From: Siebrand Mazeland <siebrand@users.mediawiki.org>
Date: Wed, 26 Mar 2008 08:51:48 +0000 (+0000)
Subject: * Add messages added in r32449 to messages.inc
X-Git-Tag: 1.31.0-rc.0~48801
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=1dafe4c4cbcc594f61e16a58b670c62c0349089c;p=lhc%2Fweb%2Fwiklou.git

* Add messages added in r32449 to messages.inc
* rebuild MessagesEn.php
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1a4a2c56c4..6e02072fd6 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -2885,31 +2885,31 @@ Others will be hidden by default.
 'monthsall'        => 'all',
 
 # E-mail address confirmation
-'confirmemail'            => 'Confirm E-mail address',
-'confirmemail_noemail'    => 'You do not have a valid email address set in your [[Special:Preferences|user preferences]].',
-'confirmemail_text'       => '{{SITENAME}} requires that you validate your e-mail address before using e-mail features.
+'confirmemail'             => 'Confirm E-mail address',
+'confirmemail_noemail'     => 'You do not have a valid email address set in your [[Special:Preferences|user preferences]].',
+'confirmemail_text'        => '{{SITENAME}} requires that you validate your e-mail address before using e-mail features.
 Activate the button below to send a confirmation mail to your address.
 The mail will include a link containing a code;
 load the link in your browser to confirm that your e-mail address is valid.',
-'confirmemail_pending'    => '<div class="error">A confirmation code has already been e-mailed to you;
+'confirmemail_pending'     => '<div class="error">A confirmation code has already been e-mailed to you;
 if you recently created your account, you may wish to wait a few minutes for it to arrive before trying to request a new code.</div>',
-'confirmemail_send'       => 'Mail a confirmation code',
-'confirmemail_sent'       => 'Confirmation e-mail sent.',
-'confirmemail_oncreate'   => 'A confirmation code was sent to your e-mail address.
+'confirmemail_send'        => 'Mail a confirmation code',
+'confirmemail_sent'        => 'Confirmation e-mail sent.',
+'confirmemail_oncreate'    => 'A confirmation code was sent to your e-mail address.
 This code is not required to log in, but you will need to provide it before enabling any e-mail-based features in the wiki.',
-'confirmemail_sendfailed' => 'Could not send confirmation mail.
+'confirmemail_sendfailed'  => 'Could not send confirmation mail.
 Check address for invalid characters.
 
 Mailer returned: $1',
-'confirmemail_invalid'    => 'Invalid confirmation code.
+'confirmemail_invalid'     => 'Invalid confirmation code.
 The code may have expired.',
-'confirmemail_needlogin'  => 'You need to $1 to confirm your email address.',
-'confirmemail_success'    => 'Your e-mail address has been confirmed.
+'confirmemail_needlogin'   => 'You need to $1 to confirm your email address.',
+'confirmemail_success'     => 'Your e-mail address has been confirmed.
 You may now log in and enjoy the wiki.',
-'confirmemail_loggedin'   => 'Your e-mail address has now been confirmed.',
-'confirmemail_error'      => 'Something went wrong saving your confirmation.',
-'confirmemail_subject'    => '{{SITENAME}} e-mail address confirmation',
-'confirmemail_body'       => 'Someone, probably you, from IP address $1,
+'confirmemail_loggedin'    => 'Your e-mail address has now been confirmed.',
+'confirmemail_error'       => 'Something went wrong saving your confirmation.',
+'confirmemail_subject'     => '{{SITENAME}} e-mail address confirmation',
+'confirmemail_body'        => 'Someone, probably you, from IP address $1,
 has registered an account "$2" with this e-mail address on {{SITENAME}}.
 
 To confirm that this account really does belong to you and activate
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index a1f1f10db3..c829e6650f 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2216,6 +2216,8 @@ $wgMessageStructure = array(
 		'confirmemail_error',
 		'confirmemail_subject',
 		'confirmemail_body',
+		'confirmemail_invalidated',
+		'invalidateemail',
 	),
 	'scarytransclusion' => array(
 		'scarytranscludedisabled',