summaryrefslogtreecommitdiffstats
path: root/webapp/components/user_settings
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2017-01-20 15:23:45 -0500
committerenahum <nahumhbl@gmail.com>2017-01-20 17:23:45 -0300
commit66dddbdb7895a87e858f9238e546cedc6e05e34e (patch)
tree6ecd071cec512bcb451ae6bbf0bbb4152e579872 /webapp/components/user_settings
parent3aaf71fdea914af1a7f2b2fb97bb6ae44132fcc4 (diff)
downloadchat-66dddbdb7895a87e858f9238e546cedc6e05e34e.tar.gz
chat-66dddbdb7895a87e858f9238e546cedc6e05e34e.tar.bz2
chat-66dddbdb7895a87e858f9238e546cedc6e05e34e.zip
Account settings text updates (#5143)
* Update en.json * Update user_settings_display.jsx * Update en.json * Update user_settings_advanced.jsx
Diffstat (limited to 'webapp/components/user_settings')
-rw-r--r--webapp/components/user_settings/user_settings_advanced.jsx2
-rw-r--r--webapp/components/user_settings/user_settings_display.jsx10
2 files changed, 6 insertions, 6 deletions
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}