Revert r41364 -- broke 22 parser test cases with change of alt behavior.

[lhc/web/wiklou.git] / languages / messages / MessagesEn.php

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index e0f1d01..a6d1d47 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -835,7 +835,6 @@ It may have already been deleted by someone else.',
 'badtitle'             => 'Bad title',
 'badtitletext'         => 'The requested page title was invalid, empty, or an incorrectly linked inter-language or inter-wiki title.
 It may contain one or more characters which cannot be used in titles.',
-'perfdisabled'         => 'Sorry! This feature has been temporarily disabled because it slows the database down to the point that no one can use the wiki.',
 'perfcached'           => 'The following data is cached and may not be up to date.',
 'perfcachedts'         => 'The following data is cached, and was last updated $1.',
 'querypage-no-updates' => 'Updates for this page are currently disabled.
@@ -1190,6 +1189,14 @@ The deletion log for this page is provided here for convenience:",
 'deleted-notice'                   => 'This page has been deleted.
 The deletion log for the page is provided below for reference.',
 'deletelog-fulllog'                => 'View full log',
+'edit-hook-aborted'                => 'Edit aborted by hook.
+It gave no explanation.',
+'edit-gone-missing'                => 'Could not update the page.
+It appears to have been deleted.',
+'edit-conflict'                    => 'Edit conflict.',
+'edit-no-change'                   => 'Your edit was ignored, because no change was made to the text.',
+'edit-already-exists'              => 'Could not create a new page.
+It already exists.',
 
 # Parser/template warnings
 'expensive-parserfunction-warning'        => 'Warning: This page contains too many expensive parser function calls.
@@ -1608,6 +1615,7 @@ please see math/README to configure.',
 'right-suppressrevision'     => 'Review and restore revisions hidden from Sysops',
 'right-suppressionlog'       => 'View private logs',
 'right-block'                => 'Block other users from editing',
+'right-restrict'             => 'Restrict user from editing certain namespaces and pages',
 'right-blockemail'           => 'Block a user from sending email',
 'right-hideuser'             => 'Block a username, hiding it from the public',
 'right-ipblock-exempt'       => 'Bypass IP blocks, auto-blocks and range blocks',
@@ -2037,6 +2045,7 @@ Each row contains links to the first and second redirect, as well as the target
 'listusers'                       => 'User list',
 'listusers-summary'               => '', # do not translate or duplicate this message to other languages
 'listusers-editsonly'             => 'Show users with edits only',
+'usereditcount'                   => '$1 {{PLURAL:$1|edit|edits}}',
 'newpages'                        => 'New pages',
 'newpages-summary'                => '', # do not translate or duplicate this message to other languages
 'newpages-username'               => 'Username:',
@@ -2311,7 +2320,9 @@ See the [[Special:ProtectedPages|protected pages list]] for the list of currentl
 'protectedarticle'            => 'protected "[[$1]]"',
 'modifiedarticleprotection'   => 'changed protection level for "[[$1]]"',
 'unprotectedarticle'          => 'unprotected "[[$1]]"',
+'movedarticleprotection'      => 'moved protection settings from "[[$2]]" to "[[$1]]"',
 'protect-title'               => 'Change protection level for "$1"',
+'prot_1movedto2'              => '[[$1]] moved to [[$2]]',
 'protect-backlink'            => '← $1', # only translate this message to other languages if you have to change it
 'protect-legend'              => 'Confirm protection',
 'protectcomment'              => 'Comment:',
@@ -2348,6 +2359,7 @@ You can change this page's protection level, but it will not affect the cascadin
 ** Counter-productive edit warring
 ** High traffic page',
 'protect-edit-reasonlist'     => 'Edit protection reasons',
+'protect-expiry-options'      => '1 hour:1 hour,1 day:1 day,1 week:1 week,2 weeks:2 weeks,1 month:1 month,3 months:3 months,6 months:6 months,1 year:1 year,infinite:infinite', # display1:time1,display2:time2,...
 'restriction-type'            => 'Permission:',
 'restriction-level'           => 'Restriction level:',
 'minimum-size'                => 'Min size',
@@ -2493,6 +2505,7 @@ Fill in a specific reason below (for example, citing particular pages that were
 'ipbotherreason'                  => 'Other/additional reason:',
 'ipbhidename'                     => 'Hide username from the block log, active block list and user list',
 'ipbwatchuser'                    => "Watch this user's user and talk pages",
+'ipballowusertalk'                => 'Allow this user to edit own talk page while blocked',
 'badipaddress'                    => 'Invalid IP address',
 'blockipsuccesssub'               => 'Block succeeded',
 'blockipsuccesstext'              => '[[Special:Contributions/$1|$1]] has been blocked.<br />
@@ -2537,6 +2550,7 @@ See the [[Special:IPBlockList|IP block list]] for the list of currently operatio
 'block-log-flags-nocreate'        => 'account creation disabled',
 'block-log-flags-noautoblock'     => 'autoblock disabled',
 'block-log-flags-noemail'         => 'e-mail blocked',
+'block-log-flags-nousertalk'      => 'cannot edit own talk page',
 'block-log-flags-angry-autoblock' => 'enhanced autoblock enabled',
 'range_block_disabled'            => 'The sysop ability to create range blocks is disabled.',
 'ipb_expiry_invalid'              => 'Expiry time invalid.',