summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorAlex White <Whiteaj36@users.noreply.github.com>2017-08-03 09:03:51 -0500
committerHarrison Healey <harrisonmhealey@gmail.com>2017-08-03 10:03:51 -0400
commit3174c9a07d780eb8f6e2fce8266013f393de40dd (patch)
tree672f123ccccbf2cd134621f7f0253e7dd3341ba1 /webapp/i18n
parentea095d6206ad8bb9b1b1ffbf74584669a24f1ca8 (diff)
downloadchat-3174c9a07d780eb8f6e2fce8266013f393de40dd.tar.gz
chat-3174c9a07d780eb8f6e2fce8266013f393de40dd.tar.bz2
chat-3174c9a07d780eb8f6e2fce8266013f393de40dd.zip
PLT-6823 Removes option to set notification sound in Edge (#6883)
* Remove sound notification support for Edge * Move the sound test to utils and also stop the dings for Edge along with firefox * Fix some styling issues * Remove sound notification support for Edge Move the sound test to utils and also stop the dings for Edge along with firefox Fix some styling issues * Reversing soundOptions util method. Fixing some string IDs for clarity * Fixing a syntax error * Restructure HasSoundOptions blocks to not begin with negative statement * Fixing paranthesis
Diffstat (limited to 'webapp/i18n')
-rwxr-xr-xwebapp/i18n/en.json10
1 files changed, 5 insertions, 5 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index a761793be..02e0964ce 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2411,16 +2411,16 @@
"user.settings.notifications.commentsNever": "Do not trigger notifications on messages in reply threads unless 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.allFirefoxForever": "For all activity, shown indefinitely",
- "user.settings.notifications.desktop.allFirefoxTimed": "For all activity, shown for {seconds} seconds",
+ "user.settings.notifications.desktop.allSoundHiddenForever": "For all activity, shown indefinitely",
+ "user.settings.notifications.desktop.allSoundHiddenTimed": "For all activity, shown for {seconds} seconds",
"user.settings.notifications.desktop.allNoSoundForever": "For all activity, without sound, shown indefinitely",
"user.settings.notifications.desktop.allNoSoundTimed": "For all activity, without sound, shown for {seconds} seconds",
"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 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.mentionsSoundHiddenForever": "For mentions and direct messages, shown indefinitely",
+ "user.settings.notifications.desktop.mentionsSoundHiddenTimed": "For mentions and direct messages, shown for {seconds} seconds",
"user.settings.notifications.desktop.mentionsNoSoundForever": "For mentions and direct messages, without sound, shown indefinitely",
"user.settings.notifications.desktop.mentionsNoSoundTimed": "For mentions and direct messages, without sound, shown for {seconds} seconds",
"user.settings.notifications.desktop.mentionsSoundForever": "For mentions and direct messages, with sound, shown indefinitely",
@@ -2454,7 +2454,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, Chrome and Mattermost Desktop Apps.",
+ "user.settings.notifications.sounds_info": "Notification sounds are available on IE11, Safari, Chrome and Mattermost Desktop Apps.",
"user.settings.notifications.teamWide": "Team-wide mentions \"@all\"",
"user.settings.notifications.title": "Notification Settings",
"user.settings.notifications.wordsTrigger": "Words that trigger mentions",