diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 364f2566..b12a0a24 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -4,20 +4,31 @@
   <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 adresář</string>
   <!--Title of the "share device id" menu action-->
+  <string name="share_device_id">ID přístroje sdílení</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
+  <string name="send_device_id_to">Poslat ID přístroje na</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Čekání na API</string>
   <!--FoldersFragment-->
+  <string name="folders_fragment_title">Adresáře</string>
   <!--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">Nenalezeny žádné adresáře</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d souborů</string>
   <!--DevicesFragment-->
+  <string name="devices_fragment_title">Přístroje</string>
   <!--Shown if no devices exist-->
+  <string name="devices_list_empty">Nenalezeny žádné přístroje</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-->
@@ -37,27 +48,38 @@
   <string name="announce_server">Ohlašovací Server</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
+  <string name="folder_id">ID adresář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">Master adresář</string>
   <!--Setting title-->
+  <string name="devices">Přístroje</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 adresář</string>
   <!--Title for FolderSettingsFragment in create mode-->
+  <string name="create_folder">Vytvořit adresář</string>
   <!--Title for FolderSettingsFragment in edit mode-->
+  <string name="edit_folder">Upravit adresář</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 adresář?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">ID adresáře nesmí být prázdné</string>
   <!--Toast shown when trying to create a folder with an empty path-->
+  <string name="folder_path_required">Cesta k adresáři nesmí být prázdná</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
+  <string name="no_devices">Nejdříve prosím připojte přístroj.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
+  <string name="device_id">ID přístroje</string>
   <!--Setting title-->
   <string name="name">Jméno</string>
   <!--Setting title-->
@@ -66,17 +88,26 @@
   <string name="current_address">Aktuální adresa</string>
   <!--Setting title-->
   <string name="compression">Komprese</string>
+  <!--Setting title-->
   <!--ActionBar item-->
+  <string name="delete_device">Smazat přístroj</string>
   <!--Title for DeviceSettingsFragment in create mode-->
+  <string name="add_device">Přidat přístroj</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 přístroj</string>
   <!--Dialog shown when attempting to delete a device-->
+  <string name="delete_device_confirm">Opravdu chcete smazat tento přístroj?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
+  <string name="device_id_required">ID přístroje 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 přístroje 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 přístroje ručně.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webové grafické rozhraní</string>
@@ -110,12 +141,14 @@ Hlašte prosím jakékoliv problémy na které narazíte přes Github.</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing verze</string>
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <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 on the file system-->
+  <string name="create_fs_folder">Vytvořit nový adresář</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Vybrat adresář</string>
   <!--SyncthingService-->
@@ -140,6 +173,7 @@ 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 přístroje 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>
@@ -156,4 +190,5 @@ Pokud se toto bude opakovat, zkuste restartovat svůj přístroj.</string>
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 933990c0..31be654a 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -4,20 +4,31 @@
   <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">Geräte ID teilen</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
+  <string name="send_device_id_to">Geräte ID senden an</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Warte auf Schnittstelle</string>
   <!--FoldersFragment-->
+  <string name="folders_fragment_title">Verzeichnisse</string>
   <!--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">Geräte</string>
   <!--Shown if no devices exist-->
+  <string name="devices_list_empty">Keine Geräte 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-->
@@ -37,27 +48,38 @@
   <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">Geräte</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 auswählen</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 devices have been added-->
+  <string name="no_devices">Bitte verbinden Sie zuerst ein Gerät.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
+  <string name="device_id">Geräte ID</string>
   <!--Setting title-->
   <string name="name">Name</string>
   <!--Setting title-->
@@ -66,17 +88,27 @@
   <string name="current_address">Aktuelle Adresse</string>
   <!--Setting title-->
   <string name="compression">Datenkomprimierung</string>
+  <!--Setting title-->
+  <string name="introducer">Verteilergerät</string>
   <!--ActionBar item-->
+  <string name="delete_device">Gerät löschen</string>
   <!--Title for DeviceSettingsFragment in create mode-->
+  <string name="add_device">Gerät 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">Gerät bearbeiten</string>
   <!--Dialog shown when attempting to delete a device-->
+  <string name="delete_device_confirm">Soll dieses Verzeichnis wirklich gelöscht werden?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
+  <string name="device_id_required">Die Geräte ID darf nicht leer sein</string>
   <!--Toast shown when trying to create a device with an empty name-->
+  <string name="device_name_required">Der Gerätename darf nicht leer sein</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR Code scannen</string>
   <!--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 Geräte ID manuell ein.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web Oberfläche</string>
@@ -108,12 +140,15 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing Version</string>
+  <!--Title of the preference showing this app's version name-->
+  <string name="app_version_title">Syncthing Android Version</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">Ordnerauswahl</string>
   <!--ListView empty text-->
   <string name="directory_empty">Ordner ist leer</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Erstelle neuen Ordner</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Ordner auswählen</string>
   <!--SyncthingService-->
@@ -137,6 +172,7 @@
   <!--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">Geräte 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>
@@ -153,4 +189,9 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
+  <string name="state_idle">Untätig</string>
+  <string name="state_scanning">Sucht</string>
+  <string name="state_cleaning">Aufräumen</string>
+  <string name="state_syncing">Synchronisiere</string>
 </resources>
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 477319c2..84afeab1 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -45,6 +45,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -70,6 +71,7 @@
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
@@ -89,4 +91,5 @@
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 477319c2..84afeab1 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -45,6 +45,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -70,6 +71,7 @@
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
@@ -89,4 +91,5 @@
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index c67ac166..63de9add 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -9,14 +9,18 @@
   <string name="api_loading">En attente de l\'API</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-->
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d fichiers</string>
   <!--DevicesFragment-->
   <!--Shown if no devices exist-->
   <!--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-->
@@ -63,6 +67,7 @@
   <!--Setting title-->
   <string name="current_address">Adresses actuelles</string>
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -98,12 +103,14 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Version de Syncthing</string>
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <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 on the file system-->
+  <string name="create_fs_folder">Créer un nouveau dossier</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Sélectionner ce dossier</string>
   <!--SyncthingService-->
@@ -139,4 +146,5 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index c8750aae..890702c2 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -9,14 +9,18 @@
   <string name="api_loading">Caricamento API</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-->
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d File</string>
   <!--DevicesFragment-->
   <!--Shown if no devices exist-->
   <!--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-->
@@ -64,6 +68,7 @@
   <string name="current_address">Indirizzo Attuale</string>
   <!--Setting title-->
   <string name="compression">Compressione</string>
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -100,12 +105,14 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Versione Syncthing</string>
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">Selezione Cartella</string>
   <!--ListView empty text-->
   <string name="directory_empty">Cartella Vuota</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Crea Nuova Cartella</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Seleziona Cartella</string>
   <!--SyncthingService-->
@@ -144,4 +151,5 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 5243a368..6f10a0f5 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -9,14 +9,18 @@
   <string name="api_loading">Wachten op API</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-->
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d bestanden</string>
   <!--DevicesFragment-->
   <!--Shown if no devices exist-->
   <!--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-->
@@ -63,6 +67,7 @@
   <!--Setting title-->
   <string name="current_address">Huidig adres</string>
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -98,12 +103,14 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Synthing-versie</string>
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">Mapkiezer</string>
   <!--ListView empty text-->
   <string name="directory_empty">Map is leeg</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Nieuwe map creëren</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Map selecteren</string>
   <!--SyncthingService-->
@@ -139,4 +146,5 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index a08c8b5b..f5810360 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -9,14 +9,18 @@
   <string name="api_loading">Oczekiwanie na API API</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-->
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d plików</string>
   <!--DevicesFragment-->
   <!--Shown if no devices exist-->
   <!--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-->
@@ -63,6 +67,7 @@
   <!--Setting title-->
   <string name="current_address">Current Address</string>
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -98,12 +103,14 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing Version</string>
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">Folder Picker</string>
   <!--ListView empty text-->
   <string name="directory_empty">Directory is Empty</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Create new Folder</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Select Folder</string>
   <!--SyncthingService-->
@@ -139,4 +146,5 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 477319c2..84afeab1 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -45,6 +45,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -70,6 +71,7 @@
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
@@ -89,4 +91,5 @@
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 477319c2..84afeab1 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -45,6 +45,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -70,6 +71,7 @@
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
@@ -89,4 +91,5 @@
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
new file mode 100644
index 00000000..84afeab1
--- /dev/null
+++ b/src/main/res/values-sk/strings.xml
@@ -0,0 +1,95 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--LocalDeviceInfoFragment-->
+  <!--ActionBar title shown when the drawer is open-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to delete a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--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-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--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-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--SyncthingService-->
+  <!--Title of the dialog shown when the syncthing binary returns an error-->
+  <!--Message of the dialog shown when the syncthing binary returns an error-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--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 device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 477319c2..84afeab1 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -45,6 +45,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
   <!--Menu item to confirm adding a device-->
@@ -70,6 +71,7 @@
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <!--ListView empty text-->
@@ -89,4 +91,5 @@
   <!--Shown when a device ID is copied to the clipboard-->
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
 </resources>
diff --git a/src/main/res/values-zh_TW/strings.xml b/src/main/res/values-zh_TW/strings.xml
index 24adafb5..e5e8c729 100644
--- a/src/main/res/values-zh_TW/strings.xml
+++ b/src/main/res/values-zh_TW/strings.xml
@@ -4,20 +4,31 @@
   <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 FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">正在等待 API</string>
   <!--FoldersFragment-->
+  <string name="folders_fragment_title">資料夾</string>
   <!--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-->
@@ -37,27 +48,38 @@
   <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 devices have been added-->
+  <string name="no_devices">請先連接至一個裝置。</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
+  <string name="device_id">裝置識別碼</string>
   <!--Setting title-->
   <string name="name">名稱</string>
   <!--Setting title-->
@@ -66,17 +88,27 @@
   <string name="current_address">目前位址</string>
   <!--Setting title-->
   <string name="compression">壓縮</string>
+  <!--Setting title-->
+  <string name="introducer">引入者</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>
@@ -96,7 +128,9 @@
   <!--Preference title-->
   <string name="always_run_in_background">永遠在背景執行</string>
   <!--Preference summary in case it is enabled-->
+  <string name="always_run_in_background_enabled">根據下列的偏好設定，Syncthing 會永遠在背景執行。</string>
   <!--Preference summary in case it is disabled-->
+  <string name="always_run_in_background_disabled">Syncthing 只會在明確地被要求時才會啟動，且可透過選單的按鈕停止。</string>
   <string name="sync_only_charging">只在充電時同步</string>
   <string name="sync_only_wifi">只透過 Wi-Fi 網路同步</string>
   <!--Title for the preference to set STTRACE parameters-->
@@ -108,12 +142,15 @@
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing 版本</string>
+  <!--Title of the preference showing this app's version name-->
+  <string name="app_version_title">Syncthing-Android 版本</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">資料夾選擇器</string>
   <!--ListView empty text-->
   <string name="directory_empty">資料夾為空</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">建立新資料夾</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">選擇資料夾</string>
   <!--SyncthingService-->
@@ -138,6 +175,7 @@
   <!--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>
@@ -154,4 +192,9 @@
     <item>Gb/s</item>
     <item>Tb/s</item>
   </string-array>
+  <!--Possible folder states-->
+  <string name="state_idle">閒置</string>
+  <string name="state_scanning">正在掃描</string>
+  <string name="state_cleaning">正在清理</string>
+  <string name="state_syncing">正在同步</string>
 </resources>