Here we go again, this time for 'blocklist-nousertalk'

[lhc/web/wiklou.git] / maintenance / language / messages.inc

diff --git a/maintenance/language/messages.inc b/maintenance/language/messages.inc
index 1d9147e..ca22e3c 100644 (file)
--- a/maintenance/language/messages.inc
+++ b/maintenance/language/messages.inc
@@ -334,7 +334,6 @@ $wgMessageStructure = array(
                'cannotdelete',
                'badtitle',
                'badtitletext',
-               'perfdisabled',
                'perfcached',
                'perfcachedts',
                'querypage-no-updates',
@@ -370,7 +369,6 @@ $wgMessageStructure = array(
                'remembermypassword',
                'yourdomainname',
                'externaldberror',
-               'loginproblem',
                'login',
                'nav-login-createaccount',
                'loginprompt',
@@ -558,6 +556,12 @@ $wgMessageStructure = array(
                'permissionserrorstext-withaction',
                'recreate-deleted-warn',
                'deleted-notice',
+               'deletelog-fulllog',
+               'edit-hook-aborted',
+               'edit-gone-missing',
+               'edit-conflict',
+               'edit-no-change',
+               'edit-already-exists',
        ),
        'parserwarnings' => array(
                'expensive-parserfunction-warning',
@@ -581,8 +585,6 @@ $wgMessageStructure = array(
        'history' => array(
                'viewpagelogs',
                'nohistory',
-               'revnotfound',
-               'revnotfoundtext',
                'currentrev',
                'currentrev-asof',
                'revisionasof',
@@ -678,6 +680,7 @@ $wgMessageStructure = array(
                'mergehistory-invalid-destination',
                'mergehistory-autocomment',
                'mergehistory-comment',
+               'mergehistory-same-destination',
        ),
        'mergelog' => array(
                'mergelog',
@@ -1206,6 +1209,7 @@ $wgMessageStructure = array(
                'statistics-header-users',
                'statistics-articles',
                'statistics-pages',
+               'statistics-pages-tooltip',
                'statistics-files',
                'statistics-edits',
                'statistics-edits-average',
@@ -1214,6 +1218,7 @@ $wgMessageStructure = array(
                'statistics-jobqueue',
                'statistics-users',
                'statistics-users-active',
+               'statistics-users-active-tooltip',
                'statistics-mostpopular',
                'statistics-footer',
        ),
@@ -1311,6 +1316,7 @@ $wgMessageStructure = array(
                'listusers',
                'listusers-summary',
                'listusers-editsonly',
+               'usereditcount',
                'newpages',
                'newpages-summary',
                'newpages-username',
@@ -1375,6 +1381,9 @@ $wgMessageStructure = array(
                'special-categories-sort-count',
                'special-categories-sort-abc',
        ),
+       'deletedcontribs' => array(
+               'deletedcontributions',
+       ),
        'linksearch' => array(
                'linksearch',
                'linksearch-pat',
@@ -1490,7 +1499,7 @@ $wgMessageStructure = array(
                'enotif_anon_editor',
                'enotif_body',
        ),
-       'deleteprotectrev' => array(
+       'delete' => array(
                'deletepage',
                'confirm',
                'excontent',
@@ -1517,6 +1526,8 @@ $wgMessageStructure = array(
                'delete-edit-reasonlist',
                'delete-toobig',
                'delete-warning-toobig',
+       ),
+       'rollback' => array(
                'rollback',
                'rollback_short',
                'rollbacklink',
@@ -1527,12 +1538,16 @@ $wgMessageStructure = array(
                'revertpage',
                'rollback-success',
                'sessionfailure',
+       ),
+       'protect' => array(
                'protectlogpage',
                'protectlogtext',
                'protectedarticle',
                'modifiedarticleprotection',
                'unprotectedarticle',
+               'movedarticleprotection',
                'protect-title',
+               'prot_1movedto2',
                'protect-backlink',
                'protect-legend',
                'confirmprotect',
@@ -1561,6 +1576,8 @@ $wgMessageStructure = array(
                'protect-otherreason',
                'protect-otherreason-op',
                'protect-dropdown',
+               'protect-edit-reasonlist',
+               'protect-expiry-options',
                'restriction-type',
                'restriction-level',
                'minimum-size',
@@ -1684,6 +1701,7 @@ $wgMessageStructure = array(
                'ipbotherreason',
                'ipbhidename',
                'ipbwatchuser',
+               'ipballowusertalk',
                'badipaddress',
                'blockipsuccesssub',
                'blockipsuccesstext',
@@ -1709,6 +1727,7 @@ $wgMessageStructure = array(
                'noautoblockblock',
                'createaccountblock',
                'emailblock',
+               'blocklist-nousertalk',
                'ipblocklist-empty',
                'ipblocklist-no-results',
                'blocklink',
@@ -1716,6 +1735,7 @@ $wgMessageStructure = array(
                'contribslink',
                'autoblocker',
                'blocklogpage',
+               'blocklog-fulllog',
                'blocklogentry',
                'blocklogtext',
                'unblocklogentry',
@@ -1723,6 +1743,7 @@ $wgMessageStructure = array(
                'block-log-flags-nocreate',
                'block-log-flags-noautoblock',
                'block-log-flags-noemail',
+               'block-log-flags-nousertalk',
                'block-log-flags-angry-autoblock',
                'range_block_disabled',
                'ipb_expiry_invalid',
@@ -1739,6 +1760,7 @@ $wgMessageStructure = array(
                'sorbs',
                'sorbsreason',
                'sorbs_create_account_reason',
+               'cant-block-while-blocked',
        ),
        'developertools' => array(
                'lockdb',
@@ -1765,6 +1787,7 @@ $wgMessageStructure = array(
                'movepagetalktext',
                'movearticle',
                'movenotallowed',
+               'moverootuserpagesnotallowed',
                'newtitle',
                'move-watch',
                'movepagebtn',
@@ -2544,6 +2567,7 @@ $wgMessageStructure = array(
                'comma-separator',
                'colon-separator',
                'autocomment-prefix',
+               'pipe-separator',
        ),
        'imgmulti' => array(
                'imgmultipageprev',
@@ -2813,6 +2837,7 @@ XHTML id names.",
        'logpages'            => 'Special:Log',
        'allpages'            => 'Special:AllPages',
        'categories'          => 'Special:Categories',
+       'deletedcontribs'     => 'Special:DeletedContributions',
        'linksearch'          => 'Special:LinkSearch',
        'listusers'           => 'Special:ListUsers',
        'newuserlog'          => 'Special:Log/newusers',
@@ -2821,7 +2846,9 @@ XHTML id names.",
        'watchlist'           => 'Watchlist',
        'watching'            => 'Displayed when you click the "watch" button and it is in the process of watching',
        'enotif'              => '',
-       'deleteprotectrev'    => 'Delete/protect/revert',
+       'delete'              => 'Delete',
+       'rollback'            => 'Rollback',
+       'protect'             => 'Protect',
        'restrictions'        => 'Restrictions (nouns)',
        'restriction-levels'  => 'Restriction levels',
        'undelete'            => 'Undelete',
@@ -2948,6 +2975,7 @@ $wgMessageComments = array(
        'exif-orientation-8'          => '0th row: left; 0th column: bottom',
        'movepage-moved'              => 'The two titles are passed in plain text as $3 and $4 to allow additional goodies in the message.',
        'ipboptions'                  => 'display1:time1,display2:time2,...',
+       'protect-expiry-options'      => 'display1:time1,display2:time2,...',
        'metadata-fields'             => 'Do not translate list items',
        'version'                     => 'Not used as normal message but as header for the special page itself',
        'userrights'                  => 'Not used as normal message but as header for the special page itself',