Merge 'passwordreset-pretext' and 'passwordreset-text' messages
authorAlexandre Emsenhuber <ialex.wiki@gmail.com>
Thu, 18 Apr 2013 07:18:54 +0000 (09:18 +0200)
committerAlexandre Emsenhuber <ialex.wiki@gmail.com>
Wed, 29 May 2013 06:33:46 +0000 (08:33 +0200)
commit3305dc816289b1e72a8cb93769a371aec6c3fbca
treefb03e2af05c445dc53dd05723161a7ac28ef4633
parent5848c65876909259de2d226bcabd4c19c1289220
Merge 'passwordreset-pretext' and 'passwordreset-text' messages

It is confusing to have in the same two messages which can be interpreted
with different meanings. When there is more than one way of resetting a
password, two messages are being show to the user:
- 'passwordreset-pretext' saying to fill only one of the fields below
- 'passwordreset-text' saying to *complete* the form, which people
  can interpret as "fill all the fields below"

This already got changed at the English Wikipedia, see
https://en.wikipedia.org/wiki/Wikipedia:MediaWiki_messages/Archive_5#Special:PasswordReset_improvements
I think it's worth changing MediaWiki too.

Change-Id: Ia2f0c889959d11396411ba44ae595ffad5d498d2
includes/specials/SpecialPasswordReset.php
languages/messages/MessagesEn.php
languages/messages/MessagesQqq.php
maintenance/language/messages.inc