Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710

1 files changed, 25 insertions, 1 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 0afc83afa..fc6d1c55b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -88,6 +88,10 @@
     "translation": "Failed to add user to channel"
   },
   {
+    "id": "api.channel.patch_update_channel.forbidden.app_error",
+    "translation": "Failed to update the channel"
+  },
+  {
     "id": "api.channel.add_user.to.channel.failed.deleted.app_error",
     "translation": "Failed to add user to channel because they have been removed from the team."
   },
@@ -312,6 +316,10 @@
     "translation": "Email has not been configured, no invite(s) sent"
   },
   {
+    "id": "api.command.invite_people.email_invitations_off",
+    "translation": "Email invitations are disabled, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.fail",
     "translation": "Encountered an error sending email invite(s)"
   },
@@ -623,6 +631,10 @@
     "translation": "You don't have enough permissions to add {{.User}} in {{.Channel}}."
   },
   {
+    "id": "api.command_invite_people.permission.app_error",
+    "translation": "You don't have permission to invite new users to this server."
+  },
+  {
     "id": "api.command_invite.private_channel.app_error",
     "translation": "Could not find the channel {{.Channel}}. Please use the channel handle to identify channels."
   },
@@ -823,10 +835,18 @@
     "translation": "You do not have the appropriate permissions to remove the member."
   },
   {
+    "id": "api.command_msg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to direct message this user."
+  },
+  {
     "id": "api.command_remove.user_not_in_channel",
     "translation": "{{.Username}} is not a member of this channel."
   },
   {
+    "id": "api.command_groupmsg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to create a new group message."
+  },
+  {
     "id": "api.command_search.desc",
     "translation": "Search text in messages"
   },
@@ -1611,6 +1631,10 @@
     "translation": "No one to invite."
   },
   {
+    "id": "api.team.invite_members.disabled.app_error",
+    "translation": "Email invitations are disabled."
+  },
+  {
     "id": "api.team.is_team_creation_allowed.disabled.app_error",
     "translation": "Team creation has been disabled. Please ask your systems administrator for details."
   },
@@ -3800,7 +3824,7 @@
   },
   {
     "id": "model.config.is_valid.display.custom_url_schemes.app_error",
-    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers, plus (+), period (.), and hyphen (-)."
+    "translation": "The custom URL scheme {{.Scheme}} is invalid. Custom URL schemes must start with a letter and contain only letters, numbers and hyphen (-)."
   },
   {
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",