From cb281ac714309eb54bfe96de45756999c4658a3c Mon Sep 17 00:00:00 2001 From: enahum Date: Tue, 8 Nov 2016 13:47:33 -0300 Subject: Fix shortcuts string (#4468) --- i18n/en.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index 53a1939be..f03018e3c 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -629,11 +629,11 @@ }, { "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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n" + "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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n" + "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 channel beginning with [character]\n:[character]+TAB: Autocomplete emoji beginning with [character]\n\n" }, { "id": "api.command_shortcuts.name", -- cgit v1.2.3-1-g7c22 From 81b9c98075d945830c6fecabeffb66cfec2fda76 Mon Sep 17 00:00:00 2001 From: enahum Date: Fri, 11 Nov 2016 16:55:23 -0300 Subject: translations PR for 3.5 (#4511) --- i18n/en.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'i18n/en.json') diff --git a/i18n/en.json b/i18n/en.json index f03018e3c..1cb0f1dda 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1519,6 +1519,14 @@ "id": "api.server.stop_server.stopping.info", "translation": "Stopping Server..." }, + { + "id": "api.slackimport.slack_add_bot_user.email_pwd", + "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n" + }, + { + "id": "api.slackimport.slack_add_bot_user.unable_import", + "translation": "Unable to import Slack Bot/Integration Posts Import User: {{.Username}}\r\n" + }, { "id": "api.slackimport.slack_add_channels.added", "translation": "\r\n Channels Added \r\n" @@ -1607,14 +1615,6 @@ "id": "api.slackimport.slack_add_users.unable_import", "translation": "Unable to import user: {{.Username}}\r\n" }, - { - "id": "api.slackimport.slack_add_bot_user.email_pwd", - "translation": "Slack Bot/Integration Posts Import User: Email, Password: {{.Email}}, {{.Password}}\r\n" - }, - { - "id": "api.slackimport.slack_add_bot_user.unable_import", - "translation": "Unable to import Slack Bot/Integration Posts 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}}" -- cgit v1.2.3-1-g7c22