diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2011-06-16 16:11:27 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2011-06-16 16:11:27 +0200 |
| commit | bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1 (patch) | |
| tree | e6f5a5d0d128ff612fd6679917890c8b07408bf1 /phpBB/language | |
| parent | aa0c70058b4deb4284d17ce961ccc9bf4cbe47e7 (diff) | |
| parent | 1d349ee5a8f41748ef3698b7948cb82911703bdc (diff) | |
| download | forums-bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1.tar forums-bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1.tar.gz forums-bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1.tar.bz2 forums-bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1.tar.xz forums-bd6e27d9c5ad686fa8ca9a5e355e08b76fb0e8d1.zip | |
Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
[ticket/10221] Append unit (seconds) after input field, remove from explanation
Diffstat (limited to 'phpBB/language')
| -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 556ad212c0..68474ee893 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -465,7 +465,7 @@ $lang = array_merge($lang, array( 'IP_LOGIN_LIMIT_MAX' => 'Maximum number of login attempts per IP address', 'IP_LOGIN_LIMIT_MAX_EXPLAIN' => 'The threshold of login attempts allowed from a single IP address before an anti-spambot task is triggered. Enter 0 to prevent the anti-spambot task from being triggered by IP addresses.', 'IP_LOGIN_LIMIT_TIME' => 'IP address login attempt expiration time', - 'IP_LOGIN_LIMIT_TIME_EXPLAIN' => 'Login attempts expire after this period, in seconds.', + 'IP_LOGIN_LIMIT_TIME_EXPLAIN' => 'Login attempts expire after this period.', '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', |