Revert r42659 per revert of r42658 by aaron in r42664 by brion.

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index d676772..b2c7589 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -772,8 +772,6 @@ See [[Special:Version|version page]].',
 'anonnotice'                   => '-', # do not translate or duplicate this message to other languages
 'newsectionheaderdefaultlevel' => '== $1 ==', # do not translate or duplicate this message to other languages
 'red-link-title'               => '$1 (not yet written)',
-'protected-sub-allowed'        => "Some users '''cannot edit this page''' because it has been [$1 restricted] to prevent editing",
-'protected-sub-disallowed'     => "You '''cannot edit this page''' because it has been [$1 restricted] to prevent editing",
 
 # Short words for each namespace, by default used in the namespace tab in monobook
 'nstab-main'      => 'Page',
@@ -2128,7 +2126,6 @@ Each row contains links to the first and second redirect, as well as the target
 You can narrow down the view by selecting a log type, the user name (case-sensitive), or the affected page (also case-sensitive).',
 'logempty'             => 'No matching items in log.',
 'log-title-wildcard'   => 'Search titles starting with this text',
-'logshowhide-patrol'   => '$1 patrol log',
 
 # Special:AllPages
 'allpages'          => 'All pages',
@@ -3000,11 +2997,12 @@ This is probably caused by a link to a blacklisted external site.',
 'markedaspatrollederror-noautopatrol' => 'You are not allowed to mark your own changes as patrolled.',
 
 # Patrol log
-'patrol-log-page'   => 'Patrol log',
-'patrol-log-header' => 'This is a log of patrolled revisions.',
-'patrol-log-line'   => 'marked $1 of $2 patrolled $3',
-'patrol-log-auto'   => '(automatic)',
-'patrol-log-diff'   => 'r$1', # only translate this message to other languages if you have to change it
+'patrol-log-page'    => 'Patrol log',
+'patrol-log-header'  => 'This is a log of patrolled revisions.',
+'patrol-log-line'    => 'marked $1 of $2 patrolled $3',
+'patrol-log-auto'    => '(automatic)',
+'patrol-log-diff'    => 'r$1', # only translate this message to other languages if you have to change it
+'logshowhide-patrol' => '$1 patrol log',
 
 # Image deletion
 'deletedrevision'                 => 'Deleted old revision $1',

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index ee6f18a..a95a769 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -287,8 +287,6 @@ $wgMessageStructure = array(
                'anonnotice',
                'newsectionheaderdefaultlevel',
                'red-link-title',
-               'protected-sub-allowed',
-               'protected-sub-disallowed',
        ),
        'nstab' => array(
                'nstab-main',