Commit graph

2012 commits

Author SHA1 Message Date
Michael 98dabe9ab4 fix forgotten spelling. 2014-08-28 16:49:52 +02:00
iNPUTmice 85b31b8d8b fixed spelling thanks @betheg 2014-08-28 11:01:24 +02:00
iNPUTmice 12cbd07693 formating in strings file 2014-08-28 10:53:44 +02:00
iNPUTmice d8eeab0879 Merge branch 'development' of https://github.com/beriain/Conversations into development
Conflicts:
	res/values-eu/strings.xml
2014-08-28 10:48:25 +02:00
Aitor Beriain 9c8b6b16d5 Update strings.xml 2014-08-27 14:48:31 +02:00
iNPUTmice 431d4ed44b translated missing string in settings 2014-08-27 09:43:53 +02:00
iNPUTmice 16eb8c3952 added swedish translations by Anders Sandblad @andersruneson 2014-08-27 09:36:47 +02:00
iNPUTmice d617f099a1 added missing string to german translation 2014-08-26 15:35:48 +02:00
Daniel Gultsch df394937b7 Merge pull request #385 from rostovtsev/development
russian translation for 0.6
2014-08-26 15:34:01 +02:00
Ilia b933a34a59 Updated to 0.6.1
1. Different bug fixed.
2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
2014-08-26 17:26:03 +04:00
Daniel Gultsch 03e779bc18 Merge pull request #384 from wapolinar/typos
Typos in readme.
2014-08-26 15:08:46 +02:00
Wolfgang Apolinarski 28d5ff1189 Typos in readme. 2014-08-26 15:01:46 +02:00
iNPUTmice 902f6c57b1 removed deprecated strings from translations 2014-08-26 11:20:10 +02:00
Daniel Gultsch 3ed29e5a8b Merge pull request #376 from wapolinar/development
Update strings.xml
2014-08-25 20:25:29 +02:00
Daniel Gultsch a9e962bf93 Merge pull request #377 from kruks23/translation2
Update Spanish Translations
2014-08-25 20:25:15 +02:00
kruks23 5e7450adfa Update Spanish Translations 2014-08-25 19:49:35 +02:00
iNPUTmice 450b911cb2 fixing duplicate private muc messages 2014-08-25 19:20:53 +02:00
wapolinar 03a387242c Update strings.xml
Typo in a key for the German translation.
2014-08-25 16:51:20 +02:00
iNPUTmice 07b422d4c8 fixed message hint 2014-08-25 15:43:50 +02:00
iNPUTmice 4e791c8a01 fixed faulty db creation on first install 2014-08-24 20:53:13 +02:00
Daniel Gultsch dce001369d Merge branch 'development' of github.com:siacs/Conversations into development 2014-08-24 17:18:10 +02:00
Daniel Gultsch 74f8e655a2 Merge pull request #375 from kriztan/patch-2
Update german translations
2014-08-24 17:17:22 +02:00
kriztan eae0a0aa2c Update strings.xml 2014-08-24 17:14:47 +02:00
Daniel Gultsch a30bc8a3e2 use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint 2014-08-24 11:21:02 +02:00
Daniel Gultsch e0b759340d jump right into edit account if now accounts are configured 2014-08-23 21:31:27 +02:00
Daniel Gultsch d504daec16 changed workflow on inital avatar publication 2014-08-23 20:00:05 +02:00
Daniel Gultsch f7437ecc36 experimental muc message deduplication 2014-08-23 15:57:39 +02:00
Daniel Gultsch ee9872277d removed server compat value in favor of a (small xep list) 2014-08-23 15:56:30 +02:00
Daniel Gultsch 26d6835927 Merge pull request #373 from kruks23/translation1
Update Spanish Translations
2014-08-23 09:52:04 +02:00
iNPUTmice 9b0bf9b5bc fixed another npe 2014-08-22 13:22:34 +02:00
iNPUTmice c40c8ee910 tiny redesign for private muc messages 2014-08-22 13:22:07 +02:00
kruks23 9776618164 Update Spanish Translations 2014-08-21 17:50:07 +02:00
iNPUTmice 4875b52f09 make avatars persisent / available even without internet 2014-08-21 12:32:50 +02:00
iNPUTmice 301477c764 save newly taken photos in DCIM dir 2014-08-21 09:19:18 +02:00
iNPUTmice 7808e5b77f added roster versioning to calculation of server compat 2014-08-21 07:47:40 +02:00
iNPUTmice 419c5e0657 added PEP to readme 2014-08-21 07:47:09 +02:00
iNPUTmice 7f5456e41b check if service is bound before adding conferences or contacts 2014-08-21 07:46:55 +02:00
iNPUTmice 9f4043c679 avoid race condition for otr key in jingle 2014-08-21 07:39:14 +02:00
iNPUTmice bd467b6b9d deregister listener in editaccount 2014-08-21 07:38:44 +02:00
iNPUTmice a269164458 added missing string resource again 2014-08-20 11:40:01 +02:00
iNPUTmice 06da080371 revised manage account activity. removed contexual action mode 2014-08-20 11:32:49 +02:00
iNPUTmice 6345217328 fixed lint error 2014-08-19 15:27:26 +02:00
iNPUTmice 3b79cc2f23 better error display and additional infos (stats) for the edit account activity 2014-08-19 15:06:50 +02:00
Daniel Gultsch d74692e0a5 Merge pull request #365 from beriain/development
Update strings.xml
2014-08-19 15:06:52 +02:00
Daniel Gultsch 3ba8dca8b9 Merge pull request #363 from kriztan/patch-1
Update german translations
2014-08-19 15:06:43 +02:00
Aitor Beriain 9963dc63af Update strings.xml 2014-08-18 15:00:43 +02:00
kriztan 8c04649d6d Update strings.xml 2014-08-17 15:00:47 +02:00
iNPUTmice 38f36aa263 more error handling for avatar publication 2014-08-16 17:31:53 +02:00
iNPUTmice 5aa8afdc1c some improvements for the edit account activity 2014-08-16 09:44:37 +02:00
iNPUTmice 32c3dd4f4a moved add/edit account from dialog into seperate activity 2014-08-15 17:31:24 +02:00