From: jenkins-bot Date: Wed, 6 Nov 2013 14:22:10 +0000 (+0000) Subject: Merge "Use a more standard "Forgot your password?" in userlogin-resetpassword-link" X-Git-Tag: 1.31.0-rc.0~18277 X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dcompta/comptes/journal.php?a=commitdiff_plain;h=12ddd4d9a2341d217789fc2137422a69f2a948f8;p=lhc%2Fweb%2Fwiklou.git Merge "Use a more standard "Forgot your password?" in userlogin-resetpassword-link" --- 12ddd4d9a2341d217789fc2137422a69f2a948f8 diff --cc languages/messages/MessagesEn.php index 7b62d29bfb,35c5e57aaf..6130bd88f8 --- a/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',