diff --git a/src/main/play/hu-HU/listing/fulldescription b/src/main/play/hu-HU/listing/fulldescription
index ec3b5090..111017be 100644
--- a/src/main/play/hu-HU/listing/fulldescription
+++ b/src/main/play/hu-HU/listing/fulldescription
@@ -1,9 +1,9 @@
-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.
+A Syncthing a zárt forrású szinkronizáló és felhő szolgáltatásokat egy nyílt, megbízható és decentralizált szoftverrel váltja fel. A te adatod csak a tiéd és te szabod meg, hogy hol tárolod, kivel osztod meg, és hogyan továbbítod az interneten.
 
-Website: https://syncthing.net/
+Weboldal: https://syncthing.net/
 
-Source code: https://github.com/syncthing/syncthing-android
+Forráskód: https://github.com/syncthing/syncthing-android
 
-Forum: https://discourse.syncthing.net/
+Fórum: https://forum.syncthing.net/
 
-Issues: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
+Hibajelentés: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/main/play/pt-PT/listing/fulldescription b/src/main/play/pt-PT/listing/fulldescription
index dbfa8fc3..b7ca5b12 100644
--- a/src/main/play/pt-PT/listing/fulldescription
+++ b/src/main/play/pt-PT/listing/fulldescription
@@ -4,6 +4,6 @@ Website: https://syncthing.net/
 
 Código fonte: https://github.com/syncthing/syncthing-android
 
-Forum: https://discourse.syncthing.net/
+Forum: https://forum.syncthing.net/
 
 Questões: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/main/play/pt-PT/listing/shortdescription b/src/main/play/pt-PT/listing/shortdescription
index d1918741..89d7f00d 100644
--- a/src/main/play/pt-PT/listing/shortdescription
+++ b/src/main/play/pt-PT/listing/shortdescription
@@ -1 +1 @@
-Substitua serviços proprietários por algo aberto, fiável e descentralizado.
\ No newline at end of file
+Sincronização aberta, fiável e descentralizada
\ 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 4ab13dfc..ab11513b 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -1,5 +1,6 @@
 <?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-->
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index d03af36c..338979ad 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -6,6 +6,10 @@
   <!--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\
+Ако срещнете проблем моля докладвайте в Github.</string>
+  <string name="cont">Напред</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
   <string name="web_gui_loading">Изчакване на потребителския интерфейс</string>
@@ -28,7 +32,10 @@
   <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_title">Пестене на батерия</string>
   <string name="dialog_disable_battery_optimization_later">По-късно</string>
+  <string name="dialog_disable_battery_optimization_dont_show_again">Без повторно запитване</string>
+  <string name="dialog_disable_battery_optimization_turn_off">Изключване за синхронизирането</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Папки</string>
   <!--Shown if no folders exist-->
@@ -61,10 +68,12 @@
   <!--Title for announce server status-->
   <string name="announce_server">Сървър за откриване на устройства</string>
   <string name="restart">Рестартиране</string>
+  <string name="dialog_confirm_restart">Желаете ли Syncthing да бъде рестартиран?</string>
   <!--FolderActivity-->
   <!--Setting title-->
   <string name="folder_id">Идентификатор на папката</string>
   <!--Setting title-->
+  <string name="folder_label">Етикет на папката</string>
   <!--Setting title-->
   <string name="directory">Директория</string>
   <!--Setting title-->
@@ -87,6 +96,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>
+  <string name="dialog_discard_changes">Отказвате ли се от направените промени?</string>
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Идентификатор на устройството</string>
@@ -105,6 +115,7 @@
     <item>Всички данни</item>
   </string-array>
   <!--Setting title-->
+  <string name="introducer">Може да предлага други устройства</string>
   <!--ActionBar item-->
   <string name="delete_device">Изтриване на устройството</string>
   <string name="add_device">Добави устройство</string>
@@ -125,8 +136,12 @@
   <string name="web_gui_title">Уеб интерфейс</string>
   <!--SettingsFragment-->
   <string name="settings_title">Настройки</string>
+  <string name="category_run_conditions">Условия на работа</string>
+  <string name="category_behaviour">Поведение</string>
   <string name="category_syncthing_options">Настройки на Syncthing</string>
-  <string name="category_experimental">Експериментално</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>
@@ -139,6 +154,7 @@
   <string name="advanced_folder_picker">Избор на папка, за напреднали</string>
   <string name="advanced_folder_picker_summary">Изберете папка, от устройството, за синхронизиране</string>
   <string name="use_root_title">Стартира Syncthing с права на Superuser</string>
+  <string name="use_root_summary">Може да предизвика разнообразни проблеми със Syncthing и като цяло с устройството. При възникване на проблем може да се наложи преинсталиране на Syncthing.</string>
   <string name="notification_type_title">Известия</string>
   <string name="notification_type_summary">Изберете тип известия</string>
   <string-array name="notification_type_entries">
@@ -152,11 +168,16 @@
   <string name="max_send_kbps">Лимит на скоростта за качване (KiB/s)</string>
   <string name="global_announce_enabled">Глобално откриване</string>
   <string name="local_announce_enabled">Локално откриване</string>
+  <string name="enable_nat_traversal">Разрешава NAT traversal</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="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-->
@@ -171,6 +192,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-->
@@ -215,6 +237,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-->
@@ -233,6 +256,7 @@
   <!--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).-->
+  <string name="default_folder_label">Камера</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-снимки</string>
   <!--RestApi-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 86ceaa19..316cf4b0 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -185,7 +185,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</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>
   <string name="use_legacy_hashing_title">Používat standardní kontrolní součet</string>
-  <string name="use_legacy_hashing_summary">Vynutí použití standardního kontrolního součtu při problémech s kompatibilitou</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-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index eb463e6c..7a86c1bc 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -33,7 +33,6 @@ Bitte melden Sie auftretende Probleme via Github.</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_title">Batterielaufzeit Optimierung</string>
-  <string name="dialog_disable_battery_optimization_message">Android kann die Synchronisierung nach einiger Zeit stoppen. Um dies zu verhindern, müssen Sie die Batterielaufzeit Optimierung abstellen.</string>
   <string name="dialog_disable_battery_optimization_later">Später</string>
   <string name="dialog_disable_battery_optimization_dont_show_again">Nicht mehr zeigen.</string>
   <string name="dialog_disable_battery_optimization_turn_off">Für Syncthing abstellen.</string>
@@ -184,7 +183,6 @@ Bitte melden Sie auftretende Probleme via Github.</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>
   <string name="use_legacy_hashing_title">Nutze veraltetes Hashing</string>
-  <string name="use_legacy_hashing_summary">Syncthing zwingen veraltetes Hashing zu nutzen aus Kompatibilitätsgründen</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-->
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index f67cb388..cd930c7a 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -51,7 +51,7 @@
   <!--Indicates that a folder is fully synced to the local device-->
   <string name="device_up_to_date">Ενημερωμένο</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
-  <string name="device_syncing">Συγχρονίζοντας (%1$d%%)</string>
+  <string name="device_syncing">Συγχρονισμός (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
   <string name="device_disconnected">Αποσυνδεδεμένο</string>
   <!--Title for current download rate-->
@@ -185,7 +185,7 @@
   <string name="use_tor_title">Χρήση του Tor</string>
   <string name="use_tor_summary">Αναγκαστική δρομολόγηση όλης της κίνησης δεδομένων μέσω του Tor για αυξημένη ιδιωτικότητα. Προαπαιτεί το Orbot</string>
   <string name="use_legacy_hashing_title">Χρήση κατακερματισμού παλαιού τύπου</string>
-  <string name="use_legacy_hashing_summary">Εξαναγκασμός χρήσης του πακέτου κατακερματισμού παλαιού τύπου για λόγους συμβατότητας</string>
+  <string name="use_legacy_hashing_summary">Χρήση του πακέτου κατακερματισμού (hashing) παλαιού τύπου για λόγους συμβατότητας</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-es/strings.xml b/src/main/res/values-es/strings.xml
index db9adcc5..1ed4077e 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -6,6 +6,7 @@
   <!--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 para sincronización de ficheros de fuentes abiertas.\nPara compartir datos con otros dispisitivos, necesitas añadir sus identificadores únicos de dispositivo a la lista de dispositivos. Después, puedes seleccionar qué carpetas vas a compartir con qué dispositivos.\nPor favor, informa de cualquier problema que te encuentres vía Github.</string>
   <string name="cont">Continuar</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
@@ -29,13 +30,18 @@
   <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_title">Optimización de batería</string>
+  <string name="dialog_disable_battery_optimization_message">Andoid puede detener la sincronización pasado un tiempo. Para evitarlo, deshabilita la optimización de batería.\n\nAlgunos dispositivos tienen instaladas aplicaciones adicionales para terminar tareas. Igualmente, deberías añadir Syncthing a su lista blanca.</string>
   <string name="dialog_disable_battery_optimization_later">Después</string>
+  <string name="dialog_disable_battery_optimization_dont_show_again">No volver a mostrar.</string>
+  <string name="dialog_disable_battery_optimization_turn_off">Deshabilitar para Syncthing</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Carpetas</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">No se encontraron carpetas</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d archivos</string>
+  <string name="toast_no_file_manager">No se ha encontrado un gestor de ficheros compatible</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Dispositivos</string>
   <!--Shown if no devices exist-->
@@ -130,7 +136,11 @@
   <string name="web_gui_title">Interfaz gráfica web</string>
   <!--SettingsFragment-->
   <string name="settings_title">Ajustes</string>
+  <string name="category_run_conditions">Condiciones de ejecución</string>
+  <string name="category_behaviour">Comportamiento</string>
   <string name="category_syncthing_options">Opciones de Syncthing</string>
+  <string name="category_backup">Copia de seguridad</string>
+  <string name="category_debug">Depuración</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-->
@@ -159,6 +169,7 @@
   <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">Servidores globales de descubrimiento</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>
@@ -171,6 +182,8 @@
   <string name="run_as_foreground_service_summary">Al activarse, Syncthing se ejecutará con prioridad de primer plano y es más improbable que Android lo detenga. Esto podría detener otros servicios cuando la memoria disponible sea escasa. Se mostrará una notificación de baja prioridad debido a los requerimientos de Android e independientemente de la configuración de las notificaciones.</string>
   <string name="use_tor_title">Usar Tor</string>
   <string name="use_tor_summary">Desviar todo el tráfico a través de Tor para incrementar la privacidad. Requiere Orbot</string>
+  <string name="use_legacy_hashing_title">Utilizar método antiguo para generar los hash</string>
+  <string name="use_legacy_hashing_summary">Forzar el uso de un paquete de hashing antiguo por compatibilidad</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">¿Realmente quieres exportar tu configuración? Se sobreescribirán los ficheros existentes.\n\n¡ADVERTENCIA! Otras aplicaciones podrían leer la clave privada localizada en la ubicación de la copia y usarla para descargar/modificar ficheros sincronizados.</string>
   <!--Dialog shown before config import-->
@@ -185,6 +198,7 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opciones de depuración</string>
   <!--Toast after entering invalid STTRACE params-->
+  <string name="toast_invalid_sttrace">Sólo se permite 0-9, a-z y coma (\',\') en las opciones de STTRACE</string>
   <!--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 41d9330d..77d40dc8 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -179,7 +179,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="use_tor_title">Käytä Tor-verkkoa</string>
   <string name="use_tor_summary">Pakota kaikki liikenne Tor-verkkoon yksityisyyden parantamiseksi. Vaatii Orbot-sovelluksen.</string>
   <string name="use_legacy_hashing_title">Käytä vanhaa tarkistussumman laskentaa</string>
-  <string name="use_legacy_hashing_summary">Pakota Syncthing käyttämään vanhaa tarkistussumman laskentapakettia yhteensopivuuden parantamiseksi.</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">Haluatko varmasti viedä asetuksesi? Vanhat tiedostot ylikirjoitetaan.\n\nVAROITUS! Muut sovellukset saattavat voida lukea yksityisen avaimen varmuuskopiosta ja käyttää sitä synkronoitujan tiedostojen lataamiseen tai muokkaamiseen.</string>
   <!--Dialog shown before config import-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 8488bcc0..16e2e634 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -183,9 +183,9 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <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>
+  <string name="use_tor_summary">Force tout le trafic à passer par Tor pour plus de discrétion. Nécessite Orbot.</string>
   <string name="use_legacy_hashing_title">Utiliser le hachage habituel</string>
-  <string name="use_legacy_hashing_summary">Force syncthing à utiliser le hachage d\'origine pour des raisons de compatibilité.</string>
+  <string name="use_legacy_hashing_summary">Force Syncthing à utiliser le hachage d\'origine pour des raisons de compatibilité.</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-->
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index bd35ba06..db38d31c 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -6,10 +6,12 @@
   <!--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-->
+  <string name="cont">Folytatás</string>
   <!--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-->
+  <string name="web_gui_creating_key">Biztonsági kulcsok generálása. Ez pár percig eltarthat.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Mappa hozzáadása</string>
   <!--Title of the "share device id" menu action-->
@@ -24,12 +26,16 @@
   <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="device_rejected">%1$s eszköz csatlakozni szeretne</string>
   <string name="dialog_disable_battery_optimization_later">Később</string>
+  <string name="dialog_disable_battery_optimization_dont_show_again">Ne jelenjen meg újra</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Mappák</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Nem található mappa</string>
   <!--Format string for folder file count-->
+  <string name="files">%1$d / %2$d fájl</string>
+  <string name="toast_no_file_manager">Nem található kompatibilis fájlkezelő</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Eszközök</string>
   <!--Shown if no devices exist-->
@@ -54,10 +60,14 @@
   <!--Title for current RAM usage-->
   <string name="ram_usage">Memória használat</string>
   <!--Title for announce server status-->
+  <string name="announce_server">Bevezető kiszolgáló</string>
+  <string name="restart">Újraindítás</string>
+  <string name="dialog_confirm_restart">Biztos, hogy újra akarod indítani a Syncthinget?</string>
   <!--FolderActivity-->
   <!--Setting title-->
   <string name="folder_id">Mappa azonosító</string>
   <!--Setting title-->
+  <string name="folder_label">Mappa címke</string>
   <!--Setting title-->
   <string name="directory">Mappa</string>
   <!--Setting title-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6b4489e3..83ff529b 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -185,7 +185,6 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</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>
   <string name="use_legacy_hashing_title">Utilizza la funzione di hash precedente</string>
-  <string name="use_legacy_hashing_summary">Forza syncthing ad utilizzare il pacchetto di hash precedente per ragioni di compatibilità</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-->
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 35ac94de..dd9066c9 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -185,7 +185,7 @@
   <string name="use_tor_title">Tor を使用する</string>
   <string name="use_tor_summary">プライバシー保護のため、強制的にすべてのトラフィックを Tor を介します。Orbot が必要です</string>
   <string name="use_legacy_hashing_title">レガシーハッシュを使用する</string>
-  <string name="use_legacy_hashing_summary">互換性のために、強制的にsyncthingが従来のハッシュパッケージを使用するようにします</string>
+  <string name="use_legacy_hashing_summary">互換性のため、Syncthingが強制的に従来のハッシュパッケージを使用するようにします</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-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 03c44884..0f21465b 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -185,7 +185,7 @@
   <string name="use_tor_title">Tor 사용</string>
   <string name="use_tor_summary">프라이버시 향상을 위해 모든 트래픽을 Tor로 통과시킵니다. Orbot이 필요합니다</string>
   <string name="use_legacy_hashing_title">레가시 해싱 쓰기</string>
-  <string name="use_legacy_hashing_summary">호환성의 목적을 위하여 Syncthing이 레가시 해싱 패키지를 쓰도록 강제합니다</string>
+  <string name="use_legacy_hashing_summary">호환성의 목적을 위하여 Syncthing이 Legacy Hashing 패키지를 쓰도록 강제합니다</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-pl/strings.xml b/src/main/res/values-pl/strings.xml
index be3f312e..408b8dd5 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -180,7 +180,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <string name="use_tor_title">Korzystanie z Tor</string>
   <string name="use_tor_summary">Wymusza cały ruch przez Tor dla zwiększenia prywatności. Wymaga Orbot.</string>
   <string name="use_legacy_hashing_title">Użyj starego mechanizmu haszowania</string>
-  <string name="use_legacy_hashing_summary">Wymuś, by Syncthing używał starego haszowania dla zachowania kompatybilności</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-->
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 4620a838..492bf86a 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -185,7 +185,7 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <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>
   <string name="use_legacy_hashing_title">Usar hashing legado</string>
-  <string name="use_legacy_hashing_summary">Forçar o Syncthing a usar o hashing legado para fins de compatibilidade</string>
+  <string name="use_legacy_hashing_summary">Forçar o Syncthing a usar hashing legado para fins de compatibilidade</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-->
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 0f964632..2f829953 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -32,13 +32,18 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <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_title">Optimização da bateria</string>
+  <string name="dialog_disable_battery_optimization_message">O Android pode parar a sincronização passado algum tempo. Para prevenir isso, desligue a optimização da bateria.\n\nAlguns dispositivos têm aplicações adicionais pré-instaladas para matar tarefas. Deve adicionar o Syncthing à lista de excepções dessas aplicações.</string>
   <string name="dialog_disable_battery_optimization_later">Mais tarde</string>
+  <string name="dialog_disable_battery_optimization_dont_show_again">Não apresentar novamente</string>
+  <string name="dialog_disable_battery_optimization_turn_off">Desligar para o Syncthing</string>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Pastas</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">Não foram encontradas quaisquer pastas</string>
   <!--Format string for folder file count-->
   <string name="files">%1$d / %2$d ficheiros</string>
+  <string name="toast_no_file_manager">Não foi encontrado um gestor de ficheiros compatível</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Dispositivos</string>
   <!--Shown if no devices exist-->
@@ -179,6 +184,8 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <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>
+  <string name="use_legacy_hashing_title">Usar verificação antiga</string>
+  <string name="use_legacy_hashing_summary">Forçar o Syncthing a usar um pacote de verificação antiga por questões de compatabilidade</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-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index d50a23fe..77c6615b 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -33,7 +33,6 @@
   <string name="device_rejected">Устройство %1$s запрашивает подключение</string>
   <string name="folder_rejected">Устройство %1$s предлагает расшаренную папку %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Оптимизация батареи</string>
-  <string name="dialog_disable_battery_optimization_message">Android может остановить синхронизацию через некоторое время. Для того, чтобы избежать этого, выключите оптимизацию батареи.</string>
   <string name="dialog_disable_battery_optimization_later">Позже</string>
   <string name="dialog_disable_battery_optimization_dont_show_again">Больше не показывать</string>
   <string name="dialog_disable_battery_optimization_turn_off">Отключить для Syncthing</string>
@@ -184,7 +183,6 @@
   <string name="use_tor_title">Использовать Tor</string>
   <string name="use_tor_summary">Пропускать весь трафик через Tor для улучшения приватности. Требует установленный Orbot.</string>
   <string name="use_legacy_hashing_title">Использовать старый алгоритм хеширования</string>
-  <string name="use_legacy_hashing_summary">Использовать старый алгоритм хеширования в целях совместимости.</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-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 46003f09..00855e6d 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -138,7 +138,7 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="web_gui_title">Webb-GUI</string>
   <!--SettingsFragment-->
   <string name="settings_title">Inställningar</string>
-  <string name="category_run_conditions">Körningsbetingelser</string>
+  <string name="category_run_conditions">Körbetingelser</string>
   <string name="category_behaviour">Beteende</string>
   <string name="category_syncthing_options">Syncthing alternativ</string>
   <string name="category_backup">Säkerhetskopiera</string>
@@ -150,12 +150,12 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Syncthing körs bara när den uttryckligen har startats, och kan stoppas genom menyknapp.</string>
   <string name="sync_only_charging">Synkronisera endast vid laddning</string>
-  <string name="sync_only_wifi">Synkronisera endast på WiFi</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="advanced_folder_picker">Använd avancerade katalogväljaren</string>
+  <string name="sync_only_wifi">Synkronisera endast via wifi</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="advanced_folder_picker">Använd avancerad 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>
+  <string name="use_root_title">Kör som superanvändare</string>
   <string name="use_root_summary">Detta är en instabil funktion som kan orsaka problem med Syncthing och med din enhet enhet. Om du stöter på problem, kan du behöva installera om Syncthing.</string>
   <string name="notification_type_title">Avisering</string>
   <string name="notification_type_summary">Välj aviseringstypen</string>
@@ -185,9 +185,9 @@ Vänligen rapportera eventuella problem du stöter på via Github.</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>
   <string name="use_legacy_hashing_title">Använd legacy hashing</string>
-  <string name="use_legacy_hashing_summary">Tvinga syncthing att använda legacy hashingspaket för kompatibilitetsändamål</string>
+  <string name="use_legacy_hashing_summary">Tvinga Syncthing att använda legacy hashningspaket för kompatibilitetsändamål</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>
+  <string name="dialog_confirm_export">Vill du verkligen 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-->
@@ -198,14 +198,14 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <!--Toast shown after config was successfully imported-->
   <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>
+  <string name="sttrace_title">Felsök alternativ</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-->
   <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>
+\nÄr du säker på att du vill rensa Syncthings index databas?</string>
   <!--Syncthing was reset-->
   <string name="streset_done">Syncthings databas återställdes</string>
   <string name="category_about">Om</string>
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 3ebb8e9e..6c88229f 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -34,7 +34,7 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="device_rejected">%1$s aygıtı bağlanmak istiyor</string>
   <string name="folder_rejected">%1$s aygıtı %2$s klasörünü paylaşmak istiyor</string>
   <string name="dialog_disable_battery_optimization_title">Batarya İyileştirme</string>
-  <string name="dialog_disable_battery_optimization_message">Android, birkaç zaman sonra eşzamanlamayı durdurabilir. Bunu önlemek için batarya iyileştirmesini kapat.</string>
+  <string name="dialog_disable_battery_optimization_message">Android, birkaç zaman sonra eşzamanlamayı durdurabilir. Bunu önlemek için batarya iyileştirmesini kapat.\n\nBazı aygıtlar ek olarak görev bitirme uygulamalarıyla yüklü gelir. Syncthing\'i onların beyaz listesine ayrıca eklemelisiniz.</string>
   <string name="dialog_disable_battery_optimization_later">Daha sonra</string>
   <string name="dialog_disable_battery_optimization_dont_show_again">Yeniden gösterme</string>
   <string name="dialog_disable_battery_optimization_turn_off">Syncthing için kapat</string>
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 68d233c6..939c5b48 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -186,8 +186,8 @@
   <string name="run_as_foreground_service_summary">如果启用，Syncthing 将以后台优先级运行，可以更少地被 Android 停止。这也可能在可用内存过低时引起其他服务关闭。因为 Android 的要求，会忽略“通知”的设置而显示一个低优先级的通知。</string>
   <string name="use_tor_title">使用 Tor</string>
   <string name="use_tor_summary">强制所有流量通过 TOR 以提高保密性。需要 Orbot</string>
-  <string name="use_legacy_hashing_title">使用旧版哈希</string>
-  <string name="use_legacy_hashing_summary">强制 syncthing 使用旧版哈希包出于兼容目的</string>
+  <string name="use_legacy_hashing_title">使用传统哈希</string>
+  <string name="use_legacy_hashing_summary">强制 syncthing 使用传统哈希包出于兼容目的</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">您确定要导出您的配置？若您之前导出过配置，则文件会被当前导出的配置所覆盖。\n\n 警告！其他应用程序可以从您导出的配置文件中获取到您的密钥，并且可以通过它来下载或者修改您的同步文件。</string>
   <!--Dialog shown before config import-->