diff --git a/app/build.gradle b/app/build.gradle
index cfa9e535897b..2a21a310dcff 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,10 +99,6 @@ android {
     namespace 'com.owncloud.android'
     testNamespace "${namespace}.test"
 
-    androidResources {
-        generateLocaleConfig = true
-    }
-
     defaultConfig {
         applicationId "com.nextcloud.client"
         minSdkVersion 25
@@ -151,6 +147,11 @@ android {
             }
         }
 
+        // NMC customization to only include German and English translations and exclude the others
+        // By doing this no need to delete the other strings which aren't required for NMC
+        // Refer: https://developer.android.com/guide/topics/resources/providing-resources#AlternativeResources
+        resConfigs "en", "de_DE", "de"
+
         buildFeatures {
             buildConfig = true
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 9098f6f7cf61..08f78f298dcd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -10,7 +10,7 @@
     <string name="action_edit">Bearbeiten</string>
     <string name="action_empty_notifications">Alle Benachrichtigungen löschen</string>
     <string name="action_empty_trashbin">Papierkorb leeren</string>
-    <string name="action_send_share">Senden/Teilen</string>
+    <string name="action_send_share">Teilen</string>
     <string name="action_switch_grid_view">Kachelansicht</string>
     <string name="action_switch_list_view">Listenansicht</string>
     <string name="actionbar_calendar_contacts_restore">Kontakte und Kalender wiederherstellen</string>
@@ -18,7 +18,7 @@
     <string name="actionbar_move_or_copy">Verschieben oder kopieren</string>
     <string name="actionbar_open_with">Öffnen mit</string>
     <string name="actionbar_search">Suche</string>
-    <string name="actionbar_see_details">Details</string>
+    <string name="actionbar_see_details">Teilen</string>
     <string name="actionbar_send_file">Senden</string>
     <string name="actionbar_settings">Einstellungen</string>
     <string name="actionbar_sort">Sortieren</string>
@@ -139,7 +139,7 @@
     <string name="clipboard_unexpected_error">Unerwarteter Fehler beim Kopieren in die Zwischenablage</string>
     <string name="common_back">Zurück</string>
     <string name="common_cancel">Abbrechen</string>
-    <string name="common_cancel_sync">Synchronisierung abbrechen</string>
+    <string name="common_cancel_sync">Abbrechen</string>
     <string name="common_choose_account">Konto auswählen</string>
     <string name="common_confirm">Bestätigen</string>
     <string name="common_copy">Kopieren</string>
@@ -193,7 +193,7 @@
     <string name="conflict_message_description_for_folder">Falls beide Versionen gewählt werden, wird beim lokalen Ordner eine Zahl am Ende des Dateinamens hinzugefügt.</string>
     <string name="conflict_server_file">Serverdatei</string>
     <string name="contact_backup_title">Kontakte-Backup</string>
-    <string name="contact_no_permission">Eine Kontakterlaubnis ist erforderlich.</string>
+    <string name="contact_no_permission">Zugriff auf Kontakte erforderlich.</string>
     <string name="contactlist_item_icon">Nutzericon für Kontaktliste</string>
     <string name="contactlist_no_permission">Keine Berechtigung vergeben, es wurde nichts importiert.</string>
     <string name="contacts">Kontakte</string>
@@ -278,11 +278,11 @@
     <string name="drawer_item_groupfolders">Gruppenordner</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_notifications">Benachrichtigungen</string>
-    <string name="drawer_item_on_device">Auf dem Gerät</string>
+    <string name="drawer_item_on_device">Offline verfügbare Dateien</string>
     <string name="drawer_item_personal_files">Persönliche Dateien</string>
     <string name="drawer_item_recently_modified">Kürzlich geändert</string>
     <string name="drawer_item_shared">Geteilt</string>
-    <string name="drawer_item_trashbin">Gelöschte Dateien</string>
+    <string name="drawer_item_trashbin">Papierkorb</string>
     <string name="drawer_item_uploads_list">Uploads</string>
     <string name="drawer_logout">Abmelden</string>
     <string name="drawer_open">Hauptmenü öffnen</string>
@@ -298,7 +298,7 @@
     <string name="ecosystem_apps_display_assistant">Assistent</string>
     <string name="ecosystem_apps_display_more">Mehr</string>
     <string name="ecosystem_apps_more">Weitere Nextcloud-Apps</string>
-    <string name="email_pick_failed">E-Mail-Adresse konnte nicht ausgewählt werden.</string>
+    <string name="email_pick_failed">Fehler beim Zugriff auf E-Mail Adresse.</string>
     <string name="encrypted">Als verschlüsselt festlegen</string>
     <string name="end_to_end_encryption_certificate_unavailable">Serverzertifikat kann nicht abgerufen werden</string>
     <string name="end_to_end_encryption_certificate_verification_failed">Überprüfung des öffentlichen Schlüssels fehlgeschlagen</string>
@@ -440,10 +440,10 @@
     <string name="file_version_restored_error">Fehler beim Wiederherstellen der Dateiversion!</string>
     <string name="file_version_restored_successfully">Dateiversion erfolgreich wiederhergestellt</string>
     <string name="filedetails_details">Details</string>
-    <string name="filedetails_download">Herunterladen</string>
+    <string name="filedetails_download">Offline Verfügbarkeit</string>
     <string name="filedetails_export">Exportieren</string>
     <string name="filedetails_renamed_in_upload_msg">Datei während des Hochladens in %1$s umbenannt</string>
-    <string name="filedetails_sync_file">Synchronisieren</string>
+    <string name="filedetails_sync_file">Offline Verfügbarkeit</string>
     <string name="filedisplay_no_file_selected">Keine Datei gewählt</string>
     <string name="filename_empty">Dateiname darf nicht leer sein</string>
     <string name="filename_forbidden_characters">Verbotene Zeichen: / \\ &lt; &gt; : \" | ? *</string>
@@ -502,7 +502,7 @@
     <string name="image_preview_unit_seconds">%s s</string>
     <string name="instant_upload_existing">Vorhandene Dateien ebenfalls hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens der Batterie hochladen</string>
-    <string name="instant_upload_path">/SofortUpload</string>
+    <string name="instant_upload_path">/Kamera-Medien</string>
     <string name="internal_shares">Interne Freigaben</string>
     <string name="internal_two_way_sync">Interne 2-Wege-Synchronisierung</string>
     <string name="internal_two_way_sync_not_yet">Bislang nicht, wird demnächst synchronisiert</string>
@@ -557,7 +557,7 @@
     <string name="media_play_pause_description">Wiedergabe-/Pause Knopf</string>
     <string name="media_rewind_description">Rückspulknopf</string>
     <string name="media_state_playing">%1$s (wird abgespielt)</string>
-    <string name="menu_item_sort_by_date_newest_first">Neue zuerst</string>
+    <string name="menu_item_sort_by_date_newest_first">Neueste zuerst</string>
     <string name="menu_item_sort_by_date_oldest_first">Älteste zuerst</string>
     <string name="menu_item_sort_by_name_a_z">A - Z</string>
     <string name="menu_item_sort_by_name_z_a">Z - A</string>
@@ -587,7 +587,7 @@
     <string name="no_mutliple_accounts_allowed">Nur ein Konto zulässig</string>
     <string name="no_pdf_app_available">Keine App verfügbar um PDFs anzuzeigen</string>
     <string name="no_send_app">Keine App zum Senden der ausgewählten Dateien verfügbar</string>
-    <string name="no_share_permission_selected">Bitte mindestens eine Berechtigung zum Teilen auswählen.</string>
+    <string name="note_confirm">Senden</string>
     <string name="note_could_not_sent">Notiz konnte nicht versandt werden</string>
     <string name="note_icon_hint">Notiz-Symbol</string>
     <string name="notification_action_failed">Ausführen der Aktion fehlgeschlagen.</string>
@@ -679,7 +679,7 @@
     <string name="prefs_data_storage_location_summary">Speicherort der Daten verwalten</string>
     <string name="prefs_davx5_setup_error">Unerwarteter Fehler beim Einrichten von DAVx5 (früher bekannt als DAVdroid)</string>
     <string name="prefs_e2e_active">Ende-zu-Ende-Verschlüsselung ist eingerichtet!</string>
-    <string name="prefs_e2e_mnemonic">E2E-Gedächtnisstütze</string>
+    <string name="prefs_e2e_mnemonic">Ende-zu-Ende Verschlüsselung</string>
     <string name="prefs_e2e_no_device_credentials">Um die Gedächtnisstütze anzuzeigen, aktivieren Sie bitte Geräte-Zugangsdaten</string>
     <string name="prefs_enable_media_scan_notifications">Benachrichtigungen der Mediensuche anzeigen</string>
     <string name="prefs_enable_media_scan_notifications_summary">Über neu gefundene Medienordner informieren</string>
@@ -695,7 +695,7 @@
     <string name="prefs_instant_upload_subfolder_rule_title">Unterordneroptionen</string>
     <string name="prefs_keys_exist">Diesem Client Ende-zu-Ende-Verschlüsselung hinzufügen</string>
     <string name="prefs_license">Lizenz</string>
-    <string name="prefs_lock">App-PIN</string>
+    <string name="prefs_lock">Sicherheit</string>
     <string name="prefs_lock_device_credentials_enabled">Geräte-Anmeldedaten aktiviert</string>
     <string name="prefs_lock_device_credentials_not_setup">Keine Geräte-Anmeldedaten eingerichtet.</string>
     <string name="prefs_lock_none">Nichts</string>
@@ -712,7 +712,7 @@
     <string name="prefs_sourcecode">Zum Programmcode</string>
     <string name="prefs_sycned_folders_summary">Ordner für \"Automatisches Hochladen\" verwalten</string>
     <string name="prefs_synced_folders_local_path_title">Lokaler Ordner</string>
-    <string name="prefs_synced_folders_remote_path_title">Remote-Ordner</string>
+    <string name="prefs_synced_folders_remote_path_title">Zielorder in Deiner MagentaCLOUD</string>
     <string name="prefs_theme_title">Design</string>
     <string name="prefs_two_way_sync_interval">Intervall</string>
     <string name="prefs_two_way_sync_summary">Interne Ordner für 2-Wege-Synchronisierung verwalten</string>
@@ -787,11 +787,12 @@
     <string name="secure_share_not_set_up">Sicheres teilen ist für diesen Benutzer nicht eingerichtet</string>
     <string name="secure_share_search">Sicheres teilen …</string>
     <string name="select_all">Alle auswählen</string>
-    <string name="select_media_folder">Medien-Ordner auswählen</string>
+    <string name="select_media_folder">Den Ordner \"Medien\" auswählen</string>
     <string name="select_one_template">Bitte eine Vorlage auswählen</string>
     <string name="select_template">Vorlage auswählen</string>
     <string name="send">Senden</string>
     <string name="send_share">Freigabe senden</string>
+    <string name="send_note">Notiz an Empfänger senden</string>
     <string name="sendbutton_description">Icon für den Senden-Button</string>
     <string name="set_as">Setze als</string>
     <string name="set_note">Notiz setzen</string>
@@ -848,7 +849,7 @@
     <string name="sharee_add_failed">Freigeben fehlgeschlagen</string>
     <string name="sharee_already_added_to_file">Das Hinzufügen der Freigabe ist fehlgeschlagen. Diese Datei oder dieser Ordner wurden bereits für diese Person oder Gruppe freigegeben.</string>
     <string name="show_all">Alle anzeigen</string>
-    <string name="show_images">Fotos anzeigen</string>
+    <string name="show_images">Bilder anzeigen</string>
     <string name="show_less">Weniger anzeigen</string>
     <string name="show_video">Videos anzeigen</string>
     <string name="sign_tos_failed">Bitte überprüfen Sie die Nutzungsbedingungen selbst!</string>
@@ -882,7 +883,7 @@
     <string name="ssl_validator_reason_hostname_not_verified">- Die Adresse stimmt nicht mit dem im Zertifikat angegebenen Hostnamen  überein</string>
     <string name="status_message">Statusnachricht</string>
     <string name="storage_camera">Kamera</string>
-    <string name="storage_choose_location">Speicherort auswählen</string>
+    <string name="storage_choose_location">Wählen Sie Quelle</string>
     <string name="storage_description_default">Standard</string>
     <string name="storage_documents">Dokumente</string>
     <string name="storage_downloads">Downloads</string>
@@ -972,7 +973,7 @@
     <string name="unshare_link_forbidden_permissions">diese Datei nicht mehr zu teilen</string>
     <string name="unsharing_failed">Freigabe aufheben fehlgeschlagen</string>
     <string name="untrusted_domain">Zugriff über nicht vertrauenswürdige Domain. Weitere Informationen finden sich in der Dokumentation.</string>
-    <string name="update_link_file_error">Es ist ein Fehler bei der Aktualisierungd der Freigabe aufgetreten.</string>
+    <string name="update_link_file_error">Fehler bei der Aktualisierungd der Freigabe aufgetreten.</string>
     <string name="update_link_file_no_exist">Aktualisierung nicht möglich. Bitte prüfen Sie, ob die Datei existiert.</string>
     <string name="update_link_forbidden_permissions">zum Aktualisieren dieser Freigabe</string>
     <string name="updating_share_failed">Aktualisierung der Freigabe fehlgeschlagen</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1e551fbb91b0..b7d626dd51f0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,13 +13,13 @@
 
 
     <string name="about_android">%1$s Android app</string>
-    <string name="about_version">version %1$s</string>
+    <string name="about_version">Version %1$s</string>
     <string name="about_version_with_build">version %1$s, build #%2$s</string>
     <string name="appbar_search_in">Search in %s</string>
     <string name="actionbar_open_with">Open with</string>
     <string name="actionbar_mkdir">New folder</string>
     <string name="actionbar_settings">Settings</string>
-    <string name="actionbar_see_details">Details</string>
+    <string name="actionbar_see_details">Share</string>
     <string name="actionbar_send_file">Send</string>
     <string name="actionbar_sort">Sort</string>
     <string name="sort_by">Sort by</string>
@@ -81,7 +81,7 @@
     <string name="drawer_item_personal_files">Personal files</string>
     <string name="drawer_item_home">Home</string>
     <string name="drawer_item_favorites">Favorites</string>
-    <string name="drawer_item_on_device">On device</string>
+    <string name="drawer_item_on_device">Offline files</string>
     <string name="drawer_item_recently_modified">Recently modified</string>
     <string name="drawer_item_shared">Shared</string>
     <string name="drawer_item_uploads_list">Uploads</string>
@@ -94,7 +94,7 @@
     <string name="prefs_category_general">General</string>
     <string name="prefs_category_more">More</string>
     <string name="prefs_manage_accounts">Manage accounts</string>
-    <string name="prefs_lock">App passcode</string>
+    <string name="prefs_lock">Security</string>
     <string name="prefs_lock_title">Protect app using</string>
     <string name="prefs_lock_none">None</string>
     <string name="prefs_lock_using_passcode">Passcode</string>
@@ -197,16 +197,16 @@
     <string name="upload_list_empty_text_auto_upload">Upload some content or activate auto upload.</string>
     <string name="file_list_folder">folder</string>
     <string name="file_upload_worker_error_notification_title">Upload failed. No internet connection</string>
-    <string name="filedetails_download">Download</string>
-    <string name="filedetails_sync_file">Sync</string>
+    <string name="filedetails_download">Offline availability</string>
+    <string name="filedetails_sync_file">Offline availability</string>
     <string name="filedetails_renamed_in_upload_msg">File renamed %1$s during upload</string>
     <string name="list_layout">Listed layout</string>
-    <string name="action_send_share">Send/share</string>
+    <string name="action_send_share">Sharing</string>
     <string name="common_yes">Yes</string>
     <string name="common_no">No</string>
     <string name="common_ok">OK</string>
     <string name="common_now">Now</string>
-    <string name="common_cancel_sync">Cancel sync</string>
+    <string name="common_cancel_sync">Cancel</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_back">Back</string>
     <string name="common_save">Save</string>
@@ -452,7 +452,7 @@
     <string name="auto_upload_on_wifi">Only upload on unmetered Wi-Fi</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_existing">Also upload existing files</string>
-    <string name="instant_upload_path">/InstantUpload</string>
+    <string name="instant_upload_path">/Camera-Media</string>
     <string name="auto_upload_path">/AutoUpload</string>
 
     <string name="preview_media_unhandled_http_code_message">File is currently locked by another user or process and therefore not deletable. Please try again later.</string>
@@ -467,7 +467,7 @@
 
     <string name="error__upload__local_file_not_copied">%1$s could not be copied to %2$s local folder</string>
     <string name="prefs_synced_folders_local_path_title">Local folder</string>
-    <string name="prefs_synced_folders_remote_path_title">Remote folder</string>
+    <string name="prefs_synced_folders_remote_path_title">Target folder in your MagentaCLOUD</string>
     <string name="prefs_instant_upload_path_use_subfolders_title">Use subfolders</string>
     <string name="prefs_instant_upload_path_use_date_subfolders_summary">Store in subfolders based on date</string>
     <string name="prefs_instant_upload_exclude_hidden_title">Exclude hidden</string>
@@ -878,7 +878,7 @@
     <string name="sharee_already_added_to_file">Adding share failed. This file or folder has already been shared with this person or group.</string>
     <string name="unsharing_failed">Unsharing failed</string>
     <string name="updating_share_failed">Updating share failed</string>
-    <string name="prefs_e2e_mnemonic">E2E mnemonic</string>
+    <string name="prefs_e2e_mnemonic">End-to-end encryption</string>
     <string name="prefs_e2e_no_device_credentials">To show mnemonic please enable device credentials.</string>
     <string name="login">Log in</string>
     <string name="signup_with_provider">Sign up with provider</string>
@@ -983,7 +983,7 @@
     <string name="notification_action_failed">Failed to execute action.</string>
     <string name="remove_push_notification">Remove</string>
     <string name="new_notification">New notification</string>
-    <string name="storage_choose_location">Choose storage location</string>
+    <string name="storage_choose_location">Choose Source</string>
     <string name="storage_internal_storage">Internal storage</string>
     <string name="storage_external_storage">External storage</string>
     <string name="storage_camera">Camera</string>
@@ -1200,19 +1200,19 @@
     <string name="pdf_zoom_tip">Tap on a page to zoom in</string>
     <string name="storage_permission_full_access">Full access</string>
     <string name="storage_permission_media_read_only">Media read-only</string>
-    <string name="subtitle_photos_videos">Photos and videos</string>
-    <string name="show_images">Show photos</string>
-    <string name="subtitle_photos_only">Photos only</string>
+    <string name="subtitle_photos_videos">Images and videos</string>
+    <string name="show_images">Show images</string>
+    <string name="subtitle_photos_only">Images only</string>
     <string name="show_video">Show videos</string>
     <string name="subtitle_videos_only">Videos only</string>
-    <string name="select_media_folder">Set media folder</string>
+    <string name="select_media_folder">Select the \"Media\" folder</string>
     <string name="lock_file">Lock file</string>
     <string name="unlock_file">Unlock file</string>
     <string name="error_file_lock">Error changing file lock status</string>
     <string name="locked_by">Locked by %1$s</string>
     <string name="locked_by_app">Locked by %1$s app</string>
     <string name="lock_expiration_info">Expires: %1$s</string>
-    <string name="file_already_exists">Filename already exists</string>
+    <string name="file_already_exists">Filename already exists.</string>
     <string name="filedetails_export">Export</string>
     <string name="locate_folder">Locate folder</string>
     <string name="video_overlay_icon">Video overlay icon</string>