diff --git a/src/fat/play/el-EL/listing/fulldescription b/src/fat/play/el-EL/listing/fulldescription
deleted file mode 100644
index f83adf9c..00000000
--- a/src/fat/play/el-EL/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
-
-Website: https://syncthing.net/
-
-Source code: https://github.com/syncthing/syncthing-android
-
-Forum: https://forum.syncthing.net/
-
-Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/el-EL/listing/shortdescription b/src/fat/play/el-EL/listing/shortdescription
deleted file mode 100644
index 2020025b..00000000
--- a/src/fat/play/el-EL/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Open, trustworthy and decentralized file synchronization
\ No newline at end of file
diff --git a/src/fat/play/en/listing/fulldescription b/src/fat/play/en/listing/fulldescription
deleted file mode 100644
index f83adf9c..00000000
--- a/src/fat/play/en/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
-
-Website: https://syncthing.net/
-
-Source code: https://github.com/syncthing/syncthing-android
-
-Forum: https://forum.syncthing.net/
-
-Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/en/listing/shortdescription b/src/fat/play/en/listing/shortdescription
deleted file mode 100644
index 2020025b..00000000
--- a/src/fat/play/en/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Open, trustworthy and decentralized file synchronization
\ No newline at end of file
diff --git a/src/fat/play/es-ES/listing/title b/src/fat/play/es-ES/listing/title
new file mode 100644
index 00000000..b9a21b0f
--- /dev/null
+++ b/src/fat/play/es-ES/listing/title
@@ -0,0 +1 @@
+Syncthing
\ No newline at end of file
diff --git a/src/fat/play/es_EC/listing/fulldescription b/src/fat/play/es_EC/listing/fulldescription
deleted file mode 100644
index 388fc0ba..00000000
--- a/src/fat/play/es_EC/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
-
-Sito Web: https://syncthing.net/
-
-Código Fuente: https://github.com/syncthing/syncthing-android
-
-Foro: https://forum.syncthing.net/
-
-Incidencias: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/es_EC/listing/shortdescription b/src/fat/play/es_EC/listing/shortdescription
deleted file mode 100644
index 2020025b..00000000
--- a/src/fat/play/es_EC/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Open, trustworthy and decentralized file synchronization
\ No newline at end of file
diff --git a/src/fat/play/es_MX/listing/fulldescription b/src/fat/play/es_MX/listing/fulldescription
deleted file mode 100644
index 8018f23b..00000000
--- a/src/fat/play/es_MX/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing reemplaza a la sincronización propietaria y a los servicios en la nube con algo abierto, confiable y descentralizado. Sus datos son solamente suyos y usted merece elegir dónde se almacenan, si se comparte con algún tercero y cómo se transmite por la Internet.
-
-Sitio web: https://syncthing.net/
-
-Código fuente: https://github.com/syncthing/syncthing-android
-
-Foro: https://forum.syncthing.net/
-
-Problemas: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/es_MX/listing/shortdescription b/src/fat/play/es_MX/listing/shortdescription
deleted file mode 100644
index 32dc3415..00000000
--- a/src/fat/play/es_MX/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Sincronización de archivos abierta, confiable y descentralizada
\ No newline at end of file
diff --git a/src/fat/play/fr-FR/listing/title b/src/fat/play/fr-FR/listing/title
new file mode 100644
index 00000000..b9a21b0f
--- /dev/null
+++ b/src/fat/play/fr-FR/listing/title
@@ -0,0 +1 @@
+Syncthing
\ No newline at end of file
diff --git a/src/fat/play/nb/listing/fulldescription b/src/fat/play/nb/listing/fulldescription
deleted file mode 100644
index 8ae6de95..00000000
--- a/src/fat/play/nb/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing erstatter kommersielle synkroniserings- og skytjenester med et åpent, pålitelig og desentralisert system. Dine data er bare dine, og du fortjener å kunne velge hvor de er lagret, om de er delt med en tredjepart, og hvordan de overføres over internett.
-
-Nettside: https://syncthing.net/
-
-Kildekode: https://github.com/syncthing/syncthing-android
-
-Forum: https://forum.syncthing.net/
-
-Problemer: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/nb/listing/shortdescription b/src/fat/play/nb/listing/shortdescription
deleted file mode 100644
index 1387c05e..00000000
--- a/src/fat/play/nb/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Åpen, pålitelig og desentralisert filsynkronisering
\ No newline at end of file
diff --git a/src/fat/play/nn/listing/fulldescription b/src/fat/play/nn/listing/fulldescription
deleted file mode 100644
index 224cab7e..00000000
--- a/src/fat/play/nn/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing erstattar kommersielle synkroniserings- og skytenester med eit ope, påliteleg og desentralisert system. Dataa dine er berre dine, og du fortener å få velje kor dei blir lagra, om dei skal delast med tredjepartar og korleis dei blir sendt over internett.
-
-Nettstad: https://syncthing.net/
-
-Kjeldekode: https://github.com/syncthing/syncthing-android
-
-Forum: https://forum.syncthing.net/
-
-Problem: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/nn/listing/shortdescription b/src/fat/play/nn/listing/shortdescription
deleted file mode 100644
index e0371c07..00000000
--- a/src/fat/play/nn/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Open, påliteleg og desentralisert filsynkronisering
\ No newline at end of file
diff --git a/src/fat/play/pt_BR/listing/fulldescription b/src/fat/play/pt_BR/listing/fulldescription
deleted file mode 100644
index 312a95e2..00000000
--- a/src/fat/play/pt_BR/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-O Syncthing substitui serviços proprietários de sincronização e nuvem com algo aberto, confiável e descentralizado. Seus dados são somente seus e você merece escolher onde são armazenados, se são compartilhados e como são transmitidos pela internet.
-
-Site: https://syncthing.net/
-
-Código-fonte: https://github.com/syncthing/syncthing-android
-
-Fórum: https://forum.syncthing.net/
-
-Erros: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/pt_BR/listing/shortdescription b/src/fat/play/pt_BR/listing/shortdescription
deleted file mode 100644
index 7589bc5f..00000000
--- a/src/fat/play/pt_BR/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Sincronização de arquivos aberta, confiável e descentralizada
\ No newline at end of file
diff --git a/src/fat/play/ro/listing/title b/src/fat/play/ro/listing/title
new file mode 100644
index 00000000..b9a21b0f
--- /dev/null
+++ b/src/fat/play/ro/listing/title
@@ -0,0 +1 @@
+Syncthing
\ No newline at end of file
diff --git a/src/fat/play/zh_CN/listing/fulldescription b/src/fat/play/zh_CN/listing/fulldescription
deleted file mode 100644
index dc4bc7ac..00000000
--- a/src/fat/play/zh_CN/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing 是开源、分布式且值得信赖的同步服务。它为取代专有的云同步服务而生。你的数据尽在您的掌握之中并且可以选择数据存储的位置。例如与第三方共享及如何在互联网中传送。
-
-主页：https://syncthing.net/
-
-源代码：https://github.com/syncthing/syncthing-android
-
-论坛：https://forum.syncthing.net/
-
-问题回报：https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/zh_CN/listing/shortdescription b/src/fat/play/zh_CN/listing/shortdescription
deleted file mode 100644
index e7c59fba..00000000
--- a/src/fat/play/zh_CN/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-开放且值得信赖的分布式文件同步
\ No newline at end of file
diff --git a/src/fat/play/zh_TW/listing/fulldescription b/src/fat/play/zh_TW/listing/fulldescription
deleted file mode 100644
index f83adf9c..00000000
--- a/src/fat/play/zh_TW/listing/fulldescription
+++ /dev/null
@@ -1,9 +0,0 @@
-Syncthing replaces proprietary sync and cloud services with something open, trustworthy and decentralized. Your data is your data alone and you deserve to choose where it is stored, if it is shared with some third party and how it's transmitted over the Internet.
-
-Website: https://syncthing.net/
-
-Source code: https://github.com/syncthing/syncthing-android
-
-Forum: https://forum.syncthing.net/
-
-Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/zh_TW/listing/shortdescription b/src/fat/play/zh_TW/listing/shortdescription
deleted file mode 100644
index 2020025b..00000000
--- a/src/fat/play/zh_TW/listing/shortdescription
+++ /dev/null
@@ -1 +0,0 @@
-Open, trustworthy and decentralized file synchronization
\ No newline at end of file
diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index fa71c93b..42c26a0f 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Отворено и заслужаващо доверие приложение за децентрализирано синхронизиране на файлове.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Добре дошли в Syncthing за Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Изчакване на потребителския интерфейс</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Генериране на ключове за сигурност. Може да отнеме няколко минути.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Добави папка</string>
   <!--Title of the "share device id" menu action-->
@@ -52,7 +60,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Сървър за откриване на устройства</string>
   <string name="restart">Рестартиране</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Идентификатор на папката</string>
   <!--Setting title-->
@@ -78,11 +86,7 @@
   <string name="folder_id_required">Наложително е да въведете идентификатор на папката</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Наложително е да въведете път до папката</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Наистина ли желаете настройките да бъдат изнесени? Съществуващите файлове ще бъдат презаписани.\n\nВНИМАНИЕ! Програми могат да извлекат частния ви ключ от генерирания файл, а чрез него да свалят и синхронизират файлове.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Наистина ли желаете внасянето на нови настройки? Съществуващите файлове ще бъдат презаписани.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Идентификатор на устройството</string>
   <!--Setting title-->
@@ -118,16 +122,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Уеб интерфейс</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Изчакване на потребителския интерфейс</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Генериране на ключове за сигурност. Може да отнеме няколко минути.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Добре дошли в Syncthing за Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing еприложение с отворен код, за синхронизиране на файлове.\n\n\
-За да споделите информация с друго устройство е необходимо да добавите уникалния идентификатор, на даденото устройство, към списъка с устройства. Тогава можете да определите кои папки с кои устройства да се споделят.\n\n
-Ако срещнете проблеми моля докладвайте за тях чрез Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Настройки</string>
@@ -141,7 +135,7 @@
   <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_wifi_turn_on_wifi">За да изберете мрежа, моля включете WiFi</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">Стартира Syncthing с права на Superuser</string>
@@ -168,6 +162,10 @@
   <string name="gui_password">Парола за потребителския интерфейс</string>
   <string name="export_config">Изнасяне на настройките</string>
   <string name="experimental_settings">Експериментално</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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Настройките са изнесени в %1$s</string>
   <string name="import_config">Внасяне на настройки</string>
@@ -179,8 +177,6 @@
   <string name="sttrace_title">Настройки за дебъгване</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">В настройките на STTRACE са разрешени само символите a-z и \',\'</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Нулиране на базата данни</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index e029bdbc..056f8c88 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Otevřená, důvěryhodná a decentralizovaná aplikace pro sdílení souborů.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Vítejte v Syncthing pro Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Pokračovat</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Čeká se na Syncthing GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Generování bezpečnostních klíčů. Toto může trvat pár minut.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Přidat adresář</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">Globální oznamování</string>
   <string name="restart">Restart</string>
   <string name="dialog_confirm_restart">Opravdu chcete restartovat Syncthing?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID adresáře</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <string name="folder_id_required">ID adresáře nesmí být prázdné</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáři nesmí být prázdná</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Opravdu chcete exportovat svou konfiguraci? Existující soubory budou přepsány.\n\nVAROVÁNÍ! Ostatní aplikace budou moci číst váš soukromý klíč ze zálohy a použít ho ke stahování/úpravám synchronizovaných souborů.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Opravud chcete importovat novou konfiguraci? Existující soubory budou přepsány.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Zrušit změny?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID přístroje</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Syncthing GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Čeká se na Syncthing GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generování bezpečnostních klíčů. Toto může trvat pár minut.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Vítejte v Syncthing pro Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing je open-source aplikace pro sdílení souborů.\n\n
-Pro sdílení dat s jinými zařízeními budete potřebovat přidat jejich unikátní ID zařízení do svého listu zařízení. Poté můžete vybrat, které adresáře chcete sdílet s kterým zařízením.\n\n
-Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Nastavení</string>
@@ -144,7 +140,7 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="sync_only_charging">Synchronizovat pouze při nabíjení</string>
   <string name="sync_only_wifi">Synchronizovat pouze přes wifi</string>
   <string name="sync_only_wifi_ssids">Omezit na vybrané sítě wifi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Pro výběr sítí prosím zapněte WiFi.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Pro výběr sítí prosím zapněte WiFi.</string>
   <string name="advanced_folder_picker">Použít rozšířený výběr adresáře</string>
   <string name="advanced_folder_picker_summary">Vyberte jakýkoliv adresář v přístroji pro synchronizaci</string>
   <string name="use_root_title">Spustit syncthing jako superuživatel</string>
@@ -178,8 +174,12 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="keep_wakelock_while_binary_running_summary">Použijte toto nastavení pokud zaznamenáváte neočekávaná ukončení spojení při běhu na baterii. Toto bude mít za následek vyšší spotřebu energie.</string>
   <string name="run_as_foreground_service">Spustit službu na popředí</string>
   <string name="run_as_foreground_service_summary">Pokud je povoleno, Syncthing poběží na popředí a bude méně pravděpodobné, že bude zastaven systémem Android. Toto může způsobit zastavení jiných služeb v případě nedostatku paměti. Android přesto vyžaduje zobrazení upozornění s nízkou prioritou, bez ohledu na zvolená nastavení \"Upozornění\".</string>
-  <string name="use_tor_title">Použít TOR</string>
-  <string name="use_tor_summary">Pro zvýšení bezpečnosti použít výhradně přenosy po síti TOR</string>
+  <string name="use_tor_title">Použít Tor</string>
+  <string name="use_tor_summary">Pro zvýšení bezpečnosti použít výhradně přenosy po síti TOR. Vyžadován Orbot</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Opravdu chcete exportovat svou konfiguraci? Existující soubory budou přepsány.\n\nVAROVÁNÍ! Ostatní aplikace budou moci číst váš soukromý klíč ze zálohy a použít ho ke stahování/úpravám synchronizovaných souborů.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Opravud chcete importovat novou konfiguraci? Existující soubory budou přepsány.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Nastavení bylo zálohováno do %1$s</string>
   <string name="import_config">Nahrát nastavení</string>
@@ -191,8 +191,6 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="sttrace_title">Možnosti ladění</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">V STTRACE jsou povoleny pouze znaky a-z a \',\'</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Resetovat databázi</string>
   <!--Syncthing was reset-->
@@ -236,6 +234,7 @@ Všechny problémy, se kterými se setkáte, nahlašte prosím přes Github.</st
   <string name="log_android_title">Zobrazit log pro Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Zobrazit log pro Syncthing</string>
+  <string name="retrieving_logs">Získávám logy...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Sdílet</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 68020cca..a831c20f 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Eine offene, vertrauenswürdige und dezentralisierte Anwendung zur Dateisynchronisation.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Willkommen bei Syncthing für Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Weiter</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Warte auf Weboberfläche</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Geheimschlüssel werden generiert. Dies kann einige Minuten dauern.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Verzeichnis hinzufügen</string>
   <!--Title of the "share device id" menu action-->
@@ -52,10 +61,12 @@
   <!--Title for announce server status-->
   <string name="announce_server">Indexserver</string>
   <string name="restart">Neustart</string>
-  <!--FolderSettingsFragment-->
+  <string name="dialog_confirm_restart">Möchtest du Syncthing neu starten?</string>
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Verzeichnis-ID</string>
   <!--Setting title-->
+  <string name="folder_label">Verzeichnisbezeichnung</string>
   <!--Setting title-->
   <string name="directory">Verzeichnis</string>
   <!--Setting title-->
@@ -78,11 +89,8 @@
   <string name="folder_id_required">Die Verzeichnis ID darf nicht leer sein</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Der Verzeichnispfad darf nicht leer sein</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Soll die Konfiguration wirklich exportiert werden? Vorhandene Dateien werden überschrieben.\n\nACHTUNG! Andere Anwendungen können möglicherweise den privaten Schlüssel im Backupverzeichnis lesen und dazu verwenden, um synchronisierte Dateien herunterzuladen und zu verändern.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Soll wirlkich eine neue Konfiguration importiert werden? Vorhandene Dateien werden überschrieben.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Deine Änderungen verwerfen?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Geräte-ID</string>
   <!--Setting title-->
@@ -119,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Weboberfläche</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Warte auf Weboberfläche</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Geheimschlüssel werden generiert. Dies kann einige Minuten dauern.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Willkommen bei Syncthing für Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing ist eine quell offene Applikation zum Synchronisieren von Dateien.\n\n\
-Um Daten mit anderen Geräten zu teilen musst du deren Geräte ID in die Liste der Geräte hinzufügen. Danach kannst du die Verzeichnisse auswählen, welche mit den Geräten geteilt werden sollen.\n\n
-Bitte auftretenden Probleme via Github melden.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Einstellungen</string>
@@ -142,10 +140,11 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="sync_only_charging">Sync nur mit Ladegerät</string>
   <string name="sync_only_wifi">Sync nur im WLAN</string>
   <string name="sync_only_wifi_ssids">Nur in bestimmten WLAN Netzwerken</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Bitte WLAN aktivieren, um eines zu wählen.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Bitte WLAN aktivieren, um eines zu wählen.</string>
   <string name="advanced_folder_picker">Erweiterte Verzeichnisauswahl benutzen</string>
   <string name="advanced_folder_picker_summary">Alle Verzeichnisse auf dem Gerät für Synchronisation auswählbar</string>
   <string name="use_root_title">Syncthing mit Superuser Rechten ausführen</string>
+  <string name="use_root_summary">Dies ist eine instabile Funktion, welche Probleme mit Syncthing und deinem Gerät verursachen könnte. Wenn du Probleme feststellst, musst du Syncthing möglicherweise neu installieren.</string>
   <string name="notification_type_title">Permanente Benachrichtigung</string>
   <string name="notification_type_summary">Wähle die Art der Benachrichtigung</string>
   <string-array name="notification_type_entries">
@@ -159,9 +158,11 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="listen_address">Adresse(n) für das Synchronisierungsprotokoll</string>
   <string name="max_recv_kbps">Eingehende Datenrate Limite (KiB/s)</string>
   <string name="max_send_kbps">Ausgehende Datenrate Limite (KiB/s)</string>
-  <string name="global_announce_enabled">Globale Auffindung</string>
-  <string name="local_announce_enabled">Lokale Auffindung</string>
+  <string name="global_announce_enabled">Globale Gerätesuche</string>
+  <string name="local_announce_enabled">Lokale Gerätesuche</string>
+  <string name="enable_nat_traversal">NAT-Traversal aktivieren</string>
   <string name="global_announce_server">Globaler Indexserver</string>
+  <string name="enable_relaying">Weiterleitung aktivieren</string>
   <string name="usage_reporting">Anonymer Nutzungsbericht</string>
   <string name="syncthing_gui">Syncthing-Weboberfläche</string>
   <string name="gui_address">Adressen für Weboberfläche</string>
@@ -171,6 +172,14 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="experimental_settings">Experimentell</string>
   <string name="keep_wakelock_while_binary_running">Prozessor wach halten während Syncthing läuft.</string>
   <string name="keep_wakelock_while_binary_running_summary">Nutze dieses Einstellung, wenn du unerwartete Verbindungsabbrüche hast, während du im Batteriebetrieb arbeitest. Das wird zu einem erhöhten Energieverbrauch führen.</string>
+  <string name="run_as_foreground_service">Führe Dienst mit Vordergrund-Priorität aus</string>
+  <string name="run_as_foreground_service_summary">Wenn aktiviert, wird Syncthing mit Vordergrund-Priorität ausgeführt und weniger wahrscheinlich durch Android gestoppt. Dies könnte das Stoppen anderer Dienste verursachen, wenn der verfügbare Speicher gering ist. Das Anzeigen einer Benachrichtigung niedriger Priorität wird hierfür von Android erfordert, ungeachtet der Benachrichtigung-Einstellung.</string>
+  <string name="use_tor_title">Tor benutzen</string>
+  <string name="use_tor_summary">Der gesamte Netzwerkverkehr wird zur Erhöhung der Privatsphäre über Tor geleitet. Benötigt Orbot.</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Soll die Konfiguration wirklich exportiert werden? Vorhandene Dateien werden überschrieben.\n\nACHTUNG! Andere Anwendungen können möglicherweise den privaten Schlüssel im Backupverzeichnis lesen und dazu verwenden, um synchronisierte Dateien herunterzuladen und zu verändern.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Soll wirlkich eine neue Konfiguration importiert werden? Vorhandene Dateien werden überschrieben.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Konfiguration exportiert nach %1$s</string>
   <string name="import_config">Konfiguration importieren</string>
@@ -182,8 +191,6 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="sttrace_title">Fehlersuchoptionen</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Nur a-z und \',\' sind in STTRACE Optionen errlaubt</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Datenbank zurücksetzen</string>
   <!--Syncthing was reset-->
@@ -227,6 +234,7 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="log_android_title">Zeige Android-Log</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Zeige Syncthing-Log</string>
+  <string name="retrieving_logs">Rufe Protokoll ab...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Teilen</string>
   <!--SyncthingService-->
@@ -240,6 +248,7 @@ Bitte auftretenden Probleme via Github melden.</string>
   <string name="exit">Beenden</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing läuft</string>
+  <string name="syncthing_active_foreground">Dienst wird mit Vordergrund-Priorität ausgeführt.</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
   <string name="toast_folder_observer_stack_overflow">Verzeichnisbaum zu verschachtelt. Auf zyklische symlinks prüfen</string>
   <!--Toast shown if syncthing failed to create a config-->
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 1b960f38..9d04cbad 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -1,7 +1,12 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Προσθήκη φακέλου</string>
   <!--Title of the "share device id" menu action-->
@@ -37,7 +42,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -52,9 +57,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -71,23 +74,19 @@
   <!--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-->
   <string name="category_syncthing">Syncthing</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index a3e05154..ad03a825 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Una aplicación para sincronización de archivos abierta, confiable y descentralizada.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Bienvenido a Syncthing para Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Esperando por la Interfaz</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Generando llaves seguras. Esto pude tomar algunos minutos.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Añadir carpeta</string>
   <!--Title of the "share device id" menu action-->
@@ -52,7 +60,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Anunciar Servidor</string>
   <string name="restart">Reiniciar</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID de la carpeta</string>
   <!--Setting title-->
@@ -78,11 +86,7 @@
   <string name="folder_id_required">El ID de la carpeta no debe estar vacío</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta de la carpeta no debe estar vacía</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">¿Realmente quiere exportar su configuración? Los archivos existentes se sobreescribirán.\n\n¡ADVERTENCIA! Otras aplicaciones pudieran leer la llave privada desde la ubicación del respaldo y usarla para descargar/modificar los archivos sincronizados.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">¿Realmente quiere importar una nueva configuración? Los archivos existentes se sobreescribirán.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
   <!--Setting title-->
@@ -119,16 +123,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz Web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Esperando por la Interfaz</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generando llaves seguras. Esto pude tomar algunos minutos.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Bienvenido a Syncthing para Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing es una aplicación de sincronización de archivos de código abierto.\n\n
-Para compartir datos con otros dispositivos, usted necesita añadir el ID único del dispositivo a la lista de dispositivos. Después puede seleccionar cuáles carpetas compartir con cuáles dispositivos.\n\n
-Por favor reporte cualquier problema que encuentre por medio de Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Configuración</string>
@@ -142,7 +136,7 @@ Por favor reporte cualquier problema que encuentre por medio de Github.</string>
   <string name="sync_only_charging">Sincronizar sólo cuando se está cargando</string>
   <string name="sync_only_wifi">Sincronizar sólo por wifi</string>
   <string name="sync_only_wifi_ssids">Restringir a ciertas redes wifi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor encienda el WiFi para seleccionar redes.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor encienda el WiFi para seleccionar redes.</string>
   <string name="advanced_folder_picker">Usar el avanzado Seleccionador de Carpetas</string>
   <string name="advanced_folder_picker_summary">Seleccionar cualquier carpeta en el dispositivo para sincronizar</string>
   <string name="use_root_title">Ejecutar Syncthing como Superusuario</string>
@@ -171,6 +165,10 @@ Por favor reporte cualquier problema que encuentre por medio de Github.</string>
   <string name="experimental_settings">Experimental</string>
   <string name="keep_wakelock_while_binary_running">Mantener el CPU encendido mientras Syncthing está en ejecución</string>
   <string name="keep_wakelock_while_binary_running_summary">Use estos ajustes si experimenta desconexiones inesperadas mientras opera con la batería. Esto resultará en un consumo elevado de batería.</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">¿Realmente quiere exportar su configuración? Los archivos existentes se sobreescribirán.\n\n¡ADVERTENCIA! Otras aplicaciones pudieran leer la llave privada desde la ubicación del respaldo y usarla para descargar/modificar los archivos sincronizados.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">¿Realmente quiere importar una nueva configuración? Los archivos existentes se sobreescribirán.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Configuración exportada a %1$s</string>
   <string name="import_config">Importar Configuración</string>
@@ -182,8 +180,6 @@ Por favor reporte cualquier problema que encuentre por medio de Github.</string>
   <string name="sttrace_title">Opciones de depuración</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Sólo (a-z) y (\',\') están permitidos en las opciones de STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reiniciar Base de Datos</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 526979c5..5f7736e6 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Una aplicación de sincronización de ficheros abierta, de confianza y descentralizada.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Bienvenido a Syncthing para Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Esperando la interfaz gráfica</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Generando llaves seguras. Esto puede tomar un tiempo.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Añadir carpeta</string>
   <!--Title of the "share device id" menu action-->
@@ -49,7 +57,7 @@
   <string name="ram_usage">Uso de RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de Anuncio</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID de carpeta</string>
   <!--Setting title-->
@@ -74,11 +82,7 @@
   <string name="folder_id_required">El ID de carpeta no debe estar vacío</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta a la carpeta no puede estar vacia</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Realmente quieres exportar tu configuración? Los ficheros existentes seran sobrescritos.\n\nAVISO! Otras aplicaciones puede pueden leer la llave privada del sitio de backup y usarla para descargar/modificar ficheros sincronizados.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">¿Realmente desea importar una nueva configuración? Se sobrescribirán los archivos existentes.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
   <!--Setting title-->
@@ -114,16 +118,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz gráfica web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Esperando la interfaz gráfica</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generando llaves seguras. Esto puede tomar un tiempo.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Bienvenido a Syncthing para Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing es una aplicación de sincronización de ficheros de código abierto.\n\n
-Para compartir datos con otros dispositivos necesitas añadir el ID único del dispositivo a la lista de dispositivos. Después podrá seleccionar las carpetas a compartir con los dispositivos.\n\n
-Por favor informe de qualquier problema que encuentres via Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Ajustes</string>
@@ -137,7 +131,7 @@ Por favor informe de qualquier problema que encuentres via Github.</string>
   <string name="sync_only_charging">Sincronizar solo cuando esté cargando</string>
   <string name="sync_only_wifi">Sincronizar sólo en wifi</string>
   <string name="sync_only_wifi_ssids">Restringir a algunas redes wifi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el WIFI en las redes seleccionadas.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el WIFI en las redes seleccionadas.</string>
   <string name="advanced_folder_picker">Usar Selección Avanzada de carpeta</string>
   <string name="advanced_folder_picker_summary">Escoja una carpeta del dispositivo para sincronizar</string>
   <string name="use_root_title">Ejecutar Syncthing como Superusuario</string>
@@ -163,6 +157,10 @@ Por favor informe de qualquier problema que encuentres via Github.</string>
   <string name="gui_user">Usuario de Autenticación GUI</string>
   <string name="gui_password">Contraseña de Autenticación GUI</string>
   <string name="export_config">Exportar Configuración</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Realmente quieres exportar tu configuración? Los ficheros existentes seran sobrescritos.\n\nAVISO! Otras aplicaciones puede pueden leer la llave privada del sitio de backup y usarla para descargar/modificar ficheros sincronizados.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">¿Realmente desea importar una nueva configuración? Se sobrescribirán los archivos existentes.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">La configuración fue exportada a %1$s</string>
   <string name="import_config">Importar Configuración</string>
@@ -174,8 +172,6 @@ Por favor informe de qualquier problema que encuentres via Github.</string>
   <string name="sttrace_title">Opciones de depuración</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Sólo se permiten a-z y \',\' en las opciones STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Restablecer base de datos</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 22c7f774..994f06af 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -2,34 +2,43 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Une application ouverte, fiable et décentralisée pour synchroniser des fichiers.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Bienvenue dans Syncthing pour Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Continuer</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">En attente de l\'interface WEB</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Génération des clefs de sécurité. Cela peut prendre quelques minutes.</string>
   <!--Title of the "add folder" menu action-->
-  <string name="add_folder">Ajouter dossier</string>
+  <string name="add_folder">Ajouter un partage</string>
   <!--Title of the "share device id" menu action-->
-  <string name="share_device_id">Partager ID machine</string>
+  <string name="share_device_id">Partager ID appareil</string>
   <!--Shown in the chooser dialog when sharing a Device ID-->
-  <string name="send_device_id_to">Envoyer ID machine à</string>
+  <string name="send_device_id_to">Envoyer ID appareil à</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Chargement...</string>
   <string name="usage_reporting_dialog_title">Autoriser l\'envoi anonyme de rapports d\'utilisation ?</string>
-  <string name="usage_reporting_dialog_description">Le rapport crypté des usages est envoyé tous les jours. Il est utilisé pour recueillir les types de plateformes, la tailles des dossiers et les versions d\'applications. Si le type de données envoyées dans les rapports est modifié, vous verrez à nouveau cette boite de dialogue.\n\nL\'agrégation des statistiques est publique, et disponible sur https://data.syncthing.net.</string>
+  <string name="usage_reporting_dialog_description">Le rapport crypté des usages est envoyé tous les jours. Il est utilisé pour recueillir les types de plates-formes, la tailles des partages et les versions d\'applications. Si le type de données envoyées dans les rapports est modifié, vous verrez à nouveau cette boite de dialogue.\n\nL\'agrégation des statistiques est publique, et disponible sur https://data.syncthing.net.</string>
   <string name="yes">Oui</string>
   <string name="no">Non</string>
   <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="folder_rejected">La machine %1$s veut partager le dossier %2$s</string>
+  <string name="device_rejected">L\'appareil %1$s veut se connecter</string>
+  <string name="folder_rejected">L\'appareil %1$s veut partager %2$s</string>
   <!--FoldersFragment-->
-  <string name="folders_fragment_title">Dossiers</string>
+  <string name="folders_fragment_title">Partages</string>
   <!--Shown if no folders exist-->
-  <string name="folder_list_empty">Aucun dossier trouvé</string>
+  <string name="folder_list_empty">Aucun partage trouvé</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d fichiers</string>
   <!--DevicesFragment-->
-  <string name="devices_fragment_title">Machines</string>
+  <string name="devices_fragment_title">Appareils</string>
   <!--Shown if no devices exist-->
-  <string name="devices_list_empty">Aucune machine trouvée</string>
+  <string name="devices_list_empty">Aucun appareil trouvé</string>
   <!--Indicates that a folder is fully synced to the local device-->
   <string name="device_up_to_date">Synchronisé</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
@@ -44,7 +53,7 @@
   <!--Same as download_title with a colon and space appended-->
   <string name="download_title_colon">Réception:\u0020</string>
   <!--Same as upload_title with a colon and space appended-->
-  <string name="upload_title_colon">Emission:\u0020</string>
+  <string name="upload_title_colon">Émission:\u0020</string>
   <!--Title for current CPU usage-->
   <string name="cpu_usage">Utilisation du CPU</string>
   <!--Title for current RAM usage-->
@@ -53,42 +62,39 @@
   <string name="announce_server">Serveur d\'annonce</string>
   <string name="restart">Redémarrer</string>
   <string name="dialog_confirm_restart">Voulez-vous redémarrer Syncthing ?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
-  <string name="folder_id">ID du dossier</string>
+  <string name="folder_id">ID du partage</string>
   <!--Setting title-->
   <string name="folder_label">Étiquette du répertoire</string>
   <!--Setting title-->
-  <string name="directory">Dossier</string>
+  <string name="directory">Répertoire</string>
   <!--Setting title-->
-  <string name="folder_master">Dossier maitre</string>
+  <string name="folder_master">Partage maître</string>
   <!--Setting title-->
-  <string name="devices">Machines</string>
+  <string name="devices">Appareils</string>
   <!--Setting title-->
   <string name="keep_versions">Conserver les versions</string>
   <!--Setting title-->
-  <string name="delete_folder">Supprimer le dossier</string>
+  <string name="delete_folder">Supprimer le partage</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Création d\'un dossier</string>
+  <string name="create_folder">Création d\'un partage</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Édition du dossier</string>
+  <string name="edit_folder">Modification du partage</string>
   <!--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>
+  <string name="remove_folder_confirm">Voulez-vous vraiment enlever ce partage 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>
+  <string name="folder_id_required">L\'ID du partage ne doit pas être vide</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">Le chemin du dossier ne doit pas être vide</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Voulez-vous vraiment exporter votre configuration ? Les fichiers existants seront écrasés.\n\n ATTENTION ! D\'autres applications pourraient lire la clé privée située à l\'emplacement de sauvegarde et l\'utiliser pour télécharger/modifier les fichiers synchronisés.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Voulez-vous vraiment importer la nouvelle configuration ? Les paramètres existants seront écrasés.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="folder_path_required">Le chemin du répertoire ne doit pas être vide</string>
+  <string name="dialog_discard_changes">Annuler vos modifications ?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
-  <string name="device_id">ID machine</string>
+  <string name="device_id">Mon ID</string>
   <!--Setting title-->
-  <string name="name">Nom</string>
+  <string name="name">Nom convivial optionnel</string>
   <!--Setting title-->
   <string name="addresses">Adresses</string>
   <!--Setting title-->
@@ -104,16 +110,16 @@
   <!--Setting title-->
   <string name="introducer">Initiateur</string>
   <!--ActionBar item-->
-  <string name="delete_device">Supprimer la machine</string>
-  <string name="add_device">Ajout d\'une machine</string>
+  <string name="delete_device">Supprimer l\'appareil</string>
+  <string name="add_device">Ajout d\'un appareil</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>
+  <string name="edit_device">Modification de l\'appareil</string>
   <!--Dialog shown when attempting to remove a device-->
-  <string name="remove_device_confirm">Voulez-vous vraiment enlever cette machine ?</string>
+  <string name="remove_device_confirm">Voulez-vous vraiment enlever cet appareil ?</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>
+  <string name="device_id_required">L\'ID d\'appareil 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-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface WEB</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">En attente de l\'interface WEB</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Génération des clefs de sécurité. Cela peut prendre quelques minutes.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Bienvenue dans Syncthing pour Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing est une application \"open-source\" de synchronisation de fichiers.\n\n\
-Pour partager des données avec une autre machine, vous devez ajouter l\'identifiant unique machine (ID), sur chacune d\'elles dans la liste des machines. Ensuite, vous pourrez sélectionner quel dossier partager avec quelle machine.\n\n
-S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Paramètres</string>
@@ -144,11 +140,11 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="sync_only_charging">Synchro uniquement sur chargeur</string>
   <string name="sync_only_wifi">Synchro uniquement en WiFi</string>
   <string name="sync_only_wifi_ssids">Limiter à certains réseaux WiFi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">S\'il vous plait, activer le WiFi pour sélectionner un réseau</string>
-  <string name="advanced_folder_picker">Choix étendu des dossiers</string>
-  <string name="advanced_folder_picker_summary">Autorise la sélection n\'importe quel dossier de cette machine pour la synchronisation</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Veuillez activer le WiFi pour sélectionner un réseau</string>
+  <string name="advanced_folder_picker">Choix étendu des répertoires</string>
+  <string name="advanced_folder_picker_summary">Permettre la sélection de n\'importe quel répertoire de cet appareil pour créer les partages</string>
   <string name="use_root_title">Faire fonctionner syncthing en super-utilisateur</string>
-  <string name="use_root_summary">Ceci est une fonction instable qui peut causer des problèmes entre Syncthing et votre machine. Si vous rencontrez des problèmes, vous devrez réinstaller Syncthing.</string>
+  <string name="use_root_summary">Ceci est une fonction instable qui peut causer des problèmes entre Syncthing et votre appareil. Si vous rencontrez des problèmes, vous devrez réinstaller Syncthing.</string>
   <string name="notification_type_title">Notification</string>
   <string name="notification_type_summary">Choisissez le mode de notification</string>
   <string-array name="notification_type_entries">
@@ -158,7 +154,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   </string-array>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Options Syncthing</string>
-  <string name="device_name">Nom de machine</string>
+  <string name="device_name">Nom de l\'appareil</string>
   <string name="listen_address">Adresse d\'écoute pour la synchro</string>
   <string name="max_recv_kbps">Limite du débit de réception (Ko/s)</string>
   <string name="max_send_kbps">Limite du débit d\'émission (Ko/s)</string>
@@ -177,6 +173,13 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="keep_wakelock_while_binary_running">Garder le CPU en éveil quand Syncthing fonctionne.</string>
   <string name="keep_wakelock_while_binary_running_summary">Utilisez ce paramètre si vous rencontrez des déconnexions inattendues en fonctionnant sur batterie. Il en résultera une augmentation de la consommation de la batterie.</string>
   <string name="run_as_foreground_service">Fonctionner avec prioriré de premier plan</string>
+  <string name="run_as_foreground_service_summary">Si activé, Syncthing fonctionnera avec une priorité de premier plan et est moins susceptible d\'être arrêté par Android. Cela peut provoquer l\'arrêt d\'autres services si la mémoire disponible devient faible. En raison des exigences d\'Android, quel que soit le réglage \"Notification\", une notification de faible priorité devra être affichée.</string>
+  <string name="use_tor_title">Utiliser Tor</string>
+  <string name="use_tor_summary">Forcer tout le trafic à passer par Tor pour plus de discrétion. Nécessite Orbot.</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Voulez-vous vraiment exporter votre configuration ? Les fichiers existants seront écrasés.\n\n ATTENTION ! D\'autres applications pourraient lire la clé privée située à l\'emplacement de sauvegarde et l\'utiliser pour télécharger/modifier les fichiers synchronisés.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Voulez-vous vraiment importer la nouvelle configuration ? Les paramètres existants seront écrasés.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">La configuration a été exportée dans %1$s</string>
   <string name="import_config">Importer la configuration</string>
@@ -188,8 +191,6 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="sttrace_title">Options de débuggage</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Seuls, les caractères a-z et \',\' sont autorisés dans les options STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Remise à zéro de la base de données</string>
   <!--Syncthing was reset-->
@@ -217,16 +218,16 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="app_version_title">Version de Syncthing pour Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
-  <string name="folder_picker_title">Sélection du dossier</string>
+  <string name="folder_picker_title">Sélection du répertoire</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 stockages externes.</string>
   <!--ListView empty text-->
-  <string name="directory_empty">Le dossier est vide</string>
+  <string name="directory_empty">Le répertoire est vide</string>
   <!--Menu item to create folder on the file system-->
-  <string name="create_fs_folder">Créer un nouveau dossier</string>
+  <string name="create_fs_folder">Créer un nouveau partage</string>
   <!--Menu item to select the current folder-->
-  <string name="select_folder">Sélectionner ce dossier</string>
-  <string name="create_folder_failed">Echec de création du dossier</string>
+  <string name="select_folder">Choisir ce répertoire</string>
+  <string name="create_folder_failed">Échec de création du partage</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
   <string name="log_title">Journal</string>
@@ -234,6 +235,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <string name="log_android_title">Voir le journal Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Voir le journal Syncthing</string>
+  <string name="retrieving_logs">Récupération des journaux....</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Partage</string>
   <!--SyncthingService-->
@@ -266,7 +268,7 @@ S\'il vous plait, signalez les problèmes que vous rencontrez via Gihub.</string
   <!--Text of the notification shown when a restart is needed-->
   <string name="restart_notification_text">Cliquez ici pour redémarrer Syncthing</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">L\'ID machine est copié dans le bloc-notes</string>
+  <string name="device_id_copied_to_clipboard">L\'ID d\'appareil est copié dans le bloc-notes</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>o</item>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index e541d9c8..e2af0f4e 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -2,7 +2,14 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Egy nyílt, megbízható és decentralizált fájl szinkronizáló alkalmazás.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Üdvözöl az androidos Syncthing.</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Várakozás a felületre</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Mappa hozzáadása</string>
   <!--Title of the "share device id" menu action-->
@@ -46,7 +53,7 @@
   <!--Title for current RAM usage-->
   <string name="ram_usage">Memória használat</string>
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Mappa azonosító</string>
   <!--Setting title-->
@@ -71,9 +78,7 @@
   <string name="folder_id_required">A mappaazonosító nem lehet üres</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">A mappaútvonal nem lehet üres</string>
-  <!--Dialog shown before config export-->
-  <!--Dialog shown before config import-->
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Eszköz azonosító</string>
   <!--Setting title-->
@@ -103,12 +108,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Várakozás a felületre</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Üdvözöl az androidos Syncthing.</string>
-  <!--Text for dialog displayed on first start-->
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Beállítások</string>
@@ -120,7 +119,7 @@
   <string name="sync_only_charging">Csak töltés közbeni szinkronizálás</string>
   <string name="sync_only_wifi">Szinkronizálás csak WiFi-n keresztül</string>
   <string name="sync_only_wifi_ssids">Korlátozás bizonyos wifi hálózatokra</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hálózat választásához kapcsold be a wifit.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hálózat választásához kapcsold be a wifit.</string>
   <string name="use_root_title">Syncthing futtatása Superuser-ként</string>
   <string name="notification_type_title">Értesítés</string>
   <string name="notification_type_summary">Értesítés típusának kiválasztása</string>
@@ -132,14 +131,14 @@
   <string name="global_announce_server">Globális felfedező szerver</string>
   <string name="syncthing_gui">Syncthing GUI</string>
   <string name="export_config">Beállítások mentése</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--Toast shown after config was successfully exported-->
   <string name="import_config">Beállítások betöltése</string>
   <!--Toast shown after config was successfully imported-->
   <!--Toast shown after config was successfully imported-->
   <!--Title for the preference to set STTRACE parameters-->
   <!--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-->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 53eda82e..9b5745b9 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -2,7 +2,12 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Terbuka, dapat dipercaya dan terdesentralisasi aplikasi sinkronisasi berkas</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Tambah Folder</string>
   <!--Title of the "share device id" menu action-->
@@ -45,7 +50,7 @@
   <string name="ram_usage">Penggunaan RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Server Penyiaran</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID Folder</string>
   <!--Setting title-->
@@ -63,9 +68,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -82,23 +85,19 @@
   <!--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-->
   <string name="category_syncthing">Syncthing</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index e830c5b1..37d976f0 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Un\'applicazione affidabile, decentralizzata e aperta per la sincronizzazione di file.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Benvenuto in Syncthing per Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Continua</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Caricamento Interfaccia Web</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Generazione delle chiavi in corso. Potrebbe essere necessario qualche minuto.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Nuova Cartella</string>
   <!--Title of the "share device id" menu action-->
@@ -51,9 +60,9 @@
   <string name="ram_usage">Utilizzo RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Server Presenza Globale</string>
-  <string name="restart">Riavvia ora</string>
+  <string name="restart">Riavvia</string>
   <string name="dialog_confirm_restart">Vuoi riavviare Syncthing?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID Cartella</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <string name="folder_id_required">L\'ID Cartella non può essere vuoto</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Il percorso della cartella non può essere vuoto</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Vuoi veramente esportare la tua configurazione? I files esistenti verranno sovrascritti.n\nATTENZIONE! Le altre applicazioni potrebbero non essere in grado di leggere la chiave privata dalla locazione di backup e usarla per scaricare/modificare i files sincronizzati.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Vuoi realmente importare una nuova configurazione? I files esistenti verranno sovrascritti.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Annullare le modifiche?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID Dispositivo</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaccia Web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Caricamento Interfaccia Web</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generazione delle chiavi in corso. Potrebbe essere necessario qualche minuto.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Benvenuto in Syncthing per Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing è un\'applicazione open-source per la sincronizzazione di file.\n\n
-Per condividere dati con altri dispositivi devi aggiungere il loro ID dispositivo alla lista. Fatto ciò potrai selezionare quali cartelle condividere, e con quali dispositivi.\n\n
-Riferisci tramite Github i problemi che incontri.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Impostazioni</string>
@@ -144,7 +140,7 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="sync_only_charging">Sincr. solo in Ricarica</string>
   <string name="sync_only_wifi">Sincr. solo in Wifi</string>
   <string name="sync_only_wifi_ssids">Solo determinate reti wifi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Prego accendere wifi per selezionare reti.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Prego accendere wifi per selezionare reti.</string>
   <string name="advanced_folder_picker">Selettore Cartella Avanzato</string>
   <string name="advanced_folder_picker_summary">Selezionare una cartella sul dispositivo per la sincronizzazione</string>
   <string name="use_root_title">Esegui Syncthing come Superutente</string>
@@ -178,8 +174,12 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="keep_wakelock_while_binary_running_summary">Usa questa impostazione se rilevi disconnessioni inaspettate durante il funzionamento a batteria. Questo aumenterà il consumo della batteria.</string>
   <string name="run_as_foreground_service">Esegui il servizio con la priorità di primo piano</string>
   <string name="run_as_foreground_service_summary">Se abilitato, Syncthing verrà eseguito con la priorità di primo piano e ha meno probabilità di essere fermato da Android. Ciò potrebbe causare l\'arresto di altri servizi se la memoria disponibile è scarsa. Una notifica a bassa priorità deve essere visualizzata a causa di requisiti di Android, a prescindere dall\'impostazione \"Notifica\".</string>
-  <string name="use_tor_title">Utilizza TOR</string>
-  <string name="use_tor_summary">Forzare tutto il traffico attraverso TOR per maggiore privacy</string>
+  <string name="use_tor_title">Utilizza Tor</string>
+  <string name="use_tor_summary">Forza tutto il traffico attraverso Tor per una maggiore privacy. Richiede Orbot</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Vuoi veramente esportare la tua configurazione? I files esistenti verranno sovrascritti.n\nATTENZIONE! Le altre applicazioni potrebbero non essere in grado di leggere la chiave privata dalla locazione di backup e usarla per scaricare/modificare i files sincronizzati.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Vuoi realmente importare una nuova configurazione? I files esistenti verranno sovrascritti.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Config è stata esportata in %1$s</string>
   <string name="import_config">Importa Configurazione</string>
@@ -191,8 +191,6 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="sttrace_title">Opzioni di Debug</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Solo le lettere da a-z e la virgola \',\' sono consentiti nelle opzioni STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reset del Database</string>
   <!--Syncthing was reset-->
@@ -237,6 +235,7 @@ Riferisci tramite Github i problemi che incontri.</string>
   <string name="log_android_title">Mostra Registro di Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Mostra Registro di Syncthing</string>
+  <string name="retrieving_logs">Recupero log...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Condividi</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 0c28dbb9..67510c6d 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">オープンで、信頼できる、分散されたファイル同期アプリケーション。</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Syncthing for Android にようこそ</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">続行</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">GUI を待機中</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">セキュア鍵を生成しています。しばらくお待ちください。</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">フォルダーを追加</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">アナウンスサーバー</string>
   <string name="restart">再起動</string>
   <string name="dialog_confirm_restart">Syncthing を再起動しますか?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">フォルダー ID</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <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-->
+  <string name="dialog_discard_changes">変更を破棄しますか?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">デバイス ID</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">GUI を待機中</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">セキュア鍵を生成しています。しばらくお待ちください。</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Syncthing for Android にようこそ</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing は、オープンソースのファイル同期アプリケーションです。\n\n
-他のデバイスとデータを共有するには、デバイスリストにその一意のデバイスIDを追加する必要があります。その後で、そのデバイスと共有するフォルダーを選択することができます。\n\n
-発生した問題はすべて GitHub で報告してください。</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">設定</string>
@@ -144,7 +140,7 @@
   <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_wifi_turn_on_wifi">ネットワークを選択するために WiFi をオンにしてください。</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">スーパーユーザーとして同期を実行します</string>
@@ -178,8 +174,12 @@
   <string name="keep_wakelock_while_binary_running_summary">バッテリーで動作しているときに予期しない接続の切断が発生した場合、この設定を使用します。これは、バッテリー消費を増やします。</string>
   <string name="run_as_foreground_service">フォアグラウンドの優先度でサービスを実行する</string>
   <string name="run_as_foreground_service_summary">有効にした場合、Syncthing はフォアグラウンドの優先度で実行し、Android によって停止される可能性が低くなります。使用可能なメモリが不足している場合、他のサービスが停止されることがあります。「通知」の設定にかかわらず、Android の要求に起因して低い優先度の通知が表示される必要があります。</string>
-  <string name="use_tor_title">TOR を使用する</string>
-  <string name="use_tor_summary">プライバシー保護のため、強制的にすべてのトラフィックを TOR を介します</string>
+  <string name="use_tor_title">Tor を使用する</string>
+  <string name="use_tor_summary">プライバシー保護のため、強制的にすべてのトラフィックを Tor を介します。Orbot が必要です</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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">設定を %1$s にエクスポートしました</string>
   <string name="import_config">設定をインポート</string>
@@ -191,8 +191,6 @@
   <string name="sttrace_title">デバッグオプション</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">STTRACE オプションでは、a-z および \',\' のみ使用できます。</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">データベースをリセット</string>
   <!--Syncthing was reset-->
@@ -236,6 +234,7 @@
   <string name="log_android_title">Android ログを表示</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Syncthing ログを表示</string>
+  <string name="retrieving_logs">ログの取得中…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">共有</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index f0bcffea..5567963e 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">공개되어 믿을 수 있는, 분산 파일 동기화 응용 프로그램.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Android용 Syncthing에 어서오세요</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">계속</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">GUI를 기다리는 중</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">보안 키 생성 중. 몇 분 정도 소요될 수 있습니다.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">폴더 추가</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">익명 서버</string>
   <string name="restart">재시작</string>
   <string name="dialog_confirm_restart">정말로 Syncthing을 재시작하시겠습니까?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">폴더 ID</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <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-->
+  <string name="dialog_discard_changes">설정 변경을 취소합니까?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">기기 ID</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">웹 GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">GUI를 기다리는 중</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">보안 키 생성 중. 몇 분 정도 소요될 수 있습니다.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Android용 Syncthing에 어서오세요</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing은 오픈 소스 파일 동기화 응용 프로그램입니다.\n\n\
-다른 기기와 데이터를 공유하려면, 기기 목록에 해당 기기의 고유한 기기 ID를 추가해야 합니다. 이후, 해당 기기와 공유할 폴더를 선택할 수 있습니다.\n\n\
-문제가 발생하는 경우 Github를 통해 문의해 주세요.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">설정</string>
@@ -144,7 +140,7 @@
   <string name="sync_only_charging">충전 중일 때만 동기화</string>
   <string name="sync_only_wifi">Wi-Fi에서만 동기화</string>
   <string name="sync_only_wifi_ssids">특정 WI-FI 네트워크로 제한하기</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">WI-FI를 활성화하고 네트워크를 선택해주세요.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">WI-FI를 활성화하고 네트워크를 선택해주세요.</string>
   <string name="advanced_folder_picker">고급 폴더 선택기 사용</string>
   <string name="advanced_folder_picker_summary">기기에서 동기화에 사용할 폴더를 골라 주세요</string>
   <string name="use_root_title">Syncthing을 Superuser로 실행</string>
@@ -177,8 +173,12 @@
   <string name="keep_wakelock_while_binary_running">Syncthing이 실행 중일 때 CPU를 깨어 있는 상태로 두기</string>
   <string name="keep_wakelock_while_binary_running_summary">만약 배터리로 사용중 예상하지 못한 접속 끊김이 발생 했다면 이 설정을 사용합니다. 이 기능은 배터리 소비를 늘립니다.</string>
   <string name="run_as_foreground_service">서비스를 포그라운드로 실행</string>
-  <string name="use_tor_title">TOR 사용</string>
-  <string name="use_tor_summary">프라이버시 보호를 위하여 모든 트래픽을 TOR로 통과시킵니다</string>
+  <string name="use_tor_title">Tor 사용</string>
+  <string name="use_tor_summary">프라이버시 향상을 위해 모든 트래픽을 Tor로 통과시킵니다. Orbot이 필요합니다</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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">설정을 %1$s 로 내보내기했습니다</string>
   <string name="import_config">설정 불러오기</string>
@@ -190,8 +190,6 @@
   <string name="sttrace_title">디버그 옵션</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">STTRACE 옵션에서는 a-z 와 \'.\' 외의 문자를 사용할 수 없습니다.</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">데이터베이스 리셋</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 760c690a..47cc0dc5 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">En åpen, pålitelig og desentralisert filsynkroniseringsapplikasjon.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Velkommen til Syncthing for Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Venter på GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Genererer sikre nøkler. Dette kan ta noen minutter.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Legg til Mappe</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +61,7 @@
   <string name="announce_server">Søketjener</string>
   <string name="restart">Omstart</string>
   <string name="dialog_confirm_restart">Vil du starte Syncthing på nytt?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Mappe-ID</string>
   <!--Setting title-->
@@ -80,11 +88,7 @@
   <string name="folder_id_required">Mappe-ID kan ikke være tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikke være tom</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Ønsker du virkelig å eksportere innstillingene? Eksisterende filer vil bli overskrevet.\n\nADVARSEL! Andre applikasjoner kan være i stand til å lese den private nøkkelen fra sikkerhetskopien og bruke den til å laste ned eller endre synkroniserte filer.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Er du sikker på at du vil importere innstillinger? Eksisterende filer vil bli skrevet over.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Enhets-ID</string>
   <!--Setting title-->
@@ -121,16 +125,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webgrensesnitt</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Venter på GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Genererer sikre nøkler. Dette kan ta noen minutter.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Velkommen til Syncthing for Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing er en filsynkroniseringsapplikasjon med åpen kildekode.\n\n
-For å dele data med andre enheter, må du legge til deres unike enhets-ID til enhetslisten. Etterpå kan du velge hvilke mapper du vil dele med hvilke enheter.\n\n
-Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Innstillinger</string>
@@ -144,7 +138,7 @@ Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <string name="sync_only_charging">Synkroniser kun ved lading</string>
   <string name="sync_only_wifi">Synkroniser kun over WiFi</string>
   <string name="sync_only_wifi_ssids">Begrens til visse wifi-nettverk</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Vennligst skru på WiFi for å velge nettverk.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Vennligst skru på WiFi for å velge nettverk.</string>
   <string name="advanced_folder_picker">Bruk avansert mappevelger</string>
   <string name="advanced_folder_picker_summary">Velg en mappe på enheten for synkronisering</string>
   <string name="use_root_title">Kjør Syncthing som superbruker</string>
@@ -178,8 +172,10 @@ Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <string name="keep_wakelock_while_binary_running_summary">Bruk denne innstillingen dersom du opplever uventede frakoblinger mens enheten går på batteri. Dette vil medføre økt batteriforbruk.</string>
   <string name="run_as_foreground_service">Kjør tjenesten med forgrunnsprioritet</string>
   <string name="run_as_foreground_service_summary">Hvis aktivert vil Syncthing kjøre med forgrunnsprioritet og det er mindre sannsynlig at den vil bli stoppet av Android. Dette kan føre til at andre tjenester stoppes i stedet, hvis det blir lite tilgjengelig minne. En notifikasjon med lav prioritet må alltid vises uavhengig av \"Notifikasjon\" innstillingen på grunn av krav fra Android.</string>
-  <string name="use_tor_title">Bruk TOR</string>
-  <string name="use_tor_summary">Tving all trafikk gjennom TOR for øket privatliv</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Ønsker du virkelig å eksportere innstillingene? Eksisterende filer vil bli overskrevet.\n\nADVARSEL! Andre applikasjoner kan være i stand til å lese den private nøkkelen fra sikkerhetskopien og bruke den til å laste ned eller endre synkroniserte filer.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Er du sikker på at du vil importere innstillinger? Eksisterende filer vil bli skrevet over.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Innstillingene ble eksportert til %1$s</string>
   <string name="import_config">Importer instillinger</string>
@@ -191,8 +187,6 @@ Vennligst rapporter eventuelle problemer som oppstår via GitHub.</string>
   <string name="sttrace_title">Feilsøkingsvalg</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Bare a-z og \',\' er tillatt som STTRACE-valg</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Nullstill database</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 4a8df6f5..b758ce63 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Een open, betrouwbare en gedecentraliseerde applicatie voor bestandssynchronisatie.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Welkom bij Syncthing voor Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Verder</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Wachten op interface</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Bezig met aanmaken van veilige sleutels. Dit kan enkele minuten duren.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Map toevoegen</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">Mededelingsserver</string>
   <string name="restart">Herstarten</string>
   <string name="dialog_confirm_restart">Wil je Syncthing herstarten?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Map-ID</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <string name="folder_id_required">De map-ID mag niet leeg zijn</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Het mappad mag niet leeg zijn</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Wil je jouw configuratie echt exporteren? Bestaande bestanden worden overschreven.\n\nWAARSCHUWING: Andere apps kunnen mogelijkerwijs bij de geheime sleutel van de back-up en gesyncte bestanden downloaden/wijzigen.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Wil je echt importeren? Huidige configuratie wordt vervangen.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Wijzigingen verwerpen?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Apparaat-ID</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web-interface</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Wachten op interface</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Bezig met aanmaken van veilige sleutels. Dit kan enkele minuten duren.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Welkom bij Syncthing voor Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing is een open-source applicatie voor bestandssynchronisatie.\n\n
-Om gegevens te delen met anderen apparaten moet je hun unieke apparaat-ID toevoegen aan de lijst met apparaten. Nadien kun je kiezen welke mappen je wilt delen met welke apparaten.\n\n
-Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Instellingen</string>
@@ -144,7 +140,7 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="sync_only_charging">Synchroniseer alleen tijdens opladen</string>
   <string name="sync_only_wifi">Synchroniseer alleen via Wi-Fi</string>
   <string name="sync_only_wifi_ssids">Tot bepaalde Wi-Fi-netwerken beperken</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Wi-Fi aanzetten t.b.v. netwerkselectie.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Wi-Fi aanzetten t.b.v. netwerkselectie.</string>
   <string name="advanced_folder_picker">Gebruik geavanceerd map-kiezer</string>
   <string name="advanced_folder_picker_summary">Selecteer een map op het toestel om te synchroniseren</string>
   <string name="use_root_title">Syncthing uitvoeren als superuser</string>
@@ -180,6 +176,10 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="run_as_foreground_service_summary">Indien ingeschakeld zal Syncthing worden uitgevoerd met voorgrondprioriteit, waardoor de kans kleiner wordt dat het door Android wordt gestopt. Dit kan ertoe leiden dat andere diensten worden gestopt wanneer het beschikbare geheugen laag is. Een melding met lage prioriteit wordt door Android vereist weergegeven, onafhankelijk van de \"Melding\"-instelling.</string>
   <string name="use_tor_title">Gebruik Tor</string>
   <string name="use_tor_summary">Dwing alle verkeer door Tor voor verhoogde privacy</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Wil je jouw configuratie echt exporteren? Bestaande bestanden worden overschreven.\n\nWAARSCHUWING: Andere apps kunnen mogelijkerwijs bij de geheime sleutel van de back-up en gesyncte bestanden downloaden/wijzigen.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Wil je echt importeren? Huidige configuratie wordt vervangen.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Configuratie is geëxporteerd naar %1$s</string>
   <string name="import_config">Configuratie importeren</string>
@@ -191,8 +191,6 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="sttrace_title">Debug-opties</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Enkel a-z en \',\' zijn toegestaan in STTRACE-opties</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Database opnieuw instellen</string>
   <!--Syncthing was reset-->
@@ -236,6 +234,7 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="log_android_title">Bekijk Android-log</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Bekijk Syncthing-log</string>
+  <string name="retrieving_logs">Logs worden opgehaald…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Delen</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index 1c66494b..732fbeb7 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Ein open, påliteleg og desentralisert app for filsynkronisering.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Velkommen til Synchting for Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Venter på grafisk grensesnitt</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Snikrar sikre nøklar. Dette kan da nokre minutt.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Legg til mappe</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +61,7 @@
   <string name="announce_server">Søketener</string>
   <string name="restart">Omstart</string>
   <string name="dialog_confirm_restart">Vil du starte om att Syncthing?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Mappe-ID</string>
   <!--Setting title-->
@@ -80,11 +88,7 @@
   <string name="folder_id_required">Mappe-ID kan ikkje vere tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikkje vere tom</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Vil du verkeleg eksportere innstillingane? Eksisterande filer vil verte skrivne over. \n\nÅTVARING: Andre appar kan vere i stand til å lese den private nøkkelen frå tryggingskopien, og bruke den til å laste ned eller endre synkroniserte filer.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Vil du verkeleg importere ei ny innstillingsfil? Eksisterande filer vil verte skrivne over.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Einings-ID</string>
   <!--Setting title-->
@@ -121,16 +125,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Grafisk grensesnitt på verdsveven</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Venter på grafisk grensesnitt</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Snikrar sikre nøklar. Dette kan da nokre minutt.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Velkommen til Synchting for Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing er ein filsynkroniseringsapplikasjon med open kjeldekode.\n\n
-For å dele data med andre einingar, må du legge til deira unike enings-ID i eningslista. Etterpå kan du velje kva mapper du ønskjer å dele med kva einingar.\n\n
-Om du skulle støyte på problem, ver snill å rapportere dei via Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Innstillingar</string>
@@ -144,7 +138,7 @@ Om du skulle støyte på problem, ver snill å rapportere dei via Github.</strin
   <string name="sync_only_charging">Synkroniser berre mens eg laddar</string>
   <string name="sync_only_wifi">Synkroniser berre over WiFi</string>
   <string name="sync_only_wifi_ssids">Avgrens til visse WiFi-nettverk</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Skru på WiFi for å velje nettverk.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Skru på WiFi for å velje nettverk.</string>
   <string name="advanced_folder_picker">Bruk avansert mappeveljar</string>
   <string name="advanced_folder_picker_summary">Vel kva mappe som helst for synkronisering</string>
   <string name="use_root_title">Køyr Syncthing som superbrukar</string>
@@ -178,8 +172,10 @@ Om du skulle støyte på problem, ver snill å rapportere dei via Github.</strin
   <string name="keep_wakelock_while_binary_running_summary">Bruk denne innstillinga om du opplever uventa avkoplingar medan du køyrer på batteri. Dette vil føre til auka batteriforbruk.</string>
   <string name="run_as_foreground_service">Køyr tenesten med forgrunnsprioritet</string>
   <string name="run_as_foreground_service_summary">Dersom aktivert vil Syncthing køyre med forgrunnsprioritet og det er mindre sannsynleg at den blir stoppa av Android. Dette kan føre til at andre tenester vert stoppa i staden, dersom det blir lite tilgjengeleg minne. Ein notifikasjon med låg prioritet må alltid visast, uavhengig av \"Notifikasjon\" innstillingen på grunn av krav fra Android.</string>
-  <string name="use_tor_title">Bruk TOR</string>
-  <string name="use_tor_summary">Tving all trafikk gjennom TOR for auka privatliv</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Vil du verkeleg eksportere innstillingane? Eksisterande filer vil verte skrivne over. \n\nÅTVARING: Andre appar kan vere i stand til å lese den private nøkkelen frå tryggingskopien, og bruke den til å laste ned eller endre synkroniserte filer.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Vil du verkeleg importere ei ny innstillingsfil? Eksisterande filer vil verte skrivne over.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Innstillingar vart eksportert til %1$s</string>
   <string name="import_config">Importer innstillingar</string>
@@ -191,8 +187,6 @@ Om du skulle støyte på problem, ver snill å rapportere dei via Github.</strin
   <string name="sttrace_title">Alternativ for feilsøking</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Berre a-z og \',\' er tillatne i STTRACE-alternativ</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Nullstill database</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index d756d4ed..e1229dd4 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Otwarty, godny zaufania oraz zdecentralizowany program do synchronizacji plików.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Witamy w Syncthing dla systemu Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <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 of the "add folder" menu action-->
   <string name="add_folder">Dodaj katalog</string>
   <!--Title of the "share device id" menu action-->
@@ -52,7 +60,8 @@
   <!--Title for announce server status-->
   <string name="announce_server">Serwer ogłoszeniowy</string>
   <string name="restart">Uruchom ponownie</string>
-  <!--FolderSettingsFragment-->
+  <string name="dialog_confirm_restart">Czy zrestartować Syncthing?</string>
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Identyfikator katalogu</string>
   <!--Setting title-->
@@ -79,11 +88,7 @@
   <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">Wyeksportować ustawienia? Istniejące pliki zostaną zastąpione.\n\nUWAGA! Inne programy 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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Identyfikator urządzenia</string>
   <!--Setting title-->
@@ -120,16 +125,6 @@
   <!--WebGuiActivity-->
   <!--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 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-->
-  <string name="welcome_title">Witamy w Syncthing dla systemu Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing to otwaroźródłowy program do synchronizacji plików.\n\n
-Aby współdzielić pliki z innym urządzeniem, należy dodać jego unikalny identyfikator do listy urządzeń. W następnym kroku można wybrać katalogi, które zostaną udostępnione wskazanym urządzeniom.\n\n
-Proszę zgłaszać błędy programu w serwisie Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Ustawienia</string>
@@ -143,7 +138,7 @@ Proszę zgłaszać błędy programu w serwisie Github.</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_wifi_turn_on_wifi">Proszę włącz WiFi dla wybranych sieci</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">Synchronizuje zawartość z uprawnieniami użytkownika Superuser</string>
@@ -157,7 +152,9 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="max_send_kbps">Limit wysyłania (KiB/s)</string>
   <string name="global_announce_enabled">Globalne wyszukiwanie</string>
   <string name="local_announce_enabled">Lokalne wyszukiwanie</string>
+  <string name="enable_nat_traversal">Włącz NAT</string>
   <string name="global_announce_server">Serwer globalnego wyszukiwania</string>
+  <string name="enable_relaying">Włącz przekazywanie</string>
   <string name="usage_reporting">Anonimowe statystyki użycia</string>
   <string name="syncthing_gui">Syncthing GUI</string>
   <string name="gui_address">Adres GUI</string>
@@ -167,6 +164,13 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="experimental_settings">Eksperymelne!</string>
   <string name="keep_wakelock_while_binary_running">Utrzymuj CPU wybudzony podczas działania Syncthing.</string>
   <string name="keep_wakelock_while_binary_running_summary">Używaj, jeśli doświadczasz nieoczekiwanych rozłączeń w trakcie działania na baterii. Spowoduje to zwiększone jej zużycie.</string>
+  <string name="run_as_foreground_service">Uruchom serwis z pierwszoplanowym priorytetem</string>
+  <string name="use_tor_title">Korzystaj z Tor</string>
+  <string name="use_tor_summary">Wymuszaj cały ruch przez Tor dla zwiększenia prywatności. Wymaga Orbot</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Wyeksportować ustawienia? Istniejące pliki zostaną zastąpione.\n\nUWAGA! Inne programy 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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Wyeksportowano ustawienia do %1$s</string>
   <string name="import_config">Importuj ustawienia</string>
@@ -178,8 +182,6 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="sttrace_title">Opcje diagnozowania błędów</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Tylko znaki a-z oraz „,” są dopuszczalne w STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Przywróć pierwotny stan bazy danych</string>
   <!--Syncthing was reset-->
@@ -200,6 +202,7 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <!--URL of the issue tracker-->
   <!--Menu item to donate-->
   <string name="donate_title">Wspomóż</string>
+  <string name="donate_summary">Pomóż nam opłacić domeny i hosting</string>
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Wersja Syncthing</string>
   <!--Title of the preference showing this app's version name-->
@@ -236,11 +239,13 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="exit">Zakończ</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing jest uruchomiony</string>
+  <string name="syncthing_active_foreground">Serwis działa z pierwszoplanowym priorytetem</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
   <string name="toast_folder_observer_stack_overflow">Drzewo katalogów jest zbyt głębokie. Proszę je sprawdzić pod kątem obecności zapętlonych dowiązań symbolicznych.</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Nie udało się utworzyć pliku konfiguracyjnego. Proszę sprawdzić dziennik.</string>
   <!--Label of the default folder created of first start (camera folder).-->
+  <string name="default_folder_label">Kamera</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <string name="default_folder_id">%1$s-zdjęcia</string>
   <!--RestApi-->
@@ -279,4 +284,5 @@ Proszę zgłaszać błędy programu w serwisie Github.</string>
   <string name="state_unknown">Nieznany</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
+  <string name="appconfig_receiver_background_enabled">Zatrzymywanie Syncthing nie jest wspierane, gdy działa w tle.</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 72594421..3ec14e9f 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Uma aplicação aberta, confiável e descentralizada para sincronização de arquivos.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Bem vindo(a) ao Syncthing for Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Continuar</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Aguardando a interface web</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Gerando chaves de segurança. Isto pode levar alguns minutos.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Adicionar pasta</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">Servidor de busca global</string>
   <string name="restart">Reiniciar</string>
   <string name="dialog_confirm_restart">Quer mesmo reiniciar o Syncthing?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID da pasta</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <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">Quer 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">Quer mesmo importar uma nova configuração? Arquivos existentes serão sobrescritos.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Descartas as alterações?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Aguardando a interface web</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Gerando chaves de segurança. Isto pode levar alguns minutos.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Bem vindo(a) ao Syncthing for Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">O Syncthing é uma aplicação de código aberto para sincronização de arquivos.\n\n
-Para compartilhar seus dados com outros dispositivos, você deve adicionar o ID único deles à sua lista de dispositivos e selecionar quais pastas devem ser compartilhadas com cada dispositivo.\n\n
-Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Configurações</string>
@@ -144,7 +140,7 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="sync_only_charging">Somente durante o carregamento</string>
   <string name="sync_only_wifi">Somente conectado ao WiFi</string>
   <string name="sync_only_wifi_ssids">Limitar a certas redes WiFi</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ligue o WiFi para selecionar as redes</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ligue o WiFi para selecionar as redes</string>
   <string name="advanced_folder_picker">Usar seletor de pasta avançado</string>
   <string name="advanced_folder_picker_summary">Selecione qualquer pasta do dispositivo para sincronização</string>
   <string name="use_root_title">Executar como Superusuário</string>
@@ -178,8 +174,12 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="keep_wakelock_while_binary_running_summary">Marque esta opção se você observar desconexões inesperadas enquanto a bateria do dispositivo não está sendo carregada. Isto resultará em maior uso da bateria.</string>
   <string name="run_as_foreground_service">Rodar serviço com prioridade de primeiro plano</string>
   <string name="run_as_foreground_service_summary">Se habilitado, o Syncthing rodará com prioridade de primeiro plano e tem menores chances de ser parado pelo Android. Isto pode fazer com que outros apps sejam parados caso a memória disponível fique baixa. Uma notificação de baixa prioridade precisa ser exibida por exigência do Android, independentemente da configuração \"Notificação\".</string>
-  <string name="use_tor_title">Use TOR</string>
-  <string name="use_tor_summary">Forçar tráfego pela rede TOR para maior privacidade</string>
+  <string name="use_tor_title">Usar Tor</string>
+  <string name="use_tor_summary">Forçar o tráfego de dados pela rede Tor para maior privacidade. Orbot deve ser instalado</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Quer 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">Quer mesmo importar uma nova configuração? Arquivos existentes serão sobrescritos.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">A configuração foi salva em %1$s</string>
   <string name="import_config">Importar configuração</string>
@@ -191,8 +191,6 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="sttrace_title">Opções de depuração</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Somente a-z e \",\" (vírgula) são permitidos nas opções do STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Limpar banco de dados</string>
   <!--Syncthing was reset-->
@@ -237,6 +235,7 @@ Por favor, informe-nos sobre quaisquer problemas via Github.</string>
   <string name="log_android_title">Exibir o log do Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Exibir o log do Syncthing</string>
+  <string name="retrieving_logs">Recuperando logs...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Compartilhar</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 8f42a804..68c88516 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Uma aplicação de sincronização de ficheiros aberta, fiável e descentralizada.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Bem vindo(a) ao Syncthing para Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Aguardando a interface web</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Gerando chaves seguras. Isto pode demorar uns minutos.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Adicionar pasta</string>
   <!--Title of the "share device id" menu action-->
@@ -49,7 +57,7 @@
   <string name="ram_usage">Utilização da RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de busca global</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID da pasta</string>
   <!--Setting title-->
@@ -74,10 +82,7 @@
   <string name="folder_id_required">O ID da pasta não pode estar vazio</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode estar vazio</string>
-  <!--Dialog shown before config export-->
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Quer mesmo importar a sua configuração? Os ficheiros existentes vão ser sobrepostos.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
   <!--Setting title-->
@@ -113,16 +118,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface Web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Aguardando a interface web</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Gerando chaves seguras. Isto pode demorar uns minutos.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Bem vindo(a) ao Syncthing para Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing é uma aplicação em código aberto de sincronização de ficheiros.\n\n\
-Para partilhar dados com outros dispositivos, tem que adicionar o ID único de cada dispositivo à lista de dispositivos. Depois pode seleccionar que pastas pretende partilhar com que dispositivos.\n\n
-Relate quaisquer problemas que encontre via Github, por favor.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Configurações</string>
@@ -160,6 +155,9 @@ Relate quaisquer problemas que encontre via Github, por favor.</string>
   <string name="gui_user">Utilizador da autenticação na interface gráfica</string>
   <string name="gui_password">Senha da autenticação na interface gráfica</string>
   <string name="export_config">Exportar configuração</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Quer mesmo importar a sua configuração? Os ficheiros existentes vão ser sobrepostos.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">A configuração foi exportada para %1$s</string>
   <string name="import_config">Importar configuração</string>
@@ -171,8 +169,6 @@ Relate quaisquer problemas que encontre via Github, por favor.</string>
   <string name="sttrace_title">Opções da despistagem de erros</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Apenas é permitido usar a-z e \';\' nas opções do STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reiniciar a base de dados</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 22e2d409..391c53f4 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Открытое, надёжное и децентрализованное приложение для синхронизации файлов.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Добро пожаловать в Syncthing для Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Ожидание GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Генерируем ключи. Это может занять несколько минут.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Доб папку</string>
   <!--Title of the "share device id" menu action-->
@@ -52,7 +60,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Сервера анонсов</string>
   <string name="restart">Перезагрузить</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID папки</string>
   <!--Setting title-->
@@ -79,11 +87,7 @@
   <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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID устройства</string>
   <!--Setting title-->
@@ -120,16 +124,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Веб-интерфейс</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Ожидание GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Генерируем ключи. Это может занять несколько минут.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Добро пожаловать в Syncthing для Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing это открытое приложение для синхронизации файлов.\n\n\
-Для того, чтобы синхронизировать данные с другими устройствами, вам необходимо добавить их уникальные идентификаторы в список устройств. Затем вы сможете выбрать папки для синхронизации с другими устройствами.\n\n
-По поводу всех возникших проблем пишите на Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Настройки</string>
@@ -143,7 +137,7 @@
   <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_wifi_turn_on_wifi">Включите WiFi, чтобы выбрать сети</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">Запуск Syncthing с рут-правами</string>
@@ -174,6 +168,11 @@
   <string name="export_config">Экспорт настроек</string>
   <string name="keep_wakelock_while_binary_running">Поддерживать CPU включенным, пока Syncthing работает</string>
   <string name="run_as_foreground_service">Запуск сервиса с повышенным приоритетом</string>
+  <string name="use_tor_title">Использовать Tor</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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Настройки экспортированы в %1$s</string>
   <string name="import_config">Импорт настроек</string>
@@ -185,8 +184,6 @@
   <string name="sttrace_title">Настройки режима отладки</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">В настройках STTRACE можно использовать только символы a-z и \',\'</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Сбросить базу данных</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index e0b673b1..e533a901 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Otvorená, dôveryhodná a decentralizovaná aplikácia pre synchronizáciu súborov.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Víta Vás Syncthing pre Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Čakám na GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Syncthing generuje RSA klúč a certifikát. Táto operácia môže chvíľu trvať.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Pridať Adresár</string>
   <!--Title of the "share device id" menu action-->
@@ -49,7 +57,7 @@
   <string name="ram_usage">Využitie RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Ohlasovací server</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID adresára</string>
   <!--Setting title-->
@@ -73,10 +81,7 @@
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáru nemôže byť prázdna</string>
-  <!--Dialog shown before config export-->
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Naozaj chcete importova konfiguráciu? Existujúce súbory budú prepísané.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID Zariadenia</string>
   <!--Setting title-->
@@ -112,15 +117,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webové GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Čakám na GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Syncthing generuje RSA klúč a certifikát. Táto operácia môže chvíľu trvať.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Víta Vás Syncthing pre Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing je open-source nástroj na synchronizáciu súborov.\n\n
-Aby ste mohli zdielať dáta s ostatnými zariadeniami, musíte najprv pridať ich unikátne ID do zoznamu zariadení. Potom budete môcť zvoliť ktoré adresáre sa budú zdielať s ktorým zariadením.\n\nAk by ste mali problémy, nahláste ich, prosím, prostredníctvom GitHubu.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Nastavenia</string>
@@ -158,6 +154,9 @@ Aby ste mohli zdielať dáta s ostatnými zariadeniami, musíte najprv pridať i
   <string name="gui_user">Užívateľské Meno pre GUI</string>
   <string name="gui_password">Užívateľské Heslo pre GUI</string>
   <string name="export_config">Exportovať Konfiguráciu</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Naozaj chcete importova konfiguráciu? Existujúce súbory budú prepísané.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Konfigurácia bola exportovaná do %1$s</string>
   <string name="import_config">Importovať Konfiguráciu</string>
@@ -169,8 +168,6 @@ Aby ste mohli zdielať dáta s ostatnými zariadeniami, musíte najprv pridať i
   <string name="sttrace_title">Nastavenia pre Ladenie</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">V STTRACE options sú povolené iba znaky a-z a \',\'</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Resetovať Databázu</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 9f7d92f8..d8ea4717 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -1,6 +1,11 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--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-->
@@ -21,7 +26,7 @@
   <!--Title for current CPU usage-->
   <!--Title for current RAM usage-->
   <!--Title for announce server status-->
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -35,9 +40,7 @@
   <!--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-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
@@ -54,22 +57,18 @@
   <!--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-->
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 0b5fb690..15344670 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">En öppen, pålitlig och decentraliserad filsynkroniserings applikation.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Välkommen till Syncthing för Android</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">Fortsätt</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Väntar på GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Genererar säkra nycklar. Detta kan ta några minuter.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Lägg till katalog</string>
   <!--Title of the "share device id" menu action-->
@@ -12,7 +21,7 @@
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Laddar...</string>
   <string name="usage_reporting_dialog_title">Tillåt anonym användningsrapportering?</string>
-  <string name="usage_reporting_dialog_description">Den krypterade användningsrapporten skickas dagligen. Den används för att spåra vanliga plattformar, katalog storlekar och appversioner. Om uppsättningen av de rapporterade uppgifterna ändras kommer du att bli tillfrågad med den här dialogrutan igen.\n\nDen aggregerade statistiken är offentligt tillgänglig på https://data.syncthing.net.</string>
+  <string name="usage_reporting_dialog_description">Den krypterade användningsrapporten skickas dagligen. Den används för att spåra vanliga plattformar, katalogstorlekar och appversioner. Om uppsättningen av de rapporterade uppgifterna ändras kommer du att bli tillfrågad med den här dialogrutan igen.\n\nDen aggregerade statistiken är offentligt tillgänglig på https://data.syncthing.net.</string>
   <string name="yes">Ja</string>
   <string name="no">Nej</string>
   <string name="off">av</string>
@@ -50,10 +59,10 @@
   <!--Title for current RAM usage-->
   <string name="ram_usage">RAM-användning</string>
   <!--Title for announce server status-->
-  <string name="announce_server">Annonseringsservrar</string>
+  <string name="announce_server">Annonseringsserver</string>
   <string name="restart">Omstart</string>
   <string name="dialog_confirm_restart">Vill du starta om Syncthing?</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Katalog-ID</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <string name="folder_id_required">Katalog-ID får inte vara tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Katalogsökvägen får inte vara tom</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Vill du verkligen vill exportera din konfiguration? Befintliga filer kommer att skrivas över.\n\nVARNING! Andra appar kan få möjlighet att läsa den privata nyckeln från säkerhetskopian och använda den för att ladda ner/ändra synkroniserade filer.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Vill du verkligen importera en ny konfiguration? Befintliga filer kommer att skrivas över.</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">Kassera dina ändringar?</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Enhets ID</string>
   <!--Setting title-->
@@ -120,17 +126,7 @@
   <string name="toast_root_denied">Fick inte root behörigheter</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
-  <string name="web_gui_title">Syncthing-GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Väntar på GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Genererar säkra nycklar. Detta kan ta några minuter.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Välkommen till Syncthing för Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing är en filsynkroniserings app med öppen källkod.\n\n\
-För att dela data med andra enheter, måste du lägga till deras unika enhets ID till enhetslistan. Efteråt kan du välja vilka kataloger som ska delas med vilka enheter.\n\n
-Vänligen rapportera eventuella problem du stöter på via Github.</string>
+  <string name="web_gui_title">Webb-GUI</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Inställningar</string>
@@ -144,7 +140,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="sync_only_charging">Synkronisera endast vid laddning</string>
   <string name="sync_only_wifi">Synkronisera endast trådlöst</string>
   <string name="sync_only_wifi_ssids">Begränsa till vissa WiFi-nätverk</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Slå på WiFi för att välja nätverk.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Slå på WiFi för att välja nätverk.</string>
   <string name="advanced_folder_picker">Använd avancerade katalogväljaren</string>
   <string name="advanced_folder_picker_summary">Välj någon katalog på enheten för synkronisering</string>
   <string name="use_root_title">Kör Syncthing som superanvändare</string>
@@ -159,7 +155,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Syncthing alternativ</string>
   <string name="device_name">Enhets namn</string>
-  <string name="listen_address">Lyssnaradresser för synkroniseringsprotokoll</string>
+  <string name="listen_address">Synkroniseringsprotokollets lyssnaradresser</string>
   <string name="max_recv_kbps">Inkommande hastighetsgräns (KiB/s)</string>
   <string name="max_send_kbps">Utgående hastighetsgräns (KiB/s)</string>
   <string name="global_announce_enabled">Global annonsering</string>
@@ -169,37 +165,39 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="enable_relaying">Aktivera reläa</string>
   <string name="usage_reporting">Anonym användningsrapportering</string>
   <string name="syncthing_gui">Syncthing-GUI</string>
-  <string name="gui_address">Lyssnardresser för GUI</string>
-  <string name="gui_user">Autentiseringsanvändare för GUI</string>
-  <string name="gui_password">Autentiseringslösenord för GUI</string>
+  <string name="gui_address">GUI lyssnaradresser</string>
+  <string name="gui_user">GUI autentiseringsanvändare</string>
+  <string name="gui_password">GUI autentiseringslösenord</string>
   <string name="export_config">Exportera konfiguration</string>
   <string name="experimental_settings">Experimentell</string>
   <string name="keep_wakelock_while_binary_running">Håll CPU:n vaken medan Syncthing körs</string>
   <string name="keep_wakelock_while_binary_running_summary">Använd den här inställningen om du får oväntade frånkopplingar under batteridrift. Detta kommer att resultera i ökad batteriförbrukning.</string>
   <string name="run_as_foreground_service">Kör tjänst med förgrundsprioritet</string>
-  <string name="run_as_foreground_service_summary">Om aktiverad, kommer Syncthing köra med förgrundsprioritet och är mindre sannolikt att stoppas av Android. Detta kan leda till att andra tjänster stoppas om tillgängligt minne är låg. En låg prioritet notering måste uppfyllas på grund av Android krav, oavsett av \"noterings\" inställning.</string>
-  <string name="use_tor_title">Använd TOR</string>
-  <string name="use_tor_summary">Tvinga all trafik genom TOR för ökad integritet</string>
+  <string name="run_as_foreground_service_summary">Om aktiverad, kommer Syncthing köra med förgrundsprioritet och är mindre sannolikt att stoppas av Android. Detta kan leda till att andra tjänster stoppas om tillgängligt minne är lågt. En låg prioritetsnotering måste visas på grund av Androidkrav, oavsett av \"noterings\"-inställning.</string>
+  <string name="use_tor_title">Använd Tor</string>
+  <string name="use_tor_summary">Tvinga all trafik genom Tor för ökad integritet. Kräver Orbot</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Vill du verkligen vill exportera din konfiguration? Befintliga filer kommer att skrivas över.\n\nVARNING! Andra appar kan få möjlighet att läsa den privata nyckeln från säkerhetskopian och använda den för att ladda ner/ändra synkroniserade filer.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Vill du verkligen importera en ny konfiguration? Befintliga filer kommer att skrivas över.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Konfiguration exporterades till %1$s</string>
   <string name="import_config">Importera konfiguration</string>
   <!--Toast shown after config was successfully imported-->
   <string name="config_imported_successful">Konfigurationen importerades</string>
   <!--Toast shown after config was successfully imported-->
-  <string name="config_import_failed">Konfigurations importering misslyckades, se till att filerna är i %1$s</string>
+  <string name="config_import_failed">Konfigurations importering misslyckades, se till att filerna finns i %1$s</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Felsöksalternativ</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Endast a-z och \',\' är tillåtna i STTRACE alternativ</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Återställ databas</string>
   <!--Syncthing was reset-->
-  <string name="streset_question">Denna åtgärd får endast utföras baserad på en rekommendation från vår support grupp.
-\nÄr du säker på att du vill rensa Syncthings index databas?</string>
+  <string name="streset_question">Denna åtgärd bör endast utföras baserad på en rekommendation från vår support grupp.
+\nÄr du säker på att du vill rensa Syncthings indexdatabas?</string>
   <!--Syncthing was reset-->
-  <string name="streset_done">Syncthings databas återställd</string>
+  <string name="streset_done">Syncthings databas återställdes</string>
   <string name="category_about">Om</string>
   <!--Settings item that opens the log activity-->
   <string name="open_log">Öppna logg</string>
@@ -236,6 +234,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="log_android_title">Visa Android logg</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Visa Syncthing logg</string>
+  <string name="retrieving_logs">Hämtar loggar...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Dela</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index ccd25757..7bacb247 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Açık, güvenilir ve merkezi olmayan bir dosya eşzamanlama uygulaması.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Android için Syncthing\'e Hoşgeldiniz</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Arayüz Bekleniyor</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Gücenli anahtarlar üretiliyor. Birkaç dakika zaman alabilir.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Klasör Ekleme</string>
   <!--Title of the "share device id" menu action-->
@@ -49,7 +57,7 @@
   <string name="ram_usage">RAM Kullanımı</string>
   <!--Title for announce server status-->
   <string name="announce_server">Bildirim Sunucusu</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Klasör ID</string>
   <!--Setting title-->
@@ -74,11 +82,7 @@
   <string name="folder_id_required">Klasör ID\'si boş bırakılamaz</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Klasör yolu boş olmamalı</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Yeni yapılandırmayı gerçekten dışa aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.\n\nDİKKAT! Diğer uygulamalar gizli anahtarı yedekleme yapılan yerden okuyabilir ve eşzamanlaması yapılan dosyaları indirmek/değiştirmek için kullanabilir.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Yeni yapılandırmayı gerçekten içe aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Cihaz ID</string>
   <!--Setting title-->
@@ -114,16 +118,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web Arayüzü</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Arayüz Bekleniyor</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Gücenli anahtarlar üretiliyor. Birkaç dakika zaman alabilir.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Android için Syncthing\'e Hoşgeldiniz</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing, açık kaynaklı bir dosya eşzamanlama uygulamasıdır.\n\n\
-Diğer cihazlar ile veri paylaşmak için, cihaz listenize onların benzersiz cihaz ID\'lerini eklemeniz gerekir. Devamında hangi klasörleri, hangi cihazlar ile paylaşacağınızı  seçebilirsiniz.\n\n
-Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildirin.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Ayarlar</string>
@@ -137,7 +131,7 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <string name="sync_only_charging">Sadece şarj edilirken eşzamanlama yap</string>
   <string name="sync_only_wifi">Sadece kablosuz ağ üzerindeyken eşzamanlama yap</string>
   <string name="sync_only_wifi_ssids">Belirlenmiş kablosuz ağlarla sınırlandır.</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ağ seçmek için lütfen kablosuz bağlantınızı açın.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ağ seçmek için lütfen kablosuz bağlantınızı açın.</string>
   <string name="advanced_folder_picker">Gelişmiş Klasör Seçici Kullan</string>
   <string name="advanced_folder_picker_summary">Eşzamanlama yapmak için cihazdan herhangi bir klasör seçin</string>
   <string name="use_root_title">Syncthing\'i Superuser/Ayrıcalıklı Kullanıcı olarak Çalıştır</string>
@@ -163,6 +157,10 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <string name="gui_user">Arayüz Kullanıcı Doğrulaması için Kullanıcı Adı</string>
   <string name="gui_password">Arayüz Kullanıcı Doğrulaması için Kullanıcı Parolası</string>
   <string name="export_config">Yapılandırmayı Dışa Aktar</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Yeni yapılandırmayı gerçekten dışa aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.\n\nDİKKAT! Diğer uygulamalar gizli anahtarı yedekleme yapılan yerden okuyabilir ve eşzamanlaması yapılan dosyaları indirmek/değiştirmek için kullanabilir.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Yeni yapılandırmayı gerçekten içe aktarmak istiyor musun? Varolan dosyaların üzerine yazılacak.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Yapılandırma %1$s dışa aktarıldı</string>
   <string name="import_config">Yapılandırmayı İçe Aktar</string>
@@ -174,8 +172,6 @@ Lütfen, herhangi bir sorunla karşılaştığınızda Github üzerinden bildiri
   <string name="sttrace_title">Hata Ayıklama Seçenekleri</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">STTRACE seçenekleri içinde sadece a-z ve \',\' karakterleri kullanabilirsiniz</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Veritabanını Sıfırla</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index d67579a4..0d7f247f 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -2,7 +2,15 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">Một ứng dụng đồng bộ hoá tập tin phi tập trung, mở và đáng tin cậy.</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Chào mừng đến với Syncthing cho Android</string>
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Đang chờ GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Đang tạo khoá bảo mật. Thao tác này có thể mất vài phút.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Thêm th.mục</string>
   <!--Title of the "share device id" menu action-->
@@ -52,7 +60,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Máy chủ th.báo</string>
   <string name="restart">Kh.chạy lại</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID thư mục</string>
   <!--Setting title-->
@@ -78,11 +86,7 @@
   <string name="folder_id_required">Không được để trống ID thư mục</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Không được để trống đường dẫn thư mục</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Có chắc là bạn muốn xuất cấu hình? Các tập tin hiện thời sẽ bị ghi đè.\n\nCẢNH BÁO! Các ứng dụng khác có thể đọc được khoá riêng tư từ vị trí sao lưu và dùng nó để tải về/chỉnh sửa các tập tin đã đồng bộ.</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Có chắc là bạn muốn nhập cấu hình mới? Các tập tin hiện tại sẽ bị chép đè lên.</string>
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID thiết bị</string>
   <!--Setting title-->
@@ -119,16 +123,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">GUI web</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Đang chờ GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Đang tạo khoá bảo mật. Thao tác này có thể mất vài phút.</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">Chào mừng đến với Syncthing cho Android</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing là ứng dụng mã nguồn mở dùng để đồng bộ hoá các tập tin.\n\n\
-Để chia sẻ dữ liệu với các thiết bị khác, bạn cần thêm ID thiết bị độc nhất của chúng vào danh sách. Sau đó, bạn có thể lựa chọn thư mục để chia sẻ giữa các thiết bị.\n\n\
-Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Cài đặt</string>
@@ -142,7 +136,7 @@ Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <string name="sync_only_charging">Chỉ đ.bộ khi sạc pin</string>
   <string name="sync_only_wifi">Chỉ đ.bộ khi dùng wifi</string>
   <string name="sync_only_wifi_ssids">Hạn chế với vài mạng wifi nhất định</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hãy bật WiFi để lựa chọn mạng.</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Hãy bật WiFi để lựa chọn mạng.</string>
   <string name="advanced_folder_picker">S.dụng trình chọn th.mục nâng cao</string>
   <string name="advanced_folder_picker_summary">Chọn bất kỳ th.mục nào trên th.bị để đồng bộ</string>
   <string name="use_root_title">Chạy Syncthing với quyền Superuser</string>
@@ -171,6 +165,10 @@ Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <string name="experimental_settings">Thực nghiệm</string>
   <string name="keep_wakelock_while_binary_running">Giữ CPU thức khi Syncthing đang chạy</string>
   <string name="keep_wakelock_while_binary_running_summary">Dùng tuỳ chỉnh này nếu bạn bị mất kết nối bất ngờ khi đang dùng pin. Nó sẽ tiêu thụ nhiều pin hơn.</string>
+  <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Có chắc là bạn muốn xuất cấu hình? Các tập tin hiện thời sẽ bị ghi đè.\n\nCẢNH BÁO! Các ứng dụng khác có thể đọc được khoá riêng tư từ vị trí sao lưu và dùng nó để tải về/chỉnh sửa các tập tin đã đồng bộ.</string>
+  <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Có chắc là bạn muốn nhập cấu hình mới? Các tập tin hiện tại sẽ bị chép đè lên.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Cấu hình đã được xuất vào %1$s</string>
   <string name="import_config">Nhập cấu hình</string>
@@ -182,8 +180,6 @@ Xin báo cáo mọi vấn đề phát sinh thông qua Github.</string>
   <string name="sttrace_title">Tuỳ chọn dò lỗi</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">Chỉ cho phép a-z và \',\' trong tuỳ chọn STTRACE</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Cài lại CSDL</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index b5921462..9881672c 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -2,7 +2,16 @@
 <resources>
   <string name="app_name">Syncthing</string>
   <string name="app_description">开放、分布式且值得信赖的文件同步应用。</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">欢迎使用 Android 版 Syncthing</string>
+  <!--Text for dialog displayed on first start-->
+  <string name="cont">继续</string>
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">正在等待管理页面</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">正在生成安全密钥。这可能需要一段时间，请稍等。</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">添加文件夹</string>
   <!--Title of the "share device id" menu action-->
@@ -53,7 +62,7 @@
   <string name="announce_server">宣告服务器</string>
   <string name="restart">重启</string>
   <string name="dialog_confirm_restart">您想要重启 Syncthing 吗？</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">文件夹标识</string>
   <!--Setting title-->
@@ -80,11 +89,8 @@
   <string name="folder_id_required">文件夹标识不得为空</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">文件夹路径不得为空</string>
-  <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">您确定要导出您的配置？若您之前导出过配置，则文件会被当前导出的配置所覆盖。\n\n 警告！其他应用程序可以从您导出的配置文件中获取到您的密钥，并且可以通过它来下载或者修改您的同步文件。</string>
-  <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">您确定要导入新配置？会覆盖现有配置。</string>
-  <!--DeviceSettingsFragment-->
+  <string name="dialog_discard_changes">放弃所做的更改？</string>
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">设备标识</string>
   <!--Setting title-->
@@ -121,16 +127,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">网页管理页面</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">正在等待管理页面</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">正在生成安全密钥。这可能需要一段时间，请稍等。</string>
-  <!--Title for dialog displayed on first start-->
-  <string name="welcome_title">欢迎使用 Android 版 Syncthing</string>
-  <!--Text for dialog displayed on first start-->
-  <string name="welcome_text">Syncthing 是一款开源文件同步应用。\n\n\
-若要同步数据到别的设备中，您需要添加该设备的唯一标识至设备列表中，其后选择分享哪些文件夹至该设备之中。\n\n\
-若您遇到任何的问题，欢迎您到 Github 上给我们反馈。</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">设置</string>
@@ -144,7 +140,7 @@
   <string name="sync_only_charging">仅在充电时同步</string>
   <string name="sync_only_wifi">仅在无线网络下同步</string>
   <string name="sync_only_wifi_ssids">对某些无线网络下限制同步</string>
-    <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">请打开无线网络连接并选择网络</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">请打开无线网络连接并选择网络</string>
   <string name="advanced_folder_picker">使用高级文件夹选择器</string>
   <string name="advanced_folder_picker_summary">可以选择设备上任何文件夹</string>
   <string name="use_root_title">Syncthing 运行于超级用户</string>
@@ -178,8 +174,12 @@
   <string name="keep_wakelock_while_binary_running_summary">使用此设置如果您在电池上运行时遇到意外的断开连接。这将会导致电量消耗的增加。</string>
   <string name="run_as_foreground_service">以前台优先级运行服务</string>
   <string name="run_as_foreground_service_summary">如果启用，Syncthing 将以后台优先级运行，可以更少地被 Android 停止。这也可能在可用内存过低时引起其他服务关闭。因为 Android 的要求，会忽略“通知”的设置而显示一个低优先级的通知。</string>
-  <string name="use_tor_title">使用 TOR</string>
-  <string name="use_tor_summary">强制所有流量通过 TOR 以提高保密性</string>
+  <string name="use_tor_title">使用 Tor</string>
+  <string name="use_tor_summary">强制所有流量通过 TOR 以提高保密性。需要 Orbot</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>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">设置已导出至 %1$s</string>
   <string name="import_config">导入设置</string>
@@ -191,8 +191,6 @@
   <string name="sttrace_title">调试选项</string>
   <!--Toast after entering invalid STTRACE params-->
   <string name="toast_invalid_sttrace">STTRACE 选项仅允许 a-z 与逗号</string>
-  <!--Toast after entering invalid username-->
-  <!--Toast after entering invalid password-->
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">重置数据库</string>
   <!--Syncthing was reset-->
@@ -236,6 +234,7 @@
   <string name="log_android_title">查看 Android 系统日志</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">查看 Syncthing 日志</string>
+  <string name="retrieving_logs">正在检索日志…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">日志</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 219916ed..53d893ee 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -1,7 +1,13 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
+  <!--FirstStartActivity-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
   <!--MainActivity-->
+  <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">正在等待 GUI</string>
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">增加資料夾</string>
   <!--Title of the "share device id" menu action-->
@@ -40,7 +46,7 @@
   <string name="ram_usage">記憶體使用率</string>
   <!--Title for announce server status-->
   <string name="announce_server">發布伺服器</string>
-  <!--FolderSettingsFragment-->
+  <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">資料夾識別碼</string>
   <!--Setting title-->
@@ -65,9 +71,7 @@
   <string name="folder_id_required">資料夾識別碼不得為空</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">資料夾路徑不得為空</string>
-  <!--Dialog shown before config export-->
-  <!--Dialog shown before config import-->
-  <!--DeviceSettingsFragment-->
+  <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">裝置識別碼</string>
   <!--Setting title-->
@@ -97,11 +101,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">網頁 GUI</string>
-  <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">正在等待 GUI</string>
-  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <!--Title for dialog displayed on first start-->
-  <!--Text for dialog displayed on first start-->
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">設定</string>
@@ -125,14 +124,14 @@
   <string name="gui_address">GUI 監聽位址</string>
   <string name="gui_user">GUI 認證使用者名稱</string>
   <string name="gui_password">GUI 認證密碼</string>
+  <!--Dialog shown before config export-->
+  <!--Dialog shown before config import-->
   <!--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-->
   <string name="sttrace_title">除錯選項</string>
   <!--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-->