aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values/strings.xml (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-3/+26
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md art/render.rb build.gradle src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java src/main/java/eu/siacs/conversations/crypto/axolotl/SQLiteAxolotlStore.java src/main/java/eu/siacs/conversations/crypto/axolotl/XmppAxolotlSession.java src/main/java/eu/siacs/conversations/entities/Bookmark.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/ListItem.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/PresenceParser.java src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java src/main/java/eu/siacs/conversations/persistance/FileBackend.java src/main/java/eu/siacs/conversations/services/XmppConnectionService.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/ListItemAdapter.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/res/layout/activity_contact_details.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml 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-eu/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-rBR/strings.xml src/main/res/values-pt/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
| * show password dialog when account was magic createdDaniel Gultsch2016-05-191-0/+1
| |
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-2/+2
| |
| * report host-account as account state in UIDaniel Gultsch2016-05-101-0/+1
| |
| * report bind failure as account stateDaniel Gultsch2016-05-051-0/+1
| |
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-0/+2
| |
| * pulled translations from transifexDaniel Gultsch2016-05-041-1/+1
| |
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-0/+1
| |
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-2/+1
| |
| * renamed welcome header to untranslatable 'Start your Conversations'Daniel Gultsch2016-04-271-1/+1
| |
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-0/+1
| |
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+10
| |
| * added magic create welcome screenDaniel Gultsch2016-04-191-0/+7
| |
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-231-0/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ConversationsPlusApplication.java src/main/java/de/thedevstack/conversationsplus/ui/dialogs/MessageDetailsDialog.java src/main/java/de/thedevstack/conversationsplus/utils/MessageUtil.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
| * \ Merge branch 'master' into introduce_cplus_database_versionsteckbrief2016-04-181-4/+10
| |\ \ | | | | | | | | | | | | | | | | | | | | Conflicts: gradle/wrapper/gradle-wrapper.properties src/main/res/values/strings.xml
| * | | DatabaseBackend updated to serve Conversatiosn Database version and ↵steckbrief2016-04-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conversations+ Database version HttpUpload Flag introduced for message to identify if a link was sent after httpupload message hint for httpupload added (message parsing and message generating)
* | | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-181-2/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Related to FS#199: fixed merge hickups (message correction setting removed, ↵steckbrief2016-04-181-2/+0
| | | | | | | | | | | | | | | | key for other expert settings readded)
| * | | removed unused stringlookshe2016-04-171-1/+0
| | | |
| * | | Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-2/+11
| |\ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+12
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | add setting for quick sharingDaniel Gultsch2016-04-141-0/+4
| | |
| * | added share uri button to conference detailsDaniel Gultsch2016-04-121-0/+2
| | |
| * | introduced setting to turn of notification ledDaniel Gultsch2016-04-091-3/+5
| | |
| * | check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-071-0/+1
| | |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-071-0/+1
|\ \ \ | | |/ | |/| | | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/LogCatOutputActivity.java
| * | Implements FS#187: Add single line copy to logcat viewsteckbrief2016-04-071-0/+1
| | |
| * | conversations->conversations+lookshe2016-04-031-14/+14
| | |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-251-0/+1
| |\ \ | |/ / |/| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-0/+1
|\ \ \ | | |/ | |/|
| * | allow to delete attachments. fixes #1539Daniel Gultsch2016-03-231-0/+1
| | |
* | | Merge branch 'trz/rename' into trz/rebaselookshe2016-03-231-2/+2
|\ \ \ | | |/ | |/|
| * | pulled from transifexlookshe2016-03-231-2/+2
| | |
| * | Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+3
| |\ \ | |/ / |/| |
| * | Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-0/+6
| |\ \
| * \ \ Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-282/+393
| |\ \ \
* | \ \ \ Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-0/+3
|\ \ \ \ \ | |_|_|/ / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/ui/PublishProfilePictureActivity.java src/main/java/eu/siacs/conversations/ui/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/utils/FileUtils.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/res/values-de/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ru/strings.xml
| * | | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+3
| | | | | | | | | | | | | | | | closing the activity prematuraly caused uri permissions to be revoked
* | | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-0/+6
|\| | | | |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | warn in conversations when account is disabledDaniel Gultsch2016-03-061-0/+1
| | |
| * | show host in file size checkerDaniel Gultsch2016-03-041-0/+1
| | |
| * | don't automatically crop avatarDaniel Gultsch2016-03-041-0/+1
| | |
| * | expert option to treat vibrate as silent mode for XA. fixes #1530Daniel Gultsch2016-03-011-0/+2
| | |
| * | let users confirm each member in a conference even if that contact is ↵Daniel Gultsch2016-03-011-0/+1
| | | | | | | | | | | | already trusted
* | | Fixes FS#147: Disable OMEMOsteckbrief2016-03-021-0/+2
| | |
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-3/+0
| | |
* | | externalized string 'Retry decryption'trz/merge_1.10.1steckbrief2016-02-281-0/+1
| | |
* | | Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-281-3/+5
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: README.md build.gradle src/main/java/eu/siacs/conversations/entities/ListItem.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/res/menu/message_context.xml src/main/res/xml/preferences.xml
| * | optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-241-0/+2
| | |
| * | Retry decryption from message menufiaxh2016-02-231-1/+0
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-06 10:14:07 +0000