aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values-de (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merged 1.5.2 into trz/master with conflicts resolvedsteckbrief2015-08-111-49/+70
|\
| * pulled new translations from transifexDaniel Gultsch2015-07-211-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
| |/
* | 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
| |
* | Merge master-originsteckbrief2015-02-202-81/+87
|\| | | | | | | | | | | | | | | | | | | Conflicts: 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/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml
| * pulled translations from transifexiNPUTmice2015-02-011-0/+1
| |
| * Removes some unused strings (the legacy SSL stuff)Sam Whited2015-02-011-2/+0
| |
| * Remove title_activity_conversations and use app_name insteadkruks232015-01-301-1/+0
| |
| * updated translationsiNPUTmice2015-01-251-0/+15
| |
| * Remove legacy SSL supportSam Whited2015-01-191-1/+0
| |
| * fetched translations from transifexiNPUTmice2015-01-191-402/+406
| |
| * Correct the download file string on notificationsSam Whited2015-01-171-1/+0
| | | | | | | | Fixes #896
| * make project translatable via transifexDaniel Gultsch2015-01-091-33/+0
| |
| * allow for very basic muc configurationDaniel Gultsch2015-01-081-1/+9
| |
| * fixed german translationDaniel Gultsch2015-01-081-2/+2
| |
| * Updated German translations for more muc optionsChristian S.2015-01-071-9/+12
| |
| * Updated German translations...Christian S2015-01-071-4/+15
| | | | | | | | | | | | | | | | | | | | ...I'm not sure if "Weitere Einstellungen" is the right translation for "advanced mode". Has anybody a better translation? I've changed the translations. Updated German translations... Updated German translations...
| * corrected German spellingsChristian Schneppe2015-01-051-16/+16
| | | | | | and shorten some strings
| * Updated languages for higher auto accept file sizes and changed labeling to ↵Christian Schneppe2015-01-051-29/+31
| | | | | | | | MiB and KiB
| * corrected German 'private_message_to'kriztan2015-01-041-1/+1
| |
* | Setting added for parsing emoticons or notTristan Zur2015-01-111-0/+2
|/
* Added and modified German translationskriztan2015-01-031-5/+11
|
* Added German translationskriztan2015-01-021-0/+7
|
* Make `app_name' string untranslatableSam Whited2014-12-291-1/+0
| | | | | | Remove untranslatable about message Escape single quote in NL translation
* Update german translationskriztan2014-12-271-0/+4
|
* Update german translationskriztan2014-12-251-0/+20
|
* Update german translationskriztan2014-12-181-0/+8
|
* Update/improve German translationsHolger Weiß2014-12-021-2/+4
|
* Update german translationskriztan2014-11-261-1/+1
| | | modified translations a bit
* Update german translationskriztan2014-11-231-0/+2
|
* Update german translationskriztan2014-11-201-16/+20
|
* Update german translationskriztan2014-11-191-0/+41
|