translations PR 20160929 (#4123)

1 files changed, 48 insertions, 48 deletions

diff --git a/i18n/en.json b/i18n/en.json
index 2b5a1e095..d261a9fa6 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -48,26 +48,6 @@
     "translation": "September"
   },
   {
-    "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": "Use Slash Commands"
-  },
-  {
-    "id": "authentication.permissions.team_use_slash_commands.description",
-    "translation": "Ability to use 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",
     "translation": "No file under 'certificate' in request"
   },
@@ -164,6 +144,10 @@
     "translation": "Error rendering template %v err=%v"
   },
   {
+    "id": "api.auth.unable_to_get_user.app_error",
+    "translation": "Unable to get user to check permissions."
+  },
+  {
     "id": "api.channel.add_member.added",
     "translation": "%v added to the channel by %v"
   },
@@ -1480,14 +1464,6 @@
     "translation": "Server is listening on %v"
   },
   {
-    "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting."
-  },
-  {
-    "id": "api.server.start_server.rate_limiting_memory_store",
-    "translation": "Unable to initalize rate limiting."
-  },
-  {
     "id": "api.server.start_server.rate.info",
     "translation": "RateLimiter is enabled"
   },
@@ -1496,6 +1472,14 @@
     "translation": "RateLimitSettings not configured properly using VaryByHeader and disabling VaryByRemoteAddr"
   },
   {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting memory store. Check MemoryStoreSize config setting."
+  },
+  {
+    "id": "api.server.start_server.rate_limiting_memory_store",
+    "translation": "Unable to initalize rate limiting."
+  },
+  {
     "id": "api.server.start_server.starting.critical",
     "translation": "Error starting server, err:%v"
   },
@@ -1520,14 +1504,6 @@
     "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"
   },
@@ -1584,6 +1560,10 @@
     "translation": "Unable to import user: {{.Username}}\r\n"
   },
   {
+    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
+    "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}"
+  },
+  {
     "id": "api.slackimport.slack_convert_timestamp.bad.warn",
     "translation": "Bad timestamp detected"
   },
@@ -1592,10 +1572,6 @@
     "translation": "Failed to compile the @mention matching regular expression for Slack user {{.UserID}} {{.Username}}"
   },
   {
-    "id": "api.slackimport.slack_convert_channel_mentions.compile_regexp_failed.warn",
-    "translation": "Failed to compile the !channel matching regular expression for Slack channel {{.ChannelID}} {{.ChannelName}}"
-  },
-  {
     "id": "api.slackimport.slack_import.log",
     "translation": "Mattermost Slack Import Log\r\n"
   },
@@ -1628,6 +1604,14 @@
     "translation": "Unable to open zip file"
   },
   {
+    "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.status.init.debug",
     "translation": "Initializing status api routes"
   },
@@ -1640,10 +1624,6 @@
     "translation": "Failed to save status for user_id=%v, err=%v"
   },
   {
-    "id": "api.team.update_member_roles.not_a_member",
-    "translation": "Specified user is not a member of specified team."
-  },
-  {
     "id": "api.team.create_team.email_disabled.app_error",
     "translation": "Team sign-up with email is disabled."
   },
@@ -1760,6 +1740,10 @@
     "translation": "Team sign-up with email is disabled."
   },
   {
+    "id": "api.team.update_member_roles.not_a_member",
+    "translation": "Specified user is not a member of specified team."
+  },
+  {
     "id": "api.team.update_team.permissions.app_error",
     "translation": "You do not have the appropriate permissions"
   },
@@ -2492,6 +2476,22 @@
     "translation": "Invalid {{.Name}} parameter"
   },
   {
+    "id": "authentication.permissions.team_invite_user.description",
+    "translation": "Ability to invite users to a team"
+  },
+  {
+    "id": "authentication.permissions.team_invite_user.name",
+    "translation": "Invite User"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.description",
+    "translation": "Ability to use slash commands"
+  },
+  {
+    "id": "authentication.permissions.team_use_slash_commands.name",
+    "translation": "Use Slash Commands"
+  },
+  {
     "id": "cli.license.critical",
     "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
   },
@@ -3132,10 +3132,6 @@
     "translation": "Invalid connection security for email settings.  Must be '', 'TLS', or 'STARTTLS'"
   },
   {
-    "id": "model.config.is_valid.max_burst.app_error",
-    "translation": "Maximum burst size must be greater than zero."
-  },
-  {
     "id": "model.config.is_valid.encrypt_sql.app_error",
     "translation": "Invalid at rest encrypt key for SQL settings.  Must be 32 chars or more."
   },
@@ -3236,6 +3232,10 @@
     "translation": "Invalid maximum login attempts for service settings.  Must be a positive number."
   },
   {
+    "id": "model.config.is_valid.max_burst.app_error",
+    "translation": "Maximum burst size must be greater than zero."
+  },
+  {
     "id": "model.config.is_valid.max_file_size.app_error",
     "translation": "Invalid max file size for file settings. Must be a zero or positive number."
   },