aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-el (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-3/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-3/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle gradle/wrapper/gradle-wrapper.properties src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/ContactChooserTargetService.java src/main/java/eu/siacs/conversations/services/NotificationService.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-es/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-it/strings.xml src/main/res/values-pt-rBR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml src/main/res/xml/preferences.xml
| | * pulled translations from transifexDaniel Gultsch2016-04-101-3/+0
| | |
* | | conversations->conversations+lookshe2016-04-031-8/+8
|/ /
* / pulled from transifexlookshe2016-03-231-0/+4
|/
* pulled translations from transifexDaniel Gultsch2016-03-061-1/+0
|
* pulled translations from transifexDaniel Gultsch2016-02-191-6/+0
|
* pulled translations from transifexDaniel Gultsch2016-01-121-2/+0
|
* pulled translations from transifexDaniel Gultsch2016-01-111-1/+0
|
* pulled new translations from transifexDaniel Gultsch2015-12-021-4/+0
|
* pulled translations from transifexDaniel Gultsch2015-10-141-1/+0
|
* pulled translations from transifexDaniel Gultsch2015-09-141-1/+0
|
* pulled updated translations from transifexDaniel Gultsch2015-08-281-1/+0
|
* pulled translations from transifexDaniel Gultsch2015-08-241-2/+0
|
* renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-241-2/+2
|
* sync translations with transifexDaniel Gultsch2015-08-031-3/+0
|
* made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-5/+0
|
* pulled translations from transifexDaniel Gultsch2015-05-011-0/+11
|
* pulled latest translations from transifexDaniel Gultsch2015-04-201-1/+9
|
* pulled new translations from transifexiNPUTmice2015-03-161-0/+5
|
* pulled new translations from transifexiNPUTmice2015-02-271-0/+5
|
* pulled translations from transifexiNPUTmice2015-02-161-1/+419
|
* pulled translations from transifexiNPUTmice2015-02-011-0/+2