Merge branch 'release-4.0'

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"