settings: Rename emoji settings.

This commit is contained in:
Rishi Gupta
2018-08-15 15:05:25 -07:00
committed by Tim Abbott
parent 8ef0c6d99a
commit fa50f68ec5
3 changed files with 4 additions and 4 deletions

View File

@@ -111,8 +111,8 @@ function setup_settings_label() {
left_side_userlist: i18n.t("User list on left sidebar in narrow windows"),
night_mode: i18n.t("Night mode"),
twenty_four_hour_time: i18n.t("24-hour time (17:00 instead of 5:00 PM)"),
translate_emoji_to_text: i18n.t("Translate emoji to text (Convert 😃 to <code>:smile:</code>)"),
translate_emoticons: i18n.t("Translate emoticons (convert <code>:)</code> to 😃 in messages)"),
translate_emoji_to_text: i18n.t("View emoji as text (see <code>:smile:</code> when others write 😃)"),
translate_emoticons: i18n.t("Convert emoticons before sending (<code>:)</code> becomes 😃)"),
};
}

View File

@@ -7,4 +7,4 @@ For example, when a heart emoji is displayed as text, it looks like
{settings_tab|display-settings}
2. Under **Emoji settings**, select **Translate emoji to text**.
2. Under **Emoji settings**, select **View emoji as text**.

View File

@@ -18,7 +18,7 @@ automatically by Zulip.
{settings_tab|display-settings}
2. Select the option labeled
**Translate emoticons (convert `:)` to 😃 in messages)**.
**Convert emoticons before sending**.
## Current emoticon conversions