diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx index 70306d8717..dc6f4ac0c5 100644 --- a/webapp/components/user_settings/user_settings_advanced.jsx +++ b/webapp/components/user_settings/user_settings_advanced.jsx @@ -332,7 +332,7 @@ export default class AdvancedSettingsDisplay extends React.Component { return ( ); case 'WEBRTC_PREVIEW': diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx index 9ffc4f721f..f51128b6fe 100644 --- a/webapp/components/user_settings/user_settings_display.jsx +++ b/webapp/components/user_settings/user_settings_display.jsx @@ -191,7 +191,7 @@ export default class UserSettingsDisplay extends React.Component {
@@ -202,7 +202,7 @@ export default class UserSettingsDisplay extends React.Component { title={ } inputs={inputs} @@ -218,14 +218,14 @@ export default class UserSettingsDisplay extends React.Component { describe = ( ); } else { describe = ( ); } @@ -239,7 +239,7 @@ export default class UserSettingsDisplay extends React.Component { title={ } describe={describe} diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 176629f6e8..1513a4afe1 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1922,7 +1922,7 @@ "update_command.question": "Your changes may break the existing slash command. Are you sure you would like to update it?", "update_command.update": "Update", "upload_overlay.info": "Drop a file to upload it.", - "user.settings.advance.embed_preview": "Show experimental previews of link content, when available", + "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.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.", @@ -1967,10 +1967,10 @@ "user.settings.display.channelDisplayTitle": "Channel Display Mode", "user.settings.display.channeldisplaymode": "Select the width of the center channel.", "user.settings.display.clockDisplay": "Clock Display", - "user.settings.display.collapseDesc": "Expand links to show a preview of content, when available.", - "user.settings.display.collapseDisplay": "Link previews", - "user.settings.display.collapseOff": "Off", - "user.settings.display.collapseOn": "On", + "user.settings.display.collapseDesc": "Set whether previews of image links show as expanded or collapsed by default. This setting can also be controlled using the slash commands /expand and /collapse.", + "user.settings.display.collapseDisplay": "Default appearance of image link previews", + "user.settings.display.collapseOff": "Collapsed", + "user.settings.display.collapseOn": "Expanded", "user.settings.display.fixedWidthCentered": "Fixed width, centered", "user.settings.display.fontDesc": "Select the font displayed in the Mattermost user interface.", "user.settings.display.fontTitle": "Display Font",