diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 7d3a7756bc..bbb18ddb9a 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -176,12 +176,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
-    <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">علبة وارد موحدة</string>
     <string name="title_folder_inbox">البريد الوارد</string>
     <string name="title_folder_outbox">البريد الصادر</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 7d3a7756bc..bbb18ddb9a 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -176,12 +176,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
-    <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">علبة وارد موحدة</string>
     <string name="title_folder_inbox">البريد الوارد</string>
     <string name="title_folder_outbox">البريد الصادر</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 7d3a7756bc..bbb18ddb9a 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -176,12 +176,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
-    <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">علبة وارد موحدة</string>
     <string name="title_folder_inbox">البريد الوارد</string>
     <string name="title_folder_outbox">البريد الصادر</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 7d3a7756bc..bbb18ddb9a 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -176,12 +176,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
-    <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">علبة وارد موحدة</string>
     <string name="title_folder_inbox">البريد الوارد</string>
     <string name="title_folder_outbox">البريد الصادر</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 7d3a7756bc..bbb18ddb9a 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -149,7 +149,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -176,12 +176,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">وتظهر في علبة موحد</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">يوجد مجلد %1$s</string>
-    <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">علبة وارد موحدة</string>
     <string name="title_folder_inbox">البريد الوارد</string>
     <string name="title_folder_outbox">البريد الصادر</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index b8fe976c08..b90c6d1252 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Eyniləşdir (mesajları göndər)</string>
     <string name="title_primary_account">Üstünlük verilən (ilkin hesab)</string>
     <string name="title_primary_identity">Üstünlük verilən (ilkin kimlik)</string>
-    <string name="title_keep_alive_interval">Bağlantı dövrünü qoru (dəqiqə)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Yoxla</string>
     <string name="title_no_name">Ad əskikdir</string>
     <string name="title_no_email">E-poçt ünvanı əskikdir</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Gizli qovluqları gizlət</string>
     <string name="title_show_folders">Gizli qovluqları göstər</string>
     <string name="title_synchronize_folder">Eyniləşdir (mesajları al)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Birləşmiş gələn qutusunda göstər</string>
     <string name="title_sync_days">Eyniləşdirilmiş mesajlar (gün)</string>
     <string name="title_keep_days">Saxlanılmış mesajlar (gün)</string>
     <string name="title_folder_exists">%1$s qovluğu mövcuddur</string>
-    <string name="title_folder_delete">Qovluğu birdəfəlik silinsin?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Birləşmiş gələn qutusu</string>
     <string name="title_folder_inbox">Gələn qutusu</string>
     <string name="title_folder_outbox">Gedən qutusu</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 893fc6727e..e1598d8766 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Sincronitza (envia missatges)</string>
     <string name="title_primary_account">Primària (compte per defecte)</string>
     <string name="title_primary_identity">Primària (identitat per defecte)</string>
-    <string name="title_keep_alive_interval">Interval d\'activitat (minuts)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Comprovar</string>
     <string name="title_no_name">Falta nom</string>
     <string name="title_no_email">Falta l\'adreça de correu-e</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Amaga les carpetes ocultes</string>
     <string name="title_show_folders">Mostra les carpetes ocultes</string>
     <string name="title_synchronize_folder">Sincronitza (rebre missatges)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Mostra en la safata d\'entrada unificada</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">La carpeta %1$s existeix</string>
-    <string name="title_folder_delete">Esborrar la carpeta per sempre?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Safata d\'entrada unificada</string>
     <string name="title_folder_inbox">Safata d\'entrada</string>
     <string name="title_folder_outbox">Safata de sortida</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 112c5ccd10..cdcbf2f906 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 52d781da70..27d0332271 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synkronisér (send meddelelser)</string>
     <string name="title_primary_account">Primær (standard konto)</string>
     <string name="title_primary_identity">Primær (standard identitet)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Navn mangler</string>
     <string name="title_no_email">Emailadresse mangler</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synkronisér (modtag meddelelser)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Samlet indbakke</string>
     <string name="title_folder_inbox">Indbakke</string>
     <string name="title_folder_outbox">Udbakke</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 2c25a52adf..e63db4d7aa 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronisieren (E-Mails versenden)</string>
     <string name="title_primary_account">Primäres Konto</string>
     <string name="title_primary_identity">Primäre Identität</string>
-    <string name="title_keep_alive_interval">Verbindung auf­recht­er­hal­ten Intervall (Minuten)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Prüfen</string>
     <string name="title_no_name">Name fehlt</string>
     <string name="title_no_email">E-Mail-Adresse fehlt</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Verstecke ausgeblendete Ordner</string>
     <string name="title_show_folders">Zeige ausgeblendete Ordner</string>
     <string name="title_synchronize_folder">Synchronisieren (E-Mails empfangen)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Im Sammeleingang anzeigen</string>
     <string name="title_sync_days">Zu synchronisierende E-Mails (Tage)</string>
     <string name="title_keep_days">E-Mails aufbewahren (Tage)</string>
     <string name="title_folder_exists">Ordner %1$s bereits vorhanden</string>
-    <string name="title_folder_delete">Ordner unwiderruflich löschen?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Sammeleingang</string>
     <string name="title_folder_inbox">Posteingang</string>
     <string name="title_folder_outbox">Postausgang</string>
@@ -197,7 +197,7 @@
     <string name="title_move">Verschieben</string>
     <string name="title_archive">Archivieren</string>
     <string name="title_reply">Antworten</string>
-    <string name="title_moving">Moving to %1$s</string>
+    <string name="title_moving">Verschiebe nach %1$s</string>
     <string name="title_open_with">Öffnen mit</string>
     <string name="title_no_answers">Keine Antwortvorlagen definiert</string>
     <string name="title_no_viewer">Keine App zum Betrachten von %1$s</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index c264238a36..5ab393bad7 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Sincronizar (enviar mensajes)</string>
     <string name="title_primary_account">Primaria (cuenta por defecto)</string>
     <string name="title_primary_identity">Primaria (identidad por defecto)</string>
-    <string name="title_keep_alive_interval">Intervalo de mantener activo (minutos)</string>
+    <string name="title_keep_alive_interval">Intervalo de comprobación (minutos)</string>
     <string name="title_check">Verificar</string>
     <string name="title_no_name">Falta nombre</string>
     <string name="title_no_email">Falta dirección de correo electrónico</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Ocultar carpetas ocultas</string>
     <string name="title_show_folders">Mostrar carpetas ocultas</string>
     <string name="title_synchronize_folder">Sincronizar (recibir mensajes)</string>
-    <string name="title_poll_folder">Sondear en lugar de sincronizar</string>
+    <string name="title_poll_folder">Comprobar periódicamente en lugar de sincronizar continuamente</string>
     <string name="title_unified_folder">Mostrar en Bandeja de Entrada Unificada</string>
     <string name="title_sync_days">Sincronizar mensajes (días)</string>
     <string name="title_keep_days">Mantener mensajes (días)</string>
     <string name="title_folder_exists">La carpeta %1$s ya existe</string>
-    <string name="title_folder_delete">¿Eliminar carpeta permanentemente?</string>
+    <string name="title_folder_delete">¿Eliminar permanentemente esta carpeta y los mensajes que contenga?</string>
     <string name="title_folder_unified">Bandeja de Entrada Unificada</string>
     <string name="title_folder_inbox">Bandeja de Entrada</string>
     <string name="title_folder_outbox">Bandeja de Salida</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index e112f7a738..4337c1b36a 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 39163a94f3..036ae84075 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Masquer les dossiers cachés</string>
     <string name="title_show_folders">Afficher les dossiers cachés</string>
     <string name="title_synchronize_folder">Synchroniser (recevoir des messages)</string>
-    <string name="title_poll_folder">Interroger le serveur au lieu de synchroniser</string>
+    <string name="title_poll_folder">Vérifier périodiquement au lieu de synchroniser en continu</string>
     <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
     <string name="title_sync_days">Synchroniser les e-mails (jours)</string>
     <string name="title_keep_days">Conserver les e-mails (jours)</string>
     <string name="title_folder_exists">Le dossier %1$s existe</string>
-    <string name="title_folder_delete">Supprimer définitivement le dossier ?</string>
+    <string name="title_folder_delete">Supprimer définitivement ce dossier et tous les messages qu’il contient ?</string>
     <string name="title_folder_unified">Boite de réception unifiée</string>
     <string name="title_folder_inbox">Boîte de réception</string>
     <string name="title_folder_outbox">Boîte d\'envoi</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 6c05880add..70db29c514 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6eed4aa46c..cfb156f56d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 38c11d5a02..1aa0f316d9 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Sincronizza (invia messaggi)</string>
     <string name="title_primary_account">Principale (account predefinito)</string>
     <string name="title_primary_identity">Principale (identità predefinita)</string>
-    <string name="title_keep_alive_interval">Intervallo resta-attivo (minuti)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Controlla</string>
     <string name="title_no_name">Nome mancante</string>
     <string name="title_no_email">Indirizzo email mancante</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Non mostrare cartelle nascoste</string>
     <string name="title_show_folders">Mostra cartelle nascoste</string>
     <string name="title_synchronize_folder">Sincronizza (ricevi messaggi)</string>
-    <string name="title_poll_folder">Richiedi invece di sincronizzare</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Mostra in posta in arrivo unificata</string>
     <string name="title_sync_days">Sincronizza i messaggi (giorni)</string>
     <string name="title_keep_days">Mantieni i messaggi (giorni)</string>
     <string name="title_folder_exists">La cartella %1$s esiste</string>
-    <string name="title_folder_delete">Eliminare la cartella permanentemente?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Posta in arrivo unificata</string>
     <string name="title_folder_inbox">Posta in arrivo</string>
     <string name="title_folder_outbox">Posta in uscita</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 6c05880add..70db29c514 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index e0e1ed1d73..4733d7a2c8 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -124,7 +124,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -151,12 +151,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index e0e1ed1d73..4733d7a2c8 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -124,7 +124,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -151,12 +151,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 89f5462ad2..467fb9d453 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -4,7 +4,7 @@
     <string name="app_copyright">Copyright &#x24B8; 2018 door M. Bokhorst</string>
     <string name="channel_service">Service</string>
     <string name="channel_notification">Meldingen</string>
-    <string name="channel_error">Foutenmeldingen</string>
+    <string name="channel_error">Foutmeldingen</string>
     <string name="tile_synchronize">Synchroniseren</string>
     <string name="tile_unseen">Nieuwe berichten</string>
     <string name="shortcut_compose">Opstellen</string>
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchroniseren (stuur berichten)</string>
     <string name="title_primary_account">Primair account (standaard account)</string>
     <string name="title_primary_identity">Primaire identiteit (standaard identiteit)</string>
-    <string name="title_keep_alive_interval">Keep alive-interval (minuten)</string>
+    <string name="title_keep_alive_interval">Keep-alive/periodieke controle interval (minuten)</string>
     <string name="title_check">Controleer</string>
     <string name="title_no_name">Naam ontbreekt</string>
     <string name="title_no_email">Email adres ontbreekt</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Verberg verborgen mappen</string>
     <string name="title_show_folders">Toon verborgen mappen</string>
     <string name="title_synchronize_folder">Synchroniseren (ontvang berichten)</string>
-    <string name="title_poll_folder">Poll in plaats van synchroniseren</string>
+    <string name="title_poll_folder">Controleer periodiek in plaats van continu synchroniseren</string>
     <string name="title_unified_folder">Toon in het gecombineerde postvak in</string>
     <string name="title_sync_days">Synchroniseren van berichten (dagen)</string>
     <string name="title_keep_days">Bewaren van berichten (dagen)</string>
     <string name="title_folder_exists">Map %1$s bestaat</string>
-    <string name="title_folder_delete">Verwijder map permanent?</string>
+    <string name="title_folder_delete">Deze map en de berichten die het bevat permanent verwijderen?</string>
     <string name="title_folder_unified">Gecombineerd postvak in</string>
     <string name="title_folder_inbox">Postvak in</string>
     <string name="title_folder_outbox">Postvak uit</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 8839cf8587..b24d7d2692 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronizuj (wyślij wiadomości)</string>
     <string name="title_primary_account">Podstawowe (domyślne konto)</string>
     <string name="title_primary_identity">Podstawowe (domyślna tożsamość)</string>
-    <string name="title_keep_alive_interval">Interwał utrzymywania aktywności (minuty)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Sprawdź</string>
     <string name="title_no_name">Brak nazwy</string>
     <string name="title_no_email">Brak adresu e-mail</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Nie pokazuj ukrytych folderów</string>
     <string name="title_show_folders">Pokaż ukryte foldery</string>
     <string name="title_synchronize_folder">Synchronizuj (odbierz wiadomości)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Pokaż we wspólnej skrzynce odbiorczej</string>
     <string name="title_sync_days">Synchronizuj wiadomości (dni)</string>
     <string name="title_keep_days">Zachowuj wiadomości (dni)</string>
     <string name="title_folder_exists">Folder %1$s istnieje</string>
-    <string name="title_folder_delete">Usunąć folder bezpowrotnie?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Wspólna skrzynka odbiorcza</string>
     <string name="title_folder_inbox">Odebrane</string>
     <string name="title_folder_outbox">Wysłane</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 460adccc79..29a0f4f2ef 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Sincronizar (enviar mensagens)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primária (identidade padrão)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Caixa de entrada unificada</string>
     <string name="title_folder_inbox">Caixa de entrada</string>
     <string name="title_folder_outbox">Caixa de saída</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 18b521fd11..278b19ee1f 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 52f132dcda..09d65b8ec6 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -134,7 +134,7 @@
     <string name="title_synchronize_identity">Sincronizare (trimitere mesaje)</string>
     <string name="title_primary_account">Primară (identitatea implicită)</string>
     <string name="title_primary_identity">Primară (identitatea implicită)</string>
-    <string name="title_keep_alive_interval">Interval menținere conexiune (minute)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Verificare</string>
     <string name="title_no_name">Lipsește numele</string>
     <string name="title_no_email">Lipsește adresa de e-mail</string>
@@ -161,12 +161,12 @@
     <string name="title_hide_folders">Ascunde dosarele ascunse</string>
     <string name="title_show_folders">Arată dosarele ascunse</string>
     <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
-    <string name="title_poll_folder">Verificare periodică în loc de sincronizare</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Arată în căsuța poștală comună</string>
     <string name="title_sync_days">Sincronizarea mesajelor (zile)</string>
     <string name="title_keep_days">Păstrarea mesajelor (zile)</string>
     <string name="title_folder_exists">Dosarul %1$s există</string>
-    <string name="title_folder_delete">Ștergeți dosarul definitiv?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Căsuță poștală comună</string>
     <string name="title_folder_inbox">Primite</string>
     <string name="title_folder_outbox">Mesaje de trimis</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 112c5ccd10..cdcbf2f906 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 13b71b814c..ea6d0d1da4 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -134,7 +134,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -161,12 +161,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index b8492328ed..7e36ab8a71 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Synkronisera (skicka meddelanden)</string>
     <string name="title_primary_account">Primär (standardkonto)</string>
     <string name="title_primary_identity">Primär (standardidentitet)</string>
-    <string name="title_keep_alive_interval">Håll vid liv intervall (minuter)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Kontrollera</string>
     <string name="title_no_name">Namn saknas</string>
     <string name="title_no_email">E-postadressen saknas</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Dölj dolda mappar</string>
     <string name="title_show_folders">Visa dolda mappar</string>
     <string name="title_synchronize_folder">Synkronisera (hämta meddelanden)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Visa i en samlad inkorg</string>
     <string name="title_sync_days">Synkronisera meddelanden (dagar)</string>
     <string name="title_keep_days">Behåll meddelanden (dagar)</string>
     <string name="title_folder_exists">Mappen %1$s finns</string>
-    <string name="title_folder_delete">Ta bort mappen permanent?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Samlad inkorg</string>
     <string name="title_folder_inbox">Inkorg</string>
     <string name="title_folder_outbox">Utkorg</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 26eb50521a..e8f7094bce 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -129,7 +129,7 @@
     <string name="title_synchronize_identity">Senkronize et (iletileri gönder)</string>
     <string name="title_primary_account">Birincil (varsayılan hesap)</string>
     <string name="title_primary_identity">Birincil (varsayılan kimlik)</string>
-    <string name="title_keep_alive_interval">Canlı tutma aralığı (dakika)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Kontrol et</string>
     <string name="title_no_name">İsim eksik</string>
     <string name="title_no_email">E-posta adresi eksik</string>
@@ -156,12 +156,12 @@
     <string name="title_hide_folders">Gizli klasörleri gizle</string>
     <string name="title_show_folders">Gizli klasörleri göster</string>
     <string name="title_synchronize_folder">Senkronize et (iletileri al)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Birleşik gelen kutusunda göster</string>
     <string name="title_sync_days">İletileri eşzamanla (gün)</string>
     <string name="title_keep_days">İletileri sakla (günler)</string>
     <string name="title_folder_exists">Klasör %1$s var</string>
-    <string name="title_folder_delete">Klasörü kalıcı olarak sil?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Birleştirilmiş gelen kutusu</string>
     <string name="title_folder_inbox">Gelen kutusu</string>
     <string name="title_folder_outbox">Giden Kutusu</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 112c5ccd10..cdcbf2f906 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -139,7 +139,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -166,12 +166,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index e0e1ed1d73..4733d7a2c8 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -124,7 +124,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -151,12 +151,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a30be8d10c..a7971611ff 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -124,7 +124,7 @@
     <string name="title_synchronize_identity">同步（发送）</string>
     <string name="title_primary_account">默认账户</string>
     <string name="title_primary_identity">默认身份</string>
-    <string name="title_keep_alive_interval">保持激活间隔时间(分钟)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">检查</string>
     <string name="title_no_name">缺少名称</string>
     <string name="title_no_email">缺少邮箱地址</string>
@@ -151,12 +151,12 @@
     <string name="title_hide_folders">隐藏隐藏的文件夹</string>
     <string name="title_show_folders">显示隐藏的文件夹</string>
     <string name="title_synchronize_folder">同步文件夹（接收）</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">在统一的收件箱中显示</string>
     <string name="title_sync_days">同步邮件(天)</string>
     <string name="title_keep_days">保留邮件(天)</string>
     <string name="title_folder_exists">文件夹 %1$s 存在</string>
-    <string name="title_folder_delete">是否永久删除文件夹？</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">聚合收件箱</string>
     <string name="title_folder_inbox">收件箱</string>
     <string name="title_folder_outbox">发件箱</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e0e1ed1d73..4733d7a2c8 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -124,7 +124,7 @@
     <string name="title_synchronize_identity">Synchronize (send messages)</string>
     <string name="title_primary_account">Primary (default account)</string>
     <string name="title_primary_identity">Primary (default identity)</string>
-    <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
+    <string name="title_keep_alive_interval">Keep-alive/poll interval (minutes)</string>
     <string name="title_check">Check</string>
     <string name="title_no_name">Name missing</string>
     <string name="title_no_email">Email address missing</string>
@@ -151,12 +151,12 @@
     <string name="title_hide_folders">Hide hidden folders</string>
     <string name="title_show_folders">Show hidden folders</string>
     <string name="title_synchronize_folder">Synchronize (receive messages)</string>
-    <string name="title_poll_folder">Poll instead of synchronize</string>
+    <string name="title_poll_folder">Check periodically instead of continuous synchronize</string>
     <string name="title_unified_folder">Show in unified inbox</string>
     <string name="title_sync_days">Synchronize messages (days)</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
-    <string name="title_folder_delete">Delete folder permanently?</string>
+    <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>
     <string name="title_folder_unified">Unified inbox</string>
     <string name="title_folder_inbox">Inbox</string>
     <string name="title_folder_outbox">Outbox</string>