diff options
| author | iNPUTmice <daniel@gultsch.de> | 2014-12-19 13:40:35 +0100 |
|---|---|---|
| committer | iNPUTmice <daniel@gultsch.de> | 2014-12-19 13:40:35 +0100 |
| commit | a68cb5d3643dc9ab5c37ade8defc109cc44e8557 (patch) | |
| tree | c725fbceb880b9f44da65368901ffbc14e91d917 /src/main/res/values-de | |
| parent | 627982df90d83177578183d0e91cad0a748c4e4d (diff) | |
| parent | 11cb06eda56640c99c4201518261e59a616b15cd (diff) | |
Merge branch 'development' of https://github.com/siacs/Conversations into development
Diffstat (limited to 'src/main/res/values-de')
| -rw-r--r-- | src/main/res/values-de/strings.xml | 8 |
1 files changed, 8 insertions, 0 deletions
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> |