summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2016-04-28 16:29:13 -0400
committerJoram Wilander <jwawilander@gmail.com>2016-04-28 16:29:13 -0400
commitf3fa435a1b35c2ada4cd9a81744a41904fe97909 (patch)
tree4044a07b7c7345084e4543282f165d4c5e716f80 /i18n/en.json
parent938caa061d4f5aad00133926c86d3d6f4485b3a2 (diff)
downloadchat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.tar.gz
chat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.tar.bz2
chat-f3fa435a1b35c2ada4cd9a81744a41904fe97909.zip
Fixing slack import. (#2819)
Diffstat (limited to 'i18n/en.json')
-rw-r--r--i18n/en.json12
1 files changed, 12 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index e8e20a12a..5cc2ec9f6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -668,6 +668,10 @@
"translation": "Failed to set email verified err=%v"
},
{
+ "id": "api.import.import_user.join_team.error",
+ "translation": "Failed to join team when importing err=%v"
+ },
+ {
"id": "api.license.add_license.array.app_error",
"translation": "Empty array under 'license' in request"
},
@@ -996,6 +1000,10 @@
"translation": "Merged with existing channel: {{.DisplayName}}\r\n"
},
{
+ "id": "api.slackimport.slack_add_channels.failed_to_add_user",
+ "translation": "Failed to add user to channel: {{.Username}}\r\n"
+ },
+ {
"id": "api.slackimport.slack_add_posts.bot.warn",
"translation": "Slack bot posts are not imported yet"
},
@@ -1036,6 +1044,10 @@
"translation": "Mattermost Slack Import Log\r\n"
},
{
+ "id": "api.slackimport.slack_import.team_fail",
+ "translation": "Failed to get team to import into.\r\n"
+ },
+ {
"id": "api.slackimport.slack_import.note1",
"translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n"
},