diff options
author | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2016-04-28 17:03:59 -0700 |
commit | 62901defaebb8f3524bdfcad86b2576cfd9fe587 (patch) | |
tree | b0740451c56c68c5284834fd02bbce4d831acc17 /i18n/en.json | |
parent | ad9dfc9c42b6597515d9eb0a96e9f069372dffdd (diff) | |
parent | f3fa435a1b35c2ada4cd9a81744a41904fe97909 (diff) | |
download | chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.gz chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.tar.bz2 chat-62901defaebb8f3524bdfcad86b2576cfd9fe587.zip |
Merge branch 'master' of https://github.com/mattermost/platform
Diffstat (limited to 'i18n/en.json')
-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 4b67d8c78..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" }, @@ -2852,6 +2864,10 @@ "translation": "We couldn't get all the channels" }, { + "id": "store.sql_channel.get_member.missing.app_error", + "translation": "No channel member found for that user id and channel id" + }, + { "id": "store.sql_channel.get_member.app_error", "translation": "We couldn't get the channel member" }, |