From f58c731c53f249e525e56bee0cb82b07c8a93ea3 Mon Sep 17 00:00:00 2001
From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Thu, 2 Dec 2010 08:03:00 +0000
Subject: [PATCH] Follow-up r77555: Remove unused message (used for extensions
 only) Tweak messages for consistency Update maintenance script

---
 languages/messages/MessagesEn.php | 14 +++++++-------
 maintenance/language/messages.inc | 12 ++++++++++++
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 78c593353a..d053baebe1 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -1950,6 +1950,7 @@ You can also choose to let others contact you through your user or talk page wit
 'right-override-export-depth' => 'Export pages including linked pages up to a depth of 5',
 'right-sendemail'             => 'Send e-mail to other users',
 'right-revisionmove'          => 'Move revisions',
+'right-disableaccount'        => 'Disable accounts',
 
 # User rights log
 'rightslog'      => 'User rights log',
@@ -4360,17 +4361,16 @@ This site is experiencing technical difficulties.',
 'sqlite-has-fts' => '$1 with full-text search support',
 'sqlite-no-fts'  => '$1 without full-text search support',
 
-## Special:DisableAccount
-'disableaccount-desc' => 'Allows administrators to disable individual accounts.',
-'right-disableaccount' => 'Disable accounts',
-'disableaccount' => 'Disable a user account',
-'disableaccount-user' => 'User name:',
+# Special:DisableAccount
+'disableaccount' => 'Disable an user account',
+'disableaccount-user' => 'Username:',
 'disableaccount-confirm' => "Disable this user account.
-The user will not be able to log in, reset their password, or receive email notifications.
+The user will not be able to log in, reset their password, or receive e-mail notifications.
 If the user is currently logged in anywhere, they will be immediately logged out.
 ''Note that disabling an account is not reversible without system administrator intervention.''",
 'disableaccount-mustconfirm' => 'You must confirm that you wish to disable this account.',
 'disableaccount-nosuchuser' => 'The user account "$1" does not exist.',
 'disableaccount-success' => 'The user account "$1" has been permanently disabled.',
-'disableaccount-logentry' => 'permanently disabled the user account [[$1]].',
+'disableaccount-logentry' => 'permanently disabled the user account [[$1]]',
 );
+
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 89cca9ec3c..95c35b0458 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -1113,6 +1113,7 @@ $wgMessageStructure = array(
 		'right-override-export-depth',
 		'right-sendemail',
 		'right-revisionmove',
+		'right-disableaccount',
 	),
 	'rightslog' => array(
 		'rightslog',
@@ -3227,6 +3228,16 @@ $wgMessageStructure = array(
 		'sqlite-has-fts',
 		'sqlite-no-fts',
 	),
+	'disableaccount' => array(
+		'disableaccount',
+		'disableaccount-user',
+		'disableaccount-confirm',
+		'disableaccount-mustconfirm',
+		'disableaccount-confirm',
+		'disableaccount-nosuchuser',
+		'disableaccount-success',
+		'disableaccount-logentry',
+	),
 );
 
 /** Comments for each block */
@@ -3439,4 +3450,5 @@ Variants for Chinese language",
 	'db-error-messages'     => 'Database error messages',
 	'html-forms'            => 'HTML forms',
 	'sqlite'                => 'SQLite database support',
+	'disableaccount'        => 'Special:DisableAccount',
 );
-- 
2.20.1