diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index d7fcaa17..fc2b0b14 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -113,7 +113,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -142,6 +142,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">وتظهر في علبة موحد</string>
   <string name="title_after">مزامنة (بالأيام)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">يوجد مجلد %1$s</string>
   <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
   <string name="title_folder_unified">علبة وارد موحدة</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index d7fcaa17..fc2b0b14 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -113,7 +113,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -142,6 +142,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">وتظهر في علبة موحد</string>
   <string name="title_after">مزامنة (بالأيام)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">يوجد مجلد %1$s</string>
   <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
   <string name="title_folder_unified">علبة وارد موحدة</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index d7fcaa17..fc2b0b14 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -113,7 +113,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -142,6 +142,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">وتظهر في علبة موحد</string>
   <string name="title_after">مزامنة (بالأيام)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">يوجد مجلد %1$s</string>
   <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
   <string name="title_folder_unified">علبة وارد موحدة</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index d7fcaa17..fc2b0b14 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -113,7 +113,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -142,6 +142,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">وتظهر في علبة موحد</string>
   <string name="title_after">مزامنة (بالأيام)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">يوجد مجلد %1$s</string>
   <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
   <string name="title_folder_unified">علبة وارد موحدة</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index d7fcaa17..fc2b0b14 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -113,7 +113,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -142,6 +142,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">وتظهر في علبة موحد</string>
   <string name="title_after">مزامنة (بالأيام)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">يوجد مجلد %1$s</string>
   <string name="title_folder_delete">حذف المجلد بشكل دائم؟</string>
   <string name="title_folder_unified">علبة وارد موحدة</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index e9ca3d48..6fbb662a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -105,7 +105,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index c6cce42f..e074fc33 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synkronisér (modtag meddelelser)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synkronisér (dage)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Samlet indbakke</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7bc043ae..d9fbc7f5 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -97,7 +97,7 @@
   <string name="title_synchronize_identity">Synchronisiere (sende E-Mails)</string>
   <string name="title_primary_account">Primäres Konto</string>
   <string name="title_primary_identity">Primäre Identität</string>
-  <string name="title_poll_interval">Abrufinterval (Minuten)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronisiere (empfange E-Mails)</string>
   <string name="title_unified_folder">Im gemeinsamen Posteingang anzeigen</string>
   <string name="title_after">Synchronisiere (Tage)</string>
+  <string name="title_poll_interval">Abrufinterval (Minuten)</string>
   <string name="title_folder_exists">Ordner %1$s bereits vorhanden</string>
   <string name="title_folder_delete">Ordner dauerhaft löschen?</string>
   <string name="title_folder_unified">Gemeinsamer Posteingang</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 6fb479b7..fc887b52 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -97,7 +97,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_poll_interval">Intervalo de espera (minutos)</string>
+  <string name="title_keep_alive_interval">Keep alive interval (minutes)</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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Sincronizar (recibir mensajes)</string>
   <string name="title_unified_folder">Mostrar en Bandeja de Entrada Unificada</string>
   <string name="title_after">Sincronizar (días)</string>
+  <string name="title_poll_interval">Intervalo de espera (minutos)</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_unified">Bandeja de Entrada Unificada</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7cc8d1b8..b0f3ecbb 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -97,7 +97,7 @@
   <string name="title_synchronize_identity">Synchroniser (envoyer des messages)</string>
   <string name="title_primary_account">Principal (compte par défaut)</string>
   <string name="title_primary_identity">Principal (identité par défaut)</string>
-  <string name="title_poll_interval">Intervalle de temps (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
   <string name="title_check">Vérifier</string>
   <string name="title_no_name">Nom manquant</string>
   <string name="title_no_email">Adresse e-mail manquante</string>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchroniser (recevoir des messages)</string>
   <string name="title_unified_folder">Afficher dans la boîte de réception unifiée</string>
   <string name="title_after">Synchroniser (jours)</string>
+  <string name="title_poll_interval">Intervalle de temps (minutes)</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_unified">Boite de réception unifiée</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 1b1f79d0..f1a6b7b7 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -105,7 +105,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index e21bace9..25255137 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -97,7 +97,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_poll_interval">Intervallo di tempo (minuti)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Sincronizza (ricevi messaggi)</string>
   <string name="title_unified_folder">Mostra in posta in arrivo unificata</string>
   <string name="title_after">Sincronizza (giorni)</string>
+  <string name="title_poll_interval">Intervallo di tempo (minuti)</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_unified">Posta in arrivo unificata</string>
@@ -204,8 +205,8 @@
   <string name="title_legend_unified">Posta in arrivo unificata</string>
   <string name="title_legend_archive">Archivio</string>
   <string name="title_legend_trash">Cestino</string>
-  <string name="title_legend_primary_disconnected">Account disconnected</string>
-  <string name="title_legend_primary_connected">Account connected</string>
+  <string name="title_legend_primary_disconnected">Account disconnesso</string>
+  <string name="title_legend_primary_connected">Account connesso</string>
   <string name="title_legend_cc">CC/CCN</string>
   <string name="title_legend_attachment">Allegato</string>
   <string name="title_legend_thread">Conversazione</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1b1f79d0..f1a6b7b7 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -105,7 +105,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index aacafce9..f72b3d9d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -93,7 +93,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -122,6 +122,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index aacafce9..f72b3d9d 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -93,7 +93,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -122,6 +122,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 99606f7e..64074c0f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -105,7 +105,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_poll_interval">Interwał sprawdzania (minuty)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronizuj (odbierz wiadomości)</string>
   <string name="title_unified_folder">Pokaż we wspólnej skrzynce odbiorczej</string>
   <string name="title_after">Synchronizuj (dni)</string>
+  <string name="title_poll_interval">Interwał sprawdzania (minuty)</string>
   <string name="title_folder_exists">Folder %1$s istnieje</string>
   <string name="title_folder_delete">Usunąć folder bezpowrotnie?</string>
   <string name="title_folder_unified">Wspólna skrzynka odbiorcza</string>
@@ -212,8 +213,8 @@
   <string name="title_legend_unified">Wspólna skrzynka odbiorcza</string>
   <string name="title_legend_archive">Archiwum</string>
   <string name="title_legend_trash">Kosz</string>
-  <string name="title_legend_primary_disconnected">Account disconnected</string>
-  <string name="title_legend_primary_connected">Account connected</string>
+  <string name="title_legend_primary_disconnected">Konto rozłączone</string>
+  <string name="title_legend_primary_connected">Konto połączone</string>
   <string name="title_legend_cc">DW/UDW</string>
   <string name="title_legend_attachment">Załącznik</string>
   <string name="title_legend_thread">Konwersacja</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 5f0d76d3..77bddba9 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Sincronizar (receber mensagens)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Sincronizar (dias)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Caixa de entrada unificada</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 1a737e06..1fd47abe 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index d64c2adf..1d72d7b5 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -101,7 +101,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_poll_interval">Interval verificare (minute)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -130,6 +130,7 @@
   <string name="title_synchronize_folder">Sincronizare (primire mesaje)</string>
   <string name="title_unified_folder">Arată în căsuța poștală comună</string>
   <string name="title_after">Sincronizare (zile)</string>
+  <string name="title_poll_interval">Interval verificare (minute)</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_unified">Căsuță poștală comună</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index e9ca3d48..6fbb662a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -105,7 +105,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 05cdf865..7509108e 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -101,7 +101,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -130,6 +130,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 80206136..c8289e80 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Synkronisera (hämta meddelanden)</string>
   <string name="title_unified_folder">Visa i en samlad inkorg</string>
   <string name="title_after">Synkronisera (dagar)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</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_unified">Samlad inkorg</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f1bcdbdf..251a68ec 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -97,7 +97,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -126,6 +126,7 @@
   <string name="title_synchronize_folder">Senkronize et (iletileri al)</string>
   <string name="title_unified_folder">Birleşik gelen kutusunda göster</string>
   <string name="title_after">Senkronize (günler)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</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_unified">Birleştirilmiş gelen kutusu</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index e9ca3d48..6fbb662a 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -105,7 +105,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -134,6 +134,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index aacafce9..f72b3d9d 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -93,7 +93,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -122,6 +122,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 4aca19fe..e8edaa17 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -22,15 +22,15 @@
   <string name="menu_answers">标准回复</string>
   <string name="menu_operations">操作</string>
   <string name="menu_legend">图例</string>
-  <string name="menu_faq">FAQ/support</string>
-  <string name="menu_pro">专业版</string>
-  <string name="menu_privacy">隐私政策</string>
+  <string name="menu_faq">常见问题/支持</string>
+  <string name="menu_pro">专业版功能</string>
+  <string name="menu_privacy">隐私</string>
   <string name="menu_about">关于</string>
-  <string name="menu_rate">Rate this app</string>
+  <string name="menu_rate">给这个应用打分</string>
   <string name="menu_other">其他应用</string>
   <string name="title_eula">最终用户许可协议</string>
   <string name="title_agree">我同意</string>
-  <string name="title_disagree">我拒绝</string>
+  <string name="title_disagree">我不同意</string>
   <string name="title_version">版本 %1$s</string>
   <string name="title_list_accounts">账户</string>
   <string name="title_list_identities">身份</string>
@@ -38,44 +38,44 @@
   <string name="title_edit_identity">编辑身份</string>
   <string name="title_edit_folder">编辑文件夹</string>
   <string name="title_setup">设置</string>
-  <string name="title_setup_export">Export settings</string>
-  <string name="title_setup_import">Import settings</string>
-  <string name="title_setup_export_do">Accounts and identities will be exported without passwords</string>
-  <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
-  <string name="title_setup_exported">Settings exported</string>
-  <string name="title_setup_imported">Settings imported</string>
+  <string name="title_setup_export">导出设置</string>
+  <string name="title_setup_import">导入设置</string>
+  <string name="title_setup_export_do">账户跟身份将会在没有密码的情况下导出</string>
+  <string name="title_setup_import_do">导入的账号将被添加，但不会覆写</string>
+  <string name="title_setup_exported">设置已导出！</string>
+  <string name="title_setup_imported">设置已导入！</string>
   <string name="title_setup_account">管理账户</string>
   <string name="title_setup_account_remark">用于接收电子邮件</string>
   <string name="title_setup_identity">管理身份</string>
   <string name="title_setup_identity_remark">用于发送电子邮件</string>
-  <string name="title_setup_doze">Disable battery optimizations</string>
-  <string name="title_setup_doze_remark">To continuously receive email (optional)</string>
-  <string name="title_setup_doze_instructions">In the next dialog, select \"All apps\" at the top, select this app and select and confirm \"Don\'t optimize\"</string>
-  <string name="title_setup_data">Disable data saving</string>
+  <string name="title_setup_doze">禁用电池优化</string>
+  <string name="title_setup_doze_remark">持续接受邮件(可选)</string>
+  <string name="title_setup_doze_instructions">在下个界面，选择最上面的\"所有应用\"，选择这个app如何选择并确定\"不优化\"</string>
+  <string name="title_setup_data">禁用省流量</string>
   <string name="title_setup_permissions">授予权限</string>
-  <string name="title_setup_permissions_remark">To get contact information (optional)</string>
+  <string name="title_setup_permissions_remark">获取联系人信息(可选)</string>
   <string name="title_setup_to_do">未设置</string>
-  <string name="title_setup_done">已设置</string>
-  <string name="title_setup_light_theme">Light theme</string>
+  <string name="title_setup_done">完成</string>
+  <string name="title_setup_light_theme">亮色主题</string>
   <string name="title_setup_dark_theme">暗色主题</string>
   <string name="title_advanced">高级选项</string>
-  <string name="title_advanced_avatars">Show contact photos</string>
-  <string name="title_advanced_light">Use notification light</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
+  <string name="title_advanced_avatars">显示联系人头像</string>
+  <string name="title_advanced_light">使用指示灯</string>
+  <string name="title_advanced_browse">浏览服务器上的消息</string>
   <string name="title_advanced_debug">调试模式</string>
   <string name="title_select">选择 &#8230;</string>
   <string name="title_identity_name">姓名</string>
   <string name="title_identity_email">电子邮件地址</string>
   <string name="title_identity_reply_to">回复地址</string>
-  <string name="title_optional">可选的</string>
+  <string name="title_optional">可选</string>
   <string name="title_account_linked">已绑定的账户</string>
-  <string name="title_account_name">账户名称</string>
+  <string name="title_account_name">账户名</string>
   <string name="title_account_name_hint">用于区分文件夹</string>
-  <string name="title_account_signature">Signature text</string>
-  <string name="title_account_color">Color</string>
-  <string name="title_domain">Domain name</string>
-  <string name="title_autoconfig">Get settings</string>
-  <string name="title_no_settings">Settings not found</string>
+  <string name="title_account_signature">签名文本</string>
+  <string name="title_account_color">颜色</string>
+  <string name="title_domain">域名</string>
+  <string name="title_autoconfig">获取设置</string>
+  <string name="title_no_settings">设置未找到</string>
   <string name="title_imap">IMAP</string>
   <string name="title_smtp">SMTP</string>
   <string name="title_provider">服务提供商</string>
@@ -86,14 +86,14 @@
   <string name="title_user">用户名</string>
   <string name="title_password">密码</string>
   <string name="title_authorize">选择账户</string>
-  <string name="title_authorizing">Authorizing account &#8230;</string>
-  <string name="title_setup_advanced">Advanced</string>
-  <string name="title_store_sent">Store sent messages (normally not needed)</string>
+  <string name="title_authorizing">授权帐户 &#8230;</string>
+  <string name="title_setup_advanced">高级选项</string>
+  <string name="title_store_sent">保存已发送的消息(通常不需要)</string>
   <string name="title_synchronize_account">同步（接收）</string>
   <string name="title_synchronize_identity">同步（发送）</string>
   <string name="title_primary_account">默认账户</string>
   <string name="title_primary_identity">默认身份</string>
-  <string name="title_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive interval (minutes)</string>
   <string name="title_check">检查</string>
   <string name="title_no_name">缺少名称</string>
   <string name="title_no_email">缺少邮箱地址</string>
@@ -103,27 +103,28 @@
   <string name="title_no_user">缺少用户名</string>
   <string name="title_no_password">缺少密码</string>
   <string name="title_no_drafts">缺少草稿箱</string>
-  <string name="title_no_idle">This provider does not support push messages. Reception of new messages can be delayed.</string>
-  <string name="title_no_uidplus">IMAP UIDPLUS not supported, see the FAQ</string>
+  <string name="title_no_idle">吃提供商不支持推送消息. 新消息的接收可能会延迟</string>
+  <string name="title_no_uidplus">不支持 IMAP UIDPLUS, 详见常见问题</string>
   <string name="title_account_delete">确定永久删除这个账户吗？</string>
   <string name="title_identity_delete">确定永久删除这个身份吗？</string>
-  <string name="title_pop">POP is not supported</string>
-  <string name="title_insecure">Insecure connections are not supported</string>
-  <string name="title_synchronize_now">Synchronize now</string>
-  <string name="title_delete_local">Delete local messages</string>
-  <string name="title_empty_trash">Empty trash</string>
-  <string name="title_edit_properties">Edit properties</string>
-  <string name="title_empty_trash_ask">Delete all trashed messages permanently?</string>
-  <string name="title_folder_name">Folder name</string>
-  <string name="title_display_name">Display name</string>
-  <string name="title_hide_folder">Hide from list</string>
-  <string name="title_hide_folders">Hide hidden folders</string>
-  <string name="title_show_folders">Show hidden folders</string>
+  <string name="title_pop">不支持POP</string>
+  <string name="title_insecure">不支持不安全的连接</string>
+  <string name="title_synchronize_now">现在同步</string>
+  <string name="title_delete_local">删除本地消息</string>
+  <string name="title_empty_trash">清空垃圾箱</string>
+  <string name="title_edit_properties">编辑属性</string>
+  <string name="title_empty_trash_ask">永久性删除所有垃圾邮件</string>
+  <string name="title_folder_name">文件夹名</string>
+  <string name="title_display_name">显示昵称</string>
+  <string name="title_hide_folder">从列表中隐藏</string>
+  <string name="title_hide_folders">隐藏隐藏的文件夹</string>
+  <string name="title_show_folders">显示隐藏的文件夹</string>
   <string name="title_synchronize_folder">同步文件夹（接收）</string>
-  <string name="title_unified_folder">Show in unified inbox</string>
+  <string name="title_unified_folder">在统一的收件箱中显示</string>
   <string name="title_after">同步天数</string>
-  <string name="title_folder_exists">Folder %1$s exists</string>
-  <string name="title_folder_delete">Delete folder permanently?</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
+  <string name="title_folder_exists">文件夹 %1$s 存在</string>
+  <string name="title_folder_delete">是否永久删除文件夹？</string>
   <string name="title_folder_unified">聚合收件箱</string>
   <string name="title_folder_inbox">收件箱</string>
   <string name="title_folder_outbox">发件箱</string>
@@ -132,25 +133,25 @@
   <string name="title_folder_trash">回收站</string>
   <string name="title_folder_junk">垃圾邮件</string>
   <string name="title_folder_sent">已发送邮件</string>
-  <string name="title_folder_system">System</string>
+  <string name="title_folder_system">系统</string>
   <string name="title_folder_user">用户</string>
   <string name="title_folder_primary">文件夹主账户</string>
-  <string name="title_folder_thread">Conversation</string>
+  <string name="title_folder_thread">对话</string>
   <string name="title_no_messages">没有邮件</string>
   <string name="title_link">链接</string>
   <string name="title_image">图片</string>
   <string name="title_show_images">显示图片</string>
   <string name="title_subject_reply">回复：%1$s</string>
   <string name="title_subject_forward">转发：%1$s</string>
-  <string name="title_thread">Show conversation</string>
+  <string name="title_thread">显示对话</string>
   <string name="title_seen">标记为已读</string>
   <string name="title_unseen">标记为未读</string>
-  <string name="title_flag">Add star</string>
-  <string name="title_unflag">Remove star</string>
+  <string name="title_flag">加注星标</string>
+  <string name="title_unflag">移除星标</string>
   <string name="title_forward">转发</string>
   <string name="title_reply_all">回复全部</string>
-  <string name="title_show_headers">Show headers</string>
-  <string name="title_show_html">Show original</string>
+  <string name="title_show_headers">显示标题</string>
+  <string name="title_show_html">显示原件</string>
   <string name="title_trash">回收站</string>
   <string name="title_delete">Delete</string>
   <string name="title_spam">垃圾邮件</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index aacafce9..f72b3d9d 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -93,7 +93,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_poll_interval">Poll interval (minutes)</string>
+  <string name="title_keep_alive_interval">Keep alive 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>
@@ -122,6 +122,7 @@
   <string name="title_synchronize_folder">Synchronize (receive messages)</string>
   <string name="title_unified_folder">Show in unified inbox</string>
   <string name="title_after">Synchronize (days)</string>
+  <string name="title_poll_interval">Poll interval (minutes)</string>
   <string name="title_folder_exists">Folder %1$s exists</string>
   <string name="title_folder_delete">Delete folder permanently?</string>
   <string name="title_folder_unified">Unified inbox</string>