aboutsummaryrefslogtreecommitdiff
path: root/languages/en.php
diff options
context:
space:
mode:
authorCash Costello <cash.costello@gmail.com>2011-11-19 07:45:33 -0500
committerCash Costello <cash.costello@gmail.com>2011-11-19 07:45:33 -0500
commit7cc4c3139d8d75335bd7e9b21d99257ff8d3cc72 (patch)
treef8688102de01d684ac09ee660c3e9923b4c8ae8b /languages/en.php
parent75c00c55dd9cc2de4d97f829d9b47c99eb4ba287 (diff)
downloadelgg-7cc4c3139d8d75335bd7e9b21d99257ff8d3cc72.tar.gz
elgg-7cc4c3139d8d75335bd7e9b21d99257ff8d3cc72.tar.bz2
Fixes #641 users can submit email address to reset password
Diffstat (limited to 'languages/en.php')
-rw-r--r--languages/en.php10
1 files changed, 5 insertions, 5 deletions
diff --git a/languages/en.php b/languages/en.php
index af97e112d..1576ed73d 100644
--- a/languages/en.php
+++ b/languages/en.php
@@ -20,7 +20,7 @@ $english = array(
'login' => "Log in",
'loginok' => "You have been logged in.",
'loginerror' => "We couldn't log you in. Please check your credentials and try again.",
- 'login:empty' => "Username and password are required.",
+ 'login:empty' => "Username/email and password are required.",
'login:baduser' => "Unable to load your user account.",
'auth:nopams' => "Internal error. No user authentication method installed.",
@@ -222,8 +222,8 @@ $english = array(
'RegistrationException:EmptyPassword' => 'The password fields cannot be empty',
'RegistrationException:PasswordMismatch' => 'Passwords must match',
'LoginException:BannedUser' => 'You have been banned from this site and cannot log in',
- 'LoginException:UsernameFailure' => 'We could not log you in. Please check your username and password.',
- 'LoginException:PasswordFailure' => 'We could not log you in. Please check your username and password.',
+ 'LoginException:UsernameFailure' => 'We could not log you in. Please check your username/email and password.',
+ 'LoginException:PasswordFailure' => 'We could not log you in. Please check your username/email and password.',
'LoginException:AccountLocked' => 'Your account has been locked for too many log in failures.',
'LoginException:ChangePasswordFailure' => 'Failed current password check.',
@@ -531,7 +531,7 @@ $english = array(
'user:password:resetreq:success' => 'Successfully requested a new password, email sent',
'user:password:resetreq:fail' => 'Could not request a new password.',
- 'user:password:text' => 'To request a new password, enter your username below and click the Request button.',
+ 'user:password:text' => 'To request a new password, enter your username or email address below and click the Request button.',
'user:persistent' => 'Remember me',
@@ -1064,7 +1064,7 @@ Your password has been reset to: %s",
Somebody (from the IP address %s) has requested a new password for their account.
-If you requested this click on the link below, otherwise ignore this email.
+If you requested this, click on the link below. Otherwise ignore this email.
%s
",