From: Siebrand Mazeland <s.mazeland@xs4all.nl>
Date: Mon, 25 Jun 2012 17:25:57 +0000 (+0000)
Subject: Change "blocked" to "disabled" for consistency.
X-Git-Tag: 1.31.0-rc.0~23238
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=020b6909d1ddf42222d8df607ee1ddd500441c90;p=lhc%2Fweb%2Fwiklou.git

Change "blocked" to "disabled" for consistency.

Change-Id: I47bc69d034965a10635390f4c72d4b80b184f61e
---

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 2b6259378f..181f44ac8c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -3196,8 +3196,8 @@ See the [[Special:BlockList|block list]] to review blocks.',
 'expiringblock'                   => 'expires on $1 at $2',
 'anononlyblock'                   => 'anon. only',
 'noautoblockblock'                => 'autoblock disabled',
-'createaccountblock'              => 'account creation blocked',
-'emailblock'                      => 'e-mail blocked',
+'createaccountblock'              => 'account creation disabled',
+'emailblock'                      => 'e-mail disabled',
 'blocklist-nousertalk'            => 'cannot edit own talk page',
 'ipblocklist-empty'               => 'The block list is empty.',
 'ipblocklist-no-results'          => 'The requested IP address or username is not blocked.',
@@ -3222,7 +3222,7 @@ See the [[Special:BlockList|block list]] for the list of currently operational b
 'block-log-flags-anononly'        => 'anonymous users only',
 'block-log-flags-nocreate'        => 'account creation disabled',
 'block-log-flags-noautoblock'     => 'autoblock disabled',
-'block-log-flags-noemail'         => 'e-mail blocked',
+'block-log-flags-noemail'         => 'e-mail disabled',
 'block-log-flags-nousertalk'      => 'cannot edit own talk page',
 'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled',
 'block-log-flags-hiddenname'      => 'username hidden',