Merge branch 'development' of https://github.com/siacs/Conversations into development

2 files changed, 16 insertions, 0 deletions

diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 0078b740..ff1f3644 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -41,6 +41,7 @@
     <string name="invite_contact">Pozvat kontakt</string>
     <string name="contacts">Kontakty</string>
     <string name="cancel">Zrušit</string>
+    <string name="set">Nastavit</string>
     <string name="add">Přidat</string>
     <string name="edit">Upravit</string>
     <string name="delete">Smazat</string>
@@ -258,6 +259,11 @@
     <string name="pref_expert_options_summary">S tímto zacházejte velmi opatrně</string>
     <string name="title_activity_about">O aplikaci Conversations</string>
     <string name="pref_about_conversations_summary">Informace o sestavení a licenci</string>
+    <string name="title_pref_quiet_hours">Tichý režim</string>
+    <string name="title_pref_quiet_hours_start_time">Odkdy</string>
+    <string name="title_pref_quiet_hours_end_time">Dokdy</string>
+    <string name="title_pref_enable_quiet_hours">Povolit tichý režim</string>
+    <string name="pref_quiet_hours_summary">Upozornění budou během tichého režimu ztlumena</string>
     <string name="pref_use_larger_font">Zvětšit písmo</string>
     <string name="pref_use_larger_font_summary">Používat v celé aplikaci větší velikost písma</string>
     <string name="pref_use_send_button_to_indicate_status">Tlačítko pro odeslání zobrazuje stav</string>
@@ -336,4 +342,6 @@
     <string name="reset">Reset</string>
     <string name="account_image_description">Avatar účtu</string>
     <string name="copy_otr_clipboard_description">Zkopírovat otisk OTR do schránky</string>
+    <string name="fetching_history_from_server">Načíst historii ze serveru</string>
+    <string name="no_more_history_on_server">Na serveru není žádná další historie</string>
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index cade782a..efe2cc74 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -41,6 +41,7 @@
     <string name="invite_contact">Kontakt einladen</string>
     <string name="contacts">Kontakte</string>
     <string name="cancel">Abbrechen</string>
+    <string name="set">Einstellen</string>
     <string name="add">Hinzufügen</string>
     <string name="edit">Bearbeiten</string>
     <string name="delete">Entfernen</string>
@@ -258,6 +259,11 @@
     <string name="pref_expert_options_summary">Hier bitte vorsichtig sein</string>
     <string name="title_activity_about">Über Conversations</string>
     <string name="pref_about_conversations_summary">Versions- und Lizenzinformationen</string>
+    <string name="title_pref_quiet_hours">Ruhige Stunden</string>
+    <string name="title_pref_quiet_hours_start_time">Beginn</string>
+    <string name="title_pref_quiet_hours_end_time">Ende</string>
+    <string name="title_pref_enable_quiet_hours">Aktiviere ruhige Stunden</string>
+    <string name="pref_quiet_hours_summary">Benachrichtigungen sind während der ruhigen Stunden stumm.</string>
     <string name="pref_use_larger_font">Schrift vergrößern</string>
     <string name="pref_use_larger_font_summary">Größere Schrift verwenden</string>
     <string name="pref_use_send_button_to_indicate_status">Absende-Knopf zeigt Online-Status an</string>
@@ -336,4 +342,6 @@
     <string name="reset">Zurücksetzen</string>
     <string name="account_image_description">Konto-Avatar</string>
     <string name="copy_otr_clipboard_description">OTR-Fingerabdruck in Zwischenablage kopieren</string>
+    <string name="fetching_history_from_server">Hole Chatverlauf vom Server</string>
+    <string name="no_more_history_on_server">Keine weiteren Nachrichten auf dem Server vorhanden.</string>
 </resources>