From 4e086311ad869a2de6a115afa0ae9bf56ad8639e Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 27 Apr 2017 09:57:26 -0300
Subject: translations PR 20170424 (#6224)

---
 i18n/en.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index fa380c095..83d0b83e2 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -443,10 +443,6 @@
     "id": "api.command.init.debug",
     "translation": "Initializing command API routes"
   },
-  {
-    "id": "api.emoji.init.debug",
-    "translation": "Initializing emoji API routes"
-  },
   {
     "id": "api.command.invite_people.desc",
     "translation": "Send an email invite to your Mattermost team"
@@ -1005,6 +1001,10 @@
     "id": "api.emoji.init.debug",
     "translation": "Initializing emoji API routes"
   },
+  {
+    "id": "api.emoji.init.debug",
+    "translation": "Initializing emoji API routes"
+  },
   {
     "id": "api.emoji.storage.app_error",
     "translation": "File storage not configured properly. Please configure for either S3 or local server file storage."
@@ -3611,14 +3611,14 @@
     "id": "model.authorize.is_valid.expires.app_error",
     "translation": "Expires in must be set"
   },
-  {
-    "id": "model.authorize.is_valid.response_type.app_error",
-    "translation": "Invalid response type"
-  },
   {
     "id": "model.authorize.is_valid.redirect_uri.app_error",
     "translation": "Invalid redirect uri"
   },
+  {
+    "id": "model.authorize.is_valid.response_type.app_error",
+    "translation": "Invalid response type"
+  },
   {
     "id": "model.authorize.is_valid.scope.app_error",
     "translation": "Invalid scope"
@@ -5207,14 +5207,14 @@
     "id": "store.sql_post.save.existing.app_error",
     "translation": "You cannot update an existing Post"
   },
-  {
-    "id": "store.sql_post.search.warn",
-    "translation": "Query error searching posts: %v"
-  },
   {
     "id": "store.sql_post.search.disabled",
     "translation": "Searching has been disabled on this server. Please contact your System Administrator."
   },
+  {
+    "id": "store.sql_post.search.warn",
+    "translation": "Query error searching posts: %v"
+  },
   {
     "id": "store.sql_post.update.app_error",
     "translation": "We couldn't update the Post"
-- 
cgit v1.2.3-1-g7c22