From: Nemo bis <federicoleva@tiscali.it>
Date: Sat, 10 Aug 2013 11:51:42 +0000 (+0200)
Subject: Eliminate confusing redundancy in accmailtext
X-Git-Tag: 1.31.0-rc.0~18930^2
X-Git-Url: http://git.cyclocoop.org/%27.parametre_url%28%20%20%20generer_action_auteur%28%27charger_plugin%27%2C%20%27update_flux%27%29%2C%27update_flux%27%2C%20%27oui%27%29.%27?a=commitdiff_plain;h=a7f8a85d482fcd8bfde72e5f4f69658226133e40;p=lhc%2Fweb%2Fwiklou.git

Eliminate confusing redundancy in accmailtext

It's the same password for the same account as mentioned
in the line below; let's not add degrees of confusion.

Change-Id: I6b434509b673b69ae96ea4581a5194fe4b0780ab
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 75e3532a23..e68501f46e 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1434,9 +1434,7 @@ It may have been moved or deleted while you were viewing the page.',
 'loginreqlink'                     => 'log in',
 'loginreqpagetext'                 => 'You must $1 to view other pages.',
 'accmailtitle'                     => 'Password sent',
-'accmailtext'                      => "A randomly generated password for [[User talk:$1|$1]] has been sent to $2.
-
-The password for this new account can be changed on the ''[[Special:ChangePassword|change password]]'' page upon logging in.",
+'accmailtext'                      => "A randomly generated password for [[User talk:$1|$1]] has been sent to $2. It can be changed on the ''[[Special:ChangePassword|change password]]'' page upon logging in.",
 'newarticle'                       => '(New)',
 'newarticletext'                   => "You have followed a link to a page that does not exist yet.
 To create the page, start typing in the box below (see the [[{{MediaWiki:Helppage}}|help page]] for more info).