summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
diff options
context:
space:
mode:
authorGeorge Goldberg <george@grundleborg.com>2016-08-29 14:45:27 +0100
committerChristopher Speller <crspeller@gmail.com>2016-08-29 09:45:27 -0400
commit55342e8fe16613f06528ed1aa726231e9b597d26 (patch)
tree121b217caed1dcb1280af16fe58d5453992db760 /webapp/i18n/en.json
parent00e12f25c6bd4efec2461bb61687939070264370 (diff)
downloadchat-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 'webapp/i18n/en.json')
-rw-r--r--webapp/i18n/en.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index f78083c2f..71a903b5b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -1664,7 +1664,7 @@
"team_export_tab.unable": " Unable to export: {error}",
"team_import_tab.failure": " Import failure: ",
"team_import_tab.import": "Import",
- "team_import_tab.importHelp": "<p>To import a team from Slack go to Slack > Team Settings > Import/Export Data > Export > Start Export. Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.</p><p>The Slack import to Mattermost is in 'Beta'. Slack bot posts do not yet import and Slack @mentions are not currently supported.</p>",
+ "team_import_tab.importHelp": "<p>To import a team from Slack go to Slack > Team Settings > Import/Export Data > Export > Start Export. Slack does not allow you to export files, images, private groups or direct messages stored in Slack. Therefore, Slack import to Mattermost only supports importing of text messages in your Slack team's public channels.</p><p>The Slack import to Mattermost is in 'Beta'. Slack bot posts do not yet import.</p>",
"team_import_tab.importSlack": "Import from Slack (Beta)",
"team_import_tab.importing": " Importing...",
"team_import_tab.successful": " Import successful: ",