translations PR 20171030 (#7748)

i18n/en.json

@@ -499,26 +499,6 @@
     "id": "api.command_away.success",
     "translation": "You are now away"
   },
-  {
-    "id": "api.command_dnd.error",
-    "translation": "Error to retrieve the user status."
-  },
-  {
-    "id": "api.command_dnd.disabled",
-    "translation": "Do Not Disturb is disabled."
-  },
-  {
-    "id": "api.command_dnd.success",
-    "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off."
-  },
-  {
-    "id": "api.command_dnd.desc",
-    "translation": "Do not disturb disables desktop and mobile push notifications."
-  },
-  {
-    "id": "api.command_dnd.name",
-    "translation": "dnd"
-  },
   {
     "id": "api.command_channel_header.channel.app_error",
     "translation": "Error to retrieve the current channel."
@@ -655,6 +635,26 @@
     "id": "api.command_collapse.success",
     "translation": "Image links now collapse by default"
   },
+  {
+    "id": "api.command_dnd.desc",
+    "translation": "Do not disturb disables desktop and mobile push notifications."
+  },
+  {
+    "id": "api.command_dnd.disabled",
+    "translation": "Do Not Disturb is disabled."
+  },
+  {
+    "id": "api.command_dnd.error",
+    "translation": "Error to retrieve the user status."
+  },
+  {
+    "id": "api.command_dnd.name",
+    "translation": "dnd"
+  },
+  {
+    "id": "api.command_dnd.success",
+    "translation": "Do Not Disturb is enabled. You will not receive desktop or mobile push notifications until Do Not Disturb is turned off."
+  },
   {
     "id": "api.command_echo.create.app_error",
     "translation": "Unable to create /echo post, err=%v"
@@ -3495,14 +3495,6 @@
     "id": "app.plugin.activate.app_error",
     "translation": "Unable to activate extracted plugin. Plugin may already exist and be activated."
   },
-  {
-    "id": "app.plugin.get_plugins.app_error",
-    "translation": "Unable to get plugins"
-  },
-  {
-    "id": "app.plugin.not_installed.app_error",
-    "translation": "Plugin is not installed"
-  },
   {
     "id": "app.plugin.config.app_error",
     "translation": "Error saving plugin state in config"
@@ -3515,10 +3507,6 @@
     "id": "app.plugin.disabled.app_error",
     "translation": "Plugins have been disabled."
   },
-  {
-    "id": "app.plugin.upload_disabled.app_error",
-    "translation": "Plugins and/or plugin uploads have been disabled."
-  },
   {
     "id": "app.plugin.extract.app_error",
     "translation": "Encountered error extracting plugin"
@@ -3527,6 +3515,10 @@
     "id": "app.plugin.filesystem.app_error",
     "translation": "Encountered filesystem error"
   },
+  {
+    "id": "app.plugin.get_plugins.app_error",
+    "translation": "Unable to get plugins"
+  },
   {
     "id": "app.plugin.get_plugins.app_error",
     "translation": "Unable to get active plugins"
@@ -3539,10 +3531,18 @@
     "id": "app.plugin.mvdir.app_error",
     "translation": "Unable to move plugin from temporary directory to final destination"
   },
+  {
+    "id": "app.plugin.not_installed.app_error",
+    "translation": "Plugin is not installed"
+  },
   {
     "id": "app.plugin.remove.app_error",
     "translation": "Unable to delete plugin"
   },
+  {
+    "id": "app.plugin.upload_disabled.app_error",
+    "translation": "Plugins and/or plugin uploads have been disabled."
+  },
   {
     "id": "app.user_access_token.disabled",
     "translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
@@ -3827,6 +3827,10 @@
     "id": "ent.elasticsearch.index_post.error",
     "translation": "Failed to index the post"
   },
+  {
+    "id": "ent.elasticsearch.indexer.do_job.get_oldest_post.error",
+    "translation": "The oldest post could not be retrieved from the database."
+  },
   {
     "id": "ent.elasticsearch.indexer.do_job.parse_end_time.error",
     "translation": "Elasticsearch indexing worker failed to parse the end time"
@@ -3883,18 +3887,6 @@
     "id": "ent.elasticsearch.test_config.reenter_password",
     "translation": "The Elasticsearch Server URL or Username has changed. Please re-enter the Elasticsearch password to test connection."
   },
-  {
-    "id": "ent.elasticsearch.indexer.do_job.get_oldest_post.error",
-    "translation": "The oldest post could not be retrieved from the database."
-  },
-  {
-    "id": "model.config.is_valid.elastic_search.bulk_indexing_time_window_seconds.app_error",
-    "translation": "Elasticsearch Bulk Indexing Time Window must be at least 1 second."
-  },
-  {
-    "id": "model.config.is_valid.elastic_search.request_timeout_seconds.app_error",
-    "translation": "Elasticsearch Request Timeout must be at least 1 second."
-  },
   {
     "id": "ent.emoji.licence_disable.app_error",
     "translation": "Custom emoji restrictions disabled by current license. Please contact your system administrator about upgrading your enterprise license."
@@ -4491,6 +4483,10 @@
     "id": "model.config.is_valid.elastic_search.aggregate_posts_after_days.app_error",
     "translation": "Elasticsearch AggregatePostsAfterDays setting must be a number greater than or equal to 1"
   },
+  {
+    "id": "model.config.is_valid.elastic_search.bulk_indexing_time_window_seconds.app_error",
+    "translation": "Elasticsearch Bulk Indexing Time Window must be at least 1 second."
+  },
   {
     "id": "model.config.is_valid.elastic_search.connection_url.app_error",
     "translation": "Elastic Search ConnectionUrl setting must be provided when Elastic Search indexing is enabled."
@@ -4511,6 +4507,10 @@
     "id": "model.config.is_valid.elastic_search.posts_aggregator_job_start_time.app_error",
     "translation": "Elasticsearch PostsAggregatorJobStartTime setting must be a time in the format \"hh:mm\""
   },
+  {
+    "id": "model.config.is_valid.elastic_search.request_timeout_seconds.app_error",
+    "translation": "Elasticsearch Request Timeout must be at least 1 second."
+  },
   {
     "id": "model.config.is_valid.elastic_search.username.app_error",
     "translation": "Elastic Search Username setting must be provided when Elastic Search indexing is enabled."
@@ -6911,10 +6911,6 @@
     "id": "web.header.back",
     "translation": "Back"
   },
-  {
-    "id": "web.incoming_webhook.split_props_length.app_error",
-    "translation": "Unable to split webhook props into {{.Max}} character parts."
-  },
   {
     "id": "web.incoming_webhook.channel.app_error",
     "translation": "Couldn't find the channel"
@@ -6935,6 +6931,10 @@
     "id": "web.incoming_webhook.permissions.app_error",
     "translation": "Inappropriate channel permissions"
   },
+  {
+    "id": "web.incoming_webhook.split_props_length.app_error",
+    "translation": "Unable to split webhook props into {{.Max}} character parts."
+  },
   {
     "id": "web.incoming_webhook.text.app_error",
     "translation": "No text specified"