diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-22 02:32:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-22 02:32:27 +0200 |
| commit | 29df4b5c60aed818949865b31ac696978e7f8965 (patch) | |
| tree | 01cfc959b96cb9cdfdea0aa90e8ad2e16db5d74a /phpBB | |
| parent | fd7e29131ecf437823f625e60e8bbcc0ddb0de40 (diff) | |
| parent | 1ffa5865832c918e9b96dcf6ee58cc44603dcb65 (diff) | |
| download | forums-29df4b5c60aed818949865b31ac696978e7f8965.tar forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.gz forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.bz2 forums-29df4b5c60aed818949865b31ac696978e7f8965.tar.xz forums-29df4b5c60aed818949865b31ac696978e7f8965.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/10228] Correct "trigger" to "triggered" in acp registration settings
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 68474ee893..0254bff992 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -469,7 +469,7 @@ $lang = array_merge($lang, array( 'IP_LOGIN_LIMIT_USE_FORWARDED' => 'Limit login attempts by <var>X_FORWARDED_FOR</var> header', 'IP_LOGIN_LIMIT_USE_FORWARDED_EXPLAIN' => 'Instead of limiting login attempts by IP address they are limited by <var>X_FORWARDED_FOR</var> values. <br /><em><strong>Warning:</strong> Only enable this if you are operating a proxy server that sets <var>X_FORWARDED_FOR</var> to trustworthy values.</em>', 'MAX_LOGIN_ATTEMPTS' => 'Maximum number of login attempts per username', - 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being trigger for distinct user accounts.', + 'MAX_LOGIN_ATTEMPTS_EXPLAIN' => 'The number of login attempts allowed for a single account before the anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered for distinct user accounts.', 'NO_IP_VALIDATION' => 'None', 'NO_REF_VALIDATION' => 'None', 'PASSWORD_TYPE' => 'Password complexity', |