aboutsummaryrefslogtreecommitdiffstats
path: root/res (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-0712-121/+0
|\
| * deleted some unused string-resources and imports, also deleted ↵Michael2014-09-0712-121/+0
| | | | | | | | edit_account_dialog.xml.
* | fixed #321 - delete otr fingerprintsiNPUTmice2014-09-076-14/+34
|/
* made otr a little bit more solid when there is no presence subscriptioniNPUTmice2014-09-061-0/+1
|
* warn user if no presence subscription existsiNPUTmice2014-09-051-0/+3
|
* added support for password protected muc - fixed #203 and fixed #395iNPUTmice2014-09-031-0/+2
|
* added ability to disable notifications for specific conversations - fixed #322iNPUTmice2014-09-033-0/+23
|
* Merge branch 'unused_resources' of https://github.com/betheg/Conversations ↵iNPUTmice2014-09-0211-496/+0
|\ | | | | | | into betheg-unused_resources
| * removed unused string resources.Michael2014-09-0111-496/+0
| |
* | fixed #410 by removing that config optioniNPUTmice2014-09-021-8/+0
| |
* | refactored share with activityiNPUTmice2014-09-022-46/+20
|/
* Merge pull request #401 from jelmer/dutch-updatesDaniel Gultsch2014-08-311-0/+33
|\ | | | | Update Dutch translations.
| * Update Dutch translations.Jelmer Vernooij2014-08-311-0/+33
| |
* | Merge pull request #398 from betheg/fix_resDaniel Gultsch2014-08-319-17/+13
|\ \ | | | | | | fix: warning: string 'publish_avatar' has no default translation.
| * | fix: warning: string 'publish_avatar' has no default translation.Michael2014-08-309-17/+13
| |/ | | | | | | also altered the types of resources from array to string-array in some res-files.
* / experimental message mergingiNPUTmice2014-08-311-0/+5
|/
* more swedish translationsiNPUTmice2014-08-291-0/+3
|
* fixed #389iNPUTmice2014-08-294-4/+4
|
* Fix some typos in the German translation.Michael Kuhn2014-08-281-19/+19
|
* fixed spelling thanks @bethegiNPUTmice2014-08-282-43/+39
|
* formating in strings fileiNPUTmice2014-08-281-3/+3
|
* Merge branch 'development' of https://github.com/beriain/Conversations into ↵iNPUTmice2014-08-281-12/+20
|\ | | | | | | | | | | | | development Conflicts: res/values-eu/strings.xml
| * Update strings.xmlAitor Beriain2014-08-271-20/+20
| |
* | translated missing string in settingsiNPUTmice2014-08-274-42/+33
| |
* | added swedish translations by Anders Sandblad @andersrunesoniNPUTmice2014-08-271-1/+24
| |
* | added missing string to german translationiNPUTmice2014-08-261-0/+1
| |
* | Updated to 0.6.1Ilia2014-08-261-23/+59
| | | | | | | | 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.
* | removed deprecated strings from translationsiNPUTmice2014-08-266-49/+1
| |
* | Merge pull request #376 from wapolinar/developmentDaniel Gultsch2014-08-251-1/+1
|\ \ | | | | | | Update strings.xml
| * | Update strings.xmlwapolinar2014-08-251-1/+1
| | | | | | | | | Typo in a key for the German translation.
* | | Update Spanish Translationskruks232014-08-251-11/+6
|/ /
* | Merge branch 'development' of github.com:siacs/Conversations into developmentDaniel Gultsch2014-08-241-11/+12
|\ \
| * | Update strings.xmlkriztan2014-08-241-11/+12
| | |
* | | jump right into edit account if now accounts are configuredDaniel Gultsch2014-08-231-1/+1
| | |
* | | changed workflow on inital avatar publicationDaniel Gultsch2014-08-231-0/+1
|/ /
* | removed server compat value in favor of a (small xep list)Daniel Gultsch2014-08-232-136/+164
| |
* | Merge pull request #373 from kruks23/translation1Daniel Gultsch2014-08-231-3/+10
|\ \ | | | | | | Update Spanish Translations
| * | Update Spanish Translationskruks232014-08-211-3/+10
| | |
* | | tiny redesign for private muc messagesiNPUTmice2014-08-221-2/+2
|/ /
* | added missing string resource againiNPUTmice2014-08-201-0/+2
| |
* | revised manage account activity. removed contexual action modeiNPUTmice2014-08-204-65/+50
| |
* | better error display and additional infos (stats) for the edit account activityiNPUTmice2014-08-193-166/+74
| |
* | Merge pull request #365 from beriain/developmentDaniel Gultsch2014-08-191-3/+19
|\| | | | | Update strings.xml
| * Update strings.xmlAitor Beriain2014-08-181-3/+19
| |
* | Update strings.xmlkriztan2014-08-171-0/+1
| |
* | moved add/edit account from dialog into seperate activityiNPUTmice2014-08-152-1/+109
| |
* | Update strings.xmlkriztan2014-08-151-1/+1
| | | | | | corrected missspelling
* | Update strings.xmlkriztan2014-08-151-17/+28
| | | | | | Added German Translations and corrected misspellings.
* | Add Hebrew translation.GreenLunar2014-08-141-0/+284
| |
* | Add Hebrew translation.GreenLunar2014-08-141-0/+22
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 05:51:42 +0000