diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
| commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
| tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /i18n/en.json | |
| parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
| parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
| download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip | |
Merge branch 'release-4.0'
Diffstat (limited to 'i18n/en.json')
| -rw-r--r-- | i18n/en.json | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index 1225ee824..0ba3194fa 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -912,10 +912,6 @@ "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" }, @@ -980,6 +976,10 @@ "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" }, @@ -1510,6 +1510,10 @@ "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" }, |