Merge "phpcs: Allow linting tools to discover rules"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 5 Jun 2017 20:23:57 +0000 (20:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 5 Jun 2017 20:23:57 +0000 (20:23 +0000)
32 files changed:
CODE_OF_CONDUCT.md [new file with mode: 0644]
RELEASE-NOTES-1.30
includes/api/ApiComparePages.php
includes/api/i18n/en.json
includes/api/i18n/es.json
includes/api/i18n/fr.json
includes/api/i18n/gl.json
includes/api/i18n/hu.json
includes/api/i18n/pt.json
includes/api/i18n/qqq.json
includes/api/i18n/ru.json
includes/installer/i18n/es.json
languages/i18n/ar.json
languages/i18n/bg.json
languages/i18n/bn.json
languages/i18n/ca.json
languages/i18n/es-formal.json
languages/i18n/es.json
languages/i18n/gl.json
languages/i18n/hr.json
languages/i18n/it.json
languages/i18n/jv.json
languages/i18n/lv.json
languages/i18n/qqq.json
languages/i18n/rue.json
languages/i18n/sah.json
languages/i18n/sv.json
languages/i18n/th.json
languages/i18n/yi.json
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.ChangesListWrapperWidget.less
resources/src/mediawiki.rcfilters/styles/mw.rcfilters.ui.HighlightColorPickerWidget.less
tests/phpunit/includes/api/ApiComparePagesTest.php [new file with mode: 0644]

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..fc49351 100644 (file)
@@ -60,6 +60,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 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 1db9479..78fc440 100644 (file)
        "api-format-prettyprint-header": "Esta es la representación en HTML del formato $1. HTML es adecuado para realizar tareas de depuración, pero no para utilizarlo en aplicaciones.\n\nUtiliza el parámetro <var>format</var> para modificar el formato de salida. Para ver la representación no HTML del formato $1, emplea <kbd>format=$2</kbd>.\n\nPara obtener más información, consulta la [[mw:Special:MyLanguage/API|documentación completa]] o la [[Special:ApiHelp/main|ayuda de API]].",
        "api-format-prettyprint-header-only-html": "Esta es una representación en HTML destinada a la depuración, y no es adecuada para el uso de la aplicación.\n\nVéase la [[mw:Special:MyLanguage/API|documentación completa]] o la [[Special:ApiHelp/main|página de ayuda de la API]] para más información.",
        "api-format-prettyprint-status": "Esta respuesta se devolvería con el estado HTTP $1 $2.",
+       "api-login-fail-badsessionprovider": "No se puede acceder mientras esté utilizándose $1.",
        "api-pageset-param-titles": "Una lista de títulos en los que trabajar.",
        "api-pageset-param-pageids": "Una lista de identificadores de páginas en las que trabajar.",
        "api-pageset-param-revids": "Una lista de identificadores de revisiones en las que trabajar.",
        "apierror-cantsend": "No estás conectado, no tienes una dirección de correo electrónico confirmada o no tienes permiso para enviar correo electrónico a otros usuarios, así que no puedes enviar correo electrónico.",
        "apierror-cantundelete": "No se ha podido restaurar: puede que las revisiones solicitadas no existan o que ya se hayan restaurado.",
        "apierror-changeauth-norequest": "No se ha podido crear la petición de modificación.",
-       "apierror-compare-inputneeded": "Se necesita un título, un identificador de página o un número de revisión tanto para el parámetro <var>from</var> como para el parámetro <var>to</var>.",
        "apierror-contentserializationexception": "La serialización de contenido falló: $1",
        "apierror-contenttoobig": "El contenido que has suministrado supera el tamaño máximo de archivo de $1 {{PLURAL:$1|kilobyte|kilobytes}}.",
        "apierror-copyuploadbaddomain": "No se permite realizar cargas a partir de este dominio.",
index 4e7d809..9ca8895 100644 (file)
        "apierror-changeauth-norequest": "Échec à la création de la requête de modification.",
        "apierror-chunk-too-small": "La taille minimale d’un segment est de $1 {{PLURAL:$1|octet|octets}} pour les segments hors le dernier.",
        "apierror-cidrtoobroad": "Les plages CIDR $1 plus large que /$2 ne sont pas acceptées.",
-       "apierror-compare-inputneeded": "Un titre, un ID de page ou un numéro de révision est nécessaire pour les paramètres <var>from</var> et <var>to</var>.",
        "apierror-contentserializationexception": "Échec de sérialisation du contenu : $1",
        "apierror-contenttoobig": "Le contenu que vous avez fourni dépasse la limite de taille d’un article, qui est de $1 {{PLURAL:$1|kilooctet|kilooctets}}.",
        "apierror-copyuploadbaddomain": "Les téléversements par URL ne sont pas autorisés pour ce domaine.",
index 86ea955..a73d127 100644 (file)
        "apierror-changeauth-norequest": "Erro ó crear a petición de modificación.",
        "apierror-chunk-too-small": "O tamaño mínimo dun segmento é de  $1 {{PLURAL:$1|byte|bytes}} para os segmentos non finais.",
        "apierror-cidrtoobroad": "Os rangos CIDR $1 maiores que /$2 non son aceptados.",
-       "apierror-compare-inputneeded": "É necesario un título, un ID de páxina ou un número de revisión para os parámetros <var>from</var> e <var>to</var>.",
        "apierror-contentserializationexception": "Erro de serialización do contidoː $1",
        "apierror-contenttoobig": "O contido que achegou excede o límite de tamaño dun artigo, que é de  {{PLURAL:$1|kilobyte|kilobytes}}.",
        "apierror-copyuploadbaddomain": "As subas por URL non están permitidas para este dominio.",
        "apierror-stashfailed-nosession": "Non hai sesión de suba por partes con esa clave.",
        "apierror-stashfilestorage": "Non se puido almacenar a suba na reservaː $1",
        "apierror-stashinvalidfile": "Ficheiro de reserva incorrecto.",
+       "apierror-stashnosuchfilekey": "A chave de ficheiro non existe: $1.",
        "apierror-stashpathinvalid": "Clave de ficheiro con formato incorrecto ou non válidaː $1.",
        "apierror-stashwrongowner": "Erro de propietarioː $1",
        "apierror-stashzerolength": "Ficheiro de lonxitude cero, non pode ser almacenado na reservaː $1.",
index cd6dd32..5ae31c1 100644 (file)
        "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-resetpassword-description": "Jelszó-visszaállító e-mail küldése a felhasználónak.",
+       "apihelp-resetpassword-description-noroutes": "Nem érhetők el jelszó-visszaállítási módok.\n\nEngedélyezz néhány módot a <var>[[mw:Special:MyLanguage/Manual:$wgPasswordResetRoutes|$wgPasswordResetRoutes]]</var> PHP-változóval a modul használatához.",
+       "apihelp-resetpassword-param-user": "A visszaállítandó felhasználó.",
+       "apihelp-resetpassword-param-email": "A visszaállítandó felhasználó e-mail-címe.",
+       "apihelp-resetpassword-example-user": "Jelszó-visszaállító e-mail küldése <kbd>Example</kbd> felhasználónak.",
+       "apihelp-resetpassword-example-email": "Jelszó-visszaállító e-mail küldése az összes <kbd>user@example.com</kbd> e-mail-című felhasználónak.",
        "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 f938cea..b681e0c 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.",
index adea9ab..e53ece6 100644 (file)
        "apihelp-compare-param-fromtitle": "{{doc-apihelp-param|compare|fromtitle}}",
        "apihelp-compare-param-fromid": "{{doc-apihelp-param|compare|fromid}}",
        "apihelp-compare-param-fromrev": "{{doc-apihelp-param|compare|fromrev}}",
+       "apihelp-compare-param-fromtext": "{{doc-apihelp-param|compare|fromtext}}",
+       "apihelp-compare-param-frompst": "{{doc-apihelp-param|compare|frompst}}",
+       "apihelp-compare-param-fromcontentmodel": "{{doc-apihelp-param|compare|fromcontentmodel}}",
+       "apihelp-compare-param-fromcontentformat": "{{doc-apihelp-param|compare|fromcontentformat}}",
        "apihelp-compare-param-totitle": "{{doc-apihelp-param|compare|totitle}}",
        "apihelp-compare-param-toid": "{{doc-apihelp-param|compare|toid}}",
        "apihelp-compare-param-torev": "{{doc-apihelp-param|compare|torev}}",
+       "apihelp-compare-param-torelative": "{{doc-apihelp-param|compare|torelative}}",
+       "apihelp-compare-param-totext": "{{doc-apihelp-param|compare|totext}}",
+       "apihelp-compare-param-topst": "{{doc-apihelp-param|compare|topst}}",
+       "apihelp-compare-param-tocontentmodel": "{{doc-apihelp-param|compare|tocontentmodel}}",
+       "apihelp-compare-param-tocontentformat": "{{doc-apihelp-param|compare|tocontentformat}}",
+       "apihelp-compare-param-prop": "{{doc-apihelp-param|compare|prop}}",
+       "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-rel": "{{doc-apihelp-paramvalue|compare|prop|rel}}",
+       "apihelp-compare-paramvalue-prop-ids": "{{doc-apihelp-paramvalue|compare|prop|ids}}",
+       "apihelp-compare-paramvalue-prop-title": "{{doc-apihelp-paramvalue|compare|prop|title}}",
+       "apihelp-compare-paramvalue-prop-user": "{{doc-apihelp-paramvalue|compare|prop|user}}",
+       "apihelp-compare-paramvalue-prop-comment": "{{doc-apihelp-paramvalue|compare|prop|comment}}",
+       "apihelp-compare-paramvalue-prop-parsedcomment": "{{doc-apihelp-paramvalue|compare|prop|parsedcomment}}",
+       "apihelp-compare-paramvalue-prop-size": "{{doc-apihelp-paramvalue|compare|prop|size}}",
        "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 9de5aa0..74ea993 100644 (file)
        "apierror-changeauth-norequest": "Попытка создать запрос правки провалилась.",
        "apierror-chunk-too-small": "Минимальный размер кусочка — $1 {{PLURAL:$1|байт|байта|байтов}}, если кусочек не является последним.",
        "apierror-cidrtoobroad": "Диапазоны $1 CIDR, шире /$2, не разрешены.",
-       "apierror-compare-inputneeded": "Название, идентификатор страницы или номер версии требуется и для параметра <var>from</var>, и для параметра <var>to</var>.",
        "apierror-contentserializationexception": "Сериализация содержимого провалилась: $1",
        "apierror-contenttoobig": "Предоставленное вами содержимое превышает максимальный размер страницы в $1 {{PLURAL:$1|килобайт|килобайта|килобайтов}}.",
        "apierror-copyuploadbaddomain": "Загрузка по ссылке недоступна с этого домена.",
index 6ed903c..279e26a 100644 (file)
@@ -98,7 +98,7 @@
        "config-diff3-bad": "GNU diff3 no se encuentra.",
        "config-git": "Se encontró el software de control de versiones Git: <code>$1</code>.",
        "config-git-bad": "No se encontró el software de control de versiones Git.",
-       "config-imagemagick": "ImageMagick encontrado: <code>$1</code>.\nLa miniaturización de imágenes se habilitará si habilitas las cargas.",
+       "config-imagemagick": "ImageMagick encontrado: <code>$1</code>.\nLa miniaturización de imágenes se habilitará si habilitas la subida de archivos.",
        "config-gd": "Se ha encontrado una biblioteca de gráficos GD integrada.\nLa miniaturización de imágenes se habilitará si habilitas las subidas.",
        "config-no-scaling": "No se ha encontrado la biblioteca GD o ImageMagik.\nSe desactivará la miniaturización de imágenes.",
        "config-no-uri": "<strong>Error:</strong> no se pudo determinar el URI actual.\nSe interrumpió la instalación.",
index 722f051..7829324 100644 (file)
        "botpasswords-help-grants": "كل منحة تعطي وصولا لصلاحيات المستخدم المعروضة التي يمتلكها حساب المستخدم بالفعل. انظر [[Special:ListGrants|جدول المنح]] للمزيد من المعلومات.",
        "botpasswords-label-grants-column": "الممنوح",
        "botpasswords-bad-appid": "اسم البوت \"$1\" غير صحيح.",
-       "botpasswords-insert-failed": "Ù\81Ø´Ù\84 Ù\81Ù\8a Ø§Ø¶Ø§Ù\81Ø©  Ø§Ø³Ù\85 Ø§Ù\84بÙ\88ت \"$1\".Ù\87Ù\84 Ø§ضيف بالفعل؟",
+       "botpasswords-insert-failed": "Ù\81Ø´Ù\84 Ù\81Ù\8a Ø¥Ø¶Ø§Ù\81Ø©  Ø§Ø³Ù\85 Ø§Ù\84بÙ\88ت \"$1\".Ù\87Ù\84 Ø£ضيف بالفعل؟",
        "botpasswords-update-failed": "فشل في تحديث اسم بوت \"$1\". هل تم حذفه؟",
        "botpasswords-created-title": "تم إنشاء كلمة سر بوت",
        "botpasswords-created-body": "تم إنشاء كلمة سر بوت \"$1\" للمستخدم \"$2\".",
        "apisandbox-helpurls": "وصلات المساعدة",
        "apisandbox-examples": "أمثلة",
        "apisandbox-dynamic-parameters": "معاملات إضافية",
-       "apisandbox-dynamic-parameters-add-label": "اضاÙ\81Ø© Ø£Ù\84Ù\8aات:",
+       "apisandbox-dynamic-parameters-add-label": "أضÙ\81 Ù\85Ù\8fعاÙ\85Ù\84ا:",
        "apisandbox-dynamic-parameters-add-placeholder": "اسم المعامل",
        "apisandbox-dynamic-error-exists": "يوجد بالفعل معامل باسم \"$1\".",
        "apisandbox-deprecated-parameters": "معاملات مهملة",
        "export-download": "احفظ كملف",
        "export-templates": "ضمن القوالب",
        "export-pagelinks": "ضمن الصفحات الموصولة إلى عمق:",
-       "export-manual": "اضافة صفحات يدويا:",
+       "export-manual": "Ø¥ضافة صفحات يدويا:",
        "allmessages": "رسائل النظام",
        "allmessagesname": "الاسم",
        "allmessagesdefault": "النص الافتراضي",
index b52f1b7..77d31be 100644 (file)
        "historysize": "({{PLURAL:$1|1 байт|$1 байта}})",
        "historyempty": "(празна)",
        "history-feed-title": "Редакционна история",
-       "history-feed-description": "Редакционна история на страницата в {{SITENAME}}",
+       "history-feed-description": "Редакционна история на страницата в уикито",
        "history-feed-item-nocomment": "$1 в $2",
        "history-feed-empty": "Исканата страница не съществува.\nМоже да е била изтрита или преименувана.\nОпитайте да [[Special:Search|потърсите]] нови страници, които биха могли да са ви полезни.",
        "history-edit-tags": "Редактиране етикетите на избраните редакции",
        "rev-suppressed-unhide-diff": "Една от версиите, съставляващи тази разликова препратка, е била <strong>прикрита</strong>.\nДопълнителна информация може да се съдържа в [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} Дневника на прикриванията].\nМожете да [$1 прегледате тази разликова препратка], ако желаете да продължите.",
        "rev-deleted-diff-view": "Една от версиите на тази разлика е <strong>изтрита</strong>.\nМожете да видите тази разлика; възможно е да има повече информация в [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} дневника на изтриванията].",
        "rev-suppressed-diff-view": "Една от редакциите от тази разлика между версиите е <strong>прикрита</strong>.\nКато администратор, можете да видите тази разлика; повече подробности има в [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} дневника за прикриванията].",
-       "rev-delundel": "показване/скриване",
+       "rev-delundel": "промяна на видимостта",
        "rev-showdeleted": "показване",
        "revisiondelete": "Изтриване/възстановяване на версии",
        "revdelete-nooldid-title": "Не е зададена версия",
        "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": "СÑ\8aÑ\85Ñ\80анÑ\8fване Ð½Ð° Ñ\84илÑ\82Ñ\80иÑ\82е ÐºÐ°Ñ\82о Ð±Ñ\8aÑ\80за Ð²Ñ\80Ñ\8aзка",
+       "rcfilters-savedqueries-add-new-title": "СÑ\8aÑ\85Ñ\80анÑ\8fване Ð½Ð° Ñ\82екÑ\83Ñ\89иÑ\82е Ð½Ð°Ñ\81Ñ\82Ñ\80ойки Ð½Ð° Ñ\84илÑ\82Ñ\80иÑ\82е",
        "rcfilters-restore-default-filters": "Възстановяване на филтрите по подразбиране",
        "rcfilters-clear-all-filters": "Изчистване на всички филтри",
        "rcfilters-search-placeholder": "Филтриране на последните промени (изберете или започнете да въвеждате)",
        "booksources-search": "Търсене",
        "booksources-text": "По-долу е списъкът от връзки към други сайтове, продаващи нови и използвани книги или имащи повече информация за книгите, които търсите:",
        "booksources-invalid-isbn": "Предоставеният ISBN изглежда е невалиден; проверете за грешки и копирайте от оригиналния източник.",
+       "magiclink-tracking-pmid": "Страници, използващи вълшебни препратки PMID",
+       "magiclink-tracking-pmid-desc": "Тази страница използва вълшебни препратки PMID. Вижте [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links mediawiki.org] как да ги пренесете.",
+       "magiclink-tracking-isbn": "Страници, използващи вълшебни препратки ISBN",
+       "magiclink-tracking-isbn-desc": "Тази страница използва вълшебни препратки ISBN. Вижте [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links mediawiki.org] как да ги пренесете.",
        "specialloguserlabel": "Изпълнител:",
        "speciallogtitlelabel": "Цел (заглавие или {{ns:user}}:потребителско име за потребител):",
        "log": "Дневници",
        "changecontentmodel-submit": "Променяне",
        "changecontentmodel-success-title": "Моделът на съдържание бе променен",
        "changecontentmodel-success-text": "Типът на съдържанието на [[:$1]] е успешно променен.",
-       "log-name-contentmodel": "Дневник на cъдържанието промяна модела",
+       "log-name-contentmodel": "Дневник на промените на модела на съдържанието",
        "log-description-contentmodel": "Страницата показва промените в модела на съдържанието на страниците и страниците, създадени с модел на съдържанието различен от този по подразбиране.",
        "logentry-contentmodel-change-revertlink": "връщане",
        "logentry-contentmodel-change-revert": "връщане",
index 13d893f..4a32779 100644 (file)
        "rcfilters-filter-major-description": "যেসব সম্পাদনাকে অনুল্লেখ্য হিসেবে চিহ্নিত করা হয়নি।",
        "rcfilters-filtergroup-watchlist": "নজরতালিকার পাতা",
        "rcfilters-filter-watchlist-watched-label": "নজরতালিকায়",
+       "rcfilters-filter-watchlist-watchednew-label": "নজরতালিকার নতুন পরিবর্তন",
+       "rcfilters-filter-watchlist-notwatched-label": "নজরতালিকাভুক্ত নয়",
        "rcfilters-filtergroup-changetype": "পরিবর্তনের ধরন",
        "rcfilters-filter-pageedits-label": "পাতার সম্পাদনা",
        "rcfilters-filter-pageedits-description": "উইকি বিষয়বস্তু, আলোচনা, বিষয়শ্রেণীর বিবরণ... ইত্যাদিতে সম্পাদনা",
index cd4618a..068904c 100644 (file)
        "userinvalidcssjstitle": "'''Atenció:''' No existeix l'aparença «$1». Recordeu que les subpàgines personalitzades amb extensions .css i .js utilitzen el títol en minúscules, per exemple, {{ns:user}}:NOM/vector.css no és el mateix que {{ns:user}}:NOM/Vector.css.",
        "updated": "(Actualitzat)",
        "note": "'''Nota:'''",
-       "previewnote": "'''Recorda que això és només una previsualització.'''\nEls vostres canvis encara no s'han desat!",
-       "continue-editing": "Aneu a l'àrea d'edició",
+       "previewnote": "<strong>Recorda que això és només una previsualització.</strong>\nEls vostres canvis encara no s’han desat!",
+       "continue-editing": "Aneu a l’àrea d’edició",
        "previewconflict": "Aquesta previsualització reflecteix, a l'àrea\nd'edició superior, el text tal com apareixerà si trieu desar-lo.",
        "session_fail_preview": "Disculpes! No s'ha pogut processar la vostra modificació a causa d'una pèrdua de dades de la sessió.\n\nPot ser que s'hagi tancat la sessió. <strong>Comproveu si teniu la sessió iniciada i proveu-ho una altra vegada</strong>.\nSi continués sense funcionar, proveu de [[Special:UserLogout|finalitzar la sessió]] i torneu a iniciar-ne una. Comproveu que el vostre navegador permeti les galetes d'aquest lloc.",
        "session_fail_preview_html": "Ho sentim, no s'han pogut processar les vostres modificacions a causa d'una pèrdua de dades de la sessió.\n\n<em>Com que el projecte {{SITENAME}} té habilitat l'ús de codi HTML cru, s'ha amagat la previsualització com a prevenció contra atacs mitjançant codis JavaScript.</em>\n\n<strong>Si es tracta d'una contribució legítima, si us plau, intenteu-ho una altra vegada.</strong> Si continua havent-hi problemes, [[Special:UserLogout|finalitzeu la sessió]] i torneu a iniciar-ne una. Comproveu que el vostre navegador permeti galetes d'aquest lloc.",
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Mostra",
        "rcfilters-activefilters": "Filtres actius",
+       "rcfilters-quickfilters-placeholder-title": "Encara no s’ha desat cap enllaç",
        "rcfilters-savedqueries-rename": "Reanomena",
        "rcfilters-savedqueries-new-name-label": "Nom",
        "rcfilters-savedqueries-apply-label": "Desa els paràmetres",
index fe7026c..b8cd52e 100644 (file)
        "editlink": "editar",
        "viewsourcelink": "ver código",
        "editsectionhint": "Editar sección: $1",
-       "toc": "Contenido",
+       "toc": "Sumario",
        "showtoc": "mostrar",
        "hidetoc": "ocultar",
        "collapsible-collapse": "Contraer",
index 55c6f27..ce8da68 100644 (file)
        "rcfilters-savedqueries-unsetdefault": "Desmarcar como predeterminado",
        "rcfilters-savedqueries-remove": "Eliminar",
        "rcfilters-savedqueries-new-name-label": "Nombre",
-       "rcfilters-savedqueries-apply-label": "Guardar ajustes",
+       "rcfilters-savedqueries-apply-label": "Guardar la configuración",
        "rcfilters-savedqueries-cancel-label": "Cancelar",
        "rcfilters-savedqueries-add-new-title": "Guardar ajustes de filtro actuales",
        "rcfilters-restore-default-filters": "Restaurar filtros predeterminados",
index 182b67f..f6eacfa 100644 (file)
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Mostrar",
        "rcfilters-activefilters": "Filtros activos",
-       "rcfilters-quickfilters": "Ligazóns rápidas",
+       "rcfilters-quickfilters": "Configuración de filtros gardados",
        "rcfilters-quickfilters-placeholder-title": "Aínda non se gardou ningunha ligazón",
+       "rcfilters-quickfilters-placeholder-description": "Para gardar a configuración dos seus filtros e reutilizala máis tarde, prema na icona do marcador na área de Filtro activo que se atopa a abaixo.",
        "rcfilters-savedqueries-defaultlabel": "Filtros gardados",
        "rcfilters-savedqueries-rename": "Renomear",
        "rcfilters-savedqueries-setdefault": "Activar por defecto",
        "rcfilters-savedqueries-unsetdefault": "Eliminar por defecto",
        "rcfilters-savedqueries-remove": "Eliminar",
        "rcfilters-savedqueries-new-name-label": "Nome",
-       "rcfilters-savedqueries-apply-label": "Crear ligazón rápida",
+       "rcfilters-savedqueries-apply-label": "Gardar configuracións",
        "rcfilters-savedqueries-cancel-label": "Cancelar",
-       "rcfilters-savedqueries-add-new-title": "Gardar filtros como ligazón rápida",
+       "rcfilters-savedqueries-add-new-title": "Gardar a configuración do filtro actual",
        "rcfilters-restore-default-filters": "Restaurar os filtros por defecto",
        "rcfilters-clear-all-filters": "Borrar todos os filtros",
        "rcfilters-search-placeholder": "Filtrar os cambios recentes (ollar ou comezar a escribir)",
        "rcfilters-filter-categorization-label": "Cambios de categoría",
        "rcfilters-filter-categorization-description": "Rexistros de páxinas engadidas ou borradas de categorías.",
        "rcfilters-filter-logactions-label": "Accións rexistradas",
-       "rcfilters-filter-logactions-description": "Accións administrativas, creacións de conta, borrados de páxinas, subas de ficheiros....",
+       "rcfilters-filter-logactions-description": "Accións administrativas, creacións de conta, borrados de páxinas, subas de ficheiros...",
        "rcfilters-hideminor-conflicts-typeofchange-global": "O filtro \"edicións menores\" está en conflito con un ou máis filtros Tipo de modificación, porque certos tipos de modificación non poden designarse como \"menores\". Os filtros en conflito están marcados na zona Filtros activos, arriba.",
        "rcfilters-hideminor-conflicts-typeofchange": "Certos tipos de modificación non poden designarse como \"menores\", polo que este filtro entra en conflito cos seguintes filtros Tipo de modificaciónː $1",
        "rcfilters-typeofchange-conflicts-hideminor": "Este filtro Tipo de modificación entra en conflito co filtro \"Modificacións menores\". Certos tipos de modificación non poden designarse como \"menores\".",
index 7a3cb9b..a09b054 100644 (file)
@@ -71,7 +71,7 @@
        "tog-watchlisthidebots": "Sakrij uređivanja botova s popisa praćenja",
        "tog-watchlisthideminor": "Sakrij manje promjene s popisa praćenja",
        "tog-watchlisthideliu": "Sakrij uređivanja prijavljenih s popisa praćenja",
-       "tog-watchlistreloadautomatically": "Ponovno učitaj popis praćenja kad god dođe do promjene filtra (potreban JavaScript)",
+       "tog-watchlistreloadautomatically": "Ponovo učitaj popis praćenja kad god dođe do promjene filtra (potreban JavaScript)",
        "tog-watchlisthideanons": "Sakrij uređivanja neprijavljenih s popisa praćenja",
        "tog-watchlisthidepatrolled": "Sakrij pregledane izmjene u popisu praćenja",
        "tog-watchlisthidecategorization": "Sakrij kategorizaciju stranica",
        "prefswarning-warning": "Napravili ste promjene u Vašim postavkama koje još nisu snimljene.\nAko napustite ovu stranicu bez pritiska na \"$1\", postavke neće biti ažurirane.",
        "prefs-tabs-navigation-hint": "Savjet: možete rabiti tipke sa strjelicama lijevo i desno za prebacivanje između kartica na popisu kartica.",
        "userrights": "Upravljanje pravima",
-       "userrights-lookup-user": "Izaberi suradnika",
+       "userrights-lookup-user": "Izaberi suradnika ili suradnicu",
        "userrights-user-editname": "Unesite suradničko ime:",
        "editusergroup": "Učitaj suradničke skupine",
        "editinguser": "Promjena suradničkih prava {{GENDER:$1|suradnika|suradnice}} <strong>[[User:$1|$1]]</strong> $2",
        "viewinguserrights": "Pregled suradničkih prava {{GENDER:$1|suradnika|suradnice}} <strong>[[User:$1|$1]]</strong> $2",
        "userrights-editusergroup": "Uređivanje {{GENDER:$1|suradnikove|suradničine}} pripadnosti skupinama",
        "userrights-viewusergroup": "Vidi {{GENDER:$1|suradničke}} skupine",
-       "saveusergroups": "Spremi {{GENDER:$1|suradničke}} grupe",
+       "saveusergroups": "Spremi {{GENDER:$1|suradnikove|suradničine|suradničke}} skupine",
        "userrights-groupsmember": "{{GENDER:$2|Pripadnik|Pripadnica}} {{PLURAL:$1|skupine|skupinama|skupina}}:",
        "userrights-groupsmember-auto": "{{GENDER:$2|Pripadnik|Pripadnica}} {{PLURAL:$1|obuhvaćene skupine|obuhvaćenih skupina}}:",
        "userrights-groups-help": "Možete promijeniti skupine za {{GENDER:$1|ovoga suradnika|ovu suradnicu}}:\n* označena kućica pokazuje skupinu kojoj {{GENDER:$1|suradnik|suradnica}} pripada;\n* neoznačena kućica pokazuje skupinu kojoj {{GENDER:$1|suradnik|suradnica}} ne pripada;\n* zvjezdica (*) označava skupinu koju ne možete ukloniti kad ju jednom dodate, ili obratno.\n* povisilica (#) označava da rok valjanosti pripadanja skupini možete samo skratiti, a ne i produljiti",
        "logeventslist-submit": "Prikaži",
        "all-logs-page": "Sve javne evidencije",
        "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.",
+       "logempty": "Nema pronađenih stavki u evidenciji.",
        "log-title-wildcard": "Traži stranice koje počinju s navedenim izrazom",
        "showhideselectedlogentries": "Otkrij/sakrij odabrane evidencije",
        "checkbox-select": "Odaberite: $1",
index b891bfb..a764e8b 100644 (file)
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Mostra",
        "rcfilters-activefilters": "Filtri attivi",
-       "rcfilters-quickfilters": "Collegamenti rapidi",
+       "rcfilters-quickfilters": "Salva le impostazioni del filtro",
        "rcfilters-quickfilters-placeholder-title": "Nessun collegamento salvato ancora",
        "rcfilters-savedqueries-defaultlabel": "Filtri salvati",
        "rcfilters-savedqueries-rename": "Rinomina",
        "rcfilters-savedqueries-unsetdefault": "Rimuovi come predefinito",
        "rcfilters-savedqueries-remove": "Rimuovi",
        "rcfilters-savedqueries-new-name-label": "Nome",
-       "rcfilters-savedqueries-apply-label": "Crea collegamento rapido",
+       "rcfilters-savedqueries-apply-label": "Salva impostazioni",
        "rcfilters-savedqueries-cancel-label": "Annulla",
-       "rcfilters-savedqueries-add-new-title": "Salva filtri come un collegamento rapido",
+       "rcfilters-savedqueries-add-new-title": "Salva le impostazioni attuali del filtro",
        "rcfilters-restore-default-filters": "Ripristina i filtri predefiniti",
        "rcfilters-clear-all-filters": "Pulisci tutti i filtri",
        "rcfilters-search-placeholder": "Filtra le ultime modifiche (naviga o inizia a digitare)",
        "rcfilters-filter-watchlist-watched-label": "Negli osservati speciali",
        "rcfilters-filtergroup-changetype": "Tipo di modifica",
        "rcfilters-filter-pageedits-label": "Modifiche alle pagine",
+       "rcfilters-filter-pageedits-description": "Modifiche al contenuto wiki, discussioni, descrizioni categoria…",
        "rcfilters-filter-newpages-label": "Creazioni pagine",
-       "rcfilters-filter-logactions-description": "Azioni amministrative, creazione utenze, cancellazioni pagine, caricamenti....",
+       "rcfilters-filter-logactions-description": "Azioni amministrative, creazione utenze, cancellazioni pagine, caricamenti",
        "rcfilters-filtergroup-lastRevision": "Ultima versione",
        "rcfilters-filter-lastrevision-label": "Ultima versione",
        "rcfilters-filter-lastrevision-description": "Le ultime modifiche ad una pagina.",
index 7424fee..6629290 100644 (file)
        "undelete-bad-store-key": "Ora bisa mbatalaké pambusakan révisi berkas mawa tandha wektu $1: berkas ilang sadurungé dibusak.",
        "undelete-cleanup-error": "Ana kaluputan nalika mbusak arsip berkas \"$1\" sing ora dienggo.",
        "undelete-missing-filearchive": "Ora bisa mulihaké arsip barkas ID $1 amarga ora ana ing basis data.\nBarkas iku bokmenawa wis dibusak.",
-       "undelete-error": "Kasalahan mbalèkaké kaca",
+       "undelete-error": "Masalah mulihaké kaca",
        "undelete-error-short": "Kaluputan olèhé mbatalaké pambusakan: $1",
        "undelete-error-long": "Ana kaluputan nalika mbatalaké pambusakan berkas:\n\n$1",
        "undelete-show-file-confirm": "Apa panjenengan yakin arep mirsani révisi berkas \"<nowiki>$1</nowiki>\" sing wis kabusak ing $2 jam $3?",
        "thumbnail-more": "Gedhèkaké",
        "filemissing": "Barkas ilang",
        "thumbnail_error": "Kaluputan nalika nggawé gambar cilik (''thumbnail''): $1",
-       "thumbnail_error_remote": "Peringatan kasalahan saka $1:\n$2",
+       "thumbnail_error_remote": "Layang masalah saka $1:\n$2",
        "djvu_page_error": "Kaca DjVu ana ing sajabaning ranggèhan (''range'')",
        "djvu_no_xml": "Ora bisa njupuk XML kanggo berkas DjVu",
        "thumbnail-temp-create": "Ora bisa nggawé berkas gambar mini sawetara",
        "feedback-close": "Rampung",
        "feedback-external-bug-report-button": "Kirim ayahan tèhnis",
        "feedback-dialog-title": "Awèh saran",
-       "feedback-error1": "Kasalahan: Asil ora dikenal saka API",
+       "feedback-error1": "Masalah: Kasil ora dingertèni saka API",
        "feedback-error2": "Masalah: Besutané wurung",
        "feedback-error3": "Kasalahan: Ora ana tanggepan saka API",
        "feedback-message": "Layang:",
        "feedback-useragent": "Agèn panganggo:",
        "searchsuggest-search": "Golèk ing {{SITENAME}}",
        "searchsuggest-containing": "ngemu...",
-       "api-error-badtoken": "Kasalahan njero: Token èlèk.",
+       "api-error-badtoken": "Masalah njero: Token ala.",
        "api-error-emptypage": "Nggawé kaca kosong anyar ora dilikaké.",
-       "api-error-publishfailed": "Kasalahan njero: Sasana gagal nyèlèhaké berkas sawetara.",
-       "api-error-stashfailed": "Kasalahan njero: Sasana gagal nyèlèhaké berkas sawetara.",
+       "api-error-publishfailed": "Masalah njero: Paladèn wurung mbabar barkas sawetara.",
+       "api-error-stashfailed": "Masalah njero: Paladèn wurung ndèkèk barkas sawetara.",
        "api-error-unknown-warning": "Pélik ora dingertèni: \"$1\".",
-       "api-error-unknownerror": "Kasalahan ora dingertèni: \"$1\".",
+       "api-error-unknownerror": "Masalah ora dingertèni: \"$1\".",
        "duration-seconds": "$1 {{PLURAL:$1|detik|detik}}",
        "duration-minutes": "$1 {{PLURAL:$1|menit|menit}}",
        "duration-hours": "$1 {{PLURAL:$1|jam|jam}}",
index cf870b4..6e1fd5a 100644 (file)
        "deletedwhileediting": "'''Brīdinājums:''' Šī lapa tika izdzēsta, pēc tam, kad tu to sāki izmainīt!",
        "confirmrecreate": "Lietotājs [[User:$1|$1]] ([[User talk:$1|diskusija]]) izdzēsa šo lapu, pēc tam, kad tu to biji sācis rediģēt, ar iemeslu:\n: ''$2''\nLūdzu apstiprini, ka tiešām gribi izveidot šo lapu no jauna.",
        "recreate": "Izveidot no jauna",
+       "confirm-purge-title": "Atjaunināt šo lapu",
        "confirm_purge_button": "Labi",
        "confirm-purge-top": "Iztīrīt šīs lapas kešu (''cache'')?",
        "confirm-purge-bottom": "Lapas atjaunināšana iztīra kešatmiņu un liek parādīt lapas jaunāko versiju.",
index e33a4b7..d6ef868 100644 (file)
        "pageinfo-category-pages": "See also:\n* {{msg-mw|Pageinfo-category-subcats}}\n* {{msg-mw|Pageinfo-category-files}}\n{{Identical|Number of pages}}",
        "pageinfo-category-subcats": "See also:\n* {{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-files}}",
        "pageinfo-category-files": "See also:\n* {{msg-mw|Pageinfo-category-pages}}\n* {{msg-mw|Pageinfo-category-subcats}}",
-       "pageinfo-user-id": "The numeric ID for a user",
+       "pageinfo-user-id": "The numeric ID for a user\n{{Identical|User ID}}",
        "markaspatrolleddiff": "{{doc-actionlink}}\nSee also:\n* {{msg-mw|Markaspatrolledtext}}\n{{Identical|Mark as patrolled}}",
        "markaspatrolledlink": "{{notranslate}}\nParameters:\n* $1 - link which has text {{msg-mw|Markaspatrolledtext}}",
        "markaspatrolledtext": "{{doc-actionlink}}\nSee also:\n* {{msg-mw|Markaspatrolleddiff}}",
index 74834bc..322d0f1 100644 (file)
        "nstab-mediawiki": "Повідомлїня",
        "nstab-template": "Шаблона",
        "nstab-help": "Сторінка помочі",
-       "nstab-category": "Катеґорія",
+       "nstab-category": "Категорѣя",
        "mainpage-nstab": "Головна сторінка",
        "nosuchaction": "Такой дїї не має",
        "nosuchactiontext": "Дїя, уведжена в URL, неправилна.\nМогли сьте неправилно написати URL або перейти через некоректный одказ .\nМоже тыж значіти ґанч в проґрамовім забеспечіню {{GRAMMAR:genitive|{{SITENAME}}}}.",
index 1602827..210dbb8 100644 (file)
        "autoblocklist": "Аптамаатынан хааччах",
        "autoblocklist-submit": "Бул",
        "autoblocklist-legend": "Аптамаатынан хааччах испииһэгэ",
+       "autoblocklist-otherblocks": "Атын {{PLURAL:$1|хааччахтааһын|хааччахтааһыннар}}",
        "ipblocklist": "Хааччахтаммыт кыттааччылар",
        "ipblocklist-legend": "Хааччахтаммыт/бобуллубут кыттааччыны көрдөөһүн",
        "blocklist-userblocks": "Хааччахтаммыт кыттааччылары көрдөрүмэ",
        "proxyblockreason": "Эн IP-ҥ аһаҕас прокси эбит, онон бобулунна. Интернет-провайдергын эбэтэр техническэй сулууспаны кытта сибээстэһэн кутталлаах суол баарын биллэр.",
        "sorbsreason": "Эн IP-ҥ {{SITENAME}} саайт DNSBL-гар аһаҕас прокси быһыытынан сылдьар.",
        "sorbs_create_account_reason": "Эн IP-ҥ {{SITENAME}} саайт DNSBL-гар аһаҕас прокси быһыытынан сылдьар. Саҥаттан бэлиэтэнэр кыаҕыҥ суох.",
+       "softblockrangesreason": "Эн IP-аадырыскыттан ааккын эппэккэ эрэ суруйар көҥүллэммэт ($1). Бука диэн, киир.",
        "xffblockreason": "X-Forwarded-For баһыгар баар IP-аадырыс бобуллубут. Бу IP Эйиэнэ эбэтэр туһанар проксиҥ гиэнэ буолуон сөп. Бобуу төрүөтэ маннык эбит: $1",
        "cant-see-hidden-user": "Эн хааччахтаары гыммыт кыттааччыҥ урут хааччахтаммыт уонна кистэммит эбит. Кыттааччылары кистиир кыаҕыҥ суох буолан ол туһунан суругу көрөр да уларытар да быраабыҥ суох.",
        "ipbblocked": "Атын кыттааччылары хааччахтыыр да, хааччахтарын да устар кыаҕыҥ суох, тоҕо диэтэххэ бэйэҥ хааччахтааххын",
        "cant-move-to-user-page": "Эн кыттааччы аатын далыгар сирэйдэри уларытар кыаҕыҥ суох (анныкы сирэйдэриттэн ураты).",
        "cant-move-category-page": "Категория сирэйин аатын уларытар кыаҕыҥ суох эбит.",
        "cant-move-to-category-page": "Сирэй аатын уларытан категория сирэйэ гынар кыаҕыҥ суох эбит.",
+       "cant-move-subpages": "Хос сирэйдэр ааттарын уларытар кыаҕыҥ суох.",
        "namespace-nosubpages": "«$1» аат далыгар сирэй оҥорор табыллыбат эбит.",
        "newtitle": "Саҥа аата:",
        "move-watch": "Кэтээн көрөргө",
        "tooltip-pt-mycontris": "Суруйбут/уларыппыт {{GENDER:|сирэйдэриҥ}} тиһиликтэрэ",
        "tooltip-pt-anoncontribs": "Бу IP-аадырыстан оҥоһуллубут испииһэк көннөрүүлэрэ.",
        "tooltip-pt-login": "Манна бэйэҕин билиһиннэриэххин сөп (булгуччута суох).",
+       "tooltip-pt-login-private": "Бу биикини туттарга киириэхтээх эбиккин",
        "tooltip-pt-logout": "Тахсыы",
        "tooltip-pt-createaccount": "Манна киирэргэ бэлиэтэнэр уонна куруук ол аатынан киирэр ордук; ол булгуччута суох",
        "tooltip-ca-talk": "Ыстатыйаны ырытыы",
        "pagelang-select-lang": "Тылы талыы",
        "pagelang-reason": "Төрүөтэ",
        "pagelang-submit": "Ыытарга",
+       "pagelang-nonexistent-page": "Маннык $1 сирэй суох эбит.",
        "right-pagelang": "Сирэй тылын уларыт",
        "action-pagelang": "сирэй тылын уларытар буол",
        "log-name-pagelang": "Тылы уларытыы сурунаала",
        "authpage-cannot-link-continue": "Ситимниир кыах суох. Сиэссийэттэн тахсан хаалбыккын быһыылаах.",
        "cannotauth-not-allowed-title": "Киирэр көҥүллэммэт",
        "cannotauth-not-allowed": "Бу сирэйи туһанарыҥ сатаммат эбит",
+       "credentialsform-provider": "Учуоттуур дааннай көрүҥэ:",
        "credentialsform-account": "Бэлиэ-аат:",
        "cannotlink-no-provider-title": "Бэлиэ-ааттар суохтар",
        "cannotlink-no-provider": "Бэлиэ-ааттар суохтар.",
        "linkaccounts-success-text": "Бэлиэ-аат ситимнэннэ.",
        "linkaccounts-submit": "Ситимнииргэ",
        "unlinkaccounts": "Ситими быһарга",
-       "unlinkaccounts-success": "Бэлиэ-аат ситимэ быһынна."
+       "unlinkaccounts-success": "Бэлиэ-аат ситимэ быһынна.",
+       "authenticationdatachange-ignored": "Дьиҥин тургутар уларытыы таҥастаммата. Баҕар, биир да провайдер суруллубатаҕа буолаарай?",
+       "userjsispublic": "Болҕой: JavaScript сирэйигэр кистэлэҥ сибидиэнньэ суох буолуохтаах, тоҕо диэтэххэ ону атын кыттааччылар хааччаҕа суох көрөр кыахтаахтар.",
+       "usercssispublic": "Болҕой: CSS  сирэйигэр кистэлэҥ сибидиэнньэ суох буолуохтаах, тоҕо диэтэххэ ону атын кыттааччылар хааччаҕа суох көрөр кыахтаахтар.",
+       "restrictionsfield-badip": "IP эбэтэр IP-лар диапазоннара сатаммат: $1",
+       "restrictionsfield-label": "Көҥүллэммит IP диапазона:"
 }
index bb3100b..2b0a4b7 100644 (file)
@@ -75,7 +75,8 @@
                        "Larske",
                        "Rockyfelle",
                        "Johan",
-                       "Martin Wiss"
+                       "Martin Wiss",
+                       "Mdjarv"
                ]
        },
        "tog-underline": "Stryk under länkar:",
        "recentchanges-legend-plusminus": "(''±123'')",
        "recentchanges-submit": "Visa",
        "rcfilters-activefilters": "Aktiva filter",
-       "rcfilters-quickfilters": "Snabblänkar",
+       "rcfilters-quickfilters": "Sparade filterinställningar",
        "rcfilters-quickfilters-placeholder-title": "Inga länkar har sparats ännu",
        "rcfilters-quickfilters-placeholder-description": "För att spara dina filterinställningar och återanvända dem senare, klicka på bokmärkesikonen under \"Aktiva filter\" nedan.",
        "rcfilters-savedqueries-defaultlabel": "Sparade filter",
        "rcfilters-savedqueries-unsetdefault": "Ta bort som standard",
        "rcfilters-savedqueries-remove": "Ta bort",
        "rcfilters-savedqueries-new-name-label": "Namn",
-       "rcfilters-savedqueries-apply-label": "Skapa snabblänk",
+       "rcfilters-savedqueries-apply-label": "Skapa inställningar",
        "rcfilters-savedqueries-cancel-label": "Avbryt",
-       "rcfilters-savedqueries-add-new-title": "Spara filter som en snabblänk",
+       "rcfilters-savedqueries-add-new-title": "Spara filterinställningar",
        "rcfilters-restore-default-filters": "Återställ standardfilter",
        "rcfilters-clear-all-filters": "Rensa alla filter",
        "rcfilters-search-placeholder": "Filtrera senaste ändringar (bläddra eller börja skriva)",
index 6aa52c2..101771d 100644 (file)
        "pageinfo-category-pages": "จำนวนหน้า",
        "pageinfo-category-subcats": "จำนวนหมวดหมู่ย่อย",
        "pageinfo-category-files": "จำนวนไฟล์",
+       "pageinfo-user-id": "หมายเลขประจำตัวผู้ใช้",
        "markaspatrolleddiff": "ทำเครื่องหมายว่าตรวจสอบแล้ว",
        "markaspatrolledtext": "ทำเครื่องหมายว่าหน้านี้ถูกตรวจสอบแล้ว",
        "markaspatrolledtext-file": "ทำเครื่องหมายรุ่นไฟล์นี้ว่าตรวจสอบแล้ว",
index a38386a..8457f35 100644 (file)
        "botpasswords-disabled": "באט פאסווערטער זענען אומאקטיווירט.",
        "botpasswords-existing": "עקזיסטירנדע באט פאסווערטער",
        "botpasswords-createnew": "שאפֿן א ניי באט פאסווארט",
+       "botpasswords-editexisting": "רעדאקטירן אן עקזיסטירנדיק באט פאסווארט",
        "botpasswords-label-appid": "באט נאמען:",
        "botpasswords-label-create": "שאַפֿן",
        "botpasswords-label-update": "דערהײַנטיקן",
        "post-expand-template-argument-warning": "'''ווארענונג''': די בלאט אנטהאלט צו ווייניגסטענס איין טאמפלעיט פארעמיטער וואס איז צו גרויס. די דאזיגע פארעמיטערס זענען אויסגעלאזט געווארן.",
        "post-expand-template-argument-category": "בלעטער וואס זענען פון דעם ארויסגעלאזט געווארן טאמפלעיט פאראמעטערס",
        "parser-template-loop-warning": "מוסטער שלייף געטראפן: [[$1]]",
+       "template-loop-category": "בלעטער מיט מוסטער־שלייפֿן",
        "parser-template-recursion-depth-warning": "מוסטער רעקורסיע טיף מאקסימום איבערגעשטיגן ($1)",
        "language-converter-depth-warning": "אַריבער דעם שפּראַך קאַנווערטער טיף לימיט ($1)",
        "node-count-exceeded-category": "בלעטער וואו קנופצאל איז צו פיל",
        "rcfilters-filterlist-whatsthis": "וואס איז דאס?",
        "rcfilters-filterlist-noresults": "קיין פֿילטערס נישט געטראפֿן",
        "rcfilters-filter-bots-label": "באט",
+       "rcfilters-filter-newpages-label": "בלאַט־שאַפֿונגען",
        "rcnotefrom": "פֿאלגנד {{PLURAL:$5|איז די ענדערונג| זענען די ענדערונגען}} זײַט <strong>$3, $4</strong> (ביז <strong>$1</strong>).",
        "rclistfrom": "װײַזן נײַע ענדערונגען פֿון $3 $2",
        "rcshowhideminor": "$1 מינערדיגע ענדערונגען",
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;
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
+               ];
+       }
+}