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

1 files changed, 24 insertions, 24 deletions

diff --git a/i18n/en.json b/i18n/en.json
index fc6d1c55b..7c424e18d 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -88,10 +88,6 @@
     "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."
   },
@@ -196,6 +192,10 @@
     "translation": "%v left the channel."
   },
   {
+    "id": "api.channel.patch_update_channel.forbidden.app_error",
+    "translation": "Failed to update the channel"
+  },
+  {
     "id": "api.channel.post_channel_privacy_message.error",
     "translation": "Failed to post channel privacy update message."
   },
@@ -312,14 +312,14 @@
     "translation": "Send an email invite to your Mattermost team"
   },
   {
-    "id": "api.command.invite_people.email_off",
-    "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.email_off",
+    "translation": "Email has not been configured, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.fail",
     "translation": "Encountered an error sending email invite(s)"
   },
@@ -583,6 +583,10 @@
     "translation": "message"
   },
   {
+    "id": "api.command_groupmsg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to create a new group message."
+  },
+  {
     "id": "api.command_help.desc",
     "translation": "Open the Mattermost help page"
   },
@@ -631,10 +635,6 @@
     "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."
   },
@@ -647,6 +647,10 @@
     "translation": "{{.User}} is already in the 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_join.desc",
     "translation": "Join the open channel"
   },
@@ -739,6 +743,10 @@
     "translation": "message"
   },
   {
+    "id": "api.command_msg.permission.app_error",
+    "translation": "You don't have the appropriate permissions to direct message this user."
+  },
+  {
     "id": "api.command_mute.desc",
     "translation": "Turns off desktop, email and push notifications for the current channel or the [channel] specified."
   },
@@ -835,18 +843,10 @@
     "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"
   },
@@ -1619,6 +1619,10 @@
     "translation": "Malformed request: filesize field is not present."
   },
   {
+    "id": "api.team.invite_members.disabled.app_error",
+    "translation": "Email invitations are disabled."
+  },
+  {
     "id": "api.team.invite_members.invalid_email.app_error",
     "translation": "The following email addresses do not belong to an accepted domain: {{.Addresses}}. Please contact your System Administrator for details."
   },
@@ -1631,10 +1635,6 @@
     "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."
   },