From 383cddd3d14107fabea28e09f5f9401623cd19d5 Mon Sep 17 00:00:00 2001
From: Joram Wilander <jwawilander@gmail.com>
Date: Thu, 28 Apr 2016 10:56:19 -0400
Subject: Don't return error if already part of channel being joined (#2814)

---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 4b67d8c78..e8e20a12a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2851,6 +2851,10 @@
     "id": "store.sql_channel.get_for_export.app_error",
     "translation": "We couldn't get all the channels"
   },
+  {
+    "id": "store.sql_channel.get_member.missing.app_error",
+    "translation": "No channel member found for that user id and channel id"
+  },
   {
     "id": "store.sql_channel.get_member.app_error",
     "translation": "We couldn't get the channel member"
-- 
cgit v1.2.3-1-g7c22


From f3fa435a1b35c2ada4cd9a81744a41904fe97909 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Thu, 28 Apr 2016 16:29:13 -0400
Subject: Fixing slack import. (#2819)

---
 i18n/en.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index e8e20a12a..5cc2ec9f6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -667,6 +667,10 @@
     "id": "api.import.import_user.set_email.error",
     "translation": "Failed to set email verified err=%v"
   },
+  {
+    "id": "api.import.import_user.join_team.error",
+    "translation": "Failed to join team when importing err=%v"
+  },
   {
     "id": "api.license.add_license.array.app_error",
     "translation": "Empty array under 'license' in request"
@@ -995,6 +999,10 @@
     "id": "api.slackimport.slack_add_channels.merge",
     "translation": "Merged with existing channel: {{.DisplayName}}\r\n"
   },
+  {
+    "id": "api.slackimport.slack_add_channels.failed_to_add_user",
+    "translation": "Failed to add user to channel: {{.Username}}\r\n"
+  },
   {
     "id": "api.slackimport.slack_add_posts.bot.warn",
     "translation": "Slack bot posts are not imported yet"
@@ -1035,6 +1043,10 @@
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
   },
+  {
+    "id": "api.slackimport.slack_import.team_fail",
+    "translation": "Failed to get team to import into.\r\n"
+  },
   {
     "id": "api.slackimport.slack_import.note1",
     "translation": "- Some posts may not have been imported because they where not supported by this importer.\r\n"
-- 
cgit v1.2.3-1-g7c22