diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-22 02:32:45 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-22 02:32:45 +0200 |
| commit | 63bf9ef6f175e56f11e9298e5824880867934aa7 (patch) | |
| tree | cd99f1f249e681ce8d88ecde6ba8fc9bf07a3f4d | |
| parent | bf39d6abdc79179e5faedf6cae131425ff42510b (diff) | |
| parent | 29df4b5c60aed818949865b31ac696978e7f8965 (diff) | |
| download | forums-63bf9ef6f175e56f11e9298e5824880867934aa7.tar forums-63bf9ef6f175e56f11e9298e5824880867934aa7.tar.gz forums-63bf9ef6f175e56f11e9298e5824880867934aa7.tar.bz2 forums-63bf9ef6f175e56f11e9298e5824880867934aa7.tar.xz forums-63bf9ef6f175e56f11e9298e5824880867934aa7.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10228] Correct "trigger" to "triggered" in acp registration settings
| -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 ede66fd9bd..6044197cc0 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -472,7 +472,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', |