aboutsummaryrefslogtreecommitdiff
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-09 20:32:57 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-09 20:32:57 +0100
commit996e263cc2fc09744e3c48ba7fe00daf63128455 (patch)
tree4274892e00062291a293f87ef48589e8604d05c4 /phpBB
parentMerge pull request #5731 from marc1706/ticket/16204 (diff)
parentMerge pull request #5824 from rxu/ticket/16311 (diff)
downloadphpbb-996e263cc2fc09744e3c48ba7fe00daf63128455.tar.gz
phpbb-996e263cc2fc09744e3c48ba7fe00daf63128455.tar.bz2
phpbb-996e263cc2fc09744e3c48ba7fe00daf63128455.zip
Merge branch '3.3.x'
Diffstat (limited to 'phpBB')
-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 a01a4f1bd1..4aee52abbe 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -250,7 +250,7 @@ $lang = array_merge($lang, array(
'MIN_CHARS' => 'Min',
'NO_AUTH_PLUGIN' => 'No suitable auth plugin found.',
'PASSWORD_LENGTH' => 'Password length',
- 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum and maximum number of characters in passwords.',
+ 'PASSWORD_LENGTH_EXPLAIN' => 'Minimum number of characters in passwords. Note that the maximum number is not limited.',
'REG_LIMIT' => 'Registration attempts',
'REG_LIMIT_EXPLAIN' => 'Number of attempts users can make at solving the anti-spambot task before being locked out of that session.',
'USERNAME_ALPHA_ONLY' => 'Alphanumeric only',