aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-09-27 11:38:48 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-09-27 11:38:48 +0200
commit99c79580cd405b8bf813317ec72875525aebe448 (patch)
tree91ed9f2fe9ab5e4929e9c6b17617a911afcf4600 /res
parent37ab39b3897e274cbde23f3ed3003757f095b9ff (diff)
parent642a70765ce028419a0577d730a009bfbbf6ffb1 (diff)
Merge pull request #487 from weiss/add-german-translations
Add missing German translations
Diffstat (limited to 'res')
-rw-r--r--res/values-de/arrays.xml7
-rw-r--r--res/values-de/strings.xml2
2 files changed, 9 insertions, 0 deletions
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index e468f478b..9b429c5a7 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -20,5 +20,12 @@
<item>524288</item>
<item>1048576</item>
</string-array>
+ <string-array name="mute_options_descriptions">
+ <item>30 Minuten</item>
+ <item>eine Stunde</item>
+ <item>2 Stunden</item>
+ <item>8 Stunden</item>
+ <item>bis auf Widerruf</item>
+ </string-array>
</resources> \ No newline at end of file
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 14397e163..0c230ec64 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -259,5 +259,7 @@
<string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
<string name="pref_use_send_button_to_indicate_status_summary">Absende-Knopf einfärben, um den Online-Status des Kontakts zu signalisieren</string>
<string name="pref_expert_options_other">Sonstiges</string>
+ <string name="pref_conference_name">Konferenz-Name</string>
+ <string name="pref_conference_name_summary">Konferenz-Thema statt Raum-JID als Name verwenden</string>
</resources>