Merge remote-tracking branch 'origin/master' into fast_actions_detail_view

1 files changed, 7 insertions, 6 deletions

diff --git a/News-Android-App/src/main/res/values-de/strings.xml b/News-Android-App/src/main/res/values-de/strings.xml
index 9412cf27..c74b99f9 100644
--- a/News-Android-App/src/main/res/values-de/strings.xml
+++ b/News-Android-App/src/main/res/values-de/strings.xml
@@ -2,7 +2,7 @@
 <resources>
 
     <string name="auto_sync_string">Automatisch synchronisieren</string>
-    <string name="title_activity_sync_interval_selector">Auswahl des Synchronisationsintervalls</string>
+    <string name="title_activity_sync_interval_selector">Synchronisierungsintervall</string>
     <string name="title_activity_news_detail">NewsDetailAktivität</string>
     <string name="empty_view_content">Keine Artikel vorhanden</string>
     <string name="toast_GettingMoreItems">Herunterladen weiterer Elemente gestartet... Bitte warten.</string>
@@ -38,7 +38,7 @@
     <string name="action_login">Servereinstellungen</string>
     <string name="action_save">Speichern</string>
     <string name="action_settings">Einstellungen</string>
-    <string name="action_sync_settings">Einstellungen zur Synchronisation</string>
+    <string name="action_sync_settings">Einstellungen zur Synchronisierung</string>
     <string name="action_add_new_feed">Einen neuen Feed hinzufügen</string>
     <string name="action_textToSpeech">Vorlesen</string>
     <string name="action_search">Suchen</string>
@@ -89,14 +89,14 @@
     <string name="move_feed_root_folder">Quellordner</string>
 
     <!-- Strings related to login -->
-    <string name="login_manual">Manueller Login</string>
-    <string name="login_sso">Login mittels Nextcloud App</string>
+    <string name="login_manual">Manuelle Anmeldung</string>
+    <string name="login_sso">Anmeldung mittels Nextcloud-App</string>
     <string name="pref_title_username">Benutzername</string>
     <string name="pref_title_password">Passwort</string>
     <string name="pref_title_owncloudRootPath">Nextcloud Wurzeladresse</string>
     <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
 
-    <string name="action_sign_in_short">Einloggen</string>
+    <string name="action_sign_in_short">Anmelden</string>
     <string name="login_progress_signing_in">Logge ein...</string>
     <!-- <string name="error_incorrect_password">Incorrect password</string> -->
     <string name="error_field_required">Dieses Feld ist erforderlich.</string>
@@ -242,7 +242,7 @@
 
 
     <!-- Data & Sync -->
-    <string name="pref_header_data_sync">Daten &amp; Synchronisation</string>
+    <string name="pref_header_data_sync">Daten &amp; Synchronisierung</string>
     <string name="pref_title_clearCache">Zwischenspeicher leeren</string>
     <string name="pref_title_CacheImagesOffline">Bilder Offline zwischenspeichern</string>
     <string name="pref_title_Max_Cache_Size">Maximale Cachegröße</string>
@@ -252,6 +252,7 @@
     <string name="pref_data_sync_image_cache_wifi_and_mobile">Über WLAN &amp; Mobil</string>
     <string name="pref_data_sync_image_cache_ask">Bei nicht verbundenem WLAN fragen</string>
 
+    <string name="array_sync_interval_min_0">Niemals</string>
     <string name="array_sync_interval_min_5">5 Minuten</string>
     <string name="array_sync_interval_min_15">15 Minuten</string>
     <string name="array_sync_interval_min_30">30 Minuten</string>