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
							
						 
					 | 
					
						
						
						
						
							
						
						
							0d6475d0d9
							
						
					 | 
					
						
						
							
							pulled more translations
						
						
						
						
						
					 | 
					
						2015-03-19 19:32:24 +01: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
							
						 
					 | 
					
						
						
						
						
							
						
						
							33530a9e30
							
						
					 | 
					
						
						
							
							pulled translations from transifex
						
						
						
						
						
					 | 
					
						2015-02-01 17:04:29 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								kruks23
							
						 
					 | 
					
						
						
						
						
							
						
						
							e76a9c06c3
							
						
					 | 
					
						
						
							
							Remove title_activity_conversations and use app_name instead
						
						
						
						
						
					 | 
					
						2015-01-30 17:02:53 +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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								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 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							d9182fe81c
							
						
					 | 
					
						
						
							
							Update basque translation
						
						
						
						
						
					 | 
					
						2014-11-27 18:33:42 +01:00 | 
					
					
						
						
							
							
							
						
					 | 
				
			
				
					
						
							
							
								 
								Aitor Beriain
							
						 
					 | 
					
						
						
						
						
							
						
						
							24b5d0eb26
							
						
					 | 
					
						
						
							
							Update basque translation
						
						
						
						
						
					 | 
					
						2014-11-19 16:12:31 +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 | 
					
					
						
						
							
							
							
						
					 |