From 66dddbdb7895a87e858f9238e546cedc6e05e34e Mon Sep 17 00:00:00 2001
From: Jason Blais <jason@spinpunch.com>
Date: Fri, 20 Jan 2017 15:23:45 -0500
Subject: Account settings text updates (#5143)

* Update en.json

* Update user_settings_display.jsx

* Update en.json

* Update user_settings_advanced.jsx
---
 webapp/components/user_settings/user_settings_advanced.jsx |  2 +-
 webapp/components/user_settings/user_settings_display.jsx  | 10 +++++-----
 webapp/i18n/en.json                                        | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'webapp')

diff --git a/webapp/components/user_settings/user_settings_advanced.jsx b/webapp/components/user_settings/user_settings_advanced.jsx
index 70306d871..dc6f4ac0c 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 (
                 <FormattedMessage
                     id='user.settings.advance.embed_preview'
-                    defaultMessage='Show experimental previews of link content, when available'
+                    defaultMessage='For the first web link in a message, display a preview of website content below the message, if available'
                 />
             );
         case 'WEBRTC_PREVIEW':
diff --git a/webapp/components/user_settings/user_settings_display.jsx b/webapp/components/user_settings/user_settings_display.jsx
index 9ffc4f721..f51128b6f 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 {
                         <br/>
                         <FormattedMessage
                             id='user.settings.display.collapseDesc'
-                            defaultMessage='Expand links to show a preview of content, when available.'
+                            defaultMessage='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.'
                         />
                     </div>
                 </div>
@@ -202,7 +202,7 @@ export default class UserSettingsDisplay extends React.Component {
                     title={
                         <FormattedMessage
                             id='user.settings.display.collapseDisplay'
-                            defaultMessage='Link previews'
+                            defaultMessage='Default appearance of image link previews'
                         />
                     }
                     inputs={inputs}
@@ -218,14 +218,14 @@ export default class UserSettingsDisplay extends React.Component {
             describe = (
                 <FormattedMessage
                     id='user.settings.display.collapseOn'
-                    defaultMessage='On'
+                    defaultMessage='Expanded'
                 />
             );
         } else {
             describe = (
                 <FormattedMessage
                     id='user.settings.display.collapseOff'
-                    defaultMessage='Off'
+                    defaultMessage='Collapsed'
                 />
             );
         }
@@ -239,7 +239,7 @@ export default class UserSettingsDisplay extends React.Component {
                 title={
                     <FormattedMessage
                         id='user.settings.display.collapseDisplay'
-                        defaultMessage='Link previews'
+                        defaultMessage='Default appearance of image link previews'
                     />
                 }
                 describe={describe}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 176629f6e..1513a4afe 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",
-- 
cgit v1.2.3-1-g7c22