Merge "RCFilters: Create one single source of truth for item display"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Dec 2017 11:50:15 +0000 (11:50 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Dec 2017 11:50:15 +0000 (11:50 +0000)
103 files changed:
RELEASE-NOTES-1.31
includes/DefaultSettings.php
includes/HistoryBlob.php
includes/Message.php
includes/Revision.php
includes/Storage/SqlBlobStore.php
includes/api/ApiBlock.php
includes/api/i18n/gl.json
includes/api/i18n/nb.json
includes/api/i18n/pt.json
includes/api/i18n/ru.json
includes/cache/localisation/LCStoreStaticArray.php
includes/changetags/ChangeTags.php
includes/clientpool/SquidPurgeClient.php
includes/import/WikiImporter.php
includes/installer/i18n/eu.json
includes/libs/MWMessagePack.php
includes/libs/mime/XmlTypeCheck.php
includes/libs/objectcache/WANObjectCache.php
includes/libs/rdbms/database/Database.php
includes/media/Bitmap.php
includes/media/XCF.php
includes/page/PageArchive.php
includes/page/WikiPage.php
includes/parser/BlockLevelPass.php
includes/parser/Parser.php
includes/parser/Preprocessor_Hash.php
includes/search/SearchEngine.php
includes/search/SearchMySQL.php
includes/shell/Command.php
includes/shell/FirejailCommand.php
includes/shell/Shell.php
includes/skins/BaseTemplate.php
includes/specialpage/ChangesListSpecialPage.php
includes/specials/SpecialRecentchangeslinked.php
includes/tidy/Balancer.php
includes/utils/AutoloadGenerator.php
includes/utils/AvroValidator.php
languages/Language.php
languages/classes/LanguageGa.php
languages/classes/LanguageLa.php
languages/i18n/ast.json
languages/i18n/be-tarask.json
languages/i18n/bg.json
languages/i18n/ce.json
languages/i18n/csb.json
languages/i18n/de.json
languages/i18n/diq.json
languages/i18n/en.json
languages/i18n/eo.json
languages/i18n/es.json
languages/i18n/et.json
languages/i18n/eu.json
languages/i18n/fi.json
languages/i18n/fr.json
languages/i18n/gl.json
languages/i18n/he.json
languages/i18n/hi.json
languages/i18n/hr.json
languages/i18n/ia.json
languages/i18n/it.json
languages/i18n/ja.json
languages/i18n/ko.json
languages/i18n/lt.json
languages/i18n/lv.json
languages/i18n/my.json
languages/i18n/nn.json
languages/i18n/pl.json
languages/i18n/pt-br.json
languages/i18n/pt.json
languages/i18n/qqq.json
languages/i18n/ru.json
languages/i18n/sd.json
languages/i18n/sl.json
languages/i18n/uk.json
languages/i18n/ur.json
languages/i18n/zh-hans.json
maintenance/dumpIterator.php
maintenance/importDump.php
maintenance/oracle/archives/patch-auto_increment_triggers.sql
maintenance/oracle/archives/patch-externallinks-el_index_60.sql
maintenance/oracle/tables.sql
maintenance/oracle/user.sql
maintenance/renderDump.php
maintenance/storage/checkStorage.php
resources/src/jquery/jquery.tablesorter.less
resources/src/mediawiki.language/specialcharacters.json
resources/src/mediawiki.rcfilters/dm/mw.rcfilters.dm.FiltersViewModel.js
resources/src/mediawiki.rcfilters/mw.rcfilters.init.js
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.MainWrapperWidget.js
resources/src/mediawiki.skinning/elements.css
resources/src/mediawiki/mediawiki.debug.less
resources/src/mediawiki/mediawiki.editfont.css
resources/src/mediawiki/mediawiki.feedback.js
tests/parser/ParserTestRunner.php
tests/parser/TestFileEditor.php
tests/phpunit/includes/MediaWikiServicesTest.php
tests/phpunit/includes/PageArchiveTest.php
tests/phpunit/includes/RevisionTest.php
tests/phpunit/includes/Storage/RevisionRecordTest.php [deleted file]
tests/phpunit/includes/db/LoadBalancerTest.php
tests/phpunit/includes/shell/FirejailCommandTest.php
tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js

index 67026f4..7f67feb 100644 (file)
@@ -71,6 +71,10 @@ changes to languages because of Phabricator reports.
 * (T180052) Mirandese (mwl) now supports gendered NS_USER/NS_USER_TALK namespaces.
 
 === Other changes in 1.31 ===
+* Introducing multi-content-revision capability into the storage layer. For details,
+  see <https://www.mediawiki.org/wiki/Requests_for_comment/Multi-Content_Revisions>.
+* The Revision class was deprecated in favor of RevisionStore, BlobStore, and
+  RevisionRecord and its subclasses.
 * MessageBlobStore::insertMessageBlob() (deprecated in 1.27) was removed.
 * The global function wfBCP47 was renamed to LanguageCode::bcp47.
 * The global function wfBCP47 is now deprecated.
index e50b7a7..b707174 100644 (file)
@@ -3763,7 +3763,7 @@ $wgResourceLoaderValidateStaticJS = false;
  * @code
  *   $wgResourceLoaderLESSVars = [
  *     'exampleFontSize'  => '1em',
- *     'exampleBlue' => '#eee',
+ *     'exampleBlue' => '#36c',
  *   ];
  * @endcode
  * @since 1.22
@@ -6953,6 +6953,7 @@ $wgUseTagFilter = true;
  * - 'mw-blank': Edit completely blanks the page
  * - 'mw-replace': Edit removes more than 90% of the content
  * - 'mw-rollback': Edit is a rollback, made through the rollback link or rollback API
+ * - 'mw-undo': Edit made through an undo link
  *
  * @var array
  * @since 1.31
@@ -6964,7 +6965,8 @@ $wgSoftwareTags = [
        'mw-changed-redirect-target' => true,
        'mw-blank' => true,
        'mw-replace' => true,
-       'mw-rollback' => true
+       'mw-rollback' => true,
+       'mw-undo' => true,
 ];
 
 /**
index 14d22ec..5193168 100644 (file)
@@ -560,26 +560,26 @@ class DiffHistoryBlob implements HistoryBlob {
                        $op = $x['op'];
                        ++$p;
                        switch ( $op ) {
-                       case self::XDL_BDOP_INS:
-                               $x = unpack( 'Csize', substr( $diff, $p, 1 ) );
-                               $p++;
-                               $out .= substr( $diff, $p, $x['size'] );
-                               $p += $x['size'];
-                               break;
-                       case self::XDL_BDOP_INSB:
-                               $x = unpack( 'Vcsize', substr( $diff, $p, 4 ) );
-                               $p += 4;
-                               $out .= substr( $diff, $p, $x['csize'] );
-                               $p += $x['csize'];
-                               break;
-                       case self::XDL_BDOP_CPY:
-                               $x = unpack( 'Voff/Vcsize', substr( $diff, $p, 8 ) );
-                               $p += 8;
-                               $out .= substr( $base, $x['off'], $x['csize'] );
-                               break;
-                       default:
-                               wfDebug( __METHOD__ . ": invalid op\n" );
-                               return false;
+                               case self::XDL_BDOP_INS:
+                                       $x = unpack( 'Csize', substr( $diff, $p, 1 ) );
+                                       $p++;
+                                       $out .= substr( $diff, $p, $x['size'] );
+                                       $p += $x['size'];
+                                       break;
+                               case self::XDL_BDOP_INSB:
+                                       $x = unpack( 'Vcsize', substr( $diff, $p, 4 ) );
+                                       $p += 4;
+                                       $out .= substr( $diff, $p, $x['csize'] );
+                                       $p += $x['csize'];
+                                       break;
+                               case self::XDL_BDOP_CPY:
+                                       $x = unpack( 'Voff/Vcsize', substr( $diff, $p, 8 ) );
+                                       $p += 8;
+                                       $out .= substr( $base, $x['off'], $x['csize'] );
+                                       break;
+                               default:
+                                       wfDebug( __METHOD__ . ": invalid op\n" );
+                                       return false;
                        }
                }
                return $out;
index 16ae839..e55eaaf 100644 (file)
@@ -1308,16 +1308,15 @@ class Message implements MessageSpecifier, Serializable {
         */
        protected function formatPlaintext( $plaintext, $format ) {
                switch ( $format ) {
-               case self::FORMAT_TEXT:
-               case self::FORMAT_PLAIN:
-                       return $plaintext;
-
-               case self::FORMAT_PARSE:
-               case self::FORMAT_BLOCK_PARSE:
-               case self::FORMAT_ESCAPED:
-               default:
-                       return htmlspecialchars( $plaintext, ENT_QUOTES );
-
+                       case self::FORMAT_TEXT:
+                       case self::FORMAT_PLAIN:
+                               return $plaintext;
+
+                       case self::FORMAT_PARSE:
+                       case self::FORMAT_BLOCK_PARSE:
+                       case self::FORMAT_ESCAPED:
+                       default:
+                               return htmlspecialchars( $plaintext, ENT_QUOTES );
                }
        }
 
index ea73a61..c7c708e 100644 (file)
@@ -979,8 +979,10 @@ class Revision implements IDBAccessObject {
 
                $this->mRecord = $rec;
 
+               // Avoid PHP 7.1 warning of passing $this by reference
+               $revision = $this;
                // TODO: hard-deprecate in 1.32 (or even 1.31?)
-               Hooks::run( 'RevisionInsertComplete', [ $this, null, null ] );
+               Hooks::run( 'RevisionInsertComplete', [ &$revision, null, null ] );
 
                return $rec->getId();
        }
index 0714633..fcdc1b9 100644 (file)
@@ -228,7 +228,7 @@ class SqlBlobStore implements IDBAccessObject, BlobStore {
                                // used. We'll need to assess expected fallout before doing that.
                        }
 
-                       $dbw = $this->getDBConnection( DB_REPLICA );
+                       $dbw = $this->getDBConnection( DB_MASTER );
 
                        $old_id = $dbw->nextSequenceValue( 'text_old_id_seq' );
                        $dbw->insert(
index 4d37af3..366a6df 100644 (file)
@@ -67,12 +67,12 @@ class ApiBlock extends ApiBase {
                                $params['user'] = $username;
                        }
                } else {
-                       $target = User::newFromName( $params['user'] );
+                       list( $target, $type ) = SpecialBlock::getTargetAndType( $params['user'] );
 
                        // T40633 - if the target is a user (not an IP address), but it
                        // doesn't exist or is unusable, error.
-                       if ( $target instanceof User &&
-                               ( $target->isAnon() /* doesn't exist */ || !User::isUsableName( $target->getName() ) )
+                       if ( $type === Block::TYPE_USER &&
+                               ( $target->isAnon() /* doesn't exist */ || !User::isUsableName( $params['user'] ) )
                        ) {
                                $this->dieWithError( [ 'nosuchusershort', $params['user'] ], 'nosuchuser' );
                        }
index fb36923..6b01875 100644 (file)
@@ -12,7 +12,8 @@
                        "Macofe",
                        "Hamilton Abreu",
                        "Umherirrender",
-                       "Fitoschido"
+                       "Fitoschido",
+                       "Athena in Wonderland"
                ]
        },
        "apihelp-main-extended-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:Special:MyLanguage/API:Main_page|Documentación]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Lista de discusión]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Anuncios da API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Erros e solicitudes]\n</div>\n<strong>Estado:</strong> Tódalas funcionalidades mostradas nesta páxina deberían estar funcionando, pero a API aínda está desenrolo, e pode ser modificada en calquera momento. Apúntese na [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ lista de discusión mediawiki-api-announce] para estar informado acerca das actualizacións.\n\n<strong>Solicitudes incorrectas:</strong> Cando se envían solicitudes incorrectas á API, envíase unha cabeceira HTTP coa chave \"MediaWiki-API-Error\" e, a seguir, tanto o valor da cabeceira como o código de erro retornado serán definidos co mesmo valor. Para máis información, consulte [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Erros e avisos]].\n\n<strong>Test:</strong> Para facilitar as probas das peticións da API, consulte [[Special:ApiSandbox]].",
        "api-help-param-upload": "Debe ser enviado como un ficheiro importado usando multipart/form-data.",
        "api-help-param-multi-separate": "Separe os valores con <kbd>|</kbd> ou [[Special:ApiHelp/main#main/datatypes|outros]].",
        "api-help-param-multi-max": "O número máximo de valores é {{PLURAL:$1|$1}} ({{PLURAL:$2|$2}} para os bots).",
-       "api-help-param-multi-max-simple": "O número máximo de valores é {{PLURAL:1$|1$}}.",
+       "api-help-param-multi-max-simple": "O número máximo de valores é {{PLURAL:$1|$1}}.",
        "api-help-param-multi-all": "Para especificar tódolos valores use <kbd>$1</kbd>.",
        "api-help-param-default": "Por defecto: $1",
        "api-help-param-default-empty": "Por defecto: <span class=\"apihelp-empty\">(baleiro)</span>",
index 2a3bb6b..c407b8e 100644 (file)
        "apihelp-query+allusers-param-prop": "Hvilken informasjon som skal inkluderes:",
        "apihelp-query+categorymembers-param-prop": "Hvilken informasjon som skal inkluderes:",
        "apihelp-query+exturlusage-param-prop": "Hvilken informasjon som skal inkluderes:",
+       "apihelp-query+iwbacklinks-param-limit": "Hvor mange sider som skal returneres totalt.",
+       "apihelp-query+iwbacklinks-param-prop": "Hvilke egenskaper som skal hentes:",
+       "apihelp-query+iwbacklinks-paramvalue-prop-iwprefix": "Legger til prefikset til interwikien.",
+       "apihelp-query+iwbacklinks-paramvalue-prop-iwtitle": "Legger til tittelen til interwikien.",
+       "apihelp-query+iwbacklinks-param-dir": "Retningen det skal listes opp i.",
+       "apihelp-query+iwbacklinks-example-simple": "Hent sider som lenker til [[wikibooks:Test]].",
+       "apihelp-query+iwbacklinks-example-generator": "Hent informasjon om sider som lenker til [[wikibooks:Test]].",
+       "apihelp-query+iwlinks-summary": "Returnerer alle interwikilenker fra de gitte sidene.",
+       "apihelp-query+iwlinks-param-url": "Hvorvidt den fulle URL-en skal hentes (kan ikke brukes med $1prop).",
+       "apihelp-query+iwlinks-param-prop": "Hvilke ekstra egenskaper som skal hentes for hver språklenke:",
+       "apihelp-query+iwlinks-paramvalue-prop-url": "Legger til den fulle URL-en.",
+       "apihelp-query+iwlinks-param-limit": "Hvor mange interikilenker som skal returneres.",
+       "apihelp-query+iwlinks-param-prefix": "Returner bare interwikilenker med dette prefikset.",
+       "apihelp-query+iwlinks-param-title": "Interwikilenker det skal søkes etter. Må brukes med <var>$1prefix</var>.",
+       "apihelp-query+iwlinks-param-dir": "Retningen det skal listes opp i.",
+       "apihelp-query+iwlinks-example-simple": "Hent interwikilenker fra sida <kbd>Main Page</kbd>.",
+       "apihelp-query+langbacklinks-summary": "Finn alle sider som lenker til den gitte språklenka.",
+       "apihelp-query+langbacklinks-param-lang": "Språket for språklenka.",
+       "apihelp-query+langbacklinks-param-title": "Språklenke det skal søkes etter. Må brukes med $1lang.",
+       "apihelp-query+langbacklinks-param-limit": "Hvor mange sider som skal returneres totalt.",
+       "apihelp-query+langbacklinks-param-prop": "Hvilke egenskaper som skal hentes:",
+       "apihelp-query+langbacklinks-paramvalue-prop-lllang": "Legger til språkkoden til språklenka.",
+       "apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Legger til tittelen til språklenka.",
+       "apihelp-query+langbacklinks-param-dir": "Retningen det skal listes opp i.",
+       "apihelp-query+langbacklinks-example-simple": "Hent sider som lenker til [[:fr:Test]].",
+       "apihelp-query+langbacklinks-example-generator": "Hent informasjon om sider som lenker til [[:fr:Test]].",
+       "apihelp-query+langlinks-summary": "Returnerer alle språklenker fra de gitte sidene.",
+       "apihelp-query+langlinks-param-limit": "Hvor mange språklenker som skal returneres.",
+       "apihelp-query+langlinks-param-url": "Hvorvidt den fulle URL-en skal hentes (kan ikke brukes med <var>$1prop</var>).",
+       "apihelp-query+langlinks-param-prop": "Hvilke ekstra egenskaper som skal hentes for hver språklenke:",
+       "apihelp-query+langlinks-paramvalue-prop-url": "Legger til den fulle URL-en.",
+       "apihelp-query+langlinks-param-lang": "Returner bare språklenker med denne språkkoden.",
+       "apihelp-query+langlinks-param-title": "Lenke det skal søkes etter. Må brukes med <var>$1lang</var>.",
+       "apihelp-query+langlinks-param-dir": "Retningen det skal listes opp i.",
+       "apihelp-query+langlinks-param-inlanguagecode": "Språkkode for oversatte språknavn.",
+       "apihelp-query+langlinks-example-simple": "Hent språklenker fra siden <kbd>Main Page</kbd>.",
+       "apihelp-query+links-summary": "Returnerer alle lenker fra de gitte sidene.",
+       "apihelp-query+links-param-namespace": "Viser lenker kun i disse navnerommene.",
+       "apihelp-query+links-param-limit": "Hvor mange lenker som skal returneres.",
+       "apihelp-query+links-param-titles": "List bare opp lenker til disse titlene. Nyttig for å sjekke om en viss side lenker til en annen viss side.",
+       "apihelp-query+links-param-dir": "Retningen det skal listes opp i.",
+       "apihelp-query+links-example-simple": "Hent lenker fra sida <kbd>Main Page</kbd>",
+       "apihelp-query+links-example-generator": "Hent informasjon om lenkesidene på sida <kbd>Main Page</kbd>.",
+       "apihelp-query+links-example-namespaces": "Hent lenker fra sida <kbd>Main Page</kbd> i navnerommene {{ns:user}} og {{ns:template}}.",
+       "apihelp-query+linkshere-summary": "Finn alle sider som lenker til de gitte sidene.",
+       "apihelp-query+linkshere-param-prop": "Hvilke egenskaper som skal hentes:",
+       "apihelp-query+linkshere-paramvalue-prop-pageid": "Side-ID for hver side.",
+       "apihelp-query+linkshere-paramvalue-prop-title": "Tittelen til hver side.",
+       "apihelp-query+linkshere-paramvalue-prop-redirect": "Marker om siden er omdirigering.",
+       "apihelp-query+linkshere-param-namespace": "Inkluder bare sider i disse navnerommene.",
+       "apihelp-query+linkshere-param-limit": "Hvor mange som skal returneres.",
+       "apihelp-query+linkshere-param-show": "Vis bare elementer som møter disse kriteriene:\n;redirect:Vis bare omdirigeringer.\n;!redirect:Vis bare ikke-omdirigeringer.",
+       "apihelp-query+linkshere-example-simple": "Hent ei liste over sider som lenker til [[Main Page]].",
+       "apihelp-query+linkshere-example-generator": "Hent informasjon om sider som lenker til [[Main Page]].",
+       "apihelp-query+logevents-summary": "Hent oppføringer fra logger.",
+       "apihelp-query+logevents-param-prop": "Hvilke egenskaper som skal hentes:",
+       "apihelp-query+logevents-paramvalue-prop-ids": "Legger til ID-en til loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-title": "Legger til tittelen på siden i loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-type": "Legger til typen loggoppføring.",
+       "apihelp-query+logevents-paramvalue-prop-user": "Legger til brukeren som er ansvarlig for loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-userid": "Legger til bruker-ID-en som var ansvarlig for loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-timestamp": "Legger til tidsstempelet for loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-comment": "Legger til kommentaren til loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-parsedcomment": "Legger til den parsede kommentaren til loggoppføringen.",
+       "apihelp-query+logevents-paramvalue-prop-details": "Lister opp ekstra detaljer om loggoppføringen.",
+       "apihelp-query+logevents-param-type": "Filtrer loggoppføringer til kun denne typen.",
+       "apihelp-query+logevents-param-action": "Filtrer logghandlinger til kun denne handlingen. Overstyrer <var>$1type</var>. I listen over mulige verdier kan verdier med jokertegnet stjerne, som <kbd>action/*</kbd> ha forskjellige strenger etter skråstreken.",
+       "apihelp-query+logevents-param-user": "Filtrer oppføringer til de som er gjort av den gitte brukeren.",
+       "apihelp-query+logevents-param-title": "Filtrer oppføringer til de som er relatert til ei side.",
+       "apihelp-query+logevents-param-namespace": "Filtrer oppføringer til de i det gitte navnerommet.",
+       "apihelp-query+logevents-param-prefix": "Filtrer oppføringer som starter med dette prefikset.",
+       "apihelp-query+logevents-param-tag": "List bare opp oppføringer som er tagget med denne taggen.",
+       "apihelp-query+logevents-param-limit": "Hvor mange oppføringer som skal returneres.",
+       "apihelp-query+logevents-example-simple": "List opp nylige loggoppføringer.",
+       "apihelp-query+pagepropnames-summary": "List opp alle sideegenskapsnavn i bruk på wikien.",
+       "apihelp-query+pagepropnames-param-limit": "Maksimalt antall navn som skal returneres.",
+       "apihelp-query+pagepropnames-example-simple": "Hent de 10 første egenskapsnavnene.",
+       "apihelp-query+pageprops-summary": "Hent diverse sideegenskaper definert i sideinnholdet.",
+       "apihelp-query+pageprops-param-prop": "List kun opp disse sideegenskapene (<kbd>[[Special:ApiHelp/query+pagepropnames|action=query&list=pagepropnames]]</kbd> returnerer sideegenskapsnavn i bruk). Nyttig for å sjekke om sider bruker en viss sideegenskap.",
+       "apihelp-query+pageprops-example-simple": "Hent egenskaper for sidene <kbd>Main Page</kbd> og <kbd>MediaWiki</kbd>.",
+       "apihelp-query+pageswithprop-summary": "Lister opp alle sider med en gitt sideegenskap.",
        "apihelp-query+pageswithprop-param-prop": "Hvilken informasjon som skal inkluderes:",
+       "apihelp-query+pageswithprop-paramvalue-prop-ids": "Legger til side-ID-en.",
+       "apihelp-query+pageswithprop-paramvalue-prop-title": "Legger til tittel- og navneroms-ID-en til sida.",
+       "apihelp-query+pageswithprop-paramvalue-prop-value": "Legger til verdien til sideegenskapen.",
+       "apihelp-query+pageswithprop-param-limit": "Maksimalt antall sider som skal returneres.",
+       "apihelp-query+pageswithprop-param-dir": "Hvilken retning det skal sorteres i.",
+       "apihelp-query+pageswithprop-example-simple": "List opp de første 10 sidene som bruker <code>&#123;&#123;DISPLAYTITLE:&#125;&#125;</code>.",
+       "apihelp-query+pageswithprop-example-generator": "Hent ekstra informasjon om de 10 første sidene som bruker <code>_&#95;NOTOC_&#95;</code>.",
+       "apihelp-query+prefixsearch-summary": "Utfør et prefikssøk for sidetitler.",
+       "apihelp-query+prefixsearch-param-search": "Søkestreng.",
+       "apihelp-query+prefixsearch-param-namespace": "Navnerom det skal søkes i.",
+       "apihelp-query+prefixsearch-param-limit": "Maksimalt antall resultater som skal returneres.",
+       "apihelp-query+prefixsearch-param-offset": "Antall resultater som skal hoppes over.",
+       "apihelp-query+prefixsearch-example-simple": "Søk etter sidetitler som begynner med <kbd>meaning</kbd>.",
+       "apihelp-query+prefixsearch-param-profile": "Søkeprofil som skal brukes.",
+       "apihelp-query+protectedtitles-summary": "List opp alle titler som er beskyttet fra opprettelse.",
+       "apihelp-query+protectedtitles-param-namespace": "List kun opp titler i disse navnerommene.",
+       "apihelp-query+protectedtitles-param-level": "List kun opp titler med disse beskyttelsesnivåene.",
+       "apihelp-query+protectedtitles-param-limit": "Hvor mange sider som skal returneres totalt.",
+       "apihelp-query+protectedtitles-param-prop": "Hvilke egenskaper som skal hentes:",
        "apihelp-query+userinfo-param-prop": "Hvilken informasjon som skal inkluderes:",
        "apihelp-query+users-param-prop": "Hvilken informasjon som skal inkluderes:",
        "apihelp-json-summary": "Resultatdata i JSON-format.",
index 60c9eae..b24e3ae 100644 (file)
        "apihelp-query+iwbacklinks-param-title": "A hiperligação interwikis a ser procurada. Tem de ser usado em conjunto com <var>$1blprefix</var>.",
        "apihelp-query+iwbacklinks-param-limit": "O número total de páginas a serem devolvidas.",
        "apihelp-query+iwbacklinks-param-prop": "As propriedades a serem obtidas:",
-       "apihelp-query+iwbacklinks-paramvalue-prop-iwprefix": "Adiciona o prefixo do ''link'' interwikis.",
-       "apihelp-query+iwbacklinks-paramvalue-prop-iwtitle": "Adiciona o título do ''link'' interwikis.",
+       "apihelp-query+iwbacklinks-paramvalue-prop-iwprefix": "Adiciona o prefixo da hiperligação interwikis.",
+       "apihelp-query+iwbacklinks-paramvalue-prop-iwtitle": "Adiciona o título da hiperligação interwikis.",
        "apihelp-query+iwbacklinks-param-dir": "A direção de listagem.",
        "apihelp-query+iwbacklinks-example-simple": "Obter as páginas que contêm ligações para [[wikibooks:Test]].",
        "apihelp-query+iwbacklinks-example-generator": "Obter informação sobre as páginas que contêm ligações para [[wikibooks:Test]].",
        "apihelp-query+iwlinks-param-title": "Hiperligação interwikis a ser procurada. Tem de ser usado em conjunto com <var>$1prefix</var>.",
        "apihelp-query+iwlinks-param-dir": "A direção de listagem.",
        "apihelp-query+iwlinks-example-simple": "Obter os ''links'' interwikis da página <kbd>Main Page</kbd>.",
-       "apihelp-query+langbacklinks-summary": "Encontrar todas as páginas que contêm ''links'' para o ''link'' interlínguas indicado.",
+       "apihelp-query+langbacklinks-summary": "Encontrar todas as páginas que contêm hiperligações para a hiperligação interlínguas indicada.",
        "apihelp-query+langbacklinks-extended-description": "Pode ser usado para encontrar todos os ''links'' para um determinado código de língua, ou todos os ''links'' para um determinado título (de uma língua). Se nenhum for usado, isso efetivamente significa \"todos os ''links'' interlínguas\".\n\nNote que os ''links'' interlínguas adicionados por extensões podem não ser considerados.",
        "apihelp-query+langbacklinks-param-lang": "A língua da hiperligação da língua.",
        "apihelp-query+langbacklinks-param-title": "Hiperligação interlínguas a ser procurada. Tem de ser usado com $1lang.",
        "apihelp-query+langbacklinks-param-limit": "O número total de páginas a serem devolvidas.",
        "apihelp-query+langbacklinks-param-prop": "As propriedades a serem obtidas:",
        "apihelp-query+langbacklinks-paramvalue-prop-lllang": "Adiciona o código de língua da ligação interlínguas.",
-       "apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Adiciona o título do ''link'' interlínguas.",
+       "apihelp-query+langbacklinks-paramvalue-prop-lltitle": "Adiciona o título da hiperligação interlínguas.",
        "apihelp-query+langbacklinks-param-dir": "A direção de listagem.",
        "apihelp-query+langbacklinks-example-simple": "Obter as páginas que contêm ligações para [[:fr:Test]].",
        "apihelp-query+langbacklinks-example-generator": "Obter informações sobre as páginas que contêm ligações para [[:fr:Test]].",
index e60ce87..e825170 100644 (file)
        "apihelp-imagerotate-param-tags": "Изменить метки записи в журнале загрузок.",
        "apihelp-imagerotate-example-simple": "Повернуть <kbd>File:Example.png</kbd> на <kbd>90</kbd> градусов.",
        "apihelp-imagerotate-example-generator": "Повернуть все изображения в <kbd>Category:Flip</kbd> на <kbd>180</kbd> градусов.",
-       "apihelp-import-summary": "Импорт страницы из другой вики, или из XML-файла.",
+       "apihelp-import-summary": "Импорт страницы из другой вики или XML-файла.",
        "apihelp-import-extended-description": "Обратите внимание, что HTTP POST-запрос должен быть осуществлён как загрузка файла (то есть, с использованием многотомных данных) при отправки файла через параметр <var>xml</var>.",
        "apihelp-import-param-summary": "Описание записи журнала импорта.",
        "apihelp-import-param-xml": "Загруженный XML-файл.",
+       "apihelp-import-param-interwikiprefix": "Для загруженных импортов: префикс интервики для неизвестных имён участников (а также известных, если задан <var>$1assignknownusers</var>).",
+       "apihelp-import-param-assignknownusers": "Связать правки с локальными участниками, когда участники с такими именами существуют.",
        "apihelp-import-param-interwikisource": "Для импорта из других вики: импортируемая вики.",
        "apihelp-import-param-interwikipage": "Для импорта из других вики: импортируемая страница.",
        "apihelp-import-param-fullhistory": "Для импорта из других вики: импортировать полную историю, а не только текущую страницу.",
        "apihelp-linkaccount-summary": "Связать аккаунт третьей стороны с текущим участником.",
        "apihelp-linkaccount-example-link": "Начать связывание аккаунта с <kbd>Example</kdb>.",
        "apihelp-login-summary": "Вход и получение аутентификационных cookie.",
-       "apihelp-login-extended-description": "Это действие должно быть использовано только в комбинации со [[Special:BotPasswords]]; использование этого модуля для входа в основной аккаунт не поддерживается и может сбиться без предупреждения. Для безопасного входа в основной аккаунт, используйте <kbd>[[Special:ApiHelp/clientlogin|action=clientlogin]]</kbd>.",
+       "apihelp-login-extended-description": "Это действие должно быть использовано только в комбинации со [[Special:BotPasswords]]; использование этого модуля для входа в основной аккаунт устарело и может сбиться без предупреждения. Для безопасного входа в основной аккаунт, используйте <kbd>[[Special:ApiHelp/clientlogin|action=clientlogin]]</kbd>.",
        "apihelp-login-extended-description-nobotpasswords": "Это действие не поддерживается и может сбиться без предупреждения. Для безопасного входа, используйте <kbd>[[Special:ApiHelp/clientlogin|action=clientlogin]]</kbd>.",
        "apihelp-login-param-name": "Имя участника.",
        "apihelp-login-param-password": "Пароль.",
        "apihelp-query+allrevisions-param-generatetitles": "При использовании в качестве генератора, генерирует названия страниц вместо идентификаторов версий.",
        "apihelp-query+allrevisions-example-user": "Перечислить последние 50 правок участника <kbd>Example</kbd>.",
        "apihelp-query+allrevisions-example-ns-main": "Перечислить первые 50 правок в основном пространстве.",
-       "apihelp-query+mystashedfiles-summary": "Получить список файлов в тайнике (upload stash) текущего участника.",
+       "apihelp-query+mystashedfiles-summary": "Получить список файлов во временном хранилище текущего участника.",
        "apihelp-query+mystashedfiles-param-prop": "Какие свойства файлов запрашивать.",
        "apihelp-query+mystashedfiles-paramvalue-prop-size": "Запросить размер и разрешение изображения.",
        "apihelp-query+mystashedfiles-paramvalue-prop-type": "Запросить MIME- и медиа-тип файла.",
        "apihelp-query+mystashedfiles-param-limit": "Сколько файлов получить.",
-       "apihelp-query+mystashedfiles-example-simple": "Получить ключ, размер и разрешение файлов в тайнике текущего участника.",
+       "apihelp-query+mystashedfiles-example-simple": "Получить ключ, размер и разрешение файлов во временном хранилище текущего участника.",
        "apihelp-query+alltransclusions-summary": "Перечисление всех включений (страниц, вставленных с помощью &#123;&#123;x&#125;&#125;), включая несуществующие.",
        "apihelp-query+alltransclusions-param-from": "Название включения, с которого начать перечисление.",
        "apihelp-query+alltransclusions-param-to": "Название включения, на котором закончить перечисление.",
        "apihelp-query+deletedrevs-param-excludeuser": "Не перечислять правки данного участника.",
        "apihelp-query+deletedrevs-param-namespace": "Перечислять только страницы этого пространства имён.",
        "apihelp-query+deletedrevs-param-limit": "Максимальное количество правок в списке.",
-       "apihelp-query+deletedrevs-param-prop": "Ð\9aакие Ñ\81войÑ\81Ñ\82ва Ð²Ð¾Ð·Ð²Ñ\80аÑ\89аÑ\82Ñ\8c:\n;revid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ñ\83далÑ\91нной Ð¿Ñ\80авки.\n;parentid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ð¿Ñ\80едÑ\8bдÑ\83Ñ\89ей Ð²ÐµÑ\80Ñ\81ии Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b.\n;user: Ð\94обавлÑ\8fеÑ\82 Ð½Ð¸Ðº Ñ\83Ñ\87аÑ\81Ñ\82ника, Ñ\81делавÑ\88его Ð¿Ñ\80авкÑ\83.\n;userid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ñ\83Ñ\87аÑ\81Ñ\82ника, Ñ\81делавÑ\88его Ð¿Ñ\80авкÑ\83.\n;comment: Ð\94обавлÑ\8fеÑ\82 Ð¾Ð¿Ð¸Ñ\81ание Ð¿Ñ\80авки.\n;parsedcomment: Ð\94обавлÑ\8fеÑ\82 Ñ\80аÑ\81паÑ\80Ñ\81енное Ð¾Ð¿Ð¸Ñ\81ание Ð¿Ñ\80авки.\n;minor: Ð\9eÑ\82меÑ\87аеÑ\82, Ð±Ñ\8bла Ð»Ð¸ Ð¿Ñ\80авка Ð¼Ð°Ð»Ñ\8bм.\n;len: Ð\94обавлÑ\8fеÑ\82 Ð´Ð»Ð¸Ð½Ñ\83 (в Ð±Ð°Ð¹Ñ\82аÑ\85) Ð¿Ñ\80авки.\n;sha1: Ð\94обавлÑ\8fеÑ\82 Ñ\85Ñ\8dÑ\88 SHA-1 (base 16) Ð¿Ñ\80авки.\n;content: Ð\94обавлÑ\8fеÑ\82 Ñ\81одеÑ\80жимое Ð¿Ñ\80авки.\n;token: <span class=\"apihelp-deprecated\">Ð\9dе Ð¿Ð¾Ð´Ð´ÐµÑ\80живаеÑ\82Ñ\81Ñ\8f.</span> Возвращает токен редактирования.\n;tags: Теги правки.",
+       "apihelp-query+deletedrevs-param-prop": "Ð\9aакие Ñ\81войÑ\81Ñ\82ва Ð²Ð¾Ð·Ð²Ñ\80аÑ\89аÑ\82Ñ\8c:\n;revid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ñ\83далÑ\91нной Ð¿Ñ\80авки.\n;parentid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ð¿Ñ\80едÑ\8bдÑ\83Ñ\89ей Ð²ÐµÑ\80Ñ\81ии Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b.\n;user: Ð\94обавлÑ\8fеÑ\82 Ð½Ð¸Ðº Ñ\83Ñ\87аÑ\81Ñ\82ника, Ñ\81делавÑ\88его Ð¿Ñ\80авкÑ\83.\n;userid: Ð\94обавлÑ\8fеÑ\82 Ð¸Ð´ÐµÐ½Ñ\82иÑ\84икаÑ\82оÑ\80 Ñ\83Ñ\87аÑ\81Ñ\82ника, Ñ\81делавÑ\88его Ð¿Ñ\80авкÑ\83.\n;comment: Ð\94обавлÑ\8fеÑ\82 Ð¾Ð¿Ð¸Ñ\81ание Ð¿Ñ\80авки.\n;parsedcomment: Ð\94обавлÑ\8fеÑ\82 Ñ\80аÑ\81паÑ\80Ñ\81енное Ð¾Ð¿Ð¸Ñ\81ание Ð¿Ñ\80авки.\n;minor: Ð\9eÑ\82меÑ\87аеÑ\82, Ð±Ñ\8bла Ð»Ð¸ Ð¿Ñ\80авка Ð¼Ð°Ð»Ñ\8bм.\n;len: Ð\94обавлÑ\8fеÑ\82 Ð´Ð»Ð¸Ð½Ñ\83 (в Ð±Ð°Ð¹Ñ\82аÑ\85) Ð¿Ñ\80авки.\n;sha1: Ð\94обавлÑ\8fеÑ\82 Ñ\85Ñ\8dÑ\88 SHA-1 (base 16) Ð¿Ñ\80авки.\n;content: Ð\94обавлÑ\8fеÑ\82 Ñ\81одеÑ\80жимое Ð¿Ñ\80авки.\n;token: <span class=\"apihelp-deprecated\">УÑ\81Ñ\82аÑ\80ело.</span> Возвращает токен редактирования.\n;tags: Теги правки.",
        "apihelp-query+deletedrevs-example-mode1": "Список последних удалённых правок страниц <kbd>Main Page</kbd> и <kbd>Talk:Main Page</kbd> с содержимым (режим 1).",
        "apihelp-query+deletedrevs-example-mode2": "Список последних 50 удалённых правок участника <kbd>Bob</kbd> (режим 2).",
        "apihelp-query+deletedrevs-example-mode3-main": "Список последних 50 удалённых правок в основном пространстве имён (режим 3)",
        "apihelp-query+revisions+base-paramvalue-prop-parsedcomment": "Распарсенное описание правки.",
        "apihelp-query+revisions+base-paramvalue-prop-content": "Текст версии.",
        "apihelp-query+revisions+base-paramvalue-prop-tags": "Метки версии.",
-       "apihelp-query+revisions+base-paramvalue-prop-parsetree": "<span class=\"apihelp-deprecated\">Ð\9dе Ð¿Ð¾Ð´Ð´ÐµÑ\80живаеÑ\82Ñ\81Ñ\8f.</span> Вместо этого используйте <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> или <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>. Дерево парсинга XML содержимого версии (требуется модель содержимого <code>$1</code>).",
+       "apihelp-query+revisions+base-paramvalue-prop-parsetree": "<span class=\"apihelp-deprecated\">УÑ\81Ñ\82аÑ\80ело.</span> Вместо этого используйте <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> или <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>. Дерево парсинга XML содержимого версии (требуется модель содержимого <code>$1</code>).",
        "apihelp-query+revisions+base-param-limit": "Сколько версий вернуть.",
        "apihelp-query+revisions+base-param-expandtemplates": "Вместо этого используйте <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd>. Раскрыть шаблоны в содержимом версии (требуется $1prop=content).",
        "apihelp-query+revisions+base-param-generatexml": "Вместо этого используйте <kbd>[[Special:ApiHelp/expandtemplates|action=expandtemplates]]</kbd> или <kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>. Сгенерировать дерево парсинга XML содержимого версии (требуется $1prop=content).",
        "apihelp-query+search-paramvalue-prop-sectiontitle": "Добавляет заголовок найденного раздела.",
        "apihelp-query+search-paramvalue-prop-categorysnippet": "Добавляет распарсенный фрагмент найденной категории.",
        "apihelp-query+search-paramvalue-prop-isfilematch": "Добавляет логическое значение, обозначающее, удовлетворяет ли поисковому запросу содержимое файла.",
+       "apihelp-query+search-paramvalue-prop-extensiondata": "Добавляет дополнительные данные, сгенерированные расширениями.",
        "apihelp-query+search-paramvalue-prop-score": "Игнорируется.",
        "apihelp-query+search-paramvalue-prop-hasrelated": "Игнорируется.",
        "apihelp-query+search-param-limit": "Сколько страниц вернуть.",
        "apihelp-query+siteinfo-example-simple": "Запросить информацию о сайте.",
        "apihelp-query+siteinfo-example-interwiki": "Запросить список локальных префиксов интервик.",
        "apihelp-query+siteinfo-example-replag": "Проверить текущее отставание репликации.",
-       "apihelp-query+stashimageinfo-summary": "Возвращает информацию о файлах в тайнике (upload stash).",
+       "apihelp-query+stashimageinfo-summary": "Возвращает информацию о файлах во временном хранилище.",
        "apihelp-query+stashimageinfo-param-filekey": "Ключ, идентифицирующий предыдущую временную загрузку.",
        "apihelp-query+stashimageinfo-param-sessionkey": "Синоним $1filekey для обратной совместимости.",
-       "apihelp-query+stashimageinfo-example-simple": "Вернуть информацию о файле в тайнике.",
+       "apihelp-query+stashimageinfo-example-simple": "Вернуть информацию о файле во временном хранилище.",
        "apihelp-query+stashimageinfo-example-params": "Вернуть эскизы двух файлов в тайнике.",
        "apihelp-query+tags-summary": "Список меток правок.",
        "apihelp-query+tags-param-limit": "Максимальное количество меток в списке.",
        "apihelp-tag-example-rev": "Добавить метку <kbd>vandalism</kbd> к версии с идентификатором 123 без указания причины.",
        "apihelp-tag-example-log": "Удаление метки <kbd>spam</kbd> из записи журнала с идентификатором 123 с причиной <kbd>Wrongly applied</kbd>.",
        "apihelp-tokens-summary": "Получение токенов для действий, связанных с редактированием данных.",
-       "apihelp-tokens-extended-description": "Этот модуль не поддерживается в пользу [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].",
+       "apihelp-tokens-extended-description": "Этот модуль устарел в пользу [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].",
        "apihelp-tokens-param-type": "Типы запрашиваемых токенов.",
        "apihelp-tokens-example-edit": "Получить токен редактирования (по умолчанию).",
        "apihelp-tokens-example-emailmove": "Получить токен электронной почты и переименования.",
        "apihelp-upload-param-url": "Ссылка на запрашиваемый файл.",
        "apihelp-upload-param-filekey": "Ключ, идентифицирующий предыдущую временную загрузку.",
        "apihelp-upload-param-sessionkey": "Синоним $1filekey, обслуживаемый для обратной совместимости.",
-       "apihelp-upload-param-stash": "Ð\95Ñ\81ли Ð·Ð°Ð´Ð°Ð½Ð¾, Ñ\81еÑ\80веÑ\80 Ð²Ñ\80еменно Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82иÑ\82 Ñ\84айл Ð² Ñ\82айник Ð²Ð¼ÐµÑ\81Ñ\82о Ð·Ð°Ð³Ñ\80Ñ\83зки ÐµÐ³Ð¾ Ð² Ñ\85Ñ\80анилиÑ\89е.",
+       "apihelp-upload-param-stash": "Ð\95Ñ\81ли Ð·Ð°Ð´Ð°Ð½Ð¾, Ñ\81еÑ\80веÑ\80 Ð¿Ð¾Ð¼ÐµÑ\81Ñ\82иÑ\82 Ñ\84айл Ð²Ð¾ Ð²Ñ\80еменное Ñ\85Ñ\80анилиÑ\89е, Ð½Ðµ Ð´Ð¾Ð±Ð°Ð²Ð¸Ð² Ð² Ð¿Ð¾Ñ\81Ñ\82оÑ\8fнное.",
        "apihelp-upload-param-filesize": "Полны размер файла.",
        "apihelp-upload-param-offset": "Смещение блока в байтах.",
        "apihelp-upload-param-chunk": "Содержимое кусочка.",
        "api-help-lead": "Это автоматически сгенерированная страница документации MediaWiki API.\n\nДокументация и примеры: https://www.mediawiki.org/wiki/API",
        "api-help-main-header": "Главный модуль",
        "api-help-undocumented-module": "Нет документации для модуля $1.",
-       "api-help-flag-deprecated": "Этот модуль не поддерживается.",
+       "api-help-flag-deprecated": "Этот модуль устарел.",
        "api-help-flag-internal": "<strong>Этот модуль внутренний или нестабильный.</strong> Его операции могут измениться без предупреждения.",
        "api-help-flag-readrights": "Этот модуль требует прав на чтение.",
        "api-help-flag-writerights": "Этот модуль требует прав на запись.",
        "api-help-license-noname": "Лицензия: [[$1|см. ссылку]]",
        "api-help-license-unknown": "Лицензия: <span class=\"apihelp-unknown\">unknown</span>",
        "api-help-parameters": "Параметр{{PLURAL:$1||ы}}:",
-       "api-help-param-deprecated": "Ð\9dе Ð¿Ð¾Ð´Ð´ÐµÑ\80живаеÑ\82Ñ\81Ñ\8f.",
+       "api-help-param-deprecated": "УÑ\81Ñ\82аÑ\80ело.",
        "api-help-param-required": "Это обязательный параметр.",
        "api-help-datatypes-header": "Типы данных",
        "api-help-datatypes": "Ввод в MediaWiki должен быть NFC-нормализованным UTF-8. MediaWiki может попытаться преобразовать другой ввод, но это приведёт к провалу некоторых операций (таких, как [[Special:ApiHelp/edit|редактирование]] со сверкой MD5).\n\nНекоторые типы параметров в запросах API требуют дополнительных пояснений:\n;логический\n:Логические параметры работают как флажки (checkboxes) в HTML: если параметр задан, независимо от его значения, он воспринимается за истину. Для передачи ложного значения просто опустите параметр.\n;временные метки\n:Временные метки могут быть заданы в нескольких форматах. Рекомендуемым является дата и время ISO 8601. Всё время считается в UTC, любые включённые часовые пояса игнорируются.\n:* Дата и время ISO 8601: <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (знаки препинания и <kbd>Z</kbd> необязательны)\n:* Дата и время ISO 8601 с (игнорируемой) дробной частью секунд: <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>.<var>00001</var>Z</kbd> (дефисы, двоеточия и <kbd>Z</kbd> необязательны)\n:* Формат MediaWiki: <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Общий числовой формат: <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (необязательный часовой пояс <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd> или <kbd>-<var>##</var></kbd> игнорируется)\n:* Формат EXIF: <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Формат RFC 2822 (часовой пояс может быть опущен): <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Формат RFC 850 (часовой пояс может быть опущен): <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Формат ctime языка программирования C: <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Количество секунд, прошедших с 1970-01-01T00:00:00Z, в виде челого числа с от 1 до 13 знаками (исключая <kbd>0</kbd>)\n:* Строка <kbd>now</kbd>\n;альтернативный разделитель значений\n:Параметры, принимающие несколько значений, обычно отправляются со значениями, разделёнными с помощью символа пайпа, например, <kbd>param=value1|value2</kbd> или <kbd>param=value1%7Cvalue2</kbd>. Если значение должно содержать символ пайпа, используйте U+001F (Unit Separator) в качестве разделителя ''и'' добавьте в начало значения U+001F, например, <kbd>param=%1Fvalue1%1Fvalue2</kbd>.",
        "api-help-param-direction": "В каком порядке перечислять:\n;newer: Начать с самых старых. Обратите внимание: $1start должно быть раньше $1end.\n;older: Начать с самых новых (по умолчанию). Обратите внимание: $1start должно быть позже $1end.",
        "api-help-param-continue": "Когда доступно больше результатов, используйте это для продолжения.",
        "api-help-param-no-description": "<span class=\"apihelp-empty\">(описание отсутствует)</span>",
+       "api-help-param-maxbytes": "Не может быть длиннее $1 {{PLURAL:$1|байта|байтов}}.",
+       "api-help-param-maxchars": "Не может быть длиннее $1 {{PLURAL:$1|символа|символов}}.",
        "api-help-examples": "Пример{{PLURAL:$1||ы}}:",
        "api-help-permissions": "{{PLURAL:$1|Разрешение|Разрешения}}:",
        "api-help-permissions-granted-to": "{{PLURAL:$1|Гарантируется}}: $2",
        "apierror-blockedfrommail": "Отправка электронной почты была для вас заблокирована.",
        "apierror-blocked": "Редактирование было для вас заблокировано.",
        "apierror-botsnotsupported": "Этот интерфейс не поддерживается для ботов.",
-       "apierror-cannot-async-upload-file": "Параметры <var>async</var> и <var>file</var> не могут применяться вместе. Если вы хотите ассинхронно обработать загруженный файл, сначала загрузите его в тайник (используя параметр <var>stash</var>), а затем опубликуйте этот файл ассинхронно (используя параметры <var>filekey</var> и <var>async</var>).",
+       "apierror-cannot-async-upload-file": "Параметры <var>async</var> и <var>file</var> не могут применяться вместе. Если вы хотите ассинхронно обработать загруженный файл, сначала загрузите его во временное хранилище (используя параметр <var>stash</var>), а затем опубликуйте этот файл ассинхронно (используя параметры <var>filekey</var> и <var>async</var>).",
        "apierror-cannotreauthenticate": "Это действие недоступно, так как ваша личность не может быть подтверждена.",
        "apierror-cannotviewtitle": "У вас нет прав на просмотр $1.",
        "apierror-cantblock-email": "У вас нет прав блокировать участникам отправку электронной почты через интерфейс вики.",
        "apierror-invalidurlparam": "Некорректное значение <var>$1urlparam</var> (<kbd>$2=$3</kbd>).",
        "apierror-invaliduser": "Некорректное имя участника «$1».",
        "apierror-invaliduserid": "Некорректный идентификатор участника <var>$1</var>.",
+       "apierror-maxbytes": "Параметр <var>$1</var> не может быть длиннее $2 {{PLURAL:$2|байта|байтов}}",
+       "apierror-maxchars": "Параметр <var>$1</var> не может быть длиннее $2 {{PLURAL:$2|символа|символов}}",
        "apierror-maxlag-generic": "Ожидание сервера базы данных: $1 {{PLURAL:$1|секунда|секунды|секунд}} задержки.",
        "apierror-maxlag": "Ожидание $2: $1 {{PLURAL:$1|секунда|секунды|секунд}} задержки.",
        "apierror-mimesearchdisabled": "Поиск по MIME отключен в жадном режиме.",
        "apierror-mustbeloggedin-generic": "Вы должны быть авторизованы.",
        "apierror-mustbeloggedin-linkaccounts": "Вы должны быть авторизованы для привязывания аккаунтов.",
        "apierror-mustbeloggedin-removeauth": "Вы должны быть авторизованы для удаления аутентификационных данных.",
-       "apierror-mustbeloggedin-uploadstash": "Тайник Ð·Ð°Ð³Ñ\80Ñ\83зки (upload stash) Ð´Ð¾Ñ\81Ñ\82Ñ\83пен только для авторизованных участников.",
+       "apierror-mustbeloggedin-uploadstash": "Ð\92Ñ\80еменное Ñ\85Ñ\80анилиÑ\89е Ð´Ð¾Ñ\81Ñ\82Ñ\83пно только для авторизованных участников.",
        "apierror-mustbeloggedin": "Вы должны быть авторизованы в $1.",
        "apierror-mustbeposted": "Модуль <kbd>$1</kbd> требует запроса POST.",
        "apierror-mustpostparams": "{{PLURAL:$2|Следующий параметр был найден|Следующие параметры были найдены}} в строке запроса, но {{PLURAL:$2|должен|должны}} находиться в теле POST: $1.",
        "apierror-sizediffdisabled": "Подсчёт разницы размеров отключён в жадном режиме.",
        "apierror-spamdetected": "Ваша правка была отклонена, так как содержит спам: <code>$1</code>.",
        "apierror-specialpage-cantexecute": "У вас нет прав, чтобы просматривать результаты этой служебной страницы.",
-       "apierror-stashedfilenotfound": "Невозможно найти файл в тайнике: $1.",
+       "apierror-stashedfilenotfound": "Невозможно найти файл во временном хранилище: $1.",
        "apierror-stashedit-missingtext": "Не найдено содержимого тайника для данного хэша.",
        "apierror-stashfailed-complete": "Загрузка по кусочкам уже завершена, проверьте статус для получения подробной информации.",
        "apierror-stashfailed-nosession": "Не найдено сессии загрузки по кусочкам с заданным ключом.",
-       "apierror-stashfilestorage": "Невозможно сохранить загрузку в тайник: $1",
+       "apierror-stashfilestorage": "Невозможно сохранить файл во временном хранилище: $1",
        "apierror-stashinvalidfile": "Некорректный файл в тайнике.",
        "apierror-stashnosuchfilekey": "Нет такого ключа файла: $1.",
        "apierror-stashpathinvalid": "Ключ файла относится к некорректному формату или сам некорректен: $1.",
        "apierror-stashwrongowner": "Некорректный владелец: $1",
-       "apierror-stashzerolength": "Файл имеет нулевую длину и не может быть сохранён в тайник: $1",
+       "apierror-stashzerolength": "Файл имеет нулевую длину и не может быть сохранён во временное хранилище: $1",
        "apierror-systemblocked": "Вы были заблокированы автоматически MediaWiki.",
        "apierror-templateexpansion-notwikitext": "Раскрытие шаблонов разрешено только для вики-текстового содержимого. $1 использует модель содержимого $2.",
        "apierror-timeout": "Сервер не ответил за ожидаемое время.",
        "apierror-unsupportedrepo": "Локальное хранилище файлов не поддерживает запрос всех изображений.",
        "apierror-upload-filekeyneeded": "Необходимо задать <var>filekey</var>, если <var>offset</var> не ноль.",
        "apierror-upload-filekeynotallowed": "Невозможно обработать <var>filekey</var>, если <var>offset</var> равен 0.",
-       "apierror-upload-inprogress": "Процесс загрузки из тайника уже запущен.",
+       "apierror-upload-inprogress": "Процесс загрузки из временного хранилища уже запущен.",
        "apierror-upload-missingresult": "Нет результатов данных статуса.",
        "apierror-urlparamnormal": "Невозможно нормализовать параметры изображения для $1.",
        "apierror-writeapidenied": "У вас нет прав на редактирование этой вики через API.",
        "apiwarn-badutf8": "Значение, переданное <var>$1</var>, содержит некорректные или ненормализованные данные. Текстовые данные должны быть корректным NFC-нормализованным Юникодом без символов управления C0, кроме HT (\\t), LF (\\n) и CR (\\r).",
        "apiwarn-checktoken-percentencoding": "Проверьте, что символы вроде «+» в токене корректно закодированы %-последовательностями в ссылке.",
        "apiwarn-compare-nocontentmodel": "Модель содержимого не может быть определена, предполагается $1.",
-       "apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> не поддерживается. Пожалуйста, вместо него используйте <kbd>prop=deletedrevisions</kbd> или <kbd>list=alldeletedrevisions</kbd>.",
+       "apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> устарел. Пожалуйста, вместо него используйте <kbd>prop=deletedrevisions</kbd> или <kbd>list=alldeletedrevisions</kbd>.",
        "apiwarn-deprecation-expandtemplates-prop": "Поскольку никакие значения не были указаны в параметре <var>prop</var>, был использован наследованный формат. Этот формат является устаревшим, и в будущем параметру <var>prop</var> будет присвоено значение по умолчанию, что приведёт к повсеместному использованию нового формата.",
        "apiwarn-deprecation-httpsexpected": "Использован HTTP, где ожидался HTTPS.",
-       "apiwarn-deprecation-login-botpw": "Вход в основной аккаунт через <kbd>action=login</kbd> не поддерживается и может быть отключен без предупреждения. Для продолжения авторизации с <kbd>action=login</kbd>, см.\n[[Special:BotPasswords]]. Для безопасного продолжения использования входа в основной аккаунт, см. <kbd>action=clientlogin</kbd>.",
+       "apiwarn-deprecation-login-botpw": "Вход в основной аккаунт через <kbd>action=login</kbd> устарел и может быть отключен без предупреждения. Для продолжения авторизации с <kbd>action=login</kbd>, см.\n[[Special:BotPasswords]]. Для безопасного продолжения использования входа в основной аккаунт, см. <kbd>action=clientlogin</kbd>.",
        "apiwarn-deprecation-login-nobotpw": "Вход в основной аккаунт через <kbd>action=login</kbd> не поддерживается и может быть отключен без предупреждения. Для безопасной авторизации, см. <kbd>action=clientlogin</kbd>.",
-       "apiwarn-deprecation-login-token": "Запрос токена через <kbd>action=login</kbd> не поддерживается. Вместо этого, см. <kbd>action=query&meta=tokens&type=login</kbd>.",
+       "apiwarn-deprecation-login-token": "Запрос токена через <kbd>action=login</kbd> устарел. Используйте <kbd>action=query&meta=tokens&type=login</kbd>.",
        "apiwarn-deprecation-parameter": "Параметр <var>$1</var> не поддерживается.",
-       "apiwarn-deprecation-parse-headitems": "<kbd>prop=headitems</kbd> не поддерживается с MediaWiki 1.28. Используйте <kbd>prop=headhtml</kbd> при создании новых HTML документов, или <kbd>prop=modules|jsconfigvars</kbd> при обновлении документов на стороне клиента.",
-       "apiwarn-deprecation-purge-get": "Использование <kbd>action=purge</kbd> посредством GET не поддерживается. Используйте POST.",
+       "apiwarn-deprecation-parse-headitems": "<kbd>prop=headitems</kbd> устарело с MediaWiki 1.28. Используйте <kbd>prop=headhtml</kbd> при создании новых HTML документов или <kbd>prop=modules|jsconfigvars</kbd> при обновлении документов на стороне клиента.",
+       "apiwarn-deprecation-purge-get": "Использование <kbd>action=purge</kbd> посредством GET устарело. Используйте POST.",
        "apiwarn-deprecation-withreplacement": "<kbd>$1</kbd> не поддерживается. Пожалуйста, используйте <kbd>$2</kbd>.",
        "apiwarn-difftohidden": "Невозможно сравнить с r$1: содержимое скрыто.",
        "apiwarn-errorprinterfailed": "Сборщик ошибок упал. Будет совершена повторная попытка без параметров.",
        "apiwarn-tokens-origin": "Токены не могут быть получены, пока не применено правило ограничения домена.",
        "apiwarn-toomanyvalues": "Слишком много значений передано параметру <var>$1</var>. Максимальное число — $2.",
        "apiwarn-truncatedresult": "Результат был усечён, поскольку в противном случае он был бы больше лимита в $1 {{PLURAL:$1|байт|байта|байт}}.",
-       "apiwarn-unclearnowtimestamp": "Передача «$2» в качестве параметра временной метки <var>$1</var> не поддерживается. Если по какой-то причине вы хотите прямо указать текущее время без вычисления его на стороне клиента, используйте <kbd>now</kbd>.",
+       "apiwarn-unclearnowtimestamp": "Передача «$2» в качестве параметра временной метки <var>$1</var> устарело. Если по какой-то причине вы хотите прямо указать текущее время без вычисления его на стороне клиента, используйте <kbd>now</kbd>.",
        "apiwarn-unrecognizedvalues": "{{PLURAL:$3|Нераспознанное значение|Нераспознанные значения}} параметра <var>$1</var>: $2.",
        "apiwarn-unsupportedarray": "Параметр <var>$1</var> использует неподдерживаемый синтаксис массивов PHP.",
        "apiwarn-urlparamwidth": "Значение ширины ($2), переданное в <var>$1urlparam</var>, было проигнорировано в пользу значения ($3), полученного из параметров <var>$1urlwidth</var>/<var>$1urlheight</var>.",
index 1e20082..602c0ac 100644 (file)
@@ -97,17 +97,17 @@ class LCStoreStaticArray implements LCStore {
                $data = $encoded[1];
 
                switch ( $type ) {
-               case 'v':
-                       return $data;
-               case 's':
-                       return unserialize( $data );
-               case 'a':
-                       return array_map( function ( $v ) {
-                               return LCStoreStaticArray::decode( $v );
-                       }, $data );
-               default:
-                       throw new RuntimeException(
-                               'Unable to decode ' . var_export( $encoded, true ) );
+                       case 'v':
+                               return $data;
+                       case 's':
+                               return unserialize( $data );
+                       case 'a':
+                               return array_map( function ( $v ) {
+                                       return LCStoreStaticArray::decode( $v );
+                               }, $data );
+                       default:
+                               throw new RuntimeException(
+                                       'Unable to decode ' . var_export( $encoded, true ) );
                }
        }
 
index b4a8ca8..db1f599 100644 (file)
@@ -39,7 +39,8 @@ class ChangeTags {
                'mw-changed-redirect-target',
                'mw-blank',
                'mw-replace',
-               'mw-rollback'
+               'mw-rollback',
+               'mw-undo',
        ];
 
        /**
index f454bd4..be802f9 100644 (file)
@@ -304,40 +304,40 @@ class SquidPurgeClient {
         */
        protected function processReadBuffer() {
                switch ( $this->readState ) {
-               case 'idle':
-                       return 'done';
-               case 'status':
-               case 'header':
-                       $lines = explode( "\r\n", $this->readBuffer, 2 );
-                       if ( count( $lines ) < 2 ) {
+                       case 'idle':
                                return 'done';
-                       }
-                       if ( $this->readState == 'status' ) {
-                               $this->processStatusLine( $lines[0] );
-                       } else { // header
-                               $this->processHeaderLine( $lines[0] );
-                       }
-                       $this->readBuffer = $lines[1];
-                       return 'continue';
-               case 'body':
-                       if ( $this->bodyRemaining !== null ) {
-                               if ( $this->bodyRemaining > strlen( $this->readBuffer ) ) {
-                                       $this->bodyRemaining -= strlen( $this->readBuffer );
-                                       $this->readBuffer = '';
+                       case 'status':
+                       case 'header':
+                               $lines = explode( "\r\n", $this->readBuffer, 2 );
+                               if ( count( $lines ) < 2 ) {
                                        return 'done';
+                               }
+                               if ( $this->readState == 'status' ) {
+                                       $this->processStatusLine( $lines[0] );
+                               } else { // header
+                                       $this->processHeaderLine( $lines[0] );
+                               }
+                               $this->readBuffer = $lines[1];
+                               return 'continue';
+                       case 'body':
+                               if ( $this->bodyRemaining !== null ) {
+                                       if ( $this->bodyRemaining > strlen( $this->readBuffer ) ) {
+                                               $this->bodyRemaining -= strlen( $this->readBuffer );
+                                               $this->readBuffer = '';
+                                               return 'done';
+                                       } else {
+                                               $this->readBuffer = substr( $this->readBuffer, $this->bodyRemaining );
+                                               $this->bodyRemaining = 0;
+                                               $this->nextRequest();
+                                               return 'continue';
+                                       }
                                } else {
-                                       $this->readBuffer = substr( $this->readBuffer, $this->bodyRemaining );
-                                       $this->bodyRemaining = 0;
-                                       $this->nextRequest();
-                                       return 'continue';
+                                       // No content length, read all data to EOF
+                                       $this->readBuffer = '';
+                                       return 'done';
                                }
-                       } else {
-                               // No content length, read all data to EOF
-                               $this->readBuffer = '';
-                               return 'done';
-                       }
-               default:
-                       throw new MWException( __METHOD__ . ': unexpected state' );
+                       default:
+                               throw new MWException( __METHOD__ . ': unexpected state' );
                }
        }
 
index 1424f33..ed5ec1a 100644 (file)
@@ -125,7 +125,9 @@ class WikiImporter {
                if ( is_callable( $this->mNoticeCallback ) ) {
                        call_user_func( $this->mNoticeCallback, $msg, $params );
                } else { # No ImportReporter -> CLI
-                       echo wfMessage( $msg, $params )->text() . "\n";
+                       // T177997: the command line importers should call setNoticeCallback()
+                       // for their own custom callback to echo the notice
+                       wfDebug( wfMessage( $msg, $params )->text() . "\n" );
                }
        }
 
@@ -543,13 +545,13 @@ class WikiImporter {
                $buffer = "";
                while ( $this->reader->read() ) {
                        switch ( $this->reader->nodeType ) {
-                       case XMLReader::TEXT:
-                       case XMLReader::CDATA:
-                       case XMLReader::SIGNIFICANT_WHITESPACE:
-                               $buffer .= $this->reader->value;
-                               break;
-                       case XMLReader::END_ELEMENT:
-                               return $buffer;
+                               case XMLReader::TEXT:
+                               case XMLReader::CDATA:
+                               case XMLReader::SIGNIFICANT_WHITESPACE:
+                                       $buffer .= $this->reader->value;
+                                       break;
+                               case XMLReader::END_ELEMENT:
+                                       return $buffer;
                        }
                }
 
index 53abf4b..87d3be3 100644 (file)
@@ -86,6 +86,7 @@
        "config-db-host": "Datu-basearen zerbitzaria:",
        "config-db-host-help": "Zure datu-basearen zerbitzaria beste zerbitzari batean badago, sartu ostalariaren izena edo IP helbidea hemen.\n\nPartekatutako web-ostatua erabiltzen ari bazara, zure ostalaritza-hornitzaileak dokumentazio-ostalariaren izen egokia eman beharko lizuke.\n\nWindows zerbitzari batean instalatzen bazara eta MySQL erabiliz, \"localhost\" agian ez du zerbitzariaren izenerako funtzionatuko. Ez badago, saiatu \"127.0.0.1\" tokiko IP helbideetarako.\n\nPostgreSQL erabiltzen ari bazara, utzi eremu hau hutsik Unix socket bidez konektatzeko.",
        "config-db-host-oracle": "Datu-baseko TNS:",
+       "config-db-host-oracle-help": "Sartu baliozko [http://download.oracle.com/docs/cd/B28359_01/network.111/b28317/tnsnames.htm Konekzio izan lokala]; instalazio honetarako tnsnames.ora fitxategia ikusgai egon behar da. <br/> Bezeroen 10g liburutegiak edo berriagoak erabiltzen ari bazara, [http://download.oracle.com/docs/cd/E11882_01/network.112 ere erabil dezakezu. /e10836/naming.htm Konektatzeko erraza] izendatzeko metodoa.",
        "config-db-wiki-settings": "Wiki hau identifikatu",
        "config-db-name": "Datu-base izena:",
        "config-db-name-help": "Aukeratu zure Wikia identifikatzen duen izena.\nEzin dira espazioak eabili.\n\nErabiltzen ari bazara web hosting partekatua, hostin-eko hornitzaileak emango dizu datu-basearen izen espezifikoa edo kontrol panel baten bitzrtez zure datu-basea sortzea utziko dizu.",
        "config-db-schema-help": "Patroi hau normalean egokia da. Bakarrik aldatu beharrezkoa bada.",
        "config-pg-test-error": "Ezin da datu-basearekin konektatu <strong>$1</strong>: $2",
        "config-sqlite-dir": "SQLite -eko informazioaren direktorioa:",
+       "config-sqlite-dir-help": "SQLite-k datu guztiak fitxategi bakarrean gordetzen ditu.\n\nHornitu duzun direktorioa web zerbitzariaren bidez idatzia izateko aukera eman beharko duu instalazioan zehar.\n\n<Strong>Ez</strong> da webgunearen bidez eskuragarri egon behar; horregatik zure PHP fitxategiak non dauden ez dugu erakutsi.\n\nInstalatzaileak <code>.htaccess</code> fitxategi bat idatziko du bertan, baina horrek huts egiten badu zure datu base gordinera norbait sar daiteke.\nErabiltzaileen datu gordinak (helbide elektronikoak, pasahitzak), ezabatutako berrikusketa eta gainontzeko datu mugatuak ere barnean hartuz.\n\nDatu-basea beste nonbait jartzearen inguruan hausnartu, adibidez, <code>/var/lib/mediawiki/yourwiki</code>-n.",
        "config-oracle-def-ts": "Taula-toki lehenetsia:",
        "config-oracle-temp-ts": "Aldi baterako taula:",
        "config-type-mysql": "MySQL (edo bateragarria)",
        "config-postgres-old": "PostgreSQL $1 edo berriagoa behar da. Zuk $2 badaukazu.",
        "config-mssql-old": "Microsoft SQL Server $1 edo berriagoa behar da. Zuk $2 badaukazu.",
        "config-sqlite-name-help": "Aukeratu zure wikia identifikatzen duen izen bat.\nEz erabili zuriunerik edo gidoirik.\nHau erabiliko da SQLite datuen artxiborako.",
+       "config-sqlite-parent-unwritable-group": "Ezin da datu-direktorioa sortu <code><nowiki>$1</nowiki></code>, web zerbitzariak ezin baitu <code><nowiki>$2</nowiki></code> guraso direktorioan idatzi.\n\nInstalatzaileak webgunea exekutatzen ari den bitartean zure erabiltzailea zehaztu du.\nEgin <code><nowiki>$3</nowiki></code> direktorioan idazteko gai izatea jarraitzeko.\nUnix/Linux sistema batean:\n\n<pre>cd $2\nmkdir $3\nchgrp $4 $3\nchmod g+w $3</pre>",
+       "config-sqlite-parent-unwritable-nogroup": "Ezin da datu-direktorioa sortu <code><nowiki>$1</nowiki></code>, web zerbitzariak ezin baitu <code><nowiki>$2</nowiki></code> guraso direktorioan idatzi.\n\nInstalatzaileak webgunea exekutatzen ari den bitartean zure erabiltzailea zehaztu dezake.\nEgin <code><nowiki>$3</nowiki></code> direktorioa globalean idazteko gai izatea (horretarako eta besteentzako!) jarraitzeko.\nUnix/Linux sistema batean:\n\n<pre>cd $2\nmkdir $3\nchmod a+w $3</pre>",
        "config-sqlite-mkdir-error": "Arazo bat sortu da datuen direktorioa sortzerakoan \"$1\".\nLokalizazio egiaztatu eta berriro saiatu.",
        "config-sqlite-dir-unwritable": "Ezin izan da \"$1\" direktoriora idatzi.\nAldatu baimenak web-serbidoreak idatzi ahal izateko, eta berriro saiatu.",
        "config-sqlite-connection-error": "$1.\n\nDatu direktorioa eta datu-basea egiaztatu eta berriro saiatu.",
        "config-mysql-myisam": "MyISAM",
        "config-mysql-myisam-dep": "<strong>Oharra:</strong> MyISAM MySQL biltegiratze-motor gisa aukeratu duzu, MediaWikirekin erabiltzeko gomendagarria ez dena honengatik:\n*taula blokeoak direla-eta gauza gutxi onartu ohi du\n*beste motore batzuek baino ustelkeria gehiago izateko aukerak ditu\n*MediaWiki-ren kode baseak ez du beti kudeatzen MyISAM behar bezala\n\nZure MySQL instalazioa InnoDB onartzen badu, hori aukeratzeko gomendatzen da.\nZure MySQL instalazioa InnoDB ez badu onartzen, baliteke bertsioa berritzeko ordua izatea.",
        "config-mysql-only-myisam-dep": "<strong> Oharra: </strong> MyISAM makinaren MySQL biltegiratze motarako bakarra da, eta hau ez da MediaWiki-rekin erabiltzeko gomendatzen, honengatik:\n* maiztasunez taula blokeoek konkurrentzia ez dute onartzen \n* Beste motore batzuek baino ustelkeria gehiago izaten dute\n* MediaWiki-ren kodekak ez du beti kudeatzen MyISAM behar bezala\n\nZure MySQL instalazioak ez du InnoDB onartzen, agian bertsio berritzeko ordua da.",
+       "config-mysql-engine-help": "<strong>InnoDB</strong> ia beti aukerarik onena da, konkurrentzia-laguntza ona duelako.\n\n<strong>MyISAM</strong> erabiltzaile bakarreko edo irakurketa bakarreko instalazioetan azkarragoa izan daiteke.\nMyISAM datu-basea gehiagokotan hondatuta ageri da InnoDB datu-baseareakin baino.",
        "config-mysql-charset": "Datu-basearen karaktere multzoa:",
        "config-mysql-binary": "Bitarra",
        "config-mysql-utf8": "UTF-8",
+       "config-mysql-charset-help": "<strong>Modu bitarrean</strong>, MediaWiki-k UTF-8 testua datu-baseko eremu bitarretan gordetzen du.\nHau MySQL-en UTF-8 modua baino eraginkorragoa da eta Unicode karaktereen barruti osoa erabiltzea ahalbidetzen du.\n\n<Strong>UTF-8 moduan</strong>, MySQL-k jakingo du zer karakterean zure datuak konfiguratzen dituen, aurkeztu eta behar bezala bihurtzeko, baina ez dizkizu karaktereak [https://en.wikipedia.org/wiki/Mapping_of_Unicode_character_planes Oinarrizko Eleaniztasun Plana]-ren gainetik gordetzen utziko.",
        "config-mssql-auth": "Autentifikazio mota:",
        "config-mssql-install-auth": "Aukeratu instalazio prozesuan zehar datu-basera konektatzeko erabiliko den autentifikazio mota.\n\"{{Int: config-mssql-windowsauth}}\" hautatzen baduzu, web zerbitzariak duen edozein erabiltzailek erabiliko duen kredentziala erabiliko da.",
        "config-mssql-web-auth": "Aukeratu instalazio prozesuan zehar datu-base zerbitzariari konektatzeko erabiliko den autentifikazio mota.\n\"{{Int: config-mssql-windowsauth}}\" hautatzen baduzu, web zerbitzariak duen edozein erabiltzailek erabiliko duen kredentziala erabiliko da.",
        "config-subscribe-help": "Hau bolumen baxuko oharren iragarkietarako erabiltzen den zerrenda da, segurtasun iragarki garrantzitsuak barne.\nHarpidetu horretara eta zure MediaWiki instalazioa eguneratu bertsio berriak ateratzean.",
        "config-subscribe-noemail": "Ohar iragarkien posta elektroniko zerrendara harpidetzen saiatu zara, helbide elektroniko bat eman gabe.\nEman ezazu helbide elektronikoa posta zerrendan harpidetzea nahi baduzu.",
        "config-pingback": "Elkarbanatu informazioa instalazio prozesuari buruz MediaWiki-ko sustatzaileekin.",
+       "config-pingback-help": "Aukera hau hautatzen baduzu, MediaWiki-k https://www.mediawiki.org guneari periodikoki ping egingo dio MediaWiki-ren instantzia honi buruzko oinarrizko datuekin. Datu horietan, adibidez, sistema mota, PHP bertsioa eta hautatutako datu-base motorra agertzen dira. Wikimedia Fundazioak datu hauek partekatzen dituu MediaWiki garatzaileekin etorkizuneko garapen-ahaleginak gidatzeko. Ondorengo datuak zure sistemara bidaliko dira:\n<pre>$1</pre>",
        "config-almost-done": "Ia amaitu duzu!\nFalta den konfigurazioa saltatu ahal duzu eta zuzenean wikia instalatu.",
        "config-optional-continue": "Galdera gehiago egin.",
        "config-optional-skip": "Aspertuta nago, wikia instalatu bakarrik.",
        "config-profile-no-anon": "Kontua sortzea beharrezkoa da",
        "config-profile-fishbowl": "Baimendutako editoreak bakarrik",
        "config-profile-private": "Wiki pribatua",
+       "config-profile-help": "Wikiak hobeto funtzionatzen dute ahalik eta jende gehiagok editatzeko aukera duenean.\nMediaWikian, erraza da azken aldaketak berrikustea eta erabiltzaile desegokiek egindako kalteak konpontzea.\n\nHala eta guztiz ere, askok MediaWiki rol ezberdinetarako baliagarri ikusi dute, nahiz eta batzuetan erraza ez izan wikiaren onureen inguruan konbentzitzea.\nBeraz, aukera zuk egiten duzu.\n\n<Strong>{{int:config-profile-wiki}}</strong> ereduak edonork edita dezake, nahiz eta saioa hasi.\n<Strong>{{int:config-profile-no-anon}}</strong> -ko wiki batek aparteko erantzukizuna ematen du, baina aldi baterako laguntzaileak alda ditzake.\n\n<Strong>{{int:config-profile-fishbowl}}</strong> planteamenduak aukera ematen du baimendutako erabiltzaileek editatzeko, baina publikoak orrialdeak ikusi ditzake, historiak barne.\n<Strong>{{int:config-profile-private}}</strong> bat soilik onartutako erabiltzaileei orriak ikusteko aukera ematen die, talde berak editatu ahal izateko.\n\nErabiltzaileen eskubideen ezarpen konplexuagoak eskuragarri daude instalazioa egin ondoren, ikus ezazu [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:User_rights eskuzko sarrera garrantzitsua].",
        "config-license": "Copyright eta lizentzia:",
        "config-license-none": "Ez jarri lizentzia orriaren baimenik",
        "config-license-cc-by-sa": "Creative Commons-eko esleipen-lizentzia",
        "config-license-cc-by": "Creative Commons Aitorpena",
+       "config-license-cc-by-nc-sa": "Creative Commons Attribution-NonCommercial-ShareAlike",
        "config-license-cc-0": "Creative Commons Zero (Jabari Publikoa)",
        "config-license-gfdl": "\nGNU Free Documentation License 1.3 edo berriagoa",
        "config-license-pd": "Domeinu Askea",
        "config-license-cc-choose": "Aukeratu Creative Commons lizentzia pertsonalizatua",
+       "config-license-help": "Wikilari publiko askok ekarpen guztiak jartzen dituzte [http://freedomdefined.org/Definition lizentzia aske] azpian.\nHonek komunitatearen jabetza zentzuaren kontzeptua sortzen laguntzen du eta epe luzerako ekarpena bultzatzen du.\nEz da, oro har, wiki pribatu edo korporatiborik behar.\n\nWikipediatik testua erabiltzeko aukera izan nahi baduzu eta Wikipediak zure wikietatik kopiatutako testua onartzeko gai izatea nahi baduzu,  <strong>{{int:config-license-cc-by-sa}}</strong> aukeratu beharko zenuke.\n\nWikipedia lehenago erabili izan du GNU Dokumentazio Librearen Lizentzia.\nGFDL baliozko lizentzia da, baina ulertzeko zaila da.\nGFDLren baimenarekin lotutako edukiak berrerabiltzea ere zaila da.",
        "config-email-settings": "E-posta hobespenak",
        "config-enable-email": "Aktibatu irteerako emaila.",
+       "config-enable-email-help": "Lan egiteko email-a nahi baduzu, [http://www.php.net/manual/en/mail.configuration.php PHP's mail settings] ondo konfiguratu egin behar da. Email ezaugarririk ez baduzu nahi, hemen kendu ditzakezu.",
        "config-email-user": "Aktibatu erabiltzaileen arteko emaila.",
        "config-email-user-help": "Baimena eman erabiltzaileei beraien artean emailak bidaltzeko, lehentasunetan aukera aktibatuta badaukate.",
        "config-email-usertalk": "Aktibatu erabiltzaileen eztabaida orrien jakinarazpena",
        "config-email-auth": "Aktibatu emailaren autentifikazioa.",
        "config-email-auth-help": "Aukera hau aktibatuta badago, erabiltzaileak konfirmatu behar du bere emaila, sortzerakoen edota aldetzerakoan bidali zaion linka erabiltzen.\n\nBakarrik kautotaku emailak gai izango dira beste erabiltzaileen emailak jasotzeko edota jakinarazpen emailak aldatzeko.\n\nAukera hau hautatzea <strong>gomendagarria</strong> da Wiki publikoentzat, emaileen erramintien abusua dela eta.",
        "config-email-sender": "Itzuli helbide elektronikoa:",
+       "config-email-sender-help": "Idatzi helbide elektronikoa bueltan mezuak jasotzeko helbide elektroniko gisa.\nErreboteak bidaliko dira horra.\nPosta-zerbitzari askok gutxienez domeinu izenaren zati bat behar dute baliozkoa izan dadin.",
        "config-upload-settings": "Irudi eta fitxategi igoerak",
        "config-upload-enable": "Fitxategi igoera gaitu",
        "config-upload-help": "Fitxategiak kargatzeak zure zerbitzaria segurtasun arriskuei eragin diezaioke.\nInformazio gehiagorako, irakurri [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security security section] eskuliburuan.\n\nFitxategiak igotzea aktibatzeko, aldatu <code> images </ code> subdirektorio modua MediaWiki-ren erroko direktorioaren azpian, web zerbitzariak honela idatz dezake.\nOndoren, gaitu aukera hau.",
        "config-skins-must-enable-some": "Gutxienez aukeratu behar duzu ikusizko estilo bat aktibatzeko.",
        "config-skins-must-enable-default": "Lehenetsia bezala aukeratu duzun ikusizko estilo aktibatuta egon behar da.",
        "config-install-alreadydone": "<strong>Oharra:</strong>Badirudi MediaWikia instalatu daukazula eta berriz instalatzen saiatzen ari zarela.\n\nMesedez, hurrengo orrian jarraitu",
+       "config-install-begin": "\"{{int:config-continue}}\" sakatuz, MediaWiki instalazioa hasiko duzu.\nAldaketak oraindik egin nahi badituzu, sakatu \"{{int:config-back}}\".",
        "config-install-step-done": "egina",
        "config-install-step-failed": "Huts egin du",
        "config-install-extensions": "Luzapenak barne",
        "config-install-interwiki-exists": "<strong>Oharra:</strong> Interwikiko taula badirudi sarrerak dituela. \nTaula estandarra saltatzen.",
        "config-install-stats": "Estatistikak hasten",
        "config-install-keys": "Gako sekretuak sortzen",
+       "config-insecure-keys": "<strong>Oharra:</strong> ($1) instalazioan zehar sortu {{PLURAL:$2|den|diren}} {{PLURAL:$2|gako segurua|gako seguruak}}ez d(ir)a guztiz segurua(k). Kontuan hartu {{PLURAL:$2|hau|hauek}} eskuz aldatzeko aukera.",
        "config-install-updates": "Saihestu egikaratzen behar ez diren aktualizazioak",
        "config-install-updates-failed": "<strong>Errore</strong> Sartzea eguneratze-gakoak taulen barruan huts egin du hurrengo errorearekin: $1",
        "config-install-sysop": "Administratzaile kontua sortzen",
        "config-install-mainpage-failed": "Orri nagusia ezin izan da txertatu: $1",
        "config-install-done": "<strong>Zorionak!</strong>\nMediaWiki instalatu duzu.\n\nInstalatzaileak <code>LocalSettings.php</code> fitxategia sortu egin du. \nZure konfigurazio guztia darama.\n\nDeskargatu egin beharko duzu eta zure wiki instalazio oinarrian jarri (index.php-rako direktorio berean). Deskarga automakikoki hasi behar izan da.\n\nDeskargatzeko aukerarik ez bazaizu eskaini, edo kantzelatu egin baduzu, hurrengo linkean klikatu berrabiarazteko deskarga:\n\n$3\n\n<strong>Oharra:</strong> Orain ez baduzu egiten, sortutako konfigurazio fitxategi hau ez da erabilgarri egongo geroago instalazioa bertan behera uzten baduzu deskargatu gabe.\n\nBehin hori eginda, <strong>[$2 zure wikia sartu]</strong> ahal duzu.",
        "config-install-done-path": "<strong>Zorionak!</strong>\nMediaWiki instalatu duzu.\n\nInstalatzaileak sortu egin du <code>LocalSettings.php</code>\nZure konfigurazio guztia dauka.\n\nDeskargatu egin behar duzu eta jarri <code>$4</code> -ean . Deskarga automakikoki hasiko da.\n\nEz badizu deskargatzeko aukerarik eman, edo kantzalatu egin baduzu, hurrengo linkean klikatu berrabiatzeko:\n\n$3\n\n<strong>Oharra:</strong> Instalazio prozesuatik ateratzen bazara konfigurazio artxikoa deskargatu barik, gero ez da egongo eskuragarri.\n\nBehin hori eginda, <strong>[$2 enter your wiki]</strong> ahal duzu.",
+       "config-install-success": "MediaWiki arrakastaz instalatu da. Orain <$1$2> bisitatu dezakezu zure wikia ikusteko.\nGalderarik izanez gero, begiratu gure maiztasunez egiten diren galderen zerrenda:\n<https://www.mediawiki.org/wiki/Manual:FAQ> edo erabili orrialde honi lotuta dauden laguntza foroetako bat.",
        "config-download-localsettings": "Jaitsi <code>LocalSettings.php</code>",
        "config-help": "Laguntza",
        "config-help-tooltip": "sakatu zabaltzeko",
index a9da366..be7e93d 100644 (file)
@@ -53,137 +53,137 @@ class MWMessagePack {
                }
 
                switch ( gettype( $value ) ) {
-               case 'NULL':
-                       return "\xC0";
+                       case 'NULL':
+                               return "\xC0";
 
-               case 'boolean':
-                       return $value ? "\xC3" : "\xC2";
+                       case 'boolean':
+                               return $value ? "\xC3" : "\xC2";
 
-               case 'double':
-               case 'float':
-                       return self::$bigendian
-                               ? "\xCB" . pack( 'd', $value )
-                               : "\xCB" . strrev( pack( 'd', $value ) );
+                       case 'double':
+                       case 'float':
+                               return self::$bigendian
+                                       ? "\xCB" . pack( 'd', $value )
+                                       : "\xCB" . strrev( pack( 'd', $value ) );
 
-               case 'string':
-                       $length = strlen( $value );
-                       if ( $length < 32 ) {
-                               return pack( 'Ca*', 0xA0 | $length, $value );
-                       } elseif ( $length <= 0xFFFF ) {
-                               return pack( 'Cna*', 0xDA, $length, $value );
-                       } elseif ( $length <= 0xFFFFFFFF ) {
-                               return pack( 'CNa*', 0xDB, $length, $value );
-                       }
-                       throw new InvalidArgumentException( __METHOD__
-                               . ": string too long (length: $length; max: 4294967295)" );
-
-               case 'integer':
-                       if ( $value >= 0 ) {
-                               if ( $value <= 0x7F ) {
-                                       // positive fixnum
-                                       return chr( $value );
-                               }
-                               if ( $value <= 0xFF ) {
-                                       // uint8
-                                       return pack( 'CC', 0xCC, $value );
-                               }
-                               if ( $value <= 0xFFFF ) {
-                                       // uint16
-                                       return pack( 'Cn', 0xCD, $value );
-                               }
-                               if ( $value <= 0xFFFFFFFF ) {
-                                       // uint32
-                                       return pack( 'CN', 0xCE, $value );
-                               }
-                               if ( $value <= 0xFFFFFFFFFFFFFFFF ) {
-                                       // uint64
-                                       $hi = ( $value & 0xFFFFFFFF00000000 ) >> 32;
-                                       $lo = $value & 0xFFFFFFFF;
-                                       return self::$bigendian
-                                               ? pack( 'CNN', 0xCF, $lo, $hi )
-                                               : pack( 'CNN', 0xCF, $hi, $lo );
-                               }
-                       } else {
-                               if ( $value >= -32 ) {
-                                       // negative fixnum
-                                       return pack( 'c', $value );
-                               }
-                               if ( $value >= -0x80 ) {
-                                       // int8
-                                       return pack( 'Cc', 0xD0, $value );
-                               }
-                               if ( $value >= -0x8000 ) {
-                                       // int16
-                                       $p = pack( 's', $value );
-                                       return self::$bigendian
-                                               ? pack( 'Ca2', 0xD1, $p )
-                                               : pack( 'Ca2', 0xD1, strrev( $p ) );
-                               }
-                               if ( $value >= -0x80000000 ) {
-                                       // int32
-                                       $p = pack( 'l', $value );
-                                       return self::$bigendian
-                                               ? pack( 'Ca4', 0xD2, $p )
-                                               : pack( 'Ca4', 0xD2, strrev( $p ) );
-                               }
-                               if ( $value >= -0x8000000000000000 ) {
-                                       // int64
-                                       // pack() does not support 64-bit ints either so pack into two 32-bits
-                                       $p1 = pack( 'l', $value & 0xFFFFFFFF );
-                                       $p2 = pack( 'l', ( $value >> 32 ) & 0xFFFFFFFF );
-                                       return self::$bigendian
-                                               ? pack( 'Ca4a4', 0xD3, $p1, $p2 )
-                                               : pack( 'Ca4a4', 0xD3, strrev( $p2 ), strrev( $p1 ) );
+                       case 'string':
+                               $length = strlen( $value );
+                               if ( $length < 32 ) {
+                                       return pack( 'Ca*', 0xA0 | $length, $value );
+                               } elseif ( $length <= 0xFFFF ) {
+                                       return pack( 'Cna*', 0xDA, $length, $value );
+                               } elseif ( $length <= 0xFFFFFFFF ) {
+                                       return pack( 'CNa*', 0xDB, $length, $value );
                                }
-                       }
-                       throw new InvalidArgumentException( __METHOD__ . ": invalid integer '$value'" );
-
-               case 'array':
-                       $buffer = '';
-                       $length = count( $value );
-                       if ( $length > 0xFFFFFFFF ) {
                                throw new InvalidArgumentException( __METHOD__
-                                       . ": array too long (length: $length, max: 4294967295)" );
-                       }
+                                       . ": string too long (length: $length; max: 4294967295)" );
 
-                       $index = 0;
-                       foreach ( $value as $k => $v ) {
-                               if ( $index !== $k || $index === $length ) {
-                                       break;
+                       case 'integer':
+                               if ( $value >= 0 ) {
+                                       if ( $value <= 0x7F ) {
+                                               // positive fixnum
+                                               return chr( $value );
+                                       }
+                                       if ( $value <= 0xFF ) {
+                                               // uint8
+                                               return pack( 'CC', 0xCC, $value );
+                                       }
+                                       if ( $value <= 0xFFFF ) {
+                                               // uint16
+                                               return pack( 'Cn', 0xCD, $value );
+                                       }
+                                       if ( $value <= 0xFFFFFFFF ) {
+                                               // uint32
+                                               return pack( 'CN', 0xCE, $value );
+                                       }
+                                       if ( $value <= 0xFFFFFFFFFFFFFFFF ) {
+                                               // uint64
+                                               $hi = ( $value & 0xFFFFFFFF00000000 ) >> 32;
+                                               $lo = $value & 0xFFFFFFFF;
+                                               return self::$bigendian
+                                                       ? pack( 'CNN', 0xCF, $lo, $hi )
+                                                       : pack( 'CNN', 0xCF, $hi, $lo );
+                                       }
                                } else {
-                                       $index++;
+                                       if ( $value >= -32 ) {
+                                               // negative fixnum
+                                               return pack( 'c', $value );
+                                       }
+                                       if ( $value >= -0x80 ) {
+                                               // int8
+                                               return pack( 'Cc', 0xD0, $value );
+                                       }
+                                       if ( $value >= -0x8000 ) {
+                                               // int16
+                                               $p = pack( 's', $value );
+                                               return self::$bigendian
+                                                       ? pack( 'Ca2', 0xD1, $p )
+                                                       : pack( 'Ca2', 0xD1, strrev( $p ) );
+                                       }
+                                       if ( $value >= -0x80000000 ) {
+                                               // int32
+                                               $p = pack( 'l', $value );
+                                               return self::$bigendian
+                                                       ? pack( 'Ca4', 0xD2, $p )
+                                                       : pack( 'Ca4', 0xD2, strrev( $p ) );
+                                       }
+                                       if ( $value >= -0x8000000000000000 ) {
+                                               // int64
+                                               // pack() does not support 64-bit ints either so pack into two 32-bits
+                                               $p1 = pack( 'l', $value & 0xFFFFFFFF );
+                                               $p2 = pack( 'l', ( $value >> 32 ) & 0xFFFFFFFF );
+                                               return self::$bigendian
+                                                       ? pack( 'Ca4a4', 0xD3, $p1, $p2 )
+                                                       : pack( 'Ca4a4', 0xD3, strrev( $p2 ), strrev( $p1 ) );
+                                       }
                                }
-                       }
-                       $associative = $index !== $length;
+                               throw new InvalidArgumentException( __METHOD__ . ": invalid integer '$value'" );
 
-                       if ( $associative ) {
-                               if ( $length < 16 ) {
-                                       $buffer .= pack( 'C', 0x80 | $length );
-                               } elseif ( $length <= 0xFFFF ) {
-                                       $buffer .= pack( 'Cn', 0xDE, $length );
-                               } else {
-                                       $buffer .= pack( 'CN', 0xDF, $length );
+                       case 'array':
+                               $buffer = '';
+                               $length = count( $value );
+                               if ( $length > 0xFFFFFFFF ) {
+                                       throw new InvalidArgumentException( __METHOD__
+                                               . ": array too long (length: $length, max: 4294967295)" );
                                }
+
+                               $index = 0;
                                foreach ( $value as $k => $v ) {
-                                       $buffer .= self::pack( $k );
-                                       $buffer .= self::pack( $v );
+                                       if ( $index !== $k || $index === $length ) {
+                                               break;
+                                       } else {
+                                               $index++;
+                                       }
                                }
-                       } else {
-                               if ( $length < 16 ) {
-                                       $buffer .= pack( 'C', 0x90 | $length );
-                               } elseif ( $length <= 0xFFFF ) {
-                                       $buffer .= pack( 'Cn', 0xDC, $length );
+                               $associative = $index !== $length;
+
+                               if ( $associative ) {
+                                       if ( $length < 16 ) {
+                                               $buffer .= pack( 'C', 0x80 | $length );
+                                       } elseif ( $length <= 0xFFFF ) {
+                                               $buffer .= pack( 'Cn', 0xDE, $length );
+                                       } else {
+                                               $buffer .= pack( 'CN', 0xDF, $length );
+                                       }
+                                       foreach ( $value as $k => $v ) {
+                                               $buffer .= self::pack( $k );
+                                               $buffer .= self::pack( $v );
+                                       }
                                } else {
-                                       $buffer .= pack( 'CN', 0xDD, $length );
-                               }
-                               foreach ( $value as $v ) {
-                                       $buffer .= self::pack( $v );
+                                       if ( $length < 16 ) {
+                                               $buffer .= pack( 'C', 0x90 | $length );
+                                       } elseif ( $length <= 0xFFFF ) {
+                                               $buffer .= pack( 'Cn', 0xDC, $length );
+                                       } else {
+                                               $buffer .= pack( 'CN', 0xDD, $length );
+                                       }
+                                       foreach ( $value as $v ) {
+                                               $buffer .= self::pack( $v );
+                                       }
                                }
-                       }
-                       return $buffer;
+                               return $buffer;
 
-               default:
-                       throw new InvalidArgumentException( __METHOD__ . ': unsupported type ' . gettype( $value ) );
+                       default:
+                               throw new InvalidArgumentException( __METHOD__ . ': unsupported type ' . gettype( $value ) );
                }
        }
 }
index ea7f9a6..9761108 100644 (file)
@@ -479,23 +479,23 @@ class XmlTypeCheck {
                                continue;
                        }
                        switch ( $field ) {
-                       case 'typepublic':
-                       case 'typesystem':
-                               $parsed['type'] = $value;
-                               break;
-                       case 'pubquote':
-                       case 'pubapos':
-                               $parsed['publicid'] = $value;
-                               break;
-                       case 'pubsysquote':
-                       case 'pubsysapos':
-                       case 'sysquote':
-                       case 'sysapos':
-                               $parsed['systemid'] = $value;
-                               break;
-                       case 'internal':
-                               $parsed['internal'] = $value;
-                               break;
+                               case 'typepublic':
+                               case 'typesystem':
+                                       $parsed['type'] = $value;
+                                       break;
+                               case 'pubquote':
+                               case 'pubapos':
+                                       $parsed['publicid'] = $value;
+                                       break;
+                               case 'pubsysquote':
+                               case 'pubsysapos':
+                               case 'sysquote':
+                               case 'sysapos':
+                                       $parsed['systemid'] = $value;
+                                       break;
+                               case 'internal':
+                                       $parsed['internal'] = $value;
+                                       break;
                        }
                }
                return $parsed;
index ac28076..562819e 100644 (file)
@@ -900,6 +900,40 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         *     );
         * @endcode
         *
+        * Example usage (key holding an LRU subkey:value map; this can avoid flooding cache with
+        * keys for an unlimited set of (constraint,situation) pairs, thereby avoiding elevated
+        * cache evictions and wasted memory):
+        * @code
+        *     $catSituationTolerabilityCache = $this->cache->getWithSetCallback(
+        *         // Group by constraint ID/hash, cat family ID/hash, or something else useful
+        *         $this->cache->makeKey( 'cat-situation-tolerablity-checks', $groupKey ),
+        *         WANObjectCache::TTL_DAY, // rarely used groups should fade away
+        *         // The $scenarioKey format is $constraintId:<ID/hash of $situation>
+        *         function ( $cacheMap ) use ( $scenarioKey, $constraintId, $situation ) {
+        *             $lruCache = MapCacheLRU::newFromArray( $cacheMap ?: [], self::CACHE_SIZE );
+        *             $result = $lruCache->get( $scenarioKey ); // triggers LRU bump if present
+        *             if ( $result === null || $this->isScenarioResultExpired( $result ) ) {
+        *                 $result = $this->checkScenarioTolerability( $constraintId, $situation );
+        *                 $lruCache->set( $scenarioKey, $result, 3 / 8 );
+        *             }
+        *             // Save the new LRU cache map and reset the map's TTL
+        *             return $lruCache->toArray();
+        *         },
+        *         [
+        *             // Once map is > 1 sec old, consider refreshing
+        *             'ageNew' => 1,
+        *             // Update within 5 seconds after "ageNew" given a 1hz cache check rate
+        *             'hotTTR' => 5,
+        *             // Avoid querying cache servers multiple times in a request; this also means
+        *             // that a request can only alter the value of any given constraint key once
+        *             'pcTTL' => WANObjectCache::TTL_PROC_LONG
+        *         ]
+        *     );
+        *     $tolerability = isset( $catSituationTolerabilityCache[$scenarioKey] )
+        *         ? $catSituationTolerabilityCache[$scenarioKey]
+        *         : $this->checkScenarioTolerability( $constraintId, $situation );
+        * @endcode
+        *
         * @see WANObjectCache::get()
         * @see WANObjectCache::set()
         *
@@ -1340,8 +1374,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         * This works the same as getWithSetCallback() except:
         *   - a) The $keys argument expects the result of WANObjectCache::makeMultiKeys()
         *   - b) The $callback argument expects a callback returning a map of (ID => new value)
-        *        for all entity IDs in $regenById and it takes the following arguments:
-        *          - $ids: a list of entity IDs to regenerate
+        *        for all entity IDs in $ids and it takes the following arguments:
+        *          - $ids: a list of entity IDs that require cache regeneration
         *          - &$ttls: a reference to the (entity ID => new TTL) map
         *          - &$setOpts: a reference to options for set() which can be altered
         *   - c) The return value is a map of (cache key => value) in the order of $keyedIds
@@ -1678,7 +1712,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
         *                 $ttl = ( $newList === $oldValue )
         *                     // No change: cache for 150% of the age of $oldValue
         *                     ? $cache->adaptiveTTL( $oldAsOf, $maxTTL, $minTTL, 1.5 )
-        *                     // Changed: cache for %50 of the age of $oldValue
+        *                     // Changed: cache for 50% of the age of $oldValue
         *                     : $cache->adaptiveTTL( $oldAsOf, $maxTTL, $minTTL, .5 );
         *             }
         *
index 7f0718c..15e02ad 100644 (file)
@@ -908,6 +908,12 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
                }
 
                if ( $isWrite ) {
+                       if ( $this->getLBInfo( 'replica' ) === true ) {
+                               throw new DBError(
+                                       $this,
+                                       'Write operations are not allowed on replica database connections.'
+                               );
+                       }
                        # In theory, non-persistent writes are allowed in read-only mode, but due to things
                        # like https://bugs.mysql.com/bug.php?id=33669 that might not work anyway...
                        $reason = $this->getReadOnlyReason();
index ac39e6f..617a910 100644 (file)
@@ -112,14 +112,14 @@ class BitmapHandler extends TransformationalImageHandler {
         */
        protected function imageMagickSubsampling( $pixelFormat ) {
                switch ( $pixelFormat ) {
-               case 'yuv444':
-                       return [ '1x1', '1x1', '1x1' ];
-               case 'yuv422':
-                       return [ '2x1', '1x1', '1x1' ];
-               case 'yuv420':
-                       return [ '2x2', '1x1', '1x1' ];
-               default:
-                       throw new MWException( 'Invalid pixel format for JPEG output' );
+                       case 'yuv444':
+                               return [ '1x1', '1x1', '1x1' ];
+                       case 'yuv422':
+                               return [ '2x1', '1x1', '1x1' ];
+                       case 'yuv420':
+                               return [ '2x2', '1x1', '1x1' ];
+                       default:
+                               throw new MWException( 'Invalid pixel format for JPEG output' );
                }
        }
 
index c419524..3587eba 100644 (file)
@@ -162,18 +162,17 @@ class XCFHandler extends BitmapHandler {
                        // Unclear from base media type if it has an alpha layer,
                        // so just assume that it does since it "potentially" could.
                        switch ( $header['base_type'] ) {
-                       case 0:
-                               $metadata['colorType'] = 'truecolour-alpha';
-                               break;
-                       case 1:
-                               $metadata['colorType'] = 'greyscale-alpha';
-                               break;
-                       case 2:
-                               $metadata['colorType'] = 'index-coloured';
-                               break;
-                       default:
-                               $metadata['colorType'] = 'unknown';
-
+                               case 0:
+                                       $metadata['colorType'] = 'truecolour-alpha';
+                                       break;
+                               case 1:
+                                       $metadata['colorType'] = 'greyscale-alpha';
+                                       break;
+                               case 2:
+                                       $metadata['colorType'] = 'index-coloured';
+                                       break;
+                               default:
+                                       $metadata['colorType'] = 'unknown';
                        }
                } else {
                        // Marker to prevent repeated attempted extraction
index c03d6b2..05247ca 100644 (file)
@@ -176,44 +176,32 @@ class PageArchive {
         * @return ResultWrapper
         */
        public function listRevisions() {
-               $dbr = wfGetDB( DB_REPLICA );
-               $commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
-
-               $tables = [ 'archive' ] + $commentQuery['tables'];
-
-               $fields = [
-                       'ar_minor_edit', 'ar_timestamp', 'ar_user', 'ar_user_text',
-                       'ar_len', 'ar_deleted', 'ar_rev_id', 'ar_sha1',
-                       'ar_page_id'
-               ] + $commentQuery['fields'];
-
-               if ( $this->config->get( 'ContentHandlerUseDB' ) ) {
-                       $fields[] = 'ar_content_format';
-                       $fields[] = 'ar_content_model';
-               }
-
-               $conds = [ 'ar_namespace' => $this->title->getNamespace(),
-                       'ar_title' => $this->title->getDBkey() ];
+               $revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
+               $queryInfo = $revisionStore->getArchiveQueryInfo();
 
+               $conds = [
+                       'ar_namespace' => $this->title->getNamespace(),
+                       'ar_title' => $this->title->getDBkey(),
+               ];
                $options = [ 'ORDER BY' => 'ar_timestamp DESC' ];
 
-               $join_conds = [] + $commentQuery['joins'];
-
                ChangeTags::modifyDisplayQuery(
-                       $tables,
-                       $fields,
+                       $queryInfo['tables'],
+                       $queryInfo['fields'],
                        $conds,
-                       $join_conds,
+                       $queryInfo['joins'],
                        $options,
                        ''
                );
 
-               return $dbr->select( $tables,
-                       $fields,
+               $dbr = wfGetDB( DB_REPLICA );
+               return $dbr->select(
+                       $queryInfo['tables'],
+                       $queryInfo['fields'],
                        $conds,
                        __METHOD__,
                        $options,
-                       $join_conds
+                       $queryInfo['joins']
                );
        }
 
@@ -542,47 +530,23 @@ class PageArchive {
                        $oldWhere['ar_timestamp'] = array_map( [ &$dbw, 'timestamp' ], $timestamps );
                }
 
-               $commentQuery = CommentStore::newKey( 'ar_comment' )->getJoin();
-
-               $tables = [ 'archive', 'revision' ] + $commentQuery['tables'];
-
-               $fields = [
-                       'ar_id',
-                       'ar_rev_id',
-                       'rev_id',
-                       'ar_text',
-                       'ar_user',
-                       'ar_user_text',
-                       'ar_timestamp',
-                       'ar_minor_edit',
-                       'ar_flags',
-                       'ar_text_id',
-                       'ar_deleted',
-                       'ar_page_id',
-                       'ar_len',
-                       'ar_sha1'
-               ] + $commentQuery['fields'];
-
-               if ( $this->config->get( 'ContentHandlerUseDB' ) ) {
-                       $fields[] = 'ar_content_format';
-                       $fields[] = 'ar_content_model';
-               }
-
-               $join_conds = [
-                       'revision' => [ 'LEFT JOIN', 'ar_rev_id=rev_id' ],
-               ] + $commentQuery['joins'];
+               $revisionStore = MediaWikiServices::getInstance()->getRevisionStore();
+               $queryInfo = $revisionStore->getArchiveQueryInfo();
+               $queryInfo['tables'][] = 'revision';
+               $queryInfo['fields'][] = 'rev_id';
+               $queryInfo['joins']['revision'] = [ 'LEFT JOIN', 'ar_rev_id=rev_id' ];
 
                /**
                 * Select each archived revision...
                 */
                $result = $dbw->select(
-                       $tables,
-                       $fields,
+                       $queryInfo['tables'],
+                       $queryInfo['fields'],
                        $oldWhere,
                        __METHOD__,
                        /* options */
                        [ 'ORDER BY' => 'ar_timestamp' ],
-                       $join_conds
+                       $queryInfo['joins']
                );
 
                $rev_count = $result->numRows();
index 7498ca5..6af7945 100644 (file)
@@ -195,15 +195,15 @@ class WikiPage implements Page, IDBAccessObject {
         */
        private static function convertSelectType( $type ) {
                switch ( $type ) {
-               case 'fromdb':
-                       return self::READ_NORMAL;
-               case 'fromdbmaster':
-                       return self::READ_LATEST;
-               case 'forupdate':
-                       return self::READ_LOCKING;
-               default:
-                       // It may already be an integer or whatever else
-                       return $type;
+                       case 'fromdb':
+                               return self::READ_NORMAL;
+                       case 'fromdbmaster':
+                               return self::READ_LATEST;
+                       case 'forupdate':
+                               return self::READ_LOCKING;
+                       default:
+                               // It may already be an integer or whatever else
+                               return $type;
                }
        }
 
@@ -1628,6 +1628,11 @@ class WikiPage implements Page, IDBAccessObject {
                        $tags[] = $tag;
                }
 
+               // Check for undo tag
+               if ( $undidRevId !== 0 && in_array( 'mw-undo', ChangeTags::getSoftwareTags() ) ) {
+                       $tags[] = 'mw-undo';
+               }
+
                // Provide autosummaries if summary is not provided and autosummaries are enabled
                if ( $wgUseAutomaticEditSummaries && ( $flags & EDIT_AUTOSUMMARY ) && $summary == '' ) {
                        $summary = $handler->getAutosummary( $old_content, $content, $flags );
index fab9ab7..761d5be 100644 (file)
@@ -417,130 +417,130 @@ class BlockLevelPass {
                        $c = $str[$i];
 
                        switch ( $state ) {
-                       case self::COLON_STATE_TEXT:
-                               switch ( $c ) {
-                               case "<":
-                                       # Could be either a <start> tag or an </end> tag
-                                       $state = self::COLON_STATE_TAGSTART;
-                                       break;
-                               case ":":
-                                       if ( $ltLevel === 0 ) {
-                                               # We found it!
-                                               $before = substr( $str, 0, $i );
-                                               $after = substr( $str, $i + 1 );
-                                               return $i;
+                               case self::COLON_STATE_TEXT:
+                                       switch ( $c ) {
+                                               case "<":
+                                                       # Could be either a <start> tag or an </end> tag
+                                                       $state = self::COLON_STATE_TAGSTART;
+                                                       break;
+                                               case ":":
+                                                       if ( $ltLevel === 0 ) {
+                                                               # We found it!
+                                                               $before = substr( $str, 0, $i );
+                                                               $after = substr( $str, $i + 1 );
+                                                               return $i;
+                                                       }
+                                                       # Embedded in a tag; don't break it.
+                                                       break;
+                                               default:
+                                                       # Skip ahead looking for something interesting
+                                                       if ( !preg_match( '/:|<|-\{/', $str, $m, PREG_OFFSET_CAPTURE, $i ) ) {
+                                                               # Nothing else interesting
+                                                               return false;
+                                                       }
+                                                       if ( $m[0][0] === '-{' ) {
+                                                               $state = self::COLON_STATE_LC;
+                                                               $lcLevel++;
+                                                               $i = $m[0][1] + 1;
+                                                       } else {
+                                                               # Skip ahead to next interesting character.
+                                                               $i = $m[0][1] - 1;
+                                                       }
+                                                       break;
                                        }
-                                       # Embedded in a tag; don't break it.
                                        break;
-                               default:
-                                       # Skip ahead looking for something interesting
-                                       if ( !preg_match( '/:|<|-\{/', $str, $m, PREG_OFFSET_CAPTURE, $i ) ) {
-                                               # Nothing else interesting
-                                               return false;
-                                       }
-                                       if ( $m[0][0] === '-{' ) {
-                                               $state = self::COLON_STATE_LC;
+                               case self::COLON_STATE_LC:
+                                       # In language converter markup -{ ... }-
+                                       if ( !preg_match( '/-\{|\}-/', $str, $m, PREG_OFFSET_CAPTURE, $i ) ) {
+                                               # Nothing else interesting to find; abort!
+                                               # We're nested in language converter markup, but there
+                                               # are no close tags left.  Abort!
+                                               break 2;
+                                       } elseif ( $m[0][0] === '-{' ) {
+                                               $i = $m[0][1] + 1;
                                                $lcLevel++;
+                                       } elseif ( $m[0][0] === '}-' ) {
                                                $i = $m[0][1] + 1;
-                                       } else {
-                                               # Skip ahead to next interesting character.
-                                               $i = $m[0][1] - 1;
+                                               $lcLevel--;
+                                               if ( $lcLevel === 0 ) {
+                                                       $state = self::COLON_STATE_TEXT;
+                                               }
                                        }
                                        break;
-                               }
-                               break;
-                       case self::COLON_STATE_LC:
-                               # In language converter markup -{ ... }-
-                               if ( !preg_match( '/-\{|\}-/', $str, $m, PREG_OFFSET_CAPTURE, $i ) ) {
-                                       # Nothing else interesting to find; abort!
-                                       # We're nested in language converter markup, but there
-                                       # are no close tags left.  Abort!
-                                       break 2;
-                               } elseif ( $m[0][0] === '-{' ) {
-                                       $i = $m[0][1] + 1;
-                                       $lcLevel++;
-                               } elseif ( $m[0][0] === '}-' ) {
-                                       $i = $m[0][1] + 1;
-                                       $lcLevel--;
-                                       if ( $lcLevel === 0 ) {
-                                               $state = self::COLON_STATE_TEXT;
+                               case self::COLON_STATE_TAG:
+                                       # In a <tag>
+                                       switch ( $c ) {
+                                               case ">":
+                                                       $ltLevel++;
+                                                       $state = self::COLON_STATE_TEXT;
+                                                       break;
+                                               case "/":
+                                                       # Slash may be followed by >?
+                                                       $state = self::COLON_STATE_TAGSLASH;
+                                                       break;
+                                               default:
+                                                       # ignore
                                        }
-                               }
-                               break;
-                       case self::COLON_STATE_TAG:
-                               # In a <tag>
-                               switch ( $c ) {
-                               case ">":
-                                       $ltLevel++;
-                                       $state = self::COLON_STATE_TEXT;
                                        break;
-                               case "/":
-                                       # Slash may be followed by >?
-                                       $state = self::COLON_STATE_TAGSLASH;
+                               case self::COLON_STATE_TAGSTART:
+                                       switch ( $c ) {
+                                               case "/":
+                                                       $state = self::COLON_STATE_CLOSETAG;
+                                                       break;
+                                               case "!":
+                                                       $state = self::COLON_STATE_COMMENT;
+                                                       break;
+                                               case ">":
+                                                       # Illegal early close? This shouldn't happen D:
+                                                       $state = self::COLON_STATE_TEXT;
+                                                       break;
+                                               default:
+                                                       $state = self::COLON_STATE_TAG;
+                                       }
                                        break;
-                               default:
-                                       # ignore
-                               }
-                               break;
-                       case self::COLON_STATE_TAGSTART:
-                               switch ( $c ) {
-                               case "/":
-                                       $state = self::COLON_STATE_CLOSETAG;
+                               case self::COLON_STATE_CLOSETAG:
+                                       # In a </tag>
+                                       if ( $c === ">" ) {
+                                               if ( $ltLevel > 0 ) {
+                                                       $ltLevel--;
+                                               } else {
+                                                       # ignore the excess close tag, but keep looking for
+                                                       # colons. (This matches Parsoid behavior.)
+                                                       wfDebug( __METHOD__ . ": Invalid input; too many close tags\n" );
+                                               }
+                                               $state = self::COLON_STATE_TEXT;
+                                       }
                                        break;
-                               case "!":
-                                       $state = self::COLON_STATE_COMMENT;
+                               case self::COLON_STATE_TAGSLASH:
+                                       if ( $c === ">" ) {
+                                               # Yes, a self-closed tag <blah/>
+                                               $state = self::COLON_STATE_TEXT;
+                                       } else {
+                                               # Probably we're jumping the gun, and this is an attribute
+                                               $state = self::COLON_STATE_TAG;
+                                       }
                                        break;
-                               case ">":
-                                       # Illegal early close? This shouldn't happen D:
-                                       $state = self::COLON_STATE_TEXT;
+                               case self::COLON_STATE_COMMENT:
+                                       if ( $c === "-" ) {
+                                               $state = self::COLON_STATE_COMMENTDASH;
+                                       }
                                        break;
-                               default:
-                                       $state = self::COLON_STATE_TAG;
-                               }
-                               break;
-                       case self::COLON_STATE_CLOSETAG:
-                               # In a </tag>
-                               if ( $c === ">" ) {
-                                       if ( $ltLevel > 0 ) {
-                                               $ltLevel--;
+                               case self::COLON_STATE_COMMENTDASH:
+                                       if ( $c === "-" ) {
+                                               $state = self::COLON_STATE_COMMENTDASHDASH;
                                        } else {
-                                               # ignore the excess close tag, but keep looking for
-                                               # colons. (This matches Parsoid behavior.)
-                                               wfDebug( __METHOD__ . ": Invalid input; too many close tags\n" );
+                                               $state = self::COLON_STATE_COMMENT;
                                        }
-                                       $state = self::COLON_STATE_TEXT;
-                               }
-                               break;
-                       case self::COLON_STATE_TAGSLASH:
-                               if ( $c === ">" ) {
-                                       # Yes, a self-closed tag <blah/>
-                                       $state = self::COLON_STATE_TEXT;
-                               } else {
-                                       # Probably we're jumping the gun, and this is an attribute
-                                       $state = self::COLON_STATE_TAG;
-                               }
-                               break;
-                       case self::COLON_STATE_COMMENT:
-                               if ( $c === "-" ) {
-                                       $state = self::COLON_STATE_COMMENTDASH;
-                               }
-                               break;
-                       case self::COLON_STATE_COMMENTDASH:
-                               if ( $c === "-" ) {
-                                       $state = self::COLON_STATE_COMMENTDASHDASH;
-                               } else {
-                                       $state = self::COLON_STATE_COMMENT;
-                               }
-                               break;
-                       case self::COLON_STATE_COMMENTDASHDASH:
-                               if ( $c === ">" ) {
-                                       $state = self::COLON_STATE_TEXT;
-                               } else {
-                                       $state = self::COLON_STATE_COMMENT;
-                               }
-                               break;
-                       default:
-                               throw new MWException( "State machine error in " . __METHOD__ );
+                                       break;
+                               case self::COLON_STATE_COMMENTDASHDASH:
+                                       if ( $c === ">" ) {
+                                               $state = self::COLON_STATE_TEXT;
+                                       } else {
+                                               $state = self::COLON_STATE_COMMENT;
+                                       }
+                                       break;
+                               default:
+                                       throw new MWException( "State machine error in " . __METHOD__ );
                        }
                }
                if ( $ltLevel > 0 || $lcLevel > 0 ) {
index 8986ddd..10a338e 100644 (file)
@@ -5022,40 +5022,40 @@ class Parser {
                                                $paramName = $paramMap[$magicName];
 
                                                switch ( $paramName ) {
-                                               case 'gallery-internal-alt':
-                                                       $alt = $this->stripAltText( $match, false );
-                                                       break;
-                                               case 'gallery-internal-link':
-                                                       $linkValue = strip_tags( $this->replaceLinkHoldersText( $match ) );
-                                                       $chars = self::EXT_LINK_URL_CLASS;
-                                                       $addr = self::EXT_LINK_ADDR;
-                                                       $prots = $this->mUrlProtocols;
-                                                       // check to see if link matches an absolute url, if not then it must be a wiki link.
-                                                       if ( preg_match( '/^-{R|(.*)}-$/', $linkValue ) ) {
-                                                               // Result of LanguageConverter::markNoConversion
-                                                               // invoked on an external link.
-                                                               $linkValue = substr( $linkValue, 4, -2 );
-                                                       }
-                                                       if ( preg_match( "/^($prots)$addr$chars*$/u", $linkValue ) ) {
-                                                               $link = $linkValue;
-                                                               $this->mOutput->addExternalLink( $link );
-                                                       } else {
-                                                               $localLinkTitle = Title::newFromText( $linkValue );
-                                                               if ( $localLinkTitle !== null ) {
-                                                                       $this->mOutput->addLink( $localLinkTitle );
-                                                                       $link = $localLinkTitle->getLinkURL();
+                                                       case 'gallery-internal-alt':
+                                                               $alt = $this->stripAltText( $match, false );
+                                                               break;
+                                                       case 'gallery-internal-link':
+                                                               $linkValue = strip_tags( $this->replaceLinkHoldersText( $match ) );
+                                                               $chars = self::EXT_LINK_URL_CLASS;
+                                                               $addr = self::EXT_LINK_ADDR;
+                                                               $prots = $this->mUrlProtocols;
+                                                               // check to see if link matches an absolute url, if not then it must be a wiki link.
+                                                               if ( preg_match( '/^-{R|(.*)}-$/', $linkValue ) ) {
+                                                                       // Result of LanguageConverter::markNoConversion
+                                                                       // invoked on an external link.
+                                                                       $linkValue = substr( $linkValue, 4, -2 );
+                                                               }
+                                                               if ( preg_match( "/^($prots)$addr$chars*$/u", $linkValue ) ) {
+                                                                       $link = $linkValue;
+                                                                       $this->mOutput->addExternalLink( $link );
+                                                               } else {
+                                                                       $localLinkTitle = Title::newFromText( $linkValue );
+                                                                       if ( $localLinkTitle !== null ) {
+                                                                               $this->mOutput->addLink( $localLinkTitle );
+                                                                               $link = $localLinkTitle->getLinkURL();
+                                                                       }
+                                                               }
+                                                               break;
+                                                       default:
+                                                               // Must be a handler specific parameter.
+                                                               if ( $handler->validateParam( $paramName, $match ) ) {
+                                                                       $handlerOptions[$paramName] = $match;
+                                                               } else {
+                                                                       // Guess not, consider it as caption.
+                                                                       wfDebug( "$parameterMatch failed parameter validation\n" );
+                                                                       $label = '|' . $parameterMatch;
                                                                }
-                                                       }
-                                                       break;
-                                               default:
-                                                       // Must be a handler specific parameter.
-                                                       if ( $handler->validateParam( $paramName, $match ) ) {
-                                                               $handlerOptions[$paramName] = $match;
-                                                       } else {
-                                                               // Guess not, consider it as caption.
-                                                               wfDebug( "$parameterMatch failed parameter validation\n" );
-                                                               $label = '|' . $parameterMatch;
-                                                       }
                                                }
 
                                        } else {
@@ -5217,52 +5217,52 @@ class Parser {
                                        } else {
                                                # Validate internal parameters
                                                switch ( $paramName ) {
-                                               case 'manualthumb':
-                                               case 'alt':
-                                               case 'class':
-                                                       # @todo FIXME: Possibly check validity here for
-                                                       # manualthumb? downstream behavior seems odd with
-                                                       # missing manual thumbs.
-                                                       $validated = true;
-                                                       $value = $this->stripAltText( $value, $holders );
-                                                       break;
-                                               case 'link':
-                                                       $chars = self::EXT_LINK_URL_CLASS;
-                                                       $addr = self::EXT_LINK_ADDR;
-                                                       $prots = $this->mUrlProtocols;
-                                                       if ( $value === '' ) {
-                                                               $paramName = 'no-link';
-                                                               $value = true;
+                                                       case 'manualthumb':
+                                                       case 'alt':
+                                                       case 'class':
+                                                               # @todo FIXME: Possibly check validity here for
+                                                               # manualthumb? downstream behavior seems odd with
+                                                               # missing manual thumbs.
                                                                $validated = true;
-                                                       } elseif ( preg_match( "/^((?i)$prots)/", $value ) ) {
-                                                               if ( preg_match( "/^((?i)$prots)$addr$chars*$/u", $value, $m ) ) {
-                                                                       $paramName = 'link-url';
-                                                                       $this->mOutput->addExternalLink( $value );
-                                                                       if ( $this->mOptions->getExternalLinkTarget() ) {
-                                                                               $params[$type]['link-target'] = $this->mOptions->getExternalLinkTarget();
-                                                                       }
-                                                                       $validated = true;
-                                                               }
-                                                       } else {
-                                                               $linkTitle = Title::newFromText( $value );
-                                                               if ( $linkTitle ) {
-                                                                       $paramName = 'link-title';
-                                                                       $value = $linkTitle;
-                                                                       $this->mOutput->addLink( $linkTitle );
+                                                               $value = $this->stripAltText( $value, $holders );
+                                                               break;
+                                                       case 'link':
+                                                               $chars = self::EXT_LINK_URL_CLASS;
+                                                               $addr = self::EXT_LINK_ADDR;
+                                                               $prots = $this->mUrlProtocols;
+                                                               if ( $value === '' ) {
+                                                                       $paramName = 'no-link';
+                                                                       $value = true;
                                                                        $validated = true;
+                                                               } elseif ( preg_match( "/^((?i)$prots)/", $value ) ) {
+                                                                       if ( preg_match( "/^((?i)$prots)$addr$chars*$/u", $value, $m ) ) {
+                                                                               $paramName = 'link-url';
+                                                                               $this->mOutput->addExternalLink( $value );
+                                                                               if ( $this->mOptions->getExternalLinkTarget() ) {
+                                                                                       $params[$type]['link-target'] = $this->mOptions->getExternalLinkTarget();
+                                                                               }
+                                                                               $validated = true;
+                                                                       }
+                                                               } else {
+                                                                       $linkTitle = Title::newFromText( $value );
+                                                                       if ( $linkTitle ) {
+                                                                               $paramName = 'link-title';
+                                                                               $value = $linkTitle;
+                                                                               $this->mOutput->addLink( $linkTitle );
+                                                                               $validated = true;
+                                                                       }
                                                                }
-                                                       }
-                                                       break;
-                                               case 'frameless':
-                                               case 'framed':
-                                               case 'thumbnail':
-                                                       // use first appearing option, discard others.
-                                                       $validated = !$seenformat;
-                                                       $seenformat = true;
-                                                       break;
-                                               default:
-                                                       # Most other things appear to be empty or numeric...
-                                                       $validated = ( $value === false || is_numeric( trim( $value ) ) );
+                                                               break;
+                                                       case 'frameless':
+                                                       case 'framed':
+                                                       case 'thumbnail':
+                                                               // use first appearing option, discard others.
+                                                               $validated = !$seenformat;
+                                                               $seenformat = true;
+                                                               break;
+                                                       default:
+                                                               # Most other things appear to be empty or numeric...
+                                                               $validated = ( $value === false || is_numeric( trim( $value ) ) );
                                                }
                                        }
 
index 332f8e9..735c33a 100644 (file)
@@ -1922,18 +1922,18 @@ class PPNode_Hash_Tree implements PPNode {
                                continue;
                        }
                        switch ( $child[self::NAME] ) {
-                       case 'name':
-                               $bits['name'] = new self( $children, $i );
-                               break;
-                       case 'attr':
-                               $bits['attr'] = new self( $children, $i );
-                               break;
-                       case 'inner':
-                               $bits['inner'] = new self( $children, $i );
-                               break;
-                       case 'close':
-                               $bits['close'] = new self( $children, $i );
-                               break;
+                               case 'name':
+                                       $bits['name'] = new self( $children, $i );
+                                       break;
+                               case 'attr':
+                                       $bits['attr'] = new self( $children, $i );
+                                       break;
+                               case 'inner':
+                                       $bits['inner'] = new self( $children, $i );
+                                       break;
+                               case 'close':
+                                       $bits['close'] = new self( $children, $i );
+                                       break;
                        }
                }
                if ( !isset( $bits['name'] ) ) {
@@ -2001,15 +2001,15 @@ class PPNode_Hash_Tree implements PPNode {
                                continue;
                        }
                        switch ( $child[self::NAME] ) {
-                       case 'title':
-                               $bits['title'] = new self( $children, $i );
-                               break;
-                       case 'part':
-                               $parts[] = new self( $children, $i );
-                               break;
-                       case '@lineStart':
-                               $bits['lineStart'] = '1';
-                               break;
+                               case 'title':
+                                       $bits['title'] = new self( $children, $i );
+                                       break;
+                               case 'part':
+                                       $parts[] = new self( $children, $i );
+                                       break;
+                               case '@lineStart':
+                                       $bits['lineStart'] = '1';
+                                       break;
                        }
                }
                if ( !isset( $bits['title'] ) ) {
index 3c8fe60..4253193 100644 (file)
@@ -112,11 +112,11 @@ abstract class SearchEngine {
         */
        public function supports( $feature ) {
                switch ( $feature ) {
-               case 'search-update':
-                       return true;
-               case 'title-suffix-filter':
-               default:
-                       return false;
+                       case 'search-update':
+                               return true;
+                       case 'title-suffix-filter':
+                       default:
+                               return false;
                }
        }
 
index 77dcfe9..2810bce 100644 (file)
@@ -209,10 +209,10 @@ class SearchMySQL extends SearchDatabase {
 
        public function supports( $feature ) {
                switch ( $feature ) {
-               case 'title-suffix-filter':
-                       return true;
-               default:
-                       return parent::supports( $feature );
+                       case 'title-suffix-filter':
+                               return true;
+                       default:
+                               return parent::supports( $feature );
                }
        }
 
index 998b3ed..2f0ea42 100644 (file)
@@ -36,7 +36,7 @@ class Command {
        use LoggerAwareTrait;
 
        /** @var string */
-       private $command = '';
+       protected $command = '';
 
        /** @var array */
        private $limits = [
@@ -269,9 +269,10 @@ class Command {
         * String together all the options and build the final command
         * to execute
         *
+        * @param string $command Already-escaped command to run
         * @return array [ command, whether to use log pipe ]
         */
-       protected function buildFinalCommand() {
+       protected function buildFinalCommand( $command ) {
                $envcmd = '';
                foreach ( $this->env as $k => $v ) {
                        if ( wfIsWindows() ) {
@@ -291,7 +292,7 @@ class Command {
                }
 
                $useLogPipe = false;
-               $cmd = $envcmd . trim( $this->command );
+               $cmd = $envcmd . trim( $command );
 
                if ( is_executable( '/bin/bash' ) ) {
                        $time = intval( $this->limits['time'] );
@@ -335,7 +336,7 @@ class Command {
 
                $profileMethod = $this->method ?: wfGetCaller();
 
-               list( $cmd, $useLogPipe ) = $this->buildFinalCommand();
+               list( $cmd, $useLogPipe ) = $this->buildFinalCommand( $this->command );
 
                $this->logger->debug( __METHOD__ . ": $cmd" );
 
index 79f679d..a71b376 100644 (file)
@@ -59,10 +59,15 @@ class FirejailCommand extends Command {
        /**
         * @inheritDoc
         */
-       protected function buildFinalCommand() {
+       protected function buildFinalCommand( $command ) {
                // If there are no restrictions, don't use firejail
                if ( $this->restrictions === 0 ) {
-                       return parent::buildFinalCommand();
+                       $splitCommand = explode( ' ', $command, 2 );
+                       $this->logger->debug(
+                               "firejail: Command {$splitCommand[0]} {params} has no restrictions",
+                               [ 'params' => isset( $splitCommand[1] ) ? $splitCommand[1] : '' ]
+                       );
+                       return parent::buildFinalCommand( $command );
                }
 
                if ( $this->firejail === false ) {
@@ -110,6 +115,10 @@ class FirejailCommand extends Command {
                        }
                }
 
+               if ( $this->hasRestriction( Shell::NO_LOCALSETTINGS ) ) {
+                       $cmd[] = '--blacklist=' . realpath( MW_CONFIG_FILE );
+               }
+
                if ( $this->hasRestriction( Shell::NO_ROOT ) ) {
                        $cmd[] = '--noroot';
                }
@@ -122,6 +131,10 @@ class FirejailCommand extends Command {
 
                if ( $this->hasRestriction( Shell::NO_EXECVE ) ) {
                        $seccomp[] = 'execve';
+                       // Normally firejail will run commands in a bash shell,
+                       // but that won't work if we ban the execve syscall, so
+                       // run the command without a shell.
+                       $cmd[] = '--shell=none';
                }
 
                if ( $seccomp ) {
@@ -136,11 +149,10 @@ class FirejailCommand extends Command {
                        $cmd[] = '--net=none';
                }
 
-               list( $fullCommand, $useLogPipe ) = parent::buildFinalCommand();
-
                $builtCmd = implode( ' ', $cmd );
 
-               return [ "$builtCmd -- $fullCommand", $useLogPipe ];
+               // Prefix the firejail command in front of the wanted command
+               return parent::buildFinalCommand( "$builtCmd -- {$command}" );
        }
 
 }
index 084e10e..05463db 100644 (file)
@@ -45,13 +45,13 @@ class Shell {
         * Apply a default set of restrictions for improved
         * security out of the box.
         *
-        * Equal to NO_ROOT | SECCOMP | PRIVATE_DEV
+        * Equal to NO_ROOT | SECCOMP | PRIVATE_DEV | NO_LOCALSETTINGS
         *
         * @note This value will change over time to provide increased security
         *       by default, and is not guaranteed to be backwards-compatible.
         * @since 1.31
         */
-       const RESTRICT_DEFAULT = 7;
+       const RESTRICT_DEFAULT = 39;
 
        /**
         * Disallow any root access. Any setuid binaries
@@ -92,6 +92,13 @@ class Shell {
         */
        const NO_EXECVE = 16;
 
+       /**
+        * Deny access to LocalSettings.php (MW_CONFIG_FILE)
+        *
+        * @since 1.31
+        */
+       const NO_LOCALSETTINGS = 32;
+
        /**
         * Returns a new instance of Command class
         *
index 8d5ce10..f0b336a 100644 (file)
@@ -182,44 +182,44 @@ abstract class BaseTemplate extends QuickTemplate {
                                continue;
                        }
                        switch ( $boxName ) {
-                       case 'SEARCH':
-                               // Search is a special case, skins should custom implement this
-                               $boxes[$boxName] = [
-                                       'id' => 'p-search',
-                                       'header' => $this->getMsg( 'search' )->text(),
-                                       'generated' => false,
-                                       'content' => true,
-                               ];
-                               break;
-                       case 'TOOLBOX':
-                               $msgObj = $this->getMsg( 'toolbox' );
-                               $boxes[$boxName] = [
-                                       'id' => 'p-tb',
-                                       'header' => $msgObj->exists() ? $msgObj->text() : 'toolbox',
-                                       'generated' => false,
-                                       'content' => $this->getToolbox(),
-                               ];
-                               break;
-                       case 'LANGUAGES':
-                               if ( $this->data['language_urls'] !== false ) {
-                                       $msgObj = $this->getMsg( 'otherlanguages' );
+                               case 'SEARCH':
+                                       // Search is a special case, skins should custom implement this
                                        $boxes[$boxName] = [
-                                               'id' => 'p-lang',
-                                               'header' => $msgObj->exists() ? $msgObj->text() : 'otherlanguages',
+                                               'id' => 'p-search',
+                                               'header' => $this->getMsg( 'search' )->text(),
                                                'generated' => false,
-                                               'content' => $this->data['language_urls'] ?: [],
+                                               'content' => true,
                                        ];
-                               }
-                               break;
-                       default:
-                               $msgObj = $this->getMsg( $boxName );
-                               $boxes[$boxName] = [
-                                       'id' => "p-$boxName",
-                                       'header' => $msgObj->exists() ? $msgObj->text() : $boxName,
-                                       'generated' => true,
-                                       'content' => $content,
-                               ];
-                               break;
+                                       break;
+                               case 'TOOLBOX':
+                                       $msgObj = $this->getMsg( 'toolbox' );
+                                       $boxes[$boxName] = [
+                                               'id' => 'p-tb',
+                                               'header' => $msgObj->exists() ? $msgObj->text() : 'toolbox',
+                                               'generated' => false,
+                                               'content' => $this->getToolbox(),
+                                       ];
+                                       break;
+                               case 'LANGUAGES':
+                                       if ( $this->data['language_urls'] !== false ) {
+                                               $msgObj = $this->getMsg( 'otherlanguages' );
+                                               $boxes[$boxName] = [
+                                                       'id' => 'p-lang',
+                                                       'header' => $msgObj->exists() ? $msgObj->text() : 'otherlanguages',
+                                                       'generated' => false,
+                                                       'content' => $this->data['language_urls'] ?: [],
+                                               ];
+                                       }
+                                       break;
+                               default:
+                                       $msgObj = $this->getMsg( $boxName );
+                                       $boxes[$boxName] = [
+                                               'id' => "p-$boxName",
+                                               'header' => $msgObj->exists() ? $msgObj->text() : $boxName,
+                                               'generated' => true,
+                                               'content' => $content,
+                                       ];
+                                       break;
                        }
                }
 
index eab5940..303184d 100644 (file)
@@ -553,7 +553,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
        public function execute( $subpage ) {
                $this->rcSubpage = $subpage;
 
-               $this->considerActionsForDefaultSavedQuery();
+               $this->considerActionsForDefaultSavedQuery( $subpage );
 
                $opts = $this->getOptions();
                try {
@@ -629,9 +629,11 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         * Check whether or not the page should load defaults, and if so, whether
         * a default saved query is relevant to be redirected to. If it is relevant,
         * redirect properly with all necessary query parameters.
+        *
+        * @param string $subpage
         */
-       protected function considerActionsForDefaultSavedQuery() {
-               if ( !$this->isStructuredFilterUiEnabled() ) {
+       protected function considerActionsForDefaultSavedQuery( $subpage ) {
+               if ( !$this->isStructuredFilterUiEnabled() || $this->including() ) {
                        return;
                }
 
@@ -677,7 +679,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                                        // but are still valid and requested in the URL
                                        $query = array_merge( $this->getRequest()->getValues(), $query );
                                        unset( $query[ 'title' ] );
-                                       $this->getOutput()->redirect( $this->getPageTitle()->getCanonicalURL( $query ) );
+                                       $this->getOutput()->redirect( $this->getPageTitle( $subpage )->getCanonicalURL( $query ) );
                                } else {
                                        // There's a default, but the version is not 2, and the server can't
                                        // actually recognize the query itself. This happens if it is before
@@ -704,7 +706,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
         */
        protected function includeRcFiltersApp() {
                $out = $this->getOutput();
-               if ( $this->isStructuredFilterUiEnabled() ) {
+               if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
                        $jsData = $this->getStructuredFilterJsData();
 
                        $messages = [];
@@ -1649,7 +1651,7 @@ abstract class ChangesListSpecialPage extends SpecialPage {
                ] );
                $out->addModules( 'mediawiki.special.changeslist.legend.js' );
 
-               if ( $this->isStructuredFilterUiEnabled() ) {
+               if ( $this->isStructuredFilterUiEnabled() && !$this->including() ) {
                        $out->addModules( 'mediawiki.rcfilters.filters.ui' );
                        $out->addModuleStyles( 'mediawiki.rcfilters.filters.base.styles' );
                }
index 9e0daf5..d4aef6c 100644 (file)
@@ -30,8 +30,6 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
        /** @var bool|Title */
        protected $rclTargetTitle;
 
-       protected $rclTarget;
-
        function __construct() {
                parent::__construct( 'Recentchangeslinked' );
        }
@@ -46,7 +44,6 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
 
        public function parseParameters( $par, FormOptions $opts ) {
                $opts['target'] = $par;
-               $this->rclTarget = $par;
        }
 
        /**
@@ -297,20 +294,6 @@ class SpecialRecentChangesLinked extends SpecialRecentChanges {
                return $this->prefixSearchString( $search, $limit, $offset );
        }
 
-       /**
-        * Get a self-referential title object
-        * with consideration to the given subpage.
-        *
-        * @param string|bool $subpage
-        * @return Title
-        * @since 1.23
-        */
-       public function getPageTitle( $subpage = false ) {
-               $subpage = $subpage ? $subpage : $this->rclTarget;
-
-               return parent::getPageTitle( $subpage );
-       }
-
        protected function outputNoResults() {
                if ( $this->getTargetTitle() === false ) {
                        $this->getOutput()->addHTML(
index 82c35bb..e570633 100644 (file)
@@ -2052,73 +2052,73 @@ class Balancer {
                        return true;
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'font':
-                               if ( isset( $attribs['color'] )
-                                       || isset( $attribs['face'] )
-                                       || isset( $attribs['size'] )
-                               ) {
-                                       break;
-                               }
-                               // otherwise, fall through
-                       case 'b':
-                       case 'big':
-                       case 'blockquote':
-                       case 'body':
-                       case 'br':
-                       case 'center':
-                       case 'code':
-                       case 'dd':
-                       case 'div':
-                       case 'dl':
-                       case 'dt':
-                       case 'em':
-                       case 'embed':
-                       case 'h1':
-                       case 'h2':
-                       case 'h3':
-                       case 'h4':
-                       case 'h5':
-                       case 'h6':
-                       case 'head':
-                       case 'hr':
-                       case 'i':
-                       case 'img':
-                       case 'li':
-                       case 'listing':
-                       case 'menu':
-                       case 'meta':
-                       case 'nobr':
-                       case 'ol':
-                       case 'p':
-                       case 'pre':
-                       case 'ruby':
-                       case 's':
-                       case 'small':
-                       case 'span':
-                       case 'strong':
-                       case 'strike':
-                       case 'sub':
-                       case 'sup':
-                       case 'table':
-                       case 'tt':
-                       case 'u':
-                       case 'ul':
-                       case 'var':
-                               if ( $this->fragmentContext ) {
-                                       break;
-                               }
-                               while ( true ) {
-                                       $this->stack->pop();
-                                       $node = $this->stack->currentNode;
-                                       if (
-                                               $node->isMathmlTextIntegrationPoint() ||
-                                               $node->isHtmlIntegrationPoint() ||
-                                               $node->isHtml()
+                               case 'font':
+                                       if ( isset( $attribs['color'] )
+                                               || isset( $attribs['face'] )
+                                               || isset( $attribs['size'] )
                                        ) {
                                                break;
                                        }
-                               }
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       // otherwise, fall through
+                               case 'b':
+                               case 'big':
+                               case 'blockquote':
+                               case 'body':
+                               case 'br':
+                               case 'center':
+                               case 'code':
+                               case 'dd':
+                               case 'div':
+                               case 'dl':
+                               case 'dt':
+                               case 'em':
+                               case 'embed':
+                               case 'h1':
+                               case 'h2':
+                               case 'h3':
+                               case 'h4':
+                               case 'h5':
+                               case 'h6':
+                               case 'head':
+                               case 'hr':
+                               case 'i':
+                               case 'img':
+                               case 'li':
+                               case 'listing':
+                               case 'menu':
+                               case 'meta':
+                               case 'nobr':
+                               case 'ol':
+                               case 'p':
+                               case 'pre':
+                               case 'ruby':
+                               case 's':
+                               case 'small':
+                               case 'span':
+                               case 'strong':
+                               case 'strike':
+                               case 'sub':
+                               case 'sup':
+                               case 'table':
+                               case 'tt':
+                               case 'u':
+                               case 'ul':
+                               case 'var':
+                                       if ( $this->fragmentContext ) {
+                                               break;
+                                       }
+                                       while ( true ) {
+                                               $this->stack->pop();
+                                               $node = $this->stack->currentNode;
+                                               if (
+                                                       $node->isMathmlTextIntegrationPoint() ||
+                                                       $node->isHtmlIntegrationPoint() ||
+                                                       $node->isHtml()
+                                               ) {
+                                                       break;
+                                               }
+                                       }
+                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
                        }
                        // "Any other start tag"
                        $adjusted = ( $this->fragmentContext && $this->stack->length() === 1 ) ?
@@ -2270,56 +2270,56 @@ class Balancer {
                        }
                        if ( $node->isHtml() ) {
                                switch ( $node->localName ) {
-                               case 'select':
-                                       $stackLength = $this->stack->length();
-                                       for ( $j = $i + 1; $j < $stackLength - 1; $j++ ) {
-                                               $ancestor = $this->stack->node( $stackLength - $j - 1 );
-                                               if ( $ancestor->isHtmlNamed( 'template' ) ) {
-                                                       break;
+                                       case 'select':
+                                               $stackLength = $this->stack->length();
+                                               for ( $j = $i + 1; $j < $stackLength - 1; $j++ ) {
+                                                       $ancestor = $this->stack->node( $stackLength - $j - 1 );
+                                                       if ( $ancestor->isHtmlNamed( 'template' ) ) {
+                                                               break;
+                                                       }
+                                                       if ( $ancestor->isHtmlNamed( 'table' ) ) {
+                                                               $this->switchMode( 'inSelectInTableMode' );
+                                                               return;
+                                                       }
                                                }
-                                               if ( $ancestor->isHtmlNamed( 'table' ) ) {
-                                                       $this->switchMode( 'inSelectInTableMode' );
-                                                       return;
-                                               }
-                                       }
-                                       $this->switchMode( 'inSelectMode' );
-                                       return;
-                               case 'tr':
-                                       $this->switchMode( 'inRowMode' );
-                                       return;
-                               case 'tbody':
-                               case 'tfoot':
-                               case 'thead':
-                                       $this->switchMode( 'inTableBodyMode' );
-                                       return;
-                               case 'caption':
-                                       $this->switchMode( 'inCaptionMode' );
-                                       return;
-                               case 'colgroup':
-                                       $this->switchMode( 'inColumnGroupMode' );
-                                       return;
-                               case 'table':
-                                       $this->switchMode( 'inTableMode' );
-                                       return;
-                               case 'template':
-                                       $this->switchMode(
-                                               array_slice( $this->templateInsertionModes, -1 )[0]
-                                       );
-                                       return;
-                               case 'body':
-                                       $this->switchMode( 'inBodyMode' );
-                                       return;
-                               // OMITTED: <frameset>
-                               // OMITTED: <html>
-                               // OMITTED: <head>
-                               default:
-                                       if ( !$last ) {
-                                               // OMITTED: <head>
-                                               if ( $node->isA( BalanceSets::$tableCellSet ) ) {
-                                                       $this->switchMode( 'inCellMode' );
-                                                       return;
+                                               $this->switchMode( 'inSelectMode' );
+                                               return;
+                                       case 'tr':
+                                               $this->switchMode( 'inRowMode' );
+                                               return;
+                                       case 'tbody':
+                                       case 'tfoot':
+                                       case 'thead':
+                                               $this->switchMode( 'inTableBodyMode' );
+                                               return;
+                                       case 'caption':
+                                               $this->switchMode( 'inCaptionMode' );
+                                               return;
+                                       case 'colgroup':
+                                               $this->switchMode( 'inColumnGroupMode' );
+                                               return;
+                                       case 'table':
+                                               $this->switchMode( 'inTableMode' );
+                                               return;
+                                       case 'template':
+                                               $this->switchMode(
+                                                       array_slice( $this->templateInsertionModes, -1 )[0]
+                                               );
+                                               return;
+                                       case 'body':
+                                               $this->switchMode( 'inBodyMode' );
+                                               return;
+                                       // OMITTED: <frameset>
+                                       // OMITTED: <html>
+                                       // OMITTED: <head>
+                                       default:
+                                               if ( !$last ) {
+                                                       // OMITTED: <head>
+                                                       if ( $node->isA( BalanceSets::$tableCellSet ) ) {
+                                                               $this->switchMode( 'inCellMode' );
+                                                               return;
+                                                       }
                                                }
-                                       }
                                }
                        }
                        if ( $last ) {
@@ -2378,52 +2378,52 @@ class Balancer {
                        // Fall through to handle non-whitespace below.
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'meta':
-                               // OMITTED: in a full HTML parser, this might change the encoding.
-                               // falls through
-                       // OMITTED: <html>
-                       case 'base':
-                       case 'basefont':
-                       case 'bgsound':
-                       case 'link':
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               return true;
-                       // OMITTED: <title>
-                       // OMITTED: <noscript>
-                       case 'noframes':
-                       case 'style':
-                               return $this->parseRawText( $value, $attribs );
-                       // OMITTED: <script>
-                       case 'template':
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->afe->insertMarker();
-                               // OMITTED: frameset_ok
-                               $this->switchMode( 'inTemplateMode' );
-                               $this->templateInsertionModes[] = $this->parseMode;
-                               return true;
-                       // OMITTED: <head>
+                               case 'meta':
+                                       // OMITTED: in a full HTML parser, this might change the encoding.
+                                       // falls through
+                               // OMITTED: <html>
+                               case 'base':
+                               case 'basefont':
+                               case 'bgsound':
+                               case 'link':
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->stack->pop();
+                                       return true;
+                               // OMITTED: <title>
+                               // OMITTED: <noscript>
+                               case 'noframes':
+                               case 'style':
+                                       return $this->parseRawText( $value, $attribs );
+                               // OMITTED: <script>
+                               case 'template':
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->afe->insertMarker();
+                                       // OMITTED: frameset_ok
+                                       $this->switchMode( 'inTemplateMode' );
+                                       $this->templateInsertionModes[] = $this->parseMode;
+                                       return true;
+                               // OMITTED: <head>
                        }
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       // OMITTED: <head>
-                       // OMITTED: <body>
-                       // OMITTED: <html>
-                       case 'br':
-                               break; // handle at the bottom of the function
-                       case 'template':
-                               if ( $this->stack->indexOf( $value ) < 0 ) {
-                                       return true; // Ignore the token.
-                               }
-                               $this->stack->generateImpliedEndTags( null, true /* thorough */ );
-                               $this->stack->popTag( $value );
-                               $this->afe->clearToMarker();
-                               array_pop( $this->templateInsertionModes );
-                               $this->resetInsertionMode();
-                               return true;
-                       default:
-                               // ignore any other end tag
-                               return true;
+                               // OMITTED: <head>
+                               // OMITTED: <body>
+                               // OMITTED: <html>
+                               case 'br':
+                                       break; // handle at the bottom of the function
+                               case 'template':
+                                       if ( $this->stack->indexOf( $value ) < 0 ) {
+                                               return true; // Ignore the token.
+                                       }
+                                       $this->stack->generateImpliedEndTags( null, true /* thorough */ );
+                                       $this->stack->popTag( $value );
+                                       $this->afe->clearToMarker();
+                                       array_pop( $this->templateInsertionModes );
+                                       $this->resetInsertionMode();
+                                       return true;
+                               default:
+                                       // ignore any other end tag
+                                       return true;
                        }
                } elseif ( $token === 'comment' ) {
                        $this->stack->insertComment( $value );
@@ -2449,505 +2449,505 @@ class Balancer {
                        return true;
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       // OMITTED: <html>
-                       case 'base':
-                       case 'basefont':
-                       case 'bgsound':
-                       case 'link':
-                       case 'meta':
-                       case 'noframes':
-                       // OMITTED: <script>
-                       case 'style':
-                       case 'template':
-                       // OMITTED: <title>
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
-                       // OMITTED: <body>
-                       // OMITTED: <frameset>
-
-                       case 'address':
-                       case 'article':
-                       case 'aside':
-                       case 'blockquote':
-                       case 'center':
-                       case 'details':
-                       case 'dialog':
-                       case 'dir':
-                       case 'div':
-                       case 'dl':
-                       case 'fieldset':
-                       case 'figcaption':
-                       case 'figure':
-                       case 'footer':
-                       case 'header':
-                       case 'hgroup':
-                       case 'main':
-                       case 'nav':
-                       case 'ol':
-                       case 'p':
-                       case 'section':
-                       case 'summary':
-                       case 'ul':
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
-
-                       case 'menu':
-                               if ( $this->stack->inButtonScope( "p" ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
-                                       $this->stack->pop();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               // OMITTED: <html>
+                               case 'base':
+                               case 'basefont':
+                               case 'bgsound':
+                               case 'link':
+                               case 'meta':
+                               case 'noframes':
+                               // OMITTED: <script>
+                               case 'style':
+                               case 'template':
+                               // OMITTED: <title>
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               // OMITTED: <body>
+                               // OMITTED: <frameset>
 
-                       case 'h1':
-                       case 'h2':
-                       case 'h3':
-                       case 'h4':
-                       case 'h5':
-                       case 'h6':
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               if ( $this->stack->currentNode->isA( BalanceSets::$headingSet ) ) {
-                                       $this->stack->pop();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               case 'address':
+                               case 'article':
+                               case 'aside':
+                               case 'blockquote':
+                               case 'center':
+                               case 'details':
+                               case 'dialog':
+                               case 'dir':
+                               case 'div':
+                               case 'dl':
+                               case 'fieldset':
+                               case 'figcaption':
+                               case 'figure':
+                               case 'footer':
+                               case 'header':
+                               case 'hgroup':
+                               case 'main':
+                               case 'nav':
+                               case 'ol':
+                               case 'p':
+                               case 'section':
+                               case 'summary':
+                               case 'ul':
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'pre':
-                       case 'listing':
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->ignoreLinefeed = true;
-                               // OMITTED: frameset_ok
-                               return true;
+                               case 'menu':
+                                       if ( $this->stack->inButtonScope( "p" ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'form':
-                               if (
-                                       $this->formElementPointer &&
-                                       $this->stack->indexOf( 'template' ) < 0
-                               ) {
-                                       return true; // in a form, not in a template.
-                               }
-                               if ( $this->stack->inButtonScope( "p" ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $elt = $this->stack->insertHTMLElement( $value, $attribs );
-                               if ( $this->stack->indexOf( 'template' ) < 0 ) {
-                                       $this->formElementPointer = $elt;
-                               }
-                               return true;
+                               case 'h1':
+                               case 'h2':
+                               case 'h3':
+                               case 'h4':
+                               case 'h5':
+                               case 'h6':
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       if ( $this->stack->currentNode->isA( BalanceSets::$headingSet ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'li':
-                               // OMITTED: frameset_ok
-                               foreach ( $this->stack as $node ) {
-                                       if ( $node->isHtmlNamed( 'li' ) ) {
-                                               $this->inBodyMode( 'endtag', 'li' );
-                                               break;
+                               case 'pre':
+                               case 'listing':
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
                                        }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->ignoreLinefeed = true;
+                                       // OMITTED: frameset_ok
+                                       return true;
+
+                               case 'form':
                                        if (
-                                               $node->isA( BalanceSets::$specialSet ) &&
-                                               !$node->isA( BalanceSets::$addressDivPSet )
+                                               $this->formElementPointer &&
+                                               $this->stack->indexOf( 'template' ) < 0
                                        ) {
-                                               break;
+                                               return true; // in a form, not in a template.
                                        }
-                               }
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
-
-                       case 'dd':
-                       case 'dt':
-                               // OMITTED: frameset_ok
-                               foreach ( $this->stack as $node ) {
-                                       if ( $node->isHtmlNamed( 'dd' ) ) {
-                                               $this->inBodyMode( 'endtag', 'dd' );
-                                               break;
+                                       if ( $this->stack->inButtonScope( "p" ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
                                        }
-                                       if ( $node->isHtmlNamed( 'dt' ) ) {
-                                               $this->inBodyMode( 'endtag', 'dt' );
-                                               break;
+                                       $elt = $this->stack->insertHTMLElement( $value, $attribs );
+                                       if ( $this->stack->indexOf( 'template' ) < 0 ) {
+                                               $this->formElementPointer = $elt;
                                        }
-                                       if (
-                                               $node->isA( BalanceSets::$specialSet ) &&
-                                               !$node->isA( BalanceSets::$addressDivPSet )
-                                       ) {
-                                               break;
+                                       return true;
+
+                               case 'li':
+                                       // OMITTED: frameset_ok
+                                       foreach ( $this->stack as $node ) {
+                                               if ( $node->isHtmlNamed( 'li' ) ) {
+                                                       $this->inBodyMode( 'endtag', 'li' );
+                                                       break;
+                                               }
+                                               if (
+                                                       $node->isA( BalanceSets::$specialSet ) &&
+                                                       !$node->isA( BalanceSets::$addressDivPSet )
+                                               ) {
+                                                       break;
+                                               }
                                        }
-                               }
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       // OMITTED: <plaintext>
+                               case 'dd':
+                               case 'dt':
+                                       // OMITTED: frameset_ok
+                                       foreach ( $this->stack as $node ) {
+                                               if ( $node->isHtmlNamed( 'dd' ) ) {
+                                                       $this->inBodyMode( 'endtag', 'dd' );
+                                                       break;
+                                               }
+                                               if ( $node->isHtmlNamed( 'dt' ) ) {
+                                                       $this->inBodyMode( 'endtag', 'dt' );
+                                                       break;
+                                               }
+                                               if (
+                                                       $node->isA( BalanceSets::$specialSet ) &&
+                                                       !$node->isA( BalanceSets::$addressDivPSet )
+                                               ) {
+                                                       break;
+                                               }
+                                       }
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'button':
-                               if ( $this->stack->inScope( 'button' ) ) {
-                                       $this->inBodyMode( 'endtag', 'button' );
-                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               // OMITTED: <plaintext>
 
-                       case 'a':
-                               $activeElement = $this->afe->findElementByTag( 'a' );
-                               if ( $activeElement ) {
-                                       $this->inBodyMode( 'endtag', 'a' );
-                                       if ( $this->afe->isInList( $activeElement ) ) {
-                                               $this->afe->remove( $activeElement );
-                                               // Don't flatten here, since when we fall
-                                               // through below we might foster parent
-                                               // the new <a> tag inside this one.
-                                               $this->stack->removeElement( $activeElement, false );
+                               case 'button':
+                                       if ( $this->stack->inScope( 'button' ) ) {
+                                               $this->inBodyMode( 'endtag', 'button' );
+                                               return $this->insertToken( $token, $value, $attribs, $selfClose );
                                        }
-                               }
-                               // Falls through
-                       case 'b':
-                       case 'big':
-                       case 'code':
-                       case 'em':
-                       case 'font':
-                       case 'i':
-                       case 's':
-                       case 'small':
-                       case 'strike':
-                       case 'strong':
-                       case 'tt':
-                       case 'u':
-                               $this->afe->reconstruct( $this->stack );
-                               $this->afe->push( $this->stack->insertHTMLElement( $value, $attribs ) );
-                               return true;
-
-                       case 'nobr':
-                               $this->afe->reconstruct( $this->stack );
-                               if ( $this->stack->inScope( 'nobr' ) ) {
-                                       $this->inBodyMode( 'endtag', 'nobr' );
                                        $this->afe->reconstruct( $this->stack );
-                               }
-                               $this->afe->push( $this->stack->insertHTMLElement( $value, $attribs ) );
-                               return true;
-
-                       case 'applet':
-                       case 'marquee':
-                       case 'object':
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->afe->insertMarker();
-                               // OMITTED: frameset_ok
-                               return true;
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'table':
-                               // The document is never in "quirks mode"; see simplifications
-                               // above.
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               // OMITTED: frameset_ok
-                               $this->switchMode( 'inTableMode' );
-                               return true;
+                               case 'a':
+                                       $activeElement = $this->afe->findElementByTag( 'a' );
+                                       if ( $activeElement ) {
+                                               $this->inBodyMode( 'endtag', 'a' );
+                                               if ( $this->afe->isInList( $activeElement ) ) {
+                                                       $this->afe->remove( $activeElement );
+                                                       // Don't flatten here, since when we fall
+                                                       // through below we might foster parent
+                                                       // the new <a> tag inside this one.
+                                                       $this->stack->removeElement( $activeElement, false );
+                                               }
+                                       }
+                                       // Falls through
+                               case 'b':
+                               case 'big':
+                               case 'code':
+                               case 'em':
+                               case 'font':
+                               case 'i':
+                               case 's':
+                               case 'small':
+                               case 'strike':
+                               case 'strong':
+                               case 'tt':
+                               case 'u':
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->afe->push( $this->stack->insertHTMLElement( $value, $attribs ) );
+                                       return true;
 
-                       case 'area':
-                       case 'br':
-                       case 'embed':
-                       case 'img':
-                       case 'keygen':
-                       case 'wbr':
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               // OMITTED: frameset_ok
-                               return true;
+                               case 'nobr':
+                                       $this->afe->reconstruct( $this->stack );
+                                       if ( $this->stack->inScope( 'nobr' ) ) {
+                                               $this->inBodyMode( 'endtag', 'nobr' );
+                                               $this->afe->reconstruct( $this->stack );
+                                       }
+                                       $this->afe->push( $this->stack->insertHTMLElement( $value, $attribs ) );
+                                       return true;
 
-                       case 'input':
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               // OMITTED: frameset_ok
-                               // (hence we don't need to examine the tag's "type" attribute)
-                               return true;
+                               case 'applet':
+                               case 'marquee':
+                               case 'object':
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->afe->insertMarker();
+                                       // OMITTED: frameset_ok
+                                       return true;
 
-                       case 'param':
-                       case 'source':
-                       case 'track':
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               return true;
+                               case 'table':
+                                       // The document is never in "quirks mode"; see simplifications
+                                       // above.
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       // OMITTED: frameset_ok
+                                       $this->switchMode( 'inTableMode' );
+                                       return true;
 
-                       case 'hr':
-                               if ( $this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'endtag', 'p' );
-                               }
-                               if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
+                               case 'area':
+                               case 'br':
+                               case 'embed':
+                               case 'img':
+                               case 'keygen':
+                               case 'wbr':
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
                                        $this->stack->pop();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               return true;
-
-                       case 'image':
-                               // warts!
-                               return $this->inBodyMode( $token, 'img', $attribs, $selfClose );
-
-                       case 'textarea':
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->ignoreLinefeed = true;
-                               $this->inRCDATA = $value; // emulate rcdata tokenizer mode
-                               // OMITTED: frameset_ok
-                               return true;
-
-                       // OMITTED: <xmp>
-                       // OMITTED: <iframe>
-                       // OMITTED: <noembed>
-                       // OMITTED: <noscript>
-
-                       case 'select':
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               switch ( $this->parseMode ) {
-                               case 'inTableMode':
-                               case 'inCaptionMode':
-                               case 'inTableBodyMode':
-                               case 'inRowMode':
-                               case 'inCellMode':
-                                       $this->switchMode( 'inSelectInTableMode' );
+                                       // OMITTED: frameset_ok
                                        return true;
-                               default:
-                                       $this->switchMode( 'inSelectMode' );
+
+                               case 'input':
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->stack->pop();
+                                       // OMITTED: frameset_ok
+                                       // (hence we don't need to examine the tag's "type" attribute)
                                        return true;
-                               }
 
-                       case 'optgroup':
-                       case 'option':
-                               if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
-                                       $this->inBodyMode( 'endtag', 'option' );
-                               }
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               case 'param':
+                               case 'source':
+                               case 'track':
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->stack->pop();
+                                       return true;
 
-                       case 'menuitem':
-                               if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
+                               case 'hr':
+                                       if ( $this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'endtag', 'p' );
+                                       }
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
                                        $this->stack->pop();
-                               }
-                               $this->afe->reconstruct( $this->stack );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                                       return true;
 
-                       case 'rb':
-                       case 'rtc':
-                               if ( $this->stack->inScope( 'ruby' ) ) {
-                                       $this->stack->generateImpliedEndTags();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               case 'image':
+                                       // warts!
+                                       return $this->inBodyMode( $token, 'img', $attribs, $selfClose );
 
-                       case 'rp':
-                       case 'rt':
-                               if ( $this->stack->inScope( 'ruby' ) ) {
-                                       $this->stack->generateImpliedEndTags( 'rtc' );
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
+                               case 'textarea':
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->ignoreLinefeed = true;
+                                       $this->inRCDATA = $value; // emulate rcdata tokenizer mode
+                                       // OMITTED: frameset_ok
+                                       return true;
 
-                       case 'math':
-                               $this->afe->reconstruct( $this->stack );
-                               // We skip the spec's "adjust MathML attributes" and
-                               // "adjust foreign attributes" steps, since the browser will
-                               // do this later when it parses the output and it doesn't affect
-                               // balancing.
-                               $this->stack->insertForeignElement(
-                                       BalanceSets::MATHML_NAMESPACE, $value, $attribs
-                               );
-                               if ( $selfClose ) {
-                                       // emit explicit </math> tag.
-                                       $this->stack->pop();
-                               }
-                               return true;
+                               // OMITTED: <xmp>
+                               // OMITTED: <iframe>
+                               // OMITTED: <noembed>
+                               // OMITTED: <noscript>
 
-                       case 'svg':
-                               $this->afe->reconstruct( $this->stack );
-                               // We skip the spec's "adjust SVG attributes" and
-                               // "adjust foreign attributes" steps, since the browser will
-                               // do this later when it parses the output and it doesn't affect
-                               // balancing.
-                               $this->stack->insertForeignElement(
-                                       BalanceSets::SVG_NAMESPACE, $value, $attribs
-                               );
-                               if ( $selfClose ) {
-                                       // emit explicit </svg> tag.
-                                       $this->stack->pop();
-                               }
-                               return true;
+                               case 'select':
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       switch ( $this->parseMode ) {
+                                               case 'inTableMode':
+                                               case 'inCaptionMode':
+                                               case 'inTableBodyMode':
+                                               case 'inRowMode':
+                                               case 'inCellMode':
+                                                       $this->switchMode( 'inSelectInTableMode' );
+                                                       return true;
+                                               default:
+                                                       $this->switchMode( 'inSelectMode' );
+                                                       return true;
+                                       }
 
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <frame>
-                       case 'head':
-                       case 'tbody':
-                       case 'td':
-                       case 'tfoot':
-                       case 'th':
-                       case 'thead':
-                       case 'tr':
-                               // Ignore table tags if we're not inTableMode
-                               return true;
-                       }
+                               case 'optgroup':
+                               case 'option':
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
+                                               $this->inBodyMode( 'endtag', 'option' );
+                                       }
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       // Handle any other start tag here
-                       $this->afe->reconstruct( $this->stack );
-                       $this->stack->insertHTMLElement( $value, $attribs );
-                       return true;
-               } elseif ( $token === 'endtag' ) {
-                       switch ( $value ) {
-                       // </body>,</html> are unsupported.
-
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
-
-                       case 'address':
-                       case 'article':
-                       case 'aside':
-                       case 'blockquote':
-                       case 'button':
-                       case 'center':
-                       case 'details':
-                       case 'dialog':
-                       case 'dir':
-                       case 'div':
-                       case 'dl':
-                       case 'fieldset':
-                       case 'figcaption':
-                       case 'figure':
-                       case 'footer':
-                       case 'header':
-                       case 'hgroup':
-                       case 'listing':
-                       case 'main':
-                       case 'menu':
-                       case 'nav':
-                       case 'ol':
-                       case 'pre':
-                       case 'section':
-                       case 'summary':
-                       case 'ul':
-                               // Ignore if there is not a matching open tag
-                               if ( !$this->stack->inScope( $value ) ) {
+                               case 'menuitem':
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'menuitem' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->afe->reconstruct( $this->stack );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
                                        return true;
-                               }
-                               $this->stack->generateImpliedEndTags();
-                               $this->stack->popTag( $value );
-                               return true;
 
-                       case 'form':
-                               if ( $this->stack->indexOf( 'template' ) < 0 ) {
-                                       $openform = $this->formElementPointer;
-                                       $this->formElementPointer = null;
-                                       if ( !$openform || !$this->stack->inScope( $openform ) ) {
-                                               return true;
+                               case 'rb':
+                               case 'rtc':
+                                       if ( $this->stack->inScope( 'ruby' ) ) {
+                                               $this->stack->generateImpliedEndTags();
                                        }
-                                       $this->stack->generateImpliedEndTags();
-                                       // Don't flatten yet if we're removing a <form> element
-                                       // out-of-order. (eg. `<form><div></form>`)
-                                       $flatten = ( $this->stack->currentNode === $openform );
-                                       $this->stack->removeElement( $openform, $flatten );
-                               } else {
-                                       if ( !$this->stack->inScope( 'form' ) ) {
-                                               return true;
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
+
+                               case 'rp':
+                               case 'rt':
+                                       if ( $this->stack->inScope( 'ruby' ) ) {
+                                               $this->stack->generateImpliedEndTags( 'rtc' );
                                        }
-                                       $this->stack->generateImpliedEndTags();
-                                       $this->stack->popTag( 'form' );
-                               }
-                               return true;
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
 
-                       case 'p':
-                               if ( !$this->stack->inButtonScope( 'p' ) ) {
-                                       $this->inBodyMode( 'tag', 'p', [] );
-                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               $this->stack->generateImpliedEndTags( $value );
-                               $this->stack->popTag( $value );
-                               return true;
+                               case 'math':
+                                       $this->afe->reconstruct( $this->stack );
+                                       // We skip the spec's "adjust MathML attributes" and
+                                       // "adjust foreign attributes" steps, since the browser will
+                                       // do this later when it parses the output and it doesn't affect
+                                       // balancing.
+                                       $this->stack->insertForeignElement(
+                                               BalanceSets::MATHML_NAMESPACE, $value, $attribs
+                                       );
+                                       if ( $selfClose ) {
+                                               // emit explicit </math> tag.
+                                               $this->stack->pop();
+                                       }
+                                       return true;
 
-                       case 'li':
-                               if ( !$this->stack->inListItemScope( $value ) ) {
-                                       return true; // ignore
-                               }
-                               $this->stack->generateImpliedEndTags( $value );
-                               $this->stack->popTag( $value );
-                               return true;
+                               case 'svg':
+                                       $this->afe->reconstruct( $this->stack );
+                                       // We skip the spec's "adjust SVG attributes" and
+                                       // "adjust foreign attributes" steps, since the browser will
+                                       // do this later when it parses the output and it doesn't affect
+                                       // balancing.
+                                       $this->stack->insertForeignElement(
+                                               BalanceSets::SVG_NAMESPACE, $value, $attribs
+                                       );
+                                       if ( $selfClose ) {
+                                               // emit explicit </svg> tag.
+                                               $this->stack->pop();
+                                       }
+                                       return true;
 
-                       case 'dd':
-                       case 'dt':
-                               if ( !$this->stack->inScope( $value ) ) {
-                                       return true; // ignore
-                               }
-                               $this->stack->generateImpliedEndTags( $value );
-                               $this->stack->popTag( $value );
-                               return true;
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <frame>
+                               case 'head':
+                               case 'tbody':
+                               case 'td':
+                               case 'tfoot':
+                               case 'th':
+                               case 'thead':
+                               case 'tr':
+                                       // Ignore table tags if we're not inTableMode
+                                       return true;
+                       }
 
-                       case 'h1':
-                       case 'h2':
-                       case 'h3':
-                       case 'h4':
-                       case 'h5':
-                       case 'h6':
-                               if ( !$this->stack->inScope( BalanceSets::$headingSet ) ) {
-                                       return true; // ignore
-                               }
-                               $this->stack->generateImpliedEndTags();
-                               $this->stack->popTag( BalanceSets::$headingSet );
-                               return true;
+                       // Handle any other start tag here
+                       $this->afe->reconstruct( $this->stack );
+                       $this->stack->insertHTMLElement( $value, $attribs );
+                       return true;
+               } elseif ( $token === 'endtag' ) {
+                       switch ( $value ) {
+                               // </body>,</html> are unsupported.
 
-                       case 'sarcasm':
-                               // Take a deep breath, then:
-                               break;
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+
+                               case 'address':
+                               case 'article':
+                               case 'aside':
+                               case 'blockquote':
+                               case 'button':
+                               case 'center':
+                               case 'details':
+                               case 'dialog':
+                               case 'dir':
+                               case 'div':
+                               case 'dl':
+                               case 'fieldset':
+                               case 'figcaption':
+                               case 'figure':
+                               case 'footer':
+                               case 'header':
+                               case 'hgroup':
+                               case 'listing':
+                               case 'main':
+                               case 'menu':
+                               case 'nav':
+                               case 'ol':
+                               case 'pre':
+                               case 'section':
+                               case 'summary':
+                               case 'ul':
+                                       // Ignore if there is not a matching open tag
+                                       if ( !$this->stack->inScope( $value ) ) {
+                                               return true;
+                                       }
+                                       $this->stack->generateImpliedEndTags();
+                                       $this->stack->popTag( $value );
+                                       return true;
 
-                       case 'a':
-                       case 'b':
-                       case 'big':
-                       case 'code':
-                       case 'em':
-                       case 'font':
-                       case 'i':
-                       case 'nobr':
-                       case 's':
-                       case 'small':
-                       case 'strike':
-                       case 'strong':
-                       case 'tt':
-                       case 'u':
-                               if ( $this->stack->adoptionAgency( $value, $this->afe ) ) {
-                                       return true; // If we did something, we're done.
-                               }
-                               break; // Go to the "any other end tag" case.
+                               case 'form':
+                                       if ( $this->stack->indexOf( 'template' ) < 0 ) {
+                                               $openform = $this->formElementPointer;
+                                               $this->formElementPointer = null;
+                                               if ( !$openform || !$this->stack->inScope( $openform ) ) {
+                                                       return true;
+                                               }
+                                               $this->stack->generateImpliedEndTags();
+                                               // Don't flatten yet if we're removing a <form> element
+                                               // out-of-order. (eg. `<form><div></form>`)
+                                               $flatten = ( $this->stack->currentNode === $openform );
+                                               $this->stack->removeElement( $openform, $flatten );
+                                       } else {
+                                               if ( !$this->stack->inScope( 'form' ) ) {
+                                                       return true;
+                                               }
+                                               $this->stack->generateImpliedEndTags();
+                                               $this->stack->popTag( 'form' );
+                                       }
+                                       return true;
 
-                       case 'applet':
-                       case 'marquee':
-                       case 'object':
-                               if ( !$this->stack->inScope( $value ) ) {
-                                       return true; // ignore
-                               }
-                               $this->stack->generateImpliedEndTags();
-                               $this->stack->popTag( $value );
-                               $this->afe->clearToMarker();
-                               return true;
+                               case 'p':
+                                       if ( !$this->stack->inButtonScope( 'p' ) ) {
+                                               $this->inBodyMode( 'tag', 'p', [] );
+                                               return $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       $this->stack->generateImpliedEndTags( $value );
+                                       $this->stack->popTag( $value );
+                                       return true;
 
-                       case 'br':
-                               // Turn </br> into <br>
-                               return $this->inBodyMode( 'tag', $value, [] );
+                               case 'li':
+                                       if ( !$this->stack->inListItemScope( $value ) ) {
+                                               return true; // ignore
+                                       }
+                                       $this->stack->generateImpliedEndTags( $value );
+                                       $this->stack->popTag( $value );
+                                       return true;
+
+                               case 'dd':
+                               case 'dt':
+                                       if ( !$this->stack->inScope( $value ) ) {
+                                               return true; // ignore
+                                       }
+                                       $this->stack->generateImpliedEndTags( $value );
+                                       $this->stack->popTag( $value );
+                                       return true;
+
+                               case 'h1':
+                               case 'h2':
+                               case 'h3':
+                               case 'h4':
+                               case 'h5':
+                               case 'h6':
+                                       if ( !$this->stack->inScope( BalanceSets::$headingSet ) ) {
+                                               return true; // ignore
+                                       }
+                                       $this->stack->generateImpliedEndTags();
+                                       $this->stack->popTag( BalanceSets::$headingSet );
+                                       return true;
+
+                               case 'sarcasm':
+                                       // Take a deep breath, then:
+                                       break;
+
+                               case 'a':
+                               case 'b':
+                               case 'big':
+                               case 'code':
+                               case 'em':
+                               case 'font':
+                               case 'i':
+                               case 'nobr':
+                               case 's':
+                               case 'small':
+                               case 'strike':
+                               case 'strong':
+                               case 'tt':
+                               case 'u':
+                                       if ( $this->stack->adoptionAgency( $value, $this->afe ) ) {
+                                               return true; // If we did something, we're done.
+                                       }
+                                       break; // Go to the "any other end tag" case.
+
+                               case 'applet':
+                               case 'marquee':
+                               case 'object':
+                                       if ( !$this->stack->inScope( $value ) ) {
+                                               return true; // ignore
+                                       }
+                                       $this->stack->generateImpliedEndTags();
+                                       $this->stack->popTag( $value );
+                                       $this->afe->clearToMarker();
+                                       return true;
+
+                               case 'br':
+                                       // Turn </br> into <br>
+                                       return $this->inBodyMode( 'tag', $value, [] );
                        }
 
                        // Any other end tag goes here
@@ -2985,87 +2985,87 @@ class Balancer {
                        return true;
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'caption':
-                               $this->afe->insertMarker();
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->switchMode( 'inCaptionMode' );
-                               return true;
-                       case 'colgroup':
-                               $this->stack->clearToContext( BalanceSets::$tableContextSet );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->switchMode( 'inColumnGroupMode' );
-                               return true;
-                       case 'col':
-                               $this->inTableMode( 'tag', 'colgroup', [] );
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                               $this->stack->clearToContext( BalanceSets::$tableContextSet );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->switchMode( 'inTableBodyMode' );
-                               return true;
-                       case 'td':
-                       case 'th':
-                       case 'tr':
-                               $this->inTableMode( 'tag', 'tbody', [] );
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
-                       case 'table':
-                               if ( !$this->stack->inTableScope( $value ) ) {
-                                       return true; // Ignore this tag.
-                               }
-                               $this->inTableMode( 'endtag', $value );
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
-
-                       case 'style':
-                       // OMITTED: <script>
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'caption':
+                                       $this->afe->insertMarker();
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->switchMode( 'inCaptionMode' );
+                                       return true;
+                               case 'colgroup':
+                                       $this->stack->clearToContext( BalanceSets::$tableContextSet );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->switchMode( 'inColumnGroupMode' );
+                                       return true;
+                               case 'col':
+                                       $this->inTableMode( 'tag', 'colgroup', [] );
+                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                                       $this->stack->clearToContext( BalanceSets::$tableContextSet );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->switchMode( 'inTableBodyMode' );
+                                       return true;
+                               case 'td':
+                               case 'th':
+                               case 'tr':
+                                       $this->inTableMode( 'tag', 'tbody', [] );
+                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
+                               case 'table':
+                                       if ( !$this->stack->inTableScope( $value ) ) {
+                                               return true; // Ignore this tag.
+                                       }
+                                       $this->inTableMode( 'endtag', $value );
+                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
 
-                       case 'input':
-                               if ( !isset( $attribs['type'] ) || strcasecmp( $attribs['type'], 'hidden' ) !== 0 ) {
-                                       break; // Handle this as "everything else"
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               return true;
+                               case 'style':
+                               // OMITTED: <script>
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
 
-                       case 'form':
-                               if (
-                                       $this->formElementPointer ||
-                                       $this->stack->indexOf( 'template' ) >= 0
-                               ) {
-                                       return true; // ignore this token
-                               }
-                               $this->formElementPointer =
+                               case 'input':
+                                       if ( !isset( $attribs['type'] ) || strcasecmp( $attribs['type'], 'hidden' ) !== 0 ) {
+                                               break; // Handle this as "everything else"
+                                       }
                                        $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->popTag( $this->formElementPointer );
-                               return true;
+                                       $this->stack->pop();
+                                       return true;
+
+                               case 'form':
+                                       if (
+                                               $this->formElementPointer ||
+                                               $this->stack->indexOf( 'template' ) >= 0
+                                       ) {
+                                               return true; // ignore this token
+                                       }
+                                       $this->formElementPointer =
+                                               $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->stack->popTag( $this->formElementPointer );
+                                       return true;
                        }
                        // Fall through for "anything else" clause.
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'table':
-                               if ( !$this->stack->inTableScope( $value ) ) {
-                                       return true; // Ignore.
-                               }
-                               $this->stack->popTag( $value );
-                               $this->resetInsertionMode();
-                               return true;
-                       // OMITTED: <body>
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <html>
-                       case 'tbody':
-                       case 'td':
-                       case 'tfoot':
-                       case 'th':
-                       case 'thead':
-                       case 'tr':
-                               return true; // Ignore the token.
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'table':
+                                       if ( !$this->stack->inTableScope( $value ) ) {
+                                               return true; // Ignore.
+                                       }
+                                       $this->stack->popTag( $value );
+                                       $this->resetInsertionMode();
+                                       return true;
+                               // OMITTED: <body>
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <html>
+                               case 'tbody':
+                               case 'td':
+                               case 'tfoot':
+                               case 'th':
+                               case 'thead':
+                               case 'tr':
+                                       return true; // Ignore the token.
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                        // Fall through for "anything else" clause.
                } elseif ( $token === 'comment' ) {
@@ -3116,43 +3116,43 @@ class Balancer {
        private function inCaptionMode( $token, $value, $attribs = null, $selfClose = false ) {
                if ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       case 'tbody':
-                       case 'td':
-                       case 'tfoot':
-                       case 'th':
-                       case 'thead':
-                       case 'tr':
-                               if ( $this->endCaption() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               case 'tbody':
+                               case 'td':
+                               case 'tfoot':
+                               case 'th':
+                               case 'thead':
+                               case 'tr':
+                                       if ( $this->endCaption() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                        }
                        // Fall through to "anything else" case.
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'caption':
-                               $this->endCaption();
-                               return true;
-                       case 'table':
-                               if ( $this->endCaption() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
-                       case 'body':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <html>
-                       case 'tbody':
-                       case 'td':
-                       case 'tfoot':
-                       case 'th':
-                       case 'thead':
-                       case 'tr':
-                               // Ignore the token
-                               return true;
+                               case 'caption':
+                                       $this->endCaption();
+                                       return true;
+                               case 'table':
+                                       if ( $this->endCaption() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
+                               case 'body':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <html>
+                               case 'tbody':
+                               case 'td':
+                               case 'tfoot':
+                               case 'th':
+                               case 'thead':
+                               case 'tr':
+                                       // Ignore the token
+                                       return true;
                        }
                        // Fall through to "anything else" case.
                }
@@ -3172,28 +3172,28 @@ class Balancer {
                        // Fall through to handle non-whitespace below.
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       // OMITTED: <html>
-                       case 'col':
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->stack->pop();
-                               return true;
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               // OMITTED: <html>
+                               case 'col':
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->stack->pop();
+                                       return true;
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                        // Fall through for "anything else".
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'colgroup':
-                               if ( !$this->stack->currentNode->isHtmlNamed( 'colgroup' ) ) {
+                               case 'colgroup':
+                                       if ( !$this->stack->currentNode->isHtmlNamed( 'colgroup' ) ) {
+                                               return true; // Ignore the token.
+                                       }
+                                       $this->stack->pop();
+                                       $this->switchMode( 'inTableMode' );
+                                       return true;
+                               case 'col':
                                        return true; // Ignore the token.
-                               }
-                               $this->stack->pop();
-                               $this->switchMode( 'inTableMode' );
-                               return true;
-                       case 'col':
-                               return true; // Ignore the token.
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                        // Fall through for "anything else".
                } elseif ( $token === 'eof' ) {
@@ -3228,50 +3228,50 @@ class Balancer {
        private function inTableBodyMode( $token, $value, $attribs = null, $selfClose = false ) {
                if ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'tr':
-                               $this->stack->clearToContext( BalanceSets::$tableBodyContextSet );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->switchMode( 'inRowMode' );
-                               return true;
-                       case 'th':
-                       case 'td':
-                               $this->inTableBodyMode( 'tag', 'tr', [] );
-                               $this->insertToken( $token, $value, $attribs, $selfClose );
-                               return true;
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                               if ( $this->endSection() ) {
+                               case 'tr':
+                                       $this->stack->clearToContext( BalanceSets::$tableBodyContextSet );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->switchMode( 'inRowMode' );
+                                       return true;
+                               case 'th':
+                               case 'td':
+                                       $this->inTableBodyMode( 'tag', 'tr', [] );
                                        $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
+                                       return true;
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                                       if ( $this->endSection() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                        }
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'table':
-                               if ( $this->endSection() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                               if ( $this->stack->inTableScope( $value ) ) {
-                                       $this->endSection();
-                               }
-                               return true;
-                       // OMITTED: <body>
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <html>
-                       case 'td':
-                       case 'th':
-                       case 'tr':
-                               return true; // Ignore the token.
+                               case 'table':
+                                       if ( $this->endSection() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                                       if ( $this->stack->inTableScope( $value ) ) {
+                                               $this->endSection();
+                                       }
+                                       return true;
+                               // OMITTED: <body>
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <html>
+                               case 'td':
+                               case 'th':
+                               case 'tr':
+                                       return true; // Ignore the token.
                        }
                }
                // Anything else:
@@ -3291,53 +3291,53 @@ class Balancer {
        private function inRowMode( $token, $value, $attribs = null, $selfClose = false ) {
                if ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'th':
-                       case 'td':
-                               $this->stack->clearToContext( BalanceSets::$tableRowContextSet );
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               $this->switchMode( 'inCellMode' );
-                               $this->afe->insertMarker();
-                               return true;
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                       case 'tr':
-                               if ( $this->endRow() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
+                               case 'th':
+                               case 'td':
+                                       $this->stack->clearToContext( BalanceSets::$tableRowContextSet );
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       $this->switchMode( 'inCellMode' );
+                                       $this->afe->insertMarker();
+                                       return true;
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                               case 'tr':
+                                       if ( $this->endRow() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                        }
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'tr':
-                               $this->endRow();
-                               return true;
-                       case 'table':
-                               if ( $this->endRow() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                               if (
-                                       $this->stack->inTableScope( $value ) &&
-                                       $this->endRow()
-                               ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
-                       // OMITTED: <body>
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <html>
-                       case 'td':
-                       case 'th':
-                               return true; // Ignore the token.
+                               case 'tr':
+                                       $this->endRow();
+                                       return true;
+                               case 'table':
+                                       if ( $this->endRow() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                                       if (
+                                               $this->stack->inTableScope( $value ) &&
+                                               $this->endRow()
+                                       ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
+                               // OMITTED: <body>
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <html>
+                               case 'td':
+                               case 'th':
+                                       return true; // Ignore the token.
                        }
                }
                // Anything else:
@@ -3359,51 +3359,51 @@ class Balancer {
        private function inCellMode( $token, $value, $attribs = null, $selfClose = false ) {
                if ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       case 'tbody':
-                       case 'td':
-                       case 'tfoot':
-                       case 'th':
-                       case 'thead':
-                       case 'tr':
-                               if ( $this->endCell() ) {
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               case 'tbody':
+                               case 'td':
+                               case 'tfoot':
+                               case 'th':
+                               case 'thead':
+                               case 'tr':
+                                       if ( $this->endCell() ) {
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                        }
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'td':
-                       case 'th':
-                               if ( $this->stack->inTableScope( $value ) ) {
-                                       $this->stack->generateImpliedEndTags();
-                                       $this->stack->popTag( $value );
-                                       $this->afe->clearToMarker();
-                                       $this->switchMode( 'inRowMode' );
-                               }
-                               return true;
-                       // OMITTED: <body>
-                       case 'caption':
-                       case 'col':
-                       case 'colgroup':
-                       // OMITTED: <html>
-                               return true;
+                               case 'td':
+                               case 'th':
+                                       if ( $this->stack->inTableScope( $value ) ) {
+                                               $this->stack->generateImpliedEndTags();
+                                               $this->stack->popTag( $value );
+                                               $this->afe->clearToMarker();
+                                               $this->switchMode( 'inRowMode' );
+                                       }
+                                       return true;
+                               // OMITTED: <body>
+                               case 'caption':
+                               case 'col':
+                               case 'colgroup':
+                               // OMITTED: <html>
+                                       return true;
 
-                       case 'table':
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                       case 'tr':
-                               if ( $this->stack->inTableScope( $value ) ) {
-                                       $this->stack->generateImpliedEndTags();
-                                       $this->stack->popTag( BalanceSets::$tableCellSet );
-                                       $this->afe->clearToMarker();
-                                       $this->switchMode( 'inRowMode' );
-                                       $this->insertToken( $token, $value, $attribs, $selfClose );
-                               }
-                               return true;
+                               case 'table':
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                               case 'tr':
+                                       if ( $this->stack->inTableScope( $value ) ) {
+                                               $this->stack->generateImpliedEndTags();
+                                               $this->stack->popTag( BalanceSets::$tableCellSet );
+                                               $this->afe->clearToMarker();
+                                               $this->switchMode( 'inRowMode' );
+                                               $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                        }
                }
                // Anything else:
@@ -3418,65 +3418,65 @@ class Balancer {
                        return $this->inBodyMode( $token, $value, $attribs, $selfClose );
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       // OMITTED: <html>
-                       case 'option':
-                               if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
-                                       $this->stack->pop();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
-                       case 'optgroup':
-                               if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
-                                       $this->stack->pop();
-                               }
-                               if ( $this->stack->currentNode->isHtmlNamed( 'optgroup' ) ) {
-                                       $this->stack->pop();
-                               }
-                               $this->stack->insertHTMLElement( $value, $attribs );
-                               return true;
-                       case 'select':
-                               $this->inSelectMode( 'endtag', $value ); // treat it like endtag
-                               return true;
-                       case 'input':
-                       case 'keygen':
-                       case 'textarea':
-                               if ( !$this->stack->inSelectScope( 'select' ) ) {
-                                       return true; // ignore token (fragment case)
-                               }
-                               $this->inSelectMode( 'endtag', 'select' );
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
-                       case 'script':
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               // OMITTED: <html>
+                               case 'option':
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
+                               case 'optgroup':
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'optgroup' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       $this->stack->insertHTMLElement( $value, $attribs );
+                                       return true;
+                               case 'select':
+                                       $this->inSelectMode( 'endtag', $value ); // treat it like endtag
+                                       return true;
+                               case 'input':
+                               case 'keygen':
+                               case 'textarea':
+                                       if ( !$this->stack->inSelectScope( 'select' ) ) {
+                                               return true; // ignore token (fragment case)
+                                       }
+                                       $this->inSelectMode( 'endtag', 'select' );
+                                       return $this->insertToken( $token, $value, $attribs, $selfClose );
+                               case 'script':
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'optgroup':
-                               if (
-                                       $this->stack->currentNode->isHtmlNamed( 'option' ) &&
-                                       $this->stack->length() >= 2 &&
-                                       $this->stack->node( $this->stack->length() - 2 )->isHtmlNamed( 'optgroup' )
-                               ) {
-                                       $this->stack->pop();
-                               }
-                               if ( $this->stack->currentNode->isHtmlNamed( 'optgroup' ) ) {
-                                       $this->stack->pop();
-                               }
-                               return true;
-                       case 'option':
-                               if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
-                                       $this->stack->pop();
-                               }
-                               return true;
-                       case 'select':
-                               if ( !$this->stack->inSelectScope( $value ) ) {
-                                       return true; // fragment case
-                               }
-                               $this->stack->popTag( $value );
-                               $this->resetInsertionMode();
-                               return true;
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'optgroup':
+                                       if (
+                                               $this->stack->currentNode->isHtmlNamed( 'option' ) &&
+                                               $this->stack->length() >= 2 &&
+                                               $this->stack->node( $this->stack->length() - 2 )->isHtmlNamed( 'optgroup' )
+                                       ) {
+                                               $this->stack->pop();
+                                       }
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'optgroup' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       return true;
+                               case 'option':
+                                       if ( $this->stack->currentNode->isHtmlNamed( 'option' ) ) {
+                                               $this->stack->pop();
+                                       }
+                                       return true;
+                               case 'select':
+                                       if ( !$this->stack->inSelectScope( $value ) ) {
+                                               return true; // fragment case
+                                       }
+                                       $this->stack->popTag( $value );
+                                       $this->resetInsertionMode();
+                                       return true;
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                } elseif ( $token === 'comment' ) {
                        $this->stack->insertComment( $value );
@@ -3488,24 +3488,24 @@ class Balancer {
 
        private function inSelectInTableMode( $token, $value, $attribs = null, $selfClose = false ) {
                switch ( $value ) {
-               case 'caption':
-               case 'table':
-               case 'tbody':
-               case 'tfoot':
-               case 'thead':
-               case 'tr':
-               case 'td':
-               case 'th':
-                       if ( $token === 'tag' ) {
-                               $this->inSelectInTableMode( 'endtag', 'select' );
-                               return $this->insertToken( $token, $value, $attribs, $selfClose );
-                       } elseif ( $token === 'endtag' ) {
-                               if ( $this->stack->inTableScope( $value ) ) {
+                       case 'caption':
+                       case 'table':
+                       case 'tbody':
+                       case 'tfoot':
+                       case 'thead':
+                       case 'tr':
+                       case 'td':
+                       case 'th':
+                               if ( $token === 'tag' ) {
                                        $this->inSelectInTableMode( 'endtag', 'select' );
                                        return $this->insertToken( $token, $value, $attribs, $selfClose );
+                               } elseif ( $token === 'endtag' ) {
+                                       if ( $this->stack->inTableScope( $value ) ) {
+                                               $this->inSelectInTableMode( 'endtag', 'select' );
+                                               return $this->insertToken( $token, $value, $attribs, $selfClose );
+                                       }
+                                       return true;
                                }
-                               return true;
-                       }
                }
                // anything else
                return $this->inSelectMode( $token, $value, $attribs, $selfClose );
@@ -3527,50 +3527,50 @@ class Balancer {
                        return true;
                } elseif ( $token === 'tag' ) {
                        switch ( $value ) {
-                       case 'base':
-                       case 'basefont':
-                       case 'bgsound':
-                       case 'link':
-                       case 'meta':
-                       case 'noframes':
-                       // OMITTED: <script>
-                       case 'style':
-                       case 'template':
-                       // OMITTED: <title>
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'base':
+                               case 'basefont':
+                               case 'bgsound':
+                               case 'link':
+                               case 'meta':
+                               case 'noframes':
+                               // OMITTED: <script>
+                               case 'style':
+                               case 'template':
+                               // OMITTED: <title>
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
 
-                       case 'caption':
-                       case 'colgroup':
-                       case 'tbody':
-                       case 'tfoot':
-                       case 'thead':
-                               return $this->switchModeAndReprocess(
-                                       'inTableMode', $token, $value, $attribs, $selfClose
-                               );
+                               case 'caption':
+                               case 'colgroup':
+                               case 'tbody':
+                               case 'tfoot':
+                               case 'thead':
+                                       return $this->switchModeAndReprocess(
+                                               'inTableMode', $token, $value, $attribs, $selfClose
+                                       );
 
-                       case 'col':
-                               return $this->switchModeAndReprocess(
-                                       'inColumnGroupMode', $token, $value, $attribs, $selfClose
-                               );
+                               case 'col':
+                                       return $this->switchModeAndReprocess(
+                                               'inColumnGroupMode', $token, $value, $attribs, $selfClose
+                                       );
 
-                       case 'tr':
-                               return $this->switchModeAndReprocess(
-                                       'inTableBodyMode', $token, $value, $attribs, $selfClose
-                               );
+                               case 'tr':
+                                       return $this->switchModeAndReprocess(
+                                               'inTableBodyMode', $token, $value, $attribs, $selfClose
+                                       );
 
-                       case 'td':
-                       case 'th':
-                               return $this->switchModeAndReprocess(
-                                       'inRowMode', $token, $value, $attribs, $selfClose
-                               );
+                               case 'td':
+                               case 'th':
+                                       return $this->switchModeAndReprocess(
+                                               'inRowMode', $token, $value, $attribs, $selfClose
+                                       );
                        }
                        return $this->switchModeAndReprocess(
                                'inBodyMode', $token, $value, $attribs, $selfClose
                        );
                } elseif ( $token === 'endtag' ) {
                        switch ( $value ) {
-                       case 'template':
-                               return $this->inHeadMode( $token, $value, $attribs, $selfClose );
+                               case 'template':
+                                       return $this->inHeadMode( $token, $value, $attribs, $selfClose );
                        }
                        return true;
                } else {
index 1415ea3..d12531b 100644 (file)
@@ -392,18 +392,18 @@ class ClassCollector {
                // Note: When changing class name discovery logic,
                // AutoLoaderTest.php may also need to be updated.
                switch ( $token[0] ) {
-               case T_NAMESPACE:
-               case T_CLASS:
-               case T_INTERFACE:
-               case T_TRAIT:
-               case T_DOUBLE_COLON:
-                       $this->startToken = $token;
-                       break;
-               case T_STRING:
-                       if ( $token[1] === 'class_alias' ) {
+                       case T_NAMESPACE:
+                       case T_CLASS:
+                       case T_INTERFACE:
+                       case T_TRAIT:
+                       case T_DOUBLE_COLON:
                                $this->startToken = $token;
-                               $this->alias = [];
-                       }
+                               break;
+                       case T_STRING:
+                               if ( $token[1] === 'class_alias' ) {
+                                       $this->startToken = $token;
+                                       $this->alias = [];
+                               }
                }
        }
 
@@ -414,78 +414,78 @@ class ClassCollector {
         */
        protected function tryEndExpect( $token ) {
                switch ( $this->startToken[0] ) {
-               case T_DOUBLE_COLON:
-                       // Skip over T_CLASS after T_DOUBLE_COLON because this is something like
-                       // "self::static" which accesses the class name. It doens't define a new class.
-                       $this->startToken = null;
-                       break;
-               case T_NAMESPACE:
-                       if ( $token === ';' || $token === '{' ) {
-                               $this->namespace = $this->implodeTokens() . '\\';
-                       } else {
-                               $this->tokens[] = $token;
-                       }
-                       break;
-
-               case T_STRING:
-                       if ( $this->alias !== null ) {
-                               // Flow 1 - Two string literals:
-                               // - T_STRING  class_alias
-                               // - '('
-                               // - T_CONSTANT_ENCAPSED_STRING 'TargetClass'
-                               // - ','
-                               // - T_WHITESPACE
-                               // - T_CONSTANT_ENCAPSED_STRING 'AliasName'
-                               // - ')'
-                               // Flow 2 - Use of ::class syntax for first parameter
-                               // - T_STRING  class_alias
-                               // - '('
-                               // - T_STRING TargetClass
-                               // - T_DOUBLE_COLON ::
-                               // - T_CLASS class
-                               // - ','
-                               // - T_WHITESPACE
-                               // - T_CONSTANT_ENCAPSED_STRING 'AliasName'
-                               // - ')'
-                               if ( $token === '(' ) {
-                                       // Start of a function call to class_alias()
-                                       $this->alias = [ 'target' => false, 'name' => false ];
-                               } elseif ( $token === ',' ) {
-                                       // Record that we're past the first parameter
-                                       if ( $this->alias['target'] === false ) {
-                                               $this->alias['target'] = true;
-                                       }
-                               } elseif ( is_array( $token ) && $token[0] === T_CONSTANT_ENCAPSED_STRING ) {
-                                       if ( $this->alias['target'] === true ) {
-                                               // We already saw a first argument, this must be the second.
-                                               // Strip quotes from the string literal.
-                                               $this->alias['name'] = substr( $token[1], 1, -1 );
+                       case T_DOUBLE_COLON:
+                               // Skip over T_CLASS after T_DOUBLE_COLON because this is something like
+                               // "self::static" which accesses the class name. It doens't define a new class.
+                               $this->startToken = null;
+                               break;
+                       case T_NAMESPACE:
+                               if ( $token === ';' || $token === '{' ) {
+                                       $this->namespace = $this->implodeTokens() . '\\';
+                               } else {
+                                       $this->tokens[] = $token;
+                               }
+                               break;
+
+                       case T_STRING:
+                               if ( $this->alias !== null ) {
+                                       // Flow 1 - Two string literals:
+                                       // - T_STRING  class_alias
+                                       // - '('
+                                       // - T_CONSTANT_ENCAPSED_STRING 'TargetClass'
+                                       // - ','
+                                       // - T_WHITESPACE
+                                       // - T_CONSTANT_ENCAPSED_STRING 'AliasName'
+                                       // - ')'
+                                       // Flow 2 - Use of ::class syntax for first parameter
+                                       // - T_STRING  class_alias
+                                       // - '('
+                                       // - T_STRING TargetClass
+                                       // - T_DOUBLE_COLON ::
+                                       // - T_CLASS class
+                                       // - ','
+                                       // - T_WHITESPACE
+                                       // - T_CONSTANT_ENCAPSED_STRING 'AliasName'
+                                       // - ')'
+                                       if ( $token === '(' ) {
+                                               // Start of a function call to class_alias()
+                                               $this->alias = [ 'target' => false, 'name' => false ];
+                                       } elseif ( $token === ',' ) {
+                                               // Record that we're past the first parameter
+                                               if ( $this->alias['target'] === false ) {
+                                                       $this->alias['target'] = true;
+                                               }
+                                       } elseif ( is_array( $token ) && $token[0] === T_CONSTANT_ENCAPSED_STRING ) {
+                                               if ( $this->alias['target'] === true ) {
+                                                       // We already saw a first argument, this must be the second.
+                                                       // Strip quotes from the string literal.
+                                                       $this->alias['name'] = substr( $token[1], 1, -1 );
+                                               }
+                                       } elseif ( $token === ')' ) {
+                                               // End of function call
+                                               $this->classes[] = $this->alias['name'];
+                                               $this->alias = null;
+                                               $this->startToken = null;
+                                       } elseif ( !is_array( $token ) || (
+                                               $token[0] !== T_STRING &&
+                                               $token[0] !== T_DOUBLE_COLON &&
+                                               $token[0] !== T_CLASS &&
+                                               $token[0] !== T_WHITESPACE
+                                       ) ) {
+                                               // Ignore this call to class_alias() - compat/Timestamp.php
+                                               $this->alias = null;
+                                               $this->startToken = null;
                                        }
-                               } elseif ( $token === ')' ) {
-                                       // End of function call
-                                       $this->classes[] = $this->alias['name'];
-                                       $this->alias = null;
-                                       $this->startToken = null;
-                               } elseif ( !is_array( $token ) || (
-                                       $token[0] !== T_STRING &&
-                                       $token[0] !== T_DOUBLE_COLON &&
-                                       $token[0] !== T_CLASS &&
-                                       $token[0] !== T_WHITESPACE
-                               ) ) {
-                                       // Ignore this call to class_alias() - compat/Timestamp.php
-                                       $this->alias = null;
-                                       $this->startToken = null;
                                }
-                       }
-                       break;
-
-               case T_CLASS:
-               case T_INTERFACE:
-               case T_TRAIT:
-                       $this->tokens[] = $token;
-                       if ( is_array( $token ) && $token[0] === T_STRING ) {
-                               $this->classes[] = $this->namespace . $this->implodeTokens();
-                       }
+                               break;
+
+                       case T_CLASS:
+                       case T_INTERFACE:
+                       case T_TRAIT:
+                               $this->tokens[] = $token;
+                               if ( is_array( $token ) && $token[0] === T_STRING ) {
+                                       $this->classes[] = $this->namespace . $this->implodeTokens();
+                               }
                }
        }
 
index 554dda9..153b313 100644 (file)
@@ -37,133 +37,133 @@ class AvroValidator {
         */
        public static function getErrors( AvroSchema $schema, $datum ) {
                switch ( $schema->type ) {
-               case AvroSchema::NULL_TYPE:
-                       if ( !is_null( $datum ) ) {
-                               return self::wrongType( 'null', $datum );
-                       }
-                       return [];
-               case AvroSchema::BOOLEAN_TYPE:
-                       if ( !is_bool( $datum ) ) {
-                               return self::wrongType( 'boolean', $datum );
-                       }
-                       return [];
-               case AvroSchema::STRING_TYPE:
-               case AvroSchema::BYTES_TYPE:
-                       if ( !is_string( $datum ) ) {
-                               return self::wrongType( 'string', $datum );
-                       }
-                       return [];
-               case AvroSchema::INT_TYPE:
-                       if ( !is_int( $datum ) ) {
-                               return self::wrongType( 'integer', $datum );
-                       }
-                       if ( AvroSchema::INT_MIN_VALUE > $datum
-                               || $datum > AvroSchema::INT_MAX_VALUE
-                       ) {
-                               return self::outOfRange(
-                                       AvroSchema::INT_MIN_VALUE,
-                                       AvroSchema::INT_MAX_VALUE,
-                                       $datum
-                               );
-                       }
-                       return [];
-               case AvroSchema::LONG_TYPE:
-                       if ( !is_int( $datum ) ) {
-                               return self::wrongType( 'integer', $datum );
-                       }
-                       if ( AvroSchema::LONG_MIN_VALUE > $datum
-                               || $datum > AvroSchema::LONG_MAX_VALUE
-                       ) {
-                               return self::outOfRange(
-                                       AvroSchema::LONG_MIN_VALUE,
-                                       AvroSchema::LONG_MAX_VALUE,
-                                       $datum
-                               );
-                       }
-                       return [];
-               case AvroSchema::FLOAT_TYPE:
-               case AvroSchema::DOUBLE_TYPE:
-                       if ( !is_float( $datum ) && !is_int( $datum ) ) {
-                               return self::wrongType( 'float or integer', $datum );
-                       }
-                       return [];
-               case AvroSchema::ARRAY_SCHEMA:
-                       if ( !is_array( $datum ) ) {
-                               return self::wrongType( 'array', $datum );
-                       }
-                       $errors = [];
-                       foreach ( $datum as $d ) {
-                               $result = self::getErrors( $schema->items(), $d );
-                               if ( $result ) {
+                       case AvroSchema::NULL_TYPE:
+                               if ( !is_null( $datum ) ) {
+                                       return self::wrongType( 'null', $datum );
+                               }
+                               return [];
+                       case AvroSchema::BOOLEAN_TYPE:
+                               if ( !is_bool( $datum ) ) {
+                                       return self::wrongType( 'boolean', $datum );
+                               }
+                               return [];
+                       case AvroSchema::STRING_TYPE:
+                       case AvroSchema::BYTES_TYPE:
+                               if ( !is_string( $datum ) ) {
+                                       return self::wrongType( 'string', $datum );
+                               }
+                               return [];
+                       case AvroSchema::INT_TYPE:
+                               if ( !is_int( $datum ) ) {
+                                       return self::wrongType( 'integer', $datum );
+                               }
+                               if ( AvroSchema::INT_MIN_VALUE > $datum
+                                       || $datum > AvroSchema::INT_MAX_VALUE
+                               ) {
+                                       return self::outOfRange(
+                                               AvroSchema::INT_MIN_VALUE,
+                                               AvroSchema::INT_MAX_VALUE,
+                                               $datum
+                                       );
+                               }
+                               return [];
+                       case AvroSchema::LONG_TYPE:
+                               if ( !is_int( $datum ) ) {
+                                       return self::wrongType( 'integer', $datum );
+                               }
+                               if ( AvroSchema::LONG_MIN_VALUE > $datum
+                                       || $datum > AvroSchema::LONG_MAX_VALUE
+                               ) {
+                                       return self::outOfRange(
+                                               AvroSchema::LONG_MIN_VALUE,
+                                               AvroSchema::LONG_MAX_VALUE,
+                                               $datum
+                                       );
+                               }
+                               return [];
+                       case AvroSchema::FLOAT_TYPE:
+                       case AvroSchema::DOUBLE_TYPE:
+                               if ( !is_float( $datum ) && !is_int( $datum ) ) {
+                                       return self::wrongType( 'float or integer', $datum );
+                               }
+                               return [];
+                       case AvroSchema::ARRAY_SCHEMA:
+                               if ( !is_array( $datum ) ) {
+                                       return self::wrongType( 'array', $datum );
+                               }
+                               $errors = [];
+                               foreach ( $datum as $d ) {
+                                       $result = self::getErrors( $schema->items(), $d );
+                                       if ( $result ) {
+                                               $errors[] = $result;
+                                       }
+                               }
+                               return $errors;
+                       case AvroSchema::MAP_SCHEMA:
+                               if ( !is_array( $datum ) ) {
+                                       return self::wrongType( 'array', $datum );
+                               }
+                               $errors = [];
+                               foreach ( $datum as $k => $v ) {
+                                       if ( !is_string( $k ) ) {
+                                               $errors[] = self::wrongType( 'string key', $k );
+                                       }
+                                       $result = self::getErrors( $schema->values(), $v );
+                                       if ( $result ) {
+                                               $errors[$k] = $result;
+                                       }
+                               }
+                               return $errors;
+                       case AvroSchema::UNION_SCHEMA:
+                               $errors = [];
+                               foreach ( $schema->schemas() as $schema ) {
+                                       $result = self::getErrors( $schema, $datum );
+                                       if ( !$result ) {
+                                               return [];
+                                       }
                                        $errors[] = $result;
                                }
-                       }
-                       return $errors;
-               case AvroSchema::MAP_SCHEMA:
-                       if ( !is_array( $datum ) ) {
-                               return self::wrongType( 'array', $datum );
-                       }
-                       $errors = [];
-                       foreach ( $datum as $k => $v ) {
-                               if ( !is_string( $k ) ) {
-                                       $errors[] = self::wrongType( 'string key', $k );
-                               }
-                               $result = self::getErrors( $schema->values(), $v );
-                               if ( $result ) {
-                                       $errors[$k] = $result;
-                               }
-                       }
-                       return $errors;
-               case AvroSchema::UNION_SCHEMA:
-                       $errors = [];
-                       foreach ( $schema->schemas() as $schema ) {
-                               $result = self::getErrors( $schema, $datum );
-                               if ( !$result ) {
-                                       return [];
-                               }
-                               $errors[] = $result;
-                       }
-                       if ( $errors ) {
-                               return [ "Expected any one of these to be true", $errors ];
-                       }
-                       return "No schemas provided to union";
-               case AvroSchema::ENUM_SCHEMA:
-                       if ( !in_array( $datum, $schema->symbols() ) ) {
-                               $symbols = implode( ', ', $schema->symbols );
-                               return "Expected one of $symbols but recieved $datum";
-                       }
-                       return [];
-               case AvroSchema::FIXED_SCHEMA:
-                       if ( !is_string( $datum ) ) {
-                               return self::wrongType( 'string', $datum );
-                       }
-                       $len = strlen( $datum );
-                       if ( $len !== $schema->size() ) {
-                               return "Expected string of length {$schema->size()}, "
-                                       . "but recieved one of length $len";
-                       }
-                       return [];
-               case AvroSchema::RECORD_SCHEMA:
-               case AvroSchema::ERROR_SCHEMA:
-               case AvroSchema::REQUEST_SCHEMA:
-                       if ( !is_array( $datum ) ) {
-                               return self::wrongType( 'array', $datum );
-                       }
-                       $errors = [];
-                       foreach ( $schema->fields() as $field ) {
-                               $name = $field->name();
-                               if ( !array_key_exists( $name, $datum ) ) {
-                                       $errors[$name] = 'Missing expected field';
-                                       continue;
-                               }
-                               $result = self::getErrors( $field->type(), $datum[$name] );
-                               if ( $result ) {
-                                       $errors[$name] = $result;
-                               }
-                       }
-                       return $errors;
-               default:
-                       return "Unknown avro schema type: {$schema->type}";
+                               if ( $errors ) {
+                                       return [ "Expected any one of these to be true", $errors ];
+                               }
+                               return "No schemas provided to union";
+                       case AvroSchema::ENUM_SCHEMA:
+                               if ( !in_array( $datum, $schema->symbols() ) ) {
+                                       $symbols = implode( ', ', $schema->symbols );
+                                       return "Expected one of $symbols but recieved $datum";
+                               }
+                               return [];
+                       case AvroSchema::FIXED_SCHEMA:
+                               if ( !is_string( $datum ) ) {
+                                       return self::wrongType( 'string', $datum );
+                               }
+                               $len = strlen( $datum );
+                               if ( $len !== $schema->size() ) {
+                                       return "Expected string of length {$schema->size()}, "
+                                               . "but recieved one of length $len";
+                               }
+                               return [];
+                       case AvroSchema::RECORD_SCHEMA:
+                       case AvroSchema::ERROR_SCHEMA:
+                       case AvroSchema::REQUEST_SCHEMA:
+                               if ( !is_array( $datum ) ) {
+                                       return self::wrongType( 'array', $datum );
+                               }
+                               $errors = [];
+                               foreach ( $schema->fields() as $field ) {
+                                       $name = $field->name();
+                                       if ( !array_key_exists( $name, $datum ) ) {
+                                               $errors[$name] = 'Missing expected field';
+                                               continue;
+                                       }
+                                       $result = self::getErrors( $field->type(), $datum[$name] );
+                                       if ( $result ) {
+                                               $errors[$name] = $result;
+                                       }
+                               }
+                               return $errors;
+                       default:
+                               return "Unknown avro schema type: {$schema->type}";
                }
        }
 
index 8d3984d..467dc78 100644 (file)
@@ -3117,18 +3117,18 @@ class Language {
         */
        function getArrow( $direction = 'forwards' ) {
                switch ( $direction ) {
-               case 'forwards':
-                       return $this->isRTL() ? '←' : '→';
-               case 'backwards':
-                       return $this->isRTL() ? '→' : '←';
-               case 'left':
-                       return '←';
-               case 'right':
-                       return '→';
-               case 'up':
-                       return '↑';
-               case 'down':
-                       return '↓';
+                       case 'forwards':
+                               return $this->isRTL() ? '←' : '→';
+                       case 'backwards':
+                               return $this->isRTL() ? '→' : '←';
+                       case 'left':
+                               return '←';
+                       case 'right':
+                               return '→';
+                       case 'up':
+                               return '↑';
+                       case 'down':
+                               return '↓';
                }
        }
 
index 38c50d2..a94343c 100644 (file)
@@ -43,30 +43,30 @@ class LanguageGa extends Language {
                }
 
                switch ( $case ) {
-               case 'ainmlae':
-                       switch ( $word ) {
-                       case 'an Domhnach':
-                               $word = 'Dé Domhnaigh';
-                               break;
-                       case 'an Luan':
-                               $word = 'Dé Luain';
-                               break;
-                       case 'an Mháirt':
-                               $word = 'Dé Mháirt';
-                               break;
-                       case 'an Chéadaoin':
-                               $word = 'Dé Chéadaoin';
-                               break;
-                       case 'an Déardaoin':
-                               $word = 'Déardaoin';
-                               break;
-                       case 'an Aoine':
-                               $word = 'Dé hAoine';
-                               break;
-                       case 'an Satharn':
-                               $word = 'Dé Sathairn';
-                               break;
-                       }
+                       case 'ainmlae':
+                               switch ( $word ) {
+                                       case 'an Domhnach':
+                                               $word = 'Dé Domhnaigh';
+                                               break;
+                                       case 'an Luan':
+                                               $word = 'Dé Luain';
+                                               break;
+                                       case 'an Mháirt':
+                                               $word = 'Dé Mháirt';
+                                               break;
+                                       case 'an Chéadaoin':
+                                               $word = 'Dé Chéadaoin';
+                                               break;
+                                       case 'an Déardaoin':
+                                               $word = 'Déardaoin';
+                                               break;
+                                       case 'an Aoine':
+                                               $word = 'Dé hAoine';
+                                               break;
+                                       case 'an Satharn':
+                                               $word = 'Dé Sathairn';
+                                               break;
+                               }
                }
                return $word;
        }
index f4082af..8a3a9d2 100644 (file)
@@ -47,65 +47,65 @@ class LanguageLa extends Language {
                }
 
                switch ( $case ) {
-               case 'genitive':
-                       // only a few declensions, and even for those mostly the singular only
-                       $in = [
-                               '/u[ms]$/',                          # 2nd declension singular
-                               '/ommunia$/',                        # 3rd declension neuter plural (partly)
-                               '/a$/',                              # 1st declension singular
-                               '/libri$/', '/nuntii$/', '/datae$/', # 2nd declension plural (partly)
-                               '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
-                               '/es$/'                              # 5th declension singular
-                       ];
-                       $out = [
-                               'i',
-                               'ommunium',
-                               'ae',
-                               'librorum', 'nuntiorum', 'datorum',
-                               'tionis', 'ntis', 'atis',
-                               'ei'
-                       ];
-                       return preg_replace( $in, $out, $word );
-               case 'accusative':
-                       // only a few declensions, and even for those mostly the singular only
-                       $in = [
-                               '/u[ms]$/',                          # 2nd declension singular
-                               '/a$/',                              # 1st declension singular
-                               '/ommuniam$/',                       # 3rd declension neuter plural (partly)
-                               '/libri$/', '/nuntii$/', '/datam$/', # 2nd declension plural (partly)
-                               '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
-                               '/es$/'                              # 5th declension singular
-                       ];
-                       $out = [
-                               'um',
-                               'am',
-                               'ommunia',
-                               'libros', 'nuntios', 'data',
-                               'tionem', 'ntem', 'atem',
-                               'em'
-                       ];
-                       return preg_replace( $in, $out, $word );
-               case 'ablative':
-                       // only a few declensions, and even for those mostly the singular only
-                       $in = [
-                               '/u[ms]$/',                          # 2nd declension singular
-                               '/ommunia$/',                        # 3rd declension neuter plural (partly)
-                               '/a$/',                              # 1st declension singular
-                               '/libri$/', '/nuntii$/', '/data$/',  # 2nd declension plural (partly)
-                               '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
-                               '/es$/'                              # 5th declension singular
-                       ];
-                       $out = [
-                               'o',
-                               'ommunibus',
-                               'a',
-                               'libris', 'nuntiis', 'datis',
-                               'tione', 'nte', 'ate',
-                               'e'
-                       ];
-                       return preg_replace( $in, $out, $word );
-               default:
-                       return $word;
+                       case 'genitive':
+                               // only a few declensions, and even for those mostly the singular only
+                               $in = [
+                                       '/u[ms]$/',                          # 2nd declension singular
+                                       '/ommunia$/',                        # 3rd declension neuter plural (partly)
+                                       '/a$/',                              # 1st declension singular
+                                       '/libri$/', '/nuntii$/', '/datae$/', # 2nd declension plural (partly)
+                                       '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
+                                       '/es$/'                              # 5th declension singular
+                               ];
+                               $out = [
+                                       'i',
+                                       'ommunium',
+                                       'ae',
+                                       'librorum', 'nuntiorum', 'datorum',
+                                       'tionis', 'ntis', 'atis',
+                                       'ei'
+                               ];
+                               return preg_replace( $in, $out, $word );
+                       case 'accusative':
+                               // only a few declensions, and even for those mostly the singular only
+                               $in = [
+                                       '/u[ms]$/',                          # 2nd declension singular
+                                       '/a$/',                              # 1st declension singular
+                                       '/ommuniam$/',                       # 3rd declension neuter plural (partly)
+                                       '/libri$/', '/nuntii$/', '/datam$/', # 2nd declension plural (partly)
+                                       '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
+                                       '/es$/'                              # 5th declension singular
+                               ];
+                               $out = [
+                                       'um',
+                                       'am',
+                                       'ommunia',
+                                       'libros', 'nuntios', 'data',
+                                       'tionem', 'ntem', 'atem',
+                                       'em'
+                               ];
+                               return preg_replace( $in, $out, $word );
+                       case 'ablative':
+                               // only a few declensions, and even for those mostly the singular only
+                               $in = [
+                                       '/u[ms]$/',                          # 2nd declension singular
+                                       '/ommunia$/',                        # 3rd declension neuter plural (partly)
+                                       '/a$/',                              # 1st declension singular
+                                       '/libri$/', '/nuntii$/', '/data$/',  # 2nd declension plural (partly)
+                                       '/tio$/', '/ns$/', '/as$/',          # 3rd declension singular (partly)
+                                       '/es$/'                              # 5th declension singular
+                               ];
+                               $out = [
+                                       'o',
+                                       'ommunibus',
+                                       'a',
+                                       'libris', 'nuntiis', 'datis',
+                                       'tione', 'nte', 'ate',
+                                       'e'
+                               ];
+                               return preg_replace( $in, $out, $word );
+                       default:
+                               return $word;
                }
        }
 }
index 64af5da..6d2ed73 100644 (file)
        "botpasswords-insert-failed": "Nun pudo amestase'l nome de bot «$1». ¿Taba añadíu yá?",
        "botpasswords-update-failed": "Nun pudo anovase'l nome de bot «$1». ¿Desaniciaríase?",
        "botpasswords-created-title": "Creóse la contraseña de bot",
-       "botpasswords-created-body": "Creóse la contraseña del bot llamáu «$1» del usuariu «$2».",
+       "botpasswords-created-body": "Creóse la contraseña del bot llamáu «$1» {{GENDER:$2|del usuariu|de la usuaria}} «$2».",
        "botpasswords-updated-title": "Anovóse la contraseña de bot",
-       "botpasswords-updated-body": "Anovóse la contraseña del bot llamáu «$1» del usuariu «$2».",
+       "botpasswords-updated-body": "Anovóse la contraseña del bot llamáu «$1» {{GENDER:$2|del usuariu|de la usuaria}} «$2».",
        "botpasswords-deleted-title": "Desanicióse la contraseña de bot",
-       "botpasswords-deleted-body": "Desanicióse la contraseña del bot llamáu «$1» del usuariu «$2».",
+       "botpasswords-deleted-body": "Desanicióse la contraseña del bot llamáu «$1» {{GENDER:$2|del usuariu|de la usuaria}} «$2».",
        "botpasswords-newpassword": "La nueva contraseña p'aniciar sesión con <strong>$1</strong> ye <strong>$2</strong>. <em>Por favor, rexistra esto pa referencies futures.</em> <br> (Pa los bots antiguos que necesiten que'l nome d'aniciu de sesión sía'l mesmu que'l nome d'usuariu, tamién pue usase <strong>$3</strong> como nome d'usuariu y <strong>$4</strong> como contraseña.)",
        "botpasswords-no-provider": "BotPasswordsSessionProvider nun ta disponible.",
        "botpasswords-restriction-failed": "Hai torgues de contraseña de bot que torgaron esti aniciu de sesión.",
        "recentchangesdays-max": "Máximo $1 {{PLURAL:$1|día|díes}}",
        "recentchangescount": "Númberu d'ediciones p'amosar de mou predetermináu:",
        "prefs-help-recentchangescount": "Incluye los cambios recientes, los historiales de páxines y los rexistros.",
-       "prefs-help-watchlist-token2": "Esta ye la clave secreta pa la canal de noticies web de la so llista de vixilancia.\nCualquiera que la sepa podrá lleer la so llista de vixilancia; nun la comparta.\n[[Special:ResetTokens|Calque equí si necesita reaniciala]].",
+       "prefs-help-watchlist-token2": "Esta ye la clave secreta pa la canal de noticies web de la to llista de vixilancia.\nCualquiera que la sepa podrá lleer la to llista de vixilancia; nun la compartas.\nSi lo necesites [[Special:ResetTokens|puedes reaniciala]].",
        "savedprefs": "Guardáronse les preferencies.",
        "savedrights": "Guardáronse los grupos {{GENDER:$1|del usuariu|de la usuaria}} $1.",
        "timezonelegend": "Estaya horaria:",
        "timezoneregion-indian": "Océanu Índicu",
        "timezoneregion-pacific": "Océanu Pacíficu",
        "allowemail": "Permitir qu'otros usuarios m'unvien correos",
+       "email-allow-new-users-label": "Permitir los correos de los usuarios nuevos",
        "email-blacklist-label": "Torgar qu'estos usuarios m'unvien correos electrónicos:",
        "prefs-searchoptions": "Buscar",
        "prefs-namespaces": "Espacios de nome",
        "right-siteadmin": "Candar y descandar la base de datos",
        "right-override-export-depth": "Esportar páxines, incluyendo páxines enllazaes fasta una fondura de 5",
        "right-sendemail": "Unviar corréu a otros usuarios",
+       "right-sendemail-new-users": "Unviar corréu electrónicu a usuarios ensin aiciones rexistraes",
        "right-managechangetags": "Crear y (des)activar [[Special:Tags|etiquetes]]",
        "right-applychangetags": "Aplicar [[Special:Tags|etiquetes]] xunto colos cambios propios",
        "right-changetags": "Amestar y desaniciar [[Special:Tags|etiquetes]] arbitraries en revisiones individuales y entraes del rexistru",
        "recentchanges-noresult": "Nengún cambiu nel periodu conseñáu coincide con esos criterios.",
        "recentchanges-timeout": "Esta gueta escosó'l tiempu. Escurque quieras tentar con parámetros de gueta distintos.",
        "recentchanges-network": "Nun se cargó nenguna resultancia por cuenta d'un problema técnicu. Tenta volver a cargar la páxina.",
+       "recentchanges-notargetpage": "Escribe'l nome d'una páxina más arriba pa ver los cambeos rellacionaos con esa páxina.",
        "recentchanges-feed-description": "Sigui nesta canal los últimos cambios de la wiki.",
        "recentchanges-label-newpage": "Esta edición creó una páxina nueva",
        "recentchanges-label-minor": "Esta ye una edición menor",
        "rcfilters-watchlist-showupdated": "Los cambeos fechos en páxines que nun visitasti desque se ficieron apaecen en <strong>negrina</strong>, con marcadores sólidos.",
        "rcfilters-preference-label": "Tapecer la versión meyorada de Cambios recién",
        "rcfilters-preference-help": "Revierte'l rediseñu de la interfaz de 2017 y toles ferramientes añadíes d'entós aquí.",
+       "rcfilters-filter-showlinkedfrom-label": "Amosar los cambios nes páxines enllazaes dende",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Páxines enllazaes dende</strong> la páxina seleicionada",
+       "rcfilters-filter-showlinkedto-label": "Amosar los cambios nes páxines qu'enllacen a",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Páxines qu'enllacen a</strong> la páxina seleicionada",
+       "rcfilters-target-page-placeholder": "Escribe'l nome de la páxina",
        "rcnotefrom": "Abaxo {{PLURAL:$5|tá'l cambiu|tan los cambios}} dende'l <strong>$3</strong>, a les <strong>$4</strong> (s'amuesen un máximu de <strong>$1</strong>).",
        "rclistfromreset": "Reaniciar la seleición de data",
        "rclistfrom": "Amosar los nuevos cambios dende'l $3 a les $2",
        "recentchangeslinked-feed": "Cambios rellacionaos",
        "recentchangeslinked-toolbox": "Cambios rellacionaos",
        "recentchangeslinked-title": "Cambios rellacionaos con \"$1\"",
-       "recentchangeslinked-summary": "Esta ye una llista de los caberos cambios fechos nes páxines enllaciaes dende una páxina determinada (o nos miembros d'una categoría determinada).\nLes páxines de [[Special:Watchlist|la to llista de siguimientu]] tán en <strong>negrina</strong>.",
+       "recentchangeslinked-summary": "Esscribe'l nome d'una páxina pa ver los cambios nes páxines enllazaes a o dende esa páxina. (Pa ver los miembros d'una categoría, escribe Categoría:Nome de la categoría). Los cambios nes páxines de [[Special:Watchlist|la to llista de siguimientu]] tán en <strong>negrina</strong>.",
        "recentchangeslinked-page": "Nome de la páxina:",
        "recentchangeslinked-to": "Amosar los cambios de les páxines qu'enllacen en cuenta de los de la páxina dada",
        "recentchanges-page-added-to-category": "[[:$1]] amestóse a la categoría",
index 0781fa8..7e36ebe 100644 (file)
        "rcfilters-preference-label": "Схаваць палепшаную вэрсію апошніх зьменаў",
        "rcfilters-preference-help": "Адкатвае рэдызайн інтэрфэйсу 2017 году і ўсе інструмэнты, дададзеныя з таго часу.",
        "rcfilters-filter-showlinkedfrom-label": "Паказаць зьмены на старонках, на якія спасылаецца",
-       "rcfilters-filter-showlinkedfrom-option-label": "Паказаць зьмены старонак, на якія ёсьць спасылкі <strong>З</strong> старонкі",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Старонкі, на якія спасылаецца</strong> абраная старонка",
        "rcfilters-filter-showlinkedto-label": "Паказаць зьмены старонак, якія спасылаюцца на",
-       "rcfilters-filter-showlinkedto-option-label": "Паказаць зьмены старонак, якія спасылаюцца <strong>НА</strong> старонку",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Старонкі, якія спасылаюцца на</strong> абраную старонку",
        "rcfilters-target-page-placeholder": "Увядзіце назву старонкі",
        "rcnotefrom": "Ніжэй {{PLURAL:$5|знаходзіцца зьмена|знаходзяцца зьмены}} з <strong>$4 $3</strong> (да <strong>$1</strong> на старонку).",
        "rclistfromreset": "Скінуць выбар даты",
        "imported-log-entries": "{{PLURAL:$1|Імпартаваны $1 запіс журнала|Імпартаваныя $1 запісы журнала|Імпартаваныя $1 запісаў журнала}}.",
        "importfailed": "Немагчыма імпартаваць: $1",
        "importunknownsource": "Невядомы тып крыніцы імпарту",
+       "importnoprefix": "Не пададзены прэфікс інтэрвікі",
        "importcantopen": "Немагчыма адкрыць файл імпарту",
        "importbadinterwiki": "Няслушная спасылка на іншую моўную вэрсію",
        "importsuccess": "Імпартаваньне скончанае!",
index 5a6cb01..86fef15 100644 (file)
        "botpasswords-label-delete": "Изтриване",
        "botpasswords-label-resetpassword": "Възстановяване на парола",
        "botpasswords-label-grants": "Приложими разрешения:",
+       "botpasswords-label-grants-column": "Дадено",
        "botpasswords-bad-appid": "Името на бота „$1“ не е валидно.",
        "botpasswords-insert-failed": "Неуспешно добавяне на име на бота „$1“. Дали не е добавяно вече?",
        "botpasswords-update-failed": "Неуспешно подновяване на името на бота „$1“. Дали не е изтрито?",
        "passwordreset-emailelement": "Потребителско име: \n$1\n\nВременна парола: \n$2",
        "passwordreset-emailsentemail": "Ако електронната Ви поща е свързана със сметката Ви, на нея е изпратено писмо за възстановяване на паролата.",
        "passwordreset-emailsentusername": "Ако това потребителско име е свързано с електронна поща, е изпратено писмо за възстановяване на паролата.",
+       "passwordreset-nosuchcaller": "Източникът на извикването не съществува: $1",
        "passwordreset-invalidemail": "Неправилен email адрес",
        "passwordreset-nodata": "Не сте указали нито потребителско име, нито адрес на ел. поща",
        "changeemail": "Промяна или премахване на адреса за е-поща",
        "recentchangesdays-max": "(най-много $1 {{PLURAL:$1|ден|дни}})",
        "recentchangescount": "Брой показвани редакции по подразбиране:",
        "prefs-help-recentchangescount": "Това включва последните промени, историите на страниците и дневниците.",
-       "prefs-help-watchlist-token2": "Това е секретният ключ към уеб хранилката на вашия списък за наблюдение. Всеки, който го знае, би могъл да прегледа списъка ви за наблюдение, така че не го споделяйте. При нужда можете да го [[Специални:ResetTokens|изчистите]].",
+       "prefs-help-watchlist-token2": "Това е секретният ключ към уеб хранилката на вашия списък за наблюдение.\nВсеки, който го знае, би могъл да прегледа списъка ви за наблюдение, така че не го споделяйте.\nПри нужда можете да го [[Special:ResetTokens|изчистите]].",
        "savedprefs": "Настройките ви бяха съхранени.",
        "savedrights": "Потребителските групи на {{GENDER:$1|$1}} са запазени.",
        "timezonelegend": "Часова зона:",
        "right-siteadmin": "Заключване и отключване на базата от данни",
        "right-override-export-depth": "Изнасяне на страници, включително свързаните с тях в дълбочина до пето ниво",
        "right-sendemail": "Изпращане на е-писма до другите потребители",
-       "right-managechangetags": "Създаване и (де)активиране на [[Специални:Етикети|етикети]]",
+       "right-managechangetags": "Създаване и (де)активиране на [[Special:Tags|етикети]]",
        "grant-group-page-interaction": "Взаимодействие със страници",
        "grant-group-file-interaction": "Взаимодействие с медийни файлове",
        "grant-group-watchlist-interaction": "Взаимодействие с вашия списък за наблюдение",
        "rcfilters-restore-default-filters": "Възстановяване на филтрите по подразбиране",
        "rcfilters-clear-all-filters": "Изчистване на всички филтри",
        "rcfilters-show-new-changes": "Преглед на най-новите промени",
-       "rcfilters-search-placeholder": "Филтриране на последните промени (изберете или започнете да въвеждате)",
+       "rcfilters-search-placeholder": "Филтриране на промените (използвайте менюто или търсете по име на филтър)",
        "rcfilters-invalid-filter": "Невалиден филтър",
        "rcfilters-empty-filter": "Няма активни филтри. Показани са всички редакции.",
        "rcfilters-filterlist-title": "Филтри",
        "rcfilters-filterlist-whatsthis": "Как работи това?",
-       "rcfilters-filterlist-feedbacklink": "Ð\9eÑ\81Ñ\82авеÑ\82е ÐºÐ¾Ð¼ÐµÐ½Ñ\82аÑ\80 Ð·Ð° Ð½Ð¾Ð²Ð¸Ñ\82е (беÑ\82а) Ñ\84илÑ\82Ñ\80и",
+       "rcfilters-filterlist-feedbacklink": "СподелеÑ\82е ÐºÐ°ÐºÐ²Ð¾ Ð¼Ð¸Ñ\81лиÑ\82е Ð·Ð° Ñ\82ези (нови) Ð¸Ð½Ñ\81Ñ\82Ñ\80Ñ\83менÑ\82и Ð·Ð° Ñ\84илÑ\82Ñ\80иÑ\80ане",
        "rcfilters-highlightbutton-title": "Отбелязване на резултатите",
        "rcfilters-highlightmenu-title": "Изберете цвят",
        "rcfilters-highlightmenu-help": "Изберете цвят за отбелязване на свойството",
        "rcfilters-filter-editsbyself-description": "Ваши редакции.",
        "rcfilters-filter-editsbyother-label": "Чужди редакции",
        "rcfilters-filter-editsbyother-description": "Всички редакции с изключение на вашите собствени.",
-       "rcfilters-filtergroup-userExpLevel": "Ð\9dиво Ð½Ð° Ð¾Ð¿Ð¸Ñ\82а (Ñ\81амо Ð·Ð° Ñ\80егиÑ\81Ñ\82Ñ\80иÑ\80ани Ð¿Ð¾Ñ\82Ñ\80ебиÑ\82ели)",
+       "rcfilters-filtergroup-userExpLevel": "РегиÑ\81Ñ\82Ñ\80аÑ\86иÑ\8f Ð½Ð° Ð¿Ð¾Ñ\82Ñ\80ебиÑ\82елÑ\8f Ð¸ Ð¾Ð¿Ð¸Ñ\82",
        "rcfilters-filter-user-experience-level-registered-label": "Регистрирани",
        "rcfilters-filter-user-experience-level-registered-description": "Влезли в системата редактори.",
        "rcfilters-filter-user-experience-level-unregistered-label": "Нерегистрирани",
        "rcfilters-filter-user-experience-level-unregistered-description": "Редактори, които не са влезли в системата.",
        "rcfilters-filter-user-experience-level-newcomer-label": "Новодошли",
-       "rcfilters-filter-user-experience-level-newcomer-description": "Ð\9fо-малко Ð¾Ñ\82 10 Ñ\80едакÑ\86ии Ð¸ 5 дни активност.",
+       "rcfilters-filter-user-experience-level-newcomer-description": "РегиÑ\81Ñ\82Ñ\80иÑ\80ани Ñ\80едакÑ\82оÑ\80и Ñ\81 Ð¿Ð¾-малко Ð¾Ñ\82 10 Ñ\80едакÑ\86ии Ð¸Ð»Ð¸ 4 дни активност.",
        "rcfilters-filter-user-experience-level-learner-label": "Учещи се",
-       "rcfilters-filter-user-experience-level-learner-description": "Ð\9fовеÑ\87е Ð¾Ð¿Ð¸Ñ\82 Ð¾Ñ\82 â\80\9eÐ\9dоводоÑ\88лиâ\80\9c, Ð½Ð¾ Ð¿Ð¾-малко Ð¾Ñ\82 „Опитни потребители“.",
+       "rcfilters-filter-user-experience-level-learner-description": "РегиÑ\81Ñ\82Ñ\80иÑ\80ани Ð¿Ð¾Ñ\82Ñ\80ебиÑ\82ели Ñ\81 Ð¾Ð¿Ð¸Ñ\82 Ð¾Ñ\82 â\80\9eÐ\9dоводоÑ\88лиâ\80\9c Ð´Ð¾ „Опитни потребители“.",
        "rcfilters-filter-user-experience-level-experienced-label": "Опитни потребители",
-       "rcfilters-filter-user-experience-level-experienced-description": "Ð\9fовеÑ\87е Ð¾Ñ\82 30 Ð´Ð½Ð¸ Ð°ÐºÑ\82ивноÑ\81Ñ\82 Ð¸ 500 Ñ\80едакÑ\86ии.",
+       "rcfilters-filter-user-experience-level-experienced-description": "РегиÑ\81Ñ\82Ñ\80иÑ\80ани Ñ\80едакÑ\82оÑ\80и Ñ\81 Ð¿Ð¾Ð²ÐµÑ\87е Ð¾Ñ\82 500 Ñ\80едакÑ\86ии Ð¸ 30 Ð´Ð½Ð¸ Ð°ÐºÑ\82ивноÑ\81Ñ\82.",
        "rcfilters-filtergroup-automated": "Автоматизирани редакции",
        "rcfilters-filter-bots-label": "Бот",
        "rcfilters-filter-bots-description": "Редакции, направени с помощта на автоматизирани инструменти.",
        "rcfilters-filter-logactions-description": "Административни действия, създавания на сметки, изтривания на страници, качвания...",
        "rcfilters-filtergroup-lastRevision": "Текущи версии",
        "rcfilters-filter-lastrevision-label": "Текуща версия",
-       "rcfilters-filter-lastrevision-description": "Ð\9fоследната промяна на страница.",
-       "rcfilters-filter-previousrevision-label": "Ð\9fо-Ñ\80анни Ð²ÐµÑ\80Ñ\81ии",
-       "rcfilters-filter-previousrevision-description": "Всички редакции, които не са последните на страница.",
+       "rcfilters-filter-lastrevision-description": "Само Ð¿оследната промяна на страница.",
+       "rcfilters-filter-previousrevision-label": "Ð\9dе Ð¿Ð¾Ñ\81леднаÑ\82а Ð²ÐµÑ\80Ñ\81иÑ\8f",
+       "rcfilters-filter-previousrevision-description": "Всички редакции, които не са „последната версия“.",
        "rcfilters-filter-excluded": "Изключени",
        "rcfilters-tag-prefix-namespace-inverted": "<strong>:не</strong> $1",
        "rcfilters-exclude-button-off": "Изключване на избраните",
        "backend-fail-read": "Файлът „$1“ не може да бъде прочетен.",
        "backend-fail-create": "Файлът „$1“ не може да бъде съхранен.",
        "backend-fail-maxsize": "Файлът „$1“ не може да бъде съхранен, тъй като размерът му надвишава {{PLURAL:$2|един байт|$2 байт}}.",
-       "backend-fail-connect": "Не е възможно свързването към бекенда за съхранение „1“.",
-       "backend-fail-internal": "Възникна неизвестна грешка в бекенда за съхранение „1“.",
+       "backend-fail-connect": "Не е възможно свързването към бекенда за съхранение „$1“.",
+       "backend-fail-internal": "Възникна неизвестна грешка в бекенда за съхранение „$1“.",
        "zip-file-open-error": "Възникна грешка при отваряне на файла за проверка на ZIP.",
        "zip-wrong-format": "Указаният файл не е ZIP файл.",
        "zip-bad": "Файлът е повреден или е нечетим ZIP файл.\nСигурността му не може да бъде проверена.",
        "listfiles_size": "Размер",
        "listfiles_description": "Описание",
        "listfiles_count": "Версии",
-       "listfiles-show-all": "Включване на старите версии на изображенията",
+       "listfiles-show-all": "Включване на стари версии на файлове",
        "listfiles-latestversion": "Текущата версия",
        "listfiles-latestversion-yes": "Да",
        "listfiles-latestversion-no": "Не",
        "filerevert-comment": "Причина:",
        "filerevert-defaultcomment": "Възвръщане към версия от $2, $1 ($3)",
        "filerevert-submit": "Възвръщане",
-       "filerevert-success": "Файлът '''[[Media:$1|$1]]''' беше възвърнат към [$4 версия от $3, $2].",
+       "filerevert-success": "Файлът <strong>[[Media:$1|$1]]</strong> беше възвърнат към [$4 версия от $3, $2].",
        "filerevert-badversion": "Не съществува предишна локална версия на файла със зададения времеви отпечатък.",
        "filedelete": "Изтриване на $1",
        "filedelete-legend": "Изтриване на файл",
        "filedelete-comment": "Причина:",
        "filedelete-submit": "Изтриване",
        "filedelete-success": "Файлът '''$1''' беше изтрит.",
-       "filedelete-success-old": "Версията на '''[[Media:$1|$1]]''' към $3, $2 е била изтрита.",
-       "filedelete-nofile": "Файлът '''$1''' не съществува.",
+       "filedelete-success-old": "Версията на <strong>[[Media:$1|$1]]</strong> към $3, $2 е била изтрита.",
+       "filedelete-nofile": "Файлът <strong>$1</strong> не съществува.",
        "filedelete-nofile-old": "Не съществува архивна версия на '''$1''' с указаните параметри.",
        "filedelete-otherreason": "Друга/допълнителна причина:",
        "filedelete-reason-otherlist": "Друга причина",
        "notvisiblerev": "Версията беше изтрита",
        "watchlist-details": "{{PLURAL:$1|Една наблюдавана страница|$1 наблюдавани страници}} от списъка Ви за наблюдение (без беседи).",
        "wlheader-enotif": "Известяването по е-поща е включено.",
-       "wlheader-showupdated": "Страниците, които са били променени след последния път, когато сте ги посетили, са показани в '''получер'''.",
+       "wlheader-showupdated": "Страниците, които са били променени след последния път, когато сте ги посетили, са показани в <strong>получер</strong>.",
        "wlnote": "{{PLURAL:$1|Показана е последната промяна|Показани са последните <strong>$1</strong> промени}} през {{PLURAL:$2|последния час|последните <strong>$2</strong> часа}}, започвайки от $3, $4.",
        "wlshowlast": "Показване на последните $1 часа $2 дни",
        "watchlist-hide": "Скриване",
        "whatlinkshere": "Какво сочи насам",
        "whatlinkshere-title": "Страници, които сочат към „$1“",
        "whatlinkshere-page": "Страница:",
-       "linkshere": "Следните страници сочат към '''[[:$1]]''':",
+       "linkshere": "Следните страници сочат към <strong>[[:$1]]</strong>:",
        "nolinkshere": "Няма страници, сочещи към '''[[:$1]]'''.",
        "nolinkshere-ns": "Няма страници, сочещи към [[:$1]] в избраното именно пространство.",
        "isredirect": "пренасочваща страница",
        "movereason": "Причина:",
        "revertmove": "връщане",
        "delete_and_move_text": "Целевата страница „[[:$1]]“ вече съществува.\nИскате ли да я изтриете, за да освободите място за преместването?",
-       "delete_and_move_confirm": "Да, искам да изтрия тази страница.",
+       "delete_and_move_confirm": "Да, искам да изтрия тази страница",
        "delete_and_move_reason": "Изтрита, за да се освободи място за преместване от „[[$1]]“",
-       "selfmove": "СÑ\82Ñ\80аниÑ\86аÑ\82а Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ\8aде Ð¿Ñ\80емеÑ\81Ñ\82ена, Ñ\82Ñ\8aй ÐºÐ°Ñ\82о Ñ\86елевоÑ\82о Ð¸Ð¼Ðµ Ñ\81Ñ\8aвпада Ñ\81 Ð¿Ñ\8aÑ\80вонаÑ\87алноÑ\82о Ñ\9d Ð·Ð°Ð³Ð»Ð°Ð²Ð¸Ðµ.",
+       "selfmove": "Ð\97аглавиеÑ\82о Ñ\81Ñ\8aвпада;\nÑ\81Ñ\82Ñ\80аниÑ\86аÑ\82а Ð½Ðµ Ð¼Ð¾Ð¶Ðµ Ð´Ð° Ð±Ñ\8aде Ð¿Ñ\80емеÑ\81Ñ\82ена Ð²Ñ\8aÑ\80Ñ\85Ñ\83 Ñ\81амаÑ\82а Ð½ÐµÑ\8f.",
        "immobile-source-namespace": "Не могат да се местят страници в именно пространство „$1“",
        "immobile-target-namespace": "Не могат да се местят страници в именно пространство „$1“.",
        "immobile-target-namespace-iw": "Страницата не може да бъде преместена под заглавие, оформено като междууики препратка.",
        "import-nonewrevisions": "Не са импортирани версии (всички вече съществуват или са пропуснати поради грешки).",
        "xml-error-string": "$1 на ред $2, колона $3 (байт $4): $5",
        "import-upload": "Качване на XML данни",
-       "import-token-mismatch": "Загуба на данните за текущата сесия.\n\nМоже би сте излезли от системата. <strong>Моля, уверете се, че сте влезли в профила си и опитайте отново</strong>.\nАко все още не работи, опитайте да [[Special:UserLogout|излезете]] и да влезете отново, също така проверете дали браузърът ви позволява бисквитки от този сайт.",
+       "import-token-mismatch": "Загуба на данните за текущата сесия.\n\nМоже би сте излезли от системата. '''Моля, уверете се, че сте влезли в профила си и опитайте отново'''.\nАко все още не работи, опитайте да [[Special:UserLogout|излезете]] и да влезете отново, също така проверете дали браузърът ви позволява бисквитки от този сайт.",
        "import-invalid-interwiki": "Не може да бъде извършено внасяне от посоченото уики.",
        "import-error-edit": "Страницата „$1“ не беше внесена, тъй като нямате права да я редактирате.",
        "import-error-create": "Страницата „$1“ не беше внесена, тъй като нямате права да я създадете.",
        "tooltip-ca-delete": "Изтриване на страницата",
        "tooltip-ca-undelete": "Възстановяване на изтрити редакции на страницата",
        "tooltip-ca-move": "Преместване на страницата",
-       "tooltip-ca-watch": "Ð\94обавÑ\8fне Ð½Ð° Ñ\81Ñ\82Ñ\80аниÑ\86аÑ\82а ÐºÑ\8aм Ñ\81пиÑ\81Ñ\8aка Ð²и за наблюдение",
+       "tooltip-ca-watch": "Ð\94обавÑ\8fне Ð½Ð° Ñ\81Ñ\82Ñ\80аниÑ\86аÑ\82а ÐºÑ\8aм Ñ\81пиÑ\81Ñ\8aка Ð\92и за наблюдение",
        "tooltip-ca-unwatch": "Премахване на страницата от списъка ви за наблюдение",
        "tooltip-search": "Претърсване на {{SITENAME}}",
        "tooltip-search-go": "Отиване на страницата, ако тя съществува с точно това име",
        "tooltip-p-logo": "Посещаване на началната страница",
        "tooltip-n-mainpage": "Началната страница",
        "tooltip-n-mainpage-description": "Посещаване на началната страница",
-       "tooltip-n-portal": "Ð\98нÑ\84оÑ\80маÑ\86иÑ\8f Ð·Ð° Ð¿Ñ\80оекÑ\82а â\80\94 какво, къде, как",
+       "tooltip-n-portal": "Ð\98нÑ\84оÑ\80маÑ\86иÑ\8f Ð·Ð° Ð¿Ñ\80оекÑ\82а â\80\93 какво, къде, как",
        "tooltip-n-currentevents": "Информация за текущи събития",
        "tooltip-n-recentchanges": "Списък на последните промени в уикито",
        "tooltip-n-randompage": "Зареждане на случайна страница",
        "exif-software": "Използван софтуер",
        "exif-artist": "Автор",
        "exif-copyright": "Притежател на авторското право",
-       "exif-exifversion": "Exif версия",
+       "exif-exifversion": "Версия на Exif",
        "exif-flashpixversion": "Поддържана версия на Flashpix",
        "exif-colorspace": "Цветово пространство",
        "exif-componentsconfiguration": "Значение на всеки компонент",
        "autosumm-blank": "Премахване на цялото съдържание на страницата",
        "autosumm-replace": "Заместване на съдържанието на страницата с „$1“",
        "autoredircomment": "Пренасочване към [[$1]]",
+       "autosumm-changed-redirect-target": "Промяна на целта на пренасочване от [[$1]] на [[$2]]",
        "autosumm-new": "Нова страница: „$1“",
        "autosumm-newblank": "Създаване на празна страница",
        "lag-warn-normal": "Промените от {{PLURAL:$1|последната $1 секунда|последните $1 секунди}} вероятно не са показани в списъка.",
index 21c5df1..46c8b60 100644 (file)
        "tooltip-n-mainpage-description": "Коьрта агӀона дехьа гӀо",
        "tooltip-n-portal": "Оцу кхолламах, мичахь хlу йу лаьташ а хlудалур ду шуьга",
        "tooltip-n-currentevents": "ДӀаоьхуш болу хаамашна могӀам",
-       "tooltip-n-recentchanges": "ТӀаьххьаралера хийцаман могӀам",
+       "tooltip-n-recentchanges": "ТӀаьххьара хийцамийн могӀам",
        "tooltip-n-randompage": "Хьажа цахууш нисйеллачу агlоне",
        "tooltip-n-help": "ГӀоде меттиг",
        "tooltip-t-whatlinkshere": "ХӀокху агӀонан тӀе хьажийна йолу массо агӀонийн могӀам",
        "exif-focalplaneresolutionunit": "Магоран фокалан дустар",
        "exif-sensingmethod": "Сенсоран тайп",
        "exif-filesource": "Файлан хьост",
+       "exif-scenetype": "Сценан тайпа",
        "exif-customrendered": "Кхин тӀе кечдар",
        "exif-exposuremode": "Сурт доккхуш йолу серлон хьал харжар",
        "exif-whitebalance": "Къайн баланс",
        "tag-filter": "[[Special:Tags|Билгалонаш]] луьттург:",
        "tag-filter-submit": "Литта",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|1=Билгало|Билгалонаш}}]]: $2)",
+       "tag-mw-new-redirect": "Керла дӀасахьажорг",
        "tag-mw-rollback": "Юхаяккха",
        "tags-title": "Билгалонаш",
        "tags-intro": "ХӀокху агӀона чохь гойтуш бу билгалонийн могӀам царца программин латторо билгал доху нисдарш, кхин билгалонийн маьӀна а.",
index 13987ca..3d71fbe 100644 (file)
        "recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (òbaczë téż [[Special:NewPages|lëstã nowëch strón]])",
        "rcfilters-legend-heading": "<strong>Ùżëté skrócënczi:</strong>",
        "rcfilters-other-review-tools": "Jiné nôrzãdza przezéru zjinaków",
+       "rcfilters-group-results-by-page": "Grëpòwanié pòdle strón.",
        "rcfilters-activefilters": "Aktiwné filtrë",
+       "rcfilters-limit-title": "Lëczba wëników do wëskrzënieniô",
+       "rcfilters-date-popup-title": "Cząd czasu dlô szëkbë.",
+       "rcfilters-days-title": "Slédnëch dni",
+       "rcfilters-hours-title": "Slédnëch gòdzënów",
+       "rcfilters-quickfilters-placeholder-title": "Ni môsz jesz zapisónëch filtrów",
+       "rcfilters-quickfilters-placeholder-description": "Abë zapisac nastôwë filtrów i ùżëwac jich pózni, klikni ikonkã załóżczi w pòlu aktiwnëch filtrów, jaczé nachôdô sã niżi.",
+       "rcfilters-savedqueries-defaultlabel": "Zapisóné filtrë",
        "rcfilters-savedqueries-add-new-title": "Zapiszë aktualné ùstôwë filtrów.",
        "rcfilters-clear-all-filters": "Wëczëszczë filtrë",
        "rcfilters-search-placeholder": "Fitruj nowé zjinaczi (ùżij do te menu abò wëszukôj pòdle pòzwë filtra)",
        "rcfilters-filter-lastrevision-description": "Leno nônowszi zjinaczi dlô kòżdi starnë.",
        "rcfilters-filter-previousrevision-label": "Wersje jiné niż nônowszô.",
        "rcfilters-filter-previousrevision-description": "Wszëtczé edicje, jaczé nie są nônowszą wersją starnë.",
+       "rcfilters-view-tags": "Edicje ze znakòwnikama przë zjinakach",
+       "rcfilters-view-tags-tooltip": "Przefiltruj wëniczi pòdle znakòwników przë zjinakach",
        "rcfilters-liveupdates-button": "Òdnôwianié na żëwò",
+       "rcfilters-liveupdates-button-title-off": "Wëskrzëniôj nowé zjinaczi zarôzkù pò tim jak sã pòjawią",
        "rcnotefrom": "Niżi {{PLURAL:$5|je zjinaka|są zjinaczi}} {{PLURAL:$5|zrobionô|zrobioné}} pò <strong>$3, $4</strong> (nie wicy jak '''$1''' pozycëji).",
        "rclistfrom": "Pòkażë nowé zmianë òd $3 $2",
        "rcshowhideminor": "$1 môłé zmianë",
        "specialpages": "Specjalné starnë",
        "tag-filter": "Filtr [[Special:Tags|znakòwników]]:",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Znakòwnik|Znakòwniczi}}]]: $2)",
+       "tag-mw-blank": "Rëmniãcé całi zamkłoscë starnë",
+       "tag-mw-rollback": "Copniãcé zjinaków",
+       "tags-title": "Znakòwniczi",
        "tags-active-yes": "Jo",
        "tags-active-no": "Ni",
        "tags-hitcount": "{{PLURAL:$1|zjinaka|zjinaczi|zjinaków}}",
        "revdelete-content-hid": "zamkłosc òsta zataconô",
        "revdelete-restricted": "nastôwi ògrańczenia dlô sprôwników",
        "revdelete-unrestricted": "rëmôj ògrańczenia dlô sprôwników",
+       "logentry-block-block": "$1 {{GENDER:$2|zablokòwôł}} {{GENDER:$4|$3}}; cząd blokadë: $5 $6",
+       "logentry-suppress-block": "$1 {{GENDER:$2|zablokòwôł}} {{GENDER:$4|$3}}; cząd blokadë: $5 $6",
        "logentry-move-move": "$1 {{GENDER:$2|przeniós|przeniosła}} starnã $3 do $4",
        "logentry-move-move-noredirect": "$1 {{GENDER:$2|przeniós|przeniosła}} starnã $3 na $4, bez òstôwienia przczerowaniô pòd stôrim titlã",
        "logentry-move-move_redir": "$1 {{GENDER:$2|przeniós|przeniosła}} starnã $3 na $4 w plac przeczérowaniô",
index 1836c65..e9d3e62 100644 (file)
        "rcfilters-preference-label": "Die verbesserte Version der Letzten Änderungen ausblenden",
        "rcfilters-preference-help": "Macht die Neugestaltung der Oberfläche aus dem Jahr 2017 und alle seitdem hinzugefügten Werkzeuge wieder rückgängig.",
        "rcfilters-filter-showlinkedfrom-label": "Änderungen auf Seiten anzeigen, die verlinkt sind von",
-       "rcfilters-filter-showlinkedfrom-option-label": "Änderungen auf Seiten anzeigen, die <strong>VON</strong> einer Seite verlinkt sind.",
-       "rcfilters-filter-showlinkedto-label": "Änderungen auf Seiten anzeigen, die verlinkt sind auf",
-       "rcfilters-filter-showlinkedto-option-label": "Änderungen auf Seiten anzeigen, die <strong>AUF</strong> eine Seite verlinkt sind.",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Seiten</strong>, die <strong>von</strong> der ausgewählten Seite <strong>verlinkt</strong> sind",
+       "rcfilters-filter-showlinkedto-label": "Änderungen auf Seiten anzeigen, die verlinken auf",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Seiten</strong>, die <strong>auf</strong> die ausgewählte Seite <strong>verlinken</strong>",
        "rcfilters-target-page-placeholder": "Einen Seitennamen eingeben",
        "rcnotefrom": "Angezeigt {{PLURAL:$5|wird die Änderung|werden die Änderungen}} seit <strong>$3, $4</strong> (max. <strong>$1</strong> Einträge).",
        "rclistfromreset": "Datumsauswahl zurücksetzen",
        "tag-mw-replace-description": "Bearbeitungen, die mehr als 90 % des Inhalts einer Seite entfernen.",
        "tag-mw-rollback": "Zurücksetzung",
        "tag-mw-rollback-description": "Bearbeitungen, die frühere Bearbeitungen mithilfe des Zurücksetzen-Links rückgängig machen.",
+       "tag-mw-undo": "Rückgängigmachung",
+       "tag-mw-undo-description": "Bearbeitungen, die frühere Versionen mit dem Link „Rückgängig machen“ zurücksetzen",
        "tags-title": "Markierungen",
        "tags-intro": "Diese Seite zeigt alle Markierungen, die für Bearbeitungen verwendet wurden, sowie deren Bedeutung. \n\nBei entsprechender Einstellung können die Missbrauchfilter beliebige Markierungen in die Versionsgeschichte setzen. Man kann die Versionsgeschichte dann nach den Markierungen filtern.",
        "tags-tag": "Markierungsname",
index e70d1c8..bbaa3bc 100644 (file)
        "nstab-main": "Perre",
        "nstab-user": "Pera karberi",
        "nstab-media": "Perra medya",
-       "nstab-special": "Pera hısusi",
+       "nstab-special": "Perra xısusiye",
        "nstab-project": "Perra proji",
        "nstab-image": "Dosya",
        "nstab-mediawiki": "Mesac",
index 3a67982..301408f 100644 (file)
        "tag-mw-replace-description": "Edits that remove more than 90% of the content of a page",
        "tag-mw-rollback": "Rollback",
        "tag-mw-rollback-description": "Edits that roll back previous edits using the rollback link",
+       "tag-mw-undo": "Undo",
+       "tag-mw-undo-description": "Edits that undo previous edits using the undo link",
        "tags-title": "Tags",
        "tags-intro": "This page lists the tags that the software may mark an edit with, and their meaning.",
        "tags-tag": "Tag name",
index 42974b7..2056034 100644 (file)
@@ -88,6 +88,7 @@
        "tog-watchlisthideminor": "Kaŝi malgrandajn redaktojn de la atentaro",
        "tog-watchlisthideliu": "Kaŝi redaktojn de ensalutitaj uzantoj de la atentaro",
        "tog-watchlistreloadautomatically": "Reŝargi la atentaron aŭtomate ĉiam, kiam filtrilo estas ŝanĝita (bezonas Ĝavoskripton)",
+       "tog-watchlistunwatchlinks": "Aldoni rektajn (mal)atentendajn ligojn al atentaro (bezonas Javascripton por komuti la funkciecon)",
        "tog-watchlisthideanons": "Kaŝi redaktojn de anonimuloj de la atentaro",
        "tog-watchlisthidepatrolled": "Kaŝi patrolitajn redaktojn de la atentaro",
        "tog-watchlisthidecategorization": "Kaŝi enkategoriigon de paĝoj",
        "botpasswords-insert-failed": "Aldono de la robota nomo \"$1\" ne sukcesis. Ĉu ĝi jam estis aldonita?",
        "botpasswords-update-failed": "Ĝisdatigo de la robota nomo \"$1\" ne sukcesis. Ĉu ĝi estis forigita?",
        "botpasswords-created-title": "Robota pasvorto kreita",
-       "botpasswords-created-body": "La robota pasvorto por robota nomo \"$1\" de la uzanto \"$2\" estis kreita.",
+       "botpasswords-created-body": "La pasvorto de roboto por nomo de roboto \"$1\" de la uzanto \"$2\" estis kreita.",
        "botpasswords-updated-title": "Robota pasvorto ĝisdatigita",
-       "botpasswords-updated-body": "La robota pasvorto por robota nomo \"$1\" de la uzanto \"$2\" estis ĝisdatigita.",
+       "botpasswords-updated-body": "La pasvorto de roboto por nomo de roboto \"$1\" de la uzanto \"$2\" estis ĝisdatigita.",
        "botpasswords-deleted-title": "Robota pasvorto forigita",
        "botpasswords-deleted-body": "La robota pasvorto por robota nomo \"$1\" de la uzanto \"$2\" estis forigita.",
        "botpasswords-newpassword": "La nova pasvorto por ensaluti per <strong>$1</strong> estas <strong>$2</strong>. <em>Bonvolu noti ĝin por estonta konsultado.</em> <br> (Por malnovaj robotoj, kiuj postulas, ke la ensaluta nomo estu sama kiel la eventuala uzantonomo, vi povas uzi <strong>$3</strong> kiel uzantonomon kaj <strong>$4</strong> kiel pasvorton.)",
        "import-mapping-subpage": "Importi kiel subpaĝojn de la jena paĝo:",
        "import-upload-filename": "Dosiernomo:",
        "import-comment": "Komento:",
-       "importtext": "Bonvolu elporti la dosieron el la fonta vikio per la [[Special:Export|eksportilo]]. Konservu ĝin sur via persona komputilo kaj poste alŝutu ĝin ĉi tien.",
+       "importtext": "Bonvolu elporti la dosieron el la fonta vikio per la [[Special:Export|elportilo]]. Konservu ĝin sur via persona komputilo kaj poste alŝutu ĝin ĉi tien.",
        "importstart": "Importante paĝojn...",
        "import-revision-count": "$1 {{PLURAL:$1|versio|versioj}}",
        "importnopages": "Neniu paĝo por importi.",
index 9daaeb3..5b27a7e 100644 (file)
                        "Luisangelrg",
                        "Pierpao",
                        "Ohlila",
-                       "KATRINE1992"
+                       "KATRINE1992",
+                       "Athena in Wonderland"
                ]
        },
        "tog-underline": "Subrayar los enlaces:",
        "rcfilters-watchlist-showupdated": "Los cambios hechos a páginas que no has visitado desde que se efectuaron aparecen en <strong>negrita</strong>, acompañados de marcadores sólidos.",
        "rcfilters-preference-label": "Ocultar la versión mejorada de Cambios recientes",
        "rcfilters-preference-help": "Revierte el rediseño de interfaz de 2017 y desactiva todas las herramientas añadidas desde entonces.",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Páginas enlazadas desde</strong> la página seleccionada",
+       "rcfilters-filter-showlinkedto-label": "Mostrar cambios en páginas que enlazan a",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Páginas que enlazan hacia</strong> la página seleccionada",
        "rcfilters-target-page-placeholder": "Escribe el nombre de una página",
        "rcnotefrom": "Debajo {{PLURAL:$5|aparece el cambio|aparecen los cambios}} desde <strong>$3, $4</strong> (se muestran hasta <strong>$1</strong>).",
        "rclistfromreset": "Restablecer selección de fecha",
        "tag-mw-replace-description": "Ediciones que eliminan más del 90 % del contenido de una página",
        "tag-mw-rollback": "Reversión",
        "tag-mw-rollback-description": "Ediciones que deshacen modificaciones previas usando la herramienta de reversor",
+       "tag-mw-undo": "Deshacer",
        "tags-title": "Etiquetas",
        "tags-intro": "Esta página lista las etiquetas con las que el software puede marcar una edición y su significado.",
        "tags-tag": "Nombre de etiqueta",
index ef98e7a..86a9236 100644 (file)
        "timezoneregion-indian": "India ookean",
        "timezoneregion-pacific": "Vaikne ookean",
        "allowemail": "Luba teistel kasutajatel mulle e-kirju saata",
+       "email-allow-new-users-label": "Luba e-kirjad tuliuutelt kasutajatelt",
        "email-blacklist-label": "Keela neil kasutajatel mulle e-kirju saata:",
        "prefs-searchoptions": "Otsimine",
        "prefs-namespaces": "Nimeruumid",
        "right-siteadmin": "Panna lukku ja lukust lahti teha andmebaasi",
        "right-override-export-depth": "Eksportida lehekülgi, kaasates viidatud leheküljed kuni viienda tasemeni",
        "right-sendemail": "Saata teistele kasutajatele e-kirju",
+       "right-sendemail-new-users": "Saata e-kirju logitud toiminguteta kasutajatele",
        "right-managechangetags": "Koostada ja (in)aktiveerida [[Special:Tags|märgiseid]]",
        "right-applychangetags": "Rakendada [[Special:Tags|märgiseid]] enda muudatuste suhtes",
        "right-changetags": "Lisada ja eemaldada käsitsi rakendatavaid [[Special:Tags|märgiseid]] üksikute redaktsioonide ja logisissekannete juures",
        "rcfilters-preference-label": "Peida viimaste muudatuste täiustatud versioon",
        "rcfilters-preference-help": "Pöörab tagasi 2017. aastast alates tehtud muudatused kujunduses ja lisatud tööriistad.",
        "rcfilters-filter-showlinkedfrom-label": "Näita muudatusi lehekülgedel, millele viidatakse leheküljelt:",
-       "rcfilters-filter-showlinkedfrom-option-label": "Näita muudatusi lehekülgedel, millele viidatakse <strong>leheküljelt</strong>",
-       "rcfilters-filter-showlinkedto-label": "Näita muudatusi lehekülgedel, millel viidatakse leheküljele:",
-       "rcfilters-filter-showlinkedto-option-label": "Näita muudatusi lehekülgedel, mis viitavad <strong>leheküljele</strong>",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Leheküljed, millele viidatakse</strong> valitud leheküljel",
+       "rcfilters-filter-showlinkedto-label": "Näita muudatusi lehekülgedel, millel viidatakse leheküljele",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Leheküljed, mis viitavad</strong> valitud leheküljele",
        "rcfilters-target-page-placeholder": "Sisesta lehekülje pealkiri",
        "rcnotefrom": "Allpool on toodud {{PLURAL:$5|muudatus|muudatused}} alates: <strong>$3, kell $4</strong> (näidatakse kuni <strong>$1</strong> muudatust)",
        "rclistfromreset": "Lähtesta kuupäeva valik",
        "tag-mw-replace-description": "Muudatused, millega asendatakse lehekülje sisust enam kui 90%",
        "tag-mw-rollback": "Tühistamine",
        "tag-mw-rollback-description": "Muudatused, millega eelmised muudatused pööratakse tagasi, kasutades tühistuslinki",
+       "tag-mw-undo": "Eemaldamine",
+       "tag-mw-undo-description": "Muudatused, millega eelmised muudatused pööratakse tagasi, kasutades eemaldamislinki",
        "tags-title": "Märgised",
        "tags-intro": "See lehekülg loetleb märgised, millega tarkvara võib muudatused märgistada, ja nende kirjeldused.",
        "tags-tag": "Märgise nimi",
index 66a399b..569d2c0 100644 (file)
        "timezoneregion-indian": "Indiar Ozeanoa",
        "timezoneregion-pacific": "Ozeano Barea",
        "allowemail": "Beste erabiltzaileei niri posta mezuak bidaltzea gaitu",
+       "email-allow-new-users-label": "Baimendu mezuak erabiltzaile berrietatik",
        "email-blacklist-label": "Erabiltzaile hauei niri mezu elektronikoak bidaltzen debekatu:",
        "prefs-searchoptions": "Bilatu",
        "prefs-namespaces": "Izen-tarteak",
        "right-siteadmin": "Blokeatu eta desblokeatu datu basea blokeatu",
        "right-override-export-depth": "5eko sakonerararteko loturiko orrialdeak barne esportatu",
        "right-sendemail": "Beste erabiltzaileei e-posta bidali",
+       "right-sendemail-new-users": "Bidali mezu elektronikoa ekintzarik gabe dauden erabiltzaileei",
        "right-managechangetags": "Sortu eta (des)aktibatzeko  [[Special:Tags|tags]]",
        "right-applychangetags": "Aplikatu [[Special:Tags|tags]] bakoitzaren aldaketekin batera",
        "right-changetags": "[[Special:Tags|tags]] arbitrarioak gehitu edo kendu berrikusketa eta sarrera indibidualetan",
        "recentchanges-noresult": "Ez da egon aldaketarik emandako tartean irizpide hau betetzen dutenik.",
        "recentchanges-timeout": "Bilaketa honek denbora muga gainditu du. Agian beste parametro batzuekin bilatu nahi duzu.",
        "recentchanges-network": "Errore tekniko baten ondorioz, ez da emaitzarik kargatu. Saiatu orria freskatzen.",
+       "recentchanges-notargetpage": "Idatzi goian orriaren izena orri horri lotutako aldaketak ikusteko.",
        "recentchanges-feed-description": "Sindikazio honetan wikian eginiko azkeneko aldaketak jarrai daitezke.",
        "recentchanges-label-newpage": "Aldaketa honek orri berri bat sortu du",
        "recentchanges-label-minor": "Aldaketa hau txikia da",
        "rcfilters-group-results-by-page": "Talde emaitzak orrika",
        "rcfilters-activefilters": "Iragazki aktiboak",
        "rcfilters-advancedfilters": "Iragazki aurreratuak",
-       "rcfilters-limit-title": "Aldaketak erakutsi",
+       "rcfilters-limit-title": "Erakusteko emaitzak",
+       "rcfilters-limit-and-date-label": "{{PLURAL:aldaketa|$1|$1 aldaketa}}, $2",
+       "rcfilters-date-popup-title": "Bilatzeko denbora tartea",
        "rcfilters-days-title": "Azken egunak",
        "rcfilters-hours-title": "Azken orduak",
        "rcfilters-days-show-days": "{{PLURAL:$1|Egun $1|$1 egun}}",
        "rcfilters-watchlist-showupdated": "Azkenengo aldaketak egin zirenetik bisitatu ez dituzun orrietan eman diren aldaketak <strong>lodi estiloan</strong> daude, markatzaile sendoekin.",
        "rcfilters-preference-label": "Azkenengo Aldaketen hobetutako bertsioa ezkutatu",
        "rcfilters-preference-help": "2017 interfazearen birmoldaketa eta geroztik gehitu diren tresna guztietara bueltatzen da.",
+       "rcfilters-target-page-placeholder": "Sartu orrialde baten izena",
        "rcnotefrom": "Jarraian azaltzen diren {{PLURAL:$5|aldaketak}} data honetatik aurrerakoak dira: <strong>$3,$4</strong> (gehienez <b>$1</b> erakusten dira).",
        "rclistfromreset": "Data aukeraketa berrezarri",
        "rclistfrom": "Erakutsi $3 $2 ondorengo aldaketa berriak",
        "uploadstash-bad-path": "Bidea ez da existitzen.",
        "uploadstash-bad-path-invalid": "Bideak ez du balio.",
        "uploadstash-bad-path-unknown-type": "Mota ezezaguna \"$1\".",
+       "uploadstash-bad-path-bad-format": "\"$1\" giltza ez dago formatu apropos batean.",
        "uploadstash-file-not-found-missing-content-type": "Eduki-motako goiburua falta da.",
        "uploadstash-file-not-found-not-exists": "Ezin da bidea aurkitu, edo ez da fitxategi arrunta.",
        "uploadstash-file-too-large": "Ezin da $1 byte baino handiagoa den fitxategia zerbitzatu.",
        "import-mapping-namespace": "Izen eremu batera inportatu:",
        "import-mapping-subpage": "Hurrengo orriaren azpi-orri bezala inportatu:",
        "import-upload-filename": "Fitxategiaren izena:",
+       "import-upload-username-prefix": "Interwiki aurrizkia:",
        "import-comment": "Iruzkina:",
        "importtext": "Mesedez, jatorrizko wikitik orrialdea esportatzeko [[Special:Export|esportazio tresna]] erabil ezazu, zure diskoan gorde eta jarraian hona igo.",
        "importstart": "Orrialdeak inportatzen...",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Etiketa|Etiketak}}]]: $2)",
        "tag-mw-contentmodelchange": "Eduki eredu aldaketa",
        "tag-mw-contentmodelchange-description": "Orri baten [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel change the content model] aldaketak",
+       "tag-mw-blank-description": "Orria zuriz jartzen duten aldaketak",
+       "tag-mw-replace": "Ordezkatuta",
+       "tag-mw-replace-description": "Orrialde baten edukiaren %90a baino gehiagok ezabatzen duten aldaketak",
+       "tag-mw-rollback": "Desegin",
        "tags-title": "Etiketak",
        "tags-intro": "Orri honek softwareak aldatzeko bezala marka ditzazkeen etiketak zerrendatzen ditu, eta berauen esanahia.",
        "tags-tag": "Etiketaren izena",
index dbc52f6..b0ad41e 100644 (file)
        "emailccsubject": "Kopio lähettämästäsi viestistä osoitteeseen $1: $2",
        "emailsent": "Sähköposti lähetetty",
        "emailsenttext": "Sähköpostiviestisi on lähetetty.",
-       "emailuserfooter": "Tämän sähköpostin {{GENDER:$1|lähetti}} $1 vastaanottajalle {{GENDER:$2|$2}} käyttämällä ”{{int:emailuser}}” -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}. Jos vastaat tähän sähköpostiin, sähköpostisi lähetetään suoraan {{GENDER:$1|alkuperäiselle lähettäjälle}}, paljastaen {{GENDER:$2|sinun}} sähköpostiosoitteesi {{GENDER:$1|hänelle}}.",
+       "emailuserfooter": "Tämän sähköpostin {{GENDER:$1|lähetti}} $1 vastaanottajalle {{GENDER:$2|$2}} käyttämällä ”{{int:emailuser}}” -toimintoa {{GRAMMAR:inessive|{{SITENAME}}}}. Jos vastaat tähän sähköpostiin, sinun sähköpostiviestisi lähetetään suoraan {{GENDER:$1|alkuperäiselle lähettäjälle}} ja samalla paljastetaan {{GENDER:$2|sinun}} sähköpostiosoitteesi {{GENDER:$1|hänelle}}.",
        "usermessage-summary": "Jätetään järjestelmäviesti.",
        "usermessage-editor": "Järjestelmäviestittäjä",
        "watchlist": "Tarkkailulista",
index eb6f531..8412a71 100644 (file)
        "rcfilters-advancedfilters": "Filtres avancés",
        "rcfilters-limit-title": "Résultats à afficher",
        "rcfilters-limit-and-date-label": "{{PLURAL:$1|modification|$1 modifications}}, $2",
-       "rcfilters-date-popup-title": "Periode de temps pour chercher",
+       "rcfilters-date-popup-title": "Période de temps à rechercher",
        "rcfilters-days-title": "Derniers jours",
        "rcfilters-hours-title": "Dernières heures",
        "rcfilters-days-show-days": "$1 {{PLURAL:$1|jour|jours}}",
        "rcfilters-preference-label": "Masquer la version améliorée des modifications récentes",
        "rcfilters-preference-help": "Désactive la version 2017 de l'interface ainsi que de tous les outils ajoutés alors et depuis.",
        "rcfilters-filter-showlinkedfrom-label": "Montrer les modifications des pages liées depuis",
-       "rcfilters-filter-showlinkedfrom-option-label": "Montrer les modifications des pages liées <strong>DEPUIS</strong> une page",
-       "rcfilters-filter-showlinkedto-label": "Montrer les modifications des pages liées vers",
-       "rcfilters-filter-showlinkedto-option-label": "Montrer les modifications des pages liées <strong>VERS</strong> une page",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Pages liées depuis</strong> la page sélectionnée",
+       "rcfilters-filter-showlinkedto-label": "Montrer les modifications des pages pointant vers",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Pages pointant vers</strong> la page sélectionnée",
        "rcfilters-target-page-placeholder": "Entrer un nom de page",
        "rcnotefrom": "Ci-dessous {{PLURAL:$5|la modification effectuée|les modifications effectuées}} depuis le <strong>$3, $4</strong> (affichées jusqu’à <strong>$1</strong>).",
        "rclistfromreset": "Réinitialiser la sélection de la date",
        "imported-log-entries": "$1 {{PLURAL:$1|entrée|entrées}} du journal {{PLURAL:$1|importée|importées}}.",
        "importfailed": "Échec de l'importation : <nowiki>$1</nowiki>",
        "importunknownsource": "Type inconnu de la source à importer",
-       "importnoprefix": "Aucun prefixe de interwiki n'a ete fourni",
+       "importnoprefix": "Aucun prefixe interwiki n’a été fourni",
        "importcantopen": "Impossible d'ouvrir le fichier à importer",
        "importbadinterwiki": "Mauvais lien inter-wiki",
        "importsuccess": "L'importation a réussi !",
        "tag-mw-contentmodelchange": "modification du modèle de contenu",
        "tag-mw-contentmodelchange-description": "Modifications qui [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel changent le modèle de contenu] d'une page",
        "tag-mw-new-redirect": "Nouvelle redirection",
-       "tag-mw-new-redirect-description": "Editions qui vont creer une nouvelle redirection ou modifier una page vers une redirection",
+       "tag-mw-new-redirect-description": "Modifications qui créent une nouvelle redirection ou transforment une page en redirection",
        "tag-mw-removed-redirect": "Redirection supprimée",
-       "tag-mw-removed-redirect-description": "Les editions qui vont changer la redirection courante a une non redirection",
-       "tag-mw-changed-redirect-target": "La destination de redirection a ete modifiee",
+       "tag-mw-removed-redirect-description": "Modifications qui remplacent une redirection existante par une page sans redirection",
+       "tag-mw-changed-redirect-target": "La destination de redirection a été modifiée",
        "tag-mw-changed-redirect-target-description": "Modifications qui modifient la cible d’une redirection",
        "tag-mw-blank": "Blanchiment",
        "tag-mw-blank-description": "Modifications qui suppriment le contenu des pages",
index e8ae7e6..a530e16 100644 (file)
@@ -24,7 +24,8 @@
                        "Banjo",
                        "Josep Maria Roca Peña",
                        "Luan",
-                       "Hamilton Abreu"
+                       "Hamilton Abreu",
+                       "Athena in Wonderland"
                ]
        },
        "tog-underline": "Subliñar as ligazóns:",
        "rcfilters-preference-label": "Ocultar a versión mellorada de cambios recentes",
        "rcfilters-preference-help": "Reverte o redeseño da interface de 2017 e tódalas ferramentas engadidas dende entón.",
        "rcfilters-filter-showlinkedfrom-label": "Amosar os cambios en páxinas ligadas desde",
-       "rcfilters-filter-showlinkedfrom-option-label": "Amosar os cambios en páxinas ligadas <strong>DESDE</strong> unha páxina",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Páxinas ligadas desde</strong> a páxina seleccionada",
        "rcfilters-filter-showlinkedto-label": "Amosar os cambios en páxinas que ligan con",
-       "rcfilters-filter-showlinkedto-option-label": "Amosar os cambios en páxinas que ligan <strong>CON</strong> unha páxina",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Páxinas que ligan</strong> para a páxina seleccionada",
        "rcfilters-target-page-placeholder": "Insire un nome de páxina",
        "rcnotefrom": "A continuación {{PLURAL:$5|móstrase o cambio feito|móstranse os cambios feitos}} desde o <strong>$3</strong> ás <strong>$4</strong> (móstranse <strong>$1</strong> como máximo).",
        "rclistfromreset": "Reinicializar a selección da data",
        "tag-mw-replace-description": "Edicións que eliminan máis do 90% do contido dunha páxina",
        "tag-mw-rollback": "Desfacer",
        "tag-mw-rollback-description": "Edicións que desfán modificacións previas usando a ligazón de desfacer",
+       "tag-mw-undo": "Desfacer",
        "tags-title": "Etiquetas",
        "tags-intro": "Esta páxina lista as etiquetas coas que o software pode marcar unha edición, e mailos seus significados.",
        "tags-tag": "Nome da etiqueta",
index 0175d2d..cf76e44 100644 (file)
        "rcfilters-watchlist-showupdated": "שינויים בדפים שלא ביקרת בהם מאז ביצוע השינויים מופיעים בכתב <strong>מודגש</strong>, ומודגשים בצבע.",
        "rcfilters-preference-label": "הסתרת הגרסה המשופרת של השינויים האחרונים",
        "rcfilters-preference-help": "ביטול של העיצוב מחדש של הממשק (שבוצע בשנת 2017) ושל כל הכלים שנוספו אז ומאז.",
-       "rcfilters-filter-showlinkedfrom-label": "×\94צ×\92ת ×©×\99× ×\95×\99×\99×\9d ×\91×\93פ×\99×\9d ×\94×\9eק×\95שר×\99×\9d ×\9e",
-       "rcfilters-filter-showlinkedfrom-option-label": "הצגת שינויים בדפים המקושרים <strong>מתוך</strong> דף",
-       "rcfilters-filter-showlinkedto-label": "×\94צ×\92ת ×©×\99× ×\95×\99×\99×\9d ×\91×\93פ×\99×\9d ×\94×\9eקשר×\99×\9d ל",
-       "rcfilters-filter-showlinkedto-option-label": "הצגת שינויים בדפים המקשרים <strong>אל</strong> דף",
+       "rcfilters-filter-showlinkedfrom-label": "×\94צ×\92ת ×©×\99× ×\95×\99×\99×\9d ×\91×\93פ×\99×\9d ×©×\9eק×\95שר×\99×\9d ×\9eת×\95×\9a",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>דפים שמקושרים מתוך</strong> הדף שנבחר",
+       "rcfilters-filter-showlinkedto-label": "×\94צ×\92ת ×©×\99× ×\95×\99×\99×\9d ×\91×\93פ×\99×\9d ×©×\9eקשר×\99×\9d ×\90ל",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>דפים שמקשרים אל</strong> הדף שנבחר",
        "rcfilters-target-page-placeholder": "הקלדת שם דף",
        "rcnotefrom": "להלן {{PLURAL:$5|השינוי שבוצע|השינויים שבוצעו}} מאז <strong>$3, $4</strong> (מוצגים עד <strong>$1</strong>).",
        "rclistfromreset": "איפוס בחירת התאריך",
        "tag-mw-replace-description": "עריכות שמסירות יותר מ־90% מהתוכן של דף",
        "tag-mw-rollback": "שחזור",
        "tag-mw-rollback-description": "עריכות שמשחזרות עריכות קודמות בעזרת קישור השחזור",
+       "tag-mw-undo": "ביטול",
+       "tag-mw-undo-description": "עריכות שמבטלות עריכות קודמות בעזרת קישור הביטול",
        "tags-title": "תגיות",
        "tags-intro": "דף זה מכיל רשימה של תגיות שהתוכנה יכולה לסמן איתן עריכה, ומשמעויותיהן.",
        "tags-tag": "שם התגית",
index 25a09cb..a05746e 100644 (file)
                        "Anamdas",
                        "Sachinkatiyar",
                        "Rishi.Singh",
-                       "Clockery"
+                       "Clockery",
+                       "Rajatkatiyar10"
                ]
        },
-       "tog-underline": "à¤\95ड़ियाà¤\81 à¤\85धà¥\8bरà¥\87à¤\96न:",
-       "tog-hideminor": "हाल में हुए परिवर्तन में छोटे बदलाव छिपाएँ",
-       "tog-hidepatrolled": "हाल में हुए परिवर्तन में परीक्षित बदलाव छिपाएँ",
-       "tog-newpageshidepatrolled": "नये पृष्ठों की सूची में परीक्षित पृष्ठ छिपाएँ",
+       "tog-underline": "लिà¤\82à¤\95 à¤°à¥\87à¤\96ाà¤\82à¤\95ित à¤\95रà¥\87à¤\82:",
+       "tog-hideminor": "हाल में हुए परिवर्तनों में छोटे बदलाव छिपाएँ",
+       "tog-hidepatrolled": "हाल में हुए परिवर्तनों में परीक्षित बदलाव छिपाएँ",
+       "tog-newpageshidepatrolled": "नये पृष्ठ की सूची में परीक्षित पृष्ठों को छिपाएँ",
        "tog-hidecategorization": "पृष्ठों का श्रेणीकरण छिपाएं",
-       "tog-extendwatchlist": "à¤\95à¥\87वल à¤¹à¤¾à¤²à¤¿à¤¯à¤¾ à¤¹à¥\80 à¤¨à¤¹à¥\80à¤\82, à¤¬à¤²à¥\8dà¤\95ि à¤¸à¤­à¥\80 à¤ªà¤°à¤¿à¤µà¤°à¥\8dतनà¥\8bà¤\82 à¤\95à¥\8b à¤¦à¤¿à¤\96ानà¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f à¤§à¥\8dयानसà¥\82à¤\9aà¥\80 à¤\95à¥\8b à¤µà¤¿à¤¸à¥\8dतारित करें",
+       "tog-extendwatchlist": "à¤\95à¥\87वल à¤¹à¤¾à¤²à¤¿à¤¯à¤¾ à¤¹à¥\80 à¤¨à¤¹à¥\80à¤\82, à¤¬à¤²à¥\8dà¤\95ि à¤¸à¤­à¥\80 à¤ªà¤°à¤¿à¤µà¤°à¥\8dतनà¥\8bà¤\82 à¤\95à¥\8b à¤¦à¤¿à¤\96ानà¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f à¤§à¥\8dयानसà¥\82à¤\9aà¥\80 à¤\95à¥\8b à¤µà¤¿à¤¸à¥\8dतà¥\83त करें",
        "tog-usenewrc": "हाल में हुए परिवर्तनों और ध्यानसूची में परिवर्तनों को पृष्ठ अनुसार समूहों में बाँटें",
-       "tog-numberheadings": "शà¥\80रà¥\8dषà¤\95 à¤¸à¥\8dव-à¤\95à¥\8dरमाà¤\82à¤\95ित à¤\95रà¥\87à¤\82",
+       "tog-numberheadings": "सà¥\8dव-à¤\95à¥\8dरमाà¤\82à¤\95ित à¤¶à¥\80रà¥\8dषà¤\95",
        "tog-showtoolbar": "सम्पादन उपकरण पट्टी दिखाएँ",
        "tog-editondblclick": "डबल क्लिक पर पृष्ठ संपादित करें",
        "tog-editsectiononrightclick": "अनुभाग शीर्षक पर दायाँ क्लिक करने पर अनुभाग सम्पादित करें",
        "nosuchusershort": "\"$1\" नाम का कोई सदस्य नहीं है।\nकृपया अपनी दी हुई वर्तनी जाँचें।",
        "nouserspecified": "सदस्यनाम देना अनिवार्य है।",
        "login-userblocked": "यह सदस्य प्रतिबन्धित है। सत्रारम्भ की अनुमति नहीं है।",
-       "wrongpassword": "आपने जो कूटशब्द लिखा है वह गलत है। कृपया पुनः प्रयास करें।",
+       "wrongpassword": "आपने जो कूटशब्द लिखा है वह गलत है। \nकृपया पुनः प्रयास करें।",
        "wrongpasswordempty": "कूटशब्द खाली है।\nपुनः यत्न करें।",
        "passwordtooshort": "आपका कूटशब्द कम से कम {{PLURAL:$1|1 अक्षर|$1 अक्षरों}} का होना चाहिये।",
        "passwordtoolong": "पासवर्ड {{PLURAL:$1|1 वर्ण|$1 वर्णों}} से ज़्यादा लम्बे नही हो सकते।",
        "diff-multi-sameuser": "(इसी सदस्य द्वारा {{PLURAL:$1|किया गया बीच का एक अवतरण नहीं दर्शाया गया|किये गये बीच के $1 अवतरण नहीं दर्शाए गए}})",
        "diff-multi-otherusers": "({{PLURAL:$2|एक अन्य सदस्य|$2 सदस्यों}} द्वारा {{PLURAL:$1|किया गया बीच का एक अवतरण नहीं दर्शाया गया|किये गये बीच के $1 अवतरण नहीं दर्शाए गए}})",
        "diff-multi-manyusers": "({{PLURAL:$2|एक योगदानकर्ता|$2 योगदानकर्ताओं}} द्वारा {{PLURAL:$1|किया बीच का एक|किए बीच के $1}} अवतरण दर्शाए नहीं हैं।)",
+       "diff-paragraph-moved-tonew": "अनुच्छेद को स्थानांतरित कर दिया गया था| नए स्थान पर जाने के लिए क्लिक करें|",
+       "diff-paragraph-moved-toold": "पैराग्राफ को स्थानांतरित कर दिया गया था| पुराने स्थान पर जाने के लिए क्लिक करें|",
        "difference-missing-revision": "इस अंतर {{PLURAL:$2|का एक अवतरण|के $2 अवतरण}} ($1) नहीं {{PLURAL:$2|पाया गया|पाए गए}}।\n\nयह आम तौर पर एक हटाए गए पृष्ठ के अवतरणों में अंतर ढूँढने पर होता है। अधिक जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटाने के लॉग] में पायी जा सकती है।",
        "searchresults": "खोज परिणाम",
        "searchresults-title": "\"$1\" के लिए खोज परिणाम",
        "recentchangesdays-max": "अधिकतम $1 {{PLURAL:$1|दिन}}",
        "recentchangescount": "मूल रूप से कितने संपादन दिखाएँ:",
        "prefs-help-recentchangescount": "इसमें हाल के बदलाव, पृष्ठ इतिहास व लॉग शामिल हैं।",
-       "prefs-help-watchlist-token2": "यह आपकी ध्यानसूची की वेब फ़ीड की गोपनीय चाबी है।\nयह जिसके भी पास होगी वह आपकी ध्यानसूची पढ़ सकेगा, इसिलए इसे किसी के साथ बांटियेगा नहीं।\n[[Special:ResetTokens|इसे रीसेट करने के लिए यहाँ क्लिक करें]]।",
+       "prefs-help-watchlist-token2": "यह आपकी ध्यानसूची की वेब फ़ीड की गोपनीय चाबी है।\nयह जिसके भी पास होगी वह आपकी ध्यानसूची पढ़ सकेगा, इसिलए इसे किसी के साथ बांटियेगा नहीं।\nअगर आप की जरूरत है, [[Special:ResetTokens|आप इसे रीसेट कर सकते हैं]]।",
        "savedprefs": "आपकी वरीयताएँ संजोई गई हैं।",
        "savedrights": "सदस्य {{GENDER:$1|$1}} का सदस्य अधिकार सहेजा गया।",
        "timezonelegend": "समयमंडल:",
        "timezoneregion-indian": "हिंद महासागर",
        "timezoneregion-pacific": "प्रशांत महासागर",
        "allowemail": "अन्य सदस्यों से ई-मेल सक्षम करें",
+       "email-allow-new-users-label": "एकदम नये उपयोगकर्ताओं को ईमेल की अनुमति दें",
        "email-blacklist-label": "इन उपयोगकर्ताओं को मुझे ईमेल भेजने से रोकना:",
        "prefs-searchoptions": "खोज",
        "prefs-namespaces": "नामस्थान",
        "right-siteadmin": "डाटाबेस को ताला लगायें या खोलें",
        "right-override-export-depth": "पृष्ठ निर्यात करें, पाँच स्तर की गहराई तक जुड़े हुए पृष्ठों समेत",
        "right-sendemail": "अन्य सदस्यों को ई-मेल भेजें",
+       "right-sendemail-new-users": "एक भी लॉग इन क्रिया नहीं करने वाले उपयोगकर्ताओं को ईमेल भेजें",
        "right-managechangetags": "डेटाबेस से [[Special:Tags|चिप्पियाँ]] बनायें और हटायें",
        "right-applychangetags": "प्रयोग में लाइये [[Special:Tags|tags]] किसी के बदलाव के साथ।",
        "right-changetags": "जमा करो और हटाओ स्वतंत्र [[Special:Tags|टैग]] व्यक्तिगत अवतरणों और लॉग प्रविक्तियों पर",
        "recentchanges-summary": "इस विकि पर हाल में हुए बदलाव इस पन्ने पर देखे जा सकते हैं।",
        "recentchanges-noresult": "इस अवधि के दौरान इन मापदंडों को पूर्ण करते कोई परिवर्तन नहीं किए गए हैं।",
        "recentchanges-timeout": "इस खोज का समय समाप्त हो गया है आप विभिन्न खोज मापदंडों की कोशिश करना चाहेंगे।",
+       "recentchanges-network": "तकनीकी त्रुटि के कारण, कोई भी परिणाम लोड नहीं किया जा सकता। कृपया पृष्ठ को रिफ्रेश करते रहें।",
+       "recentchanges-notargetpage": "उस पृष्ठ से संबंधित ऊपर परिवर्तन देखने के लिए पृष्ठ का नाम डालें|",
        "recentchanges-feed-description": "इस विकि पर हाल में हुए बदलाव इस फ़ीड में देखे जा सकते हैं।",
        "recentchanges-label-newpage": "इस संपादन से नया पृष्ठ बना",
        "recentchanges-label-minor": "यह एक छोटा सम्पादन है",
        "rcfilters-group-results-by-page": "पेज द्वारा समूह परिणाम",
        "rcfilters-activefilters": "सक्रिय फिल्टर",
        "rcfilters-advancedfilters": "उन्नत फ़िल्टर",
-       "rcfilters-limit-title": "दिखाने के लिए बदलाव",
+       "rcfilters-limit-title": "दिखाने के लिए परिणाम",
+       "rcfilters-limit-and-date-label": "{{PLURAL:$1|बदलाव|$1 परिवर्तन}}, $2",
+       "rcfilters-date-popup-title": "खोजने के लिए समय अवधि",
        "rcfilters-days-title": "कुछ दिनों के",
        "rcfilters-hours-title": "कुछ घंटों के",
        "rcfilters-days-show-days": "$1 {{PLURAL:$1|दिन}}",
        "rcfilters-savedqueries-apply-and-setdefault-label": "डिफ़ॉल्ट फ़िल्टर बनाएं",
        "rcfilters-savedqueries-cancel-label": "रद्द करें",
        "rcfilters-savedqueries-add-new-title": "वर्तमान फ़िल्टर सेटिंग को सहेजें",
+       "rcfilters-savedqueries-already-saved": "ये फ़िल्टर पहले ही सुरक्षित कर लिए गए हैं| नए सुरक्षित फ़िल्टर बनाने के लिए अपनी सेटिंग बदले|",
        "rcfilters-restore-default-filters": "मूलभूत फिल्टर पुनर्स्थापित करे",
        "rcfilters-clear-all-filters": "सभी फिल्टर हटाएँ",
        "rcfilters-show-new-changes": "नवीनतम बदलाव दिखाएँ",
-       "rcfilters-search-placeholder": "हाल à¤®à¥\87à¤\82 à¤¹à¥\81à¤\8f à¤¬à¤¦à¤²à¤¾à¤µ à¤«à¤¼à¤¿à¤²à¥\8dà¤\9fर (बà¥\8dराà¤\89à¤\9c़ à¤¯à¤¾ à¤\9fाà¤\87प à¤\95रना à¤\86रà¤\82भ करें)",
+       "rcfilters-search-placeholder": "परिवरà¥\8dतन à¤«à¤¼à¤¿à¤²à¥\8dà¤\9fर à¤\95रà¥\87à¤\82 (मà¥\87नà¥\8dयà¥\82 à¤\95ा à¤\87सà¥\8dतà¥\87माल à¤\95रà¥\87à¤\82 à¤¯à¤¾ à¤«à¤¼à¤¿à¤²à¥\8dà¤\9fर à¤¨à¤¾à¤® à¤\95à¥\87 à¤²à¤¿à¤\8f à¤\96à¥\8bà¤\9c करें)",
        "rcfilters-invalid-filter": "अमान्य फ़िल्टर",
        "rcfilters-empty-filter": "कोई सक्रिय फिल्टर नहीं। सभी योगदान दिखाए गए है।",
        "rcfilters-filterlist-title": "फिल्टर",
        "rcfilters-watchlist-showupdated": "उन पन्नों में परिवर्तन जिनपर आप परिवर्तन के बाद से नहीं गए हैं, ठोस चिन्ह के साथ <strong>bold</strong> दिखाए गए हैं।",
        "rcfilters-preference-label": "हाल के परिवर्तनों के बेहतर संस्करण को छुपाएं",
        "rcfilters-preference-help": "2017 इंटरफ़ेस के नये स्वरूप को वापस रोल करा  गया और सभी टूल तब और बाद में जोड़े गए।",
+       "rcfilters-filter-showlinkedfrom-label": "जुड़े पृष्ठों पर से परिवर्तन दिखाएं",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>से जुड़े पृष्ठ</strong> चयनित पृष्ठ",
+       "rcfilters-filter-showlinkedto-label": "लिंक करने वाले पृष्ठों पर परिवर्तन दिखाएं",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>से जुड़ने वाले पृष्ठ</strong> चयनित पृष्ठ",
+       "rcfilters-target-page-placeholder": "पृष्ठ का नाम दर्ज करें",
        "rcnotefrom": "नीचे <strong>$2</strong> के बाद से (<strong>$1</strong> तक) {{PLURAL:$5|हुआ बदलाव दर्शाया गया है|हुए बदलाव दर्शाए गये हैं}}।",
        "rclistfromreset": "चुने दिनांक पहले जैसा करें",
        "rclistfrom": "$3 $2 से नये बदलाव दिखाएँ",
        "recentchangeslinked-feed": "पृष्ठ से जुड़े बदलाव",
        "recentchangeslinked-toolbox": "पृष्ठ से जुड़े बदलाव",
        "recentchangeslinked-title": "\"$1\" से जुड़े बदलाव",
-       "recentchangeslinked-summary": "यह à¤ªà¥\83षà¥\8dठ à¤\95िसà¥\80 à¤µà¤¿à¤¶à¤¿à¤·à¥\8dà¤\9f à¤ªà¥\83षà¥\8dठ à¤¸à¥\87 à¤\9cà¥\81à¥\9cà¥\87 à¤ªà¥\83षà¥\8dठà¥\8bà¤\82 (या à¤\95िसà¥\80 à¤¶à¥\8dरà¥\87णà¥\80 à¤®à¥\87à¤\82 à¤¶à¥\8dरà¥\87णà¥\80बदà¥\8dध à¤ªà¥\83षà¥\8dठà¥\8bà¤\82) à¤®à¥\87à¤\82 à¤¹à¤¾à¤² à¤®à¥\87à¤\82 à¤¹à¥\81à¤\8f à¤¬à¤¦à¤²à¤¾à¤µà¥\8bà¤\82 à¤\95à¥\80 à¤¸à¥\82à¤\9aà¥\80 à¤¦à¤°à¥\8dशाता à¤¹à¥\88।\n[[Special:Watchlist|à¤\86पà¤\95à¥\80 à¤§à¥\8dयानसà¥\82à¤\9aà¥\80]] à¤®à¥\87à¤\82 à¤®à¥\8cà¤\9cà¥\82द à¤ªà¥\83षà¥\8dठ '''मà¥\8bà¤\9fà¥\87''' à¤\85à¤\95à¥\8dषरà¥\8bà¤\82 à¤®à¥\87à¤\82 à¤¦à¤¿à¤\96à¥\87à¤\82à¤\97à¥\87।",
+       "recentchangeslinked-summary": "à¤\89स à¤ªà¥\83षà¥\8dठ à¤ªà¤° à¤¯à¤¾ à¤\89स à¤ªà¥\83षà¥\8dठ à¤¸à¥\87 à¤\9cà¥\81ड़à¥\87 à¤ªà¥\83षà¥\8dठà¥\8bà¤\82 à¤ªà¤° à¤ªà¤°à¤¿à¤µà¤°à¥\8dतन à¤¦à¥\87à¤\96नà¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f à¤ªà¥\83षà¥\8dठ à¤\95ा à¤¨à¤¾à¤® à¤¡à¤¾à¤²à¥\87à¤\82। (à¤\8fà¤\95 à¤µà¤°à¥\8dà¤\97 à¤\95à¥\87 à¤¸à¤¦à¤¸à¥\8dयà¥\8bà¤\82 à¤\95à¥\8b à¤¦à¥\87à¤\96नà¥\87 à¤\95à¥\87 à¤²à¤¿à¤\8f, à¤¶à¥\8dरà¥\87णà¥\80 à¤¦à¤°à¥\8dà¤\9c à¤\95रà¥\87à¤\82: à¤¶à¥\8dरà¥\87णà¥\80 à¤\95ा à¤¨à¤¾à¤®)| [[Special:Watchlist|your Watchlist]] à¤\95à¥\87 à¤ªà¥\83षà¥\8dठà¥\8bà¤\82 à¤®à¥\87à¤\82 à¤ªà¤°à¤¿à¤µà¤°à¥\8dतन <strong>बà¥\8bलà¥\8dड</strong> à¤®à¥\87à¤\82 à¤¹à¥\88à¤\82|",
        "recentchangeslinked-page": "पृष्ठ नाम:",
        "recentchangeslinked-to": "इसके बदले में दिये हुए पृष्ठसे जुडे पन्नोंके बदलाव दर्शायें",
        "recentchanges-page-added-to-category": "[[:$1]] श्रेणी में जुड़ा",
        "uploaded-script-svg": "अपलोड की गयी एसवीजी फ़ाइल में स्क्रीप्ट अवयव \"$1\" पाया गया।",
        "uploaded-hostile-svg": "अपलोड की गयी एसवीजी फाइल के शैली अवयव में असुरक्षित सीएसएस पायी गयी।",
        "uploaded-event-handler-on-svg": "सेटिंग ईवेंट हैंडलर (आयोजन प्रबन्धनकर्ता वरियता) <code>$1=\"$2\"</code> एसवीजी फ़ाइल में अनुमत नहीं है।",
-       "uploaded-href-attribute-svg": "href केवल एसवीजी फ़ाइल हेतु ही http:// या https:// उपयोग करने देता है। <code>&lt;$1 $2=\"$3\"&gt;</code>",
+       "uploaded-href-attribute-svg": "<a> तत्व केवल डेटा से लिंक किया जा सकता है: (अंतःस्थापित दस्तावेज), http:// or https://, या टुकड़ा (#, समरूप दस्तावेज) लक्ष्य| अन्य तत्वों के लिए, जैसे <image>, केवल डेटा: और टुकड़ों की अनुमति है| अपने एसवीजी को निर्यात करते समय छवियों को अंतःस्थापित करने का प्रयास करें| मिला <code> &lt;$1 $2=\"$3\"&gt;</code>।",
        "uploaded-href-unsafe-target-svg": "अपलोड की गयी फ़ाइल में असुरक्षित लक्ष्य <code>&lt;$1 $2=\"$3\"&gt;</code> पाये गए।",
        "uploaded-animate-svg": "चिप्पि \"animate\" पायी गई जिससे href परिवर्तित हो सकता है, अपलोड की गयी फ़ाइल में \"from\" विशेषता <code>&lt;$1 $2=\"$3\"&gt;</code> काम में ली जा रही है।",
        "uploaded-setting-event-handler-svg": "विकल्प आयोजन-संभालने वाला अवरोधित है, एसवीजी फ़ाइल में मिला <code>&lt;$1 $2=\"$3\"&gt;</code> है।",
        "uploadstash-refresh": "फ़ाइलों की सूची रिफ़्रेश करें",
        "uploadstash-thumbnail": "छवि देखें",
        "uploadstash-exception": "गुप्त कोष में अपलोड स्टोर नहीं किया जा सका ($1): \"$2\".",
+       "uploadstash-bad-path": "पथ मौजूद नहीं है|",
+       "uploadstash-bad-path-invalid": "पथ मौजूद नहीं है|",
+       "uploadstash-bad-path-unknown-type": "अज्ञात प्रकार \"$1\"",
+       "uploadstash-bad-path-unrecognized-thumb-name": "अपरिचित अंगूठे का नाम|",
+       "uploadstash-bad-path-no-handler": "फ़ाइल $2 में से $1 के लिए कोई प्रहस्तक नहीं मिला|",
+       "uploadstash-bad-path-bad-format": "कुंजी \"$1\" एक उचित प्रारूप में नहीं है|",
+       "uploadstash-file-not-found": "छिपाने की जगह में कुंजी \"$1\" नहीं मिली|",
+       "uploadstash-file-not-found-no-thumb": "थंबनेल प्राप्त नहीं किया जा सका|",
+       "uploadstash-file-not-found-no-local-path": "स्केल की गयी वस्तु के लिए कोई स्थानीय पथ नहीं है|",
+       "uploadstash-file-not-found-no-object": "थंबनेल के लिए स्थानीय फ़ाइल ऑब्जेक्ट नहीं बना सके।",
+       "uploadstash-file-not-found-no-remote-thumb": "थंबनेल प्राप्त करना विफल: $1\nयूआरएल = $2",
+       "uploadstash-file-not-found-missing-content-type": "सामग्री प्रकार हैडर अनुपलब्ध|",
+       "uploadstash-file-not-found-not-exists": "पथ नहीं मिल सकता, न ही सादी फाइल|",
+       "uploadstash-file-too-large": "$1 बाइट्स से बड़ी फ़ाइल नहीं दे सकता|",
+       "uploadstash-not-logged-in": "कोई भी उपयोगकर्ता लॉग इन नहीं है, फाइल उपयोगकर्ताओं से संबंधित होनी चाहिए।",
+       "uploadstash-wrong-owner": "यह फ़ाइल ($1) वर्तमान उपयोगकर्ता से संबंधित नहीं है|",
+       "uploadstash-no-such-key": "ऐसी कोई भी कुंजी ($1), नहीं हटा सकते हैं|",
+       "uploadstash-no-extension": "आयतन शून्य है|",
+       "uploadstash-zero-length": "फ़ाइल शून्य लंबाई की है|",
        "invalid-chunk-offset": "अग्राह्य चंक ऑफ़सेट",
        "img-auth-accessdenied": "अनुमति नहीं है",
        "img-auth-nopathinfo": "PATH_INFO मौजूद नहीं है।\nआपके सर्वर में इस जानकारी को भेजने के लिए जमाव नहीं है।\nयह सी॰जी॰आई-आधारित हो सकता है और img_auth को स्वीकार नहीं करता है।\nhttps://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization देखें।",
        "enotif_impersonal_salutation": "{{SITENAME}} सदस्य",
        "enotif_subject_deleted": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने हटा दिया है",
        "enotif_subject_created": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने बना दिया है",
-       "enotif_subject_moved": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने स्थानांतरित कर दिया है",
+       "enotif_subject_moved": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|चले गए}} $2 द्वारा चले जा चुका है",
        "enotif_subject_restored": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने पुनर्स्थापित कर दिया है",
        "enotif_subject_changed": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने परिवर्तित किया है",
        "enotif_body_intro_deleted": "{{SITENAME}} पृष्ठ $1 को {{GENDER:$2|$2}} ने $PAGEEDITDATE को हटा दिया है, देखें $3।",
        "import-mapping-namespace": "किसी नामस्थान पर आयात करें",
        "import-mapping-subpage": "निम्न लिखित पृष्ठ के उपपृष्ठ के रूप में आयात करें:",
        "import-upload-filename": "संचिका नाम:",
+       "import-upload-username-prefix": "इंटरविकी उपसर्ग:",
+       "import-assign-known-users": "स्थानीय उपयोगकर्ताओं को संपादन नियुक्त करें जहां नामित उपयोगकर्ता स्थानीय स्तर पर मौजूद है",
        "import-comment": "टिप्पणी:",
        "importtext": "कृपया स्रोत विकि से संचिका निर्यातित करने के लिए [[Special:Export|निर्यात सुविधा]] का इस्तेमाल करें।\nइसे अपने संगणक पर सँजो के यहाँ चढ़ा दें।",
        "importstart": "पृष्ठ आयात कर रहें हैं...",
        "imported-log-entries": "आयातित $1 {{PLURAL:$1|लॉग प्रविष्टि|लॉग प्रविष्टियाँ}}.\nजब कभी कोई फाइल आपको import करनी हो",
        "importfailed": "आयात विफल हुआ: <nowiki>$1</nowiki>",
        "importunknownsource": "अज्ञात आयात स्रोत प्रकार",
+       "importnoprefix": "कोई इंटरविकी उपसर्ग नहीं दिया गया था",
        "importcantopen": "आयात फ़ाईल खोल नहीं पायें",
        "importbadinterwiki": "अवैध अन्तरविकि कड़ी",
        "importsuccess": "आयात सफल हुआ!",
        "autosumm-blank": "पृष्ठ को खाली किया",
        "autosumm-replace": "पृष्ठ को '$1' से बदल रहा है।",
        "autoredircomment": "[[$1]] को अनुप्रेषित",
+       "autosumm-removed-redirect": "हटाया गया रीडायरेक्ट [[$1]] के लिए",
+       "autosumm-changed-redirect-target": "[[$1]] से [[$2]] तक पुन्नः प्रेषित लक्ष्य बदल गया|",
        "autosumm-new": "'$1' के साथ नया पृष्ठ बनाया",
        "autosumm-newblank": "रिक्त पृष्ठ बनाया",
        "size-bytes": "$1 B",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|टैग}}]]: $2)",
        "tag-mw-contentmodelchange": "सामग्री मॉडल परिवर्तन",
        "tag-mw-contentmodelchange-description": "पृष्ठ [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel सामग्री मॉडल को परिवर्तित करें] के संपादन।",
+       "tag-mw-new-redirect": "नया पुन्नः प्रेषित लक्ष्य",
+       "tag-mw-new-redirect-description": "बदलाव जो एक नया रीडायरेक्ट बनाते हैं या पुनर्निर्देशन के लिए एक पृष्ठ बदलते हैं",
+       "tag-mw-removed-redirect": "हटाया गया पुनर्निर्देशन",
+       "tag-mw-removed-redirect-description": "संपादन जो किसी मौजूदा रीडायरेक्ट को गैर रीडायरेक्ट में बदलता है",
+       "tag-mw-changed-redirect-target": "रीडायरेक्ट लक्ष्य बदल गया",
+       "tag-mw-changed-redirect-target-description": "संपादन जो रीडायरेक्ट लक्ष्य को बदलते हैं",
+       "tag-mw-blank": "रिक्त",
+       "tag-mw-blank-description": "सम्पादन जो पृष्ट को खाली कर देता है",
+       "tag-mw-replace": "बदला गया",
+       "tag-mw-replace-description": "संपादन जिसने 90% से अधिक पृष्ट की सामग्री को हटा दिया",
+       "tag-mw-rollback": "पीछे हटना",
+       "tag-mw-rollback-description": "संपादन जो रोलबैक लिंक का उपयोग करके पिछला संपादन वापस रोल करता है",
+       "tag-mw-undo": "किए हुए कार्य को पूर्वत करना",
+       "tag-mw-undo-description": "संपादन जो पिछले लिंक का उपयोग करके पिछले संपादन को पूर्वत करता है",
        "tags-title": "चिप्पियाँ",
        "tags-intro": "यह पृष्ठ अर्थ सहित वह चिप्पियाँ दर्शाता है जिनका कोई तंत्रांश किसी संपादन पर निशान लगाने के लिए इस्तेमाल कर सकता है।",
        "tags-tag": "चिप्पी का नाम",
index 38fd1ea..d739d97 100644 (file)
        "protect-cascadeon": "Ova stranica je zaštićena jer je uključena u {{PLURAL:$1|stranicu, koja ima|stranice, koje imaju|stranice, koje imaju}} uključenu prenosivu zaštitu. Možete promijeniti stupanj zaštite ove stranice, no to neće utjecati na prenosivu zaštitu.",
        "protect-default": "Omogućeno svim suradnicima",
        "protect-fallback": "Potrebno je imati \"$1\" ovlasti",
-       "protect-level-autoconfirmed": "Onemogućeno novim i neprijavljenim suradnicima",
+       "protect-level-autoconfirmed": "Dopušteno samo autopotvrđenima",
        "protect-level-sysop": "Samo administratori",
        "protect-summary-cascade": "prenosiva zaštita",
        "protect-expiring": "istječe $1 (UTC)",
index 4697462..84d0a70 100644 (file)
        "timezoneregion-indian": "Oceano Indian",
        "timezoneregion-pacific": "Oceano Pacific",
        "allowemail": "Permitter que altere usatores me invia e-mail",
+       "email-allow-new-users-label": "Permitte e-mail de usatores toto nove",
        "email-blacklist-label": "Prohibir a iste usatores de inviar me e-mail:",
        "prefs-searchoptions": "Recerca",
        "prefs-namespaces": "Spatios de nomines",
        "rcfilters-preference-label": "Celar le version meliorate del Modificationes recente",
        "rcfilters-preference-help": "Disface le nove interfacie de 2017 e tote le instrumentos addite alora e posta.",
        "rcfilters-filter-showlinkedfrom-label": "Monstrar modificationes sur paginas ligate ab",
-       "rcfilters-filter-showlinkedfrom-option-label": "Monstrar modificationes sur paginas ligate <strong>AB</strong> un pagina",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Paginas ligate ab</strong> le pagina seligite",
        "rcfilters-filter-showlinkedto-label": "Monstrar modificationes sur paginas que liga a",
-       "rcfilters-filter-showlinkedto-option-label": "Monstrar modificationes sur paginas con ligamines <strong>VERSO</strong> un pagina",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Paginas que liga verso</strong> le pagina seligite",
        "rcfilters-target-page-placeholder": "Entra un nomine de pagina",
        "rcnotefrom": "Ecce le {{PLURAL:$5|modification|modificationes}} a partir del <strong>$3 a $4</strong> (usque a <strong>$1</strong> entratas monstrate).",
        "rclistfromreset": "Reinitialisar selection de data",
index e5ae975..f6fd689 100644 (file)
        "rcfilters-preference-label": "Nascondi la versione migliorata delle ultime modifiche",
        "rcfilters-preference-help": "Ripristina la riprogettazione dell'interfaccia 2017 e tutti gli strumenti aggiunti allora e da allora.",
        "rcfilters-filter-showlinkedfrom-label": "Mostra le modifiche alle pagine collegate da",
-       "rcfilters-filter-showlinkedfrom-option-label": "Mostra le modifiche alle pagine collegate <strong>DA</strong> una pagina",
-       "rcfilters-filter-showlinkedto-label": "Mostra le modifiche alle pagine collegate a",
-       "rcfilters-filter-showlinkedto-option-label": "Mostra le modifiche alle pagine collegate <strong>A</strong> una pagina",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Pagine con collegamenti da</strong> la pagina selezionata",
+       "rcfilters-filter-showlinkedto-label": "Mostra le modifiche alle pagine che colegano a",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Pagine con collegamenti a</strong> la pagina selezionata",
        "rcnotefrom": "Di seguito {{PLURAL:$5|è elencata la modifica apportata|sono elencate le modifiche apportate}} a partire da <strong>$3, $4</strong> (mostrate fino a <strong>$1</strong>).",
        "rclistfromreset": "Reimposta la selezione della data",
        "rclistfrom": "Mostra le nuove modifiche a partire daː $2, $3",
index 6b3e1b3..72963d6 100644 (file)
        "yourtext": "編集中の文章",
        "storedversion": "保存された版",
        "editingold": "<strong>警告: このページの古い版を編集しています。</strong>\n保存すると、この版以降になされた変更がすべて失われます。",
+       "unicode-support-fail": "お使いのブラウザはUnicodeをサポートしていないようです。 ページを編集する必要があるため、編集内容は保存されませんでした。",
        "yourdiff": "差分",
        "copyrightwarning": "{{SITENAME}}への投稿はすべて、$2 (詳細は$1を参照)のもとで公開したと見なされることにご注意ください。\n自分が書いたものが他の人に容赦なく編集され、自由に配布されるのを望まない場合は、ここに投稿しないでください。<br />\nまた、投稿するのは、自分で書いたものか、パブリック ドメインまたはそれに類するフリーな資料からの複製であることを約束してください。\n<strong>著作権保護されている作品は、許諾なしに投稿しないでください!</strong>",
        "copyrightwarning2": "{{SITENAME}}への投稿はすべて、他の投稿者によって編集、変更、除去される場合があります。\n自分が書いたものが他の人に容赦なく編集されるのを望まない場合は、ここに投稿しないでください。<br />\nまた、投稿するのは、自分で書いたものか、パブリック ドメインまたはそれに類するフリーな資料からの複製であることを約束してください(詳細は$1を参照)。\n<strong>著作権保護されている作品は、許諾なしに投稿しないでください!</strong>",
        "right-siteadmin": "データベースをロックおよびロック解除",
        "right-override-export-depth": "リンク先ページを5階層まで含めて書き出す",
        "right-sendemail": "他の利用者にメールを送信",
+       "right-sendemail-new-users": "ログに記録されていないユーザーにメールを送信する",
        "right-managechangetags": "[[Special:Tags|タグ]]の作成、有効化および無効化",
        "right-applychangetags": "自分の編集に[[Special:Tags|タグ]]を適用する",
        "right-changetags": "個々の版と記録項目の任意の[[Special:Tags|タグ]]の追加と削除",
        "recentchanges-legend": "最近の更新のオプション",
        "recentchanges-summary": "このページでは、このウィキでの最近の更新を確認できます。",
        "recentchanges-noresult": "指定した条件に該当する期間の変更はありません。",
+       "recentchanges-timeout": "この検索はタイムアウトしました。 さまざまな検索パラメータを試してみることもできます。",
+       "recentchanges-network": "技術的なエラーのため、結果をロードできませんでした。ページをリフレッシュしてみてください。",
+       "recentchanges-notargetpage": "上記のページ名を入力すると、そのページに関連する変更が表示されます。",
        "recentchanges-feed-description": "このフィードでこのウィキの最近の更新を追跡できます。",
        "recentchanges-label-newpage": "ページの新規作成",
        "recentchanges-label-minor": "細部の編集",
        "rcfilters-activefilters": "絞り込み",
        "rcfilters-advancedfilters": "詳細フィルター",
        "rcfilters-limit-title": "表示件数の変更",
+       "rcfilters-date-popup-title": "検索期間",
        "rcfilters-days-title": "日数",
        "rcfilters-hours-title": "時間",
        "rcfilters-days-show-days": "$1 {{PLURAL:$1|日}}",
        "rcfilters-savedqueries-apply-and-setdefault-label": "既定フィルターを作成",
        "rcfilters-savedqueries-cancel-label": "キャンセル",
        "rcfilters-savedqueries-add-new-title": "現在のフィルター設定を保存する",
+       "rcfilters-savedqueries-already-saved": "これらのフィルタは既に保存されています。設定を変更して、新しい保存フィルタを作成します。",
        "rcfilters-restore-default-filters": "標準設定の絞り込み条件を適用",
        "rcfilters-clear-all-filters": "すべてのフィルターをクリア",
        "rcfilters-show-new-changes": "最新の変更を表示",
        "rcfilters-invalid-filter": "無効なフィルター",
        "rcfilters-empty-filter": "絞り込みは行われていません。全ての項目が表示さます。",
        "rcfilters-filterlist-title": "フィルター",
-       "rcfilters-filterlist-whatsthis": "ã\81\93ã\82\8cã\81¯ä½\95?",
+       "rcfilters-filterlist-whatsthis": "ã\81\93ã\82\8cã\82\89ã\81¯ã\81©ã\81®ã\82\88ã\81\86ã\81«æ©\9fè\83½ã\81\97ã\81¾ã\81\99ã\81\8b?",
        "rcfilters-filterlist-feedbacklink": "(新しい)絞り込み機能に関するフィードバックをお願いします",
        "rcfilters-highlightbutton-title": "該当項目を強調表示する",
        "rcfilters-highlightmenu-title": "色を選ぶ",
        "rcfilters-filter-watchlist-watchednew-description": "ウォッチリストに登録されていて、前回訪れた後に更新があったページ。",
        "rcfilters-filter-watchlist-notwatched-label": "ウォッチリスト登録外",
        "rcfilters-filter-watchlist-notwatched-description": "ウォッチリストに登録されているページ以外の全ての変更。",
+       "rcfilters-filter-watchlistactivity-unseen-label": "保存していません!",
+       "rcfilters-filter-watchlistactivity-unseen-description": "ウォッチリストに登録されていて、前回訪れた後に更新があったページ。",
+       "rcfilters-filter-watchlistactivity-seen-label": "最近の更新",
        "rcfilters-filtergroup-changetype": "変更の種類",
        "rcfilters-filter-pageedits-label": "ページの編集",
        "rcfilters-filter-pageedits-description": "ウィキの本文、議論、カテゴリの説明などの編集",
        "rcfilters-watchlist-showupdated": "最終訪問以降に変更されたページは、塗りつぶされた丸印と一緒に、<strong>太字</strong>で表示されます。",
        "rcfilters-preference-label": "最近の更新の改善版を隠す",
        "rcfilters-preference-help": "2017年のインターフェース更新、当時追加したや以来の新しいツールの使用を断る。",
+       "rcfilters-filter-showlinkedfrom-label": "リンク先ページの変更を表示する",
        "rcnotefrom": "以下は<strong>$3 $4</strong>以降の{{PLURAL:$5|更新です}} (最大 <strong>$1</strong> 件)。",
        "rclistfromreset": "日時指定をリセット",
        "rclistfrom": "$3の$2以降の更新を表示する",
index 04e37e8..99dfa4e 100644 (file)
        "recentchangesdays-max": "최대 $1{{PLURAL:$1|일}}",
        "recentchangescount": "기본으로 보여줄 편집 수:",
        "prefs-help-recentchangescount": "이 설정은 최근 바뀜, 문서 역사와 기록에 적용됩니다.",
-       "prefs-help-watchlist-token2": "ë\82´ ì£¼ì\8b\9c문ì\84\9c ëª©ë¡\9dì\9d\98 ì\9b¹ í\94¼ë\93\9cì\9d\98 ë¹\84ë°\80 í\82¤ì\9e\85ë\8b\88ë\8b¤.\nì\9d´ í\82¤ë¥¼ ì\95\8cê³  ì\9e\88ë\8a\94 ì\82¬ë\9e\8cì\9d\80 ë\82´ ì£¼ì\8b\9c문ì\84\9c ëª©ë¡\9dì\9d\84 ì\9d½ì\9d\84 ì\88\98 ì\9e\88ì\9c¼ë\8b\88 ì\9d´ í\82¤ë¥¼ ê³µì\9c í\95\98ì§\80 ë§\88ì\84¸ì\9a\94.\ní\95\84ì\9a\94í\95\98ë\8b¤ë©´ [[Special:ResetTokens|ì\9d´ í\82¤ë¥¼ ì\9e¬ì\84¤ì \95í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤]].",
+       "prefs-help-watchlist-token2": "ì\9d´ê²\83ì\9d\80 ë\82´ ì£¼ì\8b\9c문ì\84\9c ëª©ë¡\9dì\9d\98 ì\9b¹ í\94¼ë\93\9cì\9d\98 ë¹\84ë°\80 í\82¤ì\9e\85ë\8b\88ë\8b¤.\nì\9d´ í\82¤ë¥¼ ì\95\8cê³  ì\9e\88ë\8a\94 ì\82¬ë\9e\8cì\9d\80 ë\88\84구ë\93 ì§\80 ë\82´ ì£¼ì\8b\9c문ì\84\9c ëª©ë¡\9dì\9d\84 ì\9d½ì\9d\84 ì\88\98 ì\9e\88ì\9c¼ë\8b\88 ì\9d´ í\82¤ë¥¼ ê³µì\9c í\95\98ì§\80 ë§\88ì\84¸ì\9a\94.\ní\95\84ì\9a\94í\95\98ë\8b¤ë©´ [[Special:ResetTokens|ì\9d´ í\82¤ë¥¼ ì\9e¬ì\84¤ì \95í\95  ì\88\98 ì\9e\88ì\8aµë\8b\88ë\8b¤]].",
        "savedprefs": "설정을 저장했습니다.",
        "savedrights": "{{GENDER:$1|$1}}의 사용자 그룹이 저장되었습니다.",
        "timezonelegend": "시간대:",
        "recentchangeslinked-feed": "가리키는 글의 최근 바뀜",
        "recentchangeslinked-toolbox": "가리키는 글의 최근 바뀜",
        "recentchangeslinked-title": "\"$1\" 문서에 관련된 문서 바뀜",
-       "recentchangeslinked-summary": "지정된 문서를 가리키는 문서(또는 지정된 분류에 들어 있는 문서)에 대한 최근에 바뀐 목록입니다.\n[[Special:Watchlist|주시문서 목록]]에 있는 문서는 <strong>굵게</strong> 나타납니다.",
+       "recentchangeslinked-summary": "해당 문서에 연결된 문서의 변경사항을 확인하려면 문서 이름을 입력하십시오. (분류에 들어있는 문서를 보려면 분류:분류명으로 입력하십시오). [[Special:Watchlist|내 주시문서 목록]]에 있는 문서의 변경사항은 <strong>굵게</strong> 나타납니다.",
        "recentchangeslinked-page": "문서 이름:",
        "recentchangeslinked-to": "해당 문서를 가리키는 문서의 최근 바뀜 보기",
        "recentchanges-page-added-to-category": "[[:$1]]이(가) 분류에 추가되었습니다",
index 8ec2530..f29f31d 100644 (file)
        "permissionserrorstext-withaction": "Jūs neturite leidimo $2 dėl {{PLURAL:$1|šios priežasties|šių priežasčių}}:",
        "contentmodelediterror": "Jūs negalite redaguoti šios versijos, nes jos turinio modelis yra <code>$1</code>, kuris skiriasi nuo dabartinio puslapio turinio modelio, kuris yra <code>$2</code>.",
        "recreate-moveddeleted-warn": "'''Dėmesio: Jūs atkuriate puslapį, kuris anksčiau buvo ištrintas.'''\n\nTurėtumėte nuspręsti, ar reikėtų toliau redaguoti šį puslapį.\nJūsų patogumui čia pateikiamas šio puslapio šalinimų ir perkėlimų sąrašas:",
-       "moveddeleted-notice": "Šis puslapis buvo ištrintas.\nŽemiau pateikiamas puslapio šalinimų ir pervadinimų sąrašas.",
+       "moveddeleted-notice": "Šis puslapis buvo ištrintas.\nŽemiau pateikiamas puslapio šalinimų, apsaugojimų, ir pervadinimų sąrašas.",
        "moveddeleted-notice-recent": "Atsiprašome, šis puslapis neseniai buvo ištrintas (per pastarąsias 24 valandas). Žemiau pateikiama detali puslapio ištrynimo ir perkėlimo istorija.",
        "log-fulllog": "Rodyti visą istoriją",
        "edit-hook-aborted": "Keitimas nutrauktas užlūžimo.\nTam nėra paaiškinimo.",
        "unwatchthispage": "Nustoti stebėti",
        "notanarticle": "Ne turinio puslapis",
        "notvisiblerev": "Versija buvo ištrinta",
-       "watchlist-details": "Stebima {{PLURAL:$1|$1 puslapis|$1 puslapiai|$1 puslapių}}, neskaičiuojant aptarimų puslapių.",
+       "watchlist-details": "Stebima {{PLURAL:$1|$1 puslapis|$1 puslapiai|$1 puslapių}}, (įskaičiuojant aptarimų puslapius).",
        "wlheader-enotif": "El. pašto pranešimai yra įjungti.",
        "wlheader-showupdated": "Puslapiai pakeisti nuo tada, kai paskutinį kartą apsilankėte juose, yra '''paryškinti'''.",
        "wlnote": "{{PLURAL:$1|Rodomas '''$1''' paskutinis pakeitimas, atliktas|Rodomi '''$1''' paskutiniai pakeitimai, atlikti|Rodoma '''$1''' paskutinių pakeitimų, atliktų}} per '''$2''' {{PLURAL:$2|paskutinę valandą|paskutines valandas|paskutinių valandų}}, nuo $3 $4.",
index 3835b58..083141b 100644 (file)
        "mypreferencesprotected": "Jums nav tiesību rediģēt savus iestatījumus.",
        "ns-specialprotected": "Nevar izmainīt īpašās lapas.",
        "titleprotected": "Šī lapa ir aizsargāta pret izveidošanu. To aizsargāja [[User:$1|$1]].\nNorādītais iemesls bija <em>$2</em>.",
+       "invalidtitle-knownnamespace": "Nederīgs nosaukums ar vārdtelpu \"$2\" un tekstu \"$3\"",
+       "invalidtitle-unknownnamespace": "Nederīgs nosaukums ar nezināmu vārdtelpas numuru \"$1\" un tekstu \"$2\"",
        "exception-nologin": "Neesat pieslēdzies",
        "virus-badscanner": "Nekorekta konfigurācija: nezināms vīrusu skeneris: ''$1''",
        "virus-scanfailed": "skenēšana neizdevās (kods $1)",
index 5575ff9..ff40d9d 100644 (file)
        "table_pager_empty": "မည်သည့်ရလဒ်မှ မရှိပါ",
        "autosumm-blank": "စာမျက်နှာကို ဗလာလုပ်လိုက်သည်",
        "autoredircomment": "စာမျက်နှာကို [[$1]] သို့ ပြန်ညွှန်းလိုက်သည်",
+       "autosumm-changed-redirect-target": "ပြန်ညွှန်းကို [[$1]] မှ [[$2]] သို့ ပြောင်းလဲခဲ့သည်",
        "autosumm-new": "\"$1\" အစချီသော စာလုံးတို့နှင့် စာမျက်နှာကို ဖန်တီးလိုက်သည်",
        "size-bytes": "$1 {{PLURAL:$1|ဘိုက်|ဘိုက်}}",
        "watchlistedit-normal-title": "စောင့်ကြည့်စာရင်းကို တည်းဖြတ်ရန်",
index 9ffc4f9..225857c 100644 (file)
        "action-upload_by_url": "laste påå denne fila frå ein URL",
        "action-writeapi": "bruke skrive-API",
        "action-delete": "slette denne sida",
-       "action-deleterevision": "slette denne endringa",
+       "action-deleterevision": "slette versjonar",
        "action-deletedhistory": "sjå slettehistorikken til sida",
+       "action-deletedtext": "sjå teksten til sletta versjonar",
        "action-browsearchive": "søke i sletta sider",
        "action-undelete": "attopprette denne sida",
        "action-suppressrevision": "sjå og attopprette denne skjulte endringa",
        "table_pager_limit_submit": "Gå",
        "table_pager_empty": "Ingen resultat",
        "autosumm-blank": "Tømde sida",
-       "autosumm-replace": "Erstattar innhaldet på sida med «$1»",
+       "autosumm-replace": "Erstatta innhaldet på sida med «$1»",
        "autoredircomment": "Omdirigerer til [[$1]]",
+       "autosumm-removed-redirect": "Fjerna omdirigering til [[$1]]",
+       "autosumm-changed-redirect-target": "Endra omdirigeringsmål frå [[$1]] til [[$2]]",
        "autosumm-new": "Oppretta sida med «$1»",
        "autosumm-newblank": "Oppretta tom side",
        "lag-warn-normal": "Endringar som er nyare enn {{PLURAL:$1|sekund|sekund}} er ikkje viste på denne lista.",
        "tag-filter-submit": "Filtrer",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Merke}}]]: $2)",
        "tag-mw-contentmodelchange": "endring av innhaldsmodell",
+       "tag-mw-new-redirect": "Ny omdirigering",
        "tag-mw-removed-redirect": "Fjerna omdirigering",
        "tag-mw-changed-redirect-target": "Omdirigeringsmål endra",
        "tag-mw-changed-redirect-target-description": "Endringar som endrar målet til ei omdirigering",
        "compare-invalid-title": "Tittelen du oppgav er ugild.",
        "compare-title-not-exists": "Tittelen du oppgav finst ikkje.",
        "compare-revision-not-exists": "Versjonen du oppgav finst ikkje.",
-       "diff-form": "eit '''skjema'''",
+       "diff-form": "Skilnader",
+       "permanentlink": "Fast lenkje",
+       "permanentlink-revid": "Versjons-ID",
+       "permanentlink-submit": "Gå til versjon",
        "dberr-problems": "Nettstaden har tekniske problem.",
        "dberr-again": "Venta nokre minutt og last sida inn på nytt.",
        "dberr-info": "(Kan ikkje kontakta databasetenaren: $1)",
        "logentry-delete-delete": "$1 {{GENDER:$2|sletta}} sida $3",
        "logentry-delete-delete_redir": "$1 {{GENDER:$2|sletta}} omdirigeringa $3 gjennom overskriving",
        "logentry-delete-restore": "$1 {{GENDER:$2|attoppretta}} sida $3 ($4)",
+       "restore-count-revisions": "{{PLURAL:$1|éin versjon|$1 versjonar}}",
        "logentry-delete-event": "$1 {{GENDER:$2|endra}} synlegdomen av {{PLURAL:$5|éi loggoppføring|$5 loggoppføringar}} på $3: $4",
        "logentry-delete-revision": "$1 {{GENDER:$2|endra}} synlegdomen til {{PLURAL:$5|éin versjon|$5 versjonar}} på sida $3: $4",
        "logentry-delete-event-legacy": "$1 {{GENDER:$2|endra}} synlegdomen til loggoppføringar på $3",
        "date-range-to": "Til dato:",
        "randomrootpage": "Tilfeldig rotside",
        "log-action-filter-rights": "Type endring av rettar:",
+       "log-action-filter-delete-delete_redir": "Overskriving av omdirigering",
+       "log-action-filter-delete-restore": "Attoppretting av side",
+       "log-action-filter-delete-revision": "Versjonssletting",
+       "log-action-filter-move-move": "Flytting utan overskriving av omdirigeringar",
+       "log-action-filter-move-move_redir": "Flytting med overskriving av omdirigeringar",
+       "log-action-filter-suppress-revision": "Versjonsundertrykking",
        "authmanager-userdoesnotexist": "Brukarkontoen «$1» er ikkje oppretta.",
        "authmanager-provider-temporarypassword": "Mellombels passord",
        "userjsispublic": "Merk: JavaScript-undersider bør ikkje innehalda konfidensielle data sidan dei er synlege for andre brukarar.",
-       "usercssispublic": "Merk: CSS-undersider bør ikkje innehalda konfidensielle data sidan dei er synlege for andre brukarar."
+       "usercssispublic": "Merk: CSS-undersider bør ikkje innehalda konfidensielle data sidan dei er synlege for andre brukarar.",
+       "revid": "versjon $1"
 }
index dd45a21..3c8451c 100644 (file)
        "newtitle": "Nowy tytuł:",
        "move-watch": "Obserwuj",
        "movepagebtn": "Przenieś stronę",
-       "pagemovedsub": "Przeniesienie powiodło się",
+       "pagemovedsub": "Przeniesienie się powiodło",
        "movepage-moved": "'''„$1” została przeniesiona do „$2”'''",
        "movepage-moved-redirect": "Zostało utworzone przekierowanie.",
        "movepage-moved-noredirect": "Nie zostało utworzone przekierowanie.",
index 45b2dd6..44e8dd5 100644 (file)
        "rcfilters-preference-label": "Ocultar a versão melhorada das Mudanças Recentes",
        "rcfilters-preference-help": "Reverte o redesenho da interface de 2017 e todas as ferramentas adicionadas na altura e desde então.",
        "rcfilters-filter-showlinkedfrom-label": "Mostrar alterações nas páginas ligadas de",
-       "rcfilters-filter-showlinkedfrom-option-label": "Mostrar mudanças de páginas <strong>PARA AS QUAIS</strong> uma página contém hiperligações",
-       "rcfilters-filter-showlinkedto-label": "Mostrar mudanças de páginas que contêm hiperligações para a página",
-       "rcfilters-filter-showlinkedto-option-label": "Mostrar mudanças de páginas <strong>QUE CONTÊM</strong> hiperligações para uma página",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Páginas ligadas da</strong> página selecionada",
+       "rcfilters-filter-showlinkedto-label": "Mostrar alterações nas páginas que ligam para",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Páginas que ligam para</strong> página selecionada",
        "rcfilters-target-page-placeholder": "Digite o nome de uma página",
        "rcnotefrom": "Abaixo {{PLURAL:$5|é a mudança|são as mudanças}} desde <strong>$3, $4</strong> (up to <strong>$1</strong> shown).",
        "rclistfromreset": "Redefinir seleção da data",
index f71d96a..2eb741b 100644 (file)
        "rcfilters-preference-label": "Ocultar a versão melhorada das mudanças recentes",
        "rcfilters-preference-help": "Reverte o redesenho da interface de 2017 e todas as ferramentas adicionadas na altura e desde então.",
        "rcfilters-filter-showlinkedfrom-label": "Mostrar mudanças de páginas para as quais esta página contém hiperligações",
-       "rcfilters-filter-showlinkedfrom-option-label": "Mostrar mudanças de páginas <strong>PARA AS QUAIS</strong> uma página contém hiperligações",
-       "rcfilters-filter-showlinkedto-label": "Mostrar mudanças de páginas que contêm hiperligações para a página",
-       "rcfilters-filter-showlinkedto-option-label": "Mostrar mudanças de páginas <strong>QUE CONTÊM</strong> hiperligações para uma página",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Páginas para as quais</strong> a página selecionada contém hiperligações",
+       "rcfilters-filter-showlinkedto-label": "Mostrar mudanças nas páginas que contêm hiperligações para",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Páginas que contêm hiperligações</strong> para a página selecionada",
        "rcfilters-target-page-placeholder": "Introduzir o nome de uma página",
        "rcnotefrom": "Abaixo {{PLURAL:$5|está a mudança|estão as mudanças}} desde <strong>$2</strong> (mostradas até <strong>$1</strong>).",
        "rclistfromreset": "Reiniciar a seleção da data",
        "tag-mw-replace-description": "Edições que removem mais de 90% do conteúdo de uma página",
        "tag-mw-rollback": "Reversão",
        "tag-mw-rollback-description": "Edições que revertem edições anteriores usando a hiperligação desfazer",
+       "tag-mw-undo": "Desfazer",
        "tags-title": "Etiquetas de modificação válidas",
        "tags-intro": "Esta página lista as etiquetas com que o software poderá marcar uma edição, e o seu significado.",
        "tags-tag": "Nome da etiqueta",
        "diff-form-oldid": "Identificador de revisão antigo (opcional)",
        "diff-form-revid": "Identificador de revisão da diferença",
        "diff-form-submit": "Mostrar diferenças",
-       "permanentlink": "Link permanente",
+       "permanentlink": "Hiperligação permanente",
        "permanentlink-revid": "Identificador de revisão",
        "permanentlink-submit": "Ir para a revisão",
        "dberr-problems": "Desculpe! Este site está com dificuldades técnicas.",
index 209838e..0659453 100644 (file)
        "rcfilters-activefilters": "Title for the filters selection showing the active filters.",
        "rcfilters-advancedfilters": "Title for the buttons allowing the user to switch to the various advanced filters views.",
        "rcfilters-limit-title": "Title for the options to change the number of results shown.",
-       "rcfilters-limit-and-date-label": "Title for the button that opens the operation to control how many results to show and in which time period to search. \n\nParameters: $1 - Number of results shown\n\n$2 - Time period to search. One of {{msg-mw|rcfilters-days-title}} or {{msg-mw|rcfilters-hours-title}} is used as $2",
+       "rcfilters-limit-and-date-label": "Title for the button that opens the operation to control how many results to show and in which time period to search. \n\nParameters: $1 - Number of results shown\n\n$2 - Time period to search. One of {{msg-mw|rcfilters-days-title}} or {{msg-mw|rcfilters-hours-title}} is used as $2\n{{Identical|Change}}",
        "rcfilters-date-popup-title": "Section title of date options on recent changes results",
        "rcfilters-days-title": "Title for the options to change the number of days for the results shown.",
        "rcfilters-hours-title": "Title for the options to change the number of hours for the results shown.",
        "tag-mw-replace-description": "Description for \"replace\" change tag",
        "tag-mw-rollback": "Change tag for rolling back an edit\n{{Identical|Rollback}}",
        "tag-mw-rollback-description": "Description for \"rollback\" change tag",
+       "tag-mw-undo": "Change tag for undoing an edit",
+       "tag-mw-undo-description": "Description for \"undo\" change tag",
        "tags-title": "The title of [[Special:Tags]].\n{{Identical|Tag}}",
        "tags-intro": "Explanation on top of [[Special:Tags]]. For more information on tags see [[mw:Manual:Tags|MediaWiki]].",
        "tags-tag": "Caption of a column in [[Special:Tags]]. For more information on tags see [[mw:Manual:Tags|MediaWiki]].",
index 2cc0f97..bf5df9f 100644 (file)
        "timezoneregion-indian": "Индийский океан",
        "timezoneregion-pacific": "Тихий океан",
        "allowemail": "Разрешить другим участникам отправлять мне электронную почту",
+       "email-allow-new-users-label": "Разрешить электронные письма от совсем новых участников",
        "email-blacklist-label": "Запретить этим участникам отправлять мне электронную почту:",
        "prefs-searchoptions": "Поиск",
        "prefs-namespaces": "Пространства имён",
        "right-siteadmin": "блокировка и разблокировка базы данных",
        "right-override-export-depth": "экспортирование страниц, включая связанные страницы с глубиной до 5",
        "right-sendemail": "отправка электронной почты другим участникам",
+       "right-sendemail-new-users": "отправка электронной почты участникам без записей журналов",
        "right-managechangetags": "создание и (де)активация [[Special:Tags|меток]]",
        "right-applychangetags": "применение [[Special:Tags|меток]] вместе со своими правками",
        "right-changetags": "добавление и удаление произвольных [[Special:Tags|меток]] на отдельных правках и записях в журнале",
        "recentchanges-noresult": "Изменений в указанный период, соответствующих указанным условиям, нет.",
        "recentchanges-timeout": "Время ожидания этого поиска истекло. Вы можете попробовать задать другие параметры поиска.",
        "recentchanges-network": "Из-за технической ошибки результаты не могут быть загружены. Попробуйте обновить страницу.",
+       "recentchanges-notargetpage": "Введите название страницы выше, чтобы увидеть правки, связанные с этой страницей.",
        "recentchanges-feed-description": "Отслеживание последних изменений в вики.",
        "recentchanges-label-newpage": "Этой правкой была создана новая страница",
        "recentchanges-label-minor": "Это незначительное изменение",
        "rcfilters-watchlist-showupdated": "Изменения страниц, которые вы не посещали с того момента, как они изменились, выделены <strong>жирным</strong> и отмечены полным маркером.",
        "rcfilters-preference-label": "Скрыть улучшенную версию Последних изменений",
        "rcfilters-preference-help": "Откатывает редизайн интерфейса 2017 года и все инструменты, добавленные с тех пор.",
+       "rcfilters-filter-showlinkedfrom-label": "Показать правки на ссылаемых страницах",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Страницы, на которые ссылается</strong> выбранная",
+       "rcfilters-filter-showlinkedto-label": "Показать правки на ссылающихся страницах",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Страницы, ссылающиеся</strong> на выбранную",
        "rcfilters-target-page-placeholder": "Введите имя страницы",
        "rcnotefrom": "Ниже {{PLURAL:$5|указано изменение|перечислены изменения}} с <strong>$3, $4</strong> (показано не более <strong>$1</strong>).",
        "rclistfromreset": "Сбросить выбор даты",
        "recentchangeslinked-feed": "Связанные правки",
        "recentchangeslinked-toolbox": "Связанные правки",
        "recentchangeslinked-title": "Связанные правки для «$1»",
-       "recentchangeslinked-summary": "ЭÑ\82о Ñ\81пиÑ\81ок Ð½ÐµÐ´Ð°Ð²Ð½Ð¸Ñ\85 Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ð¹ Ð² Ñ\81Ñ\82Ñ\80аниÑ\86аÑ\85, Ð½Ð° ÐºÐ¾Ñ\82оÑ\80Ñ\8bе Ñ\81Ñ\81Ñ\8bлаеÑ\82Ñ\81Ñ\8f Ñ\83казаннаÑ\8f Ñ\81Ñ\82Ñ\80аниÑ\86а (или Ð²Ñ\85одÑ\8fÑ\89иÑ\85 Ð² Ñ\83казаннÑ\83Ñ\8e ÐºÐ°Ñ\82егоÑ\80иÑ\8e).\nСÑ\82Ñ\80аниÑ\86Ñ\8b, Ð²Ñ\85одÑ\8fÑ\89ие Ð² [[Special:Watchlist|ваÑ\88 Ñ\81пиÑ\81ок Ð½Ð°Ð±Ð»Ñ\8eдениÑ\8f]] '''вÑ\8bделенÑ\8b'''.",
+       "recentchangeslinked-summary": "Ð\92ведиÑ\82е Ð¸Ð¼Ñ\8f Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\8b, Ñ\87Ñ\82обÑ\8b Ñ\83видеÑ\82Ñ\8c Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ\8f Ð½Ð° Ñ\81Ñ\82Ñ\80аниÑ\86аÑ\85, Ñ\81Ñ\81Ñ\8bлаÑ\8eÑ\89иÑ\85Ñ\81Ñ\8f Ð½Ð° Ñ\8dÑ\82Ñ\83 Ñ\81Ñ\82Ñ\80аниÑ\86Ñ\83 Ð¸Ð»Ð¸, Ð½Ð°Ð¾Ð±Ð¾Ñ\80оÑ\82, c Ð½ÐµÑ\91. (ЧÑ\82обÑ\8b Ñ\83видеÑ\82Ñ\8c Ñ\87ленов ÐºÐ°Ñ\82егоÑ\80ии, Ð²Ð²ÐµÐ´Ð¸Ñ\82е Category:Ð\9dазвание ÐºÐ°Ñ\82егоÑ\80ии). Ð\98зменениÑ\8f Ð½Ð° Ñ\81Ñ\82Ñ\80аниÑ\86аÑ\85 [[Special:Watchlist|ваÑ\88его Ñ\81пиÑ\81ка Ð½Ð°Ð±Ð»Ñ\8eдениÑ\8f]] Ð¾Ñ\82меÑ\87енÑ\8b <strong>жиÑ\80нÑ\8bм Ñ\88Ñ\80иÑ\84Ñ\82ом</strong>.",
        "recentchangeslinked-page": "Название страницы:",
        "recentchangeslinked-to": "Наоборот, показать изменения на страницах, которые ссылаются на указанную страницу",
        "recentchanges-page-added-to-category": "[[:$1]] добавлена в категорию",
        "uploadstash-bad-path-unrecognized-thumb-name": "Нераспознанное имя миниатюры.",
        "uploadstash-bad-path-no-handler": "Не найден обработчик для mime-типа $1 файла $2.",
        "uploadstash-bad-path-bad-format": "Ключ «$1» — в неподходящем формате.",
+       "uploadstash-file-not-found": "Ключ «$1» не найден во временном хранилище.",
        "uploadstash-file-not-found-no-thumb": "Не удалось получить миниатюру.",
+       "uploadstash-file-not-found-no-local-path": "Не найдено локального пути к отмасштабированному изображению.",
+       "uploadstash-file-not-found-no-object": "Не удалось создать объект локального файла для миниатюры.",
+       "uploadstash-file-not-found-no-remote-thumb": "Извлечение эскиза не удалось: $1\nURL = $2",
        "uploadstash-file-not-found-missing-content-type": "Отсутствует заголовок content-type.",
+       "uploadstash-file-not-found-not-exists": "Путь не найден или файл непонятен.",
+       "uploadstash-file-too-large": "Невозможно обработать файл размером более $1 байт.",
+       "uploadstash-not-logged-in": "Нет авторизованных участников, файлы должны принадлежать участникам.",
        "uploadstash-wrong-owner": "Этот файл ($1) не принадлежит текущему участнику.",
+       "uploadstash-no-such-key": "Нет ключа ($1), удаление невозможно.",
        "uploadstash-no-extension": "Пустое расширение.",
        "uploadstash-zero-length": "Файл нулевой длины.",
        "invalid-chunk-offset": "Недопустимое смещение фрагмента",
        "upload-disallowed-here": "Вы не можете перезаписать этот файл.",
        "filerevert": "Возврат к старой версии $1",
        "filerevert-legend": "Возвратить версию файла",
-       "filerevert-intro": "<span class=\"plainlinks\">Вы возвращаете '''[[Media:$1|$1]]''' к [$4 версии от $3, $2].</span>",
+       "filerevert-intro": "Вы возвращаете <strong>[[Media:$1|$1]]</strong> к [$4 версии от $3, $2].",
        "filerevert-comment": "Причина:",
        "filerevert-defaultcomment": "Возврат к версии от $2, $1 ($3)",
        "filerevert-submit": "Возвратить",
        "filedelete": "$1 — удаление",
        "filedelete-legend": "Удалить файл",
        "filedelete-intro": "Вы собираетесь удалить файл '''[[Media:$1|$1]]''' со всей его историей.",
-       "filedelete-intro-old": "<span class=\"plainlinks\">Вы удаляете версию '''[[Media:$1|$1]]''' от [$4 $3, $2].</span>",
+       "filedelete-intro-old": "Вы удаляете версию <strong>[[Media:$1|$1]]</strong> от [$4 $3, $2].",
        "filedelete-comment": "Причина:",
        "filedelete-submit": "Удалить",
        "filedelete-success": "'''$1''' был удалён.",
        "import-mapping-subpage": "Импортировать как подстраницы следующей страницы:",
        "import-upload-filename": "Имя файла:",
        "import-upload-username-prefix": "Префиксы интервики:",
+       "import-assign-known-users": "Связать правки с локальными участниками, когда участники с такими именами существуют.",
        "import-comment": "Примечание:",
        "importtext": "Пожалуйста, экспортируйте страницу из исходной вики, используя [[Special:Export|соответствующий инструмент]]. Сохраните файл на диск, а затем загрузите его сюда.",
        "importstart": "Импортирование страниц…",
        "imported-log-entries": "{{PLURAL:$1|Импортирована $1 запись|Импортированы $1 записи|Импортировано $1 записей}} журнала.",
        "importfailed": "Не удалось импортировать: $1",
        "importunknownsource": "Неизвестный тип импортируемой страницы",
+       "importnoprefix": "Не указан префикс интервики",
        "importcantopen": "Невозможно открыть импортируемый файл",
        "importbadinterwiki": "Неправильная интервики-ссылка",
        "importsuccess": "Импортирование выполнено!",
        "exif-exposureindex": "Индекс экспозиции",
        "exif-sensingmethod": "Тип сенсора",
        "exif-filesource": "Источник файла",
-       "exif-scenetype": "СÑ\86енан ÐºÐµÐ¿",
+       "exif-scenetype": "Тип Ñ\81Ñ\86енÑ\8b",
        "exif-customrendered": "Дополнительная обработка",
        "exif-exposuremode": "Режим выбора экспозиции",
        "exif-whitebalance": "Баланс белого",
index b889bd4..0cd11fe 100644 (file)
        "cannotdelete": "$1 نالي صفحو يا فائيل ڊهي نہ سگھيو. ٿي سگھي ٿو تہ ڪنهن ان کي اڳ ۾ ئي ڊاهي ڇڏيو هجي.",
        "cannotdelete-title": "$1 نالي صفحي کي ڊاهي نہ ٿا سگھون.",
        "badtitle": "خراب عنوان",
-       "badtitletext": "صفحي جو گھربل عنوان ڪار ڪونهي، يا خالي آهي، يا وري غيردرست طريقي سان ڳنڍيل بين‌الزباني يا بين‌الوڪي عنوان آهي. \nان ۾ هڪ يا هڪ کان وڌيڪ اهڙا اکر موجود آهن، جيڪي عنوان ۾ استعمال ڪري نہ ٿا سگھجن.",
-       "title-invalid-utf8": "صفحي جي ڄاڻايل عنوان ۾ ناقابل ڪار يُو ٽِي ايف اکر شامل آهن.",
-       "title-invalid-interwiki": "ڄاڻايل عنوان ۾ اهڙو بين‌الوڪِي ڳنڍڻو شامل آهي، جيڪو عنوانن ۾ استعمال ڪري نہ ٿو سگھجي.",
-       "title-invalid-characters": "صفحي جي ڄاڻايل عنوان ۾ ناقابل ڪار اکر شامل آهن: $1",
-       "title-invalid-leading-colon": "صفحي جي ڄاڻايل عنوان جي ابتدا ۾ ناقابل ڪار ڪالن شامل آهي.",
+       "badtitletext": "صفحي جو گھربل عنوان ڪار ڪونهي، يا خالي آهي، يا وري غيردرست طريقي سان ڳنڍيل بين‌الزباني يا بين‌الوڪي عنوان آهي. \nان ۾ هڪ يا هڪ کان وڌيڪ اهڙا اکر موجود آهن، جيڪي عنوان ۾ استعمال ڪري نٿا سگھجن.",
+       "title-invalid-utf8": "صفحي جي ڄاڻايل عنوان ۾ ناقابلِڪار يُو ٽِيئيف-8 ترتيب شامل آھي.",
+       "title-invalid-interwiki": "ڄاڻايل عنوان ۾ اهڙو بين‌الوڪِي ڳنڍڻو شامل آهي، جيڪو عنوانن ۾ استعمال ڪري نٿو سگھجي.",
+       "title-invalid-characters": "صفحي جي ڄاڻايل عنوان ۾ ناقابلِڪار اکر شامل آهن: \"$1\".",
+       "title-invalid-leading-colon": "صفحي جي ڄاڻايل عنوان جي ابتدا ۾ ناقابلِڪار ڪالن شامل آهي.",
        "viewsource": "ڪوڊ ڏسو",
        "viewsource-title": "$1 جو ڪوڊ ڏسو",
-       "protectedpagetext": "هيءُ صفحو ترميمن کان تحفظيل آهي.",
-       "viewsourcetext": "توهان هن صفحي جو ڪوڊ ڏسي ۽ نقل ڪري سگھو ٿا:",
-       "namespaceprotected": "توهان کي نانءُ پولار '''$1''' جا صفحا سنوارڻ جا اختيار ناهن.",
+       "protectedpagetext": "هيءُ صفحو ترميمن ۽ ٻين عملن کان بچائڻ لاءِ تحفظيل آهي.",
+       "viewsourcetext": "توهان هن صفحي جو ڪوڊ ڏسي ۽ نقل ڪري سگھو ٿا.",
+       "namespaceprotected": "توهان کي نانءُپولار <strong>$1</strong> جا صفحا سنوارڻ جا اختيار ناهن.",
        "mycustomcssprotected": "توهان کي هيءُ CSS صفحو سنوارڻ جي اجازت نہ آهي.",
        "mycustomjsprotected": "توهان کي هيءُ جاوا اسڪرپٽ صفحو سنوارڻ جي اجازت حاصل ڪانهي.",
        "myprivateinfoprotected": "توهان کي پنهنجي ذاتي معلومات سنوارڻ جي اجازت حاصل نہ آهي.",
        "virus-unknownscanner": "اڻڄاتل نِس وائرس:",
        "cannotlogoutnow-title": "ھاڻي خارج نٿو ٿي سگھجي",
        "cannotlogoutnow-text": "$1 استعمال ڪرڻ دوران خارج ٿيڻ ممڪن نہ آھي.",
-       "welcomeuser": "ڀلي ڪري آيا، $1!",
+       "welcomeuser": "ڀليڪار، $1!",
        "yourname": "واپرائيندڙ-نانءُ:",
        "userlogin-yourname": "واپرائيندڙ-نانءُ",
        "userlogin-yourname-ph": "پنھنجو يوزرنانءُ ڄاڻايو",
        "nosuchusershort": "\"$1\" نالي ڪو بہ واپرائيندڙ ناهي.\nپنھنجي هِجي جي پڪ ڪندا.",
        "nouserspecified": "توهان کي ڪو واپرائيندڙ-نان‎ءُ ڄاڻائڻو پوندو.",
        "login-userblocked": "هيءُ واپرائيندڙ بندشيل آهي. داخل ٿيڻ جي اجازت نٿي ڏجي.",
-       "wrongpassword": "ڏنل ڳجھولفظ غير درست آهي. مھرباني ڪري ٻيھر ڪوشش ڪندا.",
+       "wrongpassword": "ڏنل واپرائيندڙ-نانءُ يا ڳجھولفظ غير درست آهي.\nمھرباني ڪري ٻيھر ڪوشش ڪندا.",
        "wrongpasswordempty": "ڏنل ڳجھولفظ خالي هو.\nمهرباني ڪري وري ڪوشش ڪندا.",
        "passwordtooshort": "ڳجھولفظ گھٽ ۾ گھٽ  {{PLURAL:$1|1 اکر|$1 اکرَن}} تي ٻڌل هوڻ گھرجي.",
        "passwordtoolong": "ڳجھولفظ {{PLURAL:$1|1 اکر|$1 اکرن}} کان وڏو نٿو ٿي سگھي.",
        "login-abort-generic": "توهان جو داخل ٿيڻ ناڪام ويو - بند ڪيل",
        "login-migrated-generic": "توهان جو کاتو لڏي چڪو آهي، ۽ هن وڪيءَ تي توهان جو واپرائيندڙ-نان‎ءُ هاڻي وجود نٿو رکي.",
        "loginlanguagelabel": "ٻولي: $1",
-       "createacct-another-realname-tip": "اصل نالو ڄاڻائڻ اختياري آهي. جيڪڏهن توهان اصل نالو ڄاڻايو ٿا، تہ اهو توهان کي توهان جي ڪم جي مڃتا ڏيڻ لاءِ ڪم آندو ويندو.",
+       "createacct-another-realname-tip": "اصل نالو ڄاڻائڻ اختياري آھي.\nجيڪڏھن توھان اھو ڄاڻائڻ چونڊيو ٿا، تہ اھو واپرائيندڙ کي انھن جي ڪم جي مڃتا ڏيڻ لاءِ ڪم آندو ويندو.",
        "pt-login": "داخل ٿيو",
        "pt-login-button": "داخل ٿيو",
        "pt-login-continue-button": "داخل ٿيڻ جاري رکو",
        "pt-createaccount": "کاتو کوليو",
        "pt-userlogout": "خارج ٿيو",
-       "php-mail-error-unknown": "پي ايڇ پي جي  ڪاڄ اندر اڻڄاتل چُڪَ.",
+       "php-mail-error-unknown": "پي ايڇ پي جي  ڪاڄ() اندر اڻڄاتل چُڪَ.",
        "user-mail-no-addy": "برقٽپال پتو ڄاڻائڻ کان سواءِ برقٽپال اماڻڻ جي ڪوشش ڪئي وئي.",
        "changepassword": "ڳجھولفظ تبديل ڪريو",
        "resetpass_announce": "داخل ٿيڻ جو عمل پورو ڪرڻ لاءِ، توهان کي نئون ڳجھولفظ اختيار مقرر ڪرڻو پوندو.",
        "botpasswords-label-create": "سرجيو",
        "botpasswords-label-update": "تجديد",
        "botpasswords-label-cancel": "رد",
-       "botpasswords-label-delete": "ڊاهيو",
+       "botpasswords-label-delete": "ڊاھيو",
        "botpasswords-label-resetpassword": "ڳجھولفظ ٻيھر مقرر ڪريو",
        "botpasswords-label-grants-column": "منظور",
        "botpasswords-bad-appid": "بوٽ نانءُ \"$1\" قابلِڪار ناھي.",
        "passwordreset": "ڳجھولفظ مَٽايو",
        "passwordreset-text-one": "برقٽپال ذريعي عارضي ڳجھولفظ حاصل ڪرڻ لاءِ هيءُ فارم پُر ڪريو.",
        "passwordreset-disabled": "هن وڪيءَ تي ڳجھولفظ ٻيھر مقرر ڪرڻ وارو چارو غير فعال بڻايو ويو آهي.",
-       "passwordreset-emaildisabled": "هن وڪيءَ تي برق‌ٽپال واريون خصوصيتون غير فعال بڻايون ويون آهن.",
+       "passwordreset-emaildisabled": "ھن وڪيءَ تي برق‌ٽپال واريون خصوصيتون غير فعال بڻايون ويون آهن.",
        "passwordreset-username": "واپرائيندڙ-نانءُ:",
        "passwordreset-domain": "ميدان:",
        "passwordreset-email": "برقٽپال پتو:",
        "bold_sample": "گھري لکت",
        "bold_tip": "گھري لکت",
        "italic_sample": "ترڇي لکت",
-       "italic_tip": "ترڇي لکت",
+       "italic_tip": "ٽيڏي لکت",
        "link_sample": "ڳنڍڻي جو عنوان",
        "link_tip": "داخلي ڳنڍڻو",
        "extlink_sample": "http://www.example.com ڳنڍڻي جو عنوان",
        "showdiff": "تبديليون ڏيکاريو",
        "anoneditwarning": "<strong>چتاءُ:</strong> توھان داخل ٿيل نہ آھيو. توھان جو آءِپي پتو عوامي طور ظاھر ٿيندو جي توھان ڪي ترميمون ڪريو ٿا. جيڪڏھن توھان <strong>[$1 داخل ٿيو]</strong> ٿا يا <strong>[$2 کاتو کوليو]</strong> ٿا، تہ ٻين فائدن سان گڏ توھان جون ترميمون توھان جي يوزرنانءَ سان منسوب ڪيون وينديون.",
        "anonpreviewwarning": "توهان داخل ٿيل نہ آهيو. جيڪڏهن توهان صفحي ۾ تبديليون سانڍيون تہ اهڙين تبديلين ساڻ توهان جو آءِپي پتو درج ڪيو ويندو.",
-       "missingcommenttext": "براءِ مھرباني هيٺ پنهنجو تاثر درج ڪندا.",
+       "missingcommenttext": "براءِ مھرباني ڪو تاثر درج ڪندا.",
        "summary-preview": "تت جي پيش نگاھ:",
        "subject-preview": "موضوع جي پيش نگاھ:",
        "blockedtitle": "واپرائيندڙ بندشيل آهي",
        "editingsection": "ترميم ھيٺ $1 (سيڪشن)",
        "editingcomment": "ترميم هيٺ $1 (نئون سيڪشن)",
        "editconflict": "ترميمي تڪرار: $1",
-       "yourtext": "تÙ\88Ù\87اÙ\86 Ø¬Ù\88 Ù½Ù\8aڪسٽ",
+       "yourtext": "تÙ\88Ù\87اÙ\86 Ø¬Ù\88 Ù\85تÙ\86",
        "storedversion": "سانڍيل مسودو",
        "yourdiff": "تفاوت",
        "copyrightwarning": "ياد رکندا ته {{SITENAME}} لاءِ سموريون ڀاڱيداريون $2 تحت پڌريون ڪجن ٿيون (تفصيلن لاءِ $1 ڏسندا). اوهان جي تحرير کي {{SITENAME}} جي قائدن تحت ترميمي سگهجي ٿو. جيڪڏهن اوهان نه ٿا چاهيو ته اوهان جي لکڻين کي بي رحميءَ سان ترميميو وڃي يا ورهائي عام ڪيو وڃي ته پوءِ پنهنجي لکڻي هتي جمع نه ڪرايو. پنهنجو مواد هتي جمع ڪرڻ جو مطلب هوندو ته توهان کي جمع ڪرايل مواد جي مفت فراهمي ۽ کُليل تبديليءَ تي ڪو به اعتراز ناهي.<br />\nتوهان اهڙي پڪ ڏيڻ جا پابند پڻ آهيو ته توهان جو جمع ڪرايل مواد توهان جو پنهنجو لکيل آهي يا وري توهان ڪنهن مفت وسيلي تان ڪاپي ڪيو آهي.\n'''تحفظيل حق ۽ واسطا رکندڙ مواد واسطيدار مالڪ کان اڳواٽ اجازت وٺڻ کان سواءِ هتي جمع نه ڪريو.'''",
        "timezoneregion-europe": "يُورپ",
        "timezoneregion-indian": "سنڌي ساگر",
        "timezoneregion-pacific": "ماٺو ساگر",
-       "allowemail": "Ù»Ù\8aÙ\86 Ù\8aÙ\8fÙ\88زرس Ú©Ø§Ù\86 Ø§Ù\8aÙ\86دÚ\99 Ù½Ù¾Ø§Ù\84 Ø¨Ø­Ø§Ù\84 ÚªØ±يو",
+       "allowemail": "Ù»Ù\8aÙ\86 Ù\88اپرائÙ\8aÙ\86دÚ\99Ù\86 Ú©Ù\8a Ù\85Ù\88Ù\86 Ú\8fاÙ\86Ú¾Ù\86 Ø¨Ø±Ù\82ٽپاÙ\84 ÚªØ±Ú» Ø¬Ù\8a Ø§Ø¬Ø§Ø²Øª Ú\8fيو",
        "prefs-searchoptions": "ڳولا",
        "prefs-namespaces": "نانءُپولار",
        "default": "ڏنل",
        "rcfilters-quickfilters": "سانڍيل ڇاڻيون",
        "rcfilters-savedqueries-defaultlabel": "سانڍيل ڇاڻيون",
        "rcfilters-restore-default-filters": "ڏنل ڇاڻيون ريسٽور ڪريو",
-       "rcfilters-search-placeholder": "تازÙ\8aÙ\88Ù\86 ØªØ¨Ø¯Ù\8aÙ\84Ù\8aÙ\88Ù\86 Ú\87اڻÙ\8aÙ\88 (Ú\87اÙ\86Ú¯Ù\8aÙ\88 Ù\8aا Ù\84Ú©Ú» Ø´Ø±Ù\88ع ڪريو)",
+       "rcfilters-search-placeholder": "تبدÙ\8aÙ\84Ù\8aÙ\88Ù\86 Ú\87اڻÙ\8aÙ\88 (Ù\85Ù\8aÙ\86Ù\8aÙ\88 Ø§Ø³ØªØ¹Ù\85اÙ\84 ÚªØ±Ù\8aÙ\88 Ù\8aا Ú\87اڻÙ\8aØ¡Ù\8e Ø¬Ù\8a Ú³Ù\88Ù\84ا ڪريو)",
        "rcfilters-empty-filter": "ڪي بہ سرگرم ڇاڻيون ناھن. سڀ ڀاڱيداريون ڏيکاريل آھن.",
        "rcfilters-filterlist-title": "ڇاڻيون",
        "rcfilters-filterlist-whatsthis": "هي ڪيئن ڪم ڪن ٿا؟",
index 978fcdd..aa5b420 100644 (file)
        "rcfilters-preference-label": "Skrij izboljšano različico Zadnjih sprememb",
        "rcfilters-preference-help": "Povrne preoblikovanje vmesnika leta 2017 in vsa takrat in od takrat dodana orodja.",
        "rcfilters-filter-showlinkedfrom-label": "Pokaži spremembe na straneh, na katere se povezuje",
-       "rcfilters-filter-showlinkedfrom-option-label": "Pokaži spremembe na straneh, povezanih <strong>S</strong> strani",
-       "rcfilters-filter-showlinkedto-label": "Pokaži spremembe na straneh, povezane na",
-       "rcfilters-filter-showlinkedto-option-label": "Pokaži spremembe na straneh, povezanih <strong>NA</strong> stran",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Strani, na katere kaže</strong> izbrana stran",
+       "rcfilters-filter-showlinkedto-label": "Pokaži spremembe na straneh, ki kažejo na",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Strani, ki kažejo na</strong> izbrano stran",
        "rcfilters-target-page-placeholder": "Vnesite ime strani",
        "rcnotefrom": "{{PLURAL:$5|Navedena je sprememba|Navedeni sta spremembi|Navedene so spremembe}} od <strong>$3 $4</strong> dalje (prikazujem jih do <strong>$1</strong>).",
        "rclistfromreset": "Ponastavi izbiro datuma",
        "tag-mw-replace-description": "Urejanja, ki odstranijo več kot 90 % vsebine strani",
        "tag-mw-rollback": "Vrnitev",
        "tag-mw-rollback-description": "Urejanja, ki vrnejo prejšnja urejanja s povezavo za vrnitev",
+       "tag-mw-undo": "Razveljavljeno",
+       "tag-mw-undo-description": "Urejanja, ki razveljavijo prejšnja urejanja z uporabo povezave za razveljavitev",
        "tags-title": "Etikete",
        "tags-intro": "Ta stran navaja etikete, s katerimi lahko programje označi urejanja, in njihov pomen.",
        "tags-tag": "Ime oznake",
index 0d2a97f..76fb0d2 100644 (file)
        "nosuchusershort": "Користувача з іменем «$1» не існує.\nПеревірте правильність написання імені.",
        "nouserspecified": "Ви повинні зазначити ім'я користувача.",
        "login-userblocked": "Цей користувач заблокований. Вхід в систему не дозволений.",
-       "wrongpassword": "Ð\92и Ð²Ð²ÐµÐ»Ð¸ Ñ\85ибний Ð¿Ð°Ñ\80олÑ\8c. Ð¡Ð¿Ñ\80обÑ\83йÑ\82е Ñ\89е Ñ\80аз.",
+       "wrongpassword": "Ð\92и Ð²Ð²ÐµÐ»Ð¸ Ñ\85ибне Ñ\96м'Ñ\8f ÐºÐ¾Ñ\80иÑ\81Ñ\82Ñ\83ваÑ\87а Ð°Ð±Ð¾ Ð¿Ð°Ñ\80олÑ\8c. Ð\91Ñ\83дÑ\8c Ð»Ð°Ñ\81ка, Ñ\81пÑ\80обÑ\83йÑ\82е Ð·Ð½Ð¾Ð²Ñ\83.",
        "wrongpasswordempty": "Ви не ввели пароль. Будь ласка, спробуйте ще раз.",
        "passwordtooshort": "Ваш пароль закороткий, він має містити принаймні $1 {{PLURAL:$1|символ|символи|символів}}.",
        "passwordtoolong": "Пароль не може бути довшим ніж {{PLURAL:$1|1 символ|$1 символи|$1 символів}}.",
        "botpasswords-insert-failed": "Не вдалось додати бота з іменем «$1». Можливо, він вже був доданий?",
        "botpasswords-update-failed": "Не вдалось оновити бота з іменем «$1». Можливо, він був видалений?",
        "botpasswords-created-title": "Пароль бота створено",
-       "botpasswords-created-body": "Пароль бота з ім'ям «$1» користувача «$2» було створено.",
+       "botpasswords-created-body": "Пароль бота з ім'ям «$1» {{GENDER:$2|користувача|користувачки}} «$2» було створено.",
        "botpasswords-updated-title": "Пароль бота оновлено",
-       "botpasswords-updated-body": "Пароль бота з ім'ям «$1» користувача «$2» було оновлено.",
+       "botpasswords-updated-body": "Пароль бота з ім'ям «$1» {{GENDER:$2|користувача|користувачки}} «$2» було оновлено.",
        "botpasswords-deleted-title": "Пароль бота видалено",
-       "botpasswords-deleted-body": "Пароль бота з ім'ям «$1» користувача «$2» було видалено",
+       "botpasswords-deleted-body": "Пароль бота з ім'ям «$1» {{GENDER:$2|користувача|користувачки}} «$2» було вилучено",
        "botpasswords-newpassword": "Новий пароль для входу під <strong>$1</strong> — <strong>$2</strong>. <em>Запишіть його для подальшого використання.</em> <br> (Для старих ботів, які вимагають, щоб логін був такий же, як і ім'я користувача, Ви також можете використовувати <strong>$3</strong> як ім'я користувача і <strong>$4</strong> як пароль.)",
        "botpasswords-no-provider": "BotPasswordsSessionProvider не доступний.",
        "botpasswords-restriction-failed": "Вхід не було здійснено через обмеження для паролю бота.",
        "diff-multi-sameuser": "(Не {{PLURAL:$1|показано одну проміжну версію|показані $1 проміжні версії|показано $1 проміжних версій}} цього користувача)",
        "diff-multi-otherusers": "(Не {{PLURAL:$1|показана $1 проміжна версія|показано $1 проміжні версії|показані $1 проміжних версій}} {{PLURAL:$2|ще одного користувача|$2 користувачів}})",
        "diff-multi-manyusers": "({{PLURAL:$1|не показана $1 проміжна версія|не показані $1 проміжні версії|не показано $1 проміжних версій}}, зроблених більш, ніж {{PLURAL:$2|1=$1 користувачем|$2 користувачами}})",
+       "diff-paragraph-moved-tonew": "Абзац було переміщено. Натисніть щоб перестрибнути до нового розташування.",
+       "diff-paragraph-moved-toold": "Абзац було переміщено. Натисніть щоб перестрибнути до старого розташування.",
        "difference-missing-revision": "{{PLURAL:$2|$2 версія|$2 версії|$2 версій}} для цього порівняння ($1) не {{PLURAL:$2|1=знайдена|знайдені}}.\n\nІмовірно, ви перейшли за застарілим посиланням на порівняння версій вилученої сторінки.\nПодробиці можна дізнатися з [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} журналу вилучень].",
        "searchresults": "Результати пошуку",
        "searchresults-title": "Результати пошуку для «$1»",
        "timezoneregion-indian": "Індійський океан",
        "timezoneregion-pacific": "Тихий океан",
        "allowemail": "Дозволити електронну пошту від інших користувачів",
+       "email-allow-new-users-label": "Дозволити електронні листи від новозареєстрованих користувачів.",
        "email-blacklist-label": "Заборонити цим користувачам надсилати мені електронну пошту:",
        "prefs-searchoptions": "Пошук",
        "prefs-namespaces": "Простори назв",
        "right-siteadmin": "Блокування і розблокування бази даних",
        "right-override-export-depth": "експорт сторінок, включаючи пов'язані сторінки з глибиною до 5",
        "right-sendemail": "надсилання електронної пошти іншим користувачам",
+       "right-sendemail-new-users": "надсилати електронні листи до користувачів без логованих дій",
        "right-managechangetags": "створення та (де)активування [[Special:Tags|міток]]",
        "right-applychangetags": "додавання [[Special:Tags|міток]] разом зі змінами",
        "right-changetags": "додавання або вилучення будь-яких [[Special:Tags|міток]] для певних версій сторінок або записів журналів",
        "recentchanges-summary": "Відстеження останніх змін на сторінках {{grammar:genitive|{{SITENAME}}}}.",
        "recentchanges-noresult": "Немає змін за даний період, що відповідають цим критеріям.",
        "recentchanges-timeout": "Час, відведений на цей пошук, вичерпано. Можливо, Ви захочете спробувати інші пошукові параметри.",
+       "recentchanges-network": "Через технічну помилку не вдалось завантажити результати. Будь ласка, спробуйте перезавантажити сторінку.",
+       "recentchanges-notargetpage": "Щоб побачити зміни пов'язані зі сторінкою, уведіть її назву вище.",
        "recentchanges-feed-description": "Відстежувати останні зміни у вікі в цьому потоці.",
        "recentchanges-label-newpage": "Цим редагуванням створена нова сторінка",
        "recentchanges-label-minor": "Це незначна зміна",
        "rcfilters-savedqueries-apply-and-setdefault-label": "Створити стандартний фільтр",
        "rcfilters-savedqueries-cancel-label": "Скасувати",
        "rcfilters-savedqueries-add-new-title": "Зберегти поточні налаштування фільтрів",
+       "rcfilters-savedqueries-already-saved": "Ці фільтри вже збережено. Змініть свої налаштування щоб створити новий Збережений фільтр.",
        "rcfilters-restore-default-filters": "Відновити стандартні фільтри",
        "rcfilters-clear-all-filters": "Очистити фільтри",
        "rcfilters-show-new-changes": "Переглянути найновіші зміни",
-       "rcfilters-search-placeholder": "Фільтруйте нові редагування (перегляньте або почніть вводити)",
+       "rcfilters-search-placeholder": "Фільтруйте редагування (використовуйте меню, або скористайтесь пошуком фільтру за назвою)",
        "rcfilters-invalid-filter": "Недійсний фільтр",
        "rcfilters-empty-filter": "Без фільтрів. Показано всі зміни.",
        "rcfilters-filterlist-title": "Фільтри",
        "rcfilters-watchlist-showupdated": "Зміни до сторінок, які Ви не відвідували з моменту здійснення змін, виділені <strong>жирним</strong>, із цілісними маркерами.",
        "rcfilters-preference-label": "Приховати покращену версію Нових редагувань",
        "rcfilters-preference-help": "Скасовує зміну дизайну 2017 року та всі інструменти, додані тоді й пізніше.",
+       "rcfilters-filter-showlinkedfrom-label": "Показати зміни на сторінках, на які звідси посилання",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>Сторінки, на які є посилання з</strong> обраної сторінки",
+       "rcfilters-filter-showlinkedto-label": "Показати зміни на сторінках, що посилаються сюди",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>Сторінки, що посилаються на</strong> обрану сторінку",
+       "rcfilters-target-page-placeholder": "Уведіть назву сторінки",
        "rcnotefrom": "Нижче знаходяться {{PLURAL:$5|редагування}} з <strong>$3, $4</strong> (відображено до <strong>$1</strong>).",
        "rclistfromreset": "Скинути вибір дати",
        "rclistfrom": "Показати редагування починаючи з $3 $2.",
        "recentchangeslinked-feed": "Пов'язані редгування",
        "recentchangeslinked-toolbox": "Пов'язані редагування",
        "recentchangeslinked-title": "Пов'язані редагування для «$1»",
-       "recentchangeslinked-summary": "Це Ñ\81пиÑ\81ок Ð½ÐµÑ\89одавнÑ\96Ñ\85 Ð·Ð¼Ñ\96н Ð½Ð° Ñ\81Ñ\82оÑ\80Ñ\96нкаÑ\85, Ð½Ð° Ñ\8fкÑ\96 Ð¿Ð¾Ñ\81илаÑ\94Ñ\82Ñ\8cÑ\81Ñ\8f Ð·Ð°Ð·Ð½Ð°Ñ\87ена Ñ\81Ñ\82оÑ\80Ñ\96нка (або Ð½Ð° Ñ\81Ñ\82оÑ\80Ñ\96нкаÑ\85, Ñ\89о Ð¼Ñ\96Ñ\81Ñ\82Ñ\8fÑ\82Ñ\8cÑ\81Ñ\8f Ð² Ñ\86Ñ\96й ÐºÐ°Ñ\82егоÑ\80Ñ\96Ñ\97).\nСÑ\82оÑ\80Ñ\96нки Ð· [[Special:Watchlist|Ð\92аÑ\88ого Ñ\81пиÑ\81кÑ\83 Ñ\81поÑ\81Ñ\82еÑ\80еженнÑ\8f]] Ð²Ð¸Ð´Ñ\96лено '''жиÑ\80ним Ñ\88Ñ\80иÑ\84Ñ\82ом'''.",
+       "recentchangeslinked-summary": "УведÑ\96Ñ\82Ñ\8c Ð½Ð°Ð·Ð²Ñ\83 Ñ\81Ñ\82оÑ\80Ñ\96нки Ñ\89об Ð¿Ð¾Ð±Ð°Ñ\87иÑ\82и Ð·Ð¼Ñ\96ни Ð½Ð° Ñ\81Ñ\82оÑ\80Ñ\96нкаÑ\85 Ñ\8fкÑ\96 Ð¿Ð¾Ñ\81илаÑ\8eÑ\82Ñ\8cÑ\81Ñ\8f Ð½Ð° Ð½ÐµÑ\97, Ð°Ð±Ð¾ Ð½Ð° Ñ\8fкÑ\96 Ð²Ð¾Ð½Ð° Ñ\81ама Ð¿Ð¾Ñ\81илаÑ\94Ñ\82Ñ\8cÑ\81Ñ\8f. (Ð\94лÑ\8f Ð¿ÐµÑ\80еглÑ\8fдÑ\83 Ñ\87ленÑ\96в ÐºÐ°Ñ\82егоÑ\80Ñ\96Ñ\97 Ð²Ð²Ð¾Ð´Ñ\8cÑ\82е {{ns:14}}:Ð\9dазва ÐºÐ°Ñ\82егоÑ\80Ñ\96Ñ\97). Ð\97мÑ\96ни Ð½Ð° Ñ\81Ñ\82оÑ\80Ñ\96нкаÑ\85 Ð· [[Special:Watchlist|Ð\92аÑ\88ого Ð¡Ð¿Ð¸Ñ\81кÑ\83 Ñ\81поÑ\81Ñ\82еÑ\80еженнÑ\8f]] Ð²Ð¸Ð´Ñ\96ленÑ\96 <strong>жиÑ\80ним</strong>.",
        "recentchangeslinked-page": "Назва сторінки:",
        "recentchangeslinked-to": "Показати зміни на сторінках, пов'язаних з даною",
        "recentchanges-page-added-to-category": "[[:$1]] Додано до категорії",
        "uploadstash-refresh": "Оновити список файлів",
        "uploadstash-thumbnail": "перегляд мініатюри",
        "uploadstash-exception": "Не вдалося зберегти завантаження у сховку ($1): «$2».",
+       "uploadstash-bad-path": "Шлях не існує.",
+       "uploadstash-bad-path-invalid": "Неправильний шлях.",
+       "uploadstash-bad-path-unknown-type": "Невідомий тип «$1»",
+       "uploadstash-bad-path-unrecognized-thumb-name": "Нерозпізнана назва мініатюри.",
+       "uploadstash-bad-path-no-handler": "Не знайдено обробник для mime-типу «$1» файлу «$2».",
+       "uploadstash-bad-path-bad-format": "Ключ «$1» в неправильному форматі.",
+       "uploadstash-file-not-found": "Ключ «$1» не знайдено у тимчасовому сховищі.",
+       "uploadstash-file-not-found-no-thumb": "Не вдалось отримати мініатюру.",
+       "uploadstash-file-not-found-no-local-path": "Немає локального шляху для масштабованого елементу.",
+       "uploadstash-file-not-found-no-object": "Не вдалось створити локальний об'єкт файлу для мініатюри.",
+       "uploadstash-file-not-found-no-remote-thumb": "Отримання мініатюри не вдалось: $1\nURL = $2",
+       "uploadstash-file-not-found-missing-content-type": "Відсутній заголовок content-type.",
+       "uploadstash-file-not-found-not-exists": "Не вдалось отримати шлях, або не простий файл.",
+       "uploadstash-file-too-large": "Не вдалось подати файл більший за $1 {{PLURAL:$1|байт|байти|байтів}}.",
+       "uploadstash-not-logged-in": "Немає користувачів, що увійшли до системи, файли повинні належати користувачам.",
+       "uploadstash-wrong-owner": "Цей файл ($1) не належить поточному користувачу.",
+       "uploadstash-no-such-key": "Немає такого файлу ($1), неможливо вилучити.",
+       "uploadstash-no-extension": "Розширення є порожнім.",
+       "uploadstash-zero-length": "Файл нульової довжини.",
        "invalid-chunk-offset": "Неприпустимий зсув фрагмента",
        "img-auth-accessdenied": "Відмовлено в доступі",
        "img-auth-nopathinfo": "Відсутній PATH_INFO.\nВаш сервер не налаштовано для передачі цих даних.\nМожливо, він працює на основі CGI та не підтримує img_auth.\nПерегляньте [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization Відкриття доступу до зображень]",
        "import-mapping-namespace": "Імпортувати до простору назв:",
        "import-mapping-subpage": "Імпортувати як підсторінки такої сторінки:",
        "import-upload-filename": "Назва файлу:",
+       "import-upload-username-prefix": "Інтервікі-префікс:",
+       "import-assign-known-users": "Призначити редагування до локальних користувачів де користувачі з такими іменами існують локально.",
        "import-comment": "Примітка:",
        "importtext": "Будь ласка, експортуйте сторінку з іншої вікі, використовуючи [[Special:Export|засіб експорту]], збережіть файл, а потім завантажте його сюди.",
        "importstart": "Імпорт сторінок…",
        "imported-log-entries": "{{PLURAL:$1|Заімпортований $1 запис журналу|Заімпортовані $1 записи журналу|Заімпортовані $1 записів журналу}}.",
        "importfailed": "Не вдалося імпортувати: $1",
        "importunknownsource": "Невідомий тип імпортованої сторінки",
+       "importnoprefix": "Не вказано інтервікі-префікс",
        "importcantopen": "Неможливо відкрити файл імпорту",
        "importbadinterwiki": "Невірне інтервікі-посилання",
        "importsuccess": "Імпорт виконано!",
        "autosumm-blank": "Сторінка очищена",
        "autosumm-replace": "Замінено вміст на «$1»",
        "autoredircomment": "Перенаправлено на [[$1]]",
+       "autosumm-removed-redirect": "Вилучено перенаправлення на [[$1]]",
+       "autosumm-changed-redirect-target": "Змінено ціль перенаправлення з [[$1]] на [[$2]]",
        "autosumm-new": "Створена сторінка: $1",
        "autosumm-newblank": "Створити порожню сторінку",
        "size-bytes": "$1 {{PLURAL:$1|байт|байти|байтів}}",
        "tag-filter": "Фільтр&nbsp;[[Special:Tags|міток]]:",
        "tag-filter-submit": "Відфільтрувати",
        "tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Мітка|Мітки}}]]: $2)",
-       "tag-mw-contentmodelchange": "зміна контентної моделі",
-       "tag-mw-contentmodelchange-description": "Редагування, якими була здійснена [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel зміна контентної моделі] сторінки",
+       "tag-mw-contentmodelchange": "зміна моделі вмісту",
+       "tag-mw-contentmodelchange-description": "Редагування, які змінюють [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel модель вмісту] сторінки",
+       "tag-mw-new-redirect": "Нове перенаправлення",
+       "tag-mw-new-redirect-description": "Редагування, що створюють нове перенаправлення, або заміняють сторінку перенаправленням",
+       "tag-mw-removed-redirect": "Вилучено перенаправлення",
+       "tag-mw-removed-redirect-description": "Редагування, що змінюють дійсне перенаправлення на не-перенаправлення",
+       "tag-mw-changed-redirect-target": "Змінено ціль перенаправлення",
+       "tag-mw-changed-redirect-target-description": "Редагування, що змінюють ціль перенаправлення",
+       "tag-mw-blank": "Очищення",
+       "tag-mw-blank-description": "Редагування, що очищують сторінку",
+       "tag-mw-replace": "Замінено",
+       "tag-mw-replace-description": "Редагування, що вилучають понад 90% вмісту сторінки",
+       "tag-mw-rollback": "Відкіт",
+       "tag-mw-rollback-description": "Редагування, що відкидають попередні правки використовуючи посилання відкоту",
+       "tag-mw-undo": "Скасування",
+       "tag-mw-undo-description": "Редагування, що скасовують попередні правки використовуючи посилання скасування",
        "tags-title": "Мітки",
        "tags-intro": "На цій сторінці наведений список міток, якими програмне забезпечення помічає редагування, а також значення цих міток.",
        "tags-tag": "Назва мітки",
index 8eada44..934d8e9 100644 (file)
        "autosumm-replace": "\"$1\" سے مواد کی تبدیلی",
        "autoredircomment": "[[$1]] سے رجوع مکرر",
        "autosumm-removed-redirect": "[[$1]] سے رجوع مکرر ہٹایا",
+       "autosumm-changed-redirect-target": "رجوع مکرر [[$1]] کو [[$2]] سے تبدیل کیا",
        "autosumm-new": "«$1» مواد پر مشتمل نیا صفحہ بنایا",
        "autosumm-newblank": "خالی صفحہ بنایا",
        "size-bytes": "$1 بائٹ",
        "tag-mw-contentmodelchange-description": "ترامیم جو صفحہ کے [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:ChangeContentModel مواد کے ماڈل کو تبدیل کرتی ہیں]",
        "tag-mw-new-redirect": "نیا رجوع مکرر",
        "tag-mw-removed-redirect": "رجوع مکرر ہٹایا",
+       "tag-mw-changed-redirect-target": "ہدف رجوع مکرر کی تبدیلی",
        "tag-mw-blank": "خالیٔ صفحہ",
        "tag-mw-replace": "مواد کی تبدیلی",
        "tag-mw-rollback": "استرجع",
index 14ac649..5262c8c 100644 (file)
        "rcfilters-preference-label": "隐藏改进的最近更改版本",
        "rcfilters-preference-help": "返回到2017年界面重新设计版,并重新添加这以后新增的工具。",
        "rcfilters-filter-showlinkedfrom-label": "显示链接自该页面的页面上的更改",
-       "rcfilters-filter-showlinkedfrom-option-label": "显示链接<strong>自</strong>某一页面的页面上的更改",
+       "rcfilters-filter-showlinkedfrom-option-label": "<strong>链接自</strong>选定页面的页面",
        "rcfilters-filter-showlinkedto-label": "显示链接到该页面的页面上的更改",
-       "rcfilters-filter-showlinkedto-option-label": "显示链接<strong>到</strong>某一页面的页面上的更改",
+       "rcfilters-filter-showlinkedto-option-label": "<strong>链接到</strong>选定页面的页面",
        "rcfilters-target-page-placeholder": "输入页面名称",
        "rcnotefrom": "下面{{PLURAL:$5|是}}<strong>$3 $4</strong>之后的更改(最多显示<strong>$1</strong>个)。",
        "rclistfromreset": "重置时间选择",
index 254f368..707f4b3 100644 (file)
@@ -77,6 +77,9 @@ abstract class DumpIterator extends Maintenance {
 
                $importer->setRevisionCallback(
                        [ $this, 'handleRevision' ] );
+               $importer->setNoticeCallback( function ( $msg, $params ) {
+                       echo wfMessage( $msg, $params )->text() . "\n";
+               } );
 
                $this->from = $this->getOption( 'from', null );
                $this->count = 0;
index 2923b38..918c1ab 100644 (file)
@@ -322,6 +322,9 @@ TEXT
                        $this->pageCount = $nthPage - 1;
                }
                $importer->setPageCallback( [ $this, 'reportPage' ] );
+               $importer->setNoticeCallback( function ( $msg, $params ) {
+                       echo wfMessage( $msg, $params )->text() . "\n";
+               } );
                $this->importCallback = $importer->setRevisionCallback(
                        [ $this, 'handleRevision' ] );
                $this->uploadCallback = $importer->setUploadCallback(
index 6b471b0..62a2f4f 100644 (file)
@@ -24,7 +24,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.mwuser_default_user_id BEFORE INSERT ON &mw_prefix.mwuser
+CREATE TRIGGER &mw_prefix.mwuser_seq_trg BEFORE INSERT ON &mw_prefix.mwuser
        FOR EACH ROW WHEN (new.user_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(user_user_id_seq.nextval, :new.user_id);
@@ -32,7 +32,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.page_default_page_id BEFORE INSERT ON &mw_prefix.page
+CREATE TRIGGER &mw_prefix.page_seq_trg BEFORE INSERT ON &mw_prefix.page
        FOR EACH ROW WHEN (new.page_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(page_page_id_seq.nextval, :new.page_id);
@@ -40,7 +40,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.revision_default_rev_id BEFORE INSERT ON &mw_prefix.revision
+CREATE TRIGGER &mw_prefix.revision_seq_trg BEFORE INSERT ON &mw_prefix.revision
        FOR EACH ROW WHEN (new.rev_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(revision_rev_id_seq.nextval, :new.rev_id);
@@ -48,7 +48,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.text_default_old_id BEFORE INSERT ON &mw_prefix.text
+CREATE TRIGGER &mw_prefix.pagecontent_seq_trg BEFORE INSERT ON &mw_prefix.pagecontent
        FOR EACH ROW WHEN (new.old_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(text_old_id_seq.nextval, :new.old_id);
@@ -56,7 +56,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.archive_default_ar_id BEFORE INSERT ON &mw_prefix.archive
+CREATE TRIGGER &mw_prefix.archive_seq_trg BEFORE INSERT ON &mw_prefix.archive
        FOR EACH ROW WHEN (new.ar_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(archive_ar_id_seq.nextval, :new.ar_id);
@@ -64,7 +64,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.category_default_cat_id BEFORE INSERT ON &mw_prefix.category
+CREATE TRIGGER &mw_prefix.category_seq_trg BEFORE INSERT ON &mw_prefix.category
        FOR EACH ROW WHEN (new.cat_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(category_cat_id_seq.nextval, :new.cat_id);
@@ -72,7 +72,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.externallinks_default_el_id BEFORE INSERT ON &mw_prefix.externallinks
+CREATE TRIGGER &mw_prefix.externallinks_seq_trg BEFORE INSERT ON &mw_prefix.externallinks
        FOR EACH ROW WHEN (new.el_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(externallinks_el_id_seq.nextval, :new.el_id);
@@ -80,7 +80,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.ipblocks_default_ipb_id BEFORE INSERT ON &mw_prefix.ipblocks
+CREATE TRIGGER &mw_prefix.ipblocks_seq_trg BEFORE INSERT ON &mw_prefix.ipblocks
        FOR EACH ROW WHEN (new.ipb_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(ipblocks_ipb_id_seq.nextval, :new.ipb_id);
@@ -88,7 +88,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.filearchive_default_fa_id BEFORE INSERT ON &mw_prefix.filearchive
+CREATE TRIGGER &mw_prefix.filearchive_seq_trg BEFORE INSERT ON &mw_prefix.filearchive
        FOR EACH ROW WHEN (new.fa_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(filearchive_fa_id_seq.nextval, :new.fa_id);
@@ -96,7 +96,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.uploadstash_default_us_id BEFORE INSERT ON &mw_prefix.uploadstash
+CREATE TRIGGER &mw_prefix.uploadstash_seq_trg BEFORE INSERT ON &mw_prefix.uploadstash
        FOR EACH ROW WHEN (new.us_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(uploadstash_us_id_seq.nextval, :new.us_id);
@@ -104,7 +104,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.recentchanges_default_rc_id BEFORE INSERT ON &mw_prefix.recentchanges
+CREATE TRIGGER &mw_prefix.recentchanges_seq_trg BEFORE INSERT ON &mw_prefix.recentchanges
        FOR EACH ROW WHEN (new.rc_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(recentchanges_rc_id_seq.nextval, :new.rc_id);
@@ -112,7 +112,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.logging_default_log_id BEFORE INSERT ON &mw_prefix.logging
+CREATE TRIGGER &mw_prefix.logging_seq_trg BEFORE INSERT ON &mw_prefix.logging
        FOR EACH ROW WHEN (new.log_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(logging_log_id_seq.nextval, :new.log_id);
@@ -120,7 +120,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.job_default_job_id BEFORE INSERT ON &mw_prefix.job
+CREATE TRIGGER &mw_prefix.job_seq_trg BEFORE INSERT ON &mw_prefix.job
        FOR EACH ROW WHEN (new.job_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(job_job_id_seq.nextval, :new.job_id);
@@ -128,7 +128,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.page_restrictions_default_pr_id BEFORE INSERT ON &mw_prefix.page_restrictions
+CREATE TRIGGER &mw_prefix.page_restrictions_seq_trg BEFORE INSERT ON &mw_prefix.page_restrictions
        FOR EACH ROW WHEN (new.pr_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(page_restrictions_pr_id_seq.nextval, :new.pr_id);
@@ -136,7 +136,7 @@ END;
 /*$mw$*/
 
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.sites_default_site_id BEFORE INSERT ON &mw_prefix.sites
+CREATE TRIGGER &mw_prefix.sites_seq_trg BEFORE INSERT ON &mw_prefix.sites
        FOR EACH ROW WHEN (new.site_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(sites_site_id_seq.nextval, :new.site_id);
index c4b906d..39680ef 100644 (file)
@@ -1,5 +1,5 @@
 define mw_prefix='{$wgDBprefix}';
 
-ALTER TABLE &mw_prefix.externallinks ADD el_index_60 VARBINARY(60) NOT NULL DEFAULT '';
+ALTER TABLE &mw_prefix.externallinks ADD el_index_60 VARCHAR2(60);
 CREATE INDEX &mw_prefix.externallinks_i04 ON &mw_prefix.externallinks (el_index_60, el_id);
 CREATE INDEX &mw_prefix.externallinks_i05 ON &mw_prefix.externallinks (el_from, el_index_60, el_id);
index e6e2e56..d588e3a 100644 (file)
@@ -48,7 +48,7 @@ CREATE UNIQUE INDEX &mw_prefix.mwuser_u01 ON &mw_prefix.mwuser (user_name);
 CREATE INDEX &mw_prefix.mwuser_i01 ON &mw_prefix.mwuser (user_email_token);
 CREATE INDEX &mw_prefix.mwuser_i02 ON &mw_prefix.mwuser (user_email, user_name);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.mwuser_default_user_id BEFORE INSERT ON &mw_prefix.mwuser
+CREATE TRIGGER &mw_prefix.mwuser_seq_trg BEFORE INSERT ON &mw_prefix.mwuser
        FOR EACH ROW WHEN (new.user_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(user_user_id_seq.nextval, :new.user_id);
@@ -116,7 +116,7 @@ CREATE INDEX &mw_prefix.page_i01 ON &mw_prefix.page (page_random);
 CREATE INDEX &mw_prefix.page_i02 ON &mw_prefix.page (page_len);
 CREATE INDEX &mw_prefix.page_i03 ON &mw_prefix.page (page_is_redirect, page_namespace, page_len);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.page_default_page_id BEFORE INSERT ON &mw_prefix.page
+CREATE TRIGGER &mw_prefix.page_seq_trg BEFORE INSERT ON &mw_prefix.page
        FOR EACH ROW WHEN (new.page_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(page_page_id_seq.nextval, :new.page_id);
@@ -162,7 +162,7 @@ CREATE INDEX &mw_prefix.revision_i03 ON &mw_prefix.revision (rev_user,rev_timest
 CREATE INDEX &mw_prefix.revision_i04 ON &mw_prefix.revision (rev_user_text,rev_timestamp);
 CREATE INDEX &mw_prefix.revision_i05 ON &mw_prefix.revision (rev_page,rev_user,rev_timestamp);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.revision_default_rev_id BEFORE INSERT ON &mw_prefix.revision
+CREATE TRIGGER &mw_prefix.revision_seq_trg BEFORE INSERT ON &mw_prefix.revision
        FOR EACH ROW WHEN (new.rev_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(revision_rev_id_seq.nextval, :new.rev_id);
@@ -177,7 +177,7 @@ CREATE TABLE &mw_prefix.pagecontent ( -- replaces reserved word 'text'
 );
 ALTER TABLE &mw_prefix.pagecontent ADD CONSTRAINT &mw_prefix.pagecontent_pk PRIMARY KEY (old_id);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.text_default_old_id BEFORE INSERT ON &mw_prefix.text
+CREATE TRIGGER &mw_prefix.pagecontent_seq_trg BEFORE INSERT ON &mw_prefix.pagecontent
        FOR EACH ROW WHEN (new.old_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(text_old_id_seq.nextval, :new.old_id);
@@ -212,7 +212,7 @@ CREATE INDEX &mw_prefix.archive_i01 ON &mw_prefix.archive (ar_namespace,ar_title
 CREATE INDEX &mw_prefix.archive_i02 ON &mw_prefix.archive (ar_user_text,ar_timestamp);
 CREATE INDEX &mw_prefix.archive_i03 ON &mw_prefix.archive (ar_rev_id);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.archive_default_ar_id BEFORE INSERT ON &mw_prefix.archive
+CREATE TRIGGER &mw_prefix.archive_seq_trg BEFORE INSERT ON &mw_prefix.archive
        FOR EACH ROW WHEN (new.ar_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(archive_ar_id_seq.nextval, :new.ar_id);
@@ -273,7 +273,7 @@ ALTER TABLE &mw_prefix.category ADD CONSTRAINT &mw_prefix.category_pk PRIMARY KE
 CREATE UNIQUE INDEX &mw_prefix.category_u01 ON &mw_prefix.category (cat_title);
 CREATE INDEX &mw_prefix.category_i01 ON &mw_prefix.category (cat_pages);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.category_default_cat_id BEFORE INSERT ON &mw_prefix.category
+CREATE TRIGGER &mw_prefix.category_seq_trg BEFORE INSERT ON &mw_prefix.category
        FOR EACH ROW WHEN (new.cat_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(category_cat_id_seq.nextval, :new.cat_id);
@@ -286,7 +286,7 @@ CREATE TABLE &mw_prefix.externallinks (
   el_from   NUMBER  NOT NULL,
   el_to     VARCHAR2(2048) NOT NULL,
   el_index  VARCHAR2(2048) NOT NULL,
-  el_index_60  VARBINARY(60) NOT NULL DEFAULT ''
+  el_index_60  VARCHAR2(60)
 );
 ALTER TABLE &mw_prefix.externallinks ADD CONSTRAINT &mw_prefix.externallinks_pk PRIMARY KEY (el_id);
 ALTER TABLE &mw_prefix.externallinks ADD CONSTRAINT &mw_prefix.externallinks_fk1 FOREIGN KEY (el_from) REFERENCES &mw_prefix.page(page_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED;
@@ -296,7 +296,7 @@ CREATE INDEX &mw_prefix.externallinks_i03 ON &mw_prefix.externallinks (el_index)
 CREATE INDEX &mw_prefix.externallinks_i04 ON &mw_prefix.externallinks (el_index_60, el_id);
 CREATE INDEX &mw_prefix.externallinks_i05 ON &mw_prefix.externallinks (el_from, el_index_60, el_id);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.externallinks_default_el_id BEFORE INSERT ON &mw_prefix.externallinks
+CREATE TRIGGER &mw_prefix.externallinks_seq_trg BEFORE INSERT ON &mw_prefix.externallinks
        FOR EACH ROW WHEN (new.el_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(externallinks_el_id_seq.nextval, :new.el_id);
@@ -361,7 +361,7 @@ CREATE INDEX &mw_prefix.ipblocks_i03 ON &mw_prefix.ipblocks (ipb_timestamp);
 CREATE INDEX &mw_prefix.ipblocks_i04 ON &mw_prefix.ipblocks (ipb_expiry);
 CREATE INDEX &mw_prefix.ipblocks_i05 ON &mw_prefix.ipblocks (ipb_parent_block_id);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.ipblocks_default_ipb_id BEFORE INSERT ON &mw_prefix.ipblocks
+CREATE TRIGGER &mw_prefix.ipblocks_seq_trg BEFORE INSERT ON &mw_prefix.ipblocks
        FOR EACH ROW WHEN (new.ipb_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(ipblocks_ipb_id_seq.nextval, :new.ipb_id);
@@ -452,7 +452,7 @@ CREATE INDEX &mw_prefix.filearchive_i03 ON &mw_prefix.filearchive (fa_deleted_ti
 CREATE INDEX &mw_prefix.filearchive_i04 ON &mw_prefix.filearchive (fa_user_text,fa_timestamp);
 CREATE INDEX &mw_prefix.filearchive_i05 ON &mw_prefix.filearchive (fa_sha1);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.filearchive_default_fa_id BEFORE INSERT ON &mw_prefix.filearchive
+CREATE TRIGGER &mw_prefix.filearchive_seq_trg BEFORE INSERT ON &mw_prefix.filearchive
        FOR EACH ROW WHEN (new.fa_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(filearchive_fa_id_seq.nextval, :new.fa_id);
@@ -485,7 +485,7 @@ CREATE INDEX &mw_prefix.uploadstash_i01 ON &mw_prefix.uploadstash (us_user);
 CREATE INDEX &mw_prefix.uploadstash_i02 ON &mw_prefix.uploadstash (us_timestamp);
 CREATE UNIQUE INDEX &mw_prefix.uploadstash_u01 ON &mw_prefix.uploadstash (us_key);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.uploadstash_default_us_id BEFORE INSERT ON &mw_prefix.uploadstash
+CREATE TRIGGER &mw_prefix.uploadstash_seq_trg BEFORE INSERT ON &mw_prefix.uploadstash
        FOR EACH ROW WHEN (new.us_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(uploadstash_us_id_seq.nextval, :new.us_id);
@@ -532,7 +532,7 @@ CREATE INDEX &mw_prefix.recentchanges_i06 ON &mw_prefix.recentchanges (rc_namesp
 CREATE INDEX &mw_prefix.recentchanges_i07 ON &mw_prefix.recentchanges (rc_user_text, rc_timestamp);
 CREATE INDEX &mw_prefix.recentchanges_i08 ON &mw_prefix.recentchanges (rc_namespace, rc_type, rc_patrolled, rc_timestamp);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.recentchanges_default_rc_id BEFORE INSERT ON &mw_prefix.recentchanges
+CREATE TRIGGER &mw_prefix.recentchanges_seq_trg BEFORE INSERT ON &mw_prefix.recentchanges
        FOR EACH ROW WHEN (new.rc_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(recentchanges_rc_id_seq.nextval, :new.rc_id);
@@ -617,7 +617,7 @@ CREATE INDEX &mw_prefix.logging_i05 ON &mw_prefix.logging (log_type, log_action,
 CREATE INDEX &mw_prefix.logging_i06 ON &mw_prefix.logging (log_user_text, log_type, log_timestamp);
 CREATE INDEX &mw_prefix.logging_i07 ON &mw_prefix.logging (log_user_text, log_timestamp);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.logging_default_log_id BEFORE INSERT ON &mw_prefix.logging
+CREATE TRIGGER &mw_prefix.logging_seq_trg BEFORE INSERT ON &mw_prefix.logging
        FOR EACH ROW WHEN (new.log_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(logging_log_id_seq.nextval, :new.log_id);
@@ -654,7 +654,7 @@ CREATE INDEX &mw_prefix.job_i03 ON &mw_prefix.job (job_sha1);
 CREATE INDEX &mw_prefix.job_i04 ON &mw_prefix.job (job_cmd,job_token,job_random);
 CREATE INDEX &mw_prefix.job_i05 ON &mw_prefix.job (job_attempts);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.job_default_job_id BEFORE INSERT ON &mw_prefix.job
+CREATE TRIGGER &mw_prefix.job_seq_trg BEFORE INSERT ON &mw_prefix.job
        FOR EACH ROW WHEN (new.job_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(job_job_id_seq.nextval, :new.job_id);
@@ -706,7 +706,7 @@ CREATE INDEX &mw_prefix.page_restrictions_i01 ON &mw_prefix.page_restrictions (p
 CREATE INDEX &mw_prefix.page_restrictions_i02 ON &mw_prefix.page_restrictions (pr_level);
 CREATE INDEX &mw_prefix.page_restrictions_i03 ON &mw_prefix.page_restrictions (pr_cascade);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.page_restrictions_default_pr_id BEFORE INSERT ON &mw_prefix.page_restrictions
+CREATE TRIGGER &mw_prefix.page_restrictions_seq_trg BEFORE INSERT ON &mw_prefix.page_restrictions
        FOR EACH ROW WHEN (new.pr_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(page_restrictions_pr_id_seq.nextval, :new.pr_id);
@@ -821,7 +821,7 @@ CREATE INDEX &mw_prefix.sites_i05 ON &mw_prefix.sites (site_protocol);
 CREATE INDEX &mw_prefix.sites_i06 ON &mw_prefix.sites (site_domain);
 CREATE INDEX &mw_prefix.sites_i07 ON &mw_prefix.sites (site_forward);
 /*$mw$*/
-CREATE TRIGGER &mw_prefix.sites_default_site_id BEFORE INSERT ON &mw_prefix.sites
+CREATE TRIGGER &mw_prefix.sites_seq_trg BEFORE INSERT ON &mw_prefix.sites
        FOR EACH ROW WHEN (new.site_id IS NULL)
 BEGIN
        &mw_prefix.lastval_pkg.setLastval(sites_site_id_seq.nextval, :new.site_id);
index 57688ea..0a36ac4 100644 (file)
@@ -14,3 +14,5 @@ grant create synonym to &wiki_user.;
 grant create table to &wiki_user.;
 grant create sequence to &wiki_user.;
 grant create trigger to &wiki_user.;
+grant create type to &wiki_user.;
+grant create procedure to &wiki_user.;
index 68a371c..458556f 100644 (file)
@@ -66,6 +66,9 @@ class DumpRenderer extends Maintenance {
 
                $importer->setRevisionCallback(
                        [ $this, 'handleRevision' ] );
+               $importer->setNoticeCallback( function ( $msg, $params ) {
+                       echo wfMessage( $msg, $params )->text() . "\n";
+               } );
 
                $importer->doImport();
 
index 6348e96..8f55b88 100644 (file)
@@ -493,6 +493,9 @@ class CheckStorage {
                        MediaWikiServices::getInstance()->getMainConfig()
                );
                $importer->setRevisionCallback( [ $this, 'importRevision' ] );
+               $importer->setNoticeCallback( function ( $msg, $params ) {
+                       echo wfMessage( $msg, $params )->text() . "\n";
+               } );
                $importer->doImport();
        }
 
index 11f472e..ce24b0d 100644 (file)
@@ -2,18 +2,20 @@
 
 /* Table Sorting */
 
-table.jquery-tablesorter th.headerSort {
-       .background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
-       cursor: pointer;
-       background-repeat: no-repeat;
-       background-position: center right;
-       padding-right: 21px;
-}
+table.jquery-tablesorter {
+       th.headerSort {
+               .background-image-svg( 'images/sort_both.svg', 'images/sort_both.png' );
+               cursor: pointer;
+               background-repeat: no-repeat;
+               background-position: center right;
+               padding-right: 21px;
+       }
 
-table.jquery-tablesorter th.headerSortUp {
-       .background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' );
-}
+       th.headerSortUp {
+               .background-image-svg( 'images/sort_up.svg', 'images/sort_up.png' );
+       }
 
-table.jquery-tablesorter th.headerSortDown {
-       .background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' );
+       th.headerSortDown {
+               .background-image-svg( 'images/sort_down.svg', 'images/sort_down.png' );
+       }
 }
index f0a86ff..1c9294c 100644 (file)
                        "◌ֿ",
                        "ֿ"
                ],
+               [
+                       "◌ֽ",
+                       "ֽ"
+               ],
                [
                        "◌׀",
                        "׀"
index b690bbd..bbc1d7e 100644 (file)
 
                $.each( this.groups, function ( name, model ) {
                        if ( model.isSticky() ) {
-                               $.extend( true, result, model.getDefaultParams() );
+                               $.extend( true, result, model.getParamRepresentation() );
                        }
                } );
 
index 100fa0b..fe8bcf4 100644 (file)
@@ -44,7 +44,7 @@
                                                        type: 'any_value',
                                                        title: '',
                                                        hidden: true,
-                                                       isSticky: false,
+                                                       sticky: true,
                                                        filters: [
                                                                {
                                                                        name: 'target',
@@ -57,7 +57,7 @@
                                                        type: 'boolean',
                                                        title: '',
                                                        hidden: true,
-                                                       isSticky: false,
+                                                       sticky: true,
                                                        filters: [
                                                                {
                                                                        name: 'showlinkedto',
                                conditionalViews
                        );
 
+                       mainWrapperWidget.initFormWidget( specialPage );
+
                        $( 'a.mw-helplink' ).attr(
                                'href',
                                'https://www.mediawiki.org/wiki/Special:MyLanguage/Help:New_filters_for_edit_review'
index e64ffd8..8002045 100644 (file)
@@ -61,7 +61,6 @@
                $( 'body' )
                        .append( this.$overlay )
                        .addClass( 'mw-rcfilters-ui-initialized' );
-               this.initFormWidget();
        };
 
        /* Initialization */
index 58fd500..19f3553 100644 (file)
@@ -205,11 +205,7 @@ tt,
 kbd,
 samp,
 .mw-code {
-       /*
-        * Some browsers will render the monospace text too small, namely Firefox, Chrome and Safari.
-        * Specifying any valid, second value will trigger correct behavior without forcing a different font.
-        * See T176636
-        */
+       /* Support: Blink, Gecko, Webkit; enable unified font sizes for monospace font. T176636 */
        font-family: monospace, monospace;
 }
 
index 00faf84..a56e459 100644 (file)
@@ -92,7 +92,7 @@ a.mw-debug-panelabel:visited {
        height: 300px;
        overflow: scroll;
        display: none;
-       font-family: monospace;
+       font-family: monospace, monospace;
        font-size: 11px;
        background-color: #e1eff2;
        box-sizing: border-box;
index 6228030..fe7f324 100644 (file)
@@ -1,6 +1,6 @@
 /* Edit font preference */
 .mw-editfont-monospace {
-       font-family: monospace;
+       font-family: monospace, monospace;
 }
 
 .mw-editfont-sans-serif {
 .mw-editfont-serif {
        font-family: serif;
 }
+
+/* Standardize font size for edit areas using edit-fonts T182320 */
+.mw-editfont-monospace,
+.mw-editfont-sans-serif,
+.mw-editfont-serif {
+       font-size: 13px;
+}
index 2d55094..bfd5c06 100644 (file)
@@ -83,8 +83,7 @@
 
        /**
         * Respond to dialog submit event. If the information was
-        * submitted, either successfully or with an error, open
-        * a MessageDialog to thank the user.
+        * submitted successfully, open a MessageDialog to thank the user.
         *
         * @param {string} [status] A status of the end of operation
         *  of the main feedback dialog. Empty if the dialog was
         *  to the external task reporting site.
         */
        mw.Feedback.prototype.onDialogSubmit = function ( status ) {
-               var dialogConfig = {};
-               switch ( status ) {
-                       case 'submitted':
-                               dialogConfig = {
-                                       title: mw.msg( 'feedback-thanks-title' ),
-                                       message: $( '<span>' ).msg(
-                                               'feedback-thanks',
-                                               this.feedbackPageTitle.getNameText(),
-                                               $( '<a>' ).attr( {
-                                                       target: '_blank',
-                                                       href: this.feedbackPageTitle.getUrl()
-                                               } )
-                                       ),
-                                       actions: [
-                                               {
-                                                       action: 'accept',
-                                                       label: mw.msg( 'feedback-close' ),
-                                                       flags: 'primary'
-                                               }
-                                       ]
-                               };
-                               break;
+               var dialogConfig;
+
+               if ( status !== 'submitted' ) {
+                       return;
                }
 
+               dialogConfig = {
+                       title: mw.msg( 'feedback-thanks-title' ),
+                       message: $( '<span>' ).msg(
+                               'feedback-thanks',
+                               this.feedbackPageTitle.getNameText(),
+                               $( '<a>' ).attr( {
+                                       target: '_blank',
+                                       href: this.feedbackPageTitle.getUrl()
+                               } )
+                       ),
+                       actions: [
+                               {
+                                       action: 'accept',
+                                       label: mw.msg( 'feedback-close' ),
+                                       flags: 'primary'
+                               }
+                       ]
+               };
+
                // Show the message dialog
-               if ( !$.isEmptyObject( dialogConfig ) ) {
-                       this.constructor.static.windowManager.openWindow(
-                               this.thankYouDialog,
-                               dialogConfig
-                       );
-               }
+               this.constructor.static.windowManager.openWindow(
+                       this.thankYouDialog,
+                       dialogConfig
+               );
        };
 
        /**
         * @return {OO.ui.Error}
         */
        mw.Feedback.Dialog.prototype.getErrorMessage = function () {
-               switch ( this.status ) {
-                       case 'error1':
-                       case 'error2':
-                       case 'error3':
-                       case 'error4':
-                               // Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
-                               return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
-               }
+               // Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
+               return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
        };
 
        /**
index 44a00a8..e07d4a0 100644 (file)
@@ -708,15 +708,15 @@ class ParserTestRunner {
        public function meetsRequirements( $requirements ) {
                foreach ( $requirements as $requirement ) {
                        switch ( $requirement['type'] ) {
-                       case 'hook':
-                               $ok = $this->requireHook( $requirement['name'] );
-                               break;
-                       case 'functionHook':
-                               $ok = $this->requireFunctionHook( $requirement['name'] );
-                               break;
-                       case 'transparentHook':
-                               $ok = $this->requireTransparentHook( $requirement['name'] );
-                               break;
+                               case 'hook':
+                                       $ok = $this->requireHook( $requirement['name'] );
+                                       break;
+                               case 'functionHook':
+                                       $ok = $this->requireFunctionHook( $requirement['name'] );
+                                       break;
+                               case 'transparentHook':
+                                       $ok = $this->requireTransparentHook( $requirement['name'] );
+                                       break;
                        }
                        if ( !$ok ) {
                                return false;
index 7f64671..1bee31e 100644 (file)
@@ -162,18 +162,18 @@ class TestFileEditor {
                                if ( isset( $changes[$sectionName] ) ) {
                                        $change = $changes[$sectionName];
                                        switch ( $change['op'] ) {
-                                       case 'rename':
-                                               $test[$i]['name'] = $change['value'];
-                                               $test[$i]['headingLine'] = "!! {$change['value']}";
-                                               break;
-                                       case 'update':
-                                               $test[$i]['contents'] = $change['value'];
-                                               break;
-                                       case 'delete':
-                                               $test[$i]['deleted'] = true;
-                                               break;
-                                       default:
-                                               throw new Exception( "Unknown op: ${change['op']}" );
+                                               case 'rename':
+                                                       $test[$i]['name'] = $change['value'];
+                                                       $test[$i]['headingLine'] = "!! {$change['value']}";
+                                                       break;
+                                               case 'update':
+                                                       $test[$i]['contents'] = $change['value'];
+                                                       break;
+                                               case 'delete':
+                                                       $test[$i]['deleted'] = true;
+                                                       break;
+                                               default:
+                                                       throw new Exception( "Unknown op: ${change['op']}" );
                                        }
                                        // Acknowledge
                                        // Note that we use the old section name for the rename op
index 4d39f7b..6bab16f 100644 (file)
@@ -9,6 +9,7 @@ use MediaWiki\Services\ServiceDisabledException;
 use MediaWiki\Shell\CommandFactory;
 use MediaWiki\Storage\BlobStore;
 use MediaWiki\Storage\RevisionStore;
+use MediaWiki\Storage\SqlBlobStore;
 
 /**
  * @covers MediaWiki\MediaWikiServices
@@ -334,6 +335,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
                        'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ],
                        'ShellCommandFactory' => [ 'ShellCommandFactory', CommandFactory::class ],
                        'BlobStore' => [ 'BlobStore', BlobStore::class ],
+                       '_SqlBlobStore' => [ '_SqlBlobStore', SqlBlobStore::class ],
                        'RevisionStore' => [ 'RevisionStore', RevisionStore::class ],
                ];
        }
index 6420c39..ffafe3a 100644 (file)
@@ -11,8 +11,9 @@
  * ^--- important, causes tests not to fail with timeout
  */
 class PageArchiveTest extends MediaWikiTestCase {
+
        /**
-        * @var WikiPage $archivedPage
+        * @var PageArchive $archivedPage
         */
        private $archivedPage;
 
@@ -78,6 +79,7 @@ class PageArchiveTest extends MediaWikiTestCase {
 
        /**
         * @covers PageArchive::undelete
+        * @covers PageArchive::undeleteRevisions
         */
        public function testUndeleteRevisions() {
                // First make sure old revisions are archived
@@ -107,4 +109,73 @@ class PageArchiveTest extends MediaWikiTestCase {
                $row = $res->fetchObject();
                $this->assertEquals( IP::toHex( $this->ipEditor ), $row->ipc_hex );
        }
+
+       /**
+        * @covers PageArchive::listRevisions
+        */
+       public function testListRevisions() {
+               $revisions = $this->archivedPage->listRevisions();
+               $this->assertEquals( 2, $revisions->numRows() );
+
+               // Get the rows as arrays
+               $row1 = (array)$revisions->current();
+               $row2 = (array)$revisions->next();
+               // Unset the timestamps (we assume they will be right...
+               $this->assertInternalType( 'string', $row1['ar_timestamp'] );
+               $this->assertInternalType( 'string', $row2['ar_timestamp'] );
+               unset( $row1['ar_timestamp'] );
+               unset( $row2['ar_timestamp'] );
+
+               $this->assertEquals(
+                       [
+                               'ar_minor_edit' => '0',
+                               'ar_user' => '0',
+                               'ar_user_text' => '2600:387:ed7:947e:8c16:a1ad:dd34:1dd7',
+                               'ar_len' => '11',
+                               'ar_deleted' => '0',
+                               'ar_rev_id' => '3',
+                               'ar_sha1' => '0qdrpxl537ivfnx4gcpnzz0285yxryy',
+                               'ar_page_id' => '2',
+                               'ar_comment_text' => 'just a test',
+                               'ar_comment_data' => null,
+                               'ar_comment_cid' => null,
+                               'ar_content_format' => null,
+                               'ar_content_model' => null,
+                               'ts_tags' => null,
+                               'ar_id' => '2',
+                               'ar_namespace' => '0',
+                               'ar_title' => 'PageArchiveTest_thePage',
+                               'ar_text' => '',
+                               'ar_text_id' => '3',
+                               'ar_parent_id' => '2',
+                       ],
+                       $row1
+               );
+               $this->assertEquals(
+                       [
+                               'ar_minor_edit' => '0',
+                               'ar_user' => '0',
+                               'ar_user_text' => '127.0.0.1',
+                               'ar_len' => '7',
+                               'ar_deleted' => '0',
+                               'ar_rev_id' => '2',
+                               'ar_sha1' => 'pr0s8e18148pxhgjfa0gjrvpy8fiyxc',
+                               'ar_page_id' => '2',
+                               'ar_comment_text' => 'testing',
+                               'ar_comment_data' => null,
+                               'ar_comment_cid' => null,
+                               'ar_content_format' => null,
+                               'ar_content_model' => null,
+                               'ts_tags' => null,
+                               'ar_id' => '1',
+                               'ar_namespace' => '0',
+                               'ar_title' => 'PageArchiveTest_thePage',
+                               'ar_text' => '',
+                               'ar_text_id' => '2',
+                               'ar_parent_id' => '0',
+                       ],
+                       $row2
+               );
+       }
+
 }
index b7f1a47..566dc92 100644 (file)
@@ -57,7 +57,7 @@ class RevisionTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideConstructFromArray
         * @covers Revision::__construct
-        * @covers Revision::constructFromRowArray
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         */
        public function testConstructFromArray( $rowArray ) {
                $rev = new Revision( $rowArray, 0, $this->getMockTitle() );
@@ -68,7 +68,7 @@ class RevisionTest extends MediaWikiTestCase {
 
        /**
         * @covers Revision::__construct
-        * @covers Revision::constructFromRowArray
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         */
        public function testConstructFromEmptyArray() {
                $rev = new Revision( [], 0, $this->getMockTitle() );
@@ -106,7 +106,7 @@ class RevisionTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideConstructFromArray_userSetAsExpected
         * @covers Revision::__construct
-        * @covers Revision::constructFromRowArray
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         *
         * @param array $rowArray
         * @param mixed $expectedUserId null to expect the current wgUser ID
@@ -166,7 +166,7 @@ class RevisionTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideConstructFromArrayThrowsExceptions
         * @covers Revision::__construct
-        * @covers RevisionStore::newMutableRevisionFromArray
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         */
        public function testConstructFromArrayThrowsExceptions( $rowArray, Exception $expectedException ) {
                $this->setExpectedException(
@@ -179,7 +179,7 @@ class RevisionTest extends MediaWikiTestCase {
 
        /**
         * @covers Revision::__construct
-        * @covers RevisionStore::newMutableRevisionFromArray
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         */
        public function testConstructFromNothing() {
                $this->setExpectedException(
@@ -265,7 +265,7 @@ class RevisionTest extends MediaWikiTestCase {
        /**
         * @dataProvider provideConstructFromRow
         * @covers Revision::__construct
-        * @covers RevisionStore::newRevisionFromRow
+        * @covers \MediaWiki\Storage\RevisionStore::newMutableRevisionFromArray
         */
        public function testConstructFromRow( array $arrayData, $assertions ) {
                $data = 'Hello goat.'; // needs to match model and format
diff --git a/tests/phpunit/includes/Storage/RevisionRecordTest.php b/tests/phpunit/includes/Storage/RevisionRecordTest.php
deleted file mode 100644 (file)
index ea5f209..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-<?php
-
-namespace MediaWiki\Tests\Storage;
-
-use MediaWikiTestCase;
-
-/**
- * @covers \MediaWiki\Storage\RevisionRecord
- */
-class RevisionRecordTest extends MediaWikiTestCase {
-
-       public function testUserCanBitfield() {
-       }
-
-}
index f8ab7f4..a8e7f89 100644 (file)
@@ -1,5 +1,7 @@
 <?php
 
+use Wikimedia\Rdbms\DBError;
+use Wikimedia\Rdbms\IDatabase;
 use Wikimedia\Rdbms\LoadBalancer;
 
 /**
@@ -24,7 +26,7 @@ use Wikimedia\Rdbms\LoadBalancer;
  * @file
  */
 class LoadBalancerTest extends MediaWikiTestCase {
-       public function testLBSimpleServer() {
+       public function testWithoutReplica() {
                global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
 
                $servers = [
@@ -48,10 +50,11 @@ class LoadBalancerTest extends MediaWikiTestCase {
                $dbw = $lb->getConnection( DB_MASTER );
                $this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
                $this->assertTrue( $dbw->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on master" );
+               $this->assertWriteAllowed( $dbw );
 
                $dbr = $lb->getConnection( DB_REPLICA );
                $this->assertTrue( $dbr->getLBInfo( 'master' ), 'DB_REPLICA also gets the master' );
-               $this->assertTrue( $dbw->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on replica" );
+               $this->assertTrue( $dbr->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on replica" );
 
                $dbwAuto = $lb->getConnection( DB_MASTER, [], false, $lb::CONN_TRX_AUTO );
                $this->assertFalse( $dbwAuto->getFlag( $dbw::DBO_TRX ), "No DBO_TRX with CONN_TRX_AUTO" );
@@ -69,7 +72,7 @@ class LoadBalancerTest extends MediaWikiTestCase {
                $lb->closeAll();
        }
 
-       public function testLBSimpleServers() {
+       public function testWithReplica() {
                global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
 
                $servers = [
@@ -83,7 +86,7 @@ class LoadBalancerTest extends MediaWikiTestCase {
                                'load'        => 0,
                                'flags'       => DBO_TRX // REPEATABLE-READ for consistency
                        ],
-                       [ // emulated slave
+                       [ // emulated replica
                                'host'        => $wgDBserver,
                                'dbname'      => $wgDBname,
                                'user'        => $wgDBuser,
@@ -108,14 +111,16 @@ class LoadBalancerTest extends MediaWikiTestCase {
                        $dbw->getLBInfo( 'clusterMasterHost' ),
                        'cluster master set' );
                $this->assertTrue( $dbw->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on master" );
+               $this->assertWriteAllowed( $dbw );
 
                $dbr = $lb->getConnection( DB_REPLICA );
-               $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
+               $this->assertTrue( $dbr->getLBInfo( 'replica' ), 'replica shows as replica' );
                $this->assertEquals(
                        ( $wgDBserver != '' ) ? $wgDBserver : 'localhost',
                        $dbr->getLBInfo( 'clusterMasterHost' ),
                        'cluster master set' );
-               $this->assertTrue( $dbw->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on replica" );
+               $this->assertTrue( $dbr->getFlag( $dbw::DBO_TRX ), "DBO_TRX set on replica" );
+               $this->assertWriteForbidden( $dbr );
 
                $dbwAuto = $lb->getConnection( DB_MASTER, [], false, $lb::CONN_TRX_AUTO );
                $this->assertFalse( $dbwAuto->getFlag( $dbw::DBO_TRX ), "No DBO_TRX with CONN_TRX_AUTO" );
@@ -132,4 +137,30 @@ class LoadBalancerTest extends MediaWikiTestCase {
 
                $lb->closeAll();
        }
+
+       private function assertWriteForbidden( IDatabase $db ) {
+               try {
+                       $db->delete( 'user', [ 'user_id' => 57634126 ], 'TEST' );
+                       $this->fail( 'Write operation should have failed!' );
+               } catch ( DBError $ex ) {
+                       // check that the exception message contains "Write operation"
+                       $constraint = new PHPUnit_Framework_Constraint_StringContains( 'Write operation' );
+
+                       if ( !$constraint->evaluate( $ex->getMessage(), '', true ) ) {
+                               // re-throw original error, to preserve stack trace
+                               throw $ex;
+                       }
+               } finally {
+                       $db->rollback( __METHOD__, 'flush' );
+               }
+       }
+
+       private function assertWriteAllowed( IDatabase $db ) {
+               try {
+                       $this->assertNotSame( false, $db->delete( 'user', [ 'user_id' => 57634126 ] ) );
+               } finally {
+                       $db->rollback( __METHOD__, 'flush' );
+               }
+       }
+
 }
index c9db74f..7d6d7f8 100644 (file)
@@ -29,38 +29,39 @@ class FirejailCommandTest extends PHPUnit_Framework_TestCase {
                // @codingStandardsIgnoreStart
                $env = "'MW_INCLUDE_STDERR=;MW_CPU_LIMIT=180; MW_CGROUP='\'''\''; MW_MEM_LIMIT=307200; MW_FILE_SIZE_LIMIT=102400; MW_WALL_CLOCK_LIMIT=180; MW_USE_LOG_PIPE=yes'";
                // @codingStandardsIgnoreEnd
-               $limit = "$IP/includes/shell/limit.sh";
+               $limit = "/bin/bash '$IP/includes/shell/limit.sh'";
                $profile = "--profile=$IP/includes/shell/firejail.profile";
-               $default = '--noroot --seccomp=@default --private-dev';
+               $blacklist = '--blacklist=' . realpath( MW_CONFIG_FILE );
+               $default = "$blacklist --noroot --seccomp=@default --private-dev";
                return [
                        [
                                'No restrictions',
-                               'ls', 0, "/bin/bash '$limit' ''\''ls'\''' $env"
+                               'ls', 0, "$limit ''\''ls'\''' $env"
                        ],
                        [
                                'default restriction',
                                'ls', Shell::RESTRICT_DEFAULT,
-                               "firejail --quiet $profile $default -- /bin/bash '$limit' ''\''ls'\''' $env"
+                               "$limit 'firejail --quiet $profile $default -- '\''ls'\''' $env"
                        ],
                        [
                                'no network',
                                'ls', Shell::NO_NETWORK,
-                               "firejail --quiet $profile --net=none -- /bin/bash '$limit' ''\''ls'\''' $env"
+                               "$limit 'firejail --quiet $profile --net=none -- '\''ls'\''' $env"
                        ],
                        [
                                'default restriction & no network',
                                'ls', Shell::RESTRICT_DEFAULT | Shell::NO_NETWORK,
-                               "firejail --quiet $profile $default --net=none -- /bin/bash '$limit' ''\''ls'\''' $env"
+                               "$limit 'firejail --quiet $profile $default --net=none -- '\''ls'\''' $env"
                        ],
                        [
                                'seccomp',
                                'ls', Shell::SECCOMP,
-                               "firejail --quiet $profile --seccomp=@default -- /bin/bash '$limit' ''\''ls'\''' $env"
+                               "$limit 'firejail --quiet $profile --seccomp=@default -- '\''ls'\''' $env"
                        ],
                        [
                                'seccomp & no execve',
                                'ls', Shell::SECCOMP | Shell::NO_EXECVE,
-                               "firejail --quiet $profile --seccomp=@default,execve -- /bin/bash '$limit' ''\''ls'\''' $env"
+                               "$limit 'firejail --quiet $profile --shell=none --seccomp=@default,execve -- '\''ls'\''' $env"
                        ],
                ];
        }
@@ -75,7 +76,7 @@ class FirejailCommandTest extends PHPUnit_Framework_TestCase {
                        ->params( $params )
                        ->restrict( $flags );
                $wrapper = TestingAccessWrapper::newFromObject( $command );
-               $output = $wrapper->buildFinalCommand();
+               $output = $wrapper->buildFinalCommand( $wrapper->command );
                $this->assertEquals( $expected, $output[0], $desc );
        }
 
index bb27626..1730575 100644 (file)
                assert.equal( href, '/wiki/#Fragment', 'empty title with fragment' );
 
                href = util.getUrl( '#Fragment', { action: 'edit' } );
-               assert.equal( href, '/w/index.php?action=edit#Fragment', 'epmty title with query string and fragment' );
+               assert.equal( href, '/w/index.php?action=edit#Fragment', 'empty title with query string and fragment' );
 
                href = util.getUrl( 'Foo:Sandbox \xC4#Fragment \xC4', { action: 'edit' } );
                assert.equal( href, '/w/index.php?title=Foo:Sandbox_%C3%84&action=edit#Fragment_.C3.84', 'title with query string, fragment, and special characters' );