summaryrefslogtreecommitdiffstats
path: root/webapp/i18n
diff options
context:
space:
mode:
authorDavid Lu <david.lu@hotmail.com>2016-06-04 11:21:50 -0700
committerJoram Wilander <jwawilander@gmail.com>2016-06-04 14:21:50 -0400
commitf3825ba766625806e0776a17146ca5fff372612e (patch)
treef108503fe620907022130d447dc81746f8465a09 /webapp/i18n
parent6f0a7e4b137e193e6cfaac6aa90f0c91ec6b139c (diff)
downloadchat-f3825ba766625806e0776a17146ca5fff372612e.tar.gz
chat-f3825ba766625806e0776a17146ca5fff372612e.tar.bz2
chat-f3825ba766625806e0776a17146ca5fff372612e.zip
PLT-2994 Added @all (#3233)
* Added @all * Uncomment @all server side
Diffstat (limited to 'webapp/i18n')
-rw-r--r--webapp/i18n/en.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 086868cbd..13c806634 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1180,7 +1180,7 @@
"sso_signup.length_error": "Name must be 3 or more characters up to a maximum of 15",
"sso_signup.teamName": "Enter name of new team",
"sso_signup.team_error": "Please enter a team name",
- "suggestion.mention.all": "Notifies everyone in the team",
+ "suggestion.mention.all": "Notifies everyone in the channel, use in {townsquare} to notify the whole team",
"suggestion.mention.channel": "Notifies everyone in the channel",
"suggestion.search.private": "Private Groups",
"suggestion.search.public": "Public Channels",
@@ -1368,7 +1368,7 @@
"user.settings.notification.allActivity": "For all activity",
"user.settings.notification.push": "Mobile push notifications",
"user.settings.notification.soundConfig": "Please configure notification sounds in your browser settings",
- "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\"",
+ "user.settings.notifications.channelWide": "Channel-wide mentions \"@channel\", \"@all\"",
"user.settings.notifications.close": "Close",
"user.settings.notifications.desktop": "Send desktop notifications",
"user.settings.notifications.desktopSounds": "Desktop notification sounds",