summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sethna <eric@spinpunch.com>2016-12-01 05:19:40 -0700
committerenahum <nahumhbl@gmail.com>2016-12-01 09:19:40 -0300
commit30dbc412cad0d0e7fe903f7297c6aa0ab499f110 (patch)
tree9f0ba29f1fa33591097488d1d2345a206ad18316
parenta804f63c32f70dbb5ff64d446cff12f8baf39ceb (diff)
downloadchat-30dbc412cad0d0e7fe903f7297c6aa0ab499f110.tar.gz
chat-30dbc412cad0d0e7fe903f7297c6aa0ab499f110.tar.bz2
chat-30dbc412cad0d0e7fe903f7297c6aa0ab499f110.zip
Update desktop notification help text (#4684)
* Update desktop_notification_settings.jsx * desktop notification help text
-rw-r--r--webapp/components/user_settings/desktop_notification_settings.jsx6
-rw-r--r--webapp/i18n/en.json6
2 files changed, 6 insertions, 6 deletions
diff --git a/webapp/components/user_settings/desktop_notification_settings.jsx b/webapp/components/user_settings/desktop_notification_settings.jsx
index 109212049..3a330b623 100644
--- a/webapp/components/user_settings/desktop_notification_settings.jsx
+++ b/webapp/components/user_settings/desktop_notification_settings.jsx
@@ -105,7 +105,7 @@ export default class DesktopNotificationSettings extends React.Component {
<span>
<FormattedMessage
id='user.settings.notifications.sounds_info'
- defaultMessage='Notification sounds are available on IE11, Edge, Safari and Chrome.'
+ defaultMessage='Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.'
/>
</span>
</div>
@@ -207,7 +207,7 @@ export default class DesktopNotificationSettings extends React.Component {
<span>
<FormattedMessage
id='user.settings.notifications.desktop.durationInfo'
- defaultMessage='Sets how long desktop notifications will remain on screen.'
+ defaultMessage='Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.'
/>
</span>
);
@@ -270,7 +270,7 @@ export default class DesktopNotificationSettings extends React.Component {
<span>
<FormattedMessage
id='user.settings.notifications.info'
- defaultMessage='Desktop notifications are available on Firefox, Safari, and Chrome.'
+ defaultMessage='Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.'
/>
</span>
{soundSection}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 4283816f0..3b87d76c2 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2002,7 +2002,7 @@
"user.settings.notifications.desktop.allSoundForever": "For all activity, with sound, shown indefinitely",
"user.settings.notifications.desktop.allSoundTimed": "For all activity, with sound, shown for {seconds} seconds",
"user.settings.notifications.desktop.duration": "Notification duration",
- "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen.",
+ "user.settings.notifications.desktop.durationInfo": "Sets how long desktop notifications will remain on screen when using Firefox or Chrome. Desktop notifications in Edge and Safari can only stay on screen for a maximum of 5 seconds.",
"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",
"user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
@@ -2023,7 +2023,7 @@
"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.header": "Notifications",
- "user.settings.notifications.info": "Desktop notifications are available on Firefox, Safari, and Chrome.",
+ "user.settings.notifications.info": "Desktop notifications are available on Edge, Firefox, Safari, Chrome and Mattermost Desktop Apps.",
"user.settings.notifications.never": "Never",
"user.settings.notifications.noWords": "No words configured",
"user.settings.notifications.off": "Off",
@@ -2035,7 +2035,7 @@
"user.settings.notifications.sensitiveUsername": "Your non-case sensitive username \"{username}\"",
"user.settings.notifications.sensitiveWords": "Other non-case sensitive words, separated by commas:",
"user.settings.notifications.soundConfig": "Please configure notification sounds in your browser settings",
- "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari and Chrome.",
+ "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Edge, Safari, Chrome and Mattermost Desktop Apps.",
"user.settings.notifications.teamWide": "Team-wide mentions \"@all\"",
"user.settings.notifications.title": "Notification Settings",
"user.settings.notifications.usernameMention": "Your username mentioned \"@{username}\"",