diff options
Diffstat (limited to 'webapp/i18n')
| -rwxr-xr-x | webapp/i18n/en.json | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 37f636bab..81d91c188 100755 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -216,9 +216,11 @@ "admin.customization.appDownloadLinkDesc": "Add a link to a download page for the Mattermost apps. When a link is present, an option to \"Download Mattermost Apps\" will be added in the Main Menu so users can find the download page. Leave this field blank to hide the option from the Main Menu.", "admin.customization.appDownloadLinkTitle": "Mattermost Apps Download Page Link:", "admin.customization.customBrand": "Custom Branding", - "admin.customization.customEmoji": "Custom Emoji", + "admin.customization.emoji": "Emoji", "admin.customization.enableCustomEmojiDesc": "Enable users to create custom emoji for use in messages. When enabled, Custom Emoji settings can be accessed by switching to a team and clicking the three dots above the channel sidebar, and selecting \"Custom Emoji\".", "admin.customization.enableCustomEmojiTitle": "Enable Custom Emoji:", + "admin.customization.enableEmojiPickerDesc": "The emoji picker allows users to select emoji to add as reactions or use in messages. Enabling the emoji picker with a large number of custom emoji may slow down performance.", + "admin.customization.enableEmojiPickerTitle": "Enable Emoji Picker:", "admin.customization.enableLinkPreviewsDesc": "Enable users to display a preview of website content below the message, if available. When true, website previews can be enabled from Account Settings > Advanced > Preview pre-release features.", "admin.customization.enableLinkPreviewsTitle": "Enable Link Previews:", "admin.customization.iosAppDownloadLinkDesc": "Add a link to download the iOS app. Users who access the site on a mobile web browser will be prompted with a page giving them the option to download the app. Leave this field blank to prevent the page from appearing.", @@ -763,7 +765,7 @@ "admin.sidebar.configuration": "Configuration", "admin.sidebar.connections": "Connections", "admin.sidebar.customBrand": "Custom Branding", - "admin.sidebar.customEmoji": "Custom Emoji", + "admin.sidebar.emoji": "Emoji", "admin.sidebar.customIntegrations": "Custom Integrations", "admin.sidebar.customization": "Customization", "admin.sidebar.database": "Database", @@ -2152,7 +2154,6 @@ "upload_overlay.info": "Drop a file to upload it.", "user.settings.advance.embed_preview": "For the first web link in a message, display a preview of website content below the message, if available", "user.settings.advance.embed_toggle": "Show toggle for all embed previews", - "user.settings.advance.emojipicker": "Enable emoji picker for reactions and message input box", "user.settings.advance.enabledFeatures": "{count, number} {count, plural, one {Feature} other {Features}} Enabled", "user.settings.advance.formattingDesc": "If enabled, posts will be formatted to create links, show emoji, style the text, and add line breaks. By default, this setting is enabled. Changing this setting requires the page to be refreshed.", "user.settings.advance.formattingTitle": "Enable Post Formatting", |