summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-09-28 08:50:39 -0400
committerChristopher Speller <crspeller@gmail.com>2016-09-28 08:50:39 -0400
commit40c0a85b2de23b2cf67d0642bebe3128048c38bf (patch)
treec53296b5951b381d8b38137f19b1c935ab83a258 /webapp
parentcaeadde2f24384deca67f9d00999252ee53570ad (diff)
downloadchat-40c0a85b2de23b2cf67d0642bebe3128048c38bf.tar.gz
chat-40c0a85b2de23b2cf67d0642bebe3128048c38bf.tar.bz2
chat-40c0a85b2de23b2cf67d0642bebe3128048c38bf.zip
Specify WebRTC calls available on Chrome, Firefox and Desktop Apps (#4107)
* Update webrtc_settings.jsx * Update en.json
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/admin_console/webrtc_settings.jsx2
-rw-r--r--webapp/i18n/en.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/webapp/components/admin_console/webrtc_settings.jsx b/webapp/components/admin_console/webrtc_settings.jsx
index 19423cf56..cea8e2226 100644
--- a/webapp/components/admin_console/webrtc_settings.jsx
+++ b/webapp/components/admin_console/webrtc_settings.jsx
@@ -106,7 +106,7 @@ export default class WebrtcSettings extends AdminSettings {
helpText={
<FormattedHTMLMessage
id='admin.webrtc.enableDescription'
- defaultMessage='When true, Mattermost allows making <strong>one on one</strong> video calls.'
+ defaultMessage='When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.'
/>
}
value={this.state.enableWebrtc}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 512bff5a8..6607677fe 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -828,7 +828,7 @@
"admin.user_item.switchToEmail": "Switch to Email/Password",
"admin.user_item.sysAdmin": "System Admin",
"admin.user_item.teamAdmin": "Team Admin",
- "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one on one</strong> video calls.",
+ "admin.webrtc.enableDescription": "When true, Mattermost allows making <strong>one-on-one</strong> video calls. WebRTC calls are available on Chrome, Firefox and Mattermost Desktop Apps.",
"admin.webrtc.enableTitle": "Enable Mattermost WebRTC: ",
"admin.webrtc.gatewayAdminSecretDescription": "Enter your admin secret password to access the Gateway Admin URL.",
"admin.webrtc.gatewayAdminSecretExample": "Ex \"PVRzWNN1Tg6szn7IQWvhpAvLByScWxdy\"",