summaryrefslogtreecommitdiffstats
path: root/webapp/components
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components')
-rw-r--r--webapp/components/user_settings/email_notification_setting.jsx8
-rw-r--r--webapp/components/user_settings/user_settings_notifications.jsx16
2 files changed, 12 insertions, 12 deletions
diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx
index df5f80c64..5c0d95d8b 100644
--- a/webapp/components/user_settings/email_notification_setting.jsx
+++ b/webapp/components/user_settings/email_notification_setting.jsx
@@ -102,7 +102,7 @@ export default class EmailNotificationSetting extends React.Component {
return (
<SettingItemMin
- title={localizeMessage('user.settings.notifications.emailNotifications', 'Send Email notifications')}
+ title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
describe={description}
updateSection={this.expand}
/>
@@ -156,7 +156,7 @@ export default class EmailNotificationSetting extends React.Component {
return (
<SettingItemMax
- title={localizeMessage('user.settings.notifications.emailNotifications', 'Send email notifications')}
+ title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
inputs={[
<div key='userNotificationEmailOptions'>
<div className='radio'>
@@ -192,7 +192,7 @@ export default class EmailNotificationSetting extends React.Component {
<div>
<FormattedMessage
id='user.settings.notifications.emailInfo'
- defaultMessage='Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
+ defaultMessage='Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.'
values={{
siteName: global.window.mm_config.SiteName
}}
@@ -208,4 +208,4 @@ export default class EmailNotificationSetting extends React.Component {
/>
);
}
-} \ No newline at end of file
+}
diff --git a/webapp/components/user_settings/user_settings_notifications.jsx b/webapp/components/user_settings/user_settings_notifications.jsx
index a18cdf041..09bc26a9b 100644
--- a/webapp/components/user_settings/user_settings_notifications.jsx
+++ b/webapp/components/user_settings/user_settings_notifications.jsx
@@ -421,7 +421,7 @@ export default class NotificationsTab extends React.Component {
return (
<SettingItemMax
- title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
+ title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
extraInfo={extraInfo}
inputs={inputs}
submit={submit}
@@ -500,7 +500,7 @@ export default class NotificationsTab extends React.Component {
return (
<SettingItemMin
- title={Utils.localizeMessage('user.settings.notifications.push', 'Send mobile push notifications')}
+ title={Utils.localizeMessage('user.settings.notifications.push', 'Mobile push notifications')}
describe={describe}
updateSection={handleUpdatePushSection}
/>
@@ -769,14 +769,14 @@ export default class NotificationsTab extends React.Component {
<span>
<FormattedMessage
id='user.settings.notifications.commentsInfo'
- defaultMessage='Mode of triggering notifications on posts in comment threads you participated in.'
+ defaultMessage="In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads."
/>
</span>
);
commentsSection = (
<SettingItemMax
- title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
+ title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
extraInfo={extraInfo}
inputs={inputs}
submit={this.handleSubmit}
@@ -790,21 +790,21 @@ export default class NotificationsTab extends React.Component {
describe = (
<FormattedMessage
id='user.settings.notifications.commentsNever'
- defaultMessage='No mentions for comments'
+ defaultMessage="Only trigger notifications when I'm mentioned"
/>
);
} else if (this.state.notifyCommentsLevel === 'root') {
describe = (
<FormattedMessage
id='user.settings.notifications.commentsRoot'
- defaultMessage='Mention any comments on your post'
+ defaultMessage='Trigger notifications on messages in threads that I start'
/>
);
} else {
describe = (
<FormattedMessage
id='user.settings.notifications.commentsAny'
- defaultMessage='Mention any comments in a thread you participated in (This will include both mentions to your root post and any comments after you commented on a post)'
+ defaultMessage='Trigger notifications on messages in reply threads that I start or participate in'
/>
);
}
@@ -815,7 +815,7 @@ export default class NotificationsTab extends React.Component {
commentsSection = (
<SettingItemMin
- title={Utils.localizeMessage('user.settings.notifications.comments', 'Comment threads notifications')}
+ title={Utils.localizeMessage('user.settings.notifications.comments', 'Reply notifications')}
describe={describe}
updateSection={handleUpdateCommentsSection}
/>