Merge "Use a more standard "Forgot your password?" in userlogin-resetpassword-link"

diff --cc languages/messages/MessagesEn.php
index 7b62d29,35c5e57..6130bd8
--- 1/languages/messages/MessagesEn.php
--- 2/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@@ -1134,12 -1131,9 +1134,12 @@@ Do not forget to change your [[Special:
  'gotaccount'                      => 'Already have an account? $1.',
  'gotaccountlink'                  => 'Log in',
  'userlogin-resetlink'             => 'Forgotten your login details?',
- 'userlogin-resetpassword-link'    => 'Reset your password',
+ 'userlogin-resetpassword-link'    => 'Forgot your password?',
  'helplogin-url'                   => 'Help:Logging in',
  'userlogin-helplink'              => '[[{{MediaWiki:helplogin-url}}|Help with logging in]]',
 +'userlogin-loggedin'              => 'You are already logged in as {{GENDER:$1|$1}}.
 +Use the form below to log in as another user.',
 +'userlogin-createanother'         => 'Create another account',
  'createacct-join'                 => 'Enter your information below.',
  'createacct-another-join'         => "Enter the new account's information below.",
  'createacct-emailrequired'        => 'Email address',