From 2b2b7b8298d63d0913134be28c08aa4f4086a001 Mon Sep 17 00:00:00 2001 From: Linus Rath <139418639+rathlinus@users.noreply.github.com> Date: Wed, 4 Nov 2026 09:01:04 +0100 Subject: [PATCH] fix: show every attachment in the composer, with type icons and a total, failed and uploading files first The attachment list test now expects every chip and a bounded, scrolling row instead of three chips and a +N counter. --- .../composer-attachment-list-scroll.test.tsx | 41 ++++++---------- components/email/email-composer.tsx | 48 +++++++++---------- .../__tests__/attachment-order.test.ts | 18 +++++++ lib/compose/attachment-order.ts | 14 ++++++ locales/ar/common.json | 9 +++- locales/ca/common.json | 9 +++- locales/cs/common.json | 9 +++- locales/da/common.json | 9 +++- locales/de/common.json | 9 +++- locales/en/common.json | 9 +++- locales/es/common.json | 9 +++- locales/et/common.json | 9 +++- locales/fa/common.json | 9 +++- locales/fr/common.json | 9 +++- locales/he/common.json | 9 +++- locales/hu/common.json | 9 +++- locales/it/common.json | 9 +++- locales/ja/common.json | 9 +++- locales/ko/common.json | 9 +++- locales/lv/common.json | 9 +++- locales/mn/common.json | 9 +++- locales/nb/common.json | 9 +++- locales/nl/common.json | 9 +++- locales/pl/common.json | 9 +++- locales/pt/common.json | 9 +++- locales/ro/common.json | 9 +++- locales/ru/common.json | 9 +++- locales/sk/common.json | 9 +++- locales/th/common.json | 9 +++- locales/tr/common.json | 9 +++- locales/uk/common.json | 9 +++- locales/vi/common.json | 9 +++- locales/zh-TW/common.json | 9 +++- locales/zh/common.json | 9 +++- 34 files changed, 309 insertions(+), 82 deletions(-) create mode 100644 lib/compose/__tests__/attachment-order.test.ts create mode 100644 lib/compose/attachment-order.ts diff --git a/components/email/__tests__/composer-attachment-list-scroll.test.tsx b/components/email/__tests__/composer-attachment-list-scroll.test.tsx index af1d5673f..04bc59023 100644 --- a/components/email/__tests__/composer-attachment-list-scroll.test.tsx +++ b/components/email/__tests__/composer-attachment-list-scroll.test.tsx @@ -218,21 +218,20 @@ const DRAFT = { attachments: ATTACHMENTS, }; -/** The wrapping flex row that holds every chip and the expand button. */ +/** The wrapping flex row that holds every chip. */ function chipRow() { - return screen.getByText('invoice-0.pdf').closest('[class*="flex-wrap"]') as HTMLElement; + return screen.getByTestId('composer-attachments'); } /** * The attachment row is a shrink-0 sibling of the body's scroll container, * so whatever height it takes is taken from the composer and from nothing - * else. Collapsed that is three chips. Expanded it is one row per two - * attachments, and with a few dozen files it grew past the bottom of the - * composer: the send toolbar was pushed off-screen and no ancestor - * scrolled, so neither the rest of the list nor Send could be reached. - * Expanding therefore has to bound the row and scroll it itself. + * else. With a few dozen files it grew past the bottom of the composer: the + * send toolbar was pushed off-screen and no ancestor scrolled. It used to + * show three chips and "+N", which hid the fourth file's upload. Now every + * chip shows, wrapping, and the row is bounded and scrolls itself. */ -describe('expanded attachment list', () => { +describe('attachment list', () => { beforeEach(() => { observers.length = 0; vi.stubGlobal('ResizeObserver', ResizeObserverStub); @@ -242,39 +241,27 @@ describe('expanded attachment list', () => { vi.unstubAllGlobals(); }); - it('does not scroll while collapsed', () => { + it('shows every attachment, with no counter to expand', () => { render(); - expect(chipRow().className).not.toContain('overflow-y-auto'); + expect(screen.getByText('invoice-3.pdf')).toBeInTheDocument(); + expect(screen.getByText('invoice-11.pdf')).toBeInTheDocument(); + expect(screen.queryByText(`+${ATTACHMENTS.length - 3}`)).toBeNull(); }); - it('shows only the first three attachments and a counter for the rest', () => { + it('caps its height and scrolls itself', () => { render(); - expect(screen.getByText('invoice-2.pdf')).toBeInTheDocument(); - expect(screen.queryByText('invoice-3.pdf')).not.toBeInTheDocument(); - expect(screen.getByText(`+${ATTACHMENTS.length - 3}`)).toBeInTheDocument(); - }); - - it('caps its height and scrolls once expanded', () => { - render(); - - fireEvent.click(screen.getByText(`+${ATTACHMENTS.length - 3}`)); - const row = chipRow(); - expect(screen.getByText('invoice-11.pdf')).toBeInTheDocument(); expect(row.className).toContain('overflow-y-auto'); // Bounded, or the row grows with the attachment count again and takes // the send toolbar off the bottom of the composer with it. expect(row.className).toContain('max-h-['); }); - it('stops scrolling again when collapsed back', () => { + it('says how many files and how much they weigh', () => { render(); - fireEvent.click(screen.getByText(`+${ATTACHMENTS.length - 3}`)); - fireEvent.click(screen.getByText('show_less')); - - expect(chipRow().className).not.toContain('overflow-y-auto'); + expect(screen.getByTestId('composer-attachments-summary')).toHaveTextContent('attachments_summary'); }); }); diff --git a/components/email/email-composer.tsx b/components/email/email-composer.tsx index e55816505..9f3c13640 100644 --- a/components/email/email-composer.tsx +++ b/components/email/email-composer.tsx @@ -68,6 +68,8 @@ import { isFilePreviewable } from "@/lib/file-preview"; import { isEditableEventTarget } from "@/lib/keyboard"; import { isSingleKeyShortcutOff } from "@/lib/single-key-shortcuts"; import { markReplyQuoteHeader } from "@/components/email/reply-quote-collapse"; +import { attachmentIcon } from "@/components/email/attachment-chips"; +import { attachmentsForDisplay } from "@/lib/compose/attachment-order"; import { showDraftSavedToast } from "@/lib/compose/draft-close-toast"; import { buildQuotedHtmlBlock, serializeEditorContent } from "@/components/email/quoted-html"; import { containsEmbeddedSignature } from "@/components/email/signature-block"; @@ -1244,7 +1246,6 @@ export function EmailComposer({ const [closeDialogKind, setCloseDialogKind] = useState<'close' | 'discard'>('close'); // Closing saves without asking; the question comes only when that save failed. const [closeSaveFailed, setCloseSaveFailed] = useState(false); - const [showAllAttachments, setShowAllAttachments] = useState(false); const [previewAttachment, setPreviewAttachment] = useState(null); // What the checks before sending found (no subject, no text, placeholders, // a missing attachment, open proofreading issues), asked about in one dialog. @@ -5538,21 +5539,24 @@ export function EmailComposer({ {/* Attachments */} {attachments.length > 0 && (
+ {attachments.length > 1 && ( +

+ {tUx('attachments_summary', { + count: attachments.length, + size: formatFileSize(attachments.reduce((sum, att) => sum + (att.size || 0), 0)), + })} +

+ )}
- {(showAllAttachments ? attachments : attachments.slice(0, 3)).map((att, index) => { + {attachmentsForDisplay(attachments).map(({ att, index }) => { // Clickable to preview only once it has content (local File or an // uploaded blob) and the type is previewable; never mid-upload. const canPreview = !att.uploading && !att.error @@ -5612,9 +5616,11 @@ export function EmailComposer({ ) : att.error ? ( - ) : ( - - )} + ) : (() => { + // The file's type, as the reader shows it. + const { icon: TypeIcon, className: typeIconClass } = attachmentIcon(att.type, att.name); + return ; + })()} {canPreview ? ( - )}
)} diff --git a/lib/compose/__tests__/attachment-order.test.ts b/lib/compose/__tests__/attachment-order.test.ts new file mode 100644 index 000000000..d5337caea --- /dev/null +++ b/lib/compose/__tests__/attachment-order.test.ts @@ -0,0 +1,18 @@ +import { describe, expect, it } from 'vitest'; +import { attachmentsForDisplay } from '../attachment-order'; + +describe('the order of the composer attachment chips', () => { + it('puts failed, then uploading files first, and keeps the rest in the order added', () => { + const files = [ + { name: 'a.pdf' }, + { name: 'b.pdf', uploading: true }, + { name: 'c.pdf' }, + { name: 'big.zip', uploading: true }, + { name: 'broken.png', error: 'failed' }, + ]; + const shown = attachmentsForDisplay(files); + expect(shown.map(({ att }) => att.name)).toEqual(['broken.png', 'b.pdf', 'big.zip', 'a.pdf', 'c.pdf']); + // Each keeps its place in the composer's list, for Remove. + expect(shown.map(({ index }) => index)).toEqual([4, 1, 3, 0, 2]); + }); +}); diff --git a/lib/compose/attachment-order.ts b/lib/compose/attachment-order.ts new file mode 100644 index 000000000..158d340d6 --- /dev/null +++ b/lib/compose/attachment-order.ts @@ -0,0 +1,14 @@ +/** + * The composer's attachment chips in the order they're shown: failed first, + * then still uploading, then the rest, each group in the order added. The + * list scrolls past about two rows, so the files that need an eye on them + * are the ones always in view. `index` is the place in the composer's list. + */ +export function attachmentsForDisplay( + attachments: readonly T[], +): Array<{ att: T; index: number }> { + const rank = (att: T) => (att.error ? 0 : att.uploading ? 1 : 2); + return attachments + .map((att, index) => ({ att, index })) + .sort((a, b) => rank(a.att) - rank(b.att) || a.index - b.index); +} diff --git a/locales/ar/common.json b/locales/ar/common.json index 26c0c6673..8d4f16780 100644 --- a/locales/ar/common.json +++ b/locales/ar/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "تجاهل المسودة", "save_failed_close": "تعذّر حفظ المسودة. حاول مرة أخرى أو تجاهلها.", "try_again": "حاول مرة أخرى", - "add_description": "إضافة وصف" + "add_description": "إضافة وصف", + "attachments_summary": "المرفقات: {count}، {size}", + "from_sub_address": "استخدام عنوان فرعي…", + "from_edit_sender": "تعديل المرسل…", + "shortcut_insert_link": "إدراج رابط", + "shortcut_save_draft": "حفظ المسودة", + "shortcut_show_cc": "إظهار نسخة", + "shortcut_show_bcc": "إظهار نسخة مخفية" }, "confirm_dialog": { "confirm": "تأكيد", diff --git a/locales/ca/common.json b/locales/ca/common.json index ccaf06e04..7c2c8eea4 100644 --- a/locales/ca/common.json +++ b/locales/ca/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Descarta l'esborrany", "save_failed_close": "No s'ha pogut desar l'esborrany. Torneu-ho a provar o descarteu-lo.", "try_again": "Torna-ho a provar", - "add_description": "Afegeix una descripció" + "add_description": "Afegeix una descripció", + "attachments_summary": "Adjunts: {count}, {size}", + "from_sub_address": "Fes servir una subadreça…", + "from_edit_sender": "Edita el remitent…", + "shortcut_insert_link": "Insereix un enllaç", + "shortcut_save_draft": "Desa l'esborrany", + "shortcut_show_cc": "Mostra Cc", + "shortcut_show_bcc": "Mostra Cco" }, "confirm_dialog": { "confirm": "Confirma", diff --git a/locales/cs/common.json b/locales/cs/common.json index 151416cd7..4208fdfe2 100644 --- a/locales/cs/common.json +++ b/locales/cs/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Zahodit koncept", "save_failed_close": "Koncept se nepodařilo uložit. Zkuste to znovu, nebo ho zahoďte.", "try_again": "Zkusit znovu", - "add_description": "Přidat popis" + "add_description": "Přidat popis", + "attachments_summary": "Přílohy: {count}, {size}", + "from_sub_address": "Použít podadresu…", + "from_edit_sender": "Upravit odesílatele…", + "shortcut_insert_link": "Vložit odkaz", + "shortcut_save_draft": "Uložit koncept", + "shortcut_show_cc": "Zobrazit kopii", + "shortcut_show_bcc": "Zobrazit skrytou kopii" }, "confirm_dialog": { "confirm": "Potvrdit", diff --git a/locales/da/common.json b/locales/da/common.json index bd60f75bf..ae6dae03a 100644 --- a/locales/da/common.json +++ b/locales/da/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Kassér kladde", "save_failed_close": "Kladden kunne ikke gemmes. Prøv igen, eller kassér den.", "try_again": "Prøv igen", - "add_description": "Tilføj beskrivelse" + "add_description": "Tilføj beskrivelse", + "attachments_summary": "Vedhæftede filer: {count}, {size}", + "from_sub_address": "Brug en underadresse…", + "from_edit_sender": "Rediger afsender…", + "shortcut_insert_link": "Indsæt link", + "shortcut_save_draft": "Gem kladde", + "shortcut_show_cc": "Vis Cc", + "shortcut_show_bcc": "Vis Bcc" }, "confirm_dialog": { "confirm": "Bekræft", diff --git a/locales/de/common.json b/locales/de/common.json index b8a6eee95..ca3e06e95 100644 --- a/locales/de/common.json +++ b/locales/de/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Entwurf verwerfen", "save_failed_close": "Der Entwurf konnte nicht gespeichert werden. Versuchen Sie es erneut oder verwerfen Sie ihn.", "try_again": "Erneut versuchen", - "add_description": "Beschreibung hinzufügen" + "add_description": "Beschreibung hinzufügen", + "attachments_summary": "Anhänge: {count}, {size}", + "from_sub_address": "Unteradresse verwenden…", + "from_edit_sender": "Absender bearbeiten…", + "shortcut_insert_link": "Link einfügen", + "shortcut_save_draft": "Entwurf speichern", + "shortcut_show_cc": "Cc anzeigen", + "shortcut_show_bcc": "Bcc anzeigen" }, "confirm_dialog": { "confirm": "Bestätigen", diff --git a/locales/en/common.json b/locales/en/common.json index d5fffaad2..575b05e1a 100644 --- a/locales/en/common.json +++ b/locales/en/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Discard draft", "save_failed_close": "The draft could not be saved. Try again, or discard it.", "try_again": "Try again", - "add_description": "Add description" + "add_description": "Add description", + "attachments_summary": "Attachments: {count}, {size}", + "from_sub_address": "Use a sub-address…", + "from_edit_sender": "Edit sender…", + "shortcut_insert_link": "Insert link", + "shortcut_save_draft": "Save draft", + "shortcut_show_cc": "Show Cc", + "shortcut_show_bcc": "Show Bcc" }, "confirm_dialog": { "confirm": "Confirm", diff --git a/locales/es/common.json b/locales/es/common.json index 98cd6c2d3..8340b464f 100644 --- a/locales/es/common.json +++ b/locales/es/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Descartar borrador", "save_failed_close": "No se pudo guardar el borrador. Inténtelo de nuevo o descártelo.", "try_again": "Reintentar", - "add_description": "Añadir descripción" + "add_description": "Añadir descripción", + "attachments_summary": "Adjuntos: {count}, {size}", + "from_sub_address": "Usar una subdirección…", + "from_edit_sender": "Editar remitente…", + "shortcut_insert_link": "Insertar enlace", + "shortcut_save_draft": "Guardar borrador", + "shortcut_show_cc": "Mostrar CC", + "shortcut_show_bcc": "Mostrar CCO" }, "confirm_dialog": { "confirm": "Confirmar", diff --git a/locales/et/common.json b/locales/et/common.json index 3b9e3d6be..ab0c73e9c 100644 --- a/locales/et/common.json +++ b/locales/et/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Loobu mustandist", "save_failed_close": "Mustandit ei saanud salvestada. Proovige uuesti või loobuge sellest.", "try_again": "Proovi uuesti", - "add_description": "Lisa kirjeldus" + "add_description": "Lisa kirjeldus", + "attachments_summary": "Manused: {count}, {size}", + "from_sub_address": "Kasuta alamaadressi…", + "from_edit_sender": "Muuda saatjat…", + "shortcut_insert_link": "Lisa link", + "shortcut_save_draft": "Salvesta mustand", + "shortcut_show_cc": "Näita koopiat", + "shortcut_show_bcc": "Näita pimekoopiat" }, "confirm_dialog": { "confirm": "Kinnita", diff --git a/locales/fa/common.json b/locales/fa/common.json index a73b4df95..6d8f3808d 100644 --- a/locales/fa/common.json +++ b/locales/fa/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "دور انداختن پیش‌نویس", "save_failed_close": "پیش‌نویس ذخیره نشد. دوباره تلاش کنید یا آن را دور بیندازید.", "try_again": "تلاش دوباره", - "add_description": "افزودن توضیح" + "add_description": "افزودن توضیح", + "attachments_summary": "پیوست‌ها: {count}، {size}", + "from_sub_address": "استفاده از زیرنشانی…", + "from_edit_sender": "ویرایش فرستنده…", + "shortcut_insert_link": "درج پیوند", + "shortcut_save_draft": "ذخیرهٔ پیش‌نویس", + "shortcut_show_cc": "نمایش رونوشت", + "shortcut_show_bcc": "نمایش رونوشت پنهان" }, "confirm_dialog": { "confirm": "تأیید", diff --git a/locales/fr/common.json b/locales/fr/common.json index 5ddb3438e..4ea0d6429 100644 --- a/locales/fr/common.json +++ b/locales/fr/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Supprimer le brouillon", "save_failed_close": "Le brouillon n'a pas pu être enregistré. Réessayez ou supprimez-le.", "try_again": "Réessayer", - "add_description": "Ajouter une description" + "add_description": "Ajouter une description", + "attachments_summary": "Pièces jointes : {count}, {size}", + "from_sub_address": "Utiliser une sous-adresse…", + "from_edit_sender": "Modifier l'expéditeur…", + "shortcut_insert_link": "Insérer un lien", + "shortcut_save_draft": "Enregistrer le brouillon", + "shortcut_show_cc": "Afficher Cc", + "shortcut_show_bcc": "Afficher Cci" }, "confirm_dialog": { "confirm": "Confirmer", diff --git a/locales/he/common.json b/locales/he/common.json index a57187038..56d8e7588 100644 --- a/locales/he/common.json +++ b/locales/he/common.json @@ -1161,7 +1161,14 @@ "discard_draft": "מחיקת הטיוטה", "save_failed_close": "לא ניתן היה לשמור את הטיוטה. נסו שוב או מחקו אותה.", "try_again": "ניסיון נוסף", - "add_description": "הוספת תיאור" + "add_description": "הוספת תיאור", + "attachments_summary": "קבצים מצורפים: {count}, {size}", + "from_sub_address": "שימוש בכתובת משנה…", + "from_edit_sender": "עריכת השולח…", + "shortcut_insert_link": "הוספת קישור", + "shortcut_save_draft": "שמירת טיוטה", + "shortcut_show_cc": "הצגת עותק", + "shortcut_show_bcc": "הצגת עותק מוסתר" }, "confirm_dialog": { "confirm": "אשר", diff --git a/locales/hu/common.json b/locales/hu/common.json index cfccee90d..fb7181012 100644 --- a/locales/hu/common.json +++ b/locales/hu/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Piszkozat elvetése", "save_failed_close": "A piszkozatot nem sikerült menteni. Próbálja újra, vagy vesse el.", "try_again": "Újra", - "add_description": "Leírás hozzáadása" + "add_description": "Leírás hozzáadása", + "attachments_summary": "Mellékletek: {count}, {size}", + "from_sub_address": "Alcím használata…", + "from_edit_sender": "Feladó szerkesztése…", + "shortcut_insert_link": "Hivatkozás beszúrása", + "shortcut_save_draft": "Piszkozat mentése", + "shortcut_show_cc": "Másolat megjelenítése", + "shortcut_show_bcc": "Titkos másolat megjelenítése" }, "confirm_dialog": { "confirm": "Megerősítés", diff --git a/locales/it/common.json b/locales/it/common.json index 926421531..9ebe976e4 100644 --- a/locales/it/common.json +++ b/locales/it/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Elimina bozza", "save_failed_close": "Impossibile salvare la bozza. Riprova o eliminala.", "try_again": "Riprova", - "add_description": "Aggiungi descrizione" + "add_description": "Aggiungi descrizione", + "attachments_summary": "Allegati: {count}, {size}", + "from_sub_address": "Usa un sottoindirizzo…", + "from_edit_sender": "Modifica mittente…", + "shortcut_insert_link": "Inserisci link", + "shortcut_save_draft": "Salva bozza", + "shortcut_show_cc": "Mostra Cc", + "shortcut_show_bcc": "Mostra Ccn" }, "confirm_dialog": { "confirm": "Conferma", diff --git a/locales/ja/common.json b/locales/ja/common.json index 1a48da88b..15718b0e4 100644 --- a/locales/ja/common.json +++ b/locales/ja/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "下書きを破棄", "save_failed_close": "下書きを保存できませんでした。もう一度試すか、破棄してください。", "try_again": "再試行", - "add_description": "説明を追加" + "add_description": "説明を追加", + "attachments_summary": "添付ファイル: {count} 件、{size}", + "from_sub_address": "サブアドレスを使用…", + "from_edit_sender": "差出人を編集…", + "shortcut_insert_link": "リンクを挿入", + "shortcut_save_draft": "下書きを保存", + "shortcut_show_cc": "Cc を表示", + "shortcut_show_bcc": "Bcc を表示" }, "confirm_dialog": { "confirm": "確認", diff --git a/locales/ko/common.json b/locales/ko/common.json index 7fbd42927..d8ff98a31 100644 --- a/locales/ko/common.json +++ b/locales/ko/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "임시 보관 메일 삭제", "save_failed_close": "임시 보관 메일을 저장하지 못했습니다. 다시 시도하거나 삭제하세요.", "try_again": "다시 시도", - "add_description": "설명 추가" + "add_description": "설명 추가", + "attachments_summary": "첨부 파일: {count}개, {size}", + "from_sub_address": "하위 주소 사용…", + "from_edit_sender": "보낸 사람 편집…", + "shortcut_insert_link": "링크 삽입", + "shortcut_save_draft": "임시 저장", + "shortcut_show_cc": "참조 표시", + "shortcut_show_bcc": "숨은 참조 표시" }, "confirm_dialog": { "confirm": "확인", diff --git a/locales/lv/common.json b/locales/lv/common.json index a99b90bb1..44ab51ba8 100644 --- a/locales/lv/common.json +++ b/locales/lv/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Atmest melnrakstu", "save_failed_close": "Melnrakstu neizdevās saglabāt. Mēģiniet vēlreiz vai atmetiet to.", "try_again": "Mēģināt vēlreiz", - "add_description": "Pievienot aprakstu" + "add_description": "Pievienot aprakstu", + "attachments_summary": "Pielikumi: {count}, {size}", + "from_sub_address": "Izmantot apakšadresi…", + "from_edit_sender": "Rediģēt sūtītāju…", + "shortcut_insert_link": "Ievietot saiti", + "shortcut_save_draft": "Saglabāt melnrakstu", + "shortcut_show_cc": "Rādīt kopiju", + "shortcut_show_bcc": "Rādīt diskrēto kopiju" }, "confirm_dialog": { "confirm": "Apstiprināt", diff --git a/locales/mn/common.json b/locales/mn/common.json index 204cc8105..7622f6763 100644 --- a/locales/mn/common.json +++ b/locales/mn/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Ноорог устгах", "save_failed_close": "Ноорогийг хадгалж чадсангүй. Дахин оролдох эсвэл устгана уу.", "try_again": "Дахин оролдох", - "add_description": "Тайлбар нэмэх" + "add_description": "Тайлбар нэмэх", + "attachments_summary": "Хавсралт: {count}, {size}", + "from_sub_address": "Дэд хаяг ашиглах…", + "from_edit_sender": "Илгээгчийг засах…", + "shortcut_insert_link": "Холбоос оруулах", + "shortcut_save_draft": "Ноорог хадгалах", + "shortcut_show_cc": "Хуулбар харуулах", + "shortcut_show_bcc": "Нууц хуулбар харуулах" }, "confirm_dialog": { "confirm": "Баталгаажуулах", diff --git a/locales/nb/common.json b/locales/nb/common.json index 755bcbc45..1ac662c08 100644 --- a/locales/nb/common.json +++ b/locales/nb/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Forkast utkast", "save_failed_close": "Utkastet kunne ikke lagres. Prøv igjen, eller forkast det.", "try_again": "Prøv igjen", - "add_description": "Legg til beskrivelse" + "add_description": "Legg til beskrivelse", + "attachments_summary": "Vedlegg: {count}, {size}", + "from_sub_address": "Bruk en underadresse…", + "from_edit_sender": "Rediger avsender…", + "shortcut_insert_link": "Sett inn lenke", + "shortcut_save_draft": "Lagre utkast", + "shortcut_show_cc": "Vis kopi", + "shortcut_show_bcc": "Vis blindkopi" }, "confirm_dialog": { "confirm": "Bekreft", diff --git a/locales/nl/common.json b/locales/nl/common.json index c9ed9c8dd..7394b78a5 100644 --- a/locales/nl/common.json +++ b/locales/nl/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Concept verwijderen", "save_failed_close": "Het concept kon niet worden opgeslagen. Probeer het opnieuw of verwijder het.", "try_again": "Opnieuw proberen", - "add_description": "Beschrijving toevoegen" + "add_description": "Beschrijving toevoegen", + "attachments_summary": "Bijlagen: {count}, {size}", + "from_sub_address": "Subadres gebruiken…", + "from_edit_sender": "Afzender bewerken…", + "shortcut_insert_link": "Link invoegen", + "shortcut_save_draft": "Concept opslaan", + "shortcut_show_cc": "Cc tonen", + "shortcut_show_bcc": "Bcc tonen" }, "confirm_dialog": { "confirm": "Bevestigen", diff --git a/locales/pl/common.json b/locales/pl/common.json index 74467a752..e688a1cd4 100644 --- a/locales/pl/common.json +++ b/locales/pl/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Odrzuć wersję roboczą", "save_failed_close": "Nie udało się zapisać wersji roboczej. Spróbuj ponownie lub ją odrzuć.", "try_again": "Spróbuj ponownie", - "add_description": "Dodaj opis" + "add_description": "Dodaj opis", + "attachments_summary": "Załączniki: {count}, {size}", + "from_sub_address": "Użyj podadresu…", + "from_edit_sender": "Edytuj nadawcę…", + "shortcut_insert_link": "Wstaw link", + "shortcut_save_draft": "Zapisz wersję roboczą", + "shortcut_show_cc": "Pokaż DW", + "shortcut_show_bcc": "Pokaż UDW" }, "confirm_dialog": { "confirm": "Potwierdź", diff --git a/locales/pt/common.json b/locales/pt/common.json index 9e2b2d331..54c0438d0 100644 --- a/locales/pt/common.json +++ b/locales/pt/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Descartar rascunho", "save_failed_close": "Não foi possível guardar o rascunho. Tente novamente ou descarte-o.", "try_again": "Tentar novamente", - "add_description": "Adicionar descrição" + "add_description": "Adicionar descrição", + "attachments_summary": "Anexos: {count}, {size}", + "from_sub_address": "Usar um subendereço…", + "from_edit_sender": "Editar remetente…", + "shortcut_insert_link": "Inserir ligação", + "shortcut_save_draft": "Guardar rascunho", + "shortcut_show_cc": "Mostrar Cc", + "shortcut_show_bcc": "Mostrar Bcc" }, "confirm_dialog": { "confirm": "Confirmar", diff --git a/locales/ro/common.json b/locales/ro/common.json index db1ed7bce..8c2fcd50e 100644 --- a/locales/ro/common.json +++ b/locales/ro/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Renunță la ciornă", "save_failed_close": "Ciorna nu a putut fi salvată. Încercați din nou sau renunțați la ea.", "try_again": "Încearcă din nou", - "add_description": "Adaugă o descriere" + "add_description": "Adaugă o descriere", + "attachments_summary": "Atașamente: {count}, {size}", + "from_sub_address": "Folosește o subadresă…", + "from_edit_sender": "Editează expeditorul…", + "shortcut_insert_link": "Inserează un link", + "shortcut_save_draft": "Salvează ciorna", + "shortcut_show_cc": "Afișează Cc", + "shortcut_show_bcc": "Afișează Bcc" }, "confirm_dialog": { "confirm": "Confirmare", diff --git a/locales/ru/common.json b/locales/ru/common.json index 810933d38..76f168826 100644 --- a/locales/ru/common.json +++ b/locales/ru/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Удалить черновик", "save_failed_close": "Не удалось сохранить черновик. Попробуйте ещё раз или удалите его.", "try_again": "Повторить", - "add_description": "Добавить описание" + "add_description": "Добавить описание", + "attachments_summary": "Вложения: {count}, {size}", + "from_sub_address": "Использовать подадрес…", + "from_edit_sender": "Изменить отправителя…", + "shortcut_insert_link": "Вставить ссылку", + "shortcut_save_draft": "Сохранить черновик", + "shortcut_show_cc": "Показать копию", + "shortcut_show_bcc": "Показать скрытую копию" }, "confirm_dialog": { "confirm": "Подтвердить", diff --git a/locales/sk/common.json b/locales/sk/common.json index 72badccba..93a3322cf 100644 --- a/locales/sk/common.json +++ b/locales/sk/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Zahodiť koncept", "save_failed_close": "Koncept sa nepodarilo uložiť. Skúste to znova alebo ho zahoďte.", "try_again": "Skúsiť znova", - "add_description": "Pridať popis" + "add_description": "Pridať popis", + "attachments_summary": "Prílohy: {count}, {size}", + "from_sub_address": "Použiť podadresu…", + "from_edit_sender": "Upraviť odosielateľa…", + "shortcut_insert_link": "Vložiť odkaz", + "shortcut_save_draft": "Uložiť koncept", + "shortcut_show_cc": "Zobraziť kópiu", + "shortcut_show_bcc": "Zobraziť skrytú kópiu" }, "confirm_dialog": { "confirm": "Potvrdiť", diff --git a/locales/th/common.json b/locales/th/common.json index 75960886f..b527b8a89 100644 --- a/locales/th/common.json +++ b/locales/th/common.json @@ -1566,7 +1566,14 @@ "discard_draft": "ทิ้งฉบับร่าง", "save_failed_close": "บันทึกฉบับร่างไม่ได้ ลองอีกครั้งหรือทิ้งไป", "try_again": "ลองอีกครั้ง", - "add_description": "เพิ่มคำอธิบาย" + "add_description": "เพิ่มคำอธิบาย", + "attachments_summary": "ไฟล์แนบ: {count} ไฟล์, {size}", + "from_sub_address": "ใช้ที่อยู่ย่อย…", + "from_edit_sender": "แก้ไขผู้ส่ง…", + "shortcut_insert_link": "แทรกลิงก์", + "shortcut_save_draft": "บันทึกฉบับร่าง", + "shortcut_show_cc": "แสดงสำเนา", + "shortcut_show_bcc": "แสดงสำเนาลับ" }, "email_viewer": { "read_receipt": { diff --git a/locales/tr/common.json b/locales/tr/common.json index c98b22e1a..9b6097ad9 100644 --- a/locales/tr/common.json +++ b/locales/tr/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Taslağı sil", "save_failed_close": "Taslak kaydedilemedi. Yeniden deneyin ya da silin.", "try_again": "Yeniden dene", - "add_description": "Açıklama ekle" + "add_description": "Açıklama ekle", + "attachments_summary": "Ekler: {count}, {size}", + "from_sub_address": "Alt adres kullan…", + "from_edit_sender": "Göndereni düzenle…", + "shortcut_insert_link": "Bağlantı ekle", + "shortcut_save_draft": "Taslağı kaydet", + "shortcut_show_cc": "Bilgiyi göster", + "shortcut_show_bcc": "Gizli bilgiyi göster" }, "confirm_dialog": { "confirm": "Onayla", diff --git a/locales/uk/common.json b/locales/uk/common.json index 61190aba0..2b82927e1 100644 --- a/locales/uk/common.json +++ b/locales/uk/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "Видалити чернетку", "save_failed_close": "Не вдалося зберегти чернетку. Спробуйте ще раз або видаліть її.", "try_again": "Спробувати ще раз", - "add_description": "Додати опис" + "add_description": "Додати опис", + "attachments_summary": "Вкладення: {count}, {size}", + "from_sub_address": "Використати підадресу…", + "from_edit_sender": "Змінити відправника…", + "shortcut_insert_link": "Вставити посилання", + "shortcut_save_draft": "Зберегти чернетку", + "shortcut_show_cc": "Показати копію", + "shortcut_show_bcc": "Показати приховану копію" }, "confirm_dialog": { "confirm": "Підтвердити", diff --git a/locales/vi/common.json b/locales/vi/common.json index 7f1cdde96..a00fb57c3 100644 --- a/locales/vi/common.json +++ b/locales/vi/common.json @@ -1230,7 +1230,14 @@ "discard_draft": "Hủy bản nháp", "save_failed_close": "Không lưu được bản nháp. Hãy thử lại hoặc hủy bản nháp.", "try_again": "Thử lại", - "add_description": "Thêm mô tả" + "add_description": "Thêm mô tả", + "attachments_summary": "Tệp đính kèm: {count}, {size}", + "from_sub_address": "Dùng địa chỉ phụ…", + "from_edit_sender": "Sửa người gửi…", + "shortcut_insert_link": "Chèn liên kết", + "shortcut_save_draft": "Lưu bản nháp", + "shortcut_show_cc": "Hiện Cc", + "shortcut_show_bcc": "Hiện Bcc" }, "confirm_dialog": { "confirm": "Xác nhận", diff --git a/locales/zh-TW/common.json b/locales/zh-TW/common.json index 02b7f47bb..e0530e39f 100644 --- a/locales/zh-TW/common.json +++ b/locales/zh-TW/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "捨棄草稿", "save_failed_close": "無法儲存草稿。請再試一次或捨棄草稿。", "try_again": "再試一次", - "add_description": "新增描述" + "add_description": "新增描述", + "attachments_summary": "附件：{count} 個，{size}", + "from_sub_address": "使用子地址…", + "from_edit_sender": "編輯寄件者…", + "shortcut_insert_link": "插入連結", + "shortcut_save_draft": "儲存草稿", + "shortcut_show_cc": "顯示副本", + "shortcut_show_bcc": "顯示密件副本" }, "confirm_dialog": { "confirm": "確認", diff --git a/locales/zh/common.json b/locales/zh/common.json index 0b033d382..789d31678 100644 --- a/locales/zh/common.json +++ b/locales/zh/common.json @@ -1218,7 +1218,14 @@ "discard_draft": "舍弃草稿", "save_failed_close": "无法保存草稿。请重试或舍弃草稿。", "try_again": "重试", - "add_description": "添加描述" + "add_description": "添加描述", + "attachments_summary": "附件：{count} 个，{size}", + "from_sub_address": "使用子地址…", + "from_edit_sender": "编辑发件人…", + "shortcut_insert_link": "插入链接", + "shortcut_save_draft": "保存草稿", + "shortcut_show_cc": "显示抄送", + "shortcut_show_bcc": "显示密送" }, "confirm_dialog": { "confirm": "确认",