From 3b9ebfa556896d35b97fc23293cff79e730ab3ec Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sat, 11 Mar 2017 17:20:38 +0100
Subject: added and changed some strings

---
 src/main/res/values-de/strings.xml | 7 +++++++
 src/main/res/values/strings.xml    | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 7780b68ab..43d82f9b3 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -697,9 +697,16 @@
     <string name="video_high">hoch (720p)</string>
     <string name="video_low">niedrig (144p)</string>
     <string name="video_mid">mittelmäßig (360p)</string>
+    <string name="block_jabber_id">Jabber-ID</string>
+    <string name="contact_blocked_past_tense">Kontakt gesperrt.</string>
     <string name="contact_is_typing">%s schreibt…</string>
     <string name="contacts_are_typing">%s tippen…</string>
+    <string name="corresponding_conversations_closed">Zugehörige Unterhaltung beendet.</string>
+    <string name="received_message_from_stranger">Erhaltene Nachricht von einem Unbekannten</string>
     <string name="more_participants">%d Teilnehmer</string>
+    <string name="not_fetching_history_retention_period">Nachrichten werden aufgrund der eingestellten lokalen Speicherfrist nicht abgerufen.</string>
+    <string name="pref_notifications_from_strangers_summary">Benachrichtigen bei Erhalt einer neuen Nachricht von Unbekannten.</string>
+    <string name="pref_notifications_from_strangers">Benachrichtigungen von Unbekannten</string>
     <string name="one_participant">Ein Teilnehmer</string>
 
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 0c665884f..1fedeb0ae 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -174,7 +174,7 @@
     <string name="password">Password</string>
     <string name="confirm_password">Confirm password</string>
     <string name="passwords_do_not_match">Passwords do not match</string>
-    <string name="invalid_jid">This is not a valid Jabber ID</string>
+    <string name="invalid_jid">This is not a valid Jabber-ID</string>
     <string name="error_out_of_memory">Out of memory. Image is too large</string>
     <string name="add_phone_book_text">Do you want to add %s to your address book?</string>
     <string name="server_info_show_more">Server info</string>
@@ -548,7 +548,7 @@
     <string name="captcha_required">Captcha required</string>
     <string name="captcha_hint">Enter the text from the image above</string>
     <string name="certificate_chain_is_not_trusted">Certificate chain is not trusted</string>
-    <string name="jid_does_not_match_certificate">Jabber ID does not match certificate</string>
+    <string name="jid_does_not_match_certificate">Jabber-ID does not match certificate</string>
     <string name="action_renew_certificate">Renew certificate</string>
     <string name="error_fetching_omemo_key">Error fetching OMEMO key!</string>
     <string name="verified_omemo_key_with_certificate">Verified OMEMO key with certificate!</string>
@@ -746,7 +746,7 @@
     <string name="start_chatting">Start chtatting…</string>
     <string name="pref_use_max_brightness_summary">Switch to maximum brightness while watching videos or images in fullscreen.</string>
     <string name="pref_use_max_brightness">Maximum brightness</string>
-    <string name="block_jabber_id">Block Jabber ID</string>
+    <string name="block_jabber_id">Block Jabber-ID</string>
     <string name="corresponding_conversations_closed">Corresponding conversations closed.</string>
     <string name="contact_blocked_past_tense">Contact blocked.</string>
     <string name="pref_notifications_from_strangers">Notifications from strangers</string>
-- 
cgit v1.2.3