diff --git a/locales/cs/common.json b/locales/cs/common.json
index 3d409002..a642b676 100644
--- a/locales/cs/common.json
+++ b/locales/cs/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Přepnout na perštinu"
   },
   "settings": {
     "title": "Nastavení",
diff --git a/locales/da/common.json b/locales/da/common.json
index efdbed29..ac73cc9a 100644
--- a/locales/da/common.json
+++ b/locales/da/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Skift til farsi"
   },
   "settings": {
     "title": "Indstillinger",
diff --git a/locales/de/common.json b/locales/de/common.json
index 6b066449..0fc3f008 100644
--- a/locales/de/common.json
+++ b/locales/de/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Zu Farsi wechseln"
   },
   "settings": {
     "title": "Einstellungen",
diff --git a/locales/es/common.json b/locales/es/common.json
index 681f4b40..3e7bd844 100644
--- a/locales/es/common.json
+++ b/locales/es/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Cambiar a farsi"
   },
   "settings": {
     "title": "Configuración",
diff --git a/locales/fa/common.json b/locales/fa/common.json
index 7e216f87..e4065d57 100644
--- a/locales/fa/common.json
+++ b/locales/fa/common.json
@@ -134,7 +134,10 @@
     "mail": "ایمیل",
     "nav_label": "ناوبری",
     "add_app": "برنامه‌ها",
-    "scheduled": "زمان‌بندی شده"
+    "scheduled": "زمان‌بندی شده",
+    "unified_all_mail": "همه ایمیل‌ها",
+    "unified_all_starred": "همه ستاره‌دارها",
+    "unified_all_unread": "همه خوانده‌نشده‌ها"
   },
   "protocol_handlers": {
     "title": "برنامه‌های پیش‌فرض",
@@ -926,7 +929,8 @@
         "description": "نمایش گزینه \"همه ایمیل‌ها\" بالای پوشه‌ها",
         "folders_label": "پوشه‌ها در همه ایمیل‌ها",
         "folders_description": "انتخاب کنید کدام پوشه‌ها ادغام شوند",
-        "no_folders": "پوشه‌ای موجود نیست"
+        "no_folders": "پوشه‌ای موجود نیست",
+        "account_hint": "برای {account} اعمال می‌شود."
       },
       "colorful_sidebar_icons": {
         "label": "آیکون‌های رنگی نوار کناری",
@@ -937,6 +941,18 @@
         "description": "چیدمان قدرت-کاربری فقط دسکتاپ",
         "open_label": "باز کردن رابط حرفه‌ای",
         "back_to_standard": "بازگشت به استاندارد"
+      },
+      "cross_all": {
+        "label": "همه حساب‌ها: همه ایمیل‌ها",
+        "description": "نمایش یک مورد در بخش همه حساب‌ها که همه ایمیل‌های همه حساب‌ها را فهرست می‌کند، شامل همه پوشه‌ها به جز هرزنامه، ارسال‌شده، بایگانی، زباله‌دان و پیش‌نویس‌ها."
+      },
+      "cross_starred": {
+        "label": "همه حساب‌ها: ستاره‌دار",
+        "description": "نمایش یک مورد در بخش همه حساب‌ها که ایمیل‌های ستاره‌دار همه حساب‌ها را فهرست می‌کند، شامل همه پوشه‌ها به جز هرزنامه، ارسال‌شده، بایگانی، زباله‌دان و پیش‌نویس‌ها."
+      },
+      "cross_unread": {
+        "label": "همه حساب‌ها: خوانده‌نشده",
+        "description": "نمایش یک مورد در بخش همه حساب‌ها که ایمیل‌های خوانده‌نشده همه حساب‌ها را فهرست می‌کند، شامل همه پوشه‌ها به جز هرزنامه، ارسال‌شده، بایگانی، زباله‌دان و پیش‌نویس‌ها."
       }
     },
     "keywords": {
@@ -1201,7 +1217,8 @@
         "corner_top-left": "بالا چپ",
         "corner_top-right": "بالا راست",
         "corner_bottom-left": "پایین چپ",
-        "corner_bottom-right": "پایین راست"
+        "corner_bottom-right": "پایین راست",
+        "not_spam": "هرزنامه نیست"
       },
       "default_mail_program": {
         "label": "برنامه ایمیل پیش‌فرض",
@@ -1233,6 +1250,10 @@
         "off": "خاموش",
         "seconds": "{seconds} ثانیه",
         "unsupported": "پشتیبانی نمی‌شود"
+      },
+      "return_to_list_after_action": {
+        "label": "بازگشت به فهرست پس از حذف یا علامت‌گذاری به‌عنوان خوانده‌نشده",
+        "description": "پس از حذف یا علامت‌گذاری پیام باز به‌عنوان خوانده‌نشده، به‌جای باز کردن پیام بعدی به فهرست پیام‌ها بازگردید."
       }
     },
     "composer": {
diff --git a/locales/fr/common.json b/locales/fr/common.json
index 03623f76..162a49c9 100644
--- a/locales/fr/common.json
+++ b/locales/fr/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Passer au persan"
   },
   "settings": {
     "title": "Paramètres",
diff --git a/locales/hu/common.json b/locales/hu/common.json
index 0f632014..6938bfdf 100644
--- a/locales/hu/common.json
+++ b/locales/hu/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Váltás perzsára"
   },
   "settings": {
     "title": "Beállítások",
diff --git a/locales/it/common.json b/locales/it/common.json
index 6c7018f5..3f462ef8 100644
--- a/locales/it/common.json
+++ b/locales/it/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Passa al persiano"
   },
   "settings": {
     "title": "Impostazioni",
diff --git a/locales/ja/common.json b/locales/ja/common.json
index f836368c..bf2c491a 100644
--- a/locales/ja/common.json
+++ b/locales/ja/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "ペルシア語に切り替え"
   },
   "settings": {
     "title": "設定",
diff --git a/locales/ko/common.json b/locales/ko/common.json
index fd03d14b..aa4bcfcc 100644
--- a/locales/ko/common.json
+++ b/locales/ko/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "페르시아어로 전환"
   },
   "settings": {
     "title": "설정",
diff --git a/locales/lv/common.json b/locales/lv/common.json
index d37ee09d..fa19be63 100644
--- a/locales/lv/common.json
+++ b/locales/lv/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Pārslēgt uz persiešu valodu"
   },
   "settings": {
     "title": "Iestatījumi",
diff --git a/locales/nl/common.json b/locales/nl/common.json
index a31bb68d..380b9419 100644
--- a/locales/nl/common.json
+++ b/locales/nl/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Overschakelen naar Farsi"
   },
   "settings": {
     "title": "Instellingen",
diff --git a/locales/pl/common.json b/locales/pl/common.json
index 3b9135cb..26a75d6c 100644
--- a/locales/pl/common.json
+++ b/locales/pl/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Przełącz na perski"
   },
   "settings": {
     "title": "Ustawienia",
diff --git a/locales/pt/common.json b/locales/pt/common.json
index 82c0ca90..4d1068fc 100644
--- a/locales/pt/common.json
+++ b/locales/pt/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Mudar para persa"
   },
   "settings": {
     "title": "Configurações",
diff --git a/locales/ro/common.json b/locales/ro/common.json
index e263dd46..85513e02 100644
--- a/locales/ro/common.json
+++ b/locales/ro/common.json
@@ -805,7 +805,10 @@
     "pt": "Portugheză",
     "ru": "Русский",
     "uk": "Ukrainiană",
-    "zh": "Chineză simplificată"
+    "zh": "Chineză simplificată",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Comută la persană"
   },
   "settings": {
     "title": "Setări",
diff --git a/locales/ru/common.json b/locales/ru/common.json
index 577a001b..070df697 100644
--- a/locales/ru/common.json
+++ b/locales/ru/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Переключить на фарси"
   },
   "settings": {
     "title": "Настройки",
diff --git a/locales/tr/common.json b/locales/tr/common.json
index b9db3c80..23aadb7b 100644
--- a/locales/tr/common.json
+++ b/locales/tr/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Farsçaya geç"
   },
   "settings": {
     "title": "Ayarlar",
diff --git a/locales/uk/common.json b/locales/uk/common.json
index 7782cf4f..f5d75941 100644
--- a/locales/uk/common.json
+++ b/locales/uk/common.json
@@ -805,7 +805,10 @@
     "uk": "Українська",
     "zh": "简体中文",
     "polish": "Polski",
-    "switch_to_polish": "Перемкнути на польську"
+    "switch_to_polish": "Перемкнути на польську",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "Перейти на фарсі"
   },
   "settings": {
     "title": "Налаштування",
diff --git a/locales/zh/common.json b/locales/zh/common.json
index 617e5287..41c7b344 100644
--- a/locales/zh/common.json
+++ b/locales/zh/common.json
@@ -805,7 +805,10 @@
     "pt": "Português",
     "ru": "Русский",
     "uk": "Українська",
-    "zh": "简体中文"
+    "zh": "简体中文",
+    "fa": "فارسی",
+    "farsi": "فارسی",
+    "switch_to_farsi": "切换到波斯语"
   },
   "settings": {
     "title": "设置",