From 09eb5b6b8481fe25cd06bb81ebfd29b4ca1880c9 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Sun, 7 Feb 2016 19:02:37 +0100
Subject: [PATCH] Only show folder percentage while syncing (fixes #555).

---
 .../syncthingandroid/syncthing/RestApi.java   |  21 ----
 .../syncthingandroid/util/FoldersAdapter.java |  75 ++++++------
 src/main/res/values-ar/strings.xml            |   3 -
 src/main/res/values-bg/strings.xml            |   7 +-
 src/main/res/values-cs/strings.xml            |   9 +-
 src/main/res/values-da-rDK/strings.xml        |   3 -
 src/main/res/values-da/strings.xml            |   3 -
 src/main/res/values-de-rAT/strings.xml        | 113 ++++++++++++++++++
 src/main/res/values-de-rDE/strings.xml        |   3 -
 src/main/res/values-de/strings.xml            |   9 +-
 src/main/res/values-el/strings.xml            |   5 +-
 src/main/res/values-es-rEC/strings.xml        |   3 -
 src/main/res/values-es-rMX/strings.xml        |   3 -
 src/main/res/values-es/strings.xml            |   7 +-
 src/main/res/values-fi/strings.xml            |   3 -
 src/main/res/values-fr-rFR/strings.xml        |   3 -
 src/main/res/values-fr/strings.xml            |  19 ++-
 src/main/res/values-hu/strings.xml            |   7 +-
 src/main/res/values-in/strings.xml            |   5 +-
 src/main/res/values-it/strings.xml            |   9 +-
 src/main/res/values-ja/strings.xml            |  11 +-
 src/main/res/values-ko/strings.xml            |   7 +-
 src/main/res/values-nb/strings.xml            |   7 +-
 src/main/res/values-nl/strings.xml            |   9 +-
 src/main/res/values-nn/strings.xml            |   3 -
 src/main/res/values-pl-rPL/strings.xml        |   3 -
 src/main/res/values-pl/strings.xml            |  25 ++--
 src/main/res/values-pt-rBR/strings.xml        |  15 ++-
 src/main/res/values-pt/strings.xml            |   7 +-
 src/main/res/values-ru/strings.xml            |  16 ++-
 src/main/res/values-sk/strings.xml            |   7 +-
 src/main/res/values-sl/strings.xml            |   3 -
 src/main/res/values-sr/strings.xml            |   3 -
 src/main/res/values-sv-rSE/strings.xml        |   3 -
 src/main/res/values-sv/strings.xml            |   3 -
 src/main/res/values-tr/strings.xml            |   7 +-
 src/main/res/values-vi/strings.xml            |  10 +-
 src/main/res/values-zh-rCN/strings.xml        |   9 +-
 src/main/res/values-zh-rTW/strings.xml        |   7 +-
 src/main/res/values/strings.xml               |   5 +-
 40 files changed, 228 insertions(+), 242 deletions(-)
 create mode 100644 src/main/res/values-de-rAT/strings.xml

diff --git a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
index 86affe67..3c033671 100644
--- a/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
+++ b/src/main/java/com/nutomic/syncthingandroid/syncthing/RestApi.java
@@ -755,27 +755,6 @@ public class RestApi implements SyncthingService.OnWebGuiAvailableListener,
                 "since", String.valueOf(sinceId), "limit", String.valueOf(limit));
     }
 
-    /**
-     * Returns the folder's state as a localized string.
-     *
-     * @param state One of idle, scanning, cleaning or syncing.
-     */
-    public static String getLocalizedState(Context c, String state) {
-        switch (state) {
-            case "idle":     return c.getString(R.string.state_idle);
-            case "scanning": return c.getString(R.string.state_scanning);
-            case "cleaning": return c.getString(R.string.state_cleaning);
-            case "syncing":  return c.getString(R.string.state_syncing);
-            case "error":    return c.getString(R.string.state_error);
-            case "unknown":  // Fallthrough
-            case "":         return c.getString(R.string.state_unknown);
-        }
-        if (BuildConfig.DEBUG) {
-            throw new AssertionError("Unexpected folder state " + state);
-        }
-        return "";
-    }
-
     /**
      * Updates or creates the given device, depending on whether it already exists.
      *
diff --git a/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java b/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
index cd3c3a71..d6edb641 100644
--- a/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
+++ b/src/main/java/com/nutomic/syncthingandroid/util/FoldersAdapter.java
@@ -9,6 +9,7 @@ import android.widget.ArrayAdapter;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.nutomic.syncthingandroid.BuildConfig;
 import com.nutomic.syncthingandroid.R;
 import com.nutomic.syncthingandroid.syncthing.RestApi;
 
@@ -43,53 +44,63 @@ public class FoldersAdapter extends ArrayAdapter<RestApi.Folder>
 
     @Override
     public View getView(int position, View convertView, ViewGroup parent) {
-        ViewHolder viewHolder;
-        if (convertView == null) {
+        if (convertView == null)
             convertView = mInflater.inflate(R.layout.item_folder_list, parent, false);
 
-            viewHolder = new ViewHolder();
-            viewHolder.id = (TextView) convertView.findViewById(R.id.id);
-            viewHolder.state = (TextView) convertView.findViewById(R.id.state);
-            viewHolder.directory = (TextView) convertView.findViewById(R.id.directory);
-            viewHolder.items = (TextView) convertView.findViewById(R.id.items);
-            viewHolder.size = (TextView) convertView.findViewById(R.id.size);
-            viewHolder.invalid = (TextView) convertView.findViewById(R.id.invalid);
-
-            convertView.setTag(viewHolder);
-        } else {
-            viewHolder = (ViewHolder) convertView.getTag();
-        }
+        TextView id = (TextView) convertView.findViewById(R.id.id);
+        TextView state = (TextView) convertView.findViewById(R.id.state);
+        TextView directory = (TextView) convertView.findViewById(R.id.directory);
+        TextView items = (TextView) convertView.findViewById(R.id.items);
+        TextView size = (TextView) convertView.findViewById(R.id.size);
+        TextView invalid = (TextView) convertView.findViewById(R.id.invalid);
 
         RestApi.Folder folder = getItem(position);
         RestApi.Model model = mModels.get(folder.id);
-        viewHolder.id.setText(folder.id);
-        viewHolder.state.setTextColor(getContext().getResources().getColor(R.color.text_green));
-        viewHolder.directory.setText((folder.path));
+        id.setText(folder.id);
+        state.setTextColor(getContext().getResources().getColor(R.color.text_green));
+        directory.setText((folder.path));
         if (model != null) {
             int percentage = (model.globalBytes != 0)
                     ? (int) Math.floor(100 * model.inSyncBytes / model.globalBytes)
                     : 100;
-            viewHolder.state.setText(getContext().getString(R.string.folder_progress_format,
-                    RestApi.getLocalizedState(getContext(), model.state),
-                    percentage));
-            viewHolder.items.setVisibility(VISIBLE);
-            viewHolder.items.setText(getContext()
+            state.setText(getLocalizedState(getContext(), model.state, percentage));
+            items.setVisibility(VISIBLE);
+            items.setText(getContext()
                     .getString(R.string.files, model.inSyncFiles, model.globalFiles));
-            viewHolder.size.setVisibility(VISIBLE);
-            viewHolder.size.setText(readableFileSize(getContext(), model.inSyncBytes) + " / " +
+            size.setVisibility(VISIBLE);
+            size.setText(readableFileSize(getContext(), model.inSyncBytes) + " / " +
                     readableFileSize(getContext(), model.globalBytes));
             if (TextUtils.isEmpty(folder.invalid)) {
-                setTextOrHide(viewHolder.invalid, model.invalid);
+                setTextOrHide(invalid, model.invalid);
             }
         } else {
-            viewHolder.items.setVisibility(GONE);
-            viewHolder.size.setVisibility(GONE);
-            setTextOrHide(viewHolder.invalid, folder.invalid);
+            items.setVisibility(GONE);
+            size.setVisibility(GONE);
+            setTextOrHide(invalid, folder.invalid);
         }
 
         return convertView;
     }
 
+    /**
+     * Returns the folder's state as a localized string.
+     */
+    public static String getLocalizedState(Context c, String state, int percentage) {
+        switch (state) {
+            case "idle":     return c.getString(R.string.state_idle);
+            case "scanning": return c.getString(R.string.state_scanning);
+            case "cleaning": return c.getString(R.string.state_cleaning);
+            case "syncing":  return c.getString(R.string.state_syncing, percentage);
+            case "error":    return c.getString(R.string.state_error);
+            case "unknown":  // Fallthrough
+            case "":         return c.getString(R.string.state_unknown);
+        }
+        if (BuildConfig.DEBUG) {
+            throw new AssertionError("Unexpected folder state " + state);
+        }
+        return "";
+    }
+
     /**
      * Replacement for addAll, which is not implemented on lower API levels.
      */
@@ -136,12 +147,4 @@ public class FoldersAdapter extends ArrayAdapter<RestApi.Folder>
         }
     }
 
-    private static class ViewHolder {
-        TextView id;
-        TextView state;
-        TextView directory;
-        TextView items;
-        TextView size;
-        TextView invalid;
-    }
 }
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 13bdb8e5..cced9fc2 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Приложението изисква права за записване в хранилището на данни</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Папки</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Не са открити папки</string>
   <!--Format string for folder file count-->
@@ -102,7 +100,6 @@
   <!--Setting title-->
   <!--ActionBar item-->
   <string name="delete_device">Изтриване на устройството</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Добави устройство</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Добави</string>
@@ -111,8 +108,6 @@
   <!--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-->
-  <string name="device_name_required">Наложително е да въведете име на устройството</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Сканиране на QR код</string>
   <!--Toast show if we could not get root permissions-->
@@ -281,7 +276,7 @@
   <string name="state_idle">Бездействие</string>
   <string name="state_scanning">Сканиране</string>
   <string name="state_cleaning">Почистване</string>
-  <string name="state_syncing">Синхронизиране</string>
+  <string name="state_syncing">Синхронизиране (%1$d%%)</string>
   <string name="state_error">Грешка</string>
   <string name="state_unknown">Неясно</string>
 </resources>
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 202c158c..0b7c1367 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Tato aplikace vyžaduje oprávnění pro zápis do úložiště</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Adresáře</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Nenalezeny žádné adresáře</string>
   <!--Format string for folder file count-->
@@ -75,6 +73,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Přidat</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Opravdu chcete odebrat tento adresář ze Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">ID adresáře nesmí být prázdné</string>
   <!--Toast shown when trying to create a folder with an empty path-->
@@ -104,17 +103,15 @@
   <string name="introducer">Zavaděč</string>
   <!--ActionBar item-->
   <string name="delete_device">Smazat přístroj</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Přidat přístroj</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Přidat</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Upravit přístroj</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Opravdu chcete odebrat tento přístroj?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">ID přístroje nesmí být prázdné</string>
-  <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Jméno přístroje nesmí být prázdné</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Načíst QR kód</string>
   <!--Toast show if we could not get root permissions-->
@@ -282,7 +279,7 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="state_idle">Aktuální</string>
   <string name="state_scanning">Skenování</string>
   <string name="state_cleaning">Čištění</string>
-  <string name="state_syncing">Synchronizuje se</string>
+  <string name="state_syncing">Synchronizuje se (%1$d%%)</string>
   <string name="state_error">Chyba</string>
   <string name="state_unknown">Neznámý</string>
 </resources>
diff --git a/src/main/res/values-da-rDK/strings.xml b/src/main/res/values-da-rDK/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-da-rDK/strings.xml
+++ b/src/main/res/values-da-rDK/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-de-rAT/strings.xml b/src/main/res/values-de-rAT/strings.xml
new file mode 100644
index 00000000..c8bfafdd
--- /dev/null
+++ b/src/main/res/values-de-rAT/strings.xml
@@ -0,0 +1,113 @@
+<?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-->
+  <!--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-->
+  <!--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-->
+  <!--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-rDE/strings.xml b/src/main/res/values-de-rDE/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-de-rDE/strings.xml
+++ b/src/main/res/values-de-rDE/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 99c714a0..1ed4a626 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Diese App benötigt Schreibzugriff auf Ihren Gerätespeicher</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Verzeichnisse</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Keine Verzeichnisse gefunden</string>
   <!--Format string for folder file count-->
@@ -60,7 +58,7 @@
   <!--Setting title-->
   <string name="directory">Verzeichnis</string>
   <!--Setting title-->
-  <string name="folder_master">Originalverzeichnis</string>
+  <string name="folder_master">Master Verzeichnis - schreibgeschützt</string>
   <!--Setting title-->
   <string name="devices">Geräte</string>
   <!--Setting title-->
@@ -103,7 +101,6 @@
   <string name="introducer">Verteilergerät</string>
   <!--ActionBar item-->
   <string name="delete_device">Gerät löschen</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Gerät hinzufügen</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Hinzufügen</string>
@@ -112,8 +109,6 @@
   <!--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-->
-  <string name="device_name_required">Der Gerätename darf nicht leer sein</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR Code scannen</string>
   <!--Toast show if we could not get root permissions-->
@@ -281,7 +276,7 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="state_idle">Untätig</string>
   <string name="state_scanning">Scannen</string>
   <string name="state_cleaning">Aufräumen</string>
-  <string name="state_syncing">Synchronisiere</string>
+  <string name="state_syncing">Synchronisiere (%1$d%%)</string>
   <string name="state_error">Fehler</string>
   <string name="state_unknown">Unbekannt</string>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index b61584b3..ef6ed839 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -11,8 +11,6 @@
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Φάκελοι</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Δε βρέθηκαν φάκελοι</string>
   <!--Format string for folder file count-->
@@ -66,12 +64,10 @@
   <!--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-->
@@ -132,4 +128,5 @@
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
+  <string name="state_syncing">Συγχρονίζοντας (%1$d%%)</string>
 </resources>
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index db9ec7ce..dd751be3 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -20,8 +20,6 @@
   <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-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">No se encontraron carpetas</string>
   <!--Format string for folder file count-->
@@ -103,7 +101,6 @@
   <string name="introducer">Introductor</string>
   <!--ActionBar item-->
   <string name="delete_device">Eliminar dispositivo</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Añadir dispositivo</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Añadir</string>
@@ -112,8 +109,6 @@
   <!--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-->
-  <string name="device_name_required">El nombre del dispositivo no debe estar vacío</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Escanear código QR</string>
   <!--Toast show if we could not get root permissions-->
@@ -281,7 +276,7 @@ Por favor informe de qualquier problema que encuentres via Github.</string>
   <string name="state_idle">Inactivo</string>
   <string name="state_scanning">Escaneado</string>
   <string name="state_cleaning">Limpiando</string>
-  <string name="state_syncing">Sincronizando</string>
+  <string name="state_syncing">Sincronizando (%1$d%%)</string>
   <string name="state_error">Error</string>
   <string name="state_unknown">Desconocido</string>
 </resources>
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-fr-rFR/strings.xml b/src/main/res/values-fr-rFR/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-fr-rFR/strings.xml
+++ b/src/main/res/values-fr-rFR/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 4c1417d0..255cf9ac 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -18,10 +18,10 @@
   <string name="off">Arrêt</string>
   <string name="open_website">Ouvrir le site WEB</string>
   <string name="toast_write_storage_permission_required">La permission d\'écriture sur l\'espace de stockage est requise pour cette application.</string>
+  <string name="device_rejected">La machine %1$s veut se connecter</string>
+  <string name="ignore">Ignorer</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Dossiers</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">Aucun dossier trouvé</string>
   <!--Format string for folder file count-->
@@ -31,7 +31,7 @@
   <!--Shown if no devices exist-->
   <string name="devices_list_empty">Aucune machine trouvée</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">À jour</string>
+  <string name="device_up_to_date">Synchronisé</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
   <string name="device_syncing">Synchronisation (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
@@ -75,6 +75,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Créer</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Voulez-vous vraiment enlever ce dossier de Syncthing ?</string>
   <!--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-->
@@ -104,17 +105,15 @@
   <string name="introducer">Initiateur</string>
   <!--ActionBar item-->
   <string name="delete_device">Supprimer la machine</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
-  <string name="add_device">Ajouter machine</string>
+  <string name="add_device">Ajouter une machine</string>
   <!--Menu item to confirm adding a device-->
   <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 remove a device-->
+  <string name="remove_device_confirm">Voulez-vous vraiment enlever cette machine ?</string>
   <!--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-->
-  <string name="device_name_required">Le nom de la machine ne peut pas être vide</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Scanner un QR Code</string>
   <!--Toast show if we could not get root permissions-->
@@ -153,7 +152,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="use_root_title">Sync en root</string>
   <string name="use_root_summary">Faire fonctionner syncthing en super-utilisateur</string>
   <string name="root_dialog_title">Êtes-vous sûr de vouloir activer le mode root (superutilisateur) ?</string>
-  <string name="root_dialog_message">Ceci peut causer divers problèmes entre Syncthing et votre appareil. A utiliser à vos risques.</string>
+  <string name="root_dialog_message">Ceci peut causer divers problèmes entre Syncthing et votre machine. A utiliser à vos risques.</string>
   <string name="notification_type_title">Notification</string>
   <string name="notification_type_summary">Choisissez le type de notification</string>
   <string-array name="notification_type_entries">
@@ -218,7 +217,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <!--Activity title-->
   <string name="folder_picker_title">Sélection du dossier</string>
   <!--Toast shown on devices with kitkat or higher-->
-  <string name="kitkat_external_storage_warning">Attention: votre version Android n\'autorise pas la synchronisation avec des périphériques de stockage externes.</string>
+  <string name="kitkat_external_storage_warning">Attention: votre version Android n\'autorise pas la synchronisation avec des périphériques de stockages externes.</string>
   <!--ListView empty text-->
   <string name="directory_empty">Le dossier est vide</string>
   <!--Menu item to create folder on the file system-->
@@ -283,7 +282,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="state_idle">En veille</string>
   <string name="state_scanning">Analyse en cours</string>
   <string name="state_cleaning">Effacement en cours</string>
-  <string name="state_syncing">Synchro en cours</string>
+  <string name="state_syncing">Synchronisation (%1$d%%)</string>
   <string name="state_error">Erreur</string>
   <string name="state_unknown">Inconnu</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index a858b3f0..46f08953 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -19,8 +19,6 @@
   <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-->
@@ -93,7 +91,6 @@
   <string name="introducer">Bevezető</string>
   <!--ActionBar item-->
   <string name="delete_device">Eszköz törlése</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Eszköz hozzáadása</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Hozzáadás</string>
@@ -102,8 +99,6 @@
   <!--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-->
@@ -213,7 +208,7 @@
   <string name="state_idle">Tétlen</string>
   <string name="state_scanning">Átnézés</string>
   <string name="state_cleaning">Takarítás</string>
-  <string name="state_syncing">Szinkronizálás</string>
+  <string name="state_syncing">Szinkronizálás (%1$d%%)</string>
   <string name="state_error">Hiba</string>
   <string name="state_unknown">Ismeretlen</string>
 </resources>
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index ed9f8a49..8f0e5c8d 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -16,8 +16,6 @@
   <string name="no">Tidak</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Folder</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">Folder tidak ditemukan</string>
   <!--Format string for folder file count-->
@@ -78,12 +76,10 @@
   <!--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-->
@@ -144,4 +140,5 @@
   <!--Strings representing units for file sizes, from smallest to largest-->
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
+  <string name="state_syncing">Sinkronisasi (%1$d%%)</string>
 </resources>
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index aaf29bd7..350b6b0e 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -18,10 +18,10 @@
   <string name="off">off</string>
   <string name="open_website">Apri sito</string>
   <string name="toast_write_storage_permission_required">E\' richiesto il permesso di scrittura per questa app</string>
+  <string name="device_rejected">Dispositivo %1$s vuole connettersi</string>
+  <string name="ignore">Ignora</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Cartelle</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">Nessuna cartella trovata</string>
   <!--Format string for folder file count-->
@@ -105,7 +105,6 @@
   <string name="introducer">Introduttore</string>
   <!--ActionBar item-->
   <string name="delete_device">Elimina Dispositivo</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Nuovo Dispositivo</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Aggiungi</string>
@@ -115,8 +114,6 @@
   <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-->
-  <string name="device_name_required">Il nome del dispositivo non può essere vuoto</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Scansiona Codice QR</string>
   <!--Toast show if we could not get root permissions-->
@@ -285,7 +282,7 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="state_idle">Inattivo</string>
   <string name="state_scanning">Scansione in corso</string>
   <string name="state_cleaning">Pulizia</string>
-  <string name="state_syncing">Sincronizzazione</string>
+  <string name="state_syncing">Sincronizzazione (%1$d%%)</string>
   <string name="state_error">Errore</string>
   <string name="state_unknown">Sconosciuto</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 09842192..a95c7f7e 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -18,10 +18,10 @@
   <string name="off">オフ</string>
   <string name="open_website">Web サイトを開く</string>
   <string name="toast_write_storage_permission_required">このアプリはストレージの書き込みアクセス許可が必要です</string>
+  <string name="device_rejected">デバイス %1$s が接続を求めています</string>
+  <string name="ignore">無視</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">フォルダー</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">フォルダーがありません</string>
   <!--Format string for folder file count-->
@@ -75,6 +75,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">作成</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">フォルダー ID は空にできません</string>
   <!--Toast shown when trying to create a folder with an empty path-->
@@ -104,17 +105,15 @@
   <string name="introducer">紹介者</string>
   <!--ActionBar item-->
   <string name="delete_device">デバイスを削除</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">デバイスを追加</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">追加</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">デバイスを編集</string>
   <!--Dialog shown when attempting to 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">デバイス ID は空にできません</string>
-  <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">デバイス名は空にできません</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR コードをスキャン</string>
   <!--Toast show if we could not get root permissions-->
@@ -282,7 +281,7 @@
   <string name="state_idle">アイドル</string>
   <string name="state_scanning">スキャン中</string>
   <string name="state_cleaning">クリーニング中</string>
-  <string name="state_syncing">同期中</string>
+  <string name="state_syncing">同期中 (%1$d%%)</string>
   <string name="state_error">エラー</string>
   <string name="state_unknown">不明</string>
 </resources>
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index c494c6ba..56e71afa 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -13,8 +13,6 @@
   <string name="api_loading">로드 중...</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">폴더</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">폴더를 찾을 수 없습니다</string>
   <!--Format string for folder file count-->
@@ -87,7 +85,6 @@
   <!--Setting title-->
   <!--ActionBar item-->
   <string name="delete_device">기기 삭제</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">기기 추가</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">추가</string>
@@ -96,8 +93,6 @@
   <!--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-->
-  <string name="device_name_required">기기명을 공백으로 둘 수 없습니다.</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR 코드 스캔</string>
   <!--Toast show if we could not get root permissions-->
@@ -233,6 +228,6 @@
   <string name="state_idle">대기</string>
   <string name="state_scanning">스캔 중</string>
   <string name="state_cleaning">지우는 중</string>
-  <string name="state_syncing">동기화 중</string>
+  <string name="state_syncing">동기화 중 (%1$d%%)</string>
   <string name="state_unknown">알 수 없음</string>
 </resources>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 110f0110..07e4977a 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Skriverettigheter kreves av denne appen</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mapper</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">Ingen mapper funnet</string>
   <!--Format string for folder file count-->
@@ -102,7 +100,6 @@
   <string name="introducer">Innføring</string>
   <!--ActionBar item-->
   <string name="delete_device">Slett Enhet</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Legg Til Enhet</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Legg til</string>
@@ -111,8 +108,6 @@
   <!--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-->
-  <string name="device_name_required">Enhetsnavnet kan ikke være tomt</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Skann QR-kode</string>
   <!--Toast show if we could not get root permissions-->
@@ -281,7 +276,7 @@ Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <string name="state_idle">Inaktiv</string>
   <string name="state_scanning">Skanner</string>
   <string name="state_cleaning">Rydder</string>
-  <string name="state_syncing">Synkroniserer</string>
+  <string name="state_syncing">Synkroniserer (%1$d%%)</string>
   <string name="state_error">Feil</string>
   <string name="state_unknown">Ukjent</string>
 </resources>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 97a97fc2..f28a0f07 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -20,8 +20,6 @@
   <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-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Geen mappen gevonden</string>
   <!--Format string for folder file count-->
@@ -75,6 +73,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Creëren</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Weet je zeker dat je deze map van Syncthing wil verwijderen?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">De map-ID mag niet leeg zijn</string>
   <!--Toast shown when trying to create a folder with an empty path-->
@@ -104,17 +103,15 @@
   <string name="introducer">Introduceerder</string>
   <!--ActionBar item-->
   <string name="delete_device">Apparaat verwijderen</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Apparaat toevoegen</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Toevoegen</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Apparaat bewerken</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Weet je zeker dat je dit apparaat wil verwijderen?</string>
   <!--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-->
-  <string name="device_name_required">De apparaatnaam kan niet leeg zijn</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">QR-code scannen</string>
   <!--Toast show if we could not get root permissions-->
@@ -282,7 +279,7 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="state_idle">Inactief</string>
   <string name="state_scanning">Bezig met scannen</string>
   <string name="state_cleaning">Bezig met opruimen</string>
-  <string name="state_syncing">Bezig met synchroniseren</string>
+  <string name="state_syncing">Bezig met synchroniseren (%1$d%%)</string>
   <string name="state_error">Fout</string>
   <string name="state_unknown">Onbekend</string>
 </resources>
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-pl-rPL/strings.xml b/src/main/res/values-pl-rPL/strings.xml
index 52ee1ca0..bbb83c0e 100644
--- a/src/main/res/values-pl-rPL/strings.xml
+++ b/src/main/res/values-pl-rPL/strings.xml
@@ -9,7 +9,6 @@
   <!--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-->
@@ -51,12 +50,10 @@
   <!--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-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 113a6b14..7eb1d4d5 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -18,10 +18,10 @@
   <string name="off">wył</string>
   <string name="open_website">Otwórz stronę internetową</string>
   <string name="toast_write_storage_permission_required">Wymagane zezwolenie na zapisywanie do pamięci zewnętrznej</string>
+  <string name="device_rejected">Urządzenie %1$s chce nawiązać połączenie</string>
+  <string name="ignore">Ignoru</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Katalogi</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">Nie znaleziono katalogów</string>
   <!--Format string for folder file count-->
@@ -54,6 +54,7 @@
   <string name="announce_server">Serwer ogłoszeniowy</string>
   <!--Menu item to donate-->
   <string name="donate">Wspomóż</string>
+  <string name="restart">Uruchom ponownie</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">Identyfikator katalogu</string>
@@ -74,11 +75,13 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Utwórz</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Usunąć ten katalog z Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
-  <string name="folder_id_required">ID folderu nie może być puste</string>
+  <string name="folder_id_required">Identyfikator katalogu nie może być pusty</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-->
+  <string name="dialog_confirm_export">Czy rzeczywiście chcesz wyeksportować swoją konfigurację? Istniejące pliki zostaną nadpisane.\n\nUWAGA! Inne aplikacje mogą odczytać klucz prywatny z lokalizacji kopii zapasowej i użyć go by pobrać bądź zmodyfikować synchronizowane pliki.</string>
   <!--Dialog shown before config import-->
   <string name="dialog_confirm_import">Zaimportować nowe ustawienia? Istniejące pliki zostaną zastąpione.</string>
   <!--DeviceSettingsFragment-->
@@ -102,17 +105,15 @@
   <string name="introducer">Wprowadzający</string>
   <!--ActionBar item-->
   <string name="delete_device">Usuń urządzenie</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Dodawanie urządzenia</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Dodaj</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Edycja urządzenia</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Usunąć to urządzenie?</string>
   <!--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-->
-  <string name="device_name_required">Nazwa urządzenia nie może być pusta</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Skanuj kod QR</string>
   <!--Toast show if we could not get root permissions-->
@@ -121,7 +122,7 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfejs internetowy</string>
   <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Oczekiwanie na GUI</string>
+  <string name="web_gui_loading">Oczekiwanie na interfejs użytkownika</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <string name="web_gui_creating_key">Generowanie kluczy bezpieczeństwa. To może zająć kilka minut.</string>
   <!--Title for dialog displayed on first start-->
@@ -142,11 +143,15 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="always_run_in_background_disabled">Syncthing działa tylko, gdy jest ręcznie uruchomiony i może być zatrzymany z przycisku w menu.</string>
   <string name="sync_only_charging">Synchronizowanie tylko podczas ładowania</string>
   <string name="sync_only_wifi">Synchronizowanie tylko przy użyciu Wi-Fi</string>
+  <string name="sync_only_wifi_ssids">Ogranicz do określonych sieci WiFi</string>
+  <string name="sync_only_wifi_ssids_all">Synchronizowanie przy użyciu wszystkich sieci wifi</string>
+  <string name="sync_only_wifi_ssids_values">Synchronizuj jedynie gdy połączono z: %1$s</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Proszę włącz WiFi dla wybranych sieci</string>
   <string name="advanced_folder_picker">Zaawansowane wybieranie katalogów</string>
   <string name="advanced_folder_picker_summary">Wskazuje dowolny katalog na urządzeniu do zsynchronizowania</string>
   <string name="use_root_title">Działanie z uprawnieniami roota</string>
   <string name="use_root_summary">Synchronizuje zawartość z uprawnieniami użytkownika Superuser</string>
-  <string name="root_dialog_title">Czy jesteś pewny, że chcesz udostępnić prawa roota?</string>
+  <string name="root_dialog_title">Udostępnić uprawnienia root?</string>
   <string name="root_dialog_message">To może spowodować różne problemy z Syncthing i twoim urządzeniem. Używaj na własne ryzyko.</string>
   <string name="notification_type_title">Powiadomienie</string>
   <string name="notification_type_summary">Wybiera rodzaj powiadomienia</string>
@@ -189,7 +194,7 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
 \nPrzywrócić bazę danych do stanu początkowego?</string>
   <!--Syncthing was reset-->
   <string name="streset_done">Przywrócono stan początkowy bazy danych</string>
-  <string name="category_about">O projekcie</string>
+  <string name="category_about">O programie</string>
   <!--Settings item that opens the log activity-->
   <string name="open_log">Otwórz dziennik</string>
   <!--Summary for the log activity-->
@@ -272,7 +277,7 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="state_idle">Bezczynny</string>
   <string name="state_scanning">Skanowanie</string>
   <string name="state_cleaning">Czyszczenie</string>
-  <string name="state_syncing">Synchronizowanie</string>
+  <string name="state_syncing">Synchronizowanie (%1$d%%)</string>
   <string name="state_error">Błąd</string>
   <string name="state_unknown">Nieznany</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 72d39507..ff6cce29 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -18,10 +18,10 @@
   <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>
+  <string name="device_rejected">O dispositivo %1$s quer se conectar</string>
+  <string name="ignore">Ignorar</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Pastas</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">Nenhuma pasta encontrada</string>
   <!--Format string for folder file count-->
@@ -75,14 +75,15 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Criar</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Deseja mesmo remover esta pasta do Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">O ID da pasta não pode 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-->
-  <string name="dialog_confirm_export">Deseja realmente exportar a configuração? Arquivos existentes serão sobrescritos.\n\nAVISO! Outros aplicativos poderão ler a chave privada do arquivo de backup e usá-la para ler e escrever seus arquivos sincronizados.</string>
+  <string name="dialog_confirm_export">Deseja mesmo exportar a configuração? Arquivos existentes serão sobrescritos.\n\nAVISO! Outros aplicativos poderão ler a chave privada do arquivo de backup e usá-la para ler e escrever seus arquivos sincronizados.</string>
   <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Importar uma nova configuração? Arquivos existentes serão sobrescritos.</string>
+  <string name="dialog_confirm_import">Deseja mesmo importar uma nova configuração? Arquivos existentes serão sobrescritos.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
@@ -104,17 +105,15 @@
   <string name="introducer">Apresentador</string>
   <!--ActionBar item-->
   <string name="delete_device">Apagar dispositivo</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Adicionar dispositivo</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Adicionar</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Deseja mesmo remover este dispositivo?</string>
   <!--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-->
-  <string name="device_name_required">O nome do dispositivo não pode ficar vazio</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Ler QR Code</string>
   <!--Toast show if we could not get root permissions-->
@@ -283,7 +282,7 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="state_idle">Em espera</string>
   <string name="state_scanning">Verificando</string>
   <string name="state_cleaning">Limpando</string>
-  <string name="state_syncing">Sincronizando</string>
+  <string name="state_syncing">Sincronizando (%1$d%%)</string>
   <string name="state_error">Erro</string>
   <string name="state_unknown">Desconhecido</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 6de23be6..f20fd4c7 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Esta aplicação precisa de permissão de escrita no armazenamento</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Pastas</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">Não foram encontradas quaisquer pastas</string>
   <!--Format string for folder file count-->
@@ -102,7 +100,6 @@
   <string name="introducer">Apresentador</string>
   <!--ActionBar item-->
   <string name="delete_device">Eliminar dispositivo</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Adicionar dispositivo</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Adicionar</string>
@@ -111,8 +108,6 @@
   <!--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-->
-  <string name="device_name_required">O nome do dispositivo não pode estar vazio</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Ler código QR</string>
   <!--Toast show if we could not get root permissions-->
@@ -277,7 +272,7 @@ Relate quaisquer problemas que encontre via Github, por favor.</string>
   <string name="state_idle">Em espera</string>
   <string name="state_scanning">Verificando</string>
   <string name="state_cleaning">Limpando</string>
-  <string name="state_syncing">Sincronizando</string>
+  <string name="state_syncing">Sincronizando (%1$d%%)</string>
   <string name="state_error">Erro</string>
   <string name="state_unknown">Desconhecido</string>
 </resources>
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 33671307..eb035967 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Приложению требуется право на запись</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Папки</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Папки не найдены</string>
   <!--Format string for folder file count-->
@@ -54,6 +52,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>
@@ -74,10 +73,13 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Создать</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">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-->
+  <string name="dialog_confirm_export">Вы точно хотите экспортировать конфигурацию? Существующие файлы будут перезаписаны.\n\nОСТОРОЖНО! Другие приложения могут иметь возможность считать приватный ключ из резервной копии и использовать его, чтобы загрузить/изменить синхронизируемые файлы.</string>
   <!--Dialog shown before config import-->
   <string name="dialog_confirm_import">Действительно хотите импортировать новую конфигурацию? Существующие файлы будут перезаписаны.</string>
   <!--DeviceSettingsFragment-->
@@ -101,17 +103,15 @@
   <string name="introducer">Интродюсер</string>
   <!--ActionBar item-->
   <string name="delete_device">Удалить устройство</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Доб устройство</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Добавить</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Изменить устройство</string>
   <!--Dialog shown when attempting to 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">ID устройства не может быть пустым</string>
-  <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Имя устройства не может быть пустым</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Сканировать QR Код</string>
   <!--Toast show if we could not get root permissions-->
@@ -141,6 +141,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">Sync как Root</string>
@@ -276,7 +280,7 @@
   <string name="state_idle">Бездействие</string>
   <string name="state_scanning">Сканирование</string>
   <string name="state_cleaning">Очистка</string>
-  <string name="state_syncing">Синхронизация</string>
+  <string name="state_syncing">Синхронизация (%1$d%%)</string>
   <string name="state_error">Ошибка</string>
   <string name="state_unknown">Неизвестно</string>
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 9d82fd6d..237131aa 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -20,8 +20,6 @@
   <string name="toast_write_storage_permission_required">Táto aplikácia potrebuje práva pre zápis na úložisko</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Adresáre</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">Žiadne adresáre</string>
   <!--Format string for folder file count-->
@@ -101,7 +99,6 @@
   <string name="introducer">Introducer</string>
   <!--ActionBar item-->
   <string name="delete_device">Odstrániť Zariadenie</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Pridať Zariadenie</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Pridať</string>
@@ -110,8 +107,6 @@
   <!--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-->
-  <string name="device_name_required">Názov zariadenia nemôže byť prázdny</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Skenovať QR kód</string>
   <!--Toast show if we could not get root permissions-->
@@ -274,7 +269,7 @@ Naozaj chcete resetovať databázu s indexom súborov?</string>
   <string name="state_idle">Nečinné</string>
   <string name="state_scanning">Skenovanie</string>
   <string name="state_cleaning">Čistenie</string>
-  <string name="state_syncing">Syncthonizácia</string>
+  <string name="state_syncing">Synchronizuje sa (%1$d%%)</string>
   <string name="state_error">Chyba</string>
   <string name="state_unknown">Neznámy</string>
 </resources>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-sv-rSE/strings.xml b/src/main/res/values-sv-rSE/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-sv-rSE/strings.xml
+++ b/src/main/res/values-sv-rSE/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index b53d926d..c8bfafdd 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -6,7 +6,6 @@
   <!--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-->
@@ -48,12 +47,10 @@
   <!--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-->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 1248ed0c..0e11d7a7 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -20,8 +20,6 @@
   <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-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Klasör bulunamadı</string>
   <!--Format string for folder file count-->
@@ -103,7 +101,6 @@
   <string name="introducer">Tanıtıcı</string>
   <!--ActionBar item-->
   <string name="delete_device">Cihaz Sil</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">Cihaz Ekleme</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Ekle</string>
@@ -112,8 +109,6 @@
   <!--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-->
-  <string name="device_name_required">Cihaz adı boş olmamalı</string>
   <!--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-->
@@ -279,7 +274,7 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <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şzamanlama yapılıyor</string>
+  <string name="state_syncing">Eşzamanlama gerçekleştiriliyor (%1$d%%)</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 6487da72..efca7b1d 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -20,8 +20,6 @@
   <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-->
@@ -54,6 +52,7 @@
   <string name="announce_server">Máy chủ thông báo</string>
   <!--Menu item to donate-->
   <string name="donate">Quyên góp</string>
+  <string name="restart">Khởi chạy lại</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID thư mục</string>
@@ -74,6 +73,7 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Tạo mới</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Có chắc là bạn muốn xoá thư mục này khỏi Syncthing?</string>
   <!--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-->
@@ -103,17 +103,15 @@
   <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-->
   <string name="edit_device">Chỉnh sửa thiết bị</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Có chắc là bạn muốn xoá thiết bị này?</string>
   <!--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-->
@@ -282,7 +280,7 @@ Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <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_syncing">Đang đồng bộ (%1$d%%)</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 cf3803da..466ef304 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -18,10 +18,10 @@
   <string name="off">关闭</string>
   <string name="open_website">打开主页</string>
   <string name="toast_write_storage_permission_required">本应用需要写存储的权限</string>
+  <string name="device_rejected">%1$s 想要连接</string>
+  <string name="ignore">忽略</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">文件夹</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s（%2$d%%）</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">无文件夹</string>
   <!--Format string for folder file count-->
@@ -105,7 +105,6 @@
   <string name="introducer">介绍人</string>
   <!--ActionBar item-->
   <string name="delete_device">删除设备</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">添加设备</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">添加</string>
@@ -115,8 +114,6 @@
   <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-->
-  <string name="device_name_required">设备名不得为空</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">扫描二维码</string>
   <!--Toast show if we could not get root permissions-->
@@ -284,7 +281,7 @@
   <string name="state_idle">空闲</string>
   <string name="state_scanning">正在扫描</string>
   <string name="state_cleaning">正在清理</string>
-  <string name="state_syncing">正在同步</string>
+  <string name="state_syncing">正在同步 (%1$d%%)</string>
   <string name="state_error">错误</string>
   <string name="state_unknown">未知</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 8696b50f..388c0e26 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -11,8 +11,6 @@
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <!--FoldersFragment-->
   <string name="folders_fragment_title">資料夾</string>
-  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
-  <string name="folder_progress_format">%1$s (%2$d%%)</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">未找到資料夾</string>
   <!--Format string for folder file count-->
@@ -86,7 +84,6 @@
   <string name="introducer">引入者</string>
   <!--ActionBar item-->
   <string name="delete_device">刪除裝置</string>
-  <!--Title for DeviceSettingsFragment in create mode-->
   <string name="add_device">增加裝置</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">增加</string>
@@ -95,8 +92,6 @@
   <!--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-->
-  <string name="device_name_required">裝置名稱不得為空</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">掃描 QR Code</string>
   <!--Toast show if we could not get root permissions-->
@@ -199,5 +194,5 @@
   <string name="state_idle">閒置</string>
   <string name="state_scanning">正在掃描</string>
   <string name="state_cleaning">正在清理</string>
-  <string name="state_syncing">正在同步</string>
+  <string name="state_syncing">正在同步 (%1$d%%)</string>
 </resources>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c1f12425..94384214 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -43,9 +43,6 @@
 
     <string name="folders_fragment_title">Folders</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">No folders found</string>
 
@@ -462,7 +459,7 @@ Please report any problems you encounter via Github.</string>
     <string name="state_idle">Idle</string>
     <string name="state_scanning">Scanning</string>
     <string name="state_cleaning">Cleaning</string>
-    <string name="state_syncing">Syncing</string>
+    <string name="state_syncing">Syncing (%1$d%%)</string>
     <string name="state_error">Error</string>
     <string name="state_unknown">Unknown</string>