fix: explain replying from the received address in plain words

The admin-locks test finds the row by its label key, which moved to the
compose_words namespace with the new description.

components/settings/__tests__/composing-settings-locks.test.tsx

@@ -21,7 +21,7 @@ vi.mock('../settings-section', async (importOriginal) => ({
 
 const ROWS = {
   plainTextMode: 'plain_text_mode.label',
-  autoSelectReplyIdentity: 'auto_select_reply_identity.label',
+  autoSelectReplyIdentity: 'reply_from_received.label',
   replyIdentityMatch: 'reply_identity_match.label',
 } as const;
 

components/settings/__tests__/composing-settings-words.test.tsx

@@ -0,0 +1,41 @@
+import { render, screen } from '@testing-library/react';
+import { beforeEach, describe, expect, it, vi } from 'vitest';
+import { ComposingSettings } from '../composing-settings';
+import { useSettingsStore } from '@/stores/settings-store';
+import { useAuthStore } from '@/stores/auth-store';
+import en from '@/locales/en/common.json';
+
+// "Reply from the address it was sent to" explained catch-all matching,
+// which belongs to the row below it. The row now says what it does and
+// when it helps.
+
+vi.mock('next-intl', () => ({
+  useTranslations: () => (key: string) => key,
+  useLocale: () => 'en',
+}));
+
+vi.mock('../settings-section', async (importOriginal) => ({
+  ...(await importOriginal<typeof import('../settings-section')>()),
+  SettingsSection: ({ children }: { children: React.ReactNode }) => <div>{children}</div>,
+}));
+
+describe('ComposingSettings wording', () => {
+  beforeEach(() => {
+    useSettingsStore.getState().resetToDefaults();
+    useAuthStore.setState({ client: null });
+  });
+
+  it('describes replying from the received address without the catch-all note', () => {
+    render(<ComposingSettings />);
+    expect(screen.getByText('reply_from_received.description')).toBeTruthy();
+    expect(screen.queryByText('auto_select_reply_identity.description')).toBeNull();
+    expect(en.compose_words.reply_from_received.description).not.toMatch(/catch-all|Received Address Matching/i);
+  });
+
+  it('calls the send delay "Undo send"', () => {
+    render(<ComposingSettings />);
+    expect(screen.getByText('undo_send.label')).toBeTruthy();
+    expect(screen.queryByText('send_delay.label')).toBeNull();
+    expect(en.compose_words.undo_send.label).toBe('Undo send');
+  });
+});

components/settings/composing-settings.tsx

@@ -104,7 +104,7 @@ export function ComposingSettings() {
         </SettingItem>
 
         {!isSettingHidden('autoSelectReplyIdentity') && (
-        <SettingItem label={t('auto_select_reply_identity.label')} description={t('auto_select_reply_identity.description')} locked={isSettingLocked('autoSelectReplyIdentity')}>
+        <SettingItem label={tWords('reply_from_received.label')} description={tWords('reply_from_received.description')} locked={isSettingLocked('autoSelectReplyIdentity')}>
           <ToggleSwitch
             checked={autoSelectReplyIdentity}
             onChange={(checked) => updateSetting('autoSelectReplyIdentity', checked)}

lib/settings-schema.ts

@@ -272,7 +272,7 @@ const ENTRIES: SettingSchemaEntry[] = [
     opts(`${EB}mention_adds_recipient.`, ['to', 'cc', 'off'])),
   bool('rtlEditingSupport', 'composing', `${EB}rtl_editing.label`),
   bool('quickReplyEnabled', 'composing', `${EB}quick_reply.label`),
-  bool('autoSelectReplyIdentity', 'composing', `${EB}auto_select_reply_identity.label`),
+  bool('autoSelectReplyIdentity', 'composing', 'compose_words.reply_from_received.label'),
   // The page shows it only while the composer may rewrite From.
   choice('replyIdentityMatch', 'composing', `${EB}reply_identity_match.label`,
     opts(`${EB}reply_identity_match.`, ['exact', 'domain']), { gate: 'customFromEnabled' }),

lib/settings-search.ts

@@ -250,7 +250,7 @@ export const tabSearchEntries: Record<Tab, SettingsSearchEntry[]> = {
     { label: 'proofreading.settings.writing_language' },
     { label: 'settings.composing_page.sections.replying' },
     { label: 'settings.email_behavior.quick_reply.label' },
-    { label: 'settings.email_behavior.auto_select_reply_identity.label' },
+    { label: 'compose_words.reply_from_received.label' },
     { label: 'settings.email_behavior.signature_position.label' },
     { label: 'settings.email_behavior.signature_new_mail.label' },
     { label: 'settings.email_behavior.signature_reply_forward.label' },

locales/ar/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "التراجع عن الإرسال",
       "description": "يمنحك بضع ثوانٍ لاسترجاع الرسالة بعد الضغط على إرسال."
+    },
+    "reply_from_received": {
+      "label": "الرد من العنوان المستلَم إليه",
+      "description": "الرد من العنوان الذي أُرسلت إليه الرسالة. مفيد إذا كانت لديك عدة عناوين."
     }
   },
   "plugin_list": {

locales/ca/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Desfés l'enviament",
       "description": "Us dona uns segons per recuperar un missatge després de prémer Envia."
+    },
+    "reply_from_received": {
+      "label": "Respon des de l'adreça de recepció",
+      "description": "Respon des de l'adreça a la qual es va enviar el correu. Útil si teniu diverses adreces."
     }
   },
   "plugin_list": {

locales/cs/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Vrátit odeslání",
       "description": "Dává vám několik sekund na to, abyste zprávu po stisknutí Odeslat vzali zpět."
+    },
+    "reply_from_received": {
+      "label": "Automaticky vybírat adresu pro odpověď",
+      "description": "Odpovídat z adresy, na kterou zpráva přišla. Hodí se, pokud máte více adres."
     }
   },
   "plugin_list": {

locales/da/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Fortryd afsendelse",
       "description": "Giver dig et par sekunder til at tage en besked tilbage, efter du har trykket på Send."
+    },
+    "reply_from_received": {
+      "label": "Svar fra modtaget adresse",
+      "description": "Svar fra den adresse, mailen blev sendt til. Nyttigt, hvis du har flere adresser."
     }
   },
   "plugin_list": {

locales/de/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Senden rückgängig machen",
       "description": "Gibt Ihnen ein paar Sekunden, um eine Nachricht nach dem Klick auf Senden zurückzuholen."
+    },
+    "reply_from_received": {
+      "label": "Antwortadresse automatisch wählen",
+      "description": "Die Antwort geht von der Adresse aus, an die die E-Mail ging. Nützlich, wenn Sie mehrere Adressen haben."
     }
   },
   "plugin_list": {

locales/en/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Undo send",
       "description": "Gives you a few seconds to take a message back after you press Send."
+    },
+    "reply_from_received": {
+      "label": "Reply from the address it was sent to",
+      "description": "Reply from the address the mail was sent to. Useful if you have several addresses."
     }
   },
   "plugin_list": {

locales/es/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Deshacer envío",
       "description": "Le da unos segundos para recuperar un mensaje después de pulsar Enviar."
+    },
+    "reply_from_received": {
+      "label": "Seleccionar dirección de respuesta automáticamente",
+      "description": "Responder desde la dirección a la que se envió el correo. Útil si tiene varias direcciones."
     }
   },
   "plugin_list": {

locales/et/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Saatmise tühistamine",
       "description": "Annab sulle pärast Saada vajutamist mõne sekundi, et kiri tagasi võtta."
+    },
+    "reply_from_received": {
+      "label": "Vasta kirja saanud aadressilt",
+      "description": "Vasta aadressilt, kuhu kiri saadeti. Kasulik, kui sul on mitu aadressi."
     }
   },
   "plugin_list": {

locales/fa/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "لغو ارسال",
       "description": "پس از زدن ارسال، چند ثانیه فرصت می‌دهد تا پیام را پس بگیرید."
+    },
+    "reply_from_received": {
+      "label": "پاسخ از آدرس دریافتی",
+      "description": "پاسخ از نشانی‌ای که نامه به آن فرستاده شده بود. اگر چند نشانی دارید مفید است."
     }
   },
   "plugin_list": {

locales/fr/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Annuler l'envoi",
       "description": "Vous laisse quelques secondes pour reprendre un message après avoir cliqué sur Envoyer."
+    },
+    "reply_from_received": {
+      "label": "Sélection automatique de l'adresse de réponse",
+      "description": "Répondre depuis l'adresse à laquelle le message a été envoyé. Utile si vous avez plusieurs adresses."
     }
   },
   "plugin_list": {

locales/he/common.json

@@ -6389,6 +6389,10 @@
     "undo_send": {
       "label": "ביטול שליחה",
       "description": "נותן לך כמה שניות להחזיר הודעה אחרי שלחצת על שלח."
+    },
+    "reply_from_received": {
+      "label": "בחירה אוטומטית בכתובת תשובה",
+      "description": "השב מהכתובת שאליה נשלח הדואר. שימושי אם יש לך כמה כתובות."
     }
   },
   "plugin_list": {

locales/hu/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Küldés visszavonása",
       "description": "A Küldés megnyomása után néhány másodpercet ad az üzenet visszavonására."
+    },
+    "reply_from_received": {
+      "label": "Válasz a fogadott címről",
+      "description": "Válasz arról a címről, amelyre a levél érkezett. Hasznos, ha több címe van."
     }
   },
   "plugin_list": {

locales/it/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Annulla invio",
       "description": "Ti dà qualche secondo per riprendere un messaggio dopo aver premuto Invia."
+    },
+    "reply_from_received": {
+      "label": "Seleziona automaticamente l'indirizzo di risposta",
+      "description": "Rispondi dall'indirizzo a cui è stata inviata l'email. Utile se hai più indirizzi."
     }
   },
   "plugin_list": {

locales/ja/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "送信取り消し",
       "description": "送信を押した後、数秒間メッセージを取り消せます。"
+    },
+    "reply_from_received": {
+      "label": "返信元アドレスを自動選択",
+      "description": "メールの宛先になったアドレスから返信します。複数のアドレスがある場合に便利です。"
     }
   },
   "plugin_list": {

locales/ko/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "보내기 취소",
       "description": "보내기를 누른 후 몇 초 동안 메시지를 되돌릴 수 있습니다."
+    },
+    "reply_from_received": {
+      "label": "답장 시 보내는 사람 자동 선택",
+      "description": "메일을 받은 주소로 답장합니다. 주소가 여러 개일 때 유용합니다."
     }
   },
   "plugin_list": {

locales/lv/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Atsaukt sūtīšanu",
       "description": "Dod jums dažas sekundes, lai pēc Sūtīt nospiešanas paņemtu ziņojumu atpakaļ."
+    },
+    "reply_from_received": {
+      "label": "Automātiski izvēlēties atbildes adresi",
+      "description": "Atbildēt no adreses, uz kuru vēstule tika nosūtīta. Noder, ja jums ir vairākas adreses."
     }
   },
   "plugin_list": {

locales/mn/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Илгээлтийг буцаах",
       "description": "Илгээх товчийг дарсны дараа мессежээ буцаах хэдэн секунд өгнө."
+    },
+    "reply_from_received": {
+      "label": "Хүлээн авсан хаягаас хариу бичих",
+      "description": "Захидал илгээгдсэн хаягаас хариу бичнэ. Олон хаягтай бол хэрэгтэй."
     }
   },
   "plugin_list": {

locales/nb/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Angre sending",
       "description": "Gir deg noen sekunder til å ta tilbake en melding etter at du har trykket Send."
+    },
+    "reply_from_received": {
+      "label": "Svar fra mottatt adresse",
+      "description": "Svar fra adressen e-posten ble sendt til. Nyttig hvis du har flere adresser."
     }
   },
   "plugin_list": {

locales/nl/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Verzenden ongedaan maken",
       "description": "Geeft je een paar seconden om een bericht terug te halen nadat je op Verzenden hebt gedrukt."
+    },
+    "reply_from_received": {
+      "label": "Antwoordadres automatisch selecteren",
+      "description": "Antwoord vanaf het adres waar de mail naartoe is gestuurd. Handig als je meerdere adressen hebt."
     }
   },
   "plugin_list": {

locales/pl/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Cofnij wysyłkę",
       "description": "Daje kilka sekund na wycofanie wiadomości po naciśnięciu Wyślij."
+    },
+    "reply_from_received": {
+      "label": "Automatycznie wybieraj adres odpowiedzi",
+      "description": "Odpowiadaj z adresu, na który wysłano wiadomość. Przydatne, jeśli masz kilka adresów."
     }
   },
   "plugin_list": {

locales/pt/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Desfazer envio",
       "description": "Dá alguns segundos para você recuperar uma mensagem depois de clicar em Enviar."
+    },
+    "reply_from_received": {
+      "label": "Selecionar automaticamente o endereço de resposta",
+      "description": "Responder do endereço para o qual o e-mail foi enviado. Útil se você tiver vários endereços."
     }
   },
   "plugin_list": {

locales/ro/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Anulează trimiterea",
       "description": "Îți oferă câteva secunde să retragi un mesaj după ce apeși Trimite."
+    },
+    "reply_from_received": {
+      "label": "Răspunde de la adresa de la care a fost primit mesajul",
+      "description": "Răspunde de la adresa la care a fost trimis e-mailul. Util dacă ai mai multe adrese."
     }
   },
   "plugin_list": {

locales/ru/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Отмена отправки",
       "description": "Даёт несколько секунд, чтобы вернуть письмо после нажатия «Отправить»."
+    },
+    "reply_from_received": {
+      "label": "Автоматически выбирать адрес для ответа",
+      "description": "Отвечать с адреса, на который пришло письмо. Удобно, если у вас несколько адресов."
     }
   },
   "plugin_list": {

locales/sk/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Vrátiť odoslanie",
       "description": "Dáva vám niekoľko sekúnd na to, aby ste správu po stlačení Odoslať vzali späť."
+    },
+    "reply_from_received": {
+      "label": "Odpovedať z prijatej adresy",
+      "description": "Odpovedať z adresy, na ktorú prišla správa. Hodí sa, ak máte viac adries."
     }
   },
   "plugin_list": {

locales/th/common.json

@@ -3309,6 +3309,10 @@
     "undo_send": {
       "label": "ยกเลิกการส่ง",
       "description": "ให้เวลาคุณสองสามวินาทีเพื่อเรียกข้อความกลับหลังจากกดส่ง"
+    },
+    "reply_from_received": {
+      "label": "ตอบกลับจากที่อยู่ที่ได้รับ",
+      "description": "ตอบกลับจากที่อยู่ที่อีเมลถูกส่งมา มีประโยชน์หากคุณมีหลายที่อยู่"
     }
   },
   "plugin_list": {

locales/tr/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Göndermeyi geri al",
       "description": "Gönder'e bastıktan sonra iletiyi geri almanız için birkaç saniye verir."
+    },
+    "reply_from_received": {
+      "label": "Yanıt Adresini Otomatik Seç",
+      "description": "Postanın gönderildiği adresten yanıtlayın. Birden çok adresiniz varsa kullanışlıdır."
     }
   },
   "plugin_list": {

locales/uk/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "Скасувати надсилання",
       "description": "Дає кілька секунд, щоб повернути лист після натискання «Надіслати»."
+    },
+    "reply_from_received": {
+      "label": "Автоматичний вибір адреси для відповіді",
+      "description": "Відповідати з адреси, на яку надійшов лист. Зручно, якщо у вас кілька адрес."
     }
   },
   "plugin_list": {

locales/vi/common.json

@@ -6400,6 +6400,10 @@
     "undo_send": {
       "label": "Hoàn tác gửi",
       "description": "Cho bạn vài giây để lấy lại thư sau khi nhấn Gửi."
+    },
+    "reply_from_received": {
+      "label": "Trả lời bằng địa chỉ nhận thư",
+      "description": "Trả lời từ địa chỉ mà thư đã được gửi đến. Hữu ích nếu bạn có nhiều địa chỉ."
     }
   },
   "plugin_list": {

locales/zh-TW/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "取消傳送",
       "description": "按下傳送後，給您幾秒鐘撤回郵件。"
+    },
+    "reply_from_received": {
+      "label": "使用收件地址回覆",
+      "description": "從郵件寄達的地址回覆。適合擁有多個地址時使用。"
     }
   },
   "plugin_list": {

locales/zh/common.json

@@ -6388,6 +6388,10 @@
     "undo_send": {
       "label": "撤销发送",
       "description": "点击发送后，给您几秒钟时间撤回邮件。"
+    },
+    "reply_from_received": {
+      "label": "自动选择回复地址",
+      "description": "从邮件发往的地址回复。适合拥有多个地址的情况。"
     }
   },
   "plugin_list": {