fix: end mail menu items in an ellipsis only where they open a dialog, drop the key hint and say Report spam on the reader button in every language

components/email/__tests__/more-actions-menu.test.tsx

@@ -225,3 +225,15 @@ describe('phone reader names (MAIL-20)', () => {
     expect(hinted).toEqual([]);
   });
 });
+
+// The phone bar said "Spam" where every menu says "Report spam".
+describe('reader spam button name', () => {
+  it('says Report spam like the menus, and Not spam in the Spam folder', () => {
+    const { unmount } = renderViewer({ onMarkAsSpam: vi.fn(), onUndoSpam: vi.fn() });
+    expect(screen.getAllByRole('button', { name: 'spam.button_title' }).length).toBeGreaterThan(0);
+    expect(screen.queryAllByRole('button', { name: 'spam_short' })).toEqual([]);
+    unmount();
+    renderViewer({ onMarkAsSpam: vi.fn(), onUndoSpam: vi.fn(), currentMailboxRole: 'junk' });
+    expect(screen.getAllByRole('button', { name: 'spam.not_spam_title' }).length).toBeGreaterThan(0);
+  });
+});

components/email/email-viewer.tsx

@@ -4290,7 +4290,7 @@ export function EmailViewer({
             ) : (
               <ShieldAlert className={cn("h-4 w-4", !mvViewer && "text-red-600 dark:text-red-400")} />
             )}
-            {showToolbarLabels && <span className="text-[10px] leading-tight sm:text-sm">{isInJunkFolder ? t('not_spam_short') : t('spam_short')}</span>}
+            {showToolbarLabels && <span className="text-[10px] leading-tight sm:text-sm">{isInJunkFolder ? t('spam.not_spam_title') : t('spam.button_title')}</span>}
           </Button>
         )}
 

lib/__tests__/translations.test.ts

@@ -213,3 +213,31 @@ describe('labels in narrow places', () => {
     expect(value.length).toBeLessThanOrEqual(max);
   });
 });
+
+describe('mail menu labels', () => {
+  // An item that opens a dialog ends in one "…" character; one that opens a
+  // submenu or acts at once has none, and no "(?)" key hint. English follows
+  // the rule; translations had "...", "…" on submenus, or nothing (#67).
+  const en = loadLocale(referenceLocale);
+  const MENUS = ['context_menu', 'mailbox_context_menu', 'email_viewer'];
+  // Progress and placeholder texts ("Sending...") aren't menu items.
+  const menuKeys = getLeafKeys(en).filter((key) => {
+    if (!MENUS.includes(key.split('.')[0])) return false;
+    const value = resolveKey(en, key) as string;
+    return typeof value === 'string' && !value.endsWith('...') && !/loading|placeholder|running|sending|migrating/.test(key);
+  });
+  const ending = (value: string) => (value.endsWith('…') ? '…' : value.endsWith('...') ? '...' : '');
+
+  it.each(locales)('%s ends mail menu items in an ellipsis only where English does', (locale) => {
+    const table = loadLocale(locale);
+    const wrong = menuKeys
+      .map((key) => [key, resolveKey(table, key)] as const)
+      .filter(([key, value]) => typeof value === 'string' && ending(value.trimEnd()) !== ending(resolveKey(en, key) as string))
+      .map(([key, value]) => `${key}: ${value}`);
+    expect(wrong).toEqual([]);
+  });
+
+  it.each(locales)('%s names the reader menu shortcuts item without a key hint', (locale) => {
+    expect(resolveKey(loadLocale(locale), 'email_viewer.keyboard_shortcuts')).not.toMatch(/[(（][?？؟][)）]/);
+  });
+});

locales/ar/common.json

@@ -384,8 +384,6 @@
     "mark_read": "تمييز كمقروءة",
     "unread": "غير مقروءة",
     "read": "مقروءة",
-    "spam_short": "مزعج",
-    "not_spam_short": "ليس مزعجًا",
     "move": "نقل",
     "print": "طباعة",
     "view_source": "عرض المصدر",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "عرض في الوضع الفاتح",
     "export_email": "تصدير كملف ‎.eml",
     "forward_as_attachment": "إعادة التوجيه كمرفق",
-    "import_email": "استيراد ملف ‎.eml أو ‎.zip",
-    "keyboard_shortcuts": "اختصارات لوحة المفاتيح (؟)",
+    "import_email": "استيراد ملف ‎.eml أو ‎.zip…",
+    "keyboard_shortcuts": "اختصارات لوحة المفاتيح",
     "email_source": "مصدر الرسالة",
     "draft_banner": "هذه الرسالة مسودة",
     "edit_draft": "تعديل",
@@ -439,7 +437,7 @@
     "more_actions": "المزيد من الإجراءات",
     "previous": "السابق",
     "next": "التالي",
-    "move_to": "نقل إلى...",
+    "move_to": "نقل إلى",
     "remove_tag": "إزالة الوسم",
     "tag_filter_placeholder": "تصفية الوسوم",
     "tag_no_matches": "لا توجد وسوم مطابقة",
@@ -2991,7 +2989,7 @@
     "new_folder": "مجلد جديد…",
     "rename": "إعادة تسمية…",
     "share": "مشاركة…",
-    "import_email": "استيراد ملف ‎.eml أو ‎.zip...",
+    "import_email": "استيراد ملف ‎.eml أو ‎.zip…",
     "empty_folder": "إفراغ المجلد",
     "empty_folder_generic": "إفراغ المجلد",
     "delete_folder": "حذف المجلد",

locales/ca/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Marca com a llegit",
     "unread": "No llegit",
     "read": "Llegit",
-    "spam_short": "Brossa",
-    "not_spam_short": "No és brossa",
     "move": "Mou",
     "print": "Imprimeix",
     "view_source": "Mostra el codi font",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Veure en mode clar",
     "export_email": "Exporta com a .eml",
     "forward_as_attachment": "Reenvia com a fitxer adjunt",
-    "import_email": "Importa .eml o .zip",
-    "keyboard_shortcuts": "Dreceres de teclat (?)",
+    "import_email": "Importa .eml o .zip…",
+    "keyboard_shortcuts": "Dreceres de teclat",
     "email_source": "Codi font del correu",
     "draft_banner": "Aquest missatge és un esborrany",
     "edit_draft": "Edita",
@@ -439,7 +437,7 @@
     "more_actions": "Més accions",
     "previous": "Anterior",
     "next": "Següent",
-    "move_to": "Mou a...",
+    "move_to": "Mou a",
     "remove_tag": "Elimina l'etiqueta",
     "tag_filter_placeholder": "Filtra les etiquetes",
     "tag_no_matches": "Cap etiqueta coincident",
@@ -2991,7 +2989,7 @@
     "new_folder": "Carpeta nova…",
     "rename": "Canvia el nom…",
     "share": "Comparteix…",
-    "import_email": "Importa .eml o .zip...",
+    "import_email": "Importa .eml o .zip…",
     "empty_folder": "Buida la carpeta",
     "empty_folder_generic": "Buida la carpeta",
     "delete_folder": "Suprimeix la carpeta",

locales/cs/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Označit jako přečtené",
     "unread": "Nepřečtené",
     "read": "Přečtené",
-    "spam_short": "Spam",
-    "not_spam_short": "Není spam",
     "move": "Přesunout",
     "print": "Tisk",
     "view_source": "Zobrazit zdrojový kód",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Zobrazit v světlém režimu",
     "export_email": "Exportovat jako .eml",
     "forward_as_attachment": "Přeposlat jako přílohu",
-    "import_email": "Importovat .eml nebo .zip",
-    "keyboard_shortcuts": "Klávesové zkratky (?)",
+    "import_email": "Importovat .eml nebo .zip…",
+    "keyboard_shortcuts": "Klávesové zkratky",
     "email_source": "Zdrojový kód zprávy",
     "draft_banner": "Tato zpráva je koncept",
     "edit_draft": "Upravit",
@@ -439,7 +437,7 @@
     "more_actions": "Další akce",
     "previous": "Předchozí",
     "next": "Další",
-    "move_to": "Přesunout do...",
+    "move_to": "Přesunout do",
     "remove_tag": "Odebrat štítek",
     "tag_filter_placeholder": "Filtrovat štítky",
     "tag_no_matches": "Žádné odpovídající štítky",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nová složka…",
     "rename": "Přejmenovat…",
     "share": "Sdílet…",
-    "import_email": "Importovat .eml nebo .zip...",
+    "import_email": "Importovat .eml nebo .zip…",
     "empty_folder": "Vyprázdnit složku",
     "empty_folder_generic": "Vyprázdnit složku",
     "delete_folder": "Smazat složku",

locales/da/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Markér som læst",
     "unread": "Ulæst",
     "read": "Læst",
-    "spam_short": "Spam",
-    "not_spam_short": "Ikke spam",
     "move": "Flyt",
     "print": "Udskriv",
     "view_source": "Vis kilde",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Vis i lys tilstand",
     "export_email": "Eksportér som .eml",
     "forward_as_attachment": "Videresend som vedhæftet fil",
-    "import_email": "Importér .eml eller .zip",
-    "keyboard_shortcuts": "Tastaturgenveje (?)",
+    "import_email": "Importér .eml eller .zip…",
+    "keyboard_shortcuts": "Tastaturgenveje",
     "email_source": "E-mail-kilde",
     "draft_banner": "Denne besked er en kladde",
     "edit_draft": "Redigér",
@@ -439,7 +437,7 @@
     "more_actions": "Flere handlinger",
     "previous": "Forrige",
     "next": "Næste",
-    "move_to": "Flyt til...",
+    "move_to": "Flyt til",
     "remove_tag": "Fjern tag",
     "tag_filter_placeholder": "Filtrer tags",
     "tag_no_matches": "Ingen matchende tags",
@@ -2991,7 +2989,7 @@
     "new_folder": "Ny mappe…",
     "rename": "Omdøb…",
     "share": "Del…",
-    "import_email": "Importér .eml eller .zip...",
+    "import_email": "Importér .eml eller .zip…",
     "empty_folder": "Tøm mappe",
     "empty_folder_generic": "Tøm mappe",
     "delete_folder": "Slet mappe",

locales/de/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Als gelesen markieren",
     "unread": "Ungelesen",
     "read": "Gelesen",
-    "spam_short": "Spam",
-    "not_spam_short": "Kein Spam",
     "move": "Verschieben",
     "print": "Drucken",
     "view_source": "Quelltext anzeigen",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Im hellen Modus anzeigen",
     "export_email": "Als .eml exportieren",
     "forward_as_attachment": "Als Anhang weiterleiten",
-    "import_email": ".eml oder .zip importieren",
-    "keyboard_shortcuts": "Tastaturkürzel (?)",
+    "import_email": ".eml oder .zip importieren…",
+    "keyboard_shortcuts": "Tastaturkürzel",
     "email_source": "E-Mail-Quelltext",
     "draft_banner": "Diese Nachricht ist ein Entwurf",
     "edit_draft": "Bearbeiten",
@@ -437,7 +435,7 @@
     "set_tag": "Label setzen",
     "tag": "Label",
     "more_actions": "Weitere Aktionen",
-    "move_to": "Verschieben nach...",
+    "move_to": "Verschieben nach",
     "remove_tag": "Label entfernen",
     "tag_filter_placeholder": "Labels filtern",
     "tag_no_matches": "Keine passenden Labels",
@@ -2991,7 +2989,7 @@
     "new_folder": "Neuer Ordner…",
     "rename": "Umbenennen…",
     "share": "Freigeben…",
-    "import_email": ".eml oder .zip importieren...",
+    "import_email": ".eml oder .zip importieren…",
     "empty_folder": "Ordner leeren",
     "empty_folder_generic": "Ordner leeren",
     "delete_folder": "Ordner löschen",

locales/en/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Mark as read",
     "unread": "Unread",
     "read": "Read",
-    "spam_short": "Spam",
-    "not_spam_short": "Not spam",
     "move": "Move",
     "print": "Print",
     "view_source": "View source",

locales/es/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Marcar como leído",
     "unread": "No leído",
     "read": "Leído",
-    "spam_short": "Spam",
-    "not_spam_short": "No spam",
     "move": "Mover",
     "print": "Imprimir",
     "view_source": "Ver código fuente",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Ver en modo claro",
     "export_email": "Exportar como .eml",
     "forward_as_attachment": "Reenviar como archivo adjunto",
-    "import_email": "Importar .eml o .zip",
-    "keyboard_shortcuts": "Atajos de teclado (?)",
+    "import_email": "Importar .eml o .zip…",
+    "keyboard_shortcuts": "Atajos de teclado",
     "email_source": "Código Fuente del Correo",
     "draft_banner": "Este mensaje es un borrador",
     "edit_draft": "Editar",
@@ -437,7 +435,7 @@
     "set_tag": "Establecer etiqueta",
     "tag": "Etiqueta",
     "more_actions": "Más acciones",
-    "move_to": "Mover a...",
+    "move_to": "Mover a",
     "remove_tag": "Eliminar etiqueta",
     "tag_filter_placeholder": "Filtrar etiquetas",
     "tag_no_matches": "No hay etiquetas coincidentes",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nueva carpeta…",
     "rename": "Renombrar…",
     "share": "Compartir…",
-    "import_email": "Importar .eml o .zip...",
+    "import_email": "Importar .eml o .zip…",
     "empty_folder": "Vaciar carpeta",
     "empty_folder_generic": "Vaciar carpeta",
     "delete_folder": "Eliminar carpeta",

locales/et/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Märgi loetuks",
     "unread": "Lugemata",
     "read": "Loetud",
-    "spam_short": "Rämpspost",
-    "not_spam_short": "Pole rämpspost",
     "move": "Teisalda",
     "print": "Prindi",
     "view_source": "Vaata lähtekoodi",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Vaata heledas režiimis",
     "export_email": "Ekspordi .eml failina",
     "forward_as_attachment": "Saada edasi manusena",
-    "import_email": "Impordi .eml või .zip",
-    "keyboard_shortcuts": "Kiirklahvid (?)",
+    "import_email": "Impordi .eml või .zip…",
+    "keyboard_shortcuts": "Kiirklahvid",
     "email_source": "Kirja lähtekood",
     "draft_banner": "See kiri on mustand",
     "edit_draft": "Muuda",
@@ -439,7 +437,7 @@
     "more_actions": "Rohkem toiminguid",
     "previous": "Eelmine",
     "next": "Järgmine",
-    "move_to": "Teisalda kausta...",
+    "move_to": "Liiguta kausta",
     "remove_tag": "Eemalda silt",
     "tag_filter_placeholder": "Filtreeri silte",
     "tag_no_matches": "Sobivaid silte ei leitud",
@@ -2991,7 +2989,7 @@
     "new_folder": "Uus kaust…",
     "rename": "Nimeta ümber…",
     "share": "Jaga…",
-    "import_email": "Impordi .eml või .zip...",
+    "import_email": "Impordi .eml või .zip…",
     "empty_folder": "Tühjenda kaust",
     "empty_folder_generic": "Tühjenda kaust",
     "delete_folder": "Kustuta kaust",

locales/fa/common.json

@@ -384,8 +384,6 @@
     "mark_read": "علامت‌گذاری خوانده شده",
     "unread": "خوانده نشده",
     "read": "خوانده شده",
-    "spam_short": "هرزنامه",
-    "not_spam_short": "هرزنامه نیست",
     "move": "انتقال",
     "print": "چاپ",
     "view_source": "مشاهده منبع",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "نمایش در حالت روشن",
     "export_email": "خروجی .eml",
     "forward_as_attachment": "ارسال به‌عنوان پیوست",
-    "import_email": "وارد کردن .eml یا .zip",
-    "keyboard_shortcuts": "میانبرهای صفحه کلید (?)",
+    "import_email": "وارد کردن .eml یا .zip…",
+    "keyboard_shortcuts": "میانبرهای صفحه کلید",
     "email_source": "منبع ایمیل",
     "draft_banner": "این پیام یک پیش‌نویس است",
     "edit_draft": "ویرایش",
@@ -439,7 +437,7 @@
     "more_actions": "عملیات بیشتر",
     "previous": "قبلی",
     "next": "بعدی",
-    "move_to": "انتقال به...",
+    "move_to": "انتقال به",
     "remove_tag": "حذف برچسب",
     "tag_filter_placeholder": "فیلتر برچسب‌ها",
     "tag_no_matches": "برچسب مطابقی یافت نشد",
@@ -2991,7 +2989,7 @@
     "new_folder": "پوشه جدید…",
     "rename": "تغییر نام…",
     "share": "اشتراک‌گذاری…",
-    "import_email": "وارد کردن .eml/.zip...",
+    "import_email": "وارد کردن .eml/.zip…",
     "empty_folder": "خالی کردن پوشه",
     "empty_folder_generic": "خالی کردن پوشه",
     "delete_folder": "حذف پوشه",

locales/fr/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Marquer comme lu",
     "unread": "Non lu",
     "read": "Lu",
-    "spam_short": "Spam",
-    "not_spam_short": "Non spam",
     "move": "Déplacer",
     "print": "Imprimer",
     "view_source": "Voir la source",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Afficher en mode clair",
     "export_email": "Exporter en .eml",
     "forward_as_attachment": "Transférer en pièce jointe",
-    "import_email": "Importer .eml ou .zip",
-    "keyboard_shortcuts": "Raccourcis clavier (?)",
+    "import_email": "Importer .eml ou .zip…",
+    "keyboard_shortcuts": "Raccourcis clavier",
     "email_source": "Source de l'email",
     "draft_banner": "Ce message est un brouillon",
     "edit_draft": "Modifier",
@@ -437,7 +435,7 @@
     "set_tag": "Définir l'étiquette",
     "tag": "Étiquette",
     "more_actions": "Plus d'actions",
-    "move_to": "Déplacer vers...",
+    "move_to": "Déplacer vers",
     "remove_tag": "Retirer l'étiquette",
     "tag_filter_placeholder": "Filtrer les étiquettes",
     "tag_no_matches": "Aucune étiquette correspondante",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nouveau dossier…",
     "rename": "Renommer…",
     "share": "Partager…",
-    "import_email": "Importer .eml ou .zip...",
+    "import_email": "Importer .eml ou .zip…",
     "empty_folder": "Vider le dossier",
     "empty_folder_generic": "Vider le dossier",
     "delete_folder": "Supprimer le dossier",

locales/he/common.json

@@ -342,8 +342,8 @@
     "view_in_light_mode": "הצגה במצב בהיר",
     "export_email": "ייצא כ-.eml",
     "forward_as_attachment": "העבר כקובץ מצורף",
-    "import_email": "ייבוא .eml",
-    "keyboard_shortcuts": "קיצורי מקשים (?)",
+    "import_email": "ייבא .eml או .zip…",
+    "keyboard_shortcuts": "קיצורי מקשים",
     "email_source": "מקור דוא\"ל",
     "draft_banner": "הודעה זו היא טיוטה",
     "edit_draft": "ערוך",
@@ -386,7 +386,7 @@
     "more_actions": "עוד פעולות",
     "previous": "הקודם",
     "next": "הבא",
-    "move_to": "העבר ל...",
+    "move_to": "העבר ל",
     "remove_tag": "הסר תג",
     "tag_filter_placeholder": "סינון תגים",
     "tag_no_matches": "אין תגים תואמים",
@@ -589,8 +589,6 @@
     "hide_quoted_text": "הסתר טקסט מצוטט",
     "unread": "סמן כלא נקרא",
     "read": "קרא",
-    "spam_short": "דואר זבל",
-    "not_spam_short": "לא דואר זבל",
     "move": "העברה",
     "details": {
       "recipients_routing": "נמענים ו־ניתוב",

locales/hu/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Megjelölés olvasottként",
     "unread": "Olvasatlan",
     "read": "Olvasott",
-    "spam_short": "Spam",
-    "not_spam_short": "Nem spam",
     "move": "Áthelyezés",
     "print": "Nyomtatás",
     "view_source": "Forrás megtekintése",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Megjelenítés világos módban",
     "export_email": "Exportálás .eml-ként",
     "forward_as_attachment": "Továbbítás mellékletként",
-    "import_email": "Importálás .eml vagy .zip fájlból",
-    "keyboard_shortcuts": "Billentyűparancsok (?)",
+    "import_email": "Importálás .eml vagy .zip fájlból…",
+    "keyboard_shortcuts": "Billentyűparancsok",
     "email_source": "E-mail forrás",
     "draft_banner": "Ez az üzenet egy piszkozat",
     "edit_draft": "Szerkesztés",
@@ -439,7 +437,7 @@
     "more_actions": "További műveletek",
     "previous": "Előző",
     "next": "Következő",
-    "move_to": "Áthelyezés ide...",
+    "move_to": "Áthelyezés ide",
     "remove_tag": "Címke eltávolítása",
     "tag_filter_placeholder": "Címkék szűrése",
     "tag_no_matches": "Nincs találat a címkék közt",
@@ -2991,7 +2989,7 @@
     "new_folder": "Új mappa…",
     "rename": "Átnevezés…",
     "share": "Megosztás…",
-    "import_email": "Importálás .eml vagy .zip fájlból...",
+    "import_email": "Importálás .eml vagy .zip fájlból…",
     "empty_folder": "Mappa ürítése",
     "empty_folder_generic": "Mappa ürítése",
     "delete_folder": "Mappa törlése",

locales/it/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Segna come letto",
     "unread": "Non letto",
     "read": "Letto",
-    "spam_short": "Spam",
-    "not_spam_short": "Non spam",
     "move": "Sposta",
     "print": "Stampa",
     "view_source": "Visualizza sorgente",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Visualizza in modalità chiara",
     "export_email": "Esporta come .eml",
     "forward_as_attachment": "Inoltra come allegato",
-    "import_email": "Importa .eml o .zip",
-    "keyboard_shortcuts": "Scorciatoie da tastiera (?)",
+    "import_email": "Importa .eml o .zip…",
+    "keyboard_shortcuts": "Scorciatoie da tastiera",
     "email_source": "Sorgente del messaggio",
     "draft_banner": "Questo messaggio è una bozza",
     "edit_draft": "Modifica",
@@ -437,7 +435,7 @@
     "set_tag": "Imposta etichetta",
     "tag": "Etichetta",
     "more_actions": "Altre azioni",
-    "move_to": "Sposta in...",
+    "move_to": "Sposta in",
     "remove_tag": "Rimuovi etichetta",
     "tag_filter_placeholder": "Filtra etichette",
     "tag_no_matches": "Nessuna etichetta corrispondente",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nuova cartella…",
     "rename": "Rinomina…",
     "share": "Condividi…",
-    "import_email": "Importa .eml o .zip...",
+    "import_email": "Importa .eml o .zip…",
     "empty_folder": "Svuota cartella",
     "empty_folder_generic": "Svuota cartella",
     "delete_folder": "Elimina cartella",

locales/ja/common.json

@@ -384,8 +384,6 @@
     "mark_read": "既読にする",
     "unread": "未読",
     "read": "既読",
-    "spam_short": "迷惑メール",
-    "not_spam_short": "迷惑メールでない",
     "move": "移動",
     "print": "印刷",
     "view_source": "ソースを表示",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "ライトモードで表示",
     "export_email": ".emlとしてエクスポート",
     "forward_as_attachment": "添付ファイルとして転送",
-    "import_email": ".eml または .zip をインポート",
-    "keyboard_shortcuts": "キーボードショートカット (?)",
+    "import_email": ".eml または .zip をインポート…",
+    "keyboard_shortcuts": "キーボードショートカット",
     "email_source": "メールソース",
     "draft_banner": "このメッセージは下書きです",
     "edit_draft": "編集",
@@ -437,7 +435,7 @@
     "set_tag": "ラベルを設定",
     "tag": "ラベル",
     "more_actions": "その他の操作",
-    "move_to": "移動...",
+    "move_to": "移動",
     "remove_tag": "ラベルを削除",
     "tag_filter_placeholder": "ラベルを絞り込む",
     "tag_no_matches": "一致するラベルがありません",
@@ -2991,7 +2989,7 @@
     "new_folder": "新しいフォルダー…",
     "rename": "名前を変更…",
     "share": "共有…",
-    "import_email": ".eml または .zip をインポート...",
+    "import_email": ".eml または .zip をインポート…",
     "empty_folder": "フォルダーを空にする",
     "empty_folder_generic": "フォルダーを空にする",
     "delete_folder": "フォルダーを削除",

locales/ko/common.json

@@ -384,8 +384,6 @@
     "mark_read": "읽은 상태로 표시",
     "unread": "안 읽음",
     "read": "읽음",
-    "spam_short": "스팸",
-    "not_spam_short": "스팸 아님",
     "move": "이동",
     "print": "인쇄",
     "view_source": "원본 보기",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "라이트 모드로 보기",
     "export_email": ".eml 파일로 내보내기",
     "forward_as_attachment": "첨부 파일로 전달",
-    "import_email": ".eml 또는 .zip 가져오기",
-    "keyboard_shortcuts": "단축키 (?)",
+    "import_email": ".eml 또는 .zip 가져오기…",
+    "keyboard_shortcuts": "단축키",
     "email_source": "메일 원본",
     "draft_banner": "작성 중인 임시보관 메일이에요",
     "edit_draft": "수정",
@@ -439,7 +437,7 @@
     "more_actions": "작업 더보기",
     "previous": "이전",
     "next": "다음",
-    "move_to": "이동...",
+    "move_to": "이동",
     "remove_tag": "태그 제거",
     "tag_filter_placeholder": "태그 검색",
     "tag_no_matches": "일치하는 태그 없음",
@@ -2991,7 +2989,7 @@
     "new_folder": "새 폴더…",
     "rename": "이름 바꾸기…",
     "share": "공유…",
-    "import_email": ".eml 또는 .zip 가져오기...",
+    "import_email": ".eml 또는 .zip 가져오기…",
     "empty_folder": "폴더 비우기",
     "empty_folder_generic": "폴더 비우기",
     "delete_folder": "폴더 삭제",

locales/lv/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Atzīmēt kā izlasītu",
     "unread": "Nelasīts",
     "read": "Lasīts",
-    "spam_short": "Spams",
-    "not_spam_short": "Nav spams",
     "move": "Pārvietot",
     "print": "Drukāt",
     "view_source": "Skatīt avota kodu",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Skatīt gaišajā režīmā",
     "export_email": "Eksportēt kā .eml",
     "forward_as_attachment": "Pārsūtīt kā pielikumu",
-    "import_email": "Importēt .eml vai .zip",
-    "keyboard_shortcuts": "Īsinājumtaustiņi (?)",
+    "import_email": "Importēt .eml vai .zip…",
+    "keyboard_shortcuts": "Īsinājumtaustiņi",
     "email_source": "Vēstules avota kods",
     "draft_banner": "Šī vēstule ir melnraksts",
     "edit_draft": "Rediģēt",
@@ -439,7 +437,7 @@
     "more_actions": "Citas darbības",
     "previous": "Iepr.",
     "next": "Nāk.",
-    "move_to": "Pārvietot uz...",
+    "move_to": "Pārvietot uz",
     "remove_tag": "Noņemt tagu",
     "tag_filter_placeholder": "Filtrēt tagus",
     "tag_no_matches": "Nav atbilstošu tagu",
@@ -529,7 +527,7 @@
       "edit_draft": "Rediģēt melnrakstu"
     },
     "spam": {
-      "button_title": "Ziņot par mēstuli",
+      "button_title": "Atzīmēt kā mēstuli",
       "not_spam_title": "Nav mēstule",
       "toast_success": "Pārvietots uz mēstulēm",
       "toast_batch": "{count} vēstules pārvietotas uz mēstulēm",
@@ -2991,7 +2989,7 @@
     "new_folder": "Jauna mape…",
     "rename": "Pārsaukt…",
     "share": "Kopīgot…",
-    "import_email": "Importēt .eml vai .zip...",
+    "import_email": "Importēt .eml vai .zip…",
     "empty_folder": "Iztukšot mapi",
     "empty_folder_generic": "Iztukšot mapi",
     "delete_folder": "Dzēst mapi",

locales/mn/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Уншсан гэж тэмдэглэх",
     "unread": "Уншаагүй",
     "read": "унших",
-    "spam_short": "Спам",
-    "not_spam_short": "Спам биш",
     "move": "Хөдөлгөөн",
     "print": "Хэвлэх",
     "view_source": "Эх сурвалжийг харах",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Цайвар горимд харах",
     "export_email": ".eml",
     "forward_as_attachment": "Хавсралт болгон дамжуулах",
-    "import_email": "Импорт .eml эсвэл .zip",
-    "keyboard_shortcuts": "Гарын товчлол (?)",
+    "import_email": "Импорт .eml эсвэл .zip…",
+    "keyboard_shortcuts": "Гарын товчлол",
     "email_source": "Имэйл эх сурвалж",
     "draft_banner": "Энэ зурвас нь ноорог байна",
     "edit_draft": "Засварлах",
@@ -439,7 +437,7 @@
     "more_actions": "Дэлгэрэнгүй үйлдэл",
     "previous": "Өмнөх",
     "next": "Дараагийн",
-    "move_to": "...",
+    "move_to": "Шилжүүлэх",
     "remove_tag": "Ташгыг арилгах",
     "tag_filter_placeholder": "Шүүлтүүрийн шошго",
     "tag_no_matches": "Тохирох шошго байхгүй",
@@ -2991,7 +2989,7 @@
     "new_folder": "Шинэ хавтас…",
     "rename": "Нэр өөрчлөх…",
     "share": "Хуваалцах…",
-    "import_email": "Импорт .eml эсвэл .zip...",
+    "import_email": "Импорт .eml эсвэл .zip…",
     "empty_folder": "Хоосон хавтас",
     "empty_folder_generic": "Хоосон хавтас",
     "delete_folder": "Хавтас устгах",

locales/nb/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Merk som lest",
     "unread": "Ulest",
     "read": "Lest",
-    "spam_short": "Søppelpost",
-    "not_spam_short": "Ikke søppelpost",
     "move": "Flytt",
     "print": "Skriv ut",
     "view_source": "Vis meldingskilde",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Vis i lys modus",
     "export_email": "Eksporter som .eml",
     "forward_as_attachment": "Videresend som vedlegg",
-    "import_email": "Importer .eml eller .zip",
-    "keyboard_shortcuts": "Tastatursnarveier (?)",
+    "import_email": "Importer .eml eller .zip…",
+    "keyboard_shortcuts": "Tastatursnarveier",
     "email_source": "Meldingskilde",
     "draft_banner": "Denne meldingen er et utkast",
     "edit_draft": "Rediger",
@@ -439,7 +437,7 @@
     "more_actions": "Flere handlinger",
     "previous": "Forrige",
     "next": "Neste",
-    "move_to": "Flytt til...",
+    "move_to": "Flytt til",
     "remove_tag": "Fjern etiketten",
     "tag_filter_placeholder": "Filtrer etiketter",
     "tag_no_matches": "Ingen etiketter passer med søket",
@@ -2991,7 +2989,7 @@
     "new_folder": "Ny mappe…",
     "rename": "Gi nytt navn…",
     "share": "Del…",
-    "import_email": "Importer .eml eller .zip...",
+    "import_email": "Importer .eml eller .zip…",
     "empty_folder": "Tøm mappe",
     "empty_folder_generic": "Tøm mappe",
     "delete_folder": "Slett mappe",

locales/nl/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Markeren als gelezen",
     "unread": "Ongelezen",
     "read": "Gelezen",
-    "spam_short": "Spam",
-    "not_spam_short": "Geen spam",
     "move": "Verplaatsen",
     "print": "Afdrukken",
     "view_source": "Bron bekijken",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Weergeven in lichte modus",
     "export_email": "Exporteren als .eml",
     "forward_as_attachment": "Doorsturen als bijlage",
-    "import_email": ".eml of .zip importeren",
-    "keyboard_shortcuts": "Sneltoetsen (?)",
+    "import_email": ".eml of .zip importeren…",
+    "keyboard_shortcuts": "Sneltoetsen",
     "email_source": "E-mailbron",
     "draft_banner": "Dit bericht is een concept",
     "edit_draft": "Bewerken",
@@ -437,7 +435,7 @@
     "set_tag": "Label instellen",
     "tag": "Label",
     "more_actions": "Meer acties",
-    "move_to": "Verplaatsen naar...",
+    "move_to": "Verplaatsen naar",
     "remove_tag": "Label verwijderen",
     "tag_filter_placeholder": "Labels filteren",
     "tag_no_matches": "Geen overeenkomende labels",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nieuwe map…",
     "rename": "Hernoemen…",
     "share": "Delen…",
-    "import_email": ".eml of .zip importeren...",
+    "import_email": ".eml of .zip importeren…",
     "empty_folder": "Map leegmaken",
     "empty_folder_generic": "Map leegmaken",
     "delete_folder": "Map verwijderen",

locales/pl/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Oznacz jako przeczytane",
     "unread": "Nieprzeczytane",
     "read": "Przeczytane",
-    "spam_short": "Spam",
-    "not_spam_short": "Nie spam",
     "move": "Przenieś",
     "print": "Drukuj",
     "view_source": "Pokaż źródło",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Wyświetl w jasnym trybie",
     "export_email": "Eksportuj jako .eml",
     "forward_as_attachment": "Prześlij dalej jako załącznik",
-    "import_email": "Importuj .eml lub .zip",
-    "keyboard_shortcuts": "Skróty klawiszowe (?)",
+    "import_email": "Importuj .eml lub .zip…",
+    "keyboard_shortcuts": "Skróty klawiszowe",
     "email_source": "Źródło wiadomości",
     "draft_banner": "Ta wiadomość jest szkicem",
     "edit_draft": "Edytuj",
@@ -439,7 +437,7 @@
     "more_actions": "Więcej działań",
     "previous": "Poprz.",
     "next": "Nast.",
-    "move_to": "Przenieś do...",
+    "move_to": "Przenieś do",
     "remove_tag": "Usuń etykietę",
     "tag_filter_placeholder": "Filtruj etykiety",
     "tag_no_matches": "Brak pasujących etykiet",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nowy folder…",
     "rename": "Zmień nazwę…",
     "share": "Udostępnij…",
-    "import_email": "Importuj .eml lub .zip...",
+    "import_email": "Importuj .eml lub .zip…",
     "empty_folder": "Opróżnij folder",
     "empty_folder_generic": "Opróżnij folder",
     "delete_folder": "Usuń folder",

locales/pt/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Marcar como lido",
     "unread": "Não lido",
     "read": "Lido",
-    "spam_short": "Spam",
-    "not_spam_short": "Não spam",
     "move": "Mover",
     "print": "Imprimir",
     "view_source": "Ver código-fonte",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Ver em modo claro",
     "export_email": "Exportar como .eml",
     "forward_as_attachment": "Encaminhar como anexo",
-    "import_email": "Importar .eml ou .zip",
-    "keyboard_shortcuts": "Atalhos de teclado (?)",
+    "import_email": "Importar .eml ou .zip…",
+    "keyboard_shortcuts": "Atalhos de teclado",
     "email_source": "Código-fonte do E-mail",
     "draft_banner": "Esta mensagem é um rascunho",
     "edit_draft": "Editar",
@@ -437,7 +435,7 @@
     "set_tag": "Definir etiqueta",
     "tag": "Etiqueta",
     "more_actions": "Mais ações",
-    "move_to": "Mover para...",
+    "move_to": "Mover para",
     "remove_tag": "Remover etiqueta",
     "tag_filter_placeholder": "Filtrar etiquetas",
     "tag_no_matches": "Nenhuma etiqueta correspondente",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nova pasta…",
     "rename": "Renomear…",
     "share": "Partilhar…",
-    "import_email": "Importar .eml ou .zip...",
+    "import_email": "Importar .eml ou .zip…",
     "empty_folder": "Esvaziar pasta",
     "empty_folder_generic": "Esvaziar pasta",
     "delete_folder": "Excluir pasta",

locales/ro/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Marcați ca citit",
     "unread": "Necitit",
     "read": "Citiți",
-    "spam_short": "Spam",
-    "not_spam_short": "Nu este spam",
     "move": "Mutare",
     "print": "Imprimare",
     "view_source": "Vizualizați sursa",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Vizualizare în modul luminos",
     "export_email": "Exportați ca fișier .eml",
     "forward_as_attachment": "Redirecționează ca atașament",
-    "import_email": "Importați fișiere .eml sau .zip",
-    "keyboard_shortcuts": "Comenzi rapide de la tastatură (?)",
+    "import_email": "Importați fișiere .eml sau .zip…",
+    "keyboard_shortcuts": "Comenzi rapide de la tastatură",
     "email_source": "Sursa e-mailului",
     "draft_banner": "Acest mesaj este o schiță",
     "edit_draft": "Editare",
@@ -439,7 +437,7 @@
     "more_actions": "Alte acțiuni",
     "previous": "Anterior",
     "next": "Următorul",
-    "move_to": "Mergi la...",
+    "move_to": "Mută în",
     "remove_tag": "Eliminați eticheta",
     "tag_filter_placeholder": "Filtrează etichetele",
     "tag_no_matches": "Nicio etichetă corespunzătoare",
@@ -2944,7 +2942,7 @@
     "unstar": "Anulează marcarea cu stea",
     "pin": "Fixează",
     "unpin": "Anulează fixarea",
-    "move_to": "Mergi la",
+    "move_to": "Mută în",
     "move_to_dialog": "Mută în…",
     "go_to_folder": "Mergi la {folder}",
     "copy_to_account": "Copiază în cont",
@@ -2991,7 +2989,7 @@
     "new_folder": "Dosar nou…",
     "rename": "Redenumire…",
     "share": "Partajează…",
-    "import_email": "Importați fișiere .eml sau .zip...",
+    "import_email": "Importați fișiere .eml sau .zip…",
     "empty_folder": "Folder gol",
     "empty_folder_generic": "Folder gol",
     "delete_folder": "Șterge dosarul",

locales/ru/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Отметить прочитанным",
     "unread": "Не прочитано",
     "read": "Прочитано",
-    "spam_short": "Спам",
-    "not_spam_short": "Не спам",
     "move": "Переместить",
     "print": "Распечатать",
     "view_source": "Просмотреть исходный код",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Просмотр в светлом режиме",
     "export_email": "Экспортировать как .eml",
     "forward_as_attachment": "Переслать как вложение",
-    "import_email": "Импортировать .eml или .zip",
-    "keyboard_shortcuts": "Сочетания клавиш (?)",
+    "import_email": "Импортировать .eml или .zip…",
+    "keyboard_shortcuts": "Сочетания клавиш",
     "email_source": "Исходный код письма",
     "draft_banner": "Это письмо является черновиком",
     "edit_draft": "Редактировать",
@@ -439,7 +437,7 @@
     "more_actions": "Другие действия",
     "previous": "Пред.",
     "next": "След.",
-    "move_to": "Переместить в...",
+    "move_to": "Переместить в",
     "remove_tag": "Удалить тег",
     "tag_filter_placeholder": "Фильтр тегов",
     "tag_no_matches": "Подходящих тегов нет",
@@ -529,7 +527,7 @@
       "edit_draft": "Редактировать черновик"
     },
     "spam": {
-      "button_title": "Пожаловаться на спам",
+      "button_title": "Отметить как спам",
       "not_spam_title": "Отметить как не спам",
       "toast_success": "Перемещено в Спам",
       "toast_batch": "{count} писем перемещено в Спам",
@@ -2991,7 +2989,7 @@
     "new_folder": "Новая папка…",
     "rename": "Переименовать…",
     "share": "Поделиться…",
-    "import_email": "Импортировать .eml или .zip...",
+    "import_email": "Импортировать .eml или .zip…",
     "empty_folder": "Очистить папку",
     "empty_folder_generic": "Очистить папку",
     "delete_folder": "Удалить папку",

locales/sk/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Označiť ako prečítané",
     "unread": "Neprečítané",
     "read": "Prečítané",
-    "spam_short": "Spam",
-    "not_spam_short": "Nie je spam",
     "move": "Presunúť",
     "print": "Tlačiť",
     "view_source": "Zobraziť zdrojový kód",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Zobraziť v svetlom režime",
     "export_email": "Exportovať ako .eml",
     "forward_as_attachment": "Preposlať ako prílohu",
-    "import_email": "Importovať .eml alebo .zip",
-    "keyboard_shortcuts": "Klávesové skratky (?)",
+    "import_email": "Importovať .eml alebo .zip…",
+    "keyboard_shortcuts": "Klávesové skratky",
     "email_source": "Zdrojový kód e-mailu",
     "draft_banner": "Táto správa je koncept",
     "edit_draft": "Upraviť",
@@ -439,7 +437,7 @@
     "more_actions": "Viac akcií",
     "previous": "Predchádzajúci",
     "next": "Ďalší",
-    "move_to": "Presunúť do...",
+    "move_to": "Presunúť do",
     "remove_tag": "Odstrániť štítok",
     "tag_filter_placeholder": "Filtrovať štítky",
     "tag_no_matches": "Žiadne zodpovedajúce štítky",
@@ -554,7 +552,7 @@
       "edit_draft": "Upraviť koncept"
     },
     "spam": {
-      "button_title": "Nahlaš spam",
+      "button_title": "Nahlásiť spam",
       "not_spam_title": "Označiť ako legitimívne",
       "toast_success": "Presunuté do Spamu",
       "toast_batch": "{count} e-mailov presunutých do Spamu",
@@ -2991,7 +2989,7 @@
     "new_folder": "Nový priečinok…",
     "rename": "Premenovať…",
     "share": "Zdieľať…",
-    "import_email": "Importovať .eml alebo .zip...",
+    "import_email": "Importovať .eml alebo .zip…",
     "empty_folder": "Vyprázdniť priečinok",
     "empty_folder_generic": "Vyprázdniť priečinok",
     "delete_folder": "Zmazať priečinok",

locales/th/common.json

@@ -610,7 +610,7 @@
     "new_folder": "สร้างโฟลเดอร์ใหม่…",
     "rename": "เปลี่ยนชื่อ…",
     "share": "แชร์…",
-    "import_email": "นำเข้าไฟล์ .eml หรือ .zip...",
+    "import_email": "นำเข้าไฟล์ .eml หรือ .zip…",
     "empty_folder": "ล้างข้อมูลในโฟลเดอร์",
     "empty_folder_generic": "ล้างข้อมูลในโฟลเดอร์",
     "delete_folder": "ลบโฟลเดอร์",
@@ -1144,8 +1144,6 @@
     "mark_read": "ทำเครื่องหมายว่าอ่านแล้ว",
     "unread": "ยังไม่อ่าน",
     "read": "อ่านแล้ว",
-    "spam_short": "จดหมายขยะ",
-    "not_spam_short": "ไม่ใช่จดหมายขยะ",
     "move": "ย้าย",
     "print": "พิมพ์",
     "view_source": "ดูข้อความต้นฉบับ",
@@ -1155,8 +1153,8 @@
     "view_in_light_mode": "แสดงผลในโหมดสว่าง",
     "export_email": "ส่งออกเป็นไฟล์ .eml",
     "forward_as_attachment": "ส่งต่อเป็นไฟล์แนบ",
-    "import_email": "นำเข้าไฟล์ .eml หรือ .zip",
-    "keyboard_shortcuts": "แป้นพิมพ์ลัด (?)",
+    "import_email": "นำเข้าไฟล์ .eml หรือ .zip…",
+    "keyboard_shortcuts": "แป้นพิมพ์ลัด",
     "email_source": "ต้นฉบับอีเมล",
     "draft_banner": "ข้อความนี้เป็นร่างจดหมาย",
     "edit_draft": "แก้ไข",
@@ -1199,7 +1197,7 @@
     "more_actions": "การดำเนินการเพิ่มเติม",
     "previous": "ก่อนหน้า",
     "next": "ถัดไป",
-    "move_to": "ย้ายไปที่...",
+    "move_to": "ย้ายไปที่",
     "remove_tag": "ลบป้ายกำกับ",
     "tag_filter_placeholder": "กรองป้ายกำกับ",
     "tag_no_matches": "ไม่พบป้ายกำกับที่ตรงกัน",

locales/tr/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Okundu olarak işaretle",
     "unread": "Okunmadı",
     "read": "Okundu",
-    "spam_short": "Spam",
-    "not_spam_short": "Spam değil",
     "move": "Taşı",
     "print": "Yazdır",
     "view_source": "Kaynağı görüntüle",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Açık modda görüntüle",
     "export_email": ".eml olarak dışa aktar",
     "forward_as_attachment": "Ek olarak ilet",
-    "import_email": ".eml veya .zip içe aktar",
-    "keyboard_shortcuts": "Klavye kısayolları (?)",
+    "import_email": ".eml veya .zip içe aktar…",
+    "keyboard_shortcuts": "Klavye kısayolları",
     "email_source": "E-posta Kaynağı",
     "draft_banner": "Bu ileti bir taslaktır",
     "edit_draft": "Düzenle",
@@ -439,7 +437,7 @@
     "more_actions": "Diğer işlemler",
     "previous": "Önceki",
     "next": "Sonraki",
-    "move_to": "Şuraya taşı...",
+    "move_to": "Şuraya taşı",
     "remove_tag": "Etiketi kaldır",
     "tag_filter_placeholder": "Etiketleri filtrele",
     "tag_no_matches": "Eşleşen etiket yok",
@@ -529,7 +527,7 @@
       "edit_draft": "Taslağı düzenle"
     },
     "spam": {
-      "button_title": "Spam olarak bildir",
+      "button_title": "Spam bildir",
       "not_spam_title": "Meşru olarak işaretle",
       "toast_success": "Spam'e taşındı",
       "toast_batch": "{count} e-posta Spam'e taşındı",
@@ -2991,7 +2989,7 @@
     "new_folder": "Yeni klasör…",
     "rename": "Yeniden adlandır…",
     "share": "Paylaş…",
-    "import_email": ".eml veya .zip içe aktar...",
+    "import_email": ".eml veya .zip içe aktar…",
     "empty_folder": "Klasörü boşalt",
     "empty_folder_generic": "Klasörü boşalt",
     "delete_folder": "Klasörü sil",

locales/uk/common.json

@@ -384,8 +384,6 @@
     "mark_read": "Позначити як прочитане",
     "unread": "Непрочитане",
     "read": "Прочитане",
-    "spam_short": "Спам",
-    "not_spam_short": "Не спам",
     "move": "Перенести",
     "print": "Роздрукувати",
     "view_source": "Переглянути джерело",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "Перегляд у світлому режимі",
     "export_email": "Експортувати як .eml",
     "forward_as_attachment": "Переслати як вкладення",
-    "import_email": "Імпорт .eml або .zip",
-    "keyboard_shortcuts": "Комбінації клавіш (?)",
+    "import_email": "Імпорт .eml або .zip…",
+    "keyboard_shortcuts": "Комбінації клавіш",
     "email_source": "Джерело електронної пошти",
     "draft_banner": "Це повідомлення є чернеткою",
     "edit_draft": "Редагувати",
@@ -439,7 +437,7 @@
     "more_actions": "Більше дій",
     "previous": "попередня",
     "next": "Далі",
-    "move_to": "Перемістити до...",
+    "move_to": "Перемістити до",
     "remove_tag": "Видалити тег",
     "tag_filter_placeholder": "Фільтр тегів",
     "tag_no_matches": "Немає відповідних тегів",
@@ -2991,7 +2989,7 @@
     "new_folder": "Нова папка…",
     "rename": "Перейменувати…",
     "share": "Поділитися…",
-    "import_email": "Імпортувати .eml або .zip...",
+    "import_email": "Імпортувати .eml або .zip…",
     "empty_folder": "Очистити папку",
     "empty_folder_generic": "Очистити папку",
     "delete_folder": "Видалити папку",

locales/zh-TW/common.json

@@ -384,8 +384,6 @@
     "mark_read": "標示為已讀",
     "unread": "未讀",
     "read": "已讀",
-    "spam_short": "垃圾郵件",
-    "not_spam_short": "非垃圾郵件",
     "move": "移動",
     "print": "列印",
     "view_source": "檢視原始碼",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "淺色模式檢視",
     "export_email": "匯出為 .eml",
     "forward_as_attachment": "以附件形式轉寄",
-    "import_email": "匯入 .eml 或 .zip",
-    "keyboard_shortcuts": "鍵盤快速鍵 (?)",
+    "import_email": "匯入 .eml 或 .zip…",
+    "keyboard_shortcuts": "鍵盤快速鍵",
     "email_source": "郵件原始碼",
     "draft_banner": "這是一封草稿郵件",
     "edit_draft": "編輯",
@@ -439,7 +437,7 @@
     "more_actions": "更多動作",
     "previous": "上一封",
     "next": "下一封",
-    "move_to": "移至…",
+    "move_to": "移至",
     "remove_tag": "移除標籤",
     "tag_filter_placeholder": "篩選標籤",
     "tag_no_matches": "沒有相符的標籤",

locales/zh/common.json

@@ -384,8 +384,6 @@
     "mark_read": "标记为已读",
     "unread": "未读",
     "read": "已读",
-    "spam_short": "垃圾邮件",
-    "not_spam_short": "非垃圾邮件",
     "move": "移动",
     "print": "打印",
     "view_source": "查看源码",
@@ -395,8 +393,8 @@
     "view_in_light_mode": "浅色模式查看",
     "export_email": "导出为 .eml",
     "forward_as_attachment": "作为附件转发",
-    "import_email": "导入 .eml 或 .zip",
-    "keyboard_shortcuts": "键盘快捷键（？）",
+    "import_email": "导入 .eml 或 .zip…",
+    "keyboard_shortcuts": "键盘快捷键",
     "email_source": "邮件源码",
     "draft_banner": "这是一封草稿邮件",
     "edit_draft": "编辑",
@@ -439,7 +437,7 @@
     "more_actions": "更多操作",
     "previous": "上一封",
     "next": "下一封",
-    "move_to": "移动到…",
+    "move_to": "移动到",
     "remove_tag": "删除标签",
     "tag_filter_placeholder": "筛选标签",
     "tag_no_matches": "没有匹配的标签",
@@ -2991,7 +2989,7 @@
     "new_folder": "新建文件夹…",
     "rename": "重命名…",
     "share": "共享…",
-    "import_email": "导入 .eml 或 .zip...",
+    "import_email": "导入 .eml 或 .zip…",
     "empty_folder": "清空文件夹",
     "empty_folder_generic": "清空文件夹",
     "delete_folder": "删除文件夹",