diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index a44841e4..b46f6ad9 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -58,8 +58,10 @@
   <string name="title_edit_identity">تحرير الهوية</string>
   <string name="title_edit_folder">تحرير المجلد</string>
   <string name="title_setup">اعداد</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">استيراد الإعدادات</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">إعدادات تصدير</string>
   <string name="title_setup_imported">استيراد إعدادات</string>
   <string name="title_setup_account">إدارة الحسابات</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index a44841e4..b46f6ad9 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -58,8 +58,10 @@
   <string name="title_edit_identity">تحرير الهوية</string>
   <string name="title_edit_folder">تحرير المجلد</string>
   <string name="title_setup">اعداد</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">استيراد الإعدادات</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">إعدادات تصدير</string>
   <string name="title_setup_imported">استيراد إعدادات</string>
   <string name="title_setup_account">إدارة الحسابات</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index a44841e4..b46f6ad9 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -58,8 +58,10 @@
   <string name="title_edit_identity">تحرير الهوية</string>
   <string name="title_edit_folder">تحرير المجلد</string>
   <string name="title_setup">اعداد</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">استيراد الإعدادات</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">إعدادات تصدير</string>
   <string name="title_setup_imported">استيراد إعدادات</string>
   <string name="title_setup_account">إدارة الحسابات</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index a44841e4..b46f6ad9 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -58,8 +58,10 @@
   <string name="title_edit_identity">تحرير الهوية</string>
   <string name="title_edit_folder">تحرير المجلد</string>
   <string name="title_setup">اعداد</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">استيراد الإعدادات</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">إعدادات تصدير</string>
   <string name="title_setup_imported">استيراد إعدادات</string>
   <string name="title_setup_account">إدارة الحسابات</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index a44841e4..b46f6ad9 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -58,8 +58,10 @@
   <string name="title_edit_identity">تحرير الهوية</string>
   <string name="title_edit_folder">تحرير المجلد</string>
   <string name="title_setup">اعداد</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">استيراد الإعدادات</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">إعدادات تصدير</string>
   <string name="title_setup_imported">استيراد إعدادات</string>
   <string name="title_setup_account">إدارة الحسابات</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5795fbb5..9e22ba8b 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index bf32534f..e6063ae3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Rediger identitet</string>
   <string name="title_edit_folder">Rediger mappe</string>
   <string name="title_setup">Opsætning</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Administrer konti</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 3c2c9a06..e9f26c7a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Identität bearbeiten</string>
   <string name="title_edit_folder">Ordner bearbeiten</string>
   <string name="title_setup">Einstellungen</string>
-  <string name="title_setup_export">Einstellungen exportieren (keine Passwörter)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Einstellungen importieren</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">Einstellungen exportiert</string>
   <string name="title_setup_imported">Einstellungen importiert</string>
   <string name="title_setup_account">Konten verwalten</string>
@@ -63,7 +65,7 @@
   <string name="title_advanced">Erweiterte Optionen</string>
   <string name="title_advanced_avatars">Kontaktfotos anzeigen</string>
   <string name="title_advanced_light">Benachrichtigungslicht verwenden</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
+  <string name="title_advanced_browse">Nachrichten auf dem Server durchsuchen</string>
   <string name="title_advanced_debug">Debuggen</string>
   <string name="title_select">Wählen Sie &#8230;</string>
   <string name="title_identity_name">Ihr Name</string>
@@ -105,7 +107,7 @@
   <string name="title_no_user">Benutzername fehlt</string>
   <string name="title_no_password">Passwort fehlt</string>
   <string name="title_no_drafts">Entwurfsordner fehlt</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_idle">Dieser Anbieter unterstützt keine Push-Nachrichten. Der Empfang von neuen Nachrichten kann sich verzögern.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS wird nicht unterstützt, lesen Sie die FAQ</string>
   <string name="title_account_delete">Möchten Sie dieses Konto unwiderruflich löschen?</string>
   <string name="title_identity_delete">Möchten Sie diese Identität unwiderruflich löschen?</string>
@@ -162,7 +164,7 @@
   <string name="title_moving">Verschiebe E-Mail nach %1$s</string>
   <string name="title_no_viewer">Keine App zum Betrachten von %1$s</string>
   <string name="title_attachment_saved">Anhang gespeichert</string>
-  <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
+  <string name="title_attachment_unavailable">Einige Anlagen wurden nicht heruntergeladen und werden nicht weitergeleitet, fortsetzen?</string>
   <string name="title_ask_delete">E-Mail dauerhaft löschen?</string>
   <string name="title_ask_spam">Nachricht als Spam melden?</string>
   <string name="title_compose">Verfassen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 93d351df..6a722f7f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Editar identidad</string>
   <string name="title_edit_folder">Editar carpeta</string>
   <string name="title_setup">Configuración</string>
-  <string name="title_setup_export">Exportar ajustes (no contraseñas)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Importar ajustes</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">Ajustes exportados</string>
   <string name="title_setup_imported">Ajustes importados</string>
   <string name="title_setup_account">Gestionar cuentas</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7122a2dc..e2ebe0ae 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Modifier l’identité</string>
   <string name="title_edit_folder">Modifier le dossier</string>
   <string name="title_setup">Configuration</string>
-  <string name="title_setup_export">Exporter les paramètres (aucun mot de passe)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Importer les paramètres</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">Paramètres exportés</string>
   <string name="title_setup_imported">Paramètres importés</string>
   <string name="title_setup_account">Gérer les comptes</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 16bed8c5..9542536a 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 558db9ff..2f8fd9dd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Modifica identità</string>
   <string name="title_edit_folder">Modifica cartella</string>
   <string name="title_setup">Configurazione</string>
-  <string name="title_setup_export">Esporta impostazioni (nessuna password)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Importa impostazioni</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">Impostazioni esportate</string>
   <string name="title_setup_imported">Impostazioni importate</string>
   <string name="title_setup_account">Gestisci account</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 16bed8c5..9542536a 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7470d74d..d8215556 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -38,8 +38,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 7470d74d..d8215556 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -38,8 +38,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 5f31a21b..1be5abc2 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edytcja tożsamość</string>
   <string name="title_edit_folder">Edytuj folder</string>
   <string name="title_setup">Ustawienia</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Import ustawień</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">Ustawienia wyeksportowane</string>
   <string name="title_setup_imported">Ustawienia zaimportowane</string>
   <string name="title_setup_account">Zarządzaj kontami</string>
@@ -71,7 +73,7 @@
   <string name="title_advanced">Opcje zaawansowane</string>
   <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
   <string name="title_advanced_light">Użyj diody powiadomień</string>
-  <string name="title_advanced_browse">Browse messages on the server</string>
+  <string name="title_advanced_browse">Przeglądaj wiadomości na serwerze</string>
   <string name="title_advanced_debug">Debuguj</string>
   <string name="title_select">Wybierz &#8230;</string>
   <string name="title_identity_name">Twoja nazwa</string>
@@ -103,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">Poll interval (minutes)</string>
+  <string name="title_poll_interval">Interwał sprawdzania (minuty)</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>
@@ -113,7 +115,7 @@
   <string name="title_no_user">Brak nazwy użytkownika</string>
   <string name="title_no_password">Brak hasła</string>
   <string name="title_no_drafts">Brakuje folderu Szkice</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_idle">Ten dostawca nie obsługuje wiadomości push. Odbieranie nowych wiadomości może być opóźnione.</string>
   <string name="title_no_uidplus">IMAP UIDPLUS nie jest wspierane, zobacz FAQ</string>
   <string name="title_account_delete">Usunąć to konto bezpowrotnie?</string>
   <string name="title_identity_delete">Usunąć tożsamość bezpowrotnie?</string>
@@ -126,9 +128,9 @@
   <string name="title_empty_trash_ask">Trwale usunąć wszystkie wiadomości z kosza?</string>
   <string name="title_folder_name">Nazwa folderu</string>
   <string name="title_display_name">Nazwa wyświetlana</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_hide_folder">Ukryj z listy</string>
+  <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_unified_folder">Pokaż we wspólnej skrzynce odbiorczej</string>
   <string name="title_after">Synchronizuj (dni)</string>
@@ -170,7 +172,7 @@
   <string name="title_moving">Przenoszenie wiadomości do %1$s</string>
   <string name="title_no_viewer">Brak aplikacji do podglądu %1$s</string>
   <string name="title_attachment_saved">Załącznik zapisany</string>
-  <string name="title_attachment_unavailable">Some attachments are not downloaded and will not be forwarded, continue?</string>
+  <string name="title_attachment_unavailable">Niektóre załączniki nie są pobrane i nie zostaną przekazane, kontynuować?</string>
   <string name="title_ask_delete">Usunąć wiadomość bezpowrotnie?</string>
   <string name="title_ask_spam">Zgłosić wiadomość jako spam?</string>
   <string name="title_compose">Napisz</string>
@@ -197,7 +199,7 @@
   <string name="title_draft_saved">Szkic zapisany</string>
   <string name="title_queued">Wysyłanie wiadomości</string>
   <string name="title_search">Szukaj</string>
-  <string name="title_search_hint">Search on server</string>
+  <string name="title_search_hint">Szukaj na serwerze</string>
   <string name="title_searching">Szukam \'%1$s\'</string>
   <string name="title_sort_on">Sortuj wg</string>
   <string name="title_sort_on_time">Czas</string>
@@ -226,7 +228,7 @@
   <string name="title_hint_folder_actions">Przytrzymaj, aby uzyskać więcej opcji</string>
   <string name="title_hint_support">Jeśli masz pytanie lub problem, użyj menu Pomoc, aby uzyskać pomoc</string>
   <string name="title_hint_message_actions">Przesuń w lewo do kosza; przesuń w prawo do archiwum (jeśli są dostępne); długie naciśnięcie, aby oznaczyć przeczytane/nieprzeczytane lub dodać/usunąć gwiazdkę</string>
-  <string name="title_hint_sync">Downloading messages can take some time, depending on the number of messages, the speed of your internet connection and your email provider</string>
+  <string name="title_hint_sync">Pobieranie wiadomości może zająć trochę czasu, w zależności od liczby wiadomości, prędkości połączenia internetowego oraz dostawcy poczty e-mail</string>
   <string name="title_open_link">Otwórz link</string>
   <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
   <string name="title_issue">Masz pytanie lub problem?</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 349864b4..e9268cde 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Editar identidade</string>
   <string name="title_edit_folder">Editar pasta</string>
   <string name="title_setup">Configurar</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Gerenciar contas</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index adb3b873..a84c5cb0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -46,8 +46,10 @@
   <string name="title_edit_identity">Editare identitate</string>
   <string name="title_edit_folder">Editare dosar</string>
   <string name="title_setup">Setări</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Importă setări</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">Setări exportate</string>
   <string name="title_setup_imported">Setări importate</string>
   <string name="title_setup_account">Gestionarea conturilor</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5795fbb5..9e22ba8b 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0374ce32..e2d7a299 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -46,8 +46,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 107faa89..ee8ea20d 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index f87b2f9a..d67b3630 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -42,8 +42,10 @@
   <string name="title_edit_identity">Kimliği düzenle</string>
   <string name="title_edit_folder">Klasörü düzenle</string>
   <string name="title_setup">Kurulum</string>
-  <string name="title_setup_export">Export settings (no passwords)</string>
+  <string name="title_setup_export">Export settings</string>
   <string name="title_setup_import">Ayarları İçe Aktar</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">Ayarları dışa aktarıldı</string>
   <string name="title_setup_imported">Ayarları içe aktarıldı</string>
   <string name="title_setup_account">Hesapları Yönet</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5795fbb5..9e22ba8b 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -50,8 +50,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 7470d74d..d8215556 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -38,8 +38,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index d4f811a5..9b19859f 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -38,8 +38,10 @@
   <string name="title_edit_identity">编辑身份</string>
   <string name="title_edit_folder">编辑文件夹</string>
   <string name="title_setup">设置</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">管理账户</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 7470d74d..d8215556 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -38,8 +38,10 @@
   <string name="title_edit_identity">Edit identity</string>
   <string name="title_edit_folder">Edit folder</string>
   <string name="title_setup">Setup</string>
-  <string name="title_setup_export">Export settings (no passwords)</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_account">Manage accounts</string>