From 55342e8fe16613f06528ed1aa726231e9b597d26 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@grundleborg.com>
Date: Mon, 29 Aug 2016 14:45:27 +0100
Subject: Convert @mentions on Slack import. (#3837)

Converts @mentions in Slack imports for regular messages, comments and
Slack upload messages.

Updates the description on the Team Settings Import tab to remove
mention of @mentions not importing.
---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n')

diff --git a/i18n/en.json b/i18n/en.json
index 2f496d92b..0f1e4e215 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1419,6 +1419,10 @@
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Bad timestamp detected"
   },
+  {
+    "id": "api.slackimport.slack_convert_user_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
+  },
   {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
-- 
cgit v1.2.3-1-g7c22