From e9bc77a8f7f07cb08038e007c52a986cf4b9545b Mon Sep 17 00:00:00 2001 From: Eric Sethna Date: Tue, 30 Aug 2016 17:41:37 -0600 Subject: Update text in Account Settings > Notification (#3901) * Comment thread notification text * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update en.json * Update email_notification_setting.jsx * Update en.json * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx * Update user_settings_notifications.jsx --- .../user_settings/email_notification_setting.jsx | 8 ++++---- .../user_settings/user_settings_notifications.jsx | 16 ++++++++-------- webapp/i18n/en.json | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 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 ( @@ -156,7 +156,7 @@ export default class EmailNotificationSetting extends React.Component { return (
@@ -192,7 +192,7 @@ 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 ( @@ -769,14 +769,14 @@ export default class NotificationsTab extends React.Component { ); commentsSection = ( ); } else if (this.state.notifyCommentsLevel === 'root') { describe = ( ); } else { describe = ( ); } @@ -815,7 +815,7 @@ export default class NotificationsTab extends React.Component { commentsSection = ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 5e2549ebb..4617d2162 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1859,11 +1859,11 @@ "user.settings.notifications.allActivity": "For all activity", "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"", "user.settings.notifications.close": "Close", - "user.settings.notifications.comments": "Comment threads notifications", - "user.settings.notifications.commentsAny": "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)", - "user.settings.notifications.commentsInfo": "Mode of triggering notifications on posts in comment threads you participated in.", - "user.settings.notifications.commentsNever": "No mentions for comments", - "user.settings.notifications.commentsRoot": "Mention any comments on your post", + "user.settings.notifications.comments": "Reply notifications", + "user.settings.notifications.commentsAny": "Trigger notifications on messages in reply threads that I start or participate in", + "user.settings.notifications.commentsInfo": "In addition to notifications for when you're mentioned, select if you would like to receive notifications on reply threads.", + "user.settings.notifications.commentsNever": "Only trigger notifications when I'm mentioned", + "user.settings.notifications.commentsRoot": "Trigger notifications on messages in threads that I start", "user.settings.notifications.desktop": "Send desktop notifications", "user.settings.notifications.desktop.mentionsFirefoxForever": "For mentions and direct messages, shown indefinitely", "user.settings.notifications.desktop.mentionsFirefoxTimed": "For mentions and direct messages, shown for {seconds} seconds", @@ -1885,8 +1885,8 @@ "user.settings.notifications.desktop.sound": "Notification sound", "user.settings.notifications.desktopSounds": "Desktop notification sounds", "user.settings.notifications.emailBatchingInfo": "Notifications are combined into a single email and sent at the maximum frequency selected here.", - "user.settings.notifications.emailInfo": "Email notifications that are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.", - "user.settings.notifications.emailNotifications": "Send email notifications", + "user.settings.notifications.emailInfo": "Email notifications are sent for mentions and direct messages when you are offline or away from {siteName} for more than 5 minutes.", + "user.settings.notifications.emailNotifications": "Email notifications", "user.settings.notifications.everyHour": "Every hour", "user.settings.notifications.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}", "user.settings.notifications.header": "Notifications", @@ -1897,7 +1897,7 @@ "user.settings.notifications.off": "Off", "user.settings.notifications.on": "On", "user.settings.notifications.onlyMentions": "Only for mentions and direct messages", - "user.settings.notifications.push": "Send mobile push notifications", + "user.settings.notifications.push": "Mobile push notifications", "user.settings.notifications.sensitiveName": "Your case sensitive first name \"{first_name}\"", "user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"", "user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:", -- cgit v1.2.3-1-g7c22