aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-de (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed XML errors after mergesteckbrief2016-02-111-0/+2
|
* Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-299/+394
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .travis.yml CHANGELOG.md README.md art/render.rb build.gradle libs/openpgp-api-lib/build.gradle settings.gradle src/main/AndroidManifest.xml src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/crypto/PgpEngine.java src/main/java/eu/siacs/conversations/entities/Account.java src/main/java/eu/siacs/conversations/entities/Contact.java src/main/java/eu/siacs/conversations/entities/Conversation.java src/main/java/eu/siacs/conversations/entities/DownloadableFile.java src/main/java/eu/siacs/conversations/entities/Message.java src/main/java/eu/siacs/conversations/entities/MucOptions.java src/main/java/eu/siacs/conversations/entities/Transferable.java src/main/java/eu/siacs/conversations/generator/AbstractGenerator.java src/main/java/eu/siacs/conversations/generator/IqGenerator.java src/main/java/eu/siacs/conversations/generator/MessageGenerator.java src/main/java/eu/siacs/conversations/generator/PresenceGenerator.java src/main/java/eu/siacs/conversations/http/HttpConnectionManager.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/java/eu/siacs/conversations/http/HttpUploadConnection.java src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/parser/IqParser.java src/main/java/eu/siacs/conversations/parser/MessageParser.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/AbstractConnectionManager.java src/main/java/eu/siacs/conversations/services/AvatarService.java src/main/java/eu/siacs/conversations/services/MessageArchiveService.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/ConferenceDetailsActivity.java src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.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/ManageAccountActivity.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/ShareWithActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.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/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/CryptoHelper.java src/main/java/eu/siacs/conversations/utils/DNSHelper.java src/main/java/eu/siacs/conversations/utils/ExceptionHelper.java src/main/java/eu/siacs/conversations/utils/MimeUtils.java src/main/java/eu/siacs/conversations/utils/PhoneHelper.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/java/eu/siacs/conversations/utils/Xmlns.java src/main/java/eu/siacs/conversations/xml/XmlReader.java src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnectionManager.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleInbandTransport.java src/main/java/eu/siacs/conversations/xmpp/jingle/JingleSocks5Transport.java src/main/java/eu/siacs/conversations/xmpp/stanzas/MessagePacket.java src/main/res/drawable-hdpi/ic_launcher.png src/main/res/drawable-hdpi/ic_notification.png src/main/res/drawable-mdpi/ic_launcher.png src/main/res/drawable-mdpi/ic_notification.png src/main/res/drawable-xhdpi/ic_launcher.png src/main/res/drawable-xhdpi/ic_notification.png src/main/res/drawable-xxhdpi/ic_launcher.png src/main/res/drawable-xxhdpi/ic_notification.png src/main/res/drawable-xxxhdpi/ic_launcher.png src/main/res/drawable-xxxhdpi/ic_notification.png src/main/res/layout/account_row.xml src/main/res/layout/activity_about.xml src/main/res/layout/activity_change_password.xml src/main/res/layout/activity_contact_details.xml src/main/res/layout/activity_edit_account.xml src/main/res/layout/activity_muc_details.xml src/main/res/layout/activity_publish_profile_picture.xml src/main/res/layout/activity_verify_otr.xml src/main/res/layout/contact.xml src/main/res/layout/contact_key.xml src/main/res/layout/conversation_list_row.xml src/main/res/layout/enter_jid_dialog.xml src/main/res/layout/fragment_conversation.xml src/main/res/layout/join_conference_dialog.xml src/main/res/layout/message_received.xml src/main/res/layout/message_sent.xml src/main/res/layout/message_status.xml src/main/res/layout/quickedit.xml src/main/res/values-ar-rEG/strings.xml src/main/res/values-bg/strings.xml src/main/res/values-ca/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-de/strings.xml src/main/res/values-el/strings.xml src/main/res/values-es/strings.xml src/main/res/values-eu/strings.xml src/main/res/values-fa-rIR/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-id/strings.xml src/main/res/values-it/strings.xml src/main/res/values-iw/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-ko/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ru/strings.xml src/main/res/values-sk/strings.xml src/main/res/values-sr/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-v21/themes.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/arrays.xml src/main/res/values/colors.xml src/main/res/values/dimens.xml src/main/res/values/strings.xml src/main/res/values/themes.xml src/main/res/xml/preferences.xml
| * pulled translations from transifexDaniel Gultsch2016-01-201-1/+2
| |
| * pulled translations for 1.9.0 release from transifex1.9.0Daniel Gultsch2016-01-141-2/+3
| |
| * pulled translations from transifexDaniel Gultsch2016-01-121-4/+25
| |
| * pulled translations from transifexDaniel Gultsch2016-01-111-5/+2
| |
| * pulled translations from transifexDaniel Gultsch2015-12-201-2/+8
| |
| * pulled translations from transifexDaniel Gultsch2015-12-071-0/+26
| |
| * pulled new translations from transifexDaniel Gultsch2015-12-021-26/+20
| |
| * pulled translations from transifexDaniel Gultsch2015-10-141-0/+17
| |
| * pulled translations from transifexDaniel Gultsch2015-10-131-67/+67
| |
| * pulled translations from transifexDaniel Gultsch2015-09-151-0/+5
| |
| * pulled translations from transifexDaniel Gultsch2015-09-141-1/+0
| |
| * pulled updated translations from transifexDaniel Gultsch2015-08-281-1/+1
| |
| * added XEP number for http file uploadDaniel Gultsch2015-08-271-3/+6
| |
| * pulled translations from transifexDaniel Gultsch2015-08-241-2/+4
| |
| * renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-241-2/+2
| |
| * pulled translations from transifex1.6.0Daniel Gultsch2015-08-191-1/+28
| |
| * sync translations with transifexDaniel Gultsch2015-08-031-3/+0
| |
| * pulled new translations from transifexDaniel Gultsch2015-07-201-1/+1
| |
| * pulled translationsDaniel Gultsch2015-07-181-0/+2
| |
| * made 'check image on http host' message more generic. fixed #1281Daniel Gultsch2015-07-161-5/+3
| |
| * pulled translations from transifexDaniel Gultsch2015-05-201-0/+5
| |
| * pulled translations from transifexDaniel Gultsch2015-04-261-1/+1
| |
| * Add option to remove manually approved certificatesBrianBlade2015-04-191-0/+11
| | | | | | | | | | | | | | - "Remove certificates" option brings up a dialog that allows to delete certificates from MemorizingTrustManager's keystore - Reconnect active accounts when certificate-settings are changed - new preference category "Certificate options"
| * Merge branch 'dont_trust_cas_preference' of ↵iNPUTmice2015-04-141-0/+2
| |\ | | | | | | | | | | | | | | | | | | | | | https://github.com/BrianBlade/Conversations into BrianBlade-dont_trust_cas_preference Conflicts: src/main/res/values-de/strings.xml src/main/res/values/strings.xml
| | * Add option to use MTM without default TrustManagerBrianBlade2015-04-111-0/+2
| | | | | | | | | | | | | | | | | | Add a new "Don't trust system CAs" preference under advanced options that will change the behaviour of the MemorizingTrustManager. All formerly unknown certificates will raise a warning if checked.
| * | Enable end-conversation by swipe gestureBrianBlade2015-04-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add EnhancedListView library de.timroes.android:EnhancedListView:0.3.4 to enable swipe-out for ListViews Re-enable selectableItemBackground Dont end selectedConversation on swipe Call mConversationFragment.reinit() instead. Add separate undo string for swipe MUC. Add blacklistedConversation for undo swipe Update title_undo_swipe_* strings Fix undo(), rename blacklistedConversation Fix discardUndo(); re-init selectedConversation maintain scroll position after undo clear notification when dismissing a conversation modified / simplified maintain scroll position code simplify handling of selectedConversation change undo_muc string, remove notifyDataSetChanged()
| * | pulled translations from transifexiNPUTmice2015-04-011-6/+6
| |/
* | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-01-151-0/+1
| |
* | Log error in case logcat command could not be executed; Show toast in case ↵steckbrief2015-12-171-0/+1
| | | | | | | | nothing is copied
* | Implements FS#19, FS#84; Introduces ImageResizeException, MessageUtil and ↵steckbrief2015-12-161-0/+5
| | | | | | | | distinguishes between image resizing and compressing/saving
* | Implements FS#67: Introduce central logging class to use log prefix, new ↵steckbrief2015-11-201-0/+5
| | | | | | | | activity to show logcat output and button to copy contents
* | Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-031-0/+4
| | | | | | | | picture or not
* | Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+5
| |
* | Fixes FS#47: WiFi only setting in unencrypted chats bug fixed, typo in ↵steckbrief2015-10-231-1/+1
| | | | | | | | values for the setting fixed, preferences involved in the decision for auto downloading image links moved to global Utility Class
* | Publishing additional information in message details dialog such as message ↵steckbrief2015-10-041-0/+21
| | | | | | | | type and message status
* | Implements FS#72, FS#72, FS#73, FS#65, FS#66 - Resource List Dialog added, ↵steckbrief2015-10-041-0/+4
| | | | | | | | | | | | | | Open resource list on long click in conversations overview, open resource list on click on bare jid in contact details view, Message details dialog added
* | Merge tag '1.5.2' into trz/rebasetrz/1.5.2.1lookshe2015-08-111-49/+70
| |
* | changed received and read confirmation setting to one list and put it to ↵lookshe2015-04-141-4/+5
| | | | | | | | settings class
* | added settings for accepting and downloading fileslookshe2015-04-121-1/+7
| | | | | | | | fix in Settings, initialize with same values like in preferences.xml
* | differ between received and read messagelookshe2015-04-111-2/+4
| |
* | no trim of messages or passwordlookshe2015-04-111-0/+1
| | | | | | | | check password with only spaces separately
* | Configurable LED color (Attention: Expert setting because currently only ↵steckbrief2015-03-311-0/+2
| | | | | | | | text input)
* | Merge tag '1.2.0' into trz/mastersteckbrief2015-03-301-42/+56
|\| | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml
| * pulled translationsiNPUTmice2015-03-221-0/+4
| |
| * pulled new translations from transifexiNPUTmice2015-03-161-0/+5
| |
| * pulled new translations from transifexiNPUTmice2015-02-271-22/+22
| |
| * pulled new translations from transifexiNPUTmice2015-02-231-21/+25
| |
| * pulled translations from transifexiNPUTmice2015-02-161-1/+2
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 16:57:46 +0000