diff options
| author | George Goldberg <george@grundleborg.com> | 2016-08-29 14:45:27 +0100 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2016-08-29 09:45:27 -0400 |
| commit | 55342e8fe16613f06528ed1aa726231e9b597d26 (patch) | |
| tree | 121b217caed1dcb1280af16fe58d5453992db760 /i18n/en.json | |
| parent | 00e12f25c6bd4efec2461bb61687939070264370 (diff) | |
| download | chat-55342e8fe16613f06528ed1aa726231e9b597d26.tar.gz chat-55342e8fe16613f06528ed1aa726231e9b597d26.tar.bz2 chat-55342e8fe16613f06528ed1aa726231e9b597d26.zip | |
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.
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 2f496d92b..0f1e4e215 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1420,6 +1420,10 @@ "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" }, |