moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-12-01 05:02:21 -05:00
Code Issues Releases Wiki Activity
460 Commits 5 Branches 73 Tags 39 MiB
45cae4a340
Commit Graph

146 Commits

Author SHA1 Message Date
kruks23
aba1ca7918 Update Spanish Translations + harcoded just_now 2014-05-20 18:49:58 +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
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