aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-08-10 17:18:39 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-08-10 17:18:39 +0200
commitcefdf8bf19d764b7fef3d04383a41ed856af5503 (patch)
tree6a5233f23e3fecd7bfbfa220304317f9f561a709 /phpBB/language/en
parenteee18f3747592eb17ea1a16184c19e5cda1f500e (diff)
downloadforums-cefdf8bf19d764b7fef3d04383a41ed856af5503.tar
forums-cefdf8bf19d764b7fef3d04383a41ed856af5503.tar.gz
forums-cefdf8bf19d764b7fef3d04383a41ed856af5503.tar.bz2
forums-cefdf8bf19d764b7fef3d04383a41ed856af5503.tar.xz
forums-cefdf8bf19d764b7fef3d04383a41ed856af5503.zip
[ticket/11327] Finish up initial version of password reset system
PHPBB3-11327
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/ucp.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index 0a82e150ef..b0df497625 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -416,7 +416,8 @@ $lang = array_merge($lang, array(
'PASS_TYPE_SYMBOL_EXPLAIN' => 'Password must be between %1$s and %2$s long, must contain letters in mixed case, must contain numbers and must contain symbols.',
'PASSWORD' => 'Password',
'PASSWORD_ACTIVATED' => 'Your new password has been activated.',
- 'PASSWORD_UPDATED_IF_EXISTED' => 'If your account exists, a new password was sent to your registered email address. If you do not receive an email, it may be because you are banned, your account is not activated, or you are not allowed to change your password. Contact admin if any of those reasons apply. Also, check your spam filter.',
+ 'PASSWORD_RESET' => 'Your password has been successfully reset.',
+ 'PASSWORD_RESET_LINK_SENT' => 'If your account exists, a password reset link was sent to your registered email address. If you do not receive an email, it may be because you are banned, your account is not activated, you have requested multiple password resets within a short time frame, or you are not allowed to change your password. Contact an admin if any of those reasons apply. Also, please check your spam filter.',
'PERMISSIONS_RESTORED' => 'Successfully restored original permissions.',
'PERMISSIONS_TRANSFERRED' => 'Successfully transferred permissions from <strong>%s</strong>, you are now able to browse the board with this user’s permissions.<br />Please note that admin permissions were not transferred. You are able to revert to your permission set at any time.',
'PM_DISABLED' => 'Private messaging has been disabled on this board.',
@@ -464,6 +465,7 @@ $lang = array_merge($lang, array(
'REPLIED_MESSAGE' => 'Replied to message',
'REPLY_TO_ALL' => 'Reply to sender and all recipients.',
'REPORT_PM' => 'Report private message',
+ 'RESET_PASSWORD' => 'Reset password',
'RESET_TOKEN_EXPIRED_OR_INVALID' => 'The password reset token you supplied is invalid or has expired.',
'RESIGN_SELECTED' => 'Resign selected',
'RETURN_FOLDER' => '%1$sReturn to previous folder%2$s',
@@ -480,7 +482,6 @@ $lang = array_merge($lang, array(
'SAME_PASSWORD_ERROR' => 'The new password you entered is the same as your current password.',
'SEARCH_YOUR_POSTS' => 'Show your posts',
- 'SEND_PASSWORD' => 'Send password',
'SENT_AT' => 'Sent', // Used before dates in private messages
'SHOW_EMAIL' => 'Users can contact me by email',
'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit.',