summaryrefslogtreecommitdiffstats
path: root/webapp/components/admin_console
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/components/admin_console')
-rw-r--r--webapp/components/admin_console/connection_security_dropdown_setting.jsx4
-rw-r--r--webapp/components/admin_console/developer_settings.jsx2
-rw-r--r--webapp/components/admin_console/webrtc_settings.jsx4
3 files changed, 5 insertions, 5 deletions
diff --git a/webapp/components/admin_console/connection_security_dropdown_setting.jsx b/webapp/components/admin_console/connection_security_dropdown_setting.jsx
index fac611e5b..cc58bdd10 100644
--- a/webapp/components/admin_console/connection_security_dropdown_setting.jsx
+++ b/webapp/components/admin_console/connection_security_dropdown_setting.jsx
@@ -18,7 +18,7 @@ const SECTION_NONE = (
<td>
<FormattedMessage
id='admin.connectionSecurityNoneDescription'
- defaultMessage='Mattermost will connect over an unsecure connection.'
+ defaultMessage='Mattermost will connect over an insecure connection.'
/>
</td>
</tr>
@@ -35,7 +35,7 @@ const SECTION_PLAIN = (
<td>
<FormattedMessage
id='admin.connectionSecurityPlainDescription'
- defaultMessage='Mattermost will connect and authenticate over an unsecure connection.'
+ defaultMessage='Mattermost will connect and authenticate over an insecure connection.'
/>
</td>
</tr>
diff --git a/webapp/components/admin_console/developer_settings.jsx b/webapp/components/admin_console/developer_settings.jsx
index b04997225..119b92a5a 100644
--- a/webapp/components/admin_console/developer_settings.jsx
+++ b/webapp/components/admin_console/developer_settings.jsx
@@ -73,7 +73,7 @@ export default class DeveloperSettings extends AdminSettings {
helpText={
<FormattedMessage
id='admin.service.developerDesc'
- defaultMessage='When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. '
+ defaultMessage='When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. '
/>
}
value={this.state.enableDeveloper}
diff --git a/webapp/components/admin_console/webrtc_settings.jsx b/webapp/components/admin_console/webrtc_settings.jsx
index 995a02a0c..63c17f598 100644
--- a/webapp/components/admin_console/webrtc_settings.jsx
+++ b/webapp/components/admin_console/webrtc_settings.jsx
@@ -84,7 +84,7 @@ export default class WebrtcSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.webrtc.gatewayWebsocketUrlTitle'
- defaultMessage='Gateway Websocket URL:'
+ defaultMessage='Gateway WebSocket URL:'
/>
}
placeholder={Utils.localizeMessage('admin.webrtc.gatewayWebsocketUrlExample', 'Ex "wss://webrtc.mattermost.com:8189"')}
@@ -92,7 +92,7 @@ export default class WebrtcSettings extends AdminSettings {
<FormattedMessage
id='admin.webrtc.gatewayWebsocketUrlDescription'
defaultMessage='Enter wss://<mattermost-webrtc-gateway-url>:<port>. Make sure you use WS or WSS in your URL depending on your server configuration.
- This is the websocket used to signal and establish communication between the peers.'
+ This is the WebSocket used to signal and establish communication between the peers.'
/>
}
value={this.state.gatewayWebsocketUrl}