From d3f360974bb03993245191e824b38cb17794c40f Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Fri, 6 May 2016 14:37:56 -0300
Subject: Spanish locs and sort files by id (#2913)

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

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index df8cf4c2b..9013dbea9 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -379,6 +379,10 @@
     "id": "api.command_logout.desc",
     "translation": "Logout of Mattermost"
   },
+  {
+    "id": "api.command_logout.fail_message",
+    "translation": "Failed to log out"
+  },
   {
     "id": "api.command_logout.name",
     "translation": "logout"
@@ -387,10 +391,6 @@
     "id": "api.command_logout.success_message",
     "translation": "Logging out..."
   },
-  {
-    "id": "api.command_logout.fail_message",
-    "translation": "Failed to log out"
-  },
   {
     "id": "api.command_me.desc",
     "translation": "Do an action"
@@ -2307,10 +2307,6 @@
     "id": "model.config.is_valid.ldap_security.app_error",
     "translation": "Invalid connection security for LDAP settings.  Must be '', 'TLS', or 'STARTTLS'"
   },
-  {
-    "id": "model.config.is_valid.restrict_direct_message.app_error",
-    "translation": "Invalid direct message restriction.  Must be 'any', or 'team'"
-  },
   {
     "id": "model.config.is_valid.listen_address.app_error",
     "translation": "Invalid listen address for service settings Must be set."
@@ -2331,6 +2327,10 @@
     "id": "model.config.is_valid.rate_sec.app_error",
     "translation": "Invalid per sec for rate limit settings.  Must be a positive number"
   },
+  {
+    "id": "model.config.is_valid.restrict_direct_message.app_error",
+    "translation": "Invalid direct message restriction.  Must be 'any', or 'team'"
+  },
   {
     "id": "model.config.is_valid.sql_data_src.app_error",
     "translation": "Invalid data source for SQL settings.  Must be set."
-- 
cgit v1.2.3-1-g7c22