translations PR 20161226 (#4903)

1 files changed, 32 insertions, 32 deletions

diff --git a/i18n/en.json b/i18n/en.json
index e5bee2806..1744f02b1 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -288,10 +288,6 @@
     "translation": "Cannot leave the default channel {{.Channel}}"
   },
   {
-    "id": "api.channel.remove.default.app_error",
-    "translation": "Cannot remove user from the default channel {{.Channel}}"
-  },
-  {
     "id": "api.channel.leave.direct.app_error",
     "translation": "Cannot leave a direct message channel"
   },
@@ -304,6 +300,18 @@
     "translation": "%v has left the channel."
   },
   {
+    "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
+    "translation": "Failed to post displayname update message %v"
+  },
+  {
+    "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
+    "translation": "Failed to retrieve user while trying to save update channel displayname message %v"
+  },
+  {
+    "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
+    "translation": "%s updated the channel display name from: %s to: %s"
+  },
+  {
     "id": "api.channel.post_update_channel_header_message_and_forget.join_leave.error",
     "translation": "Failed to post join/leave message %v"
   },
@@ -324,22 +332,14 @@
     "translation": "%s updated the channel header to: %s"
   },
   {
-    "id": "api.channel.post_update_channel_displayname_message_and_forget.create_post.error",
-    "translation": "Failed to post displayname update message %v"
-  },
-  {
-    "id": "api.channel.post_update_channel_displayname_message_and_forget.retrieve_user.error",
-    "translation": "Failed to retrieve user while trying to save update channel displayname message %v"
-  },
-  {
-    "id": "api.channel.post_update_channel_displayname_message_and_forget.updated_from",
-    "translation": "%s updated the channel display name from: %s to: %s"
-  },
-  {
     "id": "api.channel.post_user_add_remove_message_and_forget.error",
     "translation": "Failed to post join/leave message %v"
   },
   {
+    "id": "api.channel.remove.default.app_error",
+    "translation": "Cannot remove user from the default channel {{.Channel}}"
+  },
+  {
     "id": "api.channel.remove_member.permissions.app_error",
     "translation": "You do not have the appropriate permissions "
   },
@@ -492,10 +492,6 @@
     "translation": "Unable to create /echo post, err=%v"
   },
   {
-    "id": "api.command_echo.message.app_error",
-    "translation": "A message must be provided with the /echo command."
-  },
-  {
     "id": "api.command_echo.delay.app_error",
     "translation": "Delays must be under 10000 seconds"
   },
@@ -512,6 +508,10 @@
     "translation": "'message' [delay in seconds]"
   },
   {
+    "id": "api.command_echo.message.app_error",
+    "translation": "A message must be provided with the /echo command."
+  },
+  {
     "id": "api.command_echo.name",
     "translation": "echo"
   },
@@ -828,14 +828,14 @@
     "translation": "Multi-factor authentication is required on this server."
   },
   {
-    "id": "api.context.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
-  },
-  {
     "id": "api.context.missing_teamid.app_error",
     "translation": "Missing Team Id"
   },
   {
+    "id": "api.context.permissions.app_error",
+    "translation": "You do not have the appropriate permissions"
+  },
+  {
     "id": "api.context.session_expired.app_error",
     "translation": "Invalid or expired session, please login again."
   },
@@ -4276,10 +4276,6 @@
     "translation": "We encountered an error finding the channel"
   },
   {
-    "id": "store.sql_channel.get_members_by_ids.app_error",
-    "translation": "We couldn't get the channel members"
-  },
-  {
     "id": "store.sql_channel.get_all.app_error",
     "translation": "We couldn't get all the channels"
   },
@@ -4332,6 +4328,10 @@
     "translation": "We couldn't get the channel members"
   },
   {
+    "id": "store.sql_channel.get_members_by_ids.app_error",
+    "translation": "We couldn't get the channel members"
+  },
+  {
     "id": "store.sql_channel.get_more_channels.get.app_error",
     "translation": "We couldn't get the channels"
   },
@@ -5452,6 +5452,10 @@
     "translation": "Back"
   },
   {
+    "id": "web.incoming_webhook.attachment.app_error",
+    "translation": "Maximum attachments length is {{.Max}} characters, received size is {{.Actual}}"
+  },
+  {
     "id": "web.incoming_webhook.channel.app_error",
     "translation": "Couldn't find the channel"
   },
@@ -5480,10 +5484,6 @@
     "translation": "Maximum text length is {{.Max}} characters, received size is {{.Actual}}"
   },
   {
-    "id": "web.incoming_webhook.attachment.app_error",
-    "translation": "Maximum attachments length is {{.Max}} characters, received size is {{.Actual}}"
-  },
-  {
     "id": "web.incoming_webhook.user.app_error",
     "translation": "Couldn't find the user"
   },