Reverting r22430 for now; I don't really like this keyword creep, and even if I did...

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

diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 1036a53..fa5edfe 100644 (file)
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -282,6 +282,8 @@ $magicWords = array(
        'img_center'             => array( 1,    'center', 'centre'       ),
        'img_framed'             => array( 1,    'framed', 'enframed', 'frame' ),
        'img_page'               => array( 1,    'page=$1', 'page $1'     ),
+       'img_upright'            => array( 1,    'upright', 'upright=$1', 'upright $1'  ),
+       'img_border'             => array( 1,    'border'                 ),
        'img_baseline'           => array( 1,    'baseline'               ),
        'img_sub'                => array( 1,    'sub'                    ),
        'img_super'              => array( 1,    'super', 'sup'           ),
@@ -663,7 +665,7 @@ parent class in order maintain consistency across languages.
 'redirectedfrom' => '(Redirected from $1)',
 'redirectpagesub' => 'Redirect page',
 'lastmodifiedat'               => 'This page was last modified $2, $1.',       //$1 date, $2 time
-'viewcount'            => 'This page has been accessed {{plural:$1|one time|$1 times}}.',
+'viewcount'            => 'This page has been accessed {{PLURAL:$1|one time|$1 times}}.',
 'copyright'    => 'Content is available under $1.',
 'protectedpage' => 'Protected page',
 'jumpto' => 'Jump to:',
@@ -1135,8 +1137,8 @@ undelete it again through this same interface, unless additional restrictions ar
 'revdelete-submit'            => 'Apply to selected revision',
 'revdelete-logentry'          => 'changed revision visibility of [[$1]]',
 'logdelete-logentry'          => 'changed event visibility of [[$1]]',
-'revdelete-logaction'         => '$1 {{plural:$1|revision|revisions}} set to mode $2',
-'logdelete-logaction'         => '$1 {{plural:$1|event|events}} to [[$3]] set to mode $2',
+'revdelete-logaction'         => '$1 {{PLURAL:$1|revision|revisions}} set to mode $2',
+'logdelete-logaction'         => '$1 {{PLURAL:$1|event|events}} to [[$3]] set to mode $2',
 'revdelete-success'           => 'Revision visibility successfully set.',
 'logdelete-success'           => 'Event visibility successfully set.',
 
@@ -1156,7 +1158,7 @@ hidden from Sysops. See the [[Special:Ipblocklist|IP block list]] for the list o
 'selectolderversionfordiff' => 'Select an older version for comparison',
 'compareselectedversions' => 'Compare selected versions',
 'editundo'     => 'undo',
-'diff-multi'   => "({{plural:$1|One intermediate revision|$1 intermediate revisions}} not shown.)",
+'diff-multi'   => "({{PLURAL:$1|One intermediate revision|$1 intermediate revisions}} not shown.)",
 
 # Search results
 #
@@ -1430,7 +1432,7 @@ created and by whom, and anything else you may know about it. If this is an imag
 #
 'imagelist'            => 'File list',
 'imagelist-summary' => '',
-'imagelisttext' => "Below is a list of '''$1''' {{plural:$1|file|files}} sorted $2.",
+'imagelisttext' => "Below is a list of '''$1''' {{PLURAL:$1|file|files}} sorted $2.",
 'imagelistforuser' => "This shows only images uploaded by $1.",
 'getimagelist' => 'fetching file list',
 'ilsubmit'             => 'Search',
@@ -1755,7 +1757,9 @@ at the bottom of the screen (deleting a content page also deletes the accompanyi
 'enotif_subject'       => '{{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED by $PAGEEDITOR',
 'enotif_lastvisited' => 'See $1 for all changes since your last visit.',
 'enotif_lastdiff' => 'See $1 to view this change.',
+'enotif_anon_editor' => 'anonymous user $1',
 'enotif_body' => 'Dear $WATCHINGUSERNAME,
+       
 
 The {{SITENAME}} page $PAGETITLE has been $CHANGEDORCREATED on $PAGEEDITDATE by $PAGEEDITOR, see $PAGETITLE_URL for the current version.
 
@@ -1895,9 +1899,9 @@ revision may have been restored or removed from the archive.",
 'undeletereset' => 'Reset',
 'undeletecomment' => 'Comment:',
 'undeletedarticle' => "restored \"[[$1]]\"",
-'undeletedrevisions' => "$1 {{plural:$1|revision|revisions}} restored",
-'undeletedrevisions-files' => "$1 {{plural:$1|revision|revisions}} and $2 {{plural:$2|file|files}} restored",
-'undeletedfiles' => "$1 {{plural:$1|file|files}} restored",
+'undeletedrevisions' => "$1 {{PLURAL:$1|revision|revisions}} restored",
+'undeletedrevisions-files' => "$1 {{PLURAL:$1|revision|revisions}} and $2 {{PLURAL:$2|file|files}} restored",
+'undeletedfiles' => "$1 {{PLURAL:$1|file|files}} restored",
 'cannotundelete' => 'Undelete failed; someone else may have undeleted the page first.',
 'undeletedpage' => "<big>'''$1 has been restored'''</big>
 
@@ -1963,10 +1967,10 @@ This should be done only to prevent vandalism, and in
 accordance with [[{{MediaWiki:policy-url}}|policy]].
 Fill in a specific reason below (for example, citing particular
 pages that were vandalized).",
-'ipaddress'            => 'IP Address',
-'ipadressorusername' => 'IP Address or username',
-'ipbexpiry'            => 'Expiry',
-'ipbreason'            => 'Reason',
+'ipaddress'            => 'IP Address:',
+'ipadressorusername' => 'IP Address or username:',
+'ipbexpiry'            => 'Expiry:',
+'ipbreason'            => 'Reason:',
 'ipbreasonotherlist'    => 'Other reason',
 
 // These are examples only. They can be translated but should be adjusted via
@@ -1988,10 +1992,10 @@ pages that were vandalized).",
 'ipbcreateaccount' => 'Prevent account creation',
 'ipbenableautoblock' => 'Automatically block the last IP address used by this user, and any subsequent IPs they try to edit from',
 'ipbsubmit'            => 'Block this user',
-'ipbother'             => 'Other time',
+'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,infinite:infinite',
 'ipbotheroption'       => 'other',
-'ipbotherreason'        => 'Other/additional reason',
+'ipbotherreason'        => 'Other/additional reason:',
 'ipbhidename'          => 'Hide username/IP from the block log, active block list and user list',
 'badipaddress' => 'Invalid IP address',
 'blockipsuccesssub' => 'Block succeeded',
@@ -2017,7 +2021,8 @@ to a previously blocked IP address or username.',
 'anononlyblock' => 'anon. only',
 'noautoblockblock' => 'autoblock disabled',
 'createaccountblock' => 'account creation blocked',
-'ipblocklistempty'     => 'The blocklist is empty or the requested IP address/username is not blocked.',
+'ipblocklist-empty'    => 'The blocklist is empty.',
+'ipblocklist-no-results'       => 'The requested IP address or username is not blocked.',
 'blocklink'            => 'block',
 'unblocklink'  => 'unblock',
 'contribslink' => 'contribs',
@@ -2912,6 +2917,11 @@ Please confirm that really want to recreate this page.',
 'livepreview-failed'  => "Live preview failed!\nTry normal preview.",
 'livepreview-error'   => "Failed to connect: $1 \"$2\"\nTry normal preview.",
 
+# Friendlier slave lag warnings
+'lag-warn-normal' => 'Changes newer than $1 seconds may not be shown in this list.',
+'lag-warn-high' => 'Due to high database server lag, changes newer than $1 seconds
+may not be shown in this list.',
+
 );
 
 ?>