From 7a1ec346f126fd405bdc83b9e28a3b91d806bf2b Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sun, 17 Jan 2016 23:00:02 +0100
Subject: [PATCH] Improved delete folder/device strings (fixes #536).

---
 .../fragments/DeviceFragment.java             |   6 +-
 .../fragments/FolderFragment.java             |   6 +-
 src/main/res/menu/device_settings.xml         |   2 +-
 src/main/res/menu/folder_settings.xml         |   2 +-
 src/main/res/values-ar/strings.xml            |   6 +-
 src/main/res/values-bg/strings.xml            |  16 +-
 src/main/res/values-cs/strings.xml            |  15 +-
 src/main/res/values-da-rDK/strings.xml        |   6 +-
 src/main/res/values-da/strings.xml            |   6 +-
 src/main/res/values-de-rDE/strings.xml        | 116 ++++++++++++
 src/main/res/values-de/strings.xml            |  17 +-
 src/main/res/values-el/strings.xml            |   6 +-
 src/main/res/values-es-rEC/strings.xml        |   6 +-
 src/main/res/values-es-rMX/strings.xml        |   6 +-
 src/main/res/values-es/strings.xml            |  21 ++-
 src/main/res/values-fi/strings.xml            |   6 +-
 src/main/res/values-fr-rFR/strings.xml        |   6 +-
 src/main/res/values-fr/strings.xml            |  15 +-
 src/main/res/values-hu/strings.xml            |  36 +++-
 src/main/res/values-in/strings.xml            |   6 +-
 src/main/res/values-it/strings.xml            |  25 ++-
 src/main/res/values-ja/strings.xml            |  15 +-
 src/main/res/values-ko/strings.xml            |   9 +-
 src/main/res/values-nb/strings.xml            |  14 +-
 src/main/res/values-nl/strings.xml            |  27 +--
 src/main/res/values-nn/strings.xml            |   6 +-
 src/main/res/values-pl-rPL/strings.xml        |   6 +-
 src/main/res/values-pl/strings.xml            |  10 +-
 src/main/res/values-pt-rBR/strings.xml        |  17 +-
 src/main/res/values-pt/strings.xml            |  10 +-
 src/main/res/values-ru/strings.xml            |   9 +-
 src/main/res/values-sk/strings.xml            |   9 +-
 src/main/res/values-sl/strings.xml            |   6 +-
 src/main/res/values-sr/strings.xml            |   6 +-
 src/main/res/values-sv-rSE/strings.xml        | 116 ++++++++++++
 src/main/res/values-sv/strings.xml            |   6 +-
 src/main/res/values-tr/strings.xml            |  88 ++++++---
 src/main/res/values-vi/strings.xml            | 178 +++++++++++++++++-
 src/main/res/values-zh-rCN/strings.xml        |  17 +-
 src/main/res/values-zh-rTW/strings.xml        |  10 +-
 src/main/res/values/strings.xml               |   8 +-
 41 files changed, 698 insertions(+), 200 deletions(-)
 create mode 100644 src/main/res/values-de-rDE/strings.xml
 create mode 100644 src/main/res/values-sv-rSE/strings.xml

diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java
index 17b03f96..0d3b3884 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/DeviceFragment.java
@@ -305,7 +305,7 @@ public class DeviceFragment extends Fragment implements
     public void onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.create).setVisible(mIsCreateMode);
         menu.findItem(R.id.share_device_id).setVisible(!mIsCreateMode);
-        menu.findItem(R.id.delete).setVisible(!mIsCreateMode);
+        menu.findItem(R.id.remove).setVisible(!mIsCreateMode);
     }
 
     @Override
@@ -328,9 +328,9 @@ public class DeviceFragment extends Fragment implements
             case R.id.share_device_id:
                 RestApi.shareDeviceId(getActivity(), mDevice.deviceID);
                 return true;
-            case R.id.delete:
+            case R.id.remove:
                 new AlertDialog.Builder(getActivity())
-                        .setMessage(R.string.delete_device_confirm)
+                        .setMessage(R.string.remove_device_confirm)
                         .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
index d926962c..e65df499 100644
--- a/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
+++ b/src/main/java/com/nutomic/syncthingandroid/fragments/FolderFragment.java
@@ -292,7 +292,7 @@ public class FolderFragment extends Fragment
     @Override
     public void onPrepareOptionsMenu(Menu menu) {
         menu.findItem(R.id.create).setVisible(mIsCreateMode);
-        menu.findItem(R.id.delete).setVisible(!mIsCreateMode);
+        menu.findItem(R.id.remove).setVisible(!mIsCreateMode);
     }
 
     @Override
@@ -312,9 +312,9 @@ public class FolderFragment extends Fragment
                 mSyncthingService.getApi().editFolder(mFolder, true, getActivity());
                 getActivity().finish();
                 return true;
-            case R.id.delete:
+            case R.id.remove:
                 new AlertDialog.Builder(getActivity())
-                        .setMessage(R.string.delete_folder_confirm)
+                        .setMessage(R.string.remove_folder_confirm)
                         .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
                             @Override
                             public void onClick(DialogInterface dialogInterface, int i) {
diff --git a/src/main/res/menu/device_settings.xml b/src/main/res/menu/device_settings.xml
index 94f56111..2d398ded 100644
--- a/src/main/res/menu/device_settings.xml
+++ b/src/main/res/menu/device_settings.xml
@@ -16,7 +16,7 @@
         app:showAsAction="ifRoom" />
 
     <item
-        android:id="@+id/delete"
+        android:id="@+id/remove"
         android:icon="@drawable/ic_delete_white_24dp_active"
         android:title="@string/delete_device"
         app:showAsAction="ifRoom" />
diff --git a/src/main/res/menu/folder_settings.xml b/src/main/res/menu/folder_settings.xml
index e5ebaf90..25e48c11 100644
--- a/src/main/res/menu/folder_settings.xml
+++ b/src/main/res/menu/folder_settings.xml
@@ -10,7 +10,7 @@
         app:showAsAction="always" />
 
     <item
-        android:id="@+id/delete"
+        android:id="@+id/remove"
         android:icon="@drawable/ic_delete_white_24dp_active"
         android:title="@string/delete_folder"
         app:showAsAction="ifRoom" />
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 31b90a0b..13bdb8e5 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -73,10 +73,9 @@
   <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 invalid ID-->
-  <string name="folder_id_required">Идентификаторът на папка трябва да бъде къс (64 символа или по-малко) състоящ се само от букви, цифри, точка (.), тире (-) и подчерта (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--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>
   <!--Dialog shown before config export-->
@@ -109,8 +108,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--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-->
@@ -129,7 +127,7 @@
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Добре дошли в Syncthing за Android</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing приложение с отворен код, за синхронизиране на файлове.\n\n\
+  <string name="welcome_text">Syncthing еприложение с отворен код, за синхронизиране на файлове.\n\n\
 За да споделите информация с друго устройство е необходимо да добавите уникалния идентификатор, на даденото устройство, към списъка с устройства. Тогава можете да определите кои папки с кои устройства да се споделят.\n\n
 Ако срещнете проблеми моля докладвайте за тях чрез Github.</string>
   <!--SettingsFragment-->
@@ -144,6 +142,10 @@
   <string name="always_run_in_background_disabled">Синхронизиране само след стартиране на Syncthing. Може бъде спряно от меню бутона \"Изход\".</string>
   <string name="sync_only_charging">Само по време на зареждане</string>
   <string name="sync_only_wifi">Само чрез WiFi</string>
+  <string name="sync_only_wifi_ssids">Ограничаване до определени WiFi мрежи</string>
+  <string name="sync_only_wifi_ssids_all">Синхронизиране чрез всяка WiFi мрежа</string>
+  <string name="sync_only_wifi_ssids_values">Синхронизиране само чрез: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">За да изберете мрежа, моля включете WiFi</string>
   <string name="advanced_folder_picker">Избор на папка, за напреднали</string>
   <string name="advanced_folder_picker_summary">Изберете папка, от устройството, за синхронизиране</string>
   <string name="use_root_title">Синхронизиране като Root</string>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 2eadbeab..202c158c 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -54,6 +54,7 @@
   <string name="announce_server">Globální oznamování</string>
   <!--Menu item to donate-->
   <string name="donate">Přispět</string>
+  <string name="restart">Restart</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID adresáře</string>
@@ -73,10 +74,9 @@
   <string name="edit_folder">Upravit adresář</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Přidat</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 invalid ID-->
-  <string name="folder_id_required">ID adresáře musí být krátký identifikátor (64 znaků nebo méně) obsahující pouze písmena, čísla, tečky (.), pomlčky (-) a podtržítka (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--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>
   <!--Dialog shown before config export-->
@@ -110,8 +110,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--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-->
@@ -145,6 +144,10 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="always_run_in_background_disabled">Syncthing poběží pouze pokud bude ručně spuštěn a může být ukončen tlačítkem z menu.</string>
   <string name="sync_only_charging">Synchronizovat pouze při nabíjení</string>
   <string name="sync_only_wifi">Synchronizovat pouze přes wifi</string>
+  <string name="sync_only_wifi_ssids">Omezit na vybrané sítě wifi</string>
+  <string name="sync_only_wifi_ssids_all">Synchronizovat na všech wifi sítích</string>
+  <string name="sync_only_wifi_ssids_values">Synchronizovat pouze při připojení k: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Pro výběr sítí prosím zapněte WiFi.</string>
   <string name="advanced_folder_picker">Použít rozšířený výběr adresáře</string>
   <string name="advanced_folder_picker_summary">Vyberte jakýkoliv adresář v přístroji pro synchronizaci</string>
   <string name="use_root_title">Synchronizovat jako root</string>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-de-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
new file mode 100644
index 00000000..b53d926d
--- /dev/null
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--DrawerFragment-->
+  <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--Menu item to donate-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to remove 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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Strings representing compression options-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to remove a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--Toast show if we could not get root permissions-->
+  <!--WebGuiActivity-->
+  <!--Title of the web gui activity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
+  <!--SettingsFragment-->
+  <!--Activity title-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--Toast shown after config was successfully exported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--Toast after entering invalid STTRACE params-->
+  <!--Toast after entering invalid username-->
+  <!--Toast after entering invalid password-->
+  <!--Title for the preference to reset Syncthing indexes-->
+  <!--Syncthing was reset-->
+  <!--Syncthing was reset-->
+  <!--Settings item that opens the log activity-->
+  <!--Summary for the log activity-->
+  <!--Settings item that opens issue tracker-->
+  <!--Summary for the issue tracker settings item-->
+  <!--URL of the issue tracker-->
+  <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--Toast shown on devices with kitkat or higher-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--LogActivity-->
+  <!--Title of the "log" activity-->
+  <!--Title of the "log android" menu button-->
+  <!--Title of the "log Syncthing" menu button-->
+  <!--Title of the "share log" menu button-->
+  <!--SyncthingService-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--Title of the notification shown while syncthing is running and enabled-->
+  <!--Toast shown if folder observer fails to traverse a folder-->
+  <!--Toast shown if syncthing failed to create a config-->
+  <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text for positive button in restart dialog-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Shown when a device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 69183c32..99c714a0 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -53,7 +53,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Indexserver</string>
   <!--Menu item to donate-->
-  <string name="donate">Jetzt Spenden!</string>
+  <string name="donate">Spenden</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Verzeichnis-ID</string>
@@ -73,13 +73,13 @@
   <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 invalid ID-->
-  <string name="folder_id_required">Die Verzeichnis-ID muss eine kurze Kennung (64 Zeichen oder weniger) sein. Sie kann nur aus Buchstaben, Zahlen und dem Punkt- (.), Bindestrich- (-), und Unterstrich- (_) Zeichen bestehen.</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--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 Ordnerpfad darf nicht leer sein</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Soll die Konfiguration wirklich exportiert werden? Vorhandene Dateien werden überschrieben.\n\nACHTUNG! Andere Anwendungen können möglicherweise den privaten Schlüssel im Backupordner lesen und dazu verwenden, um synchronisierte Dateien herunterzuladen und zu verändern.</string>
   <!--Dialog shown before config import-->
   <string name="dialog_confirm_import">Soll wirlkich eine neue Konfiguration importiert werden? Vorhandene Dateien werden überschrieben.</string>
   <!--DeviceSettingsFragment-->
@@ -109,8 +109,7 @@
   <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 Gerät wirklich gelöscht werden?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--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-->
@@ -144,6 +143,10 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="always_run_in_background_disabled">Syncthing läuft nur wenn es explizit gestartet wird und kann über das Menü gestoppt werden. </string>
   <string name="sync_only_charging">Sync nur mit Ladegerät</string>
   <string name="sync_only_wifi">Sync nur im WLAN</string>
+  <string name="sync_only_wifi_ssids">Nur in bestimmten WLAN Netzwerken</string>
+  <string name="sync_only_wifi_ssids_all">Synchronisiere in allen WLAN Netzwerken</string>
+  <string name="sync_only_wifi_ssids_values">Synchronisiere nur in folgendem WLAN: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Bitte WLAN aktivieren, um eines zu wählen.</string>
   <string name="advanced_folder_picker">Erweiterte Verzeichnisauswahl benutzen</string>
   <string name="advanced_folder_picker_summary">Alle Verzeichnisse auf dem Gerät für Synchronisation auswählbar</string>
   <string name="use_root_title">Syncronisiere mit Root-Rechten</string>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 7851d496..b61584b3 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -52,8 +52,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -69,7 +69,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index abc2f7f4..db9ec7ce 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -15,6 +15,9 @@
   <string name="usage_reporting_dialog_description">El informe cifrado de uso se manda a diario. Se utilitza para monitorizar las plataformas más comunes, el tamaño de las carpetas y las versiones de la aplicación. Si el conjunto de datos del informe es modificado serás notificado de nuevo con este mensaje.\n\nLas estadísticas globales están disponibles públicamente en https://data.syncthing.net.</string>
   <string name="yes">Sí</string>
   <string name="no">No</string>
+  <string name="off">apagar</string>
+  <string name="open_website">Sitio abierto</string>
+  <string name="toast_write_storage_permission_required">Hace falta permiso de escritura a disco para esta app.</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Carpetas</string>
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
@@ -70,13 +73,13 @@
   <string name="edit_folder">Editar Carpeta</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Crear</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">¿De verdad quieres eliminar esta carpeta?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">El ID de carpeta tiene que ser un identificador corto (64 caracteres o menos) formado por letras, números y los caracteres como el punto (.), el guión (-) y el subrayado(_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">El ID de carpeta no debe estar vacío</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta a la carpeta no puede estar vacia</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Realmente quieres exportar tu configuración? Los ficheros existentes seran sobrescritos.\n\nAVISO! Otras aplicaciones puede pueden leer la llave privada del sitio de backup y usarla para descargar/modificar ficheros sincronizados.</string>
   <!--Dialog shown before config import-->
   <string name="dialog_confirm_import">¿Realmente desea importar una nueva configuración? Se sobrescribirán los archivos existentes.</string>
   <!--DeviceSettingsFragment-->
@@ -106,8 +109,7 @@
   <string name="add">Añadir</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">¿Realmente desea eliminar este dispositivo?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">El ID de dispositivo no debe estar vacío</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -115,6 +117,7 @@
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Escanear código QR</string>
   <!--Toast show if we could not get root permissions-->
+  <string name="toast_root_denied">No obtuvimos permisos de root</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz gráfica web</string>
@@ -140,10 +143,16 @@ Por favor informe de qualquier problema que encuentres via Github.</string>
   <string name="always_run_in_background_disabled">Syncthing sólo se ejecutará cuando se inicie explícitamente, puede ser detenido a través del botón del menú.</string>
   <string name="sync_only_charging">Sincronizar solo cuando esté cargando</string>
   <string name="sync_only_wifi">Sincronizar sólo en wifi</string>
+  <string name="sync_only_wifi_ssids">Restringir a algunas redes wifi</string>
+  <string name="sync_only_wifi_ssids_all">Sincronizar en todas las redes wifi</string>
+  <string name="sync_only_wifi_ssids_values">Sincronizar solo cuando se está conectado a: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el WIFI en las redes seleccionadas.</string>
   <string name="advanced_folder_picker">Usar Selección Avanzada de carpeta</string>
   <string name="advanced_folder_picker_summary">Escoja una carpeta del dispositivo para sincronizar</string>
   <string name="use_root_title">Sincronizar como Root</string>
   <string name="use_root_summary">Ejecutar Syncthing como Superusuario</string>
+  <string name="root_dialog_title">Estás seguro que quieres activar root?</string>
+  <string name="root_dialog_message">Esto puede causar algunos problemas con Syncthing y tu dispositivo. Usalo bajo tu responsabilidad.</string>
   <string name="notification_type_title">Notificación</string>
   <string name="notification_type_summary">Elige el tipo de notificación</string>
   <string-array name="notification_type_entries">
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-fr-rFR/strings.xml b/src/main/res/values-fr-rFR/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-fr-rFR/strings.xml
+++ b/src/main/res/values-fr-rFR/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 6ba44d2a..4c1417d0 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -54,6 +54,7 @@
   <string name="announce_server">Serveur d\'annonce</string>
   <!--Menu item to donate-->
   <string name="donate">Faire un don</string>
+  <string name="restart">Redémarrer</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID du dossier</string>
@@ -73,10 +74,9 @@
   <string name="edit_folder">Edition du dossier</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 dossier ?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">L\'ID du dossier doit être un identifiant court (64 caractères ou moins) pouvant contenir les valeurs suivantes: lettres, chiffres, point (.), tiret milieu (-), et tiret-bas (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">L\'ID du dossier 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 du dossier ne doit pas être vide</string>
   <!--Dialog shown before config export-->
@@ -110,8 +110,7 @@
   <string name="add">Ajouter</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Edition de la machine</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Voulez-vous vraiment supprimer cette machine ?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">L\'ID machine ne peut pas être vide</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -145,6 +144,10 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="always_run_in_background_disabled">Syncthing ne fonctionne que si vous le lancez manuellement, et s\'arrête par le bouton quitter.</string>
   <string name="sync_only_charging">Synchro uniquement sur chargeur</string>
   <string name="sync_only_wifi">Synchro uniquement en WiFi</string>
+  <string name="sync_only_wifi_ssids">Limiter à certains réseaux WiFi</string>
+  <string name="sync_only_wifi_ssids_all">Synchroniser sur tous réseaux WiFi</string>
+  <string name="sync_only_wifi_ssids_values">Synchroniser seulement si connecté à: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">S\'il vous plait, activer le WiFi pour sélectionner un réseau</string>
   <string name="advanced_folder_picker">Choix étendu des dossiers</string>
   <string name="advanced_folder_picker_summary">Autorise la sélection n\'importe quel dossier de cette machine pour la synchronisation</string>
   <string name="use_root_title">Sync en root</string>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 9f58a99a..a858b3f0 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -11,12 +11,16 @@
   <string name="send_device_id_to">Eszköz azonosító megosztása</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Betöltés...</string>
+  <string name="usage_reporting_dialog_title">Engedélyezed a névtelen felhasználási adatok küldését?</string>
   <string name="yes">Igen</string>
   <string name="no">Nem</string>
   <string name="off">kikapcsolva</string>
+  <string name="open_website">Weblap megnyitása</string>
+  <string name="toast_write_storage_permission_required">Ehhez az alkalmazáshoz írási jogra van szükség.</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mappák</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">Nem található mappa</string>
   <!--Format string for folder file count-->
@@ -25,6 +29,7 @@
   <!--Shown if no devices exist-->
   <string name="devices_list_empty">Nem található eszköz</string>
   <!--Indicates that a folder is fully synced to the local device-->
+  <string name="device_up_to_date">Friss</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
   <string name="device_syncing">Szinkronizálás (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
@@ -36,7 +41,9 @@
   <!--DrawerFragment-->
   <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
   <!--Same as download_title with a colon and space appended-->
+  <string name="download_title_colon">Letöltve:\u0020</string>
   <!--Same as upload_title with a colon and space appended-->
+  <string name="upload_title_colon">Feltöltve:\u0020</string>
   <!--Title for current CPU usage-->
   <string name="cpu_usage">CPU használat</string>
   <!--Title for current RAM usage-->
@@ -63,9 +70,11 @@
   <string name="edit_folder">Mappa szerkesztése</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Létrehozás</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">A mappaazonosító nem lehet üres</string>
   <!--Toast shown when trying to create a folder with an empty path-->
+  <string name="folder_path_required">A mappaútvonal nem lehet üres</string>
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
   <!--DeviceSettingsFragment-->
@@ -90,9 +99,11 @@
   <string name="add">Hozzáadás</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Eszköz szerkesztése</string>
-  <!--Dialog shown when attempting to delete a device-->
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
+  <string name="device_id_required">Az eszközazonosító nem lehet üres</string>
   <!--Toast shown when trying to create a device with an empty name-->
+  <string name="device_name_required">Az eszköznév nem lehet üres</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR kód olvasása</string>
   <!--Toast show if we could not get root permissions-->
@@ -103,6 +114,7 @@
   <string name="web_gui_loading">Várakozás a felületre</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Üdvözöl az androidos Syncthing.</string>
   <!--Text for dialog displayed on first start-->
   <!--SettingsFragment-->
   <!--Activity title-->
@@ -114,6 +126,9 @@
   <!--Preference summary in case it is disabled-->
   <string name="sync_only_charging">Csak töltés közbeni szinkronizálás</string>
   <string name="sync_only_wifi">Szinkronizálás csak WiFi-n keresztül</string>
+  <string name="sync_only_wifi_ssids">Korlátozás bizonyos wifi hálózatokra</string>
+  <string name="sync_only_wifi_ssids_all">Szinkronizálás minden wifi hálózaton</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hálózat választásához kapcsold be a wifit.</string>
   <string name="use_root_title">Szinkronizálás Root-ként</string>
   <string name="use_root_summary">Syncthing futtatása Superuser-ként</string>
   <string name="notification_type_title">Értesítés</string>
@@ -126,7 +141,9 @@
   <string name="upnp_enabled">UPnP engedélyezése</string>
   <string name="global_announce_server">Globális felfedező szerver</string>
   <string name="syncthing_gui">Syncthing GUI</string>
+  <string name="export_config">Beállítások mentése</string>
   <!--Toast shown after config was successfully exported-->
+  <string name="import_config">Beállítások betöltése</string>
   <!--Toast shown after config was successfully imported-->
   <!--Toast shown after config was successfully imported-->
   <!--Title for the preference to set STTRACE parameters-->
@@ -136,9 +153,12 @@
   <!--Title for the preference to reset Syncthing indexes-->
   <!--Syncthing was reset-->
   <!--Syncthing was reset-->
+  <string name="category_about">Névjegy</string>
   <!--Settings item that opens the log activity-->
+  <string name="open_log">Napló megnyitása</string>
   <!--Summary for the log activity-->
   <!--Settings item that opens issue tracker-->
+  <string name="report_issue_title">Hibabejelentés</string>
   <!--Summary for the issue tracker settings item-->
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
@@ -147,24 +167,33 @@
   <string name="app_version_title">Syncthing-Android verzió</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
+  <string name="folder_picker_title">Mappaválasztó</string>
   <!--Toast shown on devices with kitkat or higher-->
   <!--ListView empty text-->
+  <string name="directory_empty">A mappa üres</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Új mappa</string>
   <!--Menu item to select the current folder-->
   <!--LogActivity-->
   <!--Title of the "log" activity-->
   <string name="log_title">Napló</string>
   <!--Title of the "log android" menu button-->
+  <string name="log_android_title">Android napló megtekintése</string>
   <!--Title of the "log Syncthing" menu button-->
+  <string name="log_syncthing_title">Syncthing napló megtekintése</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Megosztás</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_title">A Syncthing tiltva van</string>
   <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">Meg akarod változtatni a beállításokat?</string>
   <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">Beállítások megváltoztatása</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <string name="exit">Kilépés</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
+  <string name="syncthing_active">A Syncthing fut</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
   <!--Toast shown if syncthing failed to create a config-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -177,6 +206,7 @@
   <string name="restart_later">Később</string>
   <!--Text of the notification shown when a restart is needed-->
   <!--Shown when a device ID is copied to the clipboard-->
+  <string name="device_id_copied_to_clipboard">Az eszközazonosító a vágólapra másolva</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 5bc66cba..ed9f8a49 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -64,8 +64,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -81,7 +81,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index e2f6e0ef..aaf29bd7 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -12,7 +12,7 @@
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Caricamento...</string>
   <string name="usage_reporting_dialog_title">Abilitare Statistiche Anonime di Utilizzo?</string>
-  <string name="usage_reporting_dialog_description">Quotidianamente il software invia le statistiche di utilizzo in forma criptata. Questi dati riguardano i sistemi operativi utilizzati, le dimensioni delle cartelle e le versioni del software. Se i dati riportati sono cambiati, verrà mostrata di nuovo questa finestra di dialogo.\n\nI dati statistici in forma aggregata sono disponibili pubblicamente su https://data.syncthing.net.</string>
+  <string name="usage_reporting_dialog_description">Quotidianamente il software invia le statistiche di utilizzo in forma criptata. Questi dati riguardano i sistemi operativi utilizzati, le dimensioni delle cartelle e le versioni del software. Se i dati riportati sono cambiati, verrà mostrata di nuovo questa finestra di dialogo.\n\nDati statistici in forma aggregata sono disponibili pubblicamente su https://data.syncthing.net.</string>
   <string name="yes">Sì</string>
   <string name="no">No</string>
   <string name="off">off</string>
@@ -23,13 +23,13 @@
   <!--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">Nessuna cartella</string>
+  <string name="folder_list_empty">Nessuna cartella trovata</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d File</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Dispositivi</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Nessun dispositivo</string>
+  <string name="devices_list_empty">Nessun dispositivo trovato</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-->
@@ -54,6 +54,7 @@
   <string name="announce_server">Server Presenza Globale</string>
   <!--Menu item to donate-->
   <string name="donate">Donazione</string>
+  <string name="restart">Riavvia ora</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID Cartella</string>
@@ -73,10 +74,10 @@
   <string name="edit_folder">Modifica Cartella</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 questa cartella?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">L\'ID della cartella dev\'essere un identificatore breve (64 caratteri o meno) costituito solamente da lettere, numeri, punti (.), trattini (-) e trattini bassi (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Vuoi veramente eliminare questa cartella?</string>
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">L\'ID Cartella non può essere vuoto</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Il percorso della cartella non può essere vuoto</string>
   <!--Dialog shown before config export-->
@@ -110,8 +111,8 @@
   <string name="add">Aggiungi</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Modifica Dispositivo</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Vuoi veramente eliminare questo dispositivo?</string>
+  <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Vuoi veramente eliminare questo dispositivo?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">L\'ID Dispositivo non può essere vuoto</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -145,6 +146,10 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="always_run_in_background_disabled">Syncthing si attiva solo quando viene avviato manualmente e si arresta utilizzando il pulsante del menu.</string>
   <string name="sync_only_charging">Sincr. solo in Ricarica</string>
   <string name="sync_only_wifi">Sincr. solo in Wifi</string>
+  <string name="sync_only_wifi_ssids">Solo determinate reti wifi</string>
+  <string name="sync_only_wifi_ssids_all">Sincronizzazione su tutte le reti wifi</string>
+  <string name="sync_only_wifi_ssids_values">Sincronizzazione solo quando connessi a: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Prego accendere wifi per selezionare reti.</string>
   <string name="advanced_folder_picker">Selettore Cartella Avanzato</string>
   <string name="advanced_folder_picker_summary">Selezionare una cartella sul dispositivo per la sincronizzazione</string>
   <string name="use_root_title">Sincr. come Root</string>
@@ -167,7 +172,7 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="global_announce_enabled">Individuazione Globale</string>
   <string name="local_announce_enabled">Individuazione Locale</string>
   <string name="upnp_enabled">Abilita UPnP</string>
-  <string name="global_announce_server">Server Ricerca Globale</string>
+  <string name="global_announce_server">Server Individuazione Globale</string>
   <string name="usage_reporting">Statistiche Anonime Utilizzo</string>
   <string name="syncthing_gui">Interfaccia Grafica di Syncthing</string>
   <string name="gui_address">Indirizzi Interfaccia Grafica</string>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index dc5330d8..09842192 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -54,6 +54,7 @@
   <string name="announce_server">アナウンスサーバー</string>
   <!--Menu item to donate-->
   <string name="donate">寄付</string>
+  <string name="restart">再起動</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">フォルダー ID</string>
@@ -73,10 +74,9 @@
   <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 invalid ID-->
-  <string name="folder_id_required">フォルダーIDは、文字、数字、ドット (.)、ダッシュ (-)、アンダースコア (_) からなる、短い識別子 (64文字以下) でなければなりません。</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">フォルダー ID は空にできません</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">フォルダーのパスは空にできません</string>
   <!--Dialog shown before config export-->
@@ -110,8 +110,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">デバイス ID は空にできません</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -145,6 +144,10 @@
   <string name="always_run_in_background_disabled">明示的に開始したときのみ同期を実行し、メニューボタンで停止することができます。</string>
   <string name="sync_only_charging">充電中のみ同期</string>
   <string name="sync_only_wifi">Wifi 時のみ同期</string>
+  <string name="sync_only_wifi_ssids">特定の WiFi ネットワークに制限する</string>
+  <string name="sync_only_wifi_ssids_all">すべての WiFi ネットワークで共有する</string>
+  <string name="sync_only_wifi_ssids_values">%1$s に接続時のみ同期する</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">ネットワークを選択するために WiFi をオンにしてください。</string>
   <string name="advanced_folder_picker">高度なフォルダー選択を使用する</string>
   <string name="advanced_folder_picker_summary">同期するデバイスのフォルダーを選択してください</string>
   <string name="use_root_title">Root として同期</string>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 525a4df1..c494c6ba 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -66,10 +66,8 @@
   <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 invalid ID-->
-  <string name="folder_id_required">폴더 ID는 문자, 숫자, 마침표(.), 붙임표(-), 밑줄 문자(_)로만 구성되어 있는 짧은 식별자(64자 이하)여야 합니다.</string>
+  <!--Dialog shown when attempting to remove 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-->
   <string name="folder_path_required">폴더 경로를 공백으로 둘 수 없습니다</string>
   <!--Dialog shown before config export-->
@@ -95,8 +93,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--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-->
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 65c76a40..110f0110 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -73,10 +73,9 @@
   <string name="edit_folder">Rediger Mappe</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Opprett</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Ønsker du virkelig å slette denne mappen?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">Mappe-ID må være en kort identifikator (64 tegn eller færre) bestående av kun bokstaver, tall og tegnene punktum (.), bindestrek (-) og understrek (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">Mappe-ID kan ikke være tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikke være tom</string>
   <!--Dialog shown before config export-->
@@ -109,8 +108,7 @@
   <string name="add">Legg til</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Rediger Enhet</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Ønsker du virkelig å slette denne enheten?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">Enhets-ID kan ikke være tom</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -144,6 +142,10 @@ Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <string name="always_run_in_background_disabled">Syncthing kjører bare når eksplisitt startet, og kan stoppes med meny-knappen.</string>
   <string name="sync_only_charging">Synkroniser kun ved lading</string>
   <string name="sync_only_wifi">Synkroniser kun over WiFi.</string>
+  <string name="sync_only_wifi_ssids">Begrens til visse wifi-nettverk</string>
+  <string name="sync_only_wifi_ssids_all">Synkroniser på alle wifi-nettverk</string>
+  <string name="sync_only_wifi_ssids_values">Synkroniser bare når koblet til: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Vennligst skru på WiFi for å velge nettverk.</string>
   <string name="advanced_folder_picker">Bruk avansert mappevelger</string>
   <string name="advanced_folder_picker_summary">Velg en mappe på enheten for synkronisering</string>
   <string name="use_root_title">Synkroniser som Root</string>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 57d1abcd..97a97fc2 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -17,7 +17,7 @@
   <string name="no">Nee</string>
   <string name="off">uit</string>
   <string name="open_website">Website openen</string>
-  <string name="toast_write_storage_permission_required">Vereist schrijftoegang</string>
+  <string name="toast_write_storage_permission_required">Schrijftoegang is vereist voor deze applicatie</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mappen</string>
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
@@ -54,6 +54,7 @@
   <string name="announce_server">Mededelingsserver</string>
   <!--Menu item to donate-->
   <string name="donate">Doneren</string>
+  <string name="restart">Herstarten</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Map-ID</string>
@@ -73,10 +74,9 @@
   <string name="edit_folder">Map 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 je zeker dat je deze map wilt verwijderen?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">De map-ID moet een korte aanduiding (64 of minder tekens) zijn, bestaande uit enkel letters, cijfers, punten (.), streepjes (-) en onderstrepingstekens (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">De map-ID mag niet leeg zijn</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Het mappad mag niet leeg zijn</string>
   <!--Dialog shown before config export-->
@@ -101,7 +101,7 @@
     <item>Altijd</item>
   </string-array>
   <!--Setting title-->
-  <string name="introducer">Introductie</string>
+  <string name="introducer">Introduceerder</string>
   <!--ActionBar item-->
   <string name="delete_device">Apparaat verwijderen</string>
   <!--Title for DeviceSettingsFragment in create mode-->
@@ -110,8 +110,7 @@
   <string name="add">Toevoegen</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Apparaat bewerken</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Weet je zeker dat je dit apparaat wilt verwijderen?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">De apparaat-ID kan niet leeg zijn</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -145,11 +144,15 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="always_run_in_background_disabled">Syncthing draait enkel wanneer expliciet gestart, en kan gestopt worden door de menu-knop.</string>
   <string name="sync_only_charging">Synchroniseer alleen tijdens opladen</string>
   <string name="sync_only_wifi">Synchroniseer alleen via Wi-Fi</string>
+  <string name="sync_only_wifi_ssids">Tot bepaalde Wi-Fi-netwerken beperken</string>
+  <string name="sync_only_wifi_ssids_all">Synchroniseer op alle Wi-Fi-netwerken</string>
+  <string name="sync_only_wifi_ssids_values">Louter synchroniseren terwijl verbonden met: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Wi-Fi aanzetten t.b.v. netwerkselectie.</string>
   <string name="advanced_folder_picker">Gebruik geavanceerd map-kiezer</string>
   <string name="advanced_folder_picker_summary">Selecteer een map op het toestel om te synchroniseren</string>
   <string name="use_root_title">Synchroniseren als root</string>
   <string name="use_root_summary">Syncthing uitvoeren als superuser</string>
-  <string name="root_dialog_title">Zeker om root in te schakelen?</string>
+  <string name="root_dialog_title">Ben je zeker dat je root wil inschakelen?</string>
   <string name="root_dialog_message">Dit kan verschillende Syncthing- of apparaatproblemen veroorzaken. Gebruik op eigen risico.</string>
   <string name="notification_type_title">Melding</string>
   <string name="notification_type_summary">Kies het meldingstype</string>
@@ -166,7 +169,7 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="max_send_kbps">Uitgaande snelheidslimiet (KiB/s)</string>
   <string name="global_announce_enabled">Globale ontdekking</string>
   <string name="local_announce_enabled">Lokale ontdekking</string>
-  <string name="upnp_enabled">UPnP aanzetten</string>
+  <string name="upnp_enabled">UPnP inschakelen</string>
   <string name="global_announce_server">Globale ontdekkingsserver</string>
   <string name="usage_reporting">Anoniem gebruiksrapportage</string>
   <string name="syncthing_gui">Syncthing-GUI</string>
@@ -233,9 +236,9 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="share_title">Delen</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
-  <string name="syncthing_disabled_title">Syncthing is uitgezet</string>
+  <string name="syncthing_disabled_title">Syncthing is uitgeschakeld</string>
   <!--Message of the "syncthing disabled" dialog-->
-  <string name="syncthing_disabled_message">Wil je voorkeuren wijzigen?</string>
+  <string name="syncthing_disabled_message">Wil je je voorkeuren wijzigen?</string>
   <!--Button text on the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_change_settings">Instellingen wijzigen</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-pl-rPL/strings.xml b/src/main/res/values-pl-rPL/strings.xml
index 8bc62b9b..52ee1ca0 100644
--- a/src/main/res/values-pl-rPL/strings.xml
+++ b/src/main/res/values-pl-rPL/strings.xml
@@ -37,8 +37,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -54,7 +54,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 1ca1449b..113a6b14 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -73,10 +73,9 @@
   <string name="edit_folder">Edycja katalogu</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Utwórz</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Usunąć ten katalog?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">Identyfikator katalogu musi być krótki (64 lub mniej znaków), może zawierać tylko litery, cyfry, kropki, myślniki i znak podkreślenia.</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">ID folderu nie może być puste</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka katalogu nie może być pusta</string>
   <!--Dialog shown before config export-->
@@ -109,8 +108,7 @@
   <string name="add">Dodaj</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Edycja urządzenia</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Usunąć to urządzenie?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">Identyfikator urządzenia nie może być pusty</string>
   <!--Toast shown when trying to create a device with an empty name-->
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 74f52111..72d39507 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -15,7 +15,7 @@
   <string name="usage_reporting_dialog_description">O relatório de uso é criptografado e enviado diariamente. É utilizado para rastrear plataformas, tamanhos de arquivos e versões da aplicação. Caso o formato dos dados seja alterado, esta caixa de diálogo te avisará.\n\nAs estatísticas agregadas estão disponíveis publicamente em https://data.syncthing.net.</string>
   <string name="yes">Sim</string>
   <string name="no">Não</string>
-  <string name="off">off</string>
+  <string name="off">nenhuma</string>
   <string name="open_website">Abrir site</string>
   <string name="toast_write_storage_permission_required">A permissão de escrita em armazenamento é obrigatória para este aplicativo</string>
   <!--FoldersFragment-->
@@ -54,6 +54,7 @@
   <string name="announce_server">Servidor de busca global</string>
   <!--Menu item to donate-->
   <string name="donate">Doações</string>
+  <string name="restart">Reiniciar</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID da pasta</string>
@@ -73,10 +74,9 @@
   <string name="edit_folder">Editar pasta</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Criar</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Deseja mesmo apagar esta pasta?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">O ID da pasta deve ser um nome curto (64 caracteres ou menos) e composto apenas de letras, números, ponto (.), hífen (-) ou underscore (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">O ID da pasta não pode ficar vazio</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode ficar vazio</string>
   <!--Dialog shown before config export-->
@@ -110,8 +110,7 @@
   <string name="add">Adicionar</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Deseja mesmo apagar este dispositivo?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">O ID de dispositivo não pode ficar vazio</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -145,6 +144,10 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="always_run_in_background_disabled">O Syncthing sempre rodará quando iniciado manualmente e pode ser parado pelo botão de menu.</string>
   <string name="sync_only_charging">Somente durante o carregamento</string>
   <string name="sync_only_wifi">Somente conectado ao WiFi</string>
+  <string name="sync_only_wifi_ssids">Limitar a certas redes WiFi</string>
+  <string name="sync_only_wifi_ssids_all">Sincronizar em todas as redes WiFi</string>
+  <string name="sync_only_wifi_ssids_values">Sincronizar somente quando conectado a %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ligue o WiFi para selecionar as redes</string>
   <string name="advanced_folder_picker">Usar seletor de pasta avançado</string>
   <string name="advanced_folder_picker_summary">Selecione qualquer pasta do dispositivo para sincronização</string>
   <string name="use_root_title">Sincronizar como Superusuário</string>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index dace8230..6de23be6 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -73,10 +73,9 @@
   <string name="edit_folder">Editar pasta</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Criar</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Quer mesmo eliminar esta pasta?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">O ID da pasta tem que ser um identificador curto (64 caracteres ou menos) consistindo apenas em letras, números e os caracteres ponto (.), hífen (-) e sublinhado (_).</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">O ID da pasta não pode estar vazio</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode estar vazio</string>
   <!--Dialog shown before config export-->
@@ -109,8 +108,7 @@
   <string name="add">Adicionar</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Quer mesmo eliminar este dispositivo?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">O ID do dispositivo não pode estar vazio</string>
   <!--Toast shown when trying to create a device with an empty name-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index e777d55e..33671307 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -73,10 +73,8 @@
   <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 invalid ID-->
-  <string name="folder_id_required">ID папки должен быть коротким идентификатором (64 символов или меньше) состоящий из букв, цифр и символов точки (.), тире(-) и подчеркивания (_).</string>
+  <!--Dialog shown when attempting to remove 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-->
   <string name="folder_path_required">Путь к папке не может быть пустым</string>
   <!--Dialog shown before config export-->
@@ -109,8 +107,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">ID устройства не может быть пустым</string>
   <!--Toast shown when trying to create a device with an empty name-->
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 968bb2f2..9d82fd6d 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -73,10 +73,8 @@
   <string name="edit_folder">Upraviť Adresár</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Vytvoriť</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Naozaj chcete odstrániť adresár?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">ID adresára musí byť krátky reťazec  (max. 64 znakov) zložený z čísel, písmen bez diakritiky, bodky (.), pomlčky (-) alebo podtržítka (_).</string>
+  <!--Dialog shown when attempting to remove 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-->
   <string name="folder_path_required">Cesta k adresáru nemôže byť prázdna</string>
   <!--Dialog shown before config export-->
@@ -109,8 +107,7 @@
   <string name="add">Pridať</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Upraviť Zariadenie</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Naozaj chcete odstrániť zariadenie?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">ID zariadenia nemôže byť prázdne</string>
   <!--Toast shown when trying to create a device with an empty name-->
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-sv-rSE/strings.xml b/src/main/res/values-sv-rSE/strings.xml
new file mode 100644
index 00000000..b53d926d
--- /dev/null
+++ b/src/main/res/values-sv-rSE/strings.xml
@@ -0,0 +1,116 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--DrawerFragment-->
+  <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--Menu item to donate-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to remove 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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Strings representing compression options-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to remove a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--Toast show if we could not get root permissions-->
+  <!--WebGuiActivity-->
+  <!--Title of the web gui activity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
+  <!--SettingsFragment-->
+  <!--Activity title-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--Toast shown after config was successfully exported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--Toast after entering invalid STTRACE params-->
+  <!--Toast after entering invalid username-->
+  <!--Toast after entering invalid password-->
+  <!--Title for the preference to reset Syncthing indexes-->
+  <!--Syncthing was reset-->
+  <!--Syncthing was reset-->
+  <!--Settings item that opens the log activity-->
+  <!--Summary for the log activity-->
+  <!--Settings item that opens issue tracker-->
+  <!--Summary for the issue tracker settings item-->
+  <!--URL of the issue tracker-->
+  <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--Toast shown on devices with kitkat or higher-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--LogActivity-->
+  <!--Title of the "log" activity-->
+  <!--Title of the "log android" menu button-->
+  <!--Title of the "log Syncthing" menu button-->
+  <!--Title of the "share log" menu button-->
+  <!--SyncthingService-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--Title of the notification shown while syncthing is running and enabled-->
+  <!--Toast shown if folder observer fails to traverse a folder-->
+  <!--Toast shown if syncthing failed to create a config-->
+  <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text for positive button in restart dialog-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Shown when a device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index e7f6ff09..b53d926d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -34,8 +34,8 @@
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Dialog shown when attempting to remove 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-->
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
@@ -51,7 +51,7 @@
   <!--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-->
+  <!--Dialog shown when attempting to remove 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-->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index e73542eb..1248ed0c 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
-  <string name="app_description">Açık, güvenilir ve merkezi olmayan bir dosya eşitleme uygulamasıdır.</string>
+  <string name="app_description">Açık, güvenilir ve merkezi olmayan bir dosya eşzamanlama uygulaması.</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Klasör Ekleme</string>
@@ -11,6 +11,13 @@
   <string name="send_device_id_to">İle Cihaz ID Gönder</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Yükleniyor...</string>
+  <string name="usage_reporting_dialog_title">Anonim kullanımın raporlanmasına izin veriyor musun ?</string>
+  <string name="usage_reporting_dialog_description">Şifrelenmiş kullanım raporu günlük olarak yollanır. Bu rapor kullanıcı platformları, klasör büyüklükleri ve uygulama sürüm bilgilerini takip etmek için kullanılır. Raporlanan veri kümesi değişirse, bu pencere aracılığıyla yeniden bilgilendirileceksiniz.\n\nBiriken istatistiklere https://data.syncthing.net adresinden halka açık olarak erişilebilinir.</string>
+  <string name="yes">Evet</string>
+  <string name="no">Hayır</string>
+  <string name="off">kapalı</string>
+  <string name="open_website">Web sitesini aç</string>
+  <string name="toast_write_storage_permission_required">Bu uygulama için belleğe yazma yetkisi gerekmektedir.</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Klasörler</string>
   <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
@@ -26,7 +33,7 @@
   <!--Indicates that a folder is fully synced to the local device-->
   <string name="device_up_to_date">Güncel</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Eşitleniyor (%1$d%%)</string>
+  <string name="device_syncing">Eşzamanlama gerçekleştiriliyor (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
   <string name="device_disconnected">Bağlantı kesik</string>
   <!--Title for current download rate-->
@@ -66,14 +73,15 @@
   <string name="edit_folder">Klasör Düzenleme</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Oluştur</string>
-  <!--Dialog shown when attempting to delete a folder-->
-  <string name="delete_folder_confirm">Bu klasörü gerçekten silmek istiyor musunuz?</string>
-  <!--Toast shown when trying to create a folder with an invalid ID-->
-  <string name="folder_id_required">Klasör ID, (64 karakterden daha az) ve sadece harf, sayı, nokta (.), çizgi (-) ve altçizgi (_) karakterleri içermesi gerekir.</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">Klasör ID\'si boş bırakılamaz</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Klasör yolu boş olmamalı</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Yeni yapılandırmayı gerçekten dışa aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.\n\nDİKKAT! Diğer uygulamalar gizli anahtarı yedekleme yapılan yerden okuyabilir ve eşzamanlaması yapılan dosyaları indirmek/değiştirmek için kullanabilir.</string>
   <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Yeni yapılandırmayı gerçekten içe aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">Cihaz ID</string>
@@ -101,8 +109,7 @@
   <string name="add">Ekle</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Cihaz Düzenleme</string>
-  <!--Dialog shown when attempting to delete a device-->
-  <string name="delete_device_confirm">Bu cihazı gerçekten silmek istiyor musunuz?</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">Cihaz ID boş olmamalı</string>
   <!--Toast shown when trying to create a device with an empty name-->
@@ -110,6 +117,7 @@
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR Kod Tarama</string>
   <!--Toast show if we could not get root permissions-->
+  <string name="toast_root_denied">Kök Kullanıcı/Root yetkileri alınamadı.</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web Arayüzü</string>
@@ -120,8 +128,8 @@
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Android için Syncthing\'e Hoşgeldiniz</string>
   <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing, açık kaynaklı dosya eşitleme uygulamasıdır.\n\n\
-Diğer cihazlar ile veri paylaşmak için cihaz listenize onların benzersiz cihaz ID eklemeniz gerekir. Devamında hangi klasörleri, hangi cihazlar ile paylaşacağınızı  seçebilirsiniz.\n\n
+  <string name="welcome_text">Syncthing, açık kaynaklı bir dosya eşzamanlama uygulamasıdır.\n\n\
+Diğer cihazlar ile veri paylaşmak için, cihaz listenize onların benzersiz cihaz ID\'lerini eklemeniz gerekir. Devamında hangi klasörleri, hangi cihazlar ile paylaşacağınızı  seçebilirsiniz.\n\n
 Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildirin.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
@@ -133,14 +141,29 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <string name="always_run_in_background_enabled">Syncthing, herzaman aşağıdaki tercihlere göre arkaplanda çalışır.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Syncthing, sadece doğrudan başlatıldığında çalışır ve menü tuşu tarafından durdurulur.</string>
-  <string name="sync_only_charging">Sadece şarj ederken eşitle</string>
-  <string name="sync_only_wifi">Sadece wifi bağlıyken eşitle</string>
+  <string name="sync_only_charging">Sadece şarj edilirken eşzamanlama yap</string>
+  <string name="sync_only_wifi">Sadece kablosuz ağ üzerindeyken eşzamanlama yap</string>
+  <string name="sync_only_wifi_ssids">Belirlenmiş kablosuz ağlarla sınırlandır.</string>
+  <string name="sync_only_wifi_ssids_all">Herhangi bir kablosuz ağ üzerindeyken eşzamanlama yap</string>
+  <string name="sync_only_wifi_ssids_values">Sadece %1$s\'e bağlıyken eşzamanlama yap</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ağ seçmek için lütfen kablosuz bağlantınızı açın.</string>
   <string name="advanced_folder_picker">Gelişmiş Klasör Seçici Kullan</string>
-  <string name="advanced_folder_picker_summary">Eşitleme için cihazdan herhangi bir klasör seçin</string>
+  <string name="advanced_folder_picker_summary">Eşzamanlama yapmak için cihazdan herhangi bir klasör seçin</string>
+  <string name="use_root_title">Kök Kullanıcı/Root olarak Eşzamanlama yap</string>
+  <string name="use_root_summary">Syncthing\'i Superuser/Ayrıcalıklı Kullanıcı olarak Çalıştır</string>
+  <string name="root_dialog_title">Kök Kullanıcı/Root özelliğini açmak istediğine emin misin?</string>
+  <string name="root_dialog_message">Syncthing ve cihazınızla ilgili çeşitli sorunlara neden olabilir. Kullanırken risk alıyorsunuz.</string>
+  <string name="notification_type_title">Bildirimler</string>
+  <string name="notification_type_summary">Bildirim türünü seçin</string>
+  <string-array name="notification_type_entries">
+    <item>Normal</item>
+    <item>Düşük Öncelikli</item>
+    <item>Hiçbiri</item>
+  </string-array>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Syncthing Seçenekler</string>
   <string name="device_name">Cihaz Adı</string>
-  <string name="listen_address">Eşitleme Protokolü Dinleme Adresleri</string>
+  <string name="listen_address">Eşzamanlama Protokolü Dinleme/Bağlanma Adresleri</string>
   <string name="max_recv_kbps">Gelen Hız Sınırı (KiB/s)</string>
   <string name="max_send_kbps">Giden Hız Sınırı (KiB/s)</string>
   <string name="global_announce_enabled">Küresel Bulunabilirlik</string>
@@ -152,14 +175,14 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <string name="gui_address">Arayüz Dinleme Adresleri</string>
   <string name="gui_user">Arayüz Kullanıcı Doğrulaması için Kullanıcı Adı</string>
   <string name="gui_password">Arayüz Kullanıcı Doğrulaması için Kullanıcı Parolası</string>
-  <string name="export_config">Ayarları Dışarı Aktar</string>
+  <string name="export_config">Yapılandırmayı Dışa Aktar</string>
   <!--Toast shown after config was successfully exported-->
-  <string name="config_export_successful">Ayarlar %1$s dışarı aktarıldı</string>
-  <string name="import_config">Ayarları İçeri Aktar</string>
+  <string name="config_export_successful">Yapılandırma %1$s dışa aktarıldı</string>
+  <string name="import_config">Yapılandırmayı İçe Aktar</string>
   <!--Toast shown after config was successfully imported-->
-  <string name="config_imported_successful">Ayarlar içeri aktarıldı</string>
+  <string name="config_imported_successful">Yapılandırma içe aktarıldı</string>
   <!--Toast shown after config was successfully imported-->
-  <string name="config_import_failed">Ayarlar içeri aktarılamadı, dosyaların %1$s içinde olduğundan emin olun</string>
+  <string name="config_import_failed">Yapılandırma içe aktarılamadı, dosyaların %1$s içinde olduğundan emin olun</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Hata Ayıklama Seçenekleri</string>
   <!--Toast after entering invalid STTRACE params-->
@@ -169,17 +192,20 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <!--Toast after entering invalid password-->
   <string name="toast_invalid_password">Parola içinde : ve \' karakterleri kullanamazsınız</string>
   <!--Title for the preference to reset Syncthing indexes-->
+  <string name="streset_title">Veritabanını Sıfırla</string>
   <!--Syncthing was reset-->
+  <string name="streset_question">Bu eylem yalnızca destek takımımızdan alınan öneriye dayanarak gerçekleştirilmelidir.\nSyncthing\'in index veritabanını temizlemek istediğine emin misin?</string>
   <!--Syncthing was reset-->
+  <string name="streset_done">Syncthing\'in veritabanı başarıyla sıfırlandı.</string>
   <string name="category_about">Hakkında</string>
   <!--Settings item that opens the log activity-->
   <string name="open_log">Günlük Aç</string>
   <!--Summary for the log activity-->
-  <string name="open_log_summary">Syncthing ve Android günlük penceresi aç</string>
+  <string name="open_log_summary">Syncthing ve Android günlük kayıtları penceresini aç</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Hata Bildir</string>
   <!--Summary for the issue tracker settings item-->
-  <string name="report_issue_summary">Syncthing-Android hata takip izleyisini aç</string>
+  <string name="report_issue_summary">Syncthing-Android hata takip sistemini aç</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Syncthing Sürümü</string>
@@ -189,7 +215,7 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <!--Activity title-->
   <string name="folder_picker_title">Klasör Seçici</string>
   <!--Toast shown on devices with kitkat or higher-->
-  <string name="kitkat_external_storage_warning">Uyarı: Android sürümünüz, harici depolama cihazlarına eşitlemeye izin vermiyor.</string>
+  <string name="kitkat_external_storage_warning">Uyarı: Android sürümünüz, harici depolama cihazlarına eşzamanlama yapılmasına izin vermiyor.</string>
   <!--ListView empty text-->
   <string name="directory_empty">Dizin Boş</string>
   <!--Menu item to create folder on the file system-->
@@ -203,7 +229,7 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <!--Title of the "log android" menu button-->
   <string name="log_android_title">Android Günlüğünü Göster</string>
   <!--Title of the "log Syncthing" menu button-->
-  <string name="log_syncthing_title">Syncthing Günlüğünü Göster</string>
+  <string name="log_syncthing_title">Syncthing Günlük Kayıtlarını Göster</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Paylaş</string>
   <!--SyncthingService-->
@@ -218,15 +244,19 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing çalışıyor</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
+  <string name="toast_folder_observer_stack_overflow">Dizin ağacı çok derin. Döngüsel sembolik bağlantıların varlığını araştır.</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <string name="config_create_failed">Syncthing yapılandırması başarısız oldu. Lütfen günlük kayıtlarını inceleyin.</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Yeniden Başlatılması Gerekli</string>
   <!--Text for positive button in restart dialog-->
+  <string name="restart_now">Şimdi Yeniden Başlat</string>
   <!--Text for the dismiss button of the restart Activity-->
+  <string name="restart_later">Daha sonra</string>
   <!--Text of the notification shown when a restart is needed-->
-  <string name="restart_notification_text">Şimdi syncthing yeniden başlatmak için tıkla</string>
+  <string name="restart_notification_text">Şimdi syncthing\'i yeniden başlatmak için tıkla</string>
   <!--Shown when a device ID is copied to the clipboard-->
   <string name="device_id_copied_to_clipboard">Cihaz ID panoya kopyalandı</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
@@ -238,10 +268,18 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
     <item>TiB</item>
   </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>B/s</item>
+    <item>KiB/s</item>
+    <item>MiB/s</item>
+    <item>GiB/s</item>
+    <item>TiB/s</item>
+  </string-array>
   <!--Possible folder states-->
   <string name="state_idle">Boşta</string>
   <string name="state_scanning">Taranıyor</string>
   <string name="state_cleaning">Temizleniyor</string>
-  <string name="state_syncing">Eşitleniyor</string>
+  <string name="state_syncing">Eşzamanlama yapılıyor</string>
+  <string name="state_error">Hata</string>
   <string name="state_unknown">Bilinmiyor</string>
 </resources>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index e7f6ff09..6487da72 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -1,116 +1,288 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <string name="app_name">Syncthing</string>
+  <string name="app_description">Ứng dụng đồng bộ hoá tập tin phi tập trung, mở và đáng tin cậy.</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
+  <string name="add_folder">Thêm thư mục</string>
   <!--Title of the "share device id" menu action-->
+  <string name="share_device_id">Chia sẻ ID thiết bị</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
+  <string name="send_device_id_to">Gửi ID thiết bị đến</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <string name="api_loading">Đang tải...</string>
+  <string name="usage_reporting_dialog_title">Cho phép báo cáo sử dụng ẩn danh?</string>
+  <string name="usage_reporting_dialog_description">Báo cáo sử dụng đã mã hoá sẽ được gửi đi hằng ngày. Nó được dùng để theo dõi các hệ điều hành thông dụng, kích cỡ thư mục và phiên bản ứng dụng. Nếu bộ dữ liệu báo cáo có thay đổi gì, bạn sẽ được nhắc lại bằng hội thoại này.\n\nThống kê tổng hợp được đăng tải công khai tại https://data.syncthing.net.</string>
+  <string name="yes">Có</string>
+  <string name="no">Không</string>
+  <string name="off">tắt</string>
+  <string name="open_website">Mở trang web</string>
+  <string name="toast_write_storage_permission_required">Ứng dụng này cần được phép chép vào ổ lưu trữ</string>
   <!--FoldersFragment-->
+  <string name="folders_fragment_title">Các thư mục</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">Không tìm thấy thư mục nào</string>
   <!--Format string for folder file count-->
+  <string name="files">Các tập tin %1$d / %2$d</string>
   <!--DevicesFragment-->
+  <string name="devices_fragment_title">Các thiết bị</string>
   <!--Shown if no devices exist-->
+  <string name="devices_list_empty">Không tìm thấy thiết bị nào</string>
   <!--Indicates that a folder is fully synced to the local device-->
+  <string name="device_up_to_date">Đã đồng bộ</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <string name="device_syncing">Đang đồng bộ (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
+  <string name="device_disconnected">Đã ngắt kết nối</string>
   <!--Title for current download rate-->
+  <string name="download_title">Tải xuống</string>
   <!--Title for current upload rate-->
+  <string name="upload_title">Tải lên</string>
   <!--DrawerFragment-->
   <!--Placeholder for device ID field, to avoid layout changes. This is never visible to users.-->
   <!--Same as download_title with a colon and space appended-->
+  <string name="download_title_colon">Tải xuống:\u0020</string>
   <!--Same as upload_title with a colon and space appended-->
+  <string name="upload_title_colon">Tải lên:\u0020</string>
   <!--Title for current CPU usage-->
+  <string name="cpu_usage">Mức sử dụng CPU</string>
   <!--Title for current RAM usage-->
+  <string name="ram_usage">Mức sử dụng RAM</string>
   <!--Title for announce server status-->
+  <string name="announce_server">Máy chủ thông báo</string>
   <!--Menu item to donate-->
+  <string name="donate">Quyên góp</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
+  <string name="folder_id">ID thư mục</string>
   <!--Setting title-->
+  <string name="directory">Thư mục</string>
   <!--Setting title-->
+  <string name="folder_master">Thư mục Chủ</string>
   <!--Setting title-->
+  <string name="devices">Các thiết bị</string>
   <!--Setting title-->
+  <string name="keep_versions">Giữ các phiên bản</string>
   <!--Setting title-->
+  <string name="delete_folder">Xoá thư mục</string>
   <!--Title for FolderSettingsFragment in create mode-->
+  <string name="create_folder">Tạo thư mục</string>
   <!--Title for FolderSettingsFragment in edit mode-->
+  <string name="edit_folder">Chỉnh sửa thư mục</string>
   <!--Menu item to confirm folder creation-->
-  <!--Dialog shown when attempting to delete a folder-->
-  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <string name="create">Tạo mới</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">Không được để trống ID thư mục</string>
   <!--Toast shown when trying to create a folder with an empty path-->
+  <string name="folder_path_required">Không được để trống đường dẫn thư mục</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Có chắc là bạn muốn xuất cấu hình? Các tập tin hiện thời sẽ bị ghi đè.\n\nCẢNH BÁO! Các ứng dụng khác có thể đọc được khoá riêng tư từ vị trí sao lưu và dùng nó để tải về/chỉnh sửa các tập tin đã đồng bộ.</string>
   <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Có chắc là bạn muốn nhập cấu hình mới? Các tập tin hiện tại sẽ bị chép đè lên.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
+  <string name="device_id">ID thiết bị</string>
   <!--Setting title-->
+  <string name="name">Tên</string>
   <!--Setting title-->
+  <string name="addresses">Các địa chỉ</string>
   <!--Setting title-->
+  <string name="current_address">Địa chỉ hiện tại</string>
   <!--Setting title-->
+  <string name="compression">Nén</string>
   <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Không bao giờ</item>
+    <item>Siêu dữ liệu</item>
+    <item>Luôn luôn</item>
+  </string-array>
   <!--Setting title-->
+  <string name="introducer">Thiết bị giới thiệu</string>
   <!--ActionBar item-->
+  <string name="delete_device">Xoá thiết bị</string>
   <!--Title for DeviceSettingsFragment in create mode-->
+  <string name="add_device">Thêm thiết bị</string>
   <!--Menu item to confirm adding a device-->
+  <string name="add">Thêm</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
-  <!--Dialog shown when attempting to delete a device-->
+  <string name="edit_device">Chỉnh sửa thiết bị</string>
+  <!--Dialog shown when attempting to remove a device-->
   <!--Toast shown when trying to create a device with an empty ID-->
+  <string name="device_id_required">Không được để trống ID thiết bị</string>
   <!--Toast shown when trying to create a device with an empty name-->
+  <string name="device_name_required">Không được để trống tên thiết bị</string>
   <!--Content description for device ID qr code icon-->
+  <string name="scan_qr_code_description">Quét mã QR</string>
   <!--Toast show if we could not get root permissions-->
+  <string name="toast_root_denied">Không nhận được quyền root</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
+  <string name="web_gui_title">GUI web</string>
   <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Đang chờ GUI</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Đang tạo khoá bảo mật. Thao tác này có thể mất vài phút.</string>
   <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Chào mừng đến với Syncthing cho Android</string>
   <!--Text for dialog displayed on first start-->
+  <string name="welcome_text">Syncthing là ứng dụng mã nguồn mở dùng để đồng bộ hoá các tập tin.\n\n\
+Để chia sẻ dữ liệu với các thiết bị khác, bạn cần thêm ID thiết bị độc nhất của chúng vào danh sách. Sau đó, bạn có thể lựa chọn thư mục để chia sẻ giữa các thiết bị.\n\n\
+Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
+  <string name="settings_title">Cài đặt</string>
+  <string name="category_syncthing_android">Syncthing-Android</string>
   <!--Preference title-->
+  <string name="always_run_in_background">Luôn chạy nền</string>
   <!--Preference summary in case it is enabled-->
+  <string name="always_run_in_background_enabled">Syncthing luôn chạy nền theo như tuỳ chỉnh bên dưới.</string>
   <!--Preference summary in case it is disabled-->
+  <string name="always_run_in_background_disabled">Syncthing chỉ chạy khi được bật thủ công và có thể được tắt bởi nút trình đơn.</string>
+  <string name="sync_only_charging">Chỉ đồng bộ khi sạc pin</string>
+  <string name="sync_only_wifi">Chỉ đồng bộ khi dùng wifi</string>
+  <string name="sync_only_wifi_ssids">Hạn chế với một vài mạng wifi nhất định</string>
+  <string name="sync_only_wifi_ssids_all">Đồng bộ trên tất cả mạng wifi</string>
+  <string name="sync_only_wifi_ssids_values">Chỉ đồng bộ khi kết nối đến: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hãy bật WiFi để lựa chọn mạng.</string>
+  <string name="advanced_folder_picker">Sử dụng trình chọn thư mục nâng cao</string>
+  <string name="advanced_folder_picker_summary">Chọn bất kỳ thư mục nào trên thiết bị để đồng bộ</string>
+  <string name="use_root_title">Đồng bộ với quyền Root</string>
+  <string name="use_root_summary">Chạy Syncthing với quyền Superuser</string>
+  <string name="root_dialog_title">Có chắc là bạn muốn bật quyền root?</string>
+  <string name="root_dialog_message">Thao tác này có thể gây ra nhiều vấn đề cho Syncthing và thiết bị của bạn. Hãy thận trọng.</string>
+  <string name="notification_type_title">Thông báo</string>
+  <string name="notification_type_summary">Chọn dạng thông báo</string>
+  <string-array name="notification_type_entries">
+    <item>Thông thường</item>
+    <item>Ưu tiên thấp</item>
+    <item>Không thông báo</item>
+  </string-array>
+  <string name="category_syncthing">Syncthing</string>
+  <string name="syncthing_options">Tuỳ chọn Syncthing</string>
+  <string name="device_name">Tên thiết bị</string>
+  <string name="listen_address">Đồng bộ các địa chỉ lắng nghe giao thức</string>
+  <string name="max_recv_kbps">Giới hạn tốc độ đầu vào (KiB/s)</string>
+  <string name="max_send_kbps">Giới hạn tốc độ đầu ra (KiB/s)</string>
+  <string name="global_announce_enabled">Dò tìm toàn cầu</string>
+  <string name="local_announce_enabled">Dò tìm cục bộ</string>
+  <string name="upnp_enabled">Bật UPnP</string>
+  <string name="global_announce_server">Máy chủ dò tìm toàn cầu</string>
+  <string name="usage_reporting">Báo cáo sử dụng ẩn danh</string>
+  <string name="syncthing_gui">GUI Syncthing</string>
+  <string name="gui_address">Các địa chỉ lắng nghe GUI</string>
+  <string name="gui_user">Người dùng xác thực GUI</string>
+  <string name="gui_password">Mật khẩu xác thực GUI</string>
+  <string name="export_config">Xuất cấu hình</string>
   <!--Toast shown after config was successfully exported-->
+  <string name="config_export_successful">Cấu hình đã được xuất vào %1$s</string>
+  <string name="import_config">Nhập cấu hình</string>
   <!--Toast shown after config was successfully imported-->
+  <string name="config_imported_successful">Cấu hình đã được nhập</string>
   <!--Toast shown after config was successfully imported-->
+  <string name="config_import_failed">Nhập cấu hình thất bại, hãy chắc rằng các tập tin nằm trong %1$s</string>
   <!--Title for the preference to set STTRACE parameters-->
+  <string name="sttrace_title">Tuỳ chọn dò lỗi</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Chỉ cho phép a-z và \',\' trong tuỳ chọn STTRACE</string>
   <!--Toast after entering invalid username-->
+  <string name="toast_invalid_username">Không cho phép : và \' trong tên người dùng</string>
   <!--Toast after entering invalid password-->
+  <string name="toast_invalid_password">Không cho phép : và \' trong mật khẩu</string>
   <!--Title for the preference to reset Syncthing indexes-->
+  <string name="streset_title">Cài lại CSDL</string>
   <!--Syncthing was reset-->
+  <string name="streset_question">Chỉ nên thực hiện thao tác này dựa trên khuyến nghị từ nhóm hỗ trợ của chúng tôi.
+\nCó chắc là bạn muốn xoá CSDL chỉ mục của Syncthing?
+</string>
   <!--Syncthing was reset-->
+  <string name="streset_done">Cài lại thành công CSDL của Syncthing</string>
+  <string name="category_about">Thông tin về</string>
   <!--Settings item that opens the log activity-->
+  <string name="open_log">Mở lịch sử</string>
   <!--Summary for the log activity-->
+  <string name="open_log_summary">Mở cửa sổ lịch sử của Syncthing và Android</string>
   <!--Settings item that opens issue tracker-->
+  <string name="report_issue_title">Báo cáo lỗi</string>
   <!--Summary for the issue tracker settings item-->
+  <string name="report_issue_summary">Mở trình theo dõi lỗi của Syncthing-Android</string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
+  <string name="syncthing_version_title">Phiên bản Syncthing</string>
   <!--Title of the preference showing this app's version name-->
+  <string name="app_version_title">Phiên bản Syncthing-Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
+  <string name="folder_picker_title">Trình chọn thư mục</string>
   <!--Toast shown on devices with kitkat or higher-->
+  <string name="kitkat_external_storage_warning">Cảnh báo: Phiên bản Android của bạn không cho phép đồng bộ vào các thiết bị lưu trữ ngoại vi</string>
   <!--ListView empty text-->
+  <string name="directory_empty">Thư mục rỗng</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Tạo thư mục mới</string>
   <!--Menu item to select the current folder-->
+  <string name="select_folder">Chọn thư mục</string>
+  <string name="create_folder_failed">Tạo thư mục thất bại</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
+  <string name="log_title">Lịch sử</string>
   <!--Title of the "log android" menu button-->
+  <string name="log_android_title">Xem lịch sử Android</string>
   <!--Title of the "log Syncthing" menu button-->
+  <string name="log_syncthing_title">Xem lịch sử Syncthing</string>
   <!--Title of the "share log" menu button-->
+  <string name="share_title">Chia sẻ</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_title">Đã tắt Syncthing</string>
   <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">Bạn có muốn thay đổi các tinh chỉnh?</string>
   <!--Button text on the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_change_settings">Thay đổi cài đặt</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <string name="exit">Thoát</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
+  <string name="syncthing_active">Syncthing đang chạy</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
+  <string name="toast_folder_observer_stack_overflow">Cây thư mục quá sâu. Hãy kiểm tra các liên kết biểu trưng trùng lặp</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <string name="config_create_failed">Tạo cấu hình Syncthing thất bại. Hãy kiểm tra lịch sử.</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <string name="default_folder_id">%1$s-ảnh</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
+  <string name="restart_title">Cần khởi động lại</string>
   <!--Text for positive button in restart dialog-->
+  <string name="restart_now">Khởi động lại ngay</string>
   <!--Text for the dismiss button of the restart Activity-->
+  <string name="restart_later">Để sau</string>
   <!--Text of the notification shown when a restart is needed-->
+  <string name="restart_notification_text">Nhấp vào đây để khởi động lại Syncthing ngay</string>
   <!--Shown when a device ID is copied to the clipboard-->
+  <string name="device_id_copied_to_clipboard">Đã chép ID thiết bị vào clipboard</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
+  <string-array name="file_size_units">
+    <item>B</item>
+    <item>KiB</item>
+    <item>MiB</item>
+    <item>GiB</item>
+    <item>TiB</item>
+  </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>B/s</item>
+    <item>KiB/s</item>
+    <item>MiB/s</item>
+    <item>GiB/s</item>
+    <item>TiB/s</item>
+  </string-array>
   <!--Possible folder states-->
+  <string name="state_idle">Rãnh rỗi</string>
+  <string name="state_scanning">Đang quét</string>
+  <string name="state_cleaning">Đang dọn dẹp</string>
+  <string name="state_syncing">Đang đồng bộ</string>
+  <string name="state_error">Lỗi</string>
+  <string name="state_unknown">Không rõ</string>
 </resources>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 1779837a..cf3803da 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -54,6 +54,7 @@
   <string name="announce_server">宣告服务器</string>
   <!--Menu item to donate-->
   <string name="donate">捐赠</string>
+  <string name="restart">重启</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">文件夹标识</string>
@@ -73,10 +74,10 @@
   <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 invalid ID-->
-  <string name="folder_id_required">文件夹标识必须由不长于 64 位字符，且仅能包含字母、数字、半角句号（.）、横线（-）和下划线（_）。</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">您确定要从 Syncthing 中删除该文件夹吗？</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>
   <!--Dialog shown before config export-->
@@ -110,8 +111,8 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_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-->
@@ -145,6 +146,10 @@
   <string name="always_run_in_background_disabled">Syncthing 仅在运行后启动同步并且可以通过点按菜单按钮停止</string>
   <string name="sync_only_charging">仅在充电时同步</string>
   <string name="sync_only_wifi">仅在无线网络下同步</string>
+  <string name="sync_only_wifi_ssids">对某些无线网络下限制同步</string>
+  <string name="sync_only_wifi_ssids_all">在所有网络环境下同步</string>
+  <string name="sync_only_wifi_ssids_values">仅当连接到 %1$s 网络中才进行同步</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">请打开无线网络连接并选择网络</string>
   <string name="advanced_folder_picker">使用高级文件夹选择器</string>
   <string name="advanced_folder_picker_summary">可以选择设备上任何文件夹</string>
   <string name="use_root_title">使用root权限来同步</string>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 73d3845c..8696b50f 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -63,10 +63,9 @@
   <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 invalid ID-->
-  <string name="folder_id_required">資料夾識別碼必須為一段只包含半形英文字母、數字、點 (.)、連接符號 (-) 以及底線 (_) 的簡短識別碼 (不多於 64 個字元)</string>
+  <!--Dialog shown when attempting to remove a folder-->
+  <!--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>
   <!--Dialog shown before config export-->
@@ -93,8 +92,7 @@
   <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>
+  <!--Dialog shown when attempting to remove a device-->
   <!--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-->
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 56a9c529..7d964449 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -129,8 +129,8 @@
     <!-- 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>
+    <!-- Dialog shown when attempting to remove a folder -->
+    <string name="remove_folder_confirm">Do you really want to remove this folder from Syncthing?</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>
@@ -184,8 +184,8 @@
     <!-- 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 device?</string>
+    <!-- Dialog shown when attempting to remove a device -->
+    <string name="remove_device_confirm">Do you really want to remove this device?</string>
 
     <!-- Toast shown when trying to create a device with an empty ID -->
     <string name="device_id_required">The device ID must not be empty</string>