From 15ad24d160cb4604d0605ebbfa53d11a57820706 Mon Sep 17 00:00:00 2001
From: JoramWilander <jwawilander@gmail.com>
Date: Thu, 6 Jul 2017 17:28:38 -0400
Subject: Minor fix

---
 i18n/en.json | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'i18n/en.json')

diff --git a/i18n/en.json b/i18n/en.json
index 7d23a13c1..6784bcd75 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2699,6 +2699,10 @@
     "id": "api.user.permanent_delete_user.system_admin.warn",
     "translation": "You are deleting %v that is a system administrator.  You may need to set another account as the system administrator using the command line tools."
   },
+  {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
   {
     "id": "api.user.reset_password.invalid_link.app_error",
     "translation": "The reset password link does not appear to be valid"
-- 
cgit v1.2.3-1-g7c22


From 0a78d588954b31eba946c6e656fd6fa33c504a72 Mon Sep 17 00:00:00 2001
From: enahum <nahumhbl@gmail.com>
Date: Wed, 12 Jul 2017 09:14:03 -0400
Subject: translations PR 20170710 (#6902)

---
 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 6784bcd75..e3f7eaacb 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -911,10 +911,6 @@
     "id": "api.context.404.app_error",
     "translation": "Sorry, we could not find the page."
   },
-  {
-    "id": "api.context.v3_disabled.app_error",
-    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
-  },
   {
     "id": "api.context.invalid_body_param.app_error",
     "translation": "Invalid or missing {{.Name}} in request body"
@@ -979,6 +975,10 @@
     "id": "api.context.unknown.app_error",
     "translation": "An unknown error has occurred. Please contact support."
   },
+  {
+    "id": "api.context.v3_disabled.app_error",
+    "translation": "API version 3 has been disabled on this server. Please use API version 4. See https://api.mattermost.com for details."
+  },
   {
     "id": "api.deprecated.init.debug",
     "translation": "Initializing deprecated API routes"
@@ -1509,6 +1509,10 @@
     "id": "api.oauth.init.debug",
     "translation": "Initializing OAuth API routes"
   },
+  {
+    "id": "api.oauth.invalid_state_token.app_error",
+    "translation": "Invalid state token"
+  },
   {
     "id": "api.oauth.regenerate_secret.app_error",
     "translation": "Invalid permissions to regenerate the OAuth2 App Secret"
@@ -2699,10 +2703,6 @@
     "id": "api.user.permanent_delete_user.system_admin.warn",
     "translation": "You are deleting %v that is a system administrator.  You may need to set another account as the system administrator using the command line tools."
   },
-  {
-    "id": "api.oauth.invalid_state_token.app_error",
-    "translation": "Invalid state token"
-  },
   {
     "id": "api.user.reset_password.invalid_link.app_error",
     "translation": "The reset password link does not appear to be valid"
-- 
cgit v1.2.3-1-g7c22