diff options
Diffstat (limited to 'webapp/components')
6 files changed, 8 insertions, 8 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} diff --git a/webapp/components/analytics/system_analytics.jsx b/webapp/components/analytics/system_analytics.jsx index 2b4b5b48f..a50a33812 100644 --- a/webapp/components/analytics/system_analytics.jsx +++ b/webapp/components/analytics/system_analytics.jsx @@ -137,7 +137,7 @@ class SystemAnalytics extends React.Component { title={ <FormattedMessage id='analytics.system.totalWebsockets' - defaultMessage='Websocket Conns' + defaultMessage='WebSocket Conns' /> } icon='fa-user' diff --git a/webapp/components/audit_table.jsx b/webapp/components/audit_table.jsx index 8638910a2..c70c659d4 100644 --- a/webapp/components/audit_table.jsx +++ b/webapp/components/audit_table.jsx @@ -98,7 +98,7 @@ const holders = defineMessages({ }, failedPassword: { id: 'audit_table.failedPassword', - defaultMessage: 'Failed to change password - tried to update user password who was logged in through oauth' + defaultMessage: 'Failed to change password - tried to update user password who was logged in through OAuth' }, updatedRol: { id: 'audit_table.updatedRol', diff --git a/webapp/components/help/components/commands.jsx b/webapp/components/help/components/commands.jsx index 81d24517e..b59847f0d 100644 --- a/webapp/components/help/components/commands.jsx +++ b/webapp/components/help/components/commands.jsx @@ -17,7 +17,7 @@ export default class HelpCommands extends React.Component { message.push(''); message.push(localizeMessage('help.commands.builtin2', 'Begin by typing `/` and a list of slash command options appears above the text input box. The autocomplete suggestions help by providing a format example in black text and a short description of the slash command in grey text.')); message.push(''); - message.push(localizeMessage('help.commands.custom', '## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forcast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.')); + message.push(localizeMessage('help.commands.custom', '## Custom Commands\nCustom slash commands integrate with external applications. For example, a team might configure a custom slash command to check internal health records with `/patient joe smith` or check the weekly weather forecast in a city with `/weather toronto week`. Check with your System Admin or open the autocomplete list by typing `/` to determine if your team configured any custom slash commands.')); message.push(localizeMessage('help.commands.custom2', 'Custom slash commands are disabled by default and can be enabled by the System Admin in the **System Console** > **Integrations** > **Webhooks and Commands**. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).')); return ( |