From: Kevin Israel <pleasestand@live.com>
Date: Sat, 7 Dec 2013 10:11:51 +0000 (-0500)
Subject: Remove 5 unused block messages
X-Git-Tag: 1.31.0-rc.0~17720^2
X-Git-Url: http://git.cyclocoop.org/fichier?a=commitdiff_plain;h=71741409f60e0ee49b0427b2259a45e29c867ab4;p=lhc%2Fweb%2Fwiklou.git

Remove 5 unused block messages

Follows-up r83786 (78059976086f):
* blockip-title
* ipbreasonotherlist
* ipbotheroption
* ipbotherreason
* cant-block-while-blocked

Change-Id: Ic2bb1261dbc9a1fa46ed551159e8ce8ceff774bf
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index f03b60f882..f0b19869e7 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3265,7 +3265,6 @@ The latest block log entry is provided below for reference:',
 'unblock'                         => 'Unblock user',
 'unblock-summary'                 => '', # do not translate or duplicate this message to other languages
 'blockip'                         => 'Block user',
-'blockip-title'                   => 'Block user',
 'blockip-legend'                  => 'Block user',
 'blockiptext'                     => 'Use the form below to block write access from a specific IP address or username.
 This should be done only to prevent vandalism, and in accordance with [[{{MediaWiki:Policy-url}}|policy]].
@@ -3273,7 +3272,6 @@ Fill in a specific reason below (for example, citing particular pages that were
 'ipadressorusername'              => 'IP address or username:',
 'ipbexpiry'                       => 'Expiry:',
 'ipbreason'                       => 'Reason:',
-'ipbreasonotherlist'              => 'Other reason',
 'ipbreason-dropdown'              => '*Common block reasons
 ** Inserting false information
 ** Removing content from pages
@@ -3289,8 +3287,6 @@ Fill in a specific reason below (for example, citing particular pages that were
 'ipbsubmit'                       => 'Block this user',
 'ipbother'                        => 'Other time:',
 'ipboptions'                      => '2 hours:2 hours,1 day:1 day,3 days:3 days,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,indefinite:infinite',
-'ipbotheroption'                  => 'other',
-'ipbotherreason'                  => 'Other/additional reason:',
 'ipbhidename'                     => 'Hide username from edits and lists',
 'ipbwatchuser'                    => "Watch this user's user and talk pages",
 'ipb-disableusertalk'             => 'Prevent this user from editing their own talk page while blocked',
@@ -3385,7 +3381,6 @@ Please contact your Internet service provider or technical support of your organ
 'sorbs_create_account_reason'     => 'Your IP address is listed as an open proxy in the DNSBL used by {{SITENAME}}.
 You cannot create an account',
 'xffblockreason'                  => 'An IP address present in the X-Forwarded-For header, either yours or that of a proxy server you are using, has been blocked. The original block reason was: $1',
-'cant-block-while-blocked'        => 'You cannot block other users while you are blocked.',
 'cant-see-hidden-user'            => "The user you are trying to block has already been blocked and hidden.
 Since you do not have the hideuser right, you cannot see or edit the user's block.",
 'ipbblocked'                      => 'You cannot block or unblock other users because you are yourself blocked',
diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 6aeb3aee55..7bc5532605 100644
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -2249,13 +2249,11 @@ $wgMessageStructure = array(
 		'unblock',
 		'unblock-summary',
 		'blockip',
-		'blockip-title',
 		'blockip-legend',
 		'blockiptext',
 		'ipadressorusername',
 		'ipbexpiry',
 		'ipbreason',
-		'ipbreasonotherlist',
 		'ipbreason-dropdown',
 		'ipb-hardblock',
 		'ipbcreateaccount',
@@ -2264,8 +2262,6 @@ $wgMessageStructure = array(
 		'ipbsubmit',
 		'ipbother',
 		'ipboptions',
-		'ipbotheroption',
-		'ipbotherreason',
 		'ipbhidename',
 		'ipbwatchuser',
 		'ipb-disableusertalk',
@@ -2352,7 +2348,6 @@ $wgMessageStructure = array(
 		'sorbsreason',
 		'sorbs_create_account_reason',
 		'xffblockreason',
-		'cant-block-while-blocked',
 		'cant-see-hidden-user',
 		'ipbblocked',
 		'ipbnounblockself',