diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2013-05-08 08:23:11 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2013-05-08 08:23:11 -0400 |
| commit | 88d4964f0ee56f3c9dadc67c8e62b055568e6898 (patch) | |
| tree | ad51b323b6e0586159c87a34d80eb46434666f63 /phpBB/language/en/acp | |
| parent | 1a062c506412f4046a336701c8d4d53d45eac954 (diff) | |
| parent | 284011ebf256bffb9544493c7b82f90eeff4ae39 (diff) | |
| download | forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.gz forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.bz2 forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.tar.xz forums-88d4964f0ee56f3c9dadc67c8e62b055568e6898.zip | |
Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop
# By Dhruv
# Via Dhruv
* dhruvgoel92/ticket/10325:
[ticket/10325] move migration into a new file
[ticket/10325] fix acp language
[ticket/10325] use assert_response_success parts
[ticket/10325] fix language in acp and ucp
[ticket/10325] add assert_response_success in test
[ticket/10325] functional tests for forgot password functionality
[ticket/10325] add logout function in functional_test_case
[ticket/10325] fix language in acp and ucp
[ticket/10325] improve acp option language
[ticket/10325] fix language key
[ticket/10325] fix language variable
[ticket/10325] change language var
[ticket/10325] fix language
[ticket/10325] add new config value to database
[ticket/10325] trigger error if forgot password option disabled
[ticket/10325] add allow forgot password option in acp
Diffstat (limited to 'phpBB/language/en/acp')
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index f387158a0b..ce15dfefb4 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -454,6 +454,8 @@ $lang = array_merge($lang, array( 'ALL' => 'All', '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 password reset ("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. 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', |