171 Commits

Author	SHA1	Message	Date
Alethea Rose Butler	5881fc0412	Fixed typo in source "sefl" -> "self"	2014-06-01 17:45:20 -04:00
iNPUTmice	32a21e1ab9	unified crypto messages and made lock icon work for conferences	2014-06-01 19:08:42 +02:00
iNPUTmice	8ea73feec4	added warning when public keys are missing	2014-06-01 18:52:27 +02:00
iNPUTmice	1a4b1f8a2f	show dialog when no contact in a muc has pgp support	2014-06-01 11:24:35 +02:00
iNPUTmice	5d0e1374b2	OpenPGP key display in muc details is now prettier and linked to openkeychain	2014-06-01 10:22:42 +02:00
Alethea Butler	3e9627dc50	Capitalized openPGP -> OpenPGP	2014-05-31 00:11:47 -04:00
Daniel Gultsch	6f2a0c0107	Merge pull request #160 from alethea/development ... Spelling and changed "unsuccessful delivery" to "delivery failed"	2014-05-30 12:36:38 +02:00
Alethea Butler	cb127add56	Changed "unsuccessful delivery" to "delivery failed"	2014-05-30 02:04:24 -04:00
Alethea Butler	732848fc0e	Added question mark to remove_contact_text	2014-05-30 02:03:24 -04:00
kruks23	75b14a1d5c	More harcoded translations + updated Spanish	2014-05-29 18:17:21 +02:00
Daniel Gultsch	3e3967b785	Merge pull request #147 from kruks23/development ... Fix Contact Status width in contact details	2014-05-26 18:46:51 +02:00
Daniel Gultsch	a858992586	Merge pull request #152 from beriain/development ... Update basque translation	2014-05-26 18:46:12 +02:00
iNPUTmice	a0d21211e1	fixed #151	2014-05-26 18:44:26 +02:00
Aitor Beriain	10aa935331	Update strings.xml ... Some strings were untranslated in the previous commit	2014-05-26 17:30:15 +02:00
Aitor Beriain	c4e45458fb	Update strings.xml	2014-05-26 17:27:03 +02:00
kruks23	1b6a07e380	Fix Contact Status width in contact details	2014-05-24 15:37:54 +02:00
Daniel Gultsch	7f825f8027	error msg on offline subscription changes	2014-05-24 11:17:55 +02:00
kruks23	d74faa3f7c	More harcoded translations + Spanish	2014-05-24 00:17:42 +02:00
kruks23	d6fd0343ae	Title activities translations + contacts translations + update Spanish Translations	2014-05-23 16:20:49 +02:00
Daniel Gultsch	a2ae6e80fa	Merge pull request #143 from nachovfranco/mycommits ... Galician translation	2014-05-23 09:57:20 +02:00
kruks23	950165033b	Contact details translations + update spanish translations	2014-05-22 22:58:25 +02:00
nachovfranco	e26c60b9ca	Galician translation	2014-05-22 13:10:23 +02:00
Daniel Gultsch	a9d384875b	added missing strings	2014-05-21 20:37:55 +02:00
Daniel Gultsch	543d776986	Merge pull request #131 from beriain/development ... Update and fix basque translation	2014-05-20 20:37:40 +02:00
kruks23	aba1ca7918	Update Spanish Translations + harcoded just_now	2014-05-20 18:49:58 +02:00
Beriain	2b50c9912b	Update and fix basque translation	2014-05-20 16:35:02 +02:00
Daniel Gultsch	ff6e51356f	Merge pull request #128 from kruks23/development ... Update Spanish Translations	2014-05-20 11:52:11 +02:00
Daniel Gultsch	a582d44dba	added search icon	2014-05-20 10:15:47 +02:00
Daniel Gultsch	993477cd83	reworked roster/contact handling. might break some stuff. not sycing to disk yet	2014-05-19 15:15:09 +02:00
kruks23	7994b6866b	Update Spanish Translations	2014-05-18 19:33:38 +02:00
Daniel Gultsch	590e2403ab	bind and session request more compatible	2014-05-18 17:32:20 +02:00
Daniel Gultsch	7fc7201abb	cleaned up edit account dialog a little	2014-05-18 11:49:44 +02:00
Daniel Gultsch	736e09fbb5	added record audio button	2014-05-17 19:21:16 +02:00
Daniel Gultsch	a32d95cdd3	fixed #66	2014-05-17 12:10:58 +02:00
Daniel Gultsch	cab9b10e35	spelling	2014-05-17 12:02:14 +02:00
kruks23	e50f009004	Update Spanish Translations + harcoded pref_advanced_settings	2014-05-16 22:35:58 +02:00
Daniel Gultsch	225447f2f5	updated german translation	2014-05-16 16:16:35 +02:00
Daniel Gultsch	c8f8bab2a1	formating	2014-05-16 13:18:52 +02:00
Benoit Bouvarel	3d0f08e319	French translation + hard-coded string > @string	2014-05-16 01:13:07 +02:00
Daniel Gultsch	3426df21c1	Merge pull request #109 from kruks23/development ... Update Spanish Translations	2014-05-15 12:07:41 +02:00
kruks23	ad19100b9d	Update Spanish Translations	2014-05-14 19:18:07 +02:00
Daniel Gultsch	f4eebd091c	fixed #105	2014-05-14 18:32:58 +02:00
Daniel Gultsch	65e7294802	Merge branch 'development' into feature/take_picture	2014-05-14 00:09:38 +02:00
Daniel Gultsch	ebae779d73	one more entry to strings file	2014-05-13 18:06:56 +02:00
Daniel Gultsch	888de850cf	Merge branch 'development' into feature/take_picture	2014-05-13 17:23:58 +02:00
Beriain	efac008ffb	Fix	2014-05-13 16:52:35 +02:00
Beriain	8d27d0c44a	Merge https://github.com/siacs/Conversations into development	2014-05-13 16:46:03 +02:00
Beriain	1150f47add	Update basque translation and include preferences	2014-05-13 16:42:26 +02:00
Daniel Gultsch	6dfd885d34	submenu for attach file	2014-05-13 15:25:04 +02:00
Daniel Gultsch	3cd369fb7b	german translation	2014-05-13 13:51:13 +02:00