diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 3d159f6d..d03af36c 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Приложението изисква права за записване в хранилището на данни</string>
   <string name="device_rejected">Заявка за връзка от %1$s</string>
   <string name="folder_rejected">Устройство %1$s споделя папка %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">По-късно</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Папки</string>
   <!--Shown if no folders exist-->
@@ -123,9 +124,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Уеб интерфейс</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Настройки</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Настройки на Syncthing</string>
+  <string name="category_experimental">Експериментално</string>
   <string name="always_run_in_background">Постоянна работа на заден план</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Постоянно синхронизиране, според следващите опции.</string>
@@ -145,20 +146,17 @@
     <item>С нисък приоритет</item>
     <item>Без известия</item>
   </string-array>
-  <string name="category_syncthing_options">Настройки на Syncthing</string>
   <string name="device_name">Име на устройството</string>
   <string name="listen_address">Адрес за слушане на синхронизиращия протокол</string>
   <string name="max_recv_kbps">Лимит на скоростта за сваляне (KiB/s)</string>
   <string name="max_send_kbps">Лимит на скоростта за качване (KiB/s)</string>
   <string name="global_announce_enabled">Глобално откриване</string>
   <string name="local_announce_enabled">Локално откриване</string>
-  <string name="global_announce_server">Сървър за глобално откриване</string>
   <string name="usage_reporting"> Анонимен доклад за ползване на програмата</string>
   <string name="gui_address">Адрес за свързване с потребителския интерфейс</string>
   <string name="gui_user">Потребител за потребителския интерфейс</string>
   <string name="gui_password">Парола за потребителския интерфейс</string>
   <string name="export_config">Изнасяне на настройките</string>
-  <string name="category_experimental">Експериментално</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">Наистина ли желаете настройките да бъдат изнесени? Съществуващите файлове ще бъдат презаписани.\n\nВНИМАНИЕ! Програми могат да извлекат частния ви ключ от генерирания файл, а чрез него да свалят и синхронизират файлове.</string>
   <!--Dialog shown before config import-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index bd48b771..ebd741c1 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -6,6 +6,9 @@
   <!--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 synchronizační aplikace s otevřeným zdrojovým kódem.\n\
+Pro sdílení dat s dalšími přístroji je třeba přidat jejich unikátní ID do seznamu. Poté lze určovat, které adresáře jsou sdíleny s kterými přístroji.\n\
+Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="cont">Pokračovat</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">Tato aplikace vyžaduje oprávnění pro zápis do úložiště</string>
   <string name="device_rejected">Přístroj %1$s žádá o připojení</string>
   <string name="folder_rejected">Přístroj %1$s chce sdílet adresář %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Později</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Adresáře</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Syncthing GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Nastavení</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Podmínky spuštění</string>
+  <string name="category_behaviour">Chování</string>
+  <string name="category_syncthing_options">Nastavení Syncthing</string>
+  <string name="category_backup">Záloha</string>
+  <string name="category_debug">Ladění</string>
+  <string name="category_experimental">Experimentální</string>
   <string name="always_run_in_background">Vždy spuštěné na pozadí</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing poběží vždy v pozadí, podle nastavení níže.</string>
@@ -151,7 +159,6 @@
     <item>Nízká priorita</item>
     <item>Źádné</item>
   </string-array>
-  <string name="category_syncthing_options">Nastavení Syncthing</string>
   <string name="device_name">Jméno přístroje</string>
   <string name="listen_address">Adresy naslouchání protokolu synchronizace</string>
   <string name="max_recv_kbps">Omezení příchozí rychlosti (KiB/s)</string>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">Globální oznamování</string>
   <string name="local_announce_enabled">Místní oznamování</string>
   <string name="enable_nat_traversal">Povolit NAT traversal</string>
-  <string name="global_announce_server">Server globálního oznamování</string>
+  <string name="global_announce_server">Servery globálního oznamování</string>
   <string name="enable_relaying">Povolit relaying</string>
   <string name="usage_reporting">Anonymní hlášení o používání</string>
   <string name="gui_address">Adresy naslouchání GUI</string>
   <string name="gui_user">Přihlašovací jméno pro GUI</string>
   <string name="gui_password">Přihlašovací heslo pro GUI</string>
   <string name="export_config">Zálohovat nastavení</string>
-  <string name="category_experimental">Experimentální</string>
   <string name="keep_wakelock_while_binary_running">Udržovat CPU aktivní pokud běží Syncthing</string>
   <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>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <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 \'0-9\', \'a-z\' a \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Resetovat databázi</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-da/strings.xml b/src/main/res/values-da/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-da/strings.xml
+++ b/src/main/res/values-da/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 22b9c61f..9e30cbef 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -29,6 +29,7 @@
   <string name="toast_write_storage_permission_required">Diese App benötigt Schreibzugriff auf den Gerätespeicher</string>
   <string name="device_rejected">Gerät %1$s möchte sich verbinden</string>
   <string name="folder_rejected">Gerät %1$s möchte Verzeichnis %2$s teilen</string>
+  <string name="dialog_disable_battery_optimization_later">Später</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Verzeichnisse</string>
   <!--Shown if no folders exist-->
@@ -128,9 +129,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Weboberfläche</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Einstellungen</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing-Optionen</string>
+  <string name="category_experimental">Experimentell</string>
   <string name="always_run_in_background">Immer im Hintergrund ausführen</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing läuft immer im Hintergrund, entsprechend den untenstehenden Einstellungen.</string>
@@ -151,7 +152,6 @@
     <item>Geringe Priorität</item>
     <item>Keine Priorität</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing-Optionen</string>
   <string name="device_name">Gerätename</string>
   <string name="listen_address">Adresse(n) für das Synchronisierungsprotokoll</string>
   <string name="max_recv_kbps">Eingehende Datenrate Limite (KiB/s)</string>
@@ -159,14 +159,12 @@
   <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="gui_address">Adressen für Weboberfläche</string>
   <string name="gui_user">Nutzername für Weboberfläche</string>
   <string name="gui_password">Passwort für Weboberfläche</string>
   <string name="export_config">Konfiguration exportieren</string>
-  <string name="category_experimental">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>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 7cf7368b..7c35f3fa 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -32,6 +32,7 @@
   <string name="toast_write_storage_permission_required">Απαιτείται η άδεια αποθήκευσης δεδομένων για αυτή την εφαρμογή</string>
   <string name="device_rejected">Η συσκευή %1$s επιθυμεί να συνδεθεί</string>
   <string name="folder_rejected">Η συσκευή %1$s επιθυμεί να διαμοιραστεί τον φάκελο %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Αργότερα</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Φάκελοι</string>
   <!--Shown if no folders exist-->
@@ -49,14 +50,14 @@
   <!--Indicates that there is no connection to the device-->
   <string name="device_disconnected">Αποσυνδεδεμένο</string>
   <!--Title for current download rate-->
-  <string name="download_title">Κατέβασμα</string>
+  <string name="download_title">Λήψη</string>
   <!--Title for current upload rate-->
-  <string name="upload_title">Ανέβασμα</string>
+  <string name="upload_title">Αποστολή</string>
   <!--DrawerFragment-->
   <!--Same as download_title with a colon and space appended-->
-  <string name="download_title_colon">Κατέβασμα:\u0020</string>
+  <string name="download_title_colon">Λήψη:\u0020</string>
   <!--Same as upload_title with a colon and space appended-->
-  <string name="upload_title_colon">Ανέβασμα:\u0020</string>
+  <string name="upload_title_colon">Αποστολή:\u0020</string>
   <!--Title for current CPU usage-->
   <string name="cpu_usage">Χρήση CPU</string>
   <!--Title for current RAM usage-->
@@ -131,12 +132,16 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Ρυθμίσεις</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Συνθήκες εκτέλεσης</string>
+  <string name="category_behaviour">Συμπεριφορά</string>
+  <string name="category_syncthing_options">Επιλογές Syncthing</string>
+  <string name="category_backup">Αντίγραφο ασφαλείας</string>
+  <string name="category_debug">Αποσφαλμάτωση</string>
+  <string name="category_experimental">Πειραματικά</string>
   <string name="always_run_in_background">Να εκτελείται πάντα στο παρασκήνιο</string>
   <!--Preference summary in case it is enabled-->
-  <string name="always_run_in_background_enabled">Το Syncthing θα εκτελείται πάντα στο παρασκήνιο βάσει των παρακάτω ρυθμίσεων.</string>
+  <string name="always_run_in_background_enabled">Το Syncthing θα εκτελείται συνεχώς στο παρασκήνιο σύμφωνα με τις παρακάτω ρυθμίσεις.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Το Syncthing θα εκτελείται μόνο αν εκκινηθεί από τον χρήστη και μπορεί να τερματιστεί από το κουμπί του μενού.</string>
   <string name="sync_only_charging">Συγχρονισμός μόνο κατά τη φόρτιση.</string>
@@ -161,7 +166,7 @@
   <string name="global_announce_enabled">Καθολική ανεύρεση</string>
   <string name="local_announce_enabled">Τοπική ανεύρεση</string>
   <string name="enable_nat_traversal">Ενεργοποίηση διάσχισης NAT</string>
-  <string name="global_announce_server">Διακομιστής καθολικής ανεύρεσης κόμβων</string>
+  <string name="global_announce_server">Διακομιστές καθολικής ανεύρεσης κόμβων</string>
   <string name="enable_relaying">Ενεργοποίηση αναμετάδοσης</string>
   <string name="usage_reporting">Ανώνυμη αναφορά δεδομένων χρήσης</string>
   <string name="gui_address">Διευθύνσεις ακρόασης του GUI</string>
@@ -213,7 +218,7 @@
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Έκδοση Syncthing</string>
   <!--Title of the preference showing this app's version name-->
-  <string name="app_version_title">Έκδοσης Syncthing-Android</string>
+  <string name="app_version_title">Έκδοση Syncthing-Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
   <string name="folder_picker_title">Επιλογέας φακέλων</string>
@@ -249,7 +254,7 @@
   <string name="syncthing_active">Το Syncthing εκτελείται</string>
   <string name="syncthing_active_foreground">Η υπηρεσία εκτελείται με προτεραιότητα προσκηνίου</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
-  <string name="toast_folder_observer_stack_overflow">Η ιεραρχία των φακέλων έχει υπερβολικό βάθος. Ελέγξτε αν υπάρχουν κυκλικοί συμβολικοί σύνδεσμοι</string>
+  <string name="toast_folder_observer_stack_overflow">Η ιεραρχία των φακέλων έχει υπερβολικά μεγάλο βάθος. Ελέγξτε αν υπάρχουν κυκλικοί συμβολικοί σύνδεσμοι</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Η δημιουργία των ρυθμίσεων του Syncthing απέτυχε. Παρακαλώ ελέγξτε την καταγραφή συμβάντων.</string>
   <!--Label of the default folder created of first start (camera folder).-->
diff --git a/src/main/res/values-es-rEC/strings.xml b/src/main/res/values-es-rEC/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-es-rEC/strings.xml
+++ b/src/main/res/values-es-rEC/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index 9043a45a..c6e9a028 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Esta aplicación requiere permiso para escribir en el almacenamiento</string>
   <string name="device_rejected">El dispositivo %1$s quiere conectarse</string>
   <string name="folder_rejected">El dispositivo %1$s quiere compartir la carpeta %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Después</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Carpetas</string>
   <!--Shown if no folders exist-->
@@ -124,9 +125,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz Web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Configuración</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Opciones de Syncthing</string>
+  <string name="category_experimental">Experimental</string>
   <string name="always_run_in_background">Siempre ejecutar en el fondo</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing siempre se ejecuta en el fondo, de acuerdo a las preferencias debajo.</string>
@@ -146,20 +147,17 @@
     <item>Baja Prioridad</item>
     <item>Ninguna</item>
   </string-array>
-  <string name="category_syncthing_options">Opciones de Syncthing</string>
   <string name="device_name">Nombre del dispositivo</string>
   <string name="listen_address">Direcciones de escucha del Protocolo de Sincronización</string>
   <string name="max_recv_kbps">Límite de Tasa de Entrada (KiB/s)</string>
   <string name="max_send_kbps">Límite de Tasa de Salida (KiB/s)</string>
   <string name="global_announce_enabled">Descubrimiento Global</string>
   <string name="local_announce_enabled">Descubrimiento Local</string>
-  <string name="global_announce_server">Servidor de Descubrimiento Global</string>
   <string name="usage_reporting">Reporte de uso anónimo</string>
   <string name="gui_address">Direcciones de escucha de la interfaz gráfica</string>
   <string name="gui_user">Autenticación del Usuario en la Interfaz Gráfica</string>
   <string name="gui_password">Autenticación de la Contraseña en la Interfaz Gráfica</string>
   <string name="export_config">Exportar Configuración</string>
-  <string name="category_experimental">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-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 81c81964..db9adcc5 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -29,6 +29,7 @@
   <string name="toast_write_storage_permission_required">Esta app necesita permiso para escribir al sistema de almacenamiento</string>
   <string name="device_rejected">El dispositivo %1$s desea conectar</string>
   <string name="folder_rejected">El dispositivo %1$s desea compartir la carpeta %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Después</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Carpetas</string>
   <!--Shown if no folders exist-->
@@ -128,9 +129,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz gráfica web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Ajustes</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Opciones de Syncthing</string>
+  <string name="category_experimental">Experimental</string>
   <string name="always_run_in_background">Ejecutar siempre en segundo plano</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing se ejecutará siempre en segundo plano, de acuerdo a la siguiente configuración.</string>
@@ -152,14 +153,12 @@
     <item>Ninguna</item>
   </string-array>
   <string name="device_name">Nombre del dispositivo</string>
-  <string name="category_syncthing_options">Opciones de Syncthing</string>
   <string name="listen_address">Direcciones de escucha del protocolo de sincronización</string>
   <string name="max_recv_kbps">Límite de tráfico de entrada (KiB/s)</string>
   <string name="max_send_kbps">Límite de tráfico de salida (KiB/s)</string>
   <string name="global_announce_enabled">Descubrimiento global</string>
   <string name="local_announce_enabled">Descubrimiento local</string>
   <string name="enable_nat_traversal">Permitir NAT Traversal</string>
-  <string name="global_announce_server">Servidor de descubrimiento global</string>
   <string name="enable_relaying">Activar retransmisión (Relaying)</string>
   <string name="usage_reporting">Informe de uso anónimo</string>
   <string name="gui_address">Direcciones de escucha de la interfaz</string>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 0256fd83..cc071591 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -6,6 +6,9 @@
   <!--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, à code source ouvert, de synchronisation de fichiers.\n\
+Pour partager des données avec d\'autres appareils, vous devez ajouter leur identifiant unique à la liste des appareils. Ensuite, vous pouvez sélectionner quels dossiers partager avec quels appareils..\n\
+S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</string>
   <string name="cont">Continuer</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <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">L\'appareil %1$s veut se connecter</string>
   <string name="folder_rejected">L\'appareil %1$s veut partager %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Plus tard</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Partages</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface WEB</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Paramètres</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Conditions d\'exécution</string>
+  <string name="category_behaviour">Comportement</string>
+  <string name="category_syncthing_options">Options Syncthing</string>
+  <string name="category_backup">Sauvegarde</string>
+  <string name="category_debug">Debug</string>
+  <string name="category_experimental">Expérimental</string>
   <string name="always_run_in_background">Fonctionner en tâche de fond.</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing continue à fonctionner en tâche de fond, selon les réglages dans les paramètres.</string>
@@ -151,7 +159,6 @@
     <item>Discrète</item>
     <item>Aucune</item>
   </string-array>
-  <string name="category_syncthing_options">Options Syncthing</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>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">Recherche globale</string>
   <string name="local_announce_enabled">Recherche locale</string>
   <string name="enable_nat_traversal">Activer transfert d\'adresses (NAT)</string>
-  <string name="global_announce_server">Serveur de découverte globale</string>
+  <string name="global_announce_server">Serveurs de découverte globale</string>
   <string name="enable_relaying">Activer le relayage</string>
   <string name="usage_reporting">Rapports anonymes d\'utilisation</string>
   <string name="gui_address">Adresse pour l\'interface WEB</string>
   <string name="gui_user">Nom d\'authentification pour l\'interface WEB</string>
   <string name="gui_password">Mot de passe d\'authentification pour l\'interface WEB</string>
   <string name="export_config">Exporter la configuration</string>
-  <string name="category_experimental">Expérimental</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>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Options de débuggage</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Seulement 0-9, a-z et \',\' sont autorisés dans les options STTRACE</string>
   <!--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-->
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 2f1c5a09..bd35ba06 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -24,6 +24,7 @@
   <string name="off">kikapcsolva</string>
   <string name="open_website">Weblap megnyitása</string>
   <string name="toast_write_storage_permission_required">Ehhez az alkalmazáshoz írási jogra van szükség.</string>
+  <string name="dialog_disable_battery_optimization_later">Később</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mappák</string>
   <!--Shown if no folders exist-->
@@ -109,9 +110,8 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Beállítások</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing beállításai</string>
   <string name="always_run_in_background">Mindig fusson a háttérben</string>
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
@@ -122,11 +122,9 @@
   <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>
-  <string name="category_syncthing_options">Syncthing beállításai</string>
   <string name="device_name">Eszköz név</string>
   <string name="global_announce_enabled">Globális felfedezés</string>
   <string name="local_announce_enabled">Helyi felfedezés</string>
-  <string name="global_announce_server">Globális felfedező szerver</string>
   <string name="export_config">Beállítások mentése</string>
   <!--Dialog shown before config export-->
   <!--Dialog shown before config import-->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 3e2abcda..1722c7ac 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -86,8 +86,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index ec677bdf..f3cd4192 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -29,6 +29,7 @@
   <string name="toast_write_storage_permission_required">E\' richiesto il permesso di scrittura per questa app</string>
   <string name="device_rejected">Dispositivo %1$s vuole connettersi</string>
   <string name="folder_rejected">Il dispositivo %1$s desidera condividere la cartella %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Più tardi</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Cartelle</string>
   <!--Shown if no folders exist-->
@@ -128,9 +129,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaccia Web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Impostazioni</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Opzioni di Syncthing</string>
+  <string name="category_experimental">Sperimentale</string>
   <string name="always_run_in_background">Sempre in background</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing è sempre in esecuzione in modalità background.</string>
@@ -151,7 +152,6 @@
     <item>Bassa priorità</item>
     <item>Nessuno</item>
   </string-array>
-  <string name="category_syncthing_options">Opzioni di Syncthing</string>
   <string name="device_name">Nome Dispositivo</string>
   <string name="listen_address">Indirizzi Protocollo Sincronizzazione</string>
   <string name="max_recv_kbps">Limite Velocità in Ingresso (KiB/s)</string>
@@ -159,14 +159,12 @@
   <string name="global_announce_enabled">Individuazione Globale</string>
   <string name="local_announce_enabled">Individuazione Locale</string>
   <string name="enable_nat_traversal">Abilita NAT Traversal</string>
-  <string name="global_announce_server">Server Individuazione Globale</string>
   <string name="enable_relaying">Abilita Reindirizzamento</string>
   <string name="usage_reporting">Statistiche Anonime Utilizzo</string>
   <string name="gui_address">Indirizzi Interfaccia Grafica</string>
   <string name="gui_user">Utente Interfaccia Grafica</string>
   <string name="gui_password">Password Autenticazione Utente</string>
   <string name="export_config">Esporta Configurazione</string>
-  <string name="category_experimental">Sperimentale</string>
   <string name="keep_wakelock_while_binary_running">Mantieni attiva la CPU quando syncthing è in esecuzione</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>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 3ea3e442..e49ed3a1 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -6,6 +6,9 @@
   <!--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\
+他のデバイスとデータを共有するには、デバイスリストにその一意のデバイス ID を追加する必要があります。その後で、そのデバイスと共有するフォルダーを選択することができます。\n\
+発生した問題は何でも Github で報告してください。</string>
   <string name="cont">続行</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">このアプリはストレージの書き込みアクセス許可が必要です</string>
   <string name="device_rejected">デバイス %1$s が接続を求めています</string>
   <string name="folder_rejected">デバイス %1$s がフォルダー %2$s の共有を求めています</string>
+  <string name="dialog_disable_battery_optimization_later">後で</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">フォルダー</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">設定</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">実行条件</string>
+  <string name="category_behaviour">動作</string>
+  <string name="category_syncthing_options">同期オプション</string>
+  <string name="category_backup">バックアップ</string>
+  <string name="category_debug">デバッグ</string>
+  <string name="category_experimental">実験的</string>
   <string name="always_run_in_background">常にバックグラウンドで実行</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">以下のプリファレンスに応じて、常にバックグラウンドで実行されます。</string>
@@ -151,7 +159,6 @@
     <item>優先度低</item>
     <item>なし</item>
   </string-array>
-  <string name="category_syncthing_options">同期オプション</string>
   <string name="device_name">デバイス名</string>
   <string name="listen_address">同期プロトコル リスンアドレス</string>
   <string name="max_recv_kbps">着信レート制限 (KiB/秒)</string>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">グローバル探索</string>
   <string name="local_announce_enabled">ローカル探索</string>
   <string name="enable_nat_traversal">NAT トラバーサルを有効にする</string>
-  <string name="global_announce_server">グローバル探索サーバー</string>
+  <string name="global_announce_server">グローバル検索サーバー</string>
   <string name="enable_relaying">リレーを有効にする</string>
   <string name="usage_reporting">匿名使用状況レポート</string>
   <string name="gui_address">GUI リスンアドレス</string>
   <string name="gui_user">GUI 認証ユーザー</string>
   <string name="gui_password">GUI 認証パスワード</string>
   <string name="export_config">設定をエクスポート</string>
-  <string name="category_experimental">実験的</string>
   <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>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">デバッグオプション</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">STTRACE オプションでは、0-9、a-z および \',\' のみ使用できます。</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">データベースをリセット</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 105f6b63..b85539ab 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -29,6 +29,7 @@
   <string name="toast_write_storage_permission_required">스토리지 쓰기 권한이 필요합니다</string>
   <string name="device_rejected">%1$s 장치가 연결을 원하고 있습니다</string>
   <string name="folder_rejected">%1$s 장치가 %2$s 폴더를 공유하길 원하고 있습니다</string>
+  <string name="dialog_disable_battery_optimization_later">나중에</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">폴더</string>
   <!--Shown if no folders exist-->
@@ -128,9 +129,11 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">웹 GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">설정</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing 옵션 </string>
+  <string name="category_backup">백업</string>
+  <string name="category_debug">디버그</string>
+  <string name="category_experimental">실험적인 기능</string>
   <string name="always_run_in_background">백그라운드에서 항상 실행</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing이 항상 백그라운드에서 실행되도록, 다음의 설정을 변경할 수 있습니다.</string>
@@ -151,7 +154,6 @@
     <item>우선 순위 낮음</item>
     <item>사용 안 함</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing 옵션 </string>
   <string name="device_name">기기명</string>
   <string name="listen_address">동기화 프로토콜 수신 주소</string>
   <string name="max_recv_kbps">다운로드 속도 제한 (KiB/s)</string>
@@ -166,7 +168,6 @@
   <string name="gui_user">GUI 인증 사용자</string>
   <string name="gui_password">GUI 인증 비밀번호</string>
   <string name="export_config">설정 내보내기</string>
-  <string name="category_experimental">실험적인 기능</string>
   <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>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 2be04df0..b769d768 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Skriverettigheter til lagringsenheten kreves av denne appen</string>
   <string name="device_rejected">Enheten %1$s ønsker å koble til</string>
   <string name="folder_rejected">Enheten %1$s ønsker å dele mappen %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Senere</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mapper</string>
   <!--Shown if no folders exist-->
@@ -126,9 +127,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webgrensesnitt</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Innstillinger</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Valg for Syncthing</string>
+  <string name="category_experimental">Eksperimentelt</string>
   <string name="always_run_in_background">Kjør alltid i bakgrunnen</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing kjører alltid i bakgrunnen, i henhold til valgene nedenfor.</string>
@@ -149,7 +150,6 @@
     <item>Lav prioritet</item>
     <item>Ingen</item>
   </string-array>
-  <string name="category_syncthing_options">Valg for Syncthing</string>
   <string name="device_name">Enhetsnavn</string>
   <string name="listen_address">Lytteadresser for synkeprotokoll</string>
   <string name="max_recv_kbps">Grense for innkommende trafikk (KiB/s)</string>
@@ -157,14 +157,12 @@
   <string name="global_announce_enabled">Global søking</string>
   <string name="local_announce_enabled">Lokal søking</string>
   <string name="enable_nat_traversal">Slå på NAT traversering</string>
-  <string name="global_announce_server">Global søketjener</string>
   <string name="enable_relaying">Aktiver relésending</string>
   <string name="usage_reporting">Anonym bruksrapportering</string>
   <string name="gui_address">GUI Lytteadresser</string>
   <string name="gui_user">GUI Autentiseringsbruker</string>
   <string name="gui_password">GUI Autentiseringspassord</string>
   <string name="export_config">Eksporter innstillinger</string>
-  <string name="category_experimental">Eksperimentelt</string>
   <string name="keep_wakelock_while_binary_running">Hold prosessoren våken mens Syncthing kjører</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>
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 134b564b..4e979681 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -6,6 +6,9 @@
   <!--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-bron-bestandssynchronisatietoepassing.\n\
+Om gegevens met andere apparaten te delen moet je hun unieke apparaats-ID toevoegen aan de lijst met apparaten. Nadien kan je kiezen welke mappen je met welke apparaten wil delen.\n\
+Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="cont">Verder</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">Schrijftoegang is vereist voor deze applicatie</string>
   <string name="device_rejected">Apparaat %1$s wil verbinding maken</string>
   <string name="folder_rejected">Apparaat %1$s wil map %2$s delen</string>
+  <string name="dialog_disable_battery_optimization_later">Later</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mappen</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web-interface</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Instellingen</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Uitvoervoorwaarden</string>
+  <string name="category_behaviour">Gedrag</string>
+  <string name="category_syncthing_options">Syncthing-opties</string>
+  <string name="category_backup">Back-up</string>
+  <string name="category_debug">Debug</string>
+  <string name="category_experimental">Experimenteel</string>
   <string name="always_run_in_background">Altijd draaien in achtergrond</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing draait altijd in de achtergrond, volgens de hieronder weergegeven voorkeuren.</string>
@@ -151,7 +159,6 @@
     <item>Lage prioriteit</item>
     <item>Geen</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing-opties</string>
   <string name="device_name">Apparaatnaam</string>
   <string name="listen_address">Synchronisatieprotocol luister-adressen</string>
   <string name="max_recv_kbps">Inkomende snelheidslimiet (KiB/s)</string>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">Globale ontdekking</string>
   <string name="local_announce_enabled">Lokale ontdekking</string>
   <string name="enable_nat_traversal">NAT-traversal inschakelen</string>
-  <string name="global_announce_server">Globale ontdekkingsserver</string>
+  <string name="global_announce_server">Globale ontdekkingsservers</string>
   <string name="enable_relaying">Relayen inschakelen</string>
   <string name="usage_reporting">Anoniem gebruiksrapportage</string>
   <string name="gui_address">GUI luister-adressen</string>
   <string name="gui_user">GUI-authenticatie gebruiker</string>
   <string name="gui_password">GUI-authenticatie wachtwoord</string>
   <string name="export_config">Configuratie exporteren</string>
-  <string name="category_experimental">Experimenteel</string>
   <string name="keep_wakelock_while_binary_running">Laat de CPU niet slapen wanneer Syncthing wordt uitgevoerd</string>
   <string name="keep_wakelock_while_binary_running_summary">Gebruik deze instelling als je onverwacht losgekoppeld wordt wanneer je op batterij werkt. Dit zal leiden tot verhoogd batterijverbruik.</string>
   <string name="run_as_foreground_service">Dienst uitvoeren met voorgrondprioriteit</string>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Debug-opties</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Enkel 0-9, a-z en \',\' zijn toegestaan in STTRACE-opties</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Database opnieuw instellen</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index 6f656e93..71ace951 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Løyve til å skrive data er naudsynt for å bruke appen</string>
   <string name="device_rejected">Eininga %1$s vil kople til</string>
   <string name="folder_rejected">Eininga %1$s vil dele mappa %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Seinare</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mapper</string>
   <!--Shown if no folders exist-->
@@ -126,9 +127,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Grafisk grensesnitt på verdsveven</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Innstillingar</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing-innstillingar</string>
+  <string name="category_experimental">Eksperiment</string>
   <string name="always_run_in_background">Køyr alltid i bakgrunnen</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing køyrer alltid i bakgrunnen, i tråd med innstillingane under.</string>
@@ -149,7 +150,6 @@
     <item>Låg prioritet</item>
     <item>Ingen</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing-innstillingar</string>
   <string name="device_name">Einingsnamn</string>
   <string name="listen_address">Lytteadresse for synkroniseringsprotokoll</string>
   <string name="max_recv_kbps">Nedlastingsgrense (KiB/s)</string>
@@ -157,14 +157,12 @@
   <string name="global_announce_enabled">Global søketeneste</string>
   <string name="local_announce_enabled">Lokal søketeneste</string>
   <string name="enable_nat_traversal">Slå på NAT-gjennomgang</string>
-  <string name="global_announce_server">Tener for global søketeneste</string>
   <string name="enable_relaying">Aktiver Reléer</string>
   <string name="usage_reporting">Anonym rapportering av bruk</string>
   <string name="gui_address">Grensesnitt: lytteadresser</string>
   <string name="gui_user">Grensesnitt: Brukarnamn</string>
   <string name="gui_password">Grensesnitt: Passord</string>
   <string name="export_config">Eksporter innstillingar</string>
-  <string name="category_experimental">Eksperiment</string>
   <string name="keep_wakelock_while_binary_running">Hald prosessoren vaken medan Syncthing køyrer</string>
   <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>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 70a11216..731cc565 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -29,6 +29,7 @@
   <string name="toast_write_storage_permission_required">Wymagane zezwolenie na zapisywanie do pamięci zewnętrznej</string>
   <string name="device_rejected">Urządzenie %1$s chce nawiązać połączenie</string>
   <string name="folder_rejected">Urządzenie %1$s chce udostępnić katalog %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Później</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Katalogi</string>
   <!--Shown if no folders exist-->
@@ -128,9 +129,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfejs internetowy</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Ustawienia</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Ustawienia Syncthing</string>
+  <string name="category_experimental">Eksperymentalne</string>
   <string name="always_run_in_background">Działanie w tle</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Uruchamia program w tle zgodnie z poniższymi preferencjami</string>
@@ -145,7 +146,6 @@
   <string name="use_root_title">Synchronizuje zawartość z uprawnieniami użytkownika Superuser</string>
   <string name="notification_type_title">Powiadomienie</string>
   <string name="notification_type_summary">Wybiera rodzaj powiadomienia</string>
-  <string name="category_syncthing_options">Ustawienia Syncthing</string>
   <string name="device_name">Nazwa urządzenia</string>
   <string name="listen_address">Adres nasłuchiwania protokołu</string>
   <string name="max_recv_kbps">Limit pobierania (KiB/s)</string>
@@ -153,7 +153,6 @@
   <string name="global_announce_enabled">Globalne wyszukiwanie</string>
   <string name="local_announce_enabled">Lokalne wyszukiwanie</string>
   <string name="enable_nat_traversal">Trawersowanie 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="gui_address">Adres nasłuchiwania</string>
@@ -161,7 +160,6 @@
   <string name="gui_password">Hasło</string>
   <string name="export_config">Eksportuj ustawienia</string>
   <string name="keep_wakelock_while_binary_running">Utrzymywanie wybudzonego CPU podczas działania</string>
-  <string name="category_experimental">Eksperymelne!</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">Pierwszoplanowy priorytet usługi</string>
   <string name="use_tor_title">Korzystanie z Tor</string>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 330326a2..a8fd54a9 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -6,6 +6,9 @@
   <!--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\
+Para compartilhar dados com outros dispositivos, você precisa adicionar seus identificadores únicos à sua lista de dispositivos. Assim você pode selecionar quais pastas compartilhará\n\
+Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</string>
   <string name="cont">Continuar</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">A permissão de escrita em armazenamento é obrigatória para este aplicativo</string>
   <string name="device_rejected">O dispositivo %1$s quer se conectar</string>
   <string name="folder_rejected">O dispostivo %1$s quer compartilhar a pasta %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Depois</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Pastas</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Configurações</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Condições de execução</string>
+  <string name="category_behaviour">Comportamento</string>
+  <string name="category_syncthing_options">Opções do Syncthing</string>
+  <string name="category_backup">Backup</string>
+  <string name="category_debug">Depuração</string>
+  <string name="category_experimental">Configurações experimentais</string>
   <string name="always_run_in_background">Sempre rodar em segundo plano</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">O Syncthing sempre rodará em segundo plano de acordo com as preferências abaixo.</string>
@@ -151,7 +159,6 @@
     <item>Baixa prioridade</item>
     <item>Nenhuma</item>
   </string-array>
-  <string name="category_syncthing_options">Opções do Syncthing</string>
   <string name="device_name">Nome do dispositivo</string>
   <string name="listen_address">Endereços de escuta do protocolo de sincronização</string>
   <string name="max_recv_kbps">Limite de velocidade de recepção (KiB/s)</string>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">Descoberta global</string>
   <string name="local_announce_enabled">Descoberta local</string>
   <string name="enable_nat_traversal">Habilitar NAT</string>
-  <string name="global_announce_server">Descoberta global</string>
+  <string name="global_announce_server">Servidores de descoberta global</string>
   <string name="enable_relaying">Habilitar retransmissão</string>
   <string name="usage_reporting">Relatório anônimo de uso</string>
   <string name="gui_address">Endereços de escuta da interface</string>
   <string name="gui_user">Nome de usuário da interface</string>
   <string name="gui_password">Senha da interface</string>
   <string name="export_config">Exportar configuração</string>
-  <string name="category_experimental">Configurações experimentais</string>
   <string name="keep_wakelock_while_binary_running">Manter a CPU acordada</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>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opções de depuração</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Somente os caracteres 0-9, a-z e vírgula são permitidos nas opções de STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Limpar banco de dados</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 19a9664c..0f964632 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -6,6 +6,10 @@
   <!--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">O Syncthing é uma aplicação de sincronização de ficheiros de código aberto.\n\
+Para partilhar dados com outros dispositivos, tem que adicionar o seu ID único de dispositivo à lista de dispositivos. Depois pode seleccionar quais as pastas a partilhar com os dispositivos.\n\
+Reporte, através do Github, quaisquer problemas que encontre, por favor.</string>
+  <string name="cont">Continuar</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
   <string name="web_gui_loading">Aguardando a interface web</string>
@@ -26,6 +30,9 @@
   <string name="off">desligado</string>
   <string name="open_website">Abrir Website</string>
   <string name="toast_write_storage_permission_required">Esta aplicação precisa de permissão de escrita no armazenamento</string>
+  <string name="device_rejected">O dispositivo %1$s quer conectar-se</string>
+  <string name="folder_rejected">O dispositivo %1$s quer partilhar a pasta %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Mais tarde</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Pastas</string>
   <!--Shown if no folders exist-->
@@ -57,10 +64,13 @@
   <string name="ram_usage">Utilização da RAM</string>
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de busca global</string>
+  <string name="restart">Reiniciar</string>
+  <string name="dialog_confirm_restart">Quer reiniciar o Syncthing?</string>
   <!--FolderActivity-->
   <!--Setting title-->
   <string name="folder_id">ID da pasta</string>
   <!--Setting title-->
+  <string name="folder_label">Etiqueta da pasta</string>
   <!--Setting title-->
   <string name="directory">Pasta</string>
   <!--Setting title-->
@@ -78,10 +88,12 @@
   <!--Menu item to confirm folder creation-->
   <string name="create">Criar</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Tem a certeza de que quer remover esta pasta do Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">O ID da pasta não pode 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>
+  <string name="dialog_discard_changes">Descarto as suas alterações?</string>
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
@@ -109,6 +121,7 @@
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Tem a certeza de que quer remover este dispositivo?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">O ID do dispositivo não pode estar vazio</string>
   <!--Content description for device ID qr code icon-->
@@ -119,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interface Web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Configurações</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Condições de execução</string>
+  <string name="category_behaviour">Comportamento</string>
+  <string name="category_syncthing_options">Opções do Syncthing</string>
+  <string name="category_backup">Cópia de segurança</string>
+  <string name="category_debug">Depuração</string>
+  <string name="category_experimental">Experimental</string>
   <string name="always_run_in_background">Correr sempre em segundo plano</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing corre sempre em segundo plano, de acordo com as preferências abaixo.</string>
@@ -129,9 +146,12 @@
   <string name="always_run_in_background_disabled">Syncthing apenas corre quando iniciado explicitamente e pode ser parado com o botão do menu.</string>
   <string name="sync_only_charging">Sincronizar apenas quando está a carregar</string>
   <string name="sync_only_wifi">Sincronizar apenas quando está em wifi</string>
+  <string name="sync_only_wifi_ssids">Restringir a certas redes wifi</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Ligue o WiFi para seleccionar redes.</string>
   <string name="advanced_folder_picker">Usar selector de pasta avançado</string>
   <string name="advanced_folder_picker_summary">Seleccione qualquer pasta no dispositivo para sincronizar</string>
   <string name="use_root_title">Correr o Syncthing como superutilizador</string>
+  <string name="use_root_summary">Esta é uma funcionalidade instável que pode causar problemas com o Syncthing e com o seu dispositivo. Se encontrar problemas, pode ter de reinstalar o Syncthing.</string>
   <string name="notification_type_title">Notificação</string>
   <string name="notification_type_summary">Escolha o tipo de notificação</string>
   <string-array name="notification_type_entries">
@@ -139,20 +159,28 @@
     <item>Baixa prioridade</item>
     <item>Nenhuma</item>
   </string-array>
-  <string name="category_syncthing_options">Opções do Syncthing</string>
   <string name="device_name">Nome do dispositivo</string>
   <string name="listen_address">Endereços de escuta do protocolo de sincronização</string>
   <string name="max_recv_kbps">Limite de velocidade de recepção (KiB/s)</string>
   <string name="max_send_kbps">Limite de velocidade de envio (KiB/s)</string>
   <string name="global_announce_enabled">Busca global</string>
   <string name="local_announce_enabled">Busca local</string>
-  <string name="global_announce_server">Servidor da busca global</string>
+  <string name="enable_nat_traversal">Activar travessia de NAT</string>
+  <string name="global_announce_server">Servidores de pesquisa global</string>
+  <string name="enable_relaying">Permitir retransmissão</string>
   <string name="usage_reporting">Enviar relatórios anónimos de utilização</string>
   <string name="gui_address">Endereço de escuta da interface gráfica</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>
+  <string name="keep_wakelock_while_binary_running">Manter a CPU acordada enquanto o Syncthing está a correr</string>
+  <string name="keep_wakelock_while_binary_running_summary">Use esta definição se experimentar desconectações inesperadas enquanto estiver a trabalhar com a bateria. Isto irá resultar num aumento do consumo da carga da bateria.</string>
+  <string name="run_as_foreground_service">Correr o serviço com prioridade de primeiro plano</string>
+  <string name="run_as_foreground_service_summary">Se estiver activado, o Syncthing irá correr com prioridade de primeiro plano e tem menos probabilidades de ser parado pelo Android. Isto pode fazer com que outros serviços parem se a memória estiver baixa. Uma notificação de baixa prioridade tem que ser apresentada por causa de exigências do Android, independentemente da definição de \"Notificação\".</string>
+  <string name="use_tor_title">Utilizar o Tor</string>
+  <string name="use_tor_summary">Forçar todo o tráfego através do Tor para aumentar a privacidade. Exige Orbot</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Tem a certeza de que quer exportar a sua configuração? Ficheiros existentes serão sobrescritos.\n\nAVISO! Outras aplicações poderão ler a chave privada da localização da cópia de segurança e utilizá-la para descarregar/modificar os ficheiros sincronizados.</string>
   <!--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-->
@@ -165,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opções da despistagem de erros</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Nas opções STTRACE apenas é permitido 0-9, a-z e \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reiniciar a base de dados</string>
   <!--Syncthing was reset-->
@@ -185,6 +214,7 @@
   <!--URL of the issue tracker-->
   <!--Menu item to donate-->
   <string name="donate_title">Doar</string>
+  <string name="donate_summary">Ajude-nos a pagar as despesas com domínios e alojamento</string>
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Versão do </string>
   <!--Title of the preference showing this app's version name-->
@@ -208,6 +238,7 @@
   <string name="log_android_title">Ver registo do Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Ver o registo do Syncthing</string>
+  <string name="retrieving_logs">Obtendo registos...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Partilhar</string>
   <!--SyncthingService-->
@@ -221,11 +252,13 @@
   <string name="exit">Sair</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">O Syncthing está a correr</string>
+  <string name="syncthing_active_foreground">O serviço está a correr com prioridade de primeiro plano.</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
   <string name="toast_folder_observer_stack_overflow">Árvore de pastas demasiado profunda. Verifique se existem ligações simbólicas cíclicas</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Falhou a criação duma configuração para o Syncthing. Verifique os registos, por favor.</string>
   <!--Label of the default folder created of first start (camera folder).-->
+  <string name="default_folder_label">Câmera</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">fotos-de-%1$s</string>
   <!--RestApi-->
@@ -263,4 +296,6 @@
   <string name="state_error">Erro</string>
   <string name="state_unknown">Desconhecido</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">Parar o Syncthing não é suportado quando está activada a opção para correr em segundo plano.</string>
 </resources>
diff --git a/src/main/res/values-ro/strings.xml b/src/main/res/values-ro/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-ro/strings.xml
+++ b/src/main/res/values-ro/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 76ed31b3..ef83f1e9 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Приложению требуется право на запись</string>
   <string name="device_rejected">Устройство %1$s запрашивает подключение</string>
   <string name="folder_rejected">Устройство %1$s предлагает расшаренную папку %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Позже</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Папки</string>
   <!--Shown if no folders exist-->
@@ -125,9 +126,8 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Веб-интерфейс</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Настройки</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Настройки устройства</string>
   <string name="always_run_in_background">Фоновый режим</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Автозапуск при перезагрузке устройства и работа в фоне</string>
@@ -148,7 +148,6 @@
     <item>Низкий</item>
     <item>Никогда</item>
   </string-array>
-  <string name="category_syncthing_options">Настройки устройства</string>
   <string name="device_name">Имя устройства</string>
   <string name="listen_address">Адрес Ожидания Протокола Синхронизации</string>
   <string name="max_recv_kbps">Лимит Скачивания (КБ/с)</string>
@@ -156,7 +155,6 @@
   <string name="global_announce_enabled">Глобальное Обнаружение</string>
   <string name="local_announce_enabled">Локальное Обнаружение</string>
   <string name="enable_nat_traversal">Включить NAT-T обход</string>
-  <string name="global_announce_server">Глобальный сервер обнаружения</string>
   <string name="enable_relaying">Включить релеи</string>
   <string name="usage_reporting">Анонимные Отчёты Использования</string>
   <string name="gui_address">Адрес Ожидания GUI</string>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index fce7d1ef..16458527 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -26,6 +26,7 @@
   <string name="off">vypnuté</string>
   <string name="open_website">Otvoriť Webovú Stránku</string>
   <string name="toast_write_storage_permission_required">Táto aplikácia potrebuje práva pre zápis na úložisko</string>
+  <string name="dialog_disable_battery_optimization_later">Neskôr</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Adresáre</string>
   <!--Shown if no folders exist-->
@@ -118,9 +119,8 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webové GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Nastavenia</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Nastavenia Syncthing</string>
   <string name="always_run_in_background">Vždy bežať na pozadí</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing vždy beží na pozadí, podla nasledovných nastavení.</string>
@@ -138,14 +138,12 @@
     <item>S nízkou prioritou</item>
     <item>Žiadne</item>
   </string-array>
-  <string name="category_syncthing_options">Nastavenia Syncthing</string>
   <string name="device_name">Názov Zariadenia</string>
   <string name="listen_address">Adresa pre Sync Protokol</string>
   <string name="max_recv_kbps">Limit Rýchlosti Sťahovania (KiB/s)</string>
   <string name="max_send_kbps">Limit Rýchlosti Odosielania (KiB/s)</string>
   <string name="global_announce_enabled">Globálne Vyhľadávanie</string>
   <string name="local_announce_enabled">Lokálne Vyhľadávanie</string>
-  <string name="global_announce_server">Adresa Serveru pre Globálne Vyhľadávanie</string>
   <string name="usage_reporting">Povoliť Anonymné Hlásenia o Používaní</string>
   <string name="gui_address">Adresa pre GUI</string>
   <string name="gui_user">Užívateľské Meno pre GUI</string>
diff --git a/src/main/res/values-sl/strings.xml b/src/main/res/values-sl/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-sl/strings.xml
+++ b/src/main/res/values-sl/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index c2e7c19e..1e302558 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -58,8 +58,6 @@
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <!--SettingsFragment-->
-  <!--Activity title-->
-  <!--Preference title-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
   <!--Dialog shown before config export-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 4e3f9e31..f877baa6 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -6,6 +6,9 @@
   <!--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 filsynkroniseringsapplikation med öppen källkod.\n\
+För att dela data med andra enheter måste du lägga till deras unika enhets-ID i enhetslistan. Efteråt kan du välja vilka mappar som ska delas med vilka enheter.\n\
+Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="cont">Fortsätt</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">Skrivlagringstillstånd krävs för denna applikation</string>
   <string name="device_rejected">Enhet %1$s vill ansluta</string>
   <string name="folder_rejected">Enhet %1$s vill dela katalog %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Senare</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Kataloger</string>
   <!--Shown if no folders exist-->
@@ -55,9 +59,9 @@
   <!--Same as upload_title with a colon and space appended-->
   <string name="upload_title_colon">Uppladdning:\u0020</string>
   <!--Title for current CPU usage-->
-  <string name="cpu_usage">CPU-användning</string>
+  <string name="cpu_usage">CPU användning</string>
   <!--Title for current RAM usage-->
-  <string name="ram_usage">RAM-användning</string>
+  <string name="ram_usage">RAM användning</string>
   <!--Title for announce server status-->
   <string name="announce_server">Annonseringsserver</string>
   <string name="restart">Omstart</string>
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Webb-GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Inställningar</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">Körningsbetingelser</string>
+  <string name="category_behaviour">Beteende</string>
+  <string name="category_syncthing_options">Syncthing alternativ</string>
+  <string name="category_backup">Säkerhetskopiera</string>
+  <string name="category_debug">Felsök</string>
+  <string name="category_experimental">Experimentell</string>
   <string name="always_run_in_background">Körs alltid i bakgrunden</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing körs alltid i bakgrunden, enligt inställningar nedan.</string>
@@ -151,7 +159,6 @@
     <item>Låg prioritet</item>
     <item>Ingen</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing alternativ</string>
   <string name="device_name">Enhets namn</string>
   <string name="listen_address">Synkroniseringsprotokollets lyssnaradresser</string>
   <string name="max_recv_kbps">Inkommande hastighetsgräns (KiB/s)</string>
@@ -159,18 +166,17 @@
   <string name="global_announce_enabled">Global annonsering</string>
   <string name="local_announce_enabled">Lokal annonsering</string>
   <string name="enable_nat_traversal">Aktivera NAT traversering</string>
-  <string name="global_announce_server">Global upptäktsserver</string>
+  <string name="global_announce_server">Globala annonseringsservrar</string>
   <string name="enable_relaying">Aktivera reläa</string>
   <string name="usage_reporting">Anonym användningsrapportering</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="category_experimental">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ågt. En låg prioritetsnotering måste visas på grund av Androidkrav, oavsett av \"notering\"-inställning.</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 \"notering\" 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-->
@@ -187,6 +193,7 @@
   <!--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 0-9, a-z och \',\' är tillåtna i STTRACE alternativ</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Återställ databas</string>
   <!--Syncthing was reset-->
@@ -215,7 +222,7 @@
   <!--Activity title-->
   <string name="folder_picker_title">Katalogväljare</string>
   <!--Toast shown on devices with kitkat or higher-->
-  <string name="kitkat_external_storage_warning">Varning: Din Android-version tillåter inte synkronisering till externa lagringsenheter</string>
+  <string name="kitkat_external_storage_warning">Varning: Din Android version tillåter inte synkronisering till externa lagringsenheter</string>
   <!--ListView empty text-->
   <string name="directory_empty">Katalog är tom</string>
   <!--Menu item to create folder on the file system-->
@@ -252,7 +259,7 @@
   <!--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-foton</string>
+  <string name="default_folder_id">%1$s foton</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Omstart behövs</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index b9176073..4e19e9f3 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -26,6 +26,7 @@
   <string name="off">kapalı</string>
   <string name="open_website">Web sitesini aç</string>
   <string name="toast_write_storage_permission_required">Bu uygulama için belleğe yazma yetkisi gerekmektedir.</string>
+  <string name="dialog_disable_battery_optimization_later">Daha sonra</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Klasörler</string>
   <!--Shown if no folders exist-->
@@ -119,9 +120,8 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Web Arayüzü</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Ayarlar</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing Seçenekler</string>
   <string name="always_run_in_background">Arkaplanda herzaman çalış</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing, herzaman aşağıdaki tercihlere göre arkaplanda çalışır.</string>
@@ -141,14 +141,12 @@
     <item>Düşük Öncelikli</item>
     <item>Hiçbiri</item>
   </string-array>
-  <string name="category_syncthing_options">Syncthing Seçenekler</string>
   <string name="device_name">Cihaz Adı</string>
   <string name="listen_address">Eşzamanlama Protokolü Dinleme/Bağlanma Adresleri</string>
   <string name="max_recv_kbps">Gelen Hız Sınırı (KiB/s)</string>
   <string name="max_send_kbps">Giden Hız Sınırı (KiB/s)</string>
   <string name="global_announce_enabled">Küresel Bulunabilirlik</string>
   <string name="local_announce_enabled">Yerel Bulunabilirlik</string>
-  <string name="global_announce_server">Küresel Bulunabilirlik Sunucusu</string>
   <string name="usage_reporting">Anonim olarak Kullanım Raporlama</string>
   <string name="gui_address">Arayüz Dinleme Adresleri</string>
   <string name="gui_user">Arayüz Kullanıcı Doğrulaması için Kullanıcı Adı</string>
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 7869f370..bdc72d53 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -28,6 +28,7 @@
   <string name="toast_write_storage_permission_required">Ứng dụng này cần được phép chép vào ổ lưu trữ</string>
   <string name="device_rejected">Thiết bị %1$s muốn kết nối</string>
   <string name="folder_rejected">Thiết bị %1$s muốn chia sẻ thư mục %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">Để sau</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Các thư mục</string>
   <!--Shown if no folders exist-->
@@ -124,9 +125,9 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">GUI web</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">Cài đặt</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Tuỳ chọn Syncthing</string>
+  <string name="category_experimental">Thực nghiệm</string>
   <string name="always_run_in_background">Luôn chạy nền</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing luôn chạy nền theo như tuỳ chỉnh bên dưới.</string>
@@ -146,20 +147,17 @@
     <item>Ưu tiên thấp</item>
     <item>Không thông báo</item>
   </string-array>
-  <string name="category_syncthing_options">Tuỳ chọn Syncthing</string>
   <string name="device_name">Tên thiết bị</string>
   <string name="listen_address">Đồng bộ các đ.chỉ lắng nghe giao thức</string>
   <string name="max_recv_kbps">Giới hạn t.độ đầu vào (KiB/s)</string>
   <string name="max_send_kbps">Giới hạn t.độ đầu ra (KiB/s)</string>
   <string name="global_announce_enabled">Dò tìm toàn cầu</string>
   <string name="local_announce_enabled">Dò tìm cục bộ</string>
-  <string name="global_announce_server">Máy chủ dò tìm toàn cầu</string>
   <string name="usage_reporting">Báo cáo sử dụng ẩn danh</string>
   <string name="gui_address">Các đ.chỉ lắng nghe GUI</string>
   <string name="gui_user">Người dùng xác thực GUI</string>
   <string name="gui_password">Mật khẩu xác thực GUI</string>
   <string name="export_config">Xuất cấu hình</string>
-  <string name="category_experimental">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-->
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index a82fe3b1..c95c75b4 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -6,6 +6,9 @@
   <!--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 是一个开源的文件同步处理应用程序。
+若要与其他设备分享数据，你需要添加他们的唯一设备 ID 到设备列表。之后你就可以选择要分享哪些文件夹至该设备上。
+请通过 GitHub 报告任何你遇到的问题。</string>
   <string name="cont">继续</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,6 +32,7 @@
   <string name="toast_write_storage_permission_required">本应用需要写存储的权限</string>
   <string name="device_rejected">%1$s 想要连接</string>
   <string name="folder_rejected">设备 %1$s 想要分享文件夹 %2$s</string>
+  <string name="dialog_disable_battery_optimization_later">稍后重启</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">文件夹</string>
   <!--Shown if no folders exist-->
@@ -128,9 +132,13 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">网页管理页面</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">设置</string>
-  <!--Preference title-->
+  <string name="category_run_conditions">运行条件</string>
+  <string name="category_behaviour">行为</string>
+  <string name="category_syncthing_options">同步设置</string>
+  <string name="category_backup">备份</string>
+  <string name="category_debug">调试</string>
+  <string name="category_experimental">实验性</string>
   <string name="always_run_in_background">总是在后台运行</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing 会根据下方的偏好运行在后台</string>
@@ -151,7 +159,6 @@
     <item>低优先级</item>
     <item>隐藏</item>
   </string-array>
-  <string name="category_syncthing_options">同步设置</string>
   <string name="device_name">设备名称</string>
   <string name="listen_address">同步协议监听地址</string>
   <string name="max_recv_kbps">下载限速（KiB/s）</string>
@@ -159,14 +166,13 @@
   <string name="global_announce_enabled">在互联网中寻找节点</string>
   <string name="local_announce_enabled">在局域网中寻找节点</string>
   <string name="enable_nat_traversal">启用 NAT 穿透</string>
-  <string name="global_announce_server">用以在互联网上寻找节点的发布服务器地址</string>
+  <string name="global_announce_server">全局发现服务器</string>
   <string name="enable_relaying">启用中继</string>
   <string name="usage_reporting">匿名使用报告</string>
   <string name="gui_address">管理页监听地址</string>
   <string name="gui_user">管理页认证用户</string>
   <string name="gui_password">管理页认证密码</string>
   <string name="export_config">导出设置</string>
-  <string name="category_experimental">实验性</string>
   <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>
@@ -187,6 +193,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">调试选项</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">STTRACE 选项仅允许 0-9、a-z 与半角逗号“,”</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">重置数据库</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index 2c5ba27d..19ddc1df 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -102,9 +102,8 @@
   <!--Title of the web gui activity-->
   <string name="web_gui_title">網頁 GUI</string>
   <!--SettingsFragment-->
-  <!--Activity title-->
   <string name="settings_title">設定</string>
-  <!--Preference title-->
+  <string name="category_syncthing_options">Syncthing 選項</string>
   <string name="always_run_in_background">永遠在背景執行</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">根據下列的偏好設定，Syncthing 會永遠在背景執行。</string>
@@ -113,7 +112,6 @@
   <string name="sync_only_charging">只在充電時同步</string>
   <string name="sync_only_wifi">只透過 Wi-Fi 網路同步</string>
   <string name="advanced_folder_picker">使用進階的資料夾選擇器</string>
-  <string name="category_syncthing_options">Syncthing 選項</string>
   <string name="listen_address">同步通訊協定監聽位址</string>
   <string name="max_recv_kbps">下載速率限制(KiB/s)</string>
   <string name="max_send_kbps">上傳速率限制(KiB/s)</string>