From be0ae364223efb1c32a8a1815583663071f255c5 Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Mon, 28 Nov 2016 15:39:06 +0000 Subject: Fix failure to import same Slack archive to 2 teams. (#4650) This fixes the issue where you can't import 2 Slack exports with any users who's emails appear in both exports onto different teams of the same server. Fixes #4126 --- i18n/en.json | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'i18n') diff --git a/i18n/en.json b/i18n/en.json index 10652ba72..1cf41377e 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1643,6 +1643,10 @@ "id": "api.slackimport.slack_add_users.merge_existing", "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n" }, + { + "id": "api.slackimport.slack_add_users.merge_existing_failed", + "translation": "Tried to merge user with existing account: {{.Email}}, {{.Username}}, but failed to add the user to this team.\r\n" + }, { "id": "api.slackimport.slack_add_users.unable_import", "translation": "Unable to import user: {{.Username}}\r\n" -- cgit v1.2.3-1-g7c22