diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index cc5e82e6..8413b143 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <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-->
   <!--Title of the "add repo" menu action-->
   <string name="add_repo">Přidat repozitář</string>
@@ -45,12 +46,14 @@
   <string name="ram_usage">Využití RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Ohlašovací Server</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">ID repozitáře</string>
   <!--Setting title-->
   <string name="directory">Adresář</string>
   <!--Setting title-->
+  <string name="rescan_interval">Interval opakování skenu</string>
+  <!--Setting title-->
   <string name="repo_master">Hlavní repozitář</string>
   <!--Setting title-->
   <string name="nodes">Uzly</string>
@@ -60,9 +63,9 @@
   <string name="keep_versions">Udržovat verze</string>
   <!--Setting title-->
   <string name="delete_repo">Smazat repozitář</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Vytvořit repozitář</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Upravit repozitář</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Vytvořit</string>
@@ -74,7 +77,7 @@
   <string name="repo_path_required">Cesta k repozitáři nesmí být prázdná</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Nejdříve prosím připojte uzel.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">ID uzlu</string>
   <!--Setting title-->
@@ -84,12 +87,14 @@
   <!--Setting title-->
   <string name="current_address">Aktuální adresa</string>
   <!--Setting title-->
+  <string name="compression">Komprese</string>
+  <!--ActionBar item-->
   <string name="delete_node">Smazat uzel</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Přidat uzel</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Přidat</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Upravit uzel</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Opravdu chcete smazat tento uzel?</string>
@@ -109,18 +114,19 @@ Nainstalujte prosím čtečku nebo vložte ID uzlu ručně.</string>
   <string name="web_gui_loading">Čekání na grafické rozhraní</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Klíče jsou vytvářeny. Může to chvíli trvat.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Ukončit</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">První spuštění</string>
   <!--Text for dialog displayed on first start-->
   <string name="welcome_text">Vítejte do programu Syncthing pro Android!\n\n\
-Tato aplikace je momentálně v nestabilní alpha verzi. Může docházet k chybám, problémům s výkonem nebo ztrátám dat.\n\n\
-Speciální nastavení pro přenos dat v mobilních sítích není dostupné a to může vést k vyčerpání vašich datových limitů\n\n\
-Hlašte prosím jakékoliv problémy na které narazíte.</string>
-  <!--SettingsActivity-->
+Tato aplikace je momentálně v nestabilní alpha verzi. Může docházet k chybám, problémům s výkonem nebo ztrátě dat.\n\n\
+Hlašte prosím jakékoliv problémy na které narazíte přes Github.</string>
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Nastavení</string>
+  <string name="sync_only_charging">Synchronizovat pouze při nabíjení</string>
+  <string name="sync_only_wifi">Synchronizovat pouze při připojení na wifi</string>
+  <!--Title for the preference to set STTRACE parameters-->
+  <string name="sttrace_title">Možnosti ladění</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Nahlásit chybu</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +147,14 @@ Hlašte prosím jakékoliv problémy na které narazíte.</string>
   <!--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 přeinstalovat aplikaci nebo restartovat váš přístroj.\n\n</string>
+  <!--Title of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_title">Syncthing je vypnutý</string>
+  <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">Chcete změnit svoje nastavení?</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">Změnit nastavení</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="exit">Ukončit</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Je potřeba restartovat</string>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 59f3e28e..c5951856 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
+  <string name="app_description">Ersetzt proprietäre Angebote durch etwas quelloffenes, vertrauswürdiges und dezentraliserites.</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
   <string name="add_repo">Verzeichnis hinzufügen</string>
@@ -45,12 +46,14 @@
   <string name="ram_usage">RAM Auslastung</string>
   <!--Title for announce server status-->
   <string name="announce_server">Ankündigungs-Server</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">Verzeichnis ID</string>
   <!--Setting title-->
   <string name="directory">Ordner</string>
   <!--Setting title-->
+  <string name="rescan_interval">Suchintervall</string>
+  <!--Setting title-->
   <string name="repo_master">Originalverzeichnis</string>
   <!--Setting title-->
   <string name="nodes">Knoten</string>
@@ -60,9 +63,9 @@
   <string name="keep_versions">Versionen behalten</string>
   <!--Setting title-->
   <string name="delete_repo">Verzeichnis löschen</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Verzeichnis erstellen</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Verzeichnis bearbeiten</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Erstellen</string>
@@ -74,7 +77,7 @@
   <string name="repo_path_required">Der Verzeichnispfad darf nicht leer sein</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Bitte verbinden Sie zuerst einen Knoten.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">Knoten ID</string>
   <!--Setting title-->
@@ -84,12 +87,14 @@
   <!--Setting title-->
   <string name="current_address">Aktuelle Adresse</string>
   <!--Setting title-->
+  <string name="compression">Datenkomprimierung</string>
+  <!--ActionBar item-->
   <string name="delete_node">Knoten löschen</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Knoten hinzufügen</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Hinzufügen</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Knoten bearbeiten</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Soll dieser Knoten wirklich gelöscht werden?</string>
@@ -109,21 +114,17 @@ Bitte installieren Sie einen Scanner oder geben Sie die Knoten ID manuell ein.</
   <string name="web_gui_loading">Warte auf Oberfläche</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Generiere Schlüssel. Dies kann eine Weile dauern.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Verlassen</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Erster Start</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Willkommen zu Syncthing für Android
-
-Diese App ist momentan im Alpha Status, sodass es zu Fehlern, Geschwindigkeitsproblemen oder Datenverlust kommen kann.
-
-Mobiles Datenvolumen wird nicht berücksichtigt. Daher kann es sein, dass Ihr gesamtes Datenvolumen aufgebraucht wird, während Syncthing aktiv ist.
-
-Bitte teilen Sie uns auftretende Probleme mit.</string>
-  <!--SettingsActivity-->
+  <string name="welcome_text">Willkommen zu Syncthing für Android \n \n Diese App ist momentan im Alpha Status, sodass es zu Fehlern, Geschwindigkeitsproblemen oder Datenverlust kommen kann. \n\n Bitte teilen Sie uns auftretende Probleme via Github mit.</string>
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Einstellungen</string>
+  <string name="sync_only_charging">Synchronisierung nur mit angeschlossenem Ladegerät</string>
+  <string name="sync_only_wifi">Synchronisierung nur im WLAN</string>
+  <!--Title for the preference to set STTRACE parameters-->
+  <string name="sttrace_title">Fehlersuchoptionen</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Fehler berichten</string>
   <!--Summary for the issue tracker settings item-->
@@ -144,11 +145,14 @@ Bitte teilen Sie uns auftretende Probleme mit.</string>
   <!--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 beendet mit Fehlercode %1$d.
-
-Wenn es bei diesem Fehler bleibt, installieren Sie die App neu und starten Ihr Gerät erneut.
-
-</string>
+  <!--Title of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_title">Synchting is deaktiviert</string>
+  <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">Wollen sie ihre Voreinstellungen ändern?</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">Einstellungen ändern</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="exit">Verlassen</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Neustart erforderlich</string>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
new file mode 100644
index 00000000..c5106a3d
--- /dev/null
+++ b/src/main/res/values-es/strings.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add repo" menu action-->
+  <!--Title of the "share node id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Node ID-->
+  <!--Text for RepositoriesFragment and NodesFragment loading view-->
+  <!--RepositoriesFragment-->
+  <!--Format string for repository progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no repos exist-->
+  <!--Format string for repository file count-->
+  <!--NodesFragment-->
+  <!--Shown if no nodes exist-->
+  <!--Indicates that a repo is fully synced to the local node-->
+  <!--Indicates that the node is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the node-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalNodeInfoFragment-->
+  <!--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-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--RepoSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for RepoSettingsFragment in create mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
+  <!--Menu item to confirm repo creation-->
+  <!--Dialog shown when attempting to delete a repository-->
+  <!--Toast shown when trying to create a repository with an empty ID-->
+  <!--Toast shown when trying to create a repository with an empty path-->
+  <!--Toast shown when selecting 'nodes' if no nodes have been added-->
+  <!--NodeSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for NodeSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a node-->
+  <!--Title for NodeSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a node-->
+  <!--Toast shown when trying to create a node with an empty ID-->
+  <!--Toast shown when trying to create a node with an empty name-->
+  <!--Content description for node ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--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-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--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-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder-->
+  <!--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-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a node 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-->
+</resources>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
new file mode 100644
index 00000000..c5106a3d
--- /dev/null
+++ b/src/main/res/values-fi/strings.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add repo" menu action-->
+  <!--Title of the "share node id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Node ID-->
+  <!--Text for RepositoriesFragment and NodesFragment loading view-->
+  <!--RepositoriesFragment-->
+  <!--Format string for repository progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no repos exist-->
+  <!--Format string for repository file count-->
+  <!--NodesFragment-->
+  <!--Shown if no nodes exist-->
+  <!--Indicates that a repo is fully synced to the local node-->
+  <!--Indicates that the node is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the node-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalNodeInfoFragment-->
+  <!--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-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--RepoSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for RepoSettingsFragment in create mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
+  <!--Menu item to confirm repo creation-->
+  <!--Dialog shown when attempting to delete a repository-->
+  <!--Toast shown when trying to create a repository with an empty ID-->
+  <!--Toast shown when trying to create a repository with an empty path-->
+  <!--Toast shown when selecting 'nodes' if no nodes have been added-->
+  <!--NodeSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for NodeSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a node-->
+  <!--Title for NodeSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a node-->
+  <!--Toast shown when trying to create a node with an empty ID-->
+  <!--Toast shown when trying to create a node with an empty name-->
+  <!--Content description for node ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--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-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--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-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder-->
+  <!--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-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a node 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-->
+</resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 2cb907c1..4024c351 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>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
@@ -45,12 +45,13 @@
   <string name="ram_usage">Utilisation de la RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Serveur d\'annonce</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">ID du dépôt</string>
   <!--Setting title-->
   <string name="directory">Dossier</string>
   <!--Setting title-->
+  <!--Setting title-->
   <string name="repo_master">Maître du dépôt</string>
   <!--Setting title-->
   <string name="nodes">Nœuds</string>
@@ -60,9 +61,9 @@
   <string name="keep_versions">Conserver les versions</string>
   <!--Setting title-->
   <string name="delete_repo">Supprimer le dépôt</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Créer un dépôt</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Modifier le dépôt</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Créer</string>
@@ -74,7 +75,7 @@
   <string name="repo_path_required">Le chemin vers le dépôt ne doit pas être vide</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Veuillez d\'abord vous connecter à un nœud.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">ID du nœud</string>
   <!--Setting title-->
@@ -84,12 +85,13 @@
   <!--Setting title-->
   <string name="current_address">Adresses actuelles</string>
   <!--Setting title-->
+  <!--ActionBar item-->
   <string name="delete_node">Supprimer le nœud</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Ajouter un nœud</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Ajouter</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Modifier le nœud</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Voulez-vous vraiment supprimer ce nœud ?</string>
@@ -109,18 +111,13 @@ Veuillez installer un scanneur ou entrer l\'ID du nœud manuellement.</string>
   <string name="web_gui_loading">En attente de l\'interface</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Génération des clés. Cela peut prendre du temps.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Quitter</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Premier démarrage</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Bienvenue dans Syncthing pour Android ! \n\n
-Cette application est actuellement en version alpha, vous pourrez donc être confronté(e) à des bugs, des problèmes de performance ou des pertes de données.\n\n
-Il n\'y a actuellement pas de gestion particulière des données mobiles, donc l\'application pourrait épuiser votre forfait si elle est active.\n\n
-Veuillez signaler tout problème que vous rencontriez.</string>
-  <!--SettingsActivity-->
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Paramètres</string>
+  <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Signaler un problème</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +138,11 @@ Veuillez signaler tout problème que vous rencontriez.</string>
   <!--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-->
-  <string name="binary_crashed_message">Le binaire de Syncthing s\'est fermé en envoyant le code d\'erreur %1$d.\n\n
-Si cette erreur persiste, essayez de réinstaller l\'application et de redémarrer votre appareil.\n\n</string>
+  <!--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-->
+  <string name="exit">Quitter</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Redémarrage requis</string>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 92f4f640..b29932d7 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>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
@@ -45,12 +45,13 @@
   <string name="ram_usage">Utilizzo RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Server Presenza Globale</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">ID Deposito</string>
   <!--Setting title-->
   <string name="directory">Cartella</string>
   <!--Setting title-->
+  <!--Setting title-->
   <string name="repo_master">Deposito Principale</string>
   <!--Setting title-->
   <string name="nodes">Nodi</string>
@@ -60,9 +61,9 @@
   <string name="keep_versions">Versioni Mantenute</string>
   <!--Setting title-->
   <string name="delete_repo">Elimina Deposito</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Crea Deposito</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Modifica Deposito</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Crea</string>
@@ -74,7 +75,7 @@
   <string name="repo_path_required">Il percorso del deposito non può essere vuoto</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Prima devi connettere un nodo.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">ID Nodo</string>
   <!--Setting title-->
@@ -84,12 +85,13 @@
   <!--Setting title-->
   <string name="current_address">Indirizzo Attuale</string>
   <!--Setting title-->
+  <!--ActionBar item-->
   <string name="delete_node">Elimina Nodo</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Nuovo Nodo</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Aggiungi</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Modifica Nodo</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Vuoi veramente eliminare questo nodo?</string>
@@ -109,18 +111,13 @@ Installare un lettore o inserire l\'ID del nodo manualmente.</string>
   <string name="web_gui_loading">Caricamento Interfaccia Web</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Generazione delle chiavi. Potrebbe richiedere un po\' di tempo.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Esci</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\
-Attualmente non c\'è alcuna gestione dati per internet mobile, quindi l\'app potrebbe utilizzare tutto il volume dati disponibile quando è attiva.\n\n\
-Si prega di segnalare eventuali problemi riscontrati.</string>
-  <!--SettingsActivity-->
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Impostazioni</string>
+  <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Segnala Problema</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +138,11 @@ Si prega di segnalare eventuali problemi riscontrati.</string>
   <!--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">Syncthing è stata arrestata con codice errore %1$d.\n\n
-Se questo errore persiste, prova a reinstallare l\'app e a riavviare il tuo dispositivo.\n\n</string>
+  <!--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-->
+  <string name="exit">Esci</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Riavvio Necessario</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 752857f5..6fb08e7d 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>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
@@ -45,12 +45,13 @@
   <string name="ram_usage">RAM-gebrui</string>
   <!--Title for announce server status-->
   <string name="announce_server">Mededelingsserver</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">Pakketbron-ID</string>
   <!--Setting title-->
   <string name="directory">Map</string>
   <!--Setting title-->
+  <!--Setting title-->
   <string name="repo_master">Pakketbronmeester</string>
   <!--Setting title-->
   <string name="nodes">Knooppunten</string>
@@ -60,9 +61,9 @@
   <string name="keep_versions">Versies behouden</string>
   <!--Setting title-->
   <string name="delete_repo">Pakketbron verwijderen</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Pakketbron creëren</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Pakketbron bewerken</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Creëren</string>
@@ -74,7 +75,7 @@
   <string name="repo_path_required">Het pakketbron-pad mag niet leeg zijn</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Verbind eerst met een knooppunt.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">Knooppunt-ID</string>
   <!--Setting title-->
@@ -84,12 +85,13 @@
   <!--Setting title-->
   <string name="current_address">Huidig adres</string>
   <!--Setting title-->
+  <!--ActionBar item-->
   <string name="delete_node">Knooppunt verwijderen</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Knooppunt toevoegen</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Toevoegen</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Knooppunt bewerken</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Weet u zeker dat u dit knooppunt wilt verwijderen?</string>
@@ -109,18 +111,13 @@ Installeer een scanner of vul de knooppunt-ID handmatig in.</string>
   <string name="web_gui_loading">Wachten op interface</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Bezig met genereren van sleutels. Dit kan even duren.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Afsluiten</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Eerste opstart</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Welkom bij Syncthing voor Android!\n\n
-Deze app is momenteel in alfa-status en u kunt bugs verwachten, prestatieproblemen of dataverlies.\n\n
-Er is momenteel geen speciale behandeling voor mobiele netwerk-data dus het kan uw datavolume opbruiken indien actief.\n\n
-Rapporteer elk probleem dat u tegenkomt.</string>
-  <!--SettingsActivity-->
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Instellingen</string>
+  <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Probleem rapporteren</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +138,11 @@ Rapporteer elk probleem dat u tegenkomt.</string>
   <!--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-->
-  <string name="binary_crashed_message">Het uitvoerbare bestand van synthing werd afgesloten met foutcode %1$d.\n\n
-Indien deze fout aanhoudt, probeer dan de app te herinstalleren en uw apparaat te herstarten.\n\n</string>
+  <!--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-->
+  <string name="exit">Afsluiten</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Herstart vereist</string>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 67cf7223..d2ed06e2 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>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
@@ -45,12 +45,13 @@
   <string name="ram_usage">Użycie RAMu</string>
   <!--Title for announce server status-->
   <string name="announce_server">Ogłoś serwer</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">Repository ID</string>
   <!--Setting title-->
   <string name="directory">Directory</string>
   <!--Setting title-->
+  <!--Setting title-->
   <string name="repo_master">Repository Master</string>
   <!--Setting title-->
   <string name="nodes">Nodes</string>
@@ -60,9 +61,9 @@
   <string name="keep_versions">Keep Versions</string>
   <!--Setting title-->
   <string name="delete_repo">Delete Repository</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">Create Repository</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">Edit Repository</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">Create</string>
@@ -74,7 +75,7 @@
   <string name="repo_path_required">The repository path must not be empty</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">Please connect a node first.</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">Node ID</string>
   <!--Setting title-->
@@ -84,12 +85,13 @@
   <!--Setting title-->
   <string name="current_address">Current Address</string>
   <!--Setting title-->
+  <!--ActionBar item-->
   <string name="delete_node">Delete Node</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">Add Node</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">Add</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">Edit Node</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">Do you really want to delete this node?</string>
@@ -109,18 +111,13 @@ Please install a scanner or enter the node ID manually.</string>
   <string name="web_gui_loading">Waiting for GUI</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Generating keys. This may take a while.</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">Exit</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">First Start</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Welcome to Syncthing for Android!\n\n\
-This app is currently in Alpha state, and you may experience bugs, performance problems or data loss.\n\n\
-There is currently no special handling for mobile data, so it may use up your data volume if active.\n\n\
-Please report any problems you encounter.</string>
-  <!--SettingsActivity-->
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Settings</string>
+  <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Report Issue</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +138,11 @@ Please report any problems you encounter.</string>
   <!--Title of the dialog shown when the syncthing binary returns an error-->
   <string name="binary_crashed_title">Syncthing Binary Crashed</string>
   <!--Message of the dialog shown when the syncthing binary returns an error-->
-  <string name="binary_crashed_message">The syncthing binary has exited with error code %1$d.\n\n
-If this error persists, try reinstalling the app and restarting your device.\n\n</string>
+  <!--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-->
+  <string name="exit">Exit</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Restart Needed</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
new file mode 100644
index 00000000..c5106a3d
--- /dev/null
+++ b/src/main/res/values-pt/strings.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add repo" menu action-->
+  <!--Title of the "share node id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Node ID-->
+  <!--Text for RepositoriesFragment and NodesFragment loading view-->
+  <!--RepositoriesFragment-->
+  <!--Format string for repository progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no repos exist-->
+  <!--Format string for repository file count-->
+  <!--NodesFragment-->
+  <!--Shown if no nodes exist-->
+  <!--Indicates that a repo is fully synced to the local node-->
+  <!--Indicates that the node is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the node-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalNodeInfoFragment-->
+  <!--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-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--RepoSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for RepoSettingsFragment in create mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
+  <!--Menu item to confirm repo creation-->
+  <!--Dialog shown when attempting to delete a repository-->
+  <!--Toast shown when trying to create a repository with an empty ID-->
+  <!--Toast shown when trying to create a repository with an empty path-->
+  <!--Toast shown when selecting 'nodes' if no nodes have been added-->
+  <!--NodeSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for NodeSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a node-->
+  <!--Title for NodeSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a node-->
+  <!--Toast shown when trying to create a node with an empty ID-->
+  <!--Toast shown when trying to create a node with an empty name-->
+  <!--Content description for node ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--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-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--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-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder-->
+  <!--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-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a node 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-->
+</resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
new file mode 100644
index 00000000..c5106a3d
--- /dev/null
+++ b/src/main/res/values-ru/strings.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add repo" menu action-->
+  <!--Title of the "share node id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Node ID-->
+  <!--Text for RepositoriesFragment and NodesFragment loading view-->
+  <!--RepositoriesFragment-->
+  <!--Format string for repository progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no repos exist-->
+  <!--Format string for repository file count-->
+  <!--NodesFragment-->
+  <!--Shown if no nodes exist-->
+  <!--Indicates that a repo is fully synced to the local node-->
+  <!--Indicates that the node is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the node-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalNodeInfoFragment-->
+  <!--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-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--RepoSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for RepoSettingsFragment in create mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
+  <!--Menu item to confirm repo creation-->
+  <!--Dialog shown when attempting to delete a repository-->
+  <!--Toast shown when trying to create a repository with an empty ID-->
+  <!--Toast shown when trying to create a repository with an empty path-->
+  <!--Toast shown when selecting 'nodes' if no nodes have been added-->
+  <!--NodeSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for NodeSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a node-->
+  <!--Title for NodeSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a node-->
+  <!--Toast shown when trying to create a node with an empty ID-->
+  <!--Toast shown when trying to create a node with an empty name-->
+  <!--Content description for node ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--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-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--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-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder-->
+  <!--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-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a node 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-->
+</resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
new file mode 100644
index 00000000..c5106a3d
--- /dev/null
+++ b/src/main/res/values-sv/strings.xml
@@ -0,0 +1,89 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add repo" menu action-->
+  <!--Title of the "share node id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Node ID-->
+  <!--Text for RepositoriesFragment and NodesFragment loading view-->
+  <!--RepositoriesFragment-->
+  <!--Format string for repository progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no repos exist-->
+  <!--Format string for repository file count-->
+  <!--NodesFragment-->
+  <!--Shown if no nodes exist-->
+  <!--Indicates that a repo is fully synced to the local node-->
+  <!--Indicates that the node is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the node-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalNodeInfoFragment-->
+  <!--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-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--RepoSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for RepoSettingsFragment in create mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
+  <!--Menu item to confirm repo creation-->
+  <!--Dialog shown when attempting to delete a repository-->
+  <!--Toast shown when trying to create a repository with an empty ID-->
+  <!--Toast shown when trying to create a repository with an empty path-->
+  <!--Toast shown when selecting 'nodes' if no nodes have been added-->
+  <!--NodeSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for NodeSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a node-->
+  <!--Title for NodeSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a node-->
+  <!--Toast shown when trying to create a node with an empty ID-->
+  <!--Toast shown when trying to create a node with an empty name-->
+  <!--Content description for node ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--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-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--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-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder-->
+  <!--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-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a node 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-->
+</resources>
diff --git a/src/main/res/values-zh/strings.xml b/src/main/res/values-zh_TW/strings.xml
similarity index 85%
rename from src/main/res/values-zh/strings.xml
rename to src/main/res/values-zh_TW/strings.xml
index 1a6a9630..06391e82 100644
--- a/src/main/res/values-zh/strings.xml
+++ b/src/main/res/values-zh_TW/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
   <string name="app_name">Syncthing</string>
+  <string name="app_description">一個開放的、值得信賴的、分散式的專有服務取代品。</string>
   <!--MainActivity-->
   <!--Title of the "add repo" menu action-->
   <string name="add_repo">增加儲存庫</string>
@@ -45,12 +46,14 @@
   <string name="ram_usage">記憶體使用率</string>
   <!--Title for announce server status-->
   <string name="announce_server">發布伺服器</string>
-  <!--RepoSettingsActivity-->
+  <!--RepoSettingsFragment-->
   <!--Setting title-->
   <string name="repo_id">儲存庫識別碼</string>
   <!--Setting title-->
   <string name="directory">資料夾</string>
   <!--Setting title-->
+  <string name="rescan_interval">重新掃描間隔</string>
+  <!--Setting title-->
   <string name="repo_master">主儲存庫</string>
   <!--Setting title-->
   <string name="nodes">節點</string>
@@ -60,9 +63,9 @@
   <string name="keep_versions">保留版本數</string>
   <!--Setting title-->
   <string name="delete_repo">刪除儲存庫</string>
-  <!--Title for RepoSettingsActivity in create mode-->
+  <!--Title for RepoSettingsFragment in create mode-->
   <string name="create_repo">建立儲存庫</string>
-  <!--Title for RepoSettingsActivity in edit mode-->
+  <!--Title for RepoSettingsFragment in edit mode-->
   <string name="edit_repo">編輯儲存庫</string>
   <!--Menu item to confirm repo creation-->
   <string name="create">建立</string>
@@ -74,7 +77,7 @@
   <string name="repo_path_required">儲存庫路徑不得為空</string>
   <!--Toast shown when selecting 'nodes' if no nodes have been added-->
   <string name="no_nodes">請先連接至一個節點。</string>
-  <!--NodeSettingsActivity-->
+  <!--NodeSettingsFragment-->
   <!--Setting title-->
   <string name="node_id">節點識別碼</string>
   <!--Setting title-->
@@ -84,12 +87,14 @@
   <!--Setting title-->
   <string name="current_address">目前位址</string>
   <!--Setting title-->
+  <string name="compression">壓縮</string>
+  <!--ActionBar item-->
   <string name="delete_node">刪除節點</string>
-  <!--Title for NodeSettingsActivity in create mode-->
+  <!--Title for NodeSettingsFragment in create mode-->
   <string name="add_node">增加節點</string>
   <!--Menu item to confirm adding a node-->
   <string name="add">增加</string>
-  <!--Title for NodeSettingsActivity in edit mode-->
+  <!--Title for NodeSettingsFragment in edit mode-->
   <string name="edit_node">編輯節點</string>
   <!--Dialog shown when attempting to delete a node-->
   <string name="delete_node_confirm">您確定要刪除此節點？</string>
@@ -109,18 +114,19 @@
   <string name="web_gui_loading">正在等待 GUI</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">正在產生金鑰。這可能需要一些時間。</string>
-  <!--Menu item that stops Activity and Service-->
-  <string name="exit">離開</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">初次開始</string>
   <!--Text for dialog displayed on first start-->
   <string name="welcome_text">歡迎來到 Syncthing for Android!\n\n\
 此 app 目前正處於 Alpha 階段，且您可能遭遇程式錯誤、效能問題或資料遺失。\n\n\
-目前沒有針對行動數據進行特別處理，所以您的數據用量可能在 Syncthing 啟動時被用盡。\n\n\
-若遇到問題請您回報。</string>
-  <!--SettingsActivity-->
+若遇到問題請您透過 Github 回報。</string>
+  <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">設定</string>
+  <string name="sync_only_charging">只在充電時同步</string>
+  <string name="sync_only_wifi">只透過 Wi-Fi 網路同步</string>
+  <!--Title for the preference to set STTRACE parameters-->
+  <string name="sttrace_title">除錯選項</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">回報問題</string>
   <!--Summary for the issue tracker settings item-->
@@ -141,8 +147,14 @@
   <!--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
-若此狀況持續，試著重新安裝 app 並重新啟動您的裝置。\n\n</string>
+  <!--Title of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_title">Syncthing 已經停用</string>
+  <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">您確定要更改您的偏好設定？</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">更改設定</string>
+  <!--Button text on the "syncthing disabled" dialog-->
+  <string name="exit">離開</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">需要重新啟動</string>