diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 1b4d11ed..d629340d 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -6,6 +6,7 @@
   <!--Text for dialog displayed on first start-->
   <string name="cont">استمرار</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">خطأ</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">إضافة مجلد</string>
@@ -56,6 +57,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -79,6 +83,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -133,6 +138,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -147,6 +153,9 @@
   <string name="state_error">خطأ</string>
   <string name="state_unknown">غير معروف</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index df615da0..54313844 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -11,6 +11,8 @@
 Ако срещнете проблем моля докладвайте в Github.</string>
   <string name="cont">Напред</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Грешка</string>
+  <string name="ignore">Игнориране</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Добави папка</string>
@@ -24,8 +26,6 @@
   <string name="no">Не</string>
   <string name="open_website">Отвори уеб сайта</string>
   <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>
@@ -98,6 +98,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Наложително е да въведете път до папката</string>
   <string name="dialog_discard_changes">Отказвате ли се от направените промени?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Идентификатор на устройството</string>
@@ -175,6 +178,7 @@
   <string name="enable_relaying">Разрешава препращане</string>
   <string name="usage_reporting"> Анонимен доклад за ползване на програмата</string>
   <string name="gui_address">Адрес за свързване с потребителския интерфейс</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Изнасяне на настройките</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -264,6 +268,7 @@
   <string name="syncthing_active">Syncthing работи</string>
   <string name="syncthing_disabled">Syncthing не работи</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -302,6 +307,9 @@
   <string name="status_outofsync">Несинхронизирано</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="file_versioning">Версии на файловете</string>
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index c6c79037..5572be7e 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -11,6 +11,8 @@ Per compartir dades amb altres dispositius, cal que afegiu els seus identificado
 Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="cont">Continua</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_example">Exemple</string>
+  <string name="generic_error">Error</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Afegeix una carpeta</string>
@@ -24,8 +26,6 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="no">No</string>
   <string name="open_website">Obre la pàgina web</string>
   <string name="toast_write_storage_permission_required">Aquesta aplicació requereix el permís d\'escriptura a l\'emmagatzematge</string>
-  <string name="device_rejected">El dispositiu %1$s es vol connectar</string>
-  <string name="folder_rejected">El dispositiu %1$s vol compartir la carpeta %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Optimització de bateria</string>
   <string name="dialog_disable_battery_optimization_message">Passat algun temps, l\'Android podria aturar la sincronització. Per evitar-ho, apagueu l\'optimitzador de bateria.\n\nAlguns dispositius porten pre-instal·lades aplicacions que finalitzen les tasques automàticament, en aquest cas hauríeu d\'afegir el Syncthing a la seva llista d\'aplicacions autoritzades.</string>
   <string name="dialog_disable_battery_optimization_later">Més tard</string>
@@ -47,6 +47,7 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
     <item quantity="one">%1$d / %2$d Fitxer</item>
     <item quantity="other">%1$d / %2$d Fitxers</item>
   </plurals>
+  <string name="open_file_manager">Obre l\'administrador d\'arxius</string>
   <string name="toast_no_file_manager">No s\'ha trobat cap gestor de fitxers compatible</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Dispositius</string>
@@ -59,6 +60,7 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Indicates that there is no connection to the device-->
   <string name="device_disconnected">Desconnectat</string>
   <!--Indicates that the device is paused and does not sync-->
+  <string name="device_paused">En pausa</string>
   <string name="device_state_unknown">Desconegut</string>
   <!--Title for current download rate-->
   <string name="download_title">Descàrrega</string>
@@ -87,7 +89,10 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Setting title-->
   <string name="folder_master">Només envia</string>
   <!--Setting title and description-->
+  <string name="folder_fileWatcher">Vigila els canvis</string>
+  <string name="folder_fileWatcherDescription">Demana al sistema que notifiqui dels canvis als fitxers. Si es desactiva es faran comprovacions cada hora.</string>
   <!--Setting title-->
+  <string name="folder_pause">Posa la carpeta en pausa</string>
   <!--Setting title-->
   <string name="devices">Dispositius</string>
   <!--Setting title-->
@@ -107,6 +112,9 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">El camí de la carpeta no pot ser buit</string>
   <string name="dialog_discard_changes">Voleu descartar els canvis?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Patrons a ignorar</string>
   <string name="create_ignore_file_error">No s\'ha pogut crear el fitxer d\'ignorats. Es pot escriure al directori?</string>
   <string name="edit_ignore_file_error">No hi ha cap editor de text</string>
@@ -130,6 +138,7 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Setting title-->
   <string name="introducer">Introductor</string>
   <!--Setting title-->
+  <string name="pause_device">Posa el dispositiu en pausa</string>
   <!--ActionBar item-->
   <string name="delete_device">Esborra el dispositiu</string>
   <string name="add_device">Afegeix un dispositiu</string>
@@ -167,6 +176,9 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="sync_only_wifi">Executa només amb wifi</string>
   <string name="sync_only_wifi_ssids">Restringeix a xarxes wifi concretes</string>
   <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Enceneu el WiFi per seleccionar xarxes.</string>
+  <string name="sync_only_wifi_ssids_need_to_grant_location_permission">Heu de proporcionar el permís d\'UBICACIÓ per poder fer això.</string>
+  <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_title">Calen permisos</string>
+  <string name="sync_only_wifi_ssids_location_permission_rejected_dialog_content">A partir de l\'Android 8.1, cal tenir accés a la ubicació per poder llegir el nom de la WiFi. Només ho podreu fer si concediu aquest permís.</string>
   <string name="respect_battery_saving_title">Respecta la configuració d\'estalvi de bateria de l\'Android</string>
   <string name="respect_battery_saving_summary">Desactiva el Syncthing quan s\'activi l\'estalvi de bateria</string>
   <string name="advanced_folder_picker">Utilitza el selector de carpetes avançat</string>
@@ -203,16 +215,29 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="enable_relaying">Permet la retransmissió</string>
   <string name="usage_reporting">Informes d\'ús anònims</string>
   <string name="gui_address">Adreça d\'escolta de la interfície gràfica</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exporta la configuració</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Valor no vàlid. Introduïu un valor entre %1$d i %2$d.</string>
   <!--Experimental options-->
+  <string name="use_proxy">Connecta emprant un proxy</string>
+  <string name="do_not_use_proxy">No s\'ha configurat cap proxy.</string>
   <string name="keep_wakelock_while_binary_running">Mantingues activa la CPU mentre s\'executi el Syncthing</string>
   <string name="keep_wakelock_while_binary_running_summary">Activeu-ho si experimenteu desconnexions inesperades quan treballeu amb bateria. S\'incrementarà el consum de la bateria.</string>
   <string name="use_tor_title">Utilitza Tor</string>
+  <string name="use_tor_summary">Força la connexió a través de Tor per millorar la privacitat. Requereix Orbot. Desactiva les opcions del proxy.</string>
+  <string name="socks_proxy_address_title">Proxy SOCKS5</string>
+  <string name="socks_proxy_address_example">socks5://192.168.0.1:1080</string>
   <!--Toast after entering invalid socks proxy address-->
+  <string name="toast_invalid_socks_proxy_address">No compleix la sintaxi de proxy \'socks5://[IP/HOSTNAME]:[PORT]\'</string>
+  <string name="http_proxy_address_title">Proxy HTTP(S)</string>
+  <string name="http_proxy_address_example">http://192.168.0.1:8080</string>
   <!--Toast after entering invalid http proxy address-->
+  <string name="toast_invalid_http_proxy_address">No compleix la sintaxi de proxy \'http://[IP/HOSTNAME]:[PORT]\'</string>
   <string name="use_legacy_hashing_title">Genera els hash amb el sistema antic</string>
   <string name="use_legacy_hashing_summary">Es forçarà el Syncthing a utilitzar el paquet de hashing antic per compatibilitat</string>
+  <string name="restart_on_wakeup_title">Reinicia en despertar-se</string>
+  <string name="restart_on_wakeup_summary">Per defecte: Activat. Si es desactiva pot provocar retards en la comprovació de carpetes i reconnexions del dispositiu per estalviar bateria.</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">Realment voleu exportar la configuració? Es sobreescriuran els fitxers existents.\n\nAVÍS! Altres aplicacions podrien llegir la clau privada emmagatzemada a la còpia de seguretat i utilitzar-la per descarregar o modificar fitxers sincronitzats.</string>
   <!--Dialog shown before config import-->
@@ -232,11 +257,19 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="st_reset_database_title">Reinicia la base de dades</string>
   <!--Syncthing was reset-->
+  <string name="st_reset_database_question">Això només ho heu de fer si us ho recomana l\'equip de suport tècnic.
+        \nSegur que voleu esborrar la base de dades del Syncthing?
+</string>
   <!--Syncthing was reset-->
   <string name="st_reset_database_done">La base de dades del Syncthing s\'ha reiniciat amb èxit</string>
   <!--Title for the preference to reset Syncthing indexes-->
+  <string name="st_reset_deltas_title">Reinicia els Índexs Delta</string>
   <!--Syncthing was reset-->
+  <string name="st_reset_deltas_question">Això només ho heu de fer si us ho recomana l\'equip de suport tècnic.
+        \nSegur que voleu esborrar els índex delta del Syncthing?
+</string>
   <!--Syncthing was reset-->
+  <string name="st_reset_deltas_done">S\'han reiniciat correctament els índexs delta del Syncthing</string>
   <string name="category_about">Quant a</string>
   <!--Settings item that opens the log activity-->
   <string name="open_log">Obre el registre</string>
@@ -325,14 +358,18 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">El Syncthing s\'està executant</string>
   <string name="syncthing_disabled">El Syncthing està desactivat</string>
+  <string name="syncthing_terminated">El Syncthing s\'ha aturat</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">No s\'ha pogut crear el fitxer de configuració</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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">%1$s-fotos</string>
   <string name="notification_crash_title">El Syncthing s\'ha bloquejat</string>
   <string name="notification_crash_text">Feu clic per veure els registres</string>
+  <string name="notifications_persistent_channel">El Syncthing està actiu</string>
+  <string name="notification_persistent_waiting_channel">Vigilant les condicions d\'execució</string>
   <string name="notifications_other_channel">Altres notificacions</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
@@ -365,10 +402,14 @@ Ens podeu informar dels problemes que trobeu a través de Github.</string>
   <string name="state_syncing">Sincronitzant (%1$d%%)</string>
   <string name="state_error">Error</string>
   <string name="state_unknown">Desconegut</string>
+  <string name="state_paused">En pausa</string>
   <string name="status_outofsync">No sincronitzat</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">No es permet aturar el Syncthing mentre s\'està executant en segon pla.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Antiguitat Màxima</string>
   <string name="clean_out_after">Neteja després de</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 99fae2af..e51e7383 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -11,6 +11,8 @@ Pro sdílení dat s dalšími přístroji je třeba přidat jejich unikátní ID
 Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="cont">Pokračovat</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Chyba</string>
+  <string name="ignore">Ignorovat</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Přidat adresář</string>
@@ -24,8 +26,6 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="no">Ne</string>
   <string name="open_website">Otevřít webovou stránku</string>
   <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_title">Optimalizace využití baterie</string>
   <string name="dialog_disable_battery_optimization_message">Po nějakém čase může Android zastavit synchronizaci. Aby se tak nestalo, vypněte optimalizaci využití baterie.\n\nNa některých zařízeních mohou být také předinstalovány aplikace ukončující úlohy. Měli byste přidat Syncthing do jejich výjimek.</string>
   <string name="dialog_disable_battery_optimization_later">Později</string>
@@ -109,6 +109,9 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáři nesmí být prázdná</string>
   <string name="dialog_discard_changes">Zrušit změny?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ignorované vzory</string>
   <string name="create_ignore_file_error">Vytvoření souboru s ignorovanými vzory selhalo. Umožňuje složka zápis?</string>
   <string name="edit_ignore_file_error">Nenalezen žádný textový editor</string>
@@ -205,6 +208,7 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Zálohovat nastavení</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -335,6 +339,7 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</string>
   <string name="syncthing_disabled">Syncthing je vypnutý</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Vytváření konfiguračního souboru selhalo</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -377,6 +382,9 @@ Všechny zaznamenané chyby prosím hlašte přes Github.</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">Syncthing nelze zastavit když je povolený běh na pozadí.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maximální stáří</string>
   <string name="clean_out_after">Vyčistit po</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index d78145fa..2af0aabd 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -11,6 +11,7 @@ For at dele data med andre enheder, skal du tilføje deres enheds unikke ID til
 Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="cont">Fortsæt</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Fejl</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Tilføj mappe</string>
@@ -24,8 +25,6 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="no">Nej</string>
   <string name="open_website">Åben Hjemmeside</string>
   <string name="toast_write_storage_permission_required">Write storage rettigheder er nødvendige for denne app.</string>
-  <string name="device_rejected">Enhed %1$s ønsker at forbinde</string>
-  <string name="folder_rejected">Enhed %1$s ønsker at dele mappe %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Batterioptimering</string>
   <string name="dialog_disable_battery_optimization_message">Android stopper måske synkroniseringen efter noget tid. For at undgå dette, vælg batterioptimering fra.\n\nNogle enheder har ekstra job-afsluttende apps installeret. Du burde også tilføje Syncthing til deres whitelist. </string>
   <string name="dialog_disable_battery_optimization_later">Senere</string>
@@ -106,6 +105,9 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappens sti må ikke være tom</string>
   <string name="dialog_discard_changes">Slet dine ændringer?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ignorer-mønstre</string>
   <string name="create_ignore_file_error">Kunne ikke danne ignorer-filen. Er mappen skrivebeskyttet?</string>
   <string name="edit_ignore_file_error">Intet tekstbehandlingsprogram blev fundet</string>
@@ -202,6 +204,7 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="enable_relaying">Aktiver Relaying</string>
   <string name="usage_reporting">Anonym Forburgsrapportering</string>
   <string name="gui_address">GUI Listen Addresser</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Eksporter Konfigurering</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -322,6 +325,7 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </string>
   <string name="syncthing_active">Syncthing kører</string>
   <string name="syncthing_disabled">Syncthing er slået fra</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -363,6 +367,9 @@ Vær venlig at rapportere ethvert problem, du støder på, via Github. </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">At stoppe Syncthing er ikke understøttet når kørsel i baggrunden er aktiveret.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maksimal Alder</string>
   <string name="clean_out_after">Gør rent efter</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index d033e382..3cfa5682 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -12,6 +12,8 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <string name="cont">Weiter</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Beispiel</string>
+  <string name="generic_error">Fehler</string>
+  <string name="ignore">Ignorieren</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Verzeichnis hinzufügen</string>
@@ -25,8 +27,6 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <string name="no">Nein</string>
   <string name="open_website">Webseite öffnen</string>
   <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_title">Batterielaufzeit Optimierung</string>
   <string name="dialog_disable_battery_optimization_message">Android kann die Synchronisation nach einiger Zeit stoppen. Um dies zu verhindern kann der Energiesparmodus deaktiviert werden.\n\nEinige Geräte haben Apps vorinstalliert, welche Hintergrundaktivitäten unterbinden. Syncthing sollte deshalb auch in die Ausnahmeliste hinzugefügt werden.</string>
   <string name="dialog_disable_battery_optimization_later">Später</string>
@@ -113,6 +113,9 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Der Verzeichnispfad darf nicht leer sein</string>
   <string name="dialog_discard_changes">Deine Änderungen verwerfen?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ausschluss Muster</string>
   <string name="create_ignore_file_error">Erstellen der ignore Datei fehlgeschlagen. Kann ins Verzeichnis geschrieben werden?</string>
   <string name="edit_ignore_file_error">Texteditor nicht gefunden</string>
@@ -213,10 +216,13 @@ Bitte melden Sie auftretende Probleme via GitHub.</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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Konfiguration exportieren</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Der eingegebene Wert ist ungültig. Bitte gib eine Zahl zwischen %1$d und %2$d ein.</string>
   <!--Experimental options-->
   <string name="use_proxy">Über einen Proxy verbinden</string>
+  <string name="do_not_use_proxy">Kein Proxy eingestellt.</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="use_tor_title">Tor benutzen</string>
@@ -236,7 +242,7 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">Soll die Konfiguration wirklich exportiert werden? Vorhandene Dateien werden überschrieben.\n\nACHTUNG! Andere Anwendungen können möglicherweise den privaten Schlüssel im Backupverzeichnis lesen und dazu verwenden, um synchronisierte Dateien herunterzuladen und zu verändern.</string>
   <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">Soll wirlkich eine neue Konfiguration importiert werden? Vorhandene Dateien werden überschrieben.</string>
+  <string name="dialog_confirm_import">Soll wirklich eine neue Konfiguration importiert werden? Die vorhandene Konfiguration wird überschrieben.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Konfiguration exportiert nach %1$s</string>
   <string name="import_config">Konfiguration importieren</string>
@@ -349,8 +355,10 @@ Bitte melden Sie auftretende Probleme via GitHub.</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing läuft</string>
   <string name="syncthing_disabled">Syncthing ist deaktiviert</string>
+  <string name="syncthing_terminated">Syncthing wurde beendet</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Erstellen der Konfigurationsdatei fehlgeschalgen</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -396,6 +404,9 @@ Bitte melden Sie auftretende Probleme via GitHub.</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">Syncthing zu stoppen wird nicht unterstützt solange das Ausführen im Hintergrund aktiviert ist.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Höchstalter</string>
   <string name="clean_out_after">Aufräumen nach</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index d33d7909..d57945cb 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -11,6 +11,7 @@
 Παρακαλώ αναφέρετε τυχόν προβλήματα που αντιμετωπίσετε μέσω του Github.</string>
   <string name="cont">Συνέχεια</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Σφάλμα</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Προσθήκη φακέλου</string>
@@ -24,8 +25,6 @@
   <string name="no">Όχι</string>
   <string name="open_website">Άνοιγμα ιστοσελίδας</string>
   <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_message">Το Android ενδέχεται να σταματήσει τον συγχρονισμό μετά από κάποιο χρονικό διάστημα. Για να αποφευχθεί αυτό, απενεργοποιήστε τη βελτιστοποίηση μπαταρίας.\n\nΚάποιες συσκευές διαθέτουν επίσης προεγκατεστημένες εφαρμογές τερματισμού διεργασιών. Προσθέστε το Syncthing στο whitelist τους.</string>
   <string name="dialog_disable_battery_optimization_later">Αργότερα</string>
@@ -107,6 +106,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Το μονοπάτι του φακέλου δεν μπορεί να είναι κενό</string>
   <string name="dialog_discard_changes">Να απορριφθούν οι αλλαγές που κάνατε;</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Πρότυπα για αγνόηση</string>
   <string name="create_ignore_file_error">Αδυναμία δημιουργίας αρχείου προτύπων αγνόησης. Υπάρχει δικαίωμα εγγραφής στον κατάλογο;</string>
   <string name="edit_ignore_file_error">Δεν βρέθηκε επεξεργαστής κειμένου</string>
@@ -203,6 +205,7 @@
   <string name="enable_relaying">Ενεργοποίηση αναμετάδοσης</string>
   <string name="usage_reporting">Ανώνυμη αναφορά δεδομένων χρήσης</string>
   <string name="gui_address">Διευθύνσεις ακρόασης του GUI</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Εξαγωγή ρυθμίσεων</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -327,6 +330,7 @@
   <string name="syncthing_disabled">Το Syncthing είναι απενεργοποιημένο</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Αδυναμία δημιουργίας αρχείου ρυθμίσεων</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -369,6 +373,9 @@
   <!--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">Ο τερματισμός του Syncthing δεν υποστηρίζεται όταν έχει ενεργοποιηθεί η εκτέλεση στο παρασκήνιο.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Μέγιστη ηλικία</string>
   <string name="clean_out_after">Εκκαθάριση μετά από</string>
diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml
index dc34baec..6c61991f 100644
--- a/app/src/main/res/values-es-rEC/strings.xml
+++ b/app/src/main/res/values-es-rEC/strings.xml
@@ -44,6 +44,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -66,6 +69,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -120,6 +124,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -132,6 +137,9 @@
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml
index 12b85202..e86d3720 100644
--- a/app/src/main/res/values-es-rMX/strings.xml
+++ b/app/src/main/res/values-es-rMX/strings.xml
@@ -7,6 +7,8 @@
   <string name="welcome_title">Bienvenido a Syncthing para Android</string>
   <!--Text for dialog displayed on first start-->
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Error</string>
+  <string name="ignore">Ignorar</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Añadir carpeta</string>
@@ -20,8 +22,6 @@
   <string name="no">No</string>
   <string name="open_website">Abrir Sitio web</string>
   <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>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
@@ -88,6 +88,9 @@
   <string name="folder_id_required">El ID de la carpeta no debe estar vacío</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta de la carpeta no debe estar vacía</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
@@ -157,6 +160,7 @@
   <string name="local_announce_enabled">Descubrimiento Local</string>
   <string name="usage_reporting">Reporte de uso anónimo</string>
   <string name="gui_address">Direcciones de escucha de la interfaz gráfica</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportar Configuración</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -246,6 +250,7 @@
   <string name="syncthing_active">Syncthing está en ejecución</string>
   <string name="syncthing_disabled">Syncthing está deshabilitado</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--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-photos</string>
@@ -283,6 +288,9 @@
   <string name="status_outofsync">No sincronizado</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 50faf67c..0a081301 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -9,6 +9,7 @@
   <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>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Error</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Añadir carpeta</string>
@@ -22,8 +23,6 @@
   <string name="no">No</string>
   <string name="open_website">Sitio abierto</string>
   <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>
@@ -99,6 +98,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">La ruta a la carpeta no debe estar vacía</string>
   <string name="dialog_discard_changes">¿Descartar tus cambios?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
@@ -181,6 +183,7 @@
   <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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportar configuración</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -298,6 +301,7 @@
   <string name="syncthing_active">Syncthing se está ejecutando</string>
   <string name="syncthing_disabled">Syncthing está deshabilitado</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <string name="default_folder_label">Cámara</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -339,6 +343,9 @@
   <!--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">No está soportado detener Syncthing mientras está activada la ejecución en segundo plano.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Antigüedad Máxima</string>
   <string name="file_versioning">Versionado de Archivos</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 296105e2..aed133f4 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -12,6 +12,7 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="cont">Jatka</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Esimerkki</string>
+  <string name="generic_error">Virhe</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Lisää kansio</string>
@@ -25,8 +26,6 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="no">Ei</string>
   <string name="open_website">Avaa verkkosivu</string>
   <string name="toast_write_storage_permission_required">Tämä sovellus vaatii tallennustilan kirjoitusoikeuden</string>
-  <string name="device_rejected">Laite %1$s haluaa yhdistää</string>
-  <string name="folder_rejected">Laite %1$s haluaa jakaa kansion %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Akun käytön optimointi</string>
   <string name="dialog_disable_battery_optimization_message">Android saattaa pysäyttää synkronoinnin jonkin ajan kuluttua. Tämän estämiseksi, poista käytöstä akun käytön optimointi.\n\nJoissain laitteissa on lisäksi prosessienhallintasovelluksia valmiiksi asennettuna. Sinun tulisi lisätä Syncthing myös niiden sallittujen sovellusten listalle.</string>
   <string name="dialog_disable_battery_optimization_later">Myöhemmin</string>
@@ -110,6 +109,9 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Kansion polku ei voi olla tyhjä</string>
   <string name="dialog_discard_changes">Hylkää muutokset?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Laitetunnus</string>
@@ -163,6 +165,8 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="always_run_in_background_enabled">Synthing ajetaan aina taustalla alla olevien asetusten mukaan.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Syncthing käy vain kun se on erikseen käynnistetty, ja se voidaan sammuttaa valikon painikkeella.</string>
+  <string name="sync_only_charging">Aja ainoastaan latauksen aikana</string>
+  <string name="sync_only_wifi">Aja ainoastaan Wifi-yhteydellä</string>
   <string name="sync_only_wifi_ssids">Rajoita tiettyihin Wifi-verkkoihin</string>
   <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Laita Wifi päälle valitaksesi verkkoja.</string>
   <string name="respect_battery_saving_title">Noudata Androidin virransäästöasetusta</string>
@@ -187,6 +191,7 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="enable_relaying">Aktivoi yhteyden välitys</string>
   <string name="usage_reporting">Anonyymi käytönseuranta</string>
   <string name="gui_address">Käyttöliittymän kuunteluosoite</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Vie asetukset</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -295,6 +300,7 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <string name="syncthing_active">Syncthing on käynnissä</string>
   <string name="syncthing_disabled">Syncthing on poistettu käytöstä</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -336,6 +342,9 @@ Ilmoitathan ystävällisesti kaikista havaitsemistasi ongelmista Githubin kautta
   <!--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">Syncthingin pysäyttäminen ei ole käytettävissä kun käynti taustalla on valittuna.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maksimi ikä</string>
   <string name="file_versioning">Tiedostoversiointi</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index a0762b28..4518dde0 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -12,6 +12,8 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <string name="cont">Continuer</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Exemple</string>
+  <string name="generic_error">Erreur</string>
+  <string name="ignore">Ignorer</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Ajouter un partage</string>
@@ -25,8 +27,6 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <string name="no">Non</string>
   <string name="open_website">Ouvrir le site WEB</string>
   <string name="toast_write_storage_permission_required">La permission d\'écriture sur l\'espace de stockage est requise pour cette application.</string>
-  <string name="device_rejected">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_title">Optimisation de la batterie</string>
   <string name="dialog_disable_battery_optimization_message">Android peut arrêter la synchronisation après un certain temps.  Pour éviter cela, désactivez l\'optimisation de la batterie.\n\nCertains appareils disposent d\'applications préinstallées pour tuer les tâches.  Vous devrez ajouter Syncthing à leur liste blanche.</string>
   <string name="dialog_disable_battery_optimization_later">Plus tard</string>
@@ -113,6 +113,9 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Le chemin du répertoire ne doit pas être vide</string>
   <string name="dialog_discard_changes">Annuler vos modifications ?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ignorer les exclusions</string>
   <string name="create_ignore_file_error">Création de fichier échoué, fichier ignoré. Le répertoire est-il accessible en écriture ?</string>
   <string name="edit_ignore_file_error">Editeur de texte non trouvé</string>
@@ -213,10 +216,13 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exporter la configuration</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">La valeur entrée ne convient pas. SVP, entrez une valeur comprise entre %1$det %2$d.</string>
   <!--Experimental options-->
   <string name="use_proxy">Se connecter via un proxy</string>
+  <string name="do_not_use_proxy">Aucun proxy configuré</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="use_tor_title">Utiliser Tor</string>
@@ -353,8 +359,10 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing fonctionne</string>
   <string name="syncthing_disabled">Syncthing est désactivé</string>
+  <string name="syncthing_terminated">Syncthing va s\'arrêter</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Echec de création du fichier de configuration</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <string name="default_folder_label">Caméra</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -400,6 +408,9 @@ S\'il vous plaît, soumettez les problèmes que vous rencontrez via Github.</str
   <!--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">L\'arrêt de Syncthing n\'est pas supporté quand le fonctionnement en tâche de fond est activé.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Age maximum</string>
   <string name="clean_out_after">Nettoyer après</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 378848d0..e978822c 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -14,6 +14,7 @@ Kérlek, hogy az esetlegesen felmerülő hibákat jelentsd be a GitHub-on.</stri
   <string name="cont">Folytatás</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Példa</string>
+  <string name="generic_error">Hiba</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Mappa hozzáadása</string>
@@ -29,8 +30,6 @@ Az összesített statisztika nyilvánosan elérhető a https://data.syncthing.ne
   <string name="no">Nem</string>
   <string name="open_website">Weblap megnyitása</string>
   <string name="toast_write_storage_permission_required">Az alkalmazás használatához háttértár-hozzáférési jogra van szükség</string>
-  <string name="device_rejected">A %1$s eszköz csatlakozni szeretne</string>
-  <string name="folder_rejected">A %1$s eszköz szeretné megosztani a következő mappát: %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Akkumulátor optimalizáció</string>
   <string name="dialog_disable_battery_optimization_message">Az Android idővel leállíthatja a szinkronizálást. Ennek megakadályozásához kapcsold ki az akkumulátor optimalizálást.
 
@@ -119,6 +118,9 @@ Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">A mappaútvonal nem lehet üres</string>
   <string name="dialog_discard_changes">Elveted a módosításaidat?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Kihagyási minták</string>
   <string name="create_ignore_file_error">Nem sikerült létrehozni a kihagyási fájlt. Írható a könyvtár?</string>
   <string name="edit_ignore_file_error">Nem található szövegszerkesztő</string>
@@ -219,6 +221,7 @@ Néhány eszközön extra alkalmazás-leállító alkalmazást telepített fel a
   <string name="enable_relaying">Relaying engedélyezése</string>
   <string name="usage_reporting">Anonim használati statisztikák küldése</string>
   <string name="gui_address">Webes felület IP címe</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Beállítások mentése</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -361,6 +364,7 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és
   <string name="syncthing_disabled">A Syncthing le van tiltva</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Nem sikerült létrehozni a konfigurációs fájlt</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -406,6 +410,9 @@ VIGYÁZAT! Más alkalmazások kiolvashatják a backupból a titkos kulcsot, és
   <!--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">A Syncthing leállítása nem támogatott, ha engedélyezve van a háttérben futás</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maximális kor</string>
   <string name="clean_out_after">Takarítás ennyi idő után</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 893d4205..676913b8 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -24,8 +24,6 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <string name="no">Tidak</string>
   <string name="open_website">Buka Situs</string>
   <string name="toast_write_storage_permission_required">Aplikasi ini membutuuhkan kewenangan penulisan storage.</string>
-  <string name="device_rejected">Perangkat %1$s ingin tersambung</string>
-  <string name="folder_rejected">Perangkat %1$s untuk berbagi folder %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Optimisasi Baterai</string>
   <string name="dialog_disable_battery_optimization_message">Android mungkin akan menghentikan penyelarasan setelah beberapa waktu. Untuk mencegah hal ini, matikan optimisasi baterai.\n\nBeberapa perangkat mungkin sudah memiliki aplikasi penghentian tugas. Anda juga perlu memasukkan Syncthing pada whitelist aplikasi tersebut.</string>
   <string name="dialog_disable_battery_optimization_later">Nanti</string>
@@ -105,6 +103,9 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Path/lokasi folder tidak boleh kosong</string>
   <string name="dialog_discard_changes">Abaikan perubahan anda?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Pola pengabaian</string>
   <string name="create_ignore_file_error">Gagal membuat berkas ignore. Apakah direktori bisa ditulisi?</string>
   <string name="edit_ignore_file_error">Tidak ada editor teks yang ditemukan</string>
@@ -194,6 +195,7 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <string name="enable_relaying">Aktfikan Relay</string>
   <string name="usage_reporting">Laporan Penggunaan Anonim</string>
   <string name="gui_address">Alamat Listen GUI</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Ekspor Konfigurasi</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -309,6 +311,7 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <string name="syncthing_active">Syncthing dinyalakan</string>
   <string name="syncthing_disabled">Syncthing dimatikan</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -322,6 +325,9 @@ Jika ada masalah silakan laporkan lewat Github.</string>
   <!--Possible folder states-->
   <string name="state_syncing">Sinkronisasi (%1$d%%)</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 31ebd3dd..5ed67446 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -12,6 +12,8 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <string name="cont">Continua</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Esempio</string>
+  <string name="generic_error">Errore</string>
+  <string name="ignore">Ignora</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Nuova Cartella</string>
@@ -25,14 +27,12 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <string name="no">No</string>
   <string name="open_website">Apri sito</string>
   <string name="toast_write_storage_permission_required">E\' richiesto il permesso di scrittura per questa app</string>
-  <string name="device_rejected">Dispositivo %1$s vuole connettersi</string>
-  <string name="folder_rejected">Il dispositivo %1$s desidera condividere la cartella %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Ottimizzazione della batteria</string>
   <string name="dialog_disable_battery_optimization_message">Android potrebbe interrompere la sincronizzazione dopo qualche tempo. Per evitare questo, spegnere l\'ottimizzazione della batteria.\n\nAlcuni dispositivi hanno ulteriori applicazioni preinstallate di inturruzione dei processi. Si dovrebbe aggiungere Syncthing alla loro whitelist.</string>
   <string name="dialog_disable_battery_optimization_later">Più tardi</string>
   <string name="dialog_disable_battery_optimization_dont_show_again">Non mostrare più</string>
   <string name="dialog_disable_battery_optimization_turn_off">Spegnere per Syncthing</string>
-  <string name="dialog_disable_battery_optimizations_not_supported">Il tuo dispositivo non supporta disabilitazione delle ottimizzazioni della batteria</string>
+  <string name="dialog_disable_battery_optimizations_not_supported">Il tuo dispositivo non supporta la disabilitazione delle ottimizzazioni della batteria</string>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Caricamento...</string>
@@ -90,6 +90,8 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <!--Setting title-->
   <string name="folder_master">Invia Soltanto</string>
   <!--Setting title and description-->
+  <string name="folder_fileWatcher">Monitorare i cambiamenti</string>
+  <string name="folder_fileWatcherDescription">Chiede al sistema operativo di notificare le modifiche ai file. Se disabilitato, ritorna a scansioni orarie periodiche.</string>
   <!--Setting title-->
   <string name="folder_pause">Metti in pausa la cartella</string>
   <!--Setting title-->
@@ -105,12 +107,15 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Crea</string>
   <!--Dialog shown when attempting to remove a folder-->
-  <string name="remove_folder_confirm">Vuoi veramente eliminare questa cartella?</string>
+  <string name="remove_folder_confirm">Vuoi veramente eliminare questa cartella da Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">L\'ID Cartella non può essere vuoto</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Il percorso della cartella non può essere vuoto</string>
   <string name="dialog_discard_changes">Annullare le modifiche?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Schemi Esclusione File</string>
   <string name="create_ignore_file_error">Impossibile creare il file delle esclusioni. La directory è scrivibile?</string>
   <string name="edit_ignore_file_error">Nessun editor di testo trovato</string>
@@ -211,10 +216,13 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <string name="enable_relaying">Abilita Reindirizzamento</string>
   <string name="usage_reporting">Statistiche Anonime Utilizzo</string>
   <string name="gui_address">Indirizzi Interfaccia Grafica</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Esporta Configurazione</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Il valore inserito non è valido. Si prega di inserire il valore tra %1$d e %2$d.</string>
   <!--Experimental options-->
   <string name="use_proxy">Connettersi tramite un proxy</string>
+  <string name="do_not_use_proxy">Nessun proxy configurato.</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="use_tor_title">Utilizza Tor</string>
@@ -351,8 +359,10 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing è in esecuzione</string>
   <string name="syncthing_disabled">Syncthing è disabilitato</string>
+  <string name="syncthing_terminated">Syncthing è stato terminato</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Impossibile creare il file di configurazione</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <string name="default_folder_label">Camera</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -398,6 +408,9 @@ Si prega di segnalare eventuali problemi che si incontrano via Github.</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">Arrestare Syncthing non è  possibile quando è abilitato il funzionamento in background.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Età Massima</string>
   <string name="clean_out_after">Pulire dopo</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 9858240e..5da0e66d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -11,6 +11,8 @@
 発生した問題は何でも Github で報告してください。</string>
   <string name="cont">続行</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">エラー</string>
+  <string name="ignore">無視</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">フォルダーを追加</string>
@@ -24,8 +26,6 @@
   <string name="no">いいえ</string>
   <string name="open_website">Web サイトを開く</string>
   <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_message">Android はしばらくすると同期を停止することがあります。 これを防ぐには、バッテリーの最適化をオフにしてください。\n\n一部のデバイスには、タスク終了アプリが別途プリインストールされています。 これらのホワイトリストにも Syncthing を追加する必要があります。</string>
   <string name="dialog_disable_battery_optimization_later">後で</string>
@@ -106,6 +106,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">フォルダーのパスは空にできません</string>
   <string name="dialog_discard_changes">変更を破棄しますか?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">無視するパターン</string>
   <string name="create_ignore_file_error">無視ファイルの作成に失敗しました。ディレクトリは書き込み可能ですか?</string>
   <string name="edit_ignore_file_error">テキストエディタが見つかりません</string>
@@ -202,6 +205,7 @@
   <string name="enable_relaying">リレーを有効にする</string>
   <string name="usage_reporting">匿名での使用状況レポート</string>
   <string name="gui_address">GUI 待ち受けアドレス</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">設定のエクスポート</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -323,6 +327,7 @@
   <string name="syncthing_disabled">Syncthing は無効になりました</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">設定ファイルの作成に失敗しました</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -365,6 +370,9 @@
   <!--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">バックグラウンドでの実行が有効になっている場合、Syncthing の停止はサポートされていません。</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">最大保存日数</string>
   <string name="clean_out_after">以下の期間後に完全に削除</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 6f3035a2..4e6d01de 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -11,6 +11,7 @@
 발생한 문제는 무엇이든 Github를 통해 알려주시기 바랍니다.</string>
   <string name="cont">계속</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">오류</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">폴더 추가</string>
@@ -24,8 +25,6 @@
   <string name="no">아니오</string>
   <string name="open_website">웹사이트 열기</string>
   <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_message">안드로이드 운영체제는 시간이 지나면 동기화를 정지시킬 수도 있습니다. 이를 막기 위해 배터리 최적화 기능을 꺼주시기 바랍니다.\n\n몇몇 기기들은 추가적인 태스크 관리 앱이 선탑재되어 있습니다. 태스크 관리 앱의 신뢰목록에 등록함으로써 역시 문제를 해결하실 수 있습니다.</string>
   <string name="dialog_disable_battery_optimization_later">나중에</string>
@@ -106,6 +105,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">폴더 경로를 공백으로 둘 수 없습니다</string>
   <string name="dialog_discard_changes">설정 변경을 취소합니까?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">패턴 무시하기</string>
   <string name="create_ignore_file_error">무시 파일을 만들지 못했습니다. 디렉토리가 쓰기 가능합니까?</string>
   <string name="edit_ignore_file_error">텍스트 편집기를 찾을 수 없습니다</string>
@@ -202,6 +204,7 @@
   <string name="enable_relaying">Relaying 활성화</string>
   <string name="usage_reporting">익명 사용 기록 </string>
   <string name="gui_address">접속 대기 주소</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">설정 내보내기</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -323,6 +326,7 @@
   <string name="syncthing_disabled">Syncthing이 비활성화되었습니다</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">구성 파일을 만드는데 실패 했습니다.</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -365,6 +369,9 @@
   <!--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">백그라운드에서 실행이 활성화되어 있을 때는 Syncthing 중단은 지원되지 않습니다.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">최대 저장 기간</string>
   <string name="clean_out_after">다음 기간 후 제거</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index dc34baec..6c61991f 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -44,6 +44,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -66,6 +69,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -120,6 +124,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -132,6 +137,9 @@
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 6052d594..4edba0a6 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -7,6 +7,7 @@
   <string name="welcome_title">Velkommen til Syncthing for Android</string>
   <!--Text for dialog displayed on first start-->
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Feil</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Legg til Mappe</string>
@@ -20,8 +21,6 @@
   <string name="no">Nei</string>
   <string name="open_website">Åpne nettsted</string>
   <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>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
@@ -90,6 +89,9 @@
   <string name="folder_id_required">Mappe-ID kan ikke være tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikke være tom</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Enhets-ID</string>
@@ -162,6 +164,7 @@
   <string name="enable_relaying">Aktiver relésending</string>
   <string name="usage_reporting">Anonym bruksrapportering</string>
   <string name="gui_address">GUI Lytteadresser</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Eksporter innstillinger</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -251,6 +254,7 @@
   <string name="syncthing_active">Syncthing kjører</string>
   <string name="syncthing_disabled">Syncthing er deaktivert</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -290,6 +294,9 @@
   <!--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">Du kan ikke stoppe Syncthing når «kjør i bakgrunnen» er skrudd på.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="file_versioning">Versjonering av filer</string>
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml
index dc34baec..6c61991f 100644
--- a/app/src/main/res/values-nl-rBE/strings.xml
+++ b/app/src/main/res/values-nl-rBE/strings.xml
@@ -44,6 +44,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -66,6 +69,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -120,6 +124,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -132,6 +137,9 @@
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6bbadb93..2d79e464 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -12,6 +12,8 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="cont">Verder</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Voorbeeld</string>
+  <string name="generic_error">Fout</string>
+  <string name="ignore">Negeren</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Map toevoegen</string>
@@ -25,8 +27,6 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="no">Nee</string>
   <string name="open_website">Website openen</string>
   <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_title">Batterijoptimalisatie</string>
   <string name="dialog_disable_battery_optimization_message">Android kan je synchronisatie na een tijdje stoppen. Om dit te voorkomen kan je batterijoptimalisatie uitschakelen\n\nOp sommige apparaten staan extra apps voor beëindigen van taken, voeg Syncthing ook aan hun witte lijsten toe.</string>
   <string name="dialog_disable_battery_optimization_later">Later</string>
@@ -113,6 +113,9 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Het mappad mag niet leeg zijn</string>
   <string name="dialog_discard_changes">Wijzigingen verwerpen?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Patronen negeren</string>
   <string name="create_ignore_file_error">Aanmaken van ignore-bestand mislukt. Is de map schrijfbaar?</string>
   <string name="edit_ignore_file_error">Geen tekstverwerker gevonden</string>
@@ -213,10 +216,13 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <string name="enable_relaying">Relayen inschakelen</string>
   <string name="usage_reporting">Anoniem gebruiksrapportage</string>
   <string name="gui_address">GUI-luisteradressen</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Configuratie exporteren</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Ongeldige waarde ingevoerd. Voer een waarde in tussen %1$d en %2$d.</string>
   <!--Experimental options-->
   <string name="use_proxy">Verbinden via een proxy</string>
+  <string name="do_not_use_proxy">Geen proxy ingesteld.</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="use_tor_title">Gebruik Tor</string>
@@ -353,8 +359,10 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing draait</string>
   <string name="syncthing_disabled">Syncthing is uitgeschakeld</string>
+  <string name="syncthing_terminated">Syncthing is beëindigd</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Aanmaken van configuratiebestand mislukt</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <string name="default_folder_label">Camera</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -400,6 +408,9 @@ Als je problemen tegenkomt, meld ze dan via GitHub.</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">Syncthing stoppen terwijl uitvoeren in achtergrond is ingeschakeld wordt niet ondersteund.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maximumleeftijd</string>
   <string name="clean_out_after">Legen na</string>
diff --git a/app/src/main/res/values-nn/strings.xml b/app/src/main/res/values-nn/strings.xml
index e005722c..a5882d72 100644
--- a/app/src/main/res/values-nn/strings.xml
+++ b/app/src/main/res/values-nn/strings.xml
@@ -7,6 +7,7 @@
   <string name="welcome_title">Velkommen til Synchting for Android</string>
   <!--Text for dialog displayed on first start-->
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Feil</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Legg til mappe</string>
@@ -20,8 +21,6 @@
   <string name="no">Nei</string>
   <string name="open_website">Opne nettstad</string>
   <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>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
@@ -90,6 +89,9 @@
   <string name="folder_id_required">Mappe-ID kan ikkje vere tom</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mappestien kan ikkje vere tom</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Einings-ID</string>
@@ -162,6 +164,7 @@
   <string name="enable_relaying">Aktiver Reléer</string>
   <string name="usage_reporting">Anonym rapportering av bruk</string>
   <string name="gui_address">Grensesnitt: lytteadresser</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Eksporter innstillingar</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -251,6 +254,7 @@
   <string name="syncthing_active">Syncthing køyrer</string>
   <string name="syncthing_disabled">Syncthing er ikkje aktivert</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -290,6 +294,9 @@
   <!--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">Du kan ikkje stoppe Syncthing når «køyr i bakgrunnen» er skrudd på.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index ae07d5fd..347d4d5e 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -11,6 +11,8 @@ Aby udostępnić dane innemu urządzeniu, należy dodać jego unikalny identyfik
 Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.</string>
   <string name="cont">Kontynuuj</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Błąd</string>
+  <string name="ignore">Ignoru</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Dodaj katalog</string>
@@ -24,8 +26,6 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <string name="no">Nie</string>
   <string name="open_website">Otwórz stronę internetową</string>
   <string name="toast_write_storage_permission_required">Wymagane zezwolenie na zapisywanie do pamięci zewnętrznej</string>
-  <string name="device_rejected">Urządzenie %1$s chce nawiązać połączenie</string>
-  <string name="folder_rejected">Urządzenie %1$s chce udostępnić katalog %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Optymalizacja akumulatora</string>
   <string name="dialog_disable_battery_optimization_message">Android może wstrzymać synchronizację po pewnym czasie. By temu zapobiedz, wyłącz optymalizację baterii.\n\nNiektóre urządzenia posiadają dodatkowe preinstalowane aplikacje zatrzymujące zadania - dobrze byłoby dopisać Syncthing do listy ich wyjątków.</string>
   <string name="dialog_disable_battery_optimization_later">Później</string>
@@ -109,6 +109,9 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka katalogu nie może być pusta</string>
   <string name="dialog_discard_changes">Porzucić zmiany?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Wzorce ignorowania</string>
   <string name="create_ignore_file_error">Nie powiodło się tworzenie pliku ze wzorcami ignorowania. Czy do folderu można zapisywać?</string>
   <string name="edit_ignore_file_error">Nie znaleziono edytora tekstu</string>
@@ -200,6 +203,7 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Eksportuj ustawienia</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -330,6 +334,7 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <string name="syncthing_disabled">Syncthing jest wyłączony</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Nie udało się stworzyć pliku konfiguracyjnego</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -372,6 +377,9 @@ Proszę zgłaszać napotkane błędy programu za pośrednictwem serwisu Github.<
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
   <string name="appconfig_receiver_background_enabled">Zatrzymywanie programu nie jest obsługiwane podczas działania w tle.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maksymalny wiek</string>
   <string name="clean_out_after">Posprzątaj po</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 3e2f2a00..fb779243 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -12,6 +12,8 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <string name="cont">Continuar</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Exemplo</string>
+  <string name="generic_error">Erro</string>
+  <string name="ignore">Ignorar</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Adicionar pasta</string>
@@ -25,8 +27,6 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <string name="no">Não</string>
   <string name="open_website">Abrir site</string>
   <string name="toast_write_storage_permission_required">A permissão de escrita em armazenamento é obrigatória para este aplicativo</string>
-  <string name="device_rejected">O dispositivo %1$s quer se conectar</string>
-  <string name="folder_rejected">O dispostivo %1$s quer compartilhar a pasta %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Otimização de bateria</string>
   <string name="dialog_disable_battery_optimization_message">O Android poder parar a sincronização após algum tempo. Para evitar isto, desabilite a otimização de bateria.\n\nAlguns dispositivos possuem  aplicativos para \"matar\" tarefas. Você também deve adicionar o Syncthing às listas brancas deles.</string>
   <string name="dialog_disable_battery_optimization_later">Depois</string>
@@ -113,6 +113,9 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">O caminho da pasta não pode ficar vazio</string>
   <string name="dialog_discard_changes">Descartar as alterações?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Filtros</string>
   <string name="create_ignore_file_error">Não foi possível criar o arquivo de filtros. Este diretório tem permissões de escrita?</string>
   <string name="edit_ignore_file_error">Nenhum editor de texto foi encontrado</string>
@@ -213,6 +216,7 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportar configuração</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -348,6 +352,7 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <string name="syncthing_disabled">O Syncthing está desabilitado</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Não foi possível criar o arquivo de configuração</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -393,6 +398,9 @@ Por favor, nos avise sobre quaisquer problemas que você encontrar via Github.</
   <!--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">Não é possível parar o Syncthing enquanto ele estiver configurado para rodar em segundo plano.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Idade máxima</string>
   <string name="clean_out_after">Limpar depois de</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 089fdeb6..487c8539 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -12,6 +12,7 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <string name="cont">Continuar</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Exemplo</string>
+  <string name="generic_error">Erro</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Adicionar pasta</string>
@@ -25,8 +26,6 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <string name="no">Não</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_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>
@@ -102,6 +101,9 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <!--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>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID do dispositivo</string>
@@ -179,6 +181,7 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportar configuração</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -272,6 +275,7 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <string name="syncthing_active">O Syncthing está a correr</string>
   <string name="syncthing_disabled">O Syncthing está desactivado</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -312,6 +316,9 @@ Reporte, através do Github, quaisquer problemas que encontre, por favor.</strin
   <!--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>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="file_versioning">Gestão de versões</string>
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 2a728e7d..a8c7e60c 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -12,6 +12,7 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <string name="cont">Continuare</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Exemplu</string>
+  <string name="generic_error">Eroare</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Adăugare director</string>
@@ -25,8 +26,6 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <string name="no">Nu</string>
   <string name="open_website">Deschide site</string>
   <string name="toast_write_storage_permission_required">Permisiunea de scriere pe spațiul de stocare este necesară acestei aplicații</string>
-  <string name="device_rejected">Dispozitivul%1$s dorește să se conecteze</string>
-  <string name="folder_rejected">Dispozitivul %1$s dorește să partajeze%2$s</string>
   <string name="dialog_disable_battery_optimization_title">Optimizare baterie</string>
   <string name="dialog_disable_battery_optimization_message">Android poate oprii sincronizarea după un timp. Pentru a prevenii asta, opriți optimizarea bateriei.\n\nUnele dispozitive au aplicații adiționale preinstalate care pot oprii aplicațiile. Ar trebui să adăugați Syncthing și în listele lor de excepții.</string>
   <string name="dialog_disable_battery_optimization_later">Mai târziu </string>
@@ -114,6 +113,9 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Calea directorului nu poate fi goală</string>
   <string name="dialog_discard_changes">Eliminăm schimbările dumneavoastră?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ignoră șabloane</string>
   <string name="create_ignore_file_error">Nu s-a putut crea fișierul de ignorare. Se poate scrie în director?</string>
   <string name="edit_ignore_file_error">Nu s-a găsit nici un editor de text</string>
@@ -214,10 +216,13 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <string name="enable_relaying">Activează transmiterea prin relee</string>
   <string name="usage_reporting">Raport utilizare anonim</string>
   <string name="gui_address">Adresa de ascultare a interfeței</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportă configurația</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Valoarea nu este validă. Vă rugăm să introduceți o valoare între %1$d și %2$d.</string>
   <!--Experimental options-->
   <string name="use_proxy">Conectare printr-un proxy</string>
+  <string name="do_not_use_proxy">Nici un proxy configurat.</string>
   <string name="keep_wakelock_while_binary_running">Ține procesorul activ când rulează</string>
   <string name="keep_wakelock_while_binary_running_summary">Folosiți această setare dacă vă confruntați cu deconectări neașteptate atunci când dispozitivul se alimentează de la baterie. Această opțiune poate duce la o creștere a consumului bateriei.</string>
   <string name="use_tor_title">Folosește Tor</string>
@@ -357,8 +362,10 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing rulează</string>
   <string name="syncthing_disabled">Syncthing este dezactivat</string>
+  <string name="syncthing_terminated">Syncthing a fost închis</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Creerea fișierului de configurare a eșuat</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <string name="default_folder_label">Camera</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
@@ -404,6 +411,9 @@ Vă rugăm să raportați orice problemă întâlniți, prin intermediul GitHub.
   <!--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">Nu este posibilă oprirea Syncthing atunci când rularea în fundal este activată</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Vârstă maximă</string>
   <string name="clean_out_after">Curățare după</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 682685aa..30fc2326 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -12,6 +12,8 @@
   <string name="cont">Продолжить</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Пример</string>
+  <string name="generic_error">Ошибка</string>
+  <string name="ignore">Игнорировать</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Добавить папку</string>
@@ -25,8 +27,6 @@
   <string name="no">Нет</string>
   <string name="open_website">Открыть сайт</string>
   <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_message">Android может остановить синхронизацию через определенное время. Чтобы избежать этого, отключите энергосбережение в режиме ожидания.\n\nТакже, если на вашем устройстве установлена программа для автоматического завершения приложений, внесите Syncthing в её список исключений.</string>
   <string name="dialog_disable_battery_optimization_later">Позже</string>
@@ -115,6 +115,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Путь к папке не может быть пустым</string>
   <string name="dialog_discard_changes">Отменить внесённые изменения?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Шаблоны игнорирования</string>
   <string name="create_ignore_file_error">Ошибка при попытке создания файла с шаблонами игнорирования. У папки есть право на запись?</string>
   <string name="edit_ignore_file_error">Текстовый редактор не найден</string>
@@ -215,6 +218,7 @@
   <string name="enable_relaying">Включить релеи</string>
   <string name="usage_reporting">Анонимные Отчёты Использования</string>
   <string name="gui_address">Адрес Ожидания GUI</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Экспорт настроек</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -363,6 +367,7 @@
   <string name="syncthing_disabled">Syncthing выключен</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Ошибка при создании файла конфигурации</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -408,6 +413,9 @@
   <!--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">Остановка Syncthing не поддерживается, если включено выполнение в фоновом режиме.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Максимальный срок</string>
   <string name="clean_out_after">Очистить после</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 0103a5d4..8e26779e 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -7,6 +7,7 @@
   <string name="welcome_title">Víta Vás Syncthing pre Android</string>
   <!--Text for dialog displayed on first start-->
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Chyba</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Pridať Adresár</string>
@@ -83,6 +84,9 @@
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Cesta k adresáru nemôže byť prázdna</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID Zariadenia</string>
@@ -148,6 +152,7 @@
   <string name="local_announce_enabled">Loká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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportovať Konfiguráciu</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -233,6 +238,7 @@
   <string name="syncthing_active">Syncthing beží</string>
   <string name="syncthing_disabled">Syncthing je zakázaný</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--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-fotografie</string>
@@ -269,6 +275,9 @@
   <string name="state_unknown">Neznámy</string>
   <string name="status_outofsync">Nesynchronizované</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index dc34baec..6c61991f 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -44,6 +44,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -66,6 +69,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -120,6 +124,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -132,6 +137,9 @@
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index dc34baec..6c61991f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -44,6 +44,9 @@
   <!--Dialog shown when attempting to remove a folder-->
   <!--Toast shown when trying to create a folder with an empty ID-->
   <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <!--Setting title-->
@@ -66,6 +69,7 @@
   <!--SettingsFragment-->
   <!--Preference summary in case it is enabled-->
   <!--Preference summary in case it is disabled-->
+  <!--Titles for the preference to undo ignored devices and folders-->
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
   <!--Toast after entering invalid socks proxy address-->
@@ -120,6 +124,7 @@
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <!--Title of the notification shown while syncthing is running and enabled-->
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <!--RestApi-->
@@ -132,6 +137,9 @@
   <!--Strings representing units for transfer rates, from smallest to largest-->
   <!--Possible folder states-->
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 2b4af13b..227c8aa5 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -12,6 +12,8 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="cont">Fortsätt</string>
   <!--Generic texts used everywhere-->
   <string name="generic_example">Exempel</string>
+  <string name="generic_error">Fel</string>
+  <string name="ignore">Ignorera</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Lägg till mapp</string>
@@ -25,8 +27,6 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="no">Nej</string>
   <string name="open_website">Öppna hemsida</string>
   <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 mapp %2$s</string>
   <string name="dialog_disable_battery_optimization_title">Batterioptimering</string>
   <string name="dialog_disable_battery_optimization_message">Android kan stoppa synkronisering efter en viss tid. För att förhindra detta, stäng av batterioptimering.\n\nNågra enheter har ytterligare uppgiftsdödande appar förinstallerade. Ni bör lägga till Syncthing till deras vitlista, också.</string>
   <string name="dialog_disable_battery_optimization_later">Senare</string>
@@ -113,6 +113,9 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Mapp-sökvägen får inte vara tom</string>
   <string name="dialog_discard_changes">Kasta dina ändringar?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ignorera mönster</string>
   <string name="create_ignore_file_error">Misslyckades med att skapa ignorera-fil. Är katalogen skrivbar?</string>
   <string name="edit_ignore_file_error">Ingen textredigerare hittades</string>
@@ -213,10 +216,13 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <string name="enable_relaying">Aktivera reläa</string>
   <string name="usage_reporting">Anonym användningsrapportering</string>
   <string name="gui_address">Gränssnittets lyssnaradresser</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Exportera konfiguration</string>
   <!--Toast after entering invalid integer value-->
+  <string name="invalid_integer_value" tools:ignore="PluralsCandidate">Inmatningsvärdet är inte giltigt. Ange ett värde mellan%1$d och %2$d.</string>
   <!--Experimental options-->
   <string name="use_proxy">Anslut via en proxy</string>
+  <string name="do_not_use_proxy">Ingen proxy konfigurerad.</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="use_tor_title">Använd Tor</string>
@@ -353,8 +359,10 @@ Vänligen rapportera eventuella problem du stöter på via Github.</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing körs</string>
   <string name="syncthing_disabled">Syncthing är inaktiverad</string>
+  <string name="syncthing_terminated">Syncthing avslutades</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Misslyckades med att skapa konfigurationsfil</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -400,6 +408,9 @@ Vänligen rapportera eventuella problem du stöter på via Github.</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">Det går inte att stoppa Syncthing när körning i bakgrunden är aktiverad.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Maximal ålder</string>
   <string name="clean_out_after">Rensa upp efter</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index db6174cb..efb39628 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -12,6 +12,7 @@ Ardından hangi klasörlerin hangi aygıtlar ile paylaşılacağını seçebilir
 Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</string>
   <string name="cont">Devam et</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Hata</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Klasör Ekleme</string>
@@ -25,8 +26,6 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="no">Hayır</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="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.\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>
@@ -101,6 +100,9 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Klasör yolu boş olmamalı</string>
   <string name="dialog_discard_changes">Değişiklikleri göz ardı et?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">Aygıt ID</string>
@@ -177,6 +179,7 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="global_announce_server">Küresel Bulunabilirlik Sunucuları</string>
   <string name="usage_reporting">Anonim Kullanım Raporlama</string>
   <string name="gui_address">Arayüz Dinleme Adresleri</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Yapılandırmayı Dışa Aktar</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -270,6 +273,7 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <string name="syncthing_active">Syncthing çalışıyor</string>
   <string name="syncthing_disabled">Syncthing devre dışı</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -309,6 +313,9 @@ Eğer herhangi bir sorunla karşılaşırsan Github aracılığıyla bildir.</st
   <!--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">Arka planda çalışma etkinken Syncthing\'i durdurma desteklenmiyor.</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="file_versioning">Dosya Sürümlendirme</string>
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 021e8e6f..ea41a6db 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -6,6 +6,7 @@
   <!--Text for dialog displayed on first start-->
   <string name="cont">Продовжити</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Помилка</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Додати каталог</string>
@@ -84,6 +85,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Шлях до каталогу не може бути пустим</string>
   <string name="dialog_discard_changes">Скасувати зміни?</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">Ігнорувати паттерни</string>
   <string name="edit_ignore_file_error">Текстові редактори не знайдено</string>
   <!--DeviceActivity-->
@@ -156,6 +160,7 @@
   <string name="global_announce_server">Публічні сервери координації NAT</string>
   <string name="enable_relaying">Дозволити ретрансляцію (Relaying)</string>
   <string name="usage_reporting">Статистика анонімного використання</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Експорт налаштувань</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -245,6 +250,7 @@
   <string name="syncthing_active">Syncthing працює</string>
   <string name="syncthing_disabled">Syncthing заборонено</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -268,6 +274,9 @@
   <string name="state_unknown">Невідомо</string>
   <string name="status_outofsync">Не синхронізовано</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">Максимальний вік</string>
   <string name="clean_out_after">Очистити пізніше</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 43cfbfff..003cd625 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -7,6 +7,8 @@
   <string name="welcome_title">Chào mừng đến với Syncthing cho Android</string>
   <!--Text for dialog displayed on first start-->
   <!--Generic texts used everywhere-->
+  <string name="generic_error">Lỗi</string>
+  <string name="ignore">Bỏ qua</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Thêm th.mục</string>
@@ -20,8 +22,6 @@
   <string name="no">Không</string>
   <string name="open_website">Mở trang web</string>
   <string name="toast_write_storage_permission_required">Ứng dụng này cần được phép chép vào ổ lưu trữ</string>
-  <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>
   <!--StateDialogActivity-->
   <!--Text for FoldersFragment and DevicesFragment loading view-->
@@ -88,6 +88,9 @@
   <string name="folder_id_required">Không được để trống ID thư mục</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Không được để trống đường dẫn thư mục</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <!--DeviceActivity-->
   <!--Setting title-->
   <string name="device_id">ID thiết bị</string>
@@ -157,6 +160,7 @@
   <string name="local_announce_enabled">Dò tìm cục bộ</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>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">Xuất cấu hình</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -246,6 +250,7 @@
   <string name="syncthing_active">Syncthing đang chạy</string>
   <string name="syncthing_disabled">Đã tắt Syncthing</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--Label of the default folder created of first start (camera folder).-->
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
   <string name="default_folder_id">%1$s-ảnh</string>
@@ -283,6 +288,9 @@
   <string name="status_outofsync">Mất đồng bộ</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <!--File versioning dialog descriptions for file versioning types and file versioning configuration options.-->
   <!--Displays the current file versioning type in the Folder activity-->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 386d3e95..a747dd10 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -11,6 +11,8 @@
 请通过 GitHub 报告任何你遇到的问题。</string>
   <string name="cont">继续</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">错误</string>
+  <string name="ignore">忽略</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">添加文件夹</string>
@@ -24,8 +26,6 @@
   <string name="no">否</string>
   <string name="open_website">打开主页</string>
   <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_message">Android 可能会在一段时间后停止同步。为防这种情况，请关闭电池优化。
 
@@ -108,6 +108,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">文件夹路径不得为空</string>
   <string name="dialog_discard_changes">放弃所做的更改？</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">忽略列表</string>
   <string name="create_ignore_file_error">创建忽略文件失败。文件夹可写吗？</string>
   <string name="edit_ignore_file_error">未找到文本编辑器</string>
@@ -204,6 +207,7 @@
   <string name="enable_relaying">启用中继</string>
   <string name="usage_reporting">匿名使用报告</string>
   <string name="gui_address">管理页监听地址</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">导出设置</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -325,6 +329,7 @@
   <string name="syncthing_disabled">Syncthing 已禁用</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">创建配置文件失败</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -367,6 +372,9 @@
   <!--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">当启用后台运行时不支持停止 Syncthing。</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">最长保留时间</string>
   <string name="clean_out_after">在该时间后清除</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index a6c6aa9d..58ab68e8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -11,6 +11,7 @@
 請把你遇到的問題回報到 Github 上。</string>
   <string name="cont">繼續</string>
   <!--Generic texts used everywhere-->
+  <string name="generic_error">錯誤</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">增加資料夾</string>
@@ -24,8 +25,6 @@
   <string name="no">否</string>
   <string name="open_website">打開網站</string>
   <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_message">Android 也許會在一段時間後停止同步。為了防止這個情形，關閉電池最佳化。\n\n有些裝置會預載額外的工作清除應用程式，你也需把 Syncthing 加入白名單中。</string>
   <string name="dialog_disable_battery_optimization_later">稍後</string>
@@ -106,6 +105,9 @@
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">資料夾路徑不得為空</string>
   <string name="dialog_discard_changes">放棄變更？</string>
+  <!--Summary shown if we only have readonly access to the folder path-->
+  <!--Summary shown if we only have readwrite access to the folder path-->
+  <!--Toast shown if the user selected an invalid location for a new syncthing folder-->
   <string name="ignore_patterns">忽略樣式</string>
   <string name="create_ignore_file_error">無法建立忽略檔案。資料夾是可寫入的？</string>
   <string name="edit_ignore_file_error">找不到文字編輯器</string>
@@ -202,6 +204,7 @@
   <string name="enable_relaying">啟用中繼</string>
   <string name="usage_reporting">匿名使用資訊回報</string>
   <string name="gui_address">GUI 監聽位址</string>
+  <!--Titles for the preference to undo ignored devices and folders-->
   <string name="export_config">匯出設定</string>
   <!--Toast after entering invalid integer value-->
   <!--Experimental options-->
@@ -323,6 +326,7 @@
   <string name="syncthing_disabled">Syncthing 已經停用</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">無法建立設定檔</string>
+  <!--Toast shown if a config file crucial to operation is missing-->
   <!--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-->
@@ -365,6 +369,9 @@
   <!--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">當開啟在背景執行時，不支援正在停止 Syncthing</string>
+  <!--Titles used in the pull order dialog and pull order button in the folder activity-->
+  <!--Displays the current pull order type in the Folder activity-->
+  <!--Pull order dialog descriptions for pull order types-->
   <!--Titles used in the file versioning dialog and file versioning button in the folder activity-->
   <string name="maximum_age">最常保留時間</string>
   <string name="clean_out_after">於之後清空</string>