From f5d69cb813cb9307ac36e9a47dfc467c1e9f2d30 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Thu, 4 Aug 2016 10:45:36 -0500
Subject: New Languages and translations (#3729)

---
 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 17c136f7f..bf658b1aa 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1975,14 +1975,14 @@
     "id": "api.user.send_welcome_email_and_forget.failed.error",
     "translation": "Failed to send welcome email successfully err=%v"
   },
-  {
-    "id": "api.user.update_active.permissions.app_error",
-    "translation": "You do not have the appropriate permissions"
-  },
   {
     "id": "api.user.update_active.no_deactivate_ldap.app_error",
     "translation": "You can not modify the activation status of LDAP accounts. Please modify through the LDAP server."
   },
+  {
+    "id": "api.user.update_active.permissions.app_error",
+    "translation": "You do not have the appropriate permissions"
+  },
   {
     "id": "api.user.update_mfa.not_available.app_error",
     "translation": "MFA not configured or available on this server"
@@ -2179,14 +2179,6 @@
     "id": "cli.license.critical",
     "translation": "Feature requires an enterprise license. Please contact your system administrator about upgrading your enterprise license."
   },
-  {
-    "id": "ent.migration.migratetoldap.duplicate_field",
-    "translation": "Unable to migrate LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again."
-  },
-  {
-    "id": "ent.migration.migratetoldap.user_not_found",
-    "translation": "Unable to find user on LDAP server: "
-  },
   {
     "id": "ent.brand.save_brand_image.decode.app_error",
     "translation": "Unable to decode image."
@@ -2323,6 +2315,14 @@
     "id": "ent.mfa.validate_token.authenticate.app_error",
     "translation": "Error trying to authenticate MFA token"
   },
+  {
+    "id": "ent.migration.migratetoldap.duplicate_field",
+    "translation": "Unable to migrate LDAP users with specified field. Duplicate entry detected. Please remove all duplcates and try again."
+  },
+  {
+    "id": "ent.migration.migratetoldap.user_not_found",
+    "translation": "Unable to find user on LDAP server: "
+  },
   {
     "id": "ent.saml.build_request.app_error",
     "translation": "An error occurred while initiating the request to the Identity Provider. Please contact your System Administrator."
-- 
cgit v1.2.3-1-g7c22