Commit aa8d590f authored by Pierre Rudloff's avatar Pierre Rudloff Committed by enahum
Browse files

Fix some typos in the English locale (fixes #4663) (#4793)

parent 1b857323
......@@ -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>
......
......@@ -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}
......
......@@ -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}
......
......@@ -137,7 +137,7 @@ class SystemAnalytics extends React.Component {
title={
<FormattedMessage
id='analytics.system.totalWebsockets'
defaultMessage='Websocket Conns'
defaultMessage='WebSocket Conns'
/>
}
icon='fa-user'
......
......@@ -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',
......
......@@ -17,7 +17,7 @@ export default class HelpCommands extends React.Component {
message.push('![commands](https://docs.mattermost.com/_images/slashCommandsTable1.PNG)');
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('![autocomplete](https://docs.mattermost.com/_images/slashCommandsAutocomplete.PNG)');
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 (
......
......@@ -199,9 +199,9 @@
"admin.compliance_table.type": "Type",
"admin.compliance_table.userId": "Requested By",
"admin.connectionSecurityNone": "None",
"admin.connectionSecurityNoneDescription": "Mattermost will connect over an unsecure connection.",
"admin.connectionSecurityNoneDescription": "Mattermost will connect over an insecure connection.",
"admin.connectionSecurityPlain": "PLAIN",
"admin.connectionSecurityPlainDescription": "Mattermost will connect and authenticate over an unsecure connection.",
"admin.connectionSecurityPlainDescription": "Mattermost will connect and authenticate over an insecure connection.",
"admin.connectionSecurityStart": "STARTTLS",
"admin.connectionSecurityStartDescription": "Takes an existing insecure connection and attempts to upgrade it to a secure connection using TLS.",
"admin.connectionSecurityTest": "Test Connection",
......@@ -657,7 +657,7 @@
"admin.service.corsDescription": "Enable HTTP Cross origin request from a specific domain. Use \"*\" if you want to allow CORS from any domain or leave it blank to disable it.",
"admin.service.corsEx": "http://example.com",
"admin.service.corsTitle": "Enable cross-origin requests from:",
"admin.service.developerDesc": "When true, Javascript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
"admin.service.developerDesc": "When true, JavaScript errors are shown in a red bar at the top of the user interface. Not recommended for use in production. ",
"admin.service.developerTitle": "Enable Developer Mode: ",
"admin.service.enforcMfaTitle": "Enforce Multi-factor Authentication:",
"admin.service.enforceMfaDesc": "When true, users on the system will be required to set up [multi-factor authentication]. Any logged in users will be redirected to the multi-factor authentication setup page until they successfully add MFA to their account.<br/><br/>It is recommended you turn on enforcement during non-peak hours, when people are less likely to be using the system. New users will be required to set up multi-factor authentication when they first sign up. After set up, users will not be able to remove multi-factor authentication unless enforcement is disabled.<br/><br/>Please note that multi-factor authentication is only available for accounts with LDAP and email login methods. Mattermost will not enforce multi-factor authentication for other login methods. If there are users on your system using other login methods, it is recommended you set up and enforce multi-factor authentication directly with the SSO or SAML provider.",
......@@ -881,9 +881,9 @@
"admin.webrtc.gatewayAdminUrlDescription": "Enter https://<mattermost-webrtc-gateway-url>:<port>/admin. Make sure you use HTTP or HTTPS in your URL depending on your server configuration. Mattermost WebRTC uses this URL to obtain valid tokens for each peer to establish the connection.",
"admin.webrtc.gatewayAdminUrlExample": "E.g.: \"https://webrtc.mattermost.com:7089/admin\"",
"admin.webrtc.gatewayAdminUrlTitle": "Gateway Admin URL:",
"admin.webrtc.gatewayWebsocketUrlDescription": "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.",
"admin.webrtc.gatewayWebsocketUrlDescription": "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.",
"admin.webrtc.gatewayWebsocketUrlExample": "E.g.: \"wss://webrtc.mattermost.com:8189\"",
"admin.webrtc.gatewayWebsocketUrlTitle": "Gateway Websocket URL:",
"admin.webrtc.gatewayWebsocketUrlTitle": "Gateway WebSocket URL:",
"admin.webrtc.stunUriDescription": "Enter your STUN URI as stun:<your-stun-url>:<port>. STUN is a standardized network protocol to allow an end host to assist devices to access its public IP address if it is located behind a NAT.",
"admin.webrtc.stunUriExample": "E.g.: \"stun:webrtc.mattermost.com:5349\"",
"admin.webrtc.stunUriTitle": "STUN URI",
......@@ -927,7 +927,7 @@
"analytics.system.totalSessions": "Total Sessions",
"analytics.system.totalTeams": "Total Teams",
"analytics.system.totalUsers": "Total Users",
"analytics.system.totalWebsockets": "Websocket Conns",
"analytics.system.totalWebsockets": "WebSocket Conns",
"analytics.team.activeUsers": "Active Users With Posts",
"analytics.team.newlyCreated": "Newly Created Users",
"analytics.team.privateGroups": "Private Groups",
......@@ -958,7 +958,7 @@
"audit_table.failedInvalidLicenseAdd": "Failed to add an invalid license",
"audit_table.failedLogin": "FAILED login attempt",
"audit_table.failedOAuthAccess": "Failed to allow a new OAuth service access - the redirect URI did not match the previously registered callback",
"audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through oauth",
"audit_table.failedPassword": "Failed to change password - tried to update user password who was logged in through OAuth",
"audit_table.failedWebhookCreate": "Failed to create a webhook - bad channel permissions",
"audit_table.failedWebhookDelete": "Failed to delete a webhook - inappropriate conditions",
"audit_table.headerUpdated": "Updated the {channelName} channel/group header",
......@@ -1323,7 +1323,7 @@
"help.attaching.title": "# Attaching Files\n_____",
"help.commands.builtin": "## Built-in Commands\nThe following slash commands are available on all Mattermost installations:",
"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.",
"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.",
"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.",
"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).",
"help.commands.intro": "Slash commands perform operations in Mattermost by typing into the text input box. Enter a `/` followed by a command and some arguments to perform actions.\n\nBuilt-in slash commands come with all Mattermost installations and custom slash commands are configurable to interact with external applications. Learn about configuring custom slash commands on the [developer slash command documentation page](http://docs.mattermost.com/developer/slash-commands.html).",
"help.commands.title": "# Executing Commands\n___",
......
......@@ -41,7 +41,7 @@ function preRenderSetup(callwhendone) {
});
if (window.mm_config && window.mm_config.EnableDeveloper === 'true') {
window.ErrorStore.storeLastError({type: 'developer', message: 'DEVELOPER MODE: A javascript error has occured. Please use the javascript console to capture and report the error (row: ' + line + ' col: ' + column + ').'});
window.ErrorStore.storeLastError({type: 'developer', message: 'DEVELOPER MODE: A JavaScript error has occurred. Please use the JavaScript console to capture and report the error (row: ' + line + ' col: ' + column + ').'});
window.ErrorStore.emitChange();
}
};
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment