diff --git a/market/description_full-es_EC.txt b/market/description_full-es_EC.txt
new file mode 100644
index 00000000..ec3b5090
--- /dev/null
+++ b/market/description_full-es_EC.txt
@@ -0,0 +1,9 @@
+Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
+
+Website: https://syncthing.net/
+
+Source code: https://github.com/syncthing/syncthing-android
+
+Forum: https://discourse.syncthing.net/
+
+Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/market/description_full-es_MX.txt b/market/description_full-es_MX.txt
new file mode 100644
index 00000000..ec3b5090
--- /dev/null
+++ b/market/description_full-es_MX.txt
@@ -0,0 +1,9 @@
+Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
+
+Website: https://syncthing.net/
+
+Source code: https://github.com/syncthing/syncthing-android
+
+Forum: https://discourse.syncthing.net/
+
+Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/market/description_short-de.txt b/market/description_short-de.txt
index 4a10ab39..5bd6ac03 100644
--- a/market/description_short-de.txt
+++ b/market/description_short-de.txt
@@ -1 +1 @@
-Vertrauenswürdige Alternative zu Dropbox, gibt dir Kontrolle über deine Daten!
\ No newline at end of file
+Vertrauenswürdige Alternative zu bekannten Syncronisierungsdiensten. Du hast die Kontrolle über deine Daten!
\ No newline at end of file
diff --git a/market/description_short-es_EC.txt b/market/description_short-es_EC.txt
new file mode 100644
index 00000000..99688eee
--- /dev/null
+++ b/market/description_short-es_EC.txt
@@ -0,0 +1 @@
+Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
diff --git a/market/description_short-es_MX.txt b/market/description_short-es_MX.txt
new file mode 100644
index 00000000..99688eee
--- /dev/null
+++ b/market/description_short-es_MX.txt
@@ -0,0 +1 @@
+Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
diff --git a/market/description_short-it.txt b/market/description_short-it.txt
index 99688eee..e7d2d0ee 100644
--- a/market/description_short-it.txt
+++ b/market/description_short-it.txt
@@ -1 +1 @@
-Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
+Sostituisce servizi proprietari con qualcosa di aperto, affidabile e decentralizzato.
\ No newline at end of file
diff --git a/market/description_short-nb.txt b/market/description_short-nb.txt
index 99688eee..269e9757 100644
--- a/market/description_short-nb.txt
+++ b/market/description_short-nb.txt
@@ -1 +1 @@
-Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
+Erstatt proprietære tjenester med noe åpent, troverdig og desentralisert.
\ No newline at end of file
diff --git a/market/description_short-pl.txt b/market/description_short-pl.txt
index 99688eee..ee2a8d0d 100644
--- a/market/description_short-pl.txt
+++ b/market/description_short-pl.txt
@@ -1 +1 @@
-Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
+Zastępuje własnościowe serwisy czymś otwartym, zaufanym i zdecentralizowanym.
\ No newline at end of file
diff --git a/market/description_short-tr.txt b/market/description_short-tr.txt
index 99688eee..034957cb 100644
--- a/market/description_short-tr.txt
+++ b/market/description_short-tr.txt
@@ -1 +1 @@
-Replace proprietary services with something open, trustworthy and decentralized.
\ No newline at end of file
+Mülkiyetli ve kullanıcısına kapalı hizmetler yerine açık, özgür, güvenilir ve dağıtık hizmetleri seçin.
\ No newline at end of file
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index c511bd72..2ad5dbcb 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -15,6 +15,7 @@
   <string name="usage_reporting_dialog_description">Der verschlüsselte Nutzungsbericht wird täglich versendet. Er wird verwendet, um Statistiken über die genutzten Plattformen, Verzeichnisgrößen und Syncthing-Versionen zu erstellen. Wenn sich der übermittelte Datenumfang ändert, werden Sie erneut um Erlaubnis gefragt. Die zusammengeführten Statistiken sind unter https://data.syncthing.net zu finden.</string>
   <string name="yes">Ja</string>
   <string name="no">Nein</string>
+  <string name="off">aus</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Verzeichnisse</string>
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
@@ -50,7 +51,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Indexserver</string>
   <!--Menu item to donate-->
-  <string name="donate">Spenden</string>
+  <string name="donate">Jetzt Spenden!</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Verzeichnis-ID</string>
@@ -78,6 +79,10 @@
   <string name="folder_id_invalid">Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann nur aus Buchstaben, Zahlen und dem Punkt- (.), Bindestrich- (-), und Unterstrich- (_) Zeichen bestehen.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Der Ordnerpfad darf nicht leer sein</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Soll die Konfiguration wirklich exportiert werden? Vorhandene Dateien werden überschrieben.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Soll wirlkich eine neue Konfiguration importiert werden? Vorhandene Dateien werden überschrieben.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">Geräte-ID</string>
@@ -113,6 +118,8 @@
   <string name="device_name_required">Der Gerätename darf nicht leer sein</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR Code scannen</string>
+  <!--Toast show if we could not get root permissions-->
+  <string name="toast_root_denied">Konnte keine Root-Rechte erhalten.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Weboberfläche</string>
@@ -268,7 +275,7 @@ Bitte auftretenden Probleme via Github melden.</string>
   </string-array>
   <!--Possible folder states-->
   <string name="state_idle">Untätig</string>
-  <string name="state_scanning">scanning</string>
+  <string name="state_scanning">Scannen</string>
   <string name="state_cleaning">Aufräumen</string>
   <string name="state_syncing">Synchronisiere</string>
   <string name="state_error">Fehler</string>
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
new file mode 100644
index 00000000..727b70f9
--- /dev/null
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--DrawerFragment-->
+  <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--Menu item to donate-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to delete a folder-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Strings representing compression options-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--Toast show if we could not get root permissions-->
+  <!--WebGuiActivity-->
+  <!--Title of the web gui activity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
+  <!--SettingsFragment-->
+  <!--Activity title-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--Toast shown after config was successfully exported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--Toast after entering invalid STTRACE params-->
+  <!--Toast after entering invalid username-->
+  <!--Toast after entering invalid password-->
+  <!--Title for the preference to reset Syncthing indexes-->
+  <!--Syncthing was reset-->
+  <!--Syncthing was reset-->
+  <!--Settings item that opens the log activity-->
+  <!--Summary for the log activity-->
+  <!--Settings item that opens issue tracker-->
+  <!--Summary for the issue tracker settings item-->
+  <!--URL of the issue tracker-->
+  <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--Toast shown on devices with kitkat or higher-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--LogActivity-->
+  <!--Title of the "log" activity-->
+  <!--Title of the "log android" menu button-->
+  <!--Title of the "log Syncthing" menu button-->
+  <!--Title of the "share log" menu button-->
+  <!--SyncthingService-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--Title of the notification shown while syncthing is running and enabled-->
+  <!--Toast shown if folder observer fails to traverse a folder-->
+  <!--Toast shown if syncthing failed to create a config-->
+  <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text for positive button in restart dialog-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Shown when a device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
new file mode 100644
index 00000000..727b70f9
--- /dev/null
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -0,0 +1,117 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--DrawerFragment-->
+  <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--Menu item to donate-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to delete a folder-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Strings representing compression options-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--Toast show if we could not get root permissions-->
+  <!--WebGuiActivity-->
+  <!--Title of the web gui activity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
+  <!--SettingsFragment-->
+  <!--Activity title-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--Toast shown after config was successfully exported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--Toast after entering invalid STTRACE params-->
+  <!--Toast after entering invalid username-->
+  <!--Toast after entering invalid password-->
+  <!--Title for the preference to reset Syncthing indexes-->
+  <!--Syncthing was reset-->
+  <!--Syncthing was reset-->
+  <!--Settings item that opens the log activity-->
+  <!--Summary for the log activity-->
+  <!--Settings item that opens issue tracker-->
+  <!--Summary for the issue tracker settings item-->
+  <!--URL of the issue tracker-->
+  <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--Toast shown on devices with kitkat or higher-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--LogActivity-->
+  <!--Title of the "log" activity-->
+  <!--Title of the "log android" menu button-->
+  <!--Title of the "log Syncthing" menu button-->
+  <!--Title of the "share log" menu button-->
+  <!--SyncthingService-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--Title of the notification shown while syncthing is running and enabled-->
+  <!--Toast shown if folder observer fails to traverse a folder-->
+  <!--Toast shown if syncthing failed to create a config-->
+  <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text for positive button in restart dialog-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Shown when a device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>