aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDhruv <dhruv.goel92@gmail.com>2013-04-25 21:05:02 +0530
committerDhruv <dhruv.goel92@gmail.com>2013-04-25 21:05:02 +0530
commitd242b7a1a5c9b6ecc8bc21027a33bc344501a0ce (patch)
tree16a6491af590d3095bbaae46f997ced813f91d90 /phpBB
parent419aaa402f025d16e8b823586e32917d1d036599 (diff)
downloadforums-d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce.tar
forums-d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce.tar.gz
forums-d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce.tar.bz2
forums-d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce.tar.xz
forums-d242b7a1a5c9b6ecc8bc21027a33bc344501a0ce.zip
[ticket/10325] fix language in acp and ucp
PHPBB3-10325
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/language/en/acp/board.php2
-rw-r--r--phpBB/language/en/ucp.php2
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index c084779a26..39ad5b78bb 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -455,7 +455,7 @@ $lang = array_merge($lang, array(
'ALLOW_AUTOLOGIN' => 'Allow "Remember Me" logins',
'ALLOW_AUTOLOGIN_EXPLAIN' => 'Determines whether users are given "Remember Me" option when they visit the board.',
'ALLOW_PASSWORD_RESET' => 'Allow "forgot password"',
- 'ALLOW_PASSWORD_RESET_EXPLAIN' => 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. This feature can be disabled when using an external authentication plugin.',
+ 'ALLOW_PASSWORD_RESET_EXPLAIN' => 'Determines whether or not users are able to use the "I forgot my password" link on the login page to recover their account. If you use an external authentication mechanism you may wish to disable this feature.',
'AUTOLOGIN_LENGTH' => '"Remember Me" login key expiration length (in days)',
'AUTOLOGIN_LENGTH_EXPLAIN' => 'Number of days after which "Remember Me" login keys are removed or zero to disable.',
'BROWSER_VALID' => 'Validate browser',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 920dfaf176..372e44a94d 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -521,7 +521,7 @@ $lang = array_merge($lang, array(
'UCP_USERGROUPS_MEMBER' => 'Edit memberships',
'UCP_USERGROUPS_MANAGE' => 'Manage groups',
- 'UCP_PASSWORD_RESET_DISABLED' => 'The administrator has disabled the password reset ability. If you need help accessing your account, please contact the %sBoard Administrator%s',
+ 'UCP_PASSWORD_RESET_DISABLED' => 'The administrator has disabled the password reset functionality. If you need help accessing your account, please contact the %sBoard Administrator%s',
'UCP_REGISTER_DISABLE' => 'Creating a new account is currently not possible.',
'UCP_REMIND' => 'Send password',
'UCP_RESEND' => 'Send activation email',