diff options
author | enahum <nahumhbl@gmail.com> | 2016-07-19 08:34:22 -0400 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-07-19 08:34:22 -0400 |
commit | 2b0fcd378ce96277f393b89cac1a98d70e1c480f (patch) | |
tree | e4738ef559a196b7b039ae9e52e46fd279e9311f /i18n/en.json | |
parent | 40c47dcf0b85658198e369b7daf33302d26a3384 (diff) | |
download | chat-2b0fcd378ce96277f393b89cac1a98d70e1c480f.tar.gz chat-2b0fcd378ce96277f393b89cac1a98d70e1c480f.tar.bz2 chat-2b0fcd378ce96277f393b89cac1a98d70e1c480f.zip |
daily translations 20160718 (#3621)
Diffstat (limited to 'i18n/en.json')
-rw-r--r-- | i18n/en.json | 160 |
1 files changed, 80 insertions, 80 deletions
diff --git a/i18n/en.json b/i18n/en.json index f5e2f1e87..710b5d7ef 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -556,14 +556,14 @@ "translation": "Displays a list of keyboard shortcuts" }, { - "id": "api.command_shortcuts.list_mac", - "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n#### Files\n\nCMD+U: Upload file(s)\n\n#### Messages\n\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n" - }, - { "id": "api.command_shortcuts.list", "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCTRL+K: Open a quick channel switcher dialog\nCTRL+SHIFT+A: Open account settings\nCTRL+SHIFT+M: Open recent mentions\n\n#### Files\n\nCTRL+U: Upload file(s)\n\n#### Messages\n\nCTRL+UP (in empty input field): Reprint the previous message or slash command you entered\nCTRL+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n#### Built-in Browser Commands\n\nALT+LEFT: Previous channel in your history\nALT+RIGHT: Next channel in your history\nCTRL+PLUS: Increase font size (zoom in)\nCTRL+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n" }, { + "id": "api.command_shortcuts.list_mac", + "translation": "### Keyboard Shortcuts\n\n#### Navigation\n\nALT+UP: Previous channel or direct message in left hand sidebar\nALT+DOWN: Next channel or direct message in left hand sidebar\nALT+SHIFT+UP: Previous channel or direct message in left hand sidebar with unread messages\nALT+SHIFT+DOWN: Next channel or direct message in left hand sidebar with unread messages\nCMD+K: Open a quick channel switcher dialog\nCMD+SHIFT+A: Open account settings\nCMD+SHIFT+M: Open recent mentions\n\n#### Files\n\nCMD+U: Upload file(s)\n\n#### Messages\n\nCMD+UP (in empty input field): Reprint the previous message or slash command you entered\nCMD+DOWN (in empty input field): Reprint the next message or slash command you entered\nUP (in empty input field): Edit your last message in the current channel\n@[character]+TAB: Autocomplete @username beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n#### Built-in Browser Commands\n\nCMD+[: Previous channel in your history\nCMD+]: Next channel in your history\nCMD+PLUS: Increase font size (zoom in)\nCMD+MINUS: Decrease font size (zoom out)\nSHIFT+UP (in input field): Highlight text to the previous line\nSHIFT+DOWN (in input field): Highlight text to the next line\nSHIFT+ENTER (in input field): Create a new line\n" + }, + { "id": "api.command_shortcuts.name", "translation": "shortcuts" }, @@ -604,18 +604,6 @@ "translation": "%v:%v code=%v rid=%v uid=%v ip=%v %v [details: %v]" }, { - "id": "api.web_socket_router.log.error", - "translation": "websocket routing error: seq=%v uid=%v %v [details: %v]" - }, - { - "id": "api.web_socket_handler.log.error", - "translation": "%v:%v seq=%v uid=%v %v [details: %v]" - }, - { - "id": "api.websocket_handler.invalid_param.app_error", - "translation": "Invalid {{.Name}} parameter" - }, - { "id": "api.context.permissions.app_error", "translation": "You do not have the appropriate permissions" }, @@ -1256,6 +1244,14 @@ "translation": "Unable to open zip file" }, { + "id": "api.status.last_activity.error", + "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v" + }, + { + "id": "api.status.save_status.error", + "translation": "Failed to save status for user_id=%v, err=%v" + }, + { "id": "api.team.create_team.email_disabled.app_error", "translation": "Team sign-up with email is disabled." }, @@ -1984,14 +1980,6 @@ "translation": "Bad verify email link." }, { - "id": "api.status.last_activity.error", - "translation": "Failed to update LastActivityAt for user_id=%v and session_id=%v, err=%v" - }, - { - "id": "api.status.save_status.error", - "translation": "Failed to save status for user_id=%v, err=%v" - }, - { "id": "api.web_hub.start.stopping.debug", "translation": "stopping %v connections" }, @@ -2008,6 +1996,14 @@ "translation": "Initializing web socket api routes" }, { + "id": "api.web_socket_handler.log.error", + "translation": "%v:%v seq=%v uid=%v %v [details: %v]" + }, + { + "id": "api.web_socket_router.log.error", + "translation": "websocket routing error: seq=%v uid=%v %v [details: %v]" + }, + { "id": "api.web_team_hun.start.debug", "translation": "team hub stopping for teamId=%v" }, @@ -2080,6 +2076,10 @@ "translation": "Inappropriate permissions to regenerate outcoming webhook token" }, { + "id": "api.websocket_handler.invalid_param.app_error", + "translation": "Invalid {{.Name}} parameter" + }, + { "id": "cli.license.critical", "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license." }, @@ -2656,60 +2656,60 @@ "translation": "Invalid thumbnail width for file settings. Must be a positive number." }, { - "id": "model.config.is_valid.ldap_max_page_size.app_error", - "translation": "Invalid max page size value." + "id": "model.config.is_valid.ldap_basedn", + "translation": "LDAP field \"BaseDN\" is required." }, { - "id": "model.config.is_valid.ldap_required.app_error", - "translation": "Required LDAP field missing." + "id": "model.config.is_valid.ldap_bind_password", + "translation": "LDAP field \"Bind Password\" is required." }, { - "id": "model.config.is_valid.ldap_required.app_error", - "translation": "Required LDAP field missing." + "id": "model.config.is_valid.ldap_bind_username", + "translation": "LDAP field \"Bind Username\" is required." }, { - "id": "model.config.is_valid.ldap_security.app_error", - "translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'" + "id": "model.config.is_valid.ldap_email", + "translation": "LDAP field \"Email Attribute\" is required." }, { - "id": "model.config.is_valid.ldap_sync_interval.app_error", - "translation": "Invalid sync interval time. Must be at least one minute." + "id": "model.config.is_valid.ldap_firstname", + "translation": "LDAP field \"First Name Attribute\" is required." }, { - "id": "model.config.is_valid.ldap_server", - "translation": "LDAP field \"LDAP Server\" is required." + "id": "model.config.is_valid.ldap_id", + "translation": "LDAP field \"ID Attribute\" is required." }, { - "id": "model.config.is_valid.ldap_basedn", - "translation": "LDAP field \"BaseDN\" is required." + "id": "model.config.is_valid.ldap_lastname", + "translation": "LDAP field \"Last Name Attribute\" is required." }, { - "id": "model.config.is_valid.ldap_bind_username", - "translation": "LDAP field \"Bind Username\" is required." + "id": "model.config.is_valid.ldap_max_page_size.app_error", + "translation": "Invalid max page size value." }, { - "id": "model.config.is_valid.ldap_bind_password", - "translation": "LDAP field \"Bind Password\" is required." + "id": "model.config.is_valid.ldap_required.app_error", + "translation": "Required LDAP field missing." }, { - "id": "model.config.is_valid.ldap_firstname", - "translation": "LDAP field \"First Name Attribute\" is required." + "id": "model.config.is_valid.ldap_required.app_error", + "translation": "Required LDAP field missing." }, { - "id": "model.config.is_valid.ldap_lastname", - "translation": "LDAP field \"Last Name Attribute\" is required." + "id": "model.config.is_valid.ldap_security.app_error", + "translation": "Invalid connection security for LDAP settings. Must be '', 'TLS', or 'STARTTLS'" }, { - "id": "model.config.is_valid.ldap_email", - "translation": "LDAP field \"Email Attribute\" is required." + "id": "model.config.is_valid.ldap_server", + "translation": "LDAP field \"LDAP Server\" is required." }, { - "id": "model.config.is_valid.ldap_username", - "translation": "LDAP field \"Username Attribute\" is required." + "id": "model.config.is_valid.ldap_sync_interval.app_error", + "translation": "Invalid sync interval time. Must be at least one minute." }, { - "id": "model.config.is_valid.ldap_id", - "translation": "LDAP field \"ID Attribute\" is required." + "id": "model.config.is_valid.ldap_username", + "translation": "LDAP field \"Username Attribute\" is required." }, { "id": "model.config.is_valid.listen_address.app_error", @@ -3888,6 +3888,34 @@ "translation": "We couldn't update the roles" }, { + "id": "store.sql_status.get.app_error", + "translation": "Encountered an error retrieving the status" + }, + { + "id": "store.sql_status.get.missing.app_error", + "translation": "No entry for that status exists" + }, + { + "id": "store.sql_status.get_online_away.app_error", + "translation": "Encountered an error retrieving all the online/away statuses" + }, + { + "id": "store.sql_status.get_total_active_users_count.app_error", + "translation": "We could not count the active users" + }, + { + "id": "store.sql_status.reset_all.app_error", + "translation": "Encountered an error resetting all the statuses" + }, + { + "id": "store.sql_status.save.app_error", + "translation": "Encountered an error saving the status" + }, + { + "id": "store.sql_status.update.app_error", + "translation": "Encountered an error updating the status" + }, + { "id": "store.sql_system.get.app_error", "translation": "We encountered an error finding the system properties" }, @@ -4040,34 +4068,6 @@ "translation": "We encountered an error while finding user profiles" }, { - "id": "store.sql_status.get_total_active_users_count.app_error", - "translation": "We could not count the active users" - }, - { - "id": "store.sql_status.reset_all.app_error", - "translation": "Encountered an error resetting all the statuses" - }, - { - "id": "store.sql_status.get_online_away.app_error", - "translation": "Encountered an error retrieving all the online/away statuses" - }, - { - "id": "store.sql_status.get.app_error", - "translation": "Encountered an error retrieving the status" - }, - { - "id": "store.sql_status.get.missing.app_error", - "translation": "No entry for that status exists" - }, - { - "id": "store.sql_status.update.app_error", - "translation": "Encountered an error updating the status" - }, - { - "id": "store.sql_status.save.app_error", - "translation": "Encountered an error saving the status" - }, - { "id": "store.sql_user.get_total_users_count.app_error", "translation": "We could not count the users" }, |