diff options
| -rw-r--r-- | i18n/en.json | 138 | ||||
| -rw-r--r-- | utils/lru.go | 2 | ||||
| -rw-r--r-- | utils/lru_test.go | 2 | ||||
| -rw-r--r-- | webapp/components/admin_console/connection_security_dropdown_setting.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/admin_console/developer_settings.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/admin_console/webrtc_settings.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/analytics/system_analytics.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/audit_table.jsx | 2 | ||||
| -rw-r--r-- | webapp/components/help/components/commands.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 16 | ||||
| -rw-r--r-- | webapp/root.jsx | 2 |
11 files changed, 88 insertions, 88 deletions
diff --git a/i18n/en.json b/i18n/en.json index 97301da44..6d363b007 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -73,7 +73,7 @@ }, { "id": "api.admin.init.debug", - "translation": "Initializing admin api routes" + "translation": "Initializing admin API routes" }, { "id": "api.admin.recycle_db_end.warn", @@ -197,7 +197,7 @@ }, { "id": "api.channel.create_channel.direct_channel.app_error", - "translation": "Must use createDirectChannel api service for direct message channel creation" + "translation": "Must use createDirectChannel API service for direct message channel creation" }, { "id": "api.channel.create_channel.invalid_character.app_error", @@ -217,7 +217,7 @@ }, { "id": "api.channel.create_direct_channel.invalid_user.app_error", - "translation": "Invalid other user id " + "translation": "Invalid other user ID " }, { "id": "api.channel.delete_channel.archived", @@ -273,7 +273,7 @@ }, { "id": "api.channel.init.debug", - "translation": "Initializing channel api routes" + "translation": "Initializing channel API routes" }, { "id": "api.channel.join_channel.permissions.app_error", @@ -381,7 +381,7 @@ }, { "id": "api.command.delete.app_error", - "translation": "Inappropriate permissions to delete command" + "translation": "Invalid permissions to delete command" }, { "id": "api.command.disabled.app_error", @@ -421,7 +421,7 @@ }, { "id": "api.command.init.debug", - "translation": "Initializing command api routes" + "translation": "Initializing command API routes" }, { "id": "api.command.invite_people.desc", @@ -453,7 +453,7 @@ }, { "id": "api.command.regen.app_error", - "translation": "Inappropriate permissions to regenerate command token" + "translation": "Invalid permissions to regenerate command token" }, { "id": "api.command.team_mismatch.app_error", @@ -461,7 +461,7 @@ }, { "id": "api.command.update.app_error", - "translation": "Inappropriate permissions to update command" + "translation": "Invalid permissions to update command" }, { "id": "api.command_away.desc", @@ -529,7 +529,7 @@ }, { "id": "api.command_expand_collapse.fail.app_error", - "translation": "An error occured while expanding previews" + "translation": "An error occurred while expanding previews" }, { "id": "api.command_join.desc", @@ -537,7 +537,7 @@ }, { "id": "api.command_join.fail.app_error", - "translation": "An error occured while joining the channel." + "translation": "An error occurred while joining the channel." }, { "id": "api.command_join.hint", @@ -545,7 +545,7 @@ }, { "id": "api.command_join.list.app_error", - "translation": "An error occured while listing channels." + "translation": "An error occurred while listing channels." }, { "id": "api.command_join.missing.app_error", @@ -593,11 +593,11 @@ }, { "id": "api.command_msg.dm_fail.app_error", - "translation": "An error occured while creating the direct message." + "translation": "An error occurred while creating the direct message." }, { "id": "api.command_msg.fail.app_error", - "translation": "An error occured while messaging the user." + "translation": "An error occurred while messaging the user." }, { "id": "api.command_msg.hint", @@ -605,7 +605,7 @@ }, { "id": "api.command_msg.list.app_error", - "translation": "An error occured while listing users." + "translation": "An error occurred while listing users." }, { "id": "api.command_msg.missing.app_error", @@ -705,7 +705,7 @@ }, { "id": "api.context.invalid_team_url.debug", - "translation": "TeamURL accessed when not valid. Team URL should not be used in api functions or those that are team independent" + "translation": "Team URL accessed when not valid. Team URL should not be used in API functions or those that are team independent" }, { "id": "api.context.invalid_token.error", @@ -827,7 +827,7 @@ }, { "id": "api.emoji.create.permissions.app_error", - "translation": "Inappropriate permissions to create emoji." + "translation": "Invalid permissions to create emoji." }, { "id": "api.emoji.create.too_large.app_error", @@ -839,7 +839,7 @@ }, { "id": "api.emoji.delete.permissions.app_error", - "translation": "Inappropriate permissions to delete emoji." + "translation": "Invalid permissions to delete emoji." }, { "id": "api.emoji.disabled.app_error", @@ -855,7 +855,7 @@ }, { "id": "api.emoji.init.debug", - "translation": "Initializing emoji api routes" + "translation": "Initializing emoji API routes" }, { "id": "api.emoji.storage.app_error", @@ -943,7 +943,7 @@ }, { "id": "api.file.init.debug", - "translation": "Initializing file api routes" + "translation": "Initializing file API routes" }, { "id": "api.file.migrate_filenames_to_file_infos.channel.app_error", @@ -1075,7 +1075,7 @@ }, { "id": "api.general.init.debug", - "translation": "Initializing general api routes" + "translation": "Initializing general API routes" }, { "id": "api.import.import_post.saving.debug", @@ -1135,7 +1135,7 @@ }, { "id": "api.license.init.debug", - "translation": "Initializing license api routes" + "translation": "Initializing license API routes" }, { "id": "api.license.remove_license.remove.app_error", @@ -1179,7 +1179,7 @@ }, { "id": "api.oauth.delete.permissions.app_error", - "translation": "Inappropriate permissions to delete the OAuth2 App" + "translation": "Invalid permissions to delete the OAuth2 App" }, { "id": "api.oauth.get_access_token.bad_client_id.app_error", @@ -1243,11 +1243,11 @@ }, { "id": "api.oauth.init.debug", - "translation": "Initializing oauth api routes" + "translation": "Initializing OAuth API routes" }, { "id": "api.oauth.regenerate_secret.app_error", - "translation": "Inappropriate permissions to regenerate the OAuth2 App Secret" + "translation": "Invalid permissions to regenerate the OAuth2 App Secret" }, { "id": "api.oauth.register_oauth_app.turn_off.app_error", @@ -1401,7 +1401,7 @@ }, { "id": "api.post.init.debug", - "translation": "Initializing post api routes" + "translation": "Initializing post API routes" }, { "id": "api.post.make_direct_channel_visible.get_2_members.error", @@ -1533,7 +1533,7 @@ }, { "id": "api.preference.init.debug", - "translation": "Initializing preference api routes" + "translation": "Initializing preference API routes" }, { "id": "api.preference.save_preferences.decode.app_error", @@ -1549,7 +1549,7 @@ }, { "id": "api.reaction.delete_reaction.mismatched_channel_id.app_error", - "translation": "Failed to delete reaction when channel id in URL doesn't match post id in URL" + "translation": "Failed to delete reaction because channel ID does not match post ID in the URL" }, { "id": "api.reaction.init.debug", @@ -1557,11 +1557,11 @@ }, { "id": "api.reaction.list_reactions.mismatched_channel_id.app_error", - "translation": "Failed to get reactions when channel id in URL doesn't match post id in URL" + "translation": "Failed to get reactions because channel ID does not match post ID in the URL" }, { "id": "api.reaction.save_reaction.mismatched_channel_id.app_error", - "translation": "Failed to save reaction when channel id in URL doesn't match post id in URL" + "translation": "Failed to save reaction because channel ID does not match post ID in the URL" }, { "id": "api.reaction.send_reaction_event.post.app_error", @@ -1789,7 +1789,7 @@ }, { "id": "api.status.init.debug", - "translation": "Initializing status api routes" + "translation": "Initializing status API routes" }, { "id": "api.status.last_activity.error", @@ -1853,11 +1853,11 @@ }, { "id": "api.team.import_team.unavailable.app_error", - "translation": "Filesize unavilable" + "translation": "Malformed request: filesize field is not present." }, { "id": "api.team.init.debug", - "translation": "Initializing team api routes" + "translation": "Initializing team API routes" }, { "id": "api.team.invite_members.admin", @@ -2321,7 +2321,7 @@ }, { "id": "api.user.init.debug", - "translation": "Initializing user api routes" + "translation": "Initializing user API routes" }, { "id": "api.user.ldap_to_email.not_available.app_error", @@ -2345,7 +2345,7 @@ }, { "id": "api.user.login.not_provided.app_error", - "translation": "Either user id or team name and user email must be provided" + "translation": "Must provide either user ID, or team name and user email" }, { "id": "api.user.login.not_verified.app_error", @@ -2581,7 +2581,7 @@ }, { "id": "api.web_socket.init.debug", - "translation": "Initializing web socket api routes" + "translation": "Initializing web socket API routes" }, { "id": "api.web_socket_handler.log.error", @@ -2613,7 +2613,7 @@ }, { "id": "api.webhook.create_outgoing.permissions.app_error", - "translation": "Inappropriate permissions to create outcoming webhook." + "translation": "Invalid permissions to create outgoing webhook." }, { "id": "api.webhook.create_outgoing.triggers.app_error", @@ -2625,7 +2625,7 @@ }, { "id": "api.webhook.delete_incoming.permissions.app_errror", - "translation": "Inappropriate permissions to delete incoming webhook" + "translation": "Invalid permissions to delete incoming webhook" }, { "id": "api.webhook.delete_outgoing.disabled.app_error", @@ -2633,7 +2633,7 @@ }, { "id": "api.webhook.delete_outgoing.permissions.app_error", - "translation": "Inappropriate permissions to delete outcoming webhook" + "translation": "Invalid permissions to delete outcoming webhook" }, { "id": "api.webhook.get_incoming.disabled.app_error", @@ -2653,7 +2653,7 @@ }, { "id": "api.webhook.init.debug", - "translation": "Initializing webhook api routes" + "translation": "Initializing webhook API routes" }, { "id": "api.webhook.regen_outgoing_token.disabled.app_error", @@ -2661,7 +2661,7 @@ }, { "id": "api.webhook.regen_outgoing_token.permissions.app_error", - "translation": "Inappropriate permissions to regenerate outcoming webhook token" + "translation": "Invalid permissions to regenerate outcoming webhook token" }, { "id": "api.webrtc.disabled.app_error", @@ -2669,7 +2669,7 @@ }, { "id": "api.webrtc.init.debug", - "translation": "Initializing WebRTC api routes" + "translation": "Initializing WebRTC API routes" }, { "id": "api.webrtc.register_token.app_error", @@ -2981,7 +2981,7 @@ }, { "id": "error.generic.message", - "translation": "An error has occoured." + "translation": "An error has occurred." }, { "id": "error.generic.title", @@ -3017,7 +3017,7 @@ }, { "id": "manaultesting.get_channel_id.no_found.debug", - "translation": "Could not find channel: %v, %v possibilites searched" + "translation": "Could not find channel: %v, %v possibilities searched" }, { "id": "manaultesting.get_channel_id.unable.debug", @@ -3037,7 +3037,7 @@ }, { "id": "manaultesting.manual_test.uid.debug", - "translation": "No uid in url" + "translation": "No uid in URL" }, { "id": "manaultesting.test_autolink.info", @@ -3249,7 +3249,7 @@ }, { "id": "model.command.is_valid.team_id.app_error", - "translation": "Invalid team id" + "translation": "Invalid team ID" }, { "id": "model.command.is_valid.token.app_error", @@ -3265,7 +3265,7 @@ }, { "id": "model.command.is_valid.url.app_error", - "translation": "Invalid url" + "translation": "Invalid URL" }, { "id": "model.command.is_valid.url_http.app_error", @@ -3533,15 +3533,15 @@ }, { "id": "model.config.is_valid.webrtc_gateway_admin_url.app_error", - "translation": "WebRTC Gateway Admin Url must be set a valid URL and start with http:// or https://." + "translation": "WebRTC Gateway Admin URL must be a valid URL starting with http:// or https://." }, { "id": "model.config.is_valid.webrtc_gateway_ws_url.app_error", - "translation": "WebRTC Gateway Websocket Url must be a valid URL and start with ws:// or wss://." + "translation": "WebRTC Gateway Websocket URL must be a valid URL starting with ws:// or wss://." }, { "id": "model.config.is_valid.webrtc_stun_uri.app_error", - "translation": "WebRTC STUN URI must be a valid URI and start with stun:" + "translation": "WebRTC STUN URI must be a valid URL starting with stun:" }, { "id": "model.config.is_valid.webrtc_turn_shared_key.app_error", @@ -3609,7 +3609,7 @@ }, { "id": "model.incoming_hook.team_id.app_error", - "translation": "Invalid team id" + "translation": "Invalid team ID" }, { "id": "model.incoming_hook.update_at.app_error", @@ -3661,7 +3661,7 @@ }, { "id": "model.outgoing_hook.is_valid.callback.app_error", - "translation": "Invalid callback urls" + "translation": "Invalid callback URLs" }, { "id": "model.outgoing_hook.is_valid.channel_id.app_error", @@ -3685,7 +3685,7 @@ }, { "id": "model.outgoing_hook.is_valid.team_id.app_error", - "translation": "Invalid team id" + "translation": "Invalid team ID" }, { "id": "model.outgoing_hook.is_valid.token.app_error", @@ -3757,7 +3757,7 @@ }, { "id": "model.post.is_valid.root_parent.app_error", - "translation": "Invalid root id must be set if parent id set" + "translation": "Invalid root ID must be set if parent ID set" }, { "id": "model.post.is_valid.type.app_error", @@ -3861,7 +3861,7 @@ }, { "id": "model.team_member.is_valid.team_id.app_error", - "translation": "Invalid team id" + "translation": "Invalid team ID" }, { "id": "model.team_member.is_valid.user_id.app_error", @@ -3973,7 +3973,7 @@ }, { "id": "model.user.is_valid.team_id.app_error", - "translation": "Invalid team id" + "translation": "Invalid team ID" }, { "id": "model.user.is_valid.update_at.app_error", @@ -4065,19 +4065,19 @@ }, { "id": "store.sql.open_conn.critical", - "translation": "Failed to open sql connection to err:%v" + "translation": "Failed to open SQL connection to err:%v" }, { "id": "store.sql.open_conn.panic", - "translation": "Failed to open sql connection %v" + "translation": "Failed to open SQL connection %v" }, { "id": "store.sql.ping.critical", - "translation": "Failed to ping db err:%v" + "translation": "Failed to ping DB err:%v" }, { "id": "store.sql.pinging.info", - "translation": "Pinging sql %v database" + "translation": "Pinging SQL %v database" }, { "id": "store.sql.read_replicas_not_licensed.critical", @@ -4213,7 +4213,7 @@ }, { "id": "store.sql_channel.get_member.missing.app_error", - "translation": "No channel member found for that user id and channel id" + "translation": "No channel member found for that user ID and channel ID" }, { "id": "store.sql_channel.get_member_count.app_error", @@ -4265,7 +4265,7 @@ }, { "id": "store.sql_channel.save_channel.existing.app_error", - "translation": "Must call update for exisiting channel" + "translation": "Must call update for existing channel" }, { "id": "store.sql_channel.save_channel.exists.app_error", @@ -4305,7 +4305,7 @@ }, { "id": "store.sql_channel.save_member.exists.app_error", - "translation": "A channel member with that id already exists" + "translation": "A channel member with that ID already exists" }, { "id": "store.sql_channel.save_member.open_transaction.app_error", @@ -4517,7 +4517,7 @@ }, { "id": "store.sql_oauth.save_app.existing.app_error", - "translation": "Must call update for exisiting app" + "translation": "Must call update for existing app" }, { "id": "store.sql_oauth.save_app.save.app_error", @@ -4873,7 +4873,7 @@ }, { "id": "store.sql_team.get_member.missing.app_error", - "translation": "No team member found for that user id and team id" + "translation": "No team member found for that user ID and team ID" }, { "id": "store.sql_team.get_member_count.app_error", @@ -4913,11 +4913,11 @@ }, { "id": "store.sql_team.save.existing.app_error", - "translation": "Must call update for exisiting team" + "translation": "Must call update for existing team" }, { "id": "store.sql_team.save_member.exists.app_error", - "translation": "A team member with that id already exists" + "translation": "A team member with that ID already exists" }, { "id": "store.sql_team.save_member.save.app_error", @@ -5029,7 +5029,7 @@ }, { "id": "store.sql_user.save.existing.app_error", - "translation": "Must call update for exisiting user" + "translation": "Must call update for existing user" }, { "id": "store.sql_user.save.max_accounts.app_error", @@ -5277,7 +5277,7 @@ }, { "id": "utils.mail.send_mail.msg_data.app_error", - "translation": "Failed to add email messsage data" + "translation": "Failed to add email message data" }, { "id": "utils.mail.send_mail.sending.debug", @@ -5305,7 +5305,7 @@ }, { "id": "web.check_browser_compatibility.app_error", - "translation": "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, FireFox 14 or higher, Safari 9 or higher" + "translation": "Your current browser is not supported, please upgrade to one of the following browsers: Google Chrome 21 or higher, Internet Explorer 11 or higher, Firefox 14 or higher, Safari 9 or higher" }, { "id": "web.claim_account.team.error", diff --git a/utils/lru.go b/utils/lru.go index f5f7959d8..41ba72d71 100644 --- a/utils/lru.go +++ b/utils/lru.go @@ -68,7 +68,7 @@ func (c *Cache) Add(key, value interface{}) bool { return c.AddWithExpiresInSecs(key, value, 0) } -// Add adds a value to the cache. Returns true if an eviction occured. +// Add adds a value to the cache. Returns true if an eviction occurred. func (c *Cache) AddWithExpiresInSecs(key, value interface{}, expireAtSecs int64) bool { c.lock.Lock() defer c.lock.Unlock() diff --git a/utils/lru_test.go b/utils/lru_test.go index 3255f5c1a..ab7d0e50a 100644 --- a/utils/lru_test.go +++ b/utils/lru_test.go @@ -73,7 +73,7 @@ func TestLRU(t *testing.T) { } } -// test that Add return true/false if an eviction occured +// test that Add return true/false if an eviction occurred func TestLRUAdd(t *testing.T) { evictCounter := 0 onEvicted := func(k interface{}, v interface{}) { 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 ( diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 5dcff8fe3..733c72560 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -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___", diff --git a/webapp/root.jsx b/webapp/root.jsx index 1a085dae1..b8fa4e6a2 100644 --- a/webapp/root.jsx +++ b/webapp/root.jsx @@ -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(); } }; |