translations PR 20180619 (#8963)

i18n/en.json

@@ -2846,10 +2846,6 @@
     "id": "api.user.complete_switch_with_oauth.blank_email.app_error",
     "translation": "Blank email"
   },
-  {
-    "id": "oauth.gitlab.tos.error",
-    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
-  },
   {
     "id": "api.user.complete_switch_with_oauth.parse.app_error",
     "translation": "Could not parse auth data out of {{.Service}} user object"
@@ -4302,14 +4298,14 @@
     "id": "ent.elasticsearch.search_posts.disabled",
     "translation": "Elasticsearch searching is disabled on this server"
   },
-  {
-    "id": "ent.elasticsearch.search_posts.search_failed",
-    "translation": "Search failed to complete"
-  },
   {
     "id": "ent.elasticsearch.search_posts.parse_matches_failed",
     "translation": "Failed to parse search result matches"
   },
+  {
+    "id": "ent.elasticsearch.search_posts.search_failed",
+    "translation": "Search failed to complete"
+  },
   {
     "id": "ent.elasticsearch.search_posts.unmarshall_post_failed",
     "translation": "Failed to decode search results"
@@ -5914,6 +5910,10 @@
     "id": "model.utils.decode_json.app_error",
     "translation": "could not decode"
   },
+  {
+    "id": "oauth.gitlab.tos.error",
+    "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+  },
   {
     "id": "plugin.rpcplugin.invocation.error",
     "translation": "Error invoking plugin RPC"