diff --git a/help/quote-and-reply.md b/help/quote-and-reply.md index d9098ee08b..ee6b752dcb 100644 --- a/help/quote-and-reply.md +++ b/help/quote-and-reply.md @@ -21,7 +21,7 @@ to avoid unnecessarily mentioning someone twice. {!message-actions-menu.md!} -1. Click **Quote and reply or forward**. +1. Click **Quote and reply**. 1. *(optional)* Delete any parts of the quoted message that are not relevant to your reply. @@ -30,7 +30,7 @@ to avoid unnecessarily mentioning someone twice. !!! keyboard_tip "" - You can also use > to **quote and reply or forward** the + You can also use > to **quote and reply** to the selected message. {tab|mobile} @@ -54,7 +54,7 @@ to avoid unnecessarily mentioning someone twice. {!message-actions-menu.md!} -1. Click **Quote and reply or forward**. +1. Click **Quote and reply**. 1. *(optional)* Delete any parts of the quoted message that you don't want to forward. @@ -68,8 +68,7 @@ to avoid unnecessarily mentioning someone twice. !!! keyboard_tip "" - You can also use > to **quote and reply or forward** the - selected message. + You can also use > to forward the selected message. {tab|mobile} diff --git a/web/templates/actions_popover_content.hbs b/web/templates/actions_popover_content.hbs index 042ee6d2c8..17006396b6 100644 --- a/web/templates/actions_popover_content.hbs +++ b/web/templates/actions_popover_content.hbs @@ -3,7 +3,7 @@ {{#if should_display_quote_and_reply}}
  • - {{t "Quote and reply or forward" }} + {{t "Quote and reply" }} (>)
  • diff --git a/web/tests/i18n.test.js b/web/tests/i18n.test.js index 9d5796e9c7..773df89173 100644 --- a/web/tests/i18n.test.js +++ b/web/tests/i18n.test.js @@ -13,7 +13,7 @@ const {page_params} = require("./lib/zpage_params"); // that here for the tests. page_params.request_language = "en"; page_params.translation_data = { - "Quote and reply or forward": "Citer et répondre ou transférer", + "Quote and reply": "Citer et répondre", "Notification triggers": "Déclencheurs de notification", "You subscribed to stream {stream}": "Vous n'êtes pas abonnés au canal {stream}", "

    The stream {stream_name} does not exist.

    Manage your subscriptions on your Streams page.

    ": @@ -35,8 +35,8 @@ run_test("$t", () => { // Normally the id would be provided by babel-plugin-formatjs, but // this test file is not processed by Babel. assert.equal( - $t({id: "Quote and reply or forward", defaultMessage: "Quote and reply or forward"}), - "Citer et répondre ou transférer", + $t({id: "Quote and reply", defaultMessage: "Quote and reply"}), + "Citer et répondre", ); assert.equal( $t( @@ -79,7 +79,7 @@ run_test("t_tag", ({mock_template}) => { mock_template("actions_popover_content.hbs", true, (data, html) => { assert.equal(data, args); - assert.ok(html.indexOf("Citer et répondre ou transférer") > 0); + assert.ok(html.indexOf("Citer et répondre") > 0); }); require("../templates/actions_popover_content.hbs")(args);