From f7476b2fb6a01d50868a128c1d1f77c14691482d Mon Sep 17 00:00:00 2001 From: George Goldberg Date: Thu, 26 Jan 2017 02:14:12 +0000 Subject: PLT-4378 Slack import when channel name is deleted (#4649) This fixes the issue where the channel fails to Import from Slack if there is already a channel with the same name on Mattermost that has been deleted. --- i18n/en.json | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'i18n') diff --git a/i18n/en.json b/i18n/en.json index aca8fb9d0..6cc82bf37 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -4315,6 +4315,14 @@ "id": "store.sql_channel.get_channels.not_found.app_error", "translation": "No channels were found" }, + { + "id": "store.sql_channel.get_deleted_by_name.existing.app_error", + "translation": "We couldn't find the existing deleted channel" + }, + { + "id": "store.sql_channel.get_deleted_by_name.missing.app_error", + "translation": "No deleted channel exists with that name" + }, { "id": "store.sql_channel.get_extra_members.app_error", "translation": "We couldn't get the extra info for channel members" -- cgit v1.2.3-1-g7c22