translations PR 20170925 (#7509)

1 files changed, 26 insertions, 26 deletions

diff --git a/i18n/en.json b/i18n/en.json
index f08716721..5469118d4 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3688,14 +3688,6 @@
     "translation": "Compliance export started for job '{{.JobName}}' at '{{.FilePath}}'"
   },
   {
-    "id": "ent.ldap.sync_worker.create_index_job.error",
-    "translation": "LDAP sync worker failed to create the sync job"
-  },
-  {
-    "id": "ent.ldap.sync.index_job_failed.error",
-    "translation": "LDAP sync worker failed due to the sync job failing"
-  },
-  {
     "id": "ent.elasticsearch.aggregator_worker.create_index_job.error",
     "translation": "Elasticsearch aggregator worker failed to create the indexing job"
   },
@@ -3728,14 +3720,14 @@
     "translation": "Failed to setup Elasticsearch index mapping"
   },
   {
-    "id": "ent.elasticsearch.data_retention_delete_indexes.get_indexes.error",
-    "translation": "Failed to get Elasticsearch indexes"
-  },
-  {
     "id": "ent.elasticsearch.data_retention_delete_indexes.delete_index.error",
     "translation": "Failed to delete Elasticsearch index"
   },
   {
+    "id": "ent.elasticsearch.data_retention_delete_indexes.get_indexes.error",
+    "translation": "Failed to get Elasticsearch indexes"
+  },
+  {
     "id": "ent.elasticsearch.delete_post.error",
     "translation": "Failed to delete the post"
   },
@@ -3848,6 +3840,14 @@
     "translation": "Mattermost user was updated by AD/LDAP server."
   },
   {
+    "id": "ent.ldap.sync.index_job_failed.error",
+    "translation": "LDAP sync worker failed due to the sync job failing"
+  },
+  {
+    "id": "ent.ldap.sync_worker.create_index_job.error",
+    "translation": "LDAP sync worker failed to create the sync job"
+  },
+  {
     "id": "ent.ldap.syncdone.info",
     "translation": "AD/LDAP Synchronization completed"
   },
@@ -5864,6 +5864,10 @@
     "translation": "We encountered an error permanently deleting the batch of posts"
   },
   {
+    "id": "store.sql_post.permanent_delete_batch.app_error",
+    "translation": "We encountered an error permanently deleting the batch of posts"
+  },
+  {
     "id": "store.sql_post.permanent_delete_by_channel.app_error",
     "translation": "We couldn't delete the posts by channel"
   },
@@ -5896,10 +5900,6 @@
     "translation": "We couldn't update the Post"
   },
   {
-    "id": "store.sql_post.permanent_delete_batch.app_error",
-    "translation": "We encountered an error permanently deleting the batch of posts"
-  },
-  {
     "id": "store.sql_preference.cleanup_flags_batch.app_error",
     "translation": "We encountered an error cleaning up the batch of flags"
   },
@@ -6572,28 +6572,28 @@
     "translation": "Analytics not initialized"
   },
   {
-    "id": "utils.file.remove_directory.configured.app_error",
+    "id": "utils.file.list_directory.configured.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
   },
   {
-    "id": "utils.file.remove_directory.local.app_error",
-    "translation": "Encountered an error removing directory from local server file storage."
+    "id": "utils.file.list_directory.local.app_error",
+    "translation": "Encountered an error listing directory from local server file storage."
   },
   {
-    "id": "utils.file.remove_directory.s3.app_error",
-    "translation": "Encountered an error removing directory from S3."
+    "id": "utils.file.list_directory.s3.app_error",
+    "translation": "Encountered an error listing directory from S3."
   },
   {
-    "id": "utils.file.list_directory.configured.app_error",
+    "id": "utils.file.remove_directory.configured.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
   },
   {
-    "id": "utils.file.list_directory.local.app_error",
-    "translation": "Encountered an error listing directory from local server file storage."
+    "id": "utils.file.remove_directory.local.app_error",
+    "translation": "Encountered an error removing directory from local server file storage."
   },
   {
-    "id": "utils.file.list_directory.s3.app_error",
-    "translation": "Encountered an error listing directory from S3."
+    "id": "utils.file.remove_directory.s3.app_error",
+    "translation": "Encountered an error removing directory from S3."
   },
   {
     "id": "utils.file.remove_file.configured.app_error",