From b9dc759449f11e0352f97164360cc400fbc112d8 Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 4 Oct 2016 15:37:05 -0300 Subject: translations PR 20160929 (#4123) --- i18n/en.json | 96 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 48 insertions(+), 48 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 2b5a1e095..d261a9fa6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -47,26 +47,6 @@ "id": "September", "translation": "September" }, - { - "id": "authentication.permissions.team_invite_user.name", - "translation": "Invite User" - }, - { - "id": "authentication.permissions.team_invite_user.description", - "translation": "Ability to invite users to a team" - }, - { - "id": "authentication.permissions.team_use_slash_commands.name", - "translation": "Use Slash Commands" - }, - { - "id": "authentication.permissions.team_use_slash_commands.description", - "translation": "Ability to use slash commands" - }, - { - "id": "api.auth.unable_to_get_user.app_error", - "translation": "Unable to get user to check permissions." - }, { "id": "api.admin.add_certificate.no_file.app_error", "translation": "No file under 'certificate' in request" @@ -163,6 +143,10 @@ "id": "api.api.render.error", "translation": "Error rendering template %v err=%v" }, + { + "id": "api.auth.unable_to_get_user.app_error", + "translation": "Unable to get user to check permissions." + }, { "id": "api.channel.add_member.added", "translation": "%v added to the channel by %v" @@ -1479,14 +1463,6 @@ "id": "api.server.start_server.listening.info", "translation": "Server is listening on %v" }, - { - "id": "api.server.start_server.rate_limiting_memory_store", - "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting." - }, - { - "id": "api.server.start_server.rate_limiting_memory_store", - "translation": "Unable to initalize rate limiting." - }, { "id": "api.server.start_server.rate.info", "translation": "RateLimiter is enabled" @@ -1495,6 +1471,14 @@ "id": "api.server.start_server.rate.warn", "translation": "RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr" }, + { + "id": "api.server.start_server.rate_limiting_memory_store", + "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting." + }, + { + "id": "api.server.start_server.rate_limiting_memory_store", + "translation": "Unable to initalize rate limiting." + }, { "id": "api.server.start_server.starting.critical", "translation": "Error starting server, err:%v" @@ -1519,14 +1503,6 @@ "id": "api.slackimport.slack_add_channels.added", "translation": "\r\n Channels Added \r\n" }, - { - "id": "api.slackimport.slack_parse_channels.error", - "translation": "Error parsing slack channels. Import may work anyway." - }, - { - "id": "api.slackimport.slack_parse_posts.error", - "translation": "Error parsing some slack posts. Import may work anyway." - }, { "id": "api.slackimport.slack_add_channels.failed_to_add_user", "translation": "Failed to add user to channel: {{.Username}}\r\n" @@ -1583,6 +1559,10 @@ "id": "api.slackimport.slack_add_users.unable_import", "translation": "Unable to import user: {{.Username}}\r\n" }, + { + "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn", + "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}" + }, { "id": "api.slackimport.slack_convert_timestamp.bad.warn", "translation": "Bad timestamp detected" @@ -1591,10 +1571,6 @@ "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn", "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}" }, - { - "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn", - "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}" - }, { "id": "api.slackimport.slack_import.log", "translation": "Mattermost Slack Import Log\r\n" @@ -1627,6 +1603,14 @@ "id": "api.slackimport.slack_import.zip.app_error", "translation": "Unable to open zip file" }, + { + "id": "api.slackimport.slack_parse_channels.error", + "translation": "Error parsing slack channels. Import may work anyway." + }, + { + "id": "api.slackimport.slack_parse_posts.error", + "translation": "Error parsing some slack posts. Import may work anyway." + }, { "id": "api.status.init.debug", "translation": "Initializing status api routes" @@ -1639,10 +1623,6 @@ "id": "api.status.save_status.error", "translation": "Failed to save status for user_id=%v, err=%v" }, - { - "id": "api.team.update_member_roles.not_a_member", - "translation": "Specified user is not a member of specified team." - }, { "id": "api.team.create_team.email_disabled.app_error", "translation": "Team sign-up with email is disabled." @@ -1759,6 +1739,10 @@ "id": "api.team.signup_team.email_disabled.app_error", "translation": "Team sign-up with email is disabled." }, + { + "id": "api.team.update_member_roles.not_a_member", + "translation": "Specified user is not a member of specified team." + }, { "id": "api.team.update_team.permissions.app_error", "translation": "You do not have the appropriate permissions" @@ -2491,6 +2475,22 @@ "id": "api.websocket_handler.invalid_param.app_error", "translation": "Invalid {{.Name}} parameter" }, + { + "id": "authentication.permissions.team_invite_user.description", + "translation": "Ability to invite users to a team" + }, + { + "id": "authentication.permissions.team_invite_user.name", + "translation": "Invite User" + }, + { + "id": "authentication.permissions.team_use_slash_commands.description", + "translation": "Ability to use slash commands" + }, + { + "id": "authentication.permissions.team_use_slash_commands.name", + "translation": "Use Slash Commands" + }, { "id": "cli.license.critical", "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license." @@ -3131,10 +3131,6 @@ "id": "model.config.is_valid.email_security.app_error", "translation": "Invalid connection security for email settings. Must be '', 'TLS', or 'STARTTLS'" }, - { - "id": "model.config.is_valid.max_burst.app_error", - "translation": "Maximum burst size must be greater than zero." - }, { "id": "model.config.is_valid.encrypt_sql.app_error", "translation": "Invalid at rest encrypt key for SQL settings. Must be 32 chars or more." @@ -3235,6 +3231,10 @@ "id": "model.config.is_valid.login_attempts.app_error", "translation": "Invalid maximum login attempts for service settings. Must be a positive number." }, + { + "id": "model.config.is_valid.max_burst.app_error", + "translation": "Maximum burst size must be greater than zero." + }, { "id": "model.config.is_valid.max_file_size.app_error", "translation": "Invalid max file size for file settings. Must be a zero or positive number." -- cgit v1.2.3-1-g7c22