diff --git a/app/src/main/res/values-ar-rBH/strings.xml b/app/src/main/res/values-ar-rBH/strings.xml
index e68a3b907a..890504483c 100644
--- a/app/src/main/res/values-ar-rBH/strings.xml
+++ b/app/src/main/res/values-ar-rBH/strings.xml
@@ -52,16 +52,6 @@
     <string name="title_edit_folder">تعديل المجلد</string>
     <string name="title_setup">الإعداد</string>
     <string name="title_setup_help">المساعدة</string>
-    <string name="title_setup_export">تصدير الإعدادات</string>
-    <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_quick">الإعداد السريع</string>
     <string name="title_setup_quick_imap">خادم IMAP لتلقي الرسائل</string>
     <string name="title_setup_quick_smtp">خادم SMTP لإرسال الرسائل</string>
@@ -79,13 +69,24 @@
     <string name="title_setup_doze_remark">لتلقي البريد الإلكتروني باستمرار (اختياري)</string>
     <string name="title_setup_doze_instructions">في مربع الحوار التالي، حدد \"كافة تطبيقات\" في الجزء العلوي، حدد هذا التطبيق وتحديد وتأكيد \"لا الأمثل\"</string>
     <string name="title_setup_data">تعطيل حفظ البيانات</string>
-    <string name="title_setup_notifications">إدارة الإشعارات</string>
     <string name="title_setup_to_do">للانجاز</string>
     <string name="title_setup_done">تمّ</string>
+    <string name="title_setup_export">تصدير الإعدادات</string>
+    <string name="title_setup_import">استيراد الإعدادات</string>
+    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_notifications">إدارة الإشعارات</string>
     <string name="title_setup_light_theme">سمة فاتحة</string>
     <string name="title_setup_dark_theme">سمة داكنة</string>
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
+    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
@@ -146,7 +147,6 @@
     <string name="title_user">اسم المستخدم</string>
     <string name="title_password">الكلمة السرية</string>
     <string name="title_authorize">اختيار الحساب</string>
-    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_primary_account">الرئيسي (الحساب الافتراضي)</string>
     <string name="title_primary_identity">الرئيسية (الهوية الافتراضية)</string>
     <string name="title_keep_alive_interval">تبقى على قيد الحياة/استطلاع الفاصل الزمني (بالدقائق)</string>
diff --git a/app/src/main/res/values-ar-rEG/strings.xml b/app/src/main/res/values-ar-rEG/strings.xml
index e68a3b907a..890504483c 100644
--- a/app/src/main/res/values-ar-rEG/strings.xml
+++ b/app/src/main/res/values-ar-rEG/strings.xml
@@ -52,16 +52,6 @@
     <string name="title_edit_folder">تعديل المجلد</string>
     <string name="title_setup">الإعداد</string>
     <string name="title_setup_help">المساعدة</string>
-    <string name="title_setup_export">تصدير الإعدادات</string>
-    <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_quick">الإعداد السريع</string>
     <string name="title_setup_quick_imap">خادم IMAP لتلقي الرسائل</string>
     <string name="title_setup_quick_smtp">خادم SMTP لإرسال الرسائل</string>
@@ -79,13 +69,24 @@
     <string name="title_setup_doze_remark">لتلقي البريد الإلكتروني باستمرار (اختياري)</string>
     <string name="title_setup_doze_instructions">في مربع الحوار التالي، حدد \"كافة تطبيقات\" في الجزء العلوي، حدد هذا التطبيق وتحديد وتأكيد \"لا الأمثل\"</string>
     <string name="title_setup_data">تعطيل حفظ البيانات</string>
-    <string name="title_setup_notifications">إدارة الإشعارات</string>
     <string name="title_setup_to_do">للانجاز</string>
     <string name="title_setup_done">تمّ</string>
+    <string name="title_setup_export">تصدير الإعدادات</string>
+    <string name="title_setup_import">استيراد الإعدادات</string>
+    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_notifications">إدارة الإشعارات</string>
     <string name="title_setup_light_theme">سمة فاتحة</string>
     <string name="title_setup_dark_theme">سمة داكنة</string>
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
+    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
@@ -146,7 +147,6 @@
     <string name="title_user">اسم المستخدم</string>
     <string name="title_password">الكلمة السرية</string>
     <string name="title_authorize">اختيار الحساب</string>
-    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_primary_account">الرئيسي (الحساب الافتراضي)</string>
     <string name="title_primary_identity">الرئيسية (الهوية الافتراضية)</string>
     <string name="title_keep_alive_interval">تبقى على قيد الحياة/استطلاع الفاصل الزمني (بالدقائق)</string>
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml
index e68a3b907a..890504483c 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar-rSA/strings.xml
@@ -52,16 +52,6 @@
     <string name="title_edit_folder">تعديل المجلد</string>
     <string name="title_setup">الإعداد</string>
     <string name="title_setup_help">المساعدة</string>
-    <string name="title_setup_export">تصدير الإعدادات</string>
-    <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_quick">الإعداد السريع</string>
     <string name="title_setup_quick_imap">خادم IMAP لتلقي الرسائل</string>
     <string name="title_setup_quick_smtp">خادم SMTP لإرسال الرسائل</string>
@@ -79,13 +69,24 @@
     <string name="title_setup_doze_remark">لتلقي البريد الإلكتروني باستمرار (اختياري)</string>
     <string name="title_setup_doze_instructions">في مربع الحوار التالي، حدد \"كافة تطبيقات\" في الجزء العلوي، حدد هذا التطبيق وتحديد وتأكيد \"لا الأمثل\"</string>
     <string name="title_setup_data">تعطيل حفظ البيانات</string>
-    <string name="title_setup_notifications">إدارة الإشعارات</string>
     <string name="title_setup_to_do">للانجاز</string>
     <string name="title_setup_done">تمّ</string>
+    <string name="title_setup_export">تصدير الإعدادات</string>
+    <string name="title_setup_import">استيراد الإعدادات</string>
+    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_notifications">إدارة الإشعارات</string>
     <string name="title_setup_light_theme">سمة فاتحة</string>
     <string name="title_setup_dark_theme">سمة داكنة</string>
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
+    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
@@ -146,7 +147,6 @@
     <string name="title_user">اسم المستخدم</string>
     <string name="title_password">الكلمة السرية</string>
     <string name="title_authorize">اختيار الحساب</string>
-    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_primary_account">الرئيسي (الحساب الافتراضي)</string>
     <string name="title_primary_identity">الرئيسية (الهوية الافتراضية)</string>
     <string name="title_keep_alive_interval">تبقى على قيد الحياة/استطلاع الفاصل الزمني (بالدقائق)</string>
diff --git a/app/src/main/res/values-ar-rYE/strings.xml b/app/src/main/res/values-ar-rYE/strings.xml
index e68a3b907a..890504483c 100644
--- a/app/src/main/res/values-ar-rYE/strings.xml
+++ b/app/src/main/res/values-ar-rYE/strings.xml
@@ -52,16 +52,6 @@
     <string name="title_edit_folder">تعديل المجلد</string>
     <string name="title_setup">الإعداد</string>
     <string name="title_setup_help">المساعدة</string>
-    <string name="title_setup_export">تصدير الإعدادات</string>
-    <string name="title_setup_import">استيراد الإعدادات</string>
-    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_quick">الإعداد السريع</string>
     <string name="title_setup_quick_imap">خادم IMAP لتلقي الرسائل</string>
     <string name="title_setup_quick_smtp">خادم SMTP لإرسال الرسائل</string>
@@ -79,13 +69,24 @@
     <string name="title_setup_doze_remark">لتلقي البريد الإلكتروني باستمرار (اختياري)</string>
     <string name="title_setup_doze_instructions">في مربع الحوار التالي، حدد \"كافة تطبيقات\" في الجزء العلوي، حدد هذا التطبيق وتحديد وتأكيد \"لا الأمثل\"</string>
     <string name="title_setup_data">تعطيل حفظ البيانات</string>
-    <string name="title_setup_notifications">إدارة الإشعارات</string>
     <string name="title_setup_to_do">للانجاز</string>
     <string name="title_setup_done">تمّ</string>
+    <string name="title_setup_export">تصدير الإعدادات</string>
+    <string name="title_setup_import">استيراد الإعدادات</string>
+    <string name="title_setup_import_do">سيتم إضافة حسابات المستوردة، لا تتم الكتابة فوق</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_notifications">إدارة الإشعارات</string>
     <string name="title_setup_light_theme">سمة فاتحة</string>
     <string name="title_setup_dark_theme">سمة داكنة</string>
     <string name="title_setup_black_theme">سمة سوداء</string>
     <string name="title_setup_system_theme">سمة النظام</string>
+    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_setup_defaults">استعادة الأوضاع الافتراضية</string>
     <string name="title_setup_options">الخيارات</string>
     <string name="title_advanced">الخيارات المتقدمة</string>
@@ -146,7 +147,6 @@
     <string name="title_user">اسم المستخدم</string>
     <string name="title_password">الكلمة السرية</string>
     <string name="title_authorize">اختيار الحساب</string>
-    <string name="title_setup_advanced">الإعدادات المتقدمة</string>
     <string name="title_primary_account">الرئيسي (الحساب الافتراضي)</string>
     <string name="title_primary_identity">الرئيسية (الهوية الافتراضية)</string>
     <string name="title_keep_alive_interval">تبقى على قيد الحياة/استطلاع الفاصل الزمني (بالدقائق)</string>
diff --git a/app/src/main/res/values-az-rAZ/strings.xml b/app/src/main/res/values-az-rAZ/strings.xml
index a616fd2faa..c08cc0c0ba 100644
--- a/app/src/main/res/values-az-rAZ/strings.xml
+++ b/app/src/main/res/values-az-rAZ/strings.xml
@@ -65,16 +65,6 @@
     <string name="title_edit_folder">Qovluğa düzəliş et</string>
     <string name="title_setup">Quraşdırma</string>
     <string name="title_setup_help">Kömək</string>
-    <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">Şifrə</string>
-    <string name="title_setup_password_repeat">Şifrəni təkrarla</string>
-    <string name="title_setup_password_missing">Şifrə əskikdir</string>
-    <string name="title_setup_password_different">Şifrələr fərqlidir</string>
-    <string name="title_setup_password_invalid">Şifrə etibarsızdır</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_quick">Cəld quraşdırma</string>
     <string name="title_setup_quick_imap">Mesaj almaq üçün IMAP serveri</string>
     <string name="title_setup_quick_smtp">Mesaj göndərmək üçün SMTP serveri</string>
@@ -96,13 +86,24 @@
     <string name="title_setup_doze_instructions">Növbəti pəncərədə, Yuxarıdakı \"Bütün tətbiqlər\"i seçin, bu tətbiqi seçib \"Optimallaşdırmayın\"ı seçin</string>
     <string name="title_setup_data">Verilənlərə qənaət-i ləğv et</string>
     <string name="title_setup_inbox">Mesajları oxu</string>
-    <string name="title_setup_notifications">Bildirişləri idarə et</string>
     <string name="title_setup_to_do">Edilməli</string>
     <string name="title_setup_done">Hazırdır</string>
+    <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">Şifrə</string>
+    <string name="title_setup_password_repeat">Şifrəni təkrarla</string>
+    <string name="title_setup_password_missing">Şifrə əskikdir</string>
+    <string name="title_setup_password_different">Şifrələr fərqlidir</string>
+    <string name="title_setup_password_invalid">Şifrə etibarsızdır</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_notifications">Bildirişləri idarə et</string>
     <string name="title_setup_light_theme">Açıq tema</string>
     <string name="title_setup_dark_theme">Tünd tema</string>
     <string name="title_setup_black_theme">Qara tema</string>
     <string name="title_setup_system_theme">Sistem teması</string>
+    <string name="title_setup_advanced">Qabaqcıl</string>
     <string name="title_setup_defaults">İlkin vəziyyətinə qaytar</string>
     <string name="title_setup_options">Seçimlər</string>
     <string name="title_advanced">Qabaqcıl variantlar</string>
@@ -178,7 +179,6 @@
     <string name="title_password">Şifrə</string>
     <string name="title_authorize">Hesab seç</string>
     <string name="title_authorizing">Hesaba səlahiyyət verilir &#8230;</string>
-    <string name="title_setup_advanced">Qabaqcıl</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>
diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml
index 5c25dd6f8c..312cdee30c 100644
--- a/app/src/main/res/values-ca-rES/strings.xml
+++ b/app/src/main/res/values-ca-rES/strings.xml
@@ -36,11 +36,6 @@
     <string name="title_edit_identity">Edita identitat</string>
     <string name="title_edit_folder">Edita la carpeta</string>
     <string name="title_setup">Configuració</string>
-    <string name="title_setup_export">Exporta la configuració</string>
-    <string name="title_setup_import">Importa una configuració</string>
-    <string name="title_setup_import_do">Els comptes importats no es sobreescriuran</string>
-    <string name="title_setup_exported">Configuració exportada</string>
-    <string name="title_setup_imported">Configuració importada</string>
     <string name="title_setup_account_remark">Per rebre correu-e</string>
     <string name="title_setup_identity_remark">Per enviar correu-e</string>
     <string name="title_setup_doze_remark">Per rebre correu-e contínuament (opcional)</string>
@@ -48,8 +43,14 @@
     <string name="title_setup_data">Desactiva estalvi de dades</string>
     <string name="title_setup_to_do">Per fer</string>
     <string name="title_setup_done">Fet</string>
+    <string name="title_setup_export">Exporta la configuració</string>
+    <string name="title_setup_import">Importa una configuració</string>
+    <string name="title_setup_import_do">Els comptes importats no es sobreescriuran</string>
+    <string name="title_setup_exported">Configuració exportada</string>
+    <string name="title_setup_imported">Configuració importada</string>
     <string name="title_setup_light_theme">Tema clar</string>
     <string name="title_setup_dark_theme">Tema fosc</string>
+    <string name="title_setup_advanced">Avançat</string>
     <string name="title_advanced">Opcions avançades</string>
     <string name="title_advanced_browse">Busca missatges en el servidor remot</string>
     <string name="title_advanced_avatars">Mostra les fotos dels contactes</string>
@@ -75,7 +76,6 @@
     <string name="title_password">Contrasenya</string>
     <string name="title_authorize">Selecciona un compte</string>
     <string name="title_authorizing">Autoritzant compte &#8230;</string>
-    <string name="title_setup_advanced">Avançat</string>
     <string name="title_synchronize_account">Sincronitza (rebre missatges)</string>
     <string name="title_synchronize_identity">Sincronitza (envia missatges)</string>
     <string name="title_primary_account">Primària (compte per defecte)</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index 60813521a9..23b2da6eb6 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -91,16 +91,6 @@
     <string name="title_edit_folder">Upravit složku</string>
     <string name="title_setup">Nastavení</string>
     <string name="title_setup_help">Nápověda</string>
-    <string name="title_setup_export">Export nastavení</string>
-    <string name="title_setup_import">Import nastavení</string>
-    <string name="title_setup_import_do">Importované účty budou doplněny, nikoliv přepsány</string>
-    <string name="title_setup_password">Heslo</string>
-    <string name="title_setup_password_repeat">Zopakujte heslo</string>
-    <string name="title_setup_password_missing">Chybí heslo</string>
-    <string name="title_setup_password_different">Hesla se liší</string>
-    <string name="title_setup_password_invalid">Heslo není platné</string>
-    <string name="title_setup_exported">Nastavení exportována</string>
-    <string name="title_setup_imported">Nastavení importována</string>
     <string name="title_setup_quick">Rychlé nastavení</string>
     <string name="title_setup_quick_remark">Pro rychlé nastavení účtu a identity pro většinu poskytovatelů</string>
     <string name="title_setup_quick_hint">Rychlé nastavení načte konfigurační údaje z autoconfig.thunderbird.net</string>
@@ -125,14 +115,28 @@
     <string name="title_setup_doze_instructions">V následujícím dialogu nahoře se přepněte na \"Všechny aplikace\", v seznamu vyberte tuto aplikaci a označte a potvrďte volbu \"Neoptimalizovat\"</string>
     <string name="title_setup_data">Zakázat spořič dat</string>
     <string name="title_setup_inbox">Číst zprávy</string>
-    <string name="title_setup_notifications">Správa oznámení</string>
     <string name="title_setup_to_do">Udělat</string>
     <string name="title_setup_done">Hotovo</string>
+    <string name="title_setup_export">Export nastavení</string>
+    <string name="title_setup_import">Import nastavení</string>
+    <string name="title_setup_import_do">Importované účty budou doplněny, nikoliv přepsány</string>
+    <string name="title_setup_password">Heslo</string>
+    <string name="title_setup_password_repeat">Zopakujte heslo</string>
+    <string name="title_setup_password_missing">Chybí heslo</string>
+    <string name="title_setup_password_different">Hesla se liší</string>
+    <string name="title_setup_password_invalid">Heslo není platné</string>
+    <string name="title_setup_exported">Nastavení exportována</string>
+    <string name="title_setup_imported">Nastavení importována</string>
+    <string name="title_setup_notifications">Správa oznámení</string>
+    <string name="title_setup_reorder_accounts">Pořadí účtů</string>
+    <string name="title_setup_reorder_folders">Pořadí složek</string>
+    <string name="title_reset_order">Obnovit pořadí</string>
     <string name="title_setup_theme">Vybrat motiv</string>
     <string name="title_setup_light_theme">Světlý motiv</string>
     <string name="title_setup_dark_theme">Tmavý motiv</string>
     <string name="title_setup_black_theme">Černý motiv</string>
     <string name="title_setup_system_theme">Motiv systému</string>
+    <string name="title_setup_advanced">Rozšířené</string>
     <string name="title_setup_defaults">Obnovit výchozí nastavení</string>
     <string name="title_setup_options">Možnosti</string>
     <string name="title_advanced">Rozšířené možnosti</string>
@@ -205,6 +209,7 @@
     <string name="title_advanced_search_local_hint">Namísto vyhledávání v hlavní složce archivu na serveru</string>
     <string name="title_advanced_english_hint">Restartuje aplikaci</string>
     <string name="title_advanced_paranoid_hint">Podrobnosti naleznete v častých dotazech</string>
+    <string name="title_advanced_debug_hint">Zapnout rozšířený záznam a zobrazit ladící informace na různých místech</string>
     <string name="title_select">Vybrat &#8230;</string>
     <string name="title_identity_name">Vaše jméno</string>
     <string name="title_identity_email">Vaše e-mailová adresa</string>
@@ -242,7 +247,6 @@
     <string name="title_use_ip">Použít lokální IP adresu namísto názvu hostitele</string>
     <string name="title_authorize">Vybrat účet</string>
     <string name="title_authorizing">Probíhá autorizace účtu &#8230;</string>
-    <string name="title_setup_advanced">Rozšířené</string>
     <string name="title_synchronize_account">Synchronizovat (přijímat zprávy)</string>
     <string name="title_synchronize_identity">Synchronizovat (odesílat zprávy)</string>
     <string name="title_primary_account">Hlavní (výchozí účet)</string>
@@ -417,7 +421,6 @@
     <string name="title_search_hint">Hledat na serveru</string>
     <string name="title_search_device">Hledat v zařízení</string>
     <string name="title_searching">Hledám \"%1$s\"</string>
-    <string name="title_reset_order">Obnovit pořadí</string>
     <string name="title_sort_on">Řadit dle</string>
     <string name="title_sort_on_time">Čas</string>
     <string name="title_sort_on_unread">Nepřečteno</string>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
index 8f5a4d3f6f..515820d286 100644
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ b/app/src/main/res/values-da-rDK/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Redigér mappe</string>
     <string name="title_setup">Indstillinger</string>
     <string name="title_setup_help">Hjælp</string>
-    <string name="title_setup_export">Eksportér indstillinger</string>
-    <string name="title_setup_import">Importér indstillinger</string>
-    <string name="title_setup_import_do">Importerede kontakter vil blive tilføjet, ikke overskrevet</string>
-    <string name="title_setup_password">Adgangskode</string>
-    <string name="title_setup_password_repeat">Gentag adgangskode</string>
-    <string name="title_setup_password_missing">Adgangskode mangler</string>
-    <string name="title_setup_password_different">Adgangskoderne er forskellige</string>
-    <string name="title_setup_password_invalid">Ugyldig adgangskode</string>
-    <string name="title_setup_exported">Indstillinger eksporteret</string>
-    <string name="title_setup_imported">Indstillinger importeret</string>
     <string name="title_setup_quick">Hurtig opsætning</string>
     <string name="title_setup_quick_remark">For hurtigt at tilføje en konto og identitet for de fleste udbydere</string>
     <string name="title_setup_quick_hint">Opsætningen vil hente konfigurationsoplysninger fra autoconfig.thunderbird.net</string>
@@ -109,14 +99,26 @@
     <string name="title_setup_doze_instructions">Ved næste dialogboks skal du vælge \"alle apps\" i toppen, vælge denne app og vælg \"undlade at optimere\"</string>
     <string name="title_setup_data">Deaktivér databesparelse</string>
     <string name="title_setup_inbox">Læs meddelelser</string>
-    <string name="title_setup_notifications">Administrér underretninger</string>
     <string name="title_setup_to_do">Gøremål</string>
     <string name="title_setup_done">Udført</string>
+    <string name="title_setup_export">Eksportér indstillinger</string>
+    <string name="title_setup_import">Importér indstillinger</string>
+    <string name="title_setup_import_do">Importerede kontakter vil blive tilføjet, ikke overskrevet</string>
+    <string name="title_setup_password">Adgangskode</string>
+    <string name="title_setup_password_repeat">Gentag adgangskode</string>
+    <string name="title_setup_password_missing">Adgangskode mangler</string>
+    <string name="title_setup_password_different">Adgangskoderne er forskellige</string>
+    <string name="title_setup_password_invalid">Ugyldig adgangskode</string>
+    <string name="title_setup_exported">Indstillinger eksporteret</string>
+    <string name="title_setup_imported">Indstillinger importeret</string>
+    <string name="title_setup_notifications">Administrér underretninger</string>
+    <string name="title_reset_order">Nulstil rækkefølge</string>
     <string name="title_setup_theme">Vælg tema</string>
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Sort tema</string>
     <string name="title_setup_system_theme">Systemtema</string>
+    <string name="title_setup_advanced">Avanceret</string>
     <string name="title_setup_defaults">Gendan standardværdier</string>
     <string name="title_setup_options">Indstillinger</string>
     <string name="title_advanced">Avancerede indstillinger</string>
@@ -189,6 +191,7 @@
     <string name="title_advanced_search_local_hint">I stedet for at søge i den primære arkiveringsmappe på serveren</string>
     <string name="title_advanced_english_hint">Dette vil genstarte app\'en</string>
     <string name="title_advanced_paranoid_hint">Se FAQ\'en for yderligere informationer</string>
+    <string name="title_advanced_debug_hint">Aktivér ekstra logs og vis fejlretningsoplysninger diverse steder</string>
     <string name="title_select">Vælg &#8230;</string>
     <string name="title_identity_name">Dit navn</string>
     <string name="title_identity_email">Din e-mailadresse</string>
@@ -226,7 +229,6 @@
     <string name="title_use_ip">Brug lokal IP-adresse i stedet for værtsnavn</string>
     <string name="title_authorize">Vælg konto</string>
     <string name="title_authorizing">Godkender konto &#8230;</string>
-    <string name="title_setup_advanced">Avanceret</string>
     <string name="title_synchronize_account">Synkronisér (modtag meddelelser)</string>
     <string name="title_synchronize_identity">Synkronisér (send meddelelser)</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -401,7 +403,6 @@
     <string name="title_search_hint">Søg på server</string>
     <string name="title_search_device">Søg på enhed</string>
     <string name="title_searching">Søger \'%1$s \'</string>
-    <string name="title_reset_order">Nulstil rækkefølge</string>
     <string name="title_sort_on">Sortér efter</string>
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Ulæst</string>
@@ -539,7 +540,6 @@
     <string name="title_report">Rapportér</string>
     <string name="title_fix">Ret</string>
     <string name="title_enable">Aktivér</string>
-    <string name="title_reorder">Omorganisering</string>
     <string name="title_no_ask_again">Spørg ikke igen</string>
     <string name="title_no_body">Ingen meddelelsestekst fundet</string>
     <string name="title_no_charset">Ikke understøttet kodning: %1$s</string>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 26caa8500a..9b432c5d23 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Ordner bearbeiten</string>
     <string name="title_setup">Einstellungen</string>
     <string name="title_setup_help">Hilfe</string>
-    <string name="title_setup_export">Einstellungen exportieren</string>
-    <string name="title_setup_import">Einstellungen importieren</string>
-    <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">Passwort fehlt</string>
-    <string name="title_setup_password_different">Passwörter stimmen nicht überein</string>
-    <string name="title_setup_password_invalid">Passwort ungültig</string>
-    <string name="title_setup_exported">Einstellungen exportiert</string>
-    <string name="title_setup_imported">Einstellungen importiert</string>
     <string name="title_setup_quick">Schnelleinrichtung</string>
     <string name="title_setup_quick_remark">Um schnell ein Konto und eine Identität für die meisten Anbieter einzurichten</string>
     <string name="title_setup_quick_hint">Die Schnelleinrichtung wird Konfigurationsinformationen von autoconfig.thunderbird.net laden</string>
@@ -109,14 +99,28 @@
     <string name="title_setup_doze_instructions">Rufen Sie im folgendem Auswahldialog (oben) \"Alle Apps\" auf; wählen Sie anschließend FairEmail aus und bestätigen Sie die Option \"Nicht optimieren\" mit Fertig.</string>
     <string name="title_setup_data">Deaktiviere Datenreduzierung</string>
     <string name="title_setup_inbox">E-Mails lesen</string>
-    <string name="title_setup_notifications">Benachrichtigungen</string>
     <string name="title_setup_to_do">Nicht erledigt</string>
     <string name="title_setup_done">Erledigt</string>
+    <string name="title_setup_export">Einstellungen exportieren</string>
+    <string name="title_setup_import">Einstellungen importieren</string>
+    <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">Passwort fehlt</string>
+    <string name="title_setup_password_different">Passwörter stimmen nicht überein</string>
+    <string name="title_setup_password_invalid">Passwort ungültig</string>
+    <string name="title_setup_exported">Einstellungen exportiert</string>
+    <string name="title_setup_imported">Einstellungen importiert</string>
+    <string name="title_setup_notifications">Benachrichtigungen</string>
+    <string name="title_setup_reorder_accounts">Konten sortieren</string>
+    <string name="title_setup_reorder_folders">Ordner sortieren</string>
+    <string name="title_reset_order">Standard-Reihenfolge</string>
     <string name="title_setup_theme">Design auswählen</string>
     <string name="title_setup_light_theme">Helles Design</string>
     <string name="title_setup_dark_theme">Dunkles Design</string>
     <string name="title_setup_black_theme">Schwarzes Design</string>
     <string name="title_setup_system_theme">System Design</string>
+    <string name="title_setup_advanced">Erweitert</string>
     <string name="title_setup_defaults">Auf Standard zurücksetzen</string>
     <string name="title_setup_options">Optionen</string>
     <string name="title_advanced">Erweiterte Optionen</string>
@@ -189,6 +193,7 @@
     <string name="title_advanced_search_local_hint">Anstatt im primären Archiv-Ordner auf dem Server zu suchen</string>
     <string name="title_advanced_english_hint">Dies wird die App neu starten</string>
     <string name="title_advanced_paranoid_hint">Details finden Sie in der FAQ</string>
+    <string name="title_advanced_debug_hint">Aktiviert zusätzliche Protokollierung und zeigt Fehlerbehebungsinformationen an verschiedenen Stellen an</string>
     <string name="title_select">Wählen Sie &#8230;</string>
     <string name="title_identity_name">Ihr Name</string>
     <string name="title_identity_email">Ihre E-Mail-Adresse</string>
@@ -226,7 +231,6 @@
     <string name="title_use_ip">Lokale IP-Adresse anstelle des Domain-Namens verwenden</string>
     <string name="title_authorize">Konto wählen</string>
     <string name="title_authorizing">Konto autorisieren &#8230;</string>
-    <string name="title_setup_advanced">Erweitert</string>
     <string name="title_synchronize_account">Synchronisieren (E-Mails empfangen)</string>
     <string name="title_synchronize_identity">Synchronisieren (E-Mails versenden)</string>
     <string name="title_primary_account">Primäres Konto</string>
@@ -401,7 +405,6 @@
     <string name="title_search_hint">Auf Server suchen</string>
     <string name="title_search_device">Auf dem Gerät suchen</string>
     <string name="title_searching">Suche „%1$s“</string>
-    <string name="title_reset_order">Standard-Reihenfolge</string>
     <string name="title_sort_on">Sortieren nach</string>
     <string name="title_sort_on_time">Uhrzeit</string>
     <string name="title_sort_on_unread">Ungelesen</string>
@@ -539,7 +542,6 @@
     <string name="title_report">Bericht</string>
     <string name="title_fix">Problem beheben</string>
     <string name="title_enable">Aktivieren</string>
-    <string name="title_reorder">Sortieren</string>
     <string name="title_no_ask_again">Dies nicht mehr anzeigen</string>
     <string name="title_no_body">Kein Nachrichtentext gefunden</string>
     <string name="title_no_charset">Nicht unterstützte Codierung: %1$s</string>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index e99dff4b34..cc46fd6675 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -36,6 +36,10 @@
     <string name="title_edit_folder">Επεξεργασία φακέλου</string>
     <string name="title_setup">Διαμόρφωση ρυθμίσεων</string>
     <string name="title_setup_help">Βοήθεια</string>
+    <string name="title_setup_quick">Γρήγορη ρύθμιση</string>
+    <string name="title_setup_go">Ας ξεκινήσουμε</string>
+    <string name="title_setup_grant">Εκχώρηση δικαιώματος</string>
+    <string name="title_setup_identity_remark">Για να στείλετε email</string>
     <string name="title_setup_export">Εξαγωγή ρυθμίσεων</string>
     <string name="title_setup_import">Εισαγωγή ρυθμίσεων</string>
     <string name="title_setup_password">Κωδικός πρόσβασης</string>
@@ -45,10 +49,6 @@
     <string name="title_setup_password_invalid">Μη έγκυρος κωδικός πρόσβασης</string>
     <string name="title_setup_exported">Επιτυχής εξαγωγή ρυθμίσεων</string>
     <string name="title_setup_imported">Επιτυχής εισαγωγή ρυθμίσεων</string>
-    <string name="title_setup_quick">Γρήγορη ρύθμιση</string>
-    <string name="title_setup_go">Ας ξεκινήσουμε</string>
-    <string name="title_setup_grant">Εκχώρηση δικαιώματος</string>
-    <string name="title_setup_identity_remark">Για να στείλετε email</string>
     <string name="title_advanced_startup">Εμφάνιση στην oθόνη έναρξης</string>
     <string name="title_advanced_pull_refresh">Σύρετε προς τα κάτω για ανανέωση</string>
     <string name="title_advanced_light">Χρήση φωτεινής ένδειξης ειδοποιήσεων</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 7a0ac49cf3..aa581fa60f 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Editar carpeta</string>
     <string name="title_setup">Configuración</string>
     <string name="title_setup_help">Ayuda</string>
-    <string name="title_setup_export">Exportar ajustes</string>
-    <string name="title_setup_import">Importar ajustes</string>
-    <string name="title_setup_import_do">Las cuentas importadas se añadirán, no se sobrescribirán</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">Falta contraseña</string>
-    <string name="title_setup_password_different">Las contraseñas no coinciden</string>
-    <string name="title_setup_password_invalid">Contraseña inválida</string>
-    <string name="title_setup_exported">Ajustes exportados</string>
-    <string name="title_setup_imported">Ajustes importados</string>
     <string name="title_setup_quick">Configuración rápida</string>
     <string name="title_setup_quick_remark">Para configurar rápidamente una cuenta y una identidad para la mayoría de los proveedores</string>
     <string name="title_setup_quick_hint">La configuración rápida obtendrá información de configuración de autoconfig.thunderbird.net</string>
@@ -109,14 +99,26 @@
     <string name="title_setup_doze_instructions">En el siguiente diálogo, seleccione \"Todas las apps\" en el menú superior, seleccione esta app y finalmente seleccione y confirme la opción \"No optimizar\"</string>
     <string name="title_setup_data">Desactivar ahorro de datos</string>
     <string name="title_setup_inbox">Leer mensajes</string>
-    <string name="title_setup_notifications">Administrar notificaciones</string>
     <string name="title_setup_to_do">Pendiente</string>
     <string name="title_setup_done">Hecho</string>
+    <string name="title_setup_export">Exportar ajustes</string>
+    <string name="title_setup_import">Importar ajustes</string>
+    <string name="title_setup_import_do">Las cuentas importadas se añadirán, no se sobrescribirán</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">Falta contraseña</string>
+    <string name="title_setup_password_different">Las contraseñas no coinciden</string>
+    <string name="title_setup_password_invalid">Contraseña inválida</string>
+    <string name="title_setup_exported">Ajustes exportados</string>
+    <string name="title_setup_imported">Ajustes importados</string>
+    <string name="title_setup_notifications">Administrar notificaciones</string>
+    <string name="title_reset_order">Restablecer orden</string>
     <string name="title_setup_theme">Seleccionar tema</string>
     <string name="title_setup_light_theme">Tema claro</string>
     <string name="title_setup_dark_theme">Tema oscuro</string>
     <string name="title_setup_black_theme">Tema negro</string>
     <string name="title_setup_system_theme">Tema del sistema</string>
+    <string name="title_setup_advanced">Avanzado</string>
     <string name="title_setup_defaults">Restablecer ajustes por defecto</string>
     <string name="title_setup_options">Opciones</string>
     <string name="title_advanced">Opciones avanzadas</string>
@@ -189,6 +191,7 @@
     <string name="title_advanced_search_local_hint">En lugar de buscar en la carpeta de archivo principal en el servidor</string>
     <string name="title_advanced_english_hint">Esto reiniciará la app</string>
     <string name="title_advanced_paranoid_hint">Vea las preguntas frecuentes para más detalles</string>
+    <string name="title_advanced_debug_hint">Activar registro extra y mostrar información de depuración en varios lugares</string>
     <string name="title_select">Seleccione &#8230;</string>
     <string name="title_identity_name">Su nombre</string>
     <string name="title_identity_email">Su dirección de correo electrónico</string>
@@ -226,7 +229,6 @@
     <string name="title_use_ip">Usar dirección IP local en lugar de nombre de dominio</string>
     <string name="title_authorize">Seleccionar una cuenta</string>
     <string name="title_authorizing">Autorizando cuenta &#8230;</string>
-    <string name="title_setup_advanced">Avanzado</string>
     <string name="title_synchronize_account">Sincronizar (recibir mensajes)</string>
     <string name="title_synchronize_identity">Sincronizar (enviar mensajes)</string>
     <string name="title_primary_account">Primaria (cuenta predeterminada)</string>
@@ -401,7 +403,6 @@
     <string name="title_search_hint">Buscar en el servidor</string>
     <string name="title_search_device">Buscar en dispositivo</string>
     <string name="title_searching">Buscando \'%1$s\'</string>
-    <string name="title_reset_order">Restablecer orden</string>
     <string name="title_sort_on">Ordenar por</string>
     <string name="title_sort_on_time">Tiempo</string>
     <string name="title_sort_on_unread">No leído</string>
@@ -539,7 +540,6 @@
     <string name="title_report">Reportar</string>
     <string name="title_fix">Reparar</string>
     <string name="title_enable">Activar</string>
-    <string name="title_reorder">Reordenar</string>
     <string name="title_no_ask_again">No volver a preguntar</string>
     <string name="title_no_body">No se encontró texto en el mensaje</string>
     <string name="title_no_charset">Codificación no soportada: %1$s</string>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
index 65e2caf2da..94531b567f 100644
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ b/app/src/main/res/values-fa-rIR/strings.xml
@@ -41,16 +41,6 @@
     <string name="title_edit_folder">ويرايش پوشه</string>
     <string name="title_setup">تنظیمات</string>
     <string name="title_setup_help">راهنما</string>
-    <string name="title_setup_export">ذخیره تنظیمات</string>
-    <string name="title_setup_import">وارد کردن تنظیمات</string>
-    <string name="title_setup_import_do">حساب‌های وارد شده اضافه خواهند شد و رونویسی نمی‌شوند</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_quick">راه اندازی سریع</string>
     <string name="title_setup_go">برو</string>
     <string name="title_setup_setting_gmail">فعال کردن دسترسی به برنامه های \"کمتر امن\"</string>
@@ -70,13 +60,24 @@
     <string name="title_setup_doze_instructions">در قسمت بعد \"تمام برنامه‌ها\" را از قسمت بالا انتخاب کرده و سپس این برنامه را انتخاب کنید و گزینه \"عدم بهینه سازی\" را انتخاب و تایید نمایید.</string>
     <string name="title_setup_data">غیر فعال کردن ذخیره کردن داده‌ها</string>
     <string name="title_setup_inbox">خواندن پیام‌ها</string>
-    <string name="title_setup_notifications">مدیریت اعلان‌ها</string>
     <string name="title_setup_to_do">برای انجام</string>
     <string name="title_setup_done">انجام شد</string>
+    <string name="title_setup_export">ذخیره تنظیمات</string>
+    <string name="title_setup_import">وارد کردن تنظیمات</string>
+    <string name="title_setup_import_do">حساب‌های وارد شده اضافه خواهند شد و رونویسی نمی‌شوند</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_notifications">مدیریت اعلان‌ها</string>
     <string name="title_setup_light_theme">تم روشن</string>
     <string name="title_setup_dark_theme">تم تاریک</string>
     <string name="title_setup_black_theme">تم سیاه</string>
     <string name="title_setup_system_theme">تم سیستم</string>
+    <string name="title_setup_advanced">پیشرفته</string>
     <string name="title_setup_defaults">بازیابی پیش‌فرض‌ها</string>
     <string name="title_advanced">گزینه‌های پیشرفته</string>
     <string name="title_advanced_section_general">عمومی</string>
@@ -150,7 +151,6 @@
     <string name="title_realm">حوزه</string>
     <string name="title_authorize">انتخاب حساب</string>
     <string name="title_authorizing">تایید مجوز حساب &#8230;</string>
-    <string name="title_setup_advanced">پیشرفته</string>
     <string name="title_synchronize_account">همگام سازی (دریافت پیام‌ها)</string>
     <string name="title_synchronize_identity">همگام سازی (ارسال پیام‌ها)</string>
     <string name="title_primary_account">اصلی (حساب پیش فرض)</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index 19b0f3f674..960ade3134 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Modifier le dossier</string>
     <string name="title_setup">Configuration</string>
     <string name="title_setup_help">Aide</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_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">Mot de passe non valide</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_quick">Configuration rapide</string>
     <string name="title_setup_quick_remark">Pour configurer rapidement un compte et une identité pour la plupart des fournisseurs</string>
     <string name="title_setup_quick_hint">La configuration rapide récupérera les informations de configuration de autoconfig.thunderbird.net</string>
@@ -109,14 +99,28 @@
     <string name="title_setup_doze_instructions">Sur le prochain écran, sélectionnez \"Toutes les applis\" en haut, recherchez cette appli puis sélectionnez et validez \"Ne pas optimiser\"</string>
     <string name="title_setup_data">Désactiver l\'économie de données</string>
     <string name="title_setup_inbox">Lire les messages</string>
-    <string name="title_setup_notifications">Gérer les notifications</string>
     <string name="title_setup_to_do">À faire</string>
     <string name="title_setup_done">Fait</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_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">Mot de passe non valide</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_notifications">Gérer les notifications</string>
+    <string name="title_setup_reorder_accounts">Ordonner les comptes</string>
+    <string name="title_setup_reorder_folders">Ordonner les dossiers</string>
+    <string name="title_reset_order">Réinitialiser l’ordre</string>
     <string name="title_setup_theme">Choisir le thème</string>
     <string name="title_setup_light_theme">Thème clair</string>
     <string name="title_setup_dark_theme">Thème sombre</string>
     <string name="title_setup_black_theme">Thème noir</string>
     <string name="title_setup_system_theme">Thème système</string>
+    <string name="title_setup_advanced">Avancé</string>
     <string name="title_setup_defaults">Rétablir les paramètres par défaut</string>
     <string name="title_setup_options">Options</string>
     <string name="title_advanced">Options avancées</string>
@@ -189,6 +193,7 @@
     <string name="title_advanced_search_local_hint">Au lieu de chercher dans le dossier de l’archive principale sur le serveur</string>
     <string name="title_advanced_english_hint">Cela va redémarrer l’application</string>
     <string name="title_advanced_paranoid_hint">Voir la FAQ pour les détails</string>
+    <string name="title_advanced_debug_hint">Activer la journalisation supplémentaire et afficher les informations de débogage à différents endroits</string>
     <string name="title_select">Sélectionner &#8230;</string>
     <string name="title_identity_name">Votre nom</string>
     <string name="title_identity_email">Votre adresse e-mail</string>
@@ -226,7 +231,6 @@
     <string name="title_use_ip">Utiliser l\'adresse IP locale au lieu du nom de domaine</string>
     <string name="title_authorize">Sélectionner un compte</string>
     <string name="title_authorizing">Autorisation du compte en cours &#8230;</string>
-    <string name="title_setup_advanced">Avancé</string>
     <string name="title_synchronize_account">Synchroniser (recevoir des messages)</string>
     <string name="title_synchronize_identity">Synchroniser (envoyer des messages)</string>
     <string name="title_primary_account">Principal (compte par défaut)</string>
@@ -401,7 +405,6 @@
     <string name="title_search_hint">Rechercher sur le serveur</string>
     <string name="title_search_device">Rechercher sur l\'appareil</string>
     <string name="title_searching">Recherche de \'%1$s\'</string>
-    <string name="title_reset_order">Réinitialiser l’ordre</string>
     <string name="title_sort_on">Trier par</string>
     <string name="title_sort_on_time">Date</string>
     <string name="title_sort_on_unread">Non lu(s)</string>
@@ -539,7 +542,6 @@
     <string name="title_report">Rapport</string>
     <string name="title_fix">Corriger</string>
     <string name="title_enable">Activer</string>
-    <string name="title_reorder">Réordonner</string>
     <string name="title_no_ask_again">Ne plus me le demander</string>
     <string name="title_no_body">Aucun texte de message trouvé</string>
     <string name="title_no_charset">Format d\'encodage non pris en charge : %1$s</string>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml
index 3032bb4388..d57d5bbdb6 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu-rHU/strings.xml
@@ -36,11 +36,11 @@
     <string name="title_edit_identity">Azonosító szerkesztése</string>
     <string name="title_edit_folder">Könyvtár szerkesztése</string>
     <string name="title_setup">Beállítás</string>
+    <string name="title_setup_account_remark">E-mailt fogadni</string>
+    <string name="title_setup_identity_remark">E-mailt küldeni</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_import_do">Az importált fiókok felülírás nélkül lesznek hozzáadva</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_remark">E-mailt fogadni</string>
-    <string name="title_setup_identity_remark">E-mailt küldeni</string>
 </resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index eaa01f4cc3..8211a55afa 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Modifica cartella</string>
     <string name="title_setup">Configurazione</string>
     <string name="title_setup_help">Aiuto</string>
-    <string name="title_setup_export">Esporta impostazioni</string>
-    <string name="title_setup_import">Importa impostazioni</string>
-    <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">Ripeti password</string>
-    <string name="title_setup_password_missing">Password mancante</string>
-    <string name="title_setup_password_different">Password diverse</string>
-    <string name="title_setup_password_invalid">Password non valida</string>
-    <string name="title_setup_exported">Impostazioni esportate</string>
-    <string name="title_setup_imported">Impostazioni importate</string>
     <string name="title_setup_quick">Configurazione rapida</string>
     <string name="title_setup_quick_remark">Per impostare rapidamente un account e un\'identità per la maggior parte dei fornitori</string>
     <string name="title_setup_quick_hint">La configurazione rapida recupererà le informazioni di configurazione da autoconfig.thunderbird.net</string>
@@ -109,14 +99,28 @@
     <string name="title_setup_doze_instructions">Nella finestra successiva, seleziona \"Tutte le app\" in alto, scegli questa app, seleziona e conferma \"Non ottimizzare\"</string>
     <string name="title_setup_data">Disattiva risparmio dati</string>
     <string name="title_setup_inbox">Leggere messaggi</string>
-    <string name="title_setup_notifications">Gestione notifiche</string>
     <string name="title_setup_to_do">Da fare</string>
     <string name="title_setup_done">Fine</string>
+    <string name="title_setup_export">Esporta impostazioni</string>
+    <string name="title_setup_import">Importa impostazioni</string>
+    <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">Ripeti password</string>
+    <string name="title_setup_password_missing">Password mancante</string>
+    <string name="title_setup_password_different">Password diverse</string>
+    <string name="title_setup_password_invalid">Password non valida</string>
+    <string name="title_setup_exported">Impostazioni esportate</string>
+    <string name="title_setup_imported">Impostazioni importate</string>
+    <string name="title_setup_notifications">Gestione notifiche</string>
+    <string name="title_setup_reorder_accounts">Ordine account</string>
+    <string name="title_setup_reorder_folders">Ordine cartelle</string>
+    <string name="title_reset_order">Resetta ordine</string>
     <string name="title_setup_theme">Seleziona tema</string>
     <string name="title_setup_light_theme">Tema chiaro</string>
     <string name="title_setup_dark_theme">Tema scuro</string>
     <string name="title_setup_black_theme">Tema nero</string>
     <string name="title_setup_system_theme">Tema di sistema</string>
+    <string name="title_setup_advanced">Avanzate</string>
     <string name="title_setup_defaults">Ripristina predefiniti</string>
     <string name="title_setup_options">Opzioni</string>
     <string name="title_advanced">Opzioni avanzate</string>
@@ -189,6 +193,7 @@
     <string name="title_advanced_search_local_hint">Invece di cercare nella cartella principale dell\'archivio sul server</string>
     <string name="title_advanced_english_hint">Questo riavvierà l\'app</string>
     <string name="title_advanced_paranoid_hint">Vedi le FAQ per i dettagli</string>
+    <string name="title_advanced_debug_hint">Abilita il log extra e mostra le informazioni di debug in vari luoghi</string>
     <string name="title_select">Seleziona &#8230;</string>
     <string name="title_identity_name">Il tuo nome</string>
     <string name="title_identity_email">Il tuo indirizzo email</string>
@@ -226,7 +231,6 @@
     <string name="title_use_ip">Usa l\'indirizzo IP locale invece del nome dell\'host</string>
     <string name="title_authorize">Seleziona account</string>
     <string name="title_authorizing">Autorizzazione account &#8230;</string>
-    <string name="title_setup_advanced">Avanzate</string>
     <string name="title_synchronize_account">Sincronizza (ricevi messaggi)</string>
     <string name="title_synchronize_identity">Sincronizza (invia messaggi)</string>
     <string name="title_primary_account">Principale (account predefinito)</string>
@@ -401,7 +405,6 @@
     <string name="title_search_hint">Cerca sul server</string>
     <string name="title_search_device">Cerca nel dispositivo</string>
     <string name="title_searching">Ricerca di \'%1$s\'</string>
-    <string name="title_reset_order">Resetta ordine</string>
     <string name="title_sort_on">Ordina per</string>
     <string name="title_sort_on_time">Ora</string>
     <string name="title_sort_on_unread">Non letti</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 4e03a4cfde..129020fcb2 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Rediger mappe</string>
     <string name="title_setup">Oppsett</string>
     <string name="title_setup_help">Hjelp</string>
-    <string name="title_setup_export">Eksporter innstillingene</string>
-    <string name="title_setup_import">Importer innstillinger</string>
-    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
-    <string name="title_setup_password">Passord</string>
-    <string name="title_setup_password_repeat">Gjenta passord</string>
-    <string name="title_setup_password_missing">Passord mangler</string>
-    <string name="title_setup_password_different">Passordene er forskjellige</string>
-    <string name="title_setup_password_invalid">Ugyldig passord</string>
-    <string name="title_setup_exported">Innstillinger eksportert</string>
-    <string name="title_setup_imported">Innstillinger importert</string>
     <string name="title_setup_quick">Hurtig oppsett</string>
     <string name="title_setup_quick_remark">For å raskt sette opp en konto og en identitet for de fleste tilbydere</string>
     <string name="title_setup_quick_hint">Hurtig oppsettet henter konfigurasjons informasjon fra autoconfig.thunderbird.net</string>
@@ -103,20 +93,32 @@
     <string name="title_setup_identity">Oppsett av identiteter</string>
     <string name="title_setup_identity_remark">Å sende e-post</string>
     <string name="title_setup_permissions">Gi tillatelser</string>
-    <string name="title_setup_permissions_remark">Å få tilgang til kontaktinformasjon (valgfritt)</string>
-    <string name="title_setup_doze">Oppsett batterioptimaliseringer</string>
+    <string name="title_setup_permissions_remark">Få tilgang til kontaktinformasjon (valgfritt)</string>
+    <string name="title_setup_doze">Oppsett av batterioptimaliseringer</string>
     <string name="title_setup_doze_remark">Slik mottar du kontinuerlig e-post (valgfritt)</string>
     <string name="title_setup_doze_instructions">I den neste dialogboksen velger du \"Alle apper\" øverst, velg så denne appen og så bekrefte \"Ikke optimaliser\"</string>
     <string name="title_setup_data">Deaktivere data lagring</string>
     <string name="title_setup_inbox">Lese Meldinger</string>
-    <string name="title_setup_notifications">Administrer varsler</string>
     <string name="title_setup_to_do">Gjøremål</string>
     <string name="title_setup_done">Utført</string>
+    <string name="title_setup_export">Eksporter innstillingene</string>
+    <string name="title_setup_import">Importer innstillinger</string>
+    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
+    <string name="title_setup_password">Passord</string>
+    <string name="title_setup_password_repeat">Gjenta passord</string>
+    <string name="title_setup_password_missing">Passord mangler</string>
+    <string name="title_setup_password_different">Passordene er forskjellige</string>
+    <string name="title_setup_password_invalid">Ugyldig passord</string>
+    <string name="title_setup_exported">Innstillinger eksportert</string>
+    <string name="title_setup_imported">Innstillinger importert</string>
+    <string name="title_setup_notifications">Administrer varsler</string>
+    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_setup_theme">Velg tema</string>
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Svart tema</string>
     <string name="title_setup_system_theme">System tema</string>
+    <string name="title_setup_advanced">Avansert</string>
     <string name="title_setup_defaults">Gjenopprett standarder</string>
     <string name="title_setup_options">Alternativer</string>
     <string name="title_advanced">Avanserte innstillinger</string>
@@ -189,6 +191,7 @@
     <string name="title_advanced_search_local_hint">I stedet for å søke i primærarkivmappen på serveren</string>
     <string name="title_advanced_english_hint">Dette vil starte appen på nytt</string>
     <string name="title_advanced_paranoid_hint">Se FAQ for detaljer</string>
+    <string name="title_advanced_debug_hint">Aktivere ekstra logging og vis feilsøkingsinformasjon på forskjellige steder</string>
     <string name="title_select">Velg &#8230;</string>
     <string name="title_identity_name">Ditt navn</string>
     <string name="title_identity_email">Din e-postadresse</string>
@@ -226,7 +229,6 @@
     <string name="title_use_ip">Bruk lokal IP-adresse i stedet for vertsnavn</string>
     <string name="title_authorize">Velg konto</string>
     <string name="title_authorizing">Godkjenne kontoen &#8230;</string>
-    <string name="title_setup_advanced">Avansert</string>
     <string name="title_synchronize_account">Synkronisere (motta meldinger)</string>
     <string name="title_synchronize_identity">Synkronisere (sende meldinger)</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -270,7 +272,7 @@
     <string name="title_display_name">Visningsnavn</string>
     <string name="title_show_folders">Vis skjulte mapper</string>
     <string name="title_hide_folder">Skjul mappe</string>
-    <string name="title_unified_folder">Vis enhetlig konto</string>
+    <string name="title_unified_folder">Vis i enhetlig konto</string>
     <string name="title_navigation_folder">Vis i navigasjonsmenyen</string>
     <string name="title_synchronize_folder">Synkronisere (motta meldinger)</string>
     <string name="title_poll_folder">Kontroller jevnlig i stedet for kontinuerlig synkronisering</string>
@@ -401,7 +403,6 @@
     <string name="title_search_hint">Søk på server</string>
     <string name="title_search_device">Søk på enheten</string>
     <string name="title_searching">Søker \'%1$s \'</string>
-    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_sort_on">Sorter på</string>
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Ulest</string>
@@ -461,13 +462,13 @@
     <string name="title_legend_primary_connected">Konto tilkoblet</string>
     <string name="title_legend_thread">Samtale</string>
     <string name="title_legend_zoom">Endre tekststørrelse</string>
-    <string name="title_legend_draft">Har utkast</string>
-    <string name="title_legend_snoozed">Er snoozed</string>
+    <string name="title_legend_draft">Kladd finnes</string>
+    <string name="title_legend_snoozed">Er utsatt</string>
     <string name="title_legend_browsed">Er bladd eller søkt etter</string>
     <string name="title_legend_answered">Har blitt besvart</string>
     <string name="title_legend_receipt">Kvittering ble forespurt</string>
     <string name="title_legend_attachment">Har vedlegg</string>
-    <string name="title_legend_flagged">Har stjernemerket</string>
+    <string name="title_legend_flagged">Er stjernemerket</string>
     <string name="title_legend_contacts">Administrere kontakter</string>
     <string name="title_legend_view">Vis innehold</string>
     <string name="title_legend_hide">Skjul innhold</string>
@@ -484,8 +485,8 @@
     <string name="title_legend_file">Legg ved fil</string>
     <string name="title_legend_download_off">Last ned meldingsinnhold på forespørsel </string>
     <string name="title_legend_download_on">Last ned meldingsinnhold automatisk</string>
-    <string name="title_legend_synchronize_on">Synkroniser på</string>
-    <string name="title_legend_synchronize_off">Synkroniser av</string>
+    <string name="title_legend_synchronize_on">Synkroniser nå</string>
+    <string name="title_legend_synchronize_off">Synkronisering av</string>
     <string name="title_legend_primary">Primær</string>
     <string name="title_legend_disconnected">Frakoblet</string>
     <string name="title_legend_connecting">Kobler til</string>
@@ -539,7 +540,6 @@
     <string name="title_report">Rapportere</string>
     <string name="title_fix">Fiks</string>
     <string name="title_enable">Aktiver</string>
-    <string name="title_reorder">Endre rekkefølge</string>
     <string name="title_no_ask_again">Ikke spør dette igjen</string>
     <string name="title_no_body">Ingen meldingstekst funnet</string>
     <string name="title_no_charset">Koding støttes ikke: %1$s</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index b7be00c65c..a58e5b8b61 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Map bewerken</string>
     <string name="title_setup">Instellingen</string>
     <string name="title_setup_help">Help</string>
-    <string name="title_setup_export">Exporteer instellingen</string>
-    <string name="title_setup_import">Importeer instellingen</string>
-    <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_quick">Snel instellen</string>
     <string name="title_setup_quick_remark">Voor het snel instellen van een account en een identiteit voor de meeste providers</string>
     <string name="title_setup_quick_hint">De snelle instelling zal configuratie informatie ophalen van autoconfig.thunderbird.net</string>
@@ -109,14 +99,28 @@
     <string name="title_setup_doze_instructions">In het volgende dialoogvenster, selecteer \"Alle apps\" bovenin, selecteer deze app en bevestig met \"Niet optimaliseren\"</string>
     <string name="title_setup_data">Databesparing uitschakelen</string>
     <string name="title_setup_inbox">Berichten lezen</string>
-    <string name="title_setup_notifications">Beheer meldingen</string>
     <string name="title_setup_to_do">Te doen</string>
     <string name="title_setup_done">Gedaan</string>
+    <string name="title_setup_export">Exporteer instellingen</string>
+    <string name="title_setup_import">Importeer instellingen</string>
+    <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_notifications">Beheer meldingen</string>
+    <string name="title_setup_reorder_accounts">Volgorde accounts</string>
+    <string name="title_setup_reorder_folders">Volgorde mappen</string>
+    <string name="title_reset_order">Reset volgorde</string>
     <string name="title_setup_theme">Selecteer thema</string>
     <string name="title_setup_light_theme">Licht thema</string>
     <string name="title_setup_dark_theme">Donker thema</string>
     <string name="title_setup_black_theme">Zwart thema</string>
     <string name="title_setup_system_theme">Systeem thema</string>
+    <string name="title_setup_advanced">Geavanceerd</string>
     <string name="title_setup_defaults">Verstekwaarden herstellen</string>
     <string name="title_setup_options">Opties</string>
     <string name="title_advanced">Geavanceerde opties</string>
@@ -189,6 +193,7 @@
     <string name="title_advanced_search_local_hint">In plaats van zoeken in de primaire archiefmap op de server</string>
     <string name="title_advanced_english_hint">Dit zal de app herstarten</string>
     <string name="title_advanced_paranoid_hint">Zie de FAQ voor details</string>
+    <string name="title_advanced_debug_hint">Extra logging inschakelen en debug informatie tonen op verschillende plaatsen</string>
     <string name="title_select">Selecteer &#8230;</string>
     <string name="title_identity_name">Uw naam</string>
     <string name="title_identity_email">Uw e-mailadres</string>
@@ -226,7 +231,6 @@
     <string name="title_use_ip">Gebruik lokaal IP-adres in plaats van hostnaam</string>
     <string name="title_authorize">Selecteer account</string>
     <string name="title_authorizing">Account autoriseren &#8230;</string>
-    <string name="title_setup_advanced">Geavanceerd</string>
     <string name="title_synchronize_account">Synchroniseren (ontvang berichten)</string>
     <string name="title_synchronize_identity">Synchroniseren (stuur berichten)</string>
     <string name="title_primary_account">Primair account (standaard account)</string>
@@ -401,7 +405,6 @@
     <string name="title_search_hint">Zoek op server</string>
     <string name="title_search_device">Zoeken op apparaat</string>
     <string name="title_searching">Zoeken naar \'%1$s\'</string>
-    <string name="title_reset_order">Reset volgorde</string>
     <string name="title_sort_on">Sorteer op</string>
     <string name="title_sort_on_time">Tijd</string>
     <string name="title_sort_on_unread">Ongelezen</string>
@@ -539,7 +542,6 @@
     <string name="title_report">Rapporteer</string>
     <string name="title_fix">Oplossen</string>
     <string name="title_enable">Inschakelen</string>
-    <string name="title_reorder">Herschikken</string>
     <string name="title_no_ask_again">Dit niet meer vragen</string>
     <string name="title_no_body">Geen berichttekst gevonden</string>
     <string name="title_no_charset">Codering niet ondersteund: %1$s</string>
diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml
index 4e03a4cfde..129020fcb2 100644
--- a/app/src/main/res/values-nn-rNO/strings.xml
+++ b/app/src/main/res/values-nn-rNO/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Rediger mappe</string>
     <string name="title_setup">Oppsett</string>
     <string name="title_setup_help">Hjelp</string>
-    <string name="title_setup_export">Eksporter innstillingene</string>
-    <string name="title_setup_import">Importer innstillinger</string>
-    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
-    <string name="title_setup_password">Passord</string>
-    <string name="title_setup_password_repeat">Gjenta passord</string>
-    <string name="title_setup_password_missing">Passord mangler</string>
-    <string name="title_setup_password_different">Passordene er forskjellige</string>
-    <string name="title_setup_password_invalid">Ugyldig passord</string>
-    <string name="title_setup_exported">Innstillinger eksportert</string>
-    <string name="title_setup_imported">Innstillinger importert</string>
     <string name="title_setup_quick">Hurtig oppsett</string>
     <string name="title_setup_quick_remark">For å raskt sette opp en konto og en identitet for de fleste tilbydere</string>
     <string name="title_setup_quick_hint">Hurtig oppsettet henter konfigurasjons informasjon fra autoconfig.thunderbird.net</string>
@@ -103,20 +93,32 @@
     <string name="title_setup_identity">Oppsett av identiteter</string>
     <string name="title_setup_identity_remark">Å sende e-post</string>
     <string name="title_setup_permissions">Gi tillatelser</string>
-    <string name="title_setup_permissions_remark">Å få tilgang til kontaktinformasjon (valgfritt)</string>
-    <string name="title_setup_doze">Oppsett batterioptimaliseringer</string>
+    <string name="title_setup_permissions_remark">Få tilgang til kontaktinformasjon (valgfritt)</string>
+    <string name="title_setup_doze">Oppsett av batterioptimaliseringer</string>
     <string name="title_setup_doze_remark">Slik mottar du kontinuerlig e-post (valgfritt)</string>
     <string name="title_setup_doze_instructions">I den neste dialogboksen velger du \"Alle apper\" øverst, velg så denne appen og så bekrefte \"Ikke optimaliser\"</string>
     <string name="title_setup_data">Deaktivere data lagring</string>
     <string name="title_setup_inbox">Lese Meldinger</string>
-    <string name="title_setup_notifications">Administrer varsler</string>
     <string name="title_setup_to_do">Gjøremål</string>
     <string name="title_setup_done">Utført</string>
+    <string name="title_setup_export">Eksporter innstillingene</string>
+    <string name="title_setup_import">Importer innstillinger</string>
+    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
+    <string name="title_setup_password">Passord</string>
+    <string name="title_setup_password_repeat">Gjenta passord</string>
+    <string name="title_setup_password_missing">Passord mangler</string>
+    <string name="title_setup_password_different">Passordene er forskjellige</string>
+    <string name="title_setup_password_invalid">Ugyldig passord</string>
+    <string name="title_setup_exported">Innstillinger eksportert</string>
+    <string name="title_setup_imported">Innstillinger importert</string>
+    <string name="title_setup_notifications">Administrer varsler</string>
+    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_setup_theme">Velg tema</string>
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Svart tema</string>
     <string name="title_setup_system_theme">System tema</string>
+    <string name="title_setup_advanced">Avansert</string>
     <string name="title_setup_defaults">Gjenopprett standarder</string>
     <string name="title_setup_options">Alternativer</string>
     <string name="title_advanced">Avanserte innstillinger</string>
@@ -189,6 +191,7 @@
     <string name="title_advanced_search_local_hint">I stedet for å søke i primærarkivmappen på serveren</string>
     <string name="title_advanced_english_hint">Dette vil starte appen på nytt</string>
     <string name="title_advanced_paranoid_hint">Se FAQ for detaljer</string>
+    <string name="title_advanced_debug_hint">Aktivere ekstra logging og vis feilsøkingsinformasjon på forskjellige steder</string>
     <string name="title_select">Velg &#8230;</string>
     <string name="title_identity_name">Ditt navn</string>
     <string name="title_identity_email">Din e-postadresse</string>
@@ -226,7 +229,6 @@
     <string name="title_use_ip">Bruk lokal IP-adresse i stedet for vertsnavn</string>
     <string name="title_authorize">Velg konto</string>
     <string name="title_authorizing">Godkjenne kontoen &#8230;</string>
-    <string name="title_setup_advanced">Avansert</string>
     <string name="title_synchronize_account">Synkronisere (motta meldinger)</string>
     <string name="title_synchronize_identity">Synkronisere (sende meldinger)</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -270,7 +272,7 @@
     <string name="title_display_name">Visningsnavn</string>
     <string name="title_show_folders">Vis skjulte mapper</string>
     <string name="title_hide_folder">Skjul mappe</string>
-    <string name="title_unified_folder">Vis enhetlig konto</string>
+    <string name="title_unified_folder">Vis i enhetlig konto</string>
     <string name="title_navigation_folder">Vis i navigasjonsmenyen</string>
     <string name="title_synchronize_folder">Synkronisere (motta meldinger)</string>
     <string name="title_poll_folder">Kontroller jevnlig i stedet for kontinuerlig synkronisering</string>
@@ -401,7 +403,6 @@
     <string name="title_search_hint">Søk på server</string>
     <string name="title_search_device">Søk på enheten</string>
     <string name="title_searching">Søker \'%1$s \'</string>
-    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_sort_on">Sorter på</string>
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Ulest</string>
@@ -461,13 +462,13 @@
     <string name="title_legend_primary_connected">Konto tilkoblet</string>
     <string name="title_legend_thread">Samtale</string>
     <string name="title_legend_zoom">Endre tekststørrelse</string>
-    <string name="title_legend_draft">Har utkast</string>
-    <string name="title_legend_snoozed">Er snoozed</string>
+    <string name="title_legend_draft">Kladd finnes</string>
+    <string name="title_legend_snoozed">Er utsatt</string>
     <string name="title_legend_browsed">Er bladd eller søkt etter</string>
     <string name="title_legend_answered">Har blitt besvart</string>
     <string name="title_legend_receipt">Kvittering ble forespurt</string>
     <string name="title_legend_attachment">Har vedlegg</string>
-    <string name="title_legend_flagged">Har stjernemerket</string>
+    <string name="title_legend_flagged">Er stjernemerket</string>
     <string name="title_legend_contacts">Administrere kontakter</string>
     <string name="title_legend_view">Vis innehold</string>
     <string name="title_legend_hide">Skjul innhold</string>
@@ -484,8 +485,8 @@
     <string name="title_legend_file">Legg ved fil</string>
     <string name="title_legend_download_off">Last ned meldingsinnhold på forespørsel </string>
     <string name="title_legend_download_on">Last ned meldingsinnhold automatisk</string>
-    <string name="title_legend_synchronize_on">Synkroniser på</string>
-    <string name="title_legend_synchronize_off">Synkroniser av</string>
+    <string name="title_legend_synchronize_on">Synkroniser nå</string>
+    <string name="title_legend_synchronize_off">Synkronisering av</string>
     <string name="title_legend_primary">Primær</string>
     <string name="title_legend_disconnected">Frakoblet</string>
     <string name="title_legend_connecting">Kobler til</string>
@@ -539,7 +540,6 @@
     <string name="title_report">Rapportere</string>
     <string name="title_fix">Fiks</string>
     <string name="title_enable">Aktiver</string>
-    <string name="title_reorder">Endre rekkefølge</string>
     <string name="title_no_ask_again">Ikke spør dette igjen</string>
     <string name="title_no_body">Ingen meldingstekst funnet</string>
     <string name="title_no_charset">Koding støttes ikke: %1$s</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 4e03a4cfde..129020fcb2 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Rediger mappe</string>
     <string name="title_setup">Oppsett</string>
     <string name="title_setup_help">Hjelp</string>
-    <string name="title_setup_export">Eksporter innstillingene</string>
-    <string name="title_setup_import">Importer innstillinger</string>
-    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
-    <string name="title_setup_password">Passord</string>
-    <string name="title_setup_password_repeat">Gjenta passord</string>
-    <string name="title_setup_password_missing">Passord mangler</string>
-    <string name="title_setup_password_different">Passordene er forskjellige</string>
-    <string name="title_setup_password_invalid">Ugyldig passord</string>
-    <string name="title_setup_exported">Innstillinger eksportert</string>
-    <string name="title_setup_imported">Innstillinger importert</string>
     <string name="title_setup_quick">Hurtig oppsett</string>
     <string name="title_setup_quick_remark">For å raskt sette opp en konto og en identitet for de fleste tilbydere</string>
     <string name="title_setup_quick_hint">Hurtig oppsettet henter konfigurasjons informasjon fra autoconfig.thunderbird.net</string>
@@ -103,20 +93,32 @@
     <string name="title_setup_identity">Oppsett av identiteter</string>
     <string name="title_setup_identity_remark">Å sende e-post</string>
     <string name="title_setup_permissions">Gi tillatelser</string>
-    <string name="title_setup_permissions_remark">Å få tilgang til kontaktinformasjon (valgfritt)</string>
-    <string name="title_setup_doze">Oppsett batterioptimaliseringer</string>
+    <string name="title_setup_permissions_remark">Få tilgang til kontaktinformasjon (valgfritt)</string>
+    <string name="title_setup_doze">Oppsett av batterioptimaliseringer</string>
     <string name="title_setup_doze_remark">Slik mottar du kontinuerlig e-post (valgfritt)</string>
     <string name="title_setup_doze_instructions">I den neste dialogboksen velger du \"Alle apper\" øverst, velg så denne appen og så bekrefte \"Ikke optimaliser\"</string>
     <string name="title_setup_data">Deaktivere data lagring</string>
     <string name="title_setup_inbox">Lese Meldinger</string>
-    <string name="title_setup_notifications">Administrer varsler</string>
     <string name="title_setup_to_do">Gjøremål</string>
     <string name="title_setup_done">Utført</string>
+    <string name="title_setup_export">Eksporter innstillingene</string>
+    <string name="title_setup_import">Importer innstillinger</string>
+    <string name="title_setup_import_do">Importerte kontoer vil bli lagt til, ikke overskrevet</string>
+    <string name="title_setup_password">Passord</string>
+    <string name="title_setup_password_repeat">Gjenta passord</string>
+    <string name="title_setup_password_missing">Passord mangler</string>
+    <string name="title_setup_password_different">Passordene er forskjellige</string>
+    <string name="title_setup_password_invalid">Ugyldig passord</string>
+    <string name="title_setup_exported">Innstillinger eksportert</string>
+    <string name="title_setup_imported">Innstillinger importert</string>
+    <string name="title_setup_notifications">Administrer varsler</string>
+    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_setup_theme">Velg tema</string>
     <string name="title_setup_light_theme">Lyst tema</string>
     <string name="title_setup_dark_theme">Mørkt tema</string>
     <string name="title_setup_black_theme">Svart tema</string>
     <string name="title_setup_system_theme">System tema</string>
+    <string name="title_setup_advanced">Avansert</string>
     <string name="title_setup_defaults">Gjenopprett standarder</string>
     <string name="title_setup_options">Alternativer</string>
     <string name="title_advanced">Avanserte innstillinger</string>
@@ -189,6 +191,7 @@
     <string name="title_advanced_search_local_hint">I stedet for å søke i primærarkivmappen på serveren</string>
     <string name="title_advanced_english_hint">Dette vil starte appen på nytt</string>
     <string name="title_advanced_paranoid_hint">Se FAQ for detaljer</string>
+    <string name="title_advanced_debug_hint">Aktivere ekstra logging og vis feilsøkingsinformasjon på forskjellige steder</string>
     <string name="title_select">Velg &#8230;</string>
     <string name="title_identity_name">Ditt navn</string>
     <string name="title_identity_email">Din e-postadresse</string>
@@ -226,7 +229,6 @@
     <string name="title_use_ip">Bruk lokal IP-adresse i stedet for vertsnavn</string>
     <string name="title_authorize">Velg konto</string>
     <string name="title_authorizing">Godkjenne kontoen &#8230;</string>
-    <string name="title_setup_advanced">Avansert</string>
     <string name="title_synchronize_account">Synkronisere (motta meldinger)</string>
     <string name="title_synchronize_identity">Synkronisere (sende meldinger)</string>
     <string name="title_primary_account">Primær (standardkonto)</string>
@@ -270,7 +272,7 @@
     <string name="title_display_name">Visningsnavn</string>
     <string name="title_show_folders">Vis skjulte mapper</string>
     <string name="title_hide_folder">Skjul mappe</string>
-    <string name="title_unified_folder">Vis enhetlig konto</string>
+    <string name="title_unified_folder">Vis i enhetlig konto</string>
     <string name="title_navigation_folder">Vis i navigasjonsmenyen</string>
     <string name="title_synchronize_folder">Synkronisere (motta meldinger)</string>
     <string name="title_poll_folder">Kontroller jevnlig i stedet for kontinuerlig synkronisering</string>
@@ -401,7 +403,6 @@
     <string name="title_search_hint">Søk på server</string>
     <string name="title_search_device">Søk på enheten</string>
     <string name="title_searching">Søker \'%1$s \'</string>
-    <string name="title_reset_order">Tilbakestill rekkefølge</string>
     <string name="title_sort_on">Sorter på</string>
     <string name="title_sort_on_time">Tid</string>
     <string name="title_sort_on_unread">Ulest</string>
@@ -461,13 +462,13 @@
     <string name="title_legend_primary_connected">Konto tilkoblet</string>
     <string name="title_legend_thread">Samtale</string>
     <string name="title_legend_zoom">Endre tekststørrelse</string>
-    <string name="title_legend_draft">Har utkast</string>
-    <string name="title_legend_snoozed">Er snoozed</string>
+    <string name="title_legend_draft">Kladd finnes</string>
+    <string name="title_legend_snoozed">Er utsatt</string>
     <string name="title_legend_browsed">Er bladd eller søkt etter</string>
     <string name="title_legend_answered">Har blitt besvart</string>
     <string name="title_legend_receipt">Kvittering ble forespurt</string>
     <string name="title_legend_attachment">Har vedlegg</string>
-    <string name="title_legend_flagged">Har stjernemerket</string>
+    <string name="title_legend_flagged">Er stjernemerket</string>
     <string name="title_legend_contacts">Administrere kontakter</string>
     <string name="title_legend_view">Vis innehold</string>
     <string name="title_legend_hide">Skjul innhold</string>
@@ -484,8 +485,8 @@
     <string name="title_legend_file">Legg ved fil</string>
     <string name="title_legend_download_off">Last ned meldingsinnhold på forespørsel </string>
     <string name="title_legend_download_on">Last ned meldingsinnhold automatisk</string>
-    <string name="title_legend_synchronize_on">Synkroniser på</string>
-    <string name="title_legend_synchronize_off">Synkroniser av</string>
+    <string name="title_legend_synchronize_on">Synkroniser nå</string>
+    <string name="title_legend_synchronize_off">Synkronisering av</string>
     <string name="title_legend_primary">Primær</string>
     <string name="title_legend_disconnected">Frakoblet</string>
     <string name="title_legend_connecting">Kobler til</string>
@@ -539,7 +540,6 @@
     <string name="title_report">Rapportere</string>
     <string name="title_fix">Fiks</string>
     <string name="title_enable">Aktiver</string>
-    <string name="title_reorder">Endre rekkefølge</string>
     <string name="title_no_ask_again">Ikke spør dette igjen</string>
     <string name="title_no_body">Ingen meldingstekst funnet</string>
     <string name="title_no_charset">Koding støttes ikke: %1$s</string>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 3f292f195d..032b2f2829 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
+    <string name="app_changelog">Dziennik zmian</string>
     <string name="app_welcome">FairEmail to aplikacja e-mail o otwartym kodzie źródłowym, koncentrująca się na prywatności i bezpieczeństwie. Z tego powodu niektóre funkcje mogą działać inaczej niż to, do czego jesteś przyzwyczajony.</string>
     <string name="app_limitations">Przykładowo, wiadomości będą zawsze przeformatowane, aby usunąć niebezpieczne elementy i zwiększyć czytelność, a otwieranie linków musi być potwierdzane dla zachowania bezpieczeństwa.</string>
     <string name="app_crash">FairEmail nie jest obsługiwany na tym urządzeniu, ponieważ błędy w Androidzie powodują awarie</string>
@@ -31,6 +32,12 @@
         <item quantity="many">%1$d nowych wiadomość</item>
         <item quantity="other">%1$d nowych wiadomość</item>
     </plurals>
+    <plurals name="title_notification_unsent">
+        <item quantity="one">%1$d wiadomość zostanie wysłana</item>
+        <item quantity="few">%1$d wiadomości zostaną wysłane</item>
+        <item quantity="many">%1$d wiadomości zostaną wysłane</item>
+        <item quantity="other">%1$d wiadomości zostaną wysłane</item>
+    </plurals>
     <plurals name="title_tile_unseen">
         <item quantity="one">%1$d nowa</item>
         <item quantity="few">%1$d nowe</item>
@@ -84,22 +91,13 @@
     <string name="title_edit_folder">Edytuj folder</string>
     <string name="title_setup">Ustawienia</string>
     <string name="title_setup_help">Pomoc</string>
-    <string name="title_setup_export">Eksport ustawień</string>
-    <string name="title_setup_import">Import ustawień</string>
-    <string name="title_setup_import_do">Zaimportowane konta zostaną dodane, nie nadpisane</string>
-    <string name="title_setup_password">Hasło</string>
-    <string name="title_setup_password_repeat">Powtórz hasło</string>
-    <string name="title_setup_password_missing">Brak hasła</string>
-    <string name="title_setup_password_different">Hasła się różnią</string>
-    <string name="title_setup_password_invalid">Nieprawidłowe hasło</string>
-    <string name="title_setup_exported">Ustawienia wyeksportowane</string>
-    <string name="title_setup_imported">Ustawienia zaimportowane</string>
     <string name="title_setup_quick">Szybkie ustawienia</string>
     <string name="title_setup_quick_hint">Szybka konfiguracja pobierze informacje o ustawieniach z autoconfig.thunderbird.net</string>
     <string name="title_setup_quick_imap">Serwer IMAP do odbierania wiadomości</string>
     <string name="title_setup_quick_smtp">Serwer SMTP do wysyłania wiadomości</string>
     <string name="title_setup_go">Idż</string>
     <string name="title_setup_setting_gmail">Włącz dostęp dla \"mniej bezpiecznych\" aplikacji do konta</string>
+    <string name="title_setup_setting_yahoo">Włącz dostęp dla \"mniej bezpiecznych\" aplikacji</string>
     <string name="title_setup_no_settings">Nie znaleziono ustawień dla \'%1$s\'</string>
     <string name="title_setup_quick_success">Pomyślnie dodano konto i tożsamość</string>
     <string name="title_setup_quick_failed">Możesz ustawić konto i tożsamość w krokach poniżej</string>
@@ -116,13 +114,25 @@
     <string name="title_setup_doze_instructions">W następnym oknie dialogowym, na górze wybierz \"Wszystkie aplikacje\", odszukaj i dotknij FairEmail, wybierz \"Nie optymalizuj\"</string>
     <string name="title_setup_data">Wyłącz oszczędzanie danych</string>
     <string name="title_setup_inbox">Czytaj wiadomości</string>
-    <string name="title_setup_notifications">Zarządzaj powiadomieniami</string>
     <string name="title_setup_to_do">Do zrobienia</string>
     <string name="title_setup_done">Gotowe</string>
+    <string name="title_setup_export">Eksport ustawień</string>
+    <string name="title_setup_import">Import ustawień</string>
+    <string name="title_setup_import_do">Zaimportowane konta zostaną dodane, nie nadpisane</string>
+    <string name="title_setup_password">Hasło</string>
+    <string name="title_setup_password_repeat">Powtórz hasło</string>
+    <string name="title_setup_password_missing">Brak hasła</string>
+    <string name="title_setup_password_different">Hasła się różnią</string>
+    <string name="title_setup_password_invalid">Nieprawidłowe hasło</string>
+    <string name="title_setup_exported">Ustawienia wyeksportowane</string>
+    <string name="title_setup_imported">Ustawienia zaimportowane</string>
+    <string name="title_setup_notifications">Zarządzaj powiadomieniami</string>
+    <string name="title_setup_theme">Wybierz motyw</string>
     <string name="title_setup_light_theme">Jasny motyw</string>
     <string name="title_setup_dark_theme">Ciemny motyw</string>
     <string name="title_setup_black_theme">Czarny motyw</string>
     <string name="title_setup_system_theme">Motyw systemu</string>
+    <string name="title_setup_advanced">Zaawansowane</string>
     <string name="title_setup_defaults">Przywróć domyślne</string>
     <string name="title_setup_options">Opcje</string>
     <string name="title_advanced">Opcje zaawansowane</string>
@@ -141,6 +151,7 @@
     <string name="title_advanced_threading">Konwersacje w wątkach</string>
     <string name="title_advanced_avatars">Pokaż zdjęcia kontaktu</string>
     <string name="title_advanced_identicons">Pokazuje ikony kontaktów</string>
+    <string name="title_advanced_circular">Pokaż okrągłe ikony</string>
     <string name="title_advanced_name_email">Pokaż nazwy i adresy e-mail</string>
     <string name="title_advanced_subject_italic">Temat wyświetlaj kursywą</string>
     <string name="title_advanced_flags">Pokaż gwiazdki (ulubione)</string>
@@ -215,7 +226,6 @@
     <string name="title_use_ip">Użyj lokalnego adresu IP zamiast nazwy hosta</string>
     <string name="title_authorize">Wybierz konto</string>
     <string name="title_authorizing">Autoryzowanie konta &#8230;</string>
-    <string name="title_setup_advanced">Zaawansowane</string>
     <string name="title_synchronize_account">Synchronizuj (odbierz wiadomości)</string>
     <string name="title_synchronize_identity">Synchronizuj (wyślij wiadomości)</string>
     <string name="title_primary_account">Podstawowe (domyślne konto)</string>
@@ -377,8 +387,10 @@
     <string name="title_sort_on_sender">Nadawca</string>
     <string name="title_sort_on_subject">Temat</string>
     <string name="title_sort_on_size">Rozmiar</string>
+    <string name="title_filter_duplicates">Duplikaty</string>
     <string name="title_compact">Widok kompaktowy</string>
     <string name="title_zoom">Rozmiar tekstu</string>
+    <string name="title_select_all">Wybierz wszystkie</string>
     <string name="title_address_sent">Wysłane:</string>
     <string name="title_address_unsent">Niewysłane:</string>
     <string name="title_address_invalid">Nieprawidłowy:</string>
@@ -458,6 +470,17 @@
     <string name="title_legend_download_fetch">Liczba pobranych treści wiadomości / pobranych nagłówków / na serwerze</string>
     <string name="title_legend_metered">Połączenie jest taryfowe</string>
     <string name="title_legend_unmetered">Połączenie nie jest taryfowe</string>
+    <string name="title_legend_show_quotes">Pokaż cytaty</string>
+    <string name="title_legend_show_images">Pokaż obrazy</string>
+    <string name="title_legend_show_full">Pokaż na pełnym ekranie</string>
+    <string name="title_legend_edit">Edycja</string>
+    <string name="title_legend_default_color">Kolor domyślny</string>
+    <string name="title_legend_close_hint">Zamknij podpowiedź</string>
+    <string name="title_legend_connection_state">Stan połączenia</string>
+    <string name="title_legend_sync_state">Stan synchronizacji</string>
+    <string name="title_legend_download_state">Stan pobierania</string>
+    <string name="title_legend_save">Zapisz</string>
+    <string name="title_legend_delete">Usuń</string>
     <string name="title_hint_folder_actions">Przytrzymaj, aby uzyskać więcej opcji</string>
     <string name="title_hint_folder_sync">W celu ograniczenia użycia baterii i sieci nie wszystkie foldery i wiadomości będą domyślnie synchronizowane</string>
     <string name="title_hint_support">Jeśli masz pytanie lub problem, użyj menu Pomoc, aby uzyskać pomoc</string>
@@ -468,12 +491,15 @@
     <string name="title_hint_tracking_image">Web beacon %1$sx%2$s</string>
     <string name="title_hint_ignore_contact">Długo naciśnij kontakt, aby nigdy nie uznać go za ulubiony</string>
     <string name="title_open_link">Otwórz link</string>
+    <string name="title_ip_owner">Adres IP właściciela</string>
     <string name="title_insecure_link">Ten link nie jest bezpieczny</string>
+    <string name="title_select_app">Wybierz aplikację</string>
     <string name="title_updated">Jest dostępna aktualizacja do wersji %1$s</string>
     <string name="title_issue">Masz pytanie lub problem?</string>
     <string name="title_yes">Tak</string>
     <string name="title_no">Nie</string>
     <string name="title_undo">Cofnij</string>
+    <string name="title_redo">Ponów</string>
     <string name="title_add">Dodaj</string>
     <string name="title_browse">Przeglądaj</string>
     <string name="title_info">Info</string>
@@ -500,6 +526,13 @@
     <string name="title_debug_info">Info debugowania</string>
     <string name="title_debug_info_remark">Opisz proszę problem i wskaż moment jego wystąpienia:</string>
     <string name="title_crash_info_remark">Opisz proszę, co robisz, w momencie awarii aplikacji:</string>
+    <string-array name="pollIntervalNames">
+        <item>Zawsze</item>
+        <item>Co pół godziny</item>
+        <item>Co godzinę</item>
+        <item>Co 2 godziny</item>
+        <item>Co 4 godziny</item>
+    </string-array>
     <string-array name="startupNames">
         <item>Wspólna skrzynka odbiorcza</item>
         <item>Wspólne foldery</item>
@@ -516,4 +549,9 @@
         <item>2 MB</item>
         <item>&#8734;</item>
     </string-array>
+    <string-array name="targetNames">
+        <item>Do</item>
+        <item>Dw</item>
+        <item>Udw</item>
+    </string-array>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 8cccb6f8bc..43b97496ad 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Editar pasta</string>
     <string name="title_setup">Configurar</string>
     <string name="title_setup_help">Ajuda</string>
-    <string name="title_setup_export">Exportar configurações</string>
-    <string name="title_setup_import">Importar configurações</string>
-    <string name="title_setup_import_do">Contas importadas serão adicionadas, não sobrescritas</string>
-    <string name="title_setup_password">Senha</string>
-    <string name="title_setup_password_repeat">Repita a senha</string>
-    <string name="title_setup_password_missing">Senha não informada</string>
-    <string name="title_setup_password_different">Senha diferente</string>
-    <string name="title_setup_password_invalid">Senha inválida</string>
-    <string name="title_setup_exported">Configurações exportadas</string>
-    <string name="title_setup_imported">Configurações importadas</string>
     <string name="title_setup_quick">Configuração rápida</string>
     <string name="title_setup_quick_remark">Para configurar rapidamente uma conta e uma identidade para a maioria dos provedores</string>
     <string name="title_setup_quick_hint">A configuração rápida irá buscar informações de configuração a partir de autoconfig.thunderbird.net</string>
@@ -109,14 +99,26 @@
     <string name="title_setup_doze_instructions">Na próxima caixa de diálogo, selecione \"Todos os apps\" no topo, selecione este app, selecione e confirme \"Não otimizar\"</string>
     <string name="title_setup_data">Desativar a economia de dados</string>
     <string name="title_setup_inbox">Ler mensagens</string>
-    <string name="title_setup_notifications">Gerenciar notificações</string>
     <string name="title_setup_to_do">Para fazer</string>
     <string name="title_setup_done">Feito</string>
+    <string name="title_setup_export">Exportar configurações</string>
+    <string name="title_setup_import">Importar configurações</string>
+    <string name="title_setup_import_do">Contas importadas serão adicionadas, não sobrescritas</string>
+    <string name="title_setup_password">Senha</string>
+    <string name="title_setup_password_repeat">Repita a senha</string>
+    <string name="title_setup_password_missing">Senha não informada</string>
+    <string name="title_setup_password_different">Senha diferente</string>
+    <string name="title_setup_password_invalid">Senha inválida</string>
+    <string name="title_setup_exported">Configurações exportadas</string>
+    <string name="title_setup_imported">Configurações importadas</string>
+    <string name="title_setup_notifications">Gerenciar notificações</string>
+    <string name="title_reset_order">Redefinir ordem</string>
     <string name="title_setup_theme">Selecione um tema</string>
     <string name="title_setup_light_theme">Tema claro</string>
     <string name="title_setup_dark_theme">Tema escuro</string>
     <string name="title_setup_black_theme">Tema escuro</string>
     <string name="title_setup_system_theme">Tema do sistema</string>
+    <string name="title_setup_advanced">Avançado</string>
     <string name="title_setup_defaults">Restaurar padrão</string>
     <string name="title_setup_options">Opções</string>
     <string name="title_advanced">Opções avançadas</string>
@@ -226,7 +228,6 @@
     <string name="title_use_ip">Usar endereço IP local em vez do nome do host</string>
     <string name="title_authorize">Selecionar conta</string>
     <string name="title_authorizing">Autorizando a conta &#8230;</string>
-    <string name="title_setup_advanced">Avançado</string>
     <string name="title_synchronize_account">Sincronizar (receber mensagens)</string>
     <string name="title_synchronize_identity">Sincronizar (enviar mensagens)</string>
     <string name="title_primary_account">Principal (identidade padrão)</string>
@@ -401,7 +402,6 @@
     <string name="title_search_hint">Pesquisar no servidor</string>
     <string name="title_search_device">Pesquisar no dispositivo</string>
     <string name="title_searching">Pesquisando \'%1$s\'</string>
-    <string name="title_reset_order">Redefinir ordem</string>
     <string name="title_sort_on">Ordenar por</string>
     <string name="title_sort_on_time">Data</string>
     <string name="title_sort_on_unread">Não lida</string>
@@ -539,7 +539,6 @@
     <string name="title_report">Reportar</string>
     <string name="title_fix">Corrigir</string>
     <string name="title_enable">Habilitar</string>
-    <string name="title_reorder">Reordenar</string>
     <string name="title_no_ask_again">Não perguntar novamente</string>
     <string name="title_no_body">Texto da mensagem não encontrado</string>
     <string name="title_no_charset">Codificação não suportada: %1$s</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index 48b5904c8d..4d5ae18f19 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -83,16 +83,6 @@
     <string name="title_edit_folder">Editare dosar</string>
     <string name="title_setup">Setări</string>
     <string name="title_setup_help">Ajutor</string>
-    <string name="title_setup_export">Exportă setări</string>
-    <string name="title_setup_import">Importă setări</string>
-    <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">Lipsește parola</string>
-    <string name="title_setup_password_different">Parolele sunt diferite</string>
-    <string name="title_setup_password_invalid">Parolă incorectă</string>
-    <string name="title_setup_exported">Setări exportate</string>
-    <string name="title_setup_imported">Setări importate</string>
     <string name="title_setup_quick">Configurare rapidă</string>
     <string name="title_setup_quick_remark">Permite setarea rapidă a unui cont și a unei identități pentru majoritatea furnizorilor</string>
     <string name="title_setup_quick_hint">Se vor descărca informațiile necesare de pe autoconfig.thunderbird.net</string>
@@ -117,14 +107,26 @@
     <string name="title_setup_doze_instructions">În fereastra următoare, selectați \"Toate aplicațiile\" din partea de sus, selectați acestă aplicație și selectați și confirmați \"Nu optimiza\"</string>
     <string name="title_setup_data">Dezactivează salvarea datelor</string>
     <string name="title_setup_inbox">Citire mesaje</string>
-    <string name="title_setup_notifications">Gestionarea notificărilor</string>
     <string name="title_setup_to_do">De făcut</string>
     <string name="title_setup_done">Gata</string>
+    <string name="title_setup_export">Exportă setări</string>
+    <string name="title_setup_import">Importă setări</string>
+    <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">Lipsește parola</string>
+    <string name="title_setup_password_different">Parolele sunt diferite</string>
+    <string name="title_setup_password_invalid">Parolă incorectă</string>
+    <string name="title_setup_exported">Setări exportate</string>
+    <string name="title_setup_imported">Setări importate</string>
+    <string name="title_setup_notifications">Gestionarea notificărilor</string>
+    <string name="title_reset_order">Resetare ordine</string>
     <string name="title_setup_theme">Selectare temă</string>
     <string name="title_setup_light_theme">Temă luminoasă</string>
     <string name="title_setup_dark_theme">Temă întunecată</string>
     <string name="title_setup_black_theme">Temă neagră</string>
     <string name="title_setup_system_theme">Temă de sistem</string>
+    <string name="title_setup_advanced">Setări avansate</string>
     <string name="title_setup_defaults">Restabiliți valorile implicite</string>
     <string name="title_setup_options">Opţiuni</string>
     <string name="title_advanced">Opțiuni avansate</string>
@@ -197,6 +199,7 @@
     <string name="title_advanced_search_local_hint">În loc să se caute în dosarul arhivă primar de pe server</string>
     <string name="title_advanced_english_hint">Aplicația se va restarta</string>
     <string name="title_advanced_paranoid_hint">Vedeți secțiunea de întrebări și răspunsuri pentru detalii</string>
+    <string name="title_advanced_debug_hint">Activați înregistrări suplimentare în jurnalul aplicației și afișați informații de depanare în diferite locuri</string>
     <string name="title_select">Selectaţi &#8230;</string>
     <string name="title_identity_name">Numele dumneavoastră</string>
     <string name="title_identity_email">Adresa dvs. de e-mail</string>
@@ -234,7 +237,6 @@
     <string name="title_use_ip">Folosește adresa IP în loc de numele gazdei</string>
     <string name="title_authorize">Selectare cont</string>
     <string name="title_authorizing">Autorizare cont &#8230;</string>
-    <string name="title_setup_advanced">Setări avansate</string>
     <string name="title_synchronize_account">Sincronizare (primire mesaje)</string>
     <string name="title_synchronize_identity">Sincronizare (trimitere mesaje)</string>
     <string name="title_primary_account">Primară (identitatea implicită)</string>
@@ -409,7 +411,6 @@
     <string name="title_search_hint">Căutare pe server</string>
     <string name="title_search_device">Căutare pe dispozitiv</string>
     <string name="title_searching">Se caută \'%1$s\'</string>
-    <string name="title_reset_order">Resetare ordine</string>
     <string name="title_sort_on">Sortare</string>
     <string name="title_sort_on_time">Dată</string>
     <string name="title_sort_on_unread">Necitit</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index e67857a6d2..3b1ddbb55c 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -91,16 +91,6 @@
     <string name="title_edit_folder">Редактировать папку</string>
     <string name="title_setup">Установка</string>
     <string name="title_setup_help">Справка</string>
-    <string name="title_setup_export">Экспорт настроек</string>
-    <string name="title_setup_import">Импорт настроек</string>
-    <string name="title_setup_import_do">Импортированные учётные записи будут добавлены, не перезаписаны</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_quick">Быстрая настройка</string>
     <string name="title_setup_quick_remark">Быстрая настройка учётной записи и идентификатора для большинства провайдеров</string>
     <string name="title_setup_quick_hint">Быстрая настройка считывает информацию о конфигурации с autoconfig.thunderbird.net</string>
@@ -125,14 +115,28 @@
     <string name="title_setup_doze_instructions">В следующем диалоговом окне выберите «Все приложения» вверху, выберите это приложение, выберите и подтвердите «Не оптимизировать»</string>
     <string name="title_setup_data">Отключить сохранение данных</string>
     <string name="title_setup_inbox">Читать сообщения</string>
-    <string name="title_setup_notifications">Настроить уведомления</string>
     <string name="title_setup_to_do">Выполнить</string>
     <string name="title_setup_done">Готово</string>
+    <string name="title_setup_export">Экспорт настроек</string>
+    <string name="title_setup_import">Импорт настроек</string>
+    <string name="title_setup_import_do">Импортированные учётные записи будут добавлены, не перезаписаны</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_notifications">Настроить уведомления</string>
+    <string name="title_setup_reorder_accounts">Упорядочить учётные записи</string>
+    <string name="title_setup_reorder_folders">Упорядочить папки</string>
+    <string name="title_reset_order">Изменить порядок</string>
     <string name="title_setup_theme">Выбрать тему</string>
     <string name="title_setup_light_theme">Светлая тема</string>
     <string name="title_setup_dark_theme">Тёмная тема</string>
     <string name="title_setup_black_theme">Чёрная тема</string>
     <string name="title_setup_system_theme">Системная тема</string>
+    <string name="title_setup_advanced">Дополнительные опции</string>
     <string name="title_setup_defaults">Восстановить настройки по умолчанию</string>
     <string name="title_setup_options">Опции</string>
     <string name="title_advanced">Дополнительные опции</string>
@@ -205,6 +209,7 @@
     <string name="title_advanced_search_local_hint">Вместо поиска в основной папке архива на сервере</string>
     <string name="title_advanced_english_hint">Это перезапустит приложение</string>
     <string name="title_advanced_paranoid_hint">Подробнее смотрите FAQ</string>
+    <string name="title_advanced_debug_hint">Включить дополнительное журналирование и показывать отладочную информацию в различных местах</string>
     <string name="title_select">Выбор &#8230;</string>
     <string name="title_identity_name">Ваше имя</string>
     <string name="title_identity_email">Ваш эл. адрес</string>
@@ -242,7 +247,6 @@
     <string name="title_use_ip">Использовать локальный IP-адрес вместо имени хоста</string>
     <string name="title_authorize">Выбрать учетную запись</string>
     <string name="title_authorizing">Авторизация учетной записи &#8230;</string>
-    <string name="title_setup_advanced">Дополнительные опции</string>
     <string name="title_synchronize_account">Синхронизировать (получать сообщения)</string>
     <string name="title_synchronize_identity">Синхронизировать (отправлять сообщения)</string>
     <string name="title_primary_account">Основная (учетная запись по умолчанию)</string>
@@ -417,7 +421,6 @@
     <string name="title_search_hint">Поиск на сервере</string>
     <string name="title_search_device">Поиск на устройстве</string>
     <string name="title_searching">Поиск \'%1$s\'</string>
-    <string name="title_reset_order">Изменить порядок</string>
     <string name="title_sort_on">Сортировать по</string>
     <string name="title_sort_on_time">Время</string>
     <string name="title_sort_on_unread">Не прочитано</string>
@@ -555,7 +558,6 @@
     <string name="title_report">Отчет</string>
     <string name="title_fix">Исправить</string>
     <string name="title_enable">Включить</string>
-    <string name="title_reorder">Упорядочить</string>
     <string name="title_no_ask_again">Больше не спрашивать</string>
     <string name="title_no_body">В сообщении нет текста</string>
     <string name="title_no_charset">Кодировка не поддерживается: %1$s</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index fd212f7831..6c1b99e39a 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -71,16 +71,6 @@
     <string name="title_edit_folder">Redigera mapp</string>
     <string name="title_setup">Ställ in</string>
     <string name="title_setup_help">Hjälp</string>
-    <string name="title_setup_export">Exportera inställningar</string>
-    <string name="title_setup_import">Importera inställningar</string>
-    <string name="title_setup_import_do">Importerade konton kommer att läggas till, inte skrivas över</string>
-    <string name="title_setup_password">Lösenord</string>
-    <string name="title_setup_password_repeat">Upprepa lösenord</string>
-    <string name="title_setup_password_missing">Lösenord saknas</string>
-    <string name="title_setup_password_different">Lösenorden är olika</string>
-    <string name="title_setup_password_invalid">Ogiltigt lösenord</string>
-    <string name="title_setup_exported">Inställningar exporterade</string>
-    <string name="title_setup_imported">Inställningar importerade</string>
     <string name="title_setup_quick">Snabbinstallation</string>
     <string name="title_setup_quick_remark">För att snabbt konfigurera ett konto och en identitet för de flesta leverantörer</string>
     <string name="title_setup_quick_hint">Snabbinställningen hämtar konfigurationsinformation från autoconfig.thunderbird.net</string>
@@ -105,14 +95,25 @@
     <string name="title_setup_doze_instructions">I nästa dialogruta, välj ”Alla appar” högst upp, välj denna app och välj och bekräfta ”Optimera inte”</string>
     <string name="title_setup_data">Inaktivera datasparande</string>
     <string name="title_setup_inbox">Läs meddelanden</string>
-    <string name="title_setup_notifications">Hantera aviseringar</string>
     <string name="title_setup_to_do">Att göra</string>
     <string name="title_setup_done">Klar</string>
+    <string name="title_setup_export">Exportera inställningar</string>
+    <string name="title_setup_import">Importera inställningar</string>
+    <string name="title_setup_import_do">Importerade konton kommer att läggas till, inte skrivas över</string>
+    <string name="title_setup_password">Lösenord</string>
+    <string name="title_setup_password_repeat">Upprepa lösenord</string>
+    <string name="title_setup_password_missing">Lösenord saknas</string>
+    <string name="title_setup_password_different">Lösenorden är olika</string>
+    <string name="title_setup_password_invalid">Ogiltigt lösenord</string>
+    <string name="title_setup_exported">Inställningar exporterade</string>
+    <string name="title_setup_imported">Inställningar importerade</string>
+    <string name="title_setup_notifications">Hantera aviseringar</string>
     <string name="title_setup_theme">Välj tema</string>
     <string name="title_setup_light_theme">Ljust tema</string>
     <string name="title_setup_dark_theme">Mörkt tema</string>
     <string name="title_setup_black_theme">Svart Tema</string>
     <string name="title_setup_system_theme">Systemtema</string>
+    <string name="title_setup_advanced">Avancerat</string>
     <string name="title_setup_defaults">Återställ standardvärden</string>
     <string name="title_setup_options">Alternativ</string>
     <string name="title_advanced">Avancerade inställningar</string>
@@ -214,7 +215,6 @@
     <string name="title_use_ip">Använd lokal IP-adress istället för värdnamn</string>
     <string name="title_authorize">Välj konto</string>
     <string name="title_authorizing">Auktoriserar konto &#8230;</string>
-    <string name="title_setup_advanced">Avancerat</string>
     <string name="title_synchronize_account">Synkronisera (hämta meddelanden)</string>
     <string name="title_synchronize_identity">Synkronisera (skicka meddelanden)</string>
     <string name="title_primary_account">Primär (standardkonto)</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index dd1c395b95..b615563808 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -75,16 +75,6 @@
     <string name="title_edit_folder">Klasörü düzenle</string>
     <string name="title_setup">Kurulum</string>
     <string name="title_setup_help">Yardım</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_import_do">İçe aktarılan hesaplar eklenecek, üzerine yazılmayacak</string>
-    <string name="title_setup_password">Parola</string>
-    <string name="title_setup_password_repeat">Parolayı tekrarla</string>
-    <string name="title_setup_password_missing">Parola eksik</string>
-    <string name="title_setup_password_different">Parolalar farklı</string>
-    <string name="title_setup_password_invalid">Parola geçersiz</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_quick">Hızlı Kurulum</string>
     <string name="title_setup_quick_hint">Hızlı kurulum, yapılandırma bilgilerini autoconfig.thunderbird.net adresinden alır</string>
     <string name="title_setup_quick_imap">İleti almak için IMAP sunucusu</string>
@@ -108,14 +98,26 @@
     <string name="title_setup_doze_instructions">Sonraki iletişim kutusunda, en üstteki \"Tüm uygulamalar\" seçeneğini işaretleyin, bu uygulamayı seçin ve \"optimize etme\" seçeneğini onaylayın</string>
     <string name="title_setup_data">Veri kaydetmeyi devre dışı bırak</string>
     <string name="title_setup_inbox">İletileri okuyun</string>
-    <string name="title_setup_notifications">Bildirimleri yönet</string>
     <string name="title_setup_to_do">Yapılacak</string>
     <string name="title_setup_done">Bitti</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_import_do">İçe aktarılan hesaplar eklenecek, üzerine yazılmayacak</string>
+    <string name="title_setup_password">Parola</string>
+    <string name="title_setup_password_repeat">Parolayı tekrarla</string>
+    <string name="title_setup_password_missing">Parola eksik</string>
+    <string name="title_setup_password_different">Parolalar farklı</string>
+    <string name="title_setup_password_invalid">Parola geçersiz</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_notifications">Bildirimleri yönet</string>
+    <string name="title_reset_order">Düzeni sıfırla</string>
     <string name="title_setup_theme">Tema Seç</string>
     <string name="title_setup_light_theme">Aydınlık tema</string>
     <string name="title_setup_dark_theme">Koyu Tema</string>
     <string name="title_setup_black_theme">Siyah tema</string>
     <string name="title_setup_system_theme">Sistem teması</string>
+    <string name="title_setup_advanced">Gelişmiş</string>
     <string name="title_setup_defaults">Öntanımlıları geri yükle</string>
     <string name="title_setup_options">Seçenekler</string>
     <string name="title_advanced">Gelişmiş seçenekler</string>
@@ -222,7 +224,6 @@
     <string name="title_use_ip">Ana bilgisayar adı yerine yerel IP adresini kullan</string>
     <string name="title_authorize">Hesap seç</string>
     <string name="title_authorizing">Hesap yetkilendiriliyor &#8230;</string>
-    <string name="title_setup_advanced">Gelişmiş</string>
     <string name="title_synchronize_account">Eşzamanlama (iletileri al)</string>
     <string name="title_synchronize_identity">Eşzamanlama (iletileri gönder)</string>
     <string name="title_primary_account">Birincil (varsayılan hesap)</string>
@@ -393,7 +394,6 @@
     <string name="title_search_hint">Sunucuda ara</string>
     <string name="title_search_device">Aygıtda ara</string>
     <string name="title_searching">\'%1$s\' aranıyor</string>
-    <string name="title_reset_order">Düzeni sıfırla</string>
     <string name="title_sort_on">Sırala</string>
     <string name="title_sort_on_time">Zaman</string>
     <string name="title_sort_on_unread">Okunmadı</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 31a8864caf..8948662f7a 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -67,16 +67,6 @@
     <string name="title_edit_folder">编辑文件夹</string>
     <string name="title_setup">设置</string>
     <string name="title_setup_help">帮助</string>
-    <string name="title_setup_export">导出设置</string>
-    <string name="title_setup_import">导入设置</string>
-    <string name="title_setup_import_do">导入的账号将被添加，但不会覆写</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_quick">快速设置</string>
     <string name="title_setup_quick_remark">为大多数邮件服务提供商快速设置账户和身份</string>
     <string name="title_setup_quick_hint">快速设置将从autoconfig.thunderbird.net 获取配置信息</string>
@@ -101,14 +91,26 @@
     <string name="title_setup_doze_instructions">在下个界面，选择最上面的\"所有应用\"，选择这个app如何选择并确定\"不优化\"</string>
     <string name="title_setup_data">禁用省流量</string>
     <string name="title_setup_inbox">阅读信息</string>
-    <string name="title_setup_notifications">通知管理</string>
     <string name="title_setup_to_do">未设置</string>
     <string name="title_setup_done">完成</string>
+    <string name="title_setup_export">导出设置</string>
+    <string name="title_setup_import">导入设置</string>
+    <string name="title_setup_import_do">导入的账号将被添加，但不会覆写</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_notifications">通知管理</string>
+    <string name="title_reset_order">重置顺序</string>
     <string name="title_setup_theme">选择主题</string>
     <string name="title_setup_light_theme">亮色主题</string>
     <string name="title_setup_dark_theme">暗色主题</string>
     <string name="title_setup_black_theme">黑色主题</string>
     <string name="title_setup_system_theme">系统主题</string>
+    <string name="title_setup_advanced">高级选项</string>
     <string name="title_setup_defaults">恢复默认设置</string>
     <string name="title_setup_options">选项</string>
     <string name="title_advanced">高级选项</string>
@@ -181,6 +183,7 @@
     <string name="title_advanced_search_local_hint">不在服务器上的主存档文件夹中搜索</string>
     <string name="title_advanced_english_hint">这将重新启动应用程序</string>
     <string name="title_advanced_paranoid_hint">详细信息请查看常见问题</string>
+    <string name="title_advanced_debug_hint">启用额外日志并在不同地方显示调试信息</string>
     <string name="title_select">选择 &#8230;</string>
     <string name="title_identity_name">姓名</string>
     <string name="title_identity_email">电子邮件地址</string>
@@ -218,7 +221,6 @@
     <string name="title_use_ip">使用本地IP地址而非主机名</string>
     <string name="title_authorize">选择账户</string>
     <string name="title_authorizing">授权帐户 &#8230;</string>
-    <string name="title_setup_advanced">高级选项</string>
     <string name="title_synchronize_account">同步（接收）</string>
     <string name="title_synchronize_identity">同步（发送）</string>
     <string name="title_primary_account">默认账户</string>
@@ -393,7 +395,6 @@
     <string name="title_search_hint">在服务器上搜索</string>
     <string name="title_search_device">搜索设备</string>
     <string name="title_searching">搜索 “%1$s”</string>
-    <string name="title_reset_order">重置顺序</string>
     <string name="title_sort_on">分类方式</string>
     <string name="title_sort_on_time">时间</string>
     <string name="title_sort_on_unread">未读</string>
@@ -531,7 +532,6 @@
     <string name="title_report">报告</string>
     <string name="title_fix">修复</string>
     <string name="title_enable">启用</string>
-    <string name="title_reorder">重新排序</string>
     <string name="title_no_ask_again">别再询问</string>
     <string name="title_no_body">没有找到消息文本</string>
     <string name="title_no_charset">不支持的编码: %1$s</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1faac91fa7..dea0b1271f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -330,6 +330,7 @@
     <string name="title_sync_days_remark">Increasing this value will increase battery and data usage</string>
     <string name="title_keep_days">Keep messages (days)</string>
     <string name="title_keep_all">Keep all messages</string>
+    <string name="title_auto_delete">Automatically delete old messages</string>
     <string name="title_folder_name_missing">Folder name missing</string>
     <string name="title_folder_exists">Folder %1$s exists</string>
     <string name="title_folder_delete">Permanently delete this folder and any messages it contains?</string>