diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 25127a35d5..c2e9807872 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -206,7 +206,6 @@
     <string name="title_setup_close">Zavřít nastavení</string>
     <string name="title_setup_export">Export nastavení</string>
     <string name="title_setup_import">Import nastavení</string>
-    <string name="title_setup_export_do">Heslo slouží k zašifrování nastavení a je vyžadováno pro jeho zpětný import</string>
     <string name="title_setup_import_do">Importované účty budou přidány bez přepsání stávajících účtů</string>
     <string name="title_setup_password">Heslo</string>
     <string name="title_setup_password_chars">Heslo obsahuje řídící znaky či mezery</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 36b843729d..9f23eb8478 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -186,7 +186,6 @@
     <string name="title_setup_close">Luk indstillinger</string>
     <string name="title_setup_export">Eksportindstillinger</string>
     <string name="title_setup_import">Importindstillinger</string>
-    <string name="title_setup_export_do">Adgangskoden bruges til at kryptere indstillingerne og kræves for at genimportere dem</string>
     <string name="title_setup_import_do">Importerede konti tilføjes uden at overskrive eksisterende ditto</string>
     <string name="title_setup_password">Adgangskode</string>
     <string name="title_setup_password_chars">Adgangskode indeholder kontrol- eller mellemrumstegn</string>
@@ -938,7 +937,7 @@
     <string name="title_style_font">Skrifttype</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Blokcitat</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Indrykning</string>
+    <string name="title_style_indentation">Indrykning</string>
     <string name="title_style_strikethrough">Gennemstreget</string>
     <string name="title_style_clear">Ryd formatering</string>
     <string name="title_style_link">Indsæt link</string>
diff --git a/app/src/main/res/values-de-rAT/strings.xml b/app/src/main/res/values-de-rAT/strings.xml
index ac3fedb874..4447711e97 100644
--- a/app/src/main/res/values-de-rAT/strings.xml
+++ b/app/src/main/res/values-de-rAT/strings.xml
@@ -192,7 +192,6 @@
     <string name="title_setup_close">Einstellungen schließen</string>
     <string name="title_setup_export">Einstellungen exportieren</string>
     <string name="title_setup_import">Einstellungen importieren</string>
-    <string name="title_setup_export_do">Das Passwort wird verwendet, um die Einstellungen zu verschlüsseln und ist notwendig, um die Einstellungen erneut zu importieren</string>
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, ohne vorhandene zu überschreiben</string>
     <string name="title_setup_password">Passwort</string>
     <string name="title_setup_password_chars">Passwort enthält Steuer- oder Leerzeichen</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Schriftart</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Zitatblock</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Einrückung</string>
+    <string name="title_style_indentation">Einrückung</string>
     <string name="title_style_strikethrough">Durchgestrichen</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link hinzufügen</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index bee9924d38..33343d6014 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -192,7 +192,6 @@
     <string name="title_setup_close">Einstellungen schließen</string>
     <string name="title_setup_export">Einstellungen exportieren</string>
     <string name="title_setup_import">Einstellungen importieren</string>
-    <string name="title_setup_export_do">Das Passwort wird verwendet, um die Einstellungen zu verschlüsseln und ist notwendig, um die Einstellungen erneut zu importieren</string>
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, ohne vorhandene zu überschreiben</string>
     <string name="title_setup_password">Passwort</string>
     <string name="title_setup_password_chars">Passwort enthält Steuer- oder Leerzeichen</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Schriftart</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Zitatblock</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Einrückung</string>
+    <string name="title_style_indentation">Einrückung</string>
     <string name="title_style_strikethrough">Durchgestrichen</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link einfügen</string>
diff --git a/app/src/main/res/values-de-rLI/strings.xml b/app/src/main/res/values-de-rLI/strings.xml
index 36071a1d77..c8a00ad78f 100644
--- a/app/src/main/res/values-de-rLI/strings.xml
+++ b/app/src/main/res/values-de-rLI/strings.xml
@@ -192,7 +192,6 @@
     <string name="title_setup_close">Einstellungen schließen</string>
     <string name="title_setup_export">Einstellungen exportieren</string>
     <string name="title_setup_import">Einstellungen importieren</string>
-    <string name="title_setup_export_do">Das Passwort wird verwendet, um die Einstellungen zu verschlüsseln und ist notwendig, um die Einstellungen erneut zu importieren</string>
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, ohne vorhandene zu überschreiben</string>
     <string name="title_setup_password">Passwort</string>
     <string name="title_setup_password_chars">Passwort enthält Steuer- oder Leerzeichen</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Schriftart</string>
     <string name="title_style_font_default">Standard</string>
     <string name="title_style_blockquote">Zitatblock</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Einrückung</string>
+    <string name="title_style_indentation">Einrückung</string>
     <string name="title_style_strikethrough">Durchgestrichen</string>
     <string name="title_style_clear">Formatierung entfernen</string>
     <string name="title_style_link">Link hinzufügen</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 15f858443f..4a25de810e 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -191,7 +191,6 @@
     <string name="title_setup_close">Κλείσιμο ρυθμίσεων</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_password">Κωδικός πρόσβασης</string>
     <string name="title_setup_password_chars">Ο κωδικός πρόσβασης περιέχει χαρακτήρες ελέγχου ή διαστήματα</string>
@@ -959,7 +958,7 @@
     <string name="title_style_font">Γραμματοσειρά</string>
     <string name="title_style_font_default">Προεπιλογή</string>
     <string name="title_style_blockquote">Παράθεμα με εσοχή</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Εσοχή</string>
+    <string name="title_style_indentation">Εσοχή</string>
     <string name="title_style_strikethrough">Διακριτή διαγραφή</string>
     <string name="title_style_clear">Εκκαθάριση μορφοποίησης</string>
     <string name="title_style_link">Εισαγωγή συνδέσμου</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index fdf2cdef10..001dd64ff5 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -191,7 +191,6 @@
     <string name="title_setup_close">Cerrar ajustes</string>
     <string name="title_setup_export">Exportar ajustes</string>
     <string name="title_setup_import">Importar ajustes</string>
-    <string name="title_setup_export_do">La contraseña se utiliza para cifrar la configuración y es necesaria para importar la configuración de nuevo</string>
     <string name="title_setup_import_do">Las cuentas importadas serán añadidas sin sobreescribir las existentes</string>
     <string name="title_setup_password">Contraseña</string>
     <string name="title_setup_password_chars">La contraseña contiene caracteres de control o espacios en blanco</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Fuente</string>
     <string name="title_style_font_default">Por defecto</string>
     <string name="title_style_blockquote">Citar en bloque</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Sangría</string>
+    <string name="title_style_indentation">Sangría</string>
     <string name="title_style_strikethrough">Tachado</string>
     <string name="title_style_clear">Quitar formato</string>
     <string name="title_style_link">Insertar enlace</string>
diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml
index 9eb6e097b5..50905e5595 100644
--- a/app/src/main/res/values-fi-rFI/strings.xml
+++ b/app/src/main/res/values-fi-rFI/strings.xml
@@ -185,7 +185,6 @@
     <string name="title_setup_close">Sulje asetukset</string>
     <string name="title_setup_export">Vie asetukset</string>
     <string name="title_setup_import">Tuo asetukset</string>
-    <string name="title_setup_export_do">Salasanaa käytetään asetusten salaukseen, ja sitä tarvitaan asetusten tuomiseen uudelleen</string>
     <string name="title_setup_import_do">Tuodut tilit lisätään korvaamatta olemassa olevia</string>
     <string name="title_setup_password">Salasana</string>
     <string name="title_setup_password_chars">Salasana sisältää ohjaus- tai tyhjätilamerkkejä</string>
diff --git a/app/src/main/res/values-fr-rCA/strings.xml b/app/src/main/res/values-fr-rCA/strings.xml
index bd0569f5fd..589b13dc8b 100644
--- a/app/src/main/res/values-fr-rCA/strings.xml
+++ b/app/src/main/res/values-fr-rCA/strings.xml
@@ -191,7 +191,6 @@
     <string name="title_setup_close">Fermer les paramètres</string>
     <string name="title_setup_export">Exporter les paramètres</string>
     <string name="title_setup_import">Importer les paramètres</string>
-    <string name="title_setup_export_do">Le mot de passe est utilisé pour chiffrer les paramètres et est nécessaire pour importer les paramètres à nouveau</string>
     <string name="title_setup_import_do">Les comptes importés seront ajoutés sans remplacer les comptes existants</string>
     <string name="title_setup_password">Mot de passe</string>
     <string name="title_setup_password_chars">Le mot de passe contient des caractères de contrôle ou des espaces</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Police de caractères</string>
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_blockquote">Bloc de citation</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Retrait</string>
+    <string name="title_style_indentation">Retrait</string>
     <string name="title_style_strikethrough">Barré</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 9f8640c4d2..3a90e399b6 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -191,7 +191,6 @@
     <string name="title_setup_close">Fermer les paramètres</string>
     <string name="title_setup_export">Exporter les paramètres</string>
     <string name="title_setup_import">Importer les paramètres</string>
-    <string name="title_setup_export_do">Le mot de passe est utilisé pour chiffrer les paramètres et est nécessaire pour importer les paramètres à nouveau</string>
     <string name="title_setup_import_do">Les comptes importés seront ajoutés sans remplacer les comptes existants</string>
     <string name="title_setup_password">Mot de passe</string>
     <string name="title_setup_password_chars">Le mot de passe contient des caractères de contrôle ou des espaces</string>
@@ -962,7 +961,7 @@
     <string name="title_style_font">Police de caractères</string>
     <string name="title_style_font_default">Par défaut</string>
     <string name="title_style_blockquote">Bloc de citation</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Retrait</string>
+    <string name="title_style_indentation">Retrait</string>
     <string name="title_style_strikethrough">Barré</string>
     <string name="title_style_clear">Effacer la mise en forme</string>
     <string name="title_style_link">Insérer un lien</string>
diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml
index eb806bb065..e477044e3e 100644
--- a/app/src/main/res/values-fy-rNL/strings.xml
+++ b/app/src/main/res/values-fy-rNL/strings.xml
@@ -180,7 +180,6 @@
     <string name="title_setup_close">Slut ynstellings</string>
     <string name="title_setup_export">Ynstellings eksportearje</string>
     <string name="title_setup_import">Ynstellings ymportearje</string>
-    <string name="title_setup_export_do">It kaaiwurd wurdt brûkt om de ynstellings te fersiferjen en is nedich om de ynstellings wer te ûntsiferjen</string>
     <string name="title_setup_import_do">Ymporteare akkounts sille tafoege wurde sûnder besteande oerskriuwe</string>
     <string name="title_setup_password">Wachtwurd</string>
     <string name="title_setup_password_chars">Wachtwurd befettet karakters foar kontrôle as spaasjes</string>
diff --git a/app/src/main/res/values-gl-rES/strings.xml b/app/src/main/res/values-gl-rES/strings.xml
index 20a57f74f3..2e08d2c631 100644
--- a/app/src/main/res/values-gl-rES/strings.xml
+++ b/app/src/main/res/values-gl-rES/strings.xml
@@ -179,7 +179,6 @@
     <string name="title_setup_close">Pechar configuración</string>
     <string name="title_setup_export">Exportar axustes</string>
     <string name="title_setup_import">Importar axustes</string>
-    <string name="title_setup_export_do">O contrasinal úsase para cifrar a configuración e necesítase para importala de novo</string>
     <string name="title_setup_import_do">As contas importadas engadiranse sen sobrescribir as existentes</string>
     <string name="title_setup_password">Contrasinal</string>
     <string name="title_setup_password_chars">O contrasinal contén caracteres de control ou espazos</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index ad52eed301..31e1862d01 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -176,7 +176,6 @@
     <string name="title_setup_configuring">Felhasználói fiók beállítása &#8230;</string>
     <string name="title_setup_export">Beállítások exportálása</string>
     <string name="title_setup_import">Beállítások importálása</string>
-    <string name="title_setup_export_do">A jelszó a beállítások titkosítására használt és szükséges a beállítások importálásához</string>
     <string name="title_setup_import_do">Az importált kapcsolatok hozzáadása során nem módosulnak a meglévőek</string>
     <string name="title_setup_password">Jelszó</string>
     <string name="title_setup_password_chars">A jelszó vezérlő vagy szóköz karaktert tartalmaz</string>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
index 87ed9a8348..83d7b80fec 100644
--- a/app/src/main/res/values-in-rID/strings.xml
+++ b/app/src/main/res/values-in-rID/strings.xml
@@ -171,7 +171,6 @@
     <string name="title_setup_close">Tutup pengaturan</string>
     <string name="title_setup_export">Ekspor Pengaturan</string>
     <string name="title_setup_import">Impor Pengaturan</string>
-    <string name="title_setup_export_do">Kata sandi digunakan untuk mengenkripsi pengaturan dan diperlukan untuk mengimpor pengaturan lagi</string>
     <string name="title_setup_import_do">Akun yang diimpor akan ditambahkan tanpa menimpa akun yang sudah ada</string>
     <string name="title_setup_password">Kata Sandi</string>
     <string name="title_setup_password_chars">Kata sandi mengandung karakter kontrol atau spasi</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index ffc1751232..c7b60516d5 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -130,6 +130,8 @@
     <string name="title_setup_wizard_multiple">La procedura guidata è utilizzabile diverse volte per configurare più profili</string>
     <string name="title_setup_wizard_new">Mi serve un nuovo indirizzo email</string>
     <string name="title_setup_manual">Configurazione manuale e opzioni del profilo</string>
+    <string name="title_setup_classic">Configurazione classica</string>
+    <string name="title_setup_documentation">Sei pregato di consultare la documentazione del tuo provider email per la corretta configurazione del server email</string>
     <string name="title_setup_account_remark">Ricevi email</string>
     <string name="title_setup_identity_remark">Invia email</string>
     <string name="title_setup_account_identity_hint">Puoi configurare il nome, il colore e le azioni di scorrimento nelle impostazioni del profilo, e configurare una firma nelle impostazioni dell\'identità</string>
@@ -189,7 +191,6 @@
     <string name="title_setup_close">Chiudi le impostazioni</string>
     <string name="title_setup_export">Impostazioni di esportazione</string>
     <string name="title_setup_import">Importa impostazioni</string>
-    <string name="title_setup_export_do">La password è usata per crittografare le impostazioni ed è necessaria per reimportare le impostazioni</string>
     <string name="title_setup_import_do">I profili importati saranno aggiunti senza sovrascriverne alcuno esistente</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_chars">La password contiene caratteri di controllo o spazi vuoti</string>
@@ -960,6 +961,7 @@
     <string name="title_style_font">Carattere</string>
     <string name="title_style_font_default">Predefinito</string>
     <string name="title_style_blockquote">Citazione in blocco</string>
+    <string name="title_style_indentation">Rientro</string>
     <string name="title_style_strikethrough">Barrato</string>
     <string name="title_style_clear">Cancella formattazione</string>
     <string name="title_style_link">Inserisci link</string>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml
index ca863a080f..c8f7be1458 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja-rJP/strings.xml
@@ -180,7 +180,6 @@
     <string name="title_setup_close">設定を閉じる</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_password">パスワード</string>
     <string name="title_setup_password_chars">パスワードに制御文字又は空白が含まれています</string>
@@ -950,7 +949,7 @@
     <string name="title_style_font">フォント</string>
     <string name="title_style_font_default">デフォルト</string>
     <string name="title_style_blockquote">ブロック引用</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">インデント</string>
+    <string name="title_style_indentation">インデント</string>
     <string name="title_style_strikethrough">取り消し線</string>
     <string name="title_style_clear">書式をクリア</string>
     <string name="title_style_link">リンクを挿入</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 17f8c987f8..49d0537102 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -191,7 +191,9 @@
     <string name="title_setup_close">Sluit instellingen</string>
     <string name="title_setup_export">Exporteer instellingen</string>
     <string name="title_setup_import">Importeer instellingen</string>
-    <string name="title_setup_export_do">Het wachtwoord wordt gebruikt om de instellingen te versleutelen en is vereist om de instellingen opnieuw te importeren</string>
+    <string name="title_setup_export_remark">        Omdat het instellingenbestand alle instellingen en accountinformatie bevat, is het versleuteld met een wachtwoord.
+        Het wachtwoord is vereist om de instellingen opnieuw te importeren, dus vergeet het niet!
+    </string>
     <string name="title_setup_import_do">Geïmporteerde accounts worden toegevoegd zonder de bestaande te overschrijven</string>
     <string name="title_setup_password">Wachtwoord</string>
     <string name="title_setup_password_chars">Wachtwoord bevat controle of witruimte tekens</string>
@@ -962,7 +964,7 @@
     <string name="title_style_font">Lettertype</string>
     <string name="title_style_font_default">Standaard</string>
     <string name="title_style_blockquote">Blokcitaat</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Inspringing</string>
+    <string name="title_style_indentation">Inspringing</string>
     <string name="title_style_strikethrough">Doorhalen</string>
     <string name="title_style_clear">Opmaak wissen</string>
     <string name="title_style_link">Koppeling invoegen</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 9badcacfa9..fc5a850c90 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -149,6 +149,8 @@
     <string name="title_setup_wizard_multiple">Kreator może być używany wielokrotnie, aby skonfigurować wiele kont</string>
     <string name="title_setup_wizard_new">Potrzebujesz nowego adresu e-mail?</string>
     <string name="title_setup_manual">Ręczna konfiguracja i opcje konta</string>
+    <string name="title_setup_classic">Konfiguracja klasyczna</string>
+    <string name="title_setup_documentation">Sprawdź dokumentację dostawcy poczty e-mail w celu uzyskania poprawnej konfiguracji serwera e-mail</string>
     <string name="title_setup_account_remark">Odbieranie wiadomości e-mail</string>
     <string name="title_setup_identity_remark">Wysyłanie wiadomości e-mail</string>
     <string name="title_setup_account_identity_hint">Możesz skonfigurować nazwę, kolor i akcje przesuwania w ustawieniach konta oraz skonfigurować podpis w ustawieniach tożsamości</string>
@@ -208,7 +210,6 @@
     <string name="title_setup_close">Zamknij ustawienia</string>
     <string name="title_setup_export">Eksport ustawień</string>
     <string name="title_setup_import">Import ustawień</string>
-    <string name="title_setup_export_do">Hasło służy do szyfrowania ustawień i jest wymagane do ponownego zaimportowania ustawień</string>
     <string name="title_setup_import_do">Zaimportowane konta zostaną dodane bez nadpisywania istniejących</string>
     <string name="title_setup_password">Hasło</string>
     <string name="title_setup_password_chars">Hasło zawiera znaki kontrolne lub znaki spacji</string>
@@ -979,6 +980,7 @@
     <string name="title_style_font">Czcionka</string>
     <string name="title_style_font_default">Domyślny</string>
     <string name="title_style_blockquote">Zablokuj cytat</string>
+    <string name="title_style_indentation">Wcięcie</string>
     <string name="title_style_strikethrough">Przekreślenie</string>
     <string name="title_style_clear">Wyczyść formatowanie</string>
     <string name="title_style_link">Wstaw link</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index c507e3d298..b7bb3c68f6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -185,7 +185,6 @@
     <string name="title_setup_close">Fechar configurações</string>
     <string name="title_setup_export">Exportar configurações</string>
     <string name="title_setup_import">Importar configurações</string>
-    <string name="title_setup_export_do">A senha é usada para criptografar as configurações e é necessária para importar as configurações novamente</string>
     <string name="title_setup_import_do">As contas importadas serão adicionadas sem sobrescrever as existentes</string>
     <string name="title_setup_password">Senha</string>
     <string name="title_setup_password_chars">A senha contém caracteres de controle ou espaço em branco</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 886ef93421..1953e57e19 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -174,7 +174,6 @@
     <string name="title_setup_configuring">A configurar conta &#8230;</string>
     <string name="title_setup_export">Exportar definições</string>
     <string name="title_setup_import">Importar definições</string>
-    <string name="title_setup_export_do">A senha é usada para encriptar as configurações e é necessária para importar as configurações novamente</string>
     <string name="title_setup_import_do">Contas importadas serão adicionadas sem sobrescrever as já existentes</string>
     <string name="title_setup_password">Palavra-passe</string>
     <string name="title_setup_password_chars">A senha contém caractéres de controle ou espaços em branco</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index eabea64273..9750a3a46c 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -201,7 +201,6 @@
     <string name="title_setup_close">Închideți setările</string>
     <string name="title_setup_export">Exportă setări</string>
     <string name="title_setup_import">Importă setări</string>
-    <string name="title_setup_export_do">Parola este folosită pentru a cripta setările și este necesară pentru a importa din nou setările</string>
     <string name="title_setup_import_do">Conturile importate vor fi adăugate fără a suprascrie pe cele existente</string>
     <string name="title_setup_password">Parolă</string>
     <string name="title_setup_password_chars">Parola conține caractere nule sau de control</string>
@@ -972,7 +971,7 @@
     <string name="title_style_font">Font</string>
     <string name="title_style_font_default">Implicit</string>
     <string name="title_style_blockquote">Bloc citat</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Indentare</string>
+    <string name="title_style_indentation">Indentare</string>
     <string name="title_style_strikethrough">Tăiat</string>
     <string name="title_style_clear">Elimină toate formatările</string>
     <string name="title_style_link">Inserare legătură</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index 483254e89c..d999875292 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -211,7 +211,6 @@
     <string name="title_setup_close">Выйти из настроек</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_password">Пароль</string>
     <string name="title_setup_password_chars">Пароль содержит управляющие символы или пробелы</string>
@@ -982,7 +981,7 @@
     <string name="title_style_font">Шрифт</string>
     <string name="title_style_font_default">По умолчанию</string>
     <string name="title_style_blockquote">Блок цитаты</string>
-    <string name="title_style_indentation" comment="title_style_indentation&#10;Title for style menu item to ident text">Отступ</string>
+    <string name="title_style_indentation">Отступ</string>
     <string name="title_style_strikethrough">Зачёркнутый</string>
     <string name="title_style_clear">Очистить форматирование</string>
     <string name="title_style_link">Вставить ссылку</string>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index b9079ec176..375f7587c8 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -206,7 +206,6 @@
     <string name="title_setup_close">Zavrieť nastavenia</string>
     <string name="title_setup_export">Exportovať nastavenia</string>
     <string name="title_setup_import">Importovať nastavenia</string>
-    <string name="title_setup_export_do">Heslo sa použije na zašifrovanie nastavení a bude opäť vyžadované počas importu</string>
     <string name="title_setup_import_do">Importované účty budú pridané bez prepísania existujúcich účtov</string>
     <string name="title_setup_password">Heslo</string>
     <string name="title_setup_password_chars">Heslo obsahuje riadiace alebo prázdne znaky</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index 6422b1fb29..aa06667b6e 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -178,7 +178,6 @@
     <string name="title_setup_configuring">Konfigurerar konto &#8230;</string>
     <string name="title_setup_export">Exportera inställningar</string>
     <string name="title_setup_import">Importera inställningar</string>
-    <string name="title_setup_export_do">Lösenordet används för att kryptera inställningarna och krävs för att importera inställningarna igen</string>
     <string name="title_setup_import_do">Importerade konton kommer att läggas till utan att skriva över några befintliga</string>
     <string name="title_setup_password">Lösenord</string>
     <string name="title_setup_password_chars">Lösenordet innehåller CTRL- eller blanksteg</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index e3fa75a748..8731c6706f 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -188,7 +188,6 @@
     <string name="title_setup_close">Ayarları kapat</string>
     <string name="title_setup_export">Ayarları dışa aktar</string>
     <string name="title_setup_import">Ayarları içe aktar</string>
-    <string name="title_setup_export_do">Parola, ayarları şifrelemek için kullanılır ve ayarları yeniden içe aktarmak için gereklidir</string>
     <string name="title_setup_import_do">İçe aktarılan hesaplar varolan hesapların üzerine yazılmadan eklenecek</string>
     <string name="title_setup_password">Parola</string>
     <string name="title_setup_password_chars">Parola, kontrol veya boşluk karakterleri içeriyor</string>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
index a57e6011dc..f5b35c1b88 100644
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ b/app/src/main/res/values-uk-rUA/strings.xml
@@ -138,6 +138,8 @@
     <string name="title_setup_wizard_multiple">Майстер можна використати кілька разів, щоб налаштувати кілька облікових записів</string>
     <string name="title_setup_wizard_new">Вкажіть нову електронну адресу</string>
     <string name="title_setup_manual">Налаштування вручну та параметри облікового запису</string>
+    <string name="title_setup_classic">Класична конфігурація</string>
+    <string name="title_setup_documentation">Перегляньте документацію свого постачальника пошти для правильної конфігурації сервера електронної пошти</string>
     <string name="title_setup_account_remark">Отримання email</string>
     <string name="title_setup_identity_remark">Надсилання email</string>
     <string name="title_setup_account_identity_hint">Ви можете налаштувати ім\'я, колір і свайп дії в налаштуваннях облікового запису та налаштувати підпис в налаштуваннях ідентифікації</string>
@@ -197,7 +199,6 @@
     <string name="title_setup_close">Закрити налаштування</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_password">Пароль</string>
     <string name="title_setup_password_chars">Пароль містить елементи керування або пробіли</string>
@@ -967,6 +968,7 @@
     <string name="title_style_font">Шрифт</string>
     <string name="title_style_font_default">За замовчанням</string>
     <string name="title_style_blockquote">Цитата</string>
+    <string name="title_style_indentation">Відступ</string>
     <string name="title_style_strikethrough">Закреслений</string>
     <string name="title_style_clear">Очистити форматування</string>
     <string name="title_style_link">Вставити посилання</string>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml
index f61c5e6a00..1b23bb60f2 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi-rVN/strings.xml
@@ -179,7 +179,6 @@
     <string name="title_setup_close">Đóng cài đặt</string>
     <string name="title_setup_export">Xuất cài đặt</string>
     <string name="title_setup_import">Nhập cài đặt</string>
-    <string name="title_setup_export_do">Mật khẩu này được sử dụng để mã hoá cài đặt và được yêu cầu để nhập cài đặt lại</string>
     <string name="title_setup_import_do">Các tài khoản được nhập sẽ được thêm mà không ghi đè lên bất kỳ tài khoản đang tồn tại nào</string>
     <string name="title_setup_password">Mật khẩu</string>
     <string name="title_setup_password_chars">Mật khẩu chứa ký tự điều khiển hoặc không gian trắng</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 333b85f4e5..17af762f99 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -177,7 +177,6 @@
     <string name="title_setup_close">关闭设置</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_password">密码</string>
     <string name="title_setup_password_chars">密码包含控制字符或空格字符</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 763585a01e..143a9fc489 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -177,7 +177,6 @@
     <string name="title_setup_close">關閉設定</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_password">密碼</string>
     <string name="title_setup_password_chars">密碼包含空白字元</string>