summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorJoram Wilander <jwawilander@gmail.com>2018-06-14 13:27:00 -0400
committerCarlos Tadeu Panato Junior <ctadeu@gmail.com>2018-06-14 19:27:00 +0200
commit85a75526c7c03fca1d14a39cfb3f2638d98d3fe1 (patch)
tree7de21b1914e4e3285905580014e75d6e94803a21 /i18n
parent8d29f8f58b68b13ecbc5d5766105de34885a2333 (diff)
downloadchat-85a75526c7c03fca1d14a39cfb3f2638d98d3fe1.tar.gz
chat-85a75526c7c03fca1d14a39cfb3f2638d98d3fe1.tar.bz2
chat-85a75526c7c03fca1d14a39cfb3f2638d98d3fe1.zip
Add more oauth logging and note about GitLab ToS for login (#8949)
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 4df698294..0613d12cd 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2843,6 +2843,10 @@
"translation": "Blank email"
},
{
+ "id": "oauth.gitlab.tos.error",
+ "translation": "GitLab's Terms of Service have updated. Please go to gitlab.com to accept them and then try logging into Mattermost again."
+ },
+ {
"id": "api.user.complete_switch_with_oauth.parse.app_error",
"translation": "Could not parse auth data out of {{.Service}} user object"
},