diff --git a/src/main/res/values-ar/strings.xml b/src/main/res/values-ar/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-ar/strings.xml
+++ b/src/main/res/values-ar/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 5548faef..073d79e4 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -86,6 +86,7 @@
   <string name="current_address">Aktuální adresa</string>
   <!--Setting title-->
   <string name="compression">Komprese</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Zavaděč</string>
   <!--ActionBar item-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index 6011c842..ca364078 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -86,6 +86,7 @@
   <string name="current_address">Aktuelle Adresse</string>
   <!--Setting title-->
   <string name="compression">Datenkomprimierung</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Verteilergerät</string>
   <!--ActionBar item-->
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 36196c3a..5160f32b 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -46,7 +46,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <string name="devices">Συσκευές</string>
   <!--Setting title-->
   <!--Setting title-->
@@ -64,6 +63,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 06978937..22ca9efc 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -45,6 +45,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Servidor de Anuncio</string>
   <!--Menu item to donate-->
+  <string name="donate">Donar</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID de carpeta</string>
@@ -83,6 +84,7 @@
   <string name="current_address">Dirección actual</string>
   <!--Setting title-->
   <string name="compression">Compresión</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Introductor</string>
   <!--ActionBar item-->
@@ -141,6 +143,7 @@ Por favor reporte cualquier problema que encuentre a través de Github.</string>
   <string name="gui_user">Usuario de Autenticación GUI</string>
   <string name="gui_password">Contraseña de Autenticación GUI</string>
   <string name="gui_https_enabled">Usar HHTPS para la GUI</string>
+  <string name="export_config">Exportar Configuración</string>
   <!--Toast shown after config was successfully exported-->
   <!--Toast shown after config was successfully imported-->
   <!--Toast shown after config was successfully imported-->
diff --git a/src/main/res/values-fi/strings.xml b/src/main/res/values-fi/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-fi/strings.xml
+++ b/src/main/res/values-fi/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-fr-rFR/strings.xml b/src/main/res/values-fr-rFR/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-fr-rFR/strings.xml
+++ b/src/main/res/values-fr-rFR/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index b95b533a..4da7f935 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -86,6 +86,12 @@
   <string name="current_address">Adresses actuelles</string>
   <!--Setting title-->
   <string name="compression">Compression</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Jamais</item>
+    <item>Metadonnées</item>
+    <item>Toujours</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">Initiateur</string>
   <!--ActionBar item-->
@@ -223,4 +229,5 @@ SVP, signalez les problèmes que vous rencontrez via Github.</string>
   <string name="state_scanning">Analyse en cours</string>
   <string name="state_cleaning">Effacement en cours</string>
   <string name="state_syncing">Synchro en cours</string>
+  <string name="state_unknown">Inconnu</string>
 </resources>
diff --git a/src/main/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml
index 7a0cd312..d736a736 100644
--- a/src/main/res/values-hu/strings.xml
+++ b/src/main/res/values-hu/strings.xml
@@ -35,7 +35,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <string name="devices">Eszközök</string>
   <!--Setting title-->
   <!--Setting title-->
@@ -57,6 +56,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <string name="compression">Tömörítés</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-in/strings.xml b/src/main/res/values-in/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-in/strings.xml
+++ b/src/main/res/values-in/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 6e52fc6f..f889f486 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -44,6 +44,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Server Presenza Globale</string>
   <!--Menu item to donate-->
+  <string name="donate">Donazione</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID Cartella</string>
@@ -84,6 +85,12 @@
   <string name="current_address">Indirizzo Attuale</string>
   <!--Setting title-->
   <string name="compression">Compressione</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Mai</item>
+    <item>Metadati</item>
+    <item>Sempre</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">Introduttore</string>
   <!--ActionBar item-->
@@ -121,6 +128,7 @@ Si prega di segnalare eventuali problemi riscontrati tramite Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Impostazioni</string>
+  <string name="category_syncthing_android">Syncthing-Android</string>
   <!--Preference title-->
   <string name="always_run_in_background">Sempre in background</string>
   <!--Preference summary in case it is enabled-->
@@ -146,11 +154,16 @@ Si prega di segnalare eventuali problemi riscontrati tramite Github.</string>
   <string name="gui_user">Utente Interfaccia Grafica</string>
   <string name="gui_password">Password Autenticazione Utente</string>
   <string name="gui_https_enabled">Usa HTTPS per l\'interfaccia grafica</string>
+  <string name="export_config">Esporta Configurazione</string>
   <!--Toast shown after config was successfully exported-->
+  <string name="config_export_successful">Config è stata esportata in %1$s</string>
+  <string name="import_config">Importa Configurazione</string>
   <!--Toast shown after config was successfully imported-->
+  <string name="config_imported_successful">Config importata</string>
   <!--Toast shown after config was successfully imported-->
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opzioni di Debug</string>
+  <string name="category_about">Info</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Segnala Problema</string>
   <!--Summary for the issue tracker settings item-->
@@ -164,6 +177,7 @@ Si prega di segnalare eventuali problemi riscontrati tramite Github.</string>
   <!--Activity title-->
   <string name="folder_picker_title">Selezione Cartella</string>
   <!--Toast shown on devices with kitkat or higher-->
+  <string name="kitkat_external_storage_warning">Attenzione: La tua versione di Android non permette la sincronizzazione con dispositivi esterni di archiviazione</string>
   <!--ListView empty text-->
   <string name="directory_empty">Cartella Vuota</string>
   <!--Menu item to create folder on the file system-->
@@ -192,9 +206,24 @@ Si prega di segnalare eventuali problemi riscontrati tramite Github.</string>
   <!--Shown when a device ID is copied to the clipboard-->
   <string name="device_id_copied_to_clipboard">ID Dispositivo copiato negli appunti</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
+  <string-array name="file_size_units">
+    <item>B</item>
+    <item>KiB</item>
+    <item>MiB</item>
+    <item>GiB</item>
+    <item>TiB</item>
+  </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>b/s</item>
+    <item>Kib/s</item>
+    <item>Mib/s</item>
+    <item>Gib/s</item>
+    <item>Tib/s</item>
+  </string-array>
   <!--Possible folder states-->
   <string name="state_idle">Inattivo</string>
   <string name="state_scanning">Scansione in corso</string>
   <string name="state_syncing">Sincronizzazione</string>
+  <string name="state_unknown">Sconosciuto</string>
 </resources>
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 390a34a6..b077d164 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -86,6 +86,12 @@
   <string name="current_address">現在のアドレス</string>
   <!--Setting title-->
   <string name="compression">圧縮</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>なし</item>
+    <item>メタデータ</item>
+    <item>つねに</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">紹介者</string>
   <!--ActionBar item-->
@@ -223,4 +229,5 @@ GitHub 経由で、発生した問題をすべて報告してください。</st
   <string name="state_scanning">スキャン中</string>
   <string name="state_cleaning">クリーニング中</string>
   <string name="state_syncing">同期中</string>
+  <string name="state_unknown">不明</string>
 </resources>
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 44c856b1..c300875c 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -51,7 +51,6 @@
   <string name="directory">Katalog</string>
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <string name="devices">Enheter</string>
   <!--Setting title-->
   <!--Setting title-->
@@ -81,6 +80,7 @@
   <string name="current_address">Nåværende Adresser</string>
   <!--Setting title-->
   <string name="compression">Komprimering</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Innføring</string>
   <!--ActionBar item-->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index 20ab9c1b..21a6ab66 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -86,6 +86,12 @@
   <string name="current_address">Huidig adres</string>
   <!--Setting title-->
   <string name="compression">Compressie</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Nooit</item>
+    <item>Alleen metadata</item>
+    <item>Altijd</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">Introductie</string>
   <!--ActionBar item-->
@@ -223,4 +229,5 @@ Gelieve alle problemen die je tegenkomt via GitHub te melden.</string>
   <string name="state_scanning">Bezig met scannen</string>
   <string name="state_cleaning">Bezig met opruimen</string>
   <string name="state_syncing">Bezig met synchroniseren</string>
+  <string name="state_unknown">Onbekend</string>
 </resources>
diff --git a/src/main/res/values-pl-rPL/strings.xml b/src/main/res/values-pl-rPL/strings.xml
new file mode 100644
index 00000000..c5350abc
--- /dev/null
+++ b/src/main/res/values-pl-rPL/strings.xml
@@ -0,0 +1,98 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+  <!--MainActivity-->
+  <!--Title of the "add folder" menu action-->
+  <!--Title of the "share device id" menu action-->
+  <!--Shown in the chooser dialog when sharing a Device ID-->
+  <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <!--FoldersFragment-->
+  <!--Format string for folder progress. First parameter is status string, second is sync percentage-->
+  <!--Shown if no folders exist-->
+  <!--Format string for folder file count-->
+  <!--DevicesFragment-->
+  <!--Shown if no devices exist-->
+  <!--Indicates that a folder is fully synced to the local device-->
+  <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
+  <!--Indicates that there is no connection to the device-->
+  <!--Title for current download rate-->
+  <!--Title for current upload rate-->
+  <!--DrawerFragment-->
+  <!--Same as download_title with a colon and space appended-->
+  <!--Same as upload_title with a colon and space appended-->
+  <!--Title for current CPU usage-->
+  <!--Title for current RAM usage-->
+  <!--Title for announce server status-->
+  <!--Menu item to donate-->
+  <!--FolderSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Title for FolderSettingsFragment in create mode-->
+  <!--Title for FolderSettingsFragment in edit mode-->
+  <!--Menu item to confirm folder creation-->
+  <!--Dialog shown when attempting to delete a folder-->
+  <!--Toast shown when trying to create a folder with an invalid ID-->
+  <!--Toast shown when trying to create a folder with an empty path-->
+  <!--Toast shown when selecting 'devices' if no devices have been added-->
+  <!--DeviceSettingsFragment-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Setting title-->
+  <!--Strings representing compression options-->
+  <!--Setting title-->
+  <!--ActionBar item-->
+  <!--Title for DeviceSettingsFragment in create mode-->
+  <!--Menu item to confirm adding a device-->
+  <!--Title for DeviceSettingsFragment in edit mode-->
+  <!--Dialog shown when attempting to delete a device-->
+  <!--Toast shown when trying to create a device with an empty ID-->
+  <!--Toast shown when trying to create a device with an empty name-->
+  <!--Content description for device ID qr code icon-->
+  <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
+  <!--WebGuiActivity-->
+  <!--Title of the web gui activity-->
+  <!--Text for WebGuiActivity loading view-->
+  <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <!--Title for dialog displayed on first start-->
+  <!--Text for dialog displayed on first start-->
+  <!--SettingsFragment-->
+  <!--Activity title-->
+  <!--Preference title-->
+  <!--Preference summary in case it is enabled-->
+  <!--Preference summary in case it is disabled-->
+  <!--Toast shown after config was successfully exported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Toast shown after config was successfully imported-->
+  <!--Title for the preference to set STTRACE parameters-->
+  <!--Settings item that opens issue tracker-->
+  <!--Summary for the issue tracker settings item-->
+  <!--URL of the issue tracker-->
+  <!--Title of the preference showing upstream version name-->
+  <!--Title of the preference showing this app's version name-->
+  <!--FolderPickerAcitivity-->
+  <!--Activity title-->
+  <!--Toast shown on devices with kitkat or higher-->
+  <!--ListView empty text-->
+  <!--Menu item to create folder on the file system-->
+  <!--Menu item to select the current folder-->
+  <!--SyncthingService-->
+  <!--Title of the "syncthing disabled" dialog-->
+  <!--Message of the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog-->
+  <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
+  <!--Title of the notification shown while syncthing is running and enabled-->
+  <!--RestApi-->
+  <!--Title of the notification shown when a restart is needed-->
+  <!--Text of the notification shown when a restart is needed-->
+  <!--Text for the dismiss button of the restart Activity-->
+  <!--Shown when a device ID is copied to the clipboard-->
+  <!--Strings representing units for file sizes, from smallest to largest-->
+  <!--Strings representing units for transfer rates, from smallest to largest-->
+  <!--Possible folder states-->
+</resources>
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index 3c8c2dc2..701aec88 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -45,17 +45,18 @@
   <!--Title for announce server status-->
   <string name="announce_server">Serwer ogłoszeniowy</string>
   <!--Menu item to donate-->
+  <string name="donate">Wspomóż</string>
   <!--FolderSettingsFragment-->
   <!--Setting title-->
   <string name="folder_id">ID folderu</string>
   <!--Setting title-->
   <string name="directory">Katalog</string>
   <!--Setting title-->
-  <string name="folder_master">Folder nadrzędny</string>
+  <string name="folder_master">Główny folder</string>
   <!--Setting title-->
   <string name="devices">Urządzenia</string>
   <!--Setting title-->
-  <string name="file_versioning">File Versioning</string>
+  <string name="file_versioning">System wersjonowania plików</string>
   <!--Setting title-->
   <string name="keep_versions">Pamiętaj wersje</string>
   <!--Setting title-->
@@ -69,10 +70,11 @@
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Czy na pewno chcesz usunąć ten folder?</string>
   <!--Toast shown when trying to create a folder with an invalid ID-->
+  <string name="folder_id_invalid">Nazwa katalogu musi być krótka (64 lub mniej znaków). Może zawierać tylko litery, cyfry, kropki, myślniki i znak podkreślenia.</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka do folderu nie może być pusta</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
-  <string name="no_devices">Proszę połączyć sięwpierw z urządzeniem</string>
+  <string name="no_devices">Proszę najpierw podłączyć urządzenie.</string>
   <!--DeviceSettingsFragment-->
   <!--Setting title-->
   <string name="device_id">ID urządzenia</string>
@@ -84,6 +86,7 @@
   <string name="current_address">Bieżący adres</string>
   <!--Setting title-->
   <string name="compression">Kompresja</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Wprowadzający</string>
   <!--ActionBar item-->
@@ -97,11 +100,11 @@
   <!--Dialog shown when attempting to delete a device-->
   <string name="delete_device_confirm">Czy na pewno chcesz usunąć to urządzenie?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
-  <string name="device_id_required">ID urządzenie nie może być puste</string>
+  <string name="device_id_required">ID urządzenia nie może być puste</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">Nazwa urządzenie nie może być pusta</string>
+  <string name="device_name_required">Nazwa urządzenia nie może być pusta</string>
   <!--Content description for device ID qr code icon-->
-  <string name="scan_qr_code_description">Skanuj QR Code</string>
+  <string name="scan_qr_code_description">Skanuj kod QR</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
   <string name="no_qr_scanner_installed">Nie masz zainstalowanego wspieranego skanera QR.
 Zainstaluj wspierany skaner, albo wprowadź ID urządzenia ręcznie.</string>
@@ -111,41 +114,54 @@ Zainstaluj wspierany skaner, albo wprowadź ID urządzenia ręcznie.</string>
   <!--Text for WebGuiActivity loading view-->
   <string name="web_gui_loading">Oczekiwanie na GUI</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generowanie kluczy. To może potrwać chwilę.</string>
+  <string name="web_gui_creating_key">Generowanie kluczy. To może chwilę potrwać.</string>
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Pierwsze uruchomienie</string>
   <!--Text for dialog displayed on first start-->
   <string name="welcome_text">Witamy w Syncthing dla Androida!
 Ta aplikacja jest w fazie Alpha i mogą wystąpić błędy, problemy wydajnościowe albo utrata danych.
-Proszę o zgłaszanie wszelkich problemów na Github-ie.</string>
+Proszę o zgłaszanie wszelkich problemów na Githubie.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Ustawienia</string>
+  <string name="category_syncthing_android">Syncthing-Android</string>
   <!--Preference title-->
   <string name="always_run_in_background">Zawsze działaj w tle</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">Syncthing zawsze działa w tle zgodnie z ustawieniami poniżej.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Syncthing działa tylko, gdy jest ręcznie uruchomiony i może być zatrzymany z przycisku w menu.</string>
-  <string name="sync_only_charging">tylko, ładując</string>
-  <string name="sync_only_wifi">tylko na WiFi</string>
+  <string name="sync_only_charging">Synchronizuj tylko podczas ładowania</string>
+  <string name="sync_only_wifi">Synchronizuj tylko na WiFi</string>
+  <string name="advanced_folder_picker">Używaj zaawansowanego wybierania katalogów</string>
+  <string name="advanced_folder_picker_summary">Wybierz dowolny katalog do zsynchronizowania</string>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Ustawienia Syncthing</string>
+  <string name="device_name">Nazwa urządzenia</string>
+  <string name="listen_address">Adres nasłuchiwania protokołu</string>
   <string name="max_recv_kbps">Limit pobierania (KiB/s)</string>
   <string name="max_send_kbps">Limit wysyłania (KiB/s)</string>
-  <string name="global_announce_enabled">Globalny wyszukiwanie</string>
+  <string name="global_announce_enabled">Globalne wyszukiwanie</string>
   <string name="local_announce_enabled">Lokalne wyszukiwanie</string>
   <string name="upnp_enabled">Włącz UPnP</string>
+  <string name="global_announce_server">Serwer globalnego wyszukiwania</string>
+  <string name="usage_reporting">Anonimowe statystyki użycia</string>
   <string name="syncthing_gui">Syncthing GUI</string>
   <string name="gui_address">Adres GUI</string>
   <string name="gui_user">Urzytkownik GUI</string>
   <string name="gui_password">Hasło GUI</string>
   <string name="gui_https_enabled">Użyj HTTPS dla GUI</string>
+  <string name="export_config">Eksportuj konfigurację</string>
   <!--Toast shown after config was successfully exported-->
+  <string name="config_export_successful">Konfiguracja została zapisana w %1$s</string>
+  <string name="import_config">Importuj konfigurację</string>
   <!--Toast shown after config was successfully imported-->
+  <string name="config_imported_successful">Konfiguracja została zaimportowana pomyślnie</string>
   <!--Toast shown after config was successfully imported-->
+  <string name="config_import_failed">Wystąpił błąd podczas importowania, upewnij się że w %1$s są potrzebne pliki</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opcje debugowania</string>
+  <string name="category_about">O projekcie</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Zgłoś błąd</string>
   <!--Summary for the issue tracker settings item-->
@@ -157,14 +173,16 @@ Proszę o zgłaszanie wszelkich problemów na Github-ie.</string>
   <string name="app_version_title">Wersja Syncthing-Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
-  <string name="folder_picker_title">Folder Picker</string>
+  <string name="folder_picker_title">Wybieranie folderów</string>
   <!--Toast shown on devices with kitkat or higher-->
+  <string name="kitkat_external_storage_warning">Ostrzeżenie: Twoja wersja Androida nie pozwala na synchronizowanie zewnętrznych pamięci masowych</string>
   <!--ListView empty text-->
   <string name="directory_empty">Katalog jest pusty</string>
   <!--Menu item to create folder on the file system-->
   <string name="create_fs_folder">Nowy folder</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Wybierz folder</string>
+  <string name="create_folder_failed">Wystąpił błąd podczas tworzenia katalogu</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing jest wyłączone</string>
@@ -175,7 +193,7 @@ Proszę o zgłaszanie wszelkich problemów na Github-ie.</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
   <string name="exit">Wyjście</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
-  <string name="syncthing_active">Syncthing działa</string>
+  <string name="syncthing_active">Syncthing jest uruchomione</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
   <string name="restart_title">Wymagany restart</string>
@@ -184,12 +202,26 @@ Proszę o zgłaszanie wszelkich problemów na Github-ie.</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Restartuj później</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">ID urządzenia skopiowane do schowka</string>
+  <string name="device_id_copied_to_clipboard">ID urządzenia zostało skopiowane do schowka</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
+  <string-array name="file_size_units">
+    <item>B</item>
+    <item>KiB</item>
+    <item>MiB</item>
+    <item>GiB</item>
+    <item>TiB</item>
+  </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>b/s</item>
+    <item>Kib/s</item>
+    <item>Mib/s</item>
+    <item>Gib/s</item>
+    <item>Tib/s</item>
+  </string-array>
   <!--Possible folder states-->
   <string name="state_idle">Bezczynny</string>
-  <string name="state_scanning">Skanuje</string>
-  <string name="state_cleaning">Czyści</string>
-  <string name="state_syncing">Synchronizuje</string>
+  <string name="state_scanning">Skanowanie</string>
+  <string name="state_cleaning">Czyszczenie</string>
+  <string name="state_syncing">Synchronizowanie</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 518ba1b4..b472c572 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -72,7 +72,7 @@
   <!--Toast shown when trying to create a folder with an invalid ID-->
   <string name="folder_id_invalid">O ID da pasta deve ser um nome curto (64 caracteres ou menos) consistindo apenas em letras, números, ponto (.), hífen (-) ou underscore (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">O caminho da pasta não pode ser vazio</string>
+  <string name="folder_path_required">O caminho da pasta não pode ficar vazio</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
   <string name="no_devices">Conecte um dispositivo antes, por favor.</string>
   <!--DeviceSettingsFragment-->
@@ -86,6 +86,12 @@
   <string name="current_address">Endereço atual</string>
   <!--Setting title-->
   <string name="compression">Compressão</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Nunca</item>
+    <item>Metadadados</item>
+    <item>Sempre</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">Apresentador</string>
   <!--ActionBar item-->
@@ -101,7 +107,7 @@
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">O ID de dispositivo não pode ser vazio</string>
   <!--Toast shown when trying to create a device with an empty name-->
-  <string name="device_name_required">O nome do dispositivo não pode ser vazio</string>
+  <string name="device_name_required">O nome do dispositivo não pode ficar vazio</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Ler QR Code</string>
   <!--Text for toast shown if the "scan QR code" intent fails with an ActivityNotFoundException-->
@@ -123,14 +129,15 @@ Por favor, relate qualquer problema que ocorrer através do Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Configurações</string>
+  <string name="category_syncthing_android">Syncthing-Android</string>
   <!--Preference title-->
   <string name="always_run_in_background">Sempre rodar em segundo plano</string>
   <!--Preference summary in case it is enabled-->
   <string name="always_run_in_background_enabled">O Syncthing sempre rodará em segundo plano, de acordo com as preferências abaixo.</string>
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">O Syncthing sempre rodará quando iniciado manualmente e pode ser parado pelo botão de menu.</string>
-  <string name="sync_only_charging">Sincronizar somente enquanto o dispositivo estiver carregando</string>
-  <string name="sync_only_wifi">Sincronizar apenas em wifi</string>
+  <string name="sync_only_charging">Somente durante o carregamento</string>
+  <string name="sync_only_wifi">Somentr conectado ao WiFi</string>
   <string name="advanced_folder_picker">Usar seletor de pasta avançado</string>
   <string name="advanced_folder_picker_summary">Selecione qualquer pasta do dispositivo para sincronização</string>
   <string name="category_syncthing">Syncthing</string>
@@ -159,6 +166,7 @@ Por favor, relate qualquer problema que ocorrer através do Github.</string>
   <string name="config_import_failed">A importação falhou. Cheque se os arquivos estão em %1$s</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opções de depuração</string>
+  <string name="category_about">Sobre</string>
   <!--Settings item that opens issue tracker-->
   <string name="report_issue_title">Reportar incidente</string>
   <!--Summary for the issue tracker settings item-->
@@ -172,6 +180,7 @@ Por favor, relate qualquer problema que ocorrer através do Github.</string>
   <!--Activity title-->
   <string name="folder_picker_title">Seletor de pasta</string>
   <!--Toast shown on devices with kitkat or higher-->
+  <string name="kitkat_external_storage_warning">Aviso: a versão do seu Android não suporta sincronização de dispositivos externos de armazenamento</string>
   <!--ListView empty text-->
   <string name="directory_empty">A pasta está vazia</string>
   <!--Menu item to create folder on the file system-->
@@ -220,4 +229,5 @@ Por favor, relate qualquer problema que ocorrer através do Github.</string>
   <string name="state_scanning">Verificando</string>
   <string name="state_cleaning">Limpando</string>
   <string name="state_syncing">Sincronizando</string>
+  <string name="state_unknown">Desconhecido</string>
 </resources>
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index daa082fd..08d1ca0a 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -86,6 +86,7 @@
   <string name="current_address">Endereço actual</string>
   <!--Setting title-->
   <string name="compression">Compressão</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Apresentador</string>
   <!--ActionBar item-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index bfd2d560..85d9dc72 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -1,6 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
+  <string name="app_description">Открытая, надёжная и децентрализованная замена проприетарных сервисов.</string>
   <!--MainActivity-->
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Доб Папку</string>
@@ -69,6 +70,7 @@
   <!--Dialog shown when attempting to delete a folder-->
   <string name="delete_folder_confirm">Вы действительно хотите удалить папку?</string>
   <!--Toast shown when trying to create a folder with an invalid ID-->
+  <string name="folder_id_invalid">ID папки должен быть коротким идентификатором (64 символов или меньше) состоящий из букв, цифр и символов точки (.), тире(-) и подчеркивания (_).</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Путь к папке не может быть пустым</string>
   <!--Toast shown when selecting 'devices' if no devices have been added-->
@@ -84,7 +86,14 @@
   <string name="current_address">Текущий Адрес</string>
   <!--Setting title-->
   <string name="compression">Сжатие</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>Никогда</item>
+    <item>Метаданные</item>
+    <item>Всегда</item>
+  </string-array>
   <!--Setting title-->
+  <string name="introducer">Интродюсер</string>
   <!--ActionBar item-->
   <string name="delete_device">Удалить Устройство</string>
   <!--Title for DeviceSettingsFragment in create mode-->
@@ -114,6 +123,9 @@
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Первый Запуск</string>
   <!--Text for dialog displayed on first start-->
+  <string name="welcome_text">Добро пожаловать в Syncthing для Android!\n\n\
+Приложение сейчас находится в альфа версии, и вы можете столкнуться с недоработками, проблемами производительности и потерей данных.\n\n\
+Пожалуйста сообщайте о проблемах через Github.</string>
   <!--SettingsFragment-->
   <!--Activity title-->
   <string name="settings_title">Настройки</string>
@@ -126,30 +138,39 @@
   <string name="always_run_in_background_disabled">Syncthing работает только когда запущен специально и может быть остановлен кнопкой в меню.</string>
   <string name="sync_only_charging">Синхронизация только во время зарядки</string>
   <string name="sync_only_wifi">Синхронизация только по WIFI</string>
+  <string name="advanced_folder_picker">Использовать продвинутый выбор папок</string>
   <string name="advanced_folder_picker_summary">Выберите любую папку на устройстве для синхронизации</string>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Настройки Syncthing</string>
-  <string name="device_name">Имя устройства</string>
-  <string name="max_recv_kbps">Лимит скачивания (KiB/s)</string>
-  <string name="max_send_kbps">Лимит загрузки (KiB/s)</string>
+  <string name="device_name">Имя Устройства</string>
+  <string name="listen_address">Адрес Ожидания Протокола Синхронизации</string>
+  <string name="max_recv_kbps">Лимит Скачивания (КБ/с)</string>
+  <string name="max_send_kbps">Лимит Загрузки (КБ/с)</string>
+  <string name="global_announce_enabled">Глобальное Обнаружение</string>
+  <string name="local_announce_enabled">Локальное Обнаружение</string>
   <string name="upnp_enabled">Включить UPnP</string>
-  <string name="usage_reporting">Анонимные отчёты использования</string>
+  <string name="global_announce_server">Сервер Глобального Обнаружения</string>
+  <string name="usage_reporting">Анонимные Отчёты Использования</string>
   <string name="syncthing_gui">Syncthing GUI</string>
+  <string name="gui_address">Адрес Ожидания GUI</string>
+  <string name="gui_user">Пользователь Идентификации GUI</string>
+  <string name="gui_password">Пароль Идентификации GUI</string>
   <string name="gui_https_enabled">Использовать HTTPS для GUI</string>
-  <string name="export_config">Экспортировать конфигурацию</string>
+  <string name="export_config">Экспортировать Конфигурацию</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">Конфигурация экспортирована в %1$s</string>
-  <string name="import_config">Импортировать конфигурацию</string>
+  <string name="import_config">Импортировать Конфигурацию</string>
   <!--Toast shown after config was successfully imported-->
   <string name="config_imported_successful">Конфигурация импортирована</string>
   <!--Toast shown after config was successfully imported-->
   <string name="config_import_failed">Неудачное импортирование конфигурации, убедитесь что файлы находятся в %1$s</string>
   <!--Title for the preference to set STTRACE parameters-->
-  <string name="sttrace_title">Опции отладки</string>
+  <string name="sttrace_title">Опции Отладки</string>
   <string name="category_about">Информация</string>
   <!--Settings item that opens issue tracker-->
-  <string name="report_issue_title">Сообщить о проблеме</string>
+  <string name="report_issue_title">Сообщить о Проблеме</string>
   <!--Summary for the issue tracker settings item-->
+  <string name="report_issue_summary">Открыть трекер проблем Syncthing-Android </string>
   <!--URL of the issue tracker-->
   <!--Title of the preference showing upstream version name-->
   <string name="syncthing_version_title">Версия Syncthing</string>
@@ -166,10 +187,12 @@
   <string name="create_fs_folder">Создать новую папку</string>
   <!--Menu item to select the current folder-->
   <string name="select_folder">Выбрать Папку</string>
+  <string name="create_folder_failed">Неудачное создание папки</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing выключен</string>
   <!--Message of the "syncthing disabled" dialog-->
+  <string name="syncthing_disabled_message">Вы хотите изменить ваши настройки?</string>
   <!--Button text on the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_change_settings">Изменить Настройки</string>
   <!--Button text on the "syncthing disabled" dialog, used as menu item to stop syncthing service if "always_run_in_background" is true-->
@@ -178,15 +201,33 @@
   <string name="syncthing_active">Syncthing запущен</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
-  <string name="restart_title">Необходим перезапуск</string>
+  <string name="restart_title">Необходим Перезапуск</string>
   <!--Text of the notification shown when a restart is needed-->
+  <string name="restart_notification_text">Нажмите здесь чтобы перезагрузить syncthing</string>
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Позже</string>
   <!--Shown when a device ID is copied to the clipboard-->
+  <string name="device_id_copied_to_clipboard">ID устройства копирован в буфер обмена</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
+  <string-array name="file_size_units">
+    <item>Б</item>
+    <item>КБ</item>
+    <item>МБ</item>
+    <item>ГБ</item>
+    <item>ТБ</item>
+  </string-array>
   <!--Strings representing units for transfer rates, from smallest to largest-->
+  <string-array name="transfer_rate_units">
+    <item>б/с</item>
+    <item>Кб/с</item>
+    <item>Мб/с</item>
+    <item>Гб/с</item>
+    <item>Тб/с</item>
+  </string-array>
   <!--Possible folder states-->
+  <string name="state_idle">Бездействие</string>
   <string name="state_scanning">Сканирование</string>
   <string name="state_cleaning">Очистка</string>
   <string name="state_syncing">Синхронизация</string>
+  <string name="state_unknown">Неизвестно</string>
 </resources>
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-sr/strings.xml b/src/main/res/values-sr/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-sr/strings.xml
+++ b/src/main/res/values-sr/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 83541918..c5350abc 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -31,7 +31,6 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
-  <!--Setting title-->
   <!--Title for FolderSettingsFragment in create mode-->
   <!--Title for FolderSettingsFragment in edit mode-->
   <!--Menu item to confirm folder creation-->
@@ -45,6 +44,7 @@
   <!--Setting title-->
   <!--Setting title-->
   <!--Setting title-->
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <!--ActionBar item-->
   <!--Title for DeviceSettingsFragment in create mode-->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 736d928a..b6eda0db 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -86,6 +86,7 @@
   <string name="current_address">Geçerli Adres</string>
   <!--Setting title-->
   <string name="compression">Sıkıştırma</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">Tanıtıcı</string>
   <!--ActionBar item-->
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index d4a73d41..1b39501a 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -86,6 +86,12 @@
   <string name="current_address">当前地址</string>
   <!--Setting title-->
   <string name="compression">压缩</string>
+  <!--Strings representing compression options-->
+  <string-array name="compress_entries">
+    <item>从不</item>
+    <item>元数据</item>
+    <item>总是</item>
+  </string-array>
   <!--Setting title-->
   <string name="introducer">介绍人</string>
   <!--ActionBar item-->
@@ -223,4 +229,5 @@
   <string name="state_scanning">正在扫描</string>
   <string name="state_cleaning">正在清理</string>
   <string name="state_syncing">正在同步</string>
+  <string name="state_unknown">未知</string>
 </resources>
diff --git a/src/main/res/values-zh-rTW/strings.xml b/src/main/res/values-zh-rTW/strings.xml
index e30744e3..08bbc4a7 100644
--- a/src/main/res/values-zh-rTW/strings.xml
+++ b/src/main/res/values-zh-rTW/strings.xml
@@ -85,6 +85,7 @@
   <string name="current_address">目前位址</string>
   <!--Setting title-->
   <string name="compression">壓縮</string>
+  <!--Strings representing compression options-->
   <!--Setting title-->
   <string name="introducer">引入者</string>
   <!--ActionBar item-->