diff --git a/src/fat/play/es-ES/listing/fulldescription b/src/fat/play/es-ES/listing/fulldescription
index 567846b0..b42a8b2e 100644
--- a/src/fat/play/es-ES/listing/fulldescription
+++ b/src/fat/play/es-ES/listing/fulldescription
@@ -4,6 +4,6 @@ Página web: https://syncthing.net/
 
 Código fuente: https://github.com/syncthing/syncthing-android
 
-Forum: https://forum.syncthing.net/
+Foro: https://forum.syncthing.net/
 
 Problemas: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/es-ES/listing/shortdescription b/src/fat/play/es-ES/listing/shortdescription
index 2020025b..4fa1526b 100644
--- a/src/fat/play/es-ES/listing/shortdescription
+++ b/src/fat/play/es-ES/listing/shortdescription
@@ -1 +1 @@
-Open, trustworthy and decentralized file synchronization
\ No newline at end of file
+Sincronización de ficheros abierta, de confianza y descentralizada
\ No newline at end of file
diff --git a/src/fat/play/nl-NL/listing/fulldescription b/src/fat/play/nl-NL/listing/fulldescription
index ded3e1f9..982e632f 100644
--- a/src/fat/play/nl-NL/listing/fulldescription
+++ b/src/fat/play/nl-NL/listing/fulldescription
@@ -1,4 +1,4 @@
-Syncthing vervangt propriëtaire synchronisatie- en cloud-diensten door iets open, betrouwbaars en gedecentraliseerds. Jouw informatie behoort enkel tot jezelf, dus jij bepaalt waar ze wordt opgeslagen, of ze gedeeld wordt met derden en hoe ze verzonden worden via het internet.
+Syncthing is het alternatief voor twijfelachtige synchronisatiediensten. Informaties behoren tot jezelf; jij bepaalt waar al dan niet delend met derden het wordt opgeslagen en hoe alles via het internet spiegelt.
 
 Website: https://syncthing.net/
 
diff --git a/src/fat/play/nl-NL/listing/shortdescription b/src/fat/play/nl-NL/listing/shortdescription
index 0f9b831a..029daf5e 100644
--- a/src/fat/play/nl-NL/listing/shortdescription
+++ b/src/fat/play/nl-NL/listing/shortdescription
@@ -1 +1 @@
-Open, betrouwbare en gedecentraliseerde bestandssynchronisatie
\ No newline at end of file
+Open bestandssynchronisatie: betrouwbaar en decentraal
\ No newline at end of file
diff --git a/src/fat/play/pl-PL/listing/fulldescription b/src/fat/play/pl-PL/listing/fulldescription
index 148a8bca..0fa1e191 100644
--- a/src/fat/play/pl-PL/listing/fulldescription
+++ b/src/fat/play/pl-PL/listing/fulldescription
@@ -1,9 +1,9 @@
-Syncthing zastępuje własnościowe usługi synchronizacyjne i chmury czymś otwartym, godnym zaufania, zdecentralizowanym. Twoje dane są tylko i wyłącznie Twoimi i zasługujesz by wybrać gdzie są magazynowane, czy są udostępniane osobom trzecim i jak są przesyłane poprzez Internet.
+Syncthing zastępuje własnościowe usługi synchronizacyjne i chmury czymś otwartym, godnym zaufania, zdecentralizowanym. Twoje dane są tylko i wyłącznie Twoimi i zasługujesz, aby wybrać gdzie są magazynowane, udostępniane osobom trzecim i jak są przesyłane poprzez Internet.
 
-Strona: https://syncthing.net/
+Strona internetowa: https://syncthing.net/
 
 Kod źródłowy: https://github.com/syncthing/syncthing-android
 
-Forum: https://discourse.syncthing.net/
+Forum: https://forum.syncthing.net/
 
 Problemy: https://github.com/syncthing/syncthing-android/issues
\ No newline at end of file
diff --git a/src/fat/play/pl-PL/listing/shortdescription b/src/fat/play/pl-PL/listing/shortdescription
index ee2a8d0d..6232b790 100644
--- a/src/fat/play/pl-PL/listing/shortdescription
+++ b/src/fat/play/pl-PL/listing/shortdescription
@@ -1 +1 @@
-Zastępuje własnościowe serwisy czymś otwartym, zaufanym i zdecentralizowanym.
\ No newline at end of file
+Otwarty, godny zaufania i zdecentralizowany program do synchronizowania plików.
\ No newline at end of file
diff --git a/src/main/res/values-bg/strings.xml b/src/main/res/values-bg/strings.xml
index 42c26a0f..e19265fa 100644
--- a/src/main/res/values-bg/strings.xml
+++ b/src/main/res/values-bg/strings.xml
@@ -176,7 +176,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Настройки за дебъгване</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">В настройките на STTRACE са разрешени само символите a-z и \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Нулиране на базата данни</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-cs/strings.xml b/src/main/res/values-cs/strings.xml
index 056f8c88..611c2256 100644
--- a/src/main/res/values-cs/strings.xml
+++ b/src/main/res/values-cs/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Možnosti ladění</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">V STTRACE jsou povoleny pouze znaky a-z a \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Resetovat databázi</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-de/strings.xml b/src/main/res/values-de/strings.xml
index a831c20f..bcefb2d3 100644
--- a/src/main/res/values-de/strings.xml
+++ b/src/main/res/values-de/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Fehlersuchoptionen</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Nur a-z und \',\' sind in STTRACE Optionen errlaubt</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Datenbank zurücksetzen</string>
   <!--Syncthing was reset-->
@@ -293,4 +292,5 @@
   <string name="state_unknown">Unbekannt</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>
 </resources>
diff --git a/src/main/res/values-el/strings.xml b/src/main/res/values-el/strings.xml
index 9d04cbad..3c6c532b 100644
--- a/src/main/res/values-el/strings.xml
+++ b/src/main/res/values-el/strings.xml
@@ -1,12 +1,17 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
+  <string name="app_description">Μια ανοιχτή, αξιόπιστη και αποκεντρωμένη εφαρμογή συγχρονισμού αρχείων.</string>
   <!--FirstStartActivity-->
   <!--Title for dialog displayed on first start-->
+  <string name="welcome_title">Καλώς ορίσατε στο Syncthing για Android</string>
   <!--Text for dialog displayed on first start-->
+  <string name="cont">Συνέχεια</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
+  <string name="web_gui_loading">Αναμονή για το GUI</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
+  <string name="web_gui_creating_key">Δημιουργούνται τα κλειδιά κρυπτογράφησης. Αυτή η διαδικασία μπορεί να διαρκέσει μερικά λεπτά.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Προσθήκη φακέλου</string>
   <!--Title of the "share device id" menu action-->
@@ -14,6 +19,16 @@
   <!--Shown in the chooser dialog when sharing a Device ID-->
   <string name="send_device_id_to">Αποστολή ID συσκευής στο</string>
   <!--Text for FoldersFragment and DevicesFragment loading view-->
+  <string name="api_loading">Φόρτωση...</string>
+  <string name="usage_reporting_dialog_title">Να επιτραπεί η ανώνυμη αναφορά δεδομένων χρήσης;</string>
+  <string name="usage_reporting_dialog_description">Η κρυπτογραφημένη αναφορά χρήσης αποστέλλεται καθημερινά. Χρησιμοποιείται για την καταγραφή πλατφορμών, μεγεθών φακέλων και εκδόσεων της εφαρμογής. Αν υπάρξει κάποια μεταβολή στο σύνολο δεδομένων που συλλέγονται, θα ειδοποιηθείτε και πάλι με αυτό το παράθυρο.\n\nΤα ομαδοποιημένα στατιστικά στοιχεία είναι ελεύθερα προσβάσιμα στο https://data.syncthing.net.</string>
+  <string name="yes">Ναι</string>
+  <string name="no">Όχι</string>
+  <string name="off">απενεργοποιημένο</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>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Φάκελοι</string>
   <!--Shown if no folders exist-->
@@ -40,94 +55,243 @@
   <!--Same as upload_title with a colon and space appended-->
   <string name="upload_title_colon">Ανέβασμα:\u0020</string>
   <!--Title for current CPU usage-->
+  <string name="cpu_usage">Χρήση CPU</string>
   <!--Title for current RAM usage-->
+  <string name="ram_usage">Χρήση RAM</string>
   <!--Title for announce server status-->
+  <string name="announce_server">Διακομιστής ανακοίνωσης</string>
+  <string name="restart">Επανεκκίνηση</string>
+  <string name="dialog_confirm_restart">Επιθυμείτε να επανεκκινήσετε το Syncthing;</string>
   <!--FolderFragment-->
   <!--Setting title-->
+  <string name="folder_id">ID φακέλου</string>
   <!--Setting title-->
+  <string name="folder_label">Ετικέτα φακέλου</string>
   <!--Setting title-->
+  <string name="directory">Κατάλογος</string>
   <!--Setting title-->
+  <string name="folder_master">Βασικός κόμβος φακέλου</string>
   <!--Setting title-->
   <string name="devices">Συσκευές</string>
   <!--Setting title-->
+  <string name="keep_versions">Τήρηση εκδόσεων</string>
   <!--Setting title-->
+  <string name="delete_folder">Διαγραφή φακέλου</string>
   <!--Title for FolderSettingsFragment in create mode-->
+  <string name="create_folder">Δημιουργία φακέλου</string>
   <!--Title for FolderSettingsFragment in edit mode-->
+  <string name="edit_folder">Επεξεργασία φακέλου</string>
   <!--Menu item to confirm folder creation-->
+  <string name="create">Δημιουργία</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">Σίγουρα επιθυμείτε να αφαιρέσετε αυτόν τον φάκελο από το Syncthing;</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
+  <string name="folder_id_required">Το ID του φακέλου δεν μπορεί να είναι κενό</string>
   <!--Toast shown when trying to create a folder with an empty path-->
+  <string name="folder_path_required">Το μονοπάτι του φακέλου δεν μπορεί να είναι κενό</string>
+  <string name="dialog_discard_changes">Να απορριφθούν οι αλλαγές που κάνατε;</string>
   <!--DeviceFragment-->
   <!--Setting title-->
+  <string name="device_id">ID συσκευής</string>
   <!--Setting title-->
+  <string name="name">Όνομα</string>
   <!--Setting title-->
+  <string name="addresses">Διευθύνσεις</string>
   <!--Setting title-->
+  <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>
+  <string name="add_device">Προσθήκη συσκευής</string>
   <!--Menu item to confirm adding a device-->
+  <string name="add">Προσθήκη</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
+  <string name="edit_device">Επεξεργασία συσκευής</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">Σίγουρα επιθυμείτε να αφαιρέσετε αυτή την συσκευή;</string>
   <!--Toast shown when trying to create a device with an empty ID-->
+  <string name="device_id_required">Το ID της συσκευής δεν μπορεί να είναι κενό</string>
   <!--Content description for device ID qr code icon-->
+  <string name="scan_qr_code_description">Σάρωση κωδικού QR</string>
   <!--Toast show if we could not get root permissions-->
+  <string name="toast_root_denied">Δεν ήταν δυνατή η απόκτηση δικαιωμάτων root</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
+  <string name="web_gui_title">Web GUI</string>
   <!--SettingsFragment-->
   <!--Activity title-->
+  <string name="settings_title">Ρυθμίσεις</string>
+  <string name="category_syncthing_android">Syncthing-Android</string>
   <!--Preference title-->
+  <string name="always_run_in_background">Να εκτελείται πάντα στο παρασκήνιο</string>
   <!--Preference summary in case it is enabled-->
+  <string name="always_run_in_background_enabled">Το Syncthing θα εκτελείται πάντα στο παρασκήνιο βάσει των παρακάτω ρυθμίσεων.</string>
   <!--Preference summary in case it is disabled-->
+  <string name="always_run_in_background_disabled">Το Syncthing θα εκτελείται μόνο αν εκκινηθεί από τον χρήστη και μπορεί να τερματιστεί από το κουμπί του μενού.</string>
+  <string name="sync_only_charging">Συγχρονισμός μόνο κατά τη φόρτιση.</string>
+  <string name="sync_only_wifi">Συγχρονισμός μόνο μέσω WiFi</string>
+  <string name="sync_only_wifi_ssids">Περιορισμός σε συγκεκριμένα δίκτυα WiFi</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Παρακαλώ ενεργοποιήστε το WiFi για να επιλέξετε δίκτυα.</string>
+  <string name="advanced_folder_picker">Χρήση προχωρημένου επιλογέα φακέλων</string>
+  <string name="advanced_folder_picker_summary">Επιλογή οποιουδήποτε φακέλου στη συσκευή για συγχρονισμό</string>
+  <string name="use_root_title">Εκτέλεση του Syncthing ως υπερχρήστης</string>
+  <string name="use_root_summary">Πρόκειται για μια πειραματική λειτουργία η οποία ενδέχεται να προκαλέσει προβλήματα στο Syncthing και τη συσκευή σας. Σε αυτή την περίπτωση, ίσως χρειαστεί να επανεγκαταστήσετε το Syncthing.</string>
+  <string name="notification_type_title">Ειδοποίηση</string>
+  <string name="notification_type_summary">Επιλέξτε τον τύπο ειδοποίησης</string>
+  <string-array name="notification_type_entries">
+    <item>Κανονική</item>
+    <item>Χαμηλής προτεραιότητας</item>
+    <item>Καμία</item>
+  </string-array>
   <string name="category_syncthing">Syncthing</string>
+  <string name="syncthing_options">Επιλογές Syncthing</string>
+  <string name="device_name">Όνομα συσκευής</string>
+  <string name="listen_address">Διευθύνσεις ακρόασης πρωτοκόλλου συγχρονισμού</string>
+  <string name="max_recv_kbps">Περιορισμός ταχύτητας λήψης (KiB/s)</string>
+  <string name="max_send_kbps">Περιορισμός ταχύτητας αποστολής (KiB/s)</string>
+  <string name="global_announce_enabled">Καθολική ανεύρεση</string>
+  <string name="local_announce_enabled">Τοπική ανεύρεση</string>
+  <string name="enable_nat_traversal">Ενεργοποίηση διάσχισης NAT</string>
+  <string name="global_announce_server">Διακομιστής καθολικής ανεύρεσης κόμβων</string>
+  <string name="enable_relaying">Ενεργοποίηση αναμετάδοσης</string>
+  <string name="usage_reporting">Ανώνυμη αναφορά δεδομένων χρήσης</string>
+  <string name="syncthing_gui">GUI του Syncthing</string>
+  <string name="gui_address">Διευθύνσεις ακρόασης του GUI</string>
+  <string name="gui_user">Όνομα χρήστη του GUI</string>
+  <string name="gui_password">Κωδικός πρόσβασης του GUI</string>
+  <string name="export_config">Εξαγωγή ρυθμίσεων</string>
+  <string name="experimental_settings">Πειραματικά</string>
+  <string name="keep_wakelock_while_binary_running">Διατήρηση της CPU σε ενεργό κατάσταση όσο εκτελείται το Syncthing</string>
+  <string name="keep_wakelock_while_binary_running_summary">Χρησιμοποιήστε αυτή την επιλογή αν παρατηρείτε απρόσμενες αποσυνδέσεις κατά τη λειτουργία με μπαταρία. Θα έχει ως συνέπεια την υψηλότερη κατανάλωση ενέργειας.</string>
+  <string name="run_as_foreground_service">Εκτέλεση της υπηρεσίας με προτεραιότητα προσκηνίου.</string>
+  <string name="run_as_foreground_service_summary">Εφόσον ενεργοποιηθεί, το Syncthing θα εκτελείται με προτεραιότητα προσκηνίου και λιγότερες πιθανότητες να τερματιστεί από το Android. Ενδέχεται να τερματίζονται άλλες υπηρεσίες όταν θα εξαντλείται η διαθέσιμη μνήμη. Το Android επιβάλλει να εμφανίζεται μια ειδοποίηση χαμηλής προτεραιότητας, ανεξάρτητα από την επιλογή της ρύθμισης \"Ειδοποίηση\".</string>
+  <string name="use_tor_title">Χρήση του Tor</string>
+  <string name="use_tor_summary">Αναγκαστική δρομολόγηση όλης της κίνησης δεδομένων μέσω του Tor για αυξημένη ιδιωτικότητα. Προαπαιτεί το Orbot</string>
   <!--Dialog shown before config export-->
+  <string name="dialog_confirm_export">Σίγουρα επιθυμείτε να εξάγετε τις ρυθμίσεις σας; Τυχόν υπάρχοντα αρχεία θα διαγραφούν.\n\nΠΡΟΣΟΧΗ! Οι άλλες εφαρμογές ενδέχεται να μπορούν να διαβάσουν το ιδιωτικό κλειδί από την τοποθεσία του αντιγράφου ασφαλείας και να το χρησιμοποιήσουν για τη λήψη/τροποποίηση των συγχρονισμένων αρχείων.</string>
   <!--Dialog shown before config import-->
+  <string name="dialog_confirm_import">Σίγουρα επιθυμείτε να εισάγετε τις νέες ρυθμίσεις; Τυχόν υπάρχοντα αρχεία θα διαγραφούν.</string>
   <!--Toast shown after config was successfully exported-->
+  <string name="config_export_successful">Οι ρυθμίσεις εξήχθησαν στο %1$s</string>
+  <string name="import_config">Εισαγωγή ρυθμίσεων</string>
   <!--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>
   <!--Toast after entering invalid STTRACE params-->
   <!--Title for the preference to reset Syncthing indexes-->
+  <string name="streset_title">Επαναφορά βάσης δεδομένων</string>
   <!--Syncthing was reset-->
+  <string name="streset_question">Αυτή η ενέργεια πρέπει να εκτελείται μόνο κατόπιν προτροπής από την ομάδα υποστήριξης μας.
+\nΣίγουρα επιθυμείτε να διαγράψετε τη βάση δεδομένων ευρετηρίων του Syncthing;
+</string>
   <!--Syncthing was reset-->
+  <string name="streset_done">Η επαναφορά της βάσης δεδομένων του Syncthing ήταν επιτυχής</string>
+  <string name="category_about">Σχετικά με το Syncthing</string>
   <!--Settings item that opens the log activity-->
+  <string name="open_log">Άνοιγμα καταγραφής συμβάντων</string>
   <!--Summary for the log activity-->
+  <string name="open_log_summary">Άνοιγμα του παραθύρου καταγραφής συμβάντων του Syncthing και Android</string>
   <!--Settings item that opens issue tracker-->
+  <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-->
   <!--Menu item to donate-->
+  <string name="donate_title">Κάνετε δωρεά</string>
+  <string name="donate_summary">Βοηθήστε μας να πληρώσουμε τα έξοδα των domain και της φιλοξενίας ιστοσελίδας</string>
   <!--Title of the preference showing upstream version name-->
+  <string name="syncthing_version_title">Έκδοση Syncthing</string>
   <!--Title of the preference showing this app's version name-->
+  <string name="app_version_title">Έκδοσης Syncthing-Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
+  <string name="folder_picker_title">Επιλογέας φακέλων</string>
   <!--Toast shown on devices with kitkat or higher-->
+  <string name="kitkat_external_storage_warning">Προσοχή: η έκδοση του Android σας δεν επιτρέπει τον συγχρονισμό προς εξωτερικές συσκευές αποθήκευσης</string>
   <!--ListView empty text-->
+  <string name="directory_empty">Ο φάκελος είναι κενός</string>
   <!--Menu item to create folder on the file system-->
+  <string name="create_fs_folder">Δημιουργία νέου φακέλου</string>
   <!--Menu item to select the current folder-->
+  <string name="select_folder">Επιλογή φακέλου</string>
+  <string name="create_folder_failed">Η δημιουργία φακέλου απέτυχε</string>
   <!--LogActivity-->
   <!--Title of the "log" activity-->
+  <string name="log_title">Καταγραφή συμβάντων</string>
   <!--Title of the "log android" menu button-->
+  <string name="log_android_title">Εμφάνιση καταγραφής Android</string>
   <!--Title of the "log Syncthing" menu button-->
+  <string name="log_syncthing_title">Εμφάνιση καταγραφής Syncthing</string>
+  <string name="retrieving_logs">Ανάκτηση καταγραφών...</string>
   <!--Title of the "share log" menu button-->
+  <string name="share_title">Κοινή χρήση</string>
   <!--SyncthingService-->
   <!--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-->
+  <string name="exit">Έξοδος</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
+  <string name="syncthing_active">Το Syncthing εκτελείται</string>
+  <string name="syncthing_active_foreground">Η υπηρεσία εκτελείται με προτεραιότητα προσκηνίου</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
+  <string name="toast_folder_observer_stack_overflow">Η ιεραρχία των φακέλων έχει υπερβολικό βάθος. Ελέγξτε αν υπάρχουν κυκλικοί συμβολικοί σύνδεσμοι</string>
   <!--Toast shown if syncthing failed to create a config-->
+  <string name="config_create_failed">Η δημιουργία των ρυθμίσεων του Syncthing απέτυχε. Παρακαλώ ελέγξτε την καταγραφή συμβάντων.</string>
   <!--Label of the default folder created of first start (camera folder).-->
+  <string name="default_folder_label">Φωτογραφική μηχανή</string>
   <!--ID of the default folder created on first start (camera folder). Must only contain 'a-z0-9_-'. Parameter is the device name-->
+  <string name="default_folder_id">%1$s-photos</string>
   <!--RestApi-->
   <!--Title of the notification shown when a restart is needed-->
+  <string name="restart_title">Απαιτείται επανεκκίνηση</string>
   <!--Text for positive button in restart dialog-->
+  <string name="restart_now">Επανεκκίνηση τώρα</string>
   <!--Text for the dismiss button of the restart Activity-->
+  <string name="restart_later">Αργότερα</string>
   <!--Text of the notification shown when a restart is needed-->
+  <string name="restart_notification_text">Πατήστε εδώ για να επανεκκινήσετε τώρα το Syncthing</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>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_syncing">Συγχρονίζοντας (%1$d%%)</string>
+  <string name="state_idle">Αδρανής</string>
+  <string name="state_scanning">Σάρωση</string>
+  <string name="state_cleaning">Εκκαθάριση</string>
+  <string name="state_syncing">Συγχρονισμός (%1$d%%)</string>
+  <string name="state_error">Σφάλμα</string>
+  <string name="state_unknown">Άγνωστο</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 δεν υποστηρίζεται όταν έχει ενεργοποιηθεί η εκτέλεση στο παρασκήνιο.</string>
 </resources>
diff --git a/src/main/res/values-es-rMX/strings.xml b/src/main/res/values-es-rMX/strings.xml
index ad03a825..c5f2090c 100644
--- a/src/main/res/values-es-rMX/strings.xml
+++ b/src/main/res/values-es-rMX/strings.xml
@@ -179,7 +179,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opciones de depuración</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Sólo (a-z) y (\',\') están permitidos en las opciones de STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reiniciar Base de Datos</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-es/strings.xml b/src/main/res/values-es/strings.xml
index 5f7736e6..74d06033 100644
--- a/src/main/res/values-es/strings.xml
+++ b/src/main/res/values-es/strings.xml
@@ -6,11 +6,12 @@
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Bienvenido a Syncthing para Android</string>
   <!--Text for dialog displayed on first start-->
+  <string name="cont">Continuar</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
-  <string name="web_gui_loading">Esperando la interfaz gráfica</string>
+  <string name="web_gui_loading">Esperando a la interfaz gráfica</string>
   <!--Shown instead of web_gui_loading if the key does not exist and has to be created-->
-  <string name="web_gui_creating_key">Generando llaves seguras. Esto puede tomar un tiempo.</string>
+  <string name="web_gui_creating_key">Generando claves seguras. Esto puede llevar algún tiempo.</string>
   <!--Title of the "add folder" menu action-->
   <string name="add_folder">Añadir carpeta</string>
   <!--Title of the "share device id" menu action-->
@@ -20,24 +21,26 @@
   <!--Text for FoldersFragment and DevicesFragment loading view-->
   <string name="api_loading">Cargando...</string>
   <string name="usage_reporting_dialog_title">¿Permitir informes anónimos de uso?</string>
-  <string name="usage_reporting_dialog_description">El informe cifrado de uso se manda a diario. Se utilitza para monitorizar las plataformas más comunes, el tamaño de las carpetas y las versiones de la aplicación. Si el conjunto de datos del informe es modificado serás notificado de nuevo con este mensaje.\n\nLas estadísticas globales están disponibles públicamente en https://data.syncthing.net.</string>
+  <string name="usage_reporting_dialog_description">El informe cifrado de uso se manda a diario. Se utiliza para monitorizar las plataformas más comunes, el tamaño de las carpetas y las versiones de la aplicación. Si se modifica el conjunto de datos del informe se te presentará de nuevo este mensaje.\n\nLas estadísticas globales están disponibles públicamente en https://data.syncthing.net.</string>
   <string name="yes">Sí</string>
   <string name="no">No</string>
   <string name="off">apagar</string>
   <string name="open_website">Sitio abierto</string>
-  <string name="toast_write_storage_permission_required">Hace falta permiso de escritura a disco para esta app.</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>
   <!--FoldersFragment-->
   <string name="folders_fragment_title">Carpetas</string>
   <!--Shown if no folders exist-->
   <string name="folder_list_empty">No se encontraron carpetas</string>
   <!--Format string for folder file count-->
-  <string name="files">%1$d / %2$d Archivos</string>
+  <string name="files">%1$d / %2$d archivos</string>
   <!--DevicesFragment-->
   <string name="devices_fragment_title">Dispositivos</string>
   <!--Shown if no devices exist-->
   <string name="devices_list_empty">No se encontraron dispositivos</string>
   <!--Indicates that a folder is fully synced to the local device-->
-  <string name="device_up_to_date">Al día</string>
+  <string name="device_up_to_date">Actualizado</string>
   <!--Indicates that the device is currently syncing. Parameter is sync percentage-->
   <string name="device_syncing">Sincronizando (%1$d%%)</string>
   <!--Indicates that there is no connection to the device-->
@@ -45,50 +48,55 @@
   <!--Title for current download rate-->
   <string name="download_title">Descarga</string>
   <!--Title for current upload rate-->
-  <string name="upload_title">Subir</string>
+  <string name="upload_title">Subida</string>
   <!--DrawerFragment-->
   <!--Same as download_title with a colon and space appended-->
   <string name="download_title_colon">Descarga:\u0020</string>
   <!--Same as upload_title with a colon and space appended-->
-  <string name="upload_title_colon">Subir:\u0020</string>
+  <string name="upload_title_colon">Subida:\u0020</string>
   <!--Title for current CPU usage-->
   <string name="cpu_usage">Uso de CPU</string>
   <!--Title for current RAM usage-->
   <string name="ram_usage">Uso de RAM</string>
   <!--Title for announce server status-->
-  <string name="announce_server">Servidor de Anuncio</string>
+  <string name="announce_server">Servidor de anuncio</string>
+  <string name="restart">Reiniciar</string>
+  <string name="dialog_confirm_restart">¿Quieres reiniciar Syncthing?</string>
   <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">ID de carpeta</string>
   <!--Setting title-->
+  <string name="folder_label">Etiqueta de carpeta</string>
   <!--Setting title-->
   <string name="directory">Directorio</string>
   <!--Setting title-->
-  <string name="folder_master">Carpeta Maestra</string>
+  <string name="folder_master">Carpeta maestra</string>
   <!--Setting title-->
   <string name="devices">Dispositivos</string>
   <!--Setting title-->
-  <string name="keep_versions">Versiones a Mantener</string>
+  <string name="keep_versions">Versiones a mantener</string>
   <!--Setting title-->
-  <string name="delete_folder">Eliminar Carpeta</string>
+  <string name="delete_folder">Eliminar carpeta</string>
   <!--Title for FolderSettingsFragment in create mode-->
-  <string name="create_folder">Crear Carpeta</string>
+  <string name="create_folder">Crear carpeta</string>
   <!--Title for FolderSettingsFragment in edit mode-->
-  <string name="edit_folder">Editar Carpeta</string>
+  <string name="edit_folder">Editar carpeta</string>
   <!--Menu item to confirm folder creation-->
   <string name="create">Crear</string>
   <!--Dialog shown when attempting to remove a folder-->
+  <string name="remove_folder_confirm">¿Realmente quieres excluir esta carpeta de Syncthing?</string>
   <!--Toast shown when trying to create a folder with an empty ID-->
   <string name="folder_id_required">El ID de carpeta no debe estar vacío</string>
   <!--Toast shown when trying to create a folder with an empty path-->
-  <string name="folder_path_required">La ruta a la carpeta no puede estar vacia</string>
+  <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>
   <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">ID del dispositivo</string>
   <!--Setting title-->
   <string name="name">Nombre</string>
   <!--Setting title-->
-  <string name="addresses">Dirección</string>
+  <string name="addresses">Direcciones</string>
   <!--Setting title-->
   <string name="current_address">Dirección actual</string>
   <!--Setting title-->
@@ -109,12 +117,13 @@
   <!--Title for DeviceSettingsFragment in edit mode-->
   <string name="edit_device">Editar dispositivo</string>
   <!--Dialog shown when attempting to remove a device-->
+  <string name="remove_device_confirm">¿Realmente quieres excluir este dispositivo?</string>
   <!--Toast shown when trying to create a device with an empty ID-->
   <string name="device_id_required">El ID de dispositivo no debe estar vacío</string>
   <!--Content description for device ID qr code icon-->
   <string name="scan_qr_code_description">Escanear código QR</string>
   <!--Toast show if we could not get root permissions-->
-  <string name="toast_root_denied">No obtuvimos permisos de root</string>
+  <string name="toast_root_denied">No se obtuvieron permisos de root</string>
   <!--WebGuiActivity-->
   <!--Title of the web gui activity-->
   <string name="web_gui_title">Interfaz gráfica web</string>
@@ -125,58 +134,67 @@
   <!--Preference title-->
   <string name="always_run_in_background">Ejecutar siempre en segundo plano</string>
   <!--Preference summary in case it is enabled-->
-  <string name="always_run_in_background_enabled">Syncthing se ejecutará siempre en segundo plano, de acuerdo a la configuración.</string>
+  <string name="always_run_in_background_enabled">Syncthing se ejecutará siempre en segundo plano, de acuerdo a la siguiente configuración.</string>
   <!--Preference summary in case it is disabled-->
-  <string name="always_run_in_background_disabled">Syncthing sólo se ejecutará cuando se inicie explícitamente, puede ser detenido a través del botón del menú.</string>
-  <string name="sync_only_charging">Sincronizar solo cuando esté cargando</string>
-  <string name="sync_only_wifi">Sincronizar sólo en wifi</string>
-  <string name="sync_only_wifi_ssids">Restringir a algunas redes wifi</string>
-  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el WIFI en las redes seleccionadas.</string>
-  <string name="advanced_folder_picker">Usar Selección Avanzada de carpeta</string>
-  <string name="advanced_folder_picker_summary">Escoja una carpeta del dispositivo para sincronizar</string>
-  <string name="use_root_title">Ejecutar Syncthing como Superusuario</string>
+  <string name="always_run_in_background_disabled">Syncthing sólo se ejecutará cuando se inicie explícitamente, y puede ser detenido por el botón de menú.</string>
+  <string name="sync_only_charging">Sincronizar solo durante la carga</string>
+  <string name="sync_only_wifi">Sincronizar sólo con wifi</string>
+  <string name="sync_only_wifi_ssids">Restringir a determinadas redes wifi</string>
+  <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Por favor enciende el wifi para seleccionar redes.</string>
+  <string name="advanced_folder_picker">Usar selección avanzada de carpeta</string>
+  <string name="advanced_folder_picker_summary">Escoja alguna carpeta del dispositivo para sincronizar</string>
+  <string name="use_root_title">Ejecutar Syncthing como superusuario</string>
+  <string name="use_root_summary">Esta es una característica inestable que podría causar problemas con Syncthing y con tu dispositivo. Si aparecieran problemas podrías tener que reinstalar Syncthing.</string>
   <string name="notification_type_title">Notificación</string>
   <string name="notification_type_summary">Elige el tipo de notificación</string>
   <string-array name="notification_type_entries">
     <item>Normal</item>
-    <item>Baja Prioridad</item>
-    <item>Ninguno</item>
+    <item>Baja prioridad</item>
+    <item>Ninguna</item>
   </string-array>
   <string name="category_syncthing">Syncthing</string>
   <string name="syncthing_options">Opciones de Syncthing</string>
-  <string name="device_name">Nombre del Dispositivo</string>
+  <string name="device_name">Nombre del dispositivo</string>
   <string name="listen_address">Direcciones de escucha del protocolo de sincronización</string>
-  <string name="max_recv_kbps">Limitar la Tasa de Tráfico Entrante (KiB/s)</string>
-  <string name="max_send_kbps">Limitar la Tasa de Tráfico Saliente (KiB/s)</string>
-  <string name="global_announce_enabled">Descubrimiento Global</string>
-  <string name="local_announce_enabled">Descubrimiento Local</string>
-  <string name="global_announce_server">Servidor de Descubrimiento Global</string>
-  <string name="usage_reporting">Reportar Uso Anónimo</string>
-  <string name="syncthing_gui">Syncthing GUI</string>
-  <string name="gui_address">Direcciones de escucha GUI</string>
-  <string name="gui_user">Usuario de Autenticación GUI</string>
-  <string name="gui_password">Contraseña de Autenticación GUI</string>
-  <string name="export_config">Exportar Configuración</string>
+  <string name="max_recv_kbps">Límite de tráfico de entrada (KiB/s)</string>
+  <string name="max_send_kbps">Límite de tráfico de salida (KiB/s)</string>
+  <string name="global_announce_enabled">Descubrimiento global</string>
+  <string name="local_announce_enabled">Descubrimiento local</string>
+  <string name="enable_nat_traversal">Permitir NAT Traversal</string>
+  <string name="global_announce_server">Servidor de descubrimiento global</string>
+  <string name="enable_relaying">Activar retransmisión (Relaying)</string>
+  <string name="usage_reporting">Informe de uso anónimo</string>
+  <string name="syncthing_gui">Interfaz gráfica de Syncthing</string>
+  <string name="gui_address">Direcciones de escucha de la interfaz</string>
+  <string name="gui_user">Usuario de autenticación de la interfaz</string>
+  <string name="gui_password">Contraseña de autenticación de la interfaz</string>
+  <string name="export_config">Exportar configuración</string>
+  <string name="experimental_settings">Experimental</string>
+  <string name="keep_wakelock_while_binary_running">Mantener la CPU activa mientras se ejecuta Syncthing</string>
+  <string name="keep_wakelock_while_binary_running_summary">Usa este ajuste si experimentas desconexiones inesperadas mientras funcionas con la batería. Esto resultará en un incremento del consumo de batería.</string>
+  <string name="run_as_foreground_service">Ejecutar el servicio con prioridad de primer plano</string>
+  <string name="run_as_foreground_service_summary">Al activarse, Syncthing se ejecutará con prioridad de primer plano y es más improbable que Android lo detenga. Esto podría detener otros servicios cuando la memoria disponible sea escasa. Se mostrará una notificación de baja prioridad debido a los requerimientos de Android e independientemente de la configuración de las notificaciones.</string>
+  <string name="use_tor_title">Usar Tor</string>
+  <string name="use_tor_summary">Desviar todo el tráfico a través de Tor para incrementar la privacidad. Requiere Orbot</string>
   <!--Dialog shown before config export-->
-  <string name="dialog_confirm_export">Realmente quieres exportar tu configuración? Los ficheros existentes seran sobrescritos.\n\nAVISO! Otras aplicaciones puede pueden leer la llave privada del sitio de backup y usarla para descargar/modificar ficheros sincronizados.</string>
+  <string name="dialog_confirm_export">¿Realmente quieres exportar tu configuración? Se sobreescribirán los ficheros existentes.\n\n¡ADVERTENCIA! Otras aplicaciones podrían leer la clave privada localizada en la ubicación de la copia y usarla para descargar/modificar ficheros sincronizados.</string>
   <!--Dialog shown before config import-->
-  <string name="dialog_confirm_import">¿Realmente desea importar una nueva configuración? Se sobrescribirán los archivos existentes.</string>
+  <string name="dialog_confirm_import">¿Realmente deseas importar una nueva configuración? Se sobrescribirán los archivos existentes.</string>
   <!--Toast shown after config was successfully exported-->
   <string name="config_export_successful">La configuración fue exportada a %1$s</string>
-  <string name="import_config">Importar Configuración</string>
+  <string name="import_config">Importar configuración</string>
   <!--Toast shown after config was successfully imported-->
   <string name="config_imported_successful">Configuración importada</string>
   <!--Toast shown after config was successfully imported-->
-  <string name="config_import_failed">Importación de la configuración fallida, comprueba que los ficheros estan en %1$s</string>
+  <string name="config_import_failed">Importación de la configuración fallida, comprueba que los ficheros están en %1$s</string>
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opciones de depuración</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Sólo se permiten a-z y \',\' en las opciones STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Restablecer base de datos</string>
   <!--Syncthing was reset-->
-  <string name="streset_question">Esta acción sólo se debería realizar basandose en las recomendaciones de nuestro equipo de soporte.
-\n¿Estás seguro que quieres borrar el índice de la base de datos de Syncthing?</string>
+  <string name="streset_question">Esta acción sólo se debería realizar por recomendación de nuestro equipo de soporte.
+\n¿Estás seguro de que quieres limpiar la base de datos de índices de Syncthing?</string>
   <!--Syncthing was reset-->
   <string name="streset_done">Base de datos de Syncthing restablecida con éxito</string>
   <string name="category_about">Acerca de</string>
@@ -185,23 +203,24 @@
   <!--Summary for the log activity-->
   <string name="open_log_summary">Abrir ventana de registro de Syncthing y Android</string>
   <!--Settings item that opens issue tracker-->
-  <string name="report_issue_title">Reportar Problema</string>
+  <string name="report_issue_title">Informar de un problema</string>
   <!--Summary for the issue tracker settings item-->
   <string name="report_issue_summary">Abrir el seguimiento de incidencias Syncthing-Android</string>
   <!--URL of the issue tracker-->
   <!--Menu item to donate-->
   <string name="donate_title">Donar</string>
+  <string name="donate_summary">Ayúdanos a pagar los costes de dominios y servidores web</string>
   <!--Title of the preference showing upstream version name-->
-  <string name="syncthing_version_title">Versión Syncthing</string>
+  <string name="syncthing_version_title">Versión de Syncthing</string>
   <!--Title of the preference showing this app's version name-->
-  <string name="app_version_title">Versión Syncthing-Android</string>
+  <string name="app_version_title">Versión de Syncthing-Android</string>
   <!--FolderPickerAcitivity-->
   <!--Activity title-->
-  <string name="folder_picker_title">Seleccionador de Carpeta</string>
+  <string name="folder_picker_title">Seleccionador de carpetas</string>
   <!--Toast shown on devices with kitkat or higher-->
   <string name="kitkat_external_storage_warning">Aviso: Tu versión de Android no permite la sincronización con dispositivos de almacenamiento externos</string>
   <!--ListView empty text-->
-  <string name="directory_empty">El Directorio esta vacío</string>
+  <string name="directory_empty">El directorio esta vacío</string>
   <!--Menu item to create folder on the file system-->
   <string name="create_fs_folder">Crear nueva carpeta</string>
   <!--Menu item to select the current folder-->
@@ -214,24 +233,27 @@
   <string name="log_android_title">Mostrar registro de Android</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Mostrar registro de Syncthing</string>
+  <string name="retrieving_logs">Recuperando los registros...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Compartir</string>
   <!--SyncthingService-->
   <!--Title of the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_title">Syncthing está deshabilitado</string>
   <!--Message of the "syncthing disabled" dialog-->
-  <string name="syncthing_disabled_message">¿Quiere cambiar sus preferencias?</string>
+  <string name="syncthing_disabled_message">¿Quieres cambiar tus preferencias?</string>
   <!--Button text on the "syncthing disabled" dialog-->
   <string name="syncthing_disabled_change_settings">Cambiar la configuración</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">Salir</string>
   <!--Title of the notification shown while syncthing is running and enabled-->
   <string name="syncthing_active">Syncthing se está ejecutando</string>
+  <string name="syncthing_active_foreground">El servicio se está ejecutando con prioridad de primer plano.</string>
   <!--Toast shown if folder observer fails to traverse a folder-->
-  <string name="toast_folder_observer_stack_overflow">Arbol de directorio demasiado profundo. Comprobar enlaces simbólicos cíclicos</string>
+  <string name="toast_folder_observer_stack_overflow">Árbol de directorios demasiado profundo. Comprueba enlaces simbólicos cíclicos</string>
   <!--Toast shown if syncthing failed to create a config-->
   <string name="config_create_failed">Error al crear la configuración de Syncthing. Por favor, comprueba el registro.</string>
   <!--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-->
   <string name="default_folder_id">%1$s-photos</string>
   <!--RestApi-->
@@ -244,7 +266,7 @@
   <!--Text of the notification shown when a restart is needed-->
   <string name="restart_notification_text">Haga clic aquí para reiniciar Syncthing ahora</string>
   <!--Shown when a device ID is copied to the clipboard-->
-  <string name="device_id_copied_to_clipboard">El ID de Dispositivo se copió al portapapéles</string>
+  <string name="device_id_copied_to_clipboard">ID de dispositivo copiado al portapapeles</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
   <string-array name="file_size_units">
     <item>B</item>
@@ -263,10 +285,12 @@
   </string-array>
   <!--Possible folder states-->
   <string name="state_idle">Inactivo</string>
-  <string name="state_scanning">Escaneado</string>
+  <string name="state_scanning">Escaneando</string>
   <string name="state_cleaning">Limpiando</string>
   <string name="state_syncing">Sincronizando (%1$d%%)</string>
   <string name="state_error">Error</string>
   <string name="state_unknown">Desconocido</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 está soportado detener Syncthing mientras está activada la ejecución en segundo plano.</string>
 </resources>
diff --git a/src/main/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml
index 994f06af..728f8287 100644
--- a/src/main/res/values-fr/strings.xml
+++ b/src/main/res/values-fr/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Options de débuggage</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Seuls, les caractères a-z et \',\' sont autorisés dans les options STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Remise à zéro de la base de données</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-it/strings.xml b/src/main/res/values-it/strings.xml
index 37d976f0..1247c3c9 100644
--- a/src/main/res/values-it/strings.xml
+++ b/src/main/res/values-it/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opzioni di Debug</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Solo le lettere da a-z e la virgola \',\' sono consentiti nelle opzioni STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reset del Database</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-ja/strings.xml b/src/main/res/values-ja/strings.xml
index 67510c6d..5fc73921 100644
--- a/src/main/res/values-ja/strings.xml
+++ b/src/main/res/values-ja/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">デバッグオプション</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">STTRACE オプションでは、a-z および \',\' のみ使用できます。</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">データベースをリセット</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-ko/strings.xml b/src/main/res/values-ko/strings.xml
index 5567963e..724af6ba 100644
--- a/src/main/res/values-ko/strings.xml
+++ b/src/main/res/values-ko/strings.xml
@@ -189,7 +189,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">디버그 옵션</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">STTRACE 옵션에서는 a-z 와 \'.\' 외의 문자를 사용할 수 없습니다.</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">데이터베이스 리셋</string>
   <!--Syncthing was reset-->
@@ -233,6 +232,7 @@
   <string name="log_android_title">Android 로그 보기</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Syncthing 로그 보기</string>
+  <string name="retrieving_logs">로그를 받아오는중...</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">공유</string>
   <!--SyncthingService-->
diff --git a/src/main/res/values-nb/strings.xml b/src/main/res/values-nb/strings.xml
index 47cc0dc5..8250e8e9 100644
--- a/src/main/res/values-nb/strings.xml
+++ b/src/main/res/values-nb/strings.xml
@@ -186,7 +186,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Feilsøkingsvalg</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Bare a-z og \',\' er tillatt som STTRACE-valg</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Nullstill database</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-nl/strings.xml b/src/main/res/values-nl/strings.xml
index b758ce63..994329f9 100644
--- a/src/main/res/values-nl/strings.xml
+++ b/src/main/res/values-nl/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
   <string name="app_name">Syncthing</string>
-  <string name="app_description">Een open, betrouwbare en gedecentraliseerde applicatie voor bestandssynchronisatie.</string>
+  <string name="app_description">Open bestandssynchronisatie: betrouwbaar en decentraal</string>
   <!--FirstStartActivity-->
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Welkom bij Syncthing voor Android</string>
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Debug-opties</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Enkel a-z en \',\' zijn toegestaan in STTRACE-opties</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Database opnieuw instellen</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-nn/strings.xml b/src/main/res/values-nn/strings.xml
index 732fbeb7..87e00bfb 100644
--- a/src/main/res/values-nn/strings.xml
+++ b/src/main/res/values-nn/strings.xml
@@ -186,7 +186,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Alternativ for feilsøking</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Berre a-z og \',\' er tillatne i STTRACE-alternativ</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Nullstill database</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml
index e1229dd4..1854feb7 100644
--- a/src/main/res/values-pl/strings.xml
+++ b/src/main/res/values-pl/strings.xml
@@ -6,6 +6,7 @@
   <!--Title for dialog displayed on first start-->
   <string name="welcome_title">Witamy w Syncthing dla systemu Android</string>
   <!--Text for dialog displayed on first start-->
+  <string name="cont">Kontynuuj</string>
   <!--MainActivity-->
   <!--Text for WebGuiActivity loading view-->
   <string name="web_gui_loading">Oczekiwanie na interfejs użytkownika</string>
@@ -60,7 +61,7 @@
   <!--Title for announce server status-->
   <string name="announce_server">Serwer ogłoszeniowy</string>
   <string name="restart">Uruchom ponownie</string>
-  <string name="dialog_confirm_restart">Czy zrestartować Syncthing?</string>
+  <string name="dialog_confirm_restart">Uruchomić program ponownie?</string>
   <!--FolderFragment-->
   <!--Setting title-->
   <string name="folder_id">Identyfikator katalogu</string>
@@ -88,6 +89,7 @@
   <string name="folder_id_required">Identyfikator katalogu nie może być pusty</string>
   <!--Toast shown when trying to create a folder with an empty path-->
   <string name="folder_path_required">Ścieżka katalogu nie może być pusta</string>
+  <string name="dialog_discard_changes">Porzucić zmiany?</string>
   <!--DeviceFragment-->
   <!--Setting title-->
   <string name="device_id">Identyfikator urządzenia</string>
@@ -109,7 +111,7 @@
   <string name="introducer">Wprowadzający</string>
   <!--ActionBar item-->
   <string name="delete_device">Usuń urządzenie</string>
-  <string name="add_device">Dodawanie urządzenia</string>
+  <string name="add_device">Dodaj urządzenie</string>
   <!--Menu item to confirm adding a device-->
   <string name="add">Dodaj</string>
   <!--Title for DeviceSettingsFragment in edit mode-->
@@ -152,21 +154,21 @@
   <string name="max_send_kbps">Limit wysyłania (KiB/s)</string>
   <string name="global_announce_enabled">Globalne wyszukiwanie</string>
   <string name="local_announce_enabled">Lokalne wyszukiwanie</string>
-  <string name="enable_nat_traversal">Włącz NAT</string>
+  <string name="enable_nat_traversal">Trawersowanie NAT</string>
   <string name="global_announce_server">Serwer globalnego wyszukiwania</string>
   <string name="enable_relaying">Włącz przekazywanie</string>
   <string name="usage_reporting">Anonimowe statystyki użycia</string>
-  <string name="syncthing_gui">Syncthing GUI</string>
-  <string name="gui_address">Adres GUI</string>
-  <string name="gui_user">Użytkownik GUI</string>
-  <string name="gui_password">Hasło GUI</string>
+  <string name="syncthing_gui">Interfejs graficzny Syncthing</string>
+  <string name="gui_address">Adres nasłuchiwania</string>
+  <string name="gui_user">Nazwa użytkownika</string>
+  <string name="gui_password">Hasło</string>
   <string name="export_config">Eksportuj ustawienia</string>
-  <string name="experimental_settings">Eksperymelne!</string>
-  <string name="keep_wakelock_while_binary_running">Utrzymuj CPU wybudzony podczas działania Syncthing.</string>
+  <string name="experimental_settings">Eksperymentalne</string>
+  <string name="keep_wakelock_while_binary_running">Utrzymywanie wybudzonego CPU podczas działania</string>
   <string name="keep_wakelock_while_binary_running_summary">Używaj, jeśli doświadczasz nieoczekiwanych rozłączeń w trakcie działania na baterii. Spowoduje to zwiększone jej zużycie.</string>
-  <string name="run_as_foreground_service">Uruchom serwis z pierwszoplanowym priorytetem</string>
-  <string name="use_tor_title">Korzystaj z Tor</string>
-  <string name="use_tor_summary">Wymuszaj cały ruch przez Tor dla zwiększenia prywatności. Wymaga Orbot</string>
+  <string name="run_as_foreground_service">Pierwszoplanowy priorytet usługi</string>
+  <string name="use_tor_title">Korzystanie z Tor</string>
+  <string name="use_tor_summary">Wymusza cały ruch przez Tor dla zwiększenia prywatności. Wymaga Orbot.</string>
   <!--Dialog shown before config export-->
   <string name="dialog_confirm_export">Wyeksportować ustawienia? Istniejące pliki zostaną zastąpione.\n\nUWAGA! Inne programy mogą odczytać klucz prywatny z lokalizacji kopii zapasowej i użyć go by pobrać bądź zmodyfikować synchronizowane pliki.</string>
   <!--Dialog shown before config import-->
@@ -181,7 +183,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opcje diagnozowania błędów</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Tylko znaki a-z oraz „,” są dopuszczalne w STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Przywróć pierwotny stan bazy danych</string>
   <!--Syncthing was reset-->
@@ -226,6 +227,7 @@
   <string name="log_android_title">Wyświetl dziennik systemu</string>
   <!--Title of the "log Syncthing" menu button-->
   <string name="log_syncthing_title">Wyświetl dziennik programu</string>
+  <string name="retrieving_logs">Uzyskiwanie dzienników…</string>
   <!--Title of the "share log" menu button-->
   <string name="share_title">Udostępnij</string>
   <!--SyncthingService-->
@@ -256,7 +258,7 @@
   <!--Text for the dismiss button of the restart Activity-->
   <string name="restart_later">Później</string>
   <!--Text of the notification shown when a restart is needed-->
-  <string name="restart_notification_text">Proszę kliknąć, aby zrestartować syncthing</string>
+  <string name="restart_notification_text">Proszę kliknąć, aby uruchomić program ponownie</string>
   <!--Shown when a device ID is copied to the clipboard-->
   <string name="device_id_copied_to_clipboard">Skopiowano do schowka identyfikator urządzenia</string>
   <!--Strings representing units for file sizes, from smallest to largest-->
@@ -284,5 +286,5 @@
   <string name="state_unknown">Nieznany</string>
   <!--Format string for folder size, eg "500 MiB / 1 GiB"-->
   <string name="folder_size_format">%1$s / %2$s</string>
-  <string name="appconfig_receiver_background_enabled">Zatrzymywanie Syncthing nie jest wspierane, gdy działa w tle.</string>
+  <string name="appconfig_receiver_background_enabled">Zatrzymywanie programu nie jest obsługiwane podczas działania w tle.</string>
 </resources>
diff --git a/src/main/res/values-pt-rBR/strings.xml b/src/main/res/values-pt-rBR/strings.xml
index 3ec14e9f..ceb0f59d 100644
--- a/src/main/res/values-pt-rBR/strings.xml
+++ b/src/main/res/values-pt-rBR/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opções de depuração</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Somente a-z e \",\" (vírgula) são permitidos nas opções do STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Limpar banco de dados</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-pt/strings.xml b/src/main/res/values-pt/strings.xml
index 68c88516..fc2c4684 100644
--- a/src/main/res/values-pt/strings.xml
+++ b/src/main/res/values-pt/strings.xml
@@ -168,7 +168,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Opções da despistagem de erros</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Apenas é permitido usar a-z e \';\' nas opções do STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Reiniciar a base de dados</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-ru/strings.xml b/src/main/res/values-ru/strings.xml
index 391c53f4..b5735172 100644
--- a/src/main/res/values-ru/strings.xml
+++ b/src/main/res/values-ru/strings.xml
@@ -183,7 +183,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Настройки режима отладки</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">В настройках STTRACE можно использовать только символы a-z и \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Сбросить базу данных</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-sk/strings.xml b/src/main/res/values-sk/strings.xml
index e533a901..3ea5bb00 100644
--- a/src/main/res/values-sk/strings.xml
+++ b/src/main/res/values-sk/strings.xml
@@ -167,7 +167,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Nastavenia pre Ladenie</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">V STTRACE options sú povolené iba znaky a-z a \',\'</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Resetovať Databázu</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-sv/strings.xml b/src/main/res/values-sv/strings.xml
index 15344670..a0e5a905 100644
--- a/src/main/res/values-sv/strings.xml
+++ b/src/main/res/values-sv/strings.xml
@@ -138,7 +138,7 @@
   <!--Preference summary in case it is disabled-->
   <string name="always_run_in_background_disabled">Syncthing körs bara när den uttryckligen har startats, och kan stoppas genom menyknapp.</string>
   <string name="sync_only_charging">Synkronisera endast vid laddning</string>
-  <string name="sync_only_wifi">Synkronisera endast trådlöst</string>
+  <string name="sync_only_wifi">Synkronisera endast på WiFi</string>
   <string name="sync_only_wifi_ssids">Begränsa till vissa WiFi-nätverk</string>
   <string name="sync_only_wifi_ssids_wifi_turn_on_wifi">Slå på WiFi för att välja nätverk.</string>
   <string name="advanced_folder_picker">Använd avancerade katalogväljaren</string>
@@ -173,7 +173,7 @@
   <string name="keep_wakelock_while_binary_running">Håll CPU:n vaken medan Syncthing körs</string>
   <string name="keep_wakelock_while_binary_running_summary">Använd den här inställningen om du får oväntade frånkopplingar under batteridrift. Detta kommer att resultera i ökad batteriförbrukning.</string>
   <string name="run_as_foreground_service">Kör tjänst med förgrundsprioritet</string>
-  <string name="run_as_foreground_service_summary">Om aktiverad, kommer Syncthing köra med förgrundsprioritet och är mindre sannolikt att stoppas av Android. Detta kan leda till att andra tjänster stoppas om tillgängligt minne är lågt. En låg prioritetsnotering måste visas på grund av Androidkrav, oavsett av \"noterings\"-inställning.</string>
+  <string name="run_as_foreground_service_summary">Om aktiverad, kommer Syncthing köra med förgrundsprioritet och är mindre sannolikt att stoppas av Android. Detta kan leda till att andra tjänster stoppas om tillgängligt minne är lågt. En låg prioritetsnotering måste visas på grund av Androidkrav, oavsett av \"notering\"-inställning.</string>
   <string name="use_tor_title">Använd Tor</string>
   <string name="use_tor_summary">Tvinga all trafik genom Tor för ökad integritet. Kräver Orbot</string>
   <!--Dialog shown before config export-->
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Felsöksalternativ</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Endast a-z och \',\' är tillåtna i STTRACE alternativ</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Återställ databas</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-tr/strings.xml b/src/main/res/values-tr/strings.xml
index 7bacb247..38baa171 100644
--- a/src/main/res/values-tr/strings.xml
+++ b/src/main/res/values-tr/strings.xml
@@ -171,7 +171,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Hata Ayıklama Seçenekleri</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">STTRACE seçenekleri içinde sadece a-z ve \',\' karakterleri kullanabilirsiniz</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Veritabanını Sıfırla</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-vi/strings.xml b/src/main/res/values-vi/strings.xml
index 0d7f247f..4dcfa06e 100644
--- a/src/main/res/values-vi/strings.xml
+++ b/src/main/res/values-vi/strings.xml
@@ -179,7 +179,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">Tuỳ chọn dò lỗi</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">Chỉ cho phép a-z và \',\' trong tuỳ chọn STTRACE</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">Cài lại CSDL</string>
   <!--Syncthing was reset-->
diff --git a/src/main/res/values-zh-rCN/strings.xml b/src/main/res/values-zh-rCN/strings.xml
index 9881672c..6eca66d2 100644
--- a/src/main/res/values-zh-rCN/strings.xml
+++ b/src/main/res/values-zh-rCN/strings.xml
@@ -190,7 +190,6 @@
   <!--Title for the preference to set STTRACE parameters-->
   <string name="sttrace_title">调试选项</string>
   <!--Toast after entering invalid STTRACE params-->
-  <string name="toast_invalid_sttrace">STTRACE 选项仅允许 a-z 与逗号</string>
   <!--Title for the preference to reset Syncthing indexes-->
   <string name="streset_title">重置数据库</string>
   <!--Syncthing was reset-->