diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index 2fa01d685d..bbf3c3fab4 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -76,7 +76,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
     <string name="title_setup_account">إدارة الحسابات</string>
@@ -303,7 +305,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">التراجع عن</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">هذه ميزة برو</string>
     <string name="title_pro_list">قائمة ميزات برو</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index 2fa01d685d..bbf3c3fab4 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -76,7 +76,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
     <string name="title_setup_account">إدارة الحسابات</string>
@@ -303,7 +305,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">التراجع عن</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">هذه ميزة برو</string>
     <string name="title_pro_list">قائمة ميزات برو</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index 2fa01d685d..bbf3c3fab4 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -76,7 +76,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
     <string name="title_setup_account">إدارة الحسابات</string>
@@ -303,7 +305,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">التراجع عن</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">هذه ميزة برو</string>
     <string name="title_pro_list">قائمة ميزات برو</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index 2fa01d685d..bbf3c3fab4 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -76,7 +76,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
     <string name="title_setup_account">إدارة الحسابات</string>
@@ -303,7 +305,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">التراجع عن</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">هذه ميزة برو</string>
     <string name="title_pro_list">قائمة ميزات برو</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 2fa01d685d..bbf3c3fab4 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -76,7 +76,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">إعدادات تصدير</string>
     <string name="title_setup_imported">استيراد إعدادات</string>
     <string name="title_setup_account">إدارة الحسابات</string>
@@ -303,7 +305,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">التراجع عن</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">هذه ميزة برو</string>
     <string name="title_pro_list">قائمة ميزات برو</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index 34a97c9202..b75bc317f4 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -31,10 +31,10 @@
     </plurals>
     <string name="title_notification_failed">\'%1$s\' uğursuz oldu</string>
     <string name="menu_setup">Quraşdırma</string>
-    <string name="menu_answers">Templates</string>
+    <string name="menu_answers">Şablonlar</string>
     <string name="menu_operations">Əməliyyatlar</string>
     <string name="menu_legend">Mənalar</string>
-    <string name="menu_faq">Support</string>
+    <string name="menu_faq">Dəstək</string>
     <string name="menu_pro">Pro xüsusiyyətlər</string>
     <string name="menu_privacy">Gizlilik</string>
     <string name="menu_about">Haqqında</string>
@@ -54,9 +54,11 @@
     <string name="title_setup_export">Tənzimləmələri ixrac et</string>
     <string name="title_setup_import">Tənzimləmələri idxal et</string>
     <string name="title_setup_import_do">İdxal edilmiş hesablar əlavə ediləcək, üzərinə yazılmayacaq</string>
-    <string name="title_setup_password">Password</string>
-    <string name="title_setup_password_repeat">Repeat password</string>
-    <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password">Şifrə</string>
+    <string name="title_setup_password_repeat">Şifrəni təkrarla</string>
+    <string name="title_setup_password_missing">Password missing</string>
+    <string name="title_setup_password_different">Şifrələr fərqlidir</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">Tənzimləmələr ixrac edildi</string>
     <string name="title_setup_imported">Tənzimləmələr idxal edildi</string>
     <string name="title_setup_account">Hesabları idarә et</string>
@@ -85,7 +87,7 @@
     <string name="title_advanced_browse">Serverdəki mesajlara nəzər yetir</string>
     <string name="title_advanced_swipe">Sürüşdürmə hərəkətləri</string>
     <string name="title_advanced_nav">Əvvəlki/növbəti naviqasiya</string>
-    <string name="title_advanced_confirm">Confirm actions that might leak privacy sensitive information</string>
+    <string name="title_advanced_confirm">Gizlilik həssaslı məlumatların sızmasına səbəb ola biləcək hərəkətləri təsdiqlə</string>
     <string name="title_advanced_sender">Göndərənin ünvanına düzəlişə icazə ver</string>
     <string name="title_advanced_sender_hint">Bir çox təchizatçı göndərən ünvanını dəyişdirməyə icazə vermir</string>
     <string name="title_advanced_download">Mesajları və qoşmaları ölçülmüş bağlantıda avtomatik endir</string>
@@ -118,7 +120,7 @@
     <string name="title_authorizing">Hesaba səlahiyyət verilir &#8230;</string>
     <string name="title_setup_advanced">Qabaqcıl</string>
     <string name="title_store_sent">Göndərilən mesajları saxla (normalda ehtiyac yoxdur)</string>
-    <string name="title_store_copy">Store a copy of sent messages in:</string>
+    <string name="title_store_copy">Göndərilmiş mesajların bir nüsxəsini saxlayacaq yer seçin:</string>
     <string name="title_synchronize_account">Eyniləşdir (mesajları al)</string>
     <string name="title_synchronize_identity">Eyniləşdir (mesajları göndər)</string>
     <string name="title_primary_account">Üstünlük verilən (ilkin hesab)</string>
@@ -152,8 +154,8 @@
     <string name="title_show_folders">Gizli qovluqları göstər</string>
     <string name="title_synchronize_folder">Eyniləşdir (mesajları al)</string>
     <string name="title_unified_folder">Birləşmiş gələn qutusunda göstər</string>
-    <string name="title_sync_days">Synchronize messages (days)</string>
-    <string name="title_keep_days">Keep messages (days)</string>
+    <string name="title_sync_days">Eyniləşdirilmiş mesajlar (gün)</string>
+    <string name="title_keep_days">Saxlanılmış mesajlar (gün)</string>
     <string name="title_folder_exists">%1$s qovluğu mövcuddur</string>
     <string name="title_folder_delete">Qovluğu birdəfəlik silinsin?</string>
     <string name="title_folder_unified">Birləşmiş gələn qutusu</string>
@@ -177,7 +179,7 @@
     <string name="title_flag">Ulduz əlavə et</string>
     <string name="title_unflag">Ulduzu çıxart</string>
     <string name="title_forward">Yönləndir</string>
-    <string name="title_forward_raw">Forward raw</string>
+    <string name="title_forward_raw">Yönləndirmə sətri</string>
     <string name="title_reply_all">Hamısını cavabla</string>
     <string name="title_show_headers">Başlıqları göstər</string>
     <string name="title_show_html">Həqiqisini göstər</string>
@@ -193,17 +195,17 @@
     <string name="title_no_answers">Heç bir cavab şablonu təyin edilmədi</string>
     <string name="title_no_viewer">%1$s üçün heç bir görüntüləmə tətbiqi yoxdur</string>
     <string name="title_no_saf">Anbar müraciət çərçivəsi mövcud deyil</string>
-    <string name="title_no_contacts">Contact picker not available</string>
+    <string name="title_no_contacts">Şəxs seçici mövcud deyil</string>
     <string name="title_attachment_saved">Qoşma saxlanıldı</string>
     <string name="title_attachment_unavailable">Bəzi qoşmalar endirilmədi və yönləndirilməyəcək, davam edək?</string>
     <string name="title_ask_delete">Mesaj birdəfəlik silinsin?</string>
     <string name="title_ask_delete_selected">Seçilmiş mesajlar birdəfəlik silinsin?</string>
     <string name="title_ask_delete_answer">Cavab şablonu birdəfəlik silinsin?</string>
     <string name="title_ask_discard">Qaralama silinsin?</string>
-    <string name="title_ask_save">Save changes?</string>
+    <string name="title_ask_save">Dəyişikliklər saxlanılsın?</string>
     <string name="title_ask_spam">Mesajı spam kimi bildirilsin?</string>
     <string name="title_ask_show_html">Orijinal mesajın göstərilməsi, gizlilik həssaslı məlumatları sızdıra bilər</string>
-    <string name="title_ask_show_image">Showing images can leak privacy sensitive information</string>
+    <string name="title_ask_show_image">Təsvirlərin göstərilməsi, gizlilik həssaslı məlumatların sızdıra bilər</string>
     <string name="title_fix">Düzəlt</string>
     <string name="title_compose">Yaz</string>
     <string name="title_from">Göndərən:</string>
@@ -283,7 +285,6 @@
     <string name="title_yes">Bəli</string>
     <string name="title_no">Xeyr</string>
     <string name="title_undo">Geri qaytar</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Android üçün açıq mənbəli, gizlilik dostu, e-poçt tətbiqi olan FairEmail-ı sınayın</string>
     <string name="title_pro_feature">Bu Pro xüsusiyyətidir</string>
     <string name="title_pro_list">Pro xüsusiyyətlərinin siyahısı</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 67e7dcbddf..ac4415c559 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Els comptes importats no es sobreescriuran</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">Configuració exportada</string>
     <string name="title_setup_imported">Configuració importada</string>
     <string name="title_setup_account">Gestiona els comptes</string>
@@ -283,7 +285,6 @@
     <string name="title_yes">Sí</string>
     <string name="title_no">No</string>
     <string name="title_undo">Desfés</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Prova FairEmail, una aplicació de correu-e per a Android, de codi obert i que respecta la privacitat</string>
     <string name="title_pro_feature">Això es una característica Pro</string>
     <string name="title_pro_list">Llista de característiques Pro</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 5c6f0ceb4e..7bc4cc4aa9 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 7b73ad008a..e8f2dc697c 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">Dette er en pro funktion</string>
     <string name="title_pro_list">Liste over pro funktioner</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 584c9e2fcf..9727bc1751 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Importierte Konten werden hinzugefügt, nicht überschrieben</string>
     <string name="title_setup_password">Passwort</string>
     <string name="title_setup_password_repeat">Passwort erneut eingeben</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwörter stimmen nicht überein</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Ja</string>
     <string name="title_no">Nein</string>
     <string name="title_undo">Rückgängig</string>
-    <string name="title_canceled">Abgebrochen</string>
     <string name="title_try">Testen Sie FairEmail, eine opensource und datenschutzfreundliche E-Mail-App für Android</string>
     <string name="title_pro_feature">Dies ist eine Pro-Funktion</string>
     <string name="title_pro_list">Liste der Pro-Funktionen</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-en/strings.xml
+++ b/app/src/main/res/values-en/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index c880f6e3d0..613818ba74 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Las Cuentas importadas serán agregadas, no sobreescritas</string>
     <string name="title_setup_password">Contraseña</string>
     <string name="title_setup_password_repeat">Confirmar contraseña</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Las contraseñas no coinciden</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Sí</string>
     <string name="title_no">No</string>
     <string name="title_undo">Deshacer</string>
-    <string name="title_canceled">Cancelado</string>
     <string name="title_try">Pruebe FairEmail, un cliente de correo electrónico para Android de código abierto y enfocado en la privacidad</string>
     <string name="title_pro_feature">Esta es una característica Pro</string>
     <string name="title_pro_list">Lista de características Pro</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index fec3f6e028..5fe5fc59d9 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8ea9ddf890..9e648e2c35 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Les comptes importés seront ajoutés, pas remplacés</string>
     <string name="title_setup_password">Mot de passe</string>
     <string name="title_setup_password_repeat">Confirmer le mot de passe</string>
+    <string name="title_setup_password_missing">Mot de passe manquant</string>
     <string name="title_setup_password_different">Les mots de passe sont différents</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Oui</string>
     <string name="title_no">Non</string>
     <string name="title_undo">Annuler</string>
-    <string name="title_canceled">Annulé</string>
     <string name="title_try">Essayez FairEmail, une application de messagerie pour Android, open source, respectant la vie privée</string>
     <string name="title_pro_feature">Il s’agit d’une fonctionnalité Pro</string>
     <string name="title_pro_list">Liste des fonctionnalités Pro</string>
diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml
index 1153c1d890..bd42689f71 100644
--- a/app/src/main/res/values-he/strings.xml
+++ b/app/src/main/res/values-he/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 6844e7bd90..e80b8c33f0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Az importált fiókok felülírás nélkül lesznek hozzáadva</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">Beállítások exportálva</string>
     <string name="title_setup_imported">Beállítások importálva</string>
     <string name="title_setup_account">Fiókok kezelése</string>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index df2278f88b..7306d28c8f 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Gli account importati saranno aggiunti, non sovrascritti</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Sì</string>
     <string name="title_no">No</string>
     <string name="title_undo">Annulla</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Prova FairEmail, un\'app email per Android open source e rispettosa della privacy</string>
     <string name="title_pro_feature">Questa è una funzionalità a pagamento</string>
     <string name="title_pro_list">Elenco delle funzionalità a pagamento</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 1153c1d890..bd42689f71 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index fa36f8850d..4ebb9e123c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -51,7 +51,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -278,7 +280,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index fa36f8850d..4ebb9e123c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -51,7 +51,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -278,7 +280,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 1ef0ba9661..efbc83dfcf 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Geïmporteerde accounts zullen worden toegevoegd, niet overschreven</string>
     <string name="title_setup_password">Wachtwoord</string>
     <string name="title_setup_password_repeat">Herhaal wachtwoord</string>
+    <string name="title_setup_password_missing">Wachtwoord ontbreekt</string>
     <string name="title_setup_password_different">Wachtwoorden verschillen</string>
+    <string name="title_setup_password_invalid">Wachtwoord ongeldig</string>
     <string name="title_setup_exported">Instellingen geëxporteerd</string>
     <string name="title_setup_imported">Instellingen geïmporteerd</string>
     <string name="title_setup_account">Beheer accounts</string>
@@ -283,7 +285,6 @@
     <string name="title_yes">Ja</string>
     <string name="title_no">Nee</string>
     <string name="title_undo">Ongedaan maken</string>
-    <string name="title_canceled">Geannuleerd</string>
     <string name="title_try">Probeer FairEmail, een open source, privacy vriendelijke e-mail app voor Android</string>
     <string name="title_pro_feature">Dit is een pro-functie</string>
     <string name="title_pro_list">Lijst van pro-functies</string>
diff --git a/app/src/main/res/values-no/strings.xml b/app/src/main/res/values-no/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-no/strings.xml
+++ b/app/src/main/res/values-no/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index d6e311b556..4cb838655f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Zaimportowane konta zostaną dodane, nie nadpisane</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Tak</string>
     <string name="title_no">Nie</string>
     <string name="title_undo">Cofnij</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Wypróbuj FairEmail, przyjazna prywatności aplikacja pocztowa dla Android o otwartym kodzie</string>
     <string name="title_pro_feature">Jest to funkcja pro</string>
     <string name="title_pro_list">Lista funkcji pro</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 1583d6e0ee..8fc53724e6 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 6c43eaf089..674e9c3e47 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 960c9e8b5e..59c6f40c77 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -61,7 +61,9 @@
     <string name="title_setup_import_do">Conturile importate vor fi adăugate, nu suprascrise</string>
     <string name="title_setup_password">Parolă</string>
     <string name="title_setup_password_repeat">Repetă parola</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Parolele sunt diferite</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -288,7 +290,6 @@
     <string name="title_yes">Da</string>
     <string name="title_no">Nu</string>
     <string name="title_undo">Anulează</string>
-    <string name="title_canceled">Anulat</string>
     <string name="title_try">Încearcă FairEmail, o aplicație de e-mail pentru Android cu sursă deschisă, ce protejează intimitatea și confidențialitatea</string>
     <string name="title_pro_feature">Aceasta este o caracteristică Pro</string>
     <string name="title_pro_list">Lista de caracteristici Pro</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 5c6f0ceb4e..7bc4cc4aa9 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index b9c140d963..70d55caaf0 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -61,7 +61,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -288,7 +290,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index cfe096619d..4580f8d72e 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">Importerade konton kommer att läggas till, inte skrivas över</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</string>
     <string name="title_setup_exported">Inställningar exporterade</string>
     <string name="title_setup_imported">Inställningar importerade</string>
     <string name="title_setup_account">Hantera konton</string>
@@ -283,7 +285,6 @@
     <string name="title_yes">Ja</string>
     <string name="title_no">Nej</string>
     <string name="title_undo">Ångra</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Prova FairEmail, en e-postapp för Android med öppen källkod som respekterar din integritet</string>
     <string name="title_pro_feature">Detta är en pro-funktion</string>
     <string name="title_pro_list">Lista över pro-funktioner</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 7009f04a97..51b8191e02 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -56,7 +56,9 @@
     <string name="title_setup_import_do">İçe aktarılan hesaplar eklenecek, üzerine yazılmayacak</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -283,7 +285,6 @@
     <string name="title_yes">Evet</string>
     <string name="title_no">Hayır</string>
     <string name="title_undo">Geri Al</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Android için açık kaynaklı, gizlilik dostu bir e-posta uygulaması olan FairEmail\'i deneyin</string>
     <string name="title_pro_feature">Bu Pro özelliğidir</string>
     <string name="title_pro_list">Pro özelliklerin listesi</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 5c6f0ceb4e..7bc4cc4aa9 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -66,7 +66,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -293,7 +295,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index fa36f8850d..4ebb9e123c 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -51,7 +51,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -278,7 +280,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index f17be73af0..31556f7574 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -22,7 +22,7 @@
         <item quantity="other">%1$d条消息未发送</item>
     </plurals>
     <plurals name="title_tile_unseen">
-        <item quantity="other">%1$d new</item>
+        <item quantity="other">%1$d则新邮件</item>
     </plurals>
     <string name="title_notification_failed">“%1$s”失败</string>
     <string name="menu_setup">设置</string>
@@ -49,9 +49,11 @@
     <string name="title_setup_export">导出设置</string>
     <string name="title_setup_import">导入设置</string>
     <string name="title_setup_import_do">导入的账号将被添加，但不会覆写</string>
-    <string name="title_setup_password">Password</string>
-    <string name="title_setup_password_repeat">Repeat password</string>
-    <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password">密码</string>
+    <string name="title_setup_password_repeat">再次输入密码</string>
+    <string name="title_setup_password_missing">密码缺失</string>
+    <string name="title_setup_password_different">两次输入密码不同</string>
+    <string name="title_setup_password_invalid">密码无效</string>
     <string name="title_setup_exported">设置已导出！</string>
     <string name="title_setup_imported">设置已导入！</string>
     <string name="title_setup_account">管理账户</string>
@@ -147,8 +149,8 @@
     <string name="title_show_folders">显示隐藏的文件夹</string>
     <string name="title_synchronize_folder">同步文件夹（接收）</string>
     <string name="title_unified_folder">在统一的收件箱中显示</string>
-    <string name="title_sync_days">Synchronize messages (days)</string>
-    <string name="title_keep_days">Keep messages (days)</string>
+    <string name="title_sync_days">同步邮件(天)</string>
+    <string name="title_keep_days">保留邮件(天)</string>
     <string name="title_folder_exists">文件夹 %1$s 存在</string>
     <string name="title_folder_delete">是否永久删除文件夹？</string>
     <string name="title_folder_unified">聚合收件箱</string>
@@ -278,7 +280,6 @@
     <string name="title_yes">是</string>
     <string name="title_no">否</string>
     <string name="title_undo">撤销</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">请试下FairEmail吧！一个安卓平台上开源、隐私友好的邮件客户端</string>
     <string name="title_pro_feature">这是专业版功能</string>
     <string name="title_pro_list">专业版功能列表</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fa36f8850d..4ebb9e123c 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -51,7 +51,9 @@
     <string name="title_setup_import_do">Imported accounts will be added, not overwritten</string>
     <string name="title_setup_password">Password</string>
     <string name="title_setup_password_repeat">Repeat password</string>
+    <string name="title_setup_password_missing">Password missing</string>
     <string name="title_setup_password_different">Passwords different</string>
+    <string name="title_setup_password_invalid">Password invalid</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>
@@ -278,7 +280,6 @@
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
     <string name="title_undo">Undo</string>
-    <string name="title_canceled">Canceled</string>
     <string name="title_try">Try FairEmail, an open source, privacy friendly email app for Android</string>
     <string name="title_pro_feature">This is a pro feature</string>
     <string name="title_pro_list">List of pro features</string>