From a64f3bf90b36aa25634873061a56e7ebbe67d7f2 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 19 Nov 2020 10:18:01 +0100
Subject: [PATCH] Updated texts

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java | 10 +++++-----
 app/src/main/res/values-cs-rCZ/strings.xml             |  1 -
 app/src/main/res/values-da-rDK/strings.xml             |  1 -
 app/src/main/res/values-de-rAT/strings.xml             |  2 --
 app/src/main/res/values-de-rDE/strings.xml             |  2 --
 app/src/main/res/values-de-rLI/strings.xml             |  2 --
 app/src/main/res/values-el-rGR/strings.xml             |  2 --
 app/src/main/res/values-es-rES/strings.xml             |  2 --
 app/src/main/res/values-fi-rFI/strings.xml             |  1 -
 app/src/main/res/values-fr-rCA/strings.xml             |  2 --
 app/src/main/res/values-fr-rFR/strings.xml             |  2 --
 app/src/main/res/values-fy-rNL/strings.xml             |  1 -
 app/src/main/res/values-gl-rES/strings.xml             |  1 -
 app/src/main/res/values-hu-rHU/strings.xml             |  1 -
 app/src/main/res/values-in-rID/strings.xml             |  1 -
 app/src/main/res/values-it-rIT/strings.xml             |  1 -
 app/src/main/res/values-nl-rNL/strings.xml             |  5 +++--
 app/src/main/res/values-pl-rPL/strings.xml             |  2 --
 app/src/main/res/values-ro-rRO/strings.xml             |  1 -
 app/src/main/res/values-ru-rRU/strings.xml             |  1 -
 app/src/main/res/values-sk-rSK/strings.xml             |  1 -
 app/src/main/res/values-sv-rSE/strings.xml             |  2 --
 app/src/main/res/values-tr-rTR/strings.xml             |  1 -
 app/src/main/res/values-zh-rCN/strings.xml             |  2 --
 app/src/main/res/values/strings.xml                    |  5 +++--
 25 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 08f91fb11d..45f6e4c7f4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -498,11 +498,11 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                         childs++;
             if (childs > 0) {
                 SubMenu submenu = popupMenu.getMenu()
-                        .addSubMenu(Menu.NONE, Menu.NONE, order++, R.string.title_synchronize_childs);
+                        .addSubMenu(Menu.NONE, Menu.NONE, order++, R.string.title_synchronize_subfolders);
 
                 submenu.add(Menu.FIRST, R.string.title_synchronize_now, 1, R.string.title_synchronize_now);
-                submenu.add(Menu.FIRST, R.string.title_enable, 2, R.string.title_enable);
-                submenu.add(Menu.FIRST, R.string.title_disable, 3, R.string.title_disable);
+                submenu.add(Menu.FIRST, R.string.title_synchronize_batch_enable, 2, R.string.title_synchronize_batch_enable);
+                submenu.add(Menu.FIRST, R.string.title_synchronize_batch_disable, 3, R.string.title_synchronize_batch_disable);
             }
 
             if (folder.selectable) {
@@ -578,10 +578,10 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             case R.string.title_synchronize_now:
                                 onActionSync(true);
                                 return true;
-                            case R.string.title_enable:
+                            case R.string.title_synchronize_batch_enable:
                                 onActionEnable(true);
                                 return true;
-                            case R.string.title_disable:
+                            case R.string.title_synchronize_batch_disable:
                                 onActionEnable(false);
                                 return true;
                             default:
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index dd49b8df92..b42e2c6367 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -636,7 +636,6 @@
     <string name="title_advanced_browse">Procházet zprávy na serveru</string>
     <string name="title_advanced_expand_read">Označit zprávy jako přečtené při rozbalení</string>
     <string name="title_synchronize_now">Synchronizovat nyní</string>
-    <string name="title_synchronize_childs">Synchronizovat podřízené složky</string>
     <string name="title_synchronize_more">Synchronizovat více zpráv</string>
     <string name="title_synchronize_enabled">Synchronizovat</string>
     <string name="title_delete_local">Smazat lokální zprávy</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 83921b1a4b..5ab1e500fc 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -616,7 +616,6 @@
     <string name="title_advanced_browse">Gennemse beskeder på serveren</string>
     <string name="title_advanced_expand_read">Markér beskeder Læst ved udvidelse</string>
     <string name="title_synchronize_now">Synkronisér nu</string>
-    <string name="title_synchronize_childs">Synkronisér undermapper</string>
     <string name="title_synchronize_more">Synkronisér flere beskeder</string>
     <string name="title_synchronize_enabled">Synkroniserer</string>
     <string name="title_delete_local">Slet lokale beskeder</string>
diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml
index 04d9cbec34..cfa4ab5a39 100644
--- a/app/src/main/res/values-de-rAT/strings.xml
+++ b/app/src/main/res/values-de-rAT/strings.xml
@@ -620,7 +620,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_expand_read">Nachrichten beim Erweitern als gelesen markieren</string>
     <string name="title_synchronize_now">Jetzt synchronisieren</string>
-    <string name="title_synchronize_childs">Unterordner synchronisieren</string>
     <string name="title_synchronize_more">Weitere Nachrichten synchronisieren</string>
     <string name="title_synchronize_enabled">Synchronisieren</string>
     <string name="title_delete_local">Lokale Nachrichten löschen</string>
@@ -1210,7 +1209,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_fix">Problem beheben</string>
     <string name="title_enable">Aktivieren</string>
     <string name="title_enabled">Aktiviert</string>
-    <string name="title_disable">Deaktivieren</string>
     <string name="title_executing">Wird ausgeführt</string>
     <string name="title_completed">Fertig</string>
     <string name="title_default_changed">Standard geändert</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 04d9cbec34..cfa4ab5a39 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -620,7 +620,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_expand_read">Nachrichten beim Erweitern als gelesen markieren</string>
     <string name="title_synchronize_now">Jetzt synchronisieren</string>
-    <string name="title_synchronize_childs">Unterordner synchronisieren</string>
     <string name="title_synchronize_more">Weitere Nachrichten synchronisieren</string>
     <string name="title_synchronize_enabled">Synchronisieren</string>
     <string name="title_delete_local">Lokale Nachrichten löschen</string>
@@ -1210,7 +1209,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_fix">Problem beheben</string>
     <string name="title_enable">Aktivieren</string>
     <string name="title_enabled">Aktiviert</string>
-    <string name="title_disable">Deaktivieren</string>
     <string name="title_executing">Wird ausgeführt</string>
     <string name="title_completed">Fertig</string>
     <string name="title_default_changed">Standard geändert</string>
diff --git a/app/src/main/res/values-de-rLI/strings.xml b/app/src/main/res/values-de-rLI/strings.xml
index 04d9cbec34..cfa4ab5a39 100644
--- a/app/src/main/res/values-de-rLI/strings.xml
+++ b/app/src/main/res/values-de-rLI/strings.xml
@@ -620,7 +620,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
     <string name="title_advanced_expand_read">Nachrichten beim Erweitern als gelesen markieren</string>
     <string name="title_synchronize_now">Jetzt synchronisieren</string>
-    <string name="title_synchronize_childs">Unterordner synchronisieren</string>
     <string name="title_synchronize_more">Weitere Nachrichten synchronisieren</string>
     <string name="title_synchronize_enabled">Synchronisieren</string>
     <string name="title_delete_local">Lokale Nachrichten löschen</string>
@@ -1210,7 +1209,6 @@ Protokolle, die dem Standard nicht entsprechen, wie „Microsoft Exchange Web Se
     <string name="title_fix">Problem beheben</string>
     <string name="title_enable">Aktivieren</string>
     <string name="title_enabled">Aktiviert</string>
-    <string name="title_disable">Deaktivieren</string>
     <string name="title_executing">Wird ausgeführt</string>
     <string name="title_completed">Fertig</string>
     <string name="title_default_changed">Standard geändert</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 9f1e0a6ed7..0a5fdd94bb 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -617,7 +617,6 @@
     <string name="title_advanced_browse">Περιήγηση μηνυμάτων στο διακομιστή</string>
     <string name="title_advanced_expand_read">Σήμανση των μηνυμάτων ως αναγνωσμένων κατά την ανάπτυξή τους</string>
     <string name="title_synchronize_now">Συγχρονισμός τώρα</string>
-    <string name="title_synchronize_childs">Συγχρονισμός υποφακέλων</string>
     <string name="title_synchronize_more">Συγχρονισμός περισσοτέρων μηνυμάτων</string>
     <string name="title_synchronize_enabled">Συγχρονισμός</string>
     <string name="title_delete_local">Διαγραφή τοπικών μηνυμάτων</string>
@@ -1203,7 +1202,6 @@
     <string name="title_fix">Επιδιόρθωση</string>
     <string name="title_enable">Ενεργοποίηση</string>
     <string name="title_enabled">Ενεργοποιημένο</string>
-    <string name="title_disable">Απενεργοποίηση</string>
     <string name="title_executing">Εκτελείται</string>
     <string name="title_completed">Ολοκληρώθηκε</string>
     <string name="title_default_changed">Η προεπιλογή έχει αλλάξει</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 263a21c85b..b42630e197 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -620,7 +620,6 @@
     <string name="title_advanced_browse">Explorar mensajes en el servidor</string>
     <string name="title_advanced_expand_read">Marcar mensajes leídos al expandir</string>
     <string name="title_synchronize_now">Sincronizar ahora</string>
-    <string name="title_synchronize_childs">Sincronizar carpetas hijas</string>
     <string name="title_synchronize_more">Sincronizar más mensajes</string>
     <string name="title_synchronize_enabled">Sincronizar</string>
     <string name="title_delete_local">Eliminar mensajes locales</string>
@@ -1213,7 +1212,6 @@
     <string name="title_fix">Reparar</string>
     <string name="title_enable">Activar</string>
     <string name="title_enabled">Activado</string>
-    <string name="title_disable">Desactivar</string>
     <string name="title_executing">En ejecución</string>
     <string name="title_completed">Completado</string>
     <string name="title_default_changed">Por defecto cambió</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index e7fd957800..ed21951d0f 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -608,7 +608,6 @@
     <string name="title_advanced_browse">Selaa palvelimella olevia viestejä</string>
     <string name="title_advanced_expand_read">Merkitse viestit luetuiksi laajennettaessa</string>
     <string name="title_synchronize_now">Synkronoi nyt</string>
-    <string name="title_synchronize_childs">Synkronoi alikansiot</string>
     <string name="title_synchronize_more">Synkronoi lisää viestejä</string>
     <string name="title_synchronize_enabled">Synkronoi</string>
     <string name="title_delete_local">Poista paikalliset viestit</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index 3372094ce6..e1d3f457bc 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -619,7 +619,6 @@
     <string name="title_advanced_browse">Parcourir les messages sur le serveur</string>
     <string name="title_advanced_expand_read">Marquer les messages comme lus lors de leur ouverture</string>
     <string name="title_synchronize_now">Synchroniser maintenant</string>
-    <string name="title_synchronize_childs">Synchroniser les sous-dossiers</string>
     <string name="title_synchronize_more">Synchroniser davantage de messages</string>
     <string name="title_synchronize_enabled">Synchroniser</string>
     <string name="title_delete_local">Supprimer les messages locaux</string>
@@ -1212,7 +1211,6 @@
     <string name="title_fix">Corriger</string>
     <string name="title_enable">Activer</string>
     <string name="title_enabled">Activé</string>
-    <string name="title_disable">Désactiver</string>
     <string name="title_executing">Exécution en cours</string>
     <string name="title_completed">Terminé</string>
     <string name="title_default_changed">Valeur par défaut modifiée</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 80a46f69d7..f455657fd9 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -619,7 +619,6 @@
     <string name="title_advanced_browse">Parcourir les messages sur le serveur</string>
     <string name="title_advanced_expand_read">Marquer les messages comme lus lors de leur ouverture</string>
     <string name="title_synchronize_now">Synchroniser maintenant</string>
-    <string name="title_synchronize_childs">Synchroniser les sous-dossiers</string>
     <string name="title_synchronize_more">Synchroniser davantage de messages</string>
     <string name="title_synchronize_enabled">Synchroniser</string>
     <string name="title_delete_local">Supprimer les messages locaux</string>
@@ -1212,7 +1211,6 @@
     <string name="title_fix">Corriger</string>
     <string name="title_enable">Activer</string>
     <string name="title_enabled">Activé</string>
-    <string name="title_disable">Désactiver</string>
     <string name="title_executing">Exécution en cours</string>
     <string name="title_completed">Terminé</string>
     <string name="title_default_changed">Valeur par défaut modifiée</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index 318e9ea9a9..ab4e3c4fd0 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -566,7 +566,6 @@
     <string name="title_advanced_browse">Blêdzje berjochten op de server</string>
     <string name="title_advanced_expand_read">Markearje berjochten lêzen as útwreidzjen</string>
     <string name="title_synchronize_now">Syngronisearje no</string>
-    <string name="title_synchronize_childs">Syngronisearje bernemappen</string>
     <string name="title_synchronize_more">Syngronisearje mear berjochten</string>
     <string name="title_synchronize_enabled">Syngronisearje</string>
     <string name="title_delete_local">Lokale berjochten wiskje</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 4f033e958b..375270b9da 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -609,7 +609,6 @@
     <string name="title_advanced_browse">Mirar mensaxes no servidor</string>
     <string name="title_advanced_expand_read">Marcar mensaxes como lidas ao expandir</string>
     <string name="title_synchronize_now">Sincronizar agora</string>
-    <string name="title_synchronize_childs">Sincronizar os cartafoles derivados</string>
     <string name="title_synchronize_more">Sincronizar máis mensaxes</string>
     <string name="title_synchronize_enabled">Sincronizar</string>
     <string name="title_delete_local">Borrar mensaxes locais</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 786a6ceeaf..9dc854412d 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -606,7 +606,6 @@
     <string name="title_advanced_browse">Üzenetek böngészése a szerveren</string>
     <string name="title_advanced_expand_read">Üzenetek megjelölése olvasottként kibontáskor</string>
     <string name="title_synchronize_now">Szinkronizálás most</string>
-    <string name="title_synchronize_childs">Almappák sziknkronizálása</string>
     <string name="title_synchronize_more">Több üzenet szinkronizálása</string>
     <string name="title_synchronize_enabled">Szinkronizálás</string>
     <string name="title_delete_local">Helyi üzenetek törlése</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 68352c6203..f2f4d06865 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -594,7 +594,6 @@ Akun dan identitas (alias) juga dapat diatur secara manual jika diperlukan. Prot
     <string name="title_advanced_browse">Jelajahi pesan di server</string>
     <string name="title_advanced_expand_read">Tandai pesan telah dibaca saat memperluas</string>
     <string name="title_synchronize_now">Sinkronkan sekarang</string>
-    <string name="title_synchronize_childs">Sinkronkan sub folder</string>
     <string name="title_synchronize_more">Sinkronkan pesan lebih banyak</string>
     <string name="title_synchronize_enabled">Mengsinkronisasikan</string>
     <string name="title_delete_local">Hapus pesan di perangkat</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index 8e787e9b1d..4542953e1d 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -619,7 +619,6 @@
     <string name="title_advanced_browse">Sfoglia i messaggi sul server</string>
     <string name="title_advanced_expand_read">Segna i messaggi come letti in fase di espansione</string>
     <string name="title_synchronize_now">Sincronizza ora</string>
-    <string name="title_synchronize_childs">Sincronizza le sottocartelle</string>
     <string name="title_synchronize_more">Sincronizza altri messaggi</string>
     <string name="title_synchronize_enabled">Sincronizza</string>
     <string name="title_delete_local">Elimina i messaggi locali</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 4b4173a1f7..a4711a83b0 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -618,9 +618,11 @@
     <string name="title_advanced_browse">Blader door berichten op de server</string>
     <string name="title_advanced_expand_read">Markeer berichten gelezen bij uitvouwen</string>
     <string name="title_synchronize_now">Nu synchroniseren</string>
-    <string name="title_synchronize_childs">Synchroniseer onderliggende mappen</string>
+    <string name="title_synchronize_childs">Submappen</string>
     <string name="title_synchronize_more">Meer berichten synchroniseren</string>
     <string name="title_synchronize_enabled">Synchroniseren</string>
+    <string name="title_synchronize_batch_enable">Synchronisatie inschakelen</string>
+    <string name="title_synchronize_batch_disable">Synchronisatie uitschakelen</string>
     <string name="title_delete_local">Verwijder lokale berichten</string>
     <string name="title_delete_browsed">Verwijder gebladerde/gezochte berichten</string>
     <string name="title_empty_trash">Prullenbak leegmaken</string>
@@ -1211,7 +1213,6 @@
     <string name="title_fix">Oplossen</string>
     <string name="title_enable">Inschakelen</string>
     <string name="title_enabled">Ingeschakeld</string>
-    <string name="title_disable">Uitschakelen</string>
     <string name="title_executing">Aan het uitvoeren</string>
     <string name="title_completed">Voltooid</string>
     <string name="title_default_changed">Standaard gewijzigd</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 9f23898783..71a6b1488e 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -640,7 +640,6 @@
     <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
     <string name="title_advanced_expand_read">Oznacz wiadomości jako przeczytane przy rozwijaniu</string>
     <string name="title_synchronize_now">Synchronizuj teraz</string>
-    <string name="title_synchronize_childs">Synchronizuj foldery podrzędne</string>
     <string name="title_synchronize_more">Synchronizuj więcej wiadomości</string>
     <string name="title_synchronize_enabled">Synchronizuj</string>
     <string name="title_delete_local">Usuń wiadomości lokalne</string>
@@ -1233,7 +1232,6 @@
     <string name="title_fix">Popraw</string>
     <string name="title_enable">Włącz</string>
     <string name="title_enabled">Włączone</string>
-    <string name="title_disable">Wyłącz</string>
     <string name="title_executing">Wykonywanie</string>
     <string name="title_completed">Ukończone</string>
     <string name="title_default_changed">Zmieniono wartość domyślną</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 5ea90ac812..3cd3dff853 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -629,7 +629,6 @@
     <string name="title_advanced_browse">Răsfoiește mesajele de pe server</string>
     <string name="title_advanced_expand_read">Marchează mesajele ca citite la extindere</string>
     <string name="title_synchronize_now">Sincronizează acum</string>
-    <string name="title_synchronize_childs">Sincronizare dosare secundare</string>
     <string name="title_synchronize_more">Sincronizează mai multe mesaje</string>
     <string name="title_synchronize_enabled">Sincronizare</string>
     <string name="title_delete_local">Șterge mesajul local</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 752e88094f..2d94ab86e5 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -641,7 +641,6 @@
     <string name="title_advanced_browse">Просмотр сообщений на сервере</string>
     <string name="title_advanced_expand_read">Отмечать сообщения прочитанными при развёртывании</string>
     <string name="title_synchronize_now">Синхронизировать сейчас</string>
-    <string name="title_synchronize_childs">Синхронизировать вложенные папки</string>
     <string name="title_synchronize_more">Синхронизировать ещё сообщения</string>
     <string name="title_synchronize_enabled">Синхронизировать</string>
     <string name="title_delete_local">Удалить локальные сообщения</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index e48348d000..991d382c23 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -627,7 +627,6 @@ Nastavenie vždy toto kompenzuje neustálym sledovaním zmien.</string>
     <string name="title_advanced_browse">Prehliadať správy na serveri</string>
     <string name="title_advanced_expand_read">Označiť správy za prečítané po rozbalení</string>
     <string name="title_synchronize_now">Synchronizovať teraz</string>
-    <string name="title_synchronize_childs">Synchronizovať vnorené priečinky</string>
     <string name="title_synchronize_more">Synchronizovať viac správ</string>
     <string name="title_synchronize_enabled">Synchronizovať</string>
     <string name="title_delete_local">Vymazať lokálne správy</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b16056d4b8..28e13b97c1 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -618,7 +618,6 @@
     <string name="title_advanced_browse">Bläddra bland meddelanden på servern</string>
     <string name="title_advanced_expand_read">Markera meddelanden som lästa vid expanderande</string>
     <string name="title_synchronize_now">Synkronisera nu</string>
-    <string name="title_synchronize_childs">Synkronisera underordnade mappar</string>
     <string name="title_synchronize_more">Synkronisera fler meddelanden</string>
     <string name="title_synchronize_enabled">Synkronisera</string>
     <string name="title_delete_local">Ta bort lokala meddelanden</string>
@@ -1211,7 +1210,6 @@
     <string name="title_fix">Åtgärda</string>
     <string name="title_enable">Aktivera</string>
     <string name="title_enabled">Aktiverad</string>
-    <string name="title_disable">Inaktivera</string>
     <string name="title_executing">Kör</string>
     <string name="title_completed">Slutförd</string>
     <string name="title_default_changed">Standard ändrad</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 3b049a717f..0018e1f843 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -610,7 +610,6 @@
     <string name="title_advanced_browse">Sunucudaki iletilere göz atın</string>
     <string name="title_advanced_expand_read">Genişletirken mesajları okundu olarak işaretle</string>
     <string name="title_synchronize_now">Şimdi eşzamanla</string>
-    <string name="title_synchronize_childs">Alt klasörleri senkronize et</string>
     <string name="title_synchronize_more">Daha fazla ileti senkronize et</string>
     <string name="title_synchronize_enabled">Eşzamanlama</string>
     <string name="title_delete_local">Yerel iletileri sil</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index ac08efee2c..3f430e2be6 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -607,7 +607,6 @@
     <string name="title_advanced_browse">浏览服务器上的消息</string>
     <string name="title_advanced_expand_read">将展开的消息标记为已读</string>
     <string name="title_synchronize_now">立即同步</string>
-    <string name="title_synchronize_childs">同步子文件夹</string>
     <string name="title_synchronize_more">同步更多消息</string>
     <string name="title_synchronize_enabled">同步</string>
     <string name="title_delete_local">删除本地消息</string>
@@ -1200,7 +1199,6 @@
     <string name="title_fix">修复</string>
     <string name="title_enable">启用</string>
     <string name="title_enabled">已启用</string>
-    <string name="title_disable">禁用</string>
     <string name="title_executing">执行中</string>
     <string name="title_completed">完成</string>
     <string name="title_default_changed">默认已更改</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd7f126093..757e13bc06 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -725,9 +725,11 @@
     <string name="title_advanced_expand_read">Mark messages read on expanding</string>
 
     <string name="title_synchronize_now">Synchronize now</string>
-    <string name="title_synchronize_childs">Synchronize child folders</string>
+    <string name="title_synchronize_subfolders">Subfolders</string>
     <string name="title_synchronize_more">Synchronize more messages</string>
     <string name="title_synchronize_enabled">Synchronize</string>
+    <string name="title_synchronize_batch_enable">Enable synchronization</string>
+    <string name="title_synchronize_batch_disable">Disable synchronization</string>
     <string name="title_delete_local">Delete local messages</string>
     <string name="title_delete_browsed">Delete browsed/searched messages</string>
     <string name="title_empty_trash">Empty trash</string>
@@ -1366,7 +1368,6 @@
     <string name="title_fix">Fix</string>
     <string name="title_enable">Enable</string>
     <string name="title_enabled">Enabled</string>
-    <string name="title_disable">Disable</string>
     <string name="title_executing">Executing</string>
     <string name="title_completed">Completed</string>
     <string name="title_default_changed">Default changed</string>