aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2011-06-12 19:42:55 +0200
committerAndreas Fischer <bantu@phpbb.com>2011-06-12 19:42:55 +0200
commitecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c (patch)
treec4ec7e2e2df807d9d3f6c987e98506a552aee48e
parent9b469eb1637a42ba3819ef6a416313d4e0502af5 (diff)
parenta9d7c90f2aaa48cf1145e1a134bb5eb38ab4d724 (diff)
downloadforums-ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c.tar
forums-ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c.tar.gz
forums-ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c.tar.bz2
forums-ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c.tar.xz
forums-ecc9a7dd9bd4224a71dd54a0ced2d1576bc4d74c.zip
Merge branch 'develop-olympus' into develop
* develop-olympus: [ticket/10211] Add spce after dot in new language string
-rw-r--r--phpBB/language/en/acp/board.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 0800aa27b4..a23baab1f4 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -466,7 +466,7 @@ $lang = array_merge($lang, array(
'IP_VALID' => 'Session IP validation',
'IP_VALID_EXPLAIN' => 'Determines how much of the users IP is used to validate a session; <samp>All</samp> compares the complete address, <samp>A.B.C</samp> the first x.x.x, <samp>A.B</samp> the first x.x, <samp>None</samp> disables checking. On IPv6 addresses <samp>A.B.C</samp> compares the first 4 blocks and <samp>A.B</samp> the first 3 blocks.',
'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_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_USE_FORWARDED' => 'Limit login attempts by <var>X_FORWARDED_FOR</var> header',