Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							ad60bc002c
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-02-19 11:14:16 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							c3f0503a91
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-02-15 12:35:35 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							20f6a4704c
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-01-20 17:18:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							3acaec7bcd
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-01-16 21:21:14 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							635210d278
							
						
					 | 
					
						
						
							
							pulled translations for 1.9.0 release from transifex
						
						
						
						
						
					 | 
					
						2016-01-14 21:52:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							d122d224bb
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-01-12 16:43:38 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							4d38ba906f
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2016-01-11 11:19:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b9fc7ebe24
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-12-07 13:54:59 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							b60c902810
							
						
					 | 
					
						
						
							
							pulled new translations from transifex
						
						
						
						
						
					 | 
					
						2015-12-02 17:27:56 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							1738673c53
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-10-14 23:05:00 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							89edd83609
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-10-05 16:45:33 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							999d65c187
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-09-14 16:53:39 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							bc9f6d91ac
							
						
					 | 
					
						
						
							
							pulled updated translations from transifex
						
						
						
						
						
					 | 
					
						2015-08-28 13:04:57 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							cb70df7a34
							
						
					 | 
					
						
						
							
							added XEP number for http file upload
						
						
						
						
						
					 | 
					
						2015-08-27 19:18:35 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							98e7d9c74e
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-08-24 21:24:48 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							730a5c644b
							
						
					 | 
					
						
						
							
							renamed plain text to unencrypted. fixes #1331
						
						
						
						
						
					 | 
					
						2015-08-24 21:15:47 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7c822c9b75
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-08-19 13:03:14 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							9b91d0bf75
							
						
					 | 
					
						
						
							
							sync translations with transifex
						
						
						
						
						
					 | 
					
						2015-08-03 14:04:26 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							15b880f3a1
							
						
					 | 
					
						
						
							
							pulled translations
						
						
						
						
						
					 | 
					
						2015-07-18 00:02:13 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7bd66549d8
							
						
					 | 
					
						
						
							
							made 'check image on http host' message more generic. fixed #1281
						
						
						
						
						
					 | 
					
						2015-07-16 13:25:52 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a423fc04fa
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-05-26 11:09:17 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							f0d51fcb77
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-04-29 10:19:03 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							7f2a83a684
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-04-26 10:48:36 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							e9783b80d1
							
						
					 | 
					
						
						
							
							added missing translations from transifex
						
						
						
						
						
					 | 
					
						2015-04-21 10:13:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							64d6a2970e
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-04-01 20:26:28 +02:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							4aab45533a
							
						
					 | 
					
						
						
							
							pulled new translations from transifex
						
						
						
						
						
					 | 
					
						2015-03-16 11:52:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							3e8314459c
							
						
					 | 
					
						
						
							
							pulled new translations from transifex
						
						
						
						
						
					 | 
					
						2015-02-23 21:56:06 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							e0af29f0a3
							
						
					 | 
					
						
						
							
							pulled spanish translations again
						
						
						
						
						
					 | 
					
						2015-02-01 17:33:36 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							33530a9e30
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-02-01 17:04:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							ce5c6c6257
							
						
					 | 
					
						
						
							
							Removes some unused strings (the legacy SSL stuff)
						
						
						
						
						
					 | 
					
						2015-02-01 08:58:35 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							e76a9c06c3
							
						
					 | 
					
						
						
							
							Remove title_activity_conversations and use app_name instead
						
						
						
						
						
					 | 
					
						2015-01-30 17:02:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							14fc520ec0
							
						
					 | 
					
						
						
							
							updated translations
						
						
						
						
						
					 | 
					
						2015-01-25 16:36:57 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							503237087f
							
						
					 | 
					
						
						
							
							Remove legacy SSL support
						
						
						
						
						
					 | 
					
						2015-01-19 11:02:13 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							c5d087ad55
							
						
					 | 
					
						
						
							
							fetched translations from transifex
						
						
						
						
						
					 | 
					
						2015-01-19 12:14:55 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							dfc1cea882
							
						
					 | 
					
						
						
							
							Correct the download file string on notifications
						
						
						
						
						
						
						
						Fixes #896 
						
					 | 
					
						2015-01-17 09:11:04 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							734a9934a3
							
						
					 | 
					
						
						
							
							make project translatable via transifex
						
						
						
						
						
					 | 
					
						2015-01-09 02:06:03 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Daniel Gultsch
							
						 
					 | 
					
						
						
						
						
							
						
						
							a7ee9cc41b
							
						
					 | 
					
						
						
							
							Merge pull request #846 from kruks23/translation4
						
						
						
						
						
						
						
						Update spanish translation 
						
					 | 
					
						2015-01-07 10:28:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							a1a2a39108
							
						
					 | 
					
						
						
							
							Update affiliation in MUC details and advance mode
						
						
						
						
						
					 | 
					
						2015-01-07 08:50:19 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Christian Schneppe
							
						 
					 | 
					
						
						
						
						
							
						
						
							ddee804a01
							
						
					 | 
					
						
						
							
							Updated languages for higher auto accept file sizes and changed labeling to MiB and KiB
						
						
						
						
						
					 | 
					
						2015-01-05 12:46:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sergio
							
						 
					 | 
					
						
						
						
						
							
						
						
							c674e9c3e9
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2015-01-04 11:24:53 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							0882da2568
							
						
					 | 
					
						
						
							
							Make `app_name' string untranslatable
						
						
						
						
						
						
						
						Remove untranslatable about message
Escape single quote in NL translation 
						
					 | 
					
						2014-12-29 19:38:47 -05:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								sergio
							
						 
					 | 
					
						
						
						
						
							
						
						
							164c41661e
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-12-27 13:04:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							6dd75cbb07
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-12-20 10:54:23 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							1ffdae80a6
							
						
					 | 
					
						
						
							
							Update spanish translations.
						
						
						
						
						
					 | 
					
						2014-12-13 13:24:17 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							920067b8ed
							
						
					 | 
					
						
						
							
							Update spanish translations.
						
						
						
						
						
					 | 
					
						2014-12-09 18:33:13 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							2a2679cfec
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-12-01 23:16:27 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							ca761bac3c
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-11-22 00:37:41 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							3ccee22c86
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-11-19 00:16:45 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							8f33f3540a
							
						
					 | 
					
						
						
							
							Update spanish translations
						
						
						
						
						
					 | 
					
						2014-11-18 23:53:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								ferdev1
							
						 
					 | 
					
						
						
						
						
							
						
						
							6c13b8a9a1
							
						
					 | 
					
						
						
							
							Update strings.xml
						
						
						
						
						
					 | 
					
						2014-11-17 17:13:20 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							0dc711d710
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-11-15 20:48:31 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								iNPUTmice
							
						 
					 | 
					
						
						
						
						
							
						
						
							26b4788733
							
						
					 | 
					
						
						
							
							formating
						
						
						
						
						
					 | 
					
						2014-11-09 21:27:37 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							6f6f15d563
							
						
					 | 
					
						
						
							
							Update Spanish Translations
						
						
						
						
						
					 | 
					
						2014-11-09 13:29:30 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							46f147a82c
							
						
					 | 
					
						
						
							
							Merge branch 'gradle' into development
						
						
						
						
						
						
						
						Conflicts:
	.gitignore
	CHANGELOG.md
	README.md
	libs/MemorizingTrustManager
	libs/minidns
	libs/openpgp-api-lib 
						
					 | 
					
						2014-10-30 15:33:13 -04:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Sam Whited
							
						 
					 | 
					
						
						
						
						
							
						
						
							281ce3105f
							
						
					 | 
					
						
						
							
							Make conversations the root project
						
						
						
						
						
					 | 
					
						2014-10-22 15:47:11 -04:00 | 
					
					
						
						
							
							
							
						
					 |