diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index dab496c0..364f2566 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -4,31 +4,20 @@
   <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 folder" menu action-->
-  <string name="add_folder">Přidat repozitář</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Sdílet ID uzlu</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Poslat ID uzlu na</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Čekání na API</string>
-  <!--FolderFragment-->
-  <string name="folder_fragment_title">Folderzitáře</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="folder_list_empty">Folderzitáře nenalezeny</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d souborů</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Uzly</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Uzly nenalezeny</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Aktuální</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Synchronizuji (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Odpojeno</string>
   <!--Title for current download rate-->
   <string name="download_title">Download</string>
   <!--Title for current upload rate-->
@@ -48,38 +37,27 @@
   <string name="announce_server">Ohlašovací Server</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_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="folder_master">Hlavní repozitář</string>
   <!--Setting title-->
-  <string name="devices">Uzly</string>
   <!--Setting title-->
   <string name="file_versioning">Verze souborů</string>
   <!--Setting title-->
   <string name="keep_versions">Udržovat verze</string>
   <!--Setting title-->
-  <string name="delete_folder">Smazat repozitář</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Vytvořit repozitář</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Upravit repozitář</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Vytvořit</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Opravdu chcete smazat tento repozitář?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">ID repozitáře nesmí být prázdné</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">Cesta k repozitáři nesmí být prázdná</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Nejdříve prosím připojte uzel.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">ID uzlu</string>
   <!--Setting title-->
   <string name="name">Jméno</string>
   <!--Setting title-->
@@ -89,24 +67,16 @@
   <!--Setting title-->
   <string name="compression">Komprese</string>
   <!--ActionBar item-->
-  <string name="delete_device">Smazat uzel</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Přidat uzel</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Přidat</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Upravit uzel</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Opravdu chcete smazat tento uzel?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">ID uzlu nesmí být prázdné</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Jméno uzlu nesmí být prázdné</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Načíst QR kód</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">Není nainstalována žádná QR čtečka, nebo není podporována. \
-Nainstalujte prosím čtečku nebo vložte ID uzlu ručně.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webové grafické rozhraní</string>
@@ -134,9 +104,9 @@ Hlašte prosím jakékoliv problémy na které narazíte přes Github.</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="folderrt_issue_title">Nahlásit chybu</string>
+  <string name="report_issue_title">Nahlásit chybu</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">Otevřít hlášení chyb pro Syncthing-Android</string>
+  <string name="report_issue_summary">Otevřít hlášení chyb pro Syncthing-Android</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing verze</string>
@@ -145,8 +115,7 @@ Hlašte prosím jakékoliv problémy na které narazíte přes Github.</string>
   <string name="folder_picker_title">Výběr adresáře</string>
   <!--ListView empty text-->
   <string name="directory_empty">Adresář je prázdný</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_create_folfolder">Vytvořit nový adresář</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Vybrat adresář</string>
   <!--SyncthingService-->
@@ -171,7 +140,6 @@ Pokud se toto bude opakovat, zkuste restartovat svůj přístroj.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Restartovat později</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">ID uzlu bylo zkopírováno schránky</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 247bfc92..933990c0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -4,31 +4,20 @@
   <string name="app_description">Ersetzt proprietäre Angebote durch etwas quelloffenes, vertrauswürdiges und dezentraliserites.</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Verzeichnis hinzufügen</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Knoten ID teilen</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Knoten ID senden an</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Warte auf Schnittstelle</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">Verzeichnisse</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">Keine Verzeichnisse gefunden</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d Dateien</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Knoten</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Keine Knoten gefunden</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Aktuell</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Synchronisiere (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Nicht verbunden</string>
   <!--Title for current download rate-->
   <string name="download_title">Download</string>
   <!--Title for current upload rate-->
@@ -48,38 +37,27 @@
   <string name="announce_server">Ankündigungs-Server</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">Verzeichnis ID</string>
   <!--Setting title-->
   <string name="directory">Ordner</string>
   <!--Setting title-->
   <string name="rescan_interval">Suchintervall</string>
   <!--Setting title-->
-  <string name="folder_master">Originalverzeichnis</string>
   <!--Setting title-->
-  <string name="devices">Knoten</string>
   <!--Setting title-->
   <string name="file_versioning">Dateiversionierung</string>
   <!--Setting title-->
   <string name="keep_versions">Versionen behalten</string>
   <!--Setting title-->
-  <string name="delete_folder">Verzeichnis löschen</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Verzeichnis erstellen</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Verzeichnis bearbeiten</string>
   <!--Menu item to confirm folder creation-->
   <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 empty path-->
-  <string name="folder_path_required">Der Verzeichnispfad darf nicht leer sein</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Bitte verbinden Sie zuerst einen Knoten.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">Knoten ID</string>
   <!--Setting title-->
   <string name="name">Name</string>
   <!--Setting title-->
@@ -89,24 +67,16 @@
   <!--Setting title-->
   <string name="compression">Datenkomprimierung</string>
   <!--ActionBar item-->
-  <string name="delete_device">Knoten löschen</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Knoten hinzufügen</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Hinzufügen</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Knoten bearbeiten</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Soll dieser Knoten wirklich gelöscht werden?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">Die Knoten ID darf nicht leer sein</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Der Knotenname darf nicht leer sein</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR Code scannen</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">Sie haben keinen QR Scanner installiert, oder Ihr Scanner wird nicht unterstützt.
-Bitte installieren Sie einen Scanner oder geben Sie die Knoten ID manuell ein.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web Oberfläche</string>
@@ -132,9 +102,9 @@ Bitte installieren Sie einen Scanner oder geben Sie die Knoten ID manuell ein.</
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Fehlersuchoptionen</string>
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">Fehler berichten</string>
+  <string name="report_issue_title">Fehler berichten</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">Syncthing-Android Fehler-Sammlung öffnen</string>
+  <string name="report_issue_summary">Syncthing-Android Fehler-Sammlung öffnen</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing Version</string>
@@ -143,8 +113,7 @@ Bitte installieren Sie einen Scanner oder geben Sie die Knoten ID manuell ein.</
   <string name="folder_picker_title">Ordnerauswahl</string>
   <!--ListView empty text-->
   <string name="directory_empty">Ordner ist leer</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_folder">Erstelle neuen Ordner</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Ordner auswählen</string>
   <!--SyncthingService-->
@@ -168,7 +137,6 @@ Bitte installieren Sie einen Scanner oder geben Sie die Knoten ID manuell ein.</
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Später neu starten</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">Knoten ID in die Zwischenablage kopiert</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index cf70750b..477319c2 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -4,8 +4,8 @@
   <!--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 FolderFragment and DevicesFragment loading view-->
-  <!--FolderFragment-->
+  <!--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-->
@@ -38,7 +38,7 @@
   <!--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 empty path-->
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
@@ -73,7 +73,7 @@
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
-  <!--Menu item to create folder-->
+  <!--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-->
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index cf70750b..477319c2 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -4,8 +4,8 @@
   <!--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 FolderFragment and DevicesFragment loading view-->
-  <!--FolderFragment-->
+  <!--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-->
@@ -38,7 +38,7 @@
   <!--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 empty path-->
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
@@ -73,7 +73,7 @@
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
-  <!--Menu item to create folder-->
+  <!--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-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 09b56e84..c67ac166 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -3,31 +3,20 @@
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Ajouter un dépôt</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Partager l\'ID du nœud</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Envoyer l\'ID du nœud vers</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">En attente de l\'API</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">Dépôts</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">Aucun dépôt trouvé</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d fichiers</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Nœuds</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Aucun nœud trouvé</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">À jour</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Synchronisation (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Déconnecté</string>
   <!--Title for current download rate-->
   <string name="download_title">Téléchargement</string>
   <!--Title for current upload rate-->
@@ -47,37 +36,26 @@
   <string name="announce_server">Serveur d\'annonce</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">ID du dépôt</string>
   <!--Setting title-->
   <string name="directory">Dossier</string>
   <!--Setting title-->
   <!--Setting title-->
-  <string name="folder_master">Maître du dépôt</string>
   <!--Setting title-->
-  <string name="devices">Nœuds</string>
   <!--Setting title-->
   <string name="file_versioning">Gestion des versions</string>
   <!--Setting title-->
   <string name="keep_versions">Conserver les versions</string>
   <!--Setting title-->
-  <string name="delete_folder">Supprimer le dépôt</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Créer un dépôt</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Modifier le dépôt</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Créer</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Voulez-vous vraiment supprimer ce dépôt ?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">L\'ID du dépôt ne doit pas être vide</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">Le chemin vers le dépôt ne doit pas être vide</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Veuillez d\'abord vous connecter à un nœud.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">ID du nœud</string>
   <!--Setting title-->
   <string name="name">Nom</string>
   <!--Setting title-->
@@ -86,24 +64,16 @@
   <string name="current_address">Adresses actuelles</string>
   <!--Setting title-->
   <!--ActionBar item-->
-  <string name="delete_device">Supprimer le nœud</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Ajouter un nœud</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Ajouter</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Modifier le nœud</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Voulez-vous vraiment supprimer ce nœud ?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">L\'ID du nœud ne doit pas être vide</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Le nom du nœud ne doit pas être vide</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Scanner un QR Code</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">Vous n\'avez pas de scanneur QR installé, ou votre scanneur n\'est pas compatible. \
-Veuillez installer un scanneur ou entrer l\'ID du nœud manuellement.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface web</string>
@@ -122,9 +92,9 @@ Veuillez installer un scanneur ou entrer l\'ID du nœud manuellement.</string>
   <!--Preference summary in case it is disabled-->
   <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">Signaler un problème</string>
+  <string name="report_issue_title">Signaler un problème</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">Ouvrir le système de suivi des problèmes de Syncthing-Android</string>
+  <string name="report_issue_summary">Ouvrir le système de suivi des problèmes de Syncthing-Android</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Version de Syncthing</string>
@@ -133,8 +103,7 @@ Veuillez installer un scanneur ou entrer l\'ID du nœud manuellement.</string>
   <string name="folder_picker_title">Sélection du dossier</string>
   <!--ListView empty text-->
   <string name="directory_empty">Le dossier est vide</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_folder">Créer un nouveau dossier</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Sélectionner ce dossier</string>
   <!--SyncthingService-->
@@ -154,7 +123,6 @@ Veuillez installer un scanneur ou entrer l\'ID du nœud manuellement.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Redémarrer plus tard</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">ID du nœud copié dans le presse-papier.</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>o</item>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 8560d236..c8750aae 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -3,31 +3,20 @@
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Nuovo Deposito</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Condividi ID Nodo</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Invia ID Nodo tramite</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Caricamento API</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">Depositi</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">Nessun deposito</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d File</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Nodi</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Nessun nodo</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Sincronizzato</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Sincronizzazione (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Disconnesso</string>
   <!--Title for current download rate-->
   <string name="download_title">Download</string>
   <!--Title for current upload rate-->
@@ -47,37 +36,26 @@
   <string name="announce_server">Server Presenza Globale</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">ID Deposito</string>
   <!--Setting title-->
   <string name="directory">Cartella</string>
   <!--Setting title-->
   <!--Setting title-->
-  <string name="folder_master">Deposito Principale</string>
   <!--Setting title-->
-  <string name="devices">Nodi</string>
   <!--Setting title-->
   <string name="file_versioning">Controllo Versione File</string>
   <!--Setting title-->
   <string name="keep_versions">Versioni Mantenute</string>
   <!--Setting title-->
-  <string name="delete_folder">Elimina Deposito</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Crea Deposito</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Modifica Deposito</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Crea</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Vuoi veramente eliminare questo deposito?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">L\'ID Deposito non può essere vuoto</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">Il percorso del deposito non può essere vuoto</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Prima devi connettere un nodo.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">ID Nodo</string>
   <!--Setting title-->
   <string name="name">Nome</string>
   <!--Setting title-->
@@ -87,24 +65,16 @@
   <!--Setting title-->
   <string name="compression">Compressione</string>
   <!--ActionBar item-->
-  <string name="delete_device">Elimina Nodo</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Nuovo Nodo</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Aggiungi</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Modifica Nodo</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Vuoi veramente eliminare questo nodo?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">L\'ID Nodo non può essere vuoto</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Il nome del nodo non può essere vuoto</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Scansiona Codice QR</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">Non hai installato nessun lettore di Codici QR o il tuo lettore non è supportato. \
-Installare un lettore o inserire l\'ID del nodo manualmente.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaccia Web</string>
@@ -124,9 +94,9 @@ Installare un lettore o inserire l\'ID del nodo manualmente.</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opzioni di Debug</string>
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">Segnala Problema</string>
+  <string name="report_issue_title">Segnala Problema</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">Apre il registro problemi di Syncthing-Android</string>
+  <string name="report_issue_summary">Apre il registro problemi di Syncthing-Android</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Versione Syncthing</string>
@@ -135,8 +105,7 @@ Installare un lettore o inserire l\'ID del nodo manualmente.</string>
   <string name="folder_picker_title">Selezione Cartella</string>
   <!--ListView empty text-->
   <string name="directory_empty">Cartella Vuota</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_folder">Crea Nuova Cartella</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Seleziona Cartella</string>
   <!--SyncthingService-->
@@ -159,7 +128,6 @@ Installare un lettore o inserire l\'ID del nodo manualmente.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Riavvia Dopo</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">ID Nodo copiato negli appunti</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 70198415..5243a368 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -3,31 +3,20 @@
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Pakketbron toevoegen</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Knooppunt-ID delen</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Knooppunt-ID verzenden aan</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Wachten op API</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">Pakketbronnen</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">Geen pakketbronnen gevonden</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d bestanden</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Knooppunten</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Geen knooppunten gevonden</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Bijgewerkt</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Bezig met synchroniseren (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Niet verbonden</string>
   <!--Title for current download rate-->
   <string name="download_title">Download</string>
   <!--Title for current upload rate-->
@@ -47,37 +36,26 @@
   <string name="announce_server">Mededelingsserver</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">Pakketbron-ID</string>
   <!--Setting title-->
   <string name="directory">Map</string>
   <!--Setting title-->
   <!--Setting title-->
-  <string name="folder_master">Pakketbronmeester</string>
   <!--Setting title-->
-  <string name="devices">Knooppunten</string>
   <!--Setting title-->
   <string name="file_versioning">Bestandsversies</string>
   <!--Setting title-->
   <string name="keep_versions">Versies behouden</string>
   <!--Setting title-->
-  <string name="delete_folder">Pakketbron verwijderen</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Pakketbron creëren</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Pakketbron bewerken</string>
   <!--Menu item to confirm folder creation-->
   <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 pakketbron wilt verwijderen?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">De pakketbron-ID mag niet leeg zijn</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">Het pakketbron-pad mag niet leeg zijn</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Verbind eerst met een knooppunt.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">Knooppunt-ID</string>
   <!--Setting title-->
   <string name="name">Naam</string>
   <!--Setting title-->
@@ -86,24 +64,16 @@
   <string name="current_address">Huidig adres</string>
   <!--Setting title-->
   <!--ActionBar item-->
-  <string name="delete_device">Knooppunt verwijderen</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Knooppunt toevoegen</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Toevoegen</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Knooppunt bewerken</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Weet u zeker dat u dit knooppunt wilt verwijderen?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">De knooppunt-ID mag niet leeg zijn</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">De knooppuntnaam mag niet leeg zijn</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR-code scannen</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">U heeft QR-code-scanner geïnstalleerd of uw scanner wordt niet ondersteund.\
-Installeer een scanner of vul de knooppunt-ID handmatig in.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web-interface</string>
@@ -122,9 +92,9 @@ Installeer een scanner of vul de knooppunt-ID handmatig in.</string>
   <!--Preference summary in case it is disabled-->
   <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">Probleem rapporteren</string>
+  <string name="report_issue_title">Probleem rapporteren</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">De Syncthing-Android probleemtracker openen</string>
+  <string name="report_issue_summary">De Syncthing-Android probleemtracker openen</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Synthing-versie</string>
@@ -133,8 +103,7 @@ Installeer een scanner of vul de knooppunt-ID handmatig in.</string>
   <string name="folder_picker_title">Mapkiezer</string>
   <!--ListView empty text-->
   <string name="directory_empty">Map is leeg</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_folder">Nieuwe map creëren</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Map selecteren</string>
   <!--SyncthingService-->
@@ -154,7 +123,6 @@ Installeer een scanner of vul de knooppunt-ID handmatig in.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Later herstarten</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">Knooppunt-ID gekopieerd naar klembord</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d6a8b479..a08c8b5b 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -3,31 +3,20 @@
   <string name="app_name">Syncthing</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Dodaj Folderzytorium</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Odostępnij ID Węzła</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Wyślij ID węzła do</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Oczekiwanie na API API</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">Folderzytoria</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">Brak znalezionych węzłów</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d plików</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Węzły</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Brak znalezionych węzłów</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Aktualne</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Synchronizacja (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">Rozłączono</string>
   <!--Title for current download rate-->
   <string name="download_title">Pobieranie</string>
   <!--Title for current upload rate-->
@@ -47,37 +36,26 @@
   <string name="announce_server">Ogłoś serwer</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">Folder ID</string>
   <!--Setting title-->
   <string name="directory">Directory</string>
   <!--Setting title-->
   <!--Setting title-->
-  <string name="folder_master">Folder Master</string>
   <!--Setting title-->
-  <string name="devices">Devices</string>
   <!--Setting title-->
   <string name="file_versioning">File Versioning</string>
   <!--Setting title-->
   <string name="keep_versions">Keep Versions</string>
   <!--Setting title-->
-  <string name="delete_folder">Delete Folder</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Create Folder</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Edit Folder</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Create</string>
   <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Do you really want to delete this folder?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">The folder ID must not be empty</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">The folder path must not be empty</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">Please connect a node first.</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">Device ID</string>
   <!--Setting title-->
   <string name="name">Name</string>
   <!--Setting title-->
@@ -86,24 +64,16 @@
   <string name="current_address">Current Address</string>
   <!--Setting title-->
   <!--ActionBar item-->
-  <string name="delete_device">Delete Device</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Add Device</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Add</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">Edit Device</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Do you really want to delete this node?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">The node ID must not be empty</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">The node name must not be empty</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Scan QR Code</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">You have no QR scanner installed or your scanner is not supported. \
-Please install a scanner or enter the device ID manually.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
@@ -122,9 +92,9 @@ Please install a scanner or enter the device ID manually.</string>
   <!--Preference summary in case it is disabled-->
   <!--Title for the preference to set STTRACE parameters-->
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">Folderrt Issue</string>
+  <string name="report_issue_title">Report Issue</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">Open the Syncthing-Android issue tracker</string>
+  <string name="report_issue_summary">Open the Syncthing-Android issue tracker</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing Version</string>
@@ -133,8 +103,7 @@ Please install a scanner or enter the device ID manually.</string>
   <string name="folder_picker_title">Folder Picker</string>
   <!--ListView empty text-->
   <string name="directory_empty">Directory is Empty</string>
-  <!--Menu item to create folder-->
-  <string name="create_fs_folder">Create new Folder</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">Select Folder</string>
   <!--SyncthingService-->
@@ -154,7 +123,6 @@ Please install a scanner or enter the device ID manually.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Restart Later</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">Device ID copied to clipboard</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index cf70750b..477319c2 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -4,8 +4,8 @@
   <!--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 FolderFragment and DevicesFragment loading view-->
-  <!--FolderFragment-->
+  <!--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-->
@@ -38,7 +38,7 @@
   <!--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 empty path-->
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
@@ -73,7 +73,7 @@
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
-  <!--Menu item to create folder-->
+  <!--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-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index cf70750b..477319c2 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -4,8 +4,8 @@
   <!--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 FolderFragment and DevicesFragment loading view-->
-  <!--FolderFragment-->
+  <!--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-->
@@ -38,7 +38,7 @@
   <!--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 empty path-->
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
@@ -73,7 +73,7 @@
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
-  <!--Menu item to create folder-->
+  <!--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-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index cf70750b..477319c2 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -4,8 +4,8 @@
   <!--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 FolderFragment and DevicesFragment loading view-->
-  <!--FolderFragment-->
+  <!--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-->
@@ -38,7 +38,7 @@
   <!--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 empty path-->
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <!--Setting title-->
@@ -73,7 +73,7 @@
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
-  <!--Menu item to create folder-->
+  <!--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-->
diff --git a/src/main/res/values-zh_TW/strings.xml b/src/main/res/values-zh_TW/strings.xml
index 3d641f61..24adafb5 100644
--- a/src/main/res/values-zh_TW/strings.xml
+++ b/src/main/res/values-zh_TW/strings.xml
@@ -4,31 +4,20 @@
   <string name="app_description">一個開放的、值得信賴的、分散式的專有服務取代品。</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">增加儲存庫</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">分享節點識別碼</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">傳送節點識別碼給</string>
-  <!--Text for FolderFragment and DevicesFragment loading view-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">正在等待 API</string>
-  <!--FolderFragment-->
-  <string name="Folder_fragment_title">儲存庫</string>
+  <!--FoldersFragment-->
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
-  <string name="Folder_list_empty">找不到儲存庫</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d 個檔案</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">節點</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">找不到節點</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">最新</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">正在同步 (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
-  <string name="device_disconnected">斷線</string>
   <!--Title for current download rate-->
   <string name="download_title">下載</string>
   <!--Title for current upload rate-->
@@ -48,38 +37,27 @@
   <string name="announce_server">發布伺服器</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
-  <string name="folder_id">儲存庫識別碼</string>
   <!--Setting title-->
   <string name="directory">資料夾</string>
   <!--Setting title-->
   <string name="rescan_interval">重新掃描間隔</string>
   <!--Setting title-->
-  <string name="folder_master">主儲存庫</string>
   <!--Setting title-->
-  <string name="devices">節點</string>
   <!--Setting title-->
   <string name="file_versioning">檔案版本控制</string>
   <!--Setting title-->
   <string name="keep_versions">保留版本數</string>
   <!--Setting title-->
-  <string name="delete_folder">刪除儲存庫</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">建立儲存庫</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">編輯儲存庫</string>
   <!--Menu item to confirm folder creation-->
   <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 empty path-->
-  <string name="folder_path_required">儲存庫路徑不得為空</string>
-  <!--Toast shown when selecting 'devices' if no nodes have been added-->
-  <string name="no_devices">請先連接至一個節點。</string>
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
-  <string name="device_id">節點識別碼</string>
   <!--Setting title-->
   <string name="name">名稱</string>
   <!--Setting title-->
@@ -89,24 +67,16 @@
   <!--Setting title-->
   <string name="compression">壓縮</string>
   <!--ActionBar item-->
-  <string name="delete_device">刪除節點</string>
   <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">增加節點</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">增加</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <string name="edit_device">編輯節點</string>
   <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">您確定要刪除此節點？</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">節點識別碼不得為空</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">節點名稱不得為空</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">掃描 QR Code</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
-  <string name="no_qr_scanner_installed">您未安裝 QR 掃描器或是您的掃描器未被支援。\
-請安裝一個掃描器或是手動輸入節點識別碼。</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">網頁 GUI</string>
@@ -132,9 +102,9 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">除錯選項</string>
   <!--Settings item that opens issue tracker-->
-  <string name="folderrt_issue_title">回報問題</string>
+  <string name="report_issue_title">回報問題</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="folderrt_issue_summary">開啟 Syncthing-Android 問題追蹤器</string>
+  <string name="report_issue_summary">開啟 Syncthing-Android 問題追蹤器</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing 版本</string>
@@ -143,8 +113,7 @@
   <string name="folder_picker_title">資料夾選擇器</string>
   <!--ListView empty text-->
   <string name="directory_empty">資料夾為空</string>
-  <!--Menu item to create folder-->
-  <string name="create_folder">建立新資料夾</string>
+  <!--Menu item to create folder on the file system-->
   <!--Menu item to select the current folder-->
   <string name="select_folder">選擇資料夾</string>
   <!--SyncthingService-->
@@ -169,7 +138,6 @@
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">稍後重新啟動</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">節點識別碼已複製至剪貼版</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>