1 files changed, 38 insertions, 2 deletions
diff --git a/i18n/en.json b/i18n/en.json
index e9594b5e3..5306be466 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,8 +48,24 @@
     "translation": "September"
   },
   {
-    "id": "api.admin.add_certificate.array.app_error",
-    "translation": "Empty array under 'certificate' in request"
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Invite User"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Ability to invite users to a team"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "User Slash Commands"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Ability to user slash commands"
+  },
+  {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Unable to get user to check permissions."
   },
   {
     "id": "api.admin.add_certificate.no_file.app_error",
@@ -1154,6 +1170,10 @@
     "translation": "Bad filename discarded, filename=%v"
   },
   {
+    "id": "api.post.create_post.can_not_post_to_deleted.error",
+    "translation": "Can not post to deleted channel."
+  },
+  {
     "id": "api.post.create_post.channel_root_id.app_error",
     "translation": "Invalid ChannelId for RootId parameter"
   },
@@ -1424,6 +1444,14 @@
     "translation": "\r\n Channels Added \r\n"
   },
   {
+    "id": "api.slackimport.slack_parse_channels.error",
+    "translation": "Error parsing slack channels. Import may work anyway."
+  },
+  {
+    "id": "api.slackimport.slack_parse_posts.error",
+    "translation": "Error parsing some slack posts. Import may work anyway."
+  },
+  {
     "id": "api.slackimport.slack_add_channels.failed_to_add_user",
     "translation": "Failed to add user to channel: {{.Username}}\r\n"
   },
@@ -1468,6 +1496,10 @@
     "translation": "Email, Password: {{.Email}}, {{.Password}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_add_users.merge_existing",
+    "translation": "Merged user with existing account: {{.Email}}, {{.Username}}\r\n"
+  },
+  {
     "id": "api.slackimport.slack_add_users.unable_import",
     "translation": "Unable to import user: {{.Username}}\r\n"
   },
@@ -1492,6 +1524,10 @@
     "translation": "- Slack bot posts are currently not supported.\r\n"
   },
   {
+    "id": "api.slackimport.slack_import.note3",
+    "translation": "- Additional errors may be found in the server logs.\r\n"
+  },
+  {
     "id": "api.slackimport.slack_import.notes",
     "translation": "\r\n Notes \r\n"
   },