diff options
author | Christopher Speller <crspeller@gmail.com> | 2016-09-12 11:57:36 -0400 |
---|---|---|
committer | Joram Wilander <jwawilander@gmail.com> | 2016-09-12 11:57:36 -0400 |
commit | adfcda48022aa8df33e5824903c15f7b9624f963 (patch) | |
tree | de8ce01f30bf7781d6bd452bc2b17f639bec35a1 /i18n | |
parent | 6d21dab4210678ad9305bba5ab4a341267fc29fa (diff) | |
download | chat-adfcda48022aa8df33e5824903c15f7b9624f963.tar.gz chat-adfcda48022aa8df33e5824903c15f7b9624f963.tar.bz2 chat-adfcda48022aa8df33e5824903c15f7b9624f963.zip |
Some improvments to slack import (#4010)
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index e9594b5e3..32f55a6df 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1424,6 +1424,14 @@ "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" }, @@ -1468,6 +1476,10 @@ "translation": "Email, Password: {{.Email}}, {{.Password}}\r\n" }, { + "id": "api.slackimport.slack_add_users.merge_existing", + "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n" + }, + { "id": "api.slackimport.slack_add_users.unable_import", "translation": "Unable to import user: {{.Username}}\r\n" }, @@ -1492,6 +1504,10 @@ "translation": "- Slack bot posts are currently not supported.\r\n" }, { + "id": "api.slackimport.slack_import.note3", + "translation": "- Additional errors may be found in the server logs.\r\n" + }, + { "id": "api.slackimport.slack_import.notes", "translation": "\r\n Notes \r\n" }, |