* Improve default value of "blockedtext"

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index fa5eb7f..eb97d30 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -65,6 +65,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 6660) Fix behaviour of EditPage::blockedPage() when the article does
   not exist; now doesn't show the source box if the user hasn't provided it
   (blocked mid-edit) and the page doesn't exist
+* Improve default value of "blockedtext"
 
 == Languages updated ==
 

diff --git a/languages/Messages.php b/languages/Messages.php
index e7783d2..2ca84c6 100644 (file)
--- a/languages/Messages.php
+++ b/languages/Messages.php
@@ -466,13 +466,13 @@ format. Please enter a well-formatted address or empty that field.',
 'missingsummary' => "'''Reminder:''' You have not provided an edit summary. If you click Save again, your edit will be saved without one.",
 'missingcommenttext' => 'Please enter a comment below.',
 'blockedtitle' => 'User is blocked',
-'blockedtext'  => 'Your user name or IP address has been blocked by $1.
-The reason given is this:<br />\'\'$2\'\'<br />You may contact $1 or one of the other
-[[{{ns:project}}:Administrators|administrators]] to discuss the block.
+'blockedtext' => "<big>'''Your user name or IP address has been blocked.'''</big>
 
-Note that you may not use the "e-mail this user" feature unless you have a valid e-mail address registered in your [[Special:Preferences|user preferences]].
+The block was made by $1. The reason given is ''$2''.
 
-Your IP address is $3. Please include this address in any queries you make.',
+You can contact $1 or another [[{{ns:project}}:Administrators|administrator]] to discuss the block.
+You cannot use the 'email this user' feature unless a valid email address is specified in your
+[[Special:Preferences|account preferences]]. Your current IP address is $3. Please include this in any queries.",
 'blockedoriginalsource' => "The source of '''$1''' is shown below:",
 'blockededitsource' => "The text of '''your edits''' to '''$1''' is shown below:",
 'whitelistedittitle' => 'Login required to edit',