diff options
| author | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:27:44 +0100 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2010-11-07 03:27:44 +0100 |
| commit | 225482c06aaddcb05b018661717702aad6499fb5 (patch) | |
| tree | f1355dc7777b589a254695ccca7cc770764816d8 /phpBB | |
| parent | 48e6126094f160729f5199a528a9690cbeff188c (diff) | |
| parent | dd1532a72c0c5757d0729dde26fa4dffba7c14ec (diff) | |
| download | forums-225482c06aaddcb05b018661717702aad6499fb5.tar forums-225482c06aaddcb05b018661717702aad6499fb5.tar.gz forums-225482c06aaddcb05b018661717702aad6499fb5.tar.bz2 forums-225482c06aaddcb05b018661717702aad6499fb5.tar.xz forums-225482c06aaddcb05b018661717702aad6499fb5.zip | |
Merge branch 'ticket/cs278/9752' into develop-olympus
* ticket/cs278/9752:
[ticket/9752] Mark unused language variable as such.
[ticket/9752] Change reference to 'confirmation code' to be more generic.
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/common.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php index e79e5a6de3..db60cbf227 100644 --- a/phpBB/language/en/common.php +++ b/phpBB/language/en/common.php @@ -304,8 +304,8 @@ $lang = array_merge($lang, array( 'LOGIN' => 'Login', 'LOGIN_CHECK_PM' => 'Log in to check your private messages.', 'LOGIN_CONFIRMATION' => 'Confirmation of login', - 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', - 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to enter the confirm code from the image you see below.', + 'LOGIN_CONFIRM_EXPLAIN' => 'To prevent brute forcing accounts the board requires you to enter a confirmation code after a maximum amount of failed logins. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.', // unused + 'LOGIN_ERROR_ATTEMPTS' => 'You exceeded the maximum allowed number of login attempts. In addition to your username and password you now also have to solve the CAPTCHA below.', 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE' => 'You have not been authenticated by Apache.', 'LOGIN_ERROR_PASSWORD' => 'You have specified an incorrect password. Please check your password and try again. If you continue to have problems please contact the %sBoard Administrator%s.', 'LOGIN_ERROR_PASSWORD_CONVERT' => 'It was not possible to convert your password when updating this bulletin board’s software. Please %srequest a new password%s. If you continue to have problems please contact the %sBoard Administrator%s.', |