aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-17 11:13:51 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-17 11:13:51 +0200
commite59af343b898950ac004a949b6391d3724f0a551 (patch)
tree7e8d4d5e2b77745cc02081da6b615d64dbd71fa7 /phpBB/language
parent9a992a48666b1769522002d84f5d6e995dca80fb (diff)
parentecb39bc435946afc930ef68c86bb5ec441e9e3c0 (diff)
downloadforums-e59af343b898950ac004a949b6391d3724f0a551.tar
forums-e59af343b898950ac004a949b6391d3724f0a551.tar.gz
forums-e59af343b898950ac004a949b6391d3724f0a551.tar.bz2
forums-e59af343b898950ac004a949b6391d3724f0a551.tar.xz
forums-e59af343b898950ac004a949b6391d3724f0a551.zip
Merge pull request #5658 from rubencm/ticket/13175
[ticket/13175] Check if account is already linked when using OAuth
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/common.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index 26692c7b25..8df8fc630b 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -91,6 +91,7 @@ $lang = array_merge($lang, array(
'ATTACHED_IMAGE_NOT_IMAGE' => 'The image file you tried to attach is invalid.',
'AUTHOR' => 'Author',
'AUTH_NO_PROFILE_CREATED' => 'The creation of a user profile was unsuccessful.',
+ 'AUTH_PROVIDER_OAUTH_ERROR_ALREADY_LINKED' => 'The account is already linked with other user.',
'AUTH_PROVIDER_OAUTH_ERROR_INVALID_ENTRY' => 'Invalid database entry.',
'AUTH_PROVIDER_OAUTH_ERROR_INVALID_SERVICE_TYPE' => 'Invalid service type provided to OAuth service handler.',
'AUTH_PROVIDER_OAUTH_ERROR_SERVICE_NOT_CREATED' => 'OAuth service not created',