summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorGeorge Goldberg <george@gberg.me>2017-01-26 02:14:12 +0000
committerenahum <nahumhbl@gmail.com>2017-01-25 23:14:12 -0300
commitf7476b2fb6a01d50868a128c1d1f77c14691482d (patch)
tree211398e395f42f60f866b791cc005eb1dcc2959d /i18n
parent57d9d0ad1ee3e841640d74fcb122516bce8efd9a (diff)
downloadchat-f7476b2fb6a01d50868a128c1d1f77c14691482d.tar.gz
chat-f7476b2fb6a01d50868a128c1d1f77c14691482d.tar.bz2
chat-f7476b2fb6a01d50868a128c1d1f77c14691482d.zip
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.
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json8
1 files changed, 8 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index aca8fb9d0..6cc82bf37 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -4316,6 +4316,14 @@
"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"
},