diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 3ddf4846..d66b532b 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Nahraďte proprietární služby něčím otevřeným, důvěryhodným a decentralizovaným.</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">Vytvořit</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Opravdu chcete smazat tento adresář?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">ID adresáře nesmí být prázdné</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáři nesmí být prázdná</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -170,11 +169,6 @@ Hlašte prosím jakékoliv problémy na které narazíte přes Github.</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Vybrat adresář</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Syncthing přestal reagovat</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">Spustitelný soubor aplikace syncthing byl ukončen s chybou %1$d.\n\n
-Pokud se toto bude opakovat, zkuste restartovat svůj přístroj.</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing je vypnutý</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index e878365c..62d2197b 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Ersetzt proprietäre Angebote durch etwas quelloffenes, vertrauswürdiges und dezentrales.</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">Erstellen</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Soll dieses Verzeichnis wirklich gelöscht werden?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">Die Verzeichnis ID darf nicht leer sein</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Der Verzeichnispfad darf nicht leer sein</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -168,10 +167,6 @@ Bitte installieren Sie einen Scanner oder geben Sie die Geräte ID manuell ein.<
   <!--Menu item to select the current folder-->
   <string name="select_folder">Ordner auswählen</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Syncthing ist abgestürzt</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">Syncthing hat sich mit dem Fehlercode %1$d beendet.\n\n Wenn sich dieser Fehler wiederholt, versuchen Sie einen Neustart Ihres Geräts. </string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Synchting is deaktiviert</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 1021bcf3..fad9d338 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -1,16 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
+  <string name="app_name">Syncthing</string>
+  <string name="app_description">Reemplace servicios propietarios con algo abierto, confiable y descentralizado.</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
+  <string name="share_device_id">Compartir el ID del dispositivo</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
+  <string name="send_device_id_to">Enviar el ID del dispositivo a</string>
   <!--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-->
+  <string name="files">%1$d / %2$d Archivos</string>
   <!--DevicesFragment-->
+  <string name="devices_fragment_title">Dispositivos</string>
   <!--Shown if no devices exist-->
+  <string name="devices_list_empty">No se encontraron dispositivos</string>
   <!--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-->
@@ -21,7 +28,9 @@
   <!--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-->
+  <string name="cpu_usage">CPU Usage</string>
   <!--Title for current RAM usage-->
+  <string name="ram_usage">Uso de RAM</string>
   <!--Title for announce server status-->
   <!--FolderSettingsFragment-->
   <!--Setting title-->
@@ -29,6 +38,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <string name="devices">Dispositivos</string>
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -36,25 +46,34 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
+  <string name="device_id">ID del dispositivo</string>
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
   <!--ActionBar item-->
+  <string name="delete_device">Eliminar dispositivo</string>
   <!--Title for DeviceSettingsFragment in create mode-->
+  <string name="add_device">Agregar dispositivo</string>
   <!--Menu item to confirm adding a device-->
+  <string name="add">Añadir</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
+  <string name="edit_device">Editar dispositivo</string>
   <!--Dialog shown when attempting to delete a device-->
+  <string name="delete_device_confirm">¿Realmente desea eliminar este dispositivo?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
   <!--Toast shown when trying to create a device with an empty name-->
+  <string name="device_name_required">El nombre del dispositivo no debe estar vacío</string>
   <!--Content description for device ID qr code icon-->
+  <string name="scan_qr_code_description">Escanear código QR</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <string name="no_qr_scanner_installed">Usted no tiene ningún escáner QR instalado o el escáner no es compatible.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--Text for WebGuiActivity loading view-->
@@ -66,6 +85,9 @@
   <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <string name="sync_only_wifi">Sincronizar sólo en wifi</string>
+  <string name="syncthing_options">Opciones de Syncthing</string>
+  <string name="upnp_enabled">Activar UPnP</string>
   <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <!--Summary for the issue tracker settings item-->
@@ -78,19 +100,39 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">Cambiar la configuración</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <string name="exit">Salir</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
+  <string name="syncthing_active">Syncthing se está ejecutando</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <!--Text of the notification shown when a restart is needed-->
+  <string name="restart_notification_text">Haga clic aquí para reiniciar syncthing ahora</string>
   <!--Text for the dismiss button of the restart Activity-->
+  <string name="restart_later">Reiniciar más tarde</string>
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
+  <string-array name="file_size_units">
+    <item>B</item>
+    <item>KB</item>
+    <item>MB</item>
+    <item>GB</item>
+    <item>TB</item>
+  </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>b/s</item>
+    <item>Kb/s</item>
+    <item>Mb/s</item>
+    <item>Gb/s</item>
+    <item>Tb/s</item>
+  </string-array>
   <!--Possible folder states-->
+  <string name="state_scanning">Escaneado</string>
+  <string name="state_cleaning">Limpiando</string>
+  <string name="state_syncing">Sincronizando</string>
 </resources>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 138b18f6..140facd6 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
@@ -55,7 +55,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Créer</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -114,9 +114,6 @@
   <!--Menu item to select the current folder-->
   <string name="select_folder">Sélectionner ce dossier</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Le binaire de Syncthing a planté</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 1021bcf3..fea6fbe7 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -1,27 +1,34 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
+  <string name="app_name">Syncthing</string>
   <!--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-->
+  <string name="api_loading">Várakozás az API-ra</string>
   <!--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-->
+  <string name="devices_fragment_title">Eszközök</string>
   <!--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-->
+  <string name="download_title">Letöltés</string>
   <!--Title for current upload rate-->
+  <string name="upload_title">Feltöltés</string>
   <!--LocalDeviceInfoFragment-->
   <!--ActionBar title shown when the drawer is open-->
   <!--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-->
+  <string name="cpu_usage">CPU használat</string>
   <!--Title for current RAM usage-->
+  <string name="ram_usage">Memória használat</string>
   <!--Title for announce server status-->
   <!--FolderSettingsFragment-->
   <!--Setting title-->
@@ -29,43 +36,56 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <string name="devices">Eszközök</string>
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
+  <string name="create">Létrehozás</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
+  <string name="name">Név</string>
+  <!--Setting title-->
+  <string name="addresses">Címek</string>
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
+  <string name="compression">Tömörítés</string>
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
+  <string name="add">Hozzáadás</string>
   <!--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-->
+  <string name="scan_qr_code_description">QR kód olvasása</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
+  <string name="web_gui_title">Web GUI</string>
   <!--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-->
+  <string name="settings_title">Beállítások</string>
   <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <string name="sync_only_charging">Csak töltés közbeni szinkronizálás</string>
+  <string name="upnp_enabled">UPnP engedélyezése</string>
+  <string name="syncthing_gui">Syncthing GUI</string>
+  <string name="gui_https_enabled">HTTPS használata a GUI-hoz</string>
   <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <!--Summary for the issue tracker settings item-->
@@ -78,12 +98,11 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--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-->
+  <string name="exit">Kilépés</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
@@ -93,4 +112,6 @@
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
+  <string name="state_idle">Tétlen</string>
+  <string name="state_syncing">Szinkronizálás</string>
 </resources>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 55d1a6e8..5f232bd5 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
@@ -70,8 +70,7 @@
   <string name="create">Crea</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Vuoi veramente eliminare questa cartella?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">L\'ID Cartella non può essere vuoto</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Il percorso della cartella non può essere vuoto</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -118,15 +117,20 @@ Installare un lettore o inserire l\'ID del dispositivo manualmente.</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Primo Avvio</string>
   <!--Text for dialog displayed on first start-->
+  <string name="welcome_text">Benvenuto in Syncthing per Android!\n\n\
+Questa app è attualmente in fase Alpha e potrebbero verificarsi bug, problemi di prestazioni o perdite di dati.\n\n\
+Si prega di segnalare eventuali problemi riscontrati tramite Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Impostazioni</string>
   <!--Preference title-->
-  <string name="always_run_in_background">Esegui sempre in background</string>
+  <string name="always_run_in_background">Sempre in background</string>
   <!--Preference summary in case it is enabled-->
+  <string name="always_run_in_background_enabled">Syncthing è sempre in esecuzione in modalità background.</string>
   <!--Preference summary in case it is disabled-->
-  <string name="sync_only_charging">Sincron. solo in Ricarica</string>
-  <string name="sync_only_wifi">Sincronizza solo in Wifi</string>
+  <string name="always_run_in_background_disabled">Syncthing si attiva solo quando viene avviato manualmente e si arresta utilizzando il pulsante del menu.</string>
+  <string name="sync_only_charging">Sincr. solo in Ricarica</string>
+  <string name="sync_only_wifi">Sincr. solo in Wifi</string>
   <string name="syncthing_options">Opzioni di Syncthing</string>
   <string name="listen_address">Indirizzi Protocollo Sincronizzazione</string>
   <string name="max_recv_kbps">Limite Velocità in Ingresso (KiB/s)</string>
@@ -164,11 +168,6 @@ Installare un lettore o inserire l\'ID del dispositivo manualmente.</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Seleziona Cartella</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">L\'app Syncthing si è bloccata</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">L\'app Syncthing è stata arrestata con codice errore %1$d.\n\n
-Se questo errore persiste, prova a riavviare il tuo dispositivo.</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing è disabilitato</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 2b995902..03125007 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">プロプライエタリなサービスを、オープン、信頼、そして分権されたものと置き換えましょう。</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">作成</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">フォルダーを削除してもよろしいですか?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">フォルダー ID は空にできません</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">フォルダーのパスは空にできません</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -170,11 +169,6 @@ GitHub 経由で、発生した問題をすべて報告してください。</st
   <!--Menu item to select the current folder-->
   <string name="select_folder">フォルダーを選択</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Syncthing のバイナリがクラッシュしました</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">Syncthing のバイナリはエラーコード %1$d で終了しました。\n\n
-このエラーが解決しない場合は、お使いのデバイスを再起動してみてください。</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing は無効になりました</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index c0c10927..c6a0c9ed 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Erstatt proprietære tjenester med noe åpent, troverdig og desentralisert.</string>
   <!--MainActivity-->
@@ -67,8 +67,7 @@
   <string name="create">Opprett</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Ønsker du virkelig å slette denne mappen?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">Mappe-ID kan ikke være tom</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikke være tom</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -148,8 +147,6 @@ Vennligst rapporter alle problemer du møter på via Github.</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Velg Mappe</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing er deaktivert</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 000ea5ba..122e1c79 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Vervang niet-vrije diensten door iets opens, betrouwbaars en ge-decentraliseerds.</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">Creëren</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Weet u zeker dat u deze map wilt verwijderen?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">De map-ID mag niet leeg zijn</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Het mappad mag niet leeg zijn</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -139,9 +138,6 @@
   <!--Menu item to select the current folder-->
   <string name="select_folder">Map selecteren</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Synthing-uitvoerbare bestand is gecrashed</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 000120b3..9a1506ec 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Zastępuje własnościowe serwisy czymś otwartym, zaufanym i zdecentralizowanym.</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">Utwórz</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Czy na pewno chcesz usunąć ten folder?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">ID folderu nie może być puste</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka do folderu nie może być pusta</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -166,11 +165,6 @@ Proszę o zgłaszanie wszelkich problemów na Github-ie.</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Wybierz folder</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Syncthing uległo awarii</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">Syncthing zakończyło pracę z kodem błędu %1$d.
-Jeśli ten błąd będzie się utrzymywał, spróbuj zrestartować telefon.</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing jest wyłączone</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 2f0bb24e..3ba865c8 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Substitua serviços proprietários por algo aberto, fiável e descentralizado.</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">Criar</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Quer mesmo eliminar esta pasta?</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">O ID da pasta não pode estar vazio</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode estar vazio</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -170,11 +169,6 @@ Por favor, relate quaisquer problemas que encontre através do Github.</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Seleccionar pasta</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">O executável do Syncthing estoirou</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">O executável do syncthing terminou com um código de erro %1$d.\n\n
-Se o erro persistir, tente reiniciar o seu dispositivo.</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">O Syncthing está desactivado</string>
   <!--Message of the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 1021bcf3..d4142f65 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <!--Title of the "share device id" menu action-->
@@ -36,7 +36,7 @@
   <!--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 empty ID-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
@@ -78,8 +78,6 @@
   <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
   <!--Title of the "syncthing disabled" dialog-->
   <!--Message of the "syncthing disabled" dialog-->
   <!--Button text on the "syncthing disabled" dialog-->
diff --git a/src/main/res/values-zh_TW/strings.xml b/src/main/res/values-zh_TW/strings.xml
index 73f73530..4e9c964c 100644
--- a/src/main/res/values-zh_TW/strings.xml
+++ b/src/main/res/values-zh_TW/strings.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">一個開放的、值得信賴的、分散式的專有服務取代品。</string>
   <!--MainActivity-->
@@ -71,8 +71,7 @@
   <string name="create">建立</string>
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">您確定要刪除此資料夾？</string>
-  <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">資料夾識別碼不得為空</string>
+  <!--Toast shown when trying to create a folder with an invalid ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">資料夾路徑不得為空</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -133,6 +132,10 @@
   <string name="always_run_in_background_disabled">Syncthing 只會在明確地被要求時才會啟動，且可透過選單的按鈕停止。</string>
   <string name="sync_only_charging">只在充電時同步</string>
   <string name="sync_only_wifi">只透過 Wi-Fi 網路同步</string>
+  <string name="syncthing_options">Syncthing 選項</string>
+  <string name="max_recv_kbps">下載速率限制(KiB/s)</string>
+  <string name="max_send_kbps">上傳速率限制(KiB/s)</string>
+  <string name="upnp_enabled">允許UPnP</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">除錯選項</string>
   <!--Settings item that opens issue tracker-->
@@ -154,11 +157,6 @@
   <!--Menu item to select the current folder-->
   <string name="select_folder">選擇資料夾</string>
   <!--SyncthingService-->
-  <!--Title of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_title">Syncthing 二進制檔案已損毀</string>
-  <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">Syncthing 二進制檔案以錯誤碼 %1$d 退出。\n\n
-若此錯誤持續發生，請試著重新啟動您的裝置。</string>
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing 已經停用</string>
   <!--Message of the "syncthing disabled" dialog-->