Merge "Add appropriate OOjs UI icon pack dependencies for OOjs UI itself"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 6 Jun 2017 14:53:20 +0000 (14:53 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 6 Jun 2017 14:53:20 +0000 (14:53 +0000)
49 files changed:
CODE_OF_CONDUCT.md [new file with mode: 0644]
RELEASE-NOTES-1.30
docs/hooks.txt
includes/DefaultSettings.php
includes/EditPage.php
includes/api/ApiComparePages.php
includes/api/i18n/en.json
includes/api/i18n/hu.json
includes/api/i18n/pt.json
includes/api/i18n/qqq.json
includes/content/ContentHandler.php
includes/installer/i18n/lij.json
includes/libs/objectcache/WANObjectCache.php
includes/page/WikiPage.php
includes/parser/ParserCache.php
includes/parser/ParserOptions.php
includes/resourceloader/ResourceLoader.php
includes/resourceloader/ResourceLoaderOOUIFileModule.php
languages/i18n/atj.json
languages/i18n/be-tarask.json
languages/i18n/bn.json
languages/i18n/bs.json
languages/i18n/ca.json
languages/i18n/ce.json
languages/i18n/es.json
languages/i18n/hi.json
languages/i18n/hr.json
languages/i18n/ia.json
languages/i18n/ja.json
languages/i18n/jv.json
languages/i18n/ko.json
languages/i18n/lb.json
languages/i18n/nl.json
languages/i18n/pl.json
languages/i18n/qqq.json
languages/i18n/ru.json
languages/i18n/sah.json
languages/i18n/yo.json
languages/i18n/zh-hans.json
languages/i18n/zh-hant.json
phpcs.xml
resources/Resources.php
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
resources/src/mediawiki/mediawiki.Upload.Dialog.js
tests/phpunit/includes/api/ApiComparePagesTest.php [new file with mode: 0644]
tests/phpunit/includes/deferred/LinksUpdateTest.php
tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
tests/phpunit/includes/parser/ParserOptionsTest.php

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644 (file)
index 0000000..d8e5d08
--- /dev/null
@@ -0,0 +1 @@
+The development of this software is covered by a [Code of Conduct](https://www.mediawiki.org/wiki/Code_of_Conduct).
index 22fed0c..fa5c280 100644 (file)
@@ -23,6 +23,10 @@ production.
 * $wgExceptionHooks has been removed.
 * $wgShellLocale is now applied for all requests. wfInitShellLocale() is
   deprecated and a no-op, as it is no longer needed.
+* WikiPage::getParserOutput() will now throw an exception if passed
+  ParserOptions would pollute the parser cache. Callers should use
+  WikiPage::makeParserOptions() to create the ParserOptions object and only
+  change options that affect the parser cache key.
 
 === New features in 1.30 ===
 * (T37247) Output from Parser::parse() will now be wrapped in a div with
@@ -33,6 +37,8 @@ production.
 * File storage backends that supports headers (eg. Swift) now store an
   X-Content-Dimensions header for originals that contain the media's dimensions
   as page ranges keyed by dimensions.
+* Added a 'ParserOptionsRegister' hook to allow extensions to register
+  additional parser options.
 
 === Languages updated in 1.30 ===
 
@@ -60,6 +66,8 @@ production.
   the new 'wrapoutputclass' parameter.
 * When errorformat is not 'bc', abort reasons from action=login will be
   formatted as specified by the error formatter parameters.
+* action=compare can now handle arbitrary text, deleted revisions, and
+  returning users and edit comments.
 
 === Action API internal changes in 1.30 ===
 * …
index 62b22e1..0e8b508 100644 (file)
@@ -2417,7 +2417,8 @@ constructed.
 &$pager: the pager
 &$queryInfo: the query parameters
 
-'PageRenderingHash': Alter the parser cache option hash key. A parser extension
+'PageRenderingHash': NOTE: Consider using ParserOptionsRegister instead.
+Alter the parser cache option hash key. A parser extension
 which depends on user options should install this hook and append its values to
 the key.
 &$confstr: reference to a hash key string which can be modified
@@ -2541,6 +2542,16 @@ $file: file object that will be used to create the image
 &$params: 2-D array of parameters
 $parser: Parser object that called the hook
 
+'ParserOptionsRegister': Register additional parser options. Note that if you
+change the default value for an option, all existing parser cache entries will
+be invalid. To avoid bugs, you'll need to handle that somehow (e.g. with the
+RejectParserCacheValue hook) because MediaWiki won't do it for you.
+&$defaults: Set the default value for your option here.
+&$inCacheKey: To fragment the parser cache on your option, set a truthy value here.
+&$lazyLoad: To lazy-initialize your option, set it null in $defaults and set a
+  callable here. The callable is passed the ParserOptions object and the option
+  name.
+
 'ParserSectionCreate': Called each time the parser creates a document section
 from wikitext. Use this to apply per-section modifications to HTML (like
 wrapping the section in a DIV).  Caveat: DIVs are valid wikitext, and a DIV
index f7f52e5..5b7ca3e 100644 (file)
@@ -6765,7 +6765,7 @@ $wgUseRCPatrol = true;
 /**
  * Whether to allow users to save their RecentChanges filters
  */
-$wgStructuredChangeFiltersEnableSaving = false;
+$wgStructuredChangeFiltersEnableSaving = true;
 
 /**
  * Use new page patrolling to check new pages on Special:Newpages
index 20250d5..f79a286 100644 (file)
@@ -3059,7 +3059,7 @@ class EditPage {
                        'id' => 'wpSummary',
                        'name' => 'wpSummary',
                        'maxlength' => '200',
-                       'tabindex' => '1',
+                       'tabindex' => 1,
                        'size' => 60,
                        'spellcheck' => 'true',
                ] + Linker::tooltipAndAccesskeyAttribs( 'summary' );
index d6867eb..953bc10 100644 (file)
@@ -1,9 +1,5 @@
 <?php
 /**
- *
- * Created on May 1, 2011
- *
- * Copyright © 2011 Sam Reed
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 
 class ApiComparePages extends ApiBase {
 
+       private $guessed = false, $guessedTitle, $guessedModel, $props;
+
        public function execute() {
                $params = $this->extractRequestParams();
 
-               $rev1 = $this->revisionOrTitleOrId( $params['fromrev'], $params['fromtitle'], $params['fromid'] );
-               $rev2 = $this->revisionOrTitleOrId( $params['torev'], $params['totitle'], $params['toid'] );
+               // Parameter validation
+               $this->requireAtLeastOneParameter( $params, 'fromtitle', 'fromid', 'fromrev', 'fromtext' );
+               $this->requireAtLeastOneParameter( $params, 'totitle', 'toid', 'torev', 'totext', 'torelative' );
+
+               $this->props = array_flip( $params['prop'] );
+
+               // Cache responses publicly by default. This may be overridden later.
+               $this->getMain()->setCacheMode( 'public' );
+
+               // Get the 'from' Revision and Content
+               list( $fromRev, $fromContent, $relRev ) = $this->getDiffContent( 'from', $params );
 
-               $revision = Revision::newFromId( $rev1 );
+               // Get the 'to' Revision and Content
+               if ( $params['torelative'] !== null ) {
+                       if ( !$relRev ) {
+                               $this->dieWithError( 'apierror-compare-relative-to-nothing' );
+                       }
+                       switch ( $params['torelative'] ) {
+                               case 'prev':
+                                       // Swap 'from' and 'to'
+                                       $toRev = $fromRev;
+                                       $toContent = $fromContent;
+                                       $fromRev = $relRev->getPrevious();
+                                       $fromContent = $fromRev
+                                               ? $fromRev->getContent( Revision::FOR_THIS_USER, $this->getUser() )
+                                               : $toContent->getContentHandler()->makeEmptyContent();
+                                       if ( !$fromContent ) {
+                                               $this->dieWithError(
+                                                       [ 'apierror-missingcontent-revid', $fromRev->getId() ], 'missingcontent'
+                                               );
+                                       }
+                                       break;
+
+                               case 'next':
+                                       $toRev = $relRev->getNext();
+                                       $toContent = $toRev
+                                               ? $toRev->getContent( Revision::FOR_THIS_USER, $this->getUser() )
+                                               : $fromContent;
+                                       if ( !$toContent ) {
+                                               $this->dieWithError( [ 'apierror-missingcontent-revid', $toRev->getId() ], 'missingcontent' );
+                                       }
+                                       break;
+
+                               case 'cur':
+                                       $title = $relRev->getTitle();
+                                       $id = $title->getLatestRevID();
+                                       $toRev = $id ? Revision::newFromId( $id ) : null;
+                                       if ( !$toRev ) {
+                                               $this->dieWithError(
+                                                       [ 'apierror-missingrev-title', wfEscapeWikiText( $title->getPrefixedText() ) ], 'nosuchrevid'
+                                               );
+                                       }
+                                       $toContent = $toRev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
+                                       if ( !$toContent ) {
+                                               $this->dieWithError( [ 'apierror-missingcontent-revid', $toRev->getId() ], 'missingcontent' );
+                                       }
+                                       break;
+                       }
+                       $relRev2 = null;
+               } else {
+                       list( $toRev, $toContent, $relRev2 ) = $this->getDiffContent( 'to', $params );
+               }
 
-               if ( !$revision ) {
+               // Should never happen, but just in case...
+               if ( !$fromContent || !$toContent ) {
                        $this->dieWithError( 'apierror-baddiff' );
                }
 
-               $contentHandler = $revision->getContentHandler();
-               $de = $contentHandler->createDifferenceEngine( $this->getContext(),
-                       $rev1,
-                       $rev2,
-                       null, // rcid
-                       true,
-                       false );
+               // Get the diff
+               $context = new DerivativeContext( $this->getContext() );
+               if ( $relRev && $relRev->getTitle() ) {
+                       $context->setTitle( $relRev->getTitle() );
+               } elseif ( $relRev2 && $relRev2->getTitle() ) {
+                       $context->setTitle( $relRev2->getTitle() );
+               } else {
+                       $this->guessTitleAndModel();
+                       if ( $this->guessedTitle ) {
+                               $context->setTitle( $this->guessedTitle );
+                       }
+               }
+               $de = $fromContent->getContentHandler()->createDifferenceEngine(
+                       $context,
+                       $fromRev ? $fromRev->getId() : 0,
+                       $toRev ? $toRev->getId() : 0,
+                       /* $rcid = */ null,
+                       /* $refreshCache = */ false,
+                       /* $unhide = */ true
+               );
+               $de->setContent( $fromContent, $toContent );
+               $difftext = $de->getDiffBody();
+               if ( $difftext === false ) {
+                       $this->dieWithError( 'apierror-baddiff' );
+               }
 
+               // Fill in the response
                $vals = [];
-               if ( isset( $params['fromtitle'] ) ) {
-                       $vals['fromtitle'] = $params['fromtitle'];
-               }
-               if ( isset( $params['fromid'] ) ) {
-                       $vals['fromid'] = $params['fromid'];
+               $this->setVals( $vals, 'from', $fromRev );
+               $this->setVals( $vals, 'to', $toRev );
+
+               if ( isset( $this->props['rel'] ) ) {
+                       if ( $fromRev ) {
+                               $rev = $fromRev->getPrevious();
+                               if ( $rev ) {
+                                       $vals['prev'] = $rev->getId();
+                               }
+                       }
+                       if ( $toRev ) {
+                               $rev = $toRev->getNext();
+                               if ( $rev ) {
+                                       $vals['next'] = $rev->getId();
+                               }
+                       }
                }
-               $vals['fromrevid'] = $rev1;
-               if ( isset( $params['totitle'] ) ) {
-                       $vals['totitle'] = $params['totitle'];
+
+               if ( isset( $this->props['diffsize'] ) ) {
+                       $vals['diffsize'] = strlen( $difftext );
                }
-               if ( isset( $params['toid'] ) ) {
-                       $vals['toid'] = $params['toid'];
+               if ( isset( $this->props['diff'] ) ) {
+                       ApiResult::setContentValue( $vals, 'body', $difftext );
                }
-               $vals['torevid'] = $rev2;
 
-               $difftext = $de->getDiffBody();
+               $this->getResult()->addValue( null, $this->getModuleName(), $vals );
+       }
 
-               if ( $difftext === false ) {
-                       $this->dieWithError( 'apierror-baddiff' );
+       /**
+        * Guess an appropriate default Title and content model for this request
+        *
+        * Fills in $this->guessedTitle based on the first of 'fromrev',
+        * 'fromtitle', 'fromid', 'torev', 'totitle', and 'toid' that's present and
+        * valid.
+        *
+        * Fills in $this->guessedModel based on the Revision or Title used to
+        * determine $this->guessedTitle, or the 'fromcontentmodel' or
+        * 'tocontentmodel' parameters if no title was guessed.
+        */
+       private function guessTitleAndModel() {
+               if ( $this->guessed ) {
+                       return;
                }
 
-               ApiResult::setContentValue( $vals, 'body', $difftext );
+               $this->guessed = true;
+               $params = $this->extractRequestParams();
 
-               $this->getResult()->addValue( null, $this->getModuleName(), $vals );
+               foreach ( [ 'from', 'to' ] as $prefix ) {
+                       if ( $params["{$prefix}rev"] !== null ) {
+                               $revId = $params["{$prefix}rev"];
+                               $rev = Revision::newFromId( $revId );
+                               if ( !$rev ) {
+                                       // Titles of deleted revisions aren't secret, per T51088
+                                       $row = $this->getDB()->selectRow(
+                                               'archive',
+                                               array_merge(
+                                                       Revision::selectArchiveFields(),
+                                                       [ 'ar_namespace', 'ar_title' ]
+                                               ),
+                                               [ 'ar_rev_id' => $revId ],
+                                               __METHOD__
+                                       );
+                                       if ( $row ) {
+                                               $rev = Revision::newFromArchiveRow( $row );
+                                       }
+                               }
+                               if ( $rev ) {
+                                       $this->guessedTitle = $rev->getTitle();
+                                       $this->guessedModel = $rev->getContentModel();
+                                       break;
+                               }
+                       }
+
+                       if ( $params["{$prefix}title"] !== null ) {
+                               $title = Title::newFromText( $params["{$prefix}title"] );
+                               if ( $title && !$title->isExternal() ) {
+                                       $this->guessedTitle = $title;
+                                       break;
+                               }
+                       }
+
+                       if ( $params["{$prefix}id"] !== null ) {
+                               $title = Title::newFromID( $params["{$prefix}id"] );
+                               if ( $title ) {
+                                       $this->guessedTitle = $title;
+                                       break;
+                               }
+                       }
+               }
+
+               if ( !$this->guessedModel ) {
+                       if ( $this->guessedTitle ) {
+                               $this->guessedModel = $this->guessedTitle->getContentModel();
+                       } elseif ( $params['fromcontentmodel'] !== null ) {
+                               $this->guessedModel = $params['fromcontentmodel'];
+                       } elseif ( $params['tocontentmodel'] !== null ) {
+                               $this->guessedModel = $params['tocontentmodel'];
+                       }
+               }
        }
 
        /**
-        * @param int $revision
-        * @param string $titleText
-        * @param int $titleId
-        * @return int
+        * Get the Revision and Content for one side of the diff
+        *
+        * This uses the appropriate set of 'rev', 'id', 'title', 'text', 'pst',
+        * 'contentmodel', and 'contentformat' parameters to determine what content
+        * should be diffed.
+        *
+        * Returns three values:
+        * - The revision used to retrieve the content, if any
+        * - The content to be diffed
+        * - The revision specified, if any, even if not used to retrieve the
+        *   Content
+        *
+        * @param string $prefix 'from' or 'to'
+        * @param array $params
+        * @return array [ Revision|null, Content, Revision|null ]
         */
-       private function revisionOrTitleOrId( $revision, $titleText, $titleId ) {
-               if ( $revision ) {
-                       return $revision;
-               } elseif ( $titleText ) {
-                       $title = Title::newFromText( $titleText );
-                       if ( !$title || $title->isExternal() ) {
-                               $this->dieWithError( [ 'apierror-invalidtitle', wfEscapeWikiText( $titleText ) ] );
-                       }
-
-                       return $title->getLatestRevID();
-               } elseif ( $titleId ) {
-                       $title = Title::newFromID( $titleId );
+       private function getDiffContent( $prefix, array $params ) {
+               $title = null;
+               $rev = null;
+               $suppliedContent = $params["{$prefix}text"] !== null;
+
+               // Get the revision and title, if applicable
+               $revId = null;
+               if ( $params["{$prefix}rev"] !== null ) {
+                       $revId = $params["{$prefix}rev"];
+               } elseif ( $params["{$prefix}title"] !== null || $params["{$prefix}id"] !== null ) {
+                       if ( $params["{$prefix}title"] !== null ) {
+                               $title = Title::newFromText( $params["{$prefix}title"] );
+                               if ( !$title || $title->isExternal() ) {
+                                       $this->dieWithError(
+                                               [ 'apierror-invalidtitle', wfEscapeWikiText( $params["{$prefix}title"] ) ]
+                                       );
+                               }
+                       } else {
+                               $title = Title::newFromID( $params["{$prefix}id"] );
+                               if ( !$title ) {
+                                       $this->dieWithError( [ 'apierror-nosuchpageid', $params["{$prefix}id"] ] );
+                               }
+                       }
+                       $revId = $title->getLatestRevID();
+                       if ( !$revId ) {
+                               $revId = null;
+                               // Only die here if we're not using supplied text
+                               if ( !$suppliedContent ) {
+                                       if ( $title->exists() ) {
+                                               $this->dieWithError(
+                                                       [ 'apierror-missingrev-title', wfEscapeWikiText( $title->getPrefixedText() ) ], 'nosuchrevid'
+                                               );
+                                       } else {
+                                               $this->dieWithError(
+                                                       [ 'apierror-missingtitle-byname', wfEscapeWikiText( $title->getPrefixedText() ) ],
+                                                       'missingtitle'
+                                               );
+                                       }
+                               }
+                       }
+               }
+               if ( $revId !== null ) {
+                       $rev = Revision::newFromId( $revId );
+                       if ( !$rev && $this->getUser()->isAllowedAny( 'deletedtext', 'undelete' ) ) {
+                               // Try the 'archive' table
+                               $row = $this->getDB()->selectRow(
+                                       'archive',
+                                       array_merge(
+                                               Revision::selectArchiveFields(),
+                                               [ 'ar_namespace', 'ar_title' ]
+                                       ),
+                                       [ 'ar_rev_id' => $revId ],
+                                       __METHOD__
+                               );
+                               if ( $row ) {
+                                       $rev = Revision::newFromArchiveRow( $row );
+                                       $rev->isArchive = true;
+                               }
+                       }
+                       if ( !$rev ) {
+                               $this->dieWithError( [ 'apierror-nosuchrevid', $revId ] );
+                       }
+                       $title = $rev->getTitle();
+
+                       // If we don't have supplied content, return here. Otherwise,
+                       // continue on below with the supplied content.
+                       if ( !$suppliedContent ) {
+                               $content = $rev->getContent( Revision::FOR_THIS_USER, $this->getUser() );
+                               if ( !$content ) {
+                                       $this->dieWithError( [ 'apierror-missingcontent-revid', $revId ], 'missingcontent' );
+                               }
+                               return [ $rev, $content, $rev ];
+                       }
+               }
+
+               // Override $content based on supplied text
+               $model = $params["{$prefix}contentmodel"];
+               $format = $params["{$prefix}contentformat"];
+
+               if ( !$model && $rev ) {
+                       $model = $rev->getContentModel();
+               }
+               if ( !$model && $title ) {
+                       $model = $title->getContentModel();
+               }
+               if ( !$model ) {
+                       $this->guessTitleAndModel();
+                       $model = $this->guessedModel;
+               }
+               if ( !$model ) {
+                       $model = CONTENT_MODEL_WIKITEXT;
+                       $this->addWarning( [ 'apiwarn-compare-nocontentmodel', $model ] );
+               }
+
+               if ( !$title ) {
+                       $this->guessTitleAndModel();
+                       $title = $this->guessedTitle;
+               }
+
+               try {
+                       $content = ContentHandler::makeContent( $params["{$prefix}text"], $title, $model, $format );
+               } catch ( MWContentSerializationException $ex ) {
+                       $this->dieWithException( $ex, [
+                               'wrap' => ApiMessage::create( 'apierror-contentserializationexception', 'parseerror' )
+                       ] );
+               }
+
+               if ( $params["{$prefix}pst"] ) {
                        if ( !$title ) {
-                               $this->dieWithError( [ 'apierror-nosuchpageid', $titleId ] );
+                               $this->dieWithError( 'apierror-compare-no-title' );
+                       }
+                       $popts = ParserOptions::newFromContext( $this->getContext() );
+                       $content = $content->preSaveTransform( $title, $this->getUser(), $popts );
+               }
+
+               return [ null, $content, $rev ];
+       }
+
+       /**
+        * Set value fields from a Revision object
+        * @param array &$vals Result array to set data into
+        * @param string $prefix 'from' or 'to'
+        * @param Revision|null $rev
+        */
+       private function setVals( &$vals, $prefix, $rev ) {
+               if ( $rev ) {
+                       $title = $rev->getTitle();
+                       if ( isset( $this->props['ids'] ) ) {
+                               $vals["{$prefix}id"] = $title->getArticleId();
+                               $vals["{$prefix}revid"] = $rev->getId();
+                       }
+                       if ( isset( $this->props['title'] ) ) {
+                               ApiQueryBase::addTitleInfo( $vals, $title, $prefix );
+                       }
+                       if ( isset( $this->props['size'] ) ) {
+                               $vals["{$prefix}size"] = $rev->getSize();
                        }
 
-                       return $title->getLatestRevID();
+                       $anyHidden = false;
+                       if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                               $vals["{$prefix}texthidden"] = true;
+                               $anyHidden = true;
+                       }
+
+                       if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
+                               $vals["{$prefix}userhidden"] = true;
+                               $anyHidden = true;
+                       }
+                       if ( isset( $this->props['user'] ) &&
+                               $rev->userCan( Revision::DELETED_USER, $this->getUser() )
+                       ) {
+                               $vals["{$prefix}user"] = $rev->getUserText( Revision::RAW );
+                               $vals["{$prefix}userid"] = $rev->getUser( Revision::RAW );
+                       }
+
+                       if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
+                               $vals["{$prefix}commenthidden"] = true;
+                               $anyHidden = true;
+                       }
+                       if ( $rev->userCan( Revision::DELETED_COMMENT, $this->getUser() ) ) {
+                               if ( isset( $this->props['comment'] ) ) {
+                                       $vals["{$prefix}comment"] = $rev->getComment( Revision::RAW );
+                               }
+                               if ( isset( $this->props['parsedcomment'] ) ) {
+                                       $vals["{$prefix}parsedcomment"] = Linker::formatComment(
+                                               $rev->getComment( Revision::RAW ),
+                                               $rev->getTitle()
+                                       );
+                               }
+                       }
+
+                       if ( $anyHidden ) {
+                               $this->getMain()->setCacheMode( 'private' );
+                               if ( $rev->isDeleted( Revision::DELETED_RESTRICTED ) ) {
+                                       $vals["{$prefix}suppressed"] = true;
+                               }
+                       }
+
+                       if ( !empty( $rev->isArchive ) ) {
+                               $this->getMain()->setCacheMode( 'private' );
+                               $vals["{$prefix}archive"] = true;
+                       }
                }
-               $this->dieWithError( 'apierror-compare-inputneeded', 'inputneeded' );
        }
 
        public function getAllowedParams() {
-               return [
-                       'fromtitle' => null,
-                       'fromid' => [
+               // Parameters for the 'from' and 'to' content
+               $fromToParams = [
+                       'title' => null,
+                       'id' => [
                                ApiBase::PARAM_TYPE => 'integer'
                        ],
-                       'fromrev' => [
+                       'rev' => [
                                ApiBase::PARAM_TYPE => 'integer'
                        ],
-                       'totitle' => null,
-                       'toid' => [
-                               ApiBase::PARAM_TYPE => 'integer'
+                       'text' => [
+                               ApiBase::PARAM_TYPE => 'text'
                        ],
-                       'torev' => [
-                               ApiBase::PARAM_TYPE => 'integer'
+                       'pst' => false,
+                       'contentformat' => [
+                               ApiBase::PARAM_TYPE => ContentHandler::getAllContentFormats(),
                        ],
+                       'contentmodel' => [
+                               ApiBase::PARAM_TYPE => ContentHandler::getContentModels(),
+                       ]
                ];
+
+               $ret = [];
+               foreach ( $fromToParams as $k => $v ) {
+                       $ret["from$k"] = $v;
+               }
+               foreach ( $fromToParams as $k => $v ) {
+                       $ret["to$k"] = $v;
+               }
+
+               $ret = wfArrayInsertAfter(
+                       $ret,
+                       [ 'torelative' => [ ApiBase::PARAM_TYPE => [ 'prev', 'next', 'cur' ], ] ],
+                       'torev'
+               );
+
+               $ret['prop'] = [
+                       ApiBase::PARAM_DFLT => 'diff|ids|title',
+                       ApiBase::PARAM_TYPE => [
+                               'diff',
+                               'diffsize',
+                               'rel',
+                               'ids',
+                               'title',
+                               'user',
+                               'comment',
+                               'parsedcomment',
+                               'size',
+                       ],
+                       ApiBase::PARAM_ISMULTI => true,
+                       ApiBase::PARAM_HELP_MSG_PER_VALUE => [],
+               ];
+
+               return $ret;
        }
 
        protected function getExamplesMessages() {
index 9670260..ed3f25f 100644 (file)
        "apihelp-clientlogin-example-login": "Start the process of logging in to the wiki as user <kbd>Example</kbd> with password <kbd>ExamplePassword</kbd>.",
        "apihelp-clientlogin-example-login2": "Continue logging in after a <samp>UI</samp> response for two-factor auth, supplying an <var>OATHToken</var> of <kbd>987654</kbd>.",
 
-       "apihelp-compare-description": "Get the difference between 2 pages.\n\nA revision number, a page title, or a page ID for both \"from\" and \"to\" must be passed.",
+       "apihelp-compare-description": "Get the difference between two pages.\n\nA revision number, a page title, a page ID, text, or a relative reference for both \"from\" and \"to\" must be passed.",
        "apihelp-compare-param-fromtitle": "First title to compare.",
        "apihelp-compare-param-fromid": "First page ID to compare.",
        "apihelp-compare-param-fromrev": "First revision to compare.",
+       "apihelp-compare-param-fromtext": "Use this text instead of the content of the revision specified by <var>fromtitle</var>, <var>fromid</var> or <var>fromrev</var>.",
+       "apihelp-compare-param-frompst": "Do a pre-save transform on <var>fromtext</var>.",
+       "apihelp-compare-param-fromcontentmodel": "Content model of <var>fromtext</var>. If not supplied, it will be guessed based on the other parameters.",
+       "apihelp-compare-param-fromcontentformat": "Content serialization format of <var>fromtext</var>.",
        "apihelp-compare-param-totitle": "Second title to compare.",
        "apihelp-compare-param-toid": "Second page ID to compare.",
        "apihelp-compare-param-torev": "Second revision to compare.",
+       "apihelp-compare-param-torelative": "Use a revision relative to the revision determined from <var>fromtitle</var>, <var>fromid</var> or <var>fromrev</var>. All of the other 'to' options will be ignored.",
+       "apihelp-compare-param-totext": "Use this text instead of the content of the revision specified by <var>totitle</var>, <var>toid</var> or <var>torev</var>.",
+       "apihelp-compare-param-topst": "Do a pre-save transform on <var>totext</var>.",
+       "apihelp-compare-param-tocontentmodel": "Content model of <var>totext</var>. If not supplied, it will be guessed based on the other parameters.",
+       "apihelp-compare-param-tocontentformat": "Content serialization format of <var>totext</var>.",
+       "apihelp-compare-param-prop": "Which pieces of information to get.",
+       "apihelp-compare-paramvalue-prop-diff": "The diff HTML.",
+       "apihelp-compare-paramvalue-prop-diffsize": "The size of the diff HTML, in bytes.",
+       "apihelp-compare-paramvalue-prop-rel": "The revision IDs of the revision previous to 'from' and after 'to', if any.",
+       "apihelp-compare-paramvalue-prop-ids": "The page and revision IDs of the 'from' and 'to' revisions.",
+       "apihelp-compare-paramvalue-prop-title": "The page titles of the 'from' and 'to' revisions.",
+       "apihelp-compare-paramvalue-prop-user": "The user name and ID of the 'from' and 'to' revisions.",
+       "apihelp-compare-paramvalue-prop-comment": "The comment on the 'from' and 'to' revisions.",
+       "apihelp-compare-paramvalue-prop-parsedcomment": "The parsed comment on the 'from' and 'to' revisions.",
+       "apihelp-compare-paramvalue-prop-size": "The size of the 'from' and 'to' revisions.",
        "apihelp-compare-example-1": "Create a diff between revision 1 and 2.",
 
        "apihelp-createaccount-description": "Create a new user account.",
        "apierror-changeauth-norequest": "Failed to create change request.",
        "apierror-chunk-too-small": "Minimum chunk size is $1 {{PLURAL:$1|byte|bytes}} for non-final chunks.",
        "apierror-cidrtoobroad": "$1 CIDR ranges broader than /$2 are not accepted.",
-       "apierror-compare-inputneeded": "A title, a page ID, or a revision number is needed for both the <var>from</var> and the <var>to</var> parameters.",
+       "apierror-compare-no-title": "Cannot pre-save transform without a title. Try specifying <var>fromtitle</var> or <var>totitle</var>.",
+       "apierror-compare-relative-to-nothing": "No 'from' revision for <var>torelative</var> to be relative to.",
        "apierror-contentserializationexception": "Content serialization failed: $1",
        "apierror-contenttoobig": "The content you supplied exceeds the article size limit of $1 {{PLURAL:$1|kilobyte|kilobytes}}.",
        "apierror-copyuploadbaddomain": "Uploads by URL are not allowed from this domain.",
        "apierror-maxlag": "Waiting for $2: $1 {{PLURAL:$1|second|seconds}} lagged.",
        "apierror-mimesearchdisabled": "MIME search is disabled in Miser Mode.",
        "apierror-missingcontent-pageid": "Missing content for page ID $1.",
+       "apierror-missingcontent-revid": "Missing content for revision ID $1.",
        "apierror-missingparam-at-least-one-of": "{{PLURAL:$2|The parameter|At least one of the parameters}} $1 is required.",
        "apierror-missingparam-one-of": "{{PLURAL:$2|The parameter|One of the parameters}} $1 is required.",
        "apierror-missingparam": "The <var>$1</var> parameter must be set.",
        "apierror-missingrev-pageid": "No current revision of page ID $1.",
+       "apierror-missingrev-title": "No current revision of title $1.",
        "apierror-missingtitle-createonly": "Missing titles can only be protected with <kbd>create</kbd>.",
        "apierror-missingtitle": "The page you specified doesn't exist.",
        "apierror-missingtitle-byname": "The page $1 doesn't exist.",
        "apiwarn-badurlparam": "Could not parse <var>$1urlparam</var> for $2. Using only width and height.",
        "apiwarn-badutf8": "The value passed for <var>$1</var> contains invalid or non-normalized data. Textual data should be valid, NFC-normalized Unicode without C0 control characters other than HT (\\t), LF (\\n), and CR (\\r).",
        "apiwarn-checktoken-percentencoding": "Check that symbols such as \"+\" in the token are properly percent-encoded in the URL.",
+       "apiwarn-compare-nocontentmodel": "No content model could be determined, assuming $1.",
        "apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> has been deprecated. Please use <kbd>prop=deletedrevisions</kbd> or <kbd>list=alldeletedrevisions</kbd> instead.",
        "apiwarn-deprecation-expandtemplates-prop": "Because no values have been specified for the <var>prop</var> parameter, a legacy format has been used for the output. This format is deprecated, and in the future, a default value will be set for the <var>prop</var> parameter, causing the new format to always be used.",
        "apiwarn-deprecation-httpsexpected": "HTTP used when HTTPS was expected.",
index a48537c..cd6dd32 100644 (file)
        "apihelp-query+random-param-filterredir": "Szűrés átirányítások alapján.",
        "apihelp-query+random-example-simple": "Két lap visszaadása találomra a fő névtérből.",
        "apihelp-query+random-example-generator": "Lapinformációk lekérése két véletlenszerűen kiválasztott fő névtérbeli lapról.",
+       "apihelp-query+recentchanges-description": "A friss változtatások listázása.",
+       "apihelp-query+recentchanges-param-start": "Listázás ettől az időbélyegtől.",
+       "apihelp-query+recentchanges-param-end": "Listázás eddig az időbélyegig.",
+       "apihelp-query+recentchanges-param-namespace": "A változtatások szűrése ezekre a névterekre.",
+       "apihelp-query+recentchanges-param-user": "Csak ezen felhasználó szerkesztéseinek listázása.",
+       "apihelp-query+recentchanges-param-excludeuser": "Ezen felhasználó szerkesztéseinek kihagyása.",
+       "apihelp-query+recentchanges-param-tag": "Csak ezzel a címkével ellátott szerkesztések listázása.",
+       "apihelp-query+recentchanges-param-prop": "További információk visszaadása:",
+       "apihelp-query+recentchanges-paramvalue-prop-user": "A szerkesztést végrehajtó felhasználó, és hogy anonim-e.",
+       "apihelp-query+recentchanges-paramvalue-prop-userid": "A szerkesztést végrehajtó felhasználó azonosítója.",
+       "apihelp-query+recentchanges-paramvalue-prop-comment": "A szerkesztési összefoglaló.",
+       "apihelp-query+recentchanges-paramvalue-prop-timestamp": "A szerkesztés időbélyege.",
+       "apihelp-query+recentchanges-paramvalue-prop-title": "A szerkesztett lap címe.",
+       "apihelp-query+recentchanges-paramvalue-prop-ids": "A lapazonosító, frissváltoztatások-azonosító, valamint a régi és az új lapváltozat-azonosító.",
+       "apihelp-query+recentchanges-paramvalue-prop-sizes": "A lap régi és új hossza bájtban.",
+       "apihelp-query+recentchanges-paramvalue-prop-redirect": "A lap átirányítás-e.",
+       "apihelp-query+recentchanges-paramvalue-prop-patrolled": "Az ellenőrizhető (patrol) szerkesztések megjelölése ellenőrzöttként vagy ellenőrizetlenként.",
+       "apihelp-query+recentchanges-paramvalue-prop-loginfo": "Naplóinformációk (naplóazonosító, naplótípus stb.) a naplóbejegyzésekhez.",
+       "apihelp-query+recentchanges-paramvalue-prop-tags": "A változtatás címkéi.",
+       "apihelp-query+recentchanges-param-token": "Használd a <kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd> lekérdezést helyette.",
+       "apihelp-query+recentchanges-param-show": "Csak a kritériumoknak megfelelő elemek visszaadása. Például csak bejelentkezett felhasználók apró változtatásainak megtekintéséhez használd az <kbd>$1show=minor|!anon</kbd> értéket.",
+       "apihelp-query+recentchanges-param-limit": "A visszaadandó változások maximális száma.",
+       "apihelp-query+recentchanges-param-type": "A visszaadandó változások típusai.",
+       "apihelp-query+recentchanges-param-toponly": "Csak a lapok legfrissebb változtatásának visszaadása.",
+       "apihelp-query+recentchanges-example-simple": "Friss változtatások listázása.",
+       "apihelp-query+recentchanges-example-generator": "Lapinformációk lekérése az ellenőrizetlen változtatásokról (patrol).",
+       "apihelp-query+redirects-description": "A megadott lapokra mutató átirányítások lekérése.",
+       "apihelp-query+redirects-param-prop": "Lekérendő tulajdonságok:",
+       "apihelp-query+redirects-paramvalue-prop-pageid": "Az átirányítások lapazonosítói.",
+       "apihelp-query+redirects-paramvalue-prop-title": "Az átirányítások címei.",
+       "apihelp-query+redirects-param-namespace": "Lapok listázása csak ezekben a névterekben.",
+       "apihelp-query+redirects-param-limit": "A visszaadandó átirányítások száma.",
+       "apihelp-query+redirects-example-simple": "A [[Main Page]] lapra mutató átirányítások listázása.",
+       "apihelp-query+redirects-example-generator": "Információk lekérése a [[Main Page]] lapra mutató átirányításokról.",
+       "apihelp-query+revisions-paraminfo-singlepageonly": "Csak egyetlen lappal használható (2. mód).",
+       "apihelp-query+revisions-param-startid": "Listázás ennek a lapváltozatnak az időbélyegétől. A lapváltozatnak léteznie kell, de nem szükséges ehhez a laphoz tartoznia.",
+       "apihelp-query+revisions-param-endid": "Listázás ennek a lapváltozatnak az időbélyegéig. A lapváltozatnak léteznie kell, de nem szükséges ehhez a laphoz tartoznia.",
+       "apihelp-query+revisions-param-start": "Listázás ettől az időbélyegtől.",
+       "apihelp-query+revisions-param-end": "Listázás eddig az időbélyegig.",
+       "apihelp-query+revisions-param-user": "Csak ezen felhasználó szerkesztéseinek listázása.",
+       "apihelp-query+revisions-param-excludeuser": "Ezen felhasználó szerkesztéseinek kihagyása.",
+       "apihelp-query+revisions-param-tag": "Csak ezzel a címkével ellátott változatok listázása.",
+       "apihelp-query+revisions-param-token": "Az egyes lapváltozatokhoz lekérendő tokenek.",
+       "apihelp-query+revisions-example-content": "Adatok lekérése tartalommal az <kbd>API</kbd> és <kbd>Main Page</kbd> lapok legfrissebb változatáról.",
+       "apihelp-query+revisions-example-last5": "A <kbd>Main Page</kbd> 5 legfrissebb változatának lekérése.",
+       "apihelp-query+revisions-example-first5": "A <kbd>Main Page</kbd> első 5 változatának lekérése.",
+       "apihelp-query+revisions-example-first5-after": "A <kbd>Main Page</kbd> 2006. május 1-jét követő első 5 változatának lekérése.",
+       "apihelp-query+revisions-example-first5-not-localhost": "A <kbd>Main Page</kbd> első 5 változatának lekérése, amit nem <kbd>127.0.0.1</kbd> anonim felhasználó készített.",
+       "apihelp-query+revisions-example-first5-user": "A <kbd>Main Page</kbd> első 5 változatának lekérése, amit a <kbd>MediaWiki default</kbd> felhasználó készített.",
+       "apihelp-query+revisions+base-param-prop": "Az egyes lapváltozatokhoz lekérendő tulajdonságok:",
+       "apihelp-query+revisions+base-paramvalue-prop-ids": "A változat azonosítója.",
+       "apihelp-query+revisions+base-paramvalue-prop-timestamp": "A változat időbélyege.",
+       "apihelp-query+revisions+base-paramvalue-prop-user": "A változatot létrehozó felhasználó.",
+       "apihelp-query+revisions+base-paramvalue-prop-userid": "A változatot létrehozó felhasználó azonosítója.",
+       "apihelp-query+revisions+base-paramvalue-prop-size": "A változat hossza bájtban.",
+       "apihelp-query+revisions+base-paramvalue-prop-contentmodel": "A változat tartalommodell-azonosítója.",
+       "apihelp-query+revisions+base-paramvalue-prop-comment": "A szerkesztési összefoglaló.",
+       "apihelp-query+revisions+base-paramvalue-prop-content": "A változat szövege.",
+       "apihelp-query+revisions+base-paramvalue-prop-tags": "A változat címkéi.",
+       "apihelp-query+revisions+base-param-limit": "A visszaadandó változatok maximális száma.",
+       "apihelp-query+revisions+base-param-expandtemplates": "A sablonok kibontása a változat tartalmában (az <kbd>$1prop=content</kbd> paraméterrel együtt használandó).",
+       "apihelp-query+revisions+base-param-section": "Csak ezen szakasz tartalmának lekérése.",
+       "apihelp-query+search-description": "Teljes szöveges keresés végrehajtása.",
+       "apihelp-query+search-param-search": "Erre az értékre illeszkedő lapcímek és tartalom keresése. Használható lehet speciális keresési funkciók meghívására a wiki keresőmotorjától függően.",
+       "apihelp-query+search-param-namespace": "Keresés csak ezekben a névterekben.",
+       "apihelp-query+search-param-what": "A végrehajtandó keresési típus.",
+       "apihelp-query+search-param-info": "A visszaadandó metaadatok.",
+       "apihelp-query+search-param-prop": "Lekérendő tulajdonságok:",
+       "apihelp-query+search-paramvalue-prop-size": "A lap mérete bájtban.",
+       "apihelp-query+search-paramvalue-prop-wordcount": "A lap szószáma.",
+       "apihelp-query+search-paramvalue-prop-timestamp": "A lap utolsó szerkesztésének időbélyege.",
+       "apihelp-query+search-paramvalue-prop-redirecttitle": "Az illeszkedő átirányítás címe.",
+       "apihelp-query+search-paramvalue-prop-sectiontitle": "Az illeszkedő szakaszcím.",
+       "apihelp-query+search-paramvalue-prop-isfilematch": "A fájl tartalma illeszkedik-e.",
+       "apihelp-query+search-paramvalue-prop-score": "<span class=\"apihelp-deprecated\">Elavult és figyelmen kívül hagyva.</span>",
+       "apihelp-query+search-paramvalue-prop-hasrelated": "<span class=\"apihelp-deprecated\">Elavult és figyelmen kívül hagyva.</span>",
+       "apihelp-query+search-param-limit": "A visszaadandó lapok maximális száma.",
+       "apihelp-query+search-param-interwiki": "Interwiki-találatok befoglalása az eredménybe, ha elérhetők.",
+       "apihelp-query+search-param-backend": "A használandó keresőmotor, ha nem az alapértelmezett.",
+       "apihelp-query+search-param-enablerewrites": "A keresőkifejezés átírásának engedélyezése. Bizonyos keresőmotorok át tudják írni a keresőkifejezést egy jobb találatokat adónak ítéltre, például elgépelések javításával.",
+       "apihelp-query+search-example-simple": "Keresés a <kbd>meaning</kbd> szóra.",
+       "apihelp-query+search-example-text": "Keresés a <kbd>meaning</kbd> szóra a lapok szövegében.",
+       "apihelp-query+search-example-generator": "Lapinformációk lekérése a <kbd>meaning</kbd> szóra kapott találatokról.",
+       "apihelp-query+siteinfo-description": "Általános információk lekérése a wikiről.",
+       "apihelp-query+siteinfo-param-prop": "A lekérendő információk:",
+       "apihelp-query+siteinfo-paramvalue-prop-general": "Általános rendszerinformációk.",
+       "apihelp-query+siteinfo-paramvalue-prop-statistics": "Wikistatisztikák.",
+       "apihelp-query+siteinfo-paramvalue-prop-usergroups": "Felhasználócsoportok és jogaik.",
+       "apihelp-query+siteinfo-paramvalue-prop-libraries": "A wikin telepített függvénykönyvtárak.",
+       "apihelp-query+siteinfo-paramvalue-prop-extensions": "A wikin telepített kiterjesztések.",
+       "apihelp-query+siteinfo-paramvalue-prop-fileextensions": "A feltölthető fájlkiterjesztések (fájltípusok) listája.",
+       "apihelp-query+siteinfo-paramvalue-prop-rightsinfo": "A wiki szerzői jogi (licenc-) információi, ha elérhetők.",
+       "apihelp-query+siteinfo-paramvalue-prop-restrictions": "Információk az elérhető korlátozási (lapvédelmi) típusokról.",
+       "apihelp-query+siteinfo-paramvalue-prop-variables": "Az elérhető változónevek listája.",
+       "apihelp-query+siteinfo-paramvalue-prop-protocols": "A külső hivatkozásokban engedélyezett protokollok listája.",
+       "apihelp-query+siteinfo-paramvalue-prop-defaultoptions": "A felhasználói beállítások alapértelmezett értékei.",
+       "apihelp-query+siteinfo-param-filteriw": "Csak helyi vagy csak nem helyi interwikik visszaadása az interwikitérképben.",
+       "apihelp-query+siteinfo-param-numberingroup": "A egyes felhasználócsoportokba tartozó felhasználók számának listázása.",
+       "apihelp-query+siteinfo-example-simple": "Wikiinformációk lekérése.",
+       "apihelp-query+siteinfo-example-interwiki": "A helyi interwiki-előtagok listájának lekérése.",
+       "apihelp-query+tags-description": "Változtatáscímkék listázása.",
+       "apihelp-query+tags-param-limit": "A listázandó címkék maximális száma.",
+       "apihelp-query+tags-param-prop": "Lekérendő tulajdonságok:",
+       "apihelp-query+tags-paramvalue-prop-name": "A címke neve.",
+       "apihelp-query+tags-paramvalue-prop-displayname": "A címke rendszerüzenete.",
+       "apihelp-query+tags-paramvalue-prop-description": "A címke leírása.",
+       "apihelp-query+tags-paramvalue-prop-hitcount": "A címkével rendelkező lapváltozatok és naplóbejegyzések száma.",
+       "apihelp-query+tags-paramvalue-prop-defined": "A címke definiálva van-e.",
+       "apihelp-query+tags-example-simple": "Az elérhető címkék listázása.",
+       "apihelp-query+templates-description": "A megadott lapokra beillesztett összes lap visszaadása.",
+       "apihelp-query+templates-param-namespace": "Csak ezekben a névterekben található sablonok visszaadása.",
+       "apihelp-query+templates-param-limit": "A visszaadandó sablonok száma.",
+       "apihelp-query+templates-param-templates": "Csak ezen sablonok listázása. Annak ellenőrzésére alkalmas, hogy egy lap beilleszt-e egy adott sablont.",
+       "apihelp-query+templates-param-dir": "A listázás iránya.",
+       "apihelp-query+templates-example-simple": "A <kbd>Main Page</kbd> lapon használt sablonok lekérése.",
+       "apihelp-query+templates-example-generator": "Információk lekérése a <kbd>Main Page</kbd> lapon használt sablonlapokról.",
+       "apihelp-query+templates-example-namespaces": "A <kbd>Main Page</kbd> lapon használt {{ns:user}} és {{ns:template}} névtérbeli sablonok lekérése.",
+       "apihelp-query+tokens-description": "Tokenek lekérése adatmódosító műveletekhez.",
+       "apihelp-query+tokens-param-type": "Lekérendő tokentípusok.",
+       "apihelp-query+tokens-example-simple": "Egy csrf token lekérése (alapértelmezett).",
+       "apihelp-query+tokens-example-types": "Egy watch és egy patrol token lekérése.",
+       "apihelp-query+transcludedin-description": "A megadott lapokat beillesztő lapok lekérése.",
+       "apihelp-query+transcludedin-param-prop": "Lekérendő tulajdonságok:",
+       "apihelp-query+transcludedin-paramvalue-prop-pageid": "A lapok lapazonosítói.",
+       "apihelp-query+transcludedin-paramvalue-prop-title": "A lapok címei.",
+       "apihelp-query+transcludedin-paramvalue-prop-redirect": "Az átirányítások megjelölése.",
+       "apihelp-query+transcludedin-param-namespace": "Lapok listázása csak ezekben a névterekben.",
+       "apihelp-query+transcludedin-param-limit": "A visszaadandó lapok száma.",
+       "apihelp-query+transcludedin-param-show": "Szűrés az átirányítások alapján:\n;redirect: Csak átirányítások visszaadása.\n;!redirect: Átirányítások elrejtése.",
+       "apihelp-query+transcludedin-example-simple": "A <kbd>Main Page</kbd> lapot beillesztő lapok listájának lekérése.",
+       "apihelp-query+transcludedin-example-generator": "Információk lekérése a <kbd>Main Page</kbd> lapot beillesztő lapokról.",
+       "apihelp-query+usercontribs-description": "Egy felhasználó összes szerkesztésének lekérése.",
+       "apihelp-query+usercontribs-param-limit": "A visszaadott szerkesztések maximális száma.",
+       "apihelp-query+usercontribs-param-start": "Visszaadás ettől az időbélyegtől.",
+       "apihelp-query+usercontribs-param-end": "Visszaadás eddig az időbélyegig.",
+       "apihelp-query+usercontribs-param-namespace": "Szerkesztések listázása csak ezekben a névterekben.",
+       "apihelp-query+usercontribs-param-prop": "További információk visszaadása:",
+       "apihelp-query+usercontribs-paramvalue-prop-ids": "A lap- és lapváltozat-azonosító.",
+       "apihelp-query+usercontribs-paramvalue-prop-title": "A lap címe és névterének azonosítója.",
+       "apihelp-query+usercontribs-paramvalue-prop-timestamp": "A szerkesztés időbélyege.",
+       "apihelp-query+usercontribs-paramvalue-prop-comment": "A szerkesztési összefoglaló.",
+       "apihelp-query+usercontribs-paramvalue-prop-size": "A szerkesztett lap új mérete.",
+       "apihelp-query+usercontribs-paramvalue-prop-patrolled": "Az ellenőrzött szerkesztések megjelölése (patrol).",
+       "apihelp-query+usercontribs-paramvalue-prop-tags": "A szerkesztés címkéi.",
+       "apihelp-query+usercontribs-param-show": "Csak a kritériumoknak megfelelő szerkesztések mutatása, pl. csak nem apró szerkesztések: <kbd>$2show=!minor</kbd>.\n\nHa az <kbd>$2show=patrolled</kbd> vagy <kbd>$2show=!patrolled</kbd> meg van adva, a <var>[[mw:Special:MyLanguage/Manual:$wgRCMaxAge|$wgRCMaxAge]]</var>-nél ($1 másodperc) régebbi szerkesztések nem jelennek meg.",
+       "apihelp-query+usercontribs-param-tag": "Csak ezzel a címkével ellátott változatok listázása.",
+       "apihelp-query+usercontribs-param-toponly": "Csak a legfrissebbnek számító szerkesztések visszaadása.",
+       "apihelp-query+usercontribs-example-user": "<kbd>Example</kbd> szerkesztéseinek megjelenítése.",
+       "apihelp-query+usercontribs-example-ipprefix": "<kbd>192.0.2.</kbd> kezdetű IP-címek szerkesztéseinek megjelenítése.",
+       "apihelp-query+userinfo-description": "Információk lekérése az aktuális felhasználóról.",
+       "apihelp-query+userinfo-param-prop": "Visszaadandó információk:",
+       "apihelp-query+userinfo-paramvalue-prop-blockinfo": "Blokkolva van-e az aktuális felhasználó, és ha igen, akkor ki és miért blokkolta.",
+       "apihelp-query+userinfo-paramvalue-prop-groups": "A jelenlegi felhasználó összes csoportjának listája.",
+       "apihelp-query+userinfo-paramvalue-prop-groupmemberships": "A jelenlegi felhasználó explicit csoportjainak listája, az egyes csoporttagságok lejárati idejével.",
+       "apihelp-query+userinfo-paramvalue-prop-implicitgroups": "Azoknak a csoportoknak a listája, amiknek a jelenlegi felhasználó automatikusan tagja.",
+       "apihelp-query+userinfo-paramvalue-prop-rights": "A jelenlegi felhasználó jogosultságainak listája.",
+       "apihelp-query+userinfo-paramvalue-prop-changeablegroups": "A jelenlegi felhasználó által hozzáadható és eltávolítható csoportok listája.",
+       "apihelp-query+userinfo-paramvalue-prop-options": "A jelenlegi felhasználó beállításai.",
+       "apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Elavult.</span> A jelenlegi felhasználó beállításainak megváltoztatásához szükséges token lekérése.",
+       "apihelp-query+userinfo-paramvalue-prop-editcount": "A jelenlegi felhasználó szerkesztésszáma.",
+       "apihelp-query+userinfo-paramvalue-prop-ratelimits": "A jelenlegi felhasználóra érvényes sebességkorlátozások.",
+       "apihelp-query+userinfo-paramvalue-prop-realname": "A felhasználó valódi neve.",
+       "apihelp-query+userinfo-paramvalue-prop-email": "A felhasználó e-mail-címe és megerősítésének dátuma.",
+       "apihelp-query+userinfo-paramvalue-prop-registrationdate": "A felhasználó regisztrációjának dátuma.",
+       "apihelp-query+userinfo-paramvalue-prop-unreadcount": "A felhasználó figyelőlistáján levő olvasatlan lapok száma (legfeljebb $1; <samp>$2</samp> értéket ad vissza, ha több).",
+       "apihelp-query+userinfo-paramvalue-prop-centralids": "A felhasználó központi azonosítói és az összekapcsolási státusza.",
+       "apihelp-query+userinfo-param-attachedwiki": "A felhasználó össze van-e kapcsolva az ezen azonosítójú wikivel, az <kbd>$1prop=centralids</kbd> paraméterrel együtt használandó.",
+       "apihelp-query+userinfo-example-simple": "Információk lekérése az aktuális felhasználóról.",
+       "apihelp-query+userinfo-example-data": "További információk lekérése az aktuális felhasználóról.",
+       "apihelp-query+users-description": "Információk lekérése felhasználók listájáról.",
+       "apihelp-query+users-param-prop": "Visszaadandó információk:",
+       "apihelp-query+users-paramvalue-prop-blockinfo": "Blokkolva van-e a felhasználó, és ha igen, akkor ki és miért blokkolta.",
+       "apihelp-query+users-paramvalue-prop-groups": "A felhasználó összes csoportjának listája.",
+       "apihelp-query+users-paramvalue-prop-groupmemberships": "A felhasználó explicit csoportjainak listája, az egyes csoporttagságok lejárati idejével.",
+       "apihelp-query+users-paramvalue-prop-implicitgroups": "Azoknak a csoportoknak a listája, amiknek a felhasználó automatikusan tagja.",
+       "apihelp-query+users-paramvalue-prop-rights": "A felhasználó jogosultságainak listája.",
+       "apihelp-query+users-paramvalue-prop-editcount": "A felhasználó szerkesztésszáma.",
+       "apihelp-query+users-paramvalue-prop-registration": "A felhasználó regisztrációjának időbélyege.",
+       "apihelp-query+users-paramvalue-prop-emailable": "A felhasználó szeretne-e e-mailt fogadni a [[Special:Emailuser]] lapon keresztül.",
+       "apihelp-query+users-paramvalue-prop-gender": "A felhasználó neme („male”, „female” vagy „unknown”).",
+       "apihelp-query+users-paramvalue-prop-centralids": "A felhasználó központi azonosítói és az összekapcsolási státusza.",
+       "apihelp-query+users-paramvalue-prop-cancreate": "Létrehozható-e fiók az érvényes, de nem regisztrált felhasználóneveken.",
+       "apihelp-query+users-param-attachedwiki": "A felhasználó össze van-e kapcsolva az ezen azonosítójú wikivel, az <kbd>$1prop=centralids</kbd> paraméterrel együtt használandó.",
+       "apihelp-query+users-param-users": "A lekérendő felhasználók listája.",
+       "apihelp-query+users-param-userids": "A lekérendő felhasználók azonosítóinak listája.",
+       "apihelp-query+users-param-token": "Használd a <kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd> lekérdezést helyette.",
+       "apihelp-query+users-example-simple": "Információk lekérése <kbd>Example</kbd> felhasználóról.",
+       "apihelp-query+watchlist-description": "A felhasználó figyelőlistáján szereplő lapok friss változtatásainak lekérése.",
+       "apihelp-query+watchlist-param-allrev": "Egy lap összes változtatásának lekérése a megadott időszakból.",
+       "apihelp-query+watchlist-param-start": "Listázás ettől az időbélyegtől.",
+       "apihelp-query+watchlist-param-end": "Listázás eddig az időbélyegig.",
+       "apihelp-query+watchlist-param-namespace": "A változtatások szűrése ezekre a névterekre.",
+       "apihelp-query+watchlist-param-user": "Csak ezen felhasználó szerkesztéseinek listázása.",
+       "apihelp-query+watchlist-param-excludeuser": "Ezen felhasználó szerkesztéseinek kihagyása.",
+       "apihelp-query+watchlist-param-limit": "A kérésenként visszaadandó eredmények száma.",
+       "apihelp-query+watchlist-param-prop": "További lekérendő tulajdonságok:",
+       "apihelp-query+watchlist-paramvalue-prop-ids": "Lapváltozat- és lapazonosítók.",
+       "apihelp-query+watchlist-paramvalue-prop-title": "A lap címe.",
+       "apihelp-query+watchlist-paramvalue-prop-user": "A szerkesztést végrehajtó felhasználó.",
+       "apihelp-query+watchlist-paramvalue-prop-userid": "A szerkesztést végrehajtó felhasználó azonosítója.",
+       "apihelp-query+watchlist-paramvalue-prop-comment": "A szerkesztési összefoglaló.",
+       "apihelp-query+watchlist-paramvalue-prop-timestamp": "A szerkesztés időbélyege.",
+       "apihelp-query+watchlist-paramvalue-prop-patrol": "Az ellenőrzött szerkesztések megjelölése (patrol).",
+       "apihelp-query+watchlist-paramvalue-prop-sizes": "A lap régi és új hossza.",
+       "apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Annak időbélyege, amikor a felhasználó utoljára értesítést kapott a szerkesztésről.",
+       "apihelp-query+watchlist-param-show": "Csak a kritériumoknak megfelelő elemek visszaadása. Például csak bejelentkezett felhasználók apró változtatásainak megtekintéséhez használd az <kbd>$1show=minor|!anon</kbd> értéket.",
+       "apihelp-query+watchlist-param-type": "A megjelenítendő változtatások típusai:",
+       "apihelp-query+watchlist-paramvalue-type-edit": "Normál lapszerkesztések.",
+       "apihelp-query+watchlist-paramvalue-type-external": "Külső változtatások.",
+       "apihelp-query+watchlist-paramvalue-type-new": "Laplétrehozások.",
+       "apihelp-query+watchlist-paramvalue-type-log": "Naplóbejegyzések.",
+       "apihelp-query+watchlist-paramvalue-type-categorize": "Kategóriaváltoztatások.",
+       "apihelp-query+watchlist-param-owner": "A <var>$1token</var> paraméterrel együtt használandó egy másik felhasználó figyelőlistájának elérésére.",
+       "apihelp-query+watchlist-param-token": "Egy biztonsági token (elérhető a felhasználó [[Special:Preferences#mw-prefsection-watchlist|beállításaiban]]) egy másik felhasználó figyelőlistájának eléréséhez.",
+       "apihelp-query+watchlist-example-simple": "A jelenlegi felhasználó figyelőlistáján szereplő nemrég módosított lapok legfrissebb változatának listázása.",
+       "apihelp-query+watchlist-example-props": "További információk lekérése a jelenlegi felhasználó figyelőlistáján szereplő nemrég módosított lapok legfrissebb változatáról.",
+       "apihelp-query+watchlist-example-allrev": "További információk lekérése a jelenlegi felhasználó figyelőlistáján szereplő összes friss változtatásról.",
+       "apihelp-query+watchlist-example-generator": "Lapinformációk lekérése a jelenlegi felhasználó figyelőlistáján szereplő nemrég módosított lapokról.",
+       "apihelp-query+watchlist-example-generator-rev": "Lapváltozat-információk lekérése a jelenlegi felhasználó figyelőlistáján szereplő friss változtatásokról.",
+       "apihelp-query+watchlist-example-wlowner": "<kbd>Exapmle</kbd> felhasználó figyelőlistáján szereplő nemrég módosított lapok legfrissebb változatának listázása.",
+       "apihelp-query+watchlistraw-description": "A jelenlegi felhasználó figyelőlistáján szereplő összes lap lekérése.",
+       "apihelp-query+watchlistraw-param-namespace": "Lapok listázása csak ezekben a névterekben.",
+       "apihelp-query+watchlistraw-param-limit": "A kérésenként visszaadandó eredmények száma.",
+       "apihelp-query+watchlistraw-param-prop": "További lekérendő tulajdonságok:",
+       "apihelp-query+watchlistraw-paramvalue-prop-changed": "Annak időbélyege, amikor a felhasználó utoljára értesítést kapott a szerkesztésről.",
+       "apihelp-query+watchlistraw-param-show": "Csak a kritériumoknak megfelelő elemek listázása.",
+       "apihelp-query+watchlistraw-param-owner": "A <var>$1token</var> paraméterrel együtt használandó egy másik felhasználó figyelőlistájának elérésére.",
+       "apihelp-query+watchlistraw-param-token": "Egy biztonsági token (elérhető a felhasználó [[Special:Preferences#mw-prefsection-watchlist|beállításaiban]]) egy másik felhasználó figyelőlistájának eléréséhez.",
+       "apihelp-query+watchlistraw-param-dir": "A listázás iránya.",
+       "apihelp-query+watchlistraw-param-fromtitle": "Listázás ettől a címtől (névtérelőtaggal).",
+       "apihelp-query+watchlistraw-param-totitle": "Listázás eddig a címig (névtérelőtaggal).",
+       "apihelp-query+watchlistraw-example-simple": "A jelenlegi felhasználó figyelőlistáján szereplő lapok lekérése.",
+       "apihelp-query+watchlistraw-example-generator": "Lapinformációk lekérése a jelenlegi felhasználó figyelőlistáján szereplő lapokról.",
+       "apihelp-removeauthenticationdata-description": "A jelenlegi felhasználó hitelesítési adatainak eltávolítása.",
+       "apihelp-removeauthenticationdata-example-simple": "Kísérlet a jelenlegi felhasználó <kbd>FooAuthenticationRequest</kbd> kéréshez kapcsolódó adatainak eltávolítására.",
        "apihelp-userrights-param-userid": "Felhasználói azonosító.",
        "api-help-title": "MediaWiki API súgó",
        "api-help-lead": "Ez egy automatikusan generált MediaWiki API-dokumentációs lap.\n\nDokumentáció és példák: https://www.mediawiki.org/wiki/API",
index ee4f833..f938cea 100644 (file)
        "apierror-changeauth-norequest": "A criação do pedido de modificação falhou.",
        "apierror-chunk-too-small": "O tamanho de segmento mínimo é $1 {{PLURAL:$1|byte|bytes}} para segmentos que não sejam segmentos finais.",
        "apierror-cidrtoobroad": "Não são aceites intervalos CIDR $1 maiores do que /$2.",
+       "apierror-compare-inputneeded": "É necessário um título, um identificador de página, ou um número de revisão, tanto para o parâmetro <var>from</var> como para o parâmetro <var>to</var>.",
        "apierror-contentserializationexception": "A seriação do conteúdo falhou: $1",
        "apierror-contenttoobig": "O conteúdo que forneceu excede o tamanho máximo dos artigos que é $1 {{PLURAL:$1|kilobyte|kilobytes}}.",
        "apierror-copyuploadbaddomain": "Não são permitidos carregamentos por URL a partir deste domínio.",
        "apierror-integeroutofrange-abovemax": "<var>$1</var> não pode ultrapassar $2 (definido como $3) para utilizadores.",
        "apierror-integeroutofrange-belowminimum": "<var>$1</var> não pode ser inferior a $2 (definido como $3).",
        "apierror-invalidcategory": "O nome de categoria que introduziu não é válido.",
+       "apierror-invalid-chunk": "A posição mais o segmento atual ultrapassam o tamanho do ficheiro.",
        "apierror-invalidexpiry": "A hora de expiração \"$1\" é inválida.",
        "apierror-invalid-file-key": "Não é uma chave de ficheiro válida.",
        "apierror-invalidlang": "Código de língua inválido para o parâmetro <var>$1</var>.",
        "apierror-mustbeposted": "O módulo <kbd>$1</kbd> requer um pedido POST.",
        "apierror-mustpostparams": "{{PLURAL:$2|O seguinte parâmetro foi encontrado|Os seguintes parâmetros foram encontrados}} no texto da pesquisa, mas têm de estar no corpo do POST: $1.",
        "apierror-noapiwrite": "A edição desta wiki através da API foi impossibilitada. Certifique-se de que a declaração <code>$wgEnableWriteAPI=true;</code> está incluída no ficheiro <code>LocalSettings.php</code> da wiki.",
+       "apierror-nochanges": "Não foi pedida nenhuma mudança.",
+       "apierror-nodeleteablefile": "Essa versão antiga do ficheiro não existe.",
+       "apierror-no-direct-editing": "A edição direta através da API não é suportada para o modelo de conteúdo $1 usado por $2.",
+       "apierror-noedit-anon": "Os utilizadores anónimos não podem editar páginas.",
+       "apierror-noedit": "Não tem permissão para editar páginas.",
+       "apierror-noimageredirect-anon": "Os utilizadores anónimos não podem criar redirecionamentos de imagens.",
+       "apierror-noimageredirect": "Não tem permissão para criar redirecionamentos de imagens.",
+       "apierror-nosuchlogid": "Não existe nenhuma entrada de registo com o identificador $1.",
+       "apierror-nosuchpageid": "Não existe nenhuma página com o identificador $1.",
+       "apierror-nosuchrcid": "Não existe nenhuma mudança recente com o identificador $1.",
+       "apierror-nosuchrevid": "Não existe nenhuma revisão com o identificador $1.",
+       "apierror-nosuchsection": "Não existe nenhuma secção $1.",
+       "apierror-nosuchsection-what": "Não existe nenhuma secção $1 em $2.",
+       "apierror-nosuchuserid": "Não existe nenhum utilizador com o identificador $1.",
+       "apierror-notarget": "Não especificou um destino válido para esta operação.",
+       "apierror-notpatrollable": "A revisão r$1 não pode ser patrulhada porque é demasiado antiga.",
+       "apierror-nouploadmodule": "Não foi definido nenhum módulo de carregamento.",
+       "apierror-opensearch-json-warnings": "Os avisos não podem ser representados no formato OpenSearch JSON.",
+       "apierror-pagecannotexist": "O espaço nominal não permite páginas reais.",
+       "apierror-pagedeleted": "A página foi eliminada depois de obter a data e hora da mesma.",
+       "apierror-pagelang-disabled": "Nesta wiki não é permitido alterar a língua de uma página.",
+       "apierror-paramempty": "O parâmetro <var>$1</var> não pode estar vazio.",
+       "apierror-parsetree-notwikitext": "<kbd>prop=parsetree</kbd> só é suportado para conteúdo em texto wiki.",
+       "apierror-parsetree-notwikitext-title": "<kbd>prop=parsetree</kbd> só é suportado para conteúdo em texto wiki. A página $1 usa o modelo de conteúdo $2.",
+       "apierror-pastexpiry": "A data de expiração \"$1\" é uma data passada.",
+       "apierror-permissiondenied": "Não tem permissão para $1.",
+       "apierror-permissiondenied-generic": "Permissão negada.",
+       "apierror-permissiondenied-patrolflag": "Necessita ter a permissão <code>patrol</code> ou <code>patrolmarks</code> para solicitar a marca de patrulhado.",
+       "apierror-permissiondenied-unblock": "Não tem permissão para desbloquear utilizadores.",
+       "apierror-prefixsearchdisabled": "A pesquisa por prefixo está desativada no modo avarento.",
+       "apierror-promised-nonwrite-api": "O cabeçalho HTTP <code>Promise-Non-Write-API-Action</code> não pode ser enviado a módulos da API em modo de escrita.",
+       "apierror-protect-invalidaction": "O tipo de proteção \"$1\" é inválido.",
+       "apierror-protect-invalidlevel": "O nível de proteção \"$1\" é inválido.",
+       "apierror-ratelimited": "Excedeu a sua frequência limite de edições. Aguarde um pouco e tente novamente, por favor.",
+       "apierror-readapidenied": "Precisa de ter permissão de leitura para usar este módulo.",
+       "apierror-readonly": "A wiki está em modo exclusivo de leitura.",
+       "apierror-reauthenticate": "Não se autenticou recentemente nesta sessão. Volte a autenticar-se, por favor.",
+       "apierror-redirect-appendonly": "Tentou editar usando o modo de seguimento de redirecionamentos, que só pode ser usado em conjunto com <kbd>section=new</kbd>, <var>prependtext</var>, ou <var>appendtext</var>.",
+       "apierror-revdel-mutuallyexclusive": "Não pode usar o mesmo campo em <var>hide</var> e em <var>show</var>.",
+       "apierror-revdel-needtarget": "É necessário um título de destino para este tipo RevDel.",
+       "apierror-revdel-paramneeded": "É necessário pelo menos um valor para <var>hide</var> ou <var>show</var>.",
+       "apierror-revisions-badid": "Não foi encontrada nenhuma revisão para o parâmetro <var>$1</var>.",
+       "apierror-revisions-norevids": "O parâmetro <var>revids</var> não pode ser usado com as opções de listagem (<var>$1limit</var>, <var>$1startid</var>, <var>$1endid</var>, <kbd>$1dir=newer</kbd>, <var>$1user</var>, <var>$1excludeuser</var>, <var>$1start</var> e <var>$1end</var>).",
+       "apierror-revisions-singlepage": "Foi usado <var>titles</var>, <var>pageids</var> ou um gerador para fornecer diversas páginas, mas os parâmetros <var>$1limit</var>, <var>$1startid</var>, <var>$1endid</var>, <kbd>$1dir=newer</kbd>, <var>$1user</var>, <var>$1excludeuser</var>, <var>$1start</var> e <var>$1end</var> só podem ser usados sobre uma única página.",
+       "apierror-revwrongpage": "r$1 não é uma revisão de $2.",
+       "apierror-searchdisabled": "A pesquisa <var>$1</var> está desativada.",
+       "apierror-sectionreplacefailed": "Não foi possível combinar a secção atualizada.",
+       "apierror-sectionsnotsupported": "Secções não são suportadas pelo modelo de conteúdo $1.",
+       "apierror-sectionsnotsupported-what": "Secções não são suportadas por $1.",
+       "apierror-show": "Parâmetro incorreto - não podem ser fornecidos valores mutuamente exclusivos.",
+       "apierror-siteinfo-includealldenied": "Não é possível ver a informação de todos os servidores, a menos que <var>$wgShowHostNames</var> tenha o valor \"true\".",
+       "apierror-sizediffdisabled": "A diferença de tamanho está desativada no modo avarento.",
+       "apierror-spamdetected": "A sua edição foi recusada porque continha um fragmento de spam: <code>$1</code>.",
+       "apierror-specialpage-cantexecute": "Não tem permissão para ver os resultados desta página especial.",
+       "apierror-stashedfilenotfound": "O ficheiro não foi encontrado na área de ficheiros escondidos: $1.",
+       "apierror-stashedit-missingtext": "Não foi encontrado nenhum texto na área de ficheiros escondidos com a chave criptográfica fornecida.",
+       "apierror-stashfailed-complete": "O carregamento por segmentos já terminou. Para mais detalhes, verifique o estado.",
+       "apierror-stashfailed-nosession": "Não há nenhuma sessão de carregamento por segmentos com esta chave.",
+       "apierror-stashfilestorage": "Não foi possível armazenar na área de ficheiros escondidos o ficheiro enviado: $1.",
+       "apierror-stashinvalidfile": "Ficheiro escondido inválido.",
+       "apierror-stashnosuchfilekey": "A chave de ficheiro não existe: $1.",
+       "apierror-stashpathinvalid": "A chave de ficheiro tem um formato incorreto ou é inválida: $1.",
+       "apierror-stashwrongowner": "Proprietário incorreto: $1",
+       "apierror-stashzerolength": "O ficheiro tem comprimento zero e não foi possível armazená-lo na área de ficheiros escondidos: $1.",
        "apierror-systemblocked": "Foi automaticamente bloqueado pelo MediaWiki.",
+       "apierror-templateexpansion-notwikitext": "A expansão de predefinições só é suportada para conteúdo em texto wiki. A página $1 usa o modelo de conteúdo $2.",
+       "apierror-toofewexpiries": "{{PLURAL:$1|Foi fornecida $1 data e hora|Foram fornecidas $1 datas e horas}} de expiração quando {{PLURAL:$2|era necessária|eram necessárias}} $2.",
+       "apierror-unknownaction": "A operação especificada, <kbd>$1</kbd>, não é reconhecida.",
+       "apierror-unknownerror-editpage": "Erro EditPage desconhecido: $1.",
+       "apierror-unknownerror-nocode": "Erro desconhecido.",
+       "apierror-unknownerror": "Erro desconhecido: \"$1\".",
+       "apierror-unknownformat": "Formato não reconhecido \"$1\".",
+       "apierror-unrecognizedparams": "{{PLURAL:$2|Parâmetro não reconhecido|Parâmetros não reconhecidos}}: $1.",
+       "apierror-unrecognizedvalue": "Valor não reconhecido para o parâmetro <var>$1</var>: $2.",
+       "apierror-unsupportedrepo": "O repositório de ficheiros local não suporta consultas sobre todas as imagens.",
+       "apierror-upload-filekeyneeded": "Tem de ser fornecida uma <var>filekey</var> quando o <var>offset</var> é diferente de zero.",
+       "apierror-upload-filekeynotallowed": "Não pode ser fornecida uma <var>filekey</var> quando o <var>offset</var> é 0.",
+       "apierror-upload-inprogress": "O carregamento a partir da área de ficheiros escondidos já está em progresso.",
+       "apierror-upload-missingresult": "Não há nenhum resultado nos dados de estado.",
+       "apierror-urlparamnormal": "Não foi possível normalizar os parâmetros de imagem para $1.",
+       "apierror-writeapidenied": "Não lhe é permitido editar esta wiki através da API.",
+       "apiwarn-alldeletedrevisions-performance": "Para obter um desempenho melhor ao gerar títulos, defina <kbd>$1dir=newer</kbd>.",
+       "apiwarn-badurlparam": "Não foi possível analisar <var>$1urlparam</var> para $2. Serão utilizadas somente a largura e a altura.",
+       "apiwarn-badutf8": "O valor passado para <var>$1</var> contém dados inválidos ou não normalizados. Os dados textuais devem estar em formato Unicode válido, normalizado em NFC, sem caracteres de controlo C0 exceto HT (\\t), LF (\\n) e CR (\\r).",
+       "apiwarn-checktoken-percentencoding": "Verifique que símbolos como \"+\" na chave estão devidamente codificados com percentagem no URL.",
+       "apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> foi descontinuado. Em substituição, use <kbd>prop=deletedrevisions</kbd> ou <kbd>list=alldeletedrevisions</kbd>, por favor.",
+       "apiwarn-deprecation-expandtemplates-prop": "Dado que não foi especificado nenhum valor para o parâmetro <var>prop</var> foi usado um formato antigo para o resultado. Esse formato está descontinuado e, de futuro, será definido um valor por omissão para o parâmetro <var>prop</var>, de forma que seja sempre usado um formato novo.",
+       "apiwarn-deprecation-httpsexpected": "Foi usado HTTP quando era esperado HTTPS.",
+       "apiwarn-deprecation-login-botpw": "O início de sessões com uma conta principal através de <kbd>action=login</kbd> foi descontinuado e poderá deixar de funcionar sem aviso prévio. Para continuar a iniciar sessões com <kbd>action=login</kbd>, consulte [[Special:BotPasswords]]. Para continuar a iniciar sessões com a conta principal de forma segura, consulte <kbd>action=clientlogin</kbd>.",
+       "apiwarn-deprecation-login-nobotpw": "O início de sessões com uma conta principal através de <kbd>action=login</kbd> foi descontinuado e poderá deixar de funcionar sem aviso prévio. Para iniciar uma sessão de forma segura, consulte <kbd>action=clientlogin</kbd>.",
+       "apiwarn-deprecation-login-token": "A obtenção de uma chave através de <kbd>action=login</kbd> foi descontinuada. Em substituição, use <kbd>action=query&meta=tokens&type=login</kbd>.",
+       "apiwarn-deprecation-parameter": "O parâmetro <var>$1</var> foi descontinuado.",
+       "apiwarn-deprecation-parse-headitems": "<kbd>prop=headitems</kbd> é obsoleto desde o MediaWiki 1.28. Use <kbd>prop=headhtml</kbd> ao criar novos documentos de HTML, ou <kbd>prop=modules|jsconfigvars</kbd> ao atualizar um documento no lado do cliente.",
+       "apiwarn-deprecation-purge-get": "O uso de <kbd>action=purge</kbd> através de um GET foi descontinuado. Em substituição, use um POST.",
+       "apiwarn-deprecation-withreplacement": "<kbd>$1</kbd> foi descontinuado. Em substituição, use <kbd>$2</kbd>, por favor.",
+       "apiwarn-difftohidden": "Não foi possível criar uma lista das diferenças em relação à r$1: o conteúdo está ocultado.",
+       "apiwarn-errorprinterfailed": "A impressora de erros falhou. Será feita nova tentativa sem parâmetros.",
+       "apiwarn-errorprinterfailed-ex": "A impressora de erros falhou (será feita nova tentativa sem parâmetros): $1",
+       "apiwarn-invalidcategory": "\"$1\" não é uma categoria.",
+       "apiwarn-invalidtitle": "\"$1\" não é um título válido.",
+       "apiwarn-invalidxmlstylesheetext": "Uma folha de estilos deve ter a extensão <code>.xsl</code>.",
+       "apiwarn-invalidxmlstylesheet": "Foi especificada uma folha de estilos inválida ou inexistente.",
+       "apiwarn-invalidxmlstylesheetns": "A folha de estilos deveria estar no espaço nominal {{ns:MediaWiki}}.",
+       "apiwarn-moduleswithoutvars": "A propriedade <kbd>modules</kbd> foi definida mas <kbd>jsconfigvars</kbd> ou <kbd>encodedjsconfigvars</kbd> não o foram. Variáveis de configuração são necessárias para utilização correta de módulos.",
+       "apiwarn-notfile": "\"$1\" não é um ficheiro.",
+       "apiwarn-nothumb-noimagehandler": "Não foi possível criar a miniatura porque $1 não tem uma rotina associada de tratamento de imagens.",
+       "apiwarn-parse-nocontentmodel": "Não foi fornecido um <var>title</var> ou <var>contentmodel</var>, será assumido $1.",
+       "apiwarn-parse-titlewithouttext": "<var>title</var> foi usado sem <var>text</var>, e foram pedidas as propriedades da página analisada. Pretendia usar <var>page</var> em vez de <var>title</var>?",
+       "apiwarn-redirectsandrevids": "Resolução de redirecionamentos não pode ser usada em conjunto com o parâmetro <var>revids</var>. Quaisquer redirecionamentos para os quais <var>revids</var> aponta não foram resolvidos.",
+       "apiwarn-tokennotallowed": "A operação \"$1\" não é permitida para o utilizador atual.",
+       "apiwarn-tokens-origin": "Não é possível obter chaves quando a norma da mesma origem não é aplicada.",
+       "apiwarn-toomanyvalues": "Foram fornecidos demasiados valores para o parâmetro <var>$1</var>. O limite é $2.",
+       "apiwarn-truncatedresult": "Este resultado foi truncado porque ultrapassaria o limite de $1 bytes.",
+       "apiwarn-unclearnowtimestamp": "A passagem de \"$2\" no parâmetro de data e hora <var>$1</var> foi tornada obsoleta. Se, por qualquer razão, precisa de especificar de forma explícita a hora atual sem a calcular no lado do cliente, use <kbd>now</kbd>.",
+       "apiwarn-unrecognizedvalues": "{{PLURAL:$3|Valor não reconhecido|Valores não reconhecidos}} para o parâmetro <var>$1</var>: $2.",
+       "apiwarn-unsupportedarray": "O parâmetro <var>$1</var> usa sintaxe PHP de matrizes não suportada.",
+       "apiwarn-urlparamwidth": "O valor da largura definido em <var>$1urlparam</var> ($2) foi ignorado em favor da largura obtida a partir de <var>$1urlwidth</var>/<var>$1urlheight</var> ($3).",
+       "apiwarn-validationfailed-badchars": "caracteres inválidos na chave (só são permitidos <code>a-z</code>, <code>A-Z</code>, <code>0-9</code>, <code>_</code>, e <code>-</code>).",
+       "apiwarn-validationfailed-badpref": "não é uma preferência válida.",
+       "apiwarn-validationfailed-cannotset": "não pode ser definido por este módulo.",
+       "apiwarn-validationfailed-keytoolong": "chave demasiado longa (não pode ter mais de $1 bytes).",
+       "apiwarn-validationfailed": "Erro de validação de <kbd>$1</kbd>: $2",
+       "apiwarn-wgDebugAPI": "<strong>Aviso de segurança</strong>: <var>$wgDebugAPI</var> está ativado.",
+       "api-feed-error-title": "Erro ($1)",
+       "api-usage-docref": "Consulte $1 para a utilização da API.",
+       "api-usage-mailinglist-ref": "Subscreva a lista de distribuição mediawiki-api-announce em &lt;https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce&gt; para receber anúncios de descontinuação e de alterações disruptivas da API.",
+       "api-exception-trace": "$1 em $2($3)\n$4",
        "api-credits-header": "Créditos",
        "api-credits": "Programadores da API:\n* Yuri Astrakhan (criador, programador principal, set 2006–set 2007)\n* Roan Kattouw (programador principal, set 2007–2009)\n* Victor Vasiliev\n* Bryan Tong Minh\n* Sam Reed\n* Brad Jorsch (programador principal, 2013–presente)\n\nPode enviar os seus comentários, sugestões e perguntas para o endereço mediawiki-api@lists.wikimedia.org, ou reportar quaisquer defeitos que encontre em https://phabricator.wikimedia.org/."
 }
index adea9ab..83246fb 100644 (file)
        "apihelp-clientlogin-example-login": "{{doc-apihelp-example|clientlogin}}",
        "apihelp-clientlogin-example-login2": "{{doc-apihelp-example|clientlogin}}",
        "apihelp-compare-description": "{{doc-apihelp-description|compare}}",
-       "apihelp-compare-param-fromtitle": "{{doc-apihelp-param|compare|fromtitle}}",
+       "apihelp-compare-param-fromcontentformat": "{{doc-apihelp-param|compare|fromcontentformat}}",
+       "apihelp-compare-param-fromcontentmodel": "{{doc-apihelp-param|compare|fromcontentmodel}}",
        "apihelp-compare-param-fromid": "{{doc-apihelp-param|compare|fromid}}",
+       "apihelp-compare-param-frompst": "{{doc-apihelp-param|compare|frompst}}",
        "apihelp-compare-param-fromrev": "{{doc-apihelp-param|compare|fromrev}}",
-       "apihelp-compare-param-totitle": "{{doc-apihelp-param|compare|totitle}}",
+       "apihelp-compare-param-fromtext": "{{doc-apihelp-param|compare|fromtext}}",
+       "apihelp-compare-param-fromtitle": "{{doc-apihelp-param|compare|fromtitle}}",
+       "apihelp-compare-param-prop": "{{doc-apihelp-param|compare|prop}}",
+       "apihelp-compare-param-tocontentformat": "{{doc-apihelp-param|compare|tocontentformat}}",
+       "apihelp-compare-param-tocontentmodel": "{{doc-apihelp-param|compare|tocontentmodel}}",
        "apihelp-compare-param-toid": "{{doc-apihelp-param|compare|toid}}",
+       "apihelp-compare-param-topst": "{{doc-apihelp-param|compare|topst}}",
+       "apihelp-compare-param-torelative": "{{doc-apihelp-param|compare|torelative}}",
        "apihelp-compare-param-torev": "{{doc-apihelp-param|compare|torev}}",
+       "apihelp-compare-param-totext": "{{doc-apihelp-param|compare|totext}}",
+       "apihelp-compare-param-totitle": "{{doc-apihelp-param|compare|totitle}}",
+       "apihelp-compare-paramvalue-prop-comment": "{{doc-apihelp-paramvalue|compare|prop|comment}}",
+       "apihelp-compare-paramvalue-prop-diff": "{{doc-apihelp-paramvalue|compare|prop|diff}}",
+       "apihelp-compare-paramvalue-prop-diffsize": "{{doc-apihelp-paramvalue|compare|prop|diffsize}}",
+       "apihelp-compare-paramvalue-prop-ids": "{{doc-apihelp-paramvalue|compare|prop|ids}}",
+       "apihelp-compare-paramvalue-prop-parsedcomment": "{{doc-apihelp-paramvalue|compare|prop|parsedcomment}}",
+       "apihelp-compare-paramvalue-prop-rel": "{{doc-apihelp-paramvalue|compare|prop|rel}}",
+       "apihelp-compare-paramvalue-prop-size": "{{doc-apihelp-paramvalue|compare|prop|size}}",
+       "apihelp-compare-paramvalue-prop-title": "{{doc-apihelp-paramvalue|compare|prop|title}}",
+       "apihelp-compare-paramvalue-prop-user": "{{doc-apihelp-paramvalue|compare|prop|user}}",
        "apihelp-compare-example-1": "{{doc-apihelp-example|compare}}",
        "apihelp-createaccount-description": "{{doc-apihelp-description|createaccount}}",
        "apihelp-createaccount-param-preservestate": "{{doc-apihelp-param|createaccount|preservestate|info=This message is displayed in addition to {{msg-mw|api-help-authmanagerhelper-preservestate}}.}}",
        "apierror-changeauth-norequest": "{{doc-apierror}}",
        "apierror-chunk-too-small": "{{doc-apierror}}\n\nParameters:\n* $1 - Minimum size in bytes.",
        "apierror-cidrtoobroad": "{{doc-apierror}}\n\nParameters:\n* $1 - \"IPv4\" or \"IPv6\"\n* $2 - Minimum CIDR mask length.",
-       "apierror-compare-inputneeded": "{{doc-apierror}}",
+       "apierror-compare-no-title": "{{doc-apierror}}",
+       "apierror-compare-relative-to-nothing": "{{doc-apierror}}",
        "apierror-contentserializationexception": "{{doc-apierror}}\n\nParameters:\n* $1 - Exception text, may end with punctuation. Currently this is probably English, hopefully we'll fix that in the future.",
        "apierror-contenttoobig": "{{doc-apierror}}\n\nParameters:\n* $1 - Maximum article size in kilobytes.",
        "apierror-copyuploadbaddomain": "{{doc-apierror}}",
        "apierror-maxlag": "{{doc-apierror}}\n\nParameters:\n* $1 - Database lag in seconds.\n* $2 - Database server that is lagged.",
        "apierror-mimesearchdisabled": "{{doc-apierror}}",
        "apierror-missingcontent-pageid": "{{doc-apierror}}\n\nParameters:\n* $1 - Page ID number.",
+       "apierror-missingcontent-revid": "{{doc-apierror}}\n\nParameters:\n* $1 - Revision ID number",
        "apierror-missingparam-at-least-one-of": "{{doc-apierror}}\n\nParameters:\n* $1 - List of parameter names.\n* $2 - Number of parameters.",
        "apierror-missingparam-one-of": "{{doc-apierror}}\n\nParameters:\n* $1 - List of parameter names.\n* $2 - Number of parameters.",
        "apierror-missingparam": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name.",
        "apierror-missingrev-pageid": "{{doc-apierror}}\n\nParameters:\n* $1 - Page ID number.",
+       "apierror-missingrev-title": "{{doc-apierror}}\n\nParameters:\n* $1 - Page title.",
        "apierror-missingtitle-createonly": "{{doc-apierror}}",
        "apierror-missingtitle": "{{doc-apierror}}",
        "apierror-missingtitle-byname": "{{doc-apierror}}",
        "apiwarn-badurlparam": "{{doc-apierror}}\n\nParameters:\n* $1 - Module parameter prefix, e.g. \"bl\".\n* $2 - Image title.",
        "apiwarn-badutf8": "{{doc-apierror}}\n\nParameters:\n* $1 - Parameter name.\n{{doc-important|Do not translate \"\\t\", \"\\n\", and \"\\r\"}}",
        "apiwarn-checktoken-percentencoding": "{{doc-apierror}}",
+       "apiwarn-compare-nocontentmodel": "{{doc-apierror}}\n\nParameters:\n* $1 - Content model being assumed.",
        "apiwarn-deprecation-deletedrevs": "{{doc-apierror}}",
        "apiwarn-deprecation-expandtemplates-prop": "{{doc-apierror}}",
        "apiwarn-deprecation-httpsexpected": "{{doc-apierror}}",
index bccb147..85894ed 100644 (file)
@@ -1007,22 +1007,22 @@ abstract class ContentHandler {
         * @return ParserOptions
         */
        public function makeParserOptions( $context ) {
-               global $wgContLang, $wgEnableParserLimitReporting;
+               global $wgContLang;
 
                if ( $context instanceof IContextSource ) {
-                       $options = ParserOptions::newFromContext( $context );
+                       $user = $context->getUser();
+                       $lang = $context->getLanguage();
                } elseif ( $context instanceof User ) { // settings per user (even anons)
-                       $options = ParserOptions::newFromUser( $context );
+                       $user = $context;
+                       $lang = null;
                } elseif ( $context === 'canonical' ) { // canonical settings
-                       $options = ParserOptions::newFromUserAndLang( new User, $wgContLang );
+                       $user = new User;
+                       $lang = $wgContLang;
                } else {
                        throw new MWException( "Bad context for parser options: $context" );
                }
 
-               $options->enableLimitReport( $wgEnableParserLimitReporting ); // show inclusion/loop reports
-               $options->setTidy( true ); // fix bad HTML
-
-               return $options;
+               return ParserOptions::newCanonical( $user, $lang );
        }
 
        /**
index c23e1f6..852b34d 100644 (file)
        "config-db-wiki-settings": "Identiffica questo wiki",
        "config-db-name": "Nomme do database:",
        "config-db-name-help": "Çerni un nomme ch'o l'identiffiche o to wiki.\nO no deve contegnî de spaççi.\n\nSe ti doeuvi un web hosting condiviso, o to hosting provider o te fornisce un speciffico nomme de database da doeuviâ, opû o ti consentiâ de creâ o database trammite un panello de controllo.",
-       "config-db-name-oracle": "Schema do database:"
+       "config-db-name-oracle": "Schema do database:",
+       "config-db-account-oracle-warn": "Gh'è trei scenarri supportæ pe instalâ l'Oracle comme database de backend:\n\nSe t'oeu creâ 'n'utença de database comme parte do processo d'instalaçion, fornisci un account con rollo SYSDBA comme utença de database pe l'instalaçion e speciffica e credençiæ vosciue pe l'utença d'accesso web, sedonque l'è poscibbile creâ manoalmente l'utença d'accesso web e fornî solo quell'account (s'o g'ha e aotorizaçioin necessaie pe creâ i ogetti do schema) ò fornî doe utençe despæge, un-a co-i permissi de creaçion e un-a pe l'accesso web.\n\nO Script pe creâ un'utença co-e aotorizaçioin necessaie o se troeuva inta directory \"maintenance/oracle/\" de questa instalaçion. Tegnit'amente che l'uzo de 'n'utença con restriçioin o dizabilitiâ tutte e fonçionalitæ de manutençion con l'account predefinio.",
+       "config-db-install-account": "Account utente pe l'instalaçion",
+       "config-db-username": "Nomme utente do database:",
+       "config-db-password": "Password do database:",
+       "config-db-install-username": "Inseisci o nomme utente ch'o saiâ doeuviou pe conettise a-o database durante o processo d'installaçion.\nQuesto o no l'è o nomme utente de l'account MediaWiki; ma quello pe-o to database.",
+       "config-db-install-password": "Inseisci a password ch'a saiâ doeuviâ pe connettise a-o database into processo d'installaçion.\nQuesta a no l'è a password de l'account MediaWiki; ma quella pe-o to database.",
+       "config-db-install-help": "Insei o nomme utente e a password che saian doeuviæ pe-a conescion a-o database durante o processo d'instalaçion.",
+       "config-db-account-lock": "Doeuvia o mæximo nomme utente e password durante o normale fonçionamento",
+       "config-db-wiki-account": "Account utente pe-o normale fonçionamento",
+       "config-db-wiki-help": "Insei o nomme utente e a password che saiâ doeuviou pe connettise a-o database durante o normale fonçionamento da wiki.\nSe l'account o no l'existe, e l'account d'instalaçion o g'ha assæ privileggi, st'account utente o saiâ creou con privileggi minnimi necessai pe operâ in sciâ wiki.",
+       "config-db-prefix": "Prefisso da tabella do database:",
+       "config-db-prefix-help": "Se ti g'hæ de bezoeugno de condividde un database tra ciu wiki, ò tra MediaWiki e un'atra apricaçion web, ti poeu çerne d'azonze un prefisso a tutti i nommi de tabella, pe evitâ confliti.\nNo doeuviâ spaççi.\n\nA l'uzo sto campo o l'è lasciou voeuo.",
+       "config-mysql-old": "L'è necessaio MySQL $1 ò 'na verscion succesciva. Ti ti g'hæ a $2.",
+       "config-db-port": "Porta do database:",
+       "config-db-schema": "Schema pe MediaWiki:",
+       "config-db-schema-help": "Questo schema in genere o l'aniâ ben.\nCangilo solo se t'ê seguo de doveilo fâ.",
+       "config-pg-test-error": "Imposcibbile conettise a-o database '''$1''': $2",
+       "config-sqlite-dir": "Cartella dæti de SQLite:",
+       "config-sqlite-dir-help": "SQLite o memorizza tutti i dæti inte 'n unnico file.\n\nA directory che t'indichiæ a dev'ese scrivibile da-o serviou web durante l'instalaçion.\n\nA dev'ese <strong>non acescibbile via web</strong>, l'è pe questo che no a mettemmo donde gh'è i file PHP.\n\nL'instalou o ghe scriviâ insemme un file <code>.htaccess</code>, ma se o tentativo o falisse quarcun poriæ avei accesso a-o database sgroeuzzo.\nQuesto o l'includde di dæti utente sgroeuzzi (adressi, password çiffræ) coscì comme de vercsioin eliminæ e atri dæti a accesso limitou da wiki.\n\nConsciddera a-a dreitua l'oportunitæ d'alugâ o database da quarch'atra parte, prezempio in <code>/var/lib/mediawiki/tuowiki</code>.",
+       "config-oracle-def-ts": "Tablespace pe difetto:",
+       "config-oracle-temp-ts": "Tablespace tempoannio:",
+       "config-type-mysql": "MySQL (ò compatibbile)",
+       "config-type-mssql": "Microsoft SQL Server",
+       "config-support-info": "MediaWiki o supporta i seguenti scistemi de database:\n\n$1\n\nSe fra quelli elencæ chì de sotta no ti veddi o scistema de database che ti voriesci doeuviâ, segui e instruçioin inganciæ de d'ato pe abilitâ o supporto."
 }
index ff59854..423d43e 100644 (file)
@@ -1064,6 +1064,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         *   - c) The return value is a map of (cache key => value) in the order of $keyedIds
         *
         * @see WANObjectCache::getWithSetCallback()
+        * @see WANObjectCache::getMultiWithUnionSetCallback()
         *
         * Example usage:
         * @code
@@ -1134,6 +1135,127 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
                return $values;
        }
 
+       /**
+        * Method to fetch/regenerate multiple cache keys at once
+        *
+        * This works the same as getWithSetCallback() except:
+        *   - a) The $keys argument expects the result of WANObjectCache::makeMultiKeys()
+        *   - b) The $callback argument expects a callback returning a map of (ID => new value)
+        *        for all entity IDs in $regenById and it takes the following arguments:
+        *          - $ids: a list of entity IDs to regenerate
+        *          - &$ttls: a reference to the (entity ID => new TTL) map
+        *          - &$setOpts: a reference to options for set() which can be altered
+        *   - c) The return value is a map of (cache key => value) in the order of $keyedIds
+        *   - d) The "lockTSE" and "busyValue" options are ignored
+        *
+        * @see WANObjectCache::getWithSetCallback()
+        * @see WANObjectCache::getMultiWithSetCallback()
+        *
+        * Example usage:
+        * @code
+        *     $rows = $cache->getMultiWithUnionSetCallback(
+        *         // Map of cache keys to entity IDs
+        *         $cache->makeMultiKeys(
+        *             $this->fileVersionIds(),
+        *             function ( $id, WANObjectCache $cache ) {
+        *                 return $cache->makeKey( 'file-version', $id );
+        *             }
+        *         ),
+        *         // Time-to-live (in seconds)
+        *         $cache::TTL_DAY,
+        *         // Function that derives the new key value
+        *         function ( array $ids, array &$ttls, array &$setOpts ) {
+        *             $dbr = wfGetDB( DB_REPLICA );
+        *             // Account for any snapshot/replica DB lag
+        *             $setOpts += Database::getCacheSetOptions( $dbr );
+        *
+        *             // Load the rows for these files
+        *             $rows = [];
+        *             $res = $dbr->select( 'file', '*', [ 'id' => $ids ], __METHOD__ );
+        *             foreach ( $res as $row ) {
+        *                 $rows[$row->id] = $row;
+        *                 $mtime = wfTimestamp( TS_UNIX, $row->timestamp );
+        *                 $ttls[$row->id] = $this->adaptiveTTL( $mtime, $ttls[$row->id] );
+        *             }
+        *
+        *             return $rows;
+        *         },
+        *         ]
+        *     );
+        *     $files = array_map( [ __CLASS__, 'newFromRow' ], $rows );
+        * @endcode
+        *
+        * @param ArrayIterator $keyedIds Result of WANObjectCache::makeMultiKeys()
+        * @param integer $ttl Seconds to live for key updates
+        * @param callable $callback Callback the yields entity regeneration callbacks
+        * @param array $opts Options map
+        * @return array Map of (cache key => value) in the same order as $keyedIds
+        * @since 1.30
+        */
+       final public function getMultiWithUnionSetCallback(
+               ArrayIterator $keyedIds, $ttl, callable $callback, array $opts = []
+       ) {
+               $idsByValueKey = iterator_to_array( $keyedIds, true );
+               $valueKeys = array_keys( $idsByValueKey );
+               $checkKeys = isset( $opts['checkKeys'] ) ? $opts['checkKeys'] : [];
+               unset( $opts['lockTSE'] ); // incompatible
+               unset( $opts['busyValue'] ); // incompatible
+
+               // Load required keys into process cache in one go
+               $keysGet = $this->getNonProcessCachedKeys( $valueKeys, $opts );
+               $this->warmupCache = $this->getRawKeysForWarmup( $keysGet, $checkKeys );
+               $this->warmupKeyMisses = 0;
+
+               // IDs of entities known to be in need of regeneration
+               $idsRegen = [];
+
+               // Find out which keys are missing/deleted/stale
+               $curTTLs = [];
+               $asOfs = [];
+               $curByKey = $this->getMulti( $keysGet, $curTTLs, $checkKeys, $asOfs );
+               foreach ( $keysGet as $key ) {
+                       if ( !array_key_exists( $key, $curByKey ) || $curTTLs[$key] < 0 ) {
+                               $idsRegen[] = $idsByValueKey[$key];
+                       }
+               }
+
+               // Run the callback to populate the regeneration value map for all required IDs
+               $newSetOpts = [];
+               $newTTLsById = array_fill_keys( $idsRegen, $ttl );
+               $newValsById = $idsRegen ? $callback( $idsRegen, $newTTLsById, $newSetOpts ) : [];
+
+               // Wrap $callback to match the getWithSetCallback() format while passing $id to $callback
+               $id = null; // current entity ID
+               $func = function ( $oldValue, &$ttl, &$setOpts, $oldAsOf )
+                       use ( $callback, &$id, $newValsById, $newTTLsById, $newSetOpts )
+               {
+                       if ( array_key_exists( $id, $newValsById ) ) {
+                               // Value was already regerated as expected, so use the value in $newValsById
+                               $newValue = $newValsById[$id];
+                               $ttl = $newTTLsById[$id];
+                               $setOpts = $newSetOpts;
+                       } else {
+                               // Pre-emptive/popularity refresh and version mismatch cases are not detected
+                               // above and thus $newValsById has no entry. Run $callback on this single entity.
+                               $ttls = [ $id => $ttl ];
+                               $newValue = $callback( [ $id ], $ttls, $setOpts )[$id];
+                               $ttl = $ttls[$id];
+                       }
+
+                       return $newValue;
+               };
+
+               // Run the cache-aside logic using warmupCache instead of persistent cache queries
+               $values = [];
+               foreach ( $idsByValueKey as $key => $id ) { // preserve order
+                       $values[$key] = $this->getWithSetCallback( $key, $ttl, $func, $opts );
+               }
+
+               $this->warmupCache = [];
+
+               return $values;
+       }
+
        /**
         * Locally set a key to expire soon if it is stale based on $purgeTimestamp
         *
index 2adc5fb..0e23a88 100644 (file)
@@ -1055,6 +1055,13 @@ class WikiPage implements Page, IDBAccessObject {
        ) {
                $useParserCache =
                        ( !$forceParse ) && $this->shouldCheckParserCache( $parserOptions, $oldid );
+
+               if ( $useParserCache && !$parserOptions->isSafeToCache() ) {
+                       throw new InvalidArgumentException(
+                               'The supplied ParserOptions are not safe to cache. Fix the options or set $forceParse = true.'
+                       );
+               }
+
                wfDebug( __METHOD__ .
                        ': using parser cache: ' . ( $useParserCache ? 'yes' : 'no' ) . "\n" );
                if ( $parserOptions->getStubThreshold() ) {
index 76a7e1e..9c6cf93 100644 (file)
@@ -138,6 +138,20 @@ class ParserCache {
         * @return bool|mixed|string
         */
        public function getKey( $article, $popts, $useOutdated = true ) {
+               $dummy = null;
+               return $this->getKeyReal( $article, $popts, $useOutdated, $dummy );
+       }
+
+       /**
+        * Temporary internal function to allow accessing $usedOptions
+        * @todo Merge this back to self::getKey() when ParserOptions::optionsHashPre30() is removed
+        * @param WikiPage $article
+        * @param ParserOptions $popts
+        * @param bool $useOutdated (default true)
+        * @param array &$usedOptions Don't use this, it will go away soon
+        * @return bool|mixed|string
+        */
+       private function getKeyReal( $article, $popts, $useOutdated, &$usedOptions ) {
                global $wgCacheEpoch;
 
                if ( $popts instanceof User ) {
@@ -204,7 +218,8 @@ class ParserCache {
 
                $touched = $article->getTouched();
 
-               $parserOutputKey = $this->getKey( $article, $popts, $useOutdated );
+               $usedOptions = null;
+               $parserOutputKey = $this->getKeyReal( $article, $popts, $useOutdated, $usedOptions );
                if ( $parserOutputKey === false ) {
                        wfIncrStats( 'pcache.miss.absent' );
                        return false;
@@ -213,6 +228,13 @@ class ParserCache {
                $casToken = null;
                /** @var ParserOutput $value */
                $value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
+               if ( !$value ) {
+                       $parserOutputKey = $this->getParserOutputKey(
+                               $article,
+                               $popts->optionsHashPre30( $usedOptions, $article->getTitle() )
+                       );
+                       $value = $this->mMemc->get( $parserOutputKey, $casToken, BagOStuff::READ_VERIFIED );
+               }
                if ( !$value ) {
                        wfDebug( "ParserOutput cache miss.\n" );
                        wfIncrStats( "pcache.miss.absent" );
index d097414..f8ed63f 100644 (file)
@@ -25,397 +25,652 @@ use Wikimedia\ScopedCallback;
 /**
  * @brief Set options of the Parser
  *
- * All member variables are supposed to be private in theory, although in
- * practice this is not the case.
+ * How to add an option in core:
+ *  1. Add it to one of the arrays in ParserOptions::setDefaults()
+ *  2. If necessary, add an entry to ParserOptions::$inCacheKey
+ *  3. Add a getter and setter in the section for that.
+ *
+ * How to add an option in an extension:
+ *  1. Use the 'ParserOptionsRegister' hook to register it.
+ *  2. Where necessary, use $popt->getOption() and $popt->setOption()
+ *     to access it.
  *
  * @ingroup Parser
  */
 class ParserOptions {
 
        /**
-        * Interlanguage links are removed and returned in an array
+        * Default values for all options that are relevant for caching.
+        * @see self::getDefaults()
+        * @var array|null
         */
-       private $mInterwikiMagic;
+       private static $defaults = null;
 
        /**
-        * Allow external images inline?
+        * Lazy-loaded options
+        * @var callback[]
         */
-       private $mAllowExternalImages;
+       private static $lazyOptions = [
+               'dateformat' => [ __CLASS__, 'initDateFormat' ],
+       ];
 
        /**
-        * If not, any exception?
+        * Specify options that are included in the cache key
+        * @var array
         */
-       private $mAllowExternalImagesFrom;
+       private static $inCacheKey = [
+               'dateformat' => true,
+               'editsection' => true,
+               'numberheadings' => true,
+               'thumbsize' => true,
+               'stubthreshold' => true,
+               'printable' => true,
+               'userlang' => true,
+               'wrapclass' => true,
+       ];
 
        /**
-        * If not or it doesn't match, should we check an on-wiki whitelist?
+        * Current values for all options that are relevant for caching.
+        * @var array
         */
-       private $mEnableImageWhitelist;
+       private $options;
 
        /**
-        * Date format index
+        * Timestamp used for {{CURRENTDAY}} etc.
+        * @var string|null
+        * @note Caching based on parse time is handled externally
         */
-       private $mDateFormat = null;
+       private $mTimestamp;
 
        /**
-        * Create "edit section" links?
+        * Stored user object
+        * @var User
+        * @todo Track this for caching somehow without fragmenting the cache insanely
         */
-       private $mEditSection = true;
+       private $mUser;
 
        /**
-        * Allow inclusion of special pages?
+        * Function to be called when an option is accessed.
+        * @var callable|null
+        * @note Used for collecting used options, does not affect caching
         */
-       private $mAllowSpecialInclusion;
+       private $onAccessCallback = null;
 
        /**
-        * Use tidy to cleanup output HTML?
+        * If the page being parsed is a redirect, this should hold the redirect
+        * target.
+        * @var Title|null
+        * @todo Track this for caching somehow
         */
-       private $mTidy = false;
+       private $redirectTarget = null;
 
        /**
-        * Which lang to call for PLURAL and GRAMMAR
+        * Appended to the options hash
         */
-       private $mInterfaceMessage = false;
+       private $mExtraKey = '';
 
        /**
-        * Overrides $mInterfaceMessage with arbitrary language
+        * @name Option accessors
+        * @{
         */
-       private $mTargetLanguage = null;
 
        /**
-        * Maximum size of template expansions, in bytes
+        * Fetch an option, generically
+        * @since 1.30
+        * @param string $name Option name
+        * @return mixed
         */
-       private $mMaxIncludeSize;
+       public function getOption( $name ) {
+               if ( !array_key_exists( $name, $this->options ) ) {
+                       throw new InvalidArgumentException( "Unknown parser option $name" );
+               }
 
-       /**
-        * Maximum number of nodes touched by PPFrame::expand()
-        */
-       private $mMaxPPNodeCount;
+               if ( isset( self::$lazyOptions[$name] ) && $this->options[$name] === null ) {
+                       $this->options[$name] = call_user_func( self::$lazyOptions[$name], $this, $name );
+               }
+               if ( !empty( self::$inCacheKey[$name] ) ) {
+                       $this->optionUsed( $name );
+               }
+               return $this->options[$name];
+       }
 
        /**
-        * Maximum number of nodes generated by Preprocessor::preprocessToObj()
-        */
-       private $mMaxGeneratedPPNodeCount;
+        * Set an option, generically
+        * @since 1.30
+        * @param string $name Option name
+        * @param mixed $value New value. Passing null will set null, unlike many
+        *  of the existing accessors which ignore null for historical reasons.
+        * @return mixed Old value
+        */
+       public function setOption( $name, $value ) {
+               if ( !array_key_exists( $name, $this->options ) ) {
+                       throw new InvalidArgumentException( "Unknown parser option $name" );
+               }
+               $old = $this->options[$name];
+               $this->options[$name] = $value;
+               return $old;
+       }
 
        /**
-        * Maximum recursion depth in PPFrame::expand()
+        * Legacy implementation
+        * @since 1.30 For implementing legacy setters only. Don't use this in new code.
+        * @deprecated since 1.30
+        * @param string $name Option name
+        * @param mixed $value New value. Passing null does not set the value.
+        * @return mixed Old value
         */
-       private $mMaxPPExpandDepth;
+       protected function setOptionLegacy( $name, $value ) {
+               if ( !array_key_exists( $name, $this->options ) ) {
+                       throw new InvalidArgumentException( "Unknown parser option $name" );
+               }
+               return wfSetVar( $this->options[$name], $value );
+       }
 
        /**
-        * Maximum recursion depth for templates within templates
+        * Whether to extract interlanguage links
+        *
+        * When true, interlanguage links will be returned by
+        * ParserOutput::getLanguageLinks() instead of generating link HTML.
+        *
+        * @return bool
         */
-       private $mMaxTemplateDepth;
+       public function getInterwikiMagic() {
+               return $this->getOption( 'interwikiMagic' );
+       }
 
        /**
-        * Maximum number of calls per parse to expensive parser functions
+        * Specify whether to extract interlanguage links
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mExpensiveParserFunctionLimit;
+       public function setInterwikiMagic( $x ) {
+               return $this->setOptionLegacy( 'interwikiMagic', $x );
+       }
 
        /**
-        * Remove HTML comments. ONLY APPLIES TO PREPROCESS OPERATIONS
+        * Allow all external images inline?
+        * @return bool
         */
-       private $mRemoveComments = true;
+       public function getAllowExternalImages() {
+               return $this->getOption( 'allowExternalImages' );
+       }
 
        /**
-        * @var callable Callback for current revision fetching; first argument to call_user_func().
+        * Allow all external images inline?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mCurrentRevisionCallback =
-               [ 'Parser', 'statelessFetchRevision' ];
+       public function setAllowExternalImages( $x ) {
+               return $this->setOptionLegacy( 'allowExternalImages', $x );
+       }
 
        /**
-        * @var callable Callback for template fetching; first argument to call_user_func().
+        * External images to allow
+        *
+        * When self::getAllowExternalImages() is false
+        *
+        * @return string|string[] URLs to allow
         */
-       private $mTemplateCallback =
-               [ 'Parser', 'statelessFetchTemplate' ];
+       public function getAllowExternalImagesFrom() {
+               return $this->getOption( 'allowExternalImagesFrom' );
+       }
 
        /**
-        * @var callable|null Callback to generate a guess for {{REVISIONID}}
+        * External images to allow
+        *
+        * When self::getAllowExternalImages() is false
+        *
+        * @param string|string[]|null $x New value (null is no change)
+        * @return string|string[] Old value
         */
-       private $mSpeculativeRevIdCallback;
+       public function setAllowExternalImagesFrom( $x ) {
+               return $this->setOptionLegacy( 'allowExternalImagesFrom', $x );
+       }
 
        /**
-        * Enable limit report in an HTML comment on output
+        * Use the on-wiki external image whitelist?
+        * @return bool
         */
-       private $mEnableLimitReport = false;
+       public function getEnableImageWhitelist() {
+               return $this->getOption( 'enableImageWhitelist' );
+       }
 
        /**
-        * Timestamp used for {{CURRENTDAY}} etc.
+        * Use the on-wiki external image whitelist?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mTimestamp;
+       public function setEnableImageWhitelist( $x ) {
+               return $this->setOptionLegacy( 'enableImageWhitelist', $x );
+       }
 
        /**
-        * Target attribute for external links
+        * Create "edit section" links?
+        * @return bool
         */
-       private $mExternalLinkTarget;
+       public function getEditSection() {
+               return $this->getOption( 'editsection' );
+       }
 
        /**
-        * Clean up signature texts?
-        * @see Parser::cleanSig
+        * Create "edit section" links?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mCleanSignatures;
+       public function setEditSection( $x ) {
+               return $this->setOptionLegacy( 'editsection', $x );
+       }
 
        /**
-        * Transform wiki markup when saving the page?
+        * Automatically number headings?
+        * @return bool
         */
-       private $mPreSaveTransform = true;
+       public function getNumberHeadings() {
+               return $this->getOption( 'numberheadings' );
+       }
 
        /**
-        * Whether content conversion should be disabled
+        * Automatically number headings?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mDisableContentConversion;
+       public function setNumberHeadings( $x ) {
+               return $this->setOptionLegacy( 'numberheadings', $x );
+       }
 
        /**
-        * Whether title conversion should be disabled
+        * Allow inclusion of special pages?
+        * @return bool
         */
-       private $mDisableTitleConversion;
+       public function getAllowSpecialInclusion() {
+               return $this->getOption( 'allowSpecialInclusion' );
+       }
 
        /**
-        * Automatically number headings?
+        * Allow inclusion of special pages?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mNumberHeadings;
+       public function setAllowSpecialInclusion( $x ) {
+               return $this->setOptionLegacy( 'allowSpecialInclusion', $x );
+       }
 
        /**
-        * Thumb size preferred by the user.
+        * Use tidy to cleanup output HTML?
+        * @return bool
         */
-       private $mThumbSize;
+       public function getTidy() {
+               return $this->getOption( 'tidy' );
+       }
 
        /**
-        * Maximum article size of an article to be marked as "stub"
+        * Use tidy to cleanup output HTML?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mStubThreshold;
+       public function setTidy( $x ) {
+               return $this->setOptionLegacy( 'tidy', $x );
+       }
 
        /**
-        * Language object of the User language.
+        * Parsing an interface message?
+        * @return bool
         */
-       private $mUserLang;
+       public function getInterfaceMessage() {
+               return $this->getOption( 'interfaceMessage' );
+       }
 
        /**
-        * @var User
-        * Stored user object
+        * Parsing an interface message?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
         */
-       private $mUser;
+       public function setInterfaceMessage( $x ) {
+               return $this->setOptionLegacy( 'interfaceMessage', $x );
+       }
 
        /**
-        * Parsing the page for a "preview" operation?
+        * Target language for the parse
+        * @return Language|null
         */
-       private $mIsPreview = false;
+       public function getTargetLanguage() {
+               return $this->getOption( 'targetLanguage' );
+       }
 
        /**
-        * Parsing the page for a "preview" operation on a single section?
+        * Target language for the parse
+        * @param Language|null $x New value
+        * @return Language|null Old value
         */
-       private $mIsSectionPreview = false;
+       public function setTargetLanguage( $x ) {
+               return $this->setOption( 'targetLanguage', $x );
+       }
 
        /**
-        * Parsing the printable version of the page?
+        * Maximum size of template expansions, in bytes
+        * @return int
         */
-       private $mIsPrintable = false;
+       public function getMaxIncludeSize() {
+               return $this->getOption( 'maxIncludeSize' );
+       }
 
        /**
-        * Extra key that should be present in the caching key.
+        * Maximum size of template expansions, in bytes
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
         */
-       private $mExtraKey = '';
+       public function setMaxIncludeSize( $x ) {
+               return $this->setOptionLegacy( 'maxIncludeSize', $x );
+       }
 
        /**
-        * Are magic ISBN links enabled?
+        * Maximum number of nodes touched by PPFrame::expand()
+        * @return int
         */
-       private $mMagicISBNLinks = true;
+       public function getMaxPPNodeCount() {
+               return $this->getOption( 'maxPPNodeCount' );
+       }
 
        /**
-        * Are magic PMID links enabled?
+        * Maximum number of nodes touched by PPFrame::expand()
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
         */
-       private $mMagicPMIDLinks = true;
+       public function setMaxPPNodeCount( $x ) {
+               return $this->setOptionLegacy( 'maxPPNodeCount', $x );
+       }
 
        /**
-        * Are magic RFC links enabled?
+        * Maximum number of nodes generated by Preprocessor::preprocessToObj()
+        * @return int
         */
-       private $mMagicRFCLinks = true;
+       public function getMaxGeneratedPPNodeCount() {
+               return $this->getOption( 'maxGeneratedPPNodeCount' );
+       }
 
        /**
-        * Function to be called when an option is accessed.
+        * Maximum number of nodes generated by Preprocessor::preprocessToObj()
+        * @param int|null $x New value (null is no change)
+        * @return int
         */
-       private $onAccessCallback = null;
+       public function setMaxGeneratedPPNodeCount( $x ) {
+               return $this->setOptionLegacy( 'maxGeneratedPPNodeCount', $x );
+       }
 
        /**
-        * If the page being parsed is a redirect, this should hold the redirect
-        * target.
-        * @var Title|null
+        * Maximum recursion depth in PPFrame::expand()
+        * @return int
         */
-       private $redirectTarget = null;
+       public function getMaxPPExpandDepth() {
+               return $this->getOption( 'maxPPExpandDepth' );
+       }
 
        /**
-        * If the wiki is configured to allow raw html ($wgRawHtml = true)
-        * is it allowed in the specific case of parsing this page.
-        *
-        * This is meant to disable unsafe parser tags in cases where
-        * a malicious user may control the input to the parser.
-        *
-        * @note This is expected to be true for normal pages even if the
-        *  wiki has $wgRawHtml disabled in general. The setting only
-        *  signifies that raw html would be unsafe in the current context
-        *  provided that raw html is allowed at all.
-        * @var boolean
+        * Maximum recursion depth for templates within templates
+        * @return int
         */
-       private $allowUnsafeRawHtml = true;
+       public function getMaxTemplateDepth() {
+               return $this->getOption( 'maxTemplateDepth' );
+       }
 
        /**
-        * CSS class to use to wrap output from Parser::parse().
-        * @var string|false
+        * Maximum recursion depth for templates within templates
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
         */
-       private $wrapOutputClass = 'mw-parser-output';
-
-       public function getInterwikiMagic() {
-               return $this->mInterwikiMagic;
-       }
-
-       public function getAllowExternalImages() {
-               return $this->mAllowExternalImages;
-       }
-
-       public function getAllowExternalImagesFrom() {
-               return $this->mAllowExternalImagesFrom;
-       }
-
-       public function getEnableImageWhitelist() {
-               return $this->mEnableImageWhitelist;
-       }
-
-       public function getEditSection() {
-               return $this->mEditSection;
+       public function setMaxTemplateDepth( $x ) {
+               return $this->setOptionLegacy( 'maxTemplateDepth', $x );
        }
 
-       public function getNumberHeadings() {
-               $this->optionUsed( 'numberheadings' );
-
-               return $this->mNumberHeadings;
+       /**
+        * Maximum number of calls per parse to expensive parser functions
+        * @since 1.20
+        * @return int
+        */
+       public function getExpensiveParserFunctionLimit() {
+               return $this->getOption( 'expensiveParserFunctionLimit' );
        }
 
-       public function getAllowSpecialInclusion() {
-               return $this->mAllowSpecialInclusion;
+       /**
+        * Maximum number of calls per parse to expensive parser functions
+        * @since 1.20
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
+        */
+       public function setExpensiveParserFunctionLimit( $x ) {
+               return $this->setOptionLegacy( 'expensiveParserFunctionLimit', $x );
        }
 
-       public function getTidy() {
-               return $this->mTidy;
+       /**
+        * Remove HTML comments
+        * @warning Only applies to preprocess operations
+        * @return bool
+        */
+       public function getRemoveComments() {
+               return $this->getOption( 'removeComments' );
        }
 
-       public function getInterfaceMessage() {
-               return $this->mInterfaceMessage;
+       /**
+        * Remove HTML comments
+        * @warning Only applies to preprocess operations
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setRemoveComments( $x ) {
+               return $this->setOptionLegacy( 'removeComments', $x );
        }
 
-       public function getTargetLanguage() {
-               return $this->mTargetLanguage;
+       /**
+        * Enable limit report in an HTML comment on output
+        * @return bool
+        */
+       public function getEnableLimitReport() {
+               return $this->getOption( 'enableLimitReport' );
        }
 
-       public function getMaxIncludeSize() {
-               return $this->mMaxIncludeSize;
+       /**
+        * Enable limit report in an HTML comment on output
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function enableLimitReport( $x = true ) {
+               return $this->setOptionLegacy( 'enableLimitReport', $x );
        }
 
-       public function getMaxPPNodeCount() {
-               return $this->mMaxPPNodeCount;
+       /**
+        * Clean up signature texts?
+        * @see Parser::cleanSig
+        * @return bool
+        */
+       public function getCleanSignatures() {
+               return $this->getOption( 'cleanSignatures' );
        }
 
-       public function getMaxGeneratedPPNodeCount() {
-               return $this->mMaxGeneratedPPNodeCount;
+       /**
+        * Clean up signature texts?
+        * @see Parser::cleanSig
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setCleanSignatures( $x ) {
+               return $this->setOptionLegacy( 'cleanSignatures', $x );
        }
 
-       public function getMaxPPExpandDepth() {
-               return $this->mMaxPPExpandDepth;
+       /**
+        * Target attribute for external links
+        * @return string
+        */
+       public function getExternalLinkTarget() {
+               return $this->getOption( 'externalLinkTarget' );
        }
 
-       public function getMaxTemplateDepth() {
-               return $this->mMaxTemplateDepth;
+       /**
+        * Target attribute for external links
+        * @param string|null $x New value (null is no change)
+        * @return string Old value
+        */
+       public function setExternalLinkTarget( $x ) {
+               return $this->setOptionLegacy( 'externalLinkTarget', $x );
        }
 
-       /* @since 1.20 */
-       public function getExpensiveParserFunctionLimit() {
-               return $this->mExpensiveParserFunctionLimit;
+       /**
+        * Whether content conversion should be disabled
+        * @return bool
+        */
+       public function getDisableContentConversion() {
+               return $this->getOption( 'disableContentConversion' );
        }
 
-       public function getRemoveComments() {
-               return $this->mRemoveComments;
+       /**
+        * Whether content conversion should be disabled
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function disableContentConversion( $x = true ) {
+               return $this->setOptionLegacy( 'disableContentConversion', $x );
        }
 
-       /* @since 1.24 */
-       public function getCurrentRevisionCallback() {
-               return $this->mCurrentRevisionCallback;
+       /**
+        * Whether title conversion should be disabled
+        * @return bool
+        */
+       public function getDisableTitleConversion() {
+               return $this->getOption( 'disableTitleConversion' );
        }
 
-       public function getTemplateCallback() {
-               return $this->mTemplateCallback;
+       /**
+        * Whether title conversion should be disabled
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function disableTitleConversion( $x = true ) {
+               return $this->setOptionLegacy( 'disableTitleConversion', $x );
        }
 
-       /** @since 1.28 */
-       public function getSpeculativeRevIdCallback() {
-               return $this->mSpeculativeRevIdCallback;
+       /**
+        * Thumb size preferred by the user.
+        * @return int
+        */
+       public function getThumbSize() {
+               return $this->getOption( 'thumbsize' );
        }
 
-       public function getEnableLimitReport() {
-               return $this->mEnableLimitReport;
+       /**
+        * Thumb size preferred by the user.
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
+        */
+       public function setThumbSize( $x ) {
+               return $this->setOptionLegacy( 'thumbsize', $x );
        }
 
-       public function getCleanSignatures() {
-               return $this->mCleanSignatures;
+       /**
+        * Thumb size preferred by the user.
+        * @return int
+        */
+       public function getStubThreshold() {
+               return $this->getOption( 'stubthreshold' );
        }
 
-       public function getExternalLinkTarget() {
-               return $this->mExternalLinkTarget;
+       /**
+        * Thumb size preferred by the user.
+        * @param int|null $x New value (null is no change)
+        * @return int Old value
+        */
+       public function setStubThreshold( $x ) {
+               return $this->setOptionLegacy( 'stubthreshold', $x );
        }
 
-       public function getDisableContentConversion() {
-               return $this->mDisableContentConversion;
+       /**
+        * Parsing the page for a "preview" operation?
+        * @return bool
+        */
+       public function getIsPreview() {
+               return $this->getOption( 'isPreview' );
        }
 
-       public function getDisableTitleConversion() {
-               return $this->mDisableTitleConversion;
+       /**
+        * Parsing the page for a "preview" operation?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setIsPreview( $x ) {
+               return $this->setOptionLegacy( 'isPreview', $x );
        }
 
-       public function getThumbSize() {
-               $this->optionUsed( 'thumbsize' );
-
-               return $this->mThumbSize;
+       /**
+        * Parsing the page for a "preview" operation on a single section?
+        * @return bool
+        */
+       public function getIsSectionPreview() {
+               return $this->getOption( 'isSectionPreview' );
        }
 
-       public function getStubThreshold() {
-               $this->optionUsed( 'stubthreshold' );
-
-               return $this->mStubThreshold;
+       /**
+        * Parsing the page for a "preview" operation on a single section?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setIsSectionPreview( $x ) {
+               return $this->setOptionLegacy( 'isSectionPreview', $x );
        }
 
-       public function getIsPreview() {
-               return $this->mIsPreview;
+       /**
+        * Parsing the printable version of the page?
+        * @return bool
+        */
+       public function getIsPrintable() {
+               return $this->getOption( 'printable' );
        }
 
-       public function getIsSectionPreview() {
-               return $this->mIsSectionPreview;
+       /**
+        * Parsing the printable version of the page?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setIsPrintable( $x ) {
+               return $this->setOptionLegacy( 'printable', $x );
        }
 
-       public function getIsPrintable() {
-               $this->optionUsed( 'printable' );
-
-               return $this->mIsPrintable;
+       /**
+        * Transform wiki markup when saving the page?
+        * @return bool
+        */
+       public function getPreSaveTransform() {
+               return $this->getOption( 'preSaveTransform' );
        }
 
-       public function getUser() {
-               return $this->mUser;
+       /**
+        * Transform wiki markup when saving the page?
+        * @param bool|null $x New value (null is no change)
+        * @return bool Old value
+        */
+       public function setPreSaveTransform( $x ) {
+               return $this->setOptionLegacy( 'preSaveTransform', $x );
        }
 
-       public function getPreSaveTransform() {
-               return $this->mPreSaveTransform;
+       /**
+        * Date format index
+        * @return string
+        */
+       public function getDateFormat() {
+               return $this->getOption( 'dateformat' );
        }
 
-       public function getDateFormat() {
-               $this->optionUsed( 'dateformat' );
-               if ( !isset( $this->mDateFormat ) ) {
-                       $this->mDateFormat = $this->mUser->getDatePreference();
-               }
-               return $this->mDateFormat;
+       /**
+        * Lazy initializer for dateFormat
+        */
+       private static function initDateFormat( $popt ) {
+               return $popt->mUser->getDatePreference();
        }
 
-       public function getTimestamp() {
-               if ( !isset( $this->mTimestamp ) ) {
-                       $this->mTimestamp = wfTimestampNow();
-               }
-               return $this->mTimestamp;
+       /**
+        * Date format index
+        * @param string|null $x New value (null is no change)
+        * @return string Old value
+        */
+       public function setDateFormat( $x ) {
+               return $this->setOptionLegacy( 'dateformat', $x );
        }
 
        /**
@@ -436,8 +691,7 @@ class ParserOptions {
         * @since 1.19
         */
        public function getUserLangObj() {
-               $this->optionUsed( 'userlang' );
-               return $this->mUserLang;
+               return $this->getOption( 'userlang' );
        }
 
        /**
@@ -457,34 +711,72 @@ class ParserOptions {
        }
 
        /**
+        * Set the user language used by the parser for this page and split the parser cache.
+        * @param string|Language $x New value
+        * @return Language Old value
+        */
+       public function setUserLang( $x ) {
+               if ( is_string( $x ) ) {
+                       $x = Language::factory( $x );
+               }
+
+               return $this->setOptionLegacy( 'userlang', $x );
+       }
+
+       /**
+        * Are magic ISBN links enabled?
         * @since 1.28
         * @return bool
         */
        public function getMagicISBNLinks() {
-               return $this->mMagicISBNLinks;
+               return $this->getOption( 'magicISBNLinks' );
        }
 
        /**
+        * Are magic PMID links enabled?
         * @since 1.28
         * @return bool
         */
        public function getMagicPMIDLinks() {
-               return $this->mMagicPMIDLinks;
+               return $this->getOption( 'magicPMIDLinks' );
        }
        /**
+        * Are magic RFC links enabled?
         * @since 1.28
         * @return bool
         */
-       public function getMagicRFCLinks() {
-               return $this->mMagicRFCLinks;
+       public function getMagicRFCLinks() {
+               return $this->getOption( 'magicRFCLinks' );
+       }
+
+       /**
+        * If the wiki is configured to allow raw html ($wgRawHtml = true)
+        * is it allowed in the specific case of parsing this page.
+        *
+        * This is meant to disable unsafe parser tags in cases where
+        * a malicious user may control the input to the parser.
+        *
+        * @note This is expected to be true for normal pages even if the
+        *  wiki has $wgRawHtml disabled in general. The setting only
+        *  signifies that raw html would be unsafe in the current context
+        *  provided that raw html is allowed at all.
+        * @since 1.29
+        * @return bool
+        */
+       public function getAllowUnsafeRawHtml() {
+               return $this->getOption( 'allowUnsafeRawHtml' );
        }
 
        /**
+        * If the wiki is configured to allow raw html ($wgRawHtml = true)
+        * is it allowed in the specific case of parsing this page.
+        * @see self::getAllowUnsafeRawHtml()
         * @since 1.29
-        * @return bool
+        * @param bool|null Value to set or null to get current value
+        * @return bool Current value for allowUnsafeRawHtml
         */
-       public function getAllowUnsafeRawHtml() {
-               return $this->allowUnsafeRawHtml;
+       public function setAllowUnsafeRawHtml( $x ) {
+               return $this->setOptionLegacy( 'allowUnsafeRawHtml', $x );
        }
 
        /**
@@ -493,169 +785,97 @@ class ParserOptions {
         * @return string|bool
         */
        public function getWrapOutputClass() {
-               $this->optionUsed( 'wrapclass' );
-               return $this->wrapOutputClass;
-       }
-
-       public function setInterwikiMagic( $x ) {
-               return wfSetVar( $this->mInterwikiMagic, $x );
-       }
-
-       public function setAllowExternalImages( $x ) {
-               return wfSetVar( $this->mAllowExternalImages, $x );
-       }
-
-       public function setAllowExternalImagesFrom( $x ) {
-               return wfSetVar( $this->mAllowExternalImagesFrom, $x );
-       }
-
-       public function setEnableImageWhitelist( $x ) {
-               return wfSetVar( $this->mEnableImageWhitelist, $x );
-       }
-
-       public function setDateFormat( $x ) {
-               return wfSetVar( $this->mDateFormat, $x );
-       }
-
-       public function setEditSection( $x ) {
-               return wfSetVar( $this->mEditSection, $x );
-       }
-
-       public function setNumberHeadings( $x ) {
-               return wfSetVar( $this->mNumberHeadings, $x );
+               return $this->getOption( 'wrapclass' );
        }
 
-       public function setAllowSpecialInclusion( $x ) {
-               return wfSetVar( $this->mAllowSpecialInclusion, $x );
-       }
-
-       public function setTidy( $x ) {
-               return wfSetVar( $this->mTidy, $x );
-       }
-
-       public function setInterfaceMessage( $x ) {
-               return wfSetVar( $this->mInterfaceMessage, $x );
-       }
-
-       public function setTargetLanguage( $x ) {
-               return wfSetVar( $this->mTargetLanguage, $x, true );
-       }
-
-       public function setMaxIncludeSize( $x ) {
-               return wfSetVar( $this->mMaxIncludeSize, $x );
-       }
-
-       public function setMaxPPNodeCount( $x ) {
-               return wfSetVar( $this->mMaxPPNodeCount, $x );
-       }
-
-       public function setMaxGeneratedPPNodeCount( $x ) {
-               return wfSetVar( $this->mMaxGeneratedPPNodeCount, $x );
-       }
-
-       public function setMaxTemplateDepth( $x ) {
-               return wfSetVar( $this->mMaxTemplateDepth, $x );
-       }
-
-       /* @since 1.20 */
-       public function setExpensiveParserFunctionLimit( $x ) {
-               return wfSetVar( $this->mExpensiveParserFunctionLimit, $x );
+       /**
+        * CSS class to use to wrap output from Parser::parse()
+        * @since 1.30
+        * @param string|bool $className Set false to disable wrapping.
+        * @return string|bool Current value
+        */
+       public function setWrapOutputClass( $className ) {
+               if ( $className === true ) { // DWIM, they probably want the default class name
+                       $className = 'mw-parser-output';
+               }
+               return $this->setOption( 'wrapclass', $className );
        }
 
-       public function setRemoveComments( $x ) {
-               return wfSetVar( $this->mRemoveComments, $x );
+       /**
+        * Callback for current revision fetching; first argument to call_user_func().
+        * @since 1.24
+        * @return callable
+        */
+       public function getCurrentRevisionCallback() {
+               return $this->getOption( 'currentRevisionCallback' );
        }
 
-       /* @since 1.24 */
+       /**
+        * Callback for current revision fetching; first argument to call_user_func().
+        * @since 1.24
+        * @param callable|null $x New value (null is no change)
+        * @return callable Old value
+        */
        public function setCurrentRevisionCallback( $x ) {
-               return wfSetVar( $this->mCurrentRevisionCallback, $x );
+               return $this->setOptionLegacy( 'currentRevisionCallback', $x );
        }
 
-       /** @since 1.28 */
-       public function setSpeculativeRevIdCallback( $x ) {
-               return wfSetVar( $this->mSpeculativeRevIdCallback, $x );
+       /**
+        * Callback for template fetching; first argument to call_user_func().
+        * @return callable
+        */
+       public function getTemplateCallback() {
+               return $this->getOption( 'templateCallback' );
        }
 
+       /**
+        * Callback for template fetching; first argument to call_user_func().
+        * @param callable|null $x New value (null is no change)
+        * @return callable Old value
+        */
        public function setTemplateCallback( $x ) {
-               return wfSetVar( $this->mTemplateCallback, $x );
-       }
-
-       public function enableLimitReport( $x = true ) {
-               return wfSetVar( $this->mEnableLimitReport, $x );
-       }
-
-       public function setTimestamp( $x ) {
-               return wfSetVar( $this->mTimestamp, $x );
-       }
-
-       public function setCleanSignatures( $x ) {
-               return wfSetVar( $this->mCleanSignatures, $x );
-       }
-
-       public function setExternalLinkTarget( $x ) {
-               return wfSetVar( $this->mExternalLinkTarget, $x );
-       }
-
-       public function disableContentConversion( $x = true ) {
-               return wfSetVar( $this->mDisableContentConversion, $x );
-       }
-
-       public function disableTitleConversion( $x = true ) {
-               return wfSetVar( $this->mDisableTitleConversion, $x );
-       }
-
-       public function setUserLang( $x ) {
-               if ( is_string( $x ) ) {
-                       $x = Language::factory( $x );
-               }
-
-               return wfSetVar( $this->mUserLang, $x );
-       }
-
-       public function setThumbSize( $x ) {
-               return wfSetVar( $this->mThumbSize, $x );
-       }
-
-       public function setStubThreshold( $x ) {
-               return wfSetVar( $this->mStubThreshold, $x );
-       }
-
-       public function setPreSaveTransform( $x ) {
-               return wfSetVar( $this->mPreSaveTransform, $x );
+               return $this->setOptionLegacy( 'templateCallback', $x );
        }
 
-       public function setIsPreview( $x ) {
-               return wfSetVar( $this->mIsPreview, $x );
+       /**
+        * Callback to generate a guess for {{REVISIONID}}
+        * @since 1.28
+        * @return callable|null
+        */
+       public function getSpeculativeRevIdCallback() {
+               return $this->getOption( 'speculativeRevIdCallback' );
        }
 
-       public function setIsSectionPreview( $x ) {
-               return wfSetVar( $this->mIsSectionPreview, $x );
+       /**
+        * Callback to generate a guess for {{REVISIONID}}
+        * @since 1.28
+        * @param callable|null $x New value (null is no change)
+        * @return callable|null Old value
+        */
+       public function setSpeculativeRevIdCallback( $x ) {
+               return $this->setOptionLegacy( 'speculativeRevIdCallback', $x );
        }
 
-       public function setIsPrintable( $x ) {
-               return wfSetVar( $this->mIsPrintable, $x );
-       }
+       /**@}*/
 
        /**
-        * @param bool|null Value to set or null to get current value
-        * @return bool Current value for allowUnsafeRawHtml
-        * @since 1.29
+        * Timestamp used for {{CURRENTDAY}} etc.
+        * @return string
         */
-       public function setAllowUnsafeRawHtml( $x ) {
-               return wfSetVar( $this->allowUnsafeRawHtml, $x );
+       public function getTimestamp() {
+               if ( !isset( $this->mTimestamp ) ) {
+                       $this->mTimestamp = wfTimestampNow();
+               }
+               return $this->mTimestamp;
        }
 
        /**
-        * CSS class to use to wrap output from Parser::parse()
-        * @since 1.30
-        * @param string|bool $className Set false to disable wrapping.
-        * @return string|bool Current value
+        * Timestamp used for {{CURRENTDAY}} etc.
+        * @param string|null $x New value (null is no change)
+        * @return string Old value
         */
-       public function setWrapOutputClass( $className ) {
-               if ( $className === true ) { // DWIM, they probably want the default class name
-                       $className = 'mw-parser-output';
-               }
-               return wfSetVar( $this->wrapOutputClass, $className );
+       public function setTimestamp( $x ) {
+               return wfSetVar( $this->mTimestamp, $x );
        }
 
        /**
@@ -684,14 +904,27 @@ class ParserOptions {
 
        /**
         * Extra key that should be present in the parser cache key.
+        * @warning Consider registering your additional options with the
+        *  ParserOptionsRegister hook instead of using this method.
         * @param string $key
         */
        public function addExtraKey( $key ) {
                $this->mExtraKey .= '!' . $key;
        }
 
+       /**
+        * Current user
+        * @return User
+        */
+       public function getUser() {
+               return $this->mUser;
+       }
+
        /**
         * Constructor
+        * @warning For interaction with the parser cache, use
+        *  WikiPage::makeParserOptions(), ContentHandler::makeParserOptions(), or
+        *  ParserOptions::newCanonical() instead.
         * @param User $user
         * @param Language $lang
         */
@@ -716,6 +949,9 @@ class ParserOptions {
 
        /**
         * Get a ParserOptions object for an anonymous user
+        * @warning For interaction with the parser cache, use
+        *  WikiPage::makeParserOptions(), ContentHandler::makeParserOptions(), or
+        *  ParserOptions::newCanonical() instead.
         * @since 1.27
         * @return ParserOptions
         */
@@ -728,6 +964,9 @@ class ParserOptions {
         * Get a ParserOptions object from a given user.
         * Language will be taken from $wgLang.
         *
+        * @warning For interaction with the parser cache, use
+        *  WikiPage::makeParserOptions(), ContentHandler::makeParserOptions(), or
+        *  ParserOptions::newCanonical() instead.
         * @param User $user
         * @return ParserOptions
         */
@@ -738,6 +977,9 @@ class ParserOptions {
        /**
         * Get a ParserOptions object from a given user and language
         *
+        * @warning For interaction with the parser cache, use
+        *  WikiPage::makeParserOptions(), ContentHandler::makeParserOptions(), or
+        *  ParserOptions::newCanonical() instead.
         * @param User $user
         * @param Language $lang
         * @return ParserOptions
@@ -749,6 +991,9 @@ class ParserOptions {
        /**
         * Get a ParserOptions object from a IContextSource object
         *
+        * @warning For interaction with the parser cache, use
+        *  WikiPage::makeParserOptions(), ContentHandler::makeParserOptions(), or
+        *  ParserOptions::newCanonical() instead.
         * @param IContextSource $context
         * @return ParserOptions
         */
@@ -757,44 +1002,130 @@ class ParserOptions {
        }
 
        /**
-        * Get user options
+        * Creates a "canonical" ParserOptions object
         *
-        * @param User $user
-        * @param Language $lang
+        * For historical reasons, certain options have default values that are
+        * different from the canonical values used for caching.
+        *
+        * @since 1.30
+        * @param User|null $user
+        * @param Language|StubObject|null $lang
+        * @return ParserOptions
         */
-       private function initialiseFromUser( $user, $lang ) {
+       public static function newCanonical( User $user = null, $lang = null ) {
+               $ret = new ParserOptions( $user, $lang );
+               foreach ( self::getCanonicalOverrides() as $k => $v ) {
+                       $ret->setOption( $k, $v );
+               }
+               return $ret;
+       }
+
+       /**
+        * Get default option values
+        * @warning If you change the default for an existing option (unless it's
+        *  being overridden by self::getCanonicalOverrides()), all existing parser
+        *  cache entries will be invalid. To avoid bugs, you'll need to handle
+        *  that somehow (e.g. with the RejectParserCacheValue hook) because
+        *  MediaWiki won't do it for you.
+        * @return array
+        */
+       private static function getDefaults() {
                global $wgInterwikiMagic, $wgAllowExternalImages,
                        $wgAllowExternalImagesFrom, $wgEnableImageWhitelist, $wgAllowSpecialInclusion,
                        $wgMaxArticleSize, $wgMaxPPNodeCount, $wgMaxTemplateDepth, $wgMaxPPExpandDepth,
                        $wgCleanSignatures, $wgExternalLinkTarget, $wgExpensiveParserFunctionLimit,
                        $wgMaxGeneratedPPNodeCount, $wgDisableLangConversion, $wgDisableTitleConversion,
-                       $wgEnableMagicLinks;
-
-               // *UPDATE* ParserOptions::matches() if any of this changes as needed
-               $this->mInterwikiMagic = $wgInterwikiMagic;
-               $this->mAllowExternalImages = $wgAllowExternalImages;
-               $this->mAllowExternalImagesFrom = $wgAllowExternalImagesFrom;
-               $this->mEnableImageWhitelist = $wgEnableImageWhitelist;
-               $this->mAllowSpecialInclusion = $wgAllowSpecialInclusion;
-               $this->mMaxIncludeSize = $wgMaxArticleSize * 1024;
-               $this->mMaxPPNodeCount = $wgMaxPPNodeCount;
-               $this->mMaxGeneratedPPNodeCount = $wgMaxGeneratedPPNodeCount;
-               $this->mMaxPPExpandDepth = $wgMaxPPExpandDepth;
-               $this->mMaxTemplateDepth = $wgMaxTemplateDepth;
-               $this->mExpensiveParserFunctionLimit = $wgExpensiveParserFunctionLimit;
-               $this->mCleanSignatures = $wgCleanSignatures;
-               $this->mExternalLinkTarget = $wgExternalLinkTarget;
-               $this->mDisableContentConversion = $wgDisableLangConversion;
-               $this->mDisableTitleConversion = $wgDisableLangConversion || $wgDisableTitleConversion;
-               $this->mMagicISBNLinks = $wgEnableMagicLinks['ISBN'];
-               $this->mMagicPMIDLinks = $wgEnableMagicLinks['PMID'];
-               $this->mMagicRFCLinks = $wgEnableMagicLinks['RFC'];
+                       $wgEnableMagicLinks, $wgContLang;
+
+               if ( self::$defaults === null ) {
+                       // *UPDATE* ParserOptions::matches() if any of this changes as needed
+                       self::$defaults = [
+                               'dateformat' => null,
+                               'editsection' => true,
+                               'tidy' => false,
+                               'interfaceMessage' => false,
+                               'targetLanguage' => null,
+                               'removeComments' => true,
+                               'enableLimitReport' => false,
+                               'preSaveTransform' => true,
+                               'isPreview' => false,
+                               'isSectionPreview' => false,
+                               'printable' => false,
+                               'allowUnsafeRawHtml' => true,
+                               'wrapclass' => 'mw-parser-output',
+                               'currentRevisionCallback' => [ 'Parser', 'statelessFetchRevision' ],
+                               'templateCallback' => [ 'Parser', 'statelessFetchTemplate' ],
+                               'speculativeRevIdCallback' => null,
+                       ];
+
+                       Hooks::run( 'ParserOptionsRegister', [
+                               &self::$defaults,
+                               &self::$inCacheKey,
+                               &self::$lazyOptions,
+                       ] );
+
+                       ksort( self::$inCacheKey );
+               }
+
+               // Unit tests depend on being able to modify the globals at will
+               return self::$defaults + [
+                       'interwikiMagic' => $wgInterwikiMagic,
+                       'allowExternalImages' => $wgAllowExternalImages,
+                       'allowExternalImagesFrom' => $wgAllowExternalImagesFrom,
+                       'enableImageWhitelist' => $wgEnableImageWhitelist,
+                       'allowSpecialInclusion' => $wgAllowSpecialInclusion,
+                       'maxIncludeSize' => $wgMaxArticleSize * 1024,
+                       'maxPPNodeCount' => $wgMaxPPNodeCount,
+                       'maxGeneratedPPNodeCount' => $wgMaxGeneratedPPNodeCount,
+                       'maxPPExpandDepth' => $wgMaxPPExpandDepth,
+                       'maxTemplateDepth' => $wgMaxTemplateDepth,
+                       'expensiveParserFunctionLimit' => $wgExpensiveParserFunctionLimit,
+                       'externalLinkTarget' => $wgExternalLinkTarget,
+                       'cleanSignatures' => $wgCleanSignatures,
+                       'disableContentConversion' => $wgDisableLangConversion,
+                       'disableTitleConversion' => $wgDisableLangConversion || $wgDisableTitleConversion,
+                       'magicISBNLinks' => $wgEnableMagicLinks['ISBN'],
+                       'magicPMIDLinks' => $wgEnableMagicLinks['PMID'],
+                       'magicRFCLinks' => $wgEnableMagicLinks['RFC'],
+                       'numberheadings' => User::getDefaultOption( 'numberheadings' ),
+                       'thumbsize' => User::getDefaultOption( 'thumbsize' ),
+                       'stubthreshold' => 0,
+                       'userlang' => $wgContLang,
+               ];
+       }
+
+       /**
+        * Get "canonical" non-default option values
+        * @see self::newCanonical
+        * @warning If you change the override for an existing option, all existing
+        *  parser cache entries will be invalid. To avoid bugs, you'll need to
+        *  handle that somehow (e.g. with the RejectParserCacheValue hook) because
+        *  MediaWiki won't do it for you.
+        * @return array
+        */
+       private static function getCanonicalOverrides() {
+               global $wgEnableParserLimitReporting;
+
+               return [
+                       'tidy' => true,
+                       'enableLimitReport' => $wgEnableParserLimitReporting,
+               ];
+       }
+
+       /**
+        * Get user options
+        *
+        * @param User $user
+        * @param Language $lang
+        */
+       private function initialiseFromUser( $user, $lang ) {
+               $this->options = self::getDefaults();
 
                $this->mUser = $user;
-               $this->mNumberHeadings = $user->getOption( 'numberheadings' );
-               $this->mThumbSize = $user->getOption( 'thumbsize' );
-               $this->mStubThreshold = $user->getStubThreshold();
-               $this->mUserLang = $lang;
+               $this->options['numberheadings'] = $user->getOption( 'numberheadings' );
+               $this->options['thumbsize'] = $user->getOption( 'thumbsize' );
+               $this->options['stubthreshold'] = $user->getStubThreshold();
+               $this->options['userlang'] = $lang;
        }
 
        /**
@@ -807,9 +1138,36 @@ class ParserOptions {
         * @since 1.25
         */
        public function matches( ParserOptions $other ) {
+               // Populate lazy options
+               foreach ( self::$lazyOptions as $name => $callback ) {
+                       if ( $this->options[$name] === null ) {
+                               $this->options[$name] = call_user_func( $callback, $this, $name );
+                       }
+                       if ( $other->options[$name] === null ) {
+                               $other->options[$name] = call_user_func( $callback, $other, $name );
+                       }
+               }
+
+               // Compare most options
+               $options = array_keys( $this->options );
+               $options = array_diff( $options, [
+                       'enableLimitReport', // only affects HTML comments
+               ] );
+               foreach ( $options as $option ) {
+                       $o1 = $this->optionToString( $this->options[$option] );
+                       $o2 = $this->optionToString( $other->options[$option] );
+                       if ( $o1 !== $o2 ) {
+                               return false;
+                       }
+               }
+
+               // Compare most other fields
                $fields = array_keys( get_class_vars( __CLASS__ ) );
                $fields = array_diff( $fields, [
-                       'mEnableLimitReport', // only effects HTML comments
+                       'defaults', // static
+                       'lazyOptions', // static
+                       'inCacheKey', // static
+                       'options', // Already checked above
                        'onAccessCallback', // only used for ParserOutput option tracking
                ] );
                foreach ( $fields as $field ) {
@@ -817,11 +1175,8 @@ class ParserOptions {
                                return false;
                        }
                }
-               // Check the object and lazy-loaded options
-               return (
-                       $this->mUserLang->equals( $other->mUserLang ) &&
-                       $this->getDateFormat() === $other->getDateFormat()
-               );
+
+               return true;
        }
 
        /**
@@ -851,6 +1206,7 @@ class ParserOptions {
         * Returns the full array of options that would have been used by
         * in 1.16.
         * Used to get the old parser cache entries when available.
+        * @todo 1.16 was years ago, can we remove this?
         * @return array
         */
        public static function legacyOptions() {
@@ -864,6 +1220,27 @@ class ParserOptions {
                ];
        }
 
+       /**
+        * Convert an option to a string value
+        * @param mixed $value
+        * @return string
+        */
+       private function optionToString( $value ) {
+               if ( $value === true ) {
+                       return '1';
+               } elseif ( $value === false ) {
+                       return '0';
+               } elseif ( $value === null ) {
+                       return '';
+               } elseif ( $value instanceof Language ) {
+                       return $value->getCode();
+               } elseif ( is_array( $value ) ) {
+                       return '[' . join( ',', array_map( [ $this, 'optionToString' ], $value ) ) . ']';
+               } else {
+                       return (string)$value;
+               }
+       }
+
        /**
         * Generate a hash string with the values set on these ParserOptions
         * for the keys given in the array.
@@ -871,10 +1248,6 @@ class ParserOptions {
         * so users sharing the options with vary for the same page share
         * the same cached data safely.
         *
-        * Extensions which require it should install 'PageRenderingHash' hook,
-        * which will give them a chance to modify this key based on their own
-        * settings.
-        *
         * @since 1.17
         * @param array $forOptions
         * @param Title $title Used to get the content language of the page (since r97636)
@@ -883,6 +1256,61 @@ class ParserOptions {
        public function optionsHash( $forOptions, $title = null ) {
                global $wgRenderHashAppend;
 
+               // We only include used options with non-canonical values in the key
+               // so adding a new option doesn't invalidate the entire parser cache.
+               // The drawback to this is that changing the default value of an option
+               // requires manual invalidation of existing cache entries, as mentioned
+               // in the docs on the relevant methods and hooks.
+               $defaults = self::getCanonicalOverrides() + self::getDefaults();
+               $values = [];
+               foreach ( self::$inCacheKey as $option => $include ) {
+                       if ( $include && in_array( $option, $forOptions, true ) ) {
+                               $v = $this->optionToString( $this->options[$option] );
+                               $d = $this->optionToString( $defaults[$option] );
+                               if ( $v !== $d ) {
+                                       $values[] = "$option=$v";
+                               }
+                       }
+               }
+
+               $confstr = $values ? join( '!', $values ) : 'canonical';
+
+               // add in language specific options, if any
+               // @todo FIXME: This is just a way of retrieving the url/user preferred variant
+               if ( !is_null( $title ) ) {
+                       $confstr .= $title->getPageLanguage()->getExtraHashOptions();
+               } else {
+                       global $wgContLang;
+                       $confstr .= $wgContLang->getExtraHashOptions();
+               }
+
+               $confstr .= $wgRenderHashAppend;
+
+               if ( $this->mExtraKey != '' ) {
+                       $confstr .= $this->mExtraKey;
+               }
+
+               // Give a chance for extensions to modify the hash, if they have
+               // extra options or other effects on the parser cache.
+               Hooks::run( 'PageRenderingHash', [ &$confstr, $this->getUser(), &$forOptions ] );
+
+               // Make it a valid memcached key fragment
+               $confstr = str_replace( ' ', '_', $confstr );
+
+               return $confstr;
+       }
+
+       /**
+        * Generate the hash used before MediaWiki 1.30
+        * @since 1.30
+        * @deprecated since 1.30. Do not use this unless you're ParserCache.
+        * @param array $forOptions
+        * @param Title $title Used to get the content language of the page (since r97636)
+        * @return string Page rendering hash
+        */
+       public function optionsHashPre30( $forOptions, $title = null ) {
+               global $wgRenderHashAppend;
+
                // FIXME: Once the cache key is reorganized this argument
                // can be dropped. It was used when the math extension was
                // part of core.
@@ -892,7 +1320,7 @@ class ParserOptions {
                // since it disables the parser cache, its value will always
                // be 0 when this function is called by parsercache.
                if ( in_array( 'stubthreshold', $forOptions ) ) {
-                       $confstr .= '!' . $this->mStubThreshold;
+                       $confstr .= '!' . $this->options['stubthreshold'];
                } else {
                        $confstr .= '!*';
                }
@@ -902,19 +1330,19 @@ class ParserOptions {
                }
 
                if ( in_array( 'numberheadings', $forOptions ) ) {
-                       $confstr .= '!' . ( $this->mNumberHeadings ? '1' : '' );
+                       $confstr .= '!' . ( $this->options['numberheadings'] ? '1' : '' );
                } else {
                        $confstr .= '!*';
                }
 
                if ( in_array( 'userlang', $forOptions ) ) {
-                       $confstr .= '!' . $this->mUserLang->getCode();
+                       $confstr .= '!' . $this->options['userlang']->getCode();
                } else {
                        $confstr .= '!*';
                }
 
                if ( in_array( 'thumbsize', $forOptions ) ) {
-                       $confstr .= '!' . $this->mThumbSize;
+                       $confstr .= '!' . $this->options['thumbsize'];
                } else {
                        $confstr .= '!*';
                }
@@ -936,16 +1364,18 @@ class ParserOptions {
                // directly. At least Wikibase does at this point in time.
                if ( !in_array( 'editsection', $forOptions ) ) {
                        $confstr .= '!*';
-               } elseif ( !$this->mEditSection ) {
+               } elseif ( !$this->options['editsection'] ) {
                        $confstr .= '!edit=0';
                }
 
-               if ( $this->mIsPrintable && in_array( 'printable', $forOptions ) ) {
+               if ( $this->options['printable'] && in_array( 'printable', $forOptions ) ) {
                        $confstr .= '!printable=1';
                }
 
-               if ( $this->wrapOutputClass !== 'mw-parser-output' && in_array( 'wrapclass', $forOptions ) ) {
-                       $confstr .= '!wrapclass=' . $this->wrapOutputClass;
+               if ( $this->options['wrapclass'] !== 'mw-parser-output' &&
+                       in_array( 'wrapclass', $forOptions )
+               ) {
+                       $confstr .= '!wrapclass=' . $this->options['wrapclass'];
                }
 
                if ( $this->mExtraKey != '' ) {
@@ -962,6 +1392,25 @@ class ParserOptions {
                return $confstr;
        }
 
+       /**
+        * Test whether these options are safe to cache
+        * @since 1.30
+        * @return bool
+        */
+       public function isSafeToCache() {
+               $defaults = self::getCanonicalOverrides() + self::getDefaults();
+               foreach ( $this->options as $option => $value ) {
+                       if ( empty( self::$inCacheKey[$option] ) ) {
+                               $v = $this->optionToString( $value );
+                               $d = $this->optionToString( $defaults[$option] );
+                               if ( $v !== $d ) {
+                                       return false;
+                               }
+                       }
+               }
+               return true;
+       }
+
        /**
         * Sets a hook to force that a page exists, and sets a current revision callback to return
         * a revision with custom content when the current revision of the page is requested.
@@ -1009,3 +1458,8 @@ class ParserOptions {
                } );
        }
 }
+
+/**
+ * For really cool vim folding this needs to be at the end:
+ * vim: foldmarker=@{,@} foldmethod=marker
+ */
index d144987..767046b 100644 (file)
@@ -573,7 +573,12 @@ class ResourceLoader implements LoggerAwareInterface {
                        return false;
                }
                $info = $this->moduleInfos[$name];
-               if ( isset( $info['object'] ) || isset( $info['class'] ) ) {
+               if (
+                       isset( $info['object'] ) ||
+                       // This special case is dumb, but we need $wgResourceModuleSkinStyles
+                       // to work for 'oojs-ui-core.styles'. See T167042.
+                       ( isset( $info['class'] ) && $info['class'] !== 'ResourceLoaderOOUIFileModule' )
+               ) {
                        return false;
                }
                return true;
index 135efa7..e97e074 100644 (file)
@@ -29,10 +29,18 @@ class ResourceLoaderOOUIFileModule extends ResourceLoaderFileModule {
 
        public function __construct( $options = [] ) {
                if ( isset( $options[ 'themeScripts' ] ) ) {
-                       $options['skinScripts'] = $this->getSkinSpecific( $options[ 'themeScripts' ], 'scripts' );
+                       $skinScripts = $this->getSkinSpecific( $options[ 'themeScripts' ], 'scripts' );
+                       if ( !isset( $options['skinScripts'] ) ) {
+                               $options['skinScripts'] = [];
+                       }
+                       $this->extendSkinSpecific( $options['skinScripts'], $skinScripts );
                }
                if ( isset( $options[ 'themeStyles' ] ) ) {
-                       $options['skinStyles'] = $this->getSkinSpecific( $options[ 'themeStyles' ], 'styles' );
+                       $skinStyles = $this->getSkinSpecific( $options[ 'themeStyles' ], 'styles' );
+                       if ( !isset( $options['skinStyles'] ) ) {
+                               $options['skinStyles'] = [];
+                       }
+                       $this->extendSkinSpecific( $options['skinStyles'], $skinStyles );
                }
 
                parent::__construct( $options );
@@ -60,4 +68,31 @@ class ResourceLoaderOOUIFileModule extends ResourceLoaderFileModule {
                        }, array_values( $themes ) )
                );
        }
+
+       /**
+        * Prepend the $extraSkinSpecific assoc. array to the $skinSpecific assoc. array.
+        * Both of them represent a 'skinScripts' or 'skinStyles' definition.
+        *
+        * @param array &$skinSpecific
+        * @param array $extraSkinSpecific
+        */
+       private function extendSkinSpecific( &$skinSpecific, $extraSkinSpecific ) {
+               // For each skin where skinStyles/skinScripts are defined, add our ones at the beginning
+               foreach ( $skinSpecific as $skin => $files ) {
+                       if ( !is_array( $files ) ) {
+                               $files = [ $files ];
+                       }
+                       if ( isset( $extraSkinSpecific[$skin] ) ) {
+                               $skinSpecific[$skin] = array_merge( [ $extraSkinSpecific[$skin] ], $files );
+                       } elseif ( isset( $extraSkinSpecific['default'] ) ) {
+                               $skinSpecific[$skin] = array_merge( [ $extraSkinSpecific['default'] ], $files );
+                       }
+               }
+               // Add our remaining skinStyles/skinScripts for skins that did not have them defined
+               foreach ( $extraSkinSpecific as $skin => $file ) {
+                       if ( !isset( $skinSpecific[$skin] ) ) {
+                               $skinSpecific[$skin] = $file;
+                       }
+               }
+       }
 }
index a76f617..21a1fb5 100644 (file)
@@ -94,6 +94,7 @@
        "about": "Taci we otciparik",
        "newwindow": "(cepita kotak ocki osapwakan)",
        "cancel": "Ponipata",
+       "moredotdotdot": "Erikam...",
        "mypage": "Masinhikan",
        "mytalk": "Ka ici arimowaniwok",
        "anontalk": "Ka ici arimowaniok",
        "create": "Ocita",
        "create-local": "Arimota ke acotcictek",
        "editthispage": "Mecikotona owe",
+       "create-this-page": "Wita ohwe ka masinatek",
        "delete": "Wepina",
+       "protect": "Tacikatek",
        "newpage": "Ocki matcecikinakanik",
        "talkpagelinktext": "ka ici arimowaniwok",
+       "specialpage": "Ka ici wectakaniwok",
        "personaltools": "Kit irapatcitcikan",
        "talk": "Ka ici arimowaniwok",
        "views": "Ke icinakok",
        "toolbox": "Irapitcitcikan",
+       "userpage": "Kitci wapataman nihe masinahikan ka apatak",
        "projectpage": "Kitci wapataman nehe masinihikan ocki otamirowinik otci",
+       "imagepage": "Kitci wapataman nihe masinahikan",
        "otherlanguages": "Kotakahi aiarimowewina",
        "redirectedfrom": "(Taci e kiweckwemakak $1)",
+       "redirectpagesub": "Masinhikan ke kweskiticohemikok",
        "redirectto": "Nte ica:",
        "lastmodifiedat": "Pamitcitc ka meckotcitakiniwok ni apitc $1, ka tato tipahikaneak $2.",
        "jumpto": "Ica:",
        "retrievedfrom": "Neta pe otcipirin \"$1\"",
        "editsection": "meckotcita",
        "editold": "meckotcita",
+       "viewsourceold": "Nte ici nta kanawapata e otciparik",
        "editlink": "meckotcita",
        "viewsourcelink": "Nte ici nta kanawapata e otciparik",
        "editsectionhint": "Meckotcita ota: $1",
        "toc": "Tekaci e icinakok",
        "showtoc": "Wapata",
        "hidetoc": "Kata",
+       "collapsible-expand": "Otamirota",
        "confirmable-yes": "Ehe",
        "confirmable-no": "Nama",
        "site-atom-feed": "Flux Atom $1",
        "page-atom-feed": "\"$1\" Atom feed",
        "red-link-title": "$1 (nama takon kekwcic)",
        "nstab-main": "Masinahikan",
-       "nstab-user": "{{GENDER:{{ROOTPAGENAME}}|Ka masinahiketc|Ka masinahiketc}}",
+       "nstab-user": "Ka masinahiketc",
        "nstab-special": "Ka ici wectakaniwok",
        "nstab-project": "Nohwe ma",
        "nstab-image": "Masinahikan",
+       "nstab-mediawiki": "E itatcitcikatek",
        "nstab-template": "Tapapitcikan",
        "nstab-category": "Ka ici arimotcikatek",
        "mainpage-nstab": "Otitikowin",
        "userlogin-yourpassword": "Pitakesinahotiso",
        "userlogin-yourpassword-ph": "Pitakesinihikan",
        "createacct-yourpassword-ph": "Acta pitakesinihikan",
+       "yourpasswordagain": "Minawatc acta pitakesinihikan:",
        "createacct-yourpasswordagain": "Naskamowicta pitakesinihikan",
        "createacct-yourpasswordagain-ph": "Minawatc acta pitakesinihikan",
        "userlogin-remembermypassword": "Kitci cetik mekwact ka ici otamirohian",
        "login": "Posi",
+       "nav-login-createaccount": "Posi / masinahotiso",
        "logout": "Piskeapikenakan",
        "userlogout": "Piskeapikenakan",
        "userlogin-noaccount": " Nama takon ki mockinesinihikan?",
        "createacct-emailoptional": "Pamikicikwepitcikan matcetcicihikan (kir kotc)",
        "createacct-email-ph": "Pitakesinaha ki pamikicikwepitcikan matcetcicihikan",
        "createacct-submit": "Masinahotiso",
+       "createacct-another-submit": "Masinahotiso",
        "createacct-benefit-heading": "{{SITENAME}} iskwewok, iriniwok ka orisinihiketcik mitowi kir.",
        "createacct-benefit-body1": "{{PLURAL:$1|ki meckotcitakiniwok|ki meckotcitakiniwoki}}",
        "createacct-benefit-body2": "{{PLURAL:$1|masinhikan|masinahikana}}",
        "pt-login-button": "Posi",
        "pt-createaccount": "Masinahotiso",
        "pt-userlogout": "Piskeapikenakan",
+       "botpasswords-label-create": "Ocita",
        "botpasswords-label-cancel": "Ponipita",
        "botpasswords-label-delete": "Wepina",
        "resetpass-submit-cancel": "Ponipita",
        "moveddeleted-notice": "Paskickwemakan ka ki wepinikatek.\nOhwe wapatcikan nitc ici nokon paskickwemakanik ka ki wepinikateki acit ka ki atcipitcikateki.",
        "content-model-javascript": "JavaScript",
        "viewpagelogs": "Kinawapta kekwan kaki isparik ota masinhikanik",
+       "currentrev": "Mekwatc ka otamirowitcikatek",
        "currentrev-asof": "Owe mekwatc ka icinakok ni apitc ka ocitakiniwokipan $1",
        "revisionasof": "Kiwe kanawapata $1",
        "revision-info": "E tato konekisitc ka koski kanawapatcikatek $1 nohwe {{GENDER:$6|$2}}$7",
        "nextrevision": "Tec aci ka ki otamirowitcikatek →",
        "currentrevisionlink": "Mekwatc ka otamirowitcikatek",
        "cur": "e otapekitikw",
+       "next": "minawa",
        "last": "pitoc",
+       "historysize": "{{PLURAL:$1|1 irik|$1 irik}}",
        "history-feed-title": "Kotakihi e itatcitcikatekai",
        "rev-delundel": "Nokota/katcicta",
        "rev-showdeleted": "wapata",
        "searchresults-title": "Ka ki nta kiskeritakok \"$1\"",
        "prevn": "{{PLURAL:$1|nictamictew|nictamictewa $1}}",
        "nextn": "minawa {{PLURAL:$1|$1}}",
+       "next-page": "minawa masinahikan",
        "nextn-title": "Minawa $1 {{PLURAL:$1|ke iti icinakok|ke iti icinakoki}}",
        "shown-title": "Akwaskoha $1 {{PLURAL:$1|ke iti icinakok|ke iti icinakoki}} tatwa e matce paskickwemikein",
        "viewprevnext": "Tapwatcike ($1 {{int:pipe-separator}} $2) ($3)",
        "search-result-size": "$1 ({{PLURAL:$2|1 itewin e masinatek|$2 itewina e masinateki}})",
        "search-redirect": "(taci e kiweckwemakak $1)",
        "search-section": "(ke arimotcikatek $1)",
+       "search-category": "(ka ici arimotcikatek $1)",
        "search-suggest": "Ohwe kotcita e itasinatek: $1",
+       "search-interwiki-more": "(erikam)",
        "searchall": "kaskina",
        "search-showingresults": "{{PLURAL:$4|E ici miskatek <strong>$1</strong> nta neki<strong>$3</strong>|E ici miskatek <strong>$1 à $2</strong>nta neki<strong>$3</strong>}}",
        "search-nonefound": "Nama miskwapahikatew ka nantowapahikatek.",
        "powersearch-toggleall": "Kaskina",
        "preferences": "Kirowe",
        "mypreferences": "Mocak ka kinawapataman",
+       "prefs-rc": "Ka ki meckotcitakaniwoki",
+       "prefs-watchlist": "Ka masinateki",
        "saveprefs": "Kinokepitcikanik",
        "searchresultshead": "Nantokaskeritcikatek",
        "stub-threshold-disabled": "Manisinaha",
        "prefs-searchoptions": "Nantokaskeritcikatek",
+       "prefs-namespaces": "Ka ici masinasotcik",
+       "prefs-files": "Masinahikan",
        "youremail": "Matcetcicihikan:",
        "email": "Matcetcicihikan",
        "group-user": "Ka mitatc",
+       "group-bot": "Meckotciparin",
+       "group-all": "(kaskina)",
+       "grouppage-bot": "{{ns:project}}:Meckotciparin",
+       "right-upload": "Natcipata masinahikan",
        "right-writeapi": "Ohwe apitcita A.P.I meckotci aitotaman wikik",
+       "grant-createaccount": "Masinahotiso",
        "newuserlogpage": "E ici masinasotcik ka pitakesinahotisotcik",
        "action-edit": "mecikotona owe",
+       "action-move": "orinkata owe masinhikan",
        "enhancedrc-history": "isparik",
        "recentchanges": "Ka ki meckotcitakaniwoki",
        "recentchanges-legend": " Ka meckotcitain matcenikana",
        "recentchanges-legend-heading": "<strong>Itekesinihikan:</strong>",
        "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (kirika kanawapata nohwe [[Special:NewPages|taci e ici masinihikatek ocki paskickwemakana]]).",
        "recentchanges-submit": "Wapata",
+       "rcfilters-savedqueries-cancel-label": "Ponipata",
+       "rcfilters-filter-minor-label": "Memantcic meckotcipirino",
        "rclistfrom": "Nokota ka ki mameckotciparik nta e otci kitciparik $2, $3",
        "rcshowhideminor": "$1 memantcic meckotcipirino",
        "rcshowhideminor-show": "Wapata",
        "boteditletter": "p",
        "rc-change-size-new": "$1 {{PLURAL:$1|irik|irikw}} ke askowak",
        "recentchangeslinked": "Nosineta masinahikana e mamowapiketik",
+       "recentchangeslinked-feed": "Nosineta masinahikana e mamowapiketik",
        "recentchangeslinked-toolbox": "Nosineta masinahikana e mamowapiketik",
        "recentchangeslinked-title": "E nosinehikatek paskickwemikana ka acotcictek\"$1\"",
        "recentchangeslinked-summary": " Enkon ohwe ka ki meckotcisinihikateki paskickwemikana  e ici natcipitcikatek nta paskickemakanik kekwan ka arimotcikatek mia kekotc ma neki ka mamowisinasotcik taci ka ki ici aritisotcik mia.\nPaskickwemikina [[Special:Watchlist|masinihikan ka nakatcitain]] nehi<strong>makatewasinikan</strong>",
        "recentchangeslinked-page": "Icinikatamowin Ickwemakinikan:",
        "recentchangeslinked-to": "Kata nokok kaki kweskisinihikateki paskickwemikina ka acotcisinihikateki taci e ici ntowapekihikatek nohwe paskickwemakan patoc kweski e icinakok.",
        "upload": "Natcipata masinahikan",
+       "uploadbtn": "Natcipata masinahikan",
        "filedesc": "Nosem",
        "fileuploadsummary": "Nosem:",
        "filesource": "Ite wetciparik:",
+       "upload-dialog-title": "Natcipata masinahikan",
        "upload-dialog-button-cancel": "Ponipita",
        "upload-dialog-button-save": "Kinokepitcikanik",
        "upload-form-label-infoform-description": "E witcikemakak",
        "upload-form-label-infoform-categories": "Nakwe tipanictasinihikan",
        "upload-form-label-infoform-date": "Tatokonakisitc",
-       "license-header": "orocowatcikan",
+       "license": "Orocowatcikan:",
+       "license-header": "Orocowatcikan",
        "listfiles-delete": "wepina",
        "imgfile": "masinhikan",
        "listfiles": "Ka ici tapitik onimiskimasinhikan",
        "newpages": "Ocki matcecikinakanik",
        "newpages-submit": "Wapata",
        "newpages-username": "Icinikasowin:",
+       "movethispage": "Orinkata owe masinhikan",
        "pager-older-n": "{{PLURAL:$1|1 mawtci weckat|$1 mawtci weckat}}",
        "booksources": "E otciparik",
        "booksources-search-legend": "Nantowapata nta kotakahi wapatcikana",
        "logeventslist-submit": "Wapata",
        "checkbox-all": "Kaskina",
        "allpages": "Kaskina paskickwemikana",
+       "nextpage": "minawa masinahikan ($1)",
        "allarticles": "Kaskina paskickwemikana",
        "allpagessubmit": "Tapwata",
        "categories": "Ka ici arimotcikateki",
        "listusers-submit": "Wapata",
        "listgrouprights-namespaceprotection-namespace": "Ka ici masinasotcik",
        "emailusername": "Icinikasowin:",
+       "emailmessage": "E itatcitcikatek:",
        "watchlist": "Ka masinateki",
        "mywatchlist": "Ka masinateki",
        "watch": "Nanakatcita",
+       "watchthispage": "Wi nosinetaine ohwe masinahikan",
        "watchlist-hide": "Kata",
        "watchlist-submit": "Wapata",
+       "wlshowhidebots": "meckotciparin",
+       "wlshowhideliu": "ka notcitatcik e ici masinahotisotcik",
        "wlshowhideanons": "nama kiskeritakosiw ka ki masinahak",
        "enotif_anon_editor": "nama kiskeritakosiw ka ki masinahak $1",
        "delete-confirm": "Wepina \"$1\"",
        "delete-legend": "Wepina",
        "historyaction-submit": "Wapata",
        "dellogpage": " Nesitc ka wepinikatek kanaweritcikan",
+       "deletionlog": "nesitc ka wepinikatek kanaweritcikan",
        "rollbacklink": "e maninakatek",
        "rollbacklinkcount": " nesitc wepina $1 {{PLURAL:$1|kweskisinikan|kweskisinihikana}}",
        "protectlogpage": "Nanakatisiwina wapatcikan",
+       "restriction-type": "Niheritam:",
+       "pagesize": "(irik)",
        "restriction-edit": "Meckotcita",
+       "restriction-move": "Erikam",
+       "restriction-create": "Ocita",
        "undeleteviewlink": "tapwatcike",
        "undelete-search-submit": "Nantokaskeritcikatek",
        "undelete-show-file-submit": "Ehe",
        "uctop": "(mekwatc)",
        "month": "Anotc pisimw ka akotcinitc (nac nte nictam):",
        "year": "Taci e ici matce tato piponikak(acit nictam):",
+       "sp-contributions-blocklog": "wapatcikan taci e nanikactek",
+       "sp-contributions-logs": "pamikickwepitcikana masinihikana",
        "sp-contributions-talk": "ka ici arimowaniok",
        "sp-contributions-submit": "Nantokaskeritcikatek",
        "whatlinkshere": "Kaskina ickwemakina ka witci acteki",
        "whatlinkshere-hideredirs": "$1 itapahikana",
        "whatlinkshere-hidetrans": "$1 pitcititawina",
        "whatlinkshere-hidelinks": "$1 ka patiki",
+       "whatlinkshere-hideimages": "$1 ka ici tapitik onimiskimasinahikan",
        "whatlinkshere-filters": "cikopesinikan",
        "whatlinkshere-submit": "Tapowata",
+       "autoblocklist-submit": "Nantokaskeritcikatek",
        "ipblocklist-submit": "Nantokaskeritcikatek",
        "blocklink": "nokipita",
        "contribslink": "Kaki witcihehin",
+       "blocklogpage": "Wapatcikan taci e nanikactek",
+       "move-page": "Erikam $1",
        "movelogpage": "Tipatcimosanihikan ka ki meckotcicinikatcikateki",
        "movesubpagetalktext": "Neta ka arimotcikatek tipatcimosanikanik $1 {{PLURAL:$1|Nota paskickwemakan|Nota paskickwemakana}} kita masinatewa ota.",
        "export": "Matcetciciha masinahikana",
+       "export-submit": "Matcetciciha",
        "allmessages-filter-all": "Kaskina",
        "allmessages-filter-submit": "Tapowata",
        "thumbnail-more": "Micata",
        "exif-make": "Ka ki ocitatatc masinapiskahikaniw",
        "exif-model": "E icinakok masinapiskohowewin",
        "exif-software": "Tipatcimocikimiwesinikan ka totcikatek",
+       "exif-artist": "Kaki masihiketc",
        "exif-exifversion": "Exif ka itasinatek",
        "exif-colorspace": "Icipekahikanik",
        "exif-datetimeoriginal": "E tato piponikak nictam ka masinahikaniwok",
        "exif-saturation-0": "Ekote mia",
        "exif-sharpness-0": "Ekote mia",
        "exif-dc-date": "Tatokonakisitc",
+       "exif-urgency-normal": "Ekote mia ($1)",
        "namespacesall": "kaskina",
        "monthsall": "kaskina",
        "confirm_purge_button": "OK",
        "confirm-unwatch-button": "OK",
        "confirm-rollback-button": "OK",
        "quotation-marks": "\"$1\"",
+       "imgmultipagenext": "minawa masinahikan →",
        "imgmultigo": "Tapowata!",
        "img-lang-go": "Tapowata",
+       "table_pager_next": "Minawa masinahikan",
        "table_pager_limit_submit": "Tapowata",
        "signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|ka ici arimowaniwok]])",
+       "version-specialpages": "Ka ici wectakaniwok",
        "version-ext-colheader-description": "E witcikemakak",
+       "version-ext-colheader-credits": "Kaki masihiketc",
        "version-libraries-description": "E witcikemakak",
+       "version-libraries-authors": "Kaki masihiketc",
        "redirect-submit": "Tapowata",
        "fileduplicatesearch-submit": "Nantokaskeritcikatek",
        "specialpages": "Ka ici wectakaniwok",
+       "specialpages-group-login": "Posi / masinahotiso",
        "tag-filter": "Nihipita nehi[[Special:Tags|balises]] :",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Kicawatcikanicic|Kicawatcikanica}}]] : $2)",
        "tags-source-header": "Ite wetciparik",
        "logentry-newusers-create": "Anahwe $1 aci {{GENDER:$2|ickwa ocitakiniwon}}",
        "logentry-upload-upload": "$1 {{GENDER:$2|ki natapaham}} $3",
        "feedback-cancel": "Ponipita",
+       "feedback-message": "E itatcitcikatek:",
        "searchsuggest-search": "Nantona {{SITENAME}}",
        "expand_templates_ok": "OK",
        "pagelang-name": "Masinhikan",
index 0611e04..a9dc955 100644 (file)
        "rcfilters-savedqueries-new-name-label": "Назва",
        "rcfilters-savedqueries-apply-label": "Захаваць налады",
        "rcfilters-savedqueries-cancel-label": "Адмяніць",
-       "rcfilters-savedqueries-add-new-title": "Ð\97аÑ\85аваÑ\86Ñ\8c Ñ\84Ñ\96лÑ\8cÑ\82Ñ\80Ñ\8b Ñ\8fк Ñ\85Ñ\83Ñ\82кÑ\83Ñ\8e Ñ\81паÑ\81Ñ\8bлку",
+       "rcfilters-savedqueries-add-new-title": "Ð\97аÑ\85аваÑ\86Ñ\8c Ñ\86Ñ\8fпеÑ\80аÑ\88нÑ\96Ñ\8f Ð½Ð°Ð»Ð°Ð´Ñ\8b Ñ\84Ñ\96лÑ\8cÑ\82Ñ\80у",
        "rcfilters-restore-default-filters": "Аднавіць фільтры па змоўчаньні",
        "rcfilters-clear-all-filters": "Ачысьціць усе фільтры",
        "rcfilters-search-placeholder": "Фільтар апошніх зьменаў (праглядзець або пачніце друкаваць)",
index 086f155..13d893f 100644 (file)
        "recentchanges-legend-plusminus": "(''±১২৩'')",
        "recentchanges-submit": "দেখাও",
        "rcfilters-activefilters": "সক্রিয় ছাঁকনিসমূহ",
-       "rcfilters-quickfilters": "দà§\8dরà§\81ত à¦¸à¦\82যà§\8bà¦\97",
+       "rcfilters-quickfilters": "সà¦\82রà¦\95à§\8dষিত à¦\9bাà¦\81à¦\95নির à¦¸à§\87à¦\9fিà¦\82",
        "rcfilters-quickfilters-placeholder-title": "এখনো কোন সংযোগ সংরক্ষণ হয়নি",
        "rcfilters-savedqueries-defaultlabel": "ছাঁকনি সংরক্ষণ",
        "rcfilters-savedqueries-rename": "নামান্তর",
+       "rcfilters-savedqueries-setdefault": "পূর্ব-নির্ধারিত হিসেবে নির্ধারন করুন",
+       "rcfilters-savedqueries-unsetdefault": "পূর্ব-নির্ধারিত হিসেবে নির্ধারন সরান",
        "rcfilters-savedqueries-remove": "সরান",
        "rcfilters-savedqueries-new-name-label": "নাম",
-       "rcfilters-savedqueries-apply-label": "দà§\8dরà§\81ত à¦¸à¦\82যà§\8bà¦\97 à¦¤à§\88রি à¦\95রà§\81ন",
+       "rcfilters-savedqueries-apply-label": "সà§\87à¦\9fিà¦\82স à¦¸à¦\82রà¦\95à§\8dষণ",
        "rcfilters-savedqueries-cancel-label": "বাতিল",
+       "rcfilters-savedqueries-add-new-title": "বর্তমান ছাঁকনির সেটিং সংরক্ষণ করুন",
        "rcfilters-restore-default-filters": "পূর্বনির্ধারিত ছাঁকনি পুনরুদ্ধার করুন",
        "rcfilters-clear-all-filters": "সব ছাঁকনি পরিষ্কার করুন",
        "rcfilters-search-placeholder": "সাম্প্রতিক পরিবর্তনসমূহ ছাঁকুন (ব্রাউজ বা টাইপ করা শুরু করুন)",
        "rcfilters-filter-minor-description": "যেসব সম্পাদনাকে লেখক অনুল্লেখ্য হিসেবে চিহ্নিত করেছেন।",
        "rcfilters-filter-major-label": "অনুল্লেখ্য নয়, এমন সম্পাদনা",
        "rcfilters-filter-major-description": "যেসব সম্পাদনাকে অনুল্লেখ্য হিসেবে চিহ্নিত করা হয়নি।",
+       "rcfilters-filtergroup-watchlist": "নজরতালিকার পাতা",
+       "rcfilters-filter-watchlist-watched-label": "নজরতালিকায়",
        "rcfilters-filtergroup-changetype": "পরিবর্তনের ধরন",
        "rcfilters-filter-pageedits-label": "পাতার সম্পাদনা",
        "rcfilters-filter-pageedits-description": "উইকি বিষয়বস্তু, আলোচনা, বিষয়শ্রেণীর বিবরণ... ইত্যাদিতে সম্পাদনা",
        "autoblocklist-submit": "অনুসন্ধান",
        "autoblocklist-legend": "স্বয়ংক্রিয়বাধার তালিকা",
        "autoblocklist-localblocks": "স্থানীয় {{PLURAL:$1|স্বয়ংবাধা|স্বয়ংবাধাসমূহ}}",
+       "autoblocklist-total-autoblocks": "মোট স্বয়ংক্রিয় বাধার সংখ্যা: $1",
        "autoblocklist-empty": "স্বয়ংক্রিয়বাধার তালিকাটি খালি।",
        "autoblocklist-otherblocks": "অন্য {{PLURAL:$1|স্বয়ংবাধা|স্বয়ংবাধাসমূহ}}",
        "ipblocklist": "বাধাপ্রাপ্ত ব্যবহারকারী",
        "newimages-legend": "ছাঁকনি",
        "newimages-label": "ফাইলের নাম (অথবা এর কোন অংশ):",
        "newimages-user": "আইপি ঠিকানা বা ব্যবহারকারী নাম",
-       "newimages-showbots": "বà¦\9fà§\87র à¦\86পলà§\8bড à¦\97à§\81লà§\8b à¦¦à§\87à¦\96াà¦\93।",
+       "newimages-showbots": "বà¦\9fà§\87র à¦\86পলà§\8bড à¦¦à§\87à¦\96ান",
        "newimages-hidepatrolled": "টহলকৃত আপলোড লুকানো হোক",
        "noimages": "দেখার মত কিছু নেই।",
        "gallery-slideshow-toggle": "থাম্বনেল ভাসান",
index bfcb3dc..208a5ba 100644 (file)
        "printableversion": "Za štampanje",
        "permalink": "Trajni link",
        "print": "Štampaj",
-       "view": "Pogled",
+       "view": "Pogledaj",
        "view-foreign": "Vidi na {{GRAMMAR:dativ|$1}}",
        "edit": "Uredi",
        "edit-local": "Uredi lokalni opis",
        "databaseerror-query": "Upit: $1",
        "databaseerror-function": "Funkcija: $1",
        "databaseerror-error": "Greška: $1",
+       "transaction-duration-limit-exceeded": "Da se izbjegne veliko zaostajanje podataka, transakcija je prekinuta zato što je trajanje zapisivanja ($1) prekoračilo ograničenje od $2 sekunde/-i.\nAko mijenjate mnogo stavki odjednom, uradite to u više navrata.",
        "laggedslavemode": "<strong>Upozorenje:</strong> Moguće je da stranica nije ažurirana.",
        "readonly": "Baza je zaključana",
        "enterlockreason": "Unesite razlog za zaključavanje, uključujući procjenu vremena otključavanja",
        "missingarticle-rev": "(izmjena#: $1)",
        "missingarticle-diff": "(Razlika: $1, $2)",
        "readonly_lag": "Baza podataka je zaključana dok se sekundarne baze podataka na serveru ne sastave sa glavnom.",
+       "nonwrite-api-promise-error": "HTTP-zaglavlje 'Promise-Non-Write-API-Action' je poslano, ali je upućeno zapisnom modulu API-a.",
        "internalerror": "Unutrašnja greška",
        "internalerror_info": "Interna greška: $1",
        "internalerror-fatal-exception": "Fatalna greška tipa \"$1\"",
index 97f68c2..cd4618a 100644 (file)
        "search-file-match": "(coincideix amb el contingut del fitxer)",
        "search-suggest": "Volíeu dir: $1",
        "search-rewritten": "S’hi mostren els resultats de $1. Cerqueu «$2» en comptes d’aquest.",
-       "search-interwiki-caption": "Projectes germans",
+       "search-interwiki-caption": "Resultats dels projectes germans",
        "search-interwiki-default": "Resultats de $1:",
        "search-interwiki-more": "(més)",
        "search-interwiki-more-results": "més resultats",
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Mostra",
        "rcfilters-activefilters": "Filtres actius",
+       "rcfilters-savedqueries-rename": "Reanomena",
+       "rcfilters-savedqueries-new-name-label": "Nom",
+       "rcfilters-savedqueries-apply-label": "Desa els paràmetres",
+       "rcfilters-savedqueries-cancel-label": "Cancel·la",
        "rcfilters-restore-default-filters": "Restaura els filtres per defecte",
        "rcfilters-clear-all-filters": "Esborra tots els filtres",
        "rcfilters-search-placeholder": "Canvis recents dels filtres (navegueu o comenceu a escriure)",
        "rcfilters-filter-minor-description": "Modificacions que l'autor va etiquetar com a menors.",
        "rcfilters-filter-major-label": "Modificacions no menors",
        "rcfilters-filter-major-description": "Modificacions no etiquetades com a menors.",
+       "rcfilters-filter-watchlist-notwatched-label": "No és a la llista de seguiment",
        "rcfilters-filtergroup-changetype": "Tipus de canvi",
        "rcfilters-filter-pageedits-label": "Modificacions de pàgina",
        "rcfilters-filter-pageedits-description": "Modificacions al contingut del wiki, discussions, descripcions de categories...",
        "rcfilters-filter-categorization-description": "Registres de pàgines afegides o suprimides de les categories.",
        "rcfilters-filter-logactions-label": "Accions registrades",
        "rcfilters-filter-logactions-description": "Accions administratives, creacions de comptes, eliminacions de pàgines, càrregues...",
+       "rcfilters-filter-lastrevision-label": "Darrera revisió",
        "rcnotefrom": "A sota hi ha {{PLURAL:$5|el canvi|els canvis}} a partir de <strong>$3, $4</strong> (fins a <strong>$1</strong>).",
        "rclistfrom": "Mostra els canvis nous des de $3, $2",
        "rcshowhideminor": "$1 edicions menors",
        "tooltip-pt-createaccount": "Us animem a què creeu un compte i inicieu sessió, encara que no és obligatori",
        "tooltip-ca-talk": "Discussió sobre el contingut d'aquesta pàgina",
        "tooltip-ca-edit": "Modifica aquesta pàgina",
-       "tooltip-ca-addsection": "Comença una nova secció",
+       "tooltip-ca-addsection": "Comença una secció nova",
        "tooltip-ca-viewsource": "Aquesta pàgina està protegida.\nPodeu veure'n el codi font.",
        "tooltip-ca-history": "Versions antigues d'aquesta pàgina",
        "tooltip-ca-protect": "Protegeix aquesta pàgina.",
        "tags-hitcount": "$1 {{PLURAL:$1|canvi|canvis}}",
        "tags-manage-no-permission": "No teniu permisos per administrar etiquetes de canvi",
        "tags-manage-blocked": "No podeu canviar etiquetes mentre esteu {{GENDER:$1|blocat|blocada}}.",
-       "tags-create-heading": "Crea una nova etiqueta",
+       "tags-create-heading": "Crea una etiqueta nova",
        "tags-create-explanation": "Per defecte, les etiquetes acabades de crear estaran disponibles per usuaris i bots",
        "tags-create-tag-name": "Nom de l'etiqueta:",
        "tags-create-reason": "Motiu:",
        "log-action-filter-suppress-event": "Supressió de registres",
        "log-action-filter-suppress-revision": "Supressió de revisions",
        "log-action-filter-suppress-delete": "Supressió de pàgines",
-       "log-action-filter-upload-upload": "Nova càrrega",
+       "log-action-filter-upload-upload": "Càrrega nova",
        "log-action-filter-upload-overwrite": "Torna a carregar",
        "authmanager-authn-not-in-progress": "L'autenticació no està en curs o les dades de sessió s'han perdut. Comenceu de nou des del principi.",
        "authmanager-authn-no-primary": "Les dades credencials no s'han pogut autenticar.",
index da35321..bd74b76 100644 (file)
        "filedelete-reason-dropdown": "* Даржина долу дӀаяккхаран баьхьанаш \n** Авторан бакъонаш талхор\n** ЦхӀатера файлаш хилар",
        "filedelete-edit-reasonlist": "Бахьанин могӀам нисбар",
        "filedelete-maintenance-title": "Файл дӀаяккха цало",
-       "mimesearch": "MIME хула лаха",
+       "mimesearch": "MIME лаха",
        "mimesearch-summary": "ХӀокху агӀоно йиш хуьлуьйту MIME-тайпан файлаш харжа. Яздеш долу формат: чулацаман тайп/бухара тайп, масала  <code>image/jpeg</code>.",
        "mimetype": "MIME-тайп:",
        "download": "чуяккха",
        "ncategories": "$1 {{PLURAL:$1|категори|категореш}}",
        "ninterwikis": "$1 {{PLURAL:$1|1=юкъарвики-хьажорг|юкъарвики-хьажоргаш}}",
        "nlinks": "$1 {{PLURAL:$1|хьажорг}}",
-       "nmembers": "$1 {{PLURAL:$1|хӀума|хӀумнаш}}",
-       "nmemberschanged": "$1 → $2 {{PLURAL:$2|хӀума|хӀумнаш}}",
+       "nmembers": "$1 {{PLURAL:$1|объект}}",
+       "nmemberschanged": "$1 → $2 {{PLURAL:$2|объект}}",
        "nrevisions": "$1 {{PLURAL:$1|верси|версеш}}",
        "nimagelinks": "Лелош ю $1 {{PLURAL:$1|агӀонгахь|агӀонашкахь}}",
        "ntransclusions": "лелош ю $1 {{PLURAL:$1|агӀонгахь|агӀонашкахь}}",
        "saturday-at": "шот дийнахь $1",
        "sunday-at": "кӀиранан дийнахь $1",
        "yesterday-at": "селхана $1 даьлча",
-       "bad_image_list": "Ð\91аÑ\80ам Ñ\85ила Ð±ÐµÐ·Ð° Ð¸Ñ\88Ñ\82а:\n\nÐ\9bоÑ\80аÑ\88 Ñ\85иÑ\80а Ñ\8e Ð¼Ð¾Ð³Ó\80амÑ\8fÑ\85Ñ\8c Ð¹Ð¾Ð»Ñ\83 Ñ\85Ó\80Ñ\83мнаш (могӀийн, йола луш йолу символ тӀира *).\nДуьххьаралера хьажорг магӀанийн хила беза хьажорг кху цамагдо сурт дуьлаче.\nТӀяхьа йогӀуш йолу хьажорг оцу могӀарехь хира ю магóш, билгалла аьлча яззамаш долуче, сурт хьаллаточехь.",
+       "bad_image_list": "Ð\91аÑ\80ам Ñ\85ила Ð±ÐµÐ·Ð° Ð¸Ñ\88Ñ\82а:\n\nÐ\9bоÑ\80аÑ\88 Ñ\85иÑ\80а Ñ\8e Ð¼Ð¾Ð³Ó\80амÑ\8fÑ\85Ñ\8c Ð¹Ð¾Ð»Ñ\83 Ñ\8dлеменÑ\82наш (могӀийн, йола луш йолу символ тӀира *).\nДуьххьаралера хьажорг магӀанийн хила беза хьажорг кху цамагдо сурт дуьлаче.\nТӀяхьа йогӀуш йолу хьажорг оцу могӀарехь хира ю магóш, билгалла аьлча яззамаш долуче, сурт хьаллаточехь.",
        "metadata": "Метахаамаш",
        "metadata-help": "ХӀокху файлаца кхин тӀе хаам бу, даиман чуйоккхуш йолу терахьца чоьнашца йа тӀейоккхучуьнца. Нагахь файлан тӀаьхьа хийцам биняхь, тӀаккха цӀхьаболу барам цӀхьаьна ца ба мега хӀинцалера суьртаца.",
        "metadata-expand": "Гайта кхин тlе болу хаам",
        "logentry-move-move-noredirect": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажорг цаюьтуш",
        "logentry-move-move_redir": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажоран тӀехул",
        "logentry-move-move_redir-noredirect": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажорган тӀехул а, дӀасахьажорг цаюьтуш а",
-       "logentry-patrol-patrol": "$1 {{GENDER:$2|хьаьжина}}  агӀона $3 $4 версега",
-       "logentry-patrol-patrol-auto": "$1 автоматически {{GENDER:$2|хьаьжина}} $3 агӀона версега $4",
+       "logentry-patrol-patrol": "$1 {{GENDER:$2|патрулйина}} агӀона $3 $4 верси",
+       "logentry-patrol-patrol-auto": "$1 {{GENDER:$2|автопатрулйина}} $3 агӀона верси $4",
        "logentry-newusers-newusers": "{{GENDER:$2|ДӀавазвелла|ДӀаязелла}} керла декъашхо $1",
        "logentry-newusers-create": "{{GENDER:$2|ДӀавазвелла|ДӀаязелла}} керла декъашхо $1",
        "logentry-newusers-create2": "$1 {{GENDER:$2|кхоьллина}} декъашхочун дӀаяздапр $3",
        "mediastatistics": "Медиа-статистика",
        "mediastatistics-summary": "Чуяьхна файлийн тайпанийн статистикин хаамаш. Кху чохь тӀаьххьара чуяьхна файлийн версеш бен яц. Шираниш я дӀаяхнарш лоруш яц.",
        "mediastatistics-nbytes": "$1 {{PLURAL:$1|байт}} ($2; $3%)",
+       "mediastatistics-bytespertype": "ХӀокху декъан файлан юкъара барам $1 {{PLURAL:$1|байт}} ($2; $3%).",
+       "mediastatistics-allbytes": "Массо файлийн барам: $1 {{PLURAL:$1|байт}} ($2).",
        "mediastatistics-table-mimetype": "MIME-тайп",
        "mediastatistics-table-extensions": "Хила мега шордарш",
        "mediastatistics-table-count": "Файлийн дукхалла",
index e00ae7b..55c6f27 100644 (file)
        "rcfilters-activefilters": "Filtros activos",
        "rcfilters-quickfilters": "Ajustes de filtro guardados",
        "rcfilters-quickfilters-placeholder-title": "Ningún enlace guardado aún",
-       "rcfilters-quickfilters-placeholder-description": "Para guardar tus ajustes de filtro y reutilizarlos más tarde, pulsa en el icono del marcador en el área de Filtro Activo que se encuentra a continuación.",
+       "rcfilters-quickfilters-placeholder-description": "Para guardar tus ajustes de filtro y reutilizarlos más tarde, pulsa en el icono del marcador en el área de Filtro activo que se encuentra a continuación.",
        "rcfilters-savedqueries-defaultlabel": "Filtros guardados",
        "rcfilters-savedqueries-rename": "Cambiar nombre",
        "rcfilters-savedqueries-setdefault": "Activar por defecto",
index c261b10..2f2d7fd 100644 (file)
        "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|नए पन्नों की सूची]] को भी देखें)",
        "recentchanges-submit": "दिखाएँ",
        "rcfilters-activefilters": "सक्रिय फिल्टर",
-       "rcfilters-quickfilters": "शीघ्र कड़ी",
-       "rcfilters-quickfilters-placeholder": "अपने पसंदीदा औजार की वरीयता सहेजें, ताकि बाद में फिर उपयोग कर सकें।",
+       "rcfilters-quickfilters": "सहेजा फ़िल्टर सेटिंग",
+       "rcfilters-quickfilters-placeholder-title": "कोई कड़ी अभी तक सहेजा नहीं गया",
+       "rcfilters-quickfilters-placeholder-description": "अपने फ़िल्टर सेटिंग को सहेजने और बाद में उपयोग करने के लिए नीचे दिये बूकमार्क छवि पर क्लिक करें।",
        "rcfilters-savedqueries-defaultlabel": "सहेजे फ़िल्टर",
        "rcfilters-savedqueries-rename": "नाम बदलें",
        "rcfilters-savedqueries-setdefault": "मूल के रूप में रखें",
        "rcfilters-savedqueries-unsetdefault": "मूल के रूप से हटाएँ",
        "rcfilters-savedqueries-remove": "निकालें",
        "rcfilters-savedqueries-new-name-label": "नाम",
-       "rcfilters-savedqueries-apply-label": "शà¥\80à¤\98à¥\8dर à¤\95ड़à¥\80 à¤¬à¤¨à¤¾à¤\8fà¤\81",
+       "rcfilters-savedqueries-apply-label": "सà¥\87à¤\9fिà¤\82à¤\97 à¤¸à¤\82à¤\9cà¥\8bयà¥\87à¤\82",
        "rcfilters-savedqueries-cancel-label": "रद्द करें",
-       "rcfilters-savedqueries-add-new-title": "फ़िलà¥\8dà¤\9fर à¤\95à¥\8b à¤¶à¥\80à¤\98à¥\8dर à¤\95ड़à¥\80 à¤\95à¥\87 à¤°à¥\82प à¤®à¥\87à¤\82 सहेजें",
+       "rcfilters-savedqueries-add-new-title": "वरà¥\8dतमान à¤«à¤¼à¤¿à¤²à¥\8dà¤\9fर à¤¸à¥\87à¤\9fिà¤\82à¤\97 à¤\95à¥\8b सहेजें",
        "rcfilters-restore-default-filters": "मूलभूत फिल्टर पुनर्स्थापित करे",
        "rcfilters-clear-all-filters": "सभी फिल्टर हटाएँ",
        "rcfilters-search-placeholder": "हाल में हुए बदलाव फ़िल्टर (ब्राउज़ या टाइप करना आरंभ करें)",
        "rcfilters-filter-categorization-label": "श्रेणी परिवर्तन",
        "rcfilters-filter-categorization-description": "श्रेणियों से पृष्ठों के रिकॉर्ड्स को जोड़ा या निकाला जा सकता है",
        "rcfilters-filter-logactions-label": "लॉग की गई कार्रवाई",
-       "rcfilters-filter-logactions-description": "पà¥\8dरशासनिà¤\95 कार्रवाई, खाता निर्माण, पृष्ठ विलोपन, अपलोड ....",
+       "rcfilters-filter-logactions-description": "पà¥\8dरबà¤\82धà¤\95à¥\80य कार्रवाई, खाता निर्माण, पृष्ठ विलोपन, अपलोड ....",
        "rcfilters-hideminor-conflicts-typeofchange-global": "\"लघु संपादन\" फ़िल्टर एक या एक से अधिक प्रकार के परिवर्तन फ़िल्टर के साथ संघर्ष करता है, क्योंकि कुछ प्रकार के परिवर्तन को \"लघु\" के रूप में निर्दिष्ट नहीं किया जा सकता है। परस्पर विरोधी फिल्टर ऊपर सक्रिय फिल्टर क्षेत्र में चिह्नित हैं।",
        "rcfilters-hideminor-conflicts-typeofchange": "कुछ प्रकार के परिवर्तन को \"लघु\" के रूप में निर्दिष्ट नहीं किया जा सकता है\", इसलिए यह फ़िल्टर निम्न प्रकार के परिवर्तन फिल्टर के साथ संघर्ष करता है: $1",
        "rcfilters-typeofchange-conflicts-hideminor": "इस प्रकार का परिवर्तन फ़िल्टर \"लघु संपादन\" फ़िल्टर के साथ संघर्ष करता है। कुछ प्रकार के परिवर्तन को \"लघु\" के रूप में निर्दिष्ट नहीं किया जा सकता है।",
        "autoblocklist-submit": "खोजें",
        "autoblocklist-legend": "स्वतः अवरोध सूची",
        "autoblocklist-localblocks": "स्थानीय {{PLURAL:$1|स्वतः अवरोध}}",
+       "autoblocklist-total-autoblocks": "स्वतःअवरोध की कुल संख्या: $1",
        "autoblocklist-empty": "स्वतः अवरोध सूची खाली है।",
        "autoblocklist-otherblocks": "अन्य {{PLURAL:$1|स्वतःअवरोध}}",
        "ipblocklist": "अवरोधित आईपी पते व सदस्यनाम",
index fa99843..7a3cb9b 100644 (file)
        "resetpass-expired": "Istekla Vam je valjanost zaporke. Molimo Vas, potvrdite novu zaporku za prijavu.",
        "resetpass-expired-soft": "Istekla vam je valjanost zaporke i trebate ju promijeniti. Molimo odaberite novu zaporku ili pritisnite na \"{{int:authprovider-resetpass-skip-label}}\", za kasniju promjenu.",
        "resetpass-validity-soft": "Zaporka Vam ne vrijedi: $1\n\nMolimo odaberite novu zaporku ili pritisnite na \"{{int:authprovider-resetpass-skip-label}}\", za kasniju promjenu.",
-       "passwordreset": "Ponovno postavi zaporku",
+       "passwordreset": "Ponovo postavi zaporku",
        "passwordreset-text-one": "Ispunite ovaj obrazac ako želite ponovno postaviti Vašu zaporku.",
        "passwordreset-text-many": "{{PLURAL:$1|Ispunite jedno od polja da biste dobili privremenu zaporku e-poštom.}}",
        "passwordreset-disabled": "Poništavanje lozinke je onemogućeno na ovom wikiju.",
        "upload-permitted": "Dopušteni {{PLURAL:$2|tip|tipovi}} datoteka: $1.",
        "upload-preferred": "Poželjni {{PLURAL:$2|tip|tipovi}} datoteka: $1.",
        "upload-prohibited": "Zabranjeni {{PLURAL:$2|tip|tipovi}} datoteka: $1.",
-       "uploadlogpage": "Evidencija postavljanja",
+       "uploadlogpage": "Evidencija postavljanja datoteka",
        "uploadlogpagetext": "Dolje je popis nedavno postavljenih slika.",
        "filename": "Ime datoteke",
        "filedesc": "Sažetak",
        "log": "Evidencije",
        "logeventslist-submit": "Prikaži",
        "all-logs-page": "Sve javne evidencije",
-       "alllogstext": "Skupni prikaz svih dostupnih evidencija za {{SITENAME}}.\nMožete suziti prikaz odabirući tip evidencije, suradničko ime ili stranicu u upitu.",
+       "alllogstext": "Skupni prikaz svih dostupnih evidencija projekta {{SITENAME}}.\nMožete suziti prikaz odabirući tip evidencije, suradničko ime ili stranicu u upitu.",
        "logempty": "Nema pronađenih stavki.",
        "log-title-wildcard": "Traži stranice koje počinju s navedenim izrazom",
        "showhideselectedlogentries": "Otkrij/sakrij odabrane evidencije",
        "specialpages": "Posebne stranice",
        "specialpages-note-top": "Legenda",
        "specialpages-note": "* Normalne posebne stranice\n* <span class=\"mw-specialpagerestricted\">Posebne stranice s ograničenim pristupom.</span>",
-       "specialpages-group-maintenance": "Izvještaji za održavanje",
+       "specialpages-group-maintenance": "Izvješća održavanja",
        "specialpages-group-other": "Ostale posebne stranice",
        "specialpages-group-login": "Prijava/otvaranje računa",
        "specialpages-group-changes": "Nedavne promjene i evidencije",
-       "specialpages-group-media": "Izvještaji i postavljanje datoteka",
+       "specialpages-group-media": "Izvješća o višemedijskome sadržaju i postavljanju datoteka",
        "specialpages-group-users": "Suradnici i suradnička prava",
        "specialpages-group-highuse": "Najčešće korištene stranice",
        "specialpages-group-pages": "Popisi stranica",
        "revdelete-uname-unhid": "suradničko ime je otkriveno",
        "revdelete-restricted": "primijenjeno ograničenje za administratore",
        "revdelete-unrestricted": "uklonjeno ograničenje za administratore",
+       "logentry-block-block": "$1 {{GENDER:$2|blokirao|blokirala}} je {{GENDER:$4|$3}} na rok od $5 $6",
        "logentry-merge-merge": "$1 je {{GENDER:$2|spojio|spojila}} $3 s $4 (izmjene do $5)",
        "logentry-move-move": "$1 je {{GENDER:$2|premjestio|premjestila}} stranicu $3 na $4",
        "logentry-move-move-noredirect": "$1 je {{GENDER:$2|premjestio|premjestila}} stranicu $3 na $4 bez preusmjeravanja",
        "logentry-move-move_redir": "$1 je {{GENDER:$2|premjestio|premjestila}} stranicu $3 na $4 preko preusmjeravanja",
        "logentry-move-move_redir-noredirect": "$1 je {{GENDER:$2|premjestio|premjestila}} stranicu $3 na $4 preko preusmjeravanja bez ostavljanja preusmjeravanja",
        "logentry-patrol-patrol": "$1 {{GENDER:$2|označio|označila}} je uređivanje $4 stranice $3 ophođenim",
-       "logentry-patrol-patrol-auto": "$1 je automatski {{GENDER:$2|označio|označila}} uređivanje $4 stranice $3 pregledanim",
+       "logentry-patrol-patrol-auto": "$1 automatski je {{GENDER:$2|označio|označila}} uređivanje $4 stranice $3 ophođenim",
        "logentry-newusers-newusers": "$1 je {{GENDER:$2|otvorio|otvorila}} suradnički račun",
        "logentry-newusers-create": "$1 je {{GENDER:$2|stvorio|stvorila}} suradnički račun.",
        "logentry-newusers-create2": "$1 je {{GENDER:$2|otvorio|otvorila}} suradnički račun $3",
        "logentry-newusers-byemail": "$1 je {{GENDER:$2|otvorio|otvorila}} suradnički račun $3 i zaporka je poslana e-porukom.",
-       "logentry-newusers-autocreate": "Suradnički je račun $1 automatski {{GENDER:$2|stvoren|stvorila}}.",
+       "logentry-newusers-autocreate": "Suradnički je račun automatski {{GENDER:$2|stvorio suradnik|stvorila suradnica}} $1.",
        "logentry-protect-move_prot": "$1 je {{GENDER:$2|premjestio|premjestila}} postavke zaštićivanja s $4 na $3",
        "logentry-protect-unprotect": "$1 je {{GENDER:$2|uklonio|uklonila}} zaštitu stranice $3",
        "logentry-protect-protect": "$1 je {{GENDER:$2|zaštitio|zaštitila}} $3 $4",
        "logentry-protect-protect-cascade": "$1 je {{GENDER:$2|zaštitio|zaštitila}} $3 $4 [prenosiva zaštita]",
        "logentry-protect-modify": "$1 je {{GENDER:$2|promijenio|promijenila}} stupanj zaštićivanja za $3 $4",
        "logentry-protect-modify-cascade": "$1 je {{GENDER:$2|promijenio|promijenila}} stupanj zaštite za $3 $4 [prenosiva zaštita]",
-       "logentry-rights-rights": "$1 {{GENDER:$2|je promijenio|je promijenila}} suradnička prava računa $3 iz $4 u $5",
+       "logentry-rights-rights": "$1 {{GENDER:$2|promijenio|promijenila}} je pripadnost skupinama {{GENDER:$6|suradnika|suradnice}} $3 iz $4 u $5",
        "logentry-rights-rights-legacy": "$1 {{GENDER:$2|je promijenio|je promijenila}} članstvo skupine suradničkog računa $3",
-       "logentry-rights-autopromote": "Suradničkom računu $1 {{GENDER:$1| automatski je promijenjeno članstvo|automatski su promijenjena članstva}} iz $4 u $5",
+       "logentry-rights-autopromote": "Suradničkom računu $1 {{GENDER:$2|automatski je promijenjeno članstvo|automatski su promijenjena članstva}} iz $4 u $5",
        "logentry-upload-upload": "$1 је {{GENDER:$2|postavio|postavila}} $3",
        "logentry-upload-overwrite": "$1 је {{GENDER:$2|postavio|postavila}} novu inačicu $3",
        "logentry-upload-revert": "$1 је {{GENDER:$2|postavio|postavila}} $3",
        "log-name-managetags": "Evidencija upravljanja oznakama",
        "log-name-tag": "Evidencija oznaka",
        "rightsnone": "(suradnik)",
+       "rightslogentry-temporary-group": "$1 (vremenito, do $2)",
        "feedback-adding": "Dodajem povratne informacije na stranicu...",
        "feedback-back": "Natrag",
        "feedback-bugcheck": "Izvrsno! Molimo provjerite da se ne radi o nekom [$1 poznatom \"bugu\"].",
        "pagelang-select-lang": "Odaberi jezik",
        "pagelang-submit": "Pošalji",
        "right-pagelang": "Promijeni jezik stranice",
+       "log-name-pagelang": "Evidencija mijenjanja jezika",
        "mediastatistics": "Statistika datoteka",
        "mediastatistics-summary": "Slijede statistike postavljenih datoteka koje pokazuju zadnju inačicu datoteke. Starije ili izbrisane inačice nisu prikazane.",
        "mediastatistics-bytespertype": "Ukupna veličina datoteka za ovaj odlomak: {{PLURAL:$1|$1 bajt|$1 bajta|$1 bajtova}} ($2; $3%).",
index 57171e5..a1b852c 100644 (file)
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Monstrar",
        "rcfilters-activefilters": "Filtros active",
-       "rcfilters-quickfilters": "Ligamines rapide",
+       "rcfilters-quickfilters": "Filtros salveguardate",
        "rcfilters-quickfilters-placeholder-title": "Nulle ligamine salveguardate ancora",
        "rcfilters-quickfilters-placeholder-description": "Pro salveguardar tu filtros pro uso posterior, clicca sur le icone marcapaginas in le area Filtro Active hic infra.",
        "rcfilters-savedqueries-defaultlabel": "Filtros salveguardate",
        "rcfilters-savedqueries-unsetdefault": "Remover predefinition",
        "rcfilters-savedqueries-remove": "Remover",
        "rcfilters-savedqueries-new-name-label": "Nomine",
-       "rcfilters-savedqueries-apply-label": "Crear ligamine rapide",
+       "rcfilters-savedqueries-apply-label": "Salveguardar filtro",
        "rcfilters-savedqueries-cancel-label": "Cancellar",
-       "rcfilters-savedqueries-add-new-title": "Salveguardar le filtros como ligamine rapide",
+       "rcfilters-savedqueries-add-new-title": "Salveguardar le configuration actual del filtro",
        "rcfilters-restore-default-filters": "Restaurar filtros predefinite",
        "rcfilters-clear-all-filters": "Rader tote le filtros",
        "rcfilters-search-placeholder": "Filtrar le modificationes recente (naviga o comencia a scriber)",
        "rcfilters-filterlist-title": "Filtros",
        "rcfilters-filterlist-whatsthis": "Que es isto?",
        "rcfilters-filterlist-feedbacklink": "Da nos tu opinion sur le nove filtros (in beta)",
-       "rcfilters-highlightbutton-title": "Accentuar resultatos",
+       "rcfilters-highlightbutton-title": "Colorar le resultatos",
        "rcfilters-highlightmenu-title": "Selige un color",
-       "rcfilters-highlightmenu-help": "Selige un color pro accentuar iste proprietate",
+       "rcfilters-highlightmenu-help": "Selige un color pro illuminar iste proprietate",
        "rcfilters-filterlist-noresults": "Nulle filtro trovate",
        "rcfilters-noresults-conflict": "Nulle resultato trovate perque le criterios de recerca es in conflicto",
-       "rcfilters-state-message-subset": "Iste filtro non ha effecto perque su resultatos es includite in illos del sequente {{PLURAL:$2|filtro|filtros}} plus comprehensive (essaya accentuar pro poter distinguer lo): $1",
+       "rcfilters-state-message-subset": "Iste filtro non ha effecto perque su resultatos es includite in illos del sequente {{PLURAL:$2|filtro|filtros}} plus comprehensive (essaya colorar pro poter distinguer lo): $1",
        "rcfilters-state-message-fullcoverage": "Seliger tote le filtros in un gruppo equivale seliger nulle, dunque iste filtro non ha effecto. Le gruppo include: $1",
        "rcfilters-filtergroup-registration": "Registration del usator",
        "rcfilters-filter-registered-label": "Registrate",
index 3234291..945cea3 100644 (file)
        "search-file-match": "(ファイルの内容との一致)",
        "search-suggest": "もしかして: $1",
        "search-rewritten": "$1 の結果を表示しています。これは $2 の代わりに検索したものです。",
-       "search-interwiki-caption": "姉妹プロジェクト",
+       "search-interwiki-caption": "姉妹プロジェクトの結果",
        "search-interwiki-default": "$1からの結果:",
        "search-interwiki-more": "(続き)",
        "search-interwiki-more-results": "結果をさらに取得",
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "表示",
        "rcfilters-activefilters": "絞り込み",
+       "rcfilters-quickfilters": "フィルター設定を保存",
+       "rcfilters-savedqueries-defaultlabel": "フィルターを保存",
+       "rcfilters-savedqueries-setdefault": "デフォルトに設定",
        "rcfilters-savedqueries-cancel-label": "キャンセル",
        "rcfilters-restore-default-filters": "標準設定の絞り込み条件を適用",
        "rcfilters-clear-all-filters": "すべてのフィルターをクリア",
index 3012f49..7424fee 100644 (file)
        "namespaces": "Mandala aran",
        "variants": "Varian",
        "navigation-heading": "Menu navigasi",
-       "errorpagetitle": "Cacad",
+       "errorpagetitle": "Masalah",
        "returnto": "Bali nyang $1.",
        "tagline": "Saka {{SITENAME}}",
        "help": "Pitulung",
        "userpage": "Deleng kaca panganggo",
        "projectpage": "Deleng kaca proyèk",
        "imagepage": "Deleng kaca barkas",
-       "mediawikipage": "Deleng kaca nawala",
+       "mediawikipage": "Deleng kaca layang",
        "templatepage": "Deleng kaca cithakan",
        "viewhelppage": "Deleng kaca pitulung",
        "categorypage": "Deleng kaca kategori",
        "pool-timeout": "Kelangkung wekdal nengga kunci",
        "pool-queuefull": "Kempalan antrian kebak",
        "pool-errorunknown": "Kalepata ingkang mboten dipun mangertosi",
-       "poolcounter-usage-error": "Cacad panganggo: $1",
+       "poolcounter-usage-error": "Masalah pangguna: $1",
        "aboutsite": "Ngenani {{SITENAME}}",
        "aboutpage": "Project:Ngenani",
        "copyright": "Isi cumepak kanthi pangayoman $1 kajaba disebutaké yèn ana liyané.",
        "nstab-special": "Kaca mirunggan",
        "nstab-project": "Kaca proyèk",
        "nstab-image": "Barkas",
-       "nstab-mediawiki": "Nawala",
+       "nstab-mediawiki": "Layang",
        "nstab-template": "Cithakan",
        "nstab-help": "Kaca pitulung",
        "nstab-category": "Kategori",
        "nosuchactiontext": "Pratingkah sing dirinci déning URL ora sah.\nPanjenengan manawa salah ketik nalika ngisi URL, utawa salah ngisi pranala.\nIki manawa uga nuduhaké anané kesalahan ing piranti alus sing dipigunakaké déning {{SITENAME}}.",
        "nosuchspecialpage": "Ora ana kaca mirunggan mangkono",
        "nospecialpagetext": "Panjenengan nyuwun kaca astaméwa sing ora sah. Daftar kaca astaméwa sing sah bisa dipirsani ing [[Special:SpecialPages|daftar kaca astaméwa]].",
-       "error": "Cacad",
-       "databaseerror": "Cacad umpak data",
+       "error": "Masalah",
+       "databaseerror": "Masalah sasana dhata",
        "databaseerror-text": "Ana kerusakan ing basis data (query error).\n\nMungkin ana masalah ing software-e.",
        "databaseerror-textcl": "Ana kerusakan ing basis data (query error).",
        "databaseerror-query": "Query: $1",
        "databaseerror-function": "Function: $1",
-       "databaseerror-error": "Cacad: $1",
+       "databaseerror-error": "Masalah: $1",
        "laggedslavemode": "Pènget: Kaca iki mbokmenawa isiné dudu pangowahan pungkasan.",
        "readonly": "Umpak data kagembok",
        "enterlockreason": "Isi alesan ngreksa, kalebu rencana kapan pareksané bakal dibukak",
        "missingarticle-rev": "(owahan#: $1)",
        "missingarticle-diff": "(Béda: $1, $2)",
        "readonly_lag": "Database wis dikunci mawa otomatis sawetara database sékundhèr lagi nglakoni sinkronisasi mawa database utama",
-       "internalerror": "Cacad njero",
-       "internalerror_info": "Cacad njero: $1",
+       "internalerror": "Masalah njero",
+       "internalerror_info": "Masalah njero: $1",
        "filecopyerror": "Ora bisa nulad berkas \"$1\" menyang \"$2\".",
        "filerenameerror": "Ora bisa ngowahi saka \"$1\" dadi \"$2\".",
        "filedeleteerror": "Ora bisa mbusak berkas \"$1\".",
        "directorynotreadableerror": "Pérangan \"$1\" ora kena diwaca.",
        "filenotfound": "Ora bisa nemokaké berkas \"$1\".",
        "unexpected": "Biji (''nilai'') ing njabaning jangkauan: \"$1\"=\"$2\".",
-       "formerror": "Kasalahan: Ora bisa ngirimaké formulir",
+       "formerror": "Masalah: Ora bisa ngirim formulir",
        "badarticleerror": "Pratingkah iku ora bisa katindhakaké ing kaca iki.",
        "cannotdelete": "Kaca utawa berkas \"$1\" ora bisa dibusak.\nManawa wis dibusak déning wong liya.",
        "cannotdelete-title": "Ora bisa mbusak kaca \"$1\"",
        "usernameinprogress": "Panggawéning akun tumrap jeneng panganggo iki tembé lumaku.\nEntèni sadhéla.",
        "userexists": "Jeneng panganggo sing dilebokaké lagi dianggo.\nMangga pilih jeneng liya.",
        "loginerror": "Masalah mlebu log",
-       "createacct-error": "Cacad nalika nggawé akun",
+       "createacct-error": "Masalah panggawé akun",
        "createaccounterror": "Ora bisa gawé akun: $1",
        "nocookiesnew": "Akun panganggoné wis digawé, nanging panjenengan durung mlebu log.\n{{SITENAME}} nganggo kuki kanggo nglebokaké panganggo ing log.\nÉwadéné, kukiné panjenengan dipatèni.\nMangga urubaké iku, banjur mlebua log kanthi nganggo jeneng panganggo lan tembung wadiné panjenengan sing anyar.",
        "nocookieslogin": "{{SITENAME}} nggunakaké ''cookies'' kanggo log panganggoné. ''Cookies'' ing panjlajah wèb panjenengan dipatèni. Mangga ngaktifaké manèh lan coba manèh.",
        "blocked-mailpassword": "Alamat IP-né panjenengan diblokir saka mbesut. Kanggo ngéndhani tumindak salah-guna, ora diparengaké nganggo pamulihan tembung wadi saka alamat IP iki.",
        "eauthentsent": "Layang-èl konfirmasi wis dikirim nyang alamat layang-èl sing diisèkaké. Sadurungé ana layang-èl liyané sing dikirim nyang akun iku, panjenengan kudu nuruti arahan ana ing layang-èl iku saperlu ngonfirmasi yèn akun iku pancèn duwèké panjenengan.",
        "throttled-mailpassword": "Layang kanggo mbalèkaké tembung sandhi wis dikirim sasuwené ing {{PLURAL:$1|jam|$1 jam}}.\nKanggo nyegah ananing tumindhak culika, namung sak layang kanggo mbalèkaké tembung sandhi sing bakal dikirim sasuwéné ing {{PLURAL:$1|jam|$1 jam}}.",
-       "mailerror": "Cacad nalika ngirim layang: $1",
+       "mailerror": "Masalah pangirim layang: $1",
        "acct_creation_throttle_hit": "Para neneka nyang wiki iki sing nganggo alamat IP-né panjenengan wis gawé {{PLURAL:$1|akun cacah 1|akun cacah $1}} sajeroné $2 pungkasan, sing cacahé nyandhak cacah maksimum sing diidinaké.\nTemahané, para neneka sing nganggo alamat IP iki ora bisa gawé akun manèh sauntara iki.",
        "emailauthenticated": "Alamat layang-èlé panjenengan wis dikonfirmasi ing tanggal $2 pukul $3.",
        "emailnotauthenticated": "Alamat layang-èlé panjenengan durung dikonfirmasi.\nLayang-èl ora bakal dikirim yèn gegayutan karo fitur-fitur iki.",
        "noemailprefs": "Panjenengan kudu milih alamat e-mail supaya bisa nganggo fitur iki.",
        "emailconfirmlink": "Ndhedhes (konfirmasi) alamat e-mail panjenengan",
        "invalidemailaddress": "Alamat e-mail iki ora bisa ditampa amarga formaté ora bener. Tulung lebokna alamat mawa format sing bener utawa kosongaké waé isèn kasebut.",
-       "cannotchangeemail": "Alamat layang èlèktronik akun ora bisa diganti nèng wiki iki.",
+       "cannotchangeemail": "Alamat layang-èl akun ora bisa diowah ing wiki iki.",
        "emaildisabled": "Situs iki ora bisa ngirim layang èlèktronik.",
        "accountcreated": "Akun wis kagawé",
        "accountcreatedtext": "Akun panganggo [[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|rembug]]) wis digawé.",
        "pt-login-continue-button": "Banjuraké mlebu log",
        "pt-createaccount": "Gawé akun",
        "pt-userlogout": "Metu log",
-       "php-mail-error-unknown": "Kasalahan ora dingertèni nèng piguna mail() PHP.",
+       "php-mail-error-unknown": "Masalah ora dingertèni ing piguna mail() PHP.",
        "user-mail-no-addy": "Njajal ngirim layang èlèktronik tanpa alamat layang èlèktronik.",
        "user-mail-no-body": "Nyoba ngirim layang e-mail, tapi isine kosong.",
        "changepassword": "Ganti tembung wadi",
        "botpasswords-label-delete": "Busak",
        "botpasswords-label-resetpassword": "Balèni gawé tembung wadi",
        "resetpass_forbidden": "Tembung wadi ora bisa diganti",
-       "resetpass-no-info": "Panjenengan kudu mlebu log kanggo ngaksès kaca iki sacara langsung.",
+       "resetpass-no-info": "Panjenengan kudu mlebu log saperlu langsung ngaksès kaca iki.",
        "resetpass-submit-loggedin": "Ganti tembung wadi",
        "resetpass-submit-cancel": "Wurung",
        "resetpass-wrong-oldpass": "Tembung wadi saiki utawa sauntara ora trep.\nPanjengen bokmanawa wis ngganti tembung wadiné panjenengan utawa nyuwun tembung wadi sauntara sing anyar.",
        "passwordreset": "Balèni setèl tembung sandhi",
        "passwordreset-text-one": "Lengkapana formulir iki kanggo nampa tembung sandhi sementara lewat layang elektronik.",
        "passwordreset-text-many": "{{PLURAL:$1|Isinen salah sijine kotak ing ngisor iki kanggo nampa tembung sandhi sementara lewat layang elektronik.}}",
-       "passwordreset-disabled": "Piranti kanggo mbalèni nyetèl tembung sandhi dipatèni nèng wiki iki.",
+       "passwordreset-disabled": "Setèl ulang tembung wadi dipatèni ing wiki iki.",
        "passwordreset-emaildisabled": "Fitur layang elektronik wis dipateni ing wiki iki.",
        "passwordreset-username": "Jeneng panganggo:",
        "passwordreset-domain": "Domain:",
        "passwordreset-email": "Alamat layang-èl:",
-       "passwordreset-emailtitle": "Rincian akun nèng {{SITENAME}}",
+       "passwordreset-emailtitle": "Rerincèné akun ing {{SITENAME}}",
        "passwordreset-emailtext-ip": "Ana uwong (mbok menawa Sampéyan, mawa angka IP $1) njaluk ganti tembung sandhiné Sampéyan ana ing {{SITENAME}} ($4). {{PLURAL:$3|Rèkèning|Rèkèning-rèkèning}} ngisor iki magepokan karo padunungané layang èlèktronik iki:\n\n$2\n\n{{PLURAL:$3|Tembung sandhi sawetara iki}} bakal kedaluwarsa ing {{PLURAL:$5|sak dina|$5 dina}}.\nSampéyan kudu mlebu log lan milih siji tembung sandhi anyar saiki. Yèn wong liya sing njaluk iki, utawa yèn Sampéyan jebul wis kèlingan tembung sandhiné sing lawas saéngga ora ana niyat kanggo ngganti, Sampéyan bisa ngejaraké wara-wara iki lan bacutaké nganggo tembung sandhiné lawas Sampéyan.",
        "passwordreset-emailtext-user": "Panganggo $1 seka {{SITENAME}} njaluk ganti tembung sandhiné Sampéyan ana ing {{SITENAME}} ($4). {{PLURAL:$3|Rèkèning|Rèkèning-rèkèning}} ngisor iki magepokan karo padunungané layang èlèktronik iki:\n\n$2\n\n{{PLURAL:$3|Tembung sandhi sawetara iki}} bakal kedaluwarsa ing {{PLURAL:$5|sak dina|$5 dina}}.\nSampéyan kudu mlebu log lan milih siji tembung sandhi anyar saiki. Yèn wong liya sing njaluk iki, utawa yèn Sampéyan jebul wis kèlingan tembung sandhiné sing lawas saéngga ora ana niyat kanggo ngganti, Sampéyan bisa ngejaraké wara-wara iki lan bacutaké nganggo tembung sandhiné lawas Sampéyan.",
        "passwordreset-emailelement": "Jeneng panganggo: \n$1\n\nTembung wadi sauntara: \n$2",
        "missingcommentheader": "'''Pangéling:''' Sampéyan durung nyadhiyakaké judhul/jejer kanggo tanggepan iki.\nYèn Sampéyan klik \"$1\" manèh, suntingan Sampéyan bakal kasimpen tanpa kuwi.",
        "summary-preview": "Pratuduh ringkesan besutan:",
        "subject-preview": "Pratuduh jejer:",
-       "previewerrortext": "Cacad dumadi nalika njajal mratuduh owahanmu.",
+       "previewerrortext": "Ana masalah nalika njajal mratuduhaké owahané panjenengan.",
        "blockedtitle": "Panganggo kapalangan",
        "blockedtext": "<b>Asma panganggo utawa alamat IP panjenengan diblokir.</b>\n\nBlokir iki sing nglakoni $1.\nAlesané <i>$2</i>.\n\n* Diblokir wiwit: $8\n* Kadaluwarsa pemblokiran ing: $6\n* Sing arep diblokir: $7\n\nPanjenengan bisa ngubungi $1 utawa [[{{MediaWiki:Grouppage-sysop}}|pangurus liyané]] kanggo ngomongaké prakara iki.\n\nPanjenengan ora bisa nggunakaké fitur 'Kirim layang é-mail panganggo iki' kejaba panjenengan wis nglebokaké alamat é-mail sing sah ing [[Special:Preferences|prèferènsi]] panjenengan.\n\nAlamat IP panjenengan iku $3, lan ID pamblokiran iku #$5.\nTulung kabèh informasi ing ndhuwur iki disertakaké ing saben pitakon panjenengan.",
-       "autoblockedtext": "Alamat IP panjenangan wis diblokir minangka otomatis amerga dienggo déning panganggo liyané. Pamblokiran dilakoni déning $1 mawa alesan:\n\n:''$2''\n\n* Diblokir wiwit: $8\n* Blokir kadaluwarsa ing: $6\n* Sing dikarepaké diblokir: $7\n\nPanjenengan bisa ngubungi $1 utawa [[{{MediaWiki:Grouppage-sysop}}|pangurus liyané]] kanggo ngomongaké perkara iki.\n\nPanjenengan ora bisa nganggo fitur \"kirim e-mail panganggo iki\" kejaba panjenengan wis nglebokaké alamat e-mail sing sah ing [[Special:Preferences|prèferènsi]] panjenengan lan panjenengan wis diblokir kanggo nggunakaké.\n\nID pamblokiran panjenengan iku #$5 lan alamat IP panjenengan iku $3. Tulung sertakna informasi ing dhuwur kabèh iki saben ngajokaké pitakonan panjenengan. Matur nuwun.",
+       "autoblockedtext": "Alamat IP-né panjenangan wis otomatis diblokir amarga dienggo déning panganggo liyané, sing diblokir déning $1.\n\n:<em>$2</em>\n\n* Wiwit diblokir: $8\n* Rampung diblokir: $6\n* Sing diblokir: $7\n\nPanjenengan bisa ngubungi $1 utawa [[{{MediaWiki:Grouppage-sysop}}|pangurus]] liyané kanggo ngrembug blokirané.\n\nPanjenengan ora bisa nganggo fitur \"kirim layang-èl panganggo iki\" kajaba panjenengan wis ndhaftaraké alamat layang-èl sing trep ing [[Special:Preferences|pilalan panganggoné]] panjenengan lan panjenengan durung tau diblokir nalika nganggo iku.\n\nAlamat IP-né panjenengan sing saiki ya iku $3, lan ID blokirané ya iku $5. \nMangga wuwuhen kabèh rerincèn ing ndhuwur sajeroné samubarang pitakoné panjenengan.",
        "blockednoreason": "ora ana alesan sing diwènèhaké",
        "whitelistedittext": "Sampéyan kudu $1 murih bisa mbesut kaca.",
        "confirmedittext": "Panjenengan kudu ndhedhes alamat e-mail dhisik sadurungé pareng nyunting sawijining kaca. Mangga nglebokaké lan validasi alamat e-mail panjenengan sadurungé nglakoni panyuntingan. Alamat e-mail sawisé bisa diowahi liwat [[Special:Preferences|kaca préférènsi]]",
        "newarticletext": "Panjenengan ngetuti pranala sing durung ana.\nKanggo nggawé kaca, gagéa ngetik ing kothak ngisor iki (deleng [$1 kaca pitulung] ngenani katerangané).\nManawa panjenengan tekan kéné awit ora sengaja, kliken tumbul <strong>balik</strong> ana ing pangluruné panjenengan.",
        "anontalkpagetext": "----\n<em>Iki kaca parembugané panganggo anonim sing durung gawé akun, utawa sing ora nganggo akuné.</em>\nMula, awak dhéwé kudu nganggo alamat IP awujud angka kanggo nglacak dhèwèké.\nAlamat IP mangkono bisa dianggo déning sawenèh panganggo.\nManawa panjenengan panganggo anonim lan rumasa yèn ana tanggepan sing ora ilok dieneraké marang panjenengan, mangga [[Special:CreateAccount|gawéa akun]] utawa [[Special:UserLogin|mlebua log]] kanggo ngéndhani salah pangira karo panganggo anonim liyané ing tembé buri.",
        "noarticletext": "Kala saiki kaca iki durung ana tulisané.\nSampéyan bisa [[Special:Search/{{PAGENAME}}|nggolèki sesirahing kaca iki]] sajeroning kaca liya,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} nggolèki log sing magepokan],\nutawa [{{fullurl:{{FULLPAGENAME}}|action=edit}} nggawé kaca iki]</span>.",
-       "noarticletext-nopermission": "Saiki ora ana tèks ing kaca iki. \nSampéyan bisa [[Special:Search/{{PAGENAME}}|nggolèki judhul kaca iki]] nèng kaca liya, \nutawa <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|kaca={{urlencode:{{FULLPAGENAME}}}}}} nggolèki log sing kaitan]</span>, nanging Sampéyan ora nduwèni idin nggawé kaca iki.",
-       "missing-revision": "Benahan #$1 saka kaca ajeneng \"{{FULLPAGENAME}}\" ora ana.\n\nIki biasané kasebabaké pranala riwayat sing kedaluwarsa saka kaca kuwi wis dibusak.\nRinciané bisa ditemokaké nèng [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambusakan].",
+       "noarticletext-nopermission": "Saiki lagi ora ana tèks ing kaca iki. \nPanjenengan bisa [[Special:Search/{{PAGENAME}}|nggolèk sesirah kaca iki]] ing kaca liyané, \nutawa <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{urlencode:{{FULLPAGENAME}}}}}} nggolèk ing log sing gegayutan]</span>, nanging panjenengan ora kawogan nggawé kaca iki.",
+       "missing-revision": "Révisi #$1 saka kaca ajeneng \"{{FULLPAGENAME}}\" ora ana.\n\nIki biyasané kasababaké awit nututi pranala sujarah sing wis lawas saka sawijiné kaca sing wis dibusak.\nRerincèné bisa digolèki ing [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log busak].",
        "userpage-userdoesnotexist": "Akun panganggo \"$1\" ora kadhaftar.\nMangga pesthèkaké dhisik yèn panjenengan péngin nggawé/mbesut kaca iki.",
        "userpage-userdoesnotexist-view": "Panganggo \"$1\" ora kadhaptar.",
        "blocked-notice-logextract": "Panganggo iki saiki lagi diblokir.\nLog pamblokiran pungkasan dituduhaké ing ngisor iki minangka bahan rujukan:",
        "session_fail_preview": "Ngapunten! Kita ora bisa mrosès besutan panjenengan amarga ilangé sèsi data.\n\nPanjenengan bokmanawa wis metu log. <strong>Mangga vèrifikasi manawa panjenengan isih mlebu log lan jajala manèh</strong>.\nManawa isih durung kena, jajala [[Special:UserLogout|metu log]] lan mlebu log manèh, banjur priksaa apa browser panjenengan ngidinaké kuki saka situs iki.",
        "session_fail_preview_html": "'''Nuwun sèwu! Kita ora bisa prosès suntingan panjenengan amerga data sési ilang.'''\n\n''Amerga wiki iki ngidinaké panrapan HTML mentah, pratayang didelikaké minangka penggakan marang serangan Javascript.''\n\n'''Yèn iki sawijining upaya suntingan sing absah, mangga dicoba manèh. Yèn isih tetep ora kasil, cobanen metu log utawa oncat lan mlebua manèh.'''",
        "token_suffix_mismatch": "<strong>Besutané panjenengan ditulak amarga aplikasi klièné panjenengan ngowahi karakter tandha waca ing token besutané.</strong>\nBesutané wis ditulak kanggo nyegah rusaké tèks kaca.\nSing kaya mangkono biyasané kadadéan nalika panjenengan nganggo paladenan proksi anonim sing lelandhesan jaringan.",
-       "edit_form_incomplete": "'''Sebagéyan pormulir suntingan ora tekan nèng sasana; cèk pindho yèn suntingan Sampéyan isih wutuh lan jajal manèh.'''",
+       "edit_form_incomplete": "<strong>Sawenèh pérangan formulir besut ora nyandhak paladèné; priksanen manèh yèn besutané panjenengan isih wutuh banjur jajalen manèh.</strong>",
        "editing": "Mbesut $1",
        "creating": "Nggawé $1",
        "editingsection": "Mbesut $1 (pérangan)",
        "copyrightwarning2": "Mangga digatèkaké yèn kabèh kontribusi marang  {{SITENAME}} bisa disunting, diowahi, utawa dibusak déning penyumbang liyané. Yèn panjenengan ora kersa yèn tulisan panjenengan bisa disunting wong liya, aja ngirim artikel panjenengan ing kéné.<br />Panjenengan uga janji yèn tulisan panjenengan iku kasil karya panjenengan dhéwé, utawa disalin saka sumber umum utawa sumber bébas liyané (mangga delengen $1 kanggo informasi sabanjuré). '''AJA NGIRIM KARYA SING DIREKSA DÉNING UNDHANG-UNDHANG HAK CIPTA TANPA IDIN!'''",
        "longpageerror": "'''Kasalahan: Tèks sing Sampéyan lebokaké dawané {{PLURAL:$1|sak kilobita|$1 kilobita}}, luwih dawa saka maksimal {{PLURAL:$2|sak kilobita|$2 kilobita}}.'''\nKuwi ora bisa disimpen.",
        "readonlywarning": "'''PÈNGET: Basis data lagi dikunci amerga ana pangopènan, dadi saiki panjenengan ora bisa nyimpen kasil panyuntingan panjenengan. Panjenengan mbokmenawa prelu mindhahaké kasil panyuntingan panjenengan iki menyang panggonan liya kanggo disimpen bésuk.'''\n\nPangurus sing ngunci basis data mènèhi katrangan kaya mengkéné: $1",
-       "protectedpagewarning": "'''PÈNGET:  Kaca iki wis dikunci dadi namung panganggo sing nduwé hak aksès pangurus baé sing bisa nyunting.'''\nEntri cathetan pungkasan disadiakake ing ngisor kanggo referensi:",
+       "protectedpagewarning": "<strong>Pélik: Kaca iki wis direksa, mula mung panganggo mawa hak mirunggan pangurus sing bisa mbesut.</strong>\nÈntri log sing pungkasan ana ing ngisor iki minangka rujukan:",
        "semiprotectedpagewarning": "'''Cathetan:''' Kaca iki lagi pinuju direksa, dadi namung panganggo kadaftar sing bisa nyunting.\nEntri cathetan pungkasan disadiakake ing ngisor kanggo referensi:",
        "cascadeprotectedwarning": "<strong>Pènget:</strong> Kaca iki wis direksa saéngga mung panganggo kanthi hak pangurus waé sing bisa mbesut amarga kaca iki katranklusi ing {{PLURAL:$1|kaca|kaca-kaca}} sing kareksa runut ngisor iki:",
        "titleprotectedwarning": "'''Pènget: Kaca iki wis dikunci saéngga perlu [[Special:ListGroupRights|hak mligi]] kanggo gawéné.'''\nEntri cathetan pungkasan disadiakake ing ngisor kanggo referensi:",
        "template-semiprotected": "(semu kareksa)",
        "hiddencategories": "Kaca iki anggotaning {{PLURAL:$1|1 kategori wadi|$1 kategori wadi}}:",
        "edittools": "<!-- Tèks ing ngisor iki bakal ditudhuhaké ing ngisoring isènan suntingan lan pangemotan.-->",
-       "nocreatetext": "Situs iki ngwatesi kemampuan kanggo nggawé kaca anyar. Panjenengan bisa bali lan nyunting kaca sing wis ana, utawa mangga [[Special:UserLogin|mlebua log utawa ndaftar]]",
+       "nocreatetext": "{{SITENAME}} matesi bisané panjenengan nggawé kaca anyar.\nPanjenengan bisa bali lan mbesut kaca sing ana, utawa [[Special:UserLogin|mlebu log utawa nggawé akun]].",
        "nocreate-loggedin": "Panjenengan ora kagungan idin kanggo nggawé kaca anyar.",
        "sectioneditnotsupported-title": "Panyuntingan bagéyan ora kasengkuyungan",
        "sectioneditnotsupported-text": "Ora bisa mbesut sapérangan ana ing kaca iki.",
        "expansion-depth-exceeded-warning": "Kaca munculi jeroné èkspansi",
        "parser-unstrip-loop-warning": "Unstrip loop detected",
        "parser-unstrip-recursion-limit": "Unstrip recursion limit exceeded ($1)",
-       "converter-manual-rule-error": "Kasalahan kadètèk nèng aturan pangubahan basa manual",
+       "converter-manual-rule-error": "Masalah kapranggul ing aturan konvèrsi basa manual",
        "undo-success": "Besutan iki kena diwurungaké.\nTiliki bandhingan ngisor iki saperlu mesthèkaké yèn bener iki sing arep kolakoni, nuli simpen owahan ngisor iki kanggo ngiyai yèn besutané diwurungaké.",
        "undo-failure": "Suntingan iki ora bisa dibatalakén amerga ana konflik panyuntingan antara.",
        "undo-norev": "Besutan iki ora bisa diwurungaké amarga wis ora ana utawa wis dibusak.",
        "rev-deleted-event": "(rerincèn log dibusak)",
        "rev-deleted-user-contribs": "(jeneng panganggo utawa alamat IP dibusak - suntingan didhelikaké saka kontribusi)",
        "rev-deleted-text-permission": "Révisi kaca iki wis '''dibusak'''.\nPrincèné mbokmanawa kasedyakaké ing  [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambusakan].",
-       "rev-deleted-text-unhide": "Benahan kaca iki wis '''dibusak'''.\nRincian bisa ditemokaké nèng [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambusakan].\nSampéyan uga isih bisa [$1 ndelok benahan iki] yèn Sampéyan gelem.",
-       "rev-suppressed-text-unhide": "Benahan kaca iki wis '''dibrèdèl'''.\nRincian bisa ditemokaké nèng [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambrèdèlan].\nSampéyan uga isih bisa [$1 ndelok benahan iki] yèn Sampéyan gelem.",
+       "rev-deleted-text-unhide": "Révisi kaca iki wis <strong>dibusak</strong>.\nRerincèné bisa digolèki ing [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log busak].\nPanjenengan isih bisa [$1 ndeleng révisi iki] yèn panjenengan arep.",
+       "rev-suppressed-text-unhide": "Révisi kaca iki wis <strong>dibrèdhèl</strong>.\nRerincèné bisa digolèki ing [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} log brèdhèl].\nPanjenengan isih bisa [$1 ndeleng révisi iki] yèn panjenengan arep.",
        "rev-deleted-text-view": "Benahan kaca iki wis '''dibusak'''.\nSampéyan bisa ndelok iki; rinciané bisa ditemokaké nèng [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambusakan].",
        "rev-suppressed-text-view": "Benahan kaca iki wis '''dibrèdèl'''.\nSampéyan bisa ndelok iki; rinciané bisa ditemokaké nèng [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambrèdèlan].",
        "rev-deleted-no-diff": "Panjenengan ora bisa mirsani prabédan amarga siji saka révisiné wis '''dibusak'''.\nPricèné mbokmanawa isih ana ing [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} log pambusakan].",
        "action-history": "deleng sujarahé kaca iki",
        "action-minoredit": "tandhani besutan iki yèn besutan cilik",
        "action-move": "alih kaca iki",
-       "action-move-subpages": "mindahaké kaca iki, lan kabèh anak-kacané",
+       "action-move-subpages": "lih kaca iki, lan anak-kacané",
        "action-move-rootuserpages": "ngalih kaca panganggo oyod",
        "action-move-categorypages": "alih kaca kategori",
        "action-movefile": "alih barkas iki",
        "action-autopatrol": "nandhani besutané panjenengan dhéwé yèn wis kapriksa",
        "action-unwatchedpages": "deleng pratélan kaca sing ingawasan",
        "action-mergehistory": "nggabungaké sajarah kaca iki",
-       "action-userrights": "ngowahi kabèh hak panganggo",
+       "action-userrights": "besut kabèh hak panganggo",
        "action-userrights-interwiki": "ngowahi hak aksès saka panganggo ing wiki liya",
        "action-siteadmin": "ngunci utawa mbukak kunci basis data",
        "action-sendemail": "kirim layang-èl",
        "speciallogtitlelabel": "Patujon (judhul utawa panganggo) :",
        "log": "Log",
        "logeventslist-submit": "Tuduhaké",
-       "all-logs-page": "Kabèh log publik",
+       "all-logs-page": "Kabèh log umum",
        "alllogstext": "Pitontonan gabungan log-log sing ana ing {{SITENAME}}.\nPanjenengan bisa nyiyutaké sesawangané kanthi milih sawijining jinis log, jeneng panganggo (sènsitif-case), utawa kaca sing gegayutan (uga sènsitif-case).",
        "logempty": "Ora ditemokaké èntri log sing pas.",
        "log-title-wildcard": "Golèk sesirah sing diwiwiti tulisan iki",
        "allpagessubmit": "Menyang",
        "allpagesprefix": "Kapacak kaca-kaca ingkang mawi ater-ater:",
        "allpagesbadtitle": "Irah-irahan (judhul) ingkang dipun-gunaaken boten sah utawi nganggé ater-ater (awalan) antar-basa utawi antar-wiki. Irah-irahan punika saged ugi nganggé setunggal aksara utawi luwih ingkang boten saged kagunaaken dados irah-irahan.",
-       "allpages-bad-ns": "{{SITENAME}} ora duwé bilik nama \"$1\".",
+       "allpages-bad-ns": "{{SITENAME}} ora duwé mandala aran \"$1\".",
        "allpages-hide-redirects": "Dhelikaké alihan",
        "cachedspecial-viewing-cached-ttl": "Sampéyan lagi ndelok vèrsi cadhangan saka kaca iki, sing bisa dadi lawasé wis $1.",
        "cachedspecial-viewing-cached-ts": "Sampéyan lagi ndelok vèrsi cadhangan saka kaca iki, sing bisa dadi ora padha karo kasunyatan.",
        "watchlist-options": "Pilihaning pawawangan",
        "watching": "Ngawasi...",
        "unwatching": "Ngilangi pangawasan...",
-       "watcherrortext": "Ana cacad nalika ngganti tata latar pawawangané sampéyan tumrap \"$1\".",
+       "watcherrortext": "Ana masalah nalika ngganti setèlan pawawangané panjenengan tumrap \"$1\".",
        "enotif_reset": "Tandhanana kabèh kaca sing wis ditiliki",
        "enotif_impersonal_salutation": "Panganggo {{SITENAME}}",
        "enotif_subject_deleted": "Halaman $1 di {{SITENAME}} telah dihapus oleh {{gender:$2|$2}}",
        "deletereason-dropdown": "*Alesan pambusakan\n** Spam\n** Vandalisme\n** Nglanggar hak cipta\n** Disuwun sing nulis\n** Pangalihan rusak",
        "delete-edit-reasonlist": "Besut jalaraning pambusak",
        "delete-toobig": "Kaca iki darbé sujarah besutan sing dawa, punjul $1 {{PLURAL:$1|owahan}}.\nPambusak tumrap kaca sing kaya mangkono wis ora diidinaké nedya njagani murih ora ana karusakan ing {{SITENAME}}.",
-       "delete-warning-toobig": "Kaca iki duwé sajarah panyuntingan sing dawa, luwih saka $1 {{PLURAL:$1|révisi|révisi}}.\nMbusak kaca iki bisa ngrusak operasi basis data ing {{SITENAME}};\nkudu ngati-ati.",
+       "delete-warning-toobig": "Kaca iki duwé sujarah besut sing dawa, punjul $1 {{PLURAL:$1|révisi}}.\nMbusak kaca iki bisa ngrusak lakuné basis dhata ing {{SITENAME}};\nkudu diayahi kanthi ngati-ati.",
        "deleteprotected": "Panjenengan ora bisa mbusak kaca iki amarga direksa.",
        "deleting-backlinks-warning": "'''Awas:''' Kaca liyane mungkin ana sing nautake ing kaca sing arep sampeyan busak.",
        "rollback": "Pulihaké besutan",
        "cantrollback": "Ora bisa mbalèkaké suntingan; panganggo pungkasan iku siji-sijiné penulis artikel iki.",
        "alreadyrolled": "Ora bisa mulihaké besutan pungkasan [[:$1]] déning [[User:$2|$2]] ([[User talk:$2|rembug]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]); ana wong liya sing wis mbesut utawa mulihaké kaca iki.\n\nBesutan pungkasan kaca iku garapané [[User:$3|$3]] ([[User talk:$3|rembug]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
        "editcomment": "Ringkesan suntingan yaiku: <em>$1</em>.",
-       "revertpage": "Besutan sing dibalèkaké déning [[Special:Contributions/$2|$2]] ([[User talk:$2|rembugan]]) nyang révisi pungkasan déning [[User:$1|$1]]",
+       "revertpage": "Besutané [[Special:Contributions/$2|$2]] ([[User talk:$2|rembugan]]) sing dibalèkaké nyang révisi pungkasan déning [[User:$1|$1]]",
        "revertpage-nouser": "Suntingan déning panganggo sing didhelikake, dibalèkaké nèng benahan pungkasan déning [[User:$1|$1]]",
        "rollback-success": "Suntingan dibalèkaké déning $1;\ndiowahi bali menyang vèrsi pungkasan déning $2.",
        "sessionfailure-title": "Sèsi gagal",
        "metadata-help": "Berkas iki ngandhut informasi tambahan sing mbokmenawa ditambahaké déning kamera digital utawa ''scanner'' sing dipigunakaké kanggo nggawé utawa olèhé digitalisasi berkas. Yèn berkas iki wis dimodifikasi, detail sing ana mbokmenawa ora sacara kebak nuduhaké informasi saka gambar sing wis dimodifikasi iki.",
        "metadata-expand": "Tuduhna detail tambahan",
        "metadata-collapse": "Delikna detail tambahan",
-       "metadata-fields": "Babagan-babagan métadhata gambar sing katulis ing nawala iki bakal kapacak nyang jebèran kaca gambar nalika métadhata dinebaké.\nLiyané bakal kadhelikaké kanthi baku.\n* panggawé\n* gagrag\n* tanggalwayahasli\n* wayahpaparan\n* angkaf\n* bijibanteriso\n* dawafocal\n* artis\n* hakcipta\n* pratélangambar\n* latitudgps\n* longitudgps\n* altitudgps",
+       "metadata-fields": "Babagan-babagan métadhata gambar sing kapacak ing layang iki bakal dimot nyang pitontonan kaca gambar nalika métadhata diciyutaké.\nLiyané bakal kadhelikaké kanthi baku.\n* panggawé\n* gagrag\n* tanggalwayahasli\n* wayahpaparan\n* angkaf\n* bijibanteriso\n* dawafocal\n* artis\n* hakcipta\n* pratélangambar\n* latitudgps\n* longitudgps\n* altitudgps",
        "exif-imagewidth": "Jembar",
        "exif-imagelength": "Dhuwur",
        "exif-bitspersample": "Bit per komponèn",
        "feedback-external-bug-report-button": "Kirim ayahan tèhnis",
        "feedback-dialog-title": "Awèh saran",
        "feedback-error1": "Kasalahan: Asil ora dikenal saka API",
-       "feedback-error2": "Cacad: Gagal mbesut",
+       "feedback-error2": "Masalah: Besutané wurung",
        "feedback-error3": "Kasalahan: Ora ana tanggepan saka API",
        "feedback-message": "Layang:",
        "feedback-subject": "Jejer:",
index c679c28..969b2e0 100644 (file)
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "보기",
        "rcfilters-activefilters": "사용 중인 필터",
-       "rcfilters-quickfilters": "빠른 링크",
+       "rcfilters-quickfilters": "저장된 필터 설정",
        "rcfilters-quickfilters-placeholder-title": "저장된 링크가 아직 없습니다",
        "rcfilters-quickfilters-placeholder-description": "필터 설정을 저장하고 나중에 다시 사용하려면 아래의 사용 중인 필터 영역의 북마크 아이콘을 클릭하십시오.",
        "rcfilters-savedqueries-defaultlabel": "저장된 필터",
        "rcfilters-savedqueries-unsetdefault": "기본값으로 제거",
        "rcfilters-savedqueries-remove": "제거",
        "rcfilters-savedqueries-new-name-label": "이름",
-       "rcfilters-savedqueries-apply-label": "빠른 링크 만들기",
+       "rcfilters-savedqueries-apply-label": "설정 저장",
        "rcfilters-savedqueries-cancel-label": "취소",
-       "rcfilters-savedqueries-add-new-title": "í\95\84í\84°ë¥¼ ë¹ ë¥¸ ë§\81í\81¬ë¡\9c 저장",
+       "rcfilters-savedqueries-add-new-title": "í\98\84ì\9e¬ì\9d\98 í\95\84í\84° ì\84¤ì \95 저장",
        "rcfilters-restore-default-filters": "기본 필터 복구",
        "rcfilters-clear-all-filters": "필터 모두 지우기",
        "rcfilters-search-placeholder": "필터 최근 바뀜 (찾아보거나 입력을 시작하십시오)",
        "rcfilters-filter-user-experience-level-newcomer-label": "신규 사용자",
        "rcfilters-filter-user-experience-level-newcomer-description": "10회 미만의 편집 및 4일 미만의 활동.",
        "rcfilters-filter-user-experience-level-learner-label": "학습자",
-       "rcfilters-filter-user-experience-level-learner-description": "\"신규 사용자\" 보다 활동일 및 편집 수가 더 많지만 \"능숙한 사용자\" 보다는 적습니다.",
+       "rcfilters-filter-user-experience-level-learner-description": "\"신규 사용자\" 보다 경험이 더 많지만 \"능숙한 사용자\" 보다는 적습니다.",
        "rcfilters-filter-user-experience-level-experienced-label": "능숙한 사용자",
        "rcfilters-filter-user-experience-level-experienced-description": "30일 이상의 활동 및 500개 이상의 편집.",
        "rcfilters-filtergroup-automated": "자동으로 된 기여",
index dc6d7c2..44653cd 100644 (file)
        "recentchanges-legend-plusminus": "''(±123)''",
        "recentchanges-submit": "Weisen",
        "rcfilters-activefilters": "Aktiv Filteren",
-       "rcfilters-quickfilters": "Séier Linken",
+       "rcfilters-quickfilters": "Gespäichert Filter-Astellungen",
        "rcfilters-quickfilters-placeholder-title": "Nach keng Linke gespäichert",
        "rcfilters-savedqueries-defaultlabel": "Gespäichert Filteren",
        "rcfilters-savedqueries-rename": "Ëmbenennen",
        "rcfilters-savedqueries-unsetdefault": "Als Standard ewechhuelen",
        "rcfilters-savedqueries-remove": "Ewechhuelen",
        "rcfilters-savedqueries-new-name-label": "Numm",
-       "rcfilters-savedqueries-apply-label": "Séiere Link uleeën",
+       "rcfilters-savedqueries-apply-label": "Astellunge späicheren",
        "rcfilters-savedqueries-cancel-label": "Ofbriechen",
-       "rcfilters-savedqueries-add-new-title": "Filteren als séiere Link späicheren",
+       "rcfilters-savedqueries-add-new-title": "Aktuell Filter-Astellunge späicheren",
        "rcfilters-restore-default-filters": "Standardfiltere restauréieren",
        "rcfilters-clear-all-filters": "All Filteren eidelmaachen",
        "rcfilters-search-placeholder": "Rezent Ännerunge filteren (duerchsichen oder ufänke mat tippen)",
        "autoblocklist": "Automatesch Spären",
        "autoblocklist-submit": "Sichen",
        "autoblocklist-legend": "Automatesche Spären opzielen",
+       "autoblocklist-total-autoblocks": "Total vun den automatesche Spären: $1",
        "autoblocklist-empty": "D'Lëscht vun den automatesche Spären ass eidel.",
        "ipblocklist": "Gespaart Benotzer",
        "ipblocklist-legend": "No engem gespaarte Benotzer sichen",
index b06b8a0..85ea31a 100644 (file)
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "Weergeven",
        "rcfilters-activefilters": "Actieve filters",
-       "rcfilters-quickfilters": "Opgeslagen filter instellingen",
+       "rcfilters-quickfilters": "Opgeslagen filterinstellingen",
        "rcfilters-quickfilters-placeholder-title": "Nog geen koppelingen opgeslagen",
        "rcfilters-savedqueries-defaultlabel": "Opgeslagen filters",
        "rcfilters-savedqueries-rename": "Hernoemen",
        "unusedcategoriestext": "Hieronder staan categorieën die zijn aangemaakt, maar door geen enkele pagina of andere categorie gebruikt worden.",
        "notargettitle": "Geen doelpagina",
        "notargettext": "U hebt niet opgegeven voor welke pagina of gebruiker u deze handeling wilt uitvoeren.",
-       "nopagetitle": "Te hernoemen pagina bestaat niet",
+       "nopagetitle": "De doelpagina bestaat niet",
        "nopagetext": "De doelpagina die u hebt opgegeven bestaat niet.",
        "pager-newer-n": "{{PLURAL:$1|1 nieuwere|$1 nieuwere}}",
        "pager-older-n": "{{PLURAL:$1|1 oudere|$1 oudere}}",
index 80c497a..3527801 100644 (file)
        "rcfilters-savedqueries-unsetdefault": "Usuń ustawienie jako domyślne",
        "rcfilters-savedqueries-remove": "Usuń",
        "rcfilters-savedqueries-new-name-label": "Nazwa",
-       "rcfilters-savedqueries-apply-label": "Utwórz szybki link",
+       "rcfilters-savedqueries-apply-label": "Zapisz ustawienia",
        "rcfilters-savedqueries-cancel-label": "Anuluj",
        "rcfilters-savedqueries-add-new-title": "Zapisz szybki link do filtrów",
        "rcfilters-restore-default-filters": "Przywróć domyślne filtry",
index 7f5b3a2..e33a4b7 100644 (file)
                        "Winstonyin",
                        "Jhertel",
                        "Stryn",
-                       "Mazab IZW"
+                       "Mazab IZW",
+                       "Mainframe98"
                ]
        },
        "sidebar": "{{notranslate}}",
        "recentchanges-legend-plusminus": "{{optional}}\nA plus/minus sign with a number for the legend.",
        "recentchanges-submit": "Label for submit button in [[Special:RecentChanges]]\n{{Identical|Show}}",
        "rcfilters-activefilters": "Title for the filters selection showing the active filters.",
-       "rcfilters-quickfilters": "Label for the button that opens the quick filters menu in [[Special:RecentChanges]]",
+       "rcfilters-quickfilters": "Label for the button that opens the saved filter settings menu in [[Special:RecentChanges]]",
        "rcfilters-quickfilters-placeholder-title": "Title for the text shown in the quick filters menu on [[Special:RecentChanges]] if the user has not saved any quick filters.",
        "rcfilters-quickfilters-placeholder-description": "Description for the text shown in the quick filters menu on [[Special:RecentChanges]] if the user has not saved any quick filters.",
        "rcfilters-savedqueries-defaultlabel": "Default name for saving a new set of quick filters [[Special:RecentChanges]]",
        "rcfilters-savedqueries-unsetdefault": "Label for the menu option that unsets a quick filter as default in [[Special:RecentChanges]]",
        "rcfilters-savedqueries-remove": "Label for the menu option that removes a quick filter as default in [[Special:RecentChanges]]\n{{Identical|Remove}}",
        "rcfilters-savedqueries-new-name-label": "Label for the input that holds the name of the new saved filters in [[Special:RecentChanges]]\n{{Identical|Name}}",
-       "rcfilters-savedqueries-apply-label": "Label for the button to apply saving a new quick link in [[Special:RecentChanges]]",
+       "rcfilters-savedqueries-apply-label": "Label for the button to apply saving a new filter setting in [[Special:RecentChanges]]",
        "rcfilters-savedqueries-cancel-label": "Label for the button to cancel the saving of a new quick link in [[Special:RecentChanges]]\n{{Identical|Cancel}}",
        "rcfilters-savedqueries-add-new-title": "Title for the popup to add new quick link in [[Special:RecentChanges]]",
        "rcfilters-restore-default-filters": "Label for the button that resets filters to defaults",
        "unusedcategoriestext": "Used as page header in [[Special:UnusedCategories]].",
        "notargettitle": "Used as title of error message.\n\nSee also:\n* {{msg-mw|Notargettitle|title}}\n* {{msg-mw|Notargettext|text}}",
        "notargettext": "Used as error message in [[Special:MovePage]].\n\nSee also:\n* {{msg-mw|Notargettitle|title}}\n* {{msg-mw|Notargettext|text}}",
-       "nopagetitle": "Used as title on special pages like [[Special:MovePage]] (when the oldtitle does not exist) or [[Special:PermaLink]].\n\nThe text is {{msg-mw|nopagetext}}.\n\nSee also:\n* {{msg-mw|Nopagetitle|title}}\n* {{msg-mw|Nopagetext|text}}",
+       "nopagetitle": "Used as title on special pages like [[Special:MovePage]] (when the oldtitle does not exist), [[Special:Diff]] or [[Special:PermaLink]].\n\nThe text is {{msg-mw|nopagetext}}.\n\nSee also:\n* {{msg-mw|Nopagetitle|title}}\n* {{msg-mw|Nopagetext|text}}",
        "nopagetext": "Used as text on special pages like [[Special:MovePage]] (when the oldtitle does not exist) or [[Special:PermaLink]].\n\nThe title is {{msg-mw|nopagetitle}}.\n\nSee also:\n* {{msg-mw|Nopagetitle|title}}\n* {{msg-mw|Nopagetext|text}}",
        "pager-newer-n": "This is part of the navigation message on the top and bottom of Special pages which are lists of things in date order, e.g. the User's contributions page. It is passed as the second argument of {{msg-mw|Viewprevnext}}. $1 is the number of items shown per page.\n{{Identical|Newer}}",
        "pager-older-n": "This is part of the navigation message on the top and bottom of Special pages which are lists of things in date order, e.g. the User's contributions page. It is passed as the first argument of {{msg-mw|Viewprevnext}}. $1 is the number of items shown per page.",
index 78548f7..1cd1b39 100644 (file)
                        "Esukhovnina",
                        "Av6",
                        "Санюн Вадик",
-                       "MustangDSG"
+                       "MustangDSG",
+                       "Valeri'swiki"
                ]
        },
        "tog-underline": "Подчёркивание ссылок:",
        "recentchanges-submit": "Показать",
        "rcfilters-activefilters": "Активные фильтры",
        "rcfilters-quickfilters": "Сохранённые настройки фильтра",
-       "rcfilters-quickfilters-placeholder-title": "Ð\95Ñ\89Ñ\91 Ð½ÐµÑ\82 Ñ\81оÑ\85Ñ\80анÑ\91ннÑ\8bÑ\85 Ñ\81Ñ\81Ñ\8bлок",
+       "rcfilters-quickfilters-placeholder-title": "СоÑ\85Ñ\80аненнÑ\8bÑ\85 Ñ\81Ñ\81Ñ\8bлок ÐµÑ\89е Ð½ÐµÑ\82",
        "rcfilters-quickfilters-placeholder-description": "Чтобы сохранить настройки фильтра и повторно использовать их позже, щелкните значок закладки в области «Активный фильтр» ниже.",
        "rcfilters-savedqueries-defaultlabel": "Сохранённые фильтры",
        "rcfilters-savedqueries-rename": "Переименовать",
index 32af31e..1602827 100644 (file)
        "special-characters-group-thai": "Таай",
        "special-characters-group-lao": "Лаос",
        "special-characters-group-khmer": "Кхмер",
+       "special-characters-group-canadianaboriginal": "Канаада суруга-бичигэ",
        "special-characters-title-endash": "орто тире",
        "special-characters-title-emdash": "уһун тире",
        "special-characters-title-minus": "минус бэлиэтэ",
        "mw-widgets-titleinput-description-new-page": "сирэй суох эбит",
        "mw-widgets-titleinput-description-redirect": "манна $1 утаарыы",
        "mw-widgets-categoryselector-add-category-placeholder": "Категория эбии...",
+       "mw-widgets-usersmultiselect-placeholder": "Эбии эп...",
+       "date-range-from": "Баччаттан:",
+       "date-range-to": "Болдьоҕо:",
        "sessionmanager-tie": "Тургутуу хас да көрүҥүн биирдэ туһанар сатаммат: $1.",
        "sessionprovider-generic": "$1 сиэссийэ",
        "sessionprovider-mediawiki-session-cookiesessionprovider": "куукаҕа олоҕурбут сиэссийэ",
        "sessionprovider-nocookies": "Куука арахсыбыт буолуон сөп. оннук түгэҥҥэ холбоон баран хатылаа.",
        "randomrootpage": "Түбэһиэх төрүт сирэй.",
        "log-action-filter-block": "Хааччах көрүҥэ:",
-       "log-action-filter-contentmodel": "Contentmodel көрүҥэ:",
+       "log-action-filter-contentmodel": "Иһинээҕитин мадьыалын көрүҥэ:",
        "log-action-filter-delete": "Сотуу көрүҥэ:",
        "log-action-filter-import": "Киллэрии көрүҥэ:",
        "log-action-filter-managetags": "Салайар тиэк көрүҥэ:",
        "log-action-filter-block-reblock": "Бобууну уларытыы",
        "log-action-filter-block-unblock": "Бобууну суох гыныы",
        "log-action-filter-contentmodel-change": "Иһинээҕитин мадьыалын уларытыы",
-       "log-action-filter-contentmodel-new": "Contentmodel диэн мадьыалынан сирэйи айыы",
+       "log-action-filter-contentmodel-new": "Иһинээҕитин мадьыалынан уратытык наардыыр сирэйи айыы",
        "log-action-filter-delete-delete": "Сирэйи сотуу",
        "log-action-filter-delete-delete_redir": "Утаарыыны хат суруйуу",
        "log-action-filter-delete-restore": "Сирэйи сөргүтүү",
index 9cab67c..5963590 100644 (file)
        "resetpass_submit": "Ẹ ṣe àtúntò ọ̀rọ̀ìpamọ́ kí ẹ tó wọlé",
        "changepassword-success": "Ìyípadà ọ̀rọ̀ìpamọ́ yín ti já sí rere!",
        "changepassword-throttled": "Ẹ ti gbìyànjú lọ́pọ̀ bó ṣe yẹ lọ láti jáwọlé.\nẸ jọ̀wọ́ ẹ dúró fún $1 ná kí ẹ tó tún gbìyànjú lẹ́ẹ̀kan síi.",
+       "botpasswords-label-cancel": "Fagilé",
+       "botpasswords-label-delete": "Ìparẹ́",
+       "botpasswords-label-resetpassword": "Ìtúntò ọ̀rọ̀ìpamọ́",
        "resetpass_forbidden": "Àwọn ọ̀rọ̀ìpamọ́ kò ṣe é yípadà",
        "resetpass-no-info": "Ẹ gbọ́dọ̀ wọlẹ́ láti le lọ sí ojúewé yìí tààrà.",
        "resetpass-submit-loggedin": "Ìyípadà ọ̀rọ̀ìpamọ́",
index 8b8e4aa..31e3ae9 100644 (file)
@@ -95,7 +95,8 @@
                        "SolidBlock",
                        "D41D8CD98F",
                        "Wmr",
-                       "逆襲的天邪鬼"
+                       "逆襲的天邪鬼",
+                       "WhitePhosphorus"
                ]
        },
        "tog-underline": "链接下划线:",
        "rev-deleted-text-view": "本页面版本已被<strong>删除</strong>。您可以查看它,详情请见[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 删除日志]。",
        "rev-suppressed-text-view": "该页面版本已经被<strong>监督隐藏</strong>。您可以查看它。在[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 监督日志]中可以找到详细的信息。",
        "rev-deleted-no-diff": "您不能查看该差异,因为其中一个版本已被<strong>删除</strong>。详情请见[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 删除日志]。",
-       "rev-suppressed-no-diff": "无法查看该差异,因为其中一个版本已被<strong>删除<strong>。",
+       "rev-suppressed-no-diff": "无法查看该差异,因为其中一个版本已被<strong>删除</strong>。",
        "rev-deleted-unhide-diff": "该差异对比的其中的一个版本已经被<strong>删除</strong>。在[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 删除日志]中可以找到更多的信息。如果您想继续的话,您仍然可以[$1 查看此版本]。",
        "rev-suppressed-unhide-diff": "该页面的其中一次版本已经被<strong>屏蔽</strong>。在[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 监督日志]中可以找到更多的资料。如果您想继续的话,您仍然可以[$1 查看该差异]。",
        "rev-deleted-diff-view": "差异对比中的一次版本已被<strong>删除</strong>。您可以对比此差异。详细信息可在[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 删除日志]中找到。",
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "显示",
        "rcfilters-activefilters": "激活的过滤器",
-       "rcfilters-quickfilters": "保存的过滤器设置",
+       "rcfilters-quickfilters": "已保存过滤器设置",
        "rcfilters-quickfilters-placeholder-title": "尚未保存链接",
        "rcfilters-quickfilters-placeholder-description": "要保存您的过滤器设置并供日后再利用,点击下方激活的过滤器区域内的书签图标。",
        "rcfilters-savedqueries-defaultlabel": "保存的过滤器",
index dacaa7f..3d8563d 100644 (file)
        "period-am": "AM",
        "period-pm": "PM",
        "pagecategories": "{{PLURAL:$1|分類|$1 個分類}}",
-       "category_header": "分類 \"$1\" 中的頁面",
+       "category_header": "「$1」分類的頁面",
        "subcategories": "子分類",
-       "category-media-header": "分類 \"$1\" 中的媒體",
+       "category-media-header": "「$1」分類的媒體",
        "category-empty": "<em>此分類目前未包含頁面或媒體。</em>",
        "hidden-categories": "{{PLURAL:$1|隱藏分類}}",
        "hidden-category-category": "隱藏分類",
        "variants": "變體",
        "navigation-heading": "導覽選單",
        "errorpagetitle": "錯誤",
-       "returnto": "返回至 $1。",
+       "returnto": "返回「$1」頁面",
        "tagline": "出自 {{SITENAME}}",
        "help": "說明",
        "search": "搜尋",
        "poolcounter-usage-error": "用法錯誤:$1",
        "aboutsite": "關於 {{SITENAME}}",
        "aboutpage": "Project:關於",
-       "copyright": "除非額外說明,否則本站內容均使用 $1 授權條款。",
+       "copyright": "除非另有註明,否則頁面內容均以 $1 條款授權。",
        "copyrightpage": "{{ns:project}}:版權",
        "currentevents": "新聞動態",
        "currentevents-url": "Project:Current events",
        "mergelog": "合併日誌",
        "revertmerge": "取消合併",
        "mergelogpagetext": "以下是最近合併頁面歷史的清單。",
-       "history-title": "\"$1\" 的修訂歷史",
+       "history-title": "「$1」的修訂歷史",
        "difference-title": "\"$1\" 修訂間的差異",
        "difference-title-multipage": "頁面 \"$1\" 與 \"$2\" 間的差異",
        "difference-multipage": "(頁面間的差異)",
        "diff-multi-manyusers": "(未顯示由超過 $2 位使用者於中間所作的 $1 次修訂)",
        "difference-missing-revision": "查無此差異 ($1) 中的{{PLURAL:$2|1 次修訂|$2 次修訂}}。\n\n這通常是因為差異的連結過時,頁面已被刪除。\n詳情資訊請參閱 [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 刪除日誌]。",
        "searchresults": "搜尋結果",
-       "searchresults-title": "\"$1\" 的搜尋結果",
+       "searchresults-title": "搜尋「$1」的結果",
        "titlematches": "頁面標題符合",
        "textmatches": "頁面內容符合",
        "notextmatches": "沒有符合的頁面內容",
        "recentchanges-legend-plusminus": "(<em>±123</em>)",
        "recentchanges-submit": "顯示",
        "rcfilters-activefilters": "使用中的過濾條件",
-       "rcfilters-quickfilters": "å¿«é\80\9fé\80£çµ\90",
+       "rcfilters-quickfilters": "å·²å\84²å­\98ç\9a\84é\81\8e濾å\99¨è¨­å®\9a",
        "rcfilters-savedqueries-defaultlabel": "儲存過濾器",
        "rcfilters-savedqueries-rename": "重新命名",
        "rcfilters-savedqueries-setdefault": "定為預設",
        "rcfilters-savedqueries-unsetdefault": "取消作為預設",
        "rcfilters-savedqueries-remove": "移除",
        "rcfilters-savedqueries-new-name-label": "名稱",
-       "rcfilters-savedqueries-apply-label": "建ç«\8bå¿«é\80\9fé\80£çµ\90",
+       "rcfilters-savedqueries-apply-label": "å\84²å­\98設å®\9a",
        "rcfilters-savedqueries-cancel-label": "取消",
-       "rcfilters-savedqueries-add-new-title": "把過濾器存為快速連結",
+       "rcfilters-savedqueries-add-new-title": "儲存目前的過濾器設定",
        "rcfilters-restore-default-filters": "還原預設過濾條件",
        "rcfilters-clear-all-filters": "清除所有過濾條件",
        "rcfilters-search-placeholder": "過濾條件近期變更 (瀏覽或開始輸入)",
        "shared-repo-from": "來自 $1",
        "shared-repo": "共用檔案庫",
        "shared-repo-name-wikimediacommons": "維基共享資源",
-       "upload-disallowed-here": "無法覆蓋此檔案。",
+       "upload-disallowed-here": "無法覆蓋此檔案。",
        "filerevert": "還原 $1",
        "filerevert-legend": "還原檔案",
        "filerevert-intro": "您現正在還原檔案 <strong>[[Media:$1|$1]]</strong> 至 [$4 於 $2 $3 的版本]。",
        "deleteprotected": "此頁面已受保護,您無法刪除此頁面。",
        "deleting-backlinks-warning": "<strong>警告:</strong>您正要刪除的頁面有[[Special:WhatLinksHere/{{FULLPAGENAME}}|其他頁面]]連結或引用。",
        "rollback": "復原編輯",
-       "rollbacklink": "原",
+       "rollbacklink": "原",
        "rollbacklinkcount": "還原 $1 次編輯",
        "rollbacklinkcount-morethan": "還原超過 $1 次{{PLURAL:$1|編輯}}",
        "rollbackfailed": "還原失敗",
        "sp-contributions-uploads": "上傳",
        "sp-contributions-logs": "日誌",
        "sp-contributions-talk": "對話",
-       "sp-contributions-userrights": "使用者權限管理",
+       "sp-contributions-userrights": "{{GENDER:$1|使用者}}權限管理",
        "sp-contributions-blocked-notice": "此使用者目前已被封鎖。\n以下為最近的封鎖紀錄以供參考:",
        "sp-contributions-blocked-notice-anon": "此 IP 位址目前已被封鎖。\n以下為最近的封鎖記錄以供參考:",
        "sp-contributions-search": "搜尋貢獻",
        "sp-contributions-hideminor": "隱藏次要編輯",
        "sp-contributions-submit": "搜尋",
        "whatlinkshere": "連結至此的頁面",
-       "whatlinkshere-title": "連結至 \"$1\" 的頁面",
+       "whatlinkshere-title": "連結至「$1」的頁面",
        "whatlinkshere-page": "頁面:",
        "linkshere": "以下頁面連結至 <strong>[[:$1]]</strong>:",
        "nolinkshere": "沒有頁面連結至 <strong>[[:$1]]</strong>。",
        "tooltip-pt-createaccount": "我們會鼓勵您建立一個帳號並且登入,即使這不是必要的動作。",
        "tooltip-ca-talk": "有關頁面內容的討論",
        "tooltip-ca-edit": "編輯此頁面",
-       "tooltip-ca-addsection": "開始一個新章節",
-       "tooltip-ca-viewsource": "此頁面已保護。您可檢視此頁面原始碼",
+       "tooltip-ca-addsection": "開始新章節",
+       "tooltip-ca-viewsource": "此頁面已保護。您可檢視此頁面原始碼",
        "tooltip-ca-history": "此頁面先前的修訂",
        "tooltip-ca-protect": "保護此頁面",
        "tooltip-ca-unprotect": "變更此頁面保護",
        "tooltip-watchlistedit-raw-submit": "更新監視清單",
        "tooltip-recreate": "無論是否被刪除,重新建立該頁面。",
        "tooltip-upload": "開始上傳",
-       "tooltip-rollback": "點選 \"還原\" 連結便可還原至上一位貢獻者對此頁面的編輯",
+       "tooltip-rollback": "點選「還原」連結便可還原至上一位貢獻者對此頁面的編輯",
        "tooltip-undo": "\"還原\" 可還原此編輯並以預覽模式開啟編輯表單,讓您可在摘要中加入原因。",
        "tooltip-preferences-save": "儲存偏好設定",
        "tooltip-summary": "請輸入簡短摘要",
        "htmlform-user-not-valid": "<strong>$1</strong> 不是有效的使用者名稱。",
        "logentry-delete-delete": "$1 刪除頁面 $3",
        "logentry-delete-delete_redir": "$1 透過覆寫{{GENDER:$2|刪除了}}重新導向 $3",
-       "logentry-delete-restore": "$1 還原頁面 $3",
+       "logentry-delete-restore": "$1{{GENDER:$2|還原}}頁面 $3($4)",
        "logentry-delete-event": "$1 {{GENDER:$2|已更改}} $3 中 {{PLURAL:$5|1 筆日誌|$5 筆日誌}}的可見性:$4",
        "logentry-delete-revision": "$1 {{GENDER:$2|已更改}}頁面 $3 中 {{PLURAL:$5|1 筆修訂|$5 筆修訂}}的可見性:$4",
        "logentry-delete-event-legacy": "$1 {{GENDER:$2|已變更}} $3 中日誌的可見性",
index b2c8d89..440604e 100644 (file)
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <ruleset name="MediaWiki">
-       <rule ref="vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
+       <rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
                <!-- Disable rules added in 0.8.0 that don't pass yet -->
                <exclude name="MediaWiki.Commenting.FunctionComment.ExtraParamComment" />
                <exclude name="MediaWiki.Commenting.FunctionComment.MissingParamComment" />
index 1b607ce..46aafd5 100644 (file)
@@ -1944,6 +1944,9 @@ return [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
                'targets' => [ 'desktop', 'mobile' ],
        ],
+       'mediawiki.special.changeslist.enhanced' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
+       ],
        'mediawiki.special.changeslist.legend' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css',
                'targets' => [ 'desktop', 'mobile' ],
@@ -1956,9 +1959,6 @@ return [
                ],
                'targets' => [ 'desktop', 'mobile' ],
        ],
-       'mediawiki.special.changeslist.enhanced' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
-       ],
        'mediawiki.special.changeslist.visitedstatus' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js',
        ],
@@ -2027,13 +2027,6 @@ return [
                        'mediawiki.notification.convertmessagebox',
                ],
        ],
-       'mediawiki.special.userrights' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
-               'dependencies' => [
-                       'mediawiki.notification.convertmessagebox',
-               ],
-       ],
        'mediawiki.special.preferences.styles' => [
                'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
        ],
@@ -2051,15 +2044,6 @@ return [
                        'powersearch-togglenone',
                ],
        ],
-       'mediawiki.special.search.styles' => [
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
-               'targets' => [ 'desktop', 'mobile' ],
-       ],
-       'mediawiki.special.search.interwikiwidget.styles' => [
-               'styles' => 'resources/src/mediawiki.special/'
-                       . 'mediawiki.special.search.interwikiwidget.styles.less',
-               'targets' => [ 'desktop', 'mobile' ]
-       ],
        'mediawiki.special.search.commonsInterwikiWidget' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js',
                'dependencies' => [
@@ -2072,9 +2056,38 @@ return [
                        'searchprofile-images'
                ],
        ],
+       'mediawiki.special.search.interwikiwidget.styles' => [
+               'styles' => 'resources/src/mediawiki.special/'
+                       . 'mediawiki.special.search.interwikiwidget.styles.less',
+               'targets' => [ 'desktop', 'mobile' ]
+       ],
+       'mediawiki.special.search.styles' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
+               'targets' => [ 'desktop', 'mobile' ],
+       ],
        'mediawiki.special.undelete' => [
                'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
        ],
+       'mediawiki.special.unwatchedPages' => [
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
+               'messages' => [
+                       'addedwatchtext-short',
+                       'removedwatchtext-short',
+                       'unwatch',
+                       'unwatching',
+                       'watch',
+                       'watcherrortext',
+                       'watching',
+               ],
+               'dependencies' => [
+                       'mediawiki.api',
+                       'mediawiki.api.watch',
+                       'mediawiki.notify',
+                       'mediawiki.Title',
+                       'mediawiki.util',
+               ],
+       ],
        'mediawiki.special.upload' => [
                'templates' => [
                        'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
@@ -2111,11 +2124,6 @@ return [
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
                ],
        ],
-       'mediawiki.special.userlogin.signup.styles' => [
-               'styles' => [
-                       'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
-               ],
-       ],
        'mediawiki.special.userlogin.login.styles' => [
                'styles' => [
                        'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
@@ -2135,24 +2143,16 @@ return [
                        'mediawiki.htmlform.checker',
                ],
        ],
-       'mediawiki.special.unwatchedPages' => [
-               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
-               'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
-               'messages' => [
-                       'addedwatchtext-short',
-                       'removedwatchtext-short',
-                       'unwatch',
-                       'unwatching',
-                       'watch',
-                       'watcherrortext',
-                       'watching',
+       'mediawiki.special.userlogin.signup.styles' => [
+               'styles' => [
+                       'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
                ],
+       ],
+       'mediawiki.special.userrights' => [
+               'styles' => 'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+               'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
                'dependencies' => [
-                       'mediawiki.api',
-                       'mediawiki.api.watch',
-                       'mediawiki.notify',
-                       'mediawiki.Title',
-                       'mediawiki.util',
+                       'mediawiki.notification.convertmessagebox',
                ],
        ],
        'mediawiki.special.watchlist' => [
index 3337a03..20a78d0 100644 (file)
 
        // Two colors
        .highlight-color-mix( c1, c2 );
-       .highlight-color-mix( c1, c3 );
+       // Overriding .highlight-color-mix( c1, c3 ); to produce
+       // a custom color rather than the computed tint
+       // see https://phabricator.wikimedia.org/T161267
+       .mw-rcfilters-highlight-color-c1.mw-rcfilters-highlight-color-c3 {
+               background-color: #ccdecc;
+       }
        .highlight-color-mix( c1, c4 );
        .highlight-color-mix( c1, c5 );
        .highlight-color-mix( c2, c3 );
index 88f1195..4a7c3f8 100644 (file)
@@ -9,12 +9,24 @@
 
        &-buttonSelect {
                &-color {
-                       .oo-ui-iconElement-icon {
-                               width: 2em;
-                               height: 2em;
+                       // Make the rule much more specific to override OOUI
+                       .oo-ui-iconElement-icon.oo-ui-icon-check {
+                               // Override OOUI icon dimensions
+                               // The parent is 2em with 0.5em margin
+                               // (see mw-rcfilters-mixin-circle below)
+                               // so here we want 2em - 0.5em = 1.5em
+                               width: 1.5em;
+                               height: 1.5em;
+                               // By eye, this is centered horizontally for the color circle
+                               margin-left: -0.1em;
                        }
 
                        &-none {
+                               .oo-ui-iconElement-icon.oo-ui-icon-check {
+                                       // By eye, this is centered horizontally for the white circle
+                                       margin-left: -0.2em;
+                               }
+
                                .mw-rcfilters-mixin-circle( @highlight-none, 2em, 0.5em, true );
                                // Override border to dashed
                                border: 1px dashed #565656;
index 1809617..00c04bc 100644 (file)
                        } );
                }
                if ( action === 'cancel' ) {
-                       return new OO.ui.Process( this.close() );
+                       return new OO.ui.Process( this.close().closed );
                }
                if ( action === 'cancelupload' ) {
                        return new OO.ui.Process( this.uploadBooklet.initialize() );
diff --git a/tests/phpunit/includes/api/ApiComparePagesTest.php b/tests/phpunit/includes/api/ApiComparePagesTest.php
new file mode 100644 (file)
index 0000000..989d6bb
--- /dev/null
@@ -0,0 +1,611 @@
+<?php
+
+/**
+ * @group API
+ * @group Database
+ * @group medium
+ * @covers ApiComparePages
+ */
+class ApiComparePagesTest extends ApiTestCase {
+
+       protected static $repl = [];
+
+       protected function setUp() {
+               parent::setUp();
+
+               // Set $wgExternalDiffEngine to something bogus to try to force use of
+               // the PHP engine rather than wikidiff2.
+               $this->setMwGlobals( [
+                       'wgExternalDiffEngine' => '/dev/null',
+               ] );
+       }
+
+       protected function addPage( $page, $text, $model = CONTENT_MODEL_WIKITEXT ) {
+               $title = Title::newFromText( 'ApiComparePagesTest ' . $page );
+               $content = ContentHandler::makeContent( $text, $title, $model );
+
+               $page = WikiPage::factory( $title );
+               $user = static::getTestSysop()->getUser();
+               $status = $page->doEditContent(
+                       $content, 'Test for ApiComparePagesTest: ' . $text, 0, false, $user
+               );
+               if ( !$status->isOk() ) {
+                       $this->fail( "Failed to create $title: " . $status->getWikiText( false, false, 'en' ) );
+               }
+               return $status->value['revision']->getId();
+       }
+
+       public function addDBDataOnce() {
+               $user = static::getTestSysop()->getUser();
+               self::$repl['creator'] = $user->getName();
+               self::$repl['creatorid'] = $user->getId();
+
+               self::$repl['revA1'] = $this->addPage( 'A', 'A 1' );
+               self::$repl['revA2'] = $this->addPage( 'A', 'A 2' );
+               self::$repl['revA3'] = $this->addPage( 'A', 'A 3' );
+               self::$repl['revA4'] = $this->addPage( 'A', 'A 4' );
+               self::$repl['pageA'] = Title::newFromText( 'ApiComparePagesTest A' )->getArticleId();
+
+               self::$repl['revB1'] = $this->addPage( 'B', 'B 1' );
+               self::$repl['revB2'] = $this->addPage( 'B', 'B 2' );
+               self::$repl['revB3'] = $this->addPage( 'B', 'B 3' );
+               self::$repl['revB4'] = $this->addPage( 'B', 'B 4' );
+               self::$repl['pageB'] = Title::newFromText( 'ApiComparePagesTest B' )->getArticleId();
+
+               self::$repl['revC1'] = $this->addPage( 'C', 'C 1' );
+               self::$repl['revC2'] = $this->addPage( 'C', 'C 2' );
+               self::$repl['revC3'] = $this->addPage( 'C', 'C 3' );
+               self::$repl['pageC'] = Title::newFromText( 'ApiComparePagesTest C' )->getArticleId();
+
+               $id = $this->addPage( 'D', 'D 1' );
+               self::$repl['pageD'] = Title::newFromText( 'ApiComparePagesTest D' )->getArticleId();
+               wfGetDB( DB_MASTER )->delete( 'revision', [ 'rev_id' => $id ] );
+
+               self::$repl['revE1'] = $this->addPage( 'E', 'E 1' );
+               self::$repl['revE2'] = $this->addPage( 'E', 'E 2' );
+               self::$repl['revE3'] = $this->addPage( 'E', 'E 3' );
+               self::$repl['revE4'] = $this->addPage( 'E', 'E 4' );
+               self::$repl['pageE'] = Title::newFromText( 'ApiComparePagesTest E' )->getArticleId();
+               wfGetDB( DB_MASTER )->update(
+                       'page', [ 'page_latest' => 0 ], [ 'page_id' => self::$repl['pageE'] ]
+               );
+
+               WikiPage::factory( Title::newFromText( 'ApiComparePagesTest C' ) )
+                       ->doDeleteArticleReal( 'Test for ApiComparePagesTest' );
+
+               RevisionDeleter::createList(
+                       'revision',
+                       RequestContext::getMain(),
+                       Title::newFromText( 'ApiComparePagesTest B' ),
+                       [ self::$repl['revB2'] ]
+               )->setVisibility( [
+                       'value' => [
+                               Revision::DELETED_TEXT => 1,
+                               Revision::DELETED_USER => 1,
+                               Revision::DELETED_COMMENT => 1,
+                       ],
+                       'comment' => 'Test for ApiComparePages',
+               ] );
+
+               RevisionDeleter::createList(
+                       'revision',
+                       RequestContext::getMain(),
+                       Title::newFromText( 'ApiComparePagesTest B' ),
+                       [ self::$repl['revB3'] ]
+               )->setVisibility( [
+                       'value' => [
+                               Revision::DELETED_USER => 1,
+                               Revision::DELETED_COMMENT => 1,
+                               Revision::DELETED_RESTRICTED => 1,
+                       ],
+                       'comment' => 'Test for ApiComparePages',
+               ] );
+
+               Title::clearCaches(); // Otherwise it has the wrong latest revision for some reason
+       }
+
+       protected function doReplacements( &$value ) {
+               if ( is_string( $value ) ) {
+                       if ( preg_match( '/^{{REPL:(.+?)}}$/', $value, $m ) ) {
+                               $value = self::$repl[$m[1]];
+                       } else {
+                               $value = preg_replace_callback( '/{{REPL:(.+?)}}/', function ( $m ) {
+                                       return isset( self::$repl[$m[1]] ) ? self::$repl[$m[1]] : $m[0];
+                               }, $value );
+                       }
+               } elseif ( is_array( $value ) || is_object( $value ) ) {
+                       foreach ( $value as &$v ) {
+                               $this->doReplacements( $v );
+                       }
+                       unset( $v );
+               }
+       }
+
+       /**
+        * @dataProvider provideDiff
+        */
+       public function testDiff( $params, $expect, $exceptionCode = false, $sysop = false ) {
+               $this->doReplacements( $params );
+
+               $params += [
+                       'action' => 'compare',
+               ];
+
+               $user = $sysop
+                       ? static::getTestSysop()->getUser()
+                       : static::getTestUser()->getUser();
+               if ( $exceptionCode ) {
+                       try {
+                               $this->doApiRequest( $params, null, false, $user );
+                               $this->fail( 'Expected exception not thrown' );
+                       } catch ( ApiUsageException $ex ) {
+                               $this->assertTrue( $this->apiExceptionHasCode( $ex, $exceptionCode ),
+                                       "Exception with code $exceptionCode" );
+                       }
+               } else {
+                       $apiResult = $this->doApiRequest( $params, null, false, $user );
+                       $apiResult = $apiResult[0];
+                       $this->doReplacements( $expect );
+                       $this->assertEquals( $expect, $apiResult );
+               }
+       }
+
+       public static function provideDiff() {
+               return [
+                       // @codingStandardsIgnoreStart Ignore Generic.Files.LineLength.TooLong
+                       'Basic diff, titles' => [
+                               [
+                                       'fromtitle' => 'ApiComparePagesTest A',
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA4}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest A',
+                                               'toid' => '{{REPL:pageB}}',
+                                               'torevid' => '{{REPL:revB4}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest B',
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, page IDs' => [
+                               [
+                                       'fromid' => '{{REPL:pageA}}',
+                                       'toid' => '{{REPL:pageB}}',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA4}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest A',
+                                               'toid' => '{{REPL:pageB}}',
+                                               'torevid' => '{{REPL:revB4}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest B',
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">A </del>4</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">B </ins>4</div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, revision IDs' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torev' => '{{REPL:revA3}}',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA2}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest A',
+                                               'toid' => '{{REPL:pageA}}',
+                                               'torevid' => '{{REPL:revA3}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest A',
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div>A <del class="diffchange diffchange-inline">2</del></div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div>A <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, deleted revision ID as sysop' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torev' => '{{REPL:revC2}}',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA2}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest A',
+                                               'toid' => 0,
+                                               'torevid' => '{{REPL:revC2}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest C',
+                                               'toarchive' => true,
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">C </ins>2</div></td></tr>' . "\n",
+                                       ]
+                               ],
+                               false, true
+                       ],
+                       'Basic diff, revdel as sysop' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torev' => '{{REPL:revB2}}',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA2}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest A',
+                                               'toid' => '{{REPL:pageB}}',
+                                               'torevid' => '{{REPL:revB2}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest B',
+                                               'totexthidden' => true,
+                                               'touserhidden' => true,
+                                               'tocommenthidden' => true,
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">A </del>2</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">B </ins>2</div></td></tr>' . "\n",
+                                       ]
+                               ],
+                               false, true
+                       ],
+                       'Basic diff, text' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'fromcontentmodel' => 'wikitext',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'tocontentmodel' => 'wikitext',
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, text 2' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'tocontentmodel' => 'wikitext',
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">{{subst:PAGENAME}}</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, guessed model' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'totext' => 'To text',
+                               ],
+                               [
+                                       'warnings' => [
+                                               'compare' => [
+                                                       'warnings' => 'No content model could be determined, assuming wikitext.',
+                                               ],
+                                       ],
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text</div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, text with title and PST' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'totitle' => 'Test',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'topst' => true,
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">Test</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, text with page ID and PST' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'toid' => '{{REPL:pageB}}',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'topst' => true,
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, text with revision and PST' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'torev' => '{{REPL:revB2}}',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'topst' => true,
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest B</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Basic diff, text with deleted revision and PST' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'torev' => '{{REPL:revC2}}',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'topst' => true,
+                               ],
+                               [
+                                       'compare' => [
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div><del class="diffchange diffchange-inline">From </del>text</div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div><ins class="diffchange diffchange-inline">To </ins>text <ins class="diffchange diffchange-inline">ApiComparePagesTest C</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                               false, true
+                       ],
+                       'Diff with all props' => [
+                               [
+                                       'fromrev' => '{{REPL:revB1}}',
+                                       'torev' => '{{REPL:revB3}}',
+                                       'totitle' => 'ApiComparePagesTest B',
+                                       'prop' => 'diff|diffsize|rel|ids|title|user|comment|parsedcomment|size'
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageB}}',
+                                               'fromrevid' => '{{REPL:revB1}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest B',
+                                               'fromsize' => 3,
+                                               'fromuser' => '{{REPL:creator}}',
+                                               'fromuserid' => '{{REPL:creatorid}}',
+                                               'fromcomment' => 'Test for ApiComparePagesTest: B 1',
+                                               'fromparsedcomment' => 'Test for ApiComparePagesTest: B 1',
+                                               'toid' => '{{REPL:pageB}}',
+                                               'torevid' => '{{REPL:revB3}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest B',
+                                               'tosize' => 3,
+                                               'touserhidden' => true,
+                                               'tocommenthidden' => true,
+                                               'tosuppressed' => true,
+                                               'next' => '{{REPL:revB4}}',
+                                               'diffsize' => 391,
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div>B <del class="diffchange diffchange-inline">1</del></div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                       ],
+                       'Diff with all props as sysop' => [
+                               [
+                                       'fromrev' => '{{REPL:revB2}}',
+                                       'torev' => '{{REPL:revB3}}',
+                                       'totitle' => 'ApiComparePagesTest B',
+                                       'prop' => 'diff|diffsize|rel|ids|title|user|comment|parsedcomment|size'
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageB}}',
+                                               'fromrevid' => '{{REPL:revB2}}',
+                                               'fromns' => 0,
+                                               'fromtitle' => 'ApiComparePagesTest B',
+                                               'fromsize' => 3,
+                                               'fromtexthidden' => true,
+                                               'fromuserhidden' => true,
+                                               'fromuser' => '{{REPL:creator}}',
+                                               'fromuserid' => '{{REPL:creatorid}}',
+                                               'fromcommenthidden' => true,
+                                               'fromcomment' => 'Test for ApiComparePagesTest: B 2',
+                                               'fromparsedcomment' => 'Test for ApiComparePagesTest: B 2',
+                                               'toid' => '{{REPL:pageB}}',
+                                               'torevid' => '{{REPL:revB3}}',
+                                               'tons' => 0,
+                                               'totitle' => 'ApiComparePagesTest B',
+                                               'tosize' => 3,
+                                               'touserhidden' => true,
+                                               'tocommenthidden' => true,
+                                               'tosuppressed' => true,
+                                               'prev' => '{{REPL:revB1}}',
+                                               'next' => '{{REPL:revB4}}',
+                                               'diffsize' => 391,
+                                               'body' => '<tr><td colspan="2" class="diff-lineno" id="mw-diff-left-l1" >Line 1:</td>' . "\n"
+                                                       . '<td colspan="2" class="diff-lineno">Line 1:</td></tr>' . "\n"
+                                                       . '<tr><td class=\'diff-marker\'>−</td><td class=\'diff-deletedline\'><div>B <del class="diffchange diffchange-inline">2</del></div></td><td class=\'diff-marker\'>+</td><td class=\'diff-addedline\'><div>B <ins class="diffchange diffchange-inline">3</ins></div></td></tr>' . "\n",
+                                       ]
+                               ],
+                               false, true
+                       ],
+                       'Relative diff, cur' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torelative' => 'cur',
+                                       'prop' => 'ids',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageA}}',
+                                               'fromrevid' => '{{REPL:revA2}}',
+                                               'toid' => '{{REPL:pageA}}',
+                                               'torevid' => '{{REPL:revA4}}',
+                                       ]
+                               ],
+                       ],
+                       'Relative diff, next' => [
+                               [
+                                       'fromrev' => '{{REPL:revE2}}',
+                                       'torelative' => 'next',
+                                       'prop' => 'ids|rel',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageE}}',
+                                               'fromrevid' => '{{REPL:revE2}}',
+                                               'toid' => '{{REPL:pageE}}',
+                                               'torevid' => '{{REPL:revE3}}',
+                                               'prev' => '{{REPL:revE1}}',
+                                               'next' => '{{REPL:revE4}}',
+                                       ]
+                               ],
+                       ],
+                       'Relative diff, prev' => [
+                               [
+                                       'fromrev' => '{{REPL:revE3}}',
+                                       'torelative' => 'prev',
+                                       'prop' => 'ids|rel',
+                               ],
+                               [
+                                       'compare' => [
+                                               'fromid' => '{{REPL:pageE}}',
+                                               'fromrevid' => '{{REPL:revE2}}',
+                                               'toid' => '{{REPL:pageE}}',
+                                               'torevid' => '{{REPL:revE3}}',
+                                               'prev' => '{{REPL:revE1}}',
+                                               'next' => '{{REPL:revE4}}',
+                                       ]
+                               ],
+                       ],
+
+                       'Error, missing title' => [
+                               [
+                                       'fromtitle' => 'ApiComparePagesTest X',
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'missingtitle',
+                       ],
+                       'Error, invalid title' => [
+                               [
+                                       'fromtitle' => '<bad>',
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'invalidtitle',
+                       ],
+                       'Error, missing page ID' => [
+                               [
+                                       'fromid' => 8817900,
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'nosuchpageid',
+                       ],
+                       'Error, page with missing revision' => [
+                               [
+                                       'fromtitle' => 'ApiComparePagesTest D',
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'nosuchrevid',
+                       ],
+                       'Error, page with no revision' => [
+                               [
+                                       'fromtitle' => 'ApiComparePagesTest E',
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'nosuchrevid',
+                       ],
+                       'Error, bad rev ID' => [
+                               [
+                                       'fromrev' => 8817900,
+                                       'totitle' => 'ApiComparePagesTest B',
+                               ],
+                               [],
+                               'nosuchrevid',
+                       ],
+                       'Error, deleted revision ID, non-sysop' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torev' => '{{REPL:revC2}}',
+                               ],
+                               [],
+                               'nosuchrevid',
+                       ],
+                       'Error, revision-deleted content' => [
+                               [
+                                       'fromrev' => '{{REPL:revA2}}',
+                                       'torev' => '{{REPL:revB2}}',
+                               ],
+                               [],
+                               'missingcontent',
+                       ],
+                       'Error, text with no title and PST' => [
+                               [
+                                       'fromtext' => 'From text',
+                                       'totext' => 'To text {{subst:PAGENAME}}',
+                                       'topst' => true,
+                               ],
+                               [],
+                               'compare-no-title',
+                       ],
+                       'Error, Relative diff, no from revision' => [
+                               [
+                                       'fromtext' => 'Foo',
+                                       'torelative' => 'cur',
+                                       'prop' => 'ids',
+                               ],
+                               [],
+                               'compare-relative-to-nothing'
+                       ],
+                       'Error, Relative diff, cur with no current revision' => [
+                               [
+                                       'fromrev' => '{{REPL:revE2}}',
+                                       'torelative' => 'cur',
+                                       'prop' => 'ids',
+                               ],
+                               [],
+                               'nosuchrevid'
+                       ],
+                       'Error, Relative diff, next revdeleted' => [
+                               [
+                                       'fromrev' => '{{REPL:revB1}}',
+                                       'torelative' => 'next',
+                                       'prop' => 'ids',
+                               ],
+                               [],
+                               'missingcontent'
+                       ],
+                       'Error, Relative diff, prev revdeleted' => [
+                               [
+                                       'fromrev' => '{{REPL:revB3}}',
+                                       'torelative' => 'prev',
+                                       'prop' => 'ids',
+                               ],
+                               [],
+                               'missingcontent'
+                       ],
+
+                       // @codingStandardsIgnoreEnd
+               ];
+       }
+}
index 9cc3ffd..639c323 100644 (file)
@@ -167,7 +167,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
                $this->assertRecentChangeByCategorization(
                        $title,
-                       $wikiPage->getParserOutput( new ParserOptions() ),
+                       $wikiPage->getParserOutput( ParserOptions::newCanonical() ),
                        Title::newFromText( 'Category:Foo' ),
                        [ [ 'Foo', '[[:Testing]] added to category' ] ]
                );
@@ -177,7 +177,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
                $this->assertRecentChangeByCategorization(
                        $title,
-                       $wikiPage->getParserOutput( new ParserOptions() ),
+                       $wikiPage->getParserOutput( ParserOptions::newCanonical() ),
                        Title::newFromText( 'Category:Foo' ),
                        [
                                [ 'Foo', '[[:Testing]] added to category' ],
@@ -187,7 +187,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
                $this->assertRecentChangeByCategorization(
                        $title,
-                       $wikiPage->getParserOutput( new ParserOptions() ),
+                       $wikiPage->getParserOutput( ParserOptions::newCanonical() ),
                        Title::newFromText( 'Category:Bar' ),
                        [
                                [ 'Bar', '[[:Testing]] added to category' ],
@@ -211,7 +211,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
                $this->assertRecentChangeByCategorization(
                        $templateTitle,
-                       $templatePage->getParserOutput( new ParserOptions() ),
+                       $templatePage->getParserOutput( ParserOptions::newCanonical() ),
                        Title::newFromText( 'Baz' ),
                        []
                );
@@ -221,7 +221,7 @@ class LinksUpdateTest extends MediaWikiLangTestCase {
 
                $this->assertRecentChangeByCategorization(
                        $templateTitle,
-                       $templatePage->getParserOutput( new ParserOptions() ),
+                       $templatePage->getParserOutput( ParserOptions::newCanonical() ),
                        Title::newFromText( 'Baz' ),
                        [ [
                                'Baz',
index 3aeed09..728e671 100644 (file)
@@ -426,6 +426,153 @@ class WANObjectCacheTest extends PHPUnit_Framework_TestCase  {
                ];
        }
 
+       /**
+        * @dataProvider getMultiWithUnionSetCallback_provider
+        * @covers WANObjectCache::getMultiWithUnionSetCallback()
+        * @covers WANObjectCache::makeMultiKeys()
+        * @param array $extOpts
+        * @param bool $versioned
+        */
+       public function testGetMultiWithUnionSetCallback( array $extOpts, $versioned ) {
+               $cache = $this->cache;
+
+               $keyA = wfRandomString();
+               $keyB = wfRandomString();
+               $keyC = wfRandomString();
+               $cKey1 = wfRandomString();
+               $cKey2 = wfRandomString();
+
+               $wasSet = 0;
+               $genFunc = function ( array $ids, array &$ttls, array &$setOpts ) use (
+                       &$wasSet, &$priorValue, &$priorAsOf
+               ) {
+                       $newValues = [];
+                       foreach ( $ids as $id ) {
+                               ++$wasSet;
+                               $newValues[$id] = "@$id$";
+                               $ttls[$id] = 20; // override with another value
+                       }
+
+                       return $newValues;
+               };
+
+               $wasSet = 0;
+               $keyedIds = new ArrayIterator( [ $keyA => 3353 ] );
+               $value = "@3353$";
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, $extOpts );
+               $this->assertEquals( $value, $v[$keyA], "Value returned" );
+               $this->assertEquals( 1, $wasSet, "Value regenerated" );
+
+               $curTTL = null;
+               $cache->get( $keyA, $curTTL );
+               $this->assertLessThanOrEqual( 20, $curTTL, 'Current TTL between 19-20 (overriden)' );
+               $this->assertGreaterThanOrEqual( 19, $curTTL, 'Current TTL between 19-20 (overriden)' );
+
+               $wasSet = 0;
+               $value = "@efef$";
+               $keyedIds = new ArrayIterator( [ $keyB => 'efef' ] );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'lowTTL' => 0 ] + $extOpts );
+               $this->assertEquals( $value, $v[$keyB], "Value returned" );
+               $this->assertEquals( 1, $wasSet, "Value regenerated" );
+               $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed yet in process cache" );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'lowTTL' => 0 ] + $extOpts );
+               $this->assertEquals( $value, $v[$keyB], "Value returned" );
+               $this->assertEquals( 1, $wasSet, "Value not regenerated" );
+               $this->assertEquals( 0, $cache->getWarmupKeyMisses(), "Keys warmed in process cache" );
+
+               $priorTime = microtime( true );
+               usleep( 1 );
+               $wasSet = 0;
+               $keyedIds = new ArrayIterator( [ $keyB => 'efef' ] );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'checkKeys' => [ $cKey1, $cKey2 ] ] + $extOpts
+               );
+               $this->assertEquals( $value, $v[$keyB], "Value returned" );
+               $this->assertEquals( 1, $wasSet, "Value regenerated due to check keys" );
+               $t1 = $cache->getCheckKeyTime( $cKey1 );
+               $this->assertGreaterThanOrEqual( $priorTime, $t1, 'Check keys generated on miss' );
+               $t2 = $cache->getCheckKeyTime( $cKey2 );
+               $this->assertGreaterThanOrEqual( $priorTime, $t2, 'Check keys generated on miss' );
+
+               $priorTime = microtime( true );
+               $value = "@43636$";
+               $wasSet = 0;
+               $keyedIds = new ArrayIterator( [ $keyC => 43636 ] );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'checkKeys' => [ $cKey1, $cKey2 ] ] + $extOpts
+               );
+               $this->assertEquals( $value, $v[$keyC], "Value returned" );
+               $this->assertEquals( 1, $wasSet, "Value regenerated due to still-recent check keys" );
+               $t1 = $cache->getCheckKeyTime( $cKey1 );
+               $this->assertLessThanOrEqual( $priorTime, $t1, 'Check keys did not change again' );
+               $t2 = $cache->getCheckKeyTime( $cKey2 );
+               $this->assertLessThanOrEqual( $priorTime, $t2, 'Check keys did not change again' );
+
+               $curTTL = null;
+               $v = $cache->get( $keyC, $curTTL, [ $cKey1, $cKey2 ] );
+               if ( $versioned ) {
+                       $this->assertEquals( $value, $v[$cache::VFLD_DATA], "Value returned" );
+               } else {
+                       $this->assertEquals( $value, $v, "Value returned" );
+               }
+               $this->assertLessThanOrEqual( 0, $curTTL, "Value has current TTL < 0 due to check keys" );
+
+               $wasSet = 0;
+               $key = wfRandomString();
+               $keyedIds = new ArrayIterator( [ $key => 242424 ] );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'pcTTL' => 5 ] + $extOpts );
+               $this->assertEquals( "@{$keyedIds[$key]}$", $v[$key], "Value returned" );
+               $cache->delete( $key );
+               $keyedIds = new ArrayIterator( [ $key => 242424 ] );
+               $v = $cache->getMultiWithUnionSetCallback(
+                       $keyedIds, 30, $genFunc, [ 'pcTTL' => 5 ] + $extOpts );
+               $this->assertEquals( "@{$keyedIds[$key]}$", $v[$key], "Value still returned after deleted" );
+               $this->assertEquals( 1, $wasSet, "Value process cached while deleted" );
+
+               $calls = 0;
+               $ids = [ 1, 2, 3, 4, 5, 6 ];
+               $keyFunc = function ( $id, WANObjectCache $wanCache ) {
+                       return $wanCache->makeKey( 'test', $id );
+               };
+               $keyedIds = $cache->makeMultiKeys( $ids, $keyFunc );
+               $genFunc = function ( array $ids, array &$ttls, array &$setOpts ) use ( &$calls ) {
+                       $newValues = [];
+                       foreach ( $ids as $id ) {
+                               ++$calls;
+                               $newValues[$id] = "val-{$id}";
+                       }
+
+                       return $newValues;
+               };
+               $values = $cache->getMultiWithUnionSetCallback( $keyedIds, 10, $genFunc );
+
+               $this->assertEquals(
+                       [ "val-1", "val-2", "val-3", "val-4", "val-5", "val-6" ],
+                       array_values( $values ),
+                       "Correct values in correct order"
+               );
+               $this->assertEquals(
+                       array_map( $keyFunc, $ids, array_fill( 0, count( $ids ), $this->cache ) ),
+                       array_keys( $values ),
+                       "Correct keys in correct order"
+               );
+               $this->assertEquals( count( $ids ), $calls );
+
+               $cache->getMultiWithUnionSetCallback( $keyedIds, 10, $genFunc );
+               $this->assertEquals( count( $ids ), $calls, "Values cached" );
+       }
+
+       public static function getMultiWithUnionSetCallback_provider() {
+               return [
+                       [ [], false ],
+                       [ [ 'version' => 1 ], true ]
+               ];
+       }
+
        /**
         * @covers WANObjectCache::getWithSetCallback()
         * @covers WANObjectCache::doGetWithSetCallback()
index aacdb1a..81f0564 100644 (file)
@@ -6,13 +6,46 @@ use Wikimedia\ScopedCallback;
 class ParserOptionsTest extends MediaWikiTestCase {
 
        /**
-        * @dataProvider provideOptionsHash
+        * @dataProvider provideIsSafeToCache
+        * @param bool $expect Expected value
+        * @param array $options Options to set
+        */
+       public function testIsSafeToCache( $expect, $options ) {
+               $popt = ParserOptions::newCanonical();
+               foreach ( $options as $name => $value ) {
+                       $popt->setOption( $name, $value );
+               }
+               $this->assertSame( $expect, $popt->isSafeToCache() );
+       }
+
+       public static function provideIsSafeToCache() {
+               return [
+                       'No overrides' => [ true, [] ],
+                       'In-key options are ok' => [ true, [
+                               'editsection' => false,
+                               'thumbsize' => 1e100,
+                               'wrapclass' => false,
+                       ] ],
+                       'Non-in-key options are not ok' => [ false, [
+                               'removeComments' => false,
+                       ] ],
+                       'Canonical override, not default (1)' => [ true, [
+                               'tidy' => true,
+                       ] ],
+                       'Canonical override, not default (2)' => [ false, [
+                               'tidy' => false,
+                       ] ],
+               ];
+       }
+
+       /**
+        * @dataProvider provideOptionsHashPre30
         * @param array $usedOptions Used options
         * @param string $expect Expected value
         * @param array $options Options to set
         * @param array $globals Globals to set
         */
-       public function testOptionsHash( $usedOptions, $expect, $options, $globals = [] ) {
+       public function testOptionsHashPre30( $usedOptions, $expect, $options, $globals = [] ) {
                global $wgHooks;
 
                $globals += [
@@ -28,10 +61,10 @@ class ParserOptionsTest extends MediaWikiTestCase {
                foreach ( $options as $setter => $value ) {
                        $popt->$setter( $value );
                }
-               $this->assertSame( $expect, $popt->optionsHash( $usedOptions ) );
+               $this->assertSame( $expect, $popt->optionsHashPre30( $usedOptions ) );
        }
 
-       public static function provideOptionsHash() {
+       public static function provideOptionsHashPre30() {
                $used = [ 'wrapclass', 'editsection', 'printable' ];
 
                return [
@@ -57,13 +90,99 @@ class ParserOptionsTest extends MediaWikiTestCase {
                ];
        }
 
+       /**
+        * @dataProvider provideOptionsHash
+        * @param array $usedOptions Used options
+        * @param string $expect Expected value
+        * @param array $options Options to set
+        * @param array $globals Globals to set
+        */
+       public function testOptionsHash( $usedOptions, $expect, $options, $globals = [] ) {
+               global $wgHooks;
+
+               $globals += [
+                       'wgRenderHashAppend' => '',
+                       'wgHooks' => [],
+               ];
+               $globals['wgHooks'] += [
+                       'PageRenderingHash' => [],
+               ] + $wgHooks;
+               $this->setMwGlobals( $globals );
+
+               $popt = ParserOptions::newCanonical();
+               foreach ( $options as $name => $value ) {
+                       $popt->setOption( $name, $value );
+               }
+               $this->assertSame( $expect, $popt->optionsHash( $usedOptions ) );
+       }
+
+       public static function provideOptionsHash() {
+               $used = [ 'wrapclass', 'editsection', 'printable' ];
+
+               $classWrapper = TestingAccessWrapper::newFromClass( ParserOptions::class );
+               $classWrapper->getDefaults();
+               $allUsableOptions = array_diff(
+                       array_keys( $classWrapper->inCacheKey ),
+                       array_keys( $classWrapper->lazyOptions )
+               );
+
+               return [
+                       'Canonical options, nothing used' => [ [], 'canonical', [] ],
+                       'Canonical options, used some options' => [ $used, 'canonical', [] ],
+                       'Used some options, non-default values' => [
+                               $used,
+                               'printable=1!wrapclass=foobar',
+                               [
+                                       'wrapclass' => 'foobar',
+                                       'printable' => true,
+                               ]
+                       ],
+                       'Canonical options, used all non-lazy options' => [ $allUsableOptions, 'canonical', [] ],
+                       'Canonical options, nothing used, but with hooks and $wgRenderHashAppend' => [
+                               [],
+                               'canonical!wgRenderHashAppend!onPageRenderingHash',
+                               [],
+                               [
+                                       'wgRenderHashAppend' => '!wgRenderHashAppend',
+                                       'wgHooks' => [ 'PageRenderingHash' => [ [ __CLASS__ . '::onPageRenderingHash' ] ] ],
+                               ]
+                       ],
+               ];
+       }
+
        public static function onPageRenderingHash( &$confstr ) {
                $confstr .= '!onPageRenderingHash';
        }
 
+       /**
+        * @expectedException InvalidArgumentException
+        * @expectedExceptionMessage Unknown parser option bogus
+        */
+       public function testGetInvalidOption() {
+               $popt = ParserOptions::newCanonical();
+               $popt->getOption( 'bogus' );
+       }
+
+       /**
+        * @expectedException InvalidArgumentException
+        * @expectedExceptionMessage Unknown parser option bogus
+        */
+       public function testSetInvalidOption() {
+               $popt = ParserOptions::newCanonical();
+               $popt->setOption( 'bogus', true );
+       }
+
        public function testMatches() {
-               $popt1 = new ParserOptions();
-               $popt2 = new ParserOptions();
+               $classWrapper = TestingAccessWrapper::newFromClass( ParserOptions::class );
+               $oldDefaults = $classWrapper->defaults;
+               $oldLazy = $classWrapper->lazyOptions;
+               $reset = new ScopedCallback( function () use ( $classWrapper, $oldDefaults, $oldLazy ) {
+                       $classWrapper->defaults = $oldDefaults;
+                       $classWrapper->lazyOptions = $oldLazy;
+               } );
+
+               $popt1 = ParserOptions::newCanonical();
+               $popt2 = ParserOptions::newCanonical();
                $this->assertTrue( $popt1->matches( $popt2 ) );
 
                $popt1->enableLimitReport( true );
@@ -72,6 +191,17 @@ class ParserOptionsTest extends MediaWikiTestCase {
 
                $popt2->setTidy( !$popt2->getTidy() );
                $this->assertFalse( $popt1->matches( $popt2 ) );
+
+               $ctr = 0;
+               $classWrapper->defaults += [ __METHOD__ => null ];
+               $classWrapper->lazyOptions += [ __METHOD__ => function () use ( &$ctr ) {
+                       return ++$ctr;
+               } ];
+               $popt1 = ParserOptions::newCanonical();
+               $popt2 = ParserOptions::newCanonical();
+               $this->assertFalse( $popt1->matches( $popt2 ) );
+
+               ScopedCallback::consume( $reset );
        }
 
 }