| 
							
							
								 kruks23 | ad19100b9d | Update Spanish Translations | 2014-05-14 19:18:07 +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 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f38c7b22fd | further translations | 2014-05-13 11:23:11 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | cce12af766 | fixed french language | 2014-05-13 10:18:59 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 32d2efd459 | Merge pull request #88 from BenoitBouvarel/development Translation into French | 2014-05-12 23:29:26 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | dee1ba3bdd | Merge pull request #101 from kruks23/development Preferences Spanish Translations | 2014-05-12 23:28:19 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | ae768598fe | Preferences Spanish Translations | 2014-05-12 23:22:47 +02:00 |  | 
			
				
					| 
							
							
								 alvar | cb706e9e82 | Fix a typo in catalan translation | 2014-05-12 23:15:18 +02:00 |  | 
			
				
					| 
							
							
								 alvar | d07139d3c4 | Translation into catalan language | 2014-05-12 23:14:58 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ecea4a5cd2 | fixed parsing error on missing %s | 2014-05-12 23:12:01 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 3858715ccf | Update basque translation | 2014-05-12 17:19:00 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 75f7695087 | Merge https://github.com/siacs/Conversations into development | 2014-05-12 17:09:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3455d10a4a | Better error handling if attach file doesnt work (on permission denied) and unified encrypted and unencrypted file attachment | 2014-05-12 14:59:46 +02:00 |  | 
			
				
					| 
							
							
								 iNPUTmice | 4d0bf7971e | transfered preferences descritpions into strings.xml | 2014-05-11 13:55:15 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | fcc021aa94 | Delete styles.xml | 2014-05-10 11:26:53 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 1f32089ec0 | Merge remote-tracking branch 'origin/development' into development Conflicts:
	res/values-es/arrays.xml
	res/values-es/strings.xml | 2014-05-10 11:23:56 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 3d913c2e0e | Translation into spanish. | 2014-05-10 11:23:04 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 38d3da6c2b | #79 First translation into spanish. | 2014-05-10 10:50:57 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | ef0bc6714a | added dialog for otr file transfer | 2014-05-09 21:20:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | a14a28973a | nicer descriptions in notificaton for images and encrypted messages | 2014-05-09 20:46:43 +02:00 |  | 
			
				
					| 
							
							
								 Dominik Schürmann | 8a2da100d5 | Improve OTR fingerprint dialog and fix german sentence | 2014-05-08 19:03:32 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 42c07bf4ae | Update basque translation | 2014-05-08 15:59:32 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 0ed29c1c77 | more informative dialog if contact doesn't announce public key | 2014-05-08 14:23:09 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | dc73a25ae4 | code cleanup | 2014-05-08 11:53:00 +02:00 |  | 
			
				
					| 
							
							
								 Benoit Bouvarel | 02673b2866 | Traduction Francaise | 2014-05-07 15:38:27 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 5a407c766c | fixed #70 #65 | 2014-05-07 13:19:50 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 6b20a213b0 | basic german translation | 2014-05-06 22:14:02 +02:00 |  | 
			
				
					| 
							
							
								 kruks23 | 0578fb3850 | #79 First translation into spanish. | 2014-05-06 20:34:51 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | b8023b4dfc | Merge https://github.com/siacs/Conversations into development | 2014-05-06 16:56:59 +02:00 |  | 
			
				
					| 
							
							
								 Beriain | 86887274c7 | Update basque and spanish translations | 2014-05-06 16:50:27 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | be2f7e047a | more cleanup in res files | 2014-05-03 17:06:54 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4893d8030b | removed unnecessary files | 2014-05-03 17:04:41 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 3cfb4a0cd6 | added restart button to openkeychain dialog | 2014-05-03 15:24:19 +02:00 |  | 
			
				
					| 
							
							
								 Mikel | 794f9d6cc8 | Add Basque and Spanish translations | 2014-05-02 21:21:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 82bccedf70 | nicer dialog screen if openkeychain is not installed | 2014-05-02 12:02:18 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 37c8e157d0 | reworked openpgp integration part #1 | 2014-05-01 22:33:49 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | f36f218469 | unified presence selection for otr and file transfer | 2014-04-26 12:40:21 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 645139eb68 | couple of more optimazations on image loading | 2014-04-25 23:06:20 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bf2d0d5596 | smoother scrolling (first step) | 2014-04-25 16:24:56 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 77da0c6b5d | allow images to be opened with gallary app | 2014-04-21 19:51:03 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 8006931f80 | put more string into strings.xml | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | 4a36abf30f | added clear history dialog (no funcionality) | 2014-04-18 00:17:34 +02:00 |  | 
			
				
					| 
							
							
								 Daniel Gultsch | bdf9770a61 | made ui with sending images a little smoother | 2014-04-15 15:19:02 +02:00 |  |