translations PR 20170703 (#6836)

* translations PR 20170703

* Fix bad merge

1 files changed, 68 insertions, 68 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 95fab33e2..7d23a13c1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -452,10 +452,6 @@
     "translation": "Email has not been configured, no invite(s) sent"
   },
   {
-    "id": "api.command.invite_people.invite_off",
-    "translation": "User creation has been disabled on this server, no invite(s) sent"
-  },
-  {
     "id": "api.command.invite_people.fail",
     "translation": "Encountered an error sending email invite(s)"
   },
@@ -464,6 +460,10 @@
     "translation": "[name@domain.com ...]"
   },
   {
+    "id": "api.command.invite_people.invite_off",
+    "translation": "User creation has been disabled on this server, no invite(s) sent"
+  },
+  {
     "id": "api.command.invite_people.name",
     "translation": "invite_people"
   },
@@ -500,6 +500,38 @@
     "translation": "You are now away"
   },
   {
+    "id": "api.command_channel_header.channel.app_error",
+    "translation": "Error to retrieve the current channel."
+  },
+  {
+    "id": "api.command_channel_header.desc",
+    "translation": "Edit the channel header"
+  },
+  {
+    "id": "api.command_channel_header.hint",
+    "translation": "[text]"
+  },
+  {
+    "id": "api.command_channel_header.message.app_error",
+    "translation": "Text must be provided with the /header command."
+  },
+  {
+    "id": "api.command_channel_header.name",
+    "translation": "header"
+  },
+  {
+    "id": "api.command_channel_header.permission.app_error",
+    "translation": "You do not have the appropriate permissions to edit the channel header."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.app_error",
+    "translation": "Error to update the current channel."
+  },
+  {
+    "id": "api.command_channel_header.update_channel.success",
+    "translation": "Channel header successfully updated."
+  },
+  {
     "id": "api.command_collapse.desc",
     "translation": "Turn on auto-collapsing of image previews"
   },
@@ -540,38 +572,6 @@
     "translation": "echo"
   },
   {
-    "id": "api.command_channel_header.desc",
-    "translation": "Edit the channel header"
-  },
-  {
-    "id": "api.command_channel_header.hint",
-    "translation": "[text]"
-  },
-  {
-    "id": "api.command_channel_header.name",
-    "translation": "header"
-  },
-  {
-    "id": "api.command_channel_header.message.app_error",
-    "translation": "Text must be provided with the /header command."
-  },
-  {
-    "id": "api.command_channel_header.channel.app_error",
-    "translation": "Error to retrieve the current channel."
-  },
-  {
-    "id": "api.command_channel_header.permission.app_error",
-    "translation": "You do not have the appropriate permissions to edit the channel header."
-  },
-  {
-    "id": "api.command_channel_header.update_channel.app_error",
-    "translation": "Error to update the current channel."
-  },
-  {
-    "id": "api.command_channel_header.update_channel.success",
-    "translation": "Channel header successfully updated."
-  },
-  {
     "id": "api.command_expand.desc",
     "translation": "Turn off auto-collapsing of image previews"
   },
@@ -588,6 +588,14 @@
     "translation": "An error occurred while expanding previews"
   },
   {
+    "id": "api.command_help.desc",
+    "translation": "Open the Mattermost help page"
+  },
+  {
+    "id": "api.command_help.name",
+    "translation": "help"
+  },
+  {
     "id": "api.command_join.desc",
     "translation": "Join the open channel"
   },
@@ -892,14 +900,6 @@
     "translation": "shrug"
   },
   {
-    "id": "api.command_help.desc",
-    "translation": "Open the Mattermost help page"
-  },
-  {
-    "id": "api.command_help.name",
-    "translation": "help"
-  },
-  {
     "id": "api.compliance.init.debug",
     "translation": "Initializing compliance API routes"
   },
@@ -2144,6 +2144,10 @@
     "translation": "This person is already on your team"
   },
   {
+    "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."
+  },
+  {
     "id": "api.team.invite_members.member",
     "translation": "member"
   },
@@ -2164,10 +2168,6 @@
     "translation": "Failed to send invite email successfully err=%v"
   },
   {
-    "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."
-  },
-  {
     "id": "api.team.invite_members.sending.info",
     "translation": "sending invitation to %v %v"
   },
@@ -3040,10 +3040,6 @@
     "translation": "Error importing channel. Team with name \"{{.TeamName}}\" could not be found."
   },
   {
-    "id": "app.import.import_direct_channel.member_not_found.error",
-    "translation": "Could not find channel member when importing direct channel"
-  },
-  {
     "id": "app.import.import_direct_channel.create_direct_channel.error",
     "translation": "Failed to create direct channel"
   },
@@ -3052,6 +3048,10 @@
     "translation": "Failed to create group channel"
   },
   {
+    "id": "app.import.import_direct_channel.member_not_found.error",
+    "translation": "Could not find channel member when importing direct channel"
+  },
+  {
     "id": "app.import.import_direct_channel.update_header_failed.error",
     "translation": "Failed to update direct channel header"
   },
@@ -3156,6 +3156,10 @@
     "translation": "Missing required channel property: type."
   },
   {
+    "id": "app.import.validate_direct_channel_import_data.header_length.error",
+    "translation": "Direct channel header is too long"
+  },
+  {
     "id": "app.import.validate_direct_channel_import_data.members_required.error",
     "translation": "Missing required direct channel property: members"
   },
@@ -3168,10 +3172,6 @@
     "translation": "Direct channel members list contains too many items"
   },
   {
-    "id": "app.import.validate_direct_channel_import_data.header_length.error",
-    "translation": "Direct channel header is too long"
-  },
-  {
     "id": "app.import.validate_direct_post_import_data.channel_members_required.error",
     "translation": "Missing required direct post property: channel_members"
   },
@@ -3184,24 +3184,24 @@
     "translation": "Direct post channel members list contains too many items"
   },
   {
-    "id": "app.import.validate_direct_post_import_data.user_missing.error",
-    "translation": "Missing required direct post property: user"
+    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
+    "translation": "Missing required direct post property: create_at"
   },
   {
-    "id": "app.import.validate_direct_post_import_data.message_missing.error",
-    "translation": "Missing required direct post property: message"
+    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
+    "translation": "CreateAt must be greater than 0"
   },
   {
     "id": "app.import.validate_direct_post_import_data.message_length.error",
     "translation": "Message is too long"
   },
   {
-    "id": "app.import.validate_direct_post_import_data.create_at_missing.error",
-    "translation": "Missing required direct post property: create_at"
+    "id": "app.import.validate_direct_post_import_data.message_missing.error",
+    "translation": "Missing required direct post property: message"
   },
   {
-    "id": "app.import.validate_direct_post_import_data.create_at_zero.error",
-    "translation": "CreateAt must be greater than 0"
+    "id": "app.import.validate_direct_post_import_data.user_missing.error",
+    "translation": "Missing required direct post property: user"
   },
   {
     "id": "app.import.validate_post_import_data.channel_missing.error",
@@ -5888,6 +5888,10 @@
     "translation": "We found multiple users matching your credentials and were unable to log you in. Please contact an administrator."
   },
   {
+    "id": "store.sql_user.get_new_users.app_error",
+    "translation": "We encountered an error while finding the new users"
+  },
+  {
     "id": "store.sql_user.get_profiles.app_error",
     "translation": "We encountered an error while finding user profiles"
   },
@@ -5896,10 +5900,6 @@
     "translation": "We encountered an error while finding the recently active users"
   },
   {
-    "id": "store.sql_user.get_new_users.app_error",
-    "translation": "We encountered an error while finding the new users"
-  },
-  {
     "id": "store.sql_user.get_sysadmin_profiles.app_error",
     "translation": "We encountered an error while finding user profiles"
   },