From 308ef8169690fd9ad947a7f1865b0f71c86df2ca Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 23 Aug 2016 20:03:08 -0300 Subject: daily translations 20160823 (#3864) --- i18n/en.json | 72 ++++++++++++++++++++++++++++++------------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index d026a6066..40486b58d 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -323,10 +323,18 @@ "id": "api.channel.remove_member.permissions.app_error", "translation": "You do not have the appropriate permissions " }, + { + "id": "api.channel.remove_member.removed", + "translation": "%v was removed from the channel." + }, { "id": "api.channel.remove_member.unable.app_error", "translation": "Unable to remove user." }, + { + "id": "api.channel.remove_member.user.app_error", + "translation": "Failed to find user to be removed" + }, { "id": "api.channel.remove_user_from_channel.deleted.app_error", "translation": "The channel has been archived or deleted" @@ -556,45 +564,45 @@ "translation": "Messaged user." }, { - "id": "api.command_shortcuts.desc", - "translation": "Displays a list of keyboard shortcuts" - }, - { - "id": "api.command_shortcuts.nav", - "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" - }, - { - "id": "api.command_shortcuts.files", - "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n" + "id": "api.command_shortcuts.browser", + "translation": "#### 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.msgs", - "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\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" + "id": "api.command_shortcuts.browser_mac", + "translation": "#### 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.browser", - "translation": "#### 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.desc", + "translation": "Displays a list of keyboard shortcuts" }, { - "id": "api.command_shortcuts.nav_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" + "id": "api.command_shortcuts.files", + "translation": "#### Files\n\nCTRL+U: Upload file(s)\n\n" }, { "id": "api.command_shortcuts.files_mac", "translation": "#### Files\n\nCMD+U: Upload file(s)\n\n" }, { - "id": "api.command_shortcuts.msgs_mac", - "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\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" + "id": "api.command_shortcuts.msgs", + "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\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" }, { - "id": "api.command_shortcuts.browser_mac", - "translation": "#### 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.msgs_mac", + "translation": "#### Messages\n\nESC: Mark all messages in the current channel as read\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" }, { "id": "api.command_shortcuts.name", "translation": "shortcuts" }, + { + "id": "api.command_shortcuts.nav", + "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" + }, + { + "id": "api.command_shortcuts.nav_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" + }, { "id": "api.command_shrug.desc", "translation": "Adds ¯\\_(ツ)_/¯ to your message" @@ -659,14 +667,14 @@ "id": "api.email_batching.add_notification_email_to_batch.disabled.app_error", "translation": "Email batching has been disabled by the system administrator" }, - { - "id": "api.email_batching.check_pending_emails.status.app_error", - "translation": "Unable to find status of recipient for batched email notification" - }, { "id": "api.email_batching.check_pending_emails.finished_running", "translation": "Email batching job ran. %v user(s) still have notifications pending." }, + { + "id": "api.email_batching.check_pending_emails.status.app_error", + "translation": "Unable to find status of recipient for batched email notification" + }, { "id": "api.email_batching.render_batched_post.channel.app_error", "translation": "Unable to find channel of post for batched email notification" @@ -1097,10 +1105,6 @@ "id": "api.post.create_post.bad_filename.error", "translation": "Bad filename discarded, filename=%v" }, - { - "id": "api.post.delete_flagged_post.app_error.warn", - "translation": "Unable to delete flagged post preference when deleting post, err=%v" - }, { "id": "api.post.create_post.channel_root_id.app_error", "translation": "Invalid ChannelId for RootId parameter" @@ -1121,6 +1125,10 @@ "id": "api.post.create_webhook_post.creating.app_error", "translation": "Error creating post" }, + { + "id": "api.post.delete_flagged_post.app_error.warn", + "translation": "Unable to delete flagged post preference when deleting post, err=%v" + }, { "id": "api.post.delete_post.permissions.app_error", "translation": "You do not have the appropriate permissions" @@ -4854,13 +4862,5 @@ { "id": "web.watcher_fail.error", "translation": "Failed to add directory to watcher %v" - }, - { - "id": "api.channel.remove_member.removed", - "translation": "%v was removed from the channel." - }, - { - "id": "api.channel.remove_member.user.app_error", - "translation": "Failed to find user to be removed" } ] -- cgit v1.2.3-1-g7c22