aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-pl (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-13/+13
|/ /
* | pulled from transifexlookshe2016-03-231-2/+3
| |
* | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-7/+25
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/ui/ConversationActivity.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.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/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/res/values-bg/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-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-tr-rTR/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * pulled translations from transifexDaniel Gultsch2016-03-061-2/+31
| |
* | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-3/+0
| |
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-2/+74
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/parser/MessageParser.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ConversationFragment.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/layout/activity_edit_account.xml 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-eu/strings.xml src/main/res/values-gl/strings.xml src/main/res/values-it/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nb-rNO/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values-zh-rTW/strings.xml src/main/res/values/strings.xml
| * pulled translations from transifexDaniel Gultsch2016-02-191-10/+0
| |
| * pulled translations from transifexDaniel Gultsch2016-02-111-2/+78
| |
* | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-121-2/+0
|/
* pulled translations from transifexDaniel Gultsch2016-01-121-2/+0
|
* pulled translations from transifexDaniel Gultsch2016-01-111-3/+0
|
* pulled new translations from transifexDaniel Gultsch2015-12-021-6/+0
|
* pulled translations from transifexDaniel Gultsch2015-10-141-1/+0
|
* pulled translations from transifexDaniel Gultsch2015-10-131-0/+15
|
* pulled translations from transifexDaniel Gultsch2015-09-141-1/+0
|
* pulled new translations from transifexDaniel Gultsch2015-09-131-0/+28
|
* 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
|
* pulled translations from transifexDaniel Gultsch2015-08-191-0/+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-201-0/+5
|
* pulled new translations from transifexDaniel Gultsch2015-05-161-0/+25
|
* pulled translations from transifexDaniel Gultsch2015-04-261-2/+8
|
* pulled latest translations from transifexDaniel Gultsch2015-04-201-1/+332
|
* pulled translations from transifexiNPUTmice2015-02-161-0/+89
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 06:38:17 +0000