From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 18 May 2018 15:32:34 +0000 (+0000)
Subject: Merge "Strip Unicode 6.3.0 directional formatting characters from title"
X-Git-Tag: 1.34.0-rc.0~5394
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=b5b6b477790a05823a81d5fbbf5e48af420cfbc7;hp=7564624d1ca80a4d2f1cc2b4d3d32d5d2e0bca38;p=lhc%2Fweb%2Fwiklou.git

Merge "Strip Unicode 6.3.0 directional formatting characters from title"
---

diff --git a/README b/README
deleted file mode 100644
index ad9b9d9d83..0000000000
--- a/README
+++ /dev/null
@@ -1,33 +0,0 @@
-== MediaWiki ==
-
-MediaWiki is a free and open-source wiki software package written in PHP. It
-serves as the platform for Wikipedia and the other Wikimedia projects, used
-by hundreds of millions of people each month. MediaWiki is localised in over
-350 languages and its reliability and robust feature set have earned it a large
-and vibrant community of third-party users and developers.
-
-MediaWiki is:
-
-* feature-rich and extensible, both on-wiki and with hundreds of extensions;
-* scalable and suitable for both small and large sites;
-* simple to install, working on most hardware/software combinations; and
-* available in your language.
-
-For system requirements, installation, and upgrade details, see the files
-RELEASE-NOTES, INSTALL, and UPGRADE.
-
-* Ready to get started?
-** https://www.mediawiki.org/wiki/Special:MyLanguage/Download
-* Looking for the technical manual?
-** https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents
-* Seeking help from a person?
-** https://www.mediawiki.org/wiki/Special:MyLanguage/Communication
-* Looking to file a bug report or a feature request?
-** https://bugs.mediawiki.org/
-* Interested in helping out?
-** https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute
-
-MediaWiki is the result of global collaboration and cooperation. The CREDITS
-file lists technical contributors to the project. The COPYING file explains
-MediaWiki's copyright and license (GNU General Public License, version 2 or
-later). Many thanks to the Wikimedia community for testing and suggestions.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..ca703dbc0f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,34 @@
+MediaWiki
+===========
+
+MediaWiki is a free and open-source wiki software package written in PHP. It
+serves as the platform for Wikipedia and the other Wikimedia projects, used
+by hundreds of millions of people each month. MediaWiki is localised in over
+350 languages and its reliability and robust feature set have earned it a large
+and vibrant community of third-party users and developers.
+
+MediaWiki is:
+
+* feature-rich and extensible, both on-wiki and with hundreds of extensions;
+* scalable and suitable for both small and large sites;
+* simple to install, working on most hardware/software combinations; and
+* available in your language.
+
+For system requirements, installation, and upgrade details, see the files
+RELEASE-NOTES, INSTALL, and UPGRADE.
+
+* Ready to get started?
+** https://www.mediawiki.org/wiki/Special:MyLanguage/Download
+* Looking for the technical manual?
+** https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents
+* Seeking help from a person?
+** https://www.mediawiki.org/wiki/Special:MyLanguage/Communication
+* Looking to file a bug report or a feature request?
+** https://bugs.mediawiki.org/
+* Interested in helping out?
+** https://www.mediawiki.org/wiki/Special:MyLanguage/How_to_contribute
+
+MediaWiki is the result of global collaboration and cooperation. The CREDITS
+file lists technical contributors to the project. The COPYING file explains
+MediaWiki's copyright and license (GNU General Public License, version 2 or
+later). Many thanks to the Wikimedia community for testing and suggestions.
diff --git a/README.mediawiki b/README.mediawiki
deleted file mode 120000
index 100b93820a..0000000000
--- a/README.mediawiki
+++ /dev/null
@@ -1 +0,0 @@
-README
\ No newline at end of file
diff --git a/RELEASE-NOTES-1.32 b/RELEASE-NOTES-1.32
index 2124db9ff2..4663751bc1 100644
--- a/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@ -17,6 +17,10 @@ production.
   'html5-legacy' value for $wgFragmentMode is no longer accepted.
 * The experimental Html5Internal and Html5Depurate tidy drivers were removed.
   RemexHtml, which is the default, should be used instead.
+* (T135963) You can now define a Content Security Policy for your wiki. This
+  adds a defense-in-depth feature to stop an attacker who has found a bug in
+  the parser allowing them to insert malicious attributes. Disabled by default,
+  you can configure this via $wgCSPHeader and $wgCSPReportOnlyHeader.
 
 === New features in 1.32 ===
 * (T112474) Generalized the ResourceLoader mechanism for overriding modules
@@ -39,10 +43,20 @@ production.
 * …
 
 === Action API changes in 1.32 ===
-* …
+* Added templated parameters.
+  * A module can define a templated parameter like "{fruit}-quantity", where
+    the actual parameters recognized correspond to the values of a multi-valued
+    parameter. Then clients can make requests like
+    "fruits=apples|bananas&apples-quantity=1&bananas-quantity=5".
+  * action=paraminfo will return templated parameter definitions separately
+    from normal parameters. All parameter definitions now include an "index"
+    key to allow clients to maintain parameter ordering when merging normal and
+    templated parameters.
 
 === Action API internal changes in 1.32 ===
 * Added 'ApiParseMakeOutputPage' hook.
+* Parameter names may no longer contain '{' or '}', as these are now used for
+  templated parameters.
 
 === Languages updated in 1.32 ===
 MediaWiki supports over 350 languages. Many localisations are updated regularly.
@@ -92,6 +106,9 @@ because of Phabricator reports.
   of queueing style modules as well.
 * OutputPage::addModuleScripts() and ParserOutput::addModuleScripts are
   deprecated. Use addModules() instead.
+* Overriding SearchEngine::{searchText,searchTitle,searchArchiveTitle}
+  in extending classes is deprecated.  Extend related doSearch* methods
+  instead.
 
 === Other changes in 1.32 ===
 * Soft hyphens (U+00AD) are now automatically removed from titles; these
diff --git a/autoload.php b/autoload.php
index ec0d59f479..c55b931235 100644
--- a/autoload.php
+++ b/autoload.php
@@ -225,6 +225,7 @@ $wgAutoloadLocalClasses = [
 	'CapsCleanup' => __DIR__ . '/maintenance/cleanupCaps.php',
 	'CategoriesRdf' => __DIR__ . '/includes/CategoriesRdf.php',
 	'Category' => __DIR__ . '/includes/Category.php',
+	'CategoryChangesAsRdf' => __DIR__ . '/maintenance/categoryChangesAsRdf.php',
 	'CategoryFinder' => __DIR__ . '/includes/CategoryFinder.php',
 	'CategoryMembershipChange' => __DIR__ . '/includes/changes/CategoryMembershipChange.php',
 	'CategoryMembershipChangeJob' => __DIR__ . '/includes/jobqueue/jobs/CategoryMembershipChangeJob.php',
@@ -303,6 +304,7 @@ $wgAutoloadLocalClasses = [
 	'Content' => __DIR__ . '/includes/content/Content.php',
 	'ContentHandler' => __DIR__ . '/includes/content/ContentHandler.php',
 	'ContentModelLogFormatter' => __DIR__ . '/includes/logging/ContentModelLogFormatter.php',
+	'ContentSecurityPolicy' => __DIR__ . '/includes/ContentSecurityPolicy.php',
 	'ContextSource' => __DIR__ . '/includes/context/ContextSource.php',
 	'ContribsPager' => __DIR__ . '/includes/specials/pagers/ContribsPager.php',
 	'ConvertExtensionToRegistration' => __DIR__ . '/maintenance/convertExtensionToRegistration.php',
@@ -359,6 +361,7 @@ $wgAutoloadLocalClasses = [
 	'DateFormats' => __DIR__ . '/maintenance/language/date-formats.php',
 	'DateFormatter' => __DIR__ . '/includes/parser/DateFormatter.php',
 	'DeadendPagesPage' => __DIR__ . '/includes/specials/SpecialDeadendpages.php',
+	'DeduplicateArchiveRevId' => __DIR__ . '/maintenance/deduplicateArchiveRevId.php',
 	'DeferrableCallback' => __DIR__ . '/includes/deferred/DeferrableCallback.php',
 	'DeferrableUpdate' => __DIR__ . '/includes/deferred/DeferrableUpdate.php',
 	'DeferredStringifier' => __DIR__ . '/includes/libs/DeferredStringifier.php',
@@ -1159,6 +1162,7 @@ $wgAutoloadLocalClasses = [
 	'PopulateBacklinkNamespace' => __DIR__ . '/maintenance/populateBacklinkNamespace.php',
 	'PopulateCategory' => __DIR__ . '/maintenance/populateCategory.php',
 	'PopulateContentModel' => __DIR__ . '/maintenance/populateContentModel.php',
+	'PopulateExternallinksIndex60' => __DIR__ . '/maintenance/populateExternallinksIndex60.php',
 	'PopulateFilearchiveSha1' => __DIR__ . '/maintenance/populateFilearchiveSha1.php',
 	'PopulateImageSha1' => __DIR__ . '/maintenance/populateImageSha1.php',
 	'PopulateInterwiki' => __DIR__ . '/maintenance/populateInterwiki.php',
diff --git a/composer.json b/composer.json
index 8de402561b..833e3bfd0e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,7 @@
 {
 	"name": "mediawiki/core",
 	"description": "Free software wiki application developed by the Wikimedia Foundation and others",
+	"type": "mediawiki-core",
 	"keywords": ["mediawiki", "wiki"],
 	"homepage": "https://www.mediawiki.org/",
 	"authors": [
diff --git a/docs/hooks.txt b/docs/hooks.txt
index b38bd666e4..9404e1448d 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1186,6 +1186,31 @@ $lossy:   boolean indicating whether lossy conversion is allowed.
   converted Content object. Note that $result->getContentModel() must return
   $toModel.
 
+'ContentSecurityPolicyDefaultSource': Modify the allowed CSP load sources. This affects all
+directives except for the script directive. If you want to add a script
+source, see ContentSecurityPolicyScriptSource hook.
+&$defaultSrc: Array of Content-Security-Policy allowed sources
+$policyConfig: Current configuration for the Content-Security-Policy header
+$mode: ContentSecurityPolicy::REPORT_ONLY_MODE or ContentSecurityPolicy::FULL_MODE
+  depending on type of header
+
+'ContentSecurityPolicyDirectives': Modify the content security policy directives.
+Use this only if ContentSecurityPolicyDefaultSource and
+ContentSecurityPolicyScriptSource do not meet your needs.
+&$directives: Array of CSP directives
+$policyConfig: Current configuration for the CSP header
+$mode: ContentSecurityPolicy::REPORT_ONLY_MODE or
+  ContentSecurityPolicy::FULL_MODE depending on type of header
+
+'ContentSecurityPolicyScriptSource': Modify the allowed CSP script sources.
+Note that you also have to use ContentSecurityPolicyDefaultSource if you
+want non-script sources to be loaded from
+whatever you add.
+&$scriptSrc: Array of CSP directives
+$policyConfig: Current configuration for the CSP header
+$mode: ContentSecurityPolicy::REPORT_ONLY_MODE or ContentSecurityPolicy::FULL_MODE
+  depending on type of header
+
 'CustomEditor': When invoking the page editor
 Return true to allow the normal editor to be used, or false if implementing
 a custom editor, e.g. for a special namespace, etc.
diff --git a/includes/ContentSecurityPolicy.php b/includes/ContentSecurityPolicy.php
new file mode 100644
index 0000000000..21d7d57dcd
--- /dev/null
+++ b/includes/ContentSecurityPolicy.php
@@ -0,0 +1,527 @@
+<?php
+/**
+ * Handle sending Content-Security-Policy headers
+ *
+ * @see https://www.w3.org/TR/CSP2/
+ *
+ * Copyright © 2015–2018 Brian Wolff
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @since 1.32
+ * @file
+ */
+class ContentSecurityPolicy {
+	const REPORT_ONLY_MODE = 1;
+	const FULL_MODE = 2;
+	/** Used for meta tag. Does not include report urls or nonce sources */
+	const FULL_MODE_RESTRICTED = 3;
+
+	/** @var string The nonce to use for inline scripts (from OutputPage) */
+	private $nonce;
+	/** @var Config The site configuration object */
+	private $mwConfig;
+	/** @var WebResponse */
+	private $response;
+
+	/**
+	 * @param string $nonce
+	 * @param WebResponse $response
+	 * @param Config $mwConfig
+	 */
+	public function __construct( $nonce, WebResponse $response, Config $mwConfig ) {
+		$this->nonce = $nonce;
+		$this->response = $response;
+		$this->mwConfig = $mwConfig;
+	}
+
+	/**
+	 * Send a single CSP header based on a given policy config.
+	 *
+	 * @note Most callers will probably want ContentSecurityPolicy::sendHeaders() instead.
+	 * @param array $csp ContentSecurityPolicy configuration
+	 * @param int $reportOnly self::*_MODE constant
+	 */
+	public function sendCSPHeader( $csp, $reportOnly ) {
+		$policy = $this->makeCSPDirectives( $csp, $reportOnly );
+		$headerName = $this->getHeaderName( $reportOnly );
+		if ( $policy ) {
+			$this->response->header(
+				"$headerName: $policy"
+			);
+		}
+	}
+
+	/**
+	 * Return the meta header to use for after load restricted mode
+	 *
+	 * This should restrict browsers that don't support nonce-sources.
+	 * Idea stolen from
+	 * https://blogs.dropbox.com/tech/2015/09/unsafe-inline-and-nonce-deployment/
+	 *
+	 * @param array $csp CSP configuration
+	 * @return string Content for meta tag
+	 */
+	public function getMetaHeader( $csp ) {
+		return $this->makeCSPDirectives( $csp, self::FULL_MODE_RESTRICTED );
+	}
+
+	/**
+	 * Send CSP headers based on wiki config
+	 *
+	 * Main method that callers are expected to use
+	 * @param IContextSource $context A context object, the associated OutputPage
+	 *  object must be the one that the page in question was generated with.
+	 */
+	public static function sendHeaders( IContextSource $context ) {
+		$out = $context->getOutput();
+		$csp = new ContentSecurityPolicy(
+			$out->getCSPNonce(),
+			$context->getRequest()->response(),
+			$context->getConfig()
+		);
+
+		$cspConfig = $context->getConfig()->get( 'CSPHeader' );
+		$cspConfigReportOnly = $context->getConfig()->get( 'CSPReportOnlyHeader' );
+
+		$csp->sendCSPHeader( $cspConfig, self::FULL_MODE );
+		$csp->sendCSPHeader( $cspConfigReportOnly, self::REPORT_ONLY_MODE );
+
+		// Include <meta> header which increases security level after initial load.
+		// This helps mitigate attacks on browsers not supporting CSP2. It also
+		// helps mitigate attacks due to the shared nonce that non-logged in users
+		// get due to varnish cache.
+		// Unclear if this is the best place to insert the meta tag, or if
+		// it should be in a RL module. I figure its best to do this as early
+		// as possible.
+		// FIXME: Needs testing to see if this actually works properly
+		$metaHeader = $csp->getMetaHeader( $cspConfig );
+		if ( $metaHeader ) {
+			$context->getOutput()->addScript(
+				ResourceLoader::makeInlineScript(
+					$csp->makeMetaInsertScript(
+						$metaHeader
+					),
+					$out->getCSPNonce()
+				)
+			);
+		}
+	}
+
+	/**
+	 * Makes javascript to insert a meta CSP header after page load
+	 *
+	 * @see https://blogs.dropbox.com/tech/2015/09/unsafe-inline-and-nonce-deployment/
+	 * @param string $metaContents content of meta tag
+	 * @return string JS for including in page
+	 */
+	private function makeMetaInsertScript( $metaContents ) {
+		return "$('\\x3Cmeta http-equiv=\"Content-Security-Policy\"\\x3E')" .
+			'.attr("content",' .
+			Xml::encodeJsVar( $metaContents ) .
+			').prependTo($("head"))';
+	}
+
+	/**
+	 * Get the name of the HTTP header to use.
+	 *
+	 * @param int $reportOnly Either self::REPORT_ONLY_MODE or self::FULL_MODE
+	 * @return string Name of http header
+	 * @throws UnexpectedValueException if you feed it self::FULL_MODE_RESTRICTED.
+	 */
+	private function getHeaderName( $reportOnly ) {
+		if ( $reportOnly === self::REPORT_ONLY_MODE ) {
+			return 'Content-Security-Policy-Report-Only';
+		} elseif ( $reportOnly === self::FULL_MODE ) {
+			return 'Content-Security-Policy';
+		}
+		throw new UnexpectedValueException( $reportOnly );
+	}
+
+	/**
+	 * Determine what CSP policies to set for this page
+	 *
+	 * @param array|bool $config Policy configuration (Either $wgCSPHeader or $wgCSPReportOnlyHeader)
+	 * @param int $mode self::REPORT_ONLY_MODE, self::FULL_MODE or Self::FULL_MODE_RESTRICTED
+	 * @return string Policy directives, or empty string for no policy.
+	 */
+	private function makeCSPDirectives( $policyConfig, $mode ) {
+		if ( $policyConfig === false ) {
+			// CSP is disabled
+			return '';
+		}
+		if ( $policyConfig === true ) {
+			$policyConfig = [];
+		}
+
+		$mwConfig = $this->mwConfig;
+
+		$additionalSelfUrls = $this->getAdditionalSelfUrls();
+		$additionalSelfUrlsScript = $this->getAdditionalSelfUrlsScript();
+		$nonceSrc = "'nonce-" . $this->nonce . "'";
+
+		// If no default-src is sent at all, it
+		// seems browsers (or at least some), interpret
+		// that as allow anything, but the spec seems
+		// to imply that data: and blob: should be
+		// blocked.
+		$defaultSrc = [ '*', 'data:', 'blob:' ];
+
+		$cssSrc = false;
+		$imgSrc = false;
+		$scriptSrc = [ "'unsafe-eval'", "'self'" ];
+		if ( $mode !== self::FULL_MODE_RESTRICTED ) {
+			$scriptSrc[] = $nonceSrc;
+		}
+		$scriptSrc = array_merge( $scriptSrc, $additionalSelfUrlsScript );
+		if ( isset( $policyConfig['script-src'] )
+			&& is_array( $policyConfig['script-src'] )
+		) {
+			foreach ( $policyConfig['script-src'] as $src ) {
+				$scriptSrc[] = $this->escapeUrlForCSP( $src );
+			}
+		}
+		// Note: default on if unspecified.
+		if ( ( !isset( $policyConfig['unsafeFallback'] )
+			|| $policyConfig['unsafeFallback'] )
+			&& $mode !== self::FULL_MODE_RESTRICTED
+		) {
+			// unsafe-inline should be ignored on browsers
+			// that support 'nonce-foo' sources.
+			// Some older versions of firefox don't follow this
+			// rule, but new browsers do. (Should be for at least
+			// firefox 40+).
+			$scriptSrc[] = "'unsafe-inline'";
+		}
+		// If default source option set to true or
+		// an array of urls, set a restrictive default-src.
+		// If set to false, we send a lenient default-src,
+		// see the code above where $defaultSrc is set initially.
+		if ( isset( $policyConfig['default-src'] )
+			&& $policyConfig['default-src'] !== false
+		) {
+			$defaultSrc = array_merge(
+				[ "'self'", 'data:', 'blob:' ],
+				$additionalSelfUrls
+			);
+			if ( is_array( $policyConfig['default-src'] ) ) {
+				foreach ( $policyConfig['default-src'] as $src ) {
+					$defaultSrc[] = $this->escapeUrlForCSP( $src );
+				}
+			}
+		}
+
+		if ( !isset( $policyConfig['includeCORS'] ) || $policyConfig['includeCORS'] ) {
+			$CORSUrls = $this->getCORSSources();
+			if ( !in_array( '*', $defaultSrc ) ) {
+				$defaultSrc = array_merge( $defaultSrc, $CORSUrls );
+			}
+			// Unlikely to have * in scriptSrc, but doesn't
+			// hurt to check.
+			if ( !in_array( '*', $scriptSrc ) ) {
+				$scriptSrc = array_merge( $scriptSrc, $CORSUrls );
+			}
+		}
+
+		Hooks::run( 'ContentSecurityPolicyDefaultSource', [ &$defaultSrc, $policyConfig, $mode ] );
+		Hooks::run( 'ContentSecurityPolicyScriptSource', [ &$scriptSrc, $policyConfig, $mode ] );
+
+		// Check if array just in case the hook made it false
+		if ( is_array( $defaultSrc ) ) {
+			$cssSrc = array_merge( $defaultSrc, [ "'unsafe-inline'" ] );
+		}
+
+		if ( $mode === self::FULL_MODE_RESTRICTED ) {
+			// report-uri disallowed in <meta> tags.
+			$reportUri = false;
+		} elseif ( isset( $policyConfig['report-uri'] ) && $policyConfig['report-uri'] !== true ) {
+			if ( $policyConfig['report-uri'] === false ) {
+				$reportUri = false;
+			} else {
+				$reportUri = $this->escapeUrlForCSP( $policyConfig['report-uri'] );
+			}
+		} else {
+			$reportUri = $this->getReportUri( $mode );
+		}
+
+		// Only send an img-src, if we're sending a restricitve default.
+		if ( !is_array( $defaultSrc )
+			|| !in_array( '*', $defaultSrc )
+			|| !in_array( 'data:', $defaultSrc )
+			|| !in_array( 'blob:', $defaultSrc )
+		) {
+			// A future todo might be to make the whitelist options only
+			// add all the whitelisted sites to the header, instead of
+			// allowing all (Assuming there is a small number of sites).
+			// For now, the external image feature disables the limits
+			// CSP puts on external images.
+			if ( $mwConfig->get( 'AllowExternalImages' )
+				|| $mwConfig->get( 'AllowExternalImagesFrom' )
+				|| $mwConfig->get( 'AllowImageTag' )
+			) {
+				$imgSrc = [ '*', 'data:', 'blob:' ];
+			} elseif ( $mwConfig->get( 'EnableImageWhitelist' ) ) {
+				$whitelist = wfMessage( 'external_image_whitelist' )
+					->inContentLanguage()
+					->plain();
+				if ( preg_match( '/^\s*[^\s#]/m', $whitelist ) ) {
+					$imgSrc = [ '*', 'data:', 'blob:' ];
+				}
+			}
+		}
+
+		$directives = [];
+		if ( $scriptSrc ) {
+			$directives[] = 'script-src ' . implode( ' ', $scriptSrc );
+		}
+		if ( $defaultSrc ) {
+			$directives[] = 'default-src ' . implode( ' ', $defaultSrc );
+		}
+		if ( $cssSrc ) {
+			$directives[] = 'style-src ' . implode( ' ', $cssSrc );
+		}
+		if ( $imgSrc ) {
+			$directives[] = 'img-src ' . implode( ' ', $imgSrc );
+		}
+		if ( $reportUri ) {
+			$directives[] = 'report-uri ' . $reportUri;
+		}
+
+		Hooks::run( 'ContentSecurityPolicyDirectives', [ &$directives, $policyConfig, $mode ] );
+
+		return implode( '; ', $directives );
+	}
+
+	/**
+	 * Get the default report uri.
+	 *
+	 * @param int $mode self::*_MODE constant. Do not use with self::FULL_MODE_RESTRICTED
+	 * @return string The URI to send reports to.
+	 * @throws UnexpectedValueException if given invalid mode.
+	 */
+	private function getReportUri( $mode ) {
+		if ( $mode === self::FULL_MODE_RESTRICTED ) {
+			throw new UnexpectedValueException( $mode );
+		}
+		$apiArguments = [
+			'action' => 'cspreport',
+			'format' => 'json'
+		];
+		if ( $mode === self::REPORT_ONLY_MODE ) {
+			$apiArguments['reportonly'] = '1';
+		}
+		$reportUri = wfAppendQuery( wfScript( 'api' ), $apiArguments );
+
+		// Per spec, ';' and ',' must be hex-escaped in report uri
+		$reportUri = $this->escapeUrlForCSP( $reportUri );
+		return $reportUri;
+	}
+
+	/**
+	 * Given a url, convert to form needed for CSP.
+	 *
+	 * Currently this does either scheme + host, or
+	 * if protocol relative, just the host. Future versions
+	 * could potentially preserve some of the path, if its determined
+	 * that that would be a good idea.
+	 *
+	 * @note This does the extra escaping for CSP, but assumes the url
+	 *   has already had normal url escaping applied.
+	 * @note This discards urls same as server name, as 'self' directive
+	 *   takes care of that.
+	 * @param string $url
+	 * @return string|bool Converted url or false on failure
+	 */
+	private function prepareUrlForCSP( $url ) {
+		$result = false;
+		if ( preg_match( '/^[a-z][a-z0-9+.-]*:$/i', $url ) ) {
+			// A schema source (e.g. blob: or data:)
+			return $url;
+		}
+		$bits = wfParseUrl( $url );
+		if ( !$bits && strpos( $url, '/' ) === false ) {
+			// probably something like example.com.
+			// try again protocol-relative.
+			$url = '//' . $url;
+			$bits = wfParseUrl( $url );
+		}
+		if ( $bits && isset( $bits['host'] )
+			&& $bits['host'] !== $this->mwConfig->get( 'ServerName' )
+		) {
+			$result = $bits['host'];
+			if ( $bits['scheme'] !== '' ) {
+				$result = $bits['scheme'] . $bits['delimiter'] . $result;
+			}
+			if ( isset( $bits['port'] ) ) {
+				$result .= ':' . $bits['port'];
+			}
+			$result = $this->escapeUrlForCSP( $result );
+		}
+		return $result;
+	}
+
+	/**
+	 * Get additional script sources
+	 *
+	 * @return array Additional sources for loading scripts from
+	 */
+	private function getAdditionalSelfUrlsScript() {
+		$additionalUrls = [];
+		// wgExtensionAssetsPath for ?debug=true mode
+		$pathVars = [ 'LoadScript', 'ExtensionAssetsPath', 'ResourceBasePath' ];
+
+		foreach ( $pathVars as $path ) {
+			$url = $this->mwConfig->get( $path );
+			$preparedUrl = $this->prepareUrlForCSP( $url );
+			if ( $preparedUrl ) {
+				$additionalUrls[] = $preparedUrl;
+			}
+		}
+		$RLSources = $this->mwConfig->get( 'ResourceLoaderSources' );
+		foreach ( $RLSources as $wiki => $sources ) {
+			foreach ( $sources as $id => $value ) {
+				$url = $this->prepareUrlForCSP( $value );
+				if ( $url ) {
+					$additionalUrls[] = $url;
+				}
+			}
+		}
+
+		return array_unique( $additionalUrls );
+	}
+
+	/**
+	 * Get additional host names for the wiki (e.g. if static content loaded elsewhere)
+	 *
+	 * @note These are general load sources, not script sources
+	 * @return array Array of other urls for wiki (for use in default-src)
+	 */
+	private function getAdditionalSelfUrls() {
+		// XXX on a foreign repo, the included description page can have anything on it,
+		// including inline scripts. But nobody sane does that.
+
+		// In principle, you can have even more complex configs... (e.g. The urlsByExt option)
+		$pathUrls = [];
+		$additionalSelfUrls = [];
+
+		// Future todo: The zone urls should never go into
+		// style-src. They should either be only in img-src, or if
+		// img-src unspecified they should be in default-src. Similarly,
+		// the DescriptionStylesheetUrl only needs to be in style-src
+		// (or default-src if style-src unspecified).
+		$callback = function ( $repo, &$urls ) {
+			$urls[] = $repo->getZoneUrl( 'public' );
+			$urls[] = $repo->getZoneUrl( 'transcoded' );
+			$urls[] = $repo->getZoneUrl( 'thumb' );
+			$urls[] = $repo->getDescriptionStylesheetUrl();
+		};
+		$localRepo = RepoGroup::singleton()->getRepo( 'local' );
+		$callback( $localRepo, $pathUrls );
+		RepoGroup::singleton()->forEachForeignRepo( $callback, [ &$pathUrls ] );
+
+		// Globals that might point to a different domain
+		$pathGlobals = [ 'LoadScript', 'ExtensionAssetsPath', 'StylePath', 'ResourceBasePath' ];
+		foreach ( $pathGlobals as $path ) {
+			$pathUrls[] = $this->mwConfig->get( $path );
+		}
+		foreach ( $pathUrls as $path ) {
+			$preparedUrl = $this->prepareUrlForCSP( $path );
+			if ( $preparedUrl !== false ) {
+				$additionalSelfUrls[] = $preparedUrl;
+			}
+		}
+		$RLSources = $this->mwConfig->get( 'ResourceLoaderSources' );
+
+		foreach ( $RLSources as $wiki => $sources ) {
+			foreach ( $sources as $id => $value ) {
+				$url = $this->prepareUrlForCSP( $value );
+				if ( $url ) {
+					$additionalSelfUrls[] = $url;
+				}
+			}
+		}
+
+		return array_unique( $additionalSelfUrls );
+	}
+
+	/**
+	 * include domains that are allowed to send us CORS requests.
+	 *
+	 * Technically, $wgCrossSiteAJAXdomains lists things that are allowed to talk to us
+	 * not things that we are allowed to talk to - but if something is allowed to talk to us,
+	 * then there is a good chance that we should probably be allowed to talk to it.
+	 *
+	 * This is configurable with the 'includeCORS' key in the CSP config, and enabled
+	 * by default.
+	 * @note CORS domains with single character ('?') wildcards, are not included.
+	 * @return array Additional hosts
+	 */
+	private function getCORSSources() {
+		$additionalUrls = [];
+		$CORSSources = $this->mwConfig->get( 'CrossSiteAJAXdomains' );
+		foreach ( $CORSSources as $source ) {
+			if ( strpos( $source, '?' ) !== false ) {
+				// CSP doesn't support single char wildcard
+				continue;
+			}
+			$url = $this->prepareUrlForCSP( $source );
+			if ( $url ) {
+				$additionalUrls[] = $url;
+			}
+		}
+		return $additionalUrls;
+	}
+
+	/**
+	 * CSP spec says ',' and ';' are not allowed to appear in urls.
+	 *
+	 * @note This assumes that normal escaping has been applied to the url
+	 * @param string $url URL (or possibly just part of one)
+	 * @return string
+	 */
+	private function escapeUrlForCSP( $url ) {
+		return str_replace(
+			[ ';', ',' ],
+			[ '%3B', '%2C' ],
+			$url
+		);
+	}
+
+	/**
+	 * Does this browser give false positive reports?
+	 *
+	 * Some versions of firefox (40-42) incorrectly report a csp
+	 * violation for nonce sources, despite allowing them.
+	 *
+	 * @see https://bugzilla.mozilla.org/show_bug.cgi?id=1026520
+	 * @param string $ua User-agent header
+	 * @return bool
+	 */
+	public static function falsePositiveBrowser( $ua ) {
+		return (bool)preg_match( '!Firefox/4[0-2]\.!', $ua );
+	}
+
+	/**
+	 * Is CSP currently enabled (i.e. Should we set nonce attribute)
+	 *
+	 * @param Config $config Configuration object
+	 * @return bool
+	 */
+	public static function isEnabled( Config $config ) {
+		return $config->get( 'CSPHeader' ) !== false
+			|| $config->get( 'CSPReportOnlyHeader' ) !== false;
+	}
+}
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index dcf648e79c..87ca0168bd 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -7864,10 +7864,6 @@ $wgActionFilteredLogs = [
 		'autocreate' => [ 'autocreate' ],
 		'byemail' => [ 'byemail' ],
 	],
-	'patrol' => [
-		'patrol' => [ 'patrol' ],
-		'autopatrol' => [ 'autopatrol' ],
-	],
 	'protect' => [
 		'protect' => [ 'protect' ],
 		'modify' => [ 'modify' ],
@@ -8752,6 +8748,34 @@ $wgMaxUserDBWriteDuration = false;
  */
 $wgMaxJobDBWriteDuration = false;
 
+/**
+ * Controls Content-Security-Policy header [Experimental]
+ *
+ * @see https://www.w3.org/TR/CSP2/
+ * @since 1.32
+ * @var bool|array true to send default version, false to not send.
+ *  If an array, can have parameters:
+ *  'default-src' If true or array (of additional urls) will set a default-src
+ *    directive, which limits what places things can load from. If false or not
+ *    set, will send a default-src directive allowing all sources.
+ *  'includeCORS' If true or not set, will include urls from
+ *    $wgCrossSiteAJAXdomains as an allowed load sources.
+ *  'unsafeFallback' Add unsafe-inline as a script source, as a fallback for
+ *    browsers that do not understand nonce-sources [default on].
+ *  'script-src' Array of additional places that are allowed to have JS be loaded from.
+ *  'report-uri' true to use MW api [default], false to disable, string for alternate uri
+ * @warning May cause slowness on windows due to slow random number generator.
+ */
+$wgCSPHeader = false;
+
+/**
+ * Controls Content-Security-Policy-Report-Only header
+ *
+ * @since 1.32
+ * @var bool|array Same as $wgCSPHeader
+ */
+$wgCSPReportOnlyHeader = false;
+
 /**
  * Mapping of event channels (or channel categories) to EventRelayer configuration.
  *
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 4f6b7b4bbb..6d39e3a03d 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -4111,12 +4111,15 @@ ERROR;
 
 		$script .= '});';
 
+		$nonce = $wgOut->getCSPNonce();
+		$wgOut->addScript( ResourceLoader::makeInlineScript( $script, $nonce ) );
+
 		$toolbar = '<div id="toolbar"></div>';
 
 		if ( Hooks::run( 'EditPageBeforeEditToolbar', [ &$toolbar ] ) ) {
 			// Only add the old toolbar cruft to the page payload if the toolbar has not
 			// been over-written by a hook caller
-			$wgOut->addScript( ResourceLoader::makeInlineScript( $script ) );
+			$wgOut->addScript( ResourceLoader::makeInlineScript( $script, $nonce ) );
 		};
 
 		return $toolbar;
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9569bc1fb4..7e8df7ee48 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -1513,9 +1513,10 @@ function wfHostname() {
  * If $wgShowHostnames is true, the script will also set 'wgHostname' to the
  * hostname of the server handling the request.
  *
+ * @param string $nonce Value from OutputPage::getCSPNonce
  * @return string
  */
-function wfReportTime() {
+function wfReportTime( $nonce = null ) {
 	global $wgShowHostnames;
 
 	$elapsed = ( microtime( true ) - $_SERVER['REQUEST_TIME_FLOAT'] );
@@ -1525,7 +1526,7 @@ function wfReportTime() {
 	if ( $wgShowHostnames ) {
 		$reportVars['wgHostname'] = wfHostname();
 	}
-	return Skin::makeVariablesScript( $reportVars );
+	return Skin::makeVariablesScript( $reportVars, $nonce );
 }
 
 /**
diff --git a/includes/Html.php b/includes/Html.php
index 3bcf13132f..019e0785f9 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -557,10 +557,18 @@ class Html {
 	 * literal "</script>" or (for XML) literal "]]>".
 	 *
 	 * @param string $contents JavaScript
+	 * @param string $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
 	 * @return string Raw HTML
 	 */
-	public static function inlineScript( $contents ) {
+	public static function inlineScript( $contents, $nonce = null ) {
 		$attrs = [];
+		if ( $nonce !== null ) {
+			$attrs['nonce'] = $nonce;
+		} else {
+			if ( ContentSecurityPolicy::isEnabled( RequestContext::getMain()->getConfig() ) ) {
+				wfWarn( "no nonce set on script. CSP will break it" );
+			}
+		}
 
 		if ( preg_match( '/[<&]/', $contents ) ) {
 			$contents = "/*<![CDATA[*/$contents/*]]>*/";
@@ -574,10 +582,18 @@ class Html {
 	 * "<script src=foo.js></script>".
 	 *
 	 * @param string $url
+	 * @param string $nonce Nonce for CSP header, from OutputPage::getCSPNonce()
 	 * @return string Raw HTML
 	 */
-	public static function linkedScript( $url ) {
+	public static function linkedScript( $url, $nonce = null ) {
 		$attrs = [ 'src' => $url ];
+		if ( $nonce !== null ) {
+			$attrs['nonce'] = $nonce;
+		} else {
+			if ( ContentSecurityPolicy::isEnabled( RequestContext::getMain()->getConfig() ) ) {
+				wfWarn( "no nonce set on script. CSP will break it" );
+			}
+		}
 
 		return self::element( 'script', $attrs );
 	}
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index fbc7b60439..52dfc1164e 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -304,6 +304,11 @@ class OutputPage extends ContextSource {
 	 */
 	private $mLinkHeader = [];
 
+	/**
+	 * @var string The nonce for Content-Security-Policy
+	 */
+	private $CSPNonce;
+
 	/**
 	 * Constructor for OutputPage. This should not be called directly.
 	 * Instead a new RequestContext should be created and it will implicitly create
@@ -475,7 +480,7 @@ class OutputPage extends ContextSource {
 		if ( is_null( $version ) ) {
 			$version = $this->getConfig()->get( 'StyleVersion' );
 		}
-		$this->addScript( Html::linkedScript( wfAppendQuery( $path, $version ) ) );
+		$this->addScript( Html::linkedScript( wfAppendQuery( $path, $version ), $this->getCSPNonce() ) );
 	}
 
 	/**
@@ -485,7 +490,7 @@ class OutputPage extends ContextSource {
 	 * @param string $script JavaScript text, no script tags
 	 */
 	public function addInlineScript( $script ) {
-		$this->mScripts .= Html::inlineScript( $script );
+		$this->mScripts .= Html::inlineScript( "\n$script\n", $this->getCSPNonce() ) . "\n";
 	}
 
 	/**
@@ -2433,6 +2438,8 @@ class OutputPage extends ContextSource {
 			$response->header( "X-Frame-Options: $frameOptions" );
 		}
 
+		ContentSecurityPolicy::sendHeaders( $this );
+
 		if ( $this->mArticleBodyOnly ) {
 			echo $this->mBodytext;
 		} else {
@@ -2900,7 +2907,7 @@ class OutputPage extends ContextSource {
 		}
 
 		$pieces[] = Html::element( 'title', null, $this->getHTMLTitle() );
-		$pieces[] = $this->getRlClient()->getHeadHtml();
+		$pieces[] = $this->getRlClient()->getHeadHtml( $this->getCSPNonce() );
 		$pieces[] = $this->buildExemptModules();
 		$pieces = array_merge( $pieces, array_values( $this->getHeadLinksArray() ) );
 		$pieces = array_merge( $pieces, array_values( $this->mHeadItems ) );
@@ -2911,7 +2918,8 @@ class OutputPage extends ContextSource {
 				ResourceLoaderContext::newDummyContext(),
 				[ 'html5shiv' ],
 				ResourceLoaderModule::TYPE_SCRIPTS,
-				[ 'sync' => true ]
+				[ 'sync' => true ],
+				$this->getCSPNonce()
 			) .
 			'<![endif]-->';
 
@@ -2992,7 +3000,8 @@ class OutputPage extends ContextSource {
 			$this->getRlClientContext(),
 			$modules,
 			$only,
-			$extraQuery
+			$extraQuery,
+			$this->getCSPNonce()
 		);
 	}
 
@@ -3025,7 +3034,8 @@ class OutputPage extends ContextSource {
 			$chunks[] = ResourceLoader::makeInlineScript(
 				ResourceLoader::makeConfigSetScript(
 					[ 'wgPageParseReport' => $this->limitReportJSData ]
-				)
+				),
+				$this->getCSPNonce()
 			);
 		}
 
@@ -3992,4 +4002,26 @@ class OutputPage extends ContextSource {
 			);
 		}
 	}
+
+	/**
+	 * Get (and set if not yet set) the CSP nonce.
+	 *
+	 * This value needs to be included in any <script> tags on the
+	 * page.
+	 *
+	 * @return string|bool Nonce or false to mean don't output nonce
+	 * @since 1.32
+	 */
+	public function getCSPNonce() {
+		if ( !ContentSecurityPolicy::isEnabled( $this->getConfig() ) ) {
+			return false;
+		}
+		if ( $this->CSPNonce === null ) {
+			// XXX It might be expensive to generate randomness
+			// on every request, on windows.
+			$rand = MWCryptRand::generate( 15 );
+			$this->CSPNonce = base64_encode( $rand );
+		}
+		return $this->CSPNonce;
+	}
 }
diff --git a/includes/Title.php b/includes/Title.php
index b771477fad..7f0dbd7d3c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -4694,9 +4694,12 @@ class Title implements LinkTarget {
 		}
 
 		$dbw = wfGetDB( DB_MASTER );
-		$dbw->onTransactionPreCommitOrIdle( function () {
-			ResourceLoaderWikiModule::invalidateModuleCache( $this, null, null, wfWikiID() );
-		} );
+		$dbw->onTransactionPreCommitOrIdle(
+			function () {
+				ResourceLoaderWikiModule::invalidateModuleCache( $this, null, null, wfWikiID() );
+			},
+			__METHOD__
+		);
 
 		$conds = $this->pageCond();
 		DeferredUpdates::addUpdate(
diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 0988f73452..0a4eae8781 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -195,9 +195,14 @@ class InfoAction extends FormlessAction {
 	}
 
 	/**
-	 * Returns page information in an easily-manipulated format. Array keys are used so extensions
-	 * may add additional information in arbitrary positions. Array values are arrays with one
-	 * element to be rendered as a header, arrays with two elements to be rendered as a table row.
+	 * Returns an array of info groups (will be rendered as tables), keyed by group ID.
+	 * Group IDs are arbitrary and used so that extensions may add additional information in
+	 * arbitrary positions (and as message keys for section headers for the tables, prefixed
+	 * with 'pageinfo-').
+	 * Each info group is a non-associative array of info items (rendered as table rows).
+	 * Each info item is an array with two elements: the first describes the type of
+	 * information, the second the value for the current page. Both can be strings (will be
+	 * interpreted as raw HTML) or messages (will be interpreted as plain text and escaped).
 	 *
 	 * @return array
 	 */
diff --git a/includes/actions/RawAction.php b/includes/actions/RawAction.php
index 812f9623ff..50eb28a3cf 100644
--- a/includes/actions/RawAction.php
+++ b/includes/actions/RawAction.php
@@ -26,6 +26,8 @@
  * @file
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * A simple method to retrieve the plain source of an article,
  * using "action=raw" in the GET request string.
@@ -85,7 +87,6 @@ class RawAction extends FormlessAction {
 			$response->header( $this->getOutput()->getKeyHeader() );
 		}
 
-		$response->header( 'Content-type: ' . $contentType . '; charset=UTF-8' );
 		// Output may contain user-specific data;
 		// vary generated content for open sessions on private wikis
 		$privateCache = !User::isEveryoneAllowed( 'read' ) &&
@@ -97,6 +98,36 @@ class RawAction extends FormlessAction {
 			'Cache-Control: ' . $mode . ', s-maxage=' . $smaxage . ', max-age=' . $maxage
 		);
 
+		// In the event of user JS, don't allow loading a user JS/CSS/Json
+		// subpage that has no registered user associated with, as
+		// someone could register the account and take control of the
+		// JS/CSS/Json page.
+		$title = $this->getTitle();
+		if ( $title->isUserConfigPage() && $contentType !== 'text/x-wiki' ) {
+			// not using getRootText() as we want this to work
+			// even if subpages are disabled.
+			$rootPage = strtok( $title->getText(), '/' );
+			$userFromTitle = User::newFromName( $rootPage, 'usable' );
+			if ( !$userFromTitle || $userFromTitle->getId() === 0 ) {
+				$elevated = $this->getUser()->isAllowed( 'editinterface' );
+				$elevatedText = $elevated ? 'by elevated ' : '';
+				$log = LoggerFactory::getInstance( "security" );
+				$log->warning(
+					"Unsafe JS/CSS/Json $elevatedText" . "load - {user} loaded {title} with {ctype}",
+					[
+						'user' => $this->getUser()->getName(),
+						'title' => $title->getPrefixedDBKey(),
+						'ctype' => $contentType,
+						'elevated' => $elevated
+					]
+				);
+				$msg = wfMessage( 'unregistered-user-config' );
+				throw new HttpError( 403, $msg );
+			}
+		}
+
+		$response->header( 'Content-type: ' . $contentType . '; charset=UTF-8' );
+
 		$text = $this->getRawText();
 
 		// Don't return a 404 response for CSS or JavaScript;
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 7fafa1f1af..0802e160b1 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -226,6 +226,24 @@ abstract class ApiBase extends ContextSource {
 	 */
 	const PARAM_MAX_CHARS = 24;
 
+	/**
+	 * (array) Indicate that this is a templated parameter, and specify replacements. Keys are the
+	 * placeholders in the parameter name and values are the names of (unprefixed) parameters from
+	 * which the replacement values are taken.
+	 *
+	 * For example, a parameter "foo-{ns}-{title}" could be defined with
+	 * PARAM_TEMPLATE_VARS => [ 'ns' => 'namespaces', 'title' => 'titles' ]. Then a query for
+	 * namespaces=0|1&titles=X|Y would support parameters foo-0-X, foo-0-Y, foo-1-X, and foo-1-Y.
+	 *
+	 * All placeholders must be present in the parameter's name. Each target parameter must have
+	 * PARAM_ISMULTI true. If a target is itself a templated parameter, its PARAM_TEMPLATE_VARS must
+	 * be a subset of the referring parameter's, mapping the same placeholders to the same targets.
+	 * A parameter cannot target itself.
+	 *
+	 * @since 1.32
+	 */
+	const PARAM_TEMPLATE_VARS = 25;
+
 	/**@}*/
 
 	const ALL_DEFAULT_STRING = '*';
@@ -749,15 +767,78 @@ abstract class ApiBase extends ContextSource {
 	public function extractRequestParams( $parseLimit = true ) {
 		// Cache parameters, for performance and to avoid T26564.
 		if ( !isset( $this->mParamCache[$parseLimit] ) ) {
-			$params = $this->getFinalParams();
+			$params = $this->getFinalParams() ?: [];
 			$results = [];
-
-			if ( $params ) { // getFinalParams() can return false
-				foreach ( $params as $paramName => $paramSettings ) {
+			$warned = [];
+
+			// Process all non-templates and save templates for secondary
+			// processing.
+			$toProcess = [];
+			foreach ( $params as $paramName => $paramSettings ) {
+				if ( isset( $paramSettings[self::PARAM_TEMPLATE_VARS] ) ) {
+					$toProcess[] = [ $paramName, $paramSettings[self::PARAM_TEMPLATE_VARS], $paramSettings ];
+				} else {
 					$results[$paramName] = $this->getParameterFromSettings(
-						$paramName, $paramSettings, $parseLimit );
+						$paramName, $paramSettings, $parseLimit
+					);
+				}
+			}
+
+			// Now process all the templates by successively replacing the
+			// placeholders with all client-supplied values.
+			// This bit duplicates JavaScript logic in
+			// ApiSandbox.PageLayout.prototype.updateTemplatedParams().
+			// If you update this, see if that needs updating too.
+			while ( $toProcess ) {
+				list( $name, $targets, $settings ) = array_shift( $toProcess );
+
+				foreach ( $targets as $placeholder => $target ) {
+					if ( !array_key_exists( $target, $results ) ) {
+						// The target wasn't processed yet, try the next one.
+						// If all hit this case, the parameter has no expansions.
+						continue;
+					}
+					if ( !is_array( $results[$target] ) || !$results[$target] ) {
+						// The target was processed but has no (valid) values.
+						// That means it has no expansions.
+						break;
+					}
+
+					// Expand this target in the name and all other targets,
+					// then requeue if there are more targets left or put in
+					// $results if all are done.
+					unset( $targets[$placeholder] );
+					$placeholder = '{' . $placeholder . '}';
+					foreach ( $results[$target] as $value ) {
+						if ( !preg_match( '/^[^{}]*$/', $value ) ) {
+							// Skip values that make invalid parameter names.
+							$encTargetName = $this->encodeParamName( $target );
+							if ( !isset( $warned[$encTargetName][$value] ) ) {
+								$warned[$encTargetName][$value] = true;
+								$this->addWarning( [
+									'apiwarn-ignoring-invalid-templated-value',
+									wfEscapeWikiText( $encTargetName ),
+									wfEscapeWikiText( $value ),
+								] );
+							}
+							continue;
+						}
+
+						$newName = str_replace( $placeholder, $value, $name );
+						if ( !$targets ) {
+							$results[$newName] = $this->getParameterFromSettings( $newName, $settings, $parseLimit );
+						} else {
+							$newTargets = [];
+							foreach ( $targets as $k => $v ) {
+								$newTargets[$k] = str_replace( $placeholder, $value, $v );
+							}
+							$toProcess[] = [ $newName, $newTargets, $settings ];
+						}
+					}
+					break;
 				}
 			}
+
 			$this->mParamCache[$parseLimit] = $results;
 		}
 
@@ -771,9 +852,7 @@ abstract class ApiBase extends ContextSource {
 	 * @return mixed Parameter value
 	 */
 	protected function getParameter( $paramName, $parseLimit = true ) {
-		$paramSettings = $this->getFinalParams()[$paramName];
-
-		return $this->getParameterFromSettings( $paramName, $paramSettings, $parseLimit );
+		return $this->extractRequestParams( $parseLimit )[$paramName];
 	}
 
 	/**
diff --git a/includes/api/ApiCSPReport.php b/includes/api/ApiCSPReport.php
index af040d153a..82a7cce44b 100644
--- a/includes/api/ApiCSPReport.php
+++ b/includes/api/ApiCSPReport.php
@@ -47,7 +47,7 @@ class ApiCSPReport extends ApiBase {
 
 		$this->verifyPostBodyOk();
 		$report = $this->getReport();
-		$flags = $this->getFlags( $report );
+		$flags = $this->getFlags( $report, $userAgent );
 
 		$warningText = $this->generateLogLine( $flags, $report );
 		$this->logReport( $flags, $warningText, [
@@ -81,9 +81,10 @@ class ApiCSPReport extends ApiBase {
 	 * Get extra notes about the report.
 	 *
 	 * @param array $report The CSP report
+	 * @param string $userAgent
 	 * @return array
 	 */
-	private function getFlags( $report ) {
+	private function getFlags( $report, $userAgent ) {
 		$reportOnly = $this->getParameter( 'reportonly' );
 		$source = $this->getParameter( 'source' );
 		$falsePositives = $this->getConfig()->get( 'CSPFalsePositiveUrls' );
@@ -97,12 +98,22 @@ class ApiCSPReport extends ApiBase {
 		}
 
 		if (
-			( isset( $report['blocked-uri'] ) &&
-			isset( $falsePositives[$report['blocked-uri']] ) )
-			|| ( isset( $report['source-file'] ) &&
-			isset( $falsePositives[$report['source-file']] ) )
+			(
+				ContentSecurityPolicy::falsePositiveBrowser( $userAgent ) &&
+				$report['blocked-uri'] === "self"
+			) ||
+			(
+				isset( $report['blocked-uri'] ) &&
+				isset( $falsePositives[$report['blocked-uri']] )
+			) ||
+			(
+				isset( $report['source-file'] ) &&
+				isset( $falsePositives[$report['source-file']] )
+			)
 		) {
-			// Report caused by Ad-Ware
+			// False positive due to:
+			// https://bugzilla.mozilla.org/show_bug.cgi?id=1026520
+
 			$flags[] = 'false-positive';
 		}
 		return $flags;
@@ -127,7 +138,7 @@ class ApiCSPReport extends ApiBase {
 	/**
 	 * Get the report from post body and turn into associative array.
 	 *
-	 * @return Array
+	 * @return array
 	 */
 	private function getReport() {
 		$postBody = $this->getRequest()->getRawInput();
diff --git a/includes/api/ApiHelp.php b/includes/api/ApiHelp.php
index 8d24859078..bccb3385c2 100644
--- a/includes/api/ApiHelp.php
+++ b/includes/api/ApiHelp.php
@@ -466,6 +466,20 @@ class ApiHelp extends ApiBase {
 						}
 					}
 
+					// Templated?
+					if ( !empty( $settings[ApiBase::PARAM_TEMPLATE_VARS] ) ) {
+						$vars = [];
+						$msg = 'api-help-param-templated-var-first';
+						foreach ( $settings[ApiBase::PARAM_TEMPLATE_VARS] as $k => $v ) {
+							$vars[] = $context->msg( $msg, $k, $module->encodeParamName( $v ) );
+							$msg = 'api-help-param-templated-var';
+						}
+						$info[] = $context->msg( 'api-help-param-templated' )
+							->numParams( count( $vars ) )
+							->params( Message::listParam( $vars ) )
+							->parse();
+					}
+
 					// Type documentation
 					if ( !isset( $settings[ApiBase::PARAM_TYPE] ) ) {
 						$dflt = isset( $settings[ApiBase::PARAM_DFLT] )
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index b7b13c5dfc..914d8e9786 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -1888,6 +1888,7 @@ class ApiMain extends ApiBase {
 			$help[$k] = $v;
 		}
 		$help['datatypes'] = '';
+		$help['templatedparams'] = '';
 		$help['credits'] = '';
 
 		// Fill 'permissions'
@@ -1920,7 +1921,7 @@ class ApiMain extends ApiBase {
 		$help['permissions'] .= Html::closeElement( 'dl' );
 		$help['permissions'] .= Html::closeElement( 'div' );
 
-		// Fill 'datatypes' and 'credits', if applicable
+		// Fill 'datatypes', 'templatedparams', and 'credits', if applicable
 		if ( empty( $options['nolead'] ) ) {
 			$level = $options['headerlevel'];
 			$tocnumber = &$options['tocnumber'];
@@ -1954,6 +1955,35 @@ class ApiMain extends ApiBase {
 				];
 			}
 
+			$header = $this->msg( 'api-help-templatedparams-header' )->parse();
+
+			$id = Sanitizer::escapeIdForAttribute( 'main/templatedparams', Sanitizer::ID_PRIMARY );
+			$idFallback = Sanitizer::escapeIdForAttribute( 'main/templatedparams', Sanitizer::ID_FALLBACK );
+			$headline = Linker::makeHeadline( min( 6, $level ),
+				' class="apihelp-header">',
+				$id,
+				$header,
+				'',
+				$idFallback
+			);
+			// Ensure we have a sane anchor
+			if ( $id !== 'main/templatedparams' && $idFallback !== 'main/templatedparams' ) {
+				$headline = '<div id="main/templatedparams"></div>' . $headline;
+			}
+			$help['templatedparams'] .= $headline;
+			$help['templatedparams'] .= $this->msg( 'api-help-templatedparams' )->parseAsBlock();
+			if ( !isset( $tocData['main/templatedparams'] ) ) {
+				$tocnumber[$level]++;
+				$tocData['main/templatedparams'] = [
+					'toclevel' => count( $tocnumber ),
+					'level' => $level,
+					'anchor' => 'main/templatedparams',
+					'line' => $header,
+					'number' => implode( '.', $tocnumber ),
+					'index' => false,
+				];
+			}
+
 			$header = $this->msg( 'api-credits-header' )->parse();
 			$id = Sanitizer::escapeIdForAttribute( 'main/credits', Sanitizer::ID_PRIMARY );
 			$idFallback = Sanitizer::escapeIdForAttribute( 'main/credits', Sanitizer::ID_FALLBACK );
diff --git a/includes/api/ApiParamInfo.php b/includes/api/ApiParamInfo.php
index bfd3d614b3..b8a32ae430 100644
--- a/includes/api/ApiParamInfo.php
+++ b/includes/api/ApiParamInfo.php
@@ -305,16 +305,25 @@ class ApiParamInfo extends ApiBase {
 		}
 
 		$ret['parameters'] = [];
+		$ret['templatedparameters'] = [];
 		$params = $module->getFinalParams( ApiBase::GET_VALUES_FOR_HELP );
 		$paramDesc = $module->getFinalParamDescription();
+		$index = 0;
 		foreach ( $params as $name => $settings ) {
 			if ( !is_array( $settings ) ) {
 				$settings = [ ApiBase::PARAM_DFLT => $settings ];
 			}
 
 			$item = [
-				'name' => $name
+				'index' => ++$index,
+				'name' => $name,
 			];
+
+			if ( !empty( $settings[ApiBase::PARAM_TEMPLATE_VARS] ) ) {
+				$item['templatevars'] = $settings[ApiBase::PARAM_TEMPLATE_VARS];
+				ApiResult::setIndexedTagName( $item['templatevars'], 'var' );
+			}
+
 			if ( isset( $paramDesc[$name] ) ) {
 				$this->formatHelpMessages( $item, 'description', $paramDesc[$name], true );
 			}
@@ -507,9 +516,11 @@ class ApiParamInfo extends ApiBase {
 				ApiResult::setIndexedTagName( $item['info'], 'i' );
 			}
 
-			$ret['parameters'][] = $item;
+			$key = empty( $settings[ApiBase::PARAM_TEMPLATE_VARS] ) ? 'parameters' : 'templatedparameters';
+			$ret[$key][] = $item;
 		}
 		ApiResult::setIndexedTagName( $ret['parameters'], 'param' );
+		ApiResult::setIndexedTagName( $ret['templatedparameters'], 'param' );
 
 		$dynamicParams = $module->dynamicParameterDocumentation();
 		if ( $dynamicParams !== null ) {
diff --git a/includes/api/i18n/ar.json b/includes/api/i18n/ar.json
index f07c6e2dcb..574c94b2aa 100644
--- a/includes/api/i18n/ar.json
+++ b/includes/api/i18n/ar.json
@@ -17,15 +17,23 @@
 	"apihelp-main-extended-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:Special:MyLanguage/API:Main_page|Documentation]]\n* [[mw:Special:MyLanguage/API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailing list]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API Announcements]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bugs & requests]\n</div>\n<strong>Status:</strong> يجب أن تعمل جميع الميزات المعروضة في هذه الصفحة، إلا أن واجهة برمجة التطبيقات لا تزال قيد التطوير النشط، وقد تتغير في أي وقت. الاشتراك في\n<strong>Erroneous requests:</strong>عند إرسال طلبات خاطئة إلى api, فالـHTTP سيتم إرسال رأس مع المفتاح \"MediaWiki-API-Error\" ومن ثم سيتم تعيين قيمة رأس ورمز الخطأ المرسل مرة أخرى إلى نفس القيمة. لمزيد من المعلومات، راجع  [[mw:Special:MyLanguage/API:Errors_and_warnings|API: Errors and warnings]].\n<p class=\"mw-apisandbox-link\"><strong>Testing:</strong> لسهولة إختبار طلبات API، انظر [[Special:ApiSandbox]].</p>",
 	"apihelp-main-param-action": "أي فعل للعمل.",
 	"apihelp-main-param-format": "صيغة الخرج.",
+	"apihelp-main-param-maxlag": "يمكن استخدام التأخر الأقصى عند تثبيت ميدياويكي على قاعدة بيانات مكررة، لحفظ الإجراءات التي تتسبب في أي تأخير أكثر في النسخ المتماثل للموقع; يمكن أن يجعل هذا الوسيط العميل ينتظر حتى يكون تأخر النسخ المتماثل أقل من القيمة المحددة، في حالة التأخير المفرط، يتم إرجاع رمز الخطأ <samp>maxlag</samp> برسالة مثل <samp>Waiting for $host: $lag seconds lagged</samp>،<br />انظر [[mw:Special:MyLanguage/Manual:Maxlag_parameter|دليل: الوسيط maxlag]] لمزيد من المعلومات.",
+	"apihelp-main-param-smaxage": "تعيين رأس التحكم في ذاكرة التخزين المؤقت HTTP <code>s-maxage</code> إلى هذه الثواني العديدة، لا يتم تخزين الأخطاء مؤقتا أبدا.",
+	"apihelp-main-param-maxage": "تعيين رأس التحكم في ذاكرة التخزين المؤقت HTTP <code>max-age</code> إلى هذه الثواني العديدة، لا يتم تخزين الأخطاء مؤقتا أبدا.",
+	"apihelp-main-param-assert": "تحقق من تسجيل دخول المستخدم إذا كان مضبوطا على <kbd>user</kbd>، أو إذا كان لديه صلاحية البوت إذا <kbd>bot</kbd>.",
 	"apihelp-main-param-assertuser": "التحقق من أن المستخدم الحالي هو المستخدم المسمى.",
 	"apihelp-main-param-requestid": "سيتم إدراج أي قيمة معينة هنا في الاستجابة. يمكن أن تُستخدَم لتمييز الطلبات.",
 	"apihelp-main-param-servedby": "تتضمن اسم المضيف الذي الخدم طلب في النتائج.",
 	"apihelp-main-param-curtimestamp": "تشمل الطابع الزمني الحالي في النتيجة.",
 	"apihelp-main-param-responselanginfo": "تشمل اللغات المستخدمة لأجل <var>uselang</var> and <var>errorlang</var> في النتيجة.",
+	"apihelp-main-param-origin": "عند الوصول إلى API باستخدام طلب AJAX عبر النطاقات (CORS)، اضبطها على النطاق الأصلي، يجب تضمين هذا في أي طلب ما قبل الطيران، وبالتالي يجب أن يكون جزءا من طلب URI (وليس جسم POST). \n\nبالنسبة للطلبات المصادقة، يجب أن يتطابق هذا مع أحد المصادر الموجودة في الرأس<code>Origin</code> بالضبط; لذا يجب تعيينه على شيء مثل<kbd>https://en.wikipedia.org</kbd> أو <kbd>https://meta.wikimedia.org</kbd>، إذا لم يتطابق هذا الوسيط مع الرأس<code>Origin</code>، فسيتم إرجاع استجابة 403، إذا كان هذا الوسيط مطابقا للرأس <code>Origin</code>، ستتم إضافة الأصل إلى القائمة البيضاء، سيتم تعيين الرؤوس <code>Access-Control-Allow-Origin</code> و<code>Access-Control-Allow-Credentials</code>.\n\nبالنسبة للطلبات غير المصادقة، حدد القيمة <kbd>*</kbd>، سيؤدي ذلك إلى تعيين الرأس <code>Access-Control-Allow-Origin</code>، ولكن <code>Access-Control-Allow-Credentials</code> سيكون <code>false</code> وسيتم تقييد كل البيانات الخاصة بالمستخدم.",
+	"apihelp-main-param-uselang": "اللغة المستخدمة لترجمة الرسائل. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> بـ<kbd>siprop=languages</kbd> يقوم بإرجاع قائمة أكواد اللغة، أو تحديد <kbd>user</kbd> لاستخدام تفضيل اللغة للمستخدم الحالي، أو تحديد <kbd>content</kbd> لاستخدام لغة محتوى الويكي هذا.",
+	"apihelp-main-param-errorlang": "لغة لاستخدامها في التحذيرات والأخطاء. <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> بـ<kbd>siprop=languages</kbd> يقوم بإرجاع قائمة أكواد اللغة، أو تحديد <kbd>content</kbd> لاستخدام لغة محتوى الويكي هذا، أو تحديد <kbd>uselang</kbd> لاستخدام نفس القيمة كوسيط <var>uselang</var>.",
 	"apihelp-main-param-errorsuselocal": "إذا ما أعطيت، النصوص الخطأ ستستخدم الرسائل المخصصة محليا من نطاق {{ns:MediaWiki}}.",
 	"apihelp-block-summary": "منع مستخدم.",
 	"apihelp-block-param-user": "اسم المستخدم، أو عنوان IP أو نطاق عنوان IP لمنعه. لا يمكن أن يُستخدَم جنبا إلى جنب مع <var>$1userid</var>",
 	"apihelp-block-param-userid": "معرف المستخدم لمنعه، لا يمكن أن يُستخدَم جنبا إلى جنب مع <var>$1user</var>",
+	"apihelp-block-param-expiry": "وقت انتهاء الصلاحية، قد يكون نسبيا (على سبيل المثال <kbd>5 months</kbd> أو <kbd>2 weeks</kbd>) أو مطلق (على سبيل المثال <kbd>2014-09-18T12:34:56Z</kbd>)، إذا تم التعيين على <kbd>infinite</kbd> أو <kbd>indefinite</kbd> أو <kbd>never</kbd> فلن تنتهي صلاحية المنع مطلقا.",
 	"apihelp-block-param-reason": "السبب للمنع.",
 	"apihelp-block-param-anononly": "منع المستخدمين المجهولين فقط (أي تعطيل تعديلات المجهولين من  عنوان IP هذا).",
 	"apihelp-block-param-nocreate": "امنع إنشاء الحسابات.",
@@ -55,13 +63,36 @@
 	"apihelp-compare-param-fromtitle": "العنوان الأول للمقارنة.",
 	"apihelp-compare-param-fromid": "رقم الصفحة الأول للمقارنة.",
 	"apihelp-compare-param-fromrev": "أول مراجعة للمقارنة.",
+	"apihelp-compare-param-fromtext": "استخدم هذا النص بدلا من محتوى المراجعة المحدد بواسطة <var>fromtitle</var>، <var>fromid</var> أو <var>fromrev</var>.",
+	"apihelp-compare-param-fromsection": "استخدم فقط القسم المحدد في المحتوى 'من' المحدد.",
+	"apihelp-compare-param-frompst": "قم بإجراء تحويل ما قبل الحفظ على <var>fromtext</var>.",
+	"apihelp-compare-param-fromcontentmodel": "نموذج محتوى <var>fromtext</var>، إذا لم يتم توفيره، فسيتم تخمينه استنادا إلى الوسائط الأخرى.",
+	"apihelp-compare-param-fromcontentformat": "تنسيق محتوى تسلسل <var>fromtext</var>.",
 	"apihelp-compare-param-totitle": "العنوان الثاني للمقارنة.",
 	"apihelp-compare-param-toid": "رقم الصفحة الثاني للمقارنة.",
 	"apihelp-compare-param-torev": "المراجعة الثانية للمقارنة.",
+	"apihelp-compare-param-torelative": "استخدم مراجعة متعلقة بالمراجعة المحددة من <var>fromtitle</var> أو <var>fromid</var> أو <var>fromrev</var>، سيتم تجاهل جميع خيارات 'إلى' الأخرى.",
+	"apihelp-compare-param-totext": "استخدم هذا النص بدلا من محتوى المراجعة المحدد بواسطة <var>totitle</var> أو <var>toid</var> أو <var>torev</var>.",
+	"apihelp-compare-param-tosection": "استخدم فقط القسم المحدد في المحتوى 'إلى' المحدد.",
+	"apihelp-compare-param-topst": "قم بإجراء تحويل ما قبل الحفظ على <var>totext</var>.",
+	"apihelp-compare-param-tocontentmodel": "نموذج محتوى <var>totext</var>، إذا لم يتم توفيره، فسيتم تخمينه استنادا إلى الوسائط الأخرى.",
+	"apihelp-compare-param-tocontentformat": "تنسيق محتوى تسلسل <var>totext</var>.",
+	"apihelp-compare-param-prop": "أية قطعة من المعلومات للحصول عليها.",
+	"apihelp-compare-paramvalue-prop-diff": "HTML الفرق.",
+	"apihelp-compare-paramvalue-prop-diffsize": "حجم HTML الفرق، بالبايت.",
+	"apihelp-compare-paramvalue-prop-rel": "معرفات المراجعة السابقة للمراجعة السابقة من 'من' وبعد 'إلى'، إن وُجِدت.",
+	"apihelp-compare-paramvalue-prop-ids": "معرفات الصفحة والمراجعة للمراجعات 'من' و'إلى'.",
+	"apihelp-compare-paramvalue-prop-title": "عناوين صفحات المراجعات 'من' و'إلى'.",
+	"apihelp-compare-paramvalue-prop-user": "المعرف واسم المستخدم للمراجعات 'من' و'إلى'.",
+	"apihelp-compare-paramvalue-prop-comment": "التعليق على المراجعات 'من' و'إلى'.",
+	"apihelp-compare-paramvalue-prop-parsedcomment": "التعليق المحلل على المراجعات 'من' و'إلى'.",
+	"apihelp-compare-paramvalue-prop-size": "حجم المراجعات 'من' و'إلى'.",
 	"apihelp-compare-example-1": "إنشاء فرق بين المراجعة 1 و2.",
 	"apihelp-createaccount-summary": "انشاء حساب مستخدم جديد",
+	"apihelp-createaccount-param-preservestate": "إذا تم عرض <kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd> بشكل صحيح لـ<samp>hasprimarypreservedstate</samp>، فقد تم تعليم طلبات <samp>primary-required</samp> لكي يجب حذفها، إذا عرضت قيمة غير فارغة لـ<samp>preservedusername</samp> فيجب استخدام اسم المستخدم هذا للوسيط <var>username</var>.",
 	"apihelp-createaccount-example-create": "بدء عملية إنشاء المستخدم <kbd>Example</kbd> بكلمة المرور <kbd>ExamplePassword</kbd>.",
 	"apihelp-createaccount-param-name": "اسم المستخدم.",
+	"apihelp-createaccount-param-password": "كلمة المرور (يتم تجاهلها إذا تم تعيين <var>$1mailpassword</var>).",
 	"apihelp-createaccount-param-domain": "مجال للمصادقة الخارجية (اختياري).",
 	"apihelp-createaccount-param-token": "حصلت على رمز إنشاء حساب في الطلب الأول.",
 	"apihelp-createaccount-param-email": "عنوان البريد الإلكتروني للمستخدم (اختياري).",
@@ -73,12 +104,14 @@
 	"apihelp-createaccount-example-mail": "إنشاء مستخدم <kbd>testmailuser</kbd> وأرسل كلمة المرور بالبريد الإلكتروني بشكل عشوائي.",
 	"apihelp-cspreport-summary": "مستخدمة من قبل المتصفحات للإبلاغ عن انتهاكات سياسة أمن المحتوى. لا ينبغي أبدا أن تستخدم هذه الوحدة، إلا عند استخدامها تلقائيا باستخدام متصفح ويب CSP متوافق.",
 	"apihelp-cspreport-param-reportonly": "علم على أنه تقرير عن سياسة الرصد، وليس فرض سياسة",
+	"apihelp-cspreport-param-source": "ماذا أنشأ رأس CSP الذي تسبب في هذا التقرير",
 	"apihelp-delete-summary": "حذف صفحة.",
 	"apihelp-delete-param-title": "عنوان الصفحة للحذف. لا يمكن أن يُستخدَم جنبا إلى جنب مع <var>$1pageid</var",
 	"apihelp-delete-param-pageid": "معرف الصفحة للحذف. لا يمكن أن يُستخدَم جنبا إلى جنب مع <var>$1pageid</var",
 	"apihelp-delete-param-reason": "سبب الحذف. إذا لم يُحدَّد، سوف تُستخدَم أحد الأسباب التي تنشأ تلقائيا.",
 	"apihelp-delete-param-tags": "تغيير وسوم لتطبيق الإدخال في سجل الحذف.",
 	"apihelp-delete-param-watch": "أضف الصفحة إلى لائحة مراقبة المستعمل الحالي",
+	"apihelp-delete-param-watchlist": "إضافة أو إزالة الصفحة من قائمة مراقبة المستخدم الحالي أو استخدام التفضيلات أو عدم تغيير المراقبة بدون شروط.",
 	"apihelp-delete-param-unwatch": "إزالة الصفحة من قائمة المراقبة للمستخدم الحالي.",
 	"apihelp-delete-param-oldimage": "اسم الصورة القديمة لحذفها كما هو منصوص عليه [[Special:ApiHelp/query+imageinfo|action=query&prop=imageinfo&iiprop=archivename]].",
 	"apihelp-delete-example-simple": "حذف <kbd>Main Page</kbd>.",
@@ -102,11 +135,14 @@
 	"apihelp-edit-param-nocreate": "يحدث خطأ إذا كانت الصفحة غير موجودة.",
 	"apihelp-edit-param-watch": "أضف الصفحة إلى لائحة مراقبة المستعمل الحالي",
 	"apihelp-edit-param-unwatch": "إزالة الصفحة من قائمة المراقبة للمستخدم الحالي.",
+	"apihelp-edit-param-watchlist": "إضافة أو إزالة الصفحة من قائمة مراقبة المستخدم الحالي أو استخدام التفضيلات أو عدم تغيير المراقبة بدون شروط.",
+	"apihelp-edit-param-md5": "رمز الرقم MD5 للوسيط $1text، أو الوسائط $1prependtext و$1appendtext متسلسلة، في حالة التعيين، لن يتم التعديل ما لم يكن رمز الرقم صحيحا.",
 	"apihelp-edit-param-prependtext": "إضافة هذا النص إلى بداية الصفحة. تجاوز $1text.",
 	"apihelp-edit-param-appendtext": "إضافة هذا النص إلى بداية الصفحة. تجاوز $1text.\n\nاستخدم $1section=جديد لحاق القسم الجديد، بدلا من هذا الوسيط.",
 	"apihelp-edit-param-undo": "التراجع عن هذه المراجعة. تجاوز $1text, $1prependtext و$1appendtext.",
 	"apihelp-edit-param-undoafter": "التراجع عن جميع المراجعات من $1undo لهذه. إذا لم يتم التغيير، تراجع عن تعديل واحد فقط.",
 	"apihelp-edit-param-redirect": "حل التحويلات تلقائيا.",
+	"apihelp-edit-param-contentformat": "نسق المحتوى التسلسلي المستخدم لنص المدخلات.",
 	"apihelp-edit-param-contentmodel": "نموذج المحتوى للمحتوى الجديد.",
 	"apihelp-edit-param-token": "ينبغي دائما أن يُرسَل الرمز كوسيط أخير، أو على الأقل بعد الوسيط $1text.",
 	"apihelp-edit-example-edit": "عدل صفحة.",
@@ -122,9 +158,12 @@
 	"apihelp-expandtemplates-param-title": "عنوان الصفحة.",
 	"apihelp-expandtemplates-param-text": "نص ويكي للتحويل.",
 	"apihelp-expandtemplates-param-revid": "معرف المراجعة، ل<code><nowiki>{{REVISIONID}}</nowiki></code> والمتغيرات مماثلة.",
+	"apihelp-expandtemplates-param-prop": "أية قطعة من المعلومات للحصول عليها،\n\nلاحظ أنه في حالة عدم تحديد أية قيم، فإن النتيجة ستحتوي على نص ويكي، ولكن سيكون الإخراج بتنسيق موقوف.",
 	"apihelp-expandtemplates-paramvalue-prop-wikitext": "نص الويكي الموسع",
+	"apihelp-expandtemplates-paramvalue-prop-categories": "أية تصنيفات موجودة في المدخلات غير ممثلة في مخرجات نص الويكي.",
 	"apihelp-expandtemplates-paramvalue-prop-properties": "خصائص الصفحة التي تحددها الكلمات السحرية الموسعة في نص الويكي.",
 	"apihelp-expandtemplates-paramvalue-prop-volatile": "إذا كان الإخراج سريع التأثر، ينبغي عدم استخدامه في أي مكان آخر داخل الصفحة.",
+	"apihelp-expandtemplates-paramvalue-prop-ttl": "الحد الأقصى للوقت الذي يجب بعده إبطال ذاكرة التخزين المؤقت للنتيجة.",
 	"apihelp-expandtemplates-paramvalue-prop-jsconfigvars": "يعطي متغيرات تكوين جافا سكريبت الخاصة بهذه الصفحة.",
 	"apihelp-expandtemplates-paramvalue-prop-encodedjsconfigvars": "يعطي متغيرات تكوين جافا سكريبت الخاصة بهذه الصفحة كسلسلة JSON.",
 	"apihelp-expandtemplates-paramvalue-prop-parsetree": "شجرة تحليل XML للمدخلات.",
@@ -143,6 +182,8 @@
 	"apihelp-feedcontributions-param-newonly": "أظهر إنشاء الصفحات فقط",
 	"apihelp-feedcontributions-param-hideminor": "إخفاء التعديلات الطفيفة.",
 	"apihelp-feedcontributions-param-showsizediff": "عرض حجم الفرق بين النسخ.",
+	"apihelp-feedcontributions-example-simple": "عودة المساهمات للمستخدم <kbd>Example</kbd>.",
+	"apihelp-feedrecentchanges-summary": "عرض خلاصة أحدث التغييرات.",
 	"apihelp-feedrecentchanges-param-feedformat": "هيئة التلقيم.",
 	"apihelp-feedrecentchanges-param-namespace": "نطاق لتقييد النتائج.",
 	"apihelp-feedrecentchanges-param-invert": "جميع النطاقات عدا المختار.",
@@ -165,11 +206,13 @@
 	"apihelp-feedwatchlist-summary": "إرجاع تغذية قائمة المراقبة.",
 	"apihelp-feedwatchlist-param-feedformat": "هيئة التلقيم.",
 	"apihelp-feedwatchlist-param-hours": "صفحات قائمة معدلة ضمن عدة ساعات من الآن.",
+	"apihelp-feedwatchlist-param-linktosections": "الربط مباشرةً بالأقسام التي تم تغييرها إن أمكن.",
 	"apihelp-feedwatchlist-example-default": "عرض تغذية قائمة المراقبة.",
 	"apihelp-feedwatchlist-example-all6hrs": "اظهر كل التغييرات في اخر 6 ساعات",
 	"apihelp-filerevert-summary": "استرجع الملف لنسخة قديمة.",
 	"apihelp-filerevert-param-filename": "اسم الملف المستهدف، دون البادئة ملف:.",
 	"apihelp-filerevert-param-comment": "تعليق الرفع.",
+	"apihelp-filerevert-param-archivename": "اسم أرشيف المراجعة للعودة إليه.",
 	"apihelp-filerevert-example-revert": "استرجاع <kbd>Wiki.png</kbd> لنسحة <kbd>2011-03-05T15:27:40Z</kbd>.",
 	"apihelp-help-summary": "عرض مساعدة لوحدات محددة.",
 	"apihelp-help-param-modules": "وحدات لعرض مساعدة لها (قيم وسائط <var>action</var> و<var>format</var> أو<kbd>main</kbd>). يمكن تحديد الوحدات الفرعية ب <kbd>+</kbd>.",
@@ -185,16 +228,21 @@
 	"apihelp-help-example-query": "مساعدة لوحدتي استعلام فرعيتين.",
 	"apihelp-imagerotate-summary": "تدوير صورة واحدة أو أكثر.",
 	"apihelp-imagerotate-param-rotation": "درجة تدوير الصورة في اتجاه عقارب الساعة.",
+	"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-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-import-param-templates": "بالنسبة لواردات الإنترويكي: الإستيراد شمل كافة القوالب كذلك.",
 	"apihelp-import-param-namespace": "استيراد إلى هذا النطاق. لا يمكن أن يُستخدَم إلى جانب <var>$1rootpage</var>.",
 	"apihelp-import-param-rootpage": "استيراد كصفحة فرعية لهذه الصفحة. لا يمكن أن يُستخدَم إلى جانب <var>$1rootpage</var>.",
+	"apihelp-import-param-tags": "تغيير الوسوم لتطبيقها على الإدخال في سجل الاستيراد وعلى المراجعة الخالية في الصفحات المستوردة.",
 	"apihelp-import-example-import": "استيراد [[meta:Help:ParserFunctions]] للنطاق 100 بالتاريخ الكامل.",
 	"apihelp-linkaccount-summary": "ربط حساب من موفر طرف ثالث للمستخدم الحالي.",
 	"apihelp-linkaccount-example-link": "بدء عملية ربط حساب من <kbd>Example</kbd>.",
diff --git a/includes/api/i18n/cs.json b/includes/api/i18n/cs.json
index 90af65f936..c69f267b4e 100644
--- a/includes/api/i18n/cs.json
+++ b/includes/api/i18n/cs.json
@@ -269,6 +269,8 @@
 	"api-help-param-required": "Tento parametr je povinný.",
 	"api-help-datatypes-header": "Datové typy",
 	"api-help-datatypes": "Vstupem do MediaWiki by mělo být UTF-8 normalizované do NFC. Jiný vstup se MediaWiki může pokusit převést, ale tím se může stát, že některé operace (např. [[Special:ApiHelp/edit|editace]] s kontrolou MD5) selžou.\n\nNěkteré typy parametrů v API potřebují bližší vysvětlení:\n;boolean\n:Booleovské parametry fungují jako zaškrtávací políčka v HTML: pokud je parametr uveden, bez ohledu na hodnotu, je považován za pravdivý. Pro nepravdivou hodnotu parametr zcela vynechte.\n;časová značka\n:Časové značky lze uvádět v několika formátech. Doporučuje se datum a čas podle ISO 8601. Všechny časy jsou v UTC a obsažené časové pásmo je ignorováno.\n:* Datum a čas podle ISO 8601, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (interpunkce a <kbd>Z</kbd> jsou nepovinné)\n:* Datum a čas podle ISO 8601 s (ignorovaným) zlomkem sekundy, <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> (pomlčky, dvojtečky a <kbd>Z</kbd> jsou nepovinné)\n:* Formát MediaWiki, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Obecný číselný formát, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (nepovinné časové pásmo <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd> nebo <kbd>-<var>##</var></kbd> se ignoruje)\n:* Formát EXIF, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formát podle RFC 2822 (časové pásmo lze vynechat), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formát podle RFC 850 (časové pásmo lze vynechat), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formát podle céčkové funkce ctime, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Sekundy od 1970-01-01T00:00:00Z jako celé číslo o 1–13 číslicích (s výjimkou <kbd>0</kbd>)\n:* Řetězec <kbd>now</kbd>\n;alternativní oddělovač vícenásobných hodnot\n:Parametry, které přijímají několik hodnot, se zpravidla předávají s hodnotami oddělenými svislítkem, např. <kbd>param=hodnota1|hodnota2</kbd> nebo <kbd>param=hodnota1%7Chodnota2</kbd>. Pokud musí hodnota obsahovat svislítko, použijte jako oddělovač znak U+001F (Unit Separator) ''a'' před hodnotu přidejte U+001F, např. <kbd>param=%1Fhodnota1%1Fhodnota2</kbd>.",
+	"api-help-templatedparams-header": "Šablonované parametry",
+	"api-help-templatedparams": "Šablonované parametry umožňují situace, kdy modul API potřebuje hodnotu pro každou hodnotu nějakého jiného parametru. Pokud by například existoval modul API pro získání ovoce, mohl by mít parametr <var>ovoce</var>, kterým se určí požadované druhy ovoce, a šablonovaný parametr <var>{ovoce}-počet</var>, kterým se určí požadované počty jednotlivých druhů. Klient API, který by chtěl 1 jablko, 5 banánů a 20 jahod, by mohl vytvořit požadavek <kbd>ovoce=jablka|banány|jahody&jablka-počet=1&banány-počet=5&jahody-počet=20</kbd>.",
 	"api-help-param-type-integer": "Typ: {{PLURAL:$1|1=celé číslo|2=seznam celých čísel}}",
 	"api-help-param-type-boolean": "Typ: boolean ([[Special:ApiHelp/main#main/datatypes|podrobnosti]])",
 	"api-help-param-list": "{{PLURAL:$1|1=Jedna z následujících hodnot|2=Hodnoty (oddělené <kbd>{{!}}</kbd> nebo [[Special:ApiHelp/main#main/datatypes|alternativou]].)}}: $2",
diff --git a/includes/api/i18n/de.json b/includes/api/i18n/de.json
index b1eee12d6d..86a22e606f 100644
--- a/includes/api/i18n/de.json
+++ b/includes/api/i18n/de.json
@@ -762,6 +762,7 @@
 	"apihelp-query+iwbacklinks-paramvalue-prop-iwtitle": "Ergänzt den Titel des Interwikis.",
 	"apihelp-query+iwbacklinks-param-dir": "Die Auflistungsrichtung.",
 	"apihelp-query+iwbacklinks-example-simple": "Ruft Seiten ab, die auf [[wikibooks:Test]] verlinken.",
+	"apihelp-query+iwlinks-summary": "Gibt alle Interwikilinks der angegebenen Seiten zurück.",
 	"apihelp-query+iwlinks-param-prop": "Zusätzlich zurückzugebende Eigenschaften jedes Interlanguage-Links:",
 	"apihelp-query+iwlinks-paramvalue-prop-url": "Ergänzt die vollständige URL.",
 	"apihelp-query+iwlinks-param-limit": "Wie viele Interwiki-Links zurückgegeben werden sollen.",
@@ -1030,7 +1031,11 @@
 	"api-help-parameters": "{{PLURAL:$1|Parameter}}:",
 	"api-help-param-deprecated": "Veraltet.",
 	"api-help-param-required": "Dieser Parameter ist erforderlich.",
+	"api-help-param-templated": "Dies ist ein [[Special:ApiHelp/main#main/templatedparams|Vorlagenparameter]]. Bei der Erstellung der Anfrage $2.",
+	"api-help-param-templated-var-first": "<var>&#x7B;$1&#x7D;</var> im Parameternamen sollte mit Werten von <var>$2</var> ersetzt werden",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> mit Werten von <var>$2</var>",
 	"api-help-datatypes-header": "Datentypen",
+	"api-help-templatedparams-header": "Vorlagenparameter",
 	"api-help-param-type-limit": "Typ: Ganzzahl oder <kbd>max</kbd>",
 	"api-help-param-type-integer": "Typ: {{PLURAL:$1|1=Ganzzahl|2=Liste von Ganzzahlen}}",
 	"api-help-param-type-boolean": "Typ: boolesch ([[Special:ApiHelp/main#main/datatypes|Einzelheiten]])",
@@ -1096,6 +1101,7 @@
 	"apierror-unknownerror-nocode": "Unbekannter Fehler.",
 	"apierror-unknownerror": "Unbekannter Fehler: „$1“.",
 	"apierror-unknownformat": "Nicht erkanntes Format „$1“.",
+	"apiwarn-ignoring-invalid-templated-value": "Ignorieren des Wertes <kbd>$2</kbd> in <var>$1</var> bei der Verarbeitung von Vorlagenparametern.",
 	"apiwarn-invalidcategory": "„$1“ ist keine Kategorie.",
 	"apiwarn-invalidtitle": "„$1“ ist kein gültiger Titel.",
 	"apiwarn-notfile": "„$1“ ist keine Datei.",
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 6838e545d6..573d37c664 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -1586,8 +1586,13 @@
 	"api-help-parameters": "{{PLURAL:$1|Parameter|Parameters}}:",
 	"api-help-param-deprecated": "Deprecated.",
 	"api-help-param-required": "This parameter is required.",
+	"api-help-param-templated": "This is a [[Special:ApiHelp/main#main/templatedparams|templated parameter]]. When making the request, $2.",
+	"api-help-param-templated-var-first": "<var>&#x7B;$1&#x7D;</var> in the parameter's name should be replaced with values of <var>$2</var>",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> with values of <var>$2</var>",
 	"api-help-datatypes-header": "Data types",
 	"api-help-datatypes": "Input to MediaWiki should be NFC-normalized UTF-8. MediaWiki may attempt to convert other input, but this may cause some operations (such as [[Special:ApiHelp/edit|edits]] with MD5 checks) to fail.\n\nSome parameter types in API requests need further explanation:\n;boolean\n:Boolean parameters work like HTML checkboxes: if the parameter is specified, regardless of value, it is considered true. For a false value, omit the parameter entirely.\n;timestamp\n:Timestamps may be specified in several formats. ISO 8601 date and time is recommended. All times are in UTC, any included timezone is ignored.\n:* ISO 8601 date and time, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (punctuation and <kbd>Z</kbd> are optional)\n:* ISO 8601 date and time with (ignored) fractional seconds, <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> (dashes, colons, and <kbd>Z</kbd> are optional)\n:* MediaWiki format, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Generic numeric format, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (optional timezone of <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd>, or <kbd>-<var>##</var></kbd> is ignored)\n:* EXIF format, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:*RFC 2822 format (timezone may be omitted), <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 format (timezone may be omitted), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* C ctime format, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Seconds since 1970-01-01T00:00:00Z as a 1 to 13 digit integer (excluding <kbd>0</kbd>)\n:* The string <kbd>now</kbd>\n;alternative multiple-value separator\n:Parameters that take multiple values are normally submitted with the values separated using the pipe character, e.g. <kbd>param=value1|value2</kbd> or <kbd>param=value1%7Cvalue2</kbd>. If a value must contain the pipe character, use U+001F (Unit Separator) as the separator ''and'' prefix the value with U+001F, e.g. <kbd>param=%1Fvalue1%1Fvalue2</kbd>.",
+	"api-help-templatedparams-header": "Templated parameters",
+	"api-help-templatedparams": "Templated parameters support cases where an API module needs a value for each value of some other parameter. For example, if there were an API module to request fruit, it might have a parameter <var>fruits</var> to specify which fruits are being requested and a templated parameter <var>{fruit}-quantity</var> to specify how many of each fruit to request. An API client that wants 1 apple, 5 bananas, and 20 strawberries could then make a request like <kbd>fruits=apples|bananas|strawberries&apples-quantity=1&bananas-quantity=5&strawberries-quantity=20</kbd>.",
 	"api-help-param-type-limit": "Type: integer or <kbd>max</kbd>",
 	"api-help-param-type-integer": "Type: {{PLURAL:$1|1=integer|2=list of integers}}",
 	"api-help-param-type-boolean": "Type: boolean ([[Special:ApiHelp/main#main/datatypes|details]])",
@@ -1854,6 +1859,7 @@
 	"apiwarn-difftohidden": "Couldn't diff to r$1: content is hidden.",
 	"apiwarn-errorprinterfailed": "Error printer failed. Will retry without params.",
 	"apiwarn-errorprinterfailed-ex": "Error printer failed (will retry without params): $1",
+	"apiwarn-ignoring-invalid-templated-value": "Ignoring value <kbd>$2</kbd> in <var>$1</var> when processing templated parameters.",
 	"apiwarn-invalidcategory": "\"$1\" is not a category.",
 	"apiwarn-invalidtitle": "\"$1\" is not a valid title.",
 	"apiwarn-invalidxmlstylesheetext": "Stylesheet should have <code>.xsl</code> extension.",
diff --git a/includes/api/i18n/fr.json b/includes/api/i18n/fr.json
index 5ce23316b5..ab3f430787 100644
--- a/includes/api/i18n/fr.json
+++ b/includes/api/i18n/fr.json
@@ -1488,8 +1488,13 @@
 	"api-help-parameters": "{{PLURAL:$1|Paramètre|Paramètres}} :",
 	"api-help-param-deprecated": "Désuet.",
 	"api-help-param-required": "Ce paramètre est obligatoire.",
+	"api-help-param-templated": "Ceci est un [[Special:ApiHelp/main#main/templatedparams|paramètre de modèle]]. En faisant une requête, $2.",
+	"api-help-param-templated-var-first": "<var>&#x7B;$1&#x7D;</var> dans le nom du paramètre doit être remplacé par des valeurs de <var>$2</var>",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> par les valeurs de <var>$2</var>",
 	"api-help-datatypes-header": "Type de données",
 	"api-help-datatypes": "Les entrées dans MédiaWiki doivent être en UTF-8 à la norme NFC. MédiaWiki peut tenter de convertir d’autres types d’entrée, mais cela peut faire échouer certaines opérations (comme les [[Special:ApiHelp/edit|modifications]] avec contrôles MD5) to fail.\n\nCertains types de paramètre dans les requêtes de l’API nécessitent plus d’explication :\n;boolean\n:Les paramètres booléens fonctionnent comme des cases à cocher HTML : si le paramètre est spécifié, quelle que soit sa valeur, il est considéré comme vrai. Pour une valeur fausse, enlever complètement le paramètre.\n;timestamp\n:Les horodatages peuvent être spécifiés sous différentes formes. Date et heure ISO 8601 est recommandé. Toutes les heures sont en UTC, tout fuseau horaire inclus est ignoré.\n:* Date et heure ISO 8601, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (la ponctuation et <kbd>Z</kbd> sont facultatifs)\n:* Date et heure ISO 8601 avec fractions de seconde (ignorées), <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> (tirets, deux-points et <kbd>Z</kbd> sont facultatifs)\n:* Format MédiaWiki, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Format numérique générique, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (fuseau horaire facultatif en <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd>, ou <kbd>-<var>##</var></kbd> sont ignorés)\n:* Format EXIF, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:*Format RFC 2822 (le fuseau horaire est facultatif), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Format RFC 850 (le fuseau horaire est facultatif), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Format 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:* Secondes depuis 1970-01-01T00:00:00Z sous forme d’entier de 1 à 13 chiffres (sans <kbd>0</kbd>)\n:* La chaîne <kbd>now</kbd>",
+	"api-help-templatedparams-header": "Paramètres de modèle",
+	"api-help-templatedparams": "Les paramètres de modèle supportent les cas où un module d’API a besoin d’une valeur pour chaque valeur d’un autre paramètre quelconque. Par exemple, s’il y avait un module d’API pour demander un fruit, il pourrait avoir un paramètre <var>fruits</var> pour spécifier quels fruits sont demandés et un paramètre de modèle <var>{fruit}-quantité</var> pour spécifier combien de chaque fruit demander. Un client de l’API qui voudrait une pomme, cinq bananes et vingt fraises pourrait alors faire une requête comme <kbd>fruits=pommes|bananes|fraises&pommes-quantité=1&bananes-quantité=5&fraises-quantité=20</kbd>.",
 	"api-help-param-type-limit": "Type : entier ou <kbd>max</kbd>",
 	"api-help-param-type-integer": "Type : {{PLURAL:$1|1=entier|2=liste d’entiers}}",
 	"api-help-param-type-boolean": "Type : booléen ([[Special:ApiHelp/main#main/datatypes|détails]])",
@@ -1750,6 +1755,7 @@
 	"apiwarn-difftohidden": "Impossible de faire un diff avec r$1 : le contenu est masqué.",
 	"apiwarn-errorprinterfailed": "Erreur échec imprimante. Nouvel essai sans paramètres.",
 	"apiwarn-errorprinterfailed-ex": "Erreur d’échec de l’impression (réessayera sans paramètres) : $1",
+	"apiwarn-ignoring-invalid-templated-value": "Ignorer la valeur <kbd>$2</kbd> dans <var>$1</var> en traitant les paramètres de modèle.",
 	"apiwarn-invalidcategory": "« $1 » n'est pas une catégorie.",
 	"apiwarn-invalidtitle": "« $1 » n’est pas un titre valide.",
 	"apiwarn-invalidxmlstylesheetext": "Une feuille de style doit avoir une extension <code>.xsl</code>.",
diff --git a/includes/api/i18n/he.json b/includes/api/i18n/he.json
index 097d510625..911ac2f1fa 100644
--- a/includes/api/i18n/he.json
+++ b/includes/api/i18n/he.json
@@ -475,7 +475,7 @@
 	"apihelp-query+allimages-param-sha1base36": "גיבוב SHA1 של התמונה בבסיס 36 (הבסיס בו נעשה שימוש במדיה־ויקי).",
 	"apihelp-query+allimages-param-user": "להחזיר רק קבצים שהועלו על־ידי המשתמש הזה. יכול לשמש רק עם $1sort=timestamp. לא יכול לשמש יחד עם $1filterbots.",
 	"apihelp-query+allimages-param-filterbots": "איך לסנן קבצים שמעלים בוטים. יכול לשמש רק עם $1sort=timestamp. לא יכול לשמש יחד עם $1user.",
-	"apihelp-query+allimages-param-mime": "אילו סוגי MIME לחבפש, למשל <kbd>image/jpeg</kbd>.",
+	"apihelp-query+allimages-param-mime": "אילו סוגי MIME לחפש, למשל <kbd>image/jpeg</kbd>.",
 	"apihelp-query+allimages-param-limit": "כמה תמונות להחזיר בסך הכול.",
 	"apihelp-query+allimages-example-B": "הצגת רשימה של קבצים שמתחילים באות <kbd>B</kbd>.",
 	"apihelp-query+allimages-example-recent": "הצגת רשימת קבצים שהועלו לאחרונה, דומה ל־[[Special:NewFiles]].",
@@ -642,7 +642,7 @@
 	"apihelp-query+categories-paramvalue-prop-hidden": "תיוג קטגוריות שהוסתרו באמצעות <code>_&#95;HIDDENCAT_&#95;</code>.",
 	"apihelp-query+categories-param-show": "איזה סוג של קטגוריות להציג.",
 	"apihelp-query+categories-param-limit": "כמה קטגוריות להחזיר.",
-	"apihelp-query+categories-param-categories": "לרשום רק את הקטגוריות האלו. שימושי לבדיקה עם דף מסוים נמצא בקטגוריה מסוימת.",
+	"apihelp-query+categories-param-categories": "לרשום רק את הקטגוריות האלו. שימושי לבדיקה אם דף מסוים נמצא בקטגוריה מסוימת.",
 	"apihelp-query+categories-param-dir": "באיזה כיוון לרשום.",
 	"apihelp-query+categories-example-simple": "קבלת רשימת קטגוריות שהם <kbd>Albert Einstein</kbd> שייך אליהן.",
 	"apihelp-query+categories-example-generator": "קבלת מידע על כל הקטגוריות שמשמשות בדף <kbd>Albert Einstein</kbd>.",
@@ -799,7 +799,7 @@
 	"apihelp-query+imageinfo-paramvalue-prop-uploadwarning": "משמש את Special:Upload כדי לקבל מידע על קובץ קיים. לא נועד לשימוש מחוץ לליבת MediaWiki.",
 	"apihelp-query+imageinfo-paramvalue-prop-badfile": "מוסיף האם הקובץ נמצא ב־[[MediaWiki:Bad image list]]",
 	"apihelp-query+imageinfo-param-limit": "כמה גרסאות של קובץ לכל קובץ.",
-	"apihelp-query+imageinfo-param-start": "מאיז חותם־זמן להתחיל רשימה.",
+	"apihelp-query+imageinfo-param-start": "מאילו תאריך ושעה להתחיל את הרשימה.",
 	"apihelp-query+imageinfo-param-end": "באיזה חותם־זמן לסיים את הרשימה.",
 	"apihelp-query+imageinfo-param-urlwidth": "אם מוגדר $2prop=url, יוחזר URL לתמונה שגודלה הותאם לרוחב הזה.\nמסיבות של ביצועים, אם האפשרות הזאת משמשת, לא יוחזרו יותר מ־$1 תמונות.",
 	"apihelp-query+imageinfo-param-urlheight": "דומה ל־$1urlwidth.",
@@ -987,7 +987,7 @@
 	"apihelp-query+recentchanges-param-end": "באיזה חותם זמן להפסיק לרשום.",
 	"apihelp-query+recentchanges-param-namespace": "לסנן את השינויים רק למרחבי השם האלה.",
 	"apihelp-query+recentchanges-param-user": "לרשום רק שינויים של המשתמש הזה.",
-	"apihelp-query+recentchanges-param-excludeuser": "Don't list changes by this user",
+	"apihelp-query+recentchanges-param-excludeuser": "לא לרשום שינויים ממשתמש זה.",
 	"apihelp-query+recentchanges-param-tag": "לרשום רק שינויים שמתויגים עם התג הזה.",
 	"apihelp-query+recentchanges-param-prop": "לכלול פריטי מידע נוספים:",
 	"apihelp-query+recentchanges-paramvalue-prop-user": "הוספת המשתמש האחראי על העריכה ותיוג אם זאת כתובת IP.",
@@ -1098,7 +1098,7 @@
 	"apihelp-query+siteinfo-paramvalue-prop-namespacealiases": "רשימת כינויי מרחבי שם רשומים.",
 	"apihelp-query+siteinfo-paramvalue-prop-specialpagealiases": "רשימת כינויים דפים מיוחדים.",
 	"apihelp-query+siteinfo-paramvalue-prop-magicwords": "רשימות מילות קסם וכינוייהן.",
-	"apihelp-query+siteinfo-paramvalue-prop-statistics": "החזרזת סטטיסטיקות אתר.",
+	"apihelp-query+siteinfo-paramvalue-prop-statistics": "החזרת סטטיסטיקות של האתר.",
 	"apihelp-query+siteinfo-paramvalue-prop-interwikimap": "החזרת מפת בינוויקי (אפשר שתהיה מסוננת, אפשר שתהיה מותאמת מקומית באמצעות <var>$1inlanguagecode</var>).",
 	"apihelp-query+siteinfo-paramvalue-prop-dbrepllag": "החזרת שרת מסד־נתונים עם שיהוי השכפול הגבוה ביותר.",
 	"apihelp-query+siteinfo-paramvalue-prop-usergroups": "החזרת קבוצות משתמשים וההרשאות המשויכות.",
@@ -1233,7 +1233,7 @@
 	"apihelp-query+watchlist-param-end": "באיזה חותם זמן להפסיק לרשום.",
 	"apihelp-query+watchlist-param-namespace": "סינון שינויים רק למרחבי השם שניתנו.",
 	"apihelp-query+watchlist-param-user": "לרשום רק שינויים של המשתמש הזה.",
-	"apihelp-query+watchlist-param-excludeuser": "Don't list changes by this user",
+	"apihelp-query+watchlist-param-excludeuser": "לא לרשום שינויים ממשתמש זה.",
 	"apihelp-query+watchlist-param-limit": "כמה תוצאות סך הכול להחזיר בכל בקשה.",
 	"apihelp-query+watchlist-param-prop": "אילו מאפיינים נוספים לקבל:",
 	"apihelp-query+watchlist-paramvalue-prop-ids": "הוספת מזהי גסה ומזהי דף.",
@@ -1302,7 +1302,7 @@
 	"apihelp-rollback-param-title": "שם הדף לשחזור. לא יכול לשמש יחד עם <var>$1pageid</var>.",
 	"apihelp-rollback-param-pageid": "מזהה הדף לשחזור. לא יכול לשמש יחד עם <var>$1title</var>.",
 	"apihelp-rollback-param-tags": "אילו תגים להחיל על השחזור.",
-	"apihelp-rollback-param-user": "שם המשתמשים שהעריכות שלו תשוחזרנה.",
+	"apihelp-rollback-param-user": "שם המשתמש שהעריכות שלו תשוחזרנה.",
 	"apihelp-rollback-param-summary": "תקציר עריכה מותאם. אם ריק, ישמש תקציר לפי בררת מחדל.",
 	"apihelp-rollback-param-markbot": "לסמן את העריכות ששוחזרו ואת השחזור בתור עריכות בוט.",
 	"apihelp-rollback-param-watchlist": "הוספה או הסרה של הדף ללא תנאי מרשימת המעקב של המשתמש הנוכחי, להשתמש בהעדפות או לא לשנות את המעקב.",
@@ -1320,8 +1320,8 @@
 	"apihelp-setnotificationtimestamp-example-page": "אתחול מצב ההודעה עבור <kbd>Main Page</kbd>.",
 	"apihelp-setnotificationtimestamp-example-pagetimestamp": "הגדרת חותם־הזמן להודעה ל־<kbd>Main page</kbd> כך שכל העריכות מאז 1 בינואר 2012 מוגדרות בתור כאלה שלא נצפו.",
 	"apihelp-setnotificationtimestamp-example-allpages": "אתחול מצב ההודעה עבור דפים במרחב השם <kbd>{{ns:user}}</kbd>.",
-	"apihelp-setpagelanguage-summary": "שנה את השפה של דף",
-	"apihelp-setpagelanguage-extended-description-disabled": "שינוי השפה של דף לא מורשה בוויקי זה.\n\nהפעל את <var>[[mw:Special:MyLanguage/Manual:$wgPageLanguageUseDB|$wgPageLanguageUseDB]]</var> על מנת להשתמש בפעולה זו",
+	"apihelp-setpagelanguage-summary": "שינוי השפה של דף.",
+	"apihelp-setpagelanguage-extended-description-disabled": "לא ניתן לשנות שפות של דפים באתר הוויקי הזה.\n\nיש להפעיל את <var dir=\"ltr\">[[mw:Special:MyLanguage/Manual:$wgPageLanguageUseDB|$wgPageLanguageUseDB]]</var> על־מנת להשתמש בפעולה זו.",
 	"apihelp-setpagelanguage-param-title": "כותרת הדף שאת שפתו ברצונך לשנות. לא אפשרי להשתמש באפשרות עם <var>$1pageid</var>.",
 	"apihelp-setpagelanguage-param-pageid": "מזהה הדף שאת שפתו ברצונך לשנות. לא אפשרי להשתמש באפשרות עם <var>$1title</var>.",
 	"apihelp-setpagelanguage-param-lang": "קוד השפה של השפה שאליה צריך לשנות את הדף. יש להשתמש ב־<kbd>default</kbd> כדי לאתחל את הדף לשפת בררת המחדל של הוויקי.",
@@ -1435,7 +1435,7 @@
 	"apihelp-phpfm-summary": "לפלוט נתונים בתסדיר PHP מוסדר (עם הדפסה יפה ב־HTML).",
 	"apihelp-rawfm-summary": "לפלוט את הנתונים, כולל אלמנטים לניפוי שגיאות, בתסדיר JSON (עם הדפסה יפה ב־HTML).",
 	"apihelp-xml-summary": "לפלוט נתונים בתסדיר XML.",
-	"apihelp-xml-param-xslt": "אם צוין, יש להוסיף את שם הדף כגיליון עיצוב XSL. על הערך להיות כותרת ב {{ns:MediaWiki}} במרחב שם המשתמש, המסתיים ב-  <code>.xsl</code>.",
+	"apihelp-xml-param-xslt": "אם צוין, הדף יתווסף כגיליון XSL. הערך חייב להיות כותרת במרחב השם \"{{ns:MediaWiki}}\" שמסתיימת ב־<code dir=\"ltr\">.xsl</code>.",
 	"apihelp-xml-param-includexmlnamespace": "אם זה צוין, מוסיף מרחב שם של XML.",
 	"apihelp-xmlfm-summary": "לפלוט נתונים בתסדיר XML (עם הדפסה יפה ב־HTML).",
 	"api-format-title": "תוצאה של API של מדיה־ויקי",
@@ -1472,8 +1472,13 @@
 	"api-help-parameters": "{{PLURAL:$1|פרמטר|פרמטרים}}:",
 	"api-help-param-deprecated": "מיושן.",
 	"api-help-param-required": "פרמטר זה נדרש.",
+	"api-help-param-templated": "זהו  [[Special:ApiHelp/main#main/templatedparams|פרמטר בתבנית]]. בעת ביצוע הבקשה, $2.",
+	"api-help-param-templated-var-first": "יש להחליף את הטקסט <var>&#x7B;$1&#x7D;</var> (בשם הפרמטר) עם הערכים של הפרמטר <var>$2</var>",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> עם הערכים של הפרמטר <var>$2</var>",
 	"api-help-datatypes-header": "סוגי נתונים",
 	"api-help-datatypes": "קלט למדיה־ויקי צריך להיות בקידוד UTF-8 מנורמל ב־NFC. מדיה־ויקי יכולה לנסות להמיר קלט אחר, אבל זה עלול לגרום לפעולות מסוימות (כגון [[Special:ApiHelp/edit|עריכות]] עם בדיקות MD5) להיכשל.\n\nחלק מסוגי הפרמטרים בבקשות API דורשים הסבר נוסף:\n;בוליאני (boolean)\n:פרמטרים בוליאניים עובדים כמו תיבות סימון של HTML: אם הפרמטר צוין, בלי קשר לערך שלו, הוא אמת (true). בשביל ערך שקר (false), יש להשמיט את הפרמטר לגמרי.\n;חותם־זמן (timestamp)\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 dir=\"ltr\">+<var>##</var></kbd>, או <kbd dir=\"ltr\">-<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:* תסדיר C ctime‏, <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 (מפריד יחידות) בתור המפריד ''וגם'' להוסיף לתחילת הערך U+001F, למשל <kbd>param=%1Fvalue1%1Fvalue2</kbd>.",
+	"api-help-templatedparams-header": "פרמטרים בתבניות",
+	"api-help-templatedparams": "התכונה \"פרמטרים בתבניות\" תומכת במקרים שבהם מודול של API זקוק לערך כלשהו עבור ערכים של פרמטרים אחרים. למשל, אם היה מודול API לבקשת פרי, ייתכן שהוא היה זקוק לפרמטר בשם <var>פירות</var> על־מנת לציין מהם הפירות המבוקשים, ולפרמטר בתבנית בשם <var>{פרי}-כמות</var> על־מנת לציין את הכמות של כל פרי עבור הבקשה. לשם כך, לקוח API שמעוניין לקבל תפוח אחד, 5 בננות ו־20 תותים יכול היה ליצור בקשה בסגנון <kbd>פירות=תפוחים|בננות|תותים&תפוחים-כמות=1&בננות-כמות=5&תותים-כמות=20</kbd>.",
 	"api-help-param-type-limit": "סוג: מספר שלם או <kbd>max</kbd>",
 	"api-help-param-type-integer": "סוג: {{PLURAL:$1|1=מספר שלם|2=רשימת מספרים שלמים}}",
 	"api-help-param-type-boolean": "סוג: בוליאני ([[Special:ApiHelp/main#main/datatypes|פרטים]])",
@@ -1718,7 +1723,7 @@
 	"apierror-writeapidenied": "אין לך הרשאה לערוך את הוויקי הזה דרך ה־API.",
 	"apiwarn-alldeletedrevisions-performance": "לביצועים טובים יותר בעת יצירת כותרת, יש להשתמש ב־<kbd>$1dir=newer</kbd>.",
 	"apiwarn-badurlparam": "לא היה אפשר לפענח את <var>$1urlparam</var> עבור $2. משתמשים רק ב־width ו־height.",
-	"apiwarn-badutf8": "הערך הערך שהועבר ל־<var>$1</var> מכיל נתונים בלתי־תקינים או בלתי־מנורמלים. נתונים טקסט אמורים להיות תקינים, מנורמלי NFC ללא תווי בקרה C0 למעט HT (\\t)‏, LF (\\n), ו־CR (\\r).",
+	"apiwarn-badutf8": "הערך שהועבר ל־<var>$1</var> מכיל נתונים בלתי־תקינים או בלתי־מנורמלים. נתונים טקסט אמורים להיות תקינים, מנורמלי NFC וללא תווי בקרה C0 למעט <span dir=\"ltr\">HT (\\t)</span>&rlm;, <span dir=\"ltr\">LF (\\n)</span>&rlm; ו־<span dir=\"ltr\">CR (\\r)</span>.",
 	"apiwarn-checktoken-percentencoding": "נא לבדוק שסימנים כמו \"+\" באסימון מקודדים עם אחוזים בצורה נכונה ב־URL.",
 	"apiwarn-compare-nocontentmodel": "לא היה אפשר לקבוע את מודל התוכן, נניח שזה $1.",
 	"apiwarn-deprecation-deletedrevs": "<kbd>list=deletedrevs</kbd> הוצהר בתור מיושן. נא להשתמש ב־ <kbd>prop=deletedrevisions</kbd> או ב־<kbd>list=alldeletedrevisions</kbd> במקום זה.",
@@ -1734,9 +1739,10 @@
 	"apiwarn-difftohidden": "לא היה אפשר לעשות השוואה עם גרסה $1: התוכן מוסתר.",
 	"apiwarn-errorprinterfailed": "מדפיס השגיאות לא עבד. ינסה שוב ללא פרמטרים.",
 	"apiwarn-errorprinterfailed-ex": "מדפיס השגיאות לא עבד (ינסה שוב ללא פרמטרים): $1",
+	"apiwarn-ignoring-invalid-templated-value": "לא ייעשה שימוש בערך <kbd>$2</kbd> שבפרמטר <var>$1</var> בעת עיבוד הפרמטרים בתבנית.",
 	"apiwarn-invalidcategory": "\"$1\" אינה קטגוריה.",
 	"apiwarn-invalidtitle": "\"$1\" אינה כותרת תקינה.",
-	"apiwarn-invalidxmlstylesheetext": "לגיליון הסגנונות אמור להיות הסיומת <code dir=\"ltr\">.xsl</code>.",
+	"apiwarn-invalidxmlstylesheetext": "לגיליון הסגנונות אמורה להיות הסיומת <code dir=\"ltr\">.xsl</code>.",
 	"apiwarn-invalidxmlstylesheet": "ניתן גיליון סגנונות שאינו תקין או אינו קיים.",
 	"apiwarn-invalidxmlstylesheetns": "גיליון הסגנונות אמור להיות במרחב השם {{ns:MediaWiki}}.",
 	"apiwarn-moduleswithoutvars": "המאפיין <kbd>modules</kbd> לא הוגדר, אבל לא <kbd>jsconfigvars</kbd> או <kbd>encodedjsconfigvars</kbd>. משתני הגדרות נחוצים בשביל שימוש נכון במודולים.",
@@ -1751,7 +1757,7 @@
 	"apiwarn-toomanyvalues": "יותר מדי ערכים סופקו לפרמטר <var>$1</var>. המגבלה היא $2.",
 	"apiwarn-truncatedresult": "התוצאה נחתכה כי אחרת היא הייתה ארוכה מהמגבלה של $1 בתים.",
 	"apiwarn-unclearnowtimestamp": "העברת \"$2\" בתור פרמטר חותם־זמן <var>$1</var> הוצהרה בתור מיושנת. אם מסיבה כלשהי אתם צריכים להגדיר במפורש את הזמן הנוכחי ללא חישובו בצד הלקוח, יש להשתמש ב־<kbd>now</kbd>.",
-	"apiwarn-unrecognizedvalues": "לפרמטר <var>$1</var> היתנ ג{{PLURAL:$3|ניתן ערך בלתי־ידוע|ניתנו ערכים בלתי־ידועים}}: $2.",
+	"apiwarn-unrecognizedvalues": "לפרמטר <var>$1</var> {{PLURAL:$3|ניתן ערך בלתי־ידוע|ניתנו ערכים בלתי־ידועים}}: $2.",
 	"apiwarn-unsupportedarray": "הפרמטר <var>$1</var> משתמש בתחביר מערכים שאינו נתמך ב־PHP.",
 	"apiwarn-urlparamwidth": "התעלמות מרוחב (width) שהוגדר ב־<var>$1urlparam</var> (ערך: $2) לטובת רוחב שנגזר מ־<var>$1urlwidth</var>/<var>$1urlheight</var> (ערך: $3).",
 	"apiwarn-validationfailed-badchars": "תווים בלתי־תקינים במפתח (מותרים רק <code>a-z</code>‏, <code>A-Z</code>‏, <code>0-9</code>‏, <code>_</code>, ו־<code>-</code>).",
diff --git a/includes/api/i18n/it.json b/includes/api/i18n/it.json
index 38d290158f..881117756b 100644
--- a/includes/api/i18n/it.json
+++ b/includes/api/i18n/it.json
@@ -652,7 +652,9 @@
 	"api-help-parameters": "{{PLURAL:$1|Parametro|Parametri}}:",
 	"api-help-param-deprecated": "Deprecato.",
 	"api-help-param-required": "Questo parametro è obbligatorio.",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> con valori di <var>$2</var>",
 	"api-help-datatypes-header": "Tipi di dato",
+	"api-help-templatedparams-header": "Parametri template",
 	"api-help-param-type-limit": "Tipo: intero o <kbd>max</kbd>",
 	"api-help-param-type-integer": "Tipo: {{PLURAL:$1|1=intero|2=elenco di interi}}",
 	"api-help-param-type-boolean": "Tipo: booleano ([[Special:ApiHelp/main#main/datatypes|dettagli]])",
diff --git a/includes/api/i18n/ko.json b/includes/api/i18n/ko.json
index 354e75cf03..79a33aea09 100644
--- a/includes/api/i18n/ko.json
+++ b/includes/api/i18n/ko.json
@@ -756,6 +756,7 @@
 	"api-help-param-required": "이 변수는 필수 입력 사항입니다.",
 	"api-help-datatypes-header": "데이터 유형",
 	"api-help-datatypes": "API 요청 내 몇몇 매개변수형에 대해 더 자세히 설명해보겠습니다:\n;boolean\n:Boolean 매개변수들은 HTML 체크박스처럼 동작합니다: 만약 매개변수가 지정되었다면, 값에 상관없이 참의 값으로 여겨집니다. 거짓값은 매개변수 전체를 생략하세요.\n;timestamp\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:* 미디어위키 형식, <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:*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:* C ctime 형식, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* 1부터 13자리까지의 숫자로 표현된 1970-01-01T00:00:00Z부터 흐른 시간(초) (<kbd>0</kbd>을 제외)\n:* 문자열 <kbd>now</kbd>",
+	"api-help-templatedparams-header": "틀 변수",
 	"api-help-param-type-limit": "유형: 정수 또는 <kbd>max</kbd>",
 	"api-help-param-type-integer": "유형: {{PLURAL:$1|1=정수|2=정수 목록}}",
 	"api-help-param-type-boolean": "유형: 불리언 ([[Special:ApiHelp/main#main/datatypes|자세한 정보]])",
diff --git a/includes/api/i18n/pt-br.json b/includes/api/i18n/pt-br.json
index 1445647582..df7ea51ef2 100644
--- a/includes/api/i18n/pt-br.json
+++ b/includes/api/i18n/pt-br.json
@@ -1471,8 +1471,13 @@
 	"api-help-parameters": "{{PLURAL:$1|Parâmetro|Parâmetros}}:",
 	"api-help-param-deprecated": "Obsoleto.",
 	"api-help-param-required": "Este parâmetro é obrigatório.",
+	"api-help-param-templated": "Este parâmetro é um [[Special:ApiHelp/main#main/templatedparams|parâmetro de predefinição]]. Ao fazer o pedido, $2.",
+	"api-help-param-templated-var-first": "<var>&#x7B;$1&#x7D;</var> no nome do parâmetro deve ser substituído com os valores de <var>$2</var>",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> com valores de <var>$2</var>",
 	"api-help-datatypes-header": "Tipos de dados",
 	"api-help-datatypes": "A entrada para MediaWiki deve ser UTF-8 normalizada pelo NFC. O MediaWiki pode tentar converter outra entrada, mas isso pode causar a falha de algumas operações (como [[Special:ApiHelp/edit|editar]] com verificações MD5).\n\nAlguns tipos de parâmetros em solicitações de API precisam de uma explicação adicional:\n;boolean\n:Os parâmetros booleanos funcionam como caixas de seleção HTML: se o parâmetro for especificado, independentemente do valor, é considerado verdadeiro. Para um valor falso, omita o parâmetro inteiramente.\n;timestamp\n: As marcas de tempo podem ser especificadas em vários formatos. É recomendada a data e a hora ISO 8601. Todos os horários estão em UTC, qualquer fuso horário incluído é ignorado.\n:* Data e hora ISO 8601, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (pontuação e <kbd>Z</kbd> são opcionais)\n:* ISO 8601 data e hora com segundos fracionados (ignorados), <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> (traços, dois pontos e <kbd>Z</kbd> são opcionais)\n:* Formato MediaWiki, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Formato numérico genérico, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (fuso horário opcional de <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd> ou <kbd>-<var>##</var></kbd> é ignorado)\n:* Formato EXIF, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formato RFC 2822 (o fuso horário pode ser omitido), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formato RFC 850 (fuso horário Pode ser omitido), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* C ctime format, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Segundos desde 1970-01-01T00:00:00Z como um inteiro de 1 a 13 dígitos (excluindo <kbd>0</kbd>)\n:* A string <kbd>now</kbd>\n; valor múltiplo alternativo separador\n: Os parâmetros que levam vários valores são normalmente enviados com os valores separados usando o caractere do pipe, por exemplo <kbd>param=value1|value2</kbd> ou <kbd>param=value1%7Cvalue2</kbd>. Se um valor deve conter o caractere de pipe, use U+001F (separador de unidade) como o separador ''and'' prefixa o valor com U+001F, por exemplo, <kbd>param=%1Fvalue1%1Fvalue2</kbd>.",
+	"api-help-templatedparams-header": "Parâmetros da predefinição",
+	"api-help-templatedparams": "Os parâmetros modelados usam-se nos casos em que um módulo da API necessita de um valor para cada valor de um outro parâmetro. Por exemplo, se existisse um módulo da API para encomendar fruta, poderia ter um parâmetro <var>frutas</var> para especificar as frutas que estão a ser encomendadas e um parâmetro modelado <var>quantidade-de-{fruta}</var> para especificar quanto de cada fruta. Um cliente da API que pretenda 1 maçã, 5 bananas e 20 morangos pode então fazer um pedido como <kbd>frutas=maçãs|bananas|morangos&quantidade-de-maçãs=1&quantidade-de-bananas=5&quantidade-de-morangos=20</kbd>.",
 	"api-help-param-type-limit": "Tipo: inteiro ou <kbd>max</kbd>",
 	"api-help-param-type-integer": "Tipo: {{PLURAL:$1|1=inteiro|2=lista de inteiros}}",
 	"api-help-param-type-boolean": "Tipo: boleano ([[Special:ApiHelp/main#main/datatypes|details]])",
@@ -1733,6 +1738,7 @@
 	"apiwarn-difftohidden": "Não foi possível diferenciar r$1: o conteúdo está oculto.",
 	"apiwarn-errorprinterfailed": "Falha na impressora de erro. Repetirá sem parâmetros.",
 	"apiwarn-errorprinterfailed-ex": "Falha na impressora de erro (repetirá sem parâmetros): $1",
+	"apiwarn-ignoring-invalid-templated-value": "Ignorando o valor <kbd>$2</kbd> em <var>$1</var> ao processar parâmetros de predefinição.",
 	"apiwarn-invalidcategory": "\"$1\" não é uma categoria.",
 	"apiwarn-invalidtitle": "\"$1\" não é um título válido.",
 	"apiwarn-invalidxmlstylesheetext": "Stylesheet deve ter extensão <code>.xsl</code>.",
diff --git a/includes/api/i18n/pt.json b/includes/api/i18n/pt.json
index 2a81d29d93..9adb8b9a8f 100644
--- a/includes/api/i18n/pt.json
+++ b/includes/api/i18n/pt.json
@@ -1466,8 +1466,13 @@
 	"api-help-parameters": "{{PLURAL:$1|Parâmetro|Parâmetros}}:",
 	"api-help-param-deprecated": "Obsoleto.",
 	"api-help-param-required": "Este parâmetro é obrigatório.",
+	"api-help-param-templated": "Este parâmetro é um [[Special:ApiHelp/main#main/templatedparams|parâmetro modelado]]. Ao fazer o pedido, $2.",
+	"api-help-param-templated-var-first": "<var>&#x7B;$1&#x7D;</var> no nome do parâmetro deve ser substituído com os valores de <var>$2</var>",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var> com valores de <var>$2</var>",
 	"api-help-datatypes-header": "Tipo de dados",
 	"api-help-datatypes": "O formato de entrada para o MediaWiki deve ser UTF-8, normalizado de acordo com a norma NFC. O MediaWiki pode converter outros tipos de entrada, mas esta conversão pode originar a falha de algumas operações (tais como as [[Special:ApiHelp/edit|edições]] com verificações MD5).\n\nAlguns tipos de parâmetros nos pedidos à API necessitam de mais explicações:\n;boolean\n:Os parâmetros booleanos funcionam como as caixas de seleção HTML: se o parâmetro for especificado, independentemente do seu valor, é considerado verdadeiro. Para um valor falso, omitir o parâmetro completo.\n;timestamp\n:As datas e horas podem ser especificadas em vários formatos. É recomendado o formato ISO 8601. Todas as horas estão em UTC, qualquer inclusão do fuso horário é ignorada.\n:* Data e hora ISO 8601, <kbd><var>2001</var>-<var>01</var>-<var>15</var>T<var>14</var>:<var>56</var>:<var>00</var>Z</kbd> (pontuação e <kbd>Z</kbd> são opcionais)\n:* Data e hora ISO 8601 com segundos fracionários (estes são ignorados), <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> (traços, dois pontos e <kbd>Z</kbd> são opcionais)\n:* Formato do MediaWiki, <kbd><var>2001</var><var>01</var><var>15</var><var>14</var><var>56</var><var>00</var></kbd>\n:* Formato numérico genérico, <kbd><var>2001</var>-<var>01</var>-<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd> (fuso horário opcional <kbd>GMT</kbd>, <kbd>+<var>##</var></kbd>, ou <kbd>-<var>##</var></kbd> são ignorados)\n:* Formato EXIF, <kbd><var>2001</var>:<var>01</var>:<var>15</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:*Formato RFC 2822 (o fuso horário pode ser omitido), <kbd><var>Mon</var>, <var>15</var> <var>Jan</var> <var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formato RFC 850 (o fuso horário pode ser omitido), <kbd><var>Monday</var>, <var>15</var>-<var>Jan</var>-<var>2001</var> <var>14</var>:<var>56</var>:<var>00</var></kbd>\n:* Formato C ctime, <kbd><var>Mon</var> <var>Jan</var> <var>15</var> <var>14</var>:<var>56</var>:<var>00</var> <var>2001</var></kbd>\n:* Segundos desde 1970-01-01T00:00:00Z como um inteiro de 1 a 13 algarismos (excluindo <kbd>0</kbd>)\n:* O texto <kbd>now</kbd>\n;separador alternativo de valores múltiplos\n:Os parâmetros que aceitam vários valores são normalmente fornecidos com os valores separados por uma barra vertical (''pipe''), por exemplo <kbd>parâmetro=valor1|valor2</kbd> ou <kbd>parâmetro=valor1%7Cvalor2</kbd>. Se um valor contém a barra vertical, use como separador o U+001F (Separador de Unidades) ''e'' prefixe o valor com U+001F, isto é, <kbd>parâmetro=%1Fvalor1%1Fvalor2</kbd>.",
+	"api-help-templatedparams-header": "Parâmetros modelados",
+	"api-help-templatedparams": "Os parâmetros modelados usam-se nos casos em que um módulo da API necessita de um valor para cada valor de um outro parâmetro. Por exemplo, se existisse um módulo da API para encomendar fruta, poderia ter um parâmetro <var>frutas</var> para especificar as frutas que estão a ser encomendadas e um parâmetro modelado <var>quantidade-de-{fruta}</var> para especificar quanto de cada fruta. Um cliente da API que pretenda 1 maçã, 5 bananas e 20 morangos pode então fazer um pedido como <kbd>frutas=maçãs|bananas|morangos&quantidade-de-maçãs=1&quantidade-de-bananas=5&quantidade-de-morangos=20</kbd>.",
 	"api-help-param-type-limit": "Tipo: inteiro ou <kbd>max</kbd>",
 	"api-help-param-type-integer": "Tipo: {{PLURAL:$1|1=inteiro|2=lista de números inteiros}}",
 	"api-help-param-type-boolean": "Tipo: booleano ([[Special:ApiHelp/main#main/datatypes|detalhes]])",
@@ -1728,6 +1733,7 @@
 	"apiwarn-difftohidden": "Não foi possível criar uma lista das diferenças em relação à r$1: o conteúdo está ocultado.",
 	"apiwarn-errorprinterfailed": "A impressora de erros falhou. Será feita nova tentativa sem parâmetros.",
 	"apiwarn-errorprinterfailed-ex": "A impressora de erros falhou (será feita nova tentativa sem parâmetros): $1",
+	"apiwarn-ignoring-invalid-templated-value": "A ignorar o valor <kbd>$2</kbd> em <var>$1</var> ao processar parâmetros modelados.",
 	"apiwarn-invalidcategory": "\"$1\" não é uma categoria.",
 	"apiwarn-invalidtitle": "\"$1\" não é um título válido.",
 	"apiwarn-invalidxmlstylesheetext": "Uma folha de estilos deve ter a extensão <code>.xsl</code>.",
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 594bf8e685..086e74bf2d 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -1476,8 +1476,13 @@
 	"api-help-parameters": "Label for the API help parameters section\n\nParameters:\n* $1 - Number of parameters to be displayed\n{{Identical|Parameter}}",
 	"api-help-param-deprecated": "Displayed in the API help for any deprecated parameter\n{{Identical|Deprecated}}",
 	"api-help-param-required": "Displayed in the API help for any required parameter",
+	"api-help-param-templated": "Displayed in the API help for any templated parameter.\n\nParameters:\n* $1 - Count of template variables in the parameter name.\n* $2 - A list, composed using {{msg-mw|comma-separator}} and {{msg-mw|and}}, of the template variables in the parameter name. The first is formatted using {{msg-mw|api-help-param-templated-var-first|notext=1}} and the rest use {{msg-mw|api-help-param-templated-var|notext=1}}.\n\nSee also:\n* {{msg-mw|api-help-param-templated-var-first}}\n* {{msg-mw|api-help-param-templated-var}}",
+	"api-help-param-templated-var-first": "Used with {{msg-mw|api-help-param-templated|notext=1}} to display templated parameter replacement variables. See that message for context.\n\nParameters:\n* $1 - Variable.\n* $2 - Parameter from which values are taken.\n\nSee also:\n* {{msg-mw|api-help-param-templated}}\n* {{msg-mw|api-help-param-templated-var}}",
+	"api-help-param-templated-var": "Used with {{msg-mw|api-help-param-templated|notext=1}} to display templated parameter replacement variables. See that message for context.\n\nParameters:\n* $1 - Variable.\n* $2 - Parameter from which values are taken.\n\nSee also:\n* {{msg-mw|api-help-param-templated}}\n* {{msg-mw|api-help-param-templated-var-first}}",
 	"api-help-datatypes-header": "Header for the data type section in the API help output",
 	"api-help-datatypes": "{{technical}} {{doc-important|Do not translate or reformat dates inside <nowiki><kbd></kbd></nowiki> or <nowiki><var></var></nowiki> tags}} Documentation of certain API data types\nSee also:\n* [[Special:PrefixIndex/MediaWiki:api-help-param-type]]",
+	"api-help-templatedparams-header": "Header for the \"templated parameters\" section in the API help output.",
+	"api-help-templatedparams": "{{technical}} {{doc-important|Unlike in other API messages, feel free to localize the words \"fruit\", \"fruits\", \"quantity\", \"apples\", \"bananas\", and \"strawberries\" in this message even when inside <nowiki><kbd></kbd></nowiki> or <nowiki><var></var></nowiki> tags. Do not change the punctuation, only the words.}} Documentation for the \"templated parameters\" feature.",
 	"api-help-param-type-limit": "{{technical}} {{doc-important|Do not translate text inside &lt;kbd&gt; tags}} Used to indicate that a parameter is a \"limit\" type. Parameters:\n* $1 - Always 1.\nSee also:\n* {{msg-mw|api-help-datatypes}}\n* [[Special:PrefixIndex/MediaWiki:api-help-param-type]]",
 	"api-help-param-type-integer": "{{technical}} Used to indicate that a parameter is an integer or list of integers. Parameters:\n* $1 - 1 if the parameter takes one value, 2 if the parameter takes a list of values.\nSee also:\n* {{msg-mw|api-help-datatypes}}\n* [[Special:PrefixIndex/MediaWiki:api-help-param-type]]",
 	"api-help-param-type-boolean": "{{technical}} {{doc-important|Do not translate <code>Special:ApiHelp</code> in this message.}} Used to indicate that a parameter is a boolean. Parameters:\n* $1 - Always 1.\nSee also:\n* {{msg-mw|api-help-datatypes}}\n* [[Special:PrefixIndex/MediaWiki:api-help-param-type]]",
@@ -1741,6 +1746,7 @@
 	"apiwarn-difftohidden": "{{doc-apierror}}\n\nParameters:\n* $1 - Revision ID number.\n\n\"r\" is short for \"revision\". You may translate it.",
 	"apiwarn-errorprinterfailed": "{{doc-apierror}}",
 	"apiwarn-errorprinterfailed-ex": "{{doc-apierror}}\n\nParameters:\n* $1 - Exception message, which may already end in punctuation. Probably in English.",
+	"apiwarn-ignoring-invalid-templated-value": "{{doc-apierror}}\n\nParameters:\n* $1 - Target parameter having a bad value.\n* $2 - The bad value being ignored.",
 	"apiwarn-invalidcategory": "{{doc-apierror}}\n\nParameters:\n* $1 - Supplied category name.",
 	"apiwarn-invalidtitle": "{{doc-apierror}}\n\nParameters:\n* $1 - Supplied title.",
 	"apiwarn-invalidxmlstylesheetext": "{{doc-apierror}}",
diff --git a/includes/api/i18n/ru.json b/includes/api/i18n/ru.json
index 7c8c1694d0..db93d47e00 100644
--- a/includes/api/i18n/ru.json
+++ b/includes/api/i18n/ru.json
@@ -856,6 +856,7 @@
 	"apihelp-query+info-paramvalue-prop-readable": "Может ли участник просматривать эту страницу.",
 	"apihelp-query+info-paramvalue-prop-preload": "Текст, возвращённый EditFormPreloadText.",
 	"apihelp-query+info-paramvalue-prop-displaytitle": "Возвращает стиль отображения заголовка страницы.",
+	"apihelp-query+info-paramvalue-prop-varianttitles": "Выдаёт отображаемый заголовок во всех вариантах языка контента сайта.",
 	"apihelp-query+info-param-testactions": "Проверить, может ли текущий участник провести указанные действия над страницей.",
 	"apihelp-query+info-param-token": "Вместо этого используйте [[Special:ApiHelp/query+tokens|action=query&meta=tokens]].",
 	"apihelp-query+info-example-simple": "Получить информацию о странице <kbd>Main Page</kbd>.",
diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json
index fba891b62f..f335890341 100644
--- a/includes/api/i18n/zh-hans.json
+++ b/includes/api/i18n/zh-hans.json
@@ -23,7 +23,8 @@
 			"Myy730",
 			"D41D8CD98F",
 			"Umherirrender",
-			"NeverBehave"
+			"NeverBehave",
+			"Wbxshiori"
 		]
 	},
 	"apihelp-main-extended-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:Special:MyLanguage/API:Main_page|文档]]\n* [[mw:Special:MyLanguage/API:FAQ|常见问题]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api 邮件列表]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API公告]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R 程序错误与功能请求]\n</div>\n<strong>状态信息：</strong>MediaWiki API是一个成熟稳定的，不断受到支持和改进的界面。尽管我们尽力避免，但偶尔也需要作出重大更新；请订阅[https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ mediawiki-api-announce 邮件列表]以便获得更新通知。\n\n<strong>错误请求：</strong>当API收到错误请求时，HTTP header将会返回一个包含\"MediaWiki-API-Error\"的值，随后header的值与error code将会送回并设置为相同的值。详细信息请参阅[[mw:Special:MyLanguage/API:Errors_and_warnings|API：错误与警告]]。\n\n<p class=\"mw-apisandbox-link\"><strong>测试中：</strong>测试API请求的易用性，请参见[[Special:ApiSandbox]]。</p>",
@@ -1480,8 +1481,13 @@
 	"api-help-parameters": "{{PLURAL:$1|参数}}：",
 	"api-help-param-deprecated": "已弃用。",
 	"api-help-param-required": "这个参数是必须的。",
+	"api-help-param-templated": "这是一个[[Special:ApiHelp/main#main/templatedparams|模板参数]]。当做出请求时，$2。",
+	"api-help-param-templated-var-first": "参数名中的<var>&#x7B;$1&#x7D;</var>应替换为<var>$2</var>的值",
+	"api-help-param-templated-var": "<var>&#x7B;$1&#x7D;</var>与<var>$2</var>的值",
 	"api-help-datatypes-header": "数据类型",
 	"api-help-datatypes": "至MediaWiki的输入应为NFC标准化的UTF-8。MediaWiki可以尝试转换其他输入，但这可能导致一些操作失败（例如带MD5校验[[Special:ApiHelp/edit|编辑]]）。\n\n一些在API请求中的参数类型需要更进一步解释：\n;boolean\n:布尔参数就像HTML复选框一样工作：如果指定参数，无论何值都被认为是真。如果要假值，则可完全忽略参数。\n;timestamp\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:* C ctime格式，<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（单位分隔符）作为分隔符，''并''在值前加前缀U+001F，例如<kbd>param=%1Fvalue1%1Fvalue2</kbd>。",
+	"api-help-templatedparams-header": "模板参数",
+	"api-help-templatedparams": "模板参数支持API模块需要为每个其他参数赋值的情况。例如如果有API模块请求水果，它会有参数<var>水果</var>指定请求的水果，以及模板参数<var>{水果}-数量</var>以指定每种水果请求多少。需要1个苹果、5个香蕉和20个草莓的API客户端可以做出类似<kbd>水果=苹果|香蕉|草莓&苹果-数量=1&香蕉-数量=5&草莓-数量=20</kbd>的请求。",
 	"api-help-param-type-limit": "类型：整数或<kbd>max</kbd>",
 	"api-help-param-type-integer": "类型：{{PLURAL:$1|1=整数|2=整数列表}}",
 	"api-help-param-type-boolean": "类型：布尔值（[[Special:ApiHelp/main#main/datatypes|详细信息]]）",
@@ -1518,7 +1524,7 @@
 	"api-help-authmanager-general-usage": "使用此模块的一般程序是：\n# 通过<kbd>amirequestsfor=$4</kbd>取得来自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>的可用字段，和来自<kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd>的<kbd>$5</kbd>令牌。\n# 向用户显示字段，并获得其提交的内容。\n# 发送（POST）至此模块，提供<var>$1returnurl</var>及任何相关字段。\n# 在响应中检查<samp>status</samp>。\n#* 如果您收到了<samp>PASS</samp>（成功）或<samp>FAIL</samp>（失败），则认为操作结束。成功与否如上句所示。\n#* 如果您收到了<samp>UI</samp>，向用户显示新字段，并再次获取其提交的内容。然后再次使用<var>$1continue</var>，向本模块提交相关字段，并重复第四步。\n#* 如果您收到了<samp>REDIRECT</samp>，将用户指向<samp>redirecttarget</samp>中的目标，等待其返回<var>$1returnurl</var>。然后再次使用<var>$1continue</var>，向本模块提交返回URL中提供的一切字段，并重复第四步。\n#* 如果您收到了<samp>RESTART</samp>，这意味着身份验证正常运作，但我们没有链接的用户账户。您可以将此看做<samp>UI</samp>或<samp>FAIL</samp>。",
 	"api-help-authmanagerhelper-requests": "只使用这些身份验证请求，通过返回自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>的<samp>id</samp>与<kbd>amirequestsfor=$1</kbd>，或来自此模块之前的响应。",
 	"api-help-authmanagerhelper-request": "使用此身份验证请求，通过返回自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>的<samp>id</samp>与<kbd>amirequestsfor=$1</kbd>。",
-	"api-help-authmanagerhelper-messageformat": "返回消息使用的格式。",
+	"api-help-authmanagerhelper-messageformat": "用于返回消息的格式。",
 	"api-help-authmanagerhelper-mergerequestfields": "合并用于所有身份验证请求的字段信息至一个数组中。",
 	"api-help-authmanagerhelper-preservestate": "从之前失败的登录尝试中保持状态，如果可能。",
 	"api-help-authmanagerhelper-returnurl": "为第三方身份验证流返回URL，必须为绝对值。需要此值或<var>$1continue</var>两者之一。\n\n在接收<samp>REDIRECT</samp>响应时，您将代表性的打开浏览器或web视图到特定用于第三方身份验证流的<samp>redirecttarget</samp> URL。当它完成时，第三方将发生浏览器或web视图至此URL。您应当提取任何来自URL的查询或POST参数，并作为<var>$1continue</var>请求传递至此API模块。",
@@ -1742,6 +1748,7 @@
 	"apiwarn-difftohidden": "不能与r$1做差异比较：内容被隐藏。",
 	"apiwarn-errorprinterfailed": "错误打印失败。将在没有参数的前提下重试。",
 	"apiwarn-errorprinterfailed-ex": "错误打印失败（将在没有参数的前提下重试）：$1",
+	"apiwarn-ignoring-invalid-templated-value": "当处理模板参数时，忽略<var>$1</var>中的值<kbd>$2</kbd>。",
 	"apiwarn-invalidcategory": "“$1”不是一个分类。",
 	"apiwarn-invalidtitle": "“$1”不是一个有效的标题。",
 	"apiwarn-invalidxmlstylesheetext": "样式表应拥有<code>.xsl</code>扩展名。",
diff --git a/includes/api/i18n/zh-hant.json b/includes/api/i18n/zh-hant.json
index ebf998b3ec..2f9b69348c 100644
--- a/includes/api/i18n/zh-hant.json
+++ b/includes/api/i18n/zh-hant.json
@@ -248,7 +248,7 @@
 	"apihelp-query+search-param-limit": "要回傳的頁面總數。",
 	"apihelp-query+stashimageinfo-summary": "回傳多筆儲藏檔案的檔案資訊。",
 	"apihelp-query+stashimageinfo-example-simple": "回傳儲藏檔案的檔案資訊。",
-	"apihelp-query+tags-summary": "列出更改標籤。",
+	"apihelp-query+tags-summary": "列出變更標記。",
 	"apihelp-query+templates-summary": "回傳指定頁面中所有引用的頁面。",
 	"apihelp-query+templates-param-limit": "要回傳的模板數量。",
 	"apihelp-query+tokens-param-type": "要求的權杖類型。",
@@ -268,7 +268,7 @@
 	"apihelp-unblock-param-reason": "解除封鎖的原因。",
 	"apihelp-unblock-example-id": "解除封銷 ID #<kbd>105</kbd>。",
 	"apihelp-undelete-param-reason": "還原的原因。",
-	"apihelp-userrights-summary": "更改一位使用者的群組成員。",
+	"apihelp-userrights-summary": "變更一位使用者的群組成員。",
 	"apihelp-userrights-param-user": "用戶名。",
 	"apihelp-userrights-param-userid": "用戶ID。",
 	"apihelp-userrights-param-add": "加入使用者至這些群組；若已是成員，則更新失效時間。",
@@ -285,6 +285,8 @@
 	"apihelp-xmlfm-summary": "使用 XML 格式輸出資料 (使用 HTML 格式顯示)。",
 	"api-format-title": "MediaWiki API 結果",
 	"api-format-prettyprint-header": "這是$1格式的HTML呈現。HTML適合用於除錯，但不適合應用程式使用。\n\n指定<var>format</var>參數以更改輸出格式。要檢視$1格式的非HTML呈現，設定<kbd>format=$2</kbd>。\n\n參考 [[mw:Special:MyLanguage/API|完整說明文件]] 或 [[Special:ApiHelp/main|API說明]] 以取得更多資訊。",
+	"api-format-prettyprint-header-only-html": "這是用來除錯的HTML呈現，不適合實際應用。\n\n參見[[mw:Special:MyLanguage/API|完整文件]]或[[Special:ApiHelp/main|API幫助]]以取得更多資訊。",
+	"api-format-prettyprint-status": "此回應將會傳回HTTP狀態$1 $2。",
 	"api-pageset-param-titles": "要使用的標題清單。",
 	"api-pageset-param-pageids": "要使用的頁面 ID 清單。",
 	"api-pageset-param-revids": "要使用的修訂 ID 清單。",
@@ -292,12 +294,24 @@
 	"api-help-lead": "此頁為自動產生的 MediaWiki API 說明文件頁面。\n\n說明文件與範例：https://www.mediawiki.org/wiki/API",
 	"api-help-main-header": "主要模組",
 	"api-help-flag-deprecated": "此模組已停用。",
+	"api-help-flag-internal": "<strong>此模組是內部的或不穩定的。</strong>它的操作可能更改而不另行通知。",
 	"api-help-flag-readrights": "此模組需要讀取權限。",
 	"api-help-flag-writerights": "此模組需要寫入權限。",
 	"api-help-flag-mustbeposted": "此模組僅接受 POST 請求。",
+	"api-help-flag-generator": "此模組可作為產生器使用。",
+	"api-help-license": "協定：[[$1|$2]]",
+	"api-help-license-noname": "協定：[[$1|查看連結]]",
+	"api-help-license-unknown": "協定：<span class=\"apihelp-unknown\">未知</span>",
 	"api-help-parameters": "{{PLURAL:$1|參數}}：",
 	"api-help-param-deprecated": "已停用。",
 	"api-help-param-required": "此參數為必填。",
+	"api-help-datatypes-header": "資料類型",
+	"api-help-datatypes": "至MediaWiki的輸入值應為NFC標準化的UTF-8。MediaWiki可以嘗試轉換其他輸入值，但這可能導致一些操作失敗（例如附帶MD5檢查的[[Special:ApiHelp/edit|編輯]]）。\n\n一些在API請求中的參數類型需要更進一步解釋：\n;boolean\n:布林參數產生作用就像HTML複選框一樣：如果參數被指定，無論何值都被視為真（true）。如果要假值（false），則必須省略參數。\n;timestamp\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:* C ctime格式，<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（單位分隔符號）作為分隔符號，''並且''在值前加前綴U+001F，例如<kbd>param=%1Fvalue1%1Fvalue2</kbd>。",
+	"api-help-param-type-limit": "類型：整數或<kbd>max</kbd>",
+	"api-help-param-type-integer": "類型：{{PLURAL:$1|1=整數|2=整數列表}}",
+	"api-help-param-type-boolean": "類型：布林值（[[Special:ApiHelp/main#main/datatypes|詳細資訊]]）",
+	"api-help-param-type-timestamp": "類型：{{PLURAL:$1|1=時間戳記|2=時間戳記列表}}（[[Special:ApiHelp/main#main/datatypes|允許格式]]）",
+	"api-help-param-type-user": "類型：{{PLURAL:$1|1=使用者名稱|2=使用者名稱列表}}",
 	"api-help-param-list": "{{PLURAL:$1|1=單值|2=多值 (以 <kbd>{{!}}</kbd> 或 [[Special:ApiHelp/main#main/datatypes|alternative]] 分隔)}}：$2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=必須空白|可以空白，或 $2}}",
 	"api-help-param-limit": "不允許超過 $1。",
@@ -308,14 +322,29 @@
 	"api-help-param-upload": "必須使用 multipart/form-data 以檔案上傳的方式傳送。",
 	"api-help-param-multi-separate": "將幾個值以 <kbd>|</kbd> 或 [[Special:ApiHelp/main#main/datatypes|alternative]] 分隔。",
 	"api-help-param-multi-max": "上限值為 {{PLURAL:$1|$1}} (機器人為 {{PLURAL:$2|$2}})。",
+	"api-help-param-multi-all": "要指定所有值，請使用<kbd>$1</kbd>。",
 	"api-help-param-default": "預設值：$1",
 	"api-help-param-default-empty": "預設值：<span class=\"apihelp-empty\">(空)</span>",
 	"api-help-param-token": "自 [[Special:ApiHelp/query+tokens|action=query&meta=tokens]] 接收的 \"$1\" 密鑰。",
+	"api-help-param-token-webui": "為顧及相容性，web UI中使用的代碼（Token）也是可接受的。",
+	"api-help-param-disabled-in-miser-mode": "因[[mw:Special:MyLanguage/Manual:$wgMiserMode|miser模式]]而被停用。",
+	"api-help-param-limited-in-miser-mode": "<strong>注意：</strong>因[[mw:Special:MyLanguage/Manual:$wgMiserMode|miser模式]]，使用這個可能導致繼續以前傳回少於<var>$1limit</var>筆結果；極端情況下可能不會傳回任何结果。",
+	"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-examples": "{{PLURAL:$1|範例}}：",
 	"api-help-permissions": "{{PLURAL:$1|權限}}：",
 	"api-help-permissions-granted-to": "{{PLURAL:$1|已授權給}}: $2",
+	"api-help-open-in-apisandbox": "<small>[在沙盒中開啟]</small>",
 	"api-help-authmanager-general-usage": "使用此模組的一般程式是：\n# 通過<kbd>amirequestsfor=$4</kbd>取得來自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>的可用欄位，和來自<kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd>的<kbd>$5</kbd>令牌。\n# 向用戶顯示欄位，並獲得其提交的內容。\n# 提交（POST）至此模組，提供<var>$1returnurl</var>及任何相關欄位。\n# 在回应中檢查<samp>status</samp>。\n#* 如果您收到了<samp>PASS</samp>（成功）或<samp>FAIL</samp>（失敗），則認為操作結束。成功與否如上句所示。\n#* 如果您收到了<samp>UI</samp>，向用戶顯示新欄位，並再次獲取其提交的內容。然後再次使用<var>$1continue</var>，向本模組提交相關欄位，並重復第四步。\n#* 如果您收到了<samp>REDIRECT</samp>，將使用者指向<samp>redirecttarget</samp>中的目標，等待其返回<var>$1returnurl</var>。然後再次使用<var>$1continue</var>，向本模組提交返回URL中提供的一切欄位，並重復第四步。\n#* 如果您收到了<samp>RESTART</samp>，這意味著身份驗證正常運作，但我們沒有連結的使用者賬戶。您可以將此看做<samp>UI</samp>或<samp>FAIL</samp>。",
+	"api-help-authmanagerhelper-requests": "只使用這些身份驗證請求，透過自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>回傳的<samp>id</samp>與<kbd>amirequestsfor=$1</kbd>，或來自此模組之前的回應。",
+	"api-help-authmanagerhelper-request": "使用此身份驗證請求，透過自<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>回傳的<samp>id</samp>與<kbd>amirequestsfor=$1</kbd>。",
+	"api-help-authmanagerhelper-messageformat": "用於回傳訊息的格式。",
+	"api-help-authmanagerhelper-mergerequestfields": "將用於所有身份驗證請求的欄位資訊合併至一個陣列中。",
+	"api-help-authmanagerhelper-preservestate": "從之前失敗的登入嘗試中保持狀態，如果可能。",
+	"api-help-authmanagerhelper-returnurl": "為第三方身份驗證流程傳回URL，必須為絕對值。需要此值或<var>$1continue</var>兩者之一。\n\n在接收<samp>REDIRECT</samp>回應時，一般狀況下您將打開瀏覽器或網站瀏覽功能到特定的<samp>redirecttarget</samp> URL以進行第三方身份驗證流程。當它完成時，第三方會將瀏覽器或網站瀏覽功能送至此URL。您應當提取任何來自URL的查詢或POST參數，並將之作為<var>$1continue</var>請求傳遞至此API模組。",
+	"api-help-authmanagerhelper-continue": "此請求是在先前的<samp>UI</samp>或<samp>REDIRECT</samp>回應之後的後續動作。必須為此值或<var>$1returnurl</var>。",
+	"api-help-authmanagerhelper-additional-params": "此模組允許額外參數，取決於可用的身份驗證請求。使用<kbd>[[Special:ApiHelp/query+authmanagerinfo|action=query&meta=authmanagerinfo]]</kbd>与<kbd>amirequestsfor=$1</kbd>（或之前來自此模組的回應，如果合適）以決定可用請求及其使用的欄位。",
 	"apierror-missingparam": "<var>$1</var>參數必須被設定。",
 	"apierror-mustbeloggedin-changeauth": "必須登入，才能變更身分核對資取。",
 	"apierror-mustbeloggedin-removeauth": "必須登入，才能移除身分核對資取。",
diff --git a/includes/collation/IcuCollation.php b/includes/collation/IcuCollation.php
index 36efdb379b..9ac81ae01e 100644
--- a/includes/collation/IcuCollation.php
+++ b/includes/collation/IcuCollation.php
@@ -384,9 +384,17 @@ class IcuCollation extends Collation {
 		foreach ( $letters as $letter ) {
 			$key = $this->getPrimarySortKey( $letter );
 			if ( isset( $letterMap[$key] ) ) {
-				// Primary collision
-				// Keep whichever one sorts first in the main collator
-				if ( $this->mainCollator->compare( $letter, $letterMap[$key] ) < 0 ) {
+				// Primary collision (two characters with the same sort position).
+				// Keep whichever one sorts first in the main collator.
+				$comp = $this->mainCollator->compare( $letter, $letterMap[$key] );
+				wfDebug( "Primary collision '$letter' '{$letterMap[$key]}' (comparison: $comp)\n" );
+				// If that also has a collision, use codepoint as a tiebreaker.
+				if ( $comp === 0 ) {
+					// TODO Use <=> operator when PHP 7 is allowed.
+					$comp = UtfNormal\Utils::utf8ToCodepoint( $letter ) -
+						UtfNormal\Utils::utf8ToCodepoint( $letterMap[$key] );
+				}
+				if ( $comp < 0 ) {
 					$letterMap[$key] = $letter;
 				}
 			} else {
diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php
index 7479841487..2189498687 100644
--- a/includes/debug/MWDebug.php
+++ b/includes/debug/MWDebug.php
@@ -431,7 +431,8 @@ class MWDebug {
 			// Cannot use OutputPage::addJsConfigVars because those are already outputted
 			// by the time this method is called.
 			$html = ResourceLoader::makeInlineScript(
-				ResourceLoader::makeConfigSetScript( [ 'debugInfo' => $debugInfo ] )
+				ResourceLoader::makeConfigSetScript( [ 'debugInfo' => $debugInfo ] ),
+				$context->getOutput()->getCSPNonce()
 			);
 		}
 
diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index 4ddd15117b..398df01b9a 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -569,6 +569,7 @@ class LinksUpdate extends DataUpdate implements EnqueueableDataUpdate {
 					'el_from' => $this->mId,
 					'el_to' => $url,
 					'el_index' => $index,
+					'el_index_60' => substr( $index, 0, 60 ),
 				];
 			}
 		}
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index c078e90dfd..1702264045 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -1300,11 +1300,14 @@ class LocalFile extends File {
 	 * @param User|null $user User object or null to use $wgUser
 	 * @param string[] $tags Change tags to add to the log entry and page revision.
 	 *   (This doesn't check $user's permissions.)
+	 * @param bool $createNullRevision Set to false to avoid creation of a null revision on file
+	 *   upload, see T193621
 	 * @return Status On success, the value member contains the
 	 *     archive name, or an empty string if it was a new file.
 	 */
 	function upload( $src, $comment, $pageText, $flags = 0, $props = false,
-		$timestamp = false, $user = null, $tags = []
+		$timestamp = false, $user = null, $tags = [],
+		$createNullRevision = true
 	) {
 		if ( $this->getRepo()->getReadOnlyReason() !== false ) {
 			return $this->readOnlyFatalStatus();
@@ -1361,7 +1364,8 @@ class LocalFile extends File {
 				$props,
 				$timestamp,
 				$user,
-				$tags
+				$tags,
+				$createNullRevision
 			);
 			if ( !$uploadStatus->isOK() ) {
 				if ( $uploadStatus->hasMessage( 'filenotfound' ) ) {
@@ -1419,10 +1423,13 @@ class LocalFile extends File {
 	 * @param string|bool $timestamp
 	 * @param null|User $user
 	 * @param string[] $tags
+	 * @param bool $createNullRevision Set to false to avoid creation of a null revision on file
+	 *   upload, see T193621
 	 * @return Status
 	 */
 	function recordUpload2(
-		$oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null, $tags = []
+		$oldver, $comment, $pageText, $props = false, $timestamp = false, $user = null, $tags = [],
+		$createNullRevision = true
 	) {
 		global $wgCommentTableSchemaMigrationStage, $wgActorTableSchemaMigrationStage;
 
@@ -1662,7 +1669,7 @@ class LocalFile extends File {
 			$formatter->setContext( RequestContext::newExtraneousContext( $descTitle ) );
 			$editSummary = $formatter->getPlainActionText();
 
-			$nullRevision = Revision::newNullRevision(
+			$nullRevision = $createNullRevision === false ? null : Revision::newNullRevision(
 				$dbw,
 				$descId,
 				$editSummary,
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index aab881129b..5066f28ee4 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -17,6 +17,9 @@ abstract class HTMLFormField {
 	protected $mVFormClass = '';
 	protected $mHelpClass = false;
 	protected $mDefault;
+	/**
+	 * @var array|bool|null
+	 */
 	protected $mOptions = false;
 	protected $mOptionsLabelsNotFromMessage = false;
 	protected $mHideIf = null;
diff --git a/includes/import/ImportableUploadRevisionImporter.php b/includes/import/ImportableUploadRevisionImporter.php
index b64114cf87..95a171b8a7 100644
--- a/includes/import/ImportableUploadRevisionImporter.php
+++ b/includes/import/ImportableUploadRevisionImporter.php
@@ -17,6 +17,11 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 	 */
 	private $enableUploads;
 
+	/**
+	 * @var bool
+	 */
+	private $shouldCreateNullRevision = true;
+
 	/**
 	 * @param bool $enableUploads
 	 * @param LoggerInterface $logger
@@ -29,6 +34,16 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 		$this->logger = $logger;
 	}
 
+	/**
+	 * Setting this to false will deactivate the creation of a null revision as part of the upload
+	 * process logging in LocalFile::recordUpload2, see T193621
+	 *
+	 * @param bool $shouldCreateNullRevision
+	 */
+	public function setNullRevisionCreation( $shouldCreateNullRevision ) {
+		$this->shouldCreateNullRevision = $shouldCreateNullRevision;
+	}
+
 	/**
 	 * @return StatusValue
 	 */
@@ -100,7 +115,9 @@ class ImportableUploadRevisionImporter implements UploadRevisionImporter {
 				$flags,
 				false,
 				$importableRevision->getTimestamp(),
-				$user
+				$user,
+				[],
+				$this->shouldCreateNullRevision
 			);
 		}
 
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index 1f6110bd44..ba102782d2 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -974,6 +974,31 @@ abstract class DatabaseUpdater {
 		return true;
 	}
 
+	/**
+	 * Run a maintenance script
+	 *
+	 * This should only be used when the maintenance script must run before
+	 * later updates. If later updates don't depend on the script, add it to
+	 * DatabaseUpdater::$postDatabaseUpdateMaintenance instead.
+	 *
+	 * The script's execute() method must return true to indicate successful
+	 * completion, and must return false (or throw an exception) to indicate
+	 * unsuccessful completion.
+	 *
+	 * @since 1.32
+	 * @param string $class Maintenance subclass
+	 * @param string $script Script path and filename, usually "maintenance/fooBar.php"
+	 */
+	public function runMaintenance( $class, $script ) {
+		$this->output( "Running $script...\n" );
+		$task = $this->maintenance->runChild( $class );
+		$ok = $task->execute();
+		if ( !$ok ) {
+			throw new RuntimeException( "Execution of $script did not complete successfully." );
+		}
+		$this->output( "done.\n" );
+	}
+
 	/**
 	 * Set any .htaccess files or equivilent for storage repos
 	 *
@@ -1287,4 +1312,21 @@ abstract class DatabaseUpdater {
 		 }
 	 }
 
+	/**
+	 * Populates the externallinks.el_index_60 field
+	 * @since 1.32
+	 */
+	protected function populateExternallinksIndex60() {
+		if ( !$this->updateRowExists( 'populate externallinks.el_index_60' ) ) {
+			$this->output(
+				"Populating el_index_60 field, printing progress markers. For large\n" .
+				"databases, you may want to hit Ctrl-C and do this manually with\n" .
+				"maintenance/populateExternallinksIndex60.php.\n"
+			);
+			$task = $this->maintenance->runChild( 'PopulateExternallinksIndex60',
+				'populateExternallinksIndex60.php' );
+			$task->execute();
+			$this->output( "done.\n" );
+		}
+	}
 }
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 1efe5d6373..911e5d203b 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -990,6 +990,10 @@ abstract class Installer {
 			return true;
 		}
 
+		if ( Shell::isDisabled() ) {
+			return true;
+		}
+
 		# Get a list of available locales.
 		$result = Shell::command( '/usr/bin/locale', '-a' )
 			->execute();
diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
index e389135be6..cc48e2f89e 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -131,6 +131,10 @@ class MssqlUpdater extends DatabaseUpdater {
 
 			// 1.32
 			[ 'addTable', 'change_tag_def', 'patch-change_tag_def.sql' ],
+			[ 'populateExternallinksIndex60' ],
+			[ 'modifyfield', 'externallinks', 'el_index_60',
+				'patch-externallinks-el_index_60-drop-default.sql' ],
+			[ 'runMaintenance', DeduplicateArchiveRevId::class, 'maintenance/deduplicateArchiveRevId.php' ],
 		];
 	}
 
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index b4bb194195..9365e98796 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -351,6 +351,10 @@ class MysqlUpdater extends DatabaseUpdater {
 
 			// 1.32
 			[ 'addTable', 'change_tag_def', 'patch-change_tag_def.sql' ],
+			[ 'populateExternallinksIndex60' ],
+			[ 'modifyfield', 'externallinks', 'el_index_60',
+				'patch-externallinks-el_index_60-drop-default.sql' ],
+			[ 'runMaintenance', DeduplicateArchiveRevId::class, 'maintenance/deduplicateArchiveRevId.php' ],
 		];
 	}
 
diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index b08e26f0ab..34d81a7a82 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -150,6 +150,8 @@ class OracleUpdater extends DatabaseUpdater {
 
 			// 1.32
 			[ 'addTable', 'change_tag_def', 'patch-change_tag_def.sql' ],
+			[ 'populateExternallinksIndex60' ],
+			[ 'runMaintenance', DeduplicateArchiveRevId::class, 'maintenance/deduplicateArchiveRevId.php' ],
 
 			// KEEP THIS AT THE BOTTOM!!
 			[ 'doRebuildDuplicateFunction' ],
diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index c72e206a55..6263edb0ce 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -572,6 +572,9 @@ class PostgresUpdater extends DatabaseUpdater {
 
 			// 1.32
 			[ 'addTable', 'change_tag_def', 'patch-change_tag_def.sql' ],
+			[ 'populateExternallinksIndex60' ],
+			[ 'dropDefault', 'externallinks', 'el_index_60' ],
+			[ 'runMaintenance', DeduplicateArchiveRevId::class, 'maintenance/deduplicateArchiveRevId.php' ],
 		];
 	}
 
@@ -907,6 +910,20 @@ END;
 		}
 	}
 
+	/**
+	 * Drop a default value from a field
+	 * @since 1.32
+	 * @param string $table
+	 * @param string $field
+	 */
+	protected function dropDefault( $table, $field ) {
+		$info = $this->db->fieldInfo( $table, $field );
+		if ( $info->defaultValue() !== false ) {
+			$this->output( "Removing '$table.$field' default value\n" );
+			$this->db->query( "ALTER TABLE $table ALTER $field DROP DEFAULT" );
+		}
+	}
+
 	protected function changeNullableField( $table, $field, $null, $update = false ) {
 		$fi = $this->db->fieldInfo( $table, $field );
 		if ( is_null( $fi ) ) {
diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 76e1ca968f..961cb842a9 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -215,6 +215,10 @@ class SqliteUpdater extends DatabaseUpdater {
 
 			// 1.32
 			[ 'addTable', 'change_tag_def', 'patch-change_tag_def.sql' ],
+			[ 'populateExternallinksIndex60' ],
+			[ 'modifyfield', 'externallinks', 'el_index_60',
+				'patch-externallinks-el_index_60-drop-default.sql' ],
+			[ 'runMaintenance', DeduplicateArchiveRevId::class, 'maintenance/deduplicateArchiveRevId.php' ],
 		];
 	}
 
diff --git a/includes/libs/CSSMin.php b/includes/libs/CSSMin.php
index a6014b1ecd..454fd41f92 100644
--- a/includes/libs/CSSMin.php
+++ b/includes/libs/CSSMin.php
@@ -40,7 +40,7 @@ class CSSMin {
 	const EMBED_REGEX = '\/\*\s*\@embed\s*\*\/';
 	const COMMENT_REGEX = '\/\*.*?\*\/';
 
-	/** @var array List of common image files extensions and MIME-types */
+	/** @var string[] List of common image files extensions and MIME-types */
 	protected static $mimeTypes = [
 		'gif' => 'image/gif',
 		'jpe' => 'image/jpeg',
@@ -58,7 +58,7 @@ class CSSMin {
 	 *
 	 * @param string $source CSS stylesheet source to process
 	 * @param string $path File path where the source was read from
-	 * @return array List of local file references
+	 * @return string[] List of local file references
 	 */
 	public static function getLocalFileReferences( $source, $path ) {
 		$stripped = preg_replace( '/' . self::COMMENT_REGEX . '/s', '', $source );
@@ -100,7 +100,7 @@ class CSSMin {
 	 * @param bool $ie8Compat By default, a data URI will only be produced if it can be made short
 	 *     enough to fit in Internet Explorer 8 (and earlier) URI length limit (32,768 bytes). Pass
 	 *     `false` to remove this limitation.
-	 * @return string|bool Image contents encoded as a data URI or false.
+	 * @return string|false Image contents encoded as a data URI or false.
 	 */
 	public static function encodeImageAsDataURI( $file, $type = null, $ie8Compat = true ) {
 		// Fast-fail for files that definitely exceed the maximum data URI length
@@ -128,7 +128,7 @@ class CSSMin {
 	 * @param string $contents File contents to encode.
 	 * @param string $type File's MIME type.
 	 * @param bool $ie8Compat See encodeImageAsDataURI().
-	 * @return string|bool Image contents encoded as a data URI or false.
+	 * @return string|false Image contents encoded as a data URI or false.
 	 */
 	public static function encodeStringAsDataURI( $contents, $type, $ie8Compat = true ) {
 		// Try #1: Non-encoded data URI
@@ -173,13 +173,13 @@ class CSSMin {
 
 	/**
 	 * Serialize a string (escape and quote) for use as a CSS string value.
-	 * https://www.w3.org/TR/2016/WD-cssom-1-20160317/#serialize-a-string
+	 * https://drafts.csswg.org/cssom/#serialize-a-string
 	 *
 	 * @param string $value
 	 * @return string
 	 */
 	public static function serializeStringValue( $value ) {
-		$value = strtr( $value, [ "\0" => "\\fffd ", '\\' => '\\\\', '"' => '\\"' ] );
+		$value = strtr( $value, [ "\0" => "\xEF\xBF\xBD", '\\' => '\\\\', '"' => '\\"' ] );
 		$value = preg_replace_callback( '/[\x01-\x1f\x7f]/', function ( $match ) {
 			return '\\' . base_convert( ord( $match[0] ), 10, 16 ) . ' ';
 		}, $value );
@@ -387,10 +387,7 @@ class CSSMin {
 	 * @return bool
 	 */
 	protected static function isLocalUrl( $maybeUrl ) {
-		if ( $maybeUrl !== '' && $maybeUrl[0] === '/' && !self::isRemoteUrl( $maybeUrl ) ) {
-			return true;
-		}
-		return false;
+		return isset( $maybeUrl[1] ) && $maybeUrl[0] === '/' && $maybeUrl[1] !== '/';
 	}
 
 	/**
@@ -511,7 +508,7 @@ class CSSMin {
 						return $data;
 					}
 				}
-				if ( method_exists( 'OutputPage', 'transformFilePath' ) ) {
+				if ( class_exists( OutputPage::class ) ) {
 					$url = OutputPage::transformFilePath( $remote, $local, $file );
 				} else {
 					// Add version parameter as the first five hex digits
diff --git a/includes/libs/ReplacementArray.php b/includes/libs/ReplacementArray.php
index 4512a4b13d..46f9358b63 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -22,14 +22,14 @@
  * Wrapper around strtr() that holds replacements
  */
 class ReplacementArray {
-	private $data = false;
+	private $data = [];
 
 	/**
 	 * Create an object with the specified replacement array
 	 * The array should have the same form as the replacement array for strtr()
 	 * @param array $data
 	 */
-	public function __construct( $data = [] ) {
+	public function __construct( array $data = [] ) {
 		$this->data = $data;
 	}
 
@@ -44,12 +44,12 @@ class ReplacementArray {
 	 * Set the whole replacement array at once
 	 * @param array $data
 	 */
-	public function setArray( $data ) {
+	public function setArray( array $data ) {
 		$this->data = $data;
 	}
 
 	/**
-	 * @return array|bool
+	 * @return array
 	 */
 	public function getArray() {
 		return $this->data;
diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index 8420f113ff..8a88581026 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -33,14 +33,25 @@ use Wikimedia\ScopedCallback;
 use Wikimedia\WaitConditionLoop;
 
 /**
- * interface is intended to be more or less compatible with
- * the PHP memcached client.
+ * Class representing a cache/ephemeral data store
  *
- * backends for local hash array and SQL table included:
- * @code
- *   $bag = new HashBagOStuff();
- *   $bag = new SqlBagOStuff(); # connect to db first
- * @endcode
+ * This interface is intended to be more or less compatible with the PHP memcached client.
+ *
+ * Instances of this class should be created with an intended access scope, such as:
+ *   - a) A single PHP thread on a server (e.g. stored in a PHP variable)
+ *   - b) A single application server (e.g. stored in APC or sqlite)
+ *   - c) All application servers in datacenter (e.g. stored in memcached or mysql)
+ *   - d) All application servers in all datacenters (e.g. stored via mcrouter or dynomite)
+ *
+ * Callers should use the proper factory methods that yield BagOStuff instances. Site admins
+ * should make sure the configuration for those factory methods matches their access scope.
+ * BagOStuff subclasses have widely varying levels of support for replication features.
+ *
+ * For any given instance, methods like lock(), unlock(), merge(), and set() with WRITE_SYNC
+ * should semantically operate over its entire access scope; any nodes/threads in that scope
+ * should serialize appropriately when using them. Likewise, a call to get() with READ_LATEST
+ * from one node in its access scope should reflect the prior changes of any other node its access
+ * scope. Any get() should reflect the changes of any prior set() with WRITE_SYNC.
  *
  * @ingroup Cache
  */
@@ -165,7 +176,7 @@ abstract class BagOStuff implements IExpiringStore, LoggerAwareInterface {
 	/**
 	 * Get an item with the given key
 	 *
-	 * If the key includes a determistic input hash (e.g. the key can only have
+	 * If the key includes a deterministic input hash (e.g. the key can only have
 	 * the correct value) or complete staleness checks are handled by the caller
 	 * (e.g. nothing relies on the TTL), then the READ_VERIFIED flag should be set.
 	 * This lets tiered backends know they can safely upgrade a cached value to
diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php
index 90e697ec16..186014b7a2 100644
--- a/includes/libs/rdbms/ChronologyProtector.php
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -190,13 +190,14 @@ class ChronologyProtector implements LoggerAwareInterface {
 			implode( ', ', array_keys( $this->shutdownPositions ) ) . "\n"
 		);
 
-		// CP-protected writes should overwhemingly go to the master datacenter, so get DC-local
-		// lock to merge the values. Use a DC-local get() and a synchronous all-DC set(). This
-		// makes it possible for the BagOStuff class to write in parallel to all DCs with one RTT.
+		// CP-protected writes should overwhelmingly go to the master datacenter, so use a
+		// DC-local lock to merge the values. Use a DC-local get() and a synchronous all-DC
+		// set(). This makes it possible for the BagOStuff class to write in parallel to all
+		// DCs with one RTT. The use of WRITE_SYNC avoids needing READ_LATEST for the get().
 		if ( $store->lock( $this->key, 3 ) ) {
 			if ( $workCallback ) {
-				// Let the store run the work before blocking on a replication sync barrier. By the
-				// time it's done with the work, the barrier should be fast if replication caught up.
+				// Let the store run the work before blocking on a replication sync barrier.
+				// If replication caught up while the work finished, the barrier will be fast.
 				$store->addBusyCallback( $workCallback );
 			}
 			$ok = $store->set(
diff --git a/includes/libs/rdbms/connectionmanager/ConnectionManager.php b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
index 4a497b088b..27e6138102 100644
--- a/includes/libs/rdbms/connectionmanager/ConnectionManager.php
+++ b/includes/libs/rdbms/connectionmanager/ConnectionManager.php
@@ -35,7 +35,7 @@ use InvalidArgumentException;
 class ConnectionManager {
 
 	/**
-	 * @var LoadBalancer
+	 * @var ILoadBalancer
 	 */
 	private $loadBalancer;
 
@@ -52,14 +52,14 @@ class ConnectionManager {
 	private $groups = [];
 
 	/**
-	 * @param LoadBalancer $loadBalancer
+	 * @param ILoadBalancer $loadBalancer
 	 * @param string|bool $domain Optional logical DB name, defaults to current wiki.
 	 *        This follows the convention for database names used by $loadBalancer.
 	 * @param string[] $groups see LoadBalancer::getConnection
 	 *
 	 * @throws InvalidArgumentException
 	 */
-	public function __construct( LoadBalancer $loadBalancer, $domain = false, array $groups = [] ) {
+	public function __construct( ILoadBalancer $loadBalancer, $domain = false, array $groups = [] ) {
 		if ( !is_string( $domain ) && $domain !== false ) {
 			throw new InvalidArgumentException( '$dbName must be a string, or false.' );
 		}
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 38c7a5c7e9..955c28de16 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -95,6 +95,8 @@ abstract class LBFactory implements ILBFactory {
 	const ROUND_BEGINNING = 'within-begin';
 	const ROUND_COMMITTING = 'within-commit';
 	const ROUND_ROLLING_BACK = 'within-rollback';
+	const ROUND_COMMIT_CALLBACKS = 'within-commit-callbacks';
+	const ROUND_ROLLBACK_CALLBACKS = 'within-rollback-callbacks';
 
 	private static $loggerFields =
 		[ 'replLogger', 'connLogger', 'queryLogger', 'perfLogger' ];
@@ -170,28 +172,28 @@ abstract class LBFactory implements ILBFactory {
 	/**
 	 * @see ILBFactory::newMainLB()
 	 * @param bool $domain
-	 * @return LoadBalancer
+	 * @return ILoadBalancer
 	 */
 	abstract public function newMainLB( $domain = false );
 
 	/**
 	 * @see ILBFactory::getMainLB()
 	 * @param bool $domain
-	 * @return LoadBalancer
+	 * @return ILoadBalancer
 	 */
 	abstract public function getMainLB( $domain = false );
 
 	/**
 	 * @see ILBFactory::newExternalLB()
 	 * @param string $cluster
-	 * @return LoadBalancer
+	 * @return ILoadBalancer
 	 */
 	abstract public function newExternalLB( $cluster );
 
 	/**
 	 * @see ILBFactory::getExternalLB()
 	 * @param string $cluster
-	 * @return LoadBalancer
+	 * @return ILoadBalancer
 	 */
 	abstract public function getExternalLB( $cluster );
 
@@ -261,6 +263,7 @@ abstract class LBFactory implements ILBFactory {
 		// Actually perform the commit on all master DB connections and revert DBO_TRX
 		$this->forEachLBCallMethod( 'commitMasterChanges', [ $fname ] );
 		// Run all post-commit callbacks in a separate step
+		$this->trxRoundStage = self::ROUND_COMMIT_CALLBACKS;
 		$e = $this->executePostTransactionCallbacks();
 		$this->trxRoundStage = self::ROUND_CURSORY;
 		// Throw any last post-commit callback error
@@ -275,6 +278,7 @@ abstract class LBFactory implements ILBFactory {
 		// Actually perform the rollback on all master DB connections and revert DBO_TRX
 		$this->forEachLBCallMethod( 'rollbackMasterChanges', [ $fname ] );
 		// Run all post-commit callbacks in a separate step
+		$this->trxRoundStage = self::ROUND_ROLLBACK_CALLBACKS;
 		$this->executePostTransactionCallbacks();
 		$this->trxRoundStage = self::ROUND_CURSORY;
 	}
@@ -547,10 +551,18 @@ abstract class LBFactory implements ILBFactory {
 	}
 
 	/**
-	 * Base parameters to LoadBalancer::__construct()
+	 * Base parameters to ILoadBalancer::__construct()
 	 * @return array
 	 */
 	final protected function baseLoadBalancerParams() {
+		if ( $this->trxRoundStage === self::ROUND_COMMIT_CALLBACKS ) {
+			$initStage = ILoadBalancer::STAGE_POSTCOMMIT_CALLBACKS;
+		} elseif ( $this->trxRoundStage === self::ROUND_ROLLBACK_CALLBACKS ) {
+			$initStage = ILoadBalancer::STAGE_POSTROLLBACK_CALLBACKS;
+		} else {
+			$initStage = null;
+		}
+
 		return [
 			'localDomain' => $this->localDomain,
 			'readOnlyReason' => $this->readOnlyReason,
@@ -570,7 +582,8 @@ abstract class LBFactory implements ILBFactory {
 				// Defer ChronologyProtector construction in case setRequestInfo() ends up
 				// being called later (but before the first connection attempt) (T192611)
 				$this->getChronologyProtector()->initLB( $lb );
-			}
+			},
+			'roundStage' => $initStage
 		];
 	}
 
diff --git a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
index 850f9afab8..81ce4baeaf 100644
--- a/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/ILoadBalancer.php
@@ -89,6 +89,11 @@ interface ILoadBalancer {
 	/** @var int Alias for CONN_TRX_AUTOCOMMIT for b/c; deprecated since 1.31 */
 	const CONN_TRX_AUTO = 1;
 
+	/** @var string Manager of ILoadBalancer instances is running post-commit callbacks */
+	const STAGE_POSTCOMMIT_CALLBACKS = 'stage-postcommit-callbacks';
+	/** @var string Manager of ILoadBalancer instances is running post-rollback callbacks */
+	const STAGE_POSTROLLBACK_CALLBACKS = 'stage-postrollback-callbacks';
+
 	/**
 	 * Construct a manager of IDatabase connection objects
 	 *
@@ -112,6 +117,7 @@ interface ILoadBalancer {
 	 *  - perfLogger: PSR-3 logger instance. [optional]
 	 *  - errorLogger : Callback that takes an Exception and logs it. [optional]
 	 *  - deprecationLogger: Callback to log a deprecation warning. [optional]
+	 *  - roundStage: STAGE_POSTCOMMIT_* class constant; for internal use [optional]
 	 * @throws InvalidArgumentException
 	 */
 	public function __construct( array $params );
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index 405ed14160..360be4256e 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -261,6 +261,14 @@ class LoadBalancer implements ILoadBalancer {
 		if ( isset( $params['chronologyCallback'] ) ) {
 			$this->chronologyCallback = $params['chronologyCallback'];
 		}
+
+		if ( isset( $params['roundStage'] ) ) {
+			if ( $params['roundStage'] === self::STAGE_POSTCOMMIT_CALLBACKS ) {
+				$this->trxRoundStage = self::ROUND_COMMIT_CALLBACKS;
+			} elseif ( $params['roundStage'] === self::STAGE_POSTROLLBACK_CALLBACKS ) {
+				$this->trxRoundStage = self::ROUND_ROLLBACK_CALLBACKS;
+			}
+		}
 	}
 
 	/**
diff --git a/includes/logging/LogEventsList.php b/includes/logging/LogEventsList.php
index 93a81cff8e..9e4a630bd0 100644
--- a/includes/logging/LogEventsList.php
+++ b/includes/logging/LogEventsList.php
@@ -97,7 +97,7 @@ class LogEventsList extends ContextSource {
 	 * @param array|string $types
 	 * @param string $user
 	 * @param string $page
-	 * @param string $pattern
+	 * @param bool $pattern
 	 * @param int|string $year Use 0 to start with no year preselected.
 	 * @param int|string $month A month in the 1..12 range. Use 0 to start with no month
 	 *  preselected.
@@ -105,7 +105,7 @@ class LogEventsList extends ContextSource {
 	 * @param string $tagFilter Tag to select by default
 	 * @param string $action
 	 */
-	public function showOptions( $types = [], $user = '', $page = '', $pattern = '', $year = 0,
+	public function showOptions( $types = [], $user = '', $page = '', $pattern = false, $year = 0,
 		$month = 0, $filter = null, $tagFilter = '', $action = null
 	) {
 		global $wgScript, $wgMiserMode;
@@ -289,7 +289,7 @@ class LogEventsList extends ContextSource {
 	}
 
 	/**
-	 * @param string $pattern
+	 * @param bool $pattern
 	 * @return string Checkbox
 	 */
 	private function getTitlePattern( $pattern ) {
diff --git a/includes/logging/LogPager.php b/includes/logging/LogPager.php
index c047e96ea3..84653b1ba1 100644
--- a/includes/logging/LogPager.php
+++ b/includes/logging/LogPager.php
@@ -36,8 +36,8 @@ class LogPager extends ReverseChronologicalPager {
 	/** @var string|Title Events limited to those about Title when set */
 	private $title = '';
 
-	/** @var string */
-	private $pattern = '';
+	/** @var bool */
+	private $pattern = false;
 
 	/** @var string */
 	private $typeCGI = '';
@@ -59,7 +59,7 @@ class LogPager extends ReverseChronologicalPager {
 	 * @param string|array $types Log types to show
 	 * @param string $performer The user who made the log entries
 	 * @param string|Title $title The page title the log entries are for
-	 * @param string $pattern Do a prefix search rather than an exact title match
+	 * @param bool $pattern Do a prefix search rather than an exact title match
 	 * @param array $conds Extra conditions for the query
 	 * @param int|bool $year The year to start from. Default: false
 	 * @param int|bool $month The month to start from. Default: false
@@ -68,7 +68,7 @@ class LogPager extends ReverseChronologicalPager {
 	 * @param int $logId Log entry ID, to limit to a single log entry.
 	 */
 	public function __construct( $list, $types = [], $performer = '', $title = '',
-		$pattern = '', $conds = [], $year = false, $month = false, $tagFilter = '',
+		$pattern = false, $conds = [], $year = false, $month = false, $tagFilter = '',
 		$action = '', $logId = false
 	) {
 		parent::__construct( $list->getContext() );
@@ -194,7 +194,7 @@ class LogPager extends ReverseChronologicalPager {
 	 * (For the block and rights logs, this is a user page.)
 	 *
 	 * @param string|Title $page Title name
-	 * @param string $pattern
+	 * @param bool $pattern
 	 * @return void
 	 */
 	private function limitTitle( $page, $pattern ) {
@@ -398,6 +398,9 @@ class LogPager extends ReverseChronologicalPager {
 		return $this->title;
 	}
 
+	/**
+	 * @return bool
+	 */
 	public function getPattern() {
 		return $this->pattern;
 	}
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index b66031cc88..ac20b6af63 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -5087,17 +5087,15 @@ class Parser {
 								} else {
 									// Guess not, consider it as caption.
 									wfDebug( "$parameterMatch failed parameter validation\n" );
-									$label = '|' . $parameterMatch;
+									$label = $parameterMatch;
 								}
 						}
 
 					} else {
 						// Last pipe wins.
-						$label = '|' . $parameterMatch;
+						$label = $parameterMatch;
 					}
 				}
-				// Remove the pipe.
-				$label = substr( $label, 1 );
 			}
 
 			$ig->add( $title, $label, $alt, $link, $handlerOptions );
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 8fb98579f2..20bd599925 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -1275,9 +1275,17 @@ class ParserOptions {
 	public function optionsHash( $forOptions, $title = null ) {
 		global $wgRenderHashAppend;
 
+		$inCacheKey = self::allCacheVaryingOptions();
+
+		// Resolve any lazy options
+		foreach ( array_intersect( $forOptions, $inCacheKey, array_keys( self::$lazyOptions ) ) as $k ) {
+			if ( $this->options[$k] === null ) {
+				$this->options[$k] = call_user_func( self::$lazyOptions[$k], $this, $k );
+			}
+		}
+
 		$options = $this->options;
 		$defaults = self::getCanonicalOverrides() + self::getDefaults();
-		$inCacheKey = self::$inCacheKey;
 
 		// We only include used options with non-canonical values in the key
 		// so adding a new option doesn't invalidate the entire parser cache.
@@ -1285,13 +1293,11 @@ class ParserOptions {
 		// requires manual invalidation of existing cache entries, as mentioned
 		// in the docs on the relevant methods and hooks.
 		$values = [];
-		foreach ( $inCacheKey as $option => $include ) {
-			if ( $include && in_array( $option, $forOptions, true ) ) {
-				$v = $this->optionToString( $options[$option] );
-				$d = $this->optionToString( $defaults[$option] );
-				if ( $v !== $d ) {
-					$values[] = "$option=$v";
-				}
+		foreach ( array_intersect( $inCacheKey, $forOptions ) as $option ) {
+			$v = $this->optionToString( $options[$option] );
+			$d = $this->optionToString( $defaults[$option] );
+			if ( $v !== $d ) {
+				$values[] = "$option=$v";
 			}
 		}
 
diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index 0d0a6e4761..14d4a17daa 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -186,12 +186,6 @@ class ExtensionProcessor implements Processor {
 	 */
 	public function extractInfo( $path, array $info, $version ) {
 		$dir = dirname( $path );
-		if ( $version === 2 ) {
-			$this->extractConfig2( $info, $dir );
-		} else {
-			// $version === 1
-			$this->extractConfig1( $info );
-		}
 		$this->extractHooks( $info );
 		$this->extractExtensionMessagesFiles( $dir, $info );
 		$this->extractMessagesDirs( $dir, $info );
@@ -216,6 +210,15 @@ class ExtensionProcessor implements Processor {
 			$this->callbacks[$name] = $info['callback'];
 		}
 
+		// config should be after all core globals are extracted,
+		// so duplicate setting detection will work fully
+		if ( $version === 2 ) {
+			$this->extractConfig2( $info, $dir );
+		} else {
+			// $version === 1
+			$this->extractConfig1( $info );
+		}
+
 		if ( $version === 2 ) {
 			$this->extractAttributes( $path, $info );
 		}
@@ -463,7 +466,7 @@ class ExtensionProcessor implements Processor {
 			}
 			foreach ( $info['config'] as $key => $val ) {
 				if ( $key[0] !== '@' ) {
-					$this->addConfigGlobal( "$prefix$key", $val );
+					$this->addConfigGlobal( "$prefix$key", $val, $info['name'] );
 				}
 			}
 		}
@@ -491,7 +494,7 @@ class ExtensionProcessor implements Processor {
 				if ( isset( $data['path'] ) && $data['path'] ) {
 					$value = "$dir/$value";
 				}
-				$this->addConfigGlobal( "$prefix$key", $value );
+				$this->addConfigGlobal( "$prefix$key", $value, $info['name'] );
 			}
 		}
 	}
@@ -501,12 +504,13 @@ class ExtensionProcessor implements Processor {
 	 *
 	 * @param string $key The config key with the prefix and anything
 	 * @param mixed $value The value of the config
+	 * @param string $extName Name of the extension
 	 */
-	private function addConfigGlobal( $key, $value ) {
+	private function addConfigGlobal( $key, $value, $extName ) {
 		if ( array_key_exists( $key, $this->globals ) ) {
 			throw new RuntimeException(
-				"The configuration setting '$key' was already set by another extension,"
-				. " and cannot be set again." );
+				"The configuration setting '$key' was already set by MediaWiki core or"
+				. " another extension, and cannot be set again by $extName." );
 		}
 		$this->globals[$key] = $value;
 	}
diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index 90c314068d..bee3d0c9d4 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -1503,13 +1503,24 @@ MESSAGE;
 	 * startup module if the client has adequate support for MediaWiki JavaScript code.
 	 *
 	 * @param string $script JavaScript code
+	 * @param string $nonce Content-security-policy nonce, from OutputPage::getCSPNonce()
 	 * @return WrappedString HTML
 	 */
-	public static function makeInlineScript( $script ) {
+	public static function makeInlineScript( $script, $nonce = null ) {
 		$js = self::makeLoaderConditionalScript( $script );
+		$escNonce = '';
+		if ( $nonce === null ) {
+			wfWarn( __METHOD__ . " did not get nonce. Will break CSP" );
+		} elseif ( $nonce !== false ) {
+			// If it was false, CSP is disabled, so no nonce attribute.
+			// Nonce should be only base64 characters, so should be safe,
+			// but better to be safely escaped than sorry.
+			$escNonce = ' nonce="' . htmlspecialchars( $nonce ) . '"';
+		}
+
 		return new WrappedString(
-			Html::inlineScript( $js ),
-			'<script>(window.RLQ=window.RLQ||[]).push(function(){',
+			Html::inlineScript( $js, $nonce ),
+			"<script$escNonce>(window.RLQ=window.RLQ||[]).push(function(){",
 			'});</script>'
 		);
 	}
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index bb8ab32998..d0a9c4248a 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -248,9 +248,10 @@ class ResourceLoaderClientHtml {
 	 * - Inline scripts can't be asynchronous.
 	 * - For styles, earlier is better.
 	 *
+	 * @param string $nonce From OutputPage::getCSPNonce()
 	 * @return string|WrappedStringList HTML
 	 */
-	public function getHeadHtml() {
+	public function getHeadHtml( $nonce ) {
 		$data = $this->getData();
 		$chunks = [];
 
@@ -259,13 +260,15 @@ class ResourceLoaderClientHtml {
 		// See also #getDocumentAttributes() and /resources/src/startup.js.
 		$chunks[] = Html::inlineScript(
 			'document.documentElement.className = document.documentElement.className'
-			. '.replace( /(^|\s)client-nojs(\s|$)/, "$1client-js$2" );'
+			. '.replace( /(^|\s)client-nojs(\s|$)/, "$1client-js$2" );',
+			$nonce
 		);
 
 		// Inline RLQ: Set page variables
 		if ( $this->config ) {
 			$chunks[] = ResourceLoader::makeInlineScript(
-				ResourceLoader::makeConfigSetScript( $this->config )
+				ResourceLoader::makeConfigSetScript( $this->config ),
+				$nonce
 			);
 		}
 
@@ -273,7 +276,8 @@ class ResourceLoaderClientHtml {
 		$states = array_merge( $this->exemptStates, $data['states'] );
 		if ( $states ) {
 			$chunks[] = ResourceLoader::makeInlineScript(
-				ResourceLoader::makeLoaderStateScript( $states )
+				ResourceLoader::makeLoaderStateScript( $states ),
+				$nonce
 			);
 		}
 
@@ -281,14 +285,16 @@ class ResourceLoaderClientHtml {
 		if ( $data['embed']['general'] ) {
 			$chunks[] = $this->getLoad(
 				$data['embed']['general'],
-				ResourceLoaderModule::TYPE_COMBINED
+				ResourceLoaderModule::TYPE_COMBINED,
+				$nonce
 			);
 		}
 
 		// Inline RLQ: Load general modules
 		if ( $data['general'] ) {
 			$chunks[] = ResourceLoader::makeInlineScript(
-				Xml::encodeJsCall( 'mw.loader.load', [ $data['general'] ] )
+				Xml::encodeJsCall( 'mw.loader.load', [ $data['general'] ] ),
+				$nonce
 			);
 		}
 
@@ -296,7 +302,8 @@ class ResourceLoaderClientHtml {
 		if ( $data['scripts'] ) {
 			$chunks[] = $this->getLoad(
 				$data['scripts'],
-				ResourceLoaderModule::TYPE_SCRIPTS
+				ResourceLoaderModule::TYPE_SCRIPTS,
+				$nonce
 			);
 		}
 
@@ -304,7 +311,8 @@ class ResourceLoaderClientHtml {
 		if ( $data['styles'] ) {
 			$chunks[] = $this->getLoad(
 				$data['styles'],
-				ResourceLoaderModule::TYPE_STYLES
+				ResourceLoaderModule::TYPE_STYLES,
+				$nonce
 			);
 		}
 
@@ -312,7 +320,8 @@ class ResourceLoaderClientHtml {
 		if ( $data['embed']['styles'] ) {
 			$chunks[] = $this->getLoad(
 				$data['embed']['styles'],
-				ResourceLoaderModule::TYPE_STYLES
+				ResourceLoaderModule::TYPE_STYLES,
+				$nonce
 			);
 		}
 
@@ -324,6 +333,7 @@ class ResourceLoaderClientHtml {
 		$chunks[] = $this->getLoad(
 			'startup',
 			ResourceLoaderModule::TYPE_SCRIPTS,
+			$nonce,
 			$startupQuery
 		);
 
@@ -341,8 +351,8 @@ class ResourceLoaderClientHtml {
 		return self::makeContext( $this->context, $group, $type );
 	}
 
-	private function getLoad( $modules, $only, array $extraQuery = [] ) {
-		return self::makeLoad( $this->context, (array)$modules, $only, $extraQuery );
+	private function getLoad( $modules, $only, $nonce, array $extraQuery = [] ) {
+		return self::makeLoad( $this->context, (array)$modules, $only, $extraQuery, $nonce );
 	}
 
 	private static function makeContext( ResourceLoaderContext $mainContext, $group, $type,
@@ -369,11 +379,12 @@ class ResourceLoaderClientHtml {
 	 * @param ResourceLoaderContext $mainContext
 	 * @param array $modules One or more module names
 	 * @param string $only ResourceLoaderModule TYPE_ class constant
-	 * @param array $extraQuery [optional] Array with extra query parameters for the request
+	 * @param array $extraQuery Array with extra query parameters for the request
+	 * @param string $nonce See OutputPage::getCSPNonce() [Since 1.32]
 	 * @return string|WrappedStringList HTML
 	 */
 	public static function makeLoad( ResourceLoaderContext $mainContext, array $modules, $only,
-		array $extraQuery = []
+		array $extraQuery, $nonce
 	) {
 		$rl = $mainContext->getResourceLoader();
 		$chunks = [];
@@ -385,7 +396,7 @@ class ResourceLoaderClientHtml {
 			$chunks = [];
 			// Recursively call us for every item
 			foreach ( $modules as $name ) {
-				$chunks[] = self::makeLoad( $mainContext, [ $name ], $only, $extraQuery );
+				$chunks[] = self::makeLoad( $mainContext, [ $name ], $only, $extraQuery, $nonce );
 			}
 			return new WrappedStringList( "\n", $chunks );
 		}
@@ -427,7 +438,8 @@ class ResourceLoaderClientHtml {
 							);
 						} else {
 							$chunks[] = ResourceLoader::makeInlineScript(
-								$rl->makeModuleResponse( $context, $moduleSet )
+								$rl->makeModuleResponse( $context, $moduleSet ),
+								$nonce
 							);
 						}
 					} else {
@@ -461,7 +473,8 @@ class ResourceLoaderClientHtml {
 								] );
 							} else {
 								$chunk = ResourceLoader::makeInlineScript(
-									Xml::encodeJsCall( 'mw.loader.load', [ $url ] )
+									Xml::encodeJsCall( 'mw.loader.load', [ $url ] ),
+									$nonce
 								);
 							}
 						}
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 7e6e8e6d0d..bd48e21364 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -69,12 +69,25 @@ abstract class SearchEngine {
 	/**
 	 * Perform a full text search query and return a result set.
 	 * If full text searches are not supported or disabled, return null.
-	 * STUB
+	 *
+	 * As of 1.32 overriding this function is deprecated. It will
+	 * be converted to final in 1.34. Override self::doSearchText().
 	 *
 	 * @param string $term Raw search term
 	 * @return SearchResultSet|Status|null
 	 */
-	function searchText( $term ) {
+	public function searchText( $term ) {
+		return $this->doSearchText( $term );
+	}
+
+	/**
+	 * Perform a full text search query and return a result set.
+	 *
+	 * @param string $term Raw search term
+	 * @return SearchResultSet|Status|null
+	 * @since 1.32
+	 */
+	protected function doSearchText( $term ) {
 		return null;
 	}
 
@@ -85,11 +98,25 @@ abstract class SearchEngine {
 	 * The results returned by this methods are only sugegstions and
 	 * may not end up being shown to the user.
 	 *
+	 * As of 1.32 overriding this function is deprecated. It will
+	 * be converted to final in 1.34. Override self::doSearchArchiveTitle().
+	 *
 	 * @param string $term Raw search term
 	 * @return Status<Title[]>
 	 * @since 1.29
 	 */
-	function searchArchiveTitle( $term ) {
+	public function searchArchiveTitle( $term ) {
+		return $this->doSearchArchiveTitle( $term );
+	}
+
+	/**
+	 * Perform a title search in the article archive.
+	 *
+	 * @param string $term Raw search term
+	 * @return Status<Title[]>
+	 * @since 1.32
+	 */
+	protected function doSearchArchiveTitle( $term ) {
 		return Status::newGood( [] );
 	}
 
@@ -98,10 +125,24 @@ abstract class SearchEngine {
 	 * If title searches are not supported or disabled, return null.
 	 * STUB
 	 *
+	 * As of 1.32 overriding this function is deprecated. It will
+	 * be converted to final in 1.34. Override self::doSearchTitle().
+	 *
+	 * @param string $term Raw search term
+	 * @return SearchResultSet|null
+	 */
+	public function searchTitle( $term ) {
+		return $this->doSearchTitle( $term );
+	}
+
+	/**
+	 * Perform a title-only search query and return a result set.
+	 *
 	 * @param string $term Raw search term
 	 * @return SearchResultSet|null
+	 * @since 1.32
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		return null;
 	}
 
@@ -335,12 +376,25 @@ abstract class SearchEngine {
 			return false;
 		}
 		$extractedNamespace = null;
+		$allkeywords = [];
+
+		$allkeywords[] = wfMessage( 'searchall' )->inContentLanguage()->text() . ":";
+		// force all: so that we have a common syntax for all the wikis
+		if ( !in_array( 'all:', $allkeywords ) ) {
+			$allkeywords[] = 'all:';
+		}
+
+		$allQuery = false;
+		foreach ( $allkeywords as $kw ) {
+			if ( strncmp( $query, $kw, strlen( $kw ) ) == 0 ) {
+				$extractedNamespace = null;
+				$parsed = substr( $query, strlen( $kw ) );
+				$allQuery = true;
+				break;
+			}
+		}
 
-		$allkeyword = wfMessage( 'searchall' )->inContentLanguage()->text() . ":";
-		if ( strncmp( $query, $allkeyword, strlen( $allkeyword ) ) == 0 ) {
-			$extractedNamespace = null;
-			$parsed = substr( $query, strlen( $allkeyword ) );
-		} elseif ( strpos( $query, ':' ) !== false ) {
+		if ( !$allQuery && strpos( $query, ':' ) !== false ) {
 			// TODO: should we unify with PrefixSearch::extractNamespace ?
 			$prefix = str_replace( ' ', '_', substr( $query, 0, strpos( $query, ':' ) ) );
 			$index = $wgContLang->getNsIndex( $prefix );
diff --git a/includes/search/SearchMssql.php b/includes/search/SearchMssql.php
index 57ca06e39f..43bd3bed27 100644
--- a/includes/search/SearchMssql.php
+++ b/includes/search/SearchMssql.php
@@ -31,9 +31,8 @@ class SearchMssql extends SearchDatabase {
 	 *
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
-	 * @access public
 	 */
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		$resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), true ) );
 		return new SqlSearchResultSet( $resultSet, $this->searchTerms );
 	}
@@ -43,9 +42,8 @@ class SearchMssql extends SearchDatabase {
 	 *
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
-	 * @access public
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		$resultSet = $this->db->query( $this->getQuery( $this->filter( $term ), false ) );
 		return new SqlSearchResultSet( $resultSet, $this->searchTerms );
 	}
@@ -54,9 +52,8 @@ class SearchMssql extends SearchDatabase {
 	 * Return a partial WHERE clause to limit the search to the given namespaces
 	 *
 	 * @return string
-	 * @private
 	 */
-	function queryNamespaces() {
+	private function queryNamespaces() {
 		$namespaces = implode( ',', $this->namespaces );
 		if ( $namespaces == '' ) {
 			$namespaces = '0';
@@ -71,7 +68,7 @@ class SearchMssql extends SearchDatabase {
 	 *
 	 * @return string
 	 */
-	function queryLimit( $sql ) {
+	private function queryLimit( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
 	}
 
@@ -95,7 +92,7 @@ class SearchMssql extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getQuery( $filteredTerm, $fulltext ) {
+	private function getQuery( $filteredTerm, $fulltext ) {
 		return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
 			$this->queryNamespaces() . ' ' .
 			$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
@@ -117,9 +114,8 @@ class SearchMssql extends SearchDatabase {
 	 * @param string $filteredTerm
 	 * @param bool $fulltext
 	 * @return string
-	 * @private
 	 */
-	function queryMain( $filteredTerm, $fulltext ) {
+	private function queryMain( $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
 		$page = $this->db->tableName( 'page' );
 		$searchindex = $this->db->tableName( 'searchindex' );
@@ -134,7 +130,7 @@ class SearchMssql extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function parseQuery( $filteredText, $fulltext ) {
+	private function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
 		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX );
 		$this->searchTerms = [];
diff --git a/includes/search/SearchMySQL.php b/includes/search/SearchMySQL.php
index c98f7e337c..9a03ebe950 100644
--- a/includes/search/SearchMySQL.php
+++ b/includes/search/SearchMySQL.php
@@ -42,7 +42,7 @@ class SearchMySQL extends SearchDatabase {
 	 *
 	 * @return array
 	 */
-	function parseQuery( $filteredText, $fulltext ) {
+	private function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
 
 		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX ); // Minus syntax chars (" and *)
@@ -133,7 +133,7 @@ class SearchMySQL extends SearchDatabase {
 		];
 	}
 
-	function regexTerm( $string, $wildcard ) {
+	private function regexTerm( $string, $wildcard ) {
 		global $wgContLang;
 
 		$regex = preg_quote( $string, '/' );
@@ -167,7 +167,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		return $this->searchInternal( $term, true );
 	}
 
@@ -177,7 +177,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		return $this->searchInternal( $term, false );
 	}
 
@@ -264,7 +264,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @return array
 	 * @since 1.18 (changed)
 	 */
-	function getQuery( $filteredTerm, $fulltext ) {
+	private function getQuery( $filteredTerm, $fulltext ) {
 		$query = [
 			'tables' => [],
 			'fields' => [],
@@ -286,7 +286,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getIndexField( $fulltext ) {
+	private function getIndexField( $fulltext ) {
 		return $fulltext ? 'si_text' : 'si_title';
 	}
 
@@ -298,7 +298,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @since 1.18 (changed)
 	 */
-	function queryMain( &$query, $filteredTerm, $fulltext ) {
+	private function queryMain( &$query, $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
 		$query['tables'][] = 'page';
 		$query['tables'][] = 'searchindex';
@@ -316,7 +316,7 @@ class SearchMySQL extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return array
 	 */
-	function getCountQuery( $filteredTerm, $fulltext ) {
+	private function getCountQuery( $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
 
 		$query = [
diff --git a/includes/search/SearchOracle.php b/includes/search/SearchOracle.php
index 8bcd78fa66..7fe5b53ca6 100644
--- a/includes/search/SearchOracle.php
+++ b/includes/search/SearchOracle.php
@@ -64,7 +64,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		if ( $term == '' ) {
 			return new SqlSearchResultSet( false, '' );
 		}
@@ -79,7 +79,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		if ( $term == '' ) {
 			return new SqlSearchResultSet( false, '' );
 		}
@@ -92,7 +92,7 @@ class SearchOracle extends SearchDatabase {
 	 * Return a partial WHERE clause to limit the search to the given namespaces
 	 * @return string
 	 */
-	function queryNamespaces() {
+	private function queryNamespaces() {
 		if ( is_null( $this->namespaces ) ) {
 			return '';
 		}
@@ -111,7 +111,7 @@ class SearchOracle extends SearchDatabase {
 	 *
 	 * @return string
 	 */
-	function queryLimit( $sql ) {
+	private function queryLimit( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
 	}
 
@@ -134,7 +134,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getQuery( $filteredTerm, $fulltext ) {
+	private function getQuery( $filteredTerm, $fulltext ) {
 		return $this->queryLimit( $this->queryMain( $filteredTerm, $fulltext ) . ' ' .
 			$this->queryNamespaces() . ' ' .
 			$this->queryRanking( $filteredTerm, $fulltext ) . ' ' );
@@ -145,7 +145,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getIndexField( $fulltext ) {
+	private function getIndexField( $fulltext ) {
 		return $fulltext ? 'si_text' : 'si_title';
 	}
 
@@ -172,7 +172,7 @@ class SearchOracle extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function parseQuery( $filteredText, $fulltext ) {
+	private function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
 		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX );
 		$this->searchTerms = [];
diff --git a/includes/search/SearchPostgres.php b/includes/search/SearchPostgres.php
index 5a50b176e9..729e528fd6 100644
--- a/includes/search/SearchPostgres.php
+++ b/includes/search/SearchPostgres.php
@@ -37,7 +37,7 @@ class SearchPostgres extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		$q = $this->searchQuery( $term, 'titlevector', 'page_title' );
 		$olderror = error_reporting( E_ERROR );
 		$resultSet = $this->db->query( $q, 'SearchPostgres', true );
@@ -45,7 +45,7 @@ class SearchPostgres extends SearchDatabase {
 		return new SqlSearchResultSet( $resultSet, $this->searchTerms );
 	}
 
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		$q = $this->searchQuery( $term, 'textvector', 'old_text' );
 		$olderror = error_reporting( E_ERROR );
 		$resultSet = $this->db->query( $q, 'SearchPostgres', true );
@@ -61,7 +61,7 @@ class SearchPostgres extends SearchDatabase {
 	 *
 	 * @return string
 	 */
-	function parseQuery( $term ) {
+	private function parseQuery( $term ) {
 		wfDebug( "parseQuery received: $term \n" );
 
 		# # No backslashes allowed
@@ -123,7 +123,7 @@ class SearchPostgres extends SearchDatabase {
 	 * @param string $colname
 	 * @return string
 	 */
-	function searchQuery( $term, $fulltext, $colname ) {
+	private function searchQuery( $term, $fulltext, $colname ) {
 		# Get the SQL fragment for the given term
 		$searchstring = $this->parseQuery( $term );
 
diff --git a/includes/search/SearchResultSet.php b/includes/search/SearchResultSet.php
index f25c7283eb..e3eb4c250e 100644
--- a/includes/search/SearchResultSet.php
+++ b/includes/search/SearchResultSet.php
@@ -173,6 +173,7 @@ class SearchResultSet {
 	 * Fetches next search result, or false.
 	 * STUB
 	 * FIXME: refactor as iterator, so we could use nicer interfaces.
+	 * @deprecated since 1.32; Use self::extractResults()
 	 * @return SearchResult|false
 	 */
 	function next() {
@@ -181,6 +182,7 @@ class SearchResultSet {
 
 	/**
 	 * Rewind result set back to beginning
+	 * @deprecated since 1.32; Use self::extractResults()
 	 */
 	function rewind() {
 	}
diff --git a/includes/search/SearchSqlite.php b/includes/search/SearchSqlite.php
index af29212ba1..1dc37d2560 100644
--- a/includes/search/SearchSqlite.php
+++ b/includes/search/SearchSqlite.php
@@ -42,7 +42,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function parseQuery( $filteredText, $fulltext ) {
+	private function parseQuery( $filteredText, $fulltext ) {
 		global $wgContLang;
 		$lc = $this->legalSearchChars( self::CHARS_NO_SYNTAX ); // Minus syntax chars (" and *)
 		$searchon = '';
@@ -122,7 +122,7 @@ class SearchSqlite extends SearchDatabase {
 		return " $field MATCH $searchon ";
 	}
 
-	function regexTerm( $string, $wildcard ) {
+	private function regexTerm( $string, $wildcard ) {
 		global $wgContLang;
 
 		$regex = preg_quote( $string, '/' );
@@ -156,7 +156,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchText( $term ) {
+	protected function doSearchText( $term ) {
 		return $this->searchInternal( $term, true );
 	}
 
@@ -166,7 +166,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param string $term Raw search term
 	 * @return SqlSearchResultSet
 	 */
-	function searchTitle( $term ) {
+	protected function doSearchTitle( $term ) {
 		return $this->searchInternal( $term, false );
 	}
 
@@ -195,7 +195,7 @@ class SearchSqlite extends SearchDatabase {
 	 * Return a partial WHERE clause to limit the search to the given namespaces
 	 * @return string
 	 */
-	function queryNamespaces() {
+	private function queryNamespaces() {
 		if ( is_null( $this->namespaces ) ) {
 			return '';  # search all
 		}
@@ -212,7 +212,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param string $sql
 	 * @return string
 	 */
-	function limitResult( $sql ) {
+	private function limitResult( $sql ) {
 		return $this->db->limitResult( $sql, $this->limit, $this->offset );
 	}
 
@@ -223,7 +223,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getQuery( $filteredTerm, $fulltext ) {
+	private function getQuery( $filteredTerm, $fulltext ) {
 		return $this->limitResult(
 			$this->queryMain( $filteredTerm, $fulltext ) . ' ' .
 			$this->queryNamespaces()
@@ -235,7 +235,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function getIndexField( $fulltext ) {
+	private function getIndexField( $fulltext ) {
 		return $fulltext ? 'si_text' : 'si_title';
 	}
 
@@ -246,7 +246,7 @@ class SearchSqlite extends SearchDatabase {
 	 * @param bool $fulltext
 	 * @return string
 	 */
-	function queryMain( $filteredTerm, $fulltext ) {
+	private function queryMain( $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
 		$page = $this->db->tableName( 'page' );
 		$searchindex = $this->db->tableName( 'searchindex' );
@@ -255,7 +255,7 @@ class SearchSqlite extends SearchDatabase {
 			"WHERE page_id=$searchindex.rowid AND $match";
 	}
 
-	function getCountQuery( $filteredTerm, $fulltext ) {
+	private function getCountQuery( $filteredTerm, $fulltext ) {
 		$match = $this->parseQuery( $filteredTerm, $fulltext );
 		$page = $this->db->tableName( 'page' );
 		$searchindex = $this->db->tableName( 'searchindex' );
diff --git a/includes/skins/Skin.php b/includes/skins/Skin.php
index 340bc2f5bd..5dfa7e36c3 100644
--- a/includes/skins/Skin.php
+++ b/includes/skins/Skin.php
@@ -401,12 +401,14 @@ abstract class Skin extends ContextSource {
 
 	/**
 	 * @param array $data
+	 * @param string $nonce OutputPage::getCSPNonce()
 	 * @return string
 	 */
-	static function makeVariablesScript( $data ) {
+	static function makeVariablesScript( $data, $nonce = null ) {
 		if ( $data ) {
 			return ResourceLoader::makeInlineScript(
-				ResourceLoader::makeConfigSetScript( $data )
+				ResourceLoader::makeConfigSetScript( $data ),
+				$nonce
 			);
 		} else {
 			return '';
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 1d5d534ace..507688dfcc 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -465,7 +465,7 @@ class SkinTemplate extends Skin {
 
 		$tpl->set( 'debug', '' );
 		$tpl->set( 'debughtml', $this->generateDebugHTML() );
-		$tpl->set( 'reporttime', wfReportTime() );
+		$tpl->set( 'reporttime', wfReportTime( $out->getCSPNonce() ) );
 
 		// Avoid PHP 7.1 warning of passing $this by reference
 		$skinTemplate = $this;
diff --git a/includes/specialpage/ChangesListSpecialPage.php b/includes/specialpage/ChangesListSpecialPage.php
index ac13f113b2..9e61ef738b 100644
--- a/includes/specialpage/ChangesListSpecialPage.php
+++ b/includes/specialpage/ChangesListSpecialPage.php
@@ -785,7 +785,8 @@ abstract class ChangesListSpecialPage extends SpecialPage {
 
 			$out->addHTML(
 				ResourceLoader::makeInlineScript(
-					ResourceLoader::makeMessageSetScript( $messages )
+					ResourceLoader::makeMessageSetScript( $messages ),
+					$out->getCSPNonce()
 				)
 			);
 
diff --git a/includes/specials/SpecialAllPages.php b/includes/specials/SpecialAllPages.php
index f9c917d35e..ef05dd15b6 100644
--- a/includes/specials/SpecialAllPages.php
+++ b/includes/specials/SpecialAllPages.php
@@ -126,7 +126,7 @@ class SpecialAllPages extends IncludableSpecialPage {
 				'id' => 'namespace',
 				'label-message' => 'namespace',
 				'all' => null,
-				'value' => $namespace,
+				'default' => $namespace,
 			],
 			'hideredirects' => [
 				'type' => 'check',
@@ -141,7 +141,9 @@ class SpecialAllPages extends IncludableSpecialPage {
 			unset( $fields['hideredirects'] );
 		}
 
-		$form = HTMLForm::factory( 'table', $fields, $this->getContext() );
+		$context = new DerivativeContext( $this->getContext() );
+		$context->setTitle( $this->getPageTitle() ); // Remove subpage
+		$form = HTMLForm::factory( 'table', $fields, $context );
 		$form->setMethod( 'get' )
 			->setWrapperLegendMsg( 'allpages' )
 			->setSubmitTextMsg( 'allpagessubmit' )
diff --git a/includes/specials/SpecialApiSandbox.php b/includes/specials/SpecialApiSandbox.php
index c000d546d1..034e569e6c 100644
--- a/includes/specials/SpecialApiSandbox.php
+++ b/includes/specials/SpecialApiSandbox.php
@@ -37,7 +37,7 @@ class SpecialApiSandbox extends SpecialPage {
 
 		$out->addJsConfigVars( 'apihighlimits', $this->getUser()->isAllowed( 'apihighlimits' ) );
 		$out->addModuleStyles( [
-			'mediawiki.special.apisandbox.styles',
+			'mediawiki.special',
 		] );
 		$out->addModules( [
 			'mediawiki.special.apisandbox',
diff --git a/includes/specials/SpecialBotPasswords.php b/includes/specials/SpecialBotPasswords.php
index 7b2d1bcbfd..f03565adef 100644
--- a/includes/specials/SpecialBotPasswords.php
+++ b/includes/specials/SpecialBotPasswords.php
@@ -21,6 +21,8 @@
  * @ingroup SpecialPage
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * Let users manage bot passwords
  *
@@ -40,8 +42,12 @@ class SpecialBotPasswords extends FormSpecialPage {
 	/** @var string New password set, for communication between onSubmit() and onSuccess() */
 	private $password = null;
 
+	/** @var Psr\Log\LoggerInterface */
+	private $logger = null;
+
 	public function __construct() {
 		parent::__construct( 'BotPasswords', 'editmyprivateinfo' );
+		$this->logger = LoggerFactory::getInstance( 'authentication' );
 	}
 
 	/**
@@ -277,6 +283,16 @@ class SpecialBotPasswords extends FormSpecialPage {
 				$bp = BotPassword::newFromCentralId( $this->userId, $this->par );
 				if ( $bp ) {
 					$bp->delete();
+					$this->logger->info(
+						"Bot password {op} for {user}@{app_id}",
+						[
+							'app_id' => $this->par,
+							'user' => $this->getUser()->getName(),
+							'centralId' => $this->userId,
+							'op' => 'delete',
+							'client_ip' => $this->getRequest()->getIP()
+						]
+					);
 				}
 				return Status::newGood();
 
@@ -309,6 +325,18 @@ class SpecialBotPasswords extends FormSpecialPage {
 		}
 
 		if ( $bp->save( $this->operation, $password ) ) {
+			$this->logger->info(
+				"Bot password {op} for {user}@{app_id}",
+				[
+					'op' => $this->operation,
+					'user' => $this->getUser()->getName(),
+					'app_id' => $this->par,
+					'centralId' => $this->userId,
+					'restrictions' => $data['restrictions'],
+					'grants' => $bp->getGrants(),
+					'client_ip' => $this->getRequest()->getIP()
+				]
+			);
 			return Status::newGood();
 		} else {
 			// Messages: botpasswords-insert-failed, botpasswords-update-failed
diff --git a/includes/specials/SpecialComparePages.php b/includes/specials/SpecialComparePages.php
index 35cc6b84f2..28f04faa29 100644
--- a/includes/specials/SpecialComparePages.php
+++ b/includes/specials/SpecialComparePages.php
@@ -49,7 +49,7 @@ class SpecialComparePages extends SpecialPage {
 	public function execute( $par ) {
 		$this->setHeaders();
 		$this->outputHeader();
-		$this->getOutput()->addModuleStyles( 'mediawiki.special.comparepages.styles' );
+		$this->getOutput()->addModuleStyles( 'mediawiki.special' );
 
 		$form = HTMLForm::factory( 'ooui', [
 			'Page1' => [
diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php
index 60d5fd7c8c..3db7edaf8e 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -76,7 +76,7 @@ class SpecialEditTags extends UnlistedSpecialPage {
 		$this->outputHeader();
 
 		$this->getOutput()->addModules( [ 'mediawiki.special.edittags',
-			'mediawiki.special.edittags.styles' ] );
+			'mediawiki.special' ] );
 
 		$this->submitClicked = $request->wasPosted() && $request->getBool( 'wpSubmit' );
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index d30ff4329d..0069ea1bbe 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -143,8 +143,8 @@ class MovePageForm extends UnlistedSpecialPage {
 
 		$out = $this->getOutput();
 		$out->setPageTitle( $this->msg( 'move-page', $this->oldTitle->getPrefixedText() ) );
+		$out->addModuleStyles( 'mediawiki.special' );
 		$out->addModules( 'mediawiki.special.movePage' );
-		$out->addModuleStyles( 'mediawiki.special.movePage.styles' );
 		$this->addHelpLink( 'Help:Moving a page' );
 
 		$out->addWikiMsg( $this->getConfig()->get( 'FixDoubleRedirects' ) ?
diff --git a/includes/specials/SpecialPagesWithProp.php b/includes/specials/SpecialPagesWithProp.php
index 34fcc78c7e..46ad31c4a8 100644
--- a/includes/specials/SpecialPagesWithProp.php
+++ b/includes/specials/SpecialPagesWithProp.php
@@ -60,7 +60,7 @@ class SpecialPagesWithProp extends QueryPage {
 	public function execute( $par ) {
 		$this->setHeaders();
 		$this->outputHeader();
-		$this->getOutput()->addModuleStyles( 'mediawiki.special.pagesWithProp' );
+		$this->getOutput()->addModuleStyles( 'mediawiki.special' );
 
 		$request = $this->getRequest();
 		$propname = $request->getVal( 'propname', $par );
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index f67fe9f757..1cfcffa85d 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -36,8 +36,6 @@ class SpecialPreferences extends SpecialPage {
 
 	function __construct() {
 		parent::__construct( 'Preferences' );
-
-		$this->oouiEnabled = self::isOouiEnabled( $this->getContext() );
 	}
 
 	/**
@@ -56,6 +54,8 @@ class SpecialPreferences extends SpecialPage {
 	}
 
 	public function execute( $par ) {
+		$this->oouiEnabled = static::isOouiEnabled( $this->getContext() );
+
 		$this->setHeaders();
 		$this->outputHeader();
 		$out = $this->getOutput();
diff --git a/includes/specials/SpecialPrefixindex.php b/includes/specials/SpecialPrefixindex.php
index fac71b2d78..3ca3a85307 100644
--- a/includes/specials/SpecialPrefixindex.php
+++ b/includes/specials/SpecialPrefixindex.php
@@ -102,8 +102,10 @@ class SpecialPrefixindex extends SpecialAllPages {
 			'prefix' => [
 				'label-message' => 'allpagesprefix',
 				'name' => 'prefix',
+				'id' => 'nsfrom',
 				'type' => 'text',
 				'size' => '30',
+				'default' => str_replace( '_', ' ', $from ),
 			],
 			'namespace' => [
 				'type' => 'namespaceselect',
@@ -111,7 +113,7 @@ class SpecialPrefixindex extends SpecialAllPages {
 				'id' => 'namespace',
 				'label-message' => 'namespace',
 				'all' => null,
-				'value' => $namespace,
+				'default' => $namespace,
 			],
 			'hidedirects' => [
 				'class' => 'HTMLCheckField',
@@ -124,7 +126,9 @@ class SpecialPrefixindex extends SpecialAllPages {
 				'label-message' => 'prefixindex-strip',
 			],
 		];
-		$htmlForm = new HTMLForm( $formDescriptor, $this->getContext() );
+		$context = new DerivativeContext( $this->getContext() );
+		$context->setTitle( $this->getPageTitle() ); // Remove subpage
+		$htmlForm = HTMLForm::factory( 'ooui', $formDescriptor, $context );
 		$htmlForm
 			->setMethod( 'get' )
 			->setWrapperLegendMsg( 'prefixindex' )
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index f7cb654527..2eeafe6900 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -387,7 +387,7 @@ class SpecialUpload extends SpecialPage {
 		}
 
 		// Add styles for the warning, reused from the live preview
-		$this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
+		$this->getOutput()->addModuleStyles( 'mediawiki.special' );
 
 		$linkRenderer = $this->getLinkRenderer();
 		$warningHtml = '<h2>' . $this->msg( 'uploadwarning' )->escaped() . "</h2>\n"
diff --git a/includes/specials/SpecialWatchlist.php b/includes/specials/SpecialWatchlist.php
index dda1dac3af..ea73347c1f 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -60,11 +60,10 @@ class SpecialWatchlist extends ChangesListSpecialPage {
 		$output = $this->getOutput();
 		$request = $this->getRequest();
 		$this->addHelpLink( 'Help:Watching pages' );
+		$output->addModuleStyles( [ 'mediawiki.special' ] );
 		$output->addModules( [
-			'mediawiki.special.changeslist.visitedstatus',
 			'mediawiki.special.watchlist',
 		] );
-		$output->addModuleStyles( [ 'mediawiki.special.watchlist.styles' ] );
 
 		$mode = SpecialEditWatchlist::getMode( $request, $subpage );
 		if ( $mode !== false ) {
diff --git a/includes/specials/forms/UploadForm.php b/includes/specials/forms/UploadForm.php
index e561fe5882..8ab6f29f09 100644
--- a/includes/specials/forms/UploadForm.php
+++ b/includes/specials/forms/UploadForm.php
@@ -79,7 +79,7 @@ class UploadForm extends HTMLForm {
 
 		# Add a link to edit MediaWiki:Licenses
 		if ( $this->getUser()->isAllowed( 'editinterface' ) ) {
-			$this->getOutput()->addModuleStyles( 'mediawiki.special.upload.styles' );
+			$this->getOutput()->addModuleStyles( 'mediawiki.special' );
 			$licensesLink = $linkRenderer->makeKnownLink(
 				$this->msg( 'licenses' )->inContentLanguage()->getTitle(),
 				$this->msg( 'licenses-edit' )->text(),
diff --git a/includes/user/User.php b/includes/user/User.php
index e235c18928..7189bea120 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1813,14 +1813,14 @@ class User implements IDBAccessObject, UserIdentity {
 			if ( self::isLocallyBlockedProxy( $ip ) ) {
 				$block = new Block( [
 					'byText' => wfMessage( 'proxyblocker' )->text(),
-					'reason' => wfMessage( 'proxyblockreason' )->text(),
+					'reason' => wfMessage( 'proxyblockreason' )->plain(),
 					'address' => $ip,
 					'systemBlock' => 'proxy',
 				] );
 			} elseif ( $this->isAnon() && $this->isDnsBlacklisted( $ip ) ) {
 				$block = new Block( [
 					'byText' => wfMessage( 'sorbs' )->text(),
-					'reason' => wfMessage( 'sorbsreason' )->text(),
+					'reason' => wfMessage( 'sorbsreason' )->plain(),
 					'address' => $ip,
 					'systemBlock' => 'dnsbl',
 				] );
@@ -1841,7 +1841,7 @@ class User implements IDBAccessObject, UserIdentity {
 			if ( $block instanceof Block ) {
 				# Mangle the reason to alert the user that the block
 				# originated from matching the X-Forwarded-For header.
-				$block->mReason = wfMessage( 'xffblockreason', $block->mReason )->text();
+				$block->mReason = wfMessage( 'xffblockreason', $block->mReason )->plain();
 			}
 		}
 
@@ -1853,7 +1853,7 @@ class User implements IDBAccessObject, UserIdentity {
 			$block = new Block( [
 				'address' => $ip,
 				'byText' => 'MediaWiki default',
-				'reason' => wfMessage( 'softblockrangesreason', $ip )->text(),
+				'reason' => wfMessage( 'softblockrangesreason', $ip )->plain(),
 				'anonOnly' => true,
 				'systemBlock' => 'wgSoftBlockRanges',
 			] );
diff --git a/includes/utils/ExecutableFinder.php b/includes/utils/ExecutableFinder.php
index 9679bfeeec..78b3f8e29b 100644
--- a/includes/utils/ExecutableFinder.php
+++ b/includes/utils/ExecutableFinder.php
@@ -94,6 +94,11 @@ class ExecutableFinder {
 	 * @return bool|string
 	 */
 	public static function findInDefaultPaths( $names, $versionInfo = false ) {
+		if ( Shell::isDisabled() ) {
+			// If we can't shell out, there's no point looking for executables
+			return false;
+		}
+
 		$paths = self::getPossibleBinPaths();
 		foreach ( (array)$names as $name ) {
 			foreach ( $paths as $path ) {
diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index bb4c25835e..6dc121f41e 100644
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -4081,7 +4081,7 @@
 	"authmanager-authn-not-in-progress": "عملية التحقق ليست جارية أو بينات الجلسة تم فقدها. من فضلك ابدأ مرة ثانية من البداية.",
 	"authmanager-authn-no-primary": "الاعتماد الموفر لم يمكن التحقق منه.",
 	"authmanager-authn-no-local-user": "الاعتماد الموفر غير مرتبط بأي مستخدم على هذه الويكي.",
-	"authmanager-authn-no-local-user-link": "الاعتمادات الموفرة صحيحة لكن غير مرتبطة بأي مستخدم على هذه الويكي. سجل الدخول باستخدام طريقة أخرى، أو أنشيء مستخدما جديدا، وستمتلك الاختيار لوصل اعتماداتك السابقة لذلك الحساب.",
+	"authmanager-authn-no-local-user-link": "الاعتمادات الموفرة صحيحة لكن غير مرتبطة بأي مستخدم على هذه الويكي. سجل الدخول باستخدام طريقة أخرى، أو أنشئ حسابًا جديدًا، وستمتلك الاختيار لوصل اعتماداتك السابقة لذلك الحساب.",
 	"authmanager-authn-autocreate-failed": "الإنشاء التلقائي لحساب محلي فشل: $1",
 	"authmanager-change-not-supported": "الاعتمادات الموفرة لم يمكن تغييرها، حيث أن لا شيء سيستخدمها.",
 	"authmanager-create-disabled": "إنشاء الحسابات معطل.",
diff --git a/languages/i18n/as.json b/languages/i18n/as.json
index 81b6d0f239..e118a0ceec 100644
--- a/languages/i18n/as.json
+++ b/languages/i18n/as.json
@@ -25,7 +25,7 @@
 		]
 	},
 	"tog-underline": "সংযোগসমূহ অধোৰেখিত কৰক:",
-	"tog-hideminor": "সাম্প্ৰতিক সাল-সলনিত অগুৰুত্বপূৰ্ণ সম্পাদনা নেদেখুৱাব",
+	"tog-hideminor": "শেহতীয়া সাল-সলনিত অগুৰুত্বপূৰ্ণ সম্পাদনা নেদেখুৱাব",
 	"tog-hidepatrolled": "সাম্প্ৰতিক সাল-সলনিত তহলদাৰী সম্পাদনা নেদেখুৱাব",
 	"tog-newpageshidepatrolled": "নতুন পৃষ্ঠা তালিকাত তহলদাৰী পৃষ্ঠাসমূহ নেদেখুৱাব",
 	"tog-hidecategorization": "পৃষ্ঠাবোৰৰ শ্ৰেণীকৰণ লুকুৱাওক",
@@ -1151,6 +1151,7 @@
 	"recentchanges-legend-plusminus": "(''±১২৩'')",
 	"rcfilters-legend-heading": "<strong>সংক্ষিপ্ত ৰূপৰ তালিকা:</strong>",
 	"rcfilters-other-review-tools": "আন পুনৰীক্ষণ সঁজুলি",
+	"rcfilters-filter-humans-label": "মানুহ (ব'ট নহয়)",
 	"rcnotefrom": "<strong>$2</strong>ৰ পৰা হোৱা পৰিৱৰ্তনসমূহ (সৰ্বোচ্চ <strong>$1টা</strong> দেখুৱা হৈছে)।",
 	"rclistfrom": "$3 $2ৰ পৰা নতুন সালসলনি দেখুৱাওক",
 	"rcshowhideminor": "$1 -সংখ্যক নগণ্য সম্পাদনা",
diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json
index b688b16228..911a6272b1 100644
--- a/languages/i18n/ast.json
+++ b/languages/i18n/ast.json
@@ -514,6 +514,7 @@
 	"botpasswords-existing": "Contraseñes de bots esistentes",
 	"botpasswords-createnew": "Crear una contraseña nueva de bot",
 	"botpasswords-editexisting": "Editar una contraseña de bot esistiente",
+	"botpasswords-label-needsreset": "(la contraseña tien de reaniciase)",
 	"botpasswords-label-appid": "Nome del bot:",
 	"botpasswords-label-create": "Crear",
 	"botpasswords-label-update": "Anovar",
@@ -537,6 +538,7 @@
 	"botpasswords-restriction-failed": "Hai torgues de contraseña de bot que torgaron esti aniciu de sesión.",
 	"botpasswords-invalid-name": "El nome d'usuariu especificáu nun contien el separador de contraseña de bot («$1»).",
 	"botpasswords-not-exist": "L'usuariu «$1» nun tien una contraseña de bot llamada «$2».",
+	"botpasswords-needs-reset": "Tien de reniciase la contraseña del robot «$2», propiedá {{GENDER:$1|del usuariu|de la usuaria}} «$1».",
 	"resetpass_forbidden": "Nun puen camudase les contraseñes",
 	"resetpass_forbidden-reason": "Les contraseñes nun pueden camudase: $1",
 	"resetpass-no-info": "Tienes d'aniciar sesión pa entrar direutamente a esta páxina.",
@@ -632,8 +634,8 @@
 	"subject-preview": "Vista previa del asuntu:",
 	"previewerrortext": "Hebo un error al intentar entever los cambios.",
 	"blockedtitle": "L'usuariu ta bloquiáu",
-	"blockedtext": "'''El to nome d'usuariu o direición IP ta bloquiáu.'''\n\nEl bloquéu fexolu $1.\nEl motivu conseñáu ye ''$2''.\n\n* Principiu del bloquéu: $8\n* Caducidá del bloquéu: $6\n* Usuariu a bloquiar: $7\n\nPues ponete'n contautu con $1 o con otru [[{{MediaWiki:Grouppage-sysop}}|alministrador]] p'aldericar sobre'l bloquéu.\nNun pues usar la función 'manda-y un corréu electrónicu a esti usuariu' a nun ser que tea especificada una direición de\ncorréu electrónicu válida nes tos [[Special:Preferences|preferencies de cuenta]] y que nun tengas torgao usala.\nLa to direición IP actual ye $3, y la ID del bloquéu ye #$5.\nPor favor, incluye tolos detalles anteriores nes consultes que faigas.",
-	"autoblockedtext": "La to direición IP bloquióse automáticamente porque usóla otru usuariu que foi bloquiáu por $1.\nEl motivu conseñáu ye:\n\n:''$2''\n\n* Principiu del bloquéu: $8\n* Caducidá del bloquéu: $6\n* Usuariu a bloquiar: $7\n\nPues ponete'n contautu con $1 o con otru de los [[{{MediaWiki:Grouppage-sysop}}|alministradores]] p'aldericar sobre'l bloquéu.\n\nTen en cuenta que nun pues usar la función «manda-y un corréu electrónicu a esti usuariu» a nun ser que tengas rexistrada una direición de corréu electrónicu válida nes [[Special:Preferences|preferencies d'usuariu]] y que nun tengas torgao usala.\n\nLa to direición IP actual ye $3, y la ID del bloquéu ye #$5.\nPor favor, incluye tolos detalles anteriores nes consultes que faigas.",
+	"blockedtext": "<strong>El to nome d'usuariu o direición IP ta bloquiáu.</strong>\n\nEl bloquéu fexolu $1.\nEl motivu conseñáu ye <em>$2</em>.\n\n* Principiu del bloquéu: $8\n* Caducidá del bloquéu: $6\n* Usuariu a bloquiar: $7\n\nPuedes comunicate con $1 o con otru [[{{MediaWiki:Grouppage-sysop}}|alministrador]] p'aldericar sobre'l bloquéu.\nNun puedes usar la función «{{int:emailuser}}» a nun ser que tea especificada una direición de corréu electrónicu válida nes tos [[Special:Preferences|preferencies de cuenta]] y que nun tengas torgao usala.\nLa to direición IP actual ye $3, y la ID del bloquéu ye #$5.\nPor favor, incluye tolos detalles anteriores nes consultes que faigas.",
+	"autoblockedtext": "La to direición IP bloquióse automáticamente porque usóla otru usuariu que foi bloquiáu por $1.\nEl motivu conseñáu ye:\n\n:<em>$2</em>\n\n* Principiu del bloquéu: $8\n* Caducidá del bloquéu: $6\n* Usuariu a bloquiar: $7\n\nPues ponete'n contautu con $1 o con otru de los [[{{MediaWiki:Grouppage-sysop}}|alministradores]] p'aldericar sobre'l bloquéu.\n\nTen en cuenta que nun pues usar la función «{{int:emailuser}}» a nun ser que tengas rexistrada una direición de corréu electrónicu válida nes [[Special:Preferences|preferencies d'usuariu]] y que nun tengas torgao usala.\n\nLa to direición IP actual ye $3, y la ID del bloquéu ye #$5.\nPor favor, incluye tolos detalles anteriores nes consultes que faigas.",
 	"systemblockedtext": "El to nome d'usuariu o dirección IP bloquióse automáticamente pol software MediaWiki.\nEl motivu dau ye:\n\n:<em>$2</em>\n\n* Entamu del bloquéu: $8\n* Caducidá de bloquéu: $6\n* Destinatariu del bloquéu: $7\n\nLa to dirección IP actual ye $3.\nPor favor, incluye tolos anteriores en cualquier consulta que faigas.",
 	"blockednoreason": "nun se dio nengún motivu",
 	"whitelistedittext": "Tienes d'$1 pa editar páxines.",
@@ -1485,7 +1487,7 @@
 	"recentchangeslinked-feed": "Cambios rellacionaos",
 	"recentchangeslinked-toolbox": "Cambios rellacionaos",
 	"recentchangeslinked-title": "Cambios rellacionaos con \"$1\"",
-	"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-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 {{ns:category}}: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",
@@ -3998,5 +4000,6 @@
 	"pagedata-title": "Datos de la páxina",
 	"pagedata-text": "Esta páxina ufre una interfaz de datos pa les páxines. Escribe'l títulu de la páxina na URL, usando la sintaxis de subpáxina.\n* Aplícase la negociación de conteníu en base a la testera Accept del to cliente. Esto significa que los datos de la páxina van dase nel formatu que prefiera'l to cliente.",
 	"pagedata-not-acceptable": "Nun s'alcontró nengún formatu que coincidiera. Tipos MIME soportaos: $1",
-	"pagedata-bad-title": "Títulu inválidu: $1."
+	"pagedata-bad-title": "Títulu inválidu: $1.",
+	"unregistered-user-config": "Por motivos de seguridá, les subpáxines d'usuariu JavaScript, CSS y JSON nun pueden cargase pa usuarios ensin rexistrar."
 }
diff --git a/languages/i18n/azb.json b/languages/i18n/azb.json
index f7e226557f..d6fb71661b 100644
--- a/languages/i18n/azb.json
+++ b/languages/i18n/azb.json
@@ -1220,7 +1220,7 @@
 	"recentchangeslinked-feed": "باغلی دَییشیکلیک‌لر",
 	"recentchangeslinked-toolbox": "باغلی دَییشیکلیک‌لر",
 	"recentchangeslinked-title": "''$1'' ایله باغلی دییشیکلر",
-	"recentchangeslinked-summary": "آشاغیداکی سیياهی، قئيد اوْلونان صحیفه‌‌يه (و يا قئيد اوْلونان کاتئقوْرياداکی صحیفه‌‌لره) داخیلی کئچید وئرن صحیفه‌‌لرده ائدیلمیش سوْن ديَیشیکلیکلرین سیياهیسیدیر. \n[[Special:Watchlist|ایزله‌مه سیياهینیزداکی]] صحیفه‌‌لر '''قالین''' شریفتله گؤستریلمیشدیر.",
+	"recentchangeslinked-summary": "آشاغیداکی ژورنال، قئيد اوْلونان صفحه‌‌يه (و يا قئيد اوْلونان بؤلمه‌ده‌کی صفحه‌‌لره) داخیلی کئچید وئرن صفحه‌‌لرده ائدیلمیش سوْن ديَیشیکلیکلرین لیستیدیر. \n[[Special:Watchlist|ایزله‌مه لیستینیزده]]‌کی صفحه‌‌لر '''قالین''' شریفتله گؤستریلمیشدیر.",
 	"recentchangeslinked-page": "صفحه آدی:",
 	"recentchangeslinked-to": "قئيد اوْلونان صحیفه‌‌ده‌کی دئيیل، اوْنا داخیلی کئچید وئرن صحیفه‌‌لرده‌کی ديَیشیکلیکلری گؤستر",
 	"upload": "فایل یوکله‌",
diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json
index df3cd07674..d6730e8f46 100644
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -540,6 +540,7 @@
 	"botpasswords-restriction-failed": "Уваход ня выкананы праз абмежаваньні на пароль робата",
 	"botpasswords-invalid-name": "Пададзенае імя ўдзельніка ня ўтрымлівае падзяляльнік для паролю робата («$1»).",
 	"botpasswords-not-exist": "Удзельнік «$1» ня мае паролю для робата з назвай «$2».",
+	"botpasswords-needs-reset": "Пароль для робата зь імем «$2» {{GENDER:$1|удзельніка|удзельніцы}} «$1» мусіць быць скінуты.",
 	"resetpass_forbidden": "Пароль ня можа быць зьменены",
 	"resetpass_forbidden-reason": "Паролі ня могуць быць зьмененыя: $1",
 	"resetpass-no-info": "Для непасрэднага доступу да гэтай старонкі Вам неабходна ўвайсьці ў сыстэму.",
@@ -635,8 +636,8 @@
 	"subject-preview": "Папярэдні прагляд загалоўку:",
 	"previewerrortext": "Адбылася памылка пры спробе папярэдняга прагляду вашых зьменаў.",
 	"blockedtitle": "Удзельнік заблякаваны",
-	"blockedtext": "<strong>Ваш рахунак удзельніка ці IP-адрас быў заблякаваны.</strong>\n\nБлякаваньне выканаў $1.\nПрычына гэтага: <em>$2</em>.\n\n* Пачатак блякаваньня: $8\n* Сканчэньне блякаваньня: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне. Заўважце, што Вы ня зможаце ўжыць магчымасьць «даслаць ліст па электроннай пошце», пакуль не пазначыце сапраўдны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах]], і калі гэта Вам не было забаронена.\nВаш IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
-	"autoblockedtext": "Ваш IP-адрас быў аўтаматычна заблякаваны, таму што ён ужываўся іншым удзельнікам, які быў заблякаваны $1.\nПрычына гэтага:\n\n:<em>$2</em>\n\n* Блякаваньне пачалося: $8\n* Блякаваньне скончыцца: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці з адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне.\n\nЗаўважце, што Вы ня зможаце ўжываць магчымасьць «даслаць ліст праз электронную пошту», пакуль ня будзе пазначаны дзейны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах удзельніка]], і калі гэта Вам не было забаронена.\n\nВаш цяперашні IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
+	"blockedtext": "<strong>Ваш рахунак удзельніка ці IP-адрас быў заблякаваны.</strong>\n\nБлякаваньне выканаў $1.\nПрычына гэтага: <em>$2</em>.\n\n* Пачатак блякаваньня: $8\n* Сканчэньне блякаваньня: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне. Заўважце, што вы ня зможаце ўжыць магчымасьць «{{int:emailuser}}», пакуль не пазначыце сапраўдны адрас электроннай пошты ў вашых [[Special:Preferences|наладах]], і калі гэта вам не было забаронена.\nВаш IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што вы будзеце рабіць.",
+	"autoblockedtext": "Ваш IP-адрас быў аўтаматычна заблякаваны, таму што ён ужываўся іншым удзельнікам, які быў заблякаваны $1.\nПрычына гэтага:\n\n:<em>$2</em>\n\n* Блякаваньне пачалося: $8\n* Блякаваньне скончыцца: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці з адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне.\n\nЗаўважце, што вы ня зможаце ўжываць магчымасьць «{{int:emailuser}}», пакуль ня будзе пазначаны дзейны адрас электроннай пошты ў вашых [[Special:Preferences|наладах удзельніка]], і калі гэта вам не было забаронена.\n\nВаш цяперашні IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што вы будзеце рабіць.",
 	"systemblockedtext": "Вашае імя ўдзельніка ці IP-адрас былі аўтаматычна заблякаваныя MediaWiki.\nЗ наступнай прычыны:\n\n:<em>$2</em>\n\n* Пачатак блякаваньня: $8\n* Сканчэньне блякаваньня: $6\n* Мэта блякаваньня: $7\n\nВаш цяперашні IP-адрас — $3.\nКалі ласка, уключайце ўсе пададзеныя вышэй дэталі ва ўсе запыты, што вы робіце.",
 	"blockednoreason": "прычына не пазначана",
 	"whitelistedittext": "Вам трэба $1, каб рэдагаваць старонкі.",
@@ -1497,21 +1498,21 @@
 	"upload": "Загрузіць файл",
 	"uploadbtn": "Загрузіць файл",
 	"reuploaddesc": "Скасаваць загрузку і вярнуцца да формы загрузкі",
-	"upload-tryagain": "Даслаць зьмененае апісаньне файла",
+	"upload-tryagain": "Даслаць зьмененае апісаньне файлу",
 	"upload-tryagain-nostash": "Даслаць паўторна загружаны файл і зьмененае апісаньне",
 	"uploadnologin": "Вы не ўвайшлі ў сыстэму",
 	"uploadnologintext": "Вам трэба $1, каб загружаць файлы.",
 	"upload_directory_missing": "Загрузачная дырэкторыя ($1) адсутнічае і ня можа быць створаная сэрвэрам.",
 	"upload_directory_read_only": "Сэрвэр ня мае правоў на запіс у дырэкторыю загружаных файлаў ($1).",
 	"uploaderror": "Памылка загрузкі",
-	"upload-recreate-warning": "'''Увага: файл з такой назвай быў выдалены альбо перанесены.'''\n\nЖурнал выдаленьняў і пераносаў гэтай старонкі для зручнасьці пададзены тут:",
+	"upload-recreate-warning": "<strong>Увага: файл з такой назвай быў выдалены альбо перанесены.</strong>\n\nЖурнал выдаленьняў і пераносаў гэтай старонкі для зручнасьці пададзены тут:",
 	"uploadtext": "Ужывайце форму ніжэй для загрузкі файлаў.\nКаб паглядзець ці адшукаць раней загружаныя файлы, глядзіце [[Special:FileList|сьпіс загружаных файлаў]], загрузкі таксама запісваюцца ў [[Special:Log/upload|журнал загрузак]], а выдаленьні — у [[Special:Log/delete|журнал выдаленьняў]].\n\nКаб улучыць файл у старонку, ужывайце адзін з наступных варыянтаў:\n* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.jpg]]</nowiki></code>''' для поўнай вэрсіі файла\n* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:File.png|200px|thumb|left|Подпіс да выявы]]</nowiki></code>''' для выявы шырынёй 200 піксэляў у рамцы і тэкстам «Подпіс да выявы» ў якасьці подпісу\n* '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></code>''' для простай спасылкі на файл безь яго адлюстраваньня.",
 	"upload-permitted": "{{PLURAL:$2|Дазволены тып|Дазволеныя тыпы}} файлаў: $1.",
 	"upload-preferred": "{{PLURAL:$2|Пажаданы тып|Пажаданыя тыпы}} файлаў: $1.",
 	"upload-prohibited": "{{PLURAL:$2|Забаронены тып|Забароненыя тыпы}} файлаў: $1.",
 	"uploadlogpage": "Журнал загрузак",
-	"uploadlogpagetext": "Сьпіс апошніх загружаных файлаў.",
-	"filename": "Назва файла",
+	"uploadlogpagetext": "Ніжэй знаходзіцца сьпіс апошніх загружаных файлаў.\nГлядзіце [[Special:NewFiles|галерэю новых файлаў]] для больш візуальнага агляду.",
+	"filename": "Назва файлу",
 	"filedesc": "Апісаньне",
 	"fileuploadsummary": "Апісаньне:",
 	"filereuploadsummary": "Зьмены ў файле:",
@@ -1965,6 +1966,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Дадаць парамэтар:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Назва парамэтру",
 	"apisandbox-dynamic-error-exists": "Парамэтар з назвай «$1» ужо існуе.",
+	"apisandbox-templated-parameter-reason": "Гэты [[Special:ApiHelp/main#main/templatedparams|шаблённы парамэтар]] прапануецца паводле {{PLURAL:$1|1=значэньня|значэньняў}} $2.",
 	"apisandbox-deprecated-parameters": "Састарэлыя парамэтры",
 	"apisandbox-fetch-token": "Аўтазапаўненьне токену",
 	"apisandbox-add-multi": "Дадаць",
@@ -4005,5 +4007,6 @@
 	"pagedata-title": "Зьвесткі старонкі",
 	"pagedata-text": "Гэтая старонка забясьпечвае інтэрфэйс зьвестак для старонак. Калі ласка, увядзіце назву старонкі ў URL-адрас з дапамогай сынтаксысу падстаронак.\n* Узгадненьне зьместу засноўваецца на загалоўку Accept вашага кліенту. Гэта значыць, што зьвесткі старонкі будуць пададзеныя ў фармаце, найлепшым для вашага кліенту.",
 	"pagedata-not-acceptable": "Ня знойдзены адпаведны фармат. Падтрымліваюцца MIME-тыпы: $1",
-	"pagedata-bad-title": "Няслушная назва: $1."
+	"pagedata-bad-title": "Няслушная назва: $1.",
+	"unregistered-user-config": "З прычынаў бясьпекі JavaScript, CSS і JSON-падстаронкі ўдзельніка ня могуць быць загружаныя для незарэгістраваных удзельнікаў."
 }
diff --git a/languages/i18n/be.json b/languages/i18n/be.json
index 0333b61464..c7d9bf62e0 100644
--- a/languages/i18n/be.json
+++ b/languages/i18n/be.json
@@ -1023,7 +1023,7 @@
 	"recentchangesdays-max": "(найбольш $1 {{PLURAL:$1|дзень|дзён}})",
 	"recentchangescount": "Перадвызначаная колькасць правак для паказу:",
 	"prefs-help-recentchangescount": "Максімальная колькасць: 1000",
-	"prefs-help-watchlist-token2": "Гэта сакрэтны ключ да сеціўнай стужкі з Вашага спіса назірання.\nКожны, хто ведае гэты ключ, будзе мець магчымасць чытаць Ваш спіс назірання, таму не дзяліцеся ім.\nКалі трэба, можна [[Special:ResetTokens|скінуць яго]].",
+	"prefs-help-watchlist-token2": "Гэта сакрэтны ключ да сеціўнай стужкі з Вашага спісу назірання.\nКожны, хто ведае гэты ключ, будзе мець магчымасць чытаць Ваш спіс назірання, таму не дзяліцеся ім.\nКалі трэба, можна [[Special:ResetTokens|скінуць яго]].",
 	"savedprefs": "Настройкі замацаваныя.",
 	"savedrights": "Групы {{GENDER:$1|ўдзельніка|ўдзельніцы}} $1 захаваныя.",
 	"timezonelegend": "Часавы пояс:",
@@ -1576,7 +1576,7 @@
 	"uploaded-event-handler-on-svg": "Устаноўка атрыбутаў апрацоўшчыка падзей <code>$1=\"$2\"</code> у SVG файле не дазваляецца.",
 	"uploaded-href-attribute-svg": "у SVG файлах атрыбутам href дазволены толькі мэты віду http:// або https://, знойдзена <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploaded-href-unsafe-target-svg": "У ўкладзеным SVG файле знойдзена спасылка на небяспечныя звесткі: URI мэты <code>&lt;$1 $2=\"$3\"&gt;</code>.",
-	"uploaded-animate-svg": "У ўкладзеным SVG файле знойдзены тэг \"animate\", здольны змяніць спасылку з дапамогай атрыбута \"from\" <code>&lt;$1 $2=\"$3\"&gt;</code>.",
+	"uploaded-animate-svg": "Ва ўкладзеным SVG файле знойдзены тэг \"animate\", здольны змяніць спасылку з дапамогай атрыбута \"from\" <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploaded-setting-event-handler-svg": "Устаноўка атрыбутаў апрацоўкі падзей заблакавана, у ўкладзеным SVG-файле знойдзены код <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploaded-setting-href-svg": "Выкарыстанне тэга \"set\" для дадання атрыбута \"href\" у бацькоўскі элемент заблакавана.",
 	"uploaded-wrong-setting-svg": "Ужыванне тэга \"set\" для задання ў якасці мэты аддаленага адраса/звестак/сцэнарыя для любога атрыбута заблакавана. У ўкладзеным SVG-файле знойдзены <code>&lt;set to=\"$1\"&gt;</code>.",
@@ -2663,7 +2663,7 @@
 	"tooltip-ca-undelete": "Аднавіць праўкі, зробленыя на гэтай старонцы перад тым, як яна была сцёрта",
 	"tooltip-ca-move": "Перанесці гэтую старонку пад іншую назву",
 	"tooltip-ca-watch": "Дадаць гэтую старонку да свайго спісу назіраных старонак",
-	"tooltip-ca-unwatch": "Выняць гэту старонку з вашага спіса назірання",
+	"tooltip-ca-unwatch": "Выняць гэтую старонку з Вашага спісу назірання",
 	"tooltip-search": "Знайсці ў {{SITENAME}}",
 	"tooltip-search-go": "Перайсці да старонкі з дакладна такой назвай, калі такая наогул існуе",
 	"tooltip-search-fulltext": "Знайсці гэты тэкст у тэкстах старонак",
@@ -3249,7 +3249,7 @@
 	"confirm-watch-button": "ОК",
 	"confirm-watch-top": "Дабавіць старонку ў спіс назірання",
 	"confirm-unwatch-button": "ОК",
-	"confirm-unwatch-top": "Выняць гэту старонку з вашага спіса назірання?",
+	"confirm-unwatch-top": "Выняць гэту старонку з Вашага спісу назірання?",
 	"confirm-rollback-button": "Добра",
 	"confirm-rollback-top": "Адкаціць праўкі гэтай старонкі?",
 	"quotation-marks": "«$1»",
@@ -3274,6 +3274,7 @@
 	"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|байт|байты|байтаў}}",
@@ -3283,7 +3284,7 @@
 	"watchlistedit-normal-legend": "Выдаленне складнікаў са спісу назірання",
 	"watchlistedit-normal-explain": "Назвы старонак з ліку назіраных паказаныя ніжэй. Каб нешта выдаліць, адзначце клетку побач з адпаведным радком, пасля чаго націсніце \"Выняць складнікі\". Таксама можна правіць гэты спіс непасрэдна, [[Special:EditWatchlist/raw|без афармлення]].",
 	"watchlistedit-normal-submit": "Выняць складнікі",
-	"watchlistedit-normal-done": "З вашага спіса назірання {{PLURAL:$1|быў выдалены|былі выдалены|было выдалена}} $1 {{PLURAL:$1|складнік|складнікі|складнікаў}}:",
+	"watchlistedit-normal-done": "З Вашага спісу назірання {{PLURAL:$1|быў выдалены|былі выдалены|было выдалена}} $1 {{PLURAL:$1|складнік|складнікі|складнікаў}}:",
 	"watchlistedit-raw-title": "Нефарматаваны спіс назірання",
 	"watchlistedit-raw-legend": "Правіць нефарматаваны спіс назірання",
 	"watchlistedit-raw-explain": "Назвы старонак з ліку назіраных паказаныя ніжэй, без афармлення, адна назва на адзін радок; такім чынам, спіс можна правіць як звычайны тэкст. Па сканчэнні націсніце \"{{int:Watchlistedit-raw-submit}}\". Таксама гэта можна зрабіць праз [[Special:EditWatchlist|стандартны інтэрфейс]].",
@@ -3544,6 +3545,7 @@
 	"logentry-delete-delete": "$1 {{GENDER:$2|выдаліў|выдаліла}} старонку $3",
 	"logentry-delete-delete_redir": "$1 {{GENDER:$2|выдаліў|выдаліла}} перанакіраванне $3 шляхам перазапісу",
 	"logentry-delete-restore": "$1 {{GENDER:$2|аднавіў|аднавіла}} старонку $3 ($4)",
+	"restore-count-revisions": "{{PLURAL:$1|1 версія|$1 версіі|$1 версій}}",
 	"logentry-delete-event": "$1 {{GENDER:$2|змяніў|змяніла}} бачнасць {{PLURAL:$5|запісу журнала|$5 запісаў журнала}} $3: $4",
 	"logentry-delete-revision": "$1 {{GENDER:$2|змяніў|змяніла}} бачнасць {{PLURAL:$5|версіі|$5 версій|$5 версій}} старонкі $3: $4",
 	"logentry-delete-event-legacy": "$1 {{GENDER:$2|змяніў|змяніла}} бачнасць запісаў журнала $3",
diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json
index b4b31f2b46..4fc42bc67e 100644
--- a/languages/i18n/bg.json
+++ b/languages/i18n/bg.json
@@ -628,6 +628,9 @@
 	"savechanges": "Съхраняване на промените",
 	"publishpage": "Публикуване на страницата",
 	"publishchanges": "Публикуване на промените",
+	"savearticle-start": "Съхраняване на страницата...",
+	"savechanges-start": "Съхраняване на промените...",
+	"publishpage-start": "Публикуване на страницата...",
 	"publishchanges-start": "Публикуване на промените...",
 	"preview": "Предварителен преглед",
 	"showpreview": "Предварителен преглед",
@@ -636,6 +639,7 @@
 	"anoneditwarning": "<strong>Внимание:</strong> Не сте влезли в системата. Ако направите редакция IP-адресът Ви ще бъде публично видим. Ако <strong>[$1 влезете]</strong> или си <strong>[$2 създадете акаунт]</strong>, редакциите Ви ще бъдат свързани с потребителското Ви име, заедно с други преимущества.",
 	"anonpreviewwarning": "<em>Не сте влезли в системата. Ако съхраните редакцията си, тя ще бъде записана в историята на страницата с вашия IP-адрес.</em>",
 	"missingsummary": "<strong>Напомняне:</strong> Не е въведено кратко описание на промените.\nПри повторно натискане на бутона „$1“, редакцията ще бъде съхранена без резюме.",
+	"selfredirect": "<strong>Внимание:</strong> Пренасочвате страница към самата нея.\nМоже би сте посочили грешна цел за пренасочването или може би сте редактирали грешната страница.\nАко натиснете „$1“ отново, пренасочването ще бъде създадено.",
 	"missingcommenttext": "Моля, въведете коментар.",
 	"missingcommentheader": "<strong>Напомняне:</strong> Не е въведено заглавие на коментара.\nПри повторно натискане на „$1“, редакцията ще бъде записана без коментар.",
 	"summary-preview": "Предварителен преглед на резюмето:",
@@ -644,6 +648,7 @@
 	"blockedtitle": "Потребителят е блокиран",
 	"blockedtext": "'''Вашето потребителско име (или IP-адрес) беше блокирано.'''\n\nБлокирането е извършено от $1. Посочената причина е: ''$2''\n\n*Начало на блокирането: $8\n*Край на блокирането: $6\n*Блокирането се отнася за: $7\n\nМожете да се свържете с $1 или с някой от останалите [[{{MediaWiki:Grouppage-sysop}}|администратори]], за да обсъдите блокирането.\n\nМожете да използвате услугата „Пращане писмо на потребител“ само ако не ви е забранена употребата ѝ и ако сте посочили валидна електронна поща в [[Special:Preferences|настройките]] си.\n\nВашият IP адрес е $3, а номерът на блокирането е $5. Включвайте едно от двете или и двете във всяко запитване, което правите.",
 	"autoblockedtext": "IP-адресът ви беше блокиран автоматично, защото е бил използван от друг потребител, който е бил блокиран от $1.\nПосочената причина е:\n\n:''$2''\n\n* Начало на блокирането: $8\n* Край на блокирането: $6\n* Блокирането се отнася за: $7\n\nМожете да се свържете с $1 или с някой от останалите [[{{MediaWiki:Grouppage-sysop}}|администратори]], за да обсъдите блокирането.\n\nМожете да използвате услугата „Пращане писмо на потребител“ само ако не ви е забранена употребата ѝ и ако сте посочили валидна електронна поща в [[Special:Preferences|настройките]] си.\n\nТекущият ви IP-адрес е $3, а номерът на блокирането ви е $5. Включвайте ги във всяко питане, което правите.",
+	"systemblockedtext": "Вашето потребителско име или IP адрес беше автоматично блокирано от Медия Уики.\nПосочената причина е:\n\n:<em>$2</em>\n\n* Начало на блокирането: $8\n* Край на блокирането: $6\n* Блокирането се отнася за: $7\n\nВашият текущ IP адрес е $3.\nМоля, включете всичките детайли по-горе, ако правите каквито и да е запитвания.",
 	"blockednoreason": "не е указана причина",
 	"whitelistedittext": "Редактирането на страници изисква $1 в системата.",
 	"confirmedittext": "Необходимо е да потвърдите електронната си поща, преди да редактирате страници.\nВъведете и потвърдете адреса си на [[Special:Preferences|страницата с настройките]].",
@@ -1059,6 +1064,7 @@
 	"prefs-dateformat": "Формат на датата",
 	"prefs-timeoffset": "Часово отместване",
 	"prefs-advancedediting": "Общи настройки",
+	"prefs-developertools": "Инструменти за разработчици",
 	"prefs-editor": "Редактор",
 	"prefs-preview": "Преглед",
 	"prefs-advancedrc": "Разширени настройки",
@@ -1361,6 +1367,8 @@
 	"rcfilters-filter-humans-description": "Редакции, направени от редактори.",
 	"rcfilters-filtergroup-reviewstatus": "Проверка на статуса",
 	"rcfilters-filter-reviewstatus-unpatrolled-label": "Непатрулирано",
+	"rcfilters-filter-reviewstatus-manual-label": "Ръчно патрулирани",
+	"rcfilters-filter-reviewstatus-auto-label": "Автоматично патрулирани",
 	"rcfilters-filtergroup-significance": "Значимост",
 	"rcfilters-filter-minor-label": "Малки промени",
 	"rcfilters-filter-minor-description": "Редакции, които не са отбелязани като малки промени.",
@@ -1698,10 +1706,10 @@
 	"filedelete-intro-old": "Изтривате версията на <strong>[[Media:$1|$1]]</strong> към [$4 $3, $2].",
 	"filedelete-comment": "Причина:",
 	"filedelete-submit": "Изтриване",
-	"filedelete-success": "Файлът '''$1''' беше изтрит.",
+	"filedelete-success": "Файлът <strong>$1</strong> беше изтрит.",
 	"filedelete-success-old": "Версията на <strong>[[Media:$1|$1]]</strong> към $3, $2 е била изтрита.",
 	"filedelete-nofile": "Файлът <strong>$1</strong> не съществува.",
-	"filedelete-nofile-old": "Не съществува архивна версия на '''$1''' с указаните параметри.",
+	"filedelete-nofile-old": "Не съществува архивна версия на <strong>$1</strong> с указаните параметри.",
 	"filedelete-otherreason": "Друга/допълнителна причина:",
 	"filedelete-reason-otherlist": "Друга причина",
 	"filedelete-reason-dropdown": "*Общи причини за изтриване\n** Нарушение на авторските права\n** Файлът се повтаря",
@@ -2157,7 +2165,7 @@
 	"protect-othertime": "Друг срок:",
 	"protect-othertime-op": "друг срок",
 	"protect-existing-expiry": "Оставащо време: $2, $3",
-	"protect-existing-expiry-infinity": "Existing expiration time: безсрочно",
+	"protect-existing-expiry-infinity": "Оставащо време: безсрочно",
 	"protect-otherreason": "Друга/допълнителна причина:",
 	"protect-otherreason-op": "Друга причина",
 	"protect-dropdown": "* Стандартни причини за защита на страници\n** Чест обект на вандализъм\n** Чест обект на спам\n** Редакторска война\n** Страница, изискваща много сървърни ресурси",
@@ -2177,7 +2185,7 @@
 	"restriction-level-all": "всички",
 	"undelete": "Преглед на изтрити страници",
 	"undeletepage": "Преглед и възстановяване на изтрити страници",
-	"undeletepagetitle": "'''По-долу е показан списък на изтритите версии на [[:$1|$1]]'''.",
+	"undeletepagetitle": "<strong>По-долу е показан списък на изтритите версии на [[:$1|$1]]</strong>.",
 	"viewdeletedpage": "Преглед на изтрити страници",
 	"undeletepagetext": "{{PLURAL:$1|Следната страница беше изтрита, но все още се намира в архива и може да бъде възстановена|Следните $1 страници бяха изтрити, но все още се намират в архива и могат да бъдат възстановени}}. Архивът може да се почиства от време на време.",
 	"undelete-fieldset-title": "Възстановяване на версии",
diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json
index 574950e047..ccb1fb2538 100644
--- a/languages/i18n/bn.json
+++ b/languages/i18n/bn.json
@@ -654,8 +654,8 @@
 	"subject-preview": "বিষয়ের প্রাকদর্শন:",
 	"previewerrortext": "আপনার পরিবর্তনগুলি প্রাকদর্শন করার চেষ্টা করার সময় একটি ত্রুটি ঘটেছে।",
 	"blockedtitle": "ব্যবহারকারীকে বাধা দেয়া হয়েছে",
-	"blockedtext": "<strong>আপনার ব্যবহারকারী নাম বা আইপি ঠিকানাটিকে সম্পাদনায় বাধাদান করা হয়েছে।</strong>\n\n$1 এই বাধাটি প্রদান করেছেন। বাধার কারণ হিসেবে বলা হয়েছে:<em>$2</em>।\n\n* বাধা শুরুর সময়: $8\n* বাধা উঠিয়ে নেয়ার সময়: $6\n* যাকে বাধাদান করা হয়েছে: $7\n\nআপনি $1 অথবা অন্য [[{{MediaWiki:Grouppage-sysop}}|প্রশাসকদের]] সাথে এই বাধা সংক্রান্ত বিষয়ে আলোচনা করতে পারেন।\n\nআপনি \"ইমেইল করুন\" বৈশিষ্ট্যটি ব্যবহার করতে পারবেন না যদি না আপনার [[Special:Preferences|অ্যাকাউন্টের পছন্দসমূহে]] একটি বৈধ ইমেইল ঠিকানা নির্দিষ্ট না করা হয়ে থাকে এবং আপনাকে এটি ব্যবহার করা থেকে অবরুদ্ধ না করা হয়ে থাকে।\n\nআপনার বর্তমান আইপি ঠিকানা হল $3, এবং আপনার বাধা নং হল #$5।\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
-	"autoblockedtext": "আপনার আইপি ঠিকানাটিকে স্বয়ংক্রিয়ভাবে সম্পাদনায় বাধাদান করা হয়েছে কারণ এমন আরেকজন ব্যবহারকারী এটি ব্যবহার করেছেন, যাকে $1 বাধা দিয়েছেন।\nযে কারণে বাধা দেওয়া হয়েছে সেটি হল:\n\n:<em>$2</em>\n\n* বাধা শুরুর সময়: $8\n* বাধা শেষের সময়: $6\n* যাকে বাধাদান করা হয়েছে: $7\n\nআপনি $1-এর সাথে কিংবা অন্য যেকোন [[{{MediaWiki:Grouppage-sysop}}|প্রশাসকের]] সাথে যোগাযোগ করে এই বাধা সংক্রান্ত বিষয়ে আলোচনা করতে পারেন।\n\nলক্ষ্য করুন, আপনি \"এই ব্যবহারকারীকে ই-মেইল করুন\" বৈশিষ্ট্যটি ব্যবহার করতে পারবেন না যদি না আপনার [[Special:Preferences|অ্যাকাউন্টের পছন্দসমূহে]] একটি বৈধ ইমেইল ঠিকানা নিবন্ধিত না থাকে এবং আপনাকে এটি ব্যবহার করা থেকে অবরুদ্ধ না করা হয়ে থাকে।\n\nআপনার বর্তমান আইপি ঠিকানা হচ্ছে $3, এবং বাধা নং হল #$5।\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
+	"blockedtext": "<strong>আপনার ব্যবহারকারী নাম বা আইপি ঠিকানাটিকে সম্পাদনায় বাধাদান করা হয়েছে।</strong>\n\n$1 এই বাধাটি প্রদান করেছেন। বাধার কারণ হিসেবে বলা হয়েছে:<em>$2</em>।\n\n* বাধা শুরুর সময়: $8\n* বাধা উঠিয়ে নেয়ার সময়: $6\n* যাকে বাধাদান করা হয়েছে: $7\n\nআপনি $1 অথবা অন্য [[{{MediaWiki:Grouppage-sysop}}|প্রশাসকদের]] সাথে এই বাধা সংক্রান্ত বিষয়ে আলোচনা করতে পারেন।\n\nআপনি \"{{int:emailuser}}\" বৈশিষ্ট্যটি ব্যবহার করতে পারবেন না যদি না আপনার [[Special:Preferences|অ্যাকাউন্টের পছন্দসমূহে]] একটি বৈধ ইমেইল ঠিকানা নির্দিষ্ট না করা হয়ে থাকে এবং আপনাকে এটি ব্যবহার করা থেকে অবরুদ্ধ না করা হয়ে থাকে।\n\nআপনার বর্তমান আইপি ঠিকানা হল $3, এবং আপনার বাধা নং হল #$5।\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
+	"autoblockedtext": "আপনার আইপি ঠিকানাটিকে স্বয়ংক্রিয়ভাবে সম্পাদনায় বাধাদান করা হয়েছে কারণ এমন আরেকজন ব্যবহারকারী এটি ব্যবহার করেছেন, যাকে $1 বাধা দিয়েছেন।\nযে কারণে বাধা দেওয়া হয়েছে সেটি হল:\n\n:<em>$2</em>\n\n* বাধা শুরুর সময়: $8\n* বাধা শেষের সময়: $6\n* যাকে বাধাদান করা হয়েছে: $7\n\nআপনি $1-এর সাথে কিংবা অন্য যেকোন [[{{MediaWiki:Grouppage-sysop}}|প্রশাসকের]] সাথে যোগাযোগ করে এই বাধা সংক্রান্ত বিষয়ে আলোচনা করতে পারেন।\n\nলক্ষ্য করুন, আপনি \"{{int:emailuser}}\" বৈশিষ্ট্যটি ব্যবহার করতে পারবেন না যদি না আপনার [[Special:Preferences|অ্যাকাউন্টের পছন্দসমূহে]] একটি বৈধ ইমেইল ঠিকানা নিবন্ধিত না থাকে এবং আপনাকে এটি ব্যবহার করা থেকে অবরুদ্ধ না করা হয়ে থাকে।\n\nআপনার বর্তমান আইপি ঠিকানা হচ্ছে $3, এবং বাধা নং হল #$5।\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
 	"systemblockedtext": "আপনার ব্যবহারকারী নাম অথবা আইপি ঠিকানাটিকে স্বয়ংক্রিয়ভাবে মিডিয়াউইকি দ্বারা বাধাদান করা হয়েছে। যে কারণটি দেওয়া হয়েছে, সেটি হল:\n\n:<em>$2</em>\n\n* বাধা শুরুর সময়: $8\n* বাধা উঠিয়ে নেয়ার সময়: $6\n* যাকে বাধাদান করা হয়েছে: $7\n\nআপনার বর্তমান আইপি ঠিকানাটি হল $3।\nদয়া করে আপনার যেকোন জিজ্ঞাসাতে উপরের সমস্ত বিবরণ অন্তর্ভুক্ত করুন।",
 	"blockednoreason": "কোন কারণ দেওয়া হয়নি",
 	"whitelistedittext": "পাতায় সম্পাদনা করতে অনুগ্রহ করে $1 করুন।",
@@ -2282,7 +2282,7 @@
 	"protect-level-autoconfirmed": "শুধুমাত্র স্বয়ং পরীক্ষিত ব্যবহারকারীদের জন্য",
 	"protect-level-sysop": "কেবল প্রশাসকদের জন্য অনুমতি",
 	"protect-summary-cascade": "প্রপাতাকার",
-	"protect-expiring": "$1 (ইউটিসি) সময়ে মেয়াদোত্তীর্ণ",
+	"protect-expiring": "মেয়াদোত্তীর্ণ হবার তারিখ $1 (ইউটিসি)",
 	"protect-expiring-local": "মেয়াদ উত্তীর্ণের সময় $1",
 	"protect-expiry-indefinite": "অসীম",
 	"protect-cascade": "এই পাতায় অন্তর্ভুক্ত পাতাগুলিও সুরক্ষিত করা হোক (প্রপাতাকার সুরক্ষা)",
diff --git a/languages/i18n/ca.json b/languages/i18n/ca.json
index f4158eae86..a8a60d559e 100644
--- a/languages/i18n/ca.json
+++ b/languages/i18n/ca.json
@@ -586,6 +586,7 @@
 	"botpasswords-restriction-failed": "Les restriccions de contrasenyes de bots impedeixen aquest inici de sessió.",
 	"botpasswords-invalid-name": "El nom d'usuari especificat no conté el separador de contrasenya de bot («$1»).",
 	"botpasswords-not-exist": "L'usuari «$1» no té una contrasenya de bot anomenada «$2».",
+	"botpasswords-needs-reset": "Cal reinicialitzar la contrasenya del robot «$2» que pertany a {{GENDER:$1|l’usuari|la usuària}} «$1».",
 	"resetpass_forbidden": "No poden canviar-se les contrasenyes",
 	"resetpass_forbidden-reason": "Les contrasenyes no es poden canviar: $1",
 	"resetpass-no-info": "Heu d'estar registrats en un compte per a poder accedir directament a aquesta pàgina.",
diff --git a/languages/i18n/ckb.json b/languages/i18n/ckb.json
index 79f2b2b5b5..b23fbabc29 100644
--- a/languages/i18n/ckb.json
+++ b/languages/i18n/ckb.json
@@ -1174,6 +1174,8 @@
 	"rcfilters-limit-and-date-label": "$1 گۆڕانکاری، $2",
 	"rcfilters-days-show-days": "$1 {{PLURAL:$1|ڕۆژ}}",
 	"rcfilters-quickfilters": "پاڵوێنە پاشەکەوتکراوەکان",
+	"rcfilters-quickfilters-placeholder-title": "ھیچ پاڵوێنەیەک پاشەکەوت نەکراوە",
+	"rcfilters-quickfilters-placeholder-description": "بۆ پاشەکەوتکردنی ھەڵبژاردەی پاڵوێنەکان و دووبارە بەکارھێنانەوەیان، کرتە لەسەر نیشانی نیشانەی کتێبەکە بکە.",
 	"rcfilters-savedqueries-defaultlabel": "پاڵوێنە پاشەکەوتکراوەکان",
 	"rcfilters-savedqueries-setdefault": "بە بنەڕەتی کارای بکە",
 	"rcfilters-savedqueries-new-name-label": "ناو",
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index a37e90a0bb..113a994616 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -541,6 +541,7 @@
 	"botpasswords-existing": "Stávající hesla pro boty",
 	"botpasswords-createnew": "Vytvořit nové heslo pro boty",
 	"botpasswords-editexisting": "Editovat existující heslo pro boty",
+	"botpasswords-label-needsreset": "(heslo se musí resetovat)",
 	"botpasswords-label-appid": "Název bota:",
 	"botpasswords-label-create": "Vytvořit",
 	"botpasswords-label-update": "Aktualizovat",
@@ -564,6 +565,7 @@
 	"botpasswords-restriction-failed": "Toto přihlášení bylo zamítnuto omezením hesel pro boty.",
 	"botpasswords-invalid-name": "Uvedené uživatelské jméno neobsahuje oddělovač hesel pro boty („$1“).",
 	"botpasswords-not-exist": "Uživatel „$1“ nemá heslo pro bota nazvaného „$2“.",
+	"botpasswords-needs-reset": "Heslo pro bota jménem „$2“ {{GENDER:$2|uživatele|uživatelky}} „$1“ se musí resetovat.",
 	"resetpass_forbidden": "Hesla nelze změnit.",
 	"resetpass_forbidden-reason": "Hesla nelze změnit: $1",
 	"resetpass-no-info": "K této stránce mají přímý přístup jen přihlášení uživatelé.",
@@ -659,8 +661,8 @@
 	"subject-preview": "Náhled předmětu:",
 	"previewerrortext": "Při pokusu o zobrazení náhledu vašich změn došlo k chybě.",
 	"blockedtitle": "Uživatel zablokován",
-	"blockedtext": "<strong>Vaší IP adrese či uživatelskému jménu byla zablokována možnost editace.</strong>\n\nZablokování {{GENDER:$4|provedl|provedla}} $1.\nUdaným důvodem bylo <em>$2</em>.\n\n* Začátek blokování: $8\n* Zablokování vyprší: $6\n* Blokovaný uživatel: $7\n\nPokud chcete zablokování prodiskutovat, můžete kontaktovat {{GENDER:$4|uživatele|uživatelku}} $1 či jiného [[{{MediaWiki:Grouppage-sysop}}|správce]].\nUvědomte si, že nemůžete použít funkci „Poslat e-mail“, jestliže nemáte ve svém [[Special:Preferences|nastavení]] uvedenu platnou e-mailovou adresu nebo pokud vám byla tato možnost zakázána.\nVaše IP adresa je $3 a&nbsp;identifikační číslo bloku je #$5; tyto údaje uvádějte ve všech dotazech na správce.",
-	"autoblockedtext": "Vaše IP adresa byla automaticky zablokována, protože ji používal jiný uživatel, kterého zablokoval $1.\nUdaný důvod blokování:\n\n:<em>$2</em>\n\n* Začátek blokování: $8\n* Konec blokování: $6\n* Původně blokovaný uživatel: $7\n\nZablokování můžete prodiskutovat se správcem $1 nebo některým z dalších [[{{MediaWiki:Grouppage-sysop}}|správců]].\n\nUvědomte si však, že funkci „Poslat e-mail tomuto uživateli“ nemůžete použít, pokud nemáte ve svém [[Special:Preferences|uživatelském nastavení]] zadaný platný e-mail a nebylo vám zablokováno jeho užívání.\n\nVaše současná IP adresa je $3, číslo vašeho zablokování je #$5.\nProsíme, uveďte tyto údaje při komunikaci se správci.",
+	"blockedtext": "<strong>Vaší IP adrese či uživatelskému jménu byla zablokována možnost editace.</strong>\n\nZablokování {{GENDER:$4|provedl|provedla}} $1.\nUdaným důvodem bylo <em>$2</em>.\n\n* Začátek blokování: $8\n* Zablokování vyprší: $6\n* Blokovaný uživatel: $7\n\nPokud chcete zablokování prodiskutovat, můžete kontaktovat {{GENDER:$4|uživatele|uživatelku}} $1 či jiného [[{{MediaWiki:Grouppage-sysop}}|správce]].\nUvědomte si, že nemůžete použít funkci „{{int:emailuser}}“, jestliže nemáte ve svém [[Special:Preferences|nastavení]] uvedenu platnou e-mailovou adresu nebo pokud vám byla tato možnost zakázána.\nVaše IP adresa je $3 a&nbsp;identifikační číslo bloku je #$5; tyto údaje uvádějte ve všech dotazech na správce.",
+	"autoblockedtext": "Vaše IP adresa byla automaticky zablokována, protože ji používal jiný uživatel, kterého zablokoval $1.\nUdaný důvod blokování:\n\n:<em>$2</em>\n\n* Začátek blokování: $8\n* Konec blokování: $6\n* Původně blokovaný uživatel: $7\n\nZablokování můžete prodiskutovat se správcem $1 nebo některým z dalších [[{{MediaWiki:Grouppage-sysop}}|správců]].\n\nUvědomte si však, že funkci „{{int:emailuser}}“ nemůžete použít, pokud nemáte ve svém [[Special:Preferences|uživatelském nastavení]] zadaný platný e-mail a nebylo vám zablokováno jeho užívání.\n\nVaše současná IP adresa je $3, číslo vašeho zablokování je #$5.\nProsíme, uveďte tyto údaje při komunikaci se správci.",
 	"systemblockedtext": "Vaše IP adresa byla automaticky zablokována softwarem MediaWiki.\nUdaný důvod blokování:\n\n:<em>$2</em>\n\n* Začátek blokování: $8\n* Konec blokování: $6\n* Původně blokovaný uživatel: $7\n\nVaše současná IP adresa je $3.\nProsíme, uveďte tyto údaje při komunikaci se správci.",
 	"blockednoreason": "důvod nebyl zadán",
 	"whitelistedittext": "Pro editaci se musíte $1.",
@@ -1988,6 +1990,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Přidat parametr:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Jméno parametru",
 	"apisandbox-dynamic-error-exists": "Parametr s názvem „$1“ již existuje.",
+	"apisandbox-templated-parameter-reason": "Tento [[Special:ApiHelp/main#main/templatedparams|šablonovaný parametr]] se nabízí na základě {{PLURAL:$1|hodnoty|hodnot}} parametru $2.",
 	"apisandbox-deprecated-parameters": "Zavržené parametry",
 	"apisandbox-fetch-token": "Automaticky naplnit token",
 	"apisandbox-add-multi": "Přidat",
@@ -4076,5 +4079,6 @@
 	"pagedata-title": "Data stránky",
 	"pagedata-text": "Tato stránka poskytuje datové rozhraní ke stránkám. Uveďte prosím název stránky v URL pomocí syntaxe pro podstránky.\n* Funguje dohadování o obsahu na základě hlavičky Accept vašeho klienta. To znamená, že data stránky budou poskytnuta ve formátu preferovaném vaším klientem.",
 	"pagedata-not-acceptable": "Nenalezen odpovídající formát. Podporované MIME typy: $1",
-	"pagedata-bad-title": "Neplatný název: $1."
+	"pagedata-bad-title": "Neplatný název: $1.",
+	"unregistered-user-config": "Z bezpečnostních důvodů nelze načítat uživatelské podstránky s JavaScriptem, CSS nebo JSONem u neregistrovaných uživatelů."
 }
diff --git a/languages/i18n/cu.json b/languages/i18n/cu.json
index 6d27e3e037..4343b6140c 100644
--- a/languages/i18n/cu.json
+++ b/languages/i18n/cu.json
@@ -11,7 +11,7 @@
 			"Vvs-dm"
 		]
 	},
-	"tog-oldsig": "нꙑнѣшьн҄ь аѵтографъ :",
+	"tog-oldsig": "твои нꙑнѣшьн҄ь аѵтографъ :",
 	"underline-always": "вьсѥгда",
 	"underline-never": "никъгда",
 	"sunday": "нєдѣлꙗ",
@@ -83,13 +83,14 @@
 	"subcategories": "подъкатигорїѩ",
 	"category-media-header": "катигорїѩ ⁖ $1 ⁖ дѣла",
 	"category-empty": "''сѥи катигорїи нꙑнѣ страницѧ и дѣлъ нѣстъ''",
-	"hidden-categories": "{{PLURAL:$1|съкрꙑта катигорїꙗ|съкрꙑти катигорїи|съкрꙑтꙑ катигорїѩ}}",
+	"hidden-categories": "{{PLURAL:$1|съкрꙑта катигорїꙗ|съкрꙑтѣ катигорїи|съкрꙑтꙑ катигорїѩ}}",
 	"hidden-category-category": "съкрꙑтꙑ катигорїѩ",
 	"category-subcat-count": "{{PLURAL:$2|1=Сѥи катигорїи тъкъмо сꙗ подъкатигорїꙗ ѥстъ|Сѥи катигорїи {{PLURAL:$1|1=ѥдина подъкатигорїꙗ ѥстъ|2 подъкатигорїи ѥстє|$1 подъкатигорїѩ сѫтъ}} · а вьсѩ жє подъкатигорїѩ число $2 ѥстъ}}",
 	"listingcontinuesabbrev": "· вѧщє",
+	"broken-file-category": "страницѧ ѩжє блаꙁничьнꙑ свѧꙁи съ дѣла имѫтъ",
 	"about": "опьсаниѥ",
 	"article": "члѣнъ",
-	"newwindow": "(иномь окънѣ)",
+	"newwindow": "(въ иномь окънѣ)",
 	"cancel": "отъмѣтаниѥ",
 	"moredotdotdot": "вѧщє ···",
 	"mypage": "страница",
@@ -97,9 +98,9 @@
 	"anontalk": "бєсѣда",
 	"navigation": "плаваниѥ",
 	"and": "&#32;и",
-	"faq": "чѧстꙑ въпроси",
+	"faq": "чѧсти въпроси",
 	"actions": "дѣиства",
-	"namespaces": "имєнъ просторꙑ",
+	"namespaces": "имєнъ простори",
 	"variants": "обраꙁи",
 	"navigation-heading": "плаваниѥ",
 	"errorpagetitle": "блаꙁна",
@@ -140,7 +141,7 @@
 	"redirectedfrom": "(прѣнаправлѥниѥ отъ ⁖ $1 ⁖)",
 	"redirectpagesub": "прѣнаправлѥниѥ",
 	"redirectto": "прѣнаправлѥниѥ къ :",
-	"lastmodifiedat": "страницѧ послѣдьнꙗ мѣна сътворѥна $2 · $1 бѣ ⁙",
+	"lastmodifiedat": "сѥѩ страницѧ послѣдьнꙗ мѣна сътворѥна $2 · $1 бѣашє ⁙",
 	"protectedpage": "сꙗ страница ꙁабранѥна ѥстъ",
 	"jumpto": "прѣиди къ :",
 	"jumptonavigation": "плаваниѥ",
@@ -149,9 +150,9 @@
 	"aboutsite": "{{grammar:genitive|{{SITENAME}}}} опьсаниѥ",
 	"aboutpage": "Project:О сѥмь опꙑтьствовании",
 	"copyright": "подъ прощєниѥмь $1 пьсано ѥстъ · ащє ино нє каꙁано ѥстъ",
-	"copyrightpage": "{{ns:project}}:Творьцъ права",
-	"currentevents": "сѫщѧѩ вѣщи",
-	"currentevents-url": "Project:Сѫщѧѩ вѣщи",
+	"copyrightpage": "{{ns:project}}:Творьць права",
+	"currentevents": "сѫщѧѩ вѣщиѥ",
+	"currentevents-url": "Project:Сѫщѧѩ вѣщиѥ",
 	"disclaimers": "отърицаниꙗ",
 	"disclaimerpage": "Project:Главьно отърицаниѥ",
 	"edithelp": "помощь по исправлѥниѭ",
@@ -202,7 +203,7 @@
 	"viewsource": "страницѧ источьнъ обраꙁъ",
 	"viewsource-title": "вижьдь страницѧ ⁖ $1 ⁖ источьнъ обраꙁъ",
 	"exception-nologin": "тꙑ нє въшьлъ ѥси",
-	"welcomeuser": "Добрѣ прити · $1!",
+	"welcomeuser": "радоуи сѧ · $1",
 	"welcomecreation-msg": "твоѥ польꙃєватєльско мѣсто сътворєно ѥстъ ⁙\nнꙑнѣ иꙁмѣнити [[Special:Preferences|{{GRAMMAR:genitive|{{SITENAME}}}} строи]] можєши",
 	"yourname": "твоѥ имѧ",
 	"userlogin-yourname": "польꙃєватєлꙗ имѧ",
@@ -232,6 +233,7 @@
 	"createacct-benefit-heading": "{{SITENAME}} съꙁьдаѥтъ сѧ чьловѣкꙑ · ижє ꙗко тꙑ сѫтъ",
 	"createacct-benefit-body1": "{{PLURAL:$1|мѣна|мѣнꙑ|мѣнъ}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|страница|страници|страницѧ}}",
+	"createacct-benefit-body3": "{{PLURAL:$1|послѣдьн҄ь дѣтєл҄ь|послѣдьнꙗ дѣтєлꙗ|послѣдьни дѣтєлє}}",
 	"userexists": "сѫщє польꙃєватєлꙗ имѧ пьса ⁙\nбѫди добръ · ино сѥ иꙁобрѧщи",
 	"loginerror": "въхода блаꙁна",
 	"createacct-error": "мѣста сътворѥниꙗ блаꙁна",
@@ -259,6 +261,8 @@
 	"link_tip": "вънѫтрьнꙗ съвѧꙁь",
 	"extlink_sample": "http://www.example.com съвѧꙁи имѧ",
 	"extlink_tip": "вънѣщьнꙗ съвѧꙁь (помьни о http://)",
+	"headline_sample": "тїтла напьсаниѥ",
+	"headline_tip": "тїтлъ рѧда В҃",
 	"media_tip": "дѣла съвѧꙁь",
 	"sig_tip": "твои аѵтографъ и нꙑнѣшьна врѣмѧ и дьнь",
 	"summary": "опьсаниѥ :",
@@ -266,7 +270,8 @@
 	"minoredit": "малаꙗ мѣна",
 	"watchthis": "сѥѩ страницѧ блюдєниѥ",
 	"savearticle": "съхранѥниѥ",
-	"showpreview": "мѣнꙑ поꙁьрѣниѥ (бєꙁ съхранѥниꙗ)",
+	"showpreview": "мѣнꙑ поꙁьрѣниѥ (бєс съхранѥниꙗ)",
+	"showdiff": "раꙁьницѧ поꙁьрѣниѥ",
 	"blockedtitle": "польꙃєватєл҄ь ꙁаграждєнъ ѥстъ",
 	"loginreqlink": "въниди",
 	"newarticle": "(новъ)",
@@ -274,7 +279,7 @@
 	"noarticletext-nopermission": "нꙑнѣ с̑ьдє ничєсожє нє напьсано ѥстъ ⁙\n[[Special:Search/{{PAGENAME}}|сѥѩ страницѧ имѧ искати]] дроугꙑ страницѧ или\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} съвѧꙁанꙑ їсторїѩ видѣти]</span> можєши ⁙ сътворити жє сѭ страницѫ нє можєши",
 	"userpage-userdoesnotexist": "польꙃєватєльска мѣста ⁖ $1 ⁖ нꙑнѣ нѣстъ ⁙\nпрѣдъ сътворѥниѥмь или исправлѥниѥмь сѥѩ страницѧ помꙑсли жє ащє исто тъ дѣиство ноуждьно ли",
 	"userpage-userdoesnotexist-view": "польꙃєватєльско мѣсто ⁖ $1 ⁖ сътворєно нѣстъ",
-	"clearyourcache": "'''НАРОЧИТО''': По съхранѥнии можєши обити своѥго съмотрила съхранъ да видѣлъ би мѣнꙑ\n* '''Mozilla ли Firefox ли Safari''' ли жьмꙑи ''Shift'' а мꙑшиѭ жьми ''Reload'' или жьми ''Ctrl-F5'' ꙗко жє ''Ctrl-R'' (⌘-R вън Apple Mac)\n* '''Google Chrome:''' ли жьмꙑи ''Ctrl-Shift-R'' (⌘-Shift-R въ Mac)\n* '''Internet Explorer''' ли жьмꙑи ''Ctrl'' а мꙑшиѭ жьми ''Refresh'' или жьми ''Ctrl-F5'' \n* '''Опєрꙑ''' польꙃєватєльмъ можєть бꙑти ноужда пльнѣ поничьжити ихъ съмотрила съхранъ въ ''Tools → Preferences'' ⁙",
+	"clearyourcache": "<strong>НАРОЧИТО</strong>: По съхранѥнии можєши обити своѥго съмотрила съхранъ да видѣлъ би мѣнꙑ\n* <strong>Mozilla ли Firefox ли Safari</strong>''' ли жьмꙑи <em>Shift</em>'' а мꙑшиѭ жьми <em>Reload</em> или жьми <em>Ctrl-F5</em> ꙗко жє <em>Ctrl-R</em> (<em>⌘-R</em> вън Apple Mac)\n* <strong>Google Chrome:</strong> ли жьмꙑи <em>Ctrl-Shift-R</em>'' (<em>⌘-Shift-R</em> въ Mac)\n* <strong>Internet Explorer</strong>''' ли жьмꙑи <em>Ctrl</em> а мꙑшиѭ жьми <em>Refresh</em> или жьми <em>Ctrl-F5</em> \n* <strong>Опєрꙑ</strong> польꙃєватєльмъ можєть бꙑти ноужда пльнѣ поничьжити ихъ съмотрила съхранъ въ <em>Tools → Preferences</em> (<em>Opera → Preferences</em> вън Apple Mac) ⁙",
 	"updated": "(оновлѥно ѥстъ)",
 	"note": "'''НАРОЧИТО:'''",
 	"editing": "исправлѥниѥ: $1",
@@ -287,10 +292,14 @@
 	"template-protected": "(ꙁабранєно ѥстъ)",
 	"template-semiprotected": "(чѧстьно ꙁабранѥно)",
 	"hiddencategories": "сꙗ страница въ {{PLURAL:$1|1 съкрꙑтѣи катигорїи|$1 съкрꙑтѣхъ катигорїѩ}} сѧ авлꙗѥтъ :",
-	"moveddeleted-notice": "сꙗ страница поничьжєна ѥстъ ⁙\nпоничьжєниꙗ и прѣимєнованиꙗ їстории сѥѩ страницѧ нижѣ видѣти можєши",
+	"moveddeleted-notice": "сꙗ страница поничьжєна ѥстъ ⁙\nпоничьжєниꙗ ли прѣимєнованиꙗ ли ꙁабранѥниꙗ їсторїѩ на сѥи страници нижє видѣти можєши",
 	"postedit-confirmation-created": "страница сътворѥна ѥстъ",
 	"postedit-confirmation-saved": "твоꙗ мѣна съхранѥна ѥстъ",
 	"viewpagelogs": "сѥѩ страницѧ їсторїѩ",
+	"revisionasof": "обраꙁъ отъ $1",
+	"revision-info": "страницѧ обраꙁъ отъ $1 ижє {{GENDER:$6|$2}}$7 сътвори",
+	"previousrevision": "← прѣждьн҄ь обраꙁъ",
+	"currentrevisionlink": "послѣдьн҄ь обраꙁъ",
 	"cur": "нꙑ҃н",
 	"last": "пс҃лд",
 	"page_first": "прьва страница",
@@ -321,6 +330,7 @@
 	"editundo": "отъмѣтаниѥ",
 	"searchresults": "исканиꙗ слѣдьствиѥ",
 	"searchresults-title": "исканиꙗ ⁖ $1 ⁖ слѣдьствиѥ",
+	"prevn": "прѣждьнѩ {{PLURAL:$1|$1}}",
 	"viewprevnext": "виждь ($1 {{int:pipe-separator}} $2) ($3)",
 	"searchmenu-exists": "'''страница имєньмь ⁖ [[:$1]] ⁖ ѥстъ створѥна ю'''",
 	"searchmenu-new": "<strong>страницѫ \"⁖ [[:$1]] ⁖\" сътворити можєши</strong> {{PLURAL:$2|0=|ꙁъри такождє страница ижє по искании авлєна ѥстъ|ꙁьри такождє исканиꙗ слѣдьствиꙗ}}",
@@ -330,11 +340,11 @@
 	"searchprofile-articles-tooltip": "ищи въ $1",
 	"searchprofile-images-tooltip": "исканиѥ дѣлъ",
 	"searchprofile-everything-tooltip": "ищи вьсѩ страницѧ въкоупомь съ бѣсєдꙑ",
-	"search-result-size": "$1 ({{PLURAL:$2|$2 слово|$2 слова|$2 словєсъ}})",
-	"search-redirect": "(прѣнаправлєниѥ $1)",
+	"search-result-size": "$1 ({{PLURAL:$2|$2 слово|$2 словєсѣ|$2 словєсъ}})",
+	"search-redirect": "(прѣнаправлєниѥ отъ $1)",
 	"search-section": "(чѧсть $1)",
 	"search-suggest": "⁖ $1 ⁖ мьниши ли",
-	"search-interwiki-caption": "родьствьна опꙑтьствованиꙗ",
+	"search-interwiki-caption": "иꙁд родьствьнъ опꙑтьствовании вѣстиѥ",
 	"search-interwiki-more": "(вѧщє)",
 	"searchall": "вьсꙗ",
 	"search-nonefound": "исканиѥ сꙗ слова ничєсо жє нє авило ѥстъ",
@@ -364,7 +374,7 @@
 	"prefs-namespaces": "имєнъ просторꙑ",
 	"prefs-files": "дѣла",
 	"username": "{{GENDER:$1|польꙃєватєлꙗ имѧ}} :",
-	"prefs-memberingroups": "{{GENDER:$2|польꙃєватєлꙗ}} {{PLURAL:$1|чинъ|чина|чинꙑ}} :",
+	"prefs-memberingroups": "{{GENDER:$2|польꙃєватєлꙗ|польꙃєватєлицѧ}} {{PLURAL:$1|чинъ|чина|чини}} :",
 	"yourrealname": "истиньно имѧ :",
 	"yourlanguage": "ѩꙁꙑкъ :",
 	"yournick": "новъ аѵтографъ :",
@@ -372,7 +382,7 @@
 	"gender-male": "онъ исправитъ страницѧ",
 	"gender-female": "она исправитъ страницѧ",
 	"prefs-signature": "аѵтографъ",
-	"userrights": "чина польꙃєватєлꙗ строи",
+	"userrights": "польꙃєватєлꙗ чинъ",
 	"userrights-reason": "какъ съмꙑслъ :",
 	"group": "чинъ :",
 	"group-user": "польꙃєватєлє",
@@ -518,7 +528,7 @@
 	"booksources-search-legend": "кънигъ кладѧꙃь исканиѥ",
 	"booksources-search": "исканиѥ",
 	"specialloguserlabel": "испльнитєл҄ь :",
-	"speciallogtitlelabel": "страницѧ или польꙃєватєлꙗ имѧ :",
+	"speciallogtitlelabel": "страницѧ или {{ns:user}}:польꙃєватєлꙗ имѧ :",
 	"log": "їсторїѩ",
 	"all-logs-page": "вьсѩ обьщѧ їсторїѩ",
 	"allpages": "вьсѩ страницѧ",
@@ -545,8 +555,8 @@
 	"watchlist": "блюдєниꙗ",
 	"mywatchlist": "блюдєниꙗ",
 	"watchlistfor2": "дѣлꙗ ⁖ $1 ⁖ $2",
-	"addedwatchtext": "страница ⁖ [[:$1]] ⁖ нꙑнѣ подъ твоимь [[Special:Watchlist|блюдєниѥмь]] ѥстъ ⁙\nвсꙗ ѥѩ и ѥѩжє бєсѣдꙑ страницѧ мѣнꙑ твоꙗ блюдєнии каталоꙃѣ покаꙁанꙑ бѫдѫтъ",
-	"removedwatchtext": "страница ⁖ [[:$1]] ⁖ нꙑнѣ твоѥго [[Special:Watchlist|блюдєниꙗ]] иꙁнєсєна ѥстъ",
+	"addedwatchtext": "страница ⁖ [[:$1]] ⁖ и ѥѩжє бєсѣда нꙑнѣ подъ твоимь [[Special:Watchlist|блюдєниѥмь]] ѥстє ⁙",
+	"removedwatchtext": "страница ⁖ [[:$1]] ⁖ и ѥѩжє бєсѣда нꙑнѣ ис твоѥго [[Special:Watchlist|блюдєниꙗ]] иꙁнєсєна ѥстъ",
 	"watch": "блюдєниѥ",
 	"watchthispage": "сѥѩ страницѧ блюдєниѥ",
 	"unwatch": "остави блюдєниѥ",
@@ -556,7 +566,7 @@
 	"created": "сътворѥнъ ѥстъ",
 	"deletepage": "поничьжєниѥ",
 	"excontent": "вънѫтри бѣ: '$1'",
-	"excontentauthor": "вънѫтри бѣ : '$1' (и послѣдьн҄ии дѣтєл҄ь бѣ '[[Special:Contributions/$2|$2]]')",
+	"excontentauthor": "вънѫтри бѣ : '$1' · и послѣдьн҄ии дѣтєл҄ь бѣ [[Special:Contributions/$2|$2]] ([[User talk:$2|бєсѣда]])",
 	"delete-legend": "поничьжєниѥ",
 	"actioncomplete": "дѣиство сътворєно ѥстъ",
 	"deletedtext": "страница ⁖ $1 ⁖ поничьжєна ѥстъ ⁙\nвиждь ⁖ $2 ⁖ послѣдьнъ поничьжєниѩ дѣлꙗ",
@@ -584,33 +594,34 @@
 	"undelete-show-file-submit": "да",
 	"namespace": "имєнъ просторъ:",
 	"invert": "обрати иꙁборъ",
-	"namespace_association": "съвѧꙁанꙑ имєнъ просторꙑ",
+	"namespace_association": "съвѧꙁани имєнъ простори",
 	"blanknamespace": "(главьно)",
 	"contributions": "{{GENDER:$1|польꙃєватєлꙗ|польꙃєватєлицѧ}} добродѣꙗниꙗ",
 	"contributions-title": "польꙃєватєлꙗ ⁖ $1 ⁖ добродѣꙗниꙗ",
 	"mycontris": "добродѣꙗниꙗ",
 	"anoncontribs": "добродѣꙗниꙗ",
-	"contribsub2": "польꙃєватєлꙗ имѧ ⁖ {{GENDER:$3|$1}} ⁖ ѥстъ ($2)",
+	"contribsub2": "{{GENDER:$3|польꙃєватєлꙗ|польꙃєватєлицѧ}} имѧ ⁖ $1 ⁖ ѥстъ ($2)",
 	"uctop": "(нꙑнѣщьн҄ь обраꙁъ)",
 	"month": "отъ мѣсѧца и давѣѥ :",
-	"year": "отъ лѣта и давѣѥ :",
+	"year": "отъ лѣта и давѣи :",
 	"sp-contributions-blocklog": "ꙁаграждєниꙗ їсторїꙗ",
-	"sp-contributions-deleted": "поничьжєнꙑ добродѣꙗниꙗ",
+	"sp-contributions-deleted": "{{GENDER:$1|поꙁєватєлꙗ|польꙃєватєлицѧ}} поничьжєнꙑ добродѣꙗниꙗ",
 	"sp-contributions-uploads": "положєнꙑ дѣла",
 	"sp-contributions-logs": "їсторїѩ",
 	"sp-contributions-talk": "бєсѣда",
 	"sp-contributions-username": "IP число или польꙃєватєлꙗ имѧ :",
 	"sp-contributions-submit": "ищи",
-	"whatlinkshere": "дос҄ьдєщьнѩ съвѧꙁи",
+	"whatlinkshere": "дос҄ьдєщьнѩ съвѧꙁиѥ",
 	"whatlinkshere-title": "страницѧ ижє съ ⁖ $1 ⁖ съвѧꙁи имѫтъ",
 	"whatlinkshere-page": "страница :",
+	"linkshere": "сѩ страницѧ съ <strong>[[:$1]]</strong> съвѧꙁи имѫтъ :",
 	"isredirect": "прѣнаправлѥниѥ",
 	"istemplate": "внѫтри страницѧ",
 	"isimage": "дѣла съвѧꙁь",
-	"whatlinkshere-links": "← съвѧꙁи",
+	"whatlinkshere-links": "← съвѧꙁиѥ",
 	"whatlinkshere-hideredirs": "$1 прѣнаправлѥниꙗ",
-	"whatlinkshere-hidelinks": "$1 съвѧꙁи",
-	"whatlinkshere-filters": "ситꙑ",
+	"whatlinkshere-hidelinks": "$1 съвѧꙁиѥ",
+	"whatlinkshere-filters": "сита",
 	"block": "ꙁагради польꙃєватєл҄ь",
 	"blockip": "ꙁагради {{GENDER:$1|польꙃєватєл҄ь}}",
 	"ipaddressorusername": "IP число или польꙃєватєлꙗ имѧ :",
@@ -627,7 +638,7 @@
 	"blocklink": "ꙁагради",
 	"contribslink": "добродѣꙗниꙗ",
 	"blocklogpage": "ꙁаграждєниꙗ їсторїꙗ",
-	"blocklogentry": "ꙁаградилъ [[$1]] на врѣмѧ $2 $3",
+	"blocklogentry": "ꙁагради [[$1]] на врѣмѧ $2 $3",
 	"block-log-flags-anononly": "тъкъмо анѡнѷмьнꙑ польꙃєватєлє",
 	"block-log-flags-nocreate": "сътворѥниѥ мѣстъ ꙁабранєно ѥстъ",
 	"ipb_already_blocked": "⁖ $1 ⁖ ю ꙁаграждєнъ ѥстъ",
@@ -652,12 +663,13 @@
 	"tooltip-pt-userpage": "{{GENDER:|твоꙗ польꙃєватєл҄ьска}} страница",
 	"tooltip-pt-mytalk": "{{GENDER:|твоꙗ}} бєсѣдꙑ страница",
 	"tooltip-pt-preferences": "{{GENDER:|твои}} строи",
-	"tooltip-pt-watchlist": "страницѧ ижє ихъжє иꙁмѣнѥниꙗ подъ твоимь блюдєниѥмь сѫтъ",
+	"tooltip-pt-watchlist": "страницѧ ѩжє ихъжє иꙁмѣнѥниꙗ подъ твоимь блюдєниѥмь сѫтъ",
 	"tooltip-pt-mycontris": "{{GENDER:|твоѩ}} добродѣꙗнии каталогъ",
 	"tooltip-pt-logout": "ис̾ходъ",
 	"tooltip-ca-talk": "сѥѩ страницѧ бєсѣда",
 	"tooltip-ca-edit": "сѥѩ страницѧ исправлѥниѥ",
 	"tooltip-ca-viewsource": "си страница ꙁабранєна ѥстъ ⁙\nѥѩ источьнъ обраꙁъ видєти можєши",
+	"tooltip-ca-history": "сѥѩ страницѧ прѣждьни обраꙁи",
 	"tooltip-ca-protect": "сѥѩ страницѧ ꙁабранєниѥ",
 	"tooltip-ca-delete": "сѥѩ страницѧ поничьжєниѥ",
 	"tooltip-ca-move": "сѥѩ страницѧ прѣимєнованиѥ",
@@ -666,14 +678,16 @@
 	"tooltip-search-go": "прѣиди къ страницѧ съ симь имєньмь ащє жє та страница ѥстъ",
 	"tooltip-search-fulltext": "исканиѥ страницѧ ижє сѥ напьсаниѥ дрьжатъ",
 	"tooltip-p-logo": "главьна страница",
-	"tooltip-n-mainpage": "виждь главьноу страницѫ",
-	"tooltip-n-mainpage-description": "виждь главьноу страницѫ",
+	"tooltip-n-mainpage": "виждь главьнѫ страницѫ",
+	"tooltip-n-mainpage-description": "виждь главьнѫ страницѫ",
 	"tooltip-n-recentchanges": "послѣдьн҄ь мѣнъ каталогъ",
-	"tooltip-t-whatlinkshere": "страницѧ ижє съвѧꙁи дос҄ьдє имѫтъ",
+	"tooltip-n-randompage": "виждь страницѫ въ нєꙁаапѫ",
+	"tooltip-t-whatlinkshere": "страницѧ ѩжє съвѧꙁи дос҄ьдє имѫтъ",
 	"tooltip-t-contributions": "{{GENDER:$1|польꙃєватєлꙗ|польꙃєватєлицѧ}} добродѣꙗнии каталогъ",
 	"tooltip-t-upload": "положєниѥ дѣлъ",
 	"tooltip-t-specialpages": "вьсѣѩ нарочьнъ страницѧ каталогъ",
 	"tooltip-t-print": "сѥѩ страницѧ пєчатьнъ обраꙁъ",
+	"tooltip-t-permalink": "вѣчьна съвѧꙁь съ симь страницѧ обраꙁомь",
 	"tooltip-ca-nstab-user": "виждь польꙃєватєлꙗ страницѫ",
 	"tooltip-ca-nstab-special": "сѥ нарочьна страница ѥстъ · ѥѩжє иꙁмѣнꙗти нє можєши",
 	"tooltip-ca-nstab-image": "виждь дѣла страницѫ",
@@ -752,7 +766,7 @@
 	"tags-deactivate-reason": "какъ съмꙑслъ :",
 	"htmlform-no": "нѣтъ",
 	"htmlform-yes": "да",
-	"logentry-delete-delete": "$1 {{GENDER:$2|поничьжилъ|поничьжила}} страницѫ ⁖ $3 ⁖",
+	"logentry-delete-delete": "$1 {{GENDER:$2|поничьжи}} страницѫ ⁖ $3 ⁖",
 	"logentry-block-block": "$1 {{GENDER:$2|ꙁаградилъ|ꙁаградила}} {{GENDER:$4|$3}} на врѣмѧ $5 $6",
 	"logentry-suppress-block": "$1 {{GENDER:$2|ꙁаграждєнъ|ꙁаграждєна}} ѥстъ {{GENDER:$4|$3}} врѣмєньмь $5 $6",
 	"logentry-move-move": "$1 {{GENDER:$2|нарєчє}} страницѫ ⁖ $3 ⁖ имєньмь ⁖ $4 ⁖",
diff --git a/languages/i18n/cv.json b/languages/i18n/cv.json
index 946c6c97f4..4de9d8c640 100644
--- a/languages/i18n/cv.json
+++ b/languages/i18n/cv.json
@@ -885,10 +885,10 @@
 	"tooltip-pt-logout": "Сеансне пĕтер",
 	"tooltip-pt-createaccount": "Аккаунт ту та системӑна кӗр. Паллах, унсӑрах та юрать, анчах та аккаунтпа кӗни лайӑхрах.",
 	"tooltip-ca-talk": "Статьяна сӳтсе явасси",
-	"tooltip-ca-edit": "Эле тӳрлет",
+	"tooltip-ca-edit": "Кăна тӳрлет",
 	"tooltip-ca-addsection": "Çĕнĕ пай ту",
 	"tooltip-ca-viewsource": "Ку страницӑна эсир улӑштарма пултараймастӑр. Ӑна мӗнле ҫырнине кӑна пӑхма пултаратӑр.",
-	"tooltip-ca-history": "Эле улӑштарнин кун-ҫулӗ",
+	"tooltip-ca-history": "Кунăн улӑшăннисем",
 	"tooltip-ca-protect": "Улӑшратусенчен сыхласси",
 	"tooltip-ca-delete": "Страницӑна кӑларса пӑрахмалли",
 	"tooltip-ca-move": "Страницӑна урӑх ҫӗре куҫарасси",
diff --git a/languages/i18n/de.json b/languages/i18n/de.json
index 0470691a0e..6b212c91c2 100644
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -712,8 +712,8 @@
 	"subject-preview": "Vorschau der Zusammenfassungszeile:",
 	"previewerrortext": "Beim Versuch, eine Vorschau deiner Änderungen anzuzeigen, ist ein Fehler aufgetreten.",
 	"blockedtitle": "Benutzer ist gesperrt",
-	"blockedtext": "'''Dein Benutzername oder deine IP-Adresse wurde gesperrt.'''\n\nDie Sperrung wurde vom Administrator $1 durchgeführt.\nAls Grund wurde ''$2'' angegeben.\n\n* Beginn der Sperre: $8\n* Ende der Sperre: $6\n* Sperre betrifft: $7\n\nDu kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administratoren]] kontaktieren, um über die Sperre zu diskutieren.\nDu kannst die „E-Mail an diesen Benutzer“-Funktion nicht nutzen, solange keine gültige E-Mail-Adresse in deinen [[Special:Preferences|Benutzerkonto-Einstellungen]] eingetragen ist oder diese Funktion für dich gesperrt wurde.\nDeine aktuelle IP-Adresse ist $3 und die Sperrkennung lautet $5.\nBitte füge alle Informationen jeder Anfrage hinzu, die du stellst.",
-	"autoblockedtext": "Deine IP-Adresse wurde automatisch gesperrt, da sie von einem anderen Benutzer genutzt wurde, der von $1 gesperrt wurde.\nAls Grund wurde angegeben:\n\n:''$2''\n\n* Beginn der Sperre: $8\n* Ende der Sperre: $6\n* Sperre betrifft: $7\n\nDu kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administratoren]] kontaktieren, um über die Sperre zu diskutieren.\n\nDu kannst die „E-Mail an diesen Benutzer“-Funktion nicht nutzen, solange keine gültige E-Mail-Adresse in deinen [[Special:Preferences|Benutzerkonto-Einstellungen]] eingetragen ist oder diese Funktion für dich gesperrt wurde.\n\nDeine aktuelle IP-Adresse ist $3, und die Sperr-ID ist $5.\nBitte füge alle Informationen jeder Anfrage hinzu, die du stellst.",
+	"blockedtext": "'''Dein Benutzername oder deine IP-Adresse wurde gesperrt.'''\n\nDie Sperrung wurde vom Administrator $1 durchgeführt.\nAls Grund wurde ''$2'' angegeben.\n\n* Beginn der Sperre: $8\n* Ende der Sperre: $6\n* Sperre betrifft: $7\n\nDu kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administratoren]] kontaktieren, um über die Sperre zu diskutieren.\nDu kannst die „{{int:emailuser}}“-Funktion nicht nutzen, solange keine gültige E-Mail-Adresse in deinen [[Special:Preferences|Benutzerkonto-Einstellungen]] eingetragen ist oder diese Funktion für dich gesperrt wurde.\nDeine aktuelle IP-Adresse ist $3 und die Sperrkennung lautet $5.\nBitte füge alle Informationen jeder Anfrage hinzu, die du stellst.",
+	"autoblockedtext": "Deine IP-Adresse wurde automatisch gesperrt, da sie von einem anderen Benutzer genutzt wurde, der von $1 gesperrt wurde.\nAls Grund wurde angegeben:\n\n:''$2''\n\n* Beginn der Sperre: $8\n* Ende der Sperre: $6\n* Sperre betrifft: $7\n\nDu kannst $1 oder einen der anderen [[{{MediaWiki:Grouppage-sysop}}|Administratoren]] kontaktieren, um über die Sperre zu diskutieren.\n\nDu kannst die „{{int:emailuser}}“-Funktion nicht nutzen, solange keine gültige E-Mail-Adresse in deinen [[Special:Preferences|Benutzerkonto-Einstellungen]] eingetragen ist oder diese Funktion für dich gesperrt wurde.\n\nDeine aktuelle IP-Adresse ist $3, und die Sperr-ID ist $5.\nBitte füge alle Informationen jeder Anfrage hinzu, die du stellst.",
 	"systemblockedtext": "Dein Benutzername oder deine IP-Adresse wurde von MediaWiki automatisch gesperrt.\nDer angegebene Grund ist:\n\n:<em>$2</em>\n\n* Beginn der Sperre: $8\n* Ablauf der Sperre: $6\n* Sperre betrifft: $7\n\nDeine aktuelle IP-Adresse ist $3.\nBitte gib alle oben stehenden Details in jeder Anfrage an.",
 	"blockednoreason": "keine Begründung angegeben",
 	"whitelistedittext": "Du musst dich $1, um Seiten bearbeiten zu können.",
@@ -2049,6 +2049,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Parameter hinzufügen:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Name des Parameters",
 	"apisandbox-dynamic-error-exists": "Ein Parameter mit dem Namen „$1“ ist bereits vorhanden.",
+	"apisandbox-templated-parameter-reason": "Diese [[Special:ApiHelp/main#main/templatedparams|Vorlagenparameter]] werden basierend auf {{PLURAL:$1|dem Wert|den Werten}} von $2 angeboten.",
 	"apisandbox-deprecated-parameters": "Veraltete Parameter",
 	"apisandbox-fetch-token": "Den Token automatisch ausfüllen",
 	"apisandbox-add-multi": "Hinzufügen",
@@ -4114,5 +4115,6 @@
 	"pagedata-title": "Seitendaten",
 	"pagedata-text": "Diese Seite stellt eine Datenschnittstelle für Seiten zur Verfügung. Bitte gib mithilfe der Unterseitensyntax den Seitentitel in der URL an.\n* Übertragungen von Inhalten werden basierend auf dem Accept-Header deines Clients ausgeführt. Das bedeutet, dass die Seitendaten in dem Format zur Verfügung gestellt werden, das von deinem Client bevorzugt wird.",
 	"pagedata-not-acceptable": "Kein passendes Format gefunden. Unterstützte MIME-Typen: $1",
-	"pagedata-bad-title": "Ungültiger Titel: $1."
+	"pagedata-bad-title": "Ungültiger Titel: $1.",
+	"unregistered-user-config": "Aus Sicherheitsgründen können JavaScript-, CSS- und JSON-Benutzerunterseiten nicht für unangemeldete Benutzer geladen werden."
 }
diff --git a/languages/i18n/diq.json b/languages/i18n/diq.json
index 2ad2c5a77d..1a80395594 100644
--- a/languages/i18n/diq.json
+++ b/languages/i18n/diq.json
@@ -1226,31 +1226,31 @@
 	"rcnotefrom": "Cêr de <strong>$2</strong> ra nata {{PLURAL:$5|vurnayışiyê}} asenê (tewr vêşi <strong>$1</strong> asenê) <strong>$3, $4</strong>",
 	"rclistfrom": "$3 sehat $2 ra tepiya vurnayışanê neweyan bımotne",
 	"rcshowhideminor": "Vırnayışê werdiy $1",
-	"rcshowhideminor-show": "Bımotne",
+	"rcshowhideminor-show": "Bımocne",
 	"rcshowhideminor-hide": "Bınımne",
 	"rcshowhidebots": "botan $1",
-	"rcshowhidebots-show": "Bımotne",
+	"rcshowhidebots-show": "Bımocne",
 	"rcshowhidebots-hide": "Bınımne",
 	"rcshowhideliu": "karberê qeydbiyay $1",
 	"rcshowhideliu-show": "Bımocne",
 	"rcshowhideliu-hide": "Bınımne",
 	"rcshowhideanons": "$1 karberê bênamey",
-	"rcshowhideanons-show": "Bımotne",
+	"rcshowhideanons-show": "Bımocne",
 	"rcshowhideanons-hide": "Bınımne",
 	"rcshowhidepatr": "$1 vurnayışê ke dewriya geyrayê",
 	"rcshowhidepatr-show": "Bımocne",
 	"rcshowhidepatr-hide": "Bınımne",
 	"rcshowhidemine": "vırnayışê mı $1",
-	"rcshowhidemine-show": "Bımotne",
+	"rcshowhidemine-show": "Bımocne",
 	"rcshowhidemine-hide": "Bınımne",
 	"rcshowhidecategorization": "kategorizasyoni $1",
-	"rcshowhidecategorization-show": "Bımotné",
+	"rcshowhidecategorization-show": "Bımocne",
 	"rcshowhidecategorization-hide": "Bınımne",
 	"rclinks": "$1 vurnayışê peyênê ke $2 rocanê peyênan de biyê, inan bımocne",
 	"diff": "ferq",
 	"hist": "verên",
 	"hide": "Bınımne",
-	"show": "Bımotne",
+	"show": "Bımocne",
 	"minoreditletter": "q",
 	"newpageletter": "N",
 	"boteditletter": "b",
@@ -1583,7 +1583,7 @@
 	"withoutinterwiki": "Perrê ke zıwananê binan rê gıreyê cı çıni yo",
 	"withoutinterwiki-summary": "Enê pelî ke versiyonê ziwanî binî ra link nidano.",
 	"withoutinterwiki-legend": "Verole",
-	"withoutinterwiki-submit": "Bımotne",
+	"withoutinterwiki-submit": "Bımocne",
 	"fewestrevisions": "Perrê kı tewr tayn timaryayê",
 	"nbytes": "$1 {{PLURAL:$1|bayt|bayti}}",
 	"ncategories": "$1 {{PLURAL:$1|Kategori|Kategoriy}}",
@@ -1650,7 +1650,7 @@
 	"usereditcount": "$1 {{PLURAL:$1|vurnayîş|vurnayîşî}}",
 	"usercreated": "$2 de $1 {{GENDER:$3|viraziya}}",
 	"newpages": "Perrê newey",
-	"newpages-submit": "Bımotne",
+	"newpages-submit": "Bımocne",
 	"newpages-username": "Nameyê karberi:",
 	"ancientpages": "Tewr pelê kıhani",
 	"move": "Bıkırışe",
@@ -1689,7 +1689,7 @@
 	"specialloguserlabel": "Kerdoğ:",
 	"speciallogtitlelabel": "Meqsed (sername ya zi {{ns:user}}:karberi rê nameyê karberi):",
 	"log": "Qeydi",
-	"logeventslist-submit": "Bımotne",
+	"logeventslist-submit": "Bımocne",
 	"all-logs-page": "Heme qeydê pêroyi",
 	"alllogstext": "qey {{SITENAME}}i mocnayişê heme rocaneyani.\ntipa rocaneyi, nameyê karberi (herfa pil u qıci re hessas a), ya zi peli (reyna hessasiyê herfa pil u qıciyi) bıweçine u esayiş qıc kerê.",
 	"logempty": "Qeydan dı malumato unasin çıni yo.",
@@ -1730,7 +1730,7 @@
 	"linksearch-line": "$1, $2 ra link biya",
 	"linksearch-error": "jokeri têna nameyê makina ya serekini de aseni/eseni.",
 	"listusersfrom": "karber ê ke pey ıney detpêkeni ramocın:",
-	"listusers-submit": "Bımotne",
+	"listusers-submit": "Bımocne",
 	"listusers-noresult": "karber nêdiyayo/a.",
 	"listusers-blocked": "(blok biy)",
 	"activeusers": "Lista karberanê aktifan",
@@ -1820,7 +1820,7 @@
 	"wlnote": "$3 saete $4 ra dıme {{PLURAL:$2|yew saete de|'''$2''' saetan de}} {{PLURAL:$1|vurnayışo peyên|vurnayışê '''$1''' peyêni}} cêrderê.",
 	"wlshowlast": "Peyni de  $1 seata u $2 roca  bıasne",
 	"watchlist-hide": "Bınımne",
-	"watchlist-submit": "Bımotne",
+	"watchlist-submit": "Bımocne",
 	"wlshowtime": "Periyoda zemani asenayışi:",
 	"wlshowhideminor": "vırnayışê werdiy",
 	"wlshowhidebots": "boti",
@@ -1859,7 +1859,7 @@
 	"delete-confirm": "\"$1\" bestere",
 	"delete-legend": "Bestere",
 	"historywarning": "'''Teme:''' Pela ke şıma esterenê tede yew viyarte be teqriben $1 {{PLURAL:$1|versiyon esto|versiyoni estê}}:",
-	"historyaction-submit": "Bımotne",
+	"historyaction-submit": "Bımocne",
 	"confirmdeletetext": "Tı ho yew pele u tarixê pele wederneno.\nTı ra rica keno, tı zani tı ho sekeno, tı zani neticeyanê eno wedarnayışi u tı zani tı ser [[{{MediaWiki:Policy-url}}|poliçe]] kar keno.",
 	"actioncomplete": "Kar bi temam",
 	"actionfailed": "kar nêbı",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 4befdc5331..236d6e598d 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -660,8 +660,8 @@
 	"subject-preview": "Preview of subject:",
 	"previewerrortext": "An error occurred while attempting to preview your changes.",
 	"blockedtitle": "User is blocked",
-	"blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"email this user\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.",
-	"autoblockedtext": "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote that you may not use the \"email this user\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.\n\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.",
+	"blockedtext": "<strong>Your username or IP address has been blocked.</strong>\n\nThe block was made by $1.\nThe reason given is <em>$2</em>.\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou can contact $1 or another [[{{MediaWiki:Grouppage-sysop}}|administrator]] to discuss the block.\nYou cannot use the \"{{int:emailuser}}\" feature unless a valid email address is specified in your [[Special:Preferences|account preferences]] and you have not been blocked from using it.\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.",
+	"autoblockedtext": "Your IP address has been automatically blocked because it was used by another user, who was blocked by $1.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYou may contact $1 or one of the other [[{{MediaWiki:Grouppage-sysop}}|administrators]] to discuss the block.\n\nNote that you may not use the \"{{int:emailuser}}\" feature unless you have a valid email address registered in your [[Special:Preferences|user preferences]] and you have not been blocked from using it.\n\nYour current IP address is $3, and the block ID is #$5.\nPlease include all above details in any queries you make.",
 	"systemblockedtext": "Your username or IP address has been automatically blocked by MediaWiki.\nThe reason given is:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nYour current IP address is $3.\nPlease include all above details in any queries you make.",
 	"blockednoreason": "no reason given",
 	"whitelistedittext": "Please $1 to edit pages.",
@@ -2082,6 +2082,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Add parameter:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Parameter name",
 	"apisandbox-dynamic-error-exists": "A parameter named \"$1\" already exists.",
+	"apisandbox-templated-parameter-reason": "This [[Special:ApiHelp/main#main/templatedparams|templated parameter]] is offered based on the {{PLURAL:$1|value|values}} of $2.",
 	"apisandbox-deprecated-parameters": "Deprecated parameters",
 	"apisandbox-fetch-token": "Auto-fill the token",
 	"apisandbox-add-multi": "Add",
@@ -4466,5 +4467,6 @@
 	"pagedata-title": "Page data",
 	"pagedata-text": "This page provides a data interface to pages. Please provide the page title in the URL, using subpage syntax.\n* Content negotiation applies based on your client's Accept header. This means that the page data will be provided in the format preferred by your client.",
 	"pagedata-not-acceptable": "No matching format found. Supported MIME types: $1",
-	"pagedata-bad-title": "Invalid title: $1."
+	"pagedata-bad-title": "Invalid title: $1.",
+	"unregistered-user-config": "For security reasons JavaScript, CSS and JSON user subpages cannot be loaded for unregistered users."
 }
diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index 7353f90242..58cf7ddcb1 100644
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -548,6 +548,7 @@
 	"botpasswords-existing": "Ekzistantaj robotaj pasvortoj",
 	"botpasswords-createnew": "Krei novan robotan pasvorton",
 	"botpasswords-editexisting": "Redakti ekzistantan robotan pasvorton",
+	"botpasswords-label-needsreset": "(oni devas rekomencigi la pasvorton)",
 	"botpasswords-label-appid": "Robota nomo:",
 	"botpasswords-label-create": "Krei",
 	"botpasswords-label-update": "Ĝisdatigi",
diff --git a/languages/i18n/es.json b/languages/i18n/es.json
index 7199df934a..8360c61565 100644
--- a/languages/i18n/es.json
+++ b/languages/i18n/es.json
@@ -667,6 +667,7 @@
 	"botpasswords-existing": "Contraseñas de bots existentes",
 	"botpasswords-createnew": "Crear una contraseña de robot nueva",
 	"botpasswords-editexisting": "Editar una contraseña de robot existente",
+	"botpasswords-label-needsreset": "(la contraseña debe restablecerse)",
 	"botpasswords-label-appid": "Nombre del robot:",
 	"botpasswords-label-create": "Crear",
 	"botpasswords-label-update": "Actualizar",
@@ -690,6 +691,7 @@
 	"botpasswords-restriction-failed": "Las restricciones de la contraseña de bot impiden este inicio de sesión.",
 	"botpasswords-invalid-name": "El nombre de usuario especificado no contiene el separador de contraseña de bot (\"$1\").",
 	"botpasswords-not-exist": "El usuario \"$1\" no tiene una contraseña de bot llamada \"$2\".",
+	"botpasswords-needs-reset": "Se debe restablecer la contraseña del robot «$2», propiedad {{GENDER:$1|del usuario|de la usuaria}} «$1».",
 	"resetpass_forbidden": "No se pueden cambiar las contraseñas",
 	"resetpass_forbidden-reason": "Las contraseñas no pueden cambiarse: $1",
 	"resetpass-no-info": "Debes iniciar sesión para acceder directamente a esta página.",
@@ -786,7 +788,7 @@
 	"previewerrortext": "Se ha producido un error al intentar la vista previa de los cambios.",
 	"blockedtitle": "El usuario está bloqueado",
 	"blockedtext": "<strong>Tu nombre de usuario o dirección IP ha sido bloqueada.</strong>\n\nEl bloqueo lo hizo $1.\nLa razón dada es <em>$2</em>.\n\n* Inicio del bloqueo: $8\n* Caducidad del bloqueo: $6\n* Bloqueo destinado a: $7\n\nPuedes contactar a $1 o con otro de los [[{{MediaWiki:Grouppage-sysop}}|administradores]] para discutir el bloqueo.\nNo puedes utilizar la función «enviar correo electrónico a este usuario» a menos que tengas una dirección de correo electrónico válida registrada en tus [[Special:Preferences|preferencias de usuario]] y la función no haya sido también bloqueada.\n\nTu dirección IP actual es $3, y el identificador del bloqueo es #$5.\nIncluye todos los datos aquí mostrados en cualquier consulta que hagas.",
-	"autoblockedtext": "Tu dirección IP ha sido bloqueada automáticamente porque fue utilizada por otro usuario, que resultó bloqueado por $1.\nEl motivo dado es el siguiente:\n\n:<em>$2</em>\n\n* Inicio del bloqueo: $8\n* Caducidad del bloqueo: $6\n* Bloqueo destinado a: $7\n\nPuedes contactar con $1 o con otro de los [[{{MediaWiki:Grouppage-sysop}}|administradores]] para discutir el bloqueo.\n\nTen en cuenta que no puedes utilizar la función «enviar correo electrónico a este usuario» a menos que tengas una dirección de correo electrónico válida registrada en tus [[Special:Preferences|preferencias de usuario]] y la función no haya sido también bloqueada.\n\nTu dirección IP actual es $3, y el identificador del bloqueo es #$5.\nIncluye todos los datos aquí mostrados en cualquier consulta que hagas.",
+	"autoblockedtext": "Tu dirección IP ha sido bloqueada automáticamente porque fue utilizada por otro usuario, que resultó bloqueado por $1.\nEl motivo dado es el siguiente:\n\n:<em>$2</em>\n\n* Inicio del bloqueo: $8\n* Caducidad del bloqueo: $6\n* Bloqueo destinado a: $7\n\nPuedes contactar con $1 o con otro de los [[{{MediaWiki:Grouppage-sysop}}|administradores]] para discutir el bloqueo.\n\nObserva que no puedes utilizar la función «{{int:emailuser}}» a menos que hayas registrado una dirección de correo electrónico válida en tus [[Special:Preferences|preferencias de usuario]] y la función no haya sido también bloqueada.\n\nTu dirección IP actual es $3, y el identificador del bloqueo es n.º $5.\nIncluye todos los datos aquí mostrados en cualquier consulta que hagas.",
 	"systemblockedtext": "Tu nombre de usuario o dirección IP ha sido bloqueado automáticamente por el software MediaWiki.\nLa razón dada es:\n\n:<em>$2</em>\n\n* Inicio del bloqueo: $8\n* Caducidad de bloqueo: $6\n* Destinatario del bloqueo: $7\n\nTu dirección IP actual es $3.\nPor favor, incluye todos los datos aquí mostrados en cualquier consulta que hagas.",
 	"blockednoreason": "no se ha especificado el motivo",
 	"whitelistedittext": "Tienes que $1 para editar páginas.",
diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json
index f1004875f6..39336558f5 100644
--- a/languages/i18n/eu.json
+++ b/languages/i18n/eu.json
@@ -628,6 +628,7 @@
 	"savechanges": "Aldaketak gorde",
 	"publishpage": "Orrialdea argitaratu",
 	"publishchanges": "Aldaketak argitaratu",
+	"savearticle-start": "Gorde orria...",
 	"savechanges-start": "Aldaketak gorde...",
 	"publishpage-start": "Orrialdea argitaratu...",
 	"publishchanges-start": "Aldaketak argitaratu...",
diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json
index 0e22f6fed7..7a24fe7173 100644
--- a/languages/i18n/fi.json
+++ b/languages/i18n/fi.json
@@ -671,8 +671,8 @@
 	"subject-preview": "Aiheotsikon esikatselu:",
 	"previewerrortext": "Muokkaustesi esikatselun toteuttamisessa on tapahtunut virhe.",
 	"blockedtitle": "Käyttäjä on estetty",
-	"blockedtext": "'''Käyttäjätunnuksesi tai IP-osoitteesi on estetty.'''\n\nEston on asettanut $1.\nSyy: '''$2'''\n\n* Eston alkamisaika: $8\n* Eston päättymisaika: $6\n* Kohde: $7\n\nVoit keskustella ylläpitäjän $1 tai toisen [[{{MediaWiki:Grouppage-sysop}}|ylläpitäjän]] kanssa estosta.\nHuomaa, ettet voi lähettää sähköpostia {{GRAMMAR:genitive|{{SITENAME}}}} kautta, ellet ole asettanut olemassa olevaa sähköpostiosoitetta [[Special:Preferences|asetuksissa]] tai jos esto on asetettu koskemaan myös sähköpostin lähettämistä.\nIP-osoitteesi on $3 ja estotunnus on #$5.\nLiitä kaikki yllä olevat tiedot mahdollisiin kyselyihisi.",
-	"autoblockedtext": "IP-osoitteesi on estetty automaattisesti, koska sitä on käyttänyt toinen käyttäjä, jonka on estänyt ylläpitäjä $1.\nEston syy on:\n\n:''$2''\n\n* Eston alkamisaika: $8\n* Eston päättymisaika: $6\n* Kohde: $7\n\nVoit keskustella ylläpitäjän $1 tai toisen [[{{MediaWiki:Grouppage-sysop}}|ylläpitäjän]] kanssa estosta.\n\nHuomaa, ettet voi lähettää sähköpostia {{GRAMMAR:genitive|{{SITENAME}}}} kautta, ellet ole asettanut olemassa olevaa sähköpostiosoitetta [[Special:Preferences|asetuksissa]] tai jos esto on asetettu koskemaan myös sähköpostin lähettämistä.\n\nIP-osoitteesi on $3 ja estotunnus on #$5.\nLiitä kaikki yllä olevat tiedot mahdollisiin kyselyihisi.",
+	"blockedtext": "<strong>Käyttäjätunnuksesi tai IP-osoitteesi on estetty.</strong>\n\nEston on asettanut $1.\nAnnettu syy on <em>$2</em>.\n\n* Eston alkamisaika: $8\n* Eston päättymisaika: $6\n* Kohde: $7\n\nVoit keskustella ylläpitäjän $1 tai toisen [[{{MediaWiki:Grouppage-sysop}}|ylläpitäjän]] kanssa estosta.\nHuomaa, ettet voi lähettää sähköpostia {{GRAMMAR:genitive|{{SITENAME}}}} kautta, ellet ole asettanut olemassa olevaa sähköpostiosoitetta [[Special:Preferences|asetuksissa]] tai jos esto on asetettu koskemaan myös sähköpostin lähettämistä.\nIP-osoitteesi on $3 ja estotunnus on #$5.\nLiitä kaikki yllä olevat tiedot mahdollisiin kyselyihisi.",
+	"autoblockedtext": "IP-osoitteesi on estetty automaattisesti, koska sitä on käyttänyt toinen käyttäjä, jonka on estänyt ylläpitäjä $1.\nAnnettu syy on:\n\n:<em>$2</em>\n\n* Eston alkamisaika: $8\n* Eston päättymisaika: $6\n* Kohde: $7\n\nVoit keskustella ylläpitäjän $1 tai toisen [[{{MediaWiki:Grouppage-sysop}}|ylläpitäjän]] kanssa estosta.\n\nHuomaa, ettet voi lähettää sähköpostia {{GRAMMAR:genitive|{{SITENAME}}}} kautta, ellet ole asettanut olemassa olevaa sähköpostiosoitetta [[Special:Preferences|asetuksissa]] tai jos esto on asetettu koskemaan myös sähköpostin lähettämistä.\n\nIP-osoitteesi on $3 ja estotunnus on #$5.\nLiitä kaikki yllä olevat tiedot mahdollisiin kyselyihisi.",
 	"systemblockedtext": "Käyttäjätunnuksesi tai IP-osoitteesi on automaattisesti estetty MediaWikin toimesta.\nAnnettu syy on:\n\n:<em>$2</em>\n\n* Start of block: $8\n* Expiration of block: $6\n* Intended blockee: $7\n\nTämänhetkinen IP-osoitteesi on $3.\nOle hyvä ja liitä kaikki yllä olevat tiedot mahdollisiin kyselyihisi.",
 	"blockednoreason": "(syytä ei annettu)",
 	"whitelistedittext": "Sinun täytyy $1, jotta voisit muokata sivuja.",
@@ -1509,7 +1509,7 @@
 	"recentchangeslinked-feed": "Linkitettyjen sivujen muutokset",
 	"recentchangeslinked-toolbox": "Linkitettyjen sivujen muutokset",
 	"recentchangeslinked-title": "Sivulta $1 linkitettyjen sivujen muutokset",
-	"recentchangeslinked-summary": "Kirjoita sivun nimi nähdäksesi muutokset sivuihin jotka on linkitetty tai ovat tältä sivulta. (Nähdäksesi luokan jäsenet, kirjoita {{ns:category}}:Luokan nimi). Muutokset sivuihin [[Special:Watchlist|tarkkailulistallasi]] on <strong>lihavoitu</strong>.",
+	"recentchangeslinked-summary": "Kirjoita sivun nimi nähdäksesi muutokset sivuihin, joista on linkki tähän sivuun tai joihin on linkki tältä sivulta. (Luokan sisällön saat näkyviin kirjoittamalla {{ns:category}}:Luokan nimen). Muutokset [[Special:Watchlist|tarkkailulistallasi]] oleviin sivuihin on <strong>lihavoitu</strong>.",
 	"recentchangeslinked-page": "Sivun nimi:",
 	"recentchangeslinked-to": "Näytä sen sijaan muutokset sivuihin, joista on linkki tähän sivuun",
 	"recentchanges-page-added-to-category": "[[:$1]] lisätty luokkaan",
diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index 783a778bed..cd80060225 100644
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -693,7 +693,7 @@
 	"botpasswords-restriction-failed": "Les restrictions de mot de passe de robots empêchent cette connexion.",
 	"botpasswords-invalid-name": "Le nom d’utilisateur spécifié ne contient pas de séparateur de mot de passe de robots (« $1 »).",
 	"botpasswords-not-exist": "L’{{GENDER:$1|utilisateur|utilisatrice}} « $1 » n’a pas de mot de passe de robot nommé « $2 ».",
-	"botpasswords-needs-reset": "Le mot de passe du robot de nom \"$2\" de l'utilisat{{GENDER:$1|eur}} \"$1\" doit être réinitialisé.",
+	"botpasswords-needs-reset": "Le mot de passe du robot de nom « $2 » de l’utilisat{{GENDER:$1|eur|rice}} « $1 » doit être réinitialisé.",
 	"resetpass_forbidden": "Les mots de passe ne peuvent pas être changés",
 	"resetpass_forbidden-reason": "Les mots de passe ne peuvent pas être modifiés : $1",
 	"resetpass-no-info": "Vous devez être connecté(e) pour accéder directement à cette page.",
@@ -789,8 +789,8 @@
 	"subject-preview": "Aperçu du sujet :",
 	"previewerrortext": "Une erreur s’est produite lors de la tentative de prévisualisation de vos modifications.",
 	"blockedtitle": "L’utilisateur est bloqué.",
-	"blockedtext": "<strong>Votre compte utilisateur ou votre adresse IP a été bloqué.</strong>\n\nLe blocage a été effectué par $1.\nLa raison invoquée est la suivante : <em>$2</em>.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7.\n\nVous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.\nVous ne pouvez utiliser la fonction « {{int:emailuser}} » que si une adresse de courriel valide est spécifiée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été bloquée.\nVotre adresse IP actuelle est $3 et votre identifiant de blocage est $5.\nVeuillez inclure tous les détails ci-dessus dans chacune des requêtes que vous ferez.",
-	"autoblockedtext": "Votre adresse IP a été bloquée automatiquement car elle a été utilisée par un autre utilisateur, lui-même bloqué par $1.\nLa raison invoquée est :\n\n: <em>$2</em>.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7\n\nVous pouvez contacter $1 ou l’un des autres [[{{MediaWiki:Grouppage-sysop}}|administrateurs]] pour discuter de ce blocage.\n\nNotez que vous ne pourrez utiliser la fonctionnalité d’envoi de courriel que si vous avez une adresse de courriel validée dans vos [[Special:Preferences|préférences]] et que cette fonctionnalité n’a pas été désactivée.\n\nVotre adresse IP actuelle est $3, et le numéro de blocage est $5.\nVeuillez inclure tous les détails ci-dessus dans chacune des requêtes que vous ferez.",
+	"blockedtext": "<strong>Votre compte utilisateur ou votre adresse IP a été bloqué.</strong>\n\nLe blocage a été effectué par $1.\nLa raison invoquée est la suivante : <em>$2</em>.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7.\n\nVous pouvez contacter $1 ou un autre [[{{MediaWiki:Grouppage-sysop}}|administrateur]] pour en discuter.\nVous ne pouvez utiliser la fonction « {{int:emailuser}} » que si une adresse de courriel valide est spécifiée dans vos [[Special:Preferences|préférences]] et que si cette fonctionnalité n’a pas été bloquée.\nVotre adresse IP actuelle est $3 et votre identifiant de blocage est $5.\nVeuillez inclure tous les détails ci-dessus dans chacune des requêtes que vous ferez.",
+	"autoblockedtext": "Votre adresse IP a été bloquée automatiquement car elle a été utilisée par un autre utilisateur, lui-même bloqué par $1.\nLa raison invoquée est :\n\n: <em>$2</em>.\n\n* Début du blocage : $8\n* Expiration du blocage : $6\n* Compte bloqué : $7\n\nVous pouvez contacter $1 ou l’un des autres [[{{MediaWiki:Grouppage-sysop}}|administrateurs]] pour discuter de ce blocage.\n\nNotez que vous ne pourrez utiliser la fonctionnalité « {{int:emailuser}} » que si vous avez une adresse de courriel validée dans vos [[Special:Preferences|préférences]] et que cette fonctionnalité n’a pas été désactivée.\n\nVotre adresse IP actuelle est $3, et le numéro de blocage est $5.\nVeuillez inclure tous les détails ci-dessus dans chacune des requêtes que vous ferez.",
 	"systemblockedtext": "Votre nom d'utilisateur ou votre adresse IP ont été bloqués automatiquement par MediaWiki.\nLa raison donnée est la suivante:\n\n: <em>$2</em>.\n\n* Le début du blocage: $8\n* Expiration du délai de blocage: $6\n* Elément concerné: $7\n\nVotre adresse IP actuelle est $3.\nVeuillez inclure tous les détails ci-dessus dans chacune des requêtes que vous ferez.",
 	"blockednoreason": "aucune raison donnée",
 	"whitelistedittext": "Vous devez vous $1 pour avoir la permission de modifier le contenu.",
@@ -2132,6 +2132,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Ajout du paramètre:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Nom du paramètre",
 	"apisandbox-dynamic-error-exists": "Un paramètre nommé \"$1\" existe déjà.",
+	"apisandbox-templated-parameter-reason": "Ce [[Special:ApiHelp/main#main/templatedparams|paramètre de modèle]] est offert d’après {{PLURAL:$1|la valeur|les valeurs}} de $2.",
 	"apisandbox-deprecated-parameters": "Paramètres désuets",
 	"apisandbox-fetch-token": "Auto-remplissage du jeton",
 	"apisandbox-add-multi": "Ajouter",
@@ -4267,5 +4268,6 @@
 	"pagedata-title": "Données de page",
 	"pagedata-text": "Cette page fournit une interface de données aux pages. Veuillez fournir le titre de la page dans l’URL en utilisant la syntaxe de sous-page.\n* La négociation de contenu s’applique d’après l’entête Accept de votre client. Cela veut dire que les données de la page seront fournies dans le format préféré par votre client.",
 	"pagedata-not-acceptable": "Aucun format correspondant trouvé. Types MIME pris en charge : $1",
-	"pagedata-bad-title": "Titre non valide : $1."
+	"pagedata-bad-title": "Titre non valide : $1.",
+	"unregistered-user-config": "Pour des raisons de sécurité, les sous-pages utilisateur JavaScript, CSS et JSON ne peuvent pas être chargées pour des utilisateurs non inscrits."
 }
diff --git a/languages/i18n/gcr.json b/languages/i18n/gcr.json
index 584759be91..3fb3cb6ef0 100644
--- a/languages/i18n/gcr.json
+++ b/languages/i18n/gcr.json
@@ -122,7 +122,7 @@
 	"pagecategories": "{{PLURAL:$1|Katégori}}",
 	"category_header": "Paj andan katégori-a « $1 »",
 	"subcategories": "Soukatégori",
-	"category-media-header": "Médya andan katégori-a « $1 »",
+	"category-media-header": "Médja annan katégori « $1 »",
 	"category-empty": "<em>Sa katégori pa ka kontni atchwèlman pyès paj ni fiché miltimédya.</em>",
 	"hidden-categories": "{{PLURAL:$1|Katégori kaché}}",
 	"hidden-category-category": "Katégori kaché",
@@ -182,7 +182,7 @@
 	"unprotect": "Chanjé protèksyon-an",
 	"newpage": "Nouvèl paj",
 	"talkpagelinktext": "diskisyon",
-	"specialpage": "Paj spésyal",
+	"specialpage": "Paj èspésyal",
 	"personaltools": "Zouti pèrsonèl",
 	"talk": "Diskisyon",
 	"views": "Afichaj",
@@ -273,7 +273,7 @@
 	"nstab-main": "Paj",
 	"nstab-user": "Paj di {{GENDER:{{ROOTPAGENAME}}|itilizatò|itilizatris}}",
 	"nstab-media": "Médja",
-	"nstab-special": "Paj spésyal",
+	"nstab-special": "Paj èspésyal",
 	"nstab-project": "À propo",
 	"nstab-image": "Fiché",
 	"nstab-mediawiki": "Mésaj",
@@ -283,8 +283,8 @@
 	"mainpage-nstab": "Paj prensipal",
 	"nosuchaction": "Aksyon enkonèt",
 	"nosuchactiontext": "Aksyon-an spésifyé andan URL-a sa envalid.\nZòt pitèt mal antré URL-a ou swivi roun lyen éroné.\nLi pé égalman endiké oun anomali andan logisyèl itilizé pa {{SITENAME}}.",
-	"nosuchspecialpage": "Paj spésyal inègzistant",
-	"nospecialpagetext": "<strong>Zòt doumandé oun paj spésyal ki pa ka ègzisté.</strong>\n\nOun lis dé paj spésyal valid ka trouvé so kò asou [[Special:SpecialPages|{{int:specialpages}}]].",
+	"nosuchspecialpage": "Paj èspésyal inègzistant",
+	"nospecialpagetext": "<strong>Zòt doumandé oun paj èspésyal ki pa ka ègzisté.</strong>\n\nOun lis dé paj èspésyal valid ka trouvé so kò asou [[Special:SpecialPages|{{int:specialpages}}]].",
 	"error": "Érò",
 	"databaseerror": "Érò di baz di doné",
 	"databaseerror-text": "Oun érò di rékèt di baz di doné aparèt.\nSala pé provini di roun anomali annan lojisyèl-a.",
@@ -353,7 +353,7 @@
 	"mycustomjsprotected": "Zòt pa gen drwè di modifyé sa paj JavaScript.",
 	"myprivateinfoprotected": "Zòt pa gen drwè di modifyé zòt enfòrmasyon pèrsonèl.",
 	"mypreferencesprotected": "Zòt pa gen drwè di modifyé zòt préférans.",
-	"ns-specialprotected": "Paj spésyal-ya pa pouvé sa modifyé.",
+	"ns-specialprotected": "Paj èspésyal-ya pa pouvé fika modifyé.",
 	"titleprotected": "Sa tit té protéjé kont tout kréyasyon pa [[User:$1|$1]].\nMotif fourni sa <em>$2</em>.",
 	"filereadonlyerror": "Enposib di modifyé fiché-a « $1 » pas répèrtwar-a di fiché « $2 » sa an lèktir sèl.\n\nAdministratò sistèm ki li vérouyé té fourni sa motif : « $3 ».",
 	"invalidtitle-knownnamespace": "Tit pa valid ké lèspas di non « $2 » é entitilé-a « $3 »",
@@ -574,7 +574,7 @@
 	"nowiki_sample": "Antré tèks ki pa formaté isi",
 	"nowiki_tip": "Ignoré sentaks wiki-a",
 	"image_tip": "Fiché enséré",
-	"media_tip": "Lyen vèr roun fiché médya",
+	"media_tip": "Lyen bò'd roun fiché médja",
 	"sig_tip": "Zòt signatir ké dat",
 	"hr_tip": "Lign orizontal (pa an abizé)",
 	"summary": "Rézimé :",
@@ -593,7 +593,7 @@
 	"showpreview": "Prévizwalizé",
 	"showdiff": "Wè modifikasyon-yan",
 	"anoneditwarning": "<strong>Panga :</strong> zòt pa konèkté. Zòt adrès IP ké sa vizib di tout moun si zòt ka fè dé modifikasyon. Si zòt <strong>[$1 ka konèkté zòt kò]</strong> ou <strong>[$2 kréyé roun kont]</strong>, zòt modifikasyon ké sq atribwé à zòt pròp non di itilizatò(ris) é zòt ké gen dé ròt avantaj.",
-	"blockedtext": "<strong>Zòt kont itilizatò ou zòt adrès IP bloké.</strong>\n\nBlokaj té éfèktchwé pa $1.\nRézon-an évoké sa swivant : <em>$2</em>.\n\n* Koumansman di blokaj : $8\n* Èkspirasyon di blokaj : $6\n* Kont bloké : $7.\n\nZòt pé kontakté $1 ou rounòt [[{{MediaWiki:Grouppage-sysop}}|administratò]] pou an diskité.\nZòt pa pé itilizé fonksyon-an « {{int:emailuser}} » sèlman si oun adrès di kouryé valid sa spésifyé andan zòt [[Special:Preferences|préférans]] é sèlman si sa fonksyonalité pa bloké.\nZòt adrèd IP atchwèl sa $3 é zòt idantifyan di blokaj sa $5.\nSouplé, enkli tout détay-ya lasou'l annan chakin dé rékèt ki zòt ké fè.",
+	"blockedtext": "<strong>Zòt kont itilizatò oben zòt adrès IP bloké.</strong>\n\nBlokaj té éfèktchwé pa $1.\nRézon-an évoké sa swivant : <em>$2</em>.\n\n* Koumansman di blokaj : $8\n* Èspirasyon di blokaj : $6\n* Kont bloké : $7.\n\nZòt pé kontakté $1 oben rounòt [[{{MediaWiki:Grouppage-sysop}}|administratò]] pou an diskité.\nZòt pa pouvé itilizé fonksyon-an « {{int:emailuser}} » rounso si oun adrès di kouryé valid sa èspésifyé andan zòt [[Special:Preferences|préférans]] é rounso si sa fonksyonalité pa bloké.\nZòt adrès IP atchwèl sa $3 é zòt idantifyan di blokaj sa $5.\nSouplé, enkli tout détay-ya lasou'l annan chakin dé rékèt ki zòt ké fè.",
 	"loginreqlink": "konèkté so kò",
 	"newarticletext": "Zòt té ka swiv roun lyen vèr roun paj ki pa ka ègzisté òkò. \nAtò di kréyé sa paj, antré zòt tèks annan bwat ki aprè (zòt pé konsilté [$1 paj d'èd-a] pou plis enfòrmasyon).\nSi zòt pa rivé{{GENDER:|}} isi pa éròr, kliké asou bouton <strong>Routour</strong> di zòt navigatò.",
 	"anontalkpagetext": "----\n<em>Zòt asou paj di diskisyon di oun itilizatò anonim ki pa òkò kréyé di kont ou ki pa ka an itilizé</em>.\nPou sa rézon, nou divèt itilizé so adrès IP pou idantifyé li.\nOun adrès IP pé sa partajé pa plizyò itilizatò.\nSi zòt roun itiliza{{GENDER:|ò|ris}} anonim é si zòt ka kontasté ki dé koumantèr ki pa ka konsèrné zòt sa adrèsé à zòt, zòt pé [[Special:CreateAccount|kréyé roun kont]] ou [[Special:UserLogin|konèkté zòt kò]] atò di évité tout konfizyon fitir ké ròt kontribitò anonim.",
@@ -725,7 +725,7 @@
 	"recentchangeslinked-feed": "Swivi dé paj lyé",
 	"recentchangeslinked-toolbox": "Swivi dé paj lyé",
 	"recentchangeslinked-title": "Swivi dé paj asosyé à « $1 »",
-	"recentchangeslinked-summary": "Antré roun non di paj pou wè modifikasyon-yan ki fè résaman asou dé paj lyé dipi ou vèr sa paj (pou wè manm-yan di oun katégori, antré Katégori:Non di katégori). Modifikasyon-yan dé paj di [[Special:Watchlist|zòt lis di swivi]] sa <strong>an gra</strong>.",
+	"recentchangeslinked-summary": "Antré roun non di paj pou wè modifikasyon-yan ki fè résaman asou dé paj lyé dipi oben bò'd sa paj (pou wè manm-yan di oun katégori, antré {{ns:category}}:Non di katégori). Modifikasyon-yan dé paj di [[Special:Watchlist|zòt lis di swivi]] sa <strong>an gra</strong>.",
 	"recentchangeslinked-page": "Non di paj :",
 	"recentchangeslinked-to": "Afiché modifikasyon-yan dé paj ki ka konpòrté roun lyen vèr paj ki bay plito ki envèrs",
 	"upload": "Enpòrté roun fiché",
@@ -755,7 +755,7 @@
 	"sharedupload-desc-here": "Sa fiché ka provini di $1. Li pé sa itilizé pa dé ròt projè.\nSo dèskripsyon asou so [$2 paj di dèskripsyon] sa afiché anba.",
 	"filepage-nofile": "Pyès fiché di sa non ka ègzisté.",
 	"upload-disallowed-here": "Zòt pa pé ranplasé sa fiché.",
-	"randompage": "Paj o azar",
+	"randompage": "Paj o azò",
 	"statistics": "Statistik",
 	"double-redirect-fixer": "Korèktò di roudirèksyon",
 	"nbytes": "$1 {{PLURAL:$1|òktè}}",
@@ -884,7 +884,7 @@
 	"tooltip-n-portal": "À propo di projè, sa ki zòt pé fè, koté trouvé enfòrmasyon-yan",
 	"tooltip-n-currentevents": "Trouvé plis d'enfòrmasyon asou atchwalité an kour",
 	"tooltip-n-recentchanges": "Lis di modifikasyon résant asou wiki-a",
-	"tooltip-n-randompage": "Afiché roun paj o azar",
+	"tooltip-n-randompage": "Afiché roun paj o azò",
 	"tooltip-n-help": "Aksè à lèd",
 	"tooltip-t-whatlinkshere": "Lis di paj lyé ki ka pwenté asou sala",
 	"tooltip-t-recentchangeslinked": "Lis di modifikasyon résant liyé à sa paj",
@@ -892,12 +892,12 @@
 	"tooltip-t-contributions": "Wè lis dé kontribisyon di {{GENDER:$1|sa itilizatò|sa itilizatris}}",
 	"tooltip-t-emailuser": "Voyé roun kouryé à {{GENDER:$1|sa itilizatò|sa itilizatris}}",
 	"tooltip-t-upload": "Télévèrsé dé fiché",
-	"tooltip-t-specialpages": "Lis di tout paj spésyal",
+	"tooltip-t-specialpages": "Lis di tout paj èspésyal",
 	"tooltip-t-print": "Vèrsyon enprimab di sa paj",
 	"tooltip-t-permalink": "Adrès pèrmanant di sa vèrsyon di paj-a",
 	"tooltip-ca-nstab-main": "Wè kontni di paj-a",
 	"tooltip-ca-nstab-user": "Wè paj di itilizatò",
-	"tooltip-ca-nstab-special": "A roun paj spésyal, é li pa pé sa modifyé.",
+	"tooltip-ca-nstab-special": "A roun paj èspésyal, é li pa pouvé fika modifyé.",
 	"tooltip-ca-nstab-project": "Wè paj-a di projè",
 	"tooltip-ca-nstab-image": "Wè paj-a di fiché",
 	"tooltip-ca-nstab-mediawiki": "Wè mésaj sistèm-a",
@@ -984,7 +984,7 @@
 	"watchlisttools-raw": "Modifyé lis di swivi an mòd brout",
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|diskisyon]])",
 	"redirect": "Roudirijé pa ID di fiché, itilizatò, paj, révizyon ou journal",
-	"redirect-summary": "Sa paj spésyal ka roudirijé vèr roun fiché (non di fiché fourni), oun paj (ID di révizyon ou di paj fourni), oun paj di itilizatò (idantifyan nimérik di itilizatò fourni), ou roun antré di journal (ID di journal fourni). Itilizasyon : [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]], ou [[{{#Special:Redirect}}/logid/186]].",
+	"redirect-summary": "Sa paj èspésyal ka roudirijé bò'd roun fiché (non di fiché fourni), oun paj (ID di révizyon oben di paj fourni), oun paj di itilizatò (idantifyan nimérik di itilizatò fourni), oben roun antré di journal (ID di journal fourni). Itilizasyon : [[{{#Special:Redirect}}/file/Example.jpg]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]], [[{{#Special:Redirect}}/user/101]], oben [[{{#Special:Redirect}}/logid/186]].",
 	"redirect-submit": "Validé",
 	"redirect-lookup": "Sasé :",
 	"redirect-value": "Valò :",
@@ -992,7 +992,7 @@
 	"redirect-page": "ID di paj",
 	"redirect-revision": "Révizyon di paj-a",
 	"redirect-file": "Non di fiché",
-	"specialpages": "Paj spésyal",
+	"specialpages": "Paj èspésyal",
 	"tag-filter": "Filtré [[Special:Tags|baliz]] :",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Baliz}}]] : $2)",
 	"tags-active-yes": "Wi",
diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json
index 633d84dcbb..4fb87e7042 100644
--- a/languages/i18n/gl.json
+++ b/languages/i18n/gl.json
@@ -26,7 +26,8 @@
 			"Luan",
 			"Hamilton Abreu",
 			"Athena in Wonderland",
-			"Navhy"
+			"Navhy",
+			"PokéDex Nacional"
 		]
 	},
 	"tog-underline": "Subliñar as ligazóns:",
@@ -63,7 +64,7 @@
 	"tog-watchlisthideminor": "Agochar as edicións pequenas na lista de vixilancia",
 	"tog-watchlisthideliu": "Agochar as edicións dos usuarios rexistrados na lista de vixilancia",
 	"tog-watchlistreloadautomatically": "Recargar a lista de vixilancia automaticamente cando se produza un cambio nun filtro (necesítase JavaScript)",
-	"tog-watchlistunwatchlinks": "Engadir ligazóns directos para vixiar ou deixar de vixiar as entradas da lista de páxinas vixiadas (é necesario JavaScript para activar a funcionalidade)",
+	"tog-watchlistunwatchlinks": "Engadir ligazóns directos para vixiar ou deixar de vixiar ({{int:Watchlist-unwatch}}/{{int:Watchlist-unwatch-undo}}) as entradas da lista de páxinas vixiadas (é preciso JavaScript para activar a funcionalidade)",
 	"tog-watchlisthideanons": "Agochar as edicións dos usuarios anónimos na lista de vixilancia",
 	"tog-watchlisthidepatrolled": "Agochar as edicións patrulladas na lista de vixilancia",
 	"tog-watchlisthidecategorization": "Agochar a categorización das páxinas",
@@ -532,6 +533,7 @@
 	"botpasswords-existing": "Contrasinais de bots existentes",
 	"botpasswords-createnew": "Crear un novo contrasinal de bot",
 	"botpasswords-editexisting": "Editar un contrasinal de bot xa existente",
+	"botpasswords-label-needsreset": "(o contrasinal precisa ser redefinido)",
 	"botpasswords-label-appid": "Nome do bot:",
 	"botpasswords-label-create": "Crear",
 	"botpasswords-label-update": "Actualizar",
diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index 0946de246b..31b7caa3da 100644
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -491,7 +491,7 @@
 	"noemail": "לא רשומה כתובת דואר אלקטרוני עבור ה{{GENDER:$1|משתמש|משתמשת}} \"$1\".",
 	"noemailcreate": "יש לספק כתובת דואר אלקטרוני תקינה.",
 	"passwordsent": "סיסמה חדשה נשלחה לכתובת הדואר האלקטרוני הרשומה עבור \"$1\".\nאנא היכנסו חזרה לאתר אחרי שתקבלו אותה.",
-	"blocked-mailpassword": "כתובת ה־IP שלך נחסמה מעריכה. כדי למנוע ניצול לרעה, אינך מורשה להשתמש באפשרות שחזור הסיסמה.",
+	"blocked-mailpassword": "כתובת ה־IP שלך נחסמה מעריכה. כדי למנוע ניצול לרעה, אין באפשרותך להשתמש באפשרות שחזור הסיסמה.",
 	"eauthentsent": "דוא\"ל אימות נשלח לכתובת הדוא\"ל שצוינה.\nלפני שדברי דוא\"ל אחרים יישלחו לחשבון הזה, יהיה {{GENDER:|עליך|עלייך}} לפעול לפי ההוראות בדוא\"ל, כדי לאשר שהחשבון אכן שייך לך.",
 	"throttled-mailpassword": "כבר נשלח דוא\"ל לאיפוס הסיסמה ב{{PLURAL:$1|שעה האחרונה|שעתיים האחרונות|־$1 השעות האחרונות}}.\nכדי למנוע ניצול לרעה, יכול להישלח רק דוא\"ל אחד כזה בכל {{PLURAL:$1|שעה|שעתיים|$1 שעות}}.",
 	"mailerror": "שגיאה בשליחת דוא\"ל: $1",
@@ -656,8 +656,8 @@
 	"subject-preview": "תצוגה מקדימה של הנושא:",
 	"previewerrortext": "אירעה שגיאה בעת הניסיון להציג תצוגה מקדימה של השינויים שלך.",
 	"blockedtitle": "המשתמש חסום",
-	"blockedtext": "<strong>שם המשתמש או כתובת ה־IP שלך נחסמו.</strong>\n\nהחסימה בוצעה על ידי $1.\nהסיבה שניתנה לכך היא <em>$2</em>.\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nבאפשרותך ליצור קשר עם $1 או עם כל אחד מ[[{{MediaWiki:Grouppage-sysop}}|מפעילי המערכת]] האחרים כדי לדון בחסימה.\nאין באפשרותך להשתמש בתכונת \"שליחת דואר אלקטרוני למשתמש זה\" אם לא ציינת כתובת דוא\"ל תקפה ב[[Special:Preferences|העדפות המשתמש שלך]] או אם נחסמת משליחת דוא\"ל.\nכתובת ה־IP הנוכחית שלך היא $3, ומספר החסימה שלך הוא #$5.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
-	"autoblockedtext": "כתובת ה־IP שלך נחסמה באופן אוטומטי כיוון שמשתמש אחר, שנחסם על־ידי $1, השתמש בה.\nהסיבה שניתנה לחסימה היא:\n\n:<em>$2</em>\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nבאפשרותך ליצור קשר עם $1 או עם כל אחד מ[[{{MediaWiki:Grouppage-sysop}}|מפעילי המערכת]] האחרים כדי לדון בחסימה.\n\nאין באפשרותך להשתמש בתכונת \"שליחת דואר אלקטרוני למשתמש זה\" אם לא ציינת כתובת דוא\"ל תקפה ב[[Special:Preferences|העדפות המשתמש שלך]] או אם נחסמת משליחת דוא\"ל.\n\nכתובת ה־IP הנוכחית שלך היא $3, ומספר החסימה שלך הוא #$5.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
+	"blockedtext": "<strong>שם המשתמש או כתובת ה־IP שלך נחסמו.</strong>\n\nהחסימה בוצעה על־ידי $1.\nהסיבה שניתנה לכך היא <em>$2</em>.\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nבאפשרותך ליצור קשר עם $1 או עם כל אחד מ[[{{MediaWiki:Grouppage-sysop}}|מפעילי המערכת]] האחרים כדי לדון בחסימה.\nכמו־כן, באפשרותך להשתמש בתכונת \"{{int:emailuser}}\", אלא אם לא ציינת כתובת דוא\"ל תקפה ב[[Special:Preferences|העדפות המשתמש שלך]] או אם נחסמת משליחת דוא\"ל.\nכתובת ה־IP הנוכחית שלך היא $3, ומספר החסימה שלך הוא #$5.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
+	"autoblockedtext": "כתובת ה־IP שלך נחסמה באופן אוטומטי כיוון שמשתמש אחר, שנחסם על־ידי $1, השתמש בה.\nהסיבה שניתנה לחסימה היא:\n\n:<em>$2</em>\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nבאפשרותך ליצור קשר עם $1 או עם כל אחד מ[[{{MediaWiki:Grouppage-sysop}}|מפעילי המערכת]] האחרים כדי לדון בחסימה.\n\nכמו־כן, באפשרותך להשתמש בתכונת \"{{int:emailuser}}\", אלא אם לא ציינת כתובת דוא\"ל תקפה ב[[Special:Preferences|העדפות המשתמש שלך]] או אם נחסמת משליחת דוא\"ל.\n\nכתובת ה־IP הנוכחית שלך היא $3, ומספר החסימה שלך הוא #$5.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
 	"systemblockedtext": "שם המשתמש או כתובת ה־IP שלך נחסמו באופן אוטומטי על־ידי תוכנת מדיה־ויקי.\nהסיבה שניתנה לחסימה היא:\n\n:<em>$2</em>\n\n* תחילת החסימה: $8\n* פקיעת החסימה: $6\n* החסימה שבוצעה: $7\n\nכתובת ה־IP הנוכחית שלך היא $3.\nיש לציין את כל הפרטים הללו בכל פנייה לבירור החסימה.",
 	"blockednoreason": "לא ניתנה סיבה",
 	"whitelistedittext": "נדרשת $1 כדי לערוך דפים.",
@@ -1837,7 +1837,7 @@
 	"listduplicatedfiles-summary": "זוהי רשימה של קבצים שהגרסה החדשה ביותר שלהם זהה לגרסה החדשה ביותר של קובץ אחר כלשהו. רק קבצים מקומיים נבדקים לצורך זה.",
 	"listduplicatedfiles-entry": "לקובץ [[:File:$1|$1]] יש [[$3|{{PLURAL:$2|עותק זהה|$2 עותקים זהים}}]].",
 	"unusedtemplates": "תבניות שאינן בשימוש",
-	"unusedtemplatestext": "דף זה מכיל רשימה של כל הדפים במרחב השם {{ns:template}} שאינם נכללים בדף אחר. אנא זכרו לבדוק את הקישורים האחרים לתבניות לפני שתמחקו אותן.",
+	"unusedtemplatestext": "דף זה מכיל רשימה של כל הדפים במרחב השם \"{{ns:template}}\" שאינם נכללים בדף אחר.\nיש לזכור לבדוק את הקישורים האחרים לתבניות לפני מחיקתן.",
 	"unusedtemplateswlh": "קישורים אחרים",
 	"randompage": "דף אקראי",
 	"randompage-nopages": "אין דפים {{PLURAL:$2|במרחב השם הבא|במרחבי השם הבאים}}: $1.",
@@ -1882,22 +1882,22 @@
 	"brokenredirects-edit": "עריכה",
 	"brokenredirects-delete": "מחיקה",
 	"withoutinterwiki": "דפים ללא קישורי שפה",
-	"withoutinterwiki-summary": "הדפים הבאים אינם מקשרים לגרסאות שלהם בשפות אחרות:",
+	"withoutinterwiki-summary": "הדפים הבאים אינם מקשרים לגרסאות שלהם בשפות אחרות.",
 	"withoutinterwiki-legend": "תחילית",
 	"withoutinterwiki-submit": "הצגה",
 	"fewestrevisions": "הדפים בעלי מספר העריכות הנמוך ביותר",
 	"nbytes": "{{PLURAL:$1|בית אחד|$1 בתים}}",
 	"ncategories": "{{PLURAL:$1|קטגוריה אחת|$1 קטגוריות}}",
-	"ninterwikis": "{{PLURAL:$1|קישור בינוויקי קחד|$1 קישורי בינוויקי}}",
+	"ninterwikis": "{{PLURAL:$1|קישור בינוויקי אחד|$1 קישורי בינוויקי}}",
 	"nlinks": "{{PLURAL:$1|קישור אחד|$1 קישורים}}",
 	"nmembers": "{{PLURAL:$1|דף אחד|$1 דפים}}",
 	"nmemberschanged": "$1 ← {{PLURAL:$2|חבר אחד|$2 חברים}}",
 	"nrevisions": "{{PLURAL:$1|גרסה אחת|$1 גרסאות}}",
 	"nimagelinks": "בשימוש {{PLURAL:$1|בדף אחד|ב־$1 דפים}}",
 	"ntransclusions": "בשימוש {{PLURAL:$1|בדף אחד|ב־$1 דפים}}",
-	"specialpage-empty": "אין תוצאות.",
+	"specialpage-empty": "אין תוצאות בדיווח התחזוקה הזה.",
 	"lonelypages": "דפים יתומים",
-	"lonelypagestext": "הדפים הבאים אינם מקושרים ואינם מוכללים בדפים אחרים באתר {{SITENAME}}.",
+	"lonelypagestext": "הדפים הבאים אינם מקושרים מדפים אחרים ב{{GRAMMAR:תחילית|{{SITENAME}}}} ואינם מוכללים בהם.",
 	"uncategorizedpages": "דפים חסרי קטגוריה",
 	"uncategorizedcategories": "קטגוריות חסרות קטגוריה",
 	"uncategorizedimages": "קבצים חסרי קטגוריה",
@@ -1907,11 +1907,11 @@
 	"unusedimages": "קבצים שאינם בשימוש",
 	"wantedcategories": "קטגוריות מבוקשות",
 	"wantedpages": "דפים מבוקשים",
-	"wantedpages-summary": "רשימת דפים לא קיימים שמספר הקישורים אליהם הוא הגדול ביותר, למעט דפים שרק הפניות מקשרות אליהם. לרשימת דפים לא קיימים שיש הפניות המקשרות אליהם, ר' [[{{#special:BrokenRedirects}}|רשימת ההפניות הבלתי־תקינות]].",
+	"wantedpages-summary": "רשימת דפים לא קיימים שמספר הקישורים אליהם הוא הגדול ביותר, למעט דפים שרק הפניות מקשרות אליהם. לרשימת דפים לא קיימים שיש הפניות המקשרות אליהם, ניתן לעיין ב[[{{#special:BrokenRedirects}}|רשימת ההפניות הבלתי־תקינות]].",
 	"wantedpages-badtitle": "כותרת בלתי תקינה ברשימת התוצאות: $1",
 	"wantedfiles": "קבצים מבוקשים",
 	"wantedfiletext-cat": "הקבצים הבאים נמצאים בשימוש, אך אינם קיימים. ייתכן שקבצים ממאגרים חיצוניים יהיו רשומים אף על פי שהם קיימים, אך שגיאות כאלה יהיו <del>מחוקות</del>. בנוסף, דפים שמטביעים קבצים שאינם קיימים רשומים בדף [[:$1]].",
-	"wantedfiletext-cat-noforeign": "הקבצים הבאים נמצאים בשימוש, אבל אינם קיימים. כמו־כן, דפים שמשתמשים בקבצים שאינם קיימים רשומים בדף [[:$1]].",
+	"wantedfiletext-cat-noforeign": "הקבצים הבאים נמצאים בשימוש, אבל אינם קיימים. כמו־כן, דפים שמטביעים קבצים שאינם קיימים רשומים בדף [[:$1]].",
 	"wantedfiletext-nocat": "הקבצים הבאים נמצאים בשימוש, אך אינם קיימים. ייתכן שקבצים ממאגרים חיצוניים יהיו רשומים אף על פי שהם קיימים, אך שגיאות כאלה יהיו <del>מחוקות</del>.",
 	"wantedfiletext-nocat-noforeign": "הקבצים הבאים נמצאים בשימוש, אבל אינם קיימים.",
 	"wantedtemplates": "תבניות מבוקשות",
@@ -1923,7 +1923,7 @@
 	"mostinterwikis": "הדפים עם המספר הרב ביותר של קישורי בינוויקי",
 	"mostrevisions": "הדפים עם מספר העריכות הגבוה ביותר",
 	"prefixindex": "כל הדפים עם התחילית",
-	"prefixindex-namespace": "כל הדפים עם התחילית (במרחב השם $1)",
+	"prefixindex-namespace": "כל הדפים עם התחילית (במרחב השם \"$1\")",
 	"prefixindex-submit": "הצגה",
 	"prefixindex-strip": "הסתרת התחילית ברשימה",
 	"shortpages": "דפים קצרים",
@@ -1931,9 +1931,9 @@
 	"deadendpages": "דפים ללא קישורים",
 	"deadendpagestext": "הדפים הבאים אינם מקשרים לדפים אחרים באתר {{SITENAME}}.",
 	"protectedpages": "דפים מוגנים",
-	"protectedpages-filters": "מסננים:",
+	"protectedpages-filters": "סינון:",
 	"protectedpages-indef": "הגנות ללא הגבלת זמן בלבד",
-	"protectedpages-summary": "בדף זה רשומים הדפים הקיימים שמוגנים כרגע. לרשימת הכותרות שמוגנות מפני יצירה, ראו [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].",
+	"protectedpages-summary": "בדף זה רשומים הדפים הקיימים שמוגנים כרגע. רשימת הכותרות שמוגנות מפני יצירה מופיעה בדף [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].",
 	"protectedpages-cascade": "הגנות מדורגות בלבד",
 	"protectedpages-noredirect": "הסתרת הפניות",
 	"protectedpagesempty": "אין כרגע דפים מוגנים עם הפרמטרים הללו.",
@@ -1947,7 +1947,7 @@
 	"protectedpages-unknown-timestamp": "לא ידוע",
 	"protectedpages-unknown-performer": "משתמש לא ידוע",
 	"protectedtitles": "כותרות מוגנות",
-	"protectedtitles-summary": "בדף זה רשומות הכותרות של הדפים שמוגנים כעת מפני יצירה. לרשימת הדפים הקיימים שמוגנים, {{GENDER:|ראה|ראי|ראו}} [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].",
+	"protectedtitles-summary": "בדף זה רשומות הכותרות של הדפים שמוגנים כעת מפני יצירה. רשימת הדפים הקיימים שמוגנים מופיעה בדף [[{{#special:ProtectedPages}}|{{int:protectedpages}}]].",
 	"protectedtitlesempty": "אין כרגע כותרות מוגנות עם הפרמטרים האלה.",
 	"protectedtitles-submit": "הצגת הדפים",
 	"listusers": "רשימת משתמשים",
@@ -1962,7 +1962,7 @@
 	"ancientpages": "דפים מוזנחים",
 	"move": "העברה",
 	"movethispage": "העברת דף זה",
-	"unusedimagestext": "הקבצים הבאים קיימים אך אינם מוטבעים בשום דף.\nשימו לב שאתרי אינטרנט אחרים עשויים לקשר לקובץ באמצעות כתובת URL ישירה, ולכן הוא עלול להופיע כאן למרות היותו בשימוש פעיל.",
+	"unusedimagestext": "הקבצים הבאים קיימים, אך אינם מוטבעים בשום דף.\nיש לשים לב לכך שאתרי אינטרנט אחרים עשויים לקשר לקובץ באמצעות כתובת URL ישירה, ולכן הוא עלול להופיע כאן למרות היותו בשימוש פעיל.",
 	"unusedcategoriestext": "הקטגוריות הבאות קיימות, אבל לא נעשה שימוש בהן בשום דף או קטגוריה.",
 	"notargettitle": "אין דף מטרה",
 	"notargettext": "לא ציינת דף מטרה או משתמש לגביו תבוצע פעולה זו.",
@@ -1970,14 +1970,14 @@
 	"nopagetext": "דף המטרה שציינת אינו קיים.",
 	"pager-newer-n": "{{PLURAL:$1|הבאה|$1 הבאות}}",
 	"pager-older-n": "{{PLURAL:$1|הקודמת|$1 הקודמות}}",
-	"suppress": "הסתרה",
+	"suppress": "העלמה",
 	"querypage-disabled": "דף מיוחד זה מבוטל עקב בעיות ביצועים.",
 	"apihelp": "עזרה עבור ה־API",
 	"apihelp-no-such-module": "המודול \"$1\" לא נמצא.",
 	"apisandbox": "ארגז החול של ה־API",
 	"apisandbox-jsonly": "דרוש JavaScript כדי להשתמש בארגז החול של ה־API.",
 	"apisandbox-api-disabled": "API אינו פעיל באתר הזה.",
-	"apisandbox-intro": "השתמשו בדף הזה כדי להתנסות בשימוש ב<strong>שירות ה־API המבוסס Web של מדיה־ויקי</strong>.\nעיינו ב[[mw:API:Main page|תיעוד של ה־API]] (באנגלית) למידע נוסף של שימוש ב־API. למשל: [https://www.mediawiki.org/wiki/API#A_simple_example איך לקבל את התוכן של העמוד הראשי]. בחרו באחת הפעולות (actions) לדוגמאות נוספות.\n\nשימו לב שאף שמדובר ב\"ארגז חול\", פעולות שנעשות כאן עשויות לשנות את התוכן של אתר הוויקי.",
+	"apisandbox-intro": "ניתן להשתמש בדף הזה כדי להתנסות בשימוש ב<strong>שירות ה־API המבוסס Web של מדיה־ויקי</strong>.\nאפשר לעיין ב[[mw:API:Main page|תיעוד של ה־API]] (באנגלית) למידע נוסף על שימוש ב־API. למשל: [https://www.mediawiki.org/wiki/API#A_simple_example איך לקבל את התוכן של העמוד הראשי]. יש לבחור באחת הפעולות (actions) לדוגמאות נוספות.\n\nלתשומת לבך: אף על פי שמדובר ב\"ארגז חול\", פעולות שנעשות כאן עשויות לשנות את התוכן של אתר הוויקי.",
 	"apisandbox-submit": "ביצוע הבקשה",
 	"apisandbox-reset": "ניקוי",
 	"apisandbox-retry": "ניסיון נוסף",
@@ -1990,11 +1990,12 @@
 	"apisandbox-dynamic-parameters-add-label": "הוספת פרמטר:",
 	"apisandbox-dynamic-parameters-add-placeholder": "שם הפרמטר",
 	"apisandbox-dynamic-error-exists": "פרמטר בשם \"$1\" כבר קיים.",
+	"apisandbox-templated-parameter-reason": "[[Special:ApiHelp/main#main/templatedparams|פרמטר התבנית]] הזה מוצע בהתבסס על {{PLURAL:$1|הערך של השדה|הערכים של השדות}} $2.",
 	"apisandbox-deprecated-parameters": "פרמטרים מיושנים",
 	"apisandbox-fetch-token": "מילוי אוטומטי של האסימון",
 	"apisandbox-add-multi": "הוספה",
 	"apisandbox-submit-invalid-fields-title": "חלק מהשדות אינם תקינים",
-	"apisandbox-submit-invalid-fields-message": "אנא תקנו את השדות המסומנים ונסו שוב.",
+	"apisandbox-submit-invalid-fields-message": "נא לתקן את השדות המסומנים ולנסות שוב.",
 	"apisandbox-results": "תוצאות",
 	"apisandbox-sending-request": "בקשת ה־API בשליחה...",
 	"apisandbox-loading-results": "תוצאות ה־API בתהליך קבלה...",
@@ -2005,7 +2006,7 @@
 	"apisandbox-request-url-label": "כתובת ה־URL של הבקשה:",
 	"apisandbox-request-json-label": "ייצוג הבקשה כ־JSON:",
 	"apisandbox-request-time": "זמן הבקשה: {{PLURAL:$1|מילישנייה אחת|$1 מילישניות}}",
-	"apisandbox-results-fixtoken": "אנא תקנו את האסימון ושלחו שוב",
+	"apisandbox-results-fixtoken": "יש לתקן את האסימון ולשלוח שוב",
 	"apisandbox-results-fixtoken-fail": "קבלת האסימון \"$1\" נכשלה.",
 	"apisandbox-alert-page": "שדות בדף זה אינם תקינים.",
 	"apisandbox-alert-field": "הערך של שדה זה אינו תקין.",
@@ -2019,8 +2020,8 @@
 	"booksources-search-legend": "חיפוש משאבי ספרות חיצוניים",
 	"booksources-isbn": "מסת\"ב (ISBN):",
 	"booksources-search": "חיפוש",
-	"booksources-text": "להלן רשימת קישורים לאתרים אחרים המוכרים ספרים חדשים ויד־שנייה, ושבהם עשוי להיות מידע נוסף לגבי ספרים שאתם מחפשים:",
-	"booksources-invalid-isbn": "המסת\"ב שניתן כנראה אינו תקין; אנא בדקו אם ביצעתם טעויות בהעתקה מהמידע המקורי.",
+	"booksources-text": "להלן רשימת קישורים לאתרים אחרים המוכרים ספרים חדשים ויד־שנייה, ושבהם עשוי להיות מידע נוסף לגבי ספרים שמעניינים אותך:",
+	"booksources-invalid-isbn": "המסת\"ב שניתן כנראה אינו תקין; יש לבדוק אם נעשו טעויות בהעתקה מהמידע המקורי.",
 	"magiclink-tracking-rfc": "דפים שמשתמשים בקישורי קסם ל־RFC",
 	"magiclink-tracking-rfc-desc": "דף זה משתמש בקישורי קסם ל־RFC. באתר [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Magic_links mediawiki.org] מוסבר כיצד יש לשנותם.",
 	"magiclink-tracking-pmid": "דפים שמשתמשים בקישורי קסם ל־PMID",
@@ -2047,10 +2048,10 @@
 	"allpagesfrom": "הצגת דפים החל מ:",
 	"allpagesto": "הצגת דפים עד:",
 	"allarticles": "כל הדפים",
-	"allinnamespace": "כל הדפים (מרחב השם $1)",
+	"allinnamespace": "כל הדפים (במרחב השם \"$1\")",
 	"allpagessubmit": "הצגה",
-	"allpagesprefix": "הדפים ששמם מתחיל ב־:",
-	"allpagesbadtitle": "כותרת הדף שניתנה הייתה בלתי־תקינה או שהייתה בה קידומת של קישור לשפה אחרת או לוויקי אחר.\nייתכן שהיא מכילה תו אחד או יותר האסורים לשימוש בכותרות.",
+	"allpagesprefix": "הצגת דפים ששמם מתחיל ב־:",
+	"allpagesbadtitle": "כותרת הדף שניתנה הייתה בלתי־תקינה או שהייתה בה קידומת של קישור לשפה אחרת או לאתר ויקי אחר.\nייתכן שהיא מכילה תו אחד או יותר האסורים לשימוש בכותרות.",
 	"allpages-bad-ns": "מרחב השם \"$1\" לא קיים ב{{grammar:תחילית|{{SITENAME}}}}.",
 	"allpages-hide-redirects": "הסתרת הפניות",
 	"cachedspecial-viewing-cached-ttl": "זוהי גרסה שמורה בזיכרון המטמון של דף זה, שעשויה להיות בת $1.",
@@ -2058,7 +2059,7 @@
 	"cachedspecial-refresh-now": "צפייה באחרון.",
 	"categories": "קטגוריות",
 	"categories-submit": "הצגה",
-	"categoriespagetext": "{{PLURAL:$1|הקטגוריה הבאה כוללת|הקטגוריות הבאות כוללות}} דפים או קובצי מדיה.\n[[Special:UnusedCategories|קטגוריות שאינן בשימוש]] אינן מוצגות כאן.\nראו גם את [[Special:WantedCategories|רשימת הקטגוריות המבוקשות]].",
+	"categoriespagetext": "{{PLURAL:$1|הקטגוריה הבאה כוללת|הקטגוריות הבאות כוללות}} דפים או קובצי מדיה.\n[[Special:UnusedCategories|קטגוריות שאינן בשימוש]] לא מוצגות כאן.\nניתן לעיין גם ב[[Special:WantedCategories|רשימת הקטגוריות המבוקשות]].",
 	"categoriesfrom": "הצגת קטגוריות החל מ:",
 	"deletedcontributions": "תרומות משתמש מחוקות",
 	"deletedcontributions-title": "תרומות משתמש מחוקות",
@@ -2090,6 +2091,7 @@
 	"listgrouprights-helppage": "Help:הרשאות",
 	"listgrouprights-members": "(רשימת חברים)",
 	"listgrouprights-right-display": "<span class=\"listgrouprights-granted\">$1 <code dir=\"ltr\">($2)</code></span>",
+	"listgrouprights-right-revoked": "<span class=\"listgrouprights-revoked\">$1 <code dir=\"ltr\">($2)</code></span>",
 	"listgrouprights-addgroup": "הוספת משתמשים ל{{PLURAL:$2|קבוצה|קבוצות}}: $1",
 	"listgrouprights-removegroup": "הסרת משתמשים מה{{PLURAL:$2|קבוצה|קבוצות}}: $1",
 	"listgrouprights-addgroup-all": "הוספת משתמשים לכל הקבוצות",
@@ -2112,13 +2114,13 @@
 	"trackingcategories-desc": "הקריטריון להכללה בקטגוריה",
 	"restricted-displaytitle-ignored": "דפים שכותרת התצוגה שלהם אינה מופעלת",
 	"restricted-displaytitle-ignored-desc": "בדף הזה מוגדרת כותרת תצוגה (<code><nowiki>{{DISPLAYTITLE}}</nowiki></code>) שאינה מופעלת, כי היא אינה תואמת לכותרת האמיתית של הדף.",
-	"noindex-category-desc": "הדף אינו מאונדקס על‏‏־ידי רובוטים כיוון שהוא כולל את מילת הקסם <code><nowiki>__NOINDEX__</nowiki></code> והוא במרחב שם שבו דגל כזה מותר לשימוש.",
-	"index-category-desc": "הדף כולל את מילת הקסם <code><nowiki>__INDEX__</nowiki></code> (והוא במרחב שם שבו דגל כזה מותר לשימוש), ולכן הוא מאונדקס על‏‏֫־ידי רובוטים אף שכברירת מחדל הוא לא היה מאונדקס על ידם.",
-	"post-expand-template-inclusion-category-desc": "גודל הדף גדול מ‏‏־<code>$wgMaxArticleSize</code> לאחר הרחבת כל התבניות, ולכן כמה תבניות לא הורחבו.",
-	"post-expand-template-argument-category-desc": "הדף גדול מ־<code>$wgMaxArticleSize</code> לאחר הרחבת ארגומנט של תבנית (משהו בסוגריים משולשים, כגון <code>{{{Foo}}})</code>).",
-	"expensive-parserfunction-category-desc": "הדף משתמש ביותר מדי פונקציות מפענח יקרות לשימוש (כגון #קיים). ראו [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
+	"noindex-category-desc": "הדף אינו ממופתח על‏‏־ידי רובוטים כיוון שהוא כולל את מילת הקסם <code><nowiki>__לא_לחיפוש__</nowiki></code> (או <code><nowiki>__NOINDEX__</nowiki></code>) והוא במרחב שם שבו דגל כזה מותר לשימוש.",
+	"index-category-desc": "הדף כולל את מילת הקסם <code><nowiki>__לחיפוש__</nowiki></code> (או <code><nowiki>__INDEX__</nowiki></code>) (והוא במרחב שם שבו דגל כזה מותר לשימוש), ולכן הוא ממופתח על־ידי רובוטים אף שכברירת מחדל הוא לא היה ממפותח על־ידיהם.",
+	"post-expand-template-inclusion-category-desc": "גודל הדף גדול מ‏‏־<code dir=\"ltr\">$wgMaxArticleSize</code> לאחר הרחבת כל התבניות, ולכן כמה תבניות לא הורחבו.",
+	"post-expand-template-argument-category-desc": "הדף גדול מ־<code dir=\"ltr\">$wgMaxArticleSize</code> לאחר הרחבת פרמטר של תבנית (משהו בסוגריים משולשים, כגון <code>{{{Foo}}}</code>).",
+	"expensive-parserfunction-category-desc": "הדף משתמש ביותר מדי פונקציות מפענח יקרות לשימוש (כגון <code>#קיים</code> או <code dir=\"ltr\">#ifexist</code>). מידע נוסף: [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
 	"broken-file-category-desc": "הדף כולל קישור שבור לקובץ (קישור להטבעת קובץ כאשר הקובץ אינו קיים).",
-	"hidden-category-category-desc": "הקטגוריה כוללת את הטקסט <code><nowiki>__קטגוריה_מוסתרת__</nowiki></code> בתוכן הדף שלה, ולכן היא לא מופיעה בתיבת קישורי הקטגוריות בדפים כברירת מחדל.",
+	"hidden-category-category-desc": "הקטגוריה כוללת את הטקסט <code><nowiki>__קטגוריה_מוסתרת__</nowiki></code> (או <code><nowiki>__HIDDENCAT__</nowiki></code>) בתוכן הדף שלה, ולכן היא לא מופיעה בתיבת קישורי הקטגוריות בדפים כברירת מחדל.",
 	"trackingcategories-nodesc": "התיאור אינו זמין.",
 	"trackingcategories-disabled": "הקטגוריה מבוטלת",
 	"mailnologin": "אין כתובת לשליחה",
@@ -2129,7 +2131,7 @@
 	"emailpagetext": "ניתן להשתמש בטופס שלהלן כדי לשלוח הודעת דואר אלקטרוני {{GENDER:$1|למשתמש זה|למשתמשת זו}}.\nכתובת הדואר האלקטרוני שהזנת ב[[Special:Preferences|העדפות המשתמש שלך]] תופיע ככתובת שההודעה נשלחה ממנה, כדי לאפשר תגובה ישירה.",
 	"defemailsubject": "דוא\"ל מ{{GRAMMAR:תחילית|{{SITENAME}}}} מה{{GENDER:$1|משתמש|משתמשת}} \"$1\"",
 	"usermaildisabled": "שליחת דוא\"ל למשתמשים מבוטלת",
-	"usermaildisabledtext": "אינכם מורשים לשלוח דואר אלקטרוני למשתמשים אחרים באתר זה",
+	"usermaildisabledtext": "אין באפשרותך לשלוח דואר אלקטרוני למשתמשים אחרים באתר זה",
 	"noemailtitle": "אין כתובת דואר אלקטרוני",
 	"noemailtext": "משתמש זה לא הזין כתובת דואר אלקטרוני תקינה.",
 	"nowikiemailtext": "משתמש זה בחר שלא לקבל דואר אלקטרוני ממשתמשים אחרים.",
@@ -2143,7 +2145,7 @@
 	"emailsubject": "נושא:",
 	"emailmessage": "הודעה:",
 	"emailsend": "שליחה",
-	"emailccme": "שִלחו לי העתק של ההודעה שלי.",
+	"emailccme": "שלחו לי העתק של ההודעה שלי.",
 	"emailccsubject": "העתק של הודעתך למשתמש $1: $2",
 	"emailsent": "הדואר נשלח",
 	"emailsenttext": "הודעת הדואר האלקטרוני שלך נשלחה.",
@@ -2153,26 +2155,26 @@
 	"watchlist": "רשימת המעקב",
 	"mywatchlist": "רשימת המעקב",
 	"watchlistfor2": "עבור $1 $2",
-	"nowatchlist": "אין דפים ברשימת המעקב.",
+	"nowatchlist": "אין דפים ברשימת המעקב שלך.",
 	"watchlistanontext": "נדרשת כניסה לחשבון כדי לצפות או לערוך פריטים ברשימת המעקב.",
 	"watchnologin": "לא נכנסת לחשבון",
 	"addwatch": "הוספה לרשימת המעקב",
 	"addedwatchtext": "הדף \"[[:$1]]\" ודף השיחה שלו נוספו ל[[Special:Watchlist|רשימת המעקב]] שלך.",
 	"addedwatchtext-talk": "הדף \"[[:$1]]\" ודף התוכן המשויך אליו נוספו ל[[Special:Watchlist|רשימת המעקב]] שלך.",
-	"addedwatchtext-short": "הדף \"$1\" נוסף לרשימת המעקב.",
+	"addedwatchtext-short": "הדף \"$1\" נוסף לרשימת המעקב שלך.",
 	"removewatch": "הסרה מרשימת המעקב",
 	"removedwatchtext": "הדף \"[[:$1]]\" ודף השיחה שלו הוסרו מ[[Special:Watchlist|רשימת המעקב]] שלך.",
 	"removedwatchtext-talk": "הדף \"[[:$1]]\" ודף התוכן המשויך אליו הוסרו מ[[Special:Watchlist|רשימת המעקב]] שלך.",
-	"removedwatchtext-short": "הדף \"$1\" הוסר מרשימת המעקב.",
+	"removedwatchtext-short": "הדף \"$1\" הוסר מרשימת המעקב שלך.",
 	"watch": "מעקב",
 	"watchthispage": "מעקב אחרי דף זה",
 	"unwatch": "הפסקת מעקב",
 	"unwatchthispage": "הפסקת המעקב אחרי דף זה",
 	"notanarticle": "זהו אינו דף תוכן",
 	"notvisiblerev": "הגרסה האחרונה שנוצרה על־ידי משתמש אחר נמחקה",
-	"watchlist-details": "ברשימת המעקב שלך יש {{PLURAL:$1|דף אחד|$1 דפים}} (ובנוסף להם, דפי שיחה).",
+	"watchlist-details": "ברשימת המעקב שלך יש {{PLURAL:$1|דף אחד|$1 דפים}} (ובנוסף {{PLURAL:$1|אליו, דף|להם, דפי}} שיחה).",
 	"wlheader-enotif": "הודעות דוא\"ל מאופשרות.",
-	"wlheader-showupdated": "דפים שהשתנו מאז ביקורך האחרון בהם מוצגים ב'''הדגשה'''.",
+	"wlheader-showupdated": "דפים שהשתנו מאז ביקורך האחרון בהם מוצגים ב<strong>הדגשה</strong>.",
 	"wlnote": "להלן {{PLURAL:$1|השינוי האחרון|<strong>$1</strong> השינויים האחרונים}} {{PLURAL:$2|בשעה האחרונה|בשעתיים האחרונות|ב־<strong>$2</strong> השעות האחרונות}}, עד $4, $3.",
 	"wlshowlast": "הצגת $1 שעות אחרונות $2 ימים אחרונים",
 	"watchlist-hide": "הסתרת",
@@ -2196,7 +2198,7 @@
 	"enotif_subject_moved": "הדף \"$1\" ב{{grammar:תחילית|{{SITENAME}}}} הועבר על־ידי $2",
 	"enotif_subject_restored": "הדף \"$1\" ב{{grammar:תחילית|{{SITENAME}}}} שוחזר על־ידי $2",
 	"enotif_subject_changed": "הדף \"$1\" ב{{grammar:תחילית|{{SITENAME}}}} שוּנה על־ידי $2",
-	"enotif_body_intro_deleted": "הדף \"$1\" באתר {{SITENAME}} נמחק ב־$PAGEEDITDATE על־ידי $2; ראו $3.",
+	"enotif_body_intro_deleted": "הדף \"$1\" באתר {{SITENAME}} נמחק ב־$PAGEEDITDATE על־ידי $2; להלן הקישור לדף: $3.",
 	"enotif_body_intro_created": "הדף \"$1\" באתר {{SITENAME}} נוצר ב־$PAGEEDITDATE על־ידי $2; ראו $3 לגרסה הנוכחית של הדף.",
 	"enotif_body_intro_moved": "הדף \"$1\" באתר {{SITENAME}} הועבר ב־$PAGEEDITDATE על־ידי $2; ראו $3 לגרסה הנוכחית של הדף.",
 	"enotif_body_intro_restored": "הדף \"$1\" באתר {{SITENAME}} שוחזר ב־$PAGEEDITDATE על־ידי $2; ראו $3 לגרסה הנוכחית של הדף.",
@@ -4110,5 +4112,6 @@
 	"pagedata-title": "מידע על הדף",
 	"pagedata-text": "דף זה מהווה ממשק מידע לדפים. כדי להשתמש בו, כותרת הדף צריכה להופיע בכתובת ה־URL, בעזרת התחביר המתאים לדפי־משנה.\n* דף זה משתמש בשיטת \"ניתוב התוכן\" (Content negotiation) בהתבסס על כותרת ה־Accept ששולח צד הלקוח. פירוש הדבר הוא שהמידע על הדף יישלח בפורמט שצד הלקוח (כגון דפדפן) מעדיף.",
 	"pagedata-not-acceptable": "לא נמצא פורמט נתמך. סוגי MIME נתמכים: $1",
-	"pagedata-bad-title": "כותרת בלתי־תקינה: $1."
+	"pagedata-bad-title": "כותרת בלתי־תקינה: $1.",
+	"unregistered-user-config": "מסיבות אבטחה, לא ניתן לטעון דפי JavaScript‏, CSS ו־JSON בדפי משנה של משתמשים שאינם קיימים."
 }
diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json
index f82859f398..804e1ff867 100644
--- a/languages/i18n/hu.json
+++ b/languages/i18n/hu.json
@@ -669,8 +669,8 @@
 	"subject-preview": "Tárgy előnézete:",
 	"previewerrortext": "Hiba történt a változások előnézetének megjelenítése során.",
 	"blockedtitle": "A szerkesztő blokkolva van",
-	"blockedtext": "<strong>A szerkesztőnevedet vagy az IP-címedet blokkoltuk.</strong>\n\nA blokkolást $1 végezte el.\nAz általa felhozott indok: <em>$2.</em>\n\n* A blokk kezdete: $8\n* A blokk lejárata: $6\n* Blokkolt szerkesztő: $7\n\nKapcsolatba léphetsz $1 szerkesztőnkkel vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.\nAz „E-mail küldése ennek a szerkesztőnek” funkciót csak akkor használhatod, ha érvényes e-mail címet adtál meg [[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.\nJelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.\nKérjük, hogy érdeklődés esetén minden fenti részletet adj meg.",
-	"autoblockedtext": "Az IP-címed automatikusan blokkolva lett, mert korábban egy olyan szerkesztő használta, akit $1 blokkolt, az alábbi indoklással:\n\n:''$2''\n\n*A blokk kezdete: '''$8'''\n*A blokk lejárata: '''$6'''\n*Blokkolt szerkesztő: '''$7'''\n\nKapcsolatba léphetsz $1 szerkesztőnkkel, vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.\n\nAz 'E-mail küldése ennek a szerkesztőnek' funkciót csak akkor használhatod, ha érvényes e-mail címet adtál meg\n[[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.\n\nJelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.\nKérjük, hogy érdeklődés esetén mindkettőt add meg.",
+	"blockedtext": "<strong>A szerkesztőnevedet vagy az IP-címedet blokkoltuk.</strong>\n\nA blokkolást $1 végezte el.\nAz általa felhozott indok: <em>$2.</em>\n\n* A blokk kezdete: $8\n* A blokk lejárata: $6\n* Blokkolt szerkesztő: $7\n\nKapcsolatba léphetsz $1 szerkesztőnkkel vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.\nAz „{{int:emailuser}}” funkciót csak akkor használhatod, ha érvényes e-mail-címet adtál meg [[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.\nJelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.\nKérjük, hogy érdeklődés esetén minden fenti részletet adj meg.",
+	"autoblockedtext": "Az IP-címed automatikusan blokkolva lett, mert korábban egy olyan szerkesztő használta, akit $1 blokkolt, az alábbi indoklással:\n\n:''$2''\n\n*A blokk kezdete: '''$8'''\n*A blokk lejárata: '''$6'''\n*Blokkolt szerkesztő: '''$7'''\n\nKapcsolatba léphetsz $1 szerkesztőnkkel, vagy egy másik [[{{MediaWiki:Grouppage-sysop}}|adminisztrátorral]], és megbeszélheted vele a blokkolást.\n\nAz „{{int:emailuser}}” funkciót csak akkor használhatod, ha érvényes e-mail címet adtál meg\n[[Special:Preferences|fiókbeállításaidban]], és nem blokkolták a használatát.\n\nJelenlegi IP-címed: $3, a blokkolás azonosítószáma: #$5.\nKérjük, hogy érdeklődés esetén mindkettőt add meg.",
 	"systemblockedtext": "A felhasználónevedet vagy IP-címedet automatikusan blokkolta a MediaWiki.\nA blokkolás indoka:\n\n:<em>$2</em>\n\n* A blokk kezdete: $8\n* A blokk lejárata: $6\n* Blokkolt szerkesztő: $7\n\nA jelenlegi IP-címed: $3.\nKérjük, hogy érdeklődés esetén minden fenti részletet adj meg.",
 	"blockednoreason": "nem adott meg okot",
 	"whitelistedittext": "Lapok szerkesztéséhez $1.",
@@ -728,7 +728,7 @@
 	"longpageerror": "'''HIBA: Az általad beküldött szöveg {{PLURAL:$1|egy kilobájt|$1 kilobájt}} hosszú, ami több az engedélyezett {{PLURAL:$2|egy kilobájtnál|$2 kilobájtnál}}.\nA szerkesztést nem lehet elmenteni.'''",
 	"readonlywarning": "<strong>FIGYELMEZTETÉS: A wiki adatbázisát karbantartás miatt zárolták, ezért most nem fogod tudni elmenteni a szerkesztéseidet!</strong>\nA lap szövegét másold egy szövegfájlba, amit később felhasználhatsz!\n\nAz adatbázist lezáró rendszeradminisztrátor az alábbi magyarázatot adta: $1",
 	"protectedpagewarning": "<strong>Figyelem: Ez a lap védett, így csak adminisztrátori jogosultságokkal rendelkező szerkesztők módosíthatják.</strong>\nA legutolsó ide vonatkozó naplóbejegyzés alább látható:",
-	"semiprotectedpagewarning": "'''Megjegyzés:''' ez a lap védett, így regisztrálatlan vagy újonnan regisztrált szerkesztők nem módosíthatják.",
+	"semiprotectedpagewarning": "<strong>Megjegyzés:</strong> ez a lap védett, így regisztrálatlan vagy újonnan regisztrált szerkesztők nem módosíthatják.\nA lapra vonatkozó utolsó naplóbejegyzés alább látható:",
 	"cascadeprotectedwarning": "<strong>Figyelem:</strong> ez a lap le van zárva, csak [[Special:ListGroupRights|megfelelő jogosultságú]] felhasználók szerkeszthetik, mert a következő kaszkádvédelemmel ellátott {{PLURAL:$1|lapon|lapokon}} be van illesztve:",
 	"titleprotectedwarning": "'''Figyelem: Ez a lap le van védve, így csak a [[Special:ListGroupRights|megfelelő jogosultságokkal]] rendelkező szerkesztők hozhatják létre.'''\nA legutolsó ide vonatkozó naplóbejegyzés alább látható:",
 	"templatesused": "A lapon használt {{PLURAL:$1|sablon|sablonok}}:",
@@ -1349,7 +1349,7 @@
 	"rcfilters-tag-remove": "$1 eltávolítása",
 	"rcfilters-legend-heading": "<strong>Rövidítések listája:</strong>",
 	"rcfilters-other-review-tools": "Egyéb hasznos hivatkozások",
-	"rcfilters-group-results-by-page": "Csoportosítás eredményei lapok szerint",
+	"rcfilters-group-results-by-page": "Eredmények csoportosítása lapok szerint",
 	"rcfilters-activefilters": "Aktív szűrők",
 	"rcfilters-advancedfilters": "Haladó szűrők",
 	"rcfilters-limit-title": "Megjelenítendő találatok száma",
@@ -1516,7 +1516,7 @@
 	"recentchangeslinked-feed": "Kapcsolódó változtatások",
 	"recentchangeslinked-toolbox": "Kapcsolódó változtatások",
 	"recentchangeslinked-title": "A(z) $1 laphoz kapcsolódó változtatások",
-	"recentchangeslinked-summary": "Alább azon lapoknak a legutóbbi változtatásai láthatóak, amelyekre hivatkozik egy megadott lap. (Ha egy kategória tagjaira vagy kíváncsi, írd be, hogy Kategória:katerógianév.)\nA [[Special:Watchlist|figyelőlistádon]] szereplő lapok '''félkövérrel''' vannak jelölve.",
+	"recentchangeslinked-summary": "Alább azon lapoknak a legutóbbi változtatásai láthatóak, amelyekre hivatkozik egy megadott lap. (Ha egy kategória tagjaira vagy kíváncsi, írd be, hogy {{ns:category}}:katerógianév.)\nA [[Special:Watchlist|figyelőlistádon]] szereplő lapok <strong>félkövérrel</strong> vannak jelölve.",
 	"recentchangeslinked-page": "Lap neve:",
 	"recentchangeslinked-to": "Inkább az erre linkelő lapok változtatásait mutasd",
 	"recentchanges-page-added-to-category": "[[:$1]] hozzáadva a kategóriához",
@@ -4021,5 +4021,6 @@
 	"undelete-cantcreate": "Nem állíthatod helyre ezt a lapot, mert nem létezik ilyen című lap, és nincs jogosultságod létrehozni azt.",
 	"pagedata-title": "Az oldal adatai",
 	"pagedata-not-acceptable": "Nem található megfelelő formátum. Támogatott MIME-típusok: $1",
-	"pagedata-bad-title": "Érvénytelen cím: $1."
+	"pagedata-bad-title": "Érvénytelen cím: $1.",
+	"unregistered-user-config": "Biztonsági okokból JavaScript, CSS és JSON szerkesztői alapok nem töltődnek be regisztrálatlan felhasználóknak."
 }
diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json
index 3efb8cac29..0c78329f5d 100644
--- a/languages/i18n/ia.json
+++ b/languages/i18n/ia.json
@@ -54,7 +54,7 @@
 	"tog-watchlisthideminor": "Celar modificationes minor in le observatorio",
 	"tog-watchlisthideliu": "Celar modificationes de usatores registrate in le observatorio",
 	"tog-watchlistreloadautomatically": "Recargar automaticamente le observatorio quando un filtro es cambiate (JavaScript requirite)",
-	"tog-watchlistunwatchlinks": "Adjunger ligamines directe pro disobservar/observar al entratas del observatorio (JavaScript es necessari pro le functionalitate de alternar)",
+	"tog-watchlistunwatchlinks": "Adjunger marcatores directe pro disobservar/observar ({{int:Watchlist-unwatch}}/{{int:Watchlist-unwatch-undo}}) al paginas sub observation que ha cambiate (JavaScript es necessari pro le functionalitate de alternar)",
 	"tog-watchlisthideanons": "Celar modificationes de usatores anonyme in le observatorio",
 	"tog-watchlisthidepatrolled": "Celar le modificationes patruliate in le observatorio",
 	"tog-watchlisthidecategorization": "Celar le categorisation de paginas",
@@ -362,8 +362,10 @@
 	"cascadeprotected": "Iste pagina ha essite protegite contra modificationes perque illo es transcludite in le sequente {{PLURAL:$1|pagina, le qual|paginas, le quales}} es protegite usante le option \"cascada\":\n$2",
 	"namespaceprotected": "Tu non ha le permission de modificar paginas in le spatio de nomines '''$1'''.",
 	"customcssprotected": "Tu non ha le permission de modificar iste pagina de CSS perque illo contine le configuration personal de un altere usator.",
+	"customjsonprotected": "Tu non ha le permission de modificar iste pagina JSON perque illo contine le configuration personal de un altere usator.",
 	"customjsprotected": "Tu non ha le permission de modificar iste pagina de JavaScript perque illo contine le configuration personal de un altere usator.",
 	"mycustomcssprotected": "Tu non ha le permission de modificar iste pagina de CSS.",
+	"mycustomjsonprotected": "Tu non ha le permission de modificar iste pagina JSON.",
 	"mycustomjsprotected": "Tu non ha le permission de modificar iste pagina de JavaScript.",
 	"myprivateinfoprotected": "Tu non ha le permission de modificar le proprie information private.",
 	"mypreferencesprotected": "Tu non ha le permission de modificar le proprie preferentias.",
@@ -458,12 +460,12 @@
 	"wrongpasswordempty": "Tu non entrava un contrasigno. Per favor reprova.",
 	"passwordtooshort": "Le contrasignos debe continer al minus {{PLURAL:$1|1 character|$1 characteres}}.",
 	"passwordtoolong": "Le contrasignos non pote esser plus longe de {{PLURAL:$1|1 character|$1 characteres}}.",
-	"passwordtoopopular": "Contrasignos habitual non pote esser usate. Per favor, elige un contrasigno plus unic.",
+	"passwordtoopopular": "Contrasignos habitual non pote esser usate. Per favor, elige un contrasigno plus difficile a divinar.",
 	"password-name-match": "Tu contrasigno debe esser differente de tu nomine de usator.",
 	"password-login-forbidden": "Le uso de iste nomine de usator e contrasigno ha essite prohibite.",
 	"mailmypassword": "Reinitialisar contrasigno",
 	"passwordremindertitle": "Nove contrasigno temporari pro {{SITENAME}}",
-	"passwordremindertext": "Alcuno (probabilemente tu, ab le adresse IP $1) requestava un nove\ncontrasigno pro {{SITENAME}} ($4).\nUn contrasigno temporari pro le usator \"$2\" ha essite create; iste\ncontrasigno es \"$3\". Si isto esseva le intention, tu debe ora\naperir un session e eliger un nove contrasigno. Le contrasigno temporari\nexpirara post {{PLURAL:$5|un die|$5 dies}}.\n\nSi un altere persona ha facite iste requesta, o si tu te ha rememorate\nle contrasigno e non plus vole cambiar lo, tu pote ignorar iste message\ne continuar a usar le contrasigno original.",
+	"passwordremindertext": "Alcuno (ab le adresse IP $1) requestava un nove\ncontrasigno pro {{SITENAME}} ($4).\nUn contrasigno temporari pro le usator \"$2\" ha essite create; iste\ncontrasigno es \"$3\". Si isto esseva le intention, tu debe ora\naperir un session e eliger un nove contrasigno. Le contrasigno temporari\nexpirara post {{PLURAL:$5|un die|$5 dies}}.\n\nSi un altere persona ha facite iste requesta, o si tu te ha rememorate\nle contrasigno e non plus vole cambiar lo, tu pote ignorar iste message\ne continuar a usar le contrasigno original.",
 	"noemail": "Il non ha un adresse de e-mail registrate pro le usator \"$1\".",
 	"noemailcreate": "Es necessari fornir un adresse de e-mail valide",
 	"passwordsent": "Un nove contrasigno ha essite inviate al adresse de e-mail registrate pro \"$1\".\nPer favor aperi session de novo post reciper lo.",
@@ -514,6 +516,7 @@
 	"botpasswords-existing": "Contrasignos de robot existente",
 	"botpasswords-createnew": "Crear un nove contrasigno de robot",
 	"botpasswords-editexisting": "Modificar un contrasigno de robot existente",
+	"botpasswords-label-needsreset": "(contrasigno debe esser reinitialisate)",
 	"botpasswords-label-appid": "Nomine del robot:",
 	"botpasswords-label-create": "Crear",
 	"botpasswords-label-update": "Actualisar",
@@ -537,6 +540,7 @@
 	"botpasswords-restriction-failed": "Session impedite per restrictiones de contrasigno de robot.",
 	"botpasswords-invalid-name": "Iste nomine de usator non contine le separator pro contrasigno de robot (\"$1\").",
 	"botpasswords-not-exist": "Le usator \"$1\" non ha un contrasigno de robot del nomine \"$2\".",
+	"botpasswords-needs-reset": "Le contrasigno pro le robot \"$2\" del {{GENDER:$1|usator}} \"$1\" debe esser reinitialisate.",
 	"resetpass_forbidden": "Le contrasignos non pote esser cambiate",
 	"resetpass_forbidden-reason": "Le contrasignos non pote esser cambiate: $1",
 	"resetpass-no-info": "Tu debe aperir un session pro poter acceder directemente a iste pagina.",
@@ -614,6 +618,10 @@
 	"savechanges": "Salveguardar modificationes",
 	"publishpage": "Publicar pagina",
 	"publishchanges": "Publicar modificationes",
+	"savearticle-start": "Salveguardar pagina…",
+	"savechanges-start": "Salveguardar modificationes…",
+	"publishpage-start": "Publicar pagina…",
+	"publishchanges-start": "Publicar modificationes…",
 	"preview": "Previsualisation",
 	"showpreview": "Monstrar previsualisation",
 	"showdiff": "Detaliar modificationes",
@@ -628,8 +636,8 @@
 	"subject-preview": "Previsualisation del subjecto:",
 	"previewerrortext": "Un error ha occurrite durante le tentativa de previsualisar le cambiamentos.",
 	"blockedtitle": "Le usator es blocate",
-	"blockedtext": "'''Tu nomine de usator o adresse IP ha essite blocate.'''\n\nLe blocada esseva facite per $1.\nLe motivo presentate es ''$2''.\n\n* Initio del blocada: $8\n* Expiration del blocada: $6\n* Le blocato intendite: $7\n\nTu pote contactar $1 o un altere [[{{MediaWiki:Grouppage-sysop}}|administrator]] pro discuter le blocada.\nTu non pote usar le function 'inviar e-mail a iste usator' salvo que un adresse de e-mail valide es specificate in le\n[[Special:Preferences|preferentias de tu conto]] e que tu non ha essite blocate de usar lo.\nTu adresse IP actual es $3, e le ID del blocada es #$5.\nPer favor include tote le detalios supra specificate in omne correspondentia.",
-	"autoblockedtext": "Tu adresse de IP ha essite automaticamente blocate proque un altere usator lo usava qui esseva blocate per $1.\nLe motivo presentate es:\n\n:''$2''\n\n* Initio del blocada: $8\n* Expiration del blocada: $6\n* Blocato intendite: $7\n\nTu pote contactar $1 o un del altere [[{{MediaWiki:Grouppage-sysop}}|administratores]] pro discuter le blocada.\n\nNota que tu non pote utilisar le function \"inviar e-mail a iste usator\" salvo que tu ha registrate un adresse de e-mail valide in tu [[Special:Preferences|preferentias de usator]] e que tu non ha essite blocate de usar lo.\n\nTu adresse IP actual es $3, e le ID del blocada es #$5.\nPer favor include tote le detalios supra specificate in omne correspondentia.",
+	"blockedtext": "<strong>Tu nomine de usator o adresse IP ha essite blocate.</strong>\n\nLe blocada esseva facite per $1.\nLe motivo presentate es <em>$2</em>.\n\n* Initio del blocada: $8\n* Expiration del blocada: $6\n* Le blocato intendite: $7\n\nTu pote contactar $1 o un altere [[{{MediaWiki:Grouppage-sysop}}|administrator]] pro discuter le blocada.\nTu pote solmente usar le function \"{{int:emailuser}}\" si un adresse de e-mail valide es specificate in le\n[[Special:Preferences|preferentias de tu conto]] e tu non ha essite blocate de usar lo.\nTu adresse IP actual es $3, e le ID del blocada es #$5.\nPer favor include tote le detalios supra specificate in omne correspondentia.",
+	"autoblockedtext": "Tu adresse IP ha essite automaticamente blocate perque un altere usator lo usava qui esseva blocate per $1.\nLe motivo presentate es:\n\n:<em>$2</em>\n\n* Initio del blocada: $8\n* Expiration del blocada: $6\n* Blocato intendite: $7\n\nTu pote contactar $1 o un del altere [[{{MediaWiki:Grouppage-sysop}}|administratores]] pro discuter le blocada.\n\nNota que tu pote solmente utilisar le function \"{{int:emailuser}}\" si tu ha registrate un adresse de e-mail valide in tu [[Special:Preferences|preferentias de usator]] e tu non ha essite blocate de usar lo.\n\nTu adresse IP actual es $3, e le ID del blocada es #$5.\nPer favor include tote le detalios supra specificate in omne correspondentia.",
 	"systemblockedtext": "Tu nomine de usator o adresse IP ha essite blocate automaticamente per MediaWiki.\nLe motivo presentate es:\n\n:<em>$2</em>\n\n* Initio del blocada: $8\n* Expiration del blocada: $6\n* Blocato intendite: $7\n\nTu adresse IP actual es $3.\nPer favor, include tote le detalios enumerate hic supra in omne questiones que tu pone.",
 	"blockednoreason": "nulle motivo specificate",
 	"whitelistedittext": "Tu debe $1 pro poter modificar paginas.",
@@ -652,12 +660,15 @@
 	"blocked-notice-logextract": "Iste usator es actualmente blocate.\nLe ultime entrata del registro de blocadas es reproducite ci infra pro information:",
 	"clearyourcache": "<strong>Nota:</strong> Post confirmar, il pote esser necessari refrescar le <em>cache</em> de tu navigator pro vider le cambiamentos.\n* <strong>Firefox / Safari:</strong> Tenente <em>Shift</em> clicca <em>Reload (Recargar)</em>, o preme <em>Ctrl-F5</em> o <em>Ctrl-R</em> (<em>⌘-R</em> sur Mac)\n* <strong>Google Chrome:</strong> Preme <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> sur Mac)\n* <strong>Internet Explorer:</strong> Tenente <em>Ctrl</em> clicca <em>Refresh (Refrescar)</em>, o preme <em>Ctrl-F5</em> \n* <strong>Opera:</strong> Vade a <em>Menu → Configurationes</em> (<em>Opera → Preferentias</em> sur un Mac) e alora a <em>Privacy & securitate → Rader datos de navigation → Files e imagines in cache</em>.",
 	"usercssyoucanpreview": "'''Consilio:''' Usa le button \"{{int:showpreview}}\" pro testar tu nove CSS ante de salveguardar lo.",
+	"userjsonyoucanpreview": "<strong>Consilio:</strong> Usa le button \"{{int:showpreview}}\" pro testar tu nove JSON ante de salveguardar lo.",
 	"userjsyoucanpreview": "'''Consilio:''' Usa le button \"{{int:showpreview}}\" pro testar tu nove JavaScript ante de salveguardar lo.",
 	"usercsspreview": "'''Non oblida que isto es solmente un previsualisation de tu CSS personalisate.'''\n'''Le modificationes non ha ancora essite salveguardate!'''",
+	"userjsonpreview": "<strong>Non oblida que isto es solmente un test/previsualisation de tu configuration JSON personal.\nIllo non ha ancora essite salveguardate!</strong>",
 	"userjspreview": "'''Non oblida que isto es solmente un test/previsualisation de tu JavaScript personalisate.'''\n'''Illo non ha ancora essite salveguardate!'''",
 	"sitecsspreview": "'''Non oblida que isto es solmente un previsualisation de iste CSS.'''\n'''Le modificationes non ha ancora essite salveguardate!'''",
+	"sitejsonpreview": "<strong>Non oblida que isto es solmente un previsualisation de iste configuration JSON.\nIllo non ha ancora essite salveguardate!</strong>",
 	"sitejspreview": "'''Non oblida que isto es solmente un previsualisation de iste codice JavaScript.'''\n'''Le modificationes non ha ancora essite salveguardate!'''",
-	"userinvalidconfigtitle": "'''Attention:''' Le apparentia \"$1\" non existe.\nMemora que le paginas .css and .js personalisate usa un titulo in minusculas, p.ex. {{ns:user}}:Foo/vector.css e non {{ns:user}}:Foo/Vector.css.",
+	"userinvalidconfigtitle": "<strong>Attention:</strong> Le apparentia \"$1\" non existe.\nMemora que le paginas .css, .json e .js personalisate usa un titulo in minusculas, p.ex. {{ns:user}}:Foo/vector.css e non {{ns:user}}:Foo/Vector.css.",
 	"updated": "(Actualisate)",
 	"note": "'''Nota:'''",
 	"previewnote": "'''Isto es solmente un previsualisation.'''\nLe modificationes non ha ancora essite publicate!",
@@ -684,7 +695,7 @@
 	"longpageerror": "'''Error: Le texto que tu submitteva occupa {{PLURAL:$1|un kilobyte|$1 kilobytes}}, excedente le maximo de {{PLURAL:$2|un kilobyte|$2 kilobytes}}.'''\nIllo non pote esser salveguardate.",
 	"readonlywarning": "<strong>Attention: Le base de datos ha essite blocate pro mantenentia. Tu non pote salveguardar tu modificationes in iste momento.</strong>\nNos recommenda copiar e collar le texto in un file e salveguardar lo pro plus tarde.\n\nLe administrator de systema qui ha blocate le base de datos ha fornite iste explication: $1",
 	"protectedpagewarning": "'''Attention:  Iste pagina ha essite protegite de sorta que solmente usatores con privilegios de administrator pote modificar lo.''' Le ultime entrata del registro es fornite hic infra pro referentia:",
-	"semiprotectedpagewarning": "'''Nota:''' Iste pagina ha essite protegite de maniera que solmente usatores registrate pote modificar lo. Le ultime entrata del registro es fornite hic infra pro referentia:",
+	"semiprotectedpagewarning": "<strong>Nota:</strong> Iste pagina ha essite protegite de maniera que solmente usatores autoconfirmate pote modificar lo. Le ultime entrata del registro es fornite hic infra pro referentia:",
 	"cascadeprotectedwarning": "<strong>Attention:</strong> Iste pagina ha essite protegite de maniera que solmente usatores con [[Special:ListGroupRights|certe privilegios]] pote modificar lo, perque illo es transcludite in le sequente {{PLURAL:$1|pagina|paginas}} protegite in cascada:",
 	"titleprotectedwarning": "'''Attention:  Iste pagina ha essite protegite de maniera que [[Special:ListGroupRights|permissiones specific]] es requirite pro crear lo.''' Le ultime entrata del registro es fornite hic infra pro referentia:",
 	"templatesused": "{{PLURAL:$1|Patrono|Patronos}} usate in iste pagina:",
@@ -713,6 +724,7 @@
 	"postedit-confirmation-created": "Le pagina ha essite create.",
 	"postedit-confirmation-restored": "Le pagina ha essite restaurate.",
 	"postedit-confirmation-saved": "Tu modification ha essite salveguardate.",
+	"postedit-confirmation-published": "Tu modification ha essite publicate.",
 	"edit-already-exists": "Non poteva crear un nove pagina.\nIllo existe ja.",
 	"defaultmessagetext": "Texto predefinite del message",
 	"content-failed-to-parse": "Impossibile processar le contento $2 pro le modello $1: $3",
diff --git a/languages/i18n/ig.json b/languages/i18n/ig.json
index d652bd1d6b..2a1d6320c2 100644
--- a/languages/i18n/ig.json
+++ b/languages/i18n/ig.json
@@ -153,7 +153,7 @@
 	"history": "Ịta ihüá",
 	"history_short": "Ịta",
 	"updatedmarker": "ihe gáráníru ké mgbe m byàrà nga mbu",
-	"printableversion": "Ùdì ǹke mbifụ̀",
+	"printableversion": "Ùdì ǹke mbipụ̀",
 	"permalink": "Jikodo ekechịrị",
 	"print": "Dotié",
 	"view": "Lèzí",
@@ -300,8 +300,10 @@
 	"logout": "Fwuör",
 	"userlogout": "Fwuör",
 	"notloggedin": "I bátà bò",
+	"userlogin-joinproject": "Bàkọ {{SITENAME}}",
 	"createaccount": "Ké otụ buwa",
 	"createaccountmail": "na e-mail",
+	"createacct-benefit-heading": "{{SITENAME}} sì nà aka ndị dị kà gị.",
 	"createacct-benefit-body1": "{{PLURAL:$1|ḿmezi}}",
 	"badretype": "Mkpurụ okwu ejị a gafẹ é jëghị.",
 	"userexists": "Áhè ọ'bànifé tírí di na áká onye ozor.\nBíkó nwèré áhà nke ozor.",
@@ -1055,6 +1057,7 @@
 	"pageinfo-header-edits": "Mèzí ịta",
 	"pageinfo-length": "Ogologo ihü (na baitusu)",
 	"pageinfo-article-id": "ID Ihü",
+	"pageinfo-toolboxlink": "Nkàta ihu",
 	"pageinfo-redirectsto-info": "ọ́márí",
 	"pageinfo-contentpage-yes": "Eeh",
 	"pageinfo-protect-cascading-yes": "Eeh",
@@ -1242,7 +1245,7 @@
 	"special-characters-group-latin": "Latin",
 	"special-characters-group-latinextended": "Latin dọsàrà",
 	"special-characters-group-ipa": "IPA",
-	"special-characters-group-symbols": "Nkárí",
+	"special-characters-group-symbols": "Akàrà",
 	"special-characters-group-greek": "Greek",
 	"special-characters-group-cyrillic": "Cyrillic",
 	"special-characters-group-arabic": "Arabiki",
diff --git a/languages/i18n/inh.json b/languages/i18n/inh.json
index 80cf726cb6..126ac40635 100644
--- a/languages/i18n/inh.json
+++ b/languages/i18n/inh.json
@@ -154,7 +154,7 @@
 	"and": "&#32;а",
 	"faq": "Каст-кастта телаш дола хаттараш",
 	"actions": "Ардамаш",
-	"namespaces": "ЦIерий аренаш",
+	"namespaces": "ЦIерий моттигаш",
 	"variants": "Эршаш",
 	"navigation-heading": "Навигацен меню",
 	"errorpagetitle": "ГӀалат",
@@ -284,14 +284,14 @@
 	"missingarticle-diff": "(башхало: $1, $2)",
 	"internalerror": "Чура гӀалат",
 	"internalerror_info": "Чура гӀалат: $1",
-	"cannotdelete-title": "Мегаш яц дIаяккха оагIув \"$1\"",
+	"cannotdelete-title": "ДIаяккха йиш яц «$1» яха оагIув",
 	"badtitle": "Мегаш йоаца цӀи",
 	"badtitletext": "Езаш йола оагӀон цӀи нийса яц, яьсса я, е харцахь йоалаяй меттий юкъера цIи е интервики цӀи. Иштта, цӀера юкъе оттаде мегаш доаца хьаракаш нийсаденна хила мегаш да.",
 	"viewsource": "Хьажар",
-	"viewsource-title": "Оагӏон $1 духхьара текстага хьажар",
-	"actionthrottled": "Сухалах доазув дар",
-	"protectedpagetext": "Ер оагIув лораяь я цу тIа хувцамаш е кхы дола ардамаш дергдоацаш.",
-	"viewsourcetext": "Укх оагIон доладалара (чура) текста бIаргатоха а кеп яьккха а йиш я хьа.",
+	"viewsource-title": "$1 яхача оагӏон чухьнахьарча текстага хьажар",
+	"actionthrottled": "Сухала доазув дар",
+	"protectedpagetext": "Ер оагIув лораяь я цу тIа хувцамаш дергдоацаш.",
+	"viewsourcetext": "Укх оагIон чухьнахьарча текстах бIаргатоха а, цунах кеп яьккха а, йиш я хьа.",
 	"virus-unknownscanner": "йовзанза антивирус:",
 	"welcomeuser": "Маьрша воагIалва, доакъашхо $1!",
 	"yourname": "Дагара йоазон цIи:",
@@ -396,11 +396,11 @@
 	"userpage-userdoesnotexist-view": "«$1» яха дагара йоазув долаш дац.",
 	"clearyourcache": "<strong>Теркал де.</strong> Хетаргахьа, оагIув дIаязъяь яьлча шоай браузера кэш IоцIанъе езаргья шун, даь хувцамаш гургдолаш.\n* <strong>Firefox / Safari:</strong> <em>Shift</em> яха лак тоIояь лоаттаеш инструментий цхьа дакъа тIа тоIае <em>Обновить</em> е <em>Ctrl-F5</em> тоIае е <em>Ctrl-R</em> (<em>⌘-R</em> Mac тIа)\n* <strong>Google Chrome:</strong> ТоIае <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> Mac тIа)\n* <strong>Internet Explorer:</strong> <em>Ctrl</em> яха лак тоIояь лоаттаеш, тоIае <em>Обновить</em> е <em>Ctrl-F5</em> тоIае\n* <strong>Opera:</strong> ДехьагIо <em>Menu → Настройки</em> (<em>Opera → Настройки</em> Mac тIа), тIаккха <em>Безопасность → Очистить историю посещений → Кэшированные изображения и файлы</em>",
 	"note": "'''Белгалдоахар:'''",
-	"previewnote": "'''Теркам бе, ер хьалххе бIаргтохар мара бац.'''\nХьа хувцамаш хIанза а дIаяздаь дац!",
-	"continue-editing": "Хувцар кхы дIахо де",
+	"previewnote": "'''Теркам бе! Ер хьалххе бIаргтохар мара бац.'''\nХьа хувцамаш хIанзехьа кхы а дIаяздаь дац!",
+	"continue-editing": "Хувцам бергболаш дIахо дехьавáла",
 	"editing": "Хувцам: $1",
-	"creating": "«$1» оагIув хьакхоллар",
-	"editingsection": "Хувцам: $1 (оагӀон дáкъа)",
+	"creating": "«$1» яха оагIув хьакхоллар",
+	"editingsection": "Хувцар: $1 (оагӀон дáкъа)",
 	"editingcomment": "Хувцам: $1 (оагӀон керда дáкъа)",
 	"editconflict": "Хувцама вIашдухьалъоттам: $1",
 	"yourtext": "Хьа текст",
@@ -460,7 +460,7 @@
 	"mergehistory-reason": "Бахьан:",
 	"mergelog": "ВIашагIтеха хиннарий тептар",
 	"revertmerge": "Дéкъа",
-	"history-title": "\"$1\" — хувцамай истори",
+	"history-title": "«$1» яхача оагIон хувцамаш",
 	"difference-title": "$1 — эршашта юкъе йола башхало",
 	"lineno": "МугI $1:",
 	"compareselectedversions": "ВIаши йиста хержа версеш",
@@ -510,6 +510,7 @@
 	"mypreferences": "Оттамаш",
 	"prefs-skin": "ТIера кийчдара тема",
 	"skin-preview": "Хьалххе бIаргтохар",
+	"prefs-user-pages": "Доакъашхочун оагIонаш",
 	"prefs-personal": "Доакъашхочун дараш",
 	"prefs-rc": "Керда нийсдараш",
 	"prefs-watchlist": "Зéма хьаязъяьр",
@@ -532,7 +533,7 @@
 	"timezoneregion-indian": "ХIиндий океан",
 	"timezoneregion-pacific": "Тийна океан",
 	"prefs-searchoptions": "Лахар",
-	"prefs-namespaces": "ЦIерий аренаш",
+	"prefs-namespaces": "ЦIерий моттигаш",
 	"prefs-files": "Файлаш",
 	"youremail": "Электронни почта:",
 	"username": "{{GENDER:$1|Доакъашхочун цӀи}}:",
@@ -711,11 +712,11 @@
 	"allpages-hide-redirects": "ДIакъайладаха дӀа-хьа хьожавераш",
 	"categories": "ОагӀаташ",
 	"linksearch": "Арахьара тIахьожаяргаш лахар",
-	"linksearch-ns": "ЦIерий аренаш:",
+	"linksearch-ns": "ЦIерий моттигаш:",
 	"linksearch-ok": "Хьалаха",
 	"linksearch-line": "$1 яхача оагIонна тIатовжам $2 чура",
 	"listgrouprights-members": "(доакъашхой хьаязъяьр)",
-	"listgrouprights-namespaceprotection-namespace": "ЦIерий аре",
+	"listgrouprights-namespaceprotection-namespace": "ЦIерий моттиг",
 	"emailuser": "Доакъашхочоа каьхат",
 	"usermessage-editor": "Системан дIакхоачадар",
 	"watchlist": "Зем бара хьаязъяьр",
@@ -773,7 +774,7 @@
 	"undeletelink": "бIаргтоха/юхадаккха",
 	"undeleteviewlink": "хьажа",
 	"undelete-search-submit": "Хьалáха",
-	"namespace": "ЦIерий аренаш:",
+	"namespace": "ЦIерий моттигаш:",
 	"invert": "Хержар юхадаккха",
 	"tooltip-invert": "Оттае ер белгало, хержа цIерий аре чу а (белгалъяь яле вIашагIъювзаенна цIерий аре чу а), оагIонаш тIа а даь хувцамаш къайладоахаргдолаш",
 	"namespace_association": "Ювзаенна аре",
diff --git a/languages/i18n/io.json b/languages/i18n/io.json
index 8032223eea..eb097e6c2c 100644
--- a/languages/i18n/io.json
+++ b/languages/i18n/io.json
@@ -696,6 +696,7 @@
 	"rev-deleted-user-contribs": "[Uzero od IP-adreso eliminita - la redakto celesis de la kontributaji]",
 	"rev-delundel": "montrar/celar",
 	"rev-showdeleted": "montrar",
+	"revisiondelete": "Efacar/Restaurar revizi",
 	"revdelete-show-file-submit": "Yes",
 	"revdelete-hide-image": "Celar kontenajo dil arkivo",
 	"revdelete-hide-comment": "Rezumo di redakto",
@@ -873,6 +874,7 @@
 	"right-upload": "Adkargar arkivi",
 	"right-writeapi": "Uzez API por skribar",
 	"right-delete": "Efacar pagini",
+	"right-deleterevision": "Efacar e restaurar specifika revizi de la pagini",
 	"right-browsearchive": "Serchar pagini efacita",
 	"right-suppressrevision": "Vidar, celar e deskovrar specifika revizi di pagini de irga uzero",
 	"right-blockemail": "Blokusar uzero pri sendar e-posto",
@@ -1231,6 +1233,7 @@
 	"deleteotherreason": "Altra/suplementala motivo:",
 	"deletereasonotherlist": "Altra motivo",
 	"deletereason-dropdown": "*Ordinara motivi por efacado\n** \"Spam\" nedezirata mesaji\n** Vandalismo\n** Kopiyuro Violaco\n** Demandita da autoro\n** Nefuncionanta ligilo",
+	"deleting-backlinks-warning": "<strong>Atencez:</strong> [[Special:WhatLinksHere/{{FULLPAGENAME}}|Altra pagini]] ligesas ad or inkluzas la pagino quon vu deziras efacar.",
 	"rollback": "Retrorulez redakti",
 	"rollbacklink": "retrorulez",
 	"rollbacklinkcount": "nuligar $1 {{PLURAL:$1|modifiko|modifiki}}",
@@ -1276,13 +1279,20 @@
 	"restriction-upload": "Adkargar",
 	"undelete": "Vidar efacita pagini",
 	"undeletepage": "Vidar e restaurar efacita pagini",
+	"undeletepagetitle": "<strong>Yen la efacita versioni di la pagino [[:$1|$1]]</strong>.",
+	"viewdeletedpage": "Vidar pagini efacita",
 	"undeletepagetext": "La sequanta {{PLURAL:$1|pagino|pagini}} efacesis ma {{PLURAL:$1|ol|li}} ankore esas en la arkivo ed esas restaurebla. La arkivo povas netigesar periodale.",
+	"undelete-fieldset-title": "Restaurar revizi",
+	"undeleteextrahelp": "Por restaurar omna historio de la pagino, desselektez omna buxi e kliktez <strong><em>{{int:undeletebtn}}</em></strong>.\nPor selektar quala modifiki restauresos, markizez la buxi korespondanta a la revizi por restaurar, e kliktez <strong><em>{{int:undeletebtn}}</em></strong>.",
 	"undeleterevisions": "$1 {{PLURAL:$1|revizo|revizi}} efacita",
 	"undeletehistory": "Se vu restauros la pagino, omna antea revizi restauresos en la korespondanta historiala pagino.\nSe nova pagino kun la sama titulo kreesis pos l'efaco, la restaurita revizuri aparos en lua historiala pagino.",
+	"undeleterevdel": "La restauro ne facesos se to produktos partala o totala efaco de la maxim recenta revizo.\nCa kazi, vu mustas desselektar o trovar la maxim recenta versiono efacita.",
+	"undeletehistorynoadmin": "Ica pagino efacesis.\nLa motivo por l'efaco montresas en la rezumo adinfre, kune la detaligo dil uzeri qui redaktis la pagino ante lua efaco.\nLa kompleta texto di ca revizi efacita esas videbla nur por l'administreri.",
 	"undeleterevision-missing": "Nevalida o mankanta revizo.\nSive vu skribis la ligilo nekorekte, sive la revizo restauresis o removesis del arkivo.",
 	"undeletebtn": "Restaurar",
 	"undeletelink": "vidar/restaurar",
 	"undeleteviewlink": "videz",
+	"undeleteinvert": "Inversigar selektajo",
 	"undeletecomment": "Motivo:",
 	"undeletedpage": "<strong>$1 restauresis</strong>\n\nVidez la [[Special:Log/delete|'log' pri efaci]] por vidar omna recenta efaci e restauri.",
 	"undelete-search-box": "Serchez efacita pagini",
@@ -1678,6 +1688,7 @@
 	"tags-hitcount": "$1 {{PLURAL:$1|chanjo|chanji}}",
 	"tags-create-explanation": "Segun predefino, la nova etiketi kreita divenos disponebla por uzado, sive da uzeri, sive da informatikoprogrami 'bot'.",
 	"tags-create-warnings-above": "La sequanta {{PLURAL:$2|avizo|avizi}} renkontresis, probante kreir l'etiketo \"$1\":",
+	"tags-delete-not-found": "L'etiketo \"$1\" ne existas.",
 	"tags-delete-too-many-uses": "L'etiketo \"$1\" uzesas en plua kam $2 {{PLURAL:$2|revizo|revizi}}, do ol ne povas eskartesar.",
 	"tags-delete-warnings-after-delete": "L'etiketo \"$1\" efacesis, ma la sequanta {{PLURAL:$2|avizo|avizi}} renkontresis:",
 	"tags-activate-not-found": "L'etiketo \"$1\" ne existas.",
@@ -1701,6 +1712,7 @@
 	"logentry-protect-modify-cascade": "$1 {{GENDER:$2|modifikis}} la nivelo di protekto di $3 $4 [kaskade]",
 	"logentry-upload-upload": "$1 {{GENDER:$2|uploaded}} $3",
 	"logentry-upload-overwrite": "$1 {{GENDER:$2|parsendis}} nova versiono di $3",
+	"log-name-tag": "Protokolo di etiketi",
 	"rightsnone": "(nula)",
 	"searchsuggest-search": "Serchez en {{SITENAME}}",
 	"searchsuggest-containing": "quan kontenas...",
diff --git a/languages/i18n/is.json b/languages/i18n/is.json
index eab988bbc1..d39a413ff3 100644
--- a/languages/i18n/is.json
+++ b/languages/i18n/is.json
@@ -1199,7 +1199,7 @@
 	"grant-viewrestrictedlogs": "Skoða lokaðar skráningar",
 	"newuserlogpage": "Skrá yfir nýja notendur",
 	"newuserlogpagetext": "Þetta er skrá yfir nýskráða notendur.",
-	"rightslog": "Réttindaskrá notenda",
+	"rightslog": "Réttindaskrá notanda",
 	"rightslogtext": "Þetta er skrá yfir breytingar á réttindum notenda.",
 	"action-read": "lesa þessa síðu",
 	"action-edit": "breyta þessari síðu",
@@ -1966,7 +1966,7 @@
 	"emailuser-title-notarget": "Senda tölvupóst",
 	"emailpagetext": "Hafi notandinn tilgreint netfang í stillingunum sínum er hægt að senda póst til {{GENDER:$1|hans|hennar|hans}} hér.\nPóstfangið sem þú tilgreindir í [[Special:Preferences|stillingunum þínum]] birtist í \"Frá:\" hluta tölvupóstsins, svo að viðtakandi hans geti svarað beint til þín.",
 	"defemailsubject": "{{SITENAME}} skilaboð frá notandanum \"$1\"",
-	"usermaildisabled": "Netfang notenda er óvirkt",
+	"usermaildisabled": "Netfang notanda er óvirkt",
 	"usermaildisabledtext": "Þú getur ekki sent tölvupóst til annara notenda á þessum wiki",
 	"noemailtitle": "Ekkert póstfang",
 	"noemailtext": "Þessi notandi hefur ekki tilgreint gilt netfang.",
@@ -2383,8 +2383,8 @@
 	"articleexists": "Annaðhvort er þegar til síða undir þessum titli, eða sá titill sem þú hefur valið er ekki gildur.\nVeldu einhvern annan titil.",
 	"cantmove-titleprotected": "Þú getur ekki fært síðu á þessa staðsetningu, því nýi titillinn hefur verið verndaður gegn sköpun",
 	"movetalk": "Færa meðfylgjandi spjallsíðu",
-	"move-subpages": "Færa undirstíður (upp að $1)",
-	"move-talk-subpages": "Færa undirstíður spjallsíðunnar (upp að $1)",
+	"move-subpages": "Færa undirsíður (upp að $1)",
+	"move-talk-subpages": "Færa undirsíður spjallsíðunnar (upp að $1)",
 	"movepage-page-exists": "Síðan $1 er nú þegar til og er ekki hægt að yfirskrifa sjálfkrafa.",
 	"movepage-page-moved": "Síðan $1 hefur verið færð á $2.",
 	"movepage-page-unmoved": "Ekki var hægt að færa síðuna $1 á $2.",
@@ -3511,7 +3511,7 @@
 	"tags-edit-reason": "Ástæða:",
 	"tags-edit-success": "Breytingarnar voru framkvæmdar.",
 	"tags-edit-nooldid-title": "Ógild markútgáfa",
-	"tags-edit-none-selected": "Vinsamlega veldu a.m.k. eitt merki til að bæta við eða fjarlægja.",
+	"tags-edit-none-selected": "Veldu a.m.k. eitt merki til að bæta við eða fjarlægja.",
 	"comparepages": "Bera saman síður",
 	"compare-page1": "Síða 1",
 	"compare-page2": "Síða 2",
diff --git a/languages/i18n/it.json b/languages/i18n/it.json
index 3f601e3bf5..4a87f08bf3 100644
--- a/languages/i18n/it.json
+++ b/languages/i18n/it.json
@@ -734,8 +734,8 @@
 	"subject-preview": "Anteprima dell'oggetto:",
 	"previewerrortext": "Si è verificato un errore durante il tentativo di mostrare l'anteprima delle tue modifiche.",
 	"blockedtitle": "Utente bloccato.",
-	"blockedtext": "'''Il tuo nome utente o indirizzo IP è stato bloccato.'''\n\nIl blocco è stato imposto da $1. La motivazione del blocco è la seguente: ''$2''\n\n* Inizio del blocco: $8\n* Scadenza del blocco: $6\n* Intervallo di blocco: $7\n\nSe lo si desidera, è possibile contattare $1 o un altro [[{{MediaWiki:Grouppage-sysop}}|amministratore]] per discutere del blocco.\n\nSi noti che la funzione 'Scrivi all'utente' non è attiva se non è stato registrato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]] o se l'utilizzo di tale funzione è stato bloccato.\n\nL'indirizzo IP attuale è $3, il numero ID del blocco è #$5.\nSi prega di specificare tutti i dettagli precedenti in qualsiasi richiesta di chiarimenti.",
-	"autoblockedtext": "Questo indirizzo IP è stato bloccato automaticamente perché condiviso con un altro utente, a sua volta bloccato da $1.\nLa motivazione del blocco è la seguente:\n\n:''$2''\n\n* Inizio del blocco: $8\n* Scadenza del blocco: $6\n* Intervallo di blocco: $7\n\nÈ possibile contattare $1 o un altro [[{{MediaWiki:Grouppage-sysop}}|amministratore]] per richiedere eventuali chiarimenti circa il blocco.\n\nSi noti che la funzione 'Scrivi all'utente' non è attiva se non è stato registrato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]] e, comunque, se nell'applicare il blocco, tale funzione è stata disabilitata (per la durata del blocco).\n\nL'indirizzo IP attuale è $3, il numero ID del blocco è #$5\nSi prega di specificare tutti i dettagli qui inclusi nel compilare qualsiasi richiesta di chiarimenti.",
+	"blockedtext": "<strong>Il tuo nome utente o indirizzo IP è stato bloccato.</strong>\n\nIl blocco è stato imposto da $1. La motivazione del blocco è la seguente: <em>$2</em>.\n\n* Inizio del blocco: $8\n* Scadenza del blocco: $6\n* Intervallo di blocco: $7\n\nSe lo si desidera, è possibile contattare $1 o un altro [[{{MediaWiki:Grouppage-sysop}}|amministratore]] per discutere del blocco.\n\nSi noti che la funzione \"{{int:emailuser}}\" non è attiva se non è stato registrato un indirizzo email valido nelle proprie [[Special:Preferences|preferenze]] o se l'utilizzo di tale funzione è stato bloccato.\n\nL'indirizzo IP attuale è $3, il numero ID del blocco è #$5.\nSi prega di specificare tutti i dettagli precedenti in qualsiasi richiesta di chiarimenti.",
+	"autoblockedtext": "Questo indirizzo IP è stato bloccato automaticamente perché condiviso con un altro utente, a sua volta bloccato da $1.\nLa motivazione del blocco è la seguente:\n\n:<em>$2</em>\n\n* Inizio del blocco: $8\n* Scadenza del blocco: $6\n* Intervallo di blocco: $7\n\nÈ possibile contattare $1 o un altro [[{{MediaWiki:Grouppage-sysop}}|amministratore]] per richiedere eventuali chiarimenti circa il blocco.\n\nSi noti che la funzione \"{{int:emailuser}}\" non è attiva se non è stato registrato un indirizzo e-mail valido nelle proprie [[Special:Preferences|preferenze]] e, comunque, se nell'applicare il blocco, tale funzione è stata disabilitata (per la durata del blocco).\n\nL'indirizzo IP attuale è $3, il numero ID del blocco è #$5\nSi prega di specificare tutti i dettagli qui inclusi nel compilare qualsiasi richiesta di chiarimenti.",
 	"systemblockedtext": "Il tuo nome utente o l'indirizzo IP è stato bloccato automaticamente da MediaWiki.\nLa motivazione del blocco è la seguente:\n\n:''$2''\n\n* Inizio del blocco: $8\n* Scadenza del blocco: $6\n* Intervallo di blocco: $7\n\nL'indirizzo IP attuale è $3.\nSi prega di specificare tutti i dettagli qui inclusi nel compilare qualsiasi richiesta di chiarimenti.",
 	"blockednoreason": "nessuna motivazione indicata",
 	"whitelistedittext": "Per modificare le pagine è necessario $1.",
@@ -4078,5 +4078,6 @@
 	"undelete-cantedit": "Non puoi ripristinare questa pagina poiché non hai sufficienti permessi per modificarla.",
 	"undelete-cantcreate": "Non puoi ripristinare questa pagina poiché la pagina con questo nome non è ancora inesistente e non hai sufficienti permessi per crearla.",
 	"pagedata-not-acceptable": "Nessun formato corrispondente trovato. Tipi MIME supportati: $1",
-	"pagedata-bad-title": "Titolo non valido: $1."
+	"pagedata-bad-title": "Titolo non valido: $1.",
+	"unregistered-user-config": "Per motivi di sicurezza, non è possibile caricare sottopagine utente JavaScript, CSS e JSON per utenti non registrati."
 }
diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json
index 3e5182e527..321c4eb692 100644
--- a/languages/i18n/ja.json
+++ b/languages/i18n/ja.json
@@ -1473,6 +1473,9 @@
 	"rcfilters-filter-reviewstatus-unpatrolled-description": "手動または自動で巡回されていない編集。",
 	"rcfilters-filter-reviewstatus-unpatrolled-label": "未巡回",
 	"rcfilters-filter-reviewstatus-manual-description": "巡回済みと手動でマークされた編集。",
+	"rcfilters-filter-reviewstatus-manual-label": "手動巡回",
+	"rcfilters-filter-reviewstatus-auto-description": "巡回済みと自動でマークされた編集。",
+	"rcfilters-filter-reviewstatus-auto-label": "自動巡回",
 	"rcfilters-filtergroup-significance": "重要度",
 	"rcfilters-filter-minor-label": "細部の編集",
 	"rcfilters-filter-minor-description": "編集者が細部の編集とマークしたもの。",
diff --git a/languages/i18n/jv.json b/languages/i18n/jv.json
index 0d85f3bfa0..f4aa034f79 100644
--- a/languages/i18n/jv.json
+++ b/languages/i18n/jv.json
@@ -17,7 +17,8 @@
 			"아라",
 			"Macofe",
 			"Matma Rex",
-			"Fitoschido"
+			"Fitoschido",
+			"Notanotheramy"
 		]
 	},
 	"tog-underline": "Garis ngisori pranala:",
@@ -575,6 +576,7 @@
 	"savechanges": "Simpen owahan",
 	"publishpage": "Babar kaca",
 	"publishchanges": "Babar owahan",
+	"publishchanges-start": "Babar owahan...",
 	"preview": "Pratuduh",
 	"showpreview": "Deleng pratuduh",
 	"showdiff": "Tuduhaké owahan",
diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json
index 1b899914f5..09164d857b 100644
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -4070,5 +4070,6 @@
 	"pagedata-title": "문서 데이터",
 	"pagedata-text": "이 문서는 문서에 대한 데이터 인터페이스를 제공합니다. 하위 문서 문법을 사용하여 URL에 문서 제목을 지정해 주십시오.\n* 클라이언트의 Accept 헤더에 기반하여 내용이 절충됩니다. 즉, 문서 데이터는 클라이언트가 선호하는 형식으로 제공됩니다.",
 	"pagedata-not-acceptable": "일치하는 형식을 찾을 수 없습니다. 지원하는 MIME 형식: $1",
-	"pagedata-bad-title": "유효하지 않은 제목: $1."
+	"pagedata-bad-title": "유효하지 않은 제목: $1.",
+	"unregistered-user-config": "보안을 이유로 자바스크립트, CSS, JSON 사용자 하위 문서들은 비등록 사용자에게는 불러올 수 없습니다."
 }
diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json
index 8bea39a651..48f92a2289 100644
--- a/languages/i18n/lb.json
+++ b/languages/i18n/lb.json
@@ -510,6 +510,7 @@
 	"botpasswords-existing": "Aktuell Botpasswierder.",
 	"botpasswords-createnew": "En neit Botpasswuert uleeën",
 	"botpasswords-editexisting": "E Botpasswuert änneren",
+	"botpasswords-label-needsreset": "(Passwuert muss zréckgesat ginn)",
 	"botpasswords-label-appid": "Numm vum Bot:",
 	"botpasswords-label-create": "Uleeën",
 	"botpasswords-label-update": "Aktualiséieren",
@@ -623,7 +624,7 @@
 	"subject-preview": "Sujet kucken ouni ze späicheren:",
 	"previewerrortext": "Beim Versuch fir Är Ännerungen ze weisen, ass e Feeler geschitt.",
 	"blockedtitle": "Benotzer ass gespaart",
-	"blockedtext": "Äre Benotzernumm oder Är IP-Adress gouf gespaart.\n\nD'Spär gouf vum $1 gemaach. Als Grond gouf ''$2'' uginn.\n\n* Ufank vun der Spär: $8\n* Enn vun der Spär: $6\n* Spär betrëfft: $7\n\nDir kënnt den/d' $1 kontaktéieren oder ee vun den aneren [[{{MediaWiki:Grouppage-sysop}}|Administrateure]] fir iwwer d'Spär ze schwätzen.\n\nDëst sollt Dir besonnesch maachen, wann Dir d'Gefill hutt, datt de Grond fir d'Spären net bei Iech läit.\nD'Ursaach dofir ass an deem Fall, datt Dir eng dynamesch IP hutt, iwwer en Access-Provider, iwwer deen och aner Leit fueren.\nAus deem Grond ass et recommandéiert, sech e Benotzernumm zouzeleeën, fir all Mëssverständnes z'evitéieren.\n\nDir kënnt d'Funktioun \"Dësem Benotzer eng E-Mail schécken\" nëmme benotzen, wann Dir eng gëlteg E-Mail Adress bei Ären [[Special:Preferences|Astellungen]] aginn hutt.\nÄr aktuell IP-Adress ass $3 an d'Nummer vun der Spär ass #$5.\nSchreift all dës Informatioune w.e.g. bei all Ufro derbäi.",
+	"blockedtext": "<strong>Äre Benotzernumm oder Är IP-Adress gouf gespaart.</strong>\n\nD'Spär gouf vum $1 gemaach.\nAls Grond gouf <em>$2</em> uginn.\n\n* Ufank vun der Spär: $8\n* Enn vun der Spär: $6\n* Spär betrëfft: $7\n\nDir kënnt den/d' $1 kontaktéieren oder ee vun den aneren [[{{MediaWiki:Grouppage-sysop}}|Administrateure]] fir iwwer d'Spär ze schwätzen.\n\nDëst sollt Dir besonnesch maachen, wann Dir d'Gefill hutt, datt de Grond fir d'Spären net bei Iech läit.\nD'Ursaach dofir ass an deem Fall, datt Dir eng dynamesch IP hutt, iwwer en Access-Provider, iwwer deen och aner Leit fueren.\nAus deem Grond ass et recommandéiert, sech e Benotzernumm zouzeleeën, fir all Mëssverständnes z'evitéieren.\n\nDir kënnt d'Funktioun \"{{int:emailuser}}\" nëmme benotzen, wann Dir eng gëlteg E-Mail Adress bei Ären [[Special:Preferences|Astellungen]] aginn hutt.\nÄr aktuell IP-Adress ass $3 an d'Nummer vun der Spär ass #$5.\nSchreift all dës Informatioune w.e.g. bei all Ufro derbäi.",
 	"autoblockedtext": "Är IP-Adress gouf automatesch gespaart, well se vun engem anere Benotzer gebraucht gouf, an dee vum $1 gespaart gouf.\nDe Grond dofir war:\n\n:''$2''\n\n* Ufank vun der Spär: $8\n* Dauer vun der Spär: $6\n* D'Spär leeft of: $7\n\nDir kënnt de(n) $1 oder soss een [[{{MediaWiki:Grouppage-sysop}}|Administrateur]] kontaktéieren, fir iwwer déi Spär ze diskutéieren.\n\nBedenkt datt Dir d'Funktioun \"Dësem Benotzer eng E-Mail schécken\" benotze kënnt wann Dir eng gëlteg E-Mail-Adress an Ären [[Special:Preferences|Astellungen]] uginn hutt a wann dat net fir Iech gespaart gouf.\n\nÄr aktuell IP-Adress ass $3 an d'Nummer vun Ärer Spär ass $5.\nGitt dës Donnéeë w.e.g bei allen Ufroen zu dëser Spär un.",
 	"blockednoreason": "Kee Grond uginn",
 	"whitelistedittext": "Dir musst Iech $1, fir Säiten änneren ze kënnen.",
@@ -1420,7 +1421,7 @@
 	"recentchangeslinked-feed": "Ännerungen op verlinkt Säiten",
 	"recentchangeslinked-toolbox": "Ännerungen op verlinkt Säiten",
 	"recentchangeslinked-title": "Ännerungen a Verbindung mat \"$1\"",
-	"recentchangeslinked-summary": "Gitt den Numm vun enger Säit a fir Ännerungen Säiten ze gesinn op déi oder vun deene gelinkt gëtt. Ännerungen op Säite vun [[Special:Watchlist|Ärer Iwwerwaachungslëscht]] si <strong>fett</strong> geschriwwen.",
+	"recentchangeslinked-summary": "Gitt den Numm vun enger Säit a fir Ännerungen op Säiten ze gesinn op déi oder vun deene gelinkt gëtt. (Fir d'Membere vun enger Kategorie ze gesinn gitt {{ns:category}}:Numm vun der Kategorie, an.) Ännerungen op Säite vun [[Special:Watchlist|Ärer Iwwerwaachungslëscht]] si <strong>fett</strong> geschriwwen.",
 	"recentchangeslinked-page": "Säitennumm:",
 	"recentchangeslinked-to": "Weis Ännerungen zu de verlinkte Säiten aplaz vun der gefroter Säit",
 	"recentchanges-page-added-to-category": "[[:$1]] an d'Kategorie dobäigesat",
diff --git a/languages/i18n/lfn.json b/languages/i18n/lfn.json
index bad0415525..4f61fd5532 100644
--- a/languages/i18n/lfn.json
+++ b/languages/i18n/lfn.json
@@ -10,7 +10,8 @@
 			"Katxis",
 			"Chabi",
 			"Angel Blaise",
-			"Fitoschido"
+			"Fitoschido",
+			"Robin van der Vliet"
 		]
 	},
 	"tog-underline": "Sulini de lias:",
@@ -232,7 +233,7 @@
 	"disclaimerpage": "Project:Renunsia jeneral",
 	"edithelp": "Aida sur edita",
 	"helppage-top-gethelp": "Aida",
-	"mainpage": "Paje Xef",
+	"mainpage": "Paje xef",
 	"mainpage-description": "Paje xef",
 	"policy-url": "Project:Politica",
 	"portal": "Porton de comunia",
@@ -618,7 +619,7 @@
 	"subject-preview": "Previde de tema:",
 	"previewerrortext": "Un era ia aveni en atenta previde tua cambias.",
 	"blockedtitle": "Usor es impedida",
-	"blockedtext": "<strong>Tua nom de usor o adirije IP es impedida.</strong>\n\nLa impedi ia es fada par $1.\nLa razona donada es ''$2''.\n\n* Comensa de impedi: $8\n* Fini de impedi: $6\n* Conta impedida: $7\n\nTu pote contata $1 o un otra [[{{MediaWiki:Grouppage-sysop}}|dirijor]] per discute esta impedi.\nTu no pote usa la funsiona \"envia un eposta a esta usor\" estra si un adirije valida\nde eposta es spesifada en tua [[Special:Preferences|preferes de conta]] e tu no es impedida de usa lo.\nTua adirije IP presente es $3, e la numero de impedi es #$5.\nInclui tota esta detalias en cualce demandas cual tu fa, per favore.",
+	"blockedtext": "<strong>Tua nom de usor o adirije IP es impedida.</strong>\n\nLa impedi ia es fada par $1.\nLa razona donada es <em>$2</em>.\n\n* Comensa de impedi: $8\n* Fini de impedi: $6\n* Conta impedida: $7\n\nTu pote contata $1 o un otra [[{{MediaWiki:Grouppage-sysop}}|dirijor]] per discute esta impedi.\nTu no pote usa la funsiona \"{{int:emailuser}}\" estra si un adirije valida\nde eposta es spesifada en tua [[Special:Preferences|preferes de conta]] e tu no es impedida de usa lo.\nTua adirije IP presente es $3, e la numero de impedi es #$5.\nInclui tota esta detalias en cualce demandas cual tu fa, per favore.",
 	"autoblockedtext": "Tua adirije IP ia es automata impedida car lo ia es usada par un otra usor, ci ia es impedida par $1.\nLa razona donada es ''$2''.\n\n* Comensa de impedi: $8\n* Fini de impedi: $6\n* Conta impedida: $7\n\nTu pote contata $1 o un otra [[{{MediaWiki:Grouppage-sysop}}|dirijor]] per discute esta impedi.\nTu no pote usa la funsiona \"envia un eposta a esta usor\" estra si un adirije valida de eposta es spesifada en tua [[Special:Preferences|preferes de conta]] e tu no es impedida de usa lo.\nTua adirije IP presente es $3, e la numero de impedi es #$5.\nInclui tota esta detalias en cualce demandas cual tu fa, per favore.",
 	"systemblockedtext": "Tua nom de usor o adirije IP ia es automata impedida par MediaWiki.\nLa razona donada es <em>$2</em>.\n\n* Comensa de impedi: $8\n* Fini de impedi: $6\n* Conta impedida: $7\nTua adirije IP presente es $3.\nInclui tota esta detalias en cualce demandas cual tu fa, per favore.",
 	"blockednoreason": "no razona donada",
@@ -1451,7 +1452,7 @@
 	"recentchangeslinked-feed": "Cambias relatada",
 	"recentchangeslinked-toolbox": "Cambias relatada",
 	"recentchangeslinked-title": "Cambias relatada a \"$1\"",
-	"recentchangeslinked-summary": "Tape un nom de paje per vide cambias en pajes liada a o de acel paje. (Per vide membros de un categoria, tape <strong>bold</strong>.) Cambias a pajes en [[Special:Watchlist|tua lista monitorida]] es <strong>spesa</strong>.",
+	"recentchangeslinked-summary": "Tape un nom de paje per vide cambias en pajes liada a o de acel paje. (Per vide membros de un categoria, tape {{ns:category}}:Nom de categoria.) Cambias a pajes en [[Special:Watchlist|tua lista monitorida]] es <strong>spesa</strong>.",
 	"recentchangeslinked-page": "Nom de paje:",
 	"recentchangeslinked-to": "Mostra cambias a pajes cual lia a la paje indicada, en loca",
 	"recentchanges-page-added-to-category": "[[:$1]] ajuntada a categoria",
@@ -1931,6 +1932,7 @@
 	"apisandbox-dynamic-error-exists": "Un parametre nomida \"$1\" esiste ja.",
 	"apisandbox-deprecated-parameters": "Parametres desaprobada",
 	"apisandbox-fetch-token": "Autopleni la marca",
+	"apisandbox-add-multi": "Ajunta",
 	"apisandbox-submit-invalid-fields-title": "Alga campos es nonvalida",
 	"apisandbox-submit-invalid-fields-message": "Coreti la campos indicada, per favore, e reatenta.",
 	"apisandbox-results": "Resultas",
@@ -3705,6 +3707,7 @@
 	"limitreport-templateargumentsize-value": "$1/$2 {{PLURAL:$2|bait|baites}}",
 	"limitreport-expansiondepth": "Profondia la plu grande de despaci",
 	"limitreport-expensivefunctioncount": "Cuantia de funsionas custosa de analisador sintatical",
+	"limitreport-unstrip-size-value": "$1/$2 {{PLURAL:$2|bait|baites}}",
 	"expandtemplates": "Despaci stensiles",
 	"expand_templates_intro": "Esta paje spesial prende vicitesto e despaci tota stensiles en lo, en modo recorsante. Lo despaci ance funsionas suportada de analisador sintatical como <code><nowiki>{{</nowiki>#language:…}}</code> e variables como <code><nowiki>{{</nowiki>CURRENTDAY}}</code>. En fato, lo despaci cuasi tota cosas entre brasetas risa duple.",
 	"expand_templates_title": "Titulo de contesto, per {{FULLPAGENAME}}, etc.:",
diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json
index 0c88fe6cd4..6f4154e79b 100644
--- a/languages/i18n/lv.json
+++ b/languages/i18n/lv.json
@@ -485,12 +485,14 @@
 	"user-mail-no-addy": "Mēģināja sūtīt e-pastu bez e-pasta adreses.",
 	"user-mail-no-body": "Mēģināja sūtīt e-pastu ar tukšu vai nepamatoti īsu pamata daļu.",
 	"changepassword": "Mainīt paroli",
+	"resetpass_announce": "Lai pabeigtu pieslēgšanos, tev ir jāuzstāda jauna parole.",
 	"resetpass_header": "Mainīt konta paroli",
 	"oldpassword": "Vecā parole",
 	"newpassword": "Jaunā parole",
 	"retypenew": "Atkārto jauno paroli",
 	"resetpass_submit": "Uzstādīt paroli un ieiet",
 	"changepassword-success": "Tava parole tika nomainīta!",
+	"changepassword-throttled": "Jūs esat veicis pārāk daudz pieslēgšanās mēģinājumus.\nLūdzu, uzgaidiet $1 pirms mēģiniet vēlreiz.",
 	"botpasswords": "Botu paroles",
 	"botpasswords-disabled": "Botu paroles ir atspējotas.",
 	"botpasswords-no-central-id": "Lai izmantotu botu paroles, tev jāpieslēdzas centralizētajam kontam.",
@@ -709,6 +711,7 @@
 	"history-feed-description": "Šīs wiki lapas versiju hronoloģija",
 	"history-feed-item-nocomment": "$1 : $2",
 	"history-feed-empty": "Pieprasītā lapa nepastāv.\nIespējams, tā ir izdzēsta vai pārdēvēta.\nMēģiniet [[Special:Search|meklēt]], lai atrastu saistītas lapas!",
+	"history-edit-tags": "Labot iezīmes izvēlētajām versijām",
 	"rev-deleted-comment": "(labojuma kopsavilkums dzēsts)",
 	"rev-deleted-user": "(lietotāja vārds nodzēsts)",
 	"rev-deleted-event": "(reģistra detaļas noņemtas)",
@@ -819,6 +822,7 @@
 	"search-category": "(kategorija $1)",
 	"search-file-match": "(atbilst faila saturam)",
 	"search-suggest": "Vai jūs domājāt: $1",
+	"search-rewritten": "Rāda rezultātus frāzei \"$1\". Meklēt pēc \"$2\".",
 	"search-interwiki-caption": "Rezultāti no citiem projektiem",
 	"search-interwiki-default": "Rezultāti no $1:",
 	"search-interwiki-more": "(vairāk)",
@@ -903,6 +907,7 @@
 	"default": "pēc noklusējuma",
 	"prefs-files": "Faili",
 	"prefs-custom-css": "Personīgais CSS",
+	"prefs-custom-json": "Pielāgots JSON",
 	"prefs-custom-js": "Personīgais JS",
 	"prefs-common-config": "Koplietojams CSS/JavaScript visās apdarēs:",
 	"prefs-emailconfirm-label": "E-pasta statuss:",
@@ -1024,8 +1029,10 @@
 	"right-editcontentmodel": "Labot lapas satura modeli",
 	"right-editinterface": "Izmainīt dalībnieka interfeisu",
 	"right-editusercss": "Izmainīt citu dalībnieku CSS failus",
+	"right-edituserjson": "Izmainīt citu dalībnieku JSON failus",
 	"right-edituserjs": "Izmainīt citu dalībnieku JS failus",
 	"right-editmyusercss": "Rediģējiet savus dalībnieka CSS failus",
+	"right-editmyuserjson": "Izmainīt savus dalībnieka JSON failus",
 	"right-editmyuserjs": "Rediģējiet savus dalībnieka JavaScript failus",
 	"right-viewmywatchlist": "Apskatīt savu uzraugāmo rakstu sarakstu",
 	"right-viewmyprivateinfo": "Skatit savus privātos datus (piemēram, e-pasta adresi, īsto vārdu)",
@@ -1273,7 +1280,7 @@
 	"recentchangeslinked-feed": "Saistītās izmaiņas",
 	"recentchangeslinked-toolbox": "Saistītās izmaiņas",
 	"recentchangeslinked-title": "Izmaiņas, kas saistītas ar \"$1\"",
-	"recentchangeslinked-summary": "Šiet ir nesen izdarītās izmaiņas lapās, uz kurām ir saites no norādītās lapas (vai norādītajā kategorijā ietilpstošās lapas).\nLapas, kas ir tavā [[Special:Watchlist|uzraugāmo rakstu sarakstā]] ir '''treknas'''.",
+	"recentchangeslinked-summary": "Ievadi lapas nosaukumu, lai redzētu izmaiņas lapās, uz kurām vai vai no kuras ir saites ar šo lapu (Lai redzētu kategorijā ietilpstošās, norādi {{ns:category}}:Kategorijas nosaukums).\nIzmaiņas lapās, kas ir tavā [[Special:Watchlist|uzraugāmo rakstu sarakstā]] ir <strong>treknrakstā</strong>.",
 	"recentchangeslinked-page": "Lapas nosaukums:",
 	"recentchangeslinked-to": "Rādīt izmaiņas lapās, kurās ir saites uz šo lapu (nevis lapās uz kurām ir saites no šīs lapas)",
 	"autochange-username": "MediaWiki automātiskā izmaiņa",
@@ -1394,6 +1401,8 @@
 	"uploadstash-errclear": "Failu tīrīšana neizdevās.",
 	"uploadstash-refresh": "Atsvaidzināt failu sarakstu",
 	"uploadstash-thumbnail": "aplūkot sīkbildi",
+	"uploadstash-bad-path": "Ceļš nepastāv.",
+	"uploadstash-bad-path-invalid": "Ceļš nav derīgs.",
 	"uploadstash-bad-path-unknown-type": "Nezināms tips \"$1\".",
 	"uploadstash-bad-path-unrecognized-thumb-name": "Neatpazīts sīktēla nosaukums.",
 	"uploadstash-file-not-found-no-thumb": "Nevarēja iegūt sīkbildi.",
@@ -1501,6 +1510,7 @@
 	"randompage": "Nejauša lapa",
 	"randomincategory": "Nejauša lapa kategorijā",
 	"randomincategory-invalidcategory": "\"$1\" nav derīgs kategorijas nosaukums.",
+	"randomincategory-nopages": "Kategorijā [[:Category:$1|$1]] nav lapu.",
 	"randomincategory-category": "Kategorija:",
 	"randomincategory-legend": "Nejauša lapa kategorijā",
 	"randomincategory-submit": "Aiziet!",
@@ -1520,7 +1530,12 @@
 	"statistics-users": "Reģistrēti dalībnieki",
 	"statistics-users-active": "Aktīvi lietotāji",
 	"statistics-users-active-desc": "Lietotāji, kas ir veikuši jebkādu darbību {{PLURAL:$1|iepriekšējās $1 dienās|iepriekšējā $1 dienā|iepriekšējās $1 dienās}}",
+	"pageswithprop": "Lapas ar lapas īpašību",
+	"pageswithprop-legend": "Lapas ar lapas īpašību",
+	"pageswithprop-text": "Šajā lapā uzskaitītas lapas ar konkrētu lapas īpašību.",
 	"pageswithprop-prop": "Īpašības nosaukums:",
+	"pageswithprop-reverse": "Kārtot apgrieztā secībā",
+	"pageswithprop-sortbyvalue": "Kārtot pēc īpašības vērības",
 	"pageswithprop-submit": "Aiziet",
 	"doubleredirects": "Divkāršas pāradresācijas lapas",
 	"doubleredirectstext": "Šajā lapā ir uzskaitītas pāradresācijas lapas, kuras pāradresē uz citām pāradresācijas lapām.\nKatrā rindiņā ir saites uz pirmo un otro pāradresācijas lapu, kā arī pirmā rindiņa no otrās pāradresācijas lapas teksta, kas parasti ir faktiskā \"gala\" lapa, uz kuru vajadzētu būt saitei pirmajā lapā.\n<del>Nosvītrotie</del> ieraksti jau ir tikuši salaboti.",
@@ -1694,6 +1709,8 @@
 	"listgrouprights-namespaceprotection-header": "Vārdtelpas ierobežojumi",
 	"listgrouprights-namespaceprotection-namespace": "Vārdtelpa",
 	"listgrants-rights": "Tiesības",
+	"trackingcategories": "Izsekošanas kategorijas",
+	"trackingcategories-msg": "Izsekošanas kategorija",
 	"trackingcategories-nodesc": "Apraksts nav pieejams.",
 	"trackingcategories-disabled": "Kategorija ir atslēgta",
 	"mailnologin": "Nav adreses, uz kuru sūtīt",
@@ -2155,6 +2172,7 @@
 	"import-interwiki-submit": "Importēt",
 	"import-mapping-namespace": "Importēt vārdtelpā:",
 	"import-upload-filename": "Faila nosaukums:",
+	"import-upload-username-prefix": "Starpviki prefikss:",
 	"import-comment": "Komentārs:",
 	"importstart": "Importē lapas...",
 	"import-revision-count": "$1 {{PLURAL:$1|versijas|versija|versijas}}",
@@ -2842,9 +2860,11 @@
 	"tags-create-already-exists": "Iezīme \"$1\" jau pastāv.",
 	"tags-delete-title": "Dzēst iezīmi",
 	"tags-delete-reason": "Iemesls:",
+	"tags-delete-not-found": "Iezīme \"$1\" nepastāv.",
 	"tags-delete-no-permission": "Tev nav atļaujas dzēst izmaiņu iezīmes.",
 	"tags-activate-title": "Aktivizēt iezīmi",
 	"tags-activate-reason": "Iemesls:",
+	"tags-activate-not-found": "Iezīme \"$1\" nepastāv.",
 	"tags-activate-submit": "Aktivizēt",
 	"tags-deactivate-title": "Deaktivizēt iezīmi",
 	"tags-deactivate-reason": "Iemesls:",
@@ -2921,6 +2941,7 @@
 	"logentry-newusers-create": "Lietotāja konts $1 tika {{GENDER:$2|izveidots}}",
 	"logentry-newusers-create2": "$1 {{GENDER:$2|izveidoja}} lietotāja kontu $3",
 	"logentry-newusers-autocreate": "Lietotaja konts $1 tika {{GENDER:$2|izveidots}} automātiski",
+	"logentry-protect-unprotect": "$1 {{GENDER:$2|noņēma}} aizsardzību no $3",
 	"logentry-protect-protect": "$1 {{GENDER:$2|aizsargāja}} $3 $4",
 	"logentry-upload-upload": "$1 {{GENDER:$2|augšupielādēja}} $3",
 	"logentry-upload-overwrite": "$1 augšupielādēja jaunu $3 versiju",
@@ -2958,7 +2979,9 @@
 	"duration-centuries": "$1 {{PLURAL:$1|gadsimti|gadsimts|gadsimti}}",
 	"duration-millennia": "$1 {{PLURAL:$1|tūkstošgades|tūkstošgade|tūkstošgades}}",
 	"limitreport-title": "Parsētāja profilēšanas dati:",
+	"limitreport-cputime": "CPU laika lietojums",
 	"limitreport-cputime-value": "$1 {{PLURAL:$1|sekundes|sekunde|sekundes}}",
+	"limitreport-walltime": "Reālā laika lietojums",
 	"limitreport-walltime-value": "$1 {{PLURAL:$1|sekundes|sekunde|sekundes}}",
 	"limitreport-postexpandincludesize-value": "$1/$2 {{PLURAL:$2|baiti|baits|baiti}}",
 	"limitreport-templateargumentsize": "Veidnes argumenta izmērs",
@@ -3006,6 +3029,7 @@
 	"special-characters-group-persian": "Persiešu",
 	"special-characters-group-hebrew": "Ebreju",
 	"special-characters-group-bangla": "Bengāļu",
+	"special-characters-group-tamil": "Tamilu",
 	"special-characters-group-telugu": "Telugu",
 	"special-characters-group-sinhala": "Singāļu",
 	"special-characters-group-gujarati": "Gudžarati",
@@ -3019,6 +3043,8 @@
 	"sessionprovider-generic": "$1 sesijas",
 	"randomrootpage": "Nejauša saknes lapa",
 	"log-action-filter-suppress": "Cenzēšanas veids:",
+	"log-action-filter-upload": "Augšupielādes veids:",
+	"log-action-filter-block-unblock": "Atbloķēšana",
 	"log-action-filter-delete-delete": "Lapas dzēšana",
 	"log-action-filter-managetags-create": "Iezīmes izveide",
 	"log-action-filter-managetags-delete": "Iezīmes dzēšana",
diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json
index 7783806a38..fc259b2a95 100644
--- a/languages/i18n/mk.json
+++ b/languages/i18n/mk.json
@@ -646,8 +646,8 @@
 	"subject-preview": "Преглед на насловот:",
 	"previewerrortext": "Се појави грешка при обидот да се прегледаат промените.",
 	"blockedtitle": "Корисникот е блокиран",
-	"blockedtext": "'''Вашето корисничко име или IP-адреса е блокирано.'''\n\nБлокирањето е направено од страна на $1.\nДаденото образложение е ''$2''.\n\n* Почеток на блокирањето: $8\n* Истекување на блокирањето: $6\n* Корисникот што требало да биде блокиран: $7\n\nМоже да контактирате со $1 или некој друг [[{{MediaWiki:Grouppage-sysop}}|администратор]] за да разговарате во врска со блокирањето.\nМожете да ја искористите можноста „Е-пошта до овој корисник“ ако е назначена важечка е-поштенска адреса во [[Special:Preferences|вашите нагодувања]] и не ви е забрането да ја користите.\nВашата сегашна IP-адреса е $3, а назнака на блокирањето гласи #$5.\nВе молиме наведете ги сите подробности прикажани погоре, во вашата евентуална реакција.",
-	"autoblockedtext": "Вашата IP-адреса е автоматски блокирана бидејќи била користена од страна на друг корисник, кој бил блокиран од $1.\nДаденото образложение е следново:\n\n:''$2''\n\n* Почеток на блокирањето: $8\n* Истекување на блокирањето: $6\n* Со намера да се блокира: $7\n\nМоже да контактирате со $1 или некој друг [[{{MediaWiki:Grouppage-sysop}}|администратор]] за да разговарате во врска со ова блокирање.\n\nИмајте предвид дека можеби нема да можете да ја искористите можноста „Е-пошта до овој корисник“ доколку не е назначена важечка е-поштенска адреса во [[Special:Preferences|вашите нагодувања]] и ви е забрането користитење на истата.\n\nВашата IP-адреса е $3, a ID на блокирањеto е $5.\nВе молиме наведете ги овие подробности доколку реагирате на блокирањето.",
+	"blockedtext": "<strong>Вашето корисничко име или IP-адреса е блокирано.</strong>\n\nБлокирањето е направено од страна на $1.\nДаденото образложение е ''$2''.\n\n* Почеток на блокирањето: $8\n* Истекување на блокирањето: $6\n* Корисникот што требало да биде блокиран: $7\n\nМоже да контактирате со $1 или некој друг [[{{MediaWiki:Grouppage-sysop}}|администратор]] за да разговарате во врска со блокирањето.\nМожете да ја искористите можноста „{{int:emailuser}}“ ако е назначена важечка е-поштенска адреса во [[Special:Preferences|вашите нагодувања]] и не ви е забрането да ја користите.\nВашата сегашна IP-адреса е $3, а назнака на блокирањето гласи #$5.\nВе молиме наведете ги сите подробности прикажани погоре, во вашата евентуална реакција.",
+	"autoblockedtext": "Вашата IP-адреса е автоматски блокирана бидејќи била користена од страна на друг корисник, кој бил блокиран од $1.\nДаденото образложение е следново:\n\n:<em>$2</em>\n\n* Почеток на блокирањето: $8\n* Истекување на блокирањето: $6\n* Со намера да се блокира: $7\n\nМоже да контактирате со $1 или некој друг [[{{MediaWiki:Grouppage-sysop}}|администратор]] за да разговарате во врска со ова блокирање.\n\nИмајте предвид дека можеби нема да можете да ја искористите можноста „{{int:emailuser}}“ доколку не е назначена важечка е-поштенска адреса во [[Special:Preferences|вашите нагодувања]] и ви е забрането користитење на истата.\n\nВашата IP-адреса е $3, a ID на блокирањеto е $5.\nВе молиме наведете ги овие подробности доколку реагирате на блокирањето.",
 	"systemblockedtext": "Вашето корисничко име или IP-адреса е автоматски блокирано од МедијаВики.\nПонудена причина:\n\n:<em>$2</em>\n\n* Почеток на блокот: $8\n* Истек на блокот: $6\n* Блокот е наменет за: $7\n\nВашата тековна IP-адреса гласи $3.\nПрепишете ги сите горенаведени поединости доколку сакате да се распрашате кај надлежните во врска со блокот.",
 	"blockednoreason": "не е наведена причина",
 	"whitelistedittext": "Мора да сте $1 за да уредувате страници.",
@@ -1983,6 +1983,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Додај параметар:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Назив на параметарот",
 	"apisandbox-dynamic-error-exists": "Праметарот по име „$1“ веќе постои.",
+	"apisandbox-templated-parameter-reason": "Овој [[Special:ApiHelp/main#main/templatedparams|шаблонизиран параметар]] се нуди според {{PLURAL:$1|вредноста|вредностите}} на $2.",
 	"apisandbox-deprecated-parameters": "Застарени параметри",
 	"apisandbox-fetch-token": "Самопополни ја шифрата",
 	"apisandbox-add-multi": "Додај",
@@ -3995,9 +3996,9 @@
 	"special-characters-group-hebrew": "Хебрејски",
 	"special-characters-group-bangla": "Бенгалски",
 	"special-characters-group-tamil": "тамилски",
-	"special-characters-group-telugu": "Телугу",
+	"special-characters-group-telugu": "Телушки",
 	"special-characters-group-sinhala": "Синхалски",
-	"special-characters-group-gujarati": "Гуџарати",
+	"special-characters-group-gujarati": "Гуџаратски",
 	"special-characters-group-devanagari": "деванагари",
 	"special-characters-group-thai": "Тајландски",
 	"special-characters-group-lao": "Лаошки",
@@ -4163,5 +4164,6 @@
 	"pagedata-title": "Податоци за страницата",
 	"pagedata-text": "Страницава дава посредник за податоци за страниците. Укажете го насловот на страницата во URL-то, користејќи ја синтаксата за потстраници.\n* Префрлањето на содржината се заснова на заглавието Прифати на вашиот клиент. Ова значи дека податоците за страницата ќе бидат ставени во форматот кој го претпочита вашиот клиент.",
 	"pagedata-not-acceptable": "Не најдов соодветен формат. Поддржани MIME-типови: $1",
-	"pagedata-bad-title": "Неважечки наслов: $1."
+	"pagedata-bad-title": "Неважечки наслов: $1.",
+	"unregistered-user-config": "Од безбедносни причини, корисничките потстраници со JavaScript, CSS и JSON не се вчитуваат за нерегистрирани корисници."
 }
diff --git a/languages/i18n/nds-nl.json b/languages/i18n/nds-nl.json
index c023aac810..d394c0c6bd 100644
--- a/languages/i18n/nds-nl.json
+++ b/languages/i18n/nds-nl.json
@@ -2720,7 +2720,7 @@
 	"confirm-purge-title": "Herny disse syde",
 	"confirm_purge_button": "Bevestig",
 	"confirm-purge-top": "Klik up 'bevestig' üm et tüskengehöägen van disse syde te leagen.",
-	"confirm-purge-bottom": "Et leagmaken van et tüskengehöägen sörgt dervöär dat jy de lätste versy van een syde te syn krygen.",
+	"confirm-purge-bottom": "Et leagmaken van et tüskengehöägen sörgt dervöär dat jy de lätste versy van een syde te seen krygen.",
 	"confirm-watch-button": "Oké",
 	"confirm-watch-top": "Disse zied op joew volglieste zetten?",
 	"confirm-unwatch-button": "Oké",
diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json
index 656ef4f9a6..83e855fa62 100644
--- a/languages/i18n/nl.json
+++ b/languages/i18n/nl.json
@@ -117,7 +117,7 @@
 	"tog-enotifminoredits": "Mij e-mailen bij kleine bewerkingen van pagina’s en bestanden op mijn volglijst",
 	"tog-enotifrevealaddr": "Mijn e-mailadres weergeven in e-mailberichten",
 	"tog-shownumberswatching": "Het aantal gebruikers weergeven dat deze pagina volgt",
-	"tog-oldsig": "Uw bestaande ondertekening:",
+	"tog-oldsig": "Uw bestaande handtekening:",
 	"tog-fancysig": "Handtekening als wikitekst behandelen (zonder automatische koppeling)",
 	"tog-uselivepreview": "Voorvertoning weergeven zonder de pagina opnieuw te laden",
 	"tog-forceeditsummary": "Een melding geven bij een lege bewerkingssamenvatting",
@@ -706,8 +706,8 @@
 	"subject-preview": "Voorvertoning van het onderwerp:",
 	"previewerrortext": "Er is een fout opgetreden tijdens het weergeven van uw wijzigingen.",
 	"blockedtitle": "Gebruiker is geblokkeerd",
-	"blockedtext": "'''Uw gebruikersaccount of IP-adres is geblokkeerd.'''\n\nDe blokkade is uitgevoerd door $1.\nDe opgegeven reden is ''$2''.\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt contact opnemen met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]] om de blokkade te bespreken.\nU kunt geen gebruik maken van de functie \"Deze gebruiker e-mailen\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]] en het gebruik van deze functie niet geblokkeerd is.\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
-	"autoblockedtext": "Uw IP-adres is automatisch geblokkeerd, omdat het gebruikt is door een andere gebruiker, die geblokkeerd is door $1.\nDe opgegeven reden is:\n\n:''$2''\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt contact opnemen met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]] om de blokkade te bespreken.\n\nU kunt geen gebruik maken van de functie \"Deze gebruiker e-mailen\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]], en het gebruik van deze functie niet is geblokkeerd.\n\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
+	"blockedtext": "'''Uw gebruikersaccount of IP-adres is geblokkeerd.'''\n\nDe blokkade is uitgevoerd door $1.\nDe opgegeven reden is ''$2''.\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt contact opnemen met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]] om de blokkade te bespreken.\nU kunt geen gebruik maken van de functie \"{{int:emailuser}}\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]] en het gebruik van deze functie niet geblokkeerd is.\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
+	"autoblockedtext": "Uw IP-adres is automatisch geblokkeerd, omdat het gebruikt is door een andere gebruiker, die geblokkeerd is door $1.\nDe opgegeven reden is:\n\n:''$2''\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nU kunt contact opnemen met $1 of een andere [[{{MediaWiki:Grouppage-sysop}}|beheerder]] om de blokkade te bespreken.\n\nU kunt geen gebruik maken van de functie \"{{ing:emailuser}}\", tenzij u een geldig e-mailadres hebt opgegeven in uw [[Special:Preferences|voorkeuren]], en het gebruik van deze functie niet is geblokkeerd.\n\nUw huidige IP-adres is $3 en het blokkadenummer is #$5.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
 	"systemblockedtext": "Uw gebruikersaccount of IP-adres is automatisch geblokkeerd door MediaWiki.\nDe opgegeven reden is:\n\n:<em>$2</em>\n\n* Aanvang blokkade: $8\n* Einde blokkade: $6\n* Bedoeld te blokkeren: $7\n\nUw huidige IP-adres is $3.\nVermeld alle bovenstaande gegevens als u ergens op deze blokkade reageert.",
 	"blockednoreason": "geen reden opgegeven",
 	"whitelistedittext": "U moet $1 om pagina's te bewerken.",
@@ -4088,5 +4088,6 @@
 	"pagedata-title": "Paginagegevens",
 	"pagedata-text": "Deze pagina biedt een data-interface voor pagina's. Geef een paginatitel op door deze in de URL op te nemen, op de manier van een deelpagina.\n* De inhoud wordt afgestemd op de door de client meegestuurde Accept Header. Dit betekent dat de gegevens voor de pagina worden aangeboden in het voorkeursformaat van uw client.",
 	"pagedata-not-acceptable": "Er is geen overeenkomende indeling gevonden. Ondersteunde MIME-typen: $1",
-	"pagedata-bad-title": "Ongeldige titel: $1."
+	"pagedata-bad-title": "Ongeldige titel: $1.",
+	"unregistered-user-config": "Vanwege veiligheidsredenen wordt worden gebruikersdeelpagina's met JavaScript, CSS en JSON niet langer geladen voor gebruikers die niet zijn geregistreerd."
 }
diff --git a/languages/i18n/oc.json b/languages/i18n/oc.json
index f11e4fd10d..20f022a48c 100644
--- a/languages/i18n/oc.json
+++ b/languages/i18n/oc.json
@@ -737,7 +737,11 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Objècte void",
 	"content-json-empty-array": "Tablèu void",
+	"deprecated-self-close-category": "Paginas qu'utilizan d'etiquetas HTML autotampadas pas validas",
+	"deprecated-self-close-category-desc": "La pagina conten d'etiquetas HTML autotampadas pas validas, coma <code>&lt;b/></code> o <code>&lt;span/></code>. Lo comportament d'aquò cambiarà lèu per respectar l'especificacion HTML5, adonc lor emplec en wikitext es despreciat.",
+	"duplicate-args-warning": "<strong>Attention:</strong> [[:$1]] crida [[:$2]] amb mai d'una valor pel paramètre \"$3\". S'emplegarà solament  la darrièra valor provesida.",
 	"duplicate-args-category": "Paginas utilizant d'arguments duplicats dins los apèls de modèl",
+	"duplicate-args-category-desc": "La pagina conten de cridas a patrons qu'emplagan d'arguments duplicats, coma  <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> or <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "Atencion : Aquesta pagina conten tròp d’apèls dispendioses de foncions del parser.\n\nI deurià aver mens de {{PLURAL:$2|ampèl|ampèls}}, e actualament {{PLURAL:$1|i a $1 ampèl|i a $1 ampèls}}..",
 	"expensive-parserfunction-category": "Paginas amb tròp d’apèls dispendioses de foncions parsaires",
 	"post-expand-template-inclusion-warning": "Atencion : Aquesta pagina conten tròp d'inclusions de modèls.\nD'unas inclusions seràn pas efectuadas.",
@@ -745,6 +749,9 @@
 	"post-expand-template-argument-warning": "Atencion : Aquesta pagina conten al mens un paramètre de modèl que l'inclusion es renduda impossibla. Aprèp extension, aqueste auriá produit un resultat tròp long, doncas, es pas estat inclús.",
 	"post-expand-template-argument-category": "Paginas que contenon al mens un paramètre de modèl pas evaluat",
 	"parser-template-loop-warning": "Modèl en bocla detectat : [[$1]]",
+	"template-loop-category": "Paginas amb boclas de patron",
+	"template-loop-category-desc": "La pagina conten una bocla dins lo patron, es a dire, un patron que se sona el meteis recursivament.",
+	"template-loop-warning": "<strong>Attencion:</strong> Aquesta pagina sona [[:$1]. Aquò es l'encausa d'una bocla de patron (una sonada infinida resursiva).",
 	"parser-template-recursion-depth-warning": "Limit de longor de la recursion del modèl depassat ($1)",
 	"language-converter-depth-warning": "Limit de prigondor del convertissor de lenga depassada ($1)",
 	"node-count-exceeded-category": "Paginas ont nombre de nosèls es depassat",
@@ -982,6 +989,7 @@
 	"prefs-watchlist-edits": "Nombre maximal de modificacions d'afichar dins la lista de seguiment :",
 	"prefs-watchlist-edits-max": "Nombre maximum : 1000",
 	"prefs-watchlist-token": "Geton per la lista de seguiment :",
+	"prefs-watchlist-managetokens": "Administrar los getons",
 	"prefs-misc": "Preferéncias divèrsas",
 	"prefs-resetpass": "Modificar lo senhal",
 	"prefs-changeemail": "Cambiar o suprimir l'adreça electronica",
@@ -1000,6 +1008,7 @@
 	"recentchangescount": "Nombre de modificacions d'afichar per defauta dins los cambiaments recents, los istorics e los logs :",
 	"prefs-help-recentchangescount": "Nombre maximum : 1000",
 	"prefs-help-watchlist-token2": "Aquí la clau secreta del flux Web de vòstra lista de seguiment.\nTota persona que la coneis poirà legir vòstra lista de seguiment, doncas, la comuniquetz pas.\nSe necessari, [[Special:ResetTokens|clicatz aicí per la reïnicializar]].",
+	"prefs-help-tokenmanagement": "Podètz veire e tornar inicializar la clau secreta del vòstre compte que pòt accedir al flux Web de la vòstre lista de seguit. Tota persona que coneis la clau poirà legir la vòstra lista, alara la compartissètz pas",
 	"savedprefs": "Las preferéncias son estadas salvadas.",
 	"savedrights": "Los dreits d'utilizaire de {{GENDER:$1|$1}} son estats enregistrats.",
 	"timezonelegend": "Fus orari :",
@@ -1020,6 +1029,7 @@
 	"timezoneregion-pacific": "Ocean Pacific",
 	"allowemail": "Autorizar los autres utilizaires a me mandar de corrièls",
 	"email-allow-new-users-label": "Autorizar corrièr electronic d'utilizaires nòus",
+	"email-blacklist-label": "Enebís a aqueles usatgièrs de m'enviar de corrièrs electronics:",
 	"prefs-searchoptions": "Recèrca",
 	"prefs-namespaces": "Noms d’espacis",
 	"default": "defaut",
@@ -1059,9 +1069,11 @@
 	"prefs-dateformat": "Format de las datas",
 	"prefs-timeoffset": "Descalatge orari",
 	"prefs-advancedediting": "Opcions generalas",
+	"prefs-developertools": "Aisinas del desvolopaire",
 	"prefs-editor": "Editor",
 	"prefs-preview": "Apercebut",
 	"prefs-advancedrc": "Opcions avançadas",
+	"prefs-opt-out": "Refusar los melhoraments",
 	"prefs-advancedrendering": "Opcions avançadas",
 	"prefs-advancedsearchoptions": "Opcions avançadas",
 	"prefs-advancedwatchlist": "Opcions avançadas",
@@ -1070,12 +1082,14 @@
 	"prefs-tokenwatchlist": "Geton",
 	"prefs-diffs": "Diferéncias",
 	"prefs-help-prefershttps": "Aquesta preferéncia serà efectiva al moment de vòstra connexion que ven.",
+	"prefswarning-warning": "Avètz fach de cambiaments de las vòstras preferéncias que  son  pas encara efectuats.\nS'abandonatz la pagina sens clicar sus «$1», las preferéncias seràn pas mesas a jorn.",
 	"prefs-tabs-navigation-hint": "Astúcia : Podètz utilizar las sagetas d'esquèrra e de dreita per navigar entre los onglets.",
 	"userrights": "Dreits dels utilizaires",
 	"userrights-lookup-user": "Seleccionar un utilizaire",
 	"userrights-user-editname": "Entrar un nom d’utilizaire :",
 	"editusergroup": "Cargar de gropes d’utilizaires",
 	"editinguser": "Modificacion dels dreits de l’{{GENDER:$1|utilizaire|utilizaira}} <strong>[[User:$1|$1]]</strong> $2",
+	"viewinguserrights": "Afichatge dels dreches de {{GENDER:$1|user}} <strong>[[User:$1|$1]]</strong> $2",
 	"userrights-editusergroup": "Modificar los gropes de l'utilizai{{GENDER:$1|e|a}}",
 	"userrights-viewusergroup": "Afichar los gropes de l'utilizair{{GENDER:$1|e|a}}",
 	"saveusergroups": "Enregistrar los gropes de l’{{GENDER:$1|utilizaire|utilizaira}}",
@@ -1093,6 +1107,9 @@
 	"userrights-expiry-existing": "Data d'expiracion existenta : $2 à $3",
 	"userrights-expiry-othertime": "Autre temps :",
 	"userrights-expiry-options": "1 jorn:1 day,1 setmana:1 week,1 mes:1 month,3 meses:3 months,6 meses:6 months,1 an:1 year",
+	"userrights-invalid-expiry": "La data d'expiracion pel grop \"$1\" es pas valida.",
+	"userrights-expiry-in-past": "Lo temps d'expiracion pel grop  \"$1\" es trespassat.",
+	"userrights-cannot-shorten-expiry": "Podètz pas acorchar la durada d'expiracion dels membres del grop \"$1\".Sonque los usatgièrs amb de permissions per apondre e levar aqueste grop o pòdon far.",
 	"userrights-conflict": "Conflicte de modificacion de dreits d'utilizaire ! Relegissètz e confirmatz vòstras modificacions.",
 	"group": "Grop :",
 	"group-user": "Utilizaires",
@@ -1119,6 +1136,7 @@
 	"right-createpage": "Crear de paginas (que son pas de paginas de discussion)",
 	"right-createtalk": "Crear de paginas de discussion",
 	"right-createaccount": "Crear de comptes d'utilizaire novèls",
+	"right-autocreateaccount": "Comença una session automaticament amb un compte d'usatgièr extèrne",
 	"right-minoredit": "Marcar de cambiaments coma menors",
 	"right-move": "Renomenar de paginas",
 	"right-move-subpages": "Desplaçar de paginas amb lor sospaginas",
diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index ab4d43a4ab..38ab5587d7 100644
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -1092,7 +1092,7 @@
 	"recentchangescount": "Domyślna liczba wyświetlanych edycji w ostatnich zmianach, historii i rejestrach:",
 	"prefs-help-recentchangescount": "Maksymalna liczba: 1000",
 	"prefs-help-watchlist-token2": "To jest tajny klucz umożliwiający dostęp do kanału internetowego zmian w obserwowanych przez ciebie stronach.\nKażdy, kto go zna, będzie mógł je zobaczyć, więc zachowaj go dla siebie.\n[[Special:ResetTokens|Kliknij tu, jeśli chcesz go zresetować]].",
-	"prefs-help-tokenmanagement": "Możesz zobaczyć i zresetować sekretny klucz przypisany do konta, służący do uzyskania dostępu do kanału internetowego zmian w obserwowanych przez ciebie stronach. Każdy, kto go zna, będzie mógł je zobaczyć, więc nie udostępniaj go.",
+	"prefs-help-tokenmanagement": "Możesz zobaczyć i zresetować tajny klucz przypisany do Twojego konta, służący do uzyskania dostępu do kanału internetowego zmian w obserwowanych przez ciebie stronach. Każdy, kto go zna, będzie mógł je zobaczyć, więc nie udostępniaj go.",
 	"savedprefs": "Twoje preferencje zostały zapisane.",
 	"savedrights": "Zapisano grupy {{GENDER:$1|użytkownika $1|użytkowniczki $1}}.",
 	"timezonelegend": "Strefa czasowa:",
diff --git a/languages/i18n/pms.json b/languages/i18n/pms.json
index 0b9c96a5b5..5cd407adc4 100644
--- a/languages/i18n/pms.json
+++ b/languages/i18n/pms.json
@@ -18,7 +18,8 @@
 			"Purodha",
 			"Macofe",
 			"Matma Rex",
-			"Fitoschido"
+			"Fitoschido",
+			"Paolo Castellina"
 		]
 	},
 	"tog-underline": "Anliure con la sotliniadura",
@@ -46,7 +47,7 @@
 	"tog-shownumberswatching": "Smon-e ël nùmer d'utent che as ten-o la pàgina sot-euj",
 	"tog-oldsig": "Firma esistenta:",
 	"tog-fancysig": "Traté la firma com dël test wiki (sensa n'anliura automàtica)",
-	"tog-uselivepreview": "Dovré la fonsion ''Preuva dal viv''",
+	"tog-uselivepreview": "Dovré la fonsion ''Preuva dal viv'' sensa carié la pàgina",
 	"tog-forceeditsummary": "Ciamé conferma se ël resumé dla modìfica a l'é veujd",
 	"tog-watchlisthideown": "Stërmé mie modìfiche ant la ròba che im ten-o sot-euj",
 	"tog-watchlisthidebots": "Stërmé le modìfiche fàite daj trigomiro ant la lista dle ròbe che im ten-o sot-euj",
@@ -59,7 +60,7 @@
 	"tog-showhiddencats": "Smon-e le categorìe stërmà",
 	"tog-norollbackdiff": "Fé nen vëdde le diferense apress d'avèj ripristinà",
 	"tog-useeditwarning": "Aviseme quand che i chito na pàgina ëd modìfiche con dle modìfiche nen salvà",
-	"tog-prefershttps": "Dovré sempe na conession sigura pr'ësté andrinta al sistema",
+	"tog-prefershttps": "Dovré sempe na conession sicura quand ch'a l'é intrà ant ël sistema",
 	"underline-always": "Sempe",
 	"underline-never": "Mai",
 	"underline-default": "Stàndard dël navigator o dël tema",
@@ -151,10 +152,10 @@
 	"newwindow": "(as deurb ant na fnestra neuva)",
 	"cancel": "Anulé",
 	"moredotdotdot": "Ëd pì...",
-	"morenotlisted": "Costa lista a l'é nen completa.",
+	"morenotlisted": "Costa lista a podrìa esse nen completa.",
 	"mypage": "Pàgina",
 	"mytalk": "Ciaciarade",
-	"anontalk": "Ciaciarade për st'adrëssa IP-sì",
+	"anontalk": "Discussion",
 	"navigation": "Navigassion",
 	"and": "&#32;e",
 	"faq": "Chestion frequente",
@@ -173,6 +174,7 @@
 	"searcharticle": "Andé",
 	"history": "Version pì veje",
 	"history_short": "Stòria",
+	"history_small": "stòria",
 	"updatedmarker": "agiornà da l'ùltima vira che i son passà",
 	"printableversion": "Version bon-a për stampé",
 	"permalink": "Anliura fissa",
@@ -206,7 +208,7 @@
 	"redirectedfrom": "(Ridiression da $1)",
 	"redirectpagesub": "Pàgina ëd ridiression",
 	"redirectto": "Ridiression a:",
-	"lastmodifiedat": "Modificà l'ùltima vira ai $1 a $2.",
+	"lastmodifiedat": "Modificà l'ùltima vira dël $1, al $2.",
 	"viewcount": "St'artìcol-sì a l'é stàit lesù {{PLURAL:$1|na vira|$1 vire}}.",
 	"protectedpage": "Pàgina proteta",
 	"jumpto": "Andé a:",
@@ -340,7 +342,7 @@
 	"viewsource": "Vardé la sorgiss",
 	"viewsource-title": "Vëdde la sorgiss ëd $1",
 	"actionthrottled": "Assion limità",
-	"actionthrottledtext": "Për evité che 'd gent ò 'd màchine an carìo dla rumenta, st'assion-sì as peul nen fesse tròp ëd soèns, e chiel a l'ha arpetula tròpe vire. Ch'a sia gentil, ch'a preuva torna antra dontré minute.",
+	"actionthrottledtext": "Për evité che 'd gent ò 'd màchine an carìo dla rumenta, st'assion-sì as peul nen fesse tròp ëd soèns, e ti 't l'has arpetula tròpe vire. Sie gentil, preuva torna antra dontré minute.",
 	"protectedpagetext": "Sta pàgina-sì a l'è stàita blocà për evité 'd modìfiche o d'àutre assion.",
 	"viewsourcetext": "A peul vardé e copié la sorgiss dë sta pàgina.",
 	"viewyourtext": "A peul vëdde e copié la sorgiss ëd <strong>soe modìfiche</strong> a costa pàgina-sì.",
@@ -406,7 +408,7 @@
 	"createacct-reason": "Rason",
 	"createacct-reason-ph": "Përchè a crea n'àutr cont",
 	"createacct-submit": "Ch'a crea sò cont",
-	"createacct-another-submit": "Creé n'àutr cont",
+	"createacct-another-submit": "Creé un cont",
 	"createacct-benefit-heading": "{{SITENAME}} a l'é fàit da 'd gent coma chiel.",
 	"createacct-benefit-body1": "{{PLURAL:$1|modìfica|modìfiche}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|pàgina|pàgine}}",
@@ -423,7 +425,7 @@
 	"noname": "A l'ha nen ëspessificà në stranòm vàlid.",
 	"loginsuccesstitle": "Compliment! A l'é pen-a rintrà ant ël sistema.",
 	"loginsuccess": "'''Adess a l'é colegà a {{SITENAME}} con lë stranòm «$1».'''",
-	"nosuchuser": "A-i é pa gnun utent con lë stranòm «$1».\nJë stranòm ëd j'utent a son sensìbij a le majùscole.\nCh'a contròla ël nòm che a l'ha batù, o [[Special:CreateAccount|ch'a crea un neuv cont]].",
+	"nosuchuser": "A-i é pa gnun utent con lë stranòm «$1».\nJë stranòm ëd j'utent a son sensìbij a le majùscole.\nContròla ël nòm ch'it l'has batù, o [[Special:CreateAccount|crea un cont neuv]].",
 	"nosuchusershort": "A-i é pa gnun utent che as ciama «$1». Për piasì, che a contròla se a l'ha scrit tut giust.",
 	"nouserspecified": "A venta che a specìfica në stranòm d'utent",
 	"login-userblocked": "St'utent-sì a l'é blocà. A peul pa intré ant ël sistema.",
@@ -443,7 +445,7 @@
 	"eauthentsent": "A l'adrëssa che a l'ha dane i l'oma mandaje un mëssagi ëd pòsta eletrònica për conferma.\nAnans che qualsëssìa àutr messagi ëd pòsta a ven-a mandà a 's cont-sì, a venta che a a fasa coma che a-j diso dë fé ant ël mëssagi, për confermé che ës cont a l'é da bon sò.",
 	"throttled-mailpassword": "Na ciav neuva a l'é gia stàita mandà da manch che {{PLURAL:$1|n'ora|$1 ore}}. Për evité dj'abus, mach un mëssagi ëd ri-inissialisassion ëd ciav a sarà mandà minca {{PLURAL:$1|ora|$1 ore}}.",
 	"mailerror": "Eror ën mandand via un mëssagi ëd pòsta eletrònica: $1",
-	"acct_creation_throttle_hit": "Dij visitador ëd costa wiki, an dovrand soa adrëssa IP a l'han creà {{PLURAL:$1|1 cont|$1 cont}} ant l'ùltim di, che a l'é tut lòn che as peul fesse ant cost temp.\nËd conseguensa, ij visitador che a deuvro costa adrëssa IP a peulo pì nen fé dij cont al moment.",
+	"acct_creation_throttle_hit": "Dij visitador ëd costa wiki, an dovrand soa adrëssa IP a l'han creà {{PLURAL:$1|1 cont|$1 cont}} ant l'ùltim $2, che a l'é tut lòn che as peul fesse ant cost temp.\nËd conseguensa, ij visitador che a deuvro costa adrëssa IP a peulo pì nen fé dij cont al moment.",
 	"emailauthenticated": "Soa adrëssa ëd pòsta eletrònica a l'é stàita confirmà ël $2 a $3.",
 	"emailnotauthenticated": "Soa adrëssa ëd pòsta eletrònica a l'é pa ancó stàita confirmà.\nPër qualsëssìa ëd coste funsion a sarà mandà gnun mëssagi.",
 	"noemailprefs": "Che a specìfica n'adrëssa ëd pòsta eletrònica se a veul dovré coste funsion-sì.",
@@ -456,7 +458,7 @@
 	"createaccount-title": "Creassion d'un cont për {{SITENAME}}",
 	"createaccount-text": "Cheidun a l'ha duvertà un cont për soa adrëssa ëd pòsta eletrònica ansima a {{SITENAME}} ($4) butand da stranòm «$2» e da ciav «$3». A dovrìa rintré ant ël sistema e cambiesse soa ciav pì ampressa ch'a peul.\n\nSe sòn a l'é rivà për eror, a peul lassé perde e fé gnente sensa problema.",
 	"login-throttled": "A l'ha fàit tròpi tentativ recent d'intré ant ël sistema.\nPër piasì, ch'a speta $1 prima ëd prové torna.",
-	"login-abort-generic": "Sò tentitiv d'intré ant ël sistema a l'é falì - Abortì",
+	"login-abort-generic": "Sò tentativ d'intré ant ël sistema a l'é falì - Abortì",
 	"login-migrated-generic": "Sò cont a l'ha emigrà, e sò stranòm a esist pi nen su costa wiki.",
 	"loginlanguagelabel": "Lenga: $1",
 	"suspicious-userlogout": "Soa arcesta ëd seurte dal sistema a l'é stàita arfudà përchè a smija com s'a fussa stàita mandà da 'n navigador rot o da l'archiviassion an local d'un prëstanòm.",
@@ -503,7 +505,7 @@
 	"passwordreset-emailtext-user": "L'utent $1 ansima a {{SITENAME}} a l'ha ciamà na riampostassion ëd soa ciav për {{SITENAME}} ($4). {{PLURAL:$3|Ël cont utent sì-sota a l'é|Ij cont utent sì-sota a son}} associà a st'adrëssa ëd pòsta eletrònica:\n\n$2\n\n{{PLURAL:$3|Costa ciav provisòria|Coste ciav provisòrie}} a scadran da-sì {{PLURAL:$5|un di|$5 di}}.\nA dovrìa intré ant ël sistema e serne na ciav neuva adess. Se quaidun d'àutr a l'ha fàit costa arcesta, o s'a l'é arcordasse soa ciav original, e a veul pa pi cangela, a peul ignoré ës mëssagi e continué a dovré soa veja ciav.",
 	"passwordreset-emailelement": "Stranòm: \n$1\n\nCiav provisòria: \n$2",
 	"passwordreset-emailsentemail": "Un mëssagi ëd riampostassion ëd la ciav a l'é stàit spedì.",
-	"changeemail": "Cangé l'adrëssa ëd pòsta eletrònica",
+	"changeemail": "Cangé o dëscancelé l'adrëssa ëd pòsta eletrònica",
 	"changeemail-header": "Cangé l'adrëssa ëd pòsta eletrònica dël cont",
 	"changeemail-no-info": "A dev esse intrà ant ël sistema për andé diretament a costa pàgina.",
 	"changeemail-oldemail": "Adrëssa ëd pòsta eletrònica atual:",
@@ -551,10 +553,10 @@
 	"anonpreviewwarning": "''A l'é nen rintrà ant ël sistema. An salvand a sarà memorisà soa adrëssa IP ant la stòria dle modìfiche ëd sa pàgina.''",
 	"missingsummary": "'''Nòta:''' a l'ha butà gnun resumé dla modìfica. Se a sgnaca «$1» n'àutra vira, soa modìfica a resterà salvà sensa resumé.",
 	"selfredirect": "<strong>Atension:</strong> A l'é an camin ch'a ridiression-a sa pàgina a chila-midema.\nMiraco a l'ha spessificà ël bërsaj sbalià për la ridiression, opura a l'é an camin ch'a modìfica la pàgina sbalià.\nS'a sgnaca torna ansima a «$1», la ridiression a sarà creà istess.",
-	"missingcommenttext": "Për piasì, che a buta un coment sì-sota.",
+	"missingcommenttext": "Për piasì, buta un coment sì-sota.",
 	"missingcommentheader": "'''Ch'a ten-a da ment:''' A l'ha pa dàit ëd soget o d'intestassion për cost coment.\nSe a sgnaca torna «$1», soa modìfica a sarà salvà sensa gnun-a intestassion.",
-	"summary-preview": "Preuva dël resumé:",
-	"subject-preview": "Preuva dl'oget/intestassion:",
+	"summary-preview": "Preuva dla compilassion dël resumé:",
+	"subject-preview": "Previsualisassion dl'oget:",
 	"previewerrortext": "A l'é rivaje n'eror durant ël tentativ ëd previsualisassion ëd soe modìfiche.",
 	"blockedtitle": "L'utent a l'é blocà.",
 	"blockedtext": "'''Sò stranòm ò pura adrëssa IP a l'é stàit blocà.'''\n\nËl blocagi a l'é stàit fàit da $1.\nComa rason a l'ha butà ''$2''.\n\n* Blocà a parte dal: $8\n* Fin al: $6\n* As veul blochesse: $7\n\nA peul butesse an contat con $1 ò pura n'àotr [[{{MediaWiki:Grouppage-sysop}}|aministrator]] për discute ëd sò blocagi.\nCh'a ten-a present ch'a podrà dovré la fonsion «mandeje un messagi ëd pòsta eletrònica a l'utent» mach s'a l'ha specificà n'adrëssa ëd vàlida ant [[Special:Preferences|sò gust]] e se sta fonsion a l'é nen ëstàita blocà 'cò chila.\nSoa adrëssa IP corenta a l'é $3, e l'identificativ dël blocagi a l'é #$5.\nPër piasì, ch'a-j buta tut e doj ant soe comunicassion ant sta question-sì.",
@@ -843,7 +845,7 @@
 	"search-file-match": "(a corëspond al contnù d'archivi)",
 	"search-suggest": "Vorìi-lo pa dì: $1",
 	"search-rewritten": "Visualisassion dj'arzultà për $1. Sërché nopà $2.",
-	"search-interwiki-caption": "Proget frej",
+	"search-interwiki-caption": "Arzultà dij proget frej",
 	"search-interwiki-default": "Arzultà da $1:",
 	"search-interwiki-more": "(ëd pì)",
 	"search-relatedarticle": "Corelà",
@@ -886,7 +888,7 @@
 	"prefs-watchlist-token": "Geton ëd lòn che as ten sot euj:",
 	"prefs-misc": "Sòn e lòn",
 	"prefs-resetpass": "Cangé la ciav",
-	"prefs-changeemail": "Cangé l'adrëssa ëd pòsta eletrònica",
+	"prefs-changeemail": "Cangé o dëscancelé l'adrëssa ëd pòsta eletrònica",
 	"prefs-setemail": "Amposté n'adrëssa ëd pòsta eletrònica",
 	"prefs-email": "Opsion ëd pòsta eletrònica",
 	"prefs-rendering": "Sembiansa",
@@ -995,20 +997,20 @@
 	"group-bot": "Trigomiro",
 	"group-sysop": "Aministrator",
 	"group-bureaucrat": "Mangiapapé",
-	"group-suppress": "Supervisor",
+	"group-suppress": "Ancarià dle sopression",
 	"group-all": "(utent)",
 	"group-user-member": "{{GENDER:$1|utent}}",
 	"group-autoconfirmed-member": "{{GENDER:$1|utent ch'a l'é convalidasse daspërchiel|utent ch'a l'é convalidasse daspërchila}}",
 	"group-bot-member": "{{GENDER:$1|trigomiro}}",
 	"group-sysop-member": "{{GENDER:$1|aministrator|aministratris}}",
 	"group-bureaucrat-member": "{{GENDER:$1|mangiapapé}}",
-	"group-suppress-member": "{{GENDER:$1|supervisor}}",
+	"group-suppress-member": "{{GENDER:$1|ancarià dle sopression}}",
 	"grouppage-user": "{{ns:project}}:Utent",
 	"grouppage-autoconfirmed": "{{ns:project}}:Utent ch'a son convalidasse daspërlor",
 	"grouppage-bot": "{{ns:project}}:Trigomiro",
 	"grouppage-sysop": "{{ns:project}}:Aministrator",
 	"grouppage-bureaucrat": "{{ns:project}}:Mangiapapé",
-	"grouppage-suppress": "{{ns:project}}:Supervisor",
+	"grouppage-suppress": "{{ns:project}}:Fà la sopression",
 	"right-read": "Lese le pàgine",
 	"right-edit": "Modifiché le pàgine",
 	"right-createpage": "Creé dle pàgine (che a son pa dle pàgine ëd discussion)",
diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json
index 877184cd94..43b003219b 100644
--- a/languages/i18n/pt-br.json
+++ b/languages/i18n/pt-br.json
@@ -617,6 +617,7 @@
 	"botpasswords-existing": "Senhas de robôs existentes",
 	"botpasswords-createnew": "Crie uma nova senha de robô",
 	"botpasswords-editexisting": "Editar uma senha de robô existente",
+	"botpasswords-label-needsreset": "(senha precisa ser redefinida)",
 	"botpasswords-label-appid": "Nome do robô:",
 	"botpasswords-label-create": "Criar",
 	"botpasswords-label-update": "Atualizar",
@@ -640,6 +641,7 @@
 	"botpasswords-restriction-failed": "Restrições de senha de robô evitam esta autenticação.",
 	"botpasswords-invalid-name": "O nome de usuário especificado não contém o separador de senha de robô (\"$1\").",
 	"botpasswords-not-exist": "O usuário \"$1\" não possui uma senha de robô \"$2\".",
+	"botpasswords-needs-reset": "A senha do robô de nome \"$2\" {{GENDER:$1|do usuário|da usuária}} \"$1\" deve ser redefinida.",
 	"resetpass_forbidden": "As senhas não podem ser alteradas",
 	"resetpass_forbidden-reason": "Senhas não podem ser alteradas: $1",
 	"resetpass-no-info": "Você precisa estar autenticado para acessar esta página diretamente.",
@@ -1111,7 +1113,7 @@
 	"recentchangescount": "Número de edições a apresentar por omissão nas mudanças recentes, nos historiais de páginas e nos registos:",
 	"prefs-help-recentchangescount": "Número máximo: 1000",
 	"prefs-help-watchlist-token2": "Esta é a senha secreta para o feed da Web com sua lista de tokens vigiados.\nQualquer pessoa que descobrir esta senha será capaz de ler sua lista, então não a compartilhe.\nSe você precisar [[Special:ResetTokens|você pode redefini-lo]].",
-	"prefs-help-tokenmanagement": "Você pode ver e redefinir a chave secreta para sua conta que pode acessar o feed da Web da sua lista de vigilância. Qualquer pessoa que conheça a chave poderá ler sua lista de observação, então não compartilhe.",
+	"prefs-help-tokenmanagement": "Pode ver e repor a chave secreta da sua conta que permite aceder ao feed da sua lista de páginas vigiadas. Qualquer pessoa que conheça a chave será capaz de ler a sua lista de páginas vigiadas, por isso não a partilhe.",
 	"savedprefs": "As suas preferências foram salvas.",
 	"savedrights": "Os grupos {{GENDER:$1|do usuário|da usuária}} $1 foram gravados.",
 	"timezonelegend": "Fuso horário:",
@@ -1141,7 +1143,7 @@
 	"prefs-custom-json": "JSON personalizado",
 	"prefs-custom-js": "JS personalizado",
 	"prefs-common-config": "CSS/JSON/JavaScript compartilhado por todos os temas:",
-	"prefs-reset-intro": "Você pode usar esta página para restaurar as suas preferências para os valores predefinidos do sítio.\nEsta ação não pode ser desfeita.",
+	"prefs-reset-intro": "Pode usar esta página para repor as configurações padrão das preferências.\nAs suas preferências serão modificadas para os valores predefinidos do site.\nEsta operação não pode ser desfeita.",
 	"prefs-emailconfirm-label": "Confirmação do e-mail:",
 	"youremail": "Seu e-mail:",
 	"username": "Nome de {{GENDER:$1|usuário|usuária|usuário(a)}}:",
@@ -1588,7 +1590,7 @@
 	"recentchangeslinked-feed": "Mudanças relacionadas",
 	"recentchangeslinked-toolbox": "Mudanças relacionadas",
 	"recentchangeslinked-title": "Mudanças relacionadas com “$1”",
-	"recentchangeslinked-summary": "Digite um nome de página para ver as alterações nas páginas vinculadas ou a partir dessa página. (Para ver membros de uma categoria, digite Categoria: Nome da categoria). Mudanças nas páginas em [[Special:Watchlist|lista de páginas vigiadas]] são exibidas em <strong>negrito<strong>",
+	"recentchangeslinked-summary": "Introduza o nome de uma página para ver as mudanças a todas as páginas que contêm hiperligações para ela ou para as quais a página fornecida contém hiperligações (para ver as que pertencem a uma categoria, introduza {{ns:category}}:Nome da categoria). As mudanças às suas [[Special:Watchlist|páginas vigiadas]] aparecem a <strong>negrito</strong>.",
 	"recentchangeslinked-page": "Nome da página:",
 	"recentchangeslinked-to": "Inversamente, mostrar mudanças nas páginas que contêm ligações para esta",
 	"recentchanges-page-added-to-category": "[[:$1]]adicionada à categoria",
@@ -2068,6 +2070,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Parâmetro adicional",
 	"apisandbox-dynamic-parameters-add-placeholder": "Nome do parâmetro",
 	"apisandbox-dynamic-error-exists": "Um parâmetro chamado \"$1\" já existe.",
+	"apisandbox-templated-parameter-reason": "Este [[Special:ApiHelp/main#main/templatedparams|parâmetro de predefinição]] é oferecido com base {{PLURAL:$1|no valor|nos valores}} de $2.",
 	"apisandbox-deprecated-parameters": "Parâmetros obsoletos",
 	"apisandbox-fetch-token": "Preencher automaticamente o token",
 	"apisandbox-add-multi": "Adicionar",
diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json
index 9a67d6faef..85ad5b40cb 100644
--- a/languages/i18n/pt.json
+++ b/languages/i18n/pt.json
@@ -76,7 +76,8 @@
 			"Ngl2016",
 			"RadiX",
 			"MokaAkashiyaPT",
-			"Athena in Wonderland"
+			"Athena in Wonderland",
+			"Fitoschido"
 		]
 	},
 	"tog-underline": "Sublinhar hiperligações:",
@@ -583,6 +584,7 @@
 	"botpasswords-existing": "Palavras-passe de robô existentes",
 	"botpasswords-createnew": "Criar uma nova palavra-passe para robô",
 	"botpasswords-editexisting": "Editar uma palavra-passe de robô existente",
+	"botpasswords-label-needsreset": "(a palavra-passe precisa ser redefinida)",
 	"botpasswords-label-appid": "Nome do robô:",
 	"botpasswords-label-create": "Criar",
 	"botpasswords-label-update": "Atualizar",
@@ -606,6 +608,7 @@
 	"botpasswords-restriction-failed": "Restrições da palavra-passe de robô impedem esta autenticação.",
 	"botpasswords-invalid-name": "O nome de utilizador especificado não contém o separador de palavra-passe de robô (\"$1\").",
 	"botpasswords-not-exist": "O utilizador \"$1\" não tem uma palavra-passe para o robô chamado \"$2\".",
+	"botpasswords-needs-reset": "A palavra-passe do robô de nome \"$2\" {{GENDER:$1|do utilizador|da utilizadora}} \"$1\" deve ser redefinida.",
 	"resetpass_forbidden": "As palavras-passe não podem ser alteradas",
 	"resetpass_forbidden-reason": "As palavras-passe não podem ser alteradas: $1",
 	"resetpass-no-info": "Precisa de iniciar sessão para aceder diretamente a esta página.",
@@ -701,8 +704,8 @@
 	"subject-preview": "Antevisão do assunto:",
 	"previewerrortext": "Ocorreu um erro enquanto tentava antever as suas alterações.",
 	"blockedtitle": "O utilizador está bloqueado",
-	"blockedtext": "<strong>O seu nome de utilizador ou endereço IP foram bloqueados.</strong>\n\nO bloqueio foi realizado por $1.\nO motivo apresentado foi <em>$2</em>.\n\n* Início do bloqueio: $8\n* Expiração do bloqueio: $6\n* Destinatário do bloqueio: $7\n\nPode contactar $1 ou outro [[{{MediaWiki:Grouppage-sysop}}|administrador]] para discutir o bloqueio.\nNote que para utilizar a funcionalidade \"Contactar utilizador\" precisa de ter um endereço de correio eletrónico válido nas suas [[Special:Preferences|preferências]] e de não lhe ter sido bloqueado o uso desta funcionalidade.\nO seu endereço IP neste momento é $3 e a identificação (ID) do bloqueio é #$5.\nInclua todos os detalhes acima em quaisquer contactos relacionados com este bloqueio, por favor.",
-	"autoblockedtext": "O seu endereço IP foi bloqueado de forma automática porque foi utilizado recentemente por outro utilizador, o qual foi bloqueado por $1.\nO motivo apresentado foi:\n\n:<em>$2</em>\n\n* Início do bloqueio: $8\n* Expiração do bloqueio: $6\n* Destinatário do bloqueio: $7\n\nPode contactar $1 ou outro [[{{MediaWiki:Grouppage-sysop}}|administrador]] para discutir o bloqueio.\n\nNote que para utilizar a funcionalidade \"Contactar utilizador\" precisa de ter um endereço de correio eletrónico válido nas suas [[Special:Preferences|preferências]] e de não lhe ter sido bloqueado o uso desta funcionalidade.\n\nO seu endereço IP neste momento é $3 e a identificação (ID) do bloqueio é #$5.\nInclua todos os detalhes acima em quaisquer contactos relacionados com este bloqueio, por favor.",
+	"blockedtext": "<strong>O seu nome de utilizador ou endereço IP foram bloqueados.</strong>\n\nO bloqueio foi realizado por $1.\nO motivo apresentado foi <em>$2</em>.\n\n* Início do bloqueio: $8\n* Expiração do bloqueio: $6\n* Destinatário do bloqueio: $7\n\nPode contactar $1 ou outro [[{{MediaWiki:Grouppage-sysop}}|administrador]] para discutir o bloqueio.\nNote que para utilizar a funcionalidade \"{{int:emailuser}}\" precisa de ter um endereço de correio eletrónico válido nas suas [[Special:Preferences|preferências]] e de não lhe ter sido bloqueado o uso desta funcionalidade.\nO seu endereço IP neste momento é $3 e a identificação (ID) do bloqueio é #$5.\nInclua todos os detalhes acima em quaisquer contactos relacionados com este bloqueio, por favor.",
+	"autoblockedtext": "O seu endereço IP foi bloqueado de forma automática porque foi utilizado recentemente por outro utilizador, o qual foi bloqueado por $1.\nO motivo apresentado foi:\n\n:<em>$2</em>\n\n* Início do bloqueio: $8\n* Expiração do bloqueio: $6\n* Destinatário do bloqueio: $7\n\nPode contactar $1 ou outro [[{{MediaWiki:Grouppage-sysop}}|administrador]] para discutir o bloqueio.\n\nNote que para utilizar a funcionalidade \"{{int:emailuser}}\" precisa de ter um endereço de correio eletrónico válido nas suas [[Special:Preferences|preferências]] e de não lhe ter sido bloqueado o uso desta funcionalidade.\n\nO seu endereço IP neste momento é $3 e a identificação (ID) do bloqueio é #$5.\nInclua todos os detalhes acima em quaisquer contactos relacionados com este bloqueio, por favor.",
 	"systemblockedtext": "O seu nome de utilizador ou endereço IP foram bloqueados automaticamente pelo MediaWiki.\nO motivo fornecido é:\n\n:<em>$2</em>\n\n* Início do bloqueio: $8\n* Expiração do bloqueio: $6\n* Destinatário do bloqueio: $7\n\nO seu endereço IP atual é $3.\nInclua todos os detalhes acima em quaisquer contactos sobre este assunto, por favor.",
 	"blockednoreason": "sem motivo especificado",
 	"whitelistedittext": "Precisa de $1 para poder editar páginas.",
@@ -1561,7 +1564,7 @@
 	"recentchangeslinked-feed": "Alterações relacionadas",
 	"recentchangeslinked-toolbox": "Alterações relacionadas",
 	"recentchangeslinked-title": "Alterações relacionadas com \"$1\"",
-	"recentchangeslinked-summary": "Introduza o nome de uma página para ver as mudanças a todas as páginas que contêm hiperligações para ela ou para as quais a página fornecida contém hiperligações (para ver as que pertencem a uma categoria, introduza Categoria:Nome da categoria). As mudanças às suas [[Special:Watchlist|páginas vigiadas]] aparecem a <strong>negrito</strong>.",
+	"recentchangeslinked-summary": "Introduza o nome de uma página para ver as mudanças a todas as páginas que contêm hiperligações para ela ou para as quais a página fornecida contém hiperligações (para ver as que pertencem a uma categoria, introduza {{ns:category}}:Nome da categoria). As mudanças às suas [[Special:Watchlist|páginas vigiadas]] aparecem a <strong>negrito</strong>.",
 	"recentchangeslinked-page": "Nome da página:",
 	"recentchangeslinked-to": "Inversamente, mostrar mudanças às páginas que contêm hiperligações para esta",
 	"recentchanges-page-added-to-category": "[[:$1]] foi adicionada à categoria",
@@ -2040,6 +2043,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Adicionar parâmetro:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Nome do parâmetro",
 	"apisandbox-dynamic-error-exists": "Um parâmetro com o nome \"$1\" já existe.",
+	"apisandbox-templated-parameter-reason": "Este [[Special:ApiHelp/main#main/templatedparams|parâmetro modelado]] é oferecido com base {{PLURAL:$1|no valor|nos valores}} de $2.",
 	"apisandbox-deprecated-parameters": "Parâmetros obsoletos",
 	"apisandbox-fetch-token": "Auto-preencher o token",
 	"apisandbox-add-multi": "Adicionar",
@@ -2171,7 +2175,7 @@
 	"trackingcategories-disabled": "A categoria está desativada.",
 	"mailnologin": "Não existe endereço de envio",
 	"mailnologintext": "Precisa de estar [[Special:UserLogin|autenticado]] e ter um endereço de correio válido nas suas [[Special:Preferences|preferências]], para poder enviar correio eletrónico a outros utilizadores.",
-	"emailuser": "Enviar correio eletrónico a {{GENDER:{{BASEPAGENAME}}|este utilizador|esta utilizadora|este(a) utilizador(a)}}",
+	"emailuser": "Enviar correio eletrónico a {{GENDER:{{BASEPAGENAME}}|este utilizador|esta utilizadora}}",
 	"emailuser-title-target": "Enviar correio eletrónico a {{GENDER:$1|este utilizador|esta utilizadora}}",
 	"emailuser-title-notarget": "Enviar correio eletrónico ao utilizador",
 	"emailpagetext": "Pode usar o formulário abaixo para enviar uma mensagem por correio eletrónico para {{GENDER:$1|este utilizador|esta utilizadora}}.\nO endereço de correio que introduziu nas [[Special:Preferences|suas preferências]] irá aparecer no campo do remetente da mensagem \"De:\", para que o destinatário lhe possa responder diretamente.",
@@ -4069,5 +4073,6 @@
 	"pagedata-title": "Dados de página",
 	"pagedata-text": "Esta página fornece uma interface de dados para páginas. Forneça o título da página no URL, usando a sintaxe de subpáginas, por favor.\n* Aplica-se a negociação de conteúdo com base no cabeçalho Accept do seu cliente. Isto significa que os dados da página serão fornecidos no formato preferido do seu cliente.",
 	"pagedata-not-acceptable": "Não foi encontrado nenhum formato correspondente. Tipos MIME suportados: $1",
-	"pagedata-bad-title": "Título inválido: $1."
+	"pagedata-bad-title": "Título inválido: $1.",
+	"unregistered-user-config": "Por razões de segurança as subpáginas de utilizador com JavaScript, CSS e JSON não podem ser carregadas para utilizadores não registados."
 }
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 17e26ae75d..0947db2173 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -2280,6 +2280,7 @@
 	"apisandbox-dynamic-parameters-add-label": "JavaScript label for the widget to add a new arbitrary parameter.",
 	"apisandbox-dynamic-parameters-add-placeholder": "JavaScript text field placeholder for the widget to add a new arbitrary parameter.",
 	"apisandbox-dynamic-error-exists": "Displayed as an error message from JavaScript when trying to add a new arbitrary parameter with a name that already exists. Parameters:\n* $1 - Parameter name that failed.",
+	"apisandbox-templated-parameter-reason": "Displayed (from JavaScript) on each instance of a templated parameter.\n\nParameters:\n* $1 - Number of fields in $2.\n* $2 - List of targeted fields, combined using {{msg-mw|comma-separator}} and {{msg-mw|and}}.",
 	"apisandbox-deprecated-parameters": "JavaScript button label and fieldset legend for separating deprecated parameters in the UI.",
 	"apisandbox-fetch-token": "Label for the button that fetches a CSRF token.",
 	"apisandbox-add-multi": "Label for the button to add another value to a field that accepts multiple values\n{{Identical|Add}}",
@@ -4664,5 +4665,6 @@
 	"pagedata-title": "Title shown on the special page when a form or text is presented",
 	"pagedata-text": "Error shown when none of the formats acceptable to the client is supported (HTTP error 406). Parameters:\n* $1 - the list of supported MIME types",
 	"pagedata-not-acceptable": "No matching format found. Supported MIME types: $1",
-	"pagedata-bad-title": "Error shown when the requested title is invalid. Parameters:\n* $1: the malformed ID"
+	"pagedata-bad-title": "Error shown when the requested title is invalid. Parameters:\n* $1: the malformed ID",
+	"unregistered-user-config": "Shown when viewing a user JS, CSS or JSON subpage with ?action=raw&ctype=<mime type> where there is no such user. It is shown as a paragraph after a header saying 'Forbidden'."
 }
diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json
index 99d05480ba..f80a820a15 100644
--- a/languages/i18n/ru.json
+++ b/languages/i18n/ru.json
@@ -633,6 +633,7 @@
 	"botpasswords-existing": "Существующие пароли бота",
 	"botpasswords-createnew": "Создать новый пароль бота",
 	"botpasswords-editexisting": "Редактировать существующий пароль бота",
+	"botpasswords-label-needsreset": "(пароль должен быть сброшен)",
 	"botpasswords-label-appid": "Название бота:",
 	"botpasswords-label-create": "Создать",
 	"botpasswords-label-update": "Обновить",
@@ -656,6 +657,7 @@
 	"botpasswords-restriction-failed": "Из-за ограничений, связанных с паролем бота, вход не произведён.",
 	"botpasswords-invalid-name": "Указанное имя участника не содержит разделителя для пароля бота («$1»).",
 	"botpasswords-not-exist": "У участника «$1» нет пароля для бота с названием «$2».",
+	"botpasswords-needs-reset": "Пароль для бота «$1» {{GENDER:$2|участника|участницы}} «$2» должен быть сброшен.",
 	"resetpass_forbidden": "Пароль не может быть изменён",
 	"resetpass_forbidden-reason": "Пароли не могут быть изменены: $1",
 	"resetpass-no-info": "Чтобы обращаться непосредственно к этой странице, вам следует представиться системе.",
@@ -751,8 +753,8 @@
 	"subject-preview": "Предпросмотр темы/заголовка:",
 	"previewerrortext": "При попытке отобразить предварительный просмотр ваших изменений произошла ошибка.",
 	"blockedtitle": "Участник заблокирован",
-	"blockedtext": "<strong>Ваша учётная запись или IP-адрес заблокированы.</strong>\n\nБлокировка произведена администратором $1.\nУказана следующая причина: «<em>$2</em>».\n\n* Начало блокировки: $8\n* Окончание блокировки: $6\n* Цель блокировки: $7\n\nВы можете связаться с $1 или любым другим [[{{MediaWiki:Grouppage-sysop}}|администратором]], чтобы обсудить блокировку.\nОбратите внимание, что вы не сможете использовать функцию «письмо участнику», если в своих [[Special:Preferences|персональных настройках]] не задали или не подтвердили корректный адрес электронной почты, или если ваша блокировка включает запрет отправки писем подобным образом.\nВаш IP-адрес — $3, идентификатор блокировки — $5.\nПожалуйста, указывайте эти сведения в любых своих обращениях.",
-	"autoblockedtext": "Ваш IP-адрес автоматически заблокирован в связи с тем, что он ранее использовался кем-то из участников, заблокированных {{GENDER:$4|участником|участницей}} $1. \nБыла указана следующая причина блокировки:\n\n: «$2».\n\n* Начало блокировки: $8\n* Окончание блокировки: $6\n* Цель блокировки: $7\n\nВы можете связаться с $1 или любым другим [[{{MediaWiki:Grouppage-sysop}}|администратором]], чтобы обсудить блокировку.\n\nОбратите внимание, что вы не сможете использовать функцию «письмо участнику», если в своих [[Special:Preferences|персональных настройках]] не задали или не подтвердили корректный адрес электронной почты, или если ваша блокировка включает запрет отправки писем подобным образом.\n\nВаш IP-адрес — $3, идентификатор блокировки — #$5.\nПожалуйста, указывайте эти сведения в любых своих обращениях.",
+	"blockedtext": "<strong>Ваша учётная запись или IP-адрес заблокированы.</strong>\n\nБлокировка произведена администратором $1.\nУказана следующая причина: <em>$2</em>.\n\n* Начало блокировки: $8\n* Окончание блокировки: $6\n* Цель блокировки: $7\n\nВы можете связаться с $1 или любым другим [[{{MediaWiki:Grouppage-sysop}}|администратором]], чтобы обсудить блокировку.\nОбратите внимание, что вы не сможете использовать функцию «{{int:emailuser}}», если в своих [[Special:Preferences|персональных настройках]] не задали или не подтвердили корректный адрес электронной почты, или если ваша блокировка включает запрет отправки писем подобным образом.\nВаш IP-адрес — $3, идентификатор блокировки — $5.\nПожалуйста, указывайте эти сведения в любых своих обращениях.",
+	"autoblockedtext": "Ваш IP-адрес автоматически заблокирован в связи с тем, что он ранее использовался кем-то из участников, заблокированных администратором $1. \nБыла указана следующая причина блокировки:\n\n: «$2».\n\n* Начало блокировки: $8\n* Окончание блокировки: $6\n* Цель блокировки: $7\n\nВы можете связаться с $1 или любым другим [[{{MediaWiki:Grouppage-sysop}}|администратором]], чтобы обсудить блокировку.\n\nОбратите внимание, что вы не сможете использовать функцию «{{int:emailuser}}», если в своих [[Special:Preferences|персональных настройках]] не задали или не подтвердили корректный адрес электронной почты, или если ваша блокировка включает запрет отправки писем подобным образом.\n\nВаш IP-адрес — $3, идентификатор блокировки — #$5.\nПожалуйста, указывайте эти сведения в любых своих обращениях.",
 	"systemblockedtext": "Ваше имя участника или IP-адрес были автоматически заблокированы MediaWiki.\nУказана следующая причина:\n\n:<em>$2</em>\n\n* Начало блокировки: $8\n* Окончание блокировки: $6\n* Цель блокировки: $7\n\nВаш текущий IP-адрес $3.\nПожалуйста, указывайте все эти сведения в любых своих обращениях.",
 	"blockednoreason": "причина не указана",
 	"whitelistedittext": "Вы должны $1 для изменения страниц.",
@@ -2096,6 +2098,7 @@
 	"apisandbox-dynamic-parameters-add-label": "Добавить параметр:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Имя параметра",
 	"apisandbox-dynamic-error-exists": "Параметр с именем «$1» уже существует.",
+	"apisandbox-templated-parameter-reason": "Этот [[Special:ApiHelp/main#main/templatedparams|шаблонный параметр]] предлагается на основе {{PLURAL:$1|значения|значений}} $2.",
 	"apisandbox-deprecated-parameters": "Устаревшие параметры",
 	"apisandbox-fetch-token": "Автозаполнение токена",
 	"apisandbox-add-multi": "Добавить",
@@ -4126,7 +4129,7 @@
 	"mediastatistics-header-audio": "Аудио",
 	"mediastatistics-header-video": "Видео",
 	"mediastatistics-header-multimedia": "Мультимедиа",
-	"mediastatistics-header-office": "Офисные",
+	"mediastatistics-header-office": "Документы",
 	"mediastatistics-header-text": "Текстовые",
 	"mediastatistics-header-executable": "Исполняемые",
 	"mediastatistics-header-archive": "Сжатые форматы",
@@ -4326,5 +4329,6 @@
 	"pagedata-title": "Данные страницы",
 	"pagedata-text": "Эта страница предоставляет интерфейс к данным страниц. Пожалуйста, введите заголовок страницы в URL, используя синтаксис подстраниц.\n* Согласование содержимого применяется основываясь на заголовке Accept вашего клиента. Это означает, что данные страницы будут предоставлены в формате, предпочитаемом вашим клиентом.",
 	"pagedata-not-acceptable": "Соответствующий формат не найден. Поддерживаемые MIME-типы: $1",
-	"pagedata-bad-title": "Некорректный заголовок: $1."
+	"pagedata-bad-title": "Некорректный заголовок: $1.",
+	"unregistered-user-config": "По соображениям безопасности пользовательские подстраницы JavaScript, CSS и JSON не могут быть загружены для незарегистрированных участников."
 }
diff --git a/languages/i18n/sat.json b/languages/i18n/sat.json
index 65f27f6c1a..81537a0a4c 100644
--- a/languages/i18n/sat.json
+++ b/languages/i18n/sat.json
@@ -352,8 +352,8 @@
 	"userlogin-helplink2": "ᱵᱚᱞᱚᱜ ᱠᱷᱟᱹᱛᱤᱨ ᱜᱚᱸᱲᱚᱸ",
 	"userlogin-createanother": "ᱮᱴᱟᱜ ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨᱢᱮ",
 	"createacct-emailrequired": "ᱤᱢᱮᱞ ᱵᱩᱴᱟᱹ",
-	"createacct-emailoptional": "Email ᱴᱷᱤᱠᱱᱟ (ᱵᱟᱹᱲᱛᱤᱛᱮ)",
-	"createacct-email-ph": "ᱟᱢᱟᱜ email ᱴᱷᱤᱠᱱᱟ ᱵᱚᱞᱚᱭᱢᱮ",
+	"createacct-emailoptional": "ᱤᱢᱮᱞ ᱴᱷᱤᱠᱱᱟ (ᱟᱢᱠᱩᱥᱤ)",
+	"createacct-email-ph": "ᱟᱢᱟᱜ ᱤᱢᱮᱞ ᱵᱩᱴᱟᱹ ᱟᱫᱮᱨᱢᱮ",
 	"createacct-another-email-ph": "ᱤᱢᱮᱞ ᱵᱩᱴᱟᱹ ᱟᱫᱮᱨᱢᱮ",
 	"createaccountmail": "E-mail hotete",
 	"createacct-realname": "ᱥᱚᱛ ᱧᱩᱛᱩᱢ (ᱚᱯᱥᱱᱟᱞ)",
@@ -363,7 +363,7 @@
 	"createacct-another-submit": "ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨᱢᱮ",
 	"createacct-continue-submit": "ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨ ᱛᱚᱝᱜᱮᱢᱮ",
 	"createacct-another-continue-submit": "ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨ ᱛᱚᱝᱜᱮᱢᱮ",
-	"createacct-benefit-heading": "{{SITENAME}} ᱟᱢ ᱞᱮᱠᱟᱱ ᱦᱚᱲ ᱦᱚᱛᱮᱛᱮ ᱛᱮᱭᱟᱨ ᱟᱠᱟᱱ᱾",
+	"createacct-benefit-heading": "{{SITENAME}} ᱫᱚ ᱟᱢ ᱞᱮᱠᱟᱱ ᱦᱚᱲ ᱦᱚᱛᱮᱛᱮ ᱛᱮᱭᱟᱨ ᱟᱠᱟᱱ᱾",
 	"createacct-benefit-body1": "{{PLURAL:$1|ᱥᱟᱯᱲᱟᱣ|ᱥᱟᱯᱲᱟᱣᱠᱚ}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|ᱥᱟᱦᱴᱟ|ᱥᱟᱦᱴᱟᱠᱳ}}",
 	"createacct-benefit-body3": "ᱱᱮᱛᱟᱨ {{PLURAL:$1|ᱮᱱᱮᱢᱤᱭᱟᱹ|ᱮᱱᱮᱢᱤᱭᱟᱹᱠᱚ}}",
@@ -488,7 +488,7 @@
 	"summary-preview": "ᱜᱩᱴ ᱠᱟᱛᱷᱟ ᱩᱱᱩᱫᱩᱜ:",
 	"subject-preview": "ᱜᱩᱴᱠᱟᱛᱷᱟ ᱩᱱᱩᱫᱩᱜ:",
 	"blockedtitle": "ᱵᱮᱵᱷᱟᱨᱤᱡ ᱫᱚ ᱮᱥᱮᱫ ᱚᱪᱚᱣᱟᱠᱟᱱᱟᱭ",
-	"blockedtext": "<strong>ᱟᱢᱟᱜ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱧᱩᱛᱩᱢ ᱟᱨᱵᱟᱝ IP ᱵᱩᱴᱟᱹ ᱫᱚ ᱵᱚᱸᱫᱽ ᱟᱠᱟᱱᱟ ᱾ </strong>\n\nᱱᱚᱶᱟ ᱵᱚᱸᱫᱽ ᱫᱚ $1 ᱫᱟᱨᱟᱭᱛᱮ ᱦᱩᱭᱟᱠᱱᱟ ᱾\nᱱᱚᱶᱟ ᱨᱮᱱᱟᱜ ᱚᱡᱮ ᱫᱚ ᱮᱢᱮᱱᱟ <em>$2</em>.\n\n* ᱵᱚᱸᱫᱽ ᱮᱦᱚᱵ: $8\n* ᱵᱚᱸᱫᱽ ᱢᱩᱪᱟᱹᱫ: $6\n* ᱟᱥᱟᱦᱟᱱ ᱵᱚᱸᱫᱽᱠᱚ: $7\n\nᱟᱢ $1 ᱮᱢ ᱥᱟᱹᱜᱟᱹᱭ ᱫᱟᱲᱮᱭᱟᱭᱟ ᱵᱟᱝᱠᱷᱟᱱ ᱮᱴᱟᱜ [[{{MediaWiki:Grouppage-sysop}}|ᱟᱰᱢᱤᱱᱤᱥᱴᱨᱮᱴᱚᱨ]] ᱵᱚᱸᱫᱽ ᱵᱟᱵᱚᱫᱽ ᱛᱮ ᱜᱟᱞᱚᱪ ᱞᱟᱹᱜᱤᱫ ᱾\nᱟᱢ ᱵᱟᱢ ᱵᱮᱵᱷᱟᱨ ᱫᱟᱲᱮᱭᱟᱜ \"email this user\" ᱥᱩᱵᱤᱫᱷᱟ ᱡᱚᱛᱷᱟᱛ ᱤᱢᱮᱞ ᱵᱩᱴᱟᱹ ᱛᱟᱢ ᱵᱟᱝ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱟᱨ ᱱᱚᱶᱟ ᱫᱚ ᱪᱤᱱᱦᱟᱹᱣ-ᱟ [[Special:Preferences|ᱠᱷᱟᱛᱟ ᱧᱮᱞᱚᱚᱜ]] ᱠᱷᱚᱱ ᱟᱨ ᱟᱢ ᱫᱚ ᱵᱟᱢ ᱵᱚᱸᱫᱽ ᱟᱠᱟᱱᱟ ᱱᱚᱶᱟ ᱵᱮᱵᱷᱟᱨ ᱠᱷᱚᱱ ᱾\nᱟᱢᱟᱜ ᱱᱤᱛᱚᱜᱟᱜ IP ᱵᱩᱴᱟᱹ ᱫᱚ $3, ᱟᱨ ᱵᱚᱸᱫᱽ ID ᱫᱚ #$5  \nᱫᱟᱭᱟᱠᱟᱛᱮ ᱥᱮᱞᱮᱫᱽ ᱢᱮ ᱪᱮᱛᱟᱱᱟᱜ ᱠᱟᱛᱷᱟᱠᱚ ᱡᱚᱛᱚ ᱞᱮᱠᱟᱱ ᱠᱩᱠᱞᱤ ᱨᱮ ᱾",
+	"blockedtext": "<strong>ᱟᱢᱟᱜ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱧᱩᱛᱩᱢ ᱟᱨᱵᱟᱝ IP ᱵᱩᱴᱟᱹ ᱫᱚ ᱵᱚᱸᱫᱽ ᱟᱠᱟᱱᱟ ᱾ </strong>\n\nᱱᱚᱶᱟ ᱵᱚᱸᱫᱽ ᱫᱚ $1 ᱫᱟᱨᱟᱭᱛᱮ ᱦᱩᱭᱟᱠᱱᱟ ᱾\nᱱᱚᱶᱟ ᱨᱮᱱᱟᱜ ᱚᱡᱮ ᱫᱚ ᱮᱢᱮᱱᱟ <em>$2</em>.\n\n* ᱵᱚᱸᱫᱽ ᱮᱦᱚᱵ: $8\n* ᱵᱚᱸᱫᱽ ᱢᱩᱪᱟᱹᱫ: $6\n* ᱟᱥᱟᱦᱟᱱ ᱵᱚᱸᱫᱽᱠᱚ: $7\n\nᱟᱢ $1 ᱮᱢ ᱥᱟᱹᱜᱟᱹᱭ ᱫᱟᱲᱮᱭᱟᱭᱟ ᱵᱟᱝᱠᱷᱟᱱ ᱮᱴᱟᱜ [[{{MediaWiki:Grouppage-sysop}}|ᱟᱰᱢᱤᱱᱤᱥᱴᱨᱮᱴᱚᱨ]] ᱵᱚᱸᱫᱽ ᱵᱟᱵᱚᱫᱽ ᱛᱮ ᱜᱟᱞᱚᱪ ᱞᱟᱹᱜᱤᱫ ᱾\nᱟᱢ ᱵᱟᱢ ᱵᱮᱵᱷᱟᱨ ᱫᱟᱲᱮᱭᱟᱜ \"{{int:emailuser}}\" ᱥᱩᱵᱤᱫᱷᱟ ᱡᱚᱛᱷᱟᱛ ᱤᱢᱮᱞ ᱵᱩᱴᱟᱹ ᱛᱟᱢ ᱵᱟᱝ ᱛᱟᱦᱮᱸᱱ ᱠᱷᱟᱱ ᱟᱨ ᱱᱚᱶᱟ ᱫᱚ ᱪᱤᱱᱦᱟᱹᱣ-ᱟ [[Special:Preferences|ᱠᱷᱟᱛᱟ ᱧᱮᱞᱚᱚᱜ]] ᱠᱷᱚᱱ ᱟᱨ ᱟᱢ ᱫᱚ ᱵᱟᱢ ᱵᱚᱸᱫᱽ ᱟᱠᱟᱱᱟ ᱱᱚᱶᱟ ᱵᱮᱵᱷᱟᱨ ᱠᱷᱚᱱ ᱾\nᱟᱢᱟᱜ ᱱᱤᱛᱚᱜᱟᱜ IP ᱵᱩᱴᱟᱹ ᱫᱚ $3, ᱟᱨ ᱵᱚᱸᱫᱽ ID ᱫᱚ #$5  \nᱫᱟᱭᱟᱠᱟᱛᱮ ᱥᱮᱞᱮᱫᱽ ᱢᱮ ᱪᱮᱛᱟᱱᱟᱜ ᱠᱟᱛᱷᱟᱠᱚ ᱡᱚᱛᱚ ᱞᱮᱠᱟᱱ ᱠᱩᱠᱞᱤ ᱨᱮ ᱾",
 	"blockednoreason": "ᱡᱟᱸᱦᱟᱸᱱ ᱚᱡᱮ ᱵᱟᱝ ᱮᱢᱠᱟᱱᱟ",
 	"whitelistedittext": "ᱥᱟᱦᱴᱟ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱛ $1 ᱮᱢ ᱦᱩᱭᱩᱜ-ᱟ᱾",
 	"nosuchsectiontitle": "ᱛᱷᱚᱠ ᱵᱟᱝ ᱧᱟᱢᱞᱮᱱᱟ",
@@ -500,7 +500,7 @@
 	"newarticle": "(ᱱᱟᱣᱟᱱᱟᱜ)",
 	"newarticletext": "ᱟᱢ ᱚᱠᱟ ᱥᱟᱦᱴᱟ ᱨᱮᱱᱟᱜ ᱡᱚᱱᱟᱲᱮᱢ ᱯᱟᱸᱡᱟᱸ ᱟᱹᱜᱩᱭᱫᱟ ᱚᱱᱚ ᱫᱚ ᱵᱟᱱᱩᱜ-ᱟ᱾\nᱚᱱᱟ ᱥᱟᱦᱴᱟ ᱛᱮᱭᱟᱨ ᱞᱟᱹᱜᱤᱛ ᱛᱮ, ᱞᱟᱛᱟᱨ ᱵᱟᱠᱥᱚ ᱵᱷᱤᱛᱨᱤᱨᱮ ᱚᱞ ᱮᱦᱚᱵ ᱢᱮ (ᱟᱨᱦᱚᱸ ᱡᱟᱹᱥᱛᱤ ᱵᱟᱰᱟᱭ ᱞᱟᱹᱜᱤᱛᱴᱮ [$1 ᱜᱚᱸᱲᱚᱸ ᱥᱟᱦᱴᱟ] ᱯᱟᱸᱡᱚᱸᱭᱢᱮ)᱾\nᱟᱢ ᱵᱷᱩᱞᱛᱮ ᱱᱚᱸᱰᱮᱢ ᱦᱮᱡ ᱟᱠᱟᱱ ᱠᱷᱟᱡ, ᱟᱢᱟᱜ ᱵᱨᱟᱣᱡᱟᱨ ᱨᱮᱱᱟᱜ '''ᱛᱟᱭᱚᱢ''' ᱵᱟᱴᱚᱱ ᱞᱤᱱᱢᱮ᱾",
 	"anontalkpagetext": "----\n\n<em>ᱱᱚᱶᱟ ᱫᱚ ᱜᱟᱞᱚᱪ ᱥᱟᱦᱴᱟ ᱠᱟᱱᱟ ᱩᱠᱩᱧᱩᱛᱩᱢ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱚᱣᱟᱜ ᱡᱟᱦᱟᱸᱭ ᱫᱚ ᱠᱷᱟᱛᱟ ᱵᱟᱭ ᱛᱮᱭᱟᱨ ᱟᱠᱟᱫᱟ ᱱᱤᱛ ᱦᱟᱹᱵᱤᱡ, ᱟᱨᱵᱟᱝ ᱡᱟᱦᱟᱸᱭ ᱵᱮᱵᱷᱟᱨ ᱟᱠᱟᱫᱟ ᱱᱚᱶᱟ ᱾</em>\nᱚᱱᱟᱛᱮ ᱟᱞᱮ ᱮᱞᱮᱞ IP ᱞᱮ ᱵᱮᱵᱷᱟᱨᱮᱜ-ᱟ ᱩᱱᱤ ᱪᱤᱱᱦᱟᱹᱣ ᱞᱟᱹᱜᱤᱫ ᱾\nᱚᱱᱠᱟᱱ IP ᱵᱩᱴᱟᱹ ᱫᱚ ᱦᱟᱹᱴᱤᱧ ᱫᱟᱲᱮᱭᱟᱜ-ᱟ ᱛᱤᱢᱤᱱ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱫᱟᱨᱟᱭᱛᱮ ᱾\nᱡᱩᱫᱤ ᱟᱢ ᱩᱠᱩᱧᱩᱛᱩᱢ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱟᱱᱟᱢ ᱟᱨ ᱵᱷᱟᱹᱵᱤᱭᱮᱜ-ᱟᱢ ᱵᱟᱝ ᱡᱚᱲᱟᱣᱟᱱ ᱠᱟᱛᱷᱟ ᱟᱢᱮ ᱩᱫᱩᱜᱢᱮ ᱠᱟᱱᱟ, ᱮᱱᱠᱷᱟᱱ  [[Special:CreateAccount|ᱠᱷᱟᱛᱟ ᱛᱮᱭᱟᱨᱢᱮ]] ᱟᱨᱵᱟᱝ [[Special:UserLogin|ᱞᱚᱜᱤᱱ]] ᱢᱮ ᱫᱟᱨᱟᱭ ᱵᱷᱮᱣᱱᱟ ᱠᱚ ᱥᱟᱦᱟᱭ ᱞᱟᱹᱜᱤᱫ ᱮᱴᱟᱜ ᱩᱠᱩᱧᱩᱛᱩᱢ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ ᱠᱚ ᱥᱟᱶ ᱾",
-	"noarticletext": "ᱱᱮᱛᱚᱜ ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟᱨᱮ ᱪᱮᱫᱜᱮ ᱵᱟᱹᱱᱩᱜ-ᱟ᱾\nᱮᱴᱟᱜ ᱥᱟᱦᱴᱟᱨᱮᱢ [[Special:Search/{{PAGENAME}}|search for this page title]],\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} search the related logs],\nor [{{fullurl:{{FULLPAGENAME}}|action=edit}} edit this page]</span>.",
+	"noarticletext": "ᱱᱮᱛᱚᱜ ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟᱨᱮ ᱪᱮᱫᱜᱮ ᱵᱟᱹᱱᱩᱜ-ᱟ᱾\nᱮᱴᱟᱜ ᱥᱟᱦᱴᱟᱨᱮᱢ [[Special:Search/{{PAGENAME}}|ᱱᱚᱶᱟ ᱥᱟᱦᱴᱟ ᱧᱩᱛᱩᱢ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ]],\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ᱡᱚᱲᱟᱣᱟᱱ ᱞᱚᱜᱽ ᱠᱚ ᱥᱮᱸᱫᱽᱨᱟᱭ ᱢᱮ],\nor [{{fullurl:{{FULLPAGENAME}}|action=edit}} ᱱᱚᱶᱟ ᱥᱟᱦᱴᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ]</span>.",
 	"noarticletext-nopermission": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟᱨᱮ ᱱᱤᱛᱚᱜ ᱪᱮᱫᱜᱮ ᱚᱞ ᱵᱟᱹᱱᱩᱜ-ᱟ᱾\n\nᱟᱢ [[Special:Search/{{PAGENAME}}|ᱱᱚᱭᱟ ᱥᱟᱦᱴᱟᱨᱮᱱᱟᱜ ᱧᱤᱛᱩᱢᱮᱢ ᱥᱮᱸᱫᱽᱨᱟ ᱫᱟᱲᱮᱭᱟᱜ-ᱟ]] ᱮᱴᱟᱜ ᱥᱟᱦᱴᱟ ᱠᱚᱨᱮᱦᱚᱸ,\nᱟᱨᱵᱟᱝ <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} search the related logs]</span>.",
 	"userpage-userdoesnotexist": "\"<nowiki>$1</nowiki>\" ńutuman jahãe beoharićaḱ ekaunṭ do baṅ resṭri hoeakana. Daya kate biḍạo katet́ ńelmẽ noa sakam do benoa/sompadonem menet́ kana se baṅ.",
 	"userpage-userdoesnotexist-view": "ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ \"$1\" ᱮᱠᱟᱣᱱᱴ ᱫᱚ ᱵᱟᱝ ᱨᱮᱥᱴᱨᱤ ᱟᱠᱟᱱᱟ᱾",
@@ -638,7 +638,7 @@
 	"searchrelated": "ᱥᱟᱹᱜᱟᱹᱭᱟᱱᱠᱩ",
 	"searchall": "ᱡᱚᱛᱚ",
 	"search-showingresults": "{{PLURAL:$4|ᱚᱨᱡᱚ <strong>$1</strong> ᱨᱮᱱᱟᱜ <strong>$3</strong>|ᱚᱨᱡᱚᱠᱚ <strong>$1 - $2</strong> ᱨᱮᱱᱟᱜ <strong>$3</strong>}}",
-	"search-nonefound": "ᱠᱩᱠᱞᱤ ᱥᱟᱶᱛᱮ ᱯᱷᱚᱞ ᱵᱟᱝ ᱢᱤᱞᱟᱹᱮ ᱞᱮᱱᱟ᱾",
+	"search-nonefound": "ᱠᱩᱠᱞᱤ ᱥᱟᱶᱛᱮ ᱚᱨᱡᱚ ᱵᱟᱝ ᱯᱚᱲᱛᱟ ᱞᱮᱱᱟ᱾",
 	"powersearch-ns": "ᱨᱟᱠᱷᱟ ᱧᱩᱛᱩᱢ ᱨᱮ ᱥᱮᱸᱫᱽᱨᱟ",
 	"powersearch-togglelabel": "ᱠᱷᱚᱸᱡᱽ:",
 	"powersearch-toggleall": "ᱡᱚᱛᱚ",
@@ -786,7 +786,7 @@
 	"recentchangeslinked-feed": "ᱥᱟᱹᱜᱟᱹᱭᱟᱱ ᱵᱚᱫᱚᱞᱠᱚ",
 	"recentchangeslinked-toolbox": "ᱥᱟᱹᱜᱟᱹᱭᱟᱱ ᱵᱚᱫᱚᱞᱠᱚ",
 	"recentchangeslinked-title": "ᱵᱚᱫᱚᱞᱟᱜ ᱠᱚᱫᱚ \"$1\" ᱥᱟᱶᱛᱮ ᱡᱚᱲᱟᱣ ᱜᱮᱭᱟ",
-	"recentchangeslinked-summary": "ᱱᱚᱣᱟ ᱫᱚ ᱚᱱᱟ ᱛᱟᱹᱞᱠᱟᱹ ᱠᱟᱱᱟ ᱚᱠᱟ ᱫᱟ ᱱᱮᱵᱮᱛᱟᱨᱜᱮ ᱵᱚᱫᱚᱞ ᱦᱩᱭ ᱟᱠᱟᱱᱟ ᱚᱠᱟ ᱫᱚ ᱛᱷᱚᱠ ᱦᱟᱛᱟᱣ ᱟᱠᱟᱱ ᱥᱟᱠᱟᱢ ᱠᱷᱚᱱ᱾\n\n[[Special:Watchlist|ᱟᱢᱟᱜ ᱧᱮᱞ ᱞᱤᱥᱴᱤ]] ᱨᱮᱭᱟᱜ ᱥᱟᱦᱴᱟ ᱫᱚ <strong>ᱢᱚᱴᱟ ᱛᱮ</strong> ᱚᱞ ᱟᱠᱟᱱᱟ ᱾",
+	"recentchangeslinked-summary": "ᱥᱟᱦᱴᱟ ᱨᱮᱱᱟᱜ ᱧᱩᱛᱩᱢ ᱟᱫᱮᱨᱢᱮ ᱡᱟᱦᱟᱸ ᱠᱷᱚᱱ ᱡᱚᱱᱚᱲᱟᱣ ᱟᱨᱵᱟᱝ ᱥᱟᱦᱴᱟ ᱵᱚᱫᱚᱞ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ ᱾ (ᱛᱷᱚᱠ ᱨᱮᱱᱟᱜ ᱥᱚᱦᱮᱫ ᱧᱮᱞ ᱞᱟᱹᱜᱤᱫ, ᱟᱫᱮᱨᱢᱮ {{ns:category}}:ᱛᱷᱚᱠ ᱧᱩᱛᱩᱢ) ᱾ [[Special:Watchlist|ᱟᱢᱟᱜ ᱧᱮᱞ ᱞᱤᱥᱴᱤ]] ᱨᱮᱱᱟᱜ ᱵᱚᱱᱚᱫᱚᱞᱟᱜ ᱥᱟᱦᱴᱟ ᱫᱚ <strong>ᱢᱚᱴᱟ ᱛᱮ</strong> ᱚᱞ ᱟᱠᱟᱱᱟ ᱾",
 	"recentchangeslinked-page": "ᱥᱟᱦᱴᱟ ᱧᱤᱛᱩᱢ :",
 	"recentchangeslinked-to": "ᱡᱚᱱᱚᱲ ᱥᱟᱦᱴᱟᱨᱮ ᱧᱮᱞ ᱚᱪᱚᱭ ᱢᱮ ᱮᱢᱟᱜ ᱥᱟᱦᱴᱟ ᱵᱟᱹᱜᱤ ᱠᱟᱛᱮ",
 	"upload": "ᱨᱮᱫ ᱞᱟᱫᱮᱢᱮ",
@@ -834,7 +834,7 @@
 	"filehist-thumb": "ᱴᱤᱯ",
 	"filehist-thumbtext": "Thumbnail for version as of $1",
 	"filehist-nothumb": "ᱵᱟᱹᱱᱩᱜ-ᱟ ᱴᱤᱯ-ᱨᱟᱢᱟ",
-	"filehist-user": "ᱵᱮᱵᱦᱟᱨᱤᱡ",
+	"filehist-user": "ᱵᱮᱵᱷᱟᱨᱤᱡ",
 	"filehist-dimensions": "ᱡᱚᱠᱷᱟ",
 	"filehist-filesize": "ᱨᱮᱫ ᱥᱟᱭᱤᱡᱽ",
 	"filehist-comment": "ᱠᱟᱛᱷᱟ",
@@ -869,7 +869,7 @@
 	"movethispage": "ᱱᱚᱶᱟ ᱥᱟᱦᱴᱟ ᱥᱟᱦᱟᱭᱢᱮ",
 	"pager-newer-n": "{{PLURAL:$1|1 ᱱᱟᱣᱟᱱᱟᱜ | ᱱᱟᱣᱟᱱᱟᱜ $1}}",
 	"pager-older-n": "{{PLURAL:$1|ᱢᱟᱨᱮᱭᱟᱜ 1|ᱢᱟᱨᱮᱭᱟᱜ $1}}",
-	"booksources": "ᱯᱚᱛᱚᱵ ᱯᱷᱮᱰᱟᱛ ᱦᱚᱨᱠᱟ",
+	"booksources": "ᱯᱚᱛᱚᱵ ᱯᱷᱮᱰᱟᱛ ᱠᱚ",
 	"booksources-search-legend": "ᱯᱚᱛᱚᱵ ᱨᱮᱭᱟᱜ ᱯᱷᱮᱰᱟᱛ ᱦᱚᱨ ᱞᱟᱹᱜᱤᱛ ᱥᱮᱸᱫᱽᱨᱟ",
 	"booksources-search": "ᱥᱮᱸᱫᱽᱨᱟ",
 	"specialloguserlabel": "ᱠᱟᱹᱢᱤᱭᱟᱹ:",
@@ -964,8 +964,8 @@
 	"sp-contributions-submit": "ᱥᱮᱸᱫᱽᱨᱟ",
 	"whatlinkshere": "ᱱᱚᱸᱰᱮ ᱫᱚ ᱪᱮᱫ ᱡᱚᱱᱚᱲ ᱠᱳ",
 	"whatlinkshere-title": "ᱚᱠᱟ ᱥᱟᱦᱴᱟ ᱠᱚᱫᱚ \"$1\" ᱨᱮ ᱡᱚᱱᱚᱲ ᱢᱮᱱᱟᱜ-ᱟ",
-	"whatlinkshere-page": "ᱥᱟᱦᱴᱟ",
-	"linkshere": "ᱞᱟᱛᱟᱨ ᱨᱮᱭᱟᱜ ᱥᱟᱦᱴᱟᱠᱚ ᱫᱚ '''[[:$1]]''' ᱡᱚᱱᱚᱲ ᱢᱮᱱᱟᱜ-ᱟ :",
+	"whatlinkshere-page": "ᱥᱟᱦᱴᱟ:",
+	"linkshere": "ᱞᱟᱛᱟᱨ ᱨᱮᱭᱟᱜ ᱥᱟᱦᱴᱟᱠᱚ ᱫᱚ <strong>[[:$1]]</strong> ᱥᱟᱶ ᱡᱚᱱᱚᱲ ᱢᱮᱱᱟᱜ-ᱟ :",
 	"nolinkshere": "ᱥᱟᱦᱴᱟ ᱡᱚᱱᱚᱲ ᱵᱟᱱᱩᱜ-ᱟ ᱱᱤᱭᱟᱹ <strong>[[:$1]]</strong>.",
 	"isredirect": "ᱵᱟᱝ ᱥᱚᱡᱽᱦᱮ ᱥᱟᱦᱴᱟ",
 	"istemplate": "ᱥᱮᱞᱮᱫ",
@@ -1030,7 +1030,7 @@
 	"tooltip-ca-history": "ᱱᱚᱭᱟ ᱥᱟᱦᱴᱟ ᱨᱮᱱᱟᱜ ᱮᱱᱟᱝ ᱱᱟᱝ ᱧᱮᱞ ᱨᱩᱟᱹᱲ",
 	"tooltip-ca-protect": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱨᱩᱠᱷᱤᱭᱟᱹᱭ ᱢᱮ",
 	"tooltip-ca-delete": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱜᱮᱫᱽ ᱢᱮ",
-	"tooltip-ca-move": "ᱱᱚᱣᱲ ᱥᱟᱦᱴᱟ ᱠᱩᱞᱢᱮ",
+	"tooltip-ca-move": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱩᱪᱟᱹᱲᱢᱮ",
 	"tooltip-ca-watch": "ᱱᱚᱭᱟ ᱥᱟᱦᱴᱟ ᱫᱚ ᱟᱢᱟᱜ ᱧᱮᱞᱚᱜ ᱛᱟᱹᱞᱠᱟᱹᱨᱮ ᱡᱚᱲᱟᱣᱢᱮ",
 	"tooltip-ca-unwatch": "ᱟᱢᱟᱜ ᱧᱮᱞ ᱛᱟᱹᱞᱠᱟᱹ ᱠᱷᱚᱡ ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱫᱚ ᱚᱪᱚᱜᱽ ᱢᱮ",
 	"tooltip-search": "ᱥᱮᱸᱫᱽᱨᱟ {{SITENAME}}",
@@ -1046,7 +1046,7 @@
 	"tooltip-n-help": "ᱥᱮᱸᱫᱽᱨᱟ ᱧᱟᱢ ᱨᱮᱭᱟᱜ ᱡᱟᱜᱟ",
 	"tooltip-t-whatlinkshere": "ᱥᱟᱱᱟᱢ ᱩᱤᱠᱤ ᱥᱟᱦᱴᱟ ᱨᱮᱱᱟᱜ ᱛᱟᱹᱞᱠᱟᱹ ᱟᱨ ᱡᱚᱱᱚᱲ ᱫᱚ ᱱᱚᱸᱰᱮ",
 	"tooltip-t-recentchangeslinked": "ᱱᱚᱭᱟ ᱥᱟᱦᱴᱟ ᱨᱮ ᱨᱚᱠᱟ ᱵᱚᱫᱚᱞ ᱟᱠᱟᱱ ᱥᱟᱦᱴᱟ ᱨᱮᱱᱟᱜ ᱡᱚᱱᱚᱲ",
-	"tooltip-feed-atom": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱞᱟᱹᱜᱤᱛ Atom feed",
+	"tooltip-feed-atom": "ᱱᱚᱣᱟ ᱥᱟᱦᱴᱟ ᱞᱟᱹᱜᱤᱫ ᱟᱴᱚᱢ ᱯᱷᱤᱰ",
 	"tooltip-t-contributions": "ᱮᱱᱮᱢ ᱨᱮᱱᱟᱜ ᱛᱟᱹᱞᱠᱟᱹ {{GENDER:$1|ᱱᱩᱭ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ}}",
 	"tooltip-t-emailuser": "ᱢᱤᱫ ᱤᱢᱮᱞ ᱠᱩᱞᱟᱭᱢᱮ {{GENDER:$1|ᱱᱩᱭ ᱵᱮᱵᱷᱟᱨᱤᱭᱟᱹ}}",
 	"tooltip-t-upload": "ᱨᱮᱫ ᱠᱚ ᱞᱟᱫᱮᱢᱮ",
@@ -1114,7 +1114,7 @@
 	"widthheightpage": "$1 × $2, $3 {{PLURAL:$3|ᱥᱟᱦᱴᱟ|ᱥᱟᱦᱴᱟᱠᱚ}}",
 	"file-info-size": "$1 x $2 pixels, file size: $3, MIME type: $4",
 	"file-info-size-pages": "$1 × $2 ᱯᱤᱠᱥᱮᱞ, ᱨᱮᱫ ᱥᱚᱝ: $3, MIME ᱞᱮᱠᱟᱱ: $4, $5 {{PLURAL:$5|ᱥᱟᱦᱴᱟ|ᱥᱟᱦᱴᱟᱠᱚ}}",
-	"file-nohires": "ᱟᱭᱢᱟ ᱨᱮᱡᱩᱞᱮᱥᱚᱱ ᱵᱟᱱᱩᱜ-ᱟ᱾",
+	"file-nohires": "ᱥᱮᱬᱟ ᱨᱮᱡᱩᱞᱮᱥᱚᱱ ᱵᱟᱱᱩᱜ-ᱟ᱾",
 	"svg-long-desc": "SVG ᱨᱮᱫ, ᱱᱚᱨᱢᱟᱞᱛᱮ $1 x $2 pixels, ᱨᱮᱫ ᱡᱟᱜᱟ: $3",
 	"show-big-image": "ᱟᱥᱚᱞ ᱨᱮᱫ",
 	"show-big-image-preview": "ᱧᱮᱞᱡᱚᱝ ᱨᱮᱱᱟᱜ ᱟᱠᱟᱨ:$1",
diff --git a/languages/i18n/skr-arab.json b/languages/i18n/skr-arab.json
index 0ee213e1cd..d549a85241 100644
--- a/languages/i18n/skr-arab.json
+++ b/languages/i18n/skr-arab.json
@@ -408,7 +408,7 @@
 	"yourdiff": "فرق",
 	"templatesused": "ایں ورقے تے  ورتے ڳئے {{PLURAL:$1|سانچے|سانچہ}}:",
 	"templatesusedpreview": "ایں کچے کم تے  ورتے ڳئے {{PLURAL:$1|سانچے|سانچہ}}:",
-	"template-protected": "(بچایا گیا)",
+	"template-protected": "(بچایا ڳیا)",
 	"template-semiprotected": "(نیم محفوظ)",
 	"hiddencategories": "ایہ ورقہ {{PLURAL:$1|1 لُکے زمریاں|$1 لکا زمرہ }} وچ شامل ہے:",
 	"permissionserrors": "خطائے اجازت",
@@ -861,7 +861,7 @@
 	"logentry-contentmodel-change-revertlink": "واپس",
 	"logentry-contentmodel-change-revert": "واپس",
 	"protectlogpage": "حفاظت لاگ",
-	"protectedarticle": "\"[[$1]]\" بچایا گیا اے",
+	"protectedarticle": "\"[[$1]]\" بچایا ڳیا ہے",
 	"modifiedarticleprotection": "«[[$1]]» دا درجہ حفاظت تبدیل کیتا",
 	"protectcomment": "سبب:",
 	"protectexpiry": "مُکسی:",
diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json
index f3e9296a7c..c5a187465b 100644
--- a/languages/i18n/sl.json
+++ b/languages/i18n/sl.json
@@ -515,6 +515,7 @@
 	"botpasswords-existing": "Obstoječa gesla botov",
 	"botpasswords-createnew": "Ustvari novo geslo bota",
 	"botpasswords-editexisting": "Uredi obstoječe geslo bota",
+	"botpasswords-label-needsreset": "(geslo mora biti ponastavljeno)",
 	"botpasswords-label-appid": "Ime bota:",
 	"botpasswords-label-create": "Ustvari",
 	"botpasswords-label-update": "Posodobi",
@@ -538,6 +539,7 @@
 	"botpasswords-restriction-failed": "Omejitve gesla bota preprečujejo to prijavo.",
 	"botpasswords-invalid-name": "Navedeno uporabniško ime ne vsebuje ločila za geslo bota (»$1«).",
 	"botpasswords-not-exist": "Uporabnik »$1« nima gesla bota z imenom »$2«.",
+	"botpasswords-needs-reset": "Geslo bota »$2« {{GENDER:$1|uporabnika|uporabnice}} »$1« mora biti ponastavljeno.",
 	"resetpass_forbidden": "Gesla ne morete spremeniti",
 	"resetpass_forbidden-reason": "Gesel nismo mogli spremeniti: $1",
 	"resetpass-no-info": "Za neposreden dostop do te strani morate biti prijavljeni.",
@@ -633,8 +635,8 @@
 	"subject-preview": "Predogled zadeve:",
 	"previewerrortext": "Med poskusom prikaza predogleda vaših sprememb je prišlo do napake.",
 	"blockedtitle": "Uporabnik je blokiran",
-	"blockedtext": "'''Urejanje z vašim uporabniškim imenom oziroma IP-naslovom je onemogočeno.'''\n\nBlokiral vas je $1.\nPodani razlog je ''$2''.\n\n* začetek blokade: $8\n* potek blokade: $6\n* blokirani uporabnik: $7\n\nO blokiranju se lahko pogovorite z uporabnikom/-co $1 ali katerim drugim [[{{MediaWiki:Grouppage-sysop}}|administratorjem]].\nVedite, da lahko ukaz »Pošlji uporabniku e-pismo« uporabite le, če ste v [[Special:Preferences|nastavitvah]] vpisali in potrdili svoj elektronski naslov in ta ni blokiran.\nVaš IP-naslov je $3, številka blokade pa #$5.\nProsimo, vključite ju v vse morebitne poizvedbe.",
-	"autoblockedtext": "Vaš IP-naslov je bil samodejno blokiran, saj je bil uporabljen s strani drugega uporabnika, ki ga je blokiral $1.\nRazlog za to je bil naslednji:\n\n:''$2''\n\n* Začetek blokade: $8\n* Konec blokade: $6\n* Blokirani uporabnik: $7\n\nKontaktirate lahko $1 ali katerega od drugih [[{{MediaWiki:Grouppage-sysop}}|administratorjev]], da razpravljate o blokadi.\n\nVedite, da lahko funkcijo »{{:MediaWiki:Emailuser/sl}}« uporabljate le, če ste v svoje [[Special:Preferences|uporabniške nastavitve]] vnesli veljaven e-poštni naslov, in vam njena uporaba ni bila preprečena.\n\nVaš trenutni IP-naslov je $3, ID blokiranja pa #$5. Prosimo, vključite ta ID v vsako zastavljeno vprašanje.",
+	"blockedtext": "<strong>Urejanje z vašim uporabniškim imenom oziroma IP-naslovom je onemogočeno.</strong>\n\nBlokiral vas je $1.\nPodani razlog je <em>$2</em>.\n\n* Začetek blokade: $8\n* Potek blokade: $6\n* Blokirani uporabnik: $7\n\nO blokiranju se lahko pogovorite z uporabnikom/-co $1 ali katerim drugim [[{{MediaWiki:Grouppage-sysop}}|administratorjem]].\nVedite, da lahko ukaz »{{int:emailuser}}« uporabite le, če ste v [[Special:Preferences|nastavitvah]] vpisali in potrdili svoj elektronski naslov in ta ni blokiran.\nVaš IP-naslov je $3, številka blokade pa #$5.\nProsimo, vključite ju v vse morebitne poizvedbe.",
+	"autoblockedtext": "Vaš IP-naslov je bil samodejno blokiran, saj je bil uporabljen s strani drugega uporabnika, ki ga je blokiral $1.\nRazlog za to je bil naslednji:\n\n:<em>$2</em>\n\n* Začetek blokade: $8\n* Konec blokade: $6\n* Blokirani uporabnik: $7\n\nKontaktirate lahko $1 ali katerega od drugih [[{{MediaWiki:Grouppage-sysop}}|administratorjev]], da razpravljate o blokadi.\n\nVedite, da lahko funkcijo »{{int:emailuser}}« uporabljate le, če ste v svoje [[Special:Preferences|uporabniške nastavitve]] vnesli veljaven e-poštni naslov, in vam njena uporaba ni bila preprečena.\n\nVaš trenutni IP-naslov je $3, ID blokiranja pa #$5. Prosimo, vključite ta ID v vsako zastavljeno vprašanje.",
 	"systemblockedtext": "Vaše uporabniško ime ali IP-naslov je MediaWiki samodejn blokiral.\nPodani razlog je:\n\n:<em>$2</em>\n\n* Začetek blokade: $8\n* Potek blokade: $6\n* Blokirani uporabnik: $7\n\nVaš trenutni IP-naslov je $3.\nProsimo, da v svoje poizvedbe vključite vse zgornje podatke.",
 	"blockednoreason": "razlog ni podan",
 	"whitelistedittext": "Za urejanje strani se morate $1.",
@@ -3995,5 +3997,6 @@
 	"pagedata-title": "Podatki strani",
 	"pagedata-text": "Ta stran nudi podatkovni vmesnik do strani. Prosimo, navedite naslov strani v URL-ju z uporabo skladnje podstrani.\n* Pogajanje o vsebini se nanaša na glavo Accept vašega odjemalca. To pomeni, da bomo podatke strani posredovali v obliki, ki vašemu odjemalcu bolj ustreza.",
 	"pagedata-not-acceptable": "Nismo našli ujemajoče oblike. Podprte vrste MIME: $1",
-	"pagedata-bad-title": "Neveljaven naslov: $1."
+	"pagedata-bad-title": "Neveljaven naslov: $1.",
+	"unregistered-user-config": "Iz varnostnih razlogov uporabniških podstrani JavaScript, CSS in JSON ne moremo naložiti neregistriranim uporabnikom."
 }
diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json
index 534190a536..6bf1e4fe6c 100644
--- a/languages/i18n/sv.json
+++ b/languages/i18n/sv.json
@@ -577,6 +577,7 @@
 	"botpasswords-existing": "Befintliga botlösenord",
 	"botpasswords-createnew": "Skapa ett nytt botlösenord",
 	"botpasswords-editexisting": "Redigera ett befintligt botlösenord",
+	"botpasswords-label-needsreset": "(lösenordet behöver återställas)",
 	"botpasswords-label-appid": "Botnamn:",
 	"botpasswords-label-create": "Skapa",
 	"botpasswords-label-update": "Uppdatera",
@@ -600,6 +601,7 @@
 	"botpasswords-restriction-failed": "Begränsningar av botlösenord tillåter inte denna inloggning.",
 	"botpasswords-invalid-name": "Det angivna användarnamnet innehåller inte separatorn för botlösenord (\"$1\").",
 	"botpasswords-not-exist": "Användaren \"$1\" har inte ett botlösenord som är \"$2\".",
+	"botpasswords-needs-reset": "Botlösenordet för botnamnet \"$2\" till {{GENDER:$1|användaren}} \"$1\" måste återställas.",
 	"resetpass_forbidden": "Lösenord kan inte ändras",
 	"resetpass_forbidden-reason": "Lösenorden kan inte ändras: $1",
 	"resetpass-no-info": "Du måste vara inloggad för att komma åt den här sidan direkt.",
@@ -695,8 +697,8 @@
 	"subject-preview": "Förhandsgranskning av ämne:",
 	"previewerrortext": "Ett fel uppstod när dina ändringar skulle förhandsgranskas.",
 	"blockedtitle": "Användaren är blockerad",
-	"blockedtext": "'''Din IP-adress eller ditt användarnamn är blockerat.'''\n\nBlockeringen utfördes av $1 med motiveringen: ''$2''.\n\n* Blockeringen startade: $8\n* Blockeringen gäller till: $6.\n* Blockeringen var avsedd för: $7.\n\nDu kan kontakta $1 eller någon annan av [[{{MediaWiki:Grouppage-sysop}}|administratörerna]] för att diskutera blockeringen.\nOm du är inloggad och har uppgivit en e-postadress i dina [[Special:Preferences|inställningar]] så kan du använda funktionen 'Skicka e-post till den här användaren', såvida du inte blivit blockerad från funktionen.\n\nDin IP-adress är $3 och blockerings-ID är #$5.\nVänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.",
-	"autoblockedtext": "Din IP-adress har blockerats automatiskt eftersom den har använts av en annan användare som blockerats av $1.\nMotiveringen av blockeringen var:\n\n:''$2''\n\n* Blockeringen startade: $8\n* Blockeringen gäller till: $6\n* Blockeringen är avsedd för: $7\n\nDu kan kontakta $1 eller någon annan [[{{MediaWiki:Grouppage-sysop}}|administratör]] för att diskutera blockeringen.\n\nObservera att du inte kan använda dig av funktionen \"skicka e-post till användare\" om du inte har registrerat en giltig e-postadress i [[Special:Preferences|dina inställningar]] eller om du har blivit blockerad från att skicka e-post.\n\nDin nuvarande IP-adress är $3, och blockerings-ID är #$5.\nVänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.",
+	"blockedtext": "'''Din IP-adress eller ditt användarnamn är blockerat.'''\n\nBlockeringen utfördes av $1 med motiveringen: ''$2''.\n\n* Blockeringen startade: $8\n* Blockeringen gäller till: $6.\n* Blockeringen var avsedd för: $7.\n\nDu kan kontakta $1 eller någon annan av [[{{MediaWiki:Grouppage-sysop}}|administratörerna]] för att diskutera blockeringen.\nOm du är inloggad och har uppgivit en e-postadress i dina [[Special:Preferences|inställningar]] så kan du använda funktionen \"{{int:emailuser}}\", såvida du inte blivit blockerad från funktionen.\n\nDin IP-adress är $3 och blockerings-ID är #$5.\nVänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.",
+	"autoblockedtext": "Din IP-adress har blockerats automatiskt eftersom den har använts av en annan användare som blockerats av $1.\nMotiveringen av blockeringen var:\n\n:''$2''\n\n* Blockeringen startade: $8\n* Blockeringen gäller till: $6\n* Blockeringen är avsedd för: $7\n\nDu kan kontakta $1 eller någon annan [[{{MediaWiki:Grouppage-sysop}}|administratör]] för att diskutera blockeringen.\n\nObservera att du inte kan använda dig av funktionen \"{{int:emailuser}}\" om du inte har registrerat en giltig e-postadress i [[Special:Preferences|dina inställningar]] eller om du har blivit blockerad från att skicka e-post.\n\nDin nuvarande IP-adress är $3, och blockerings-ID är #$5.\nVänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.",
 	"systemblockedtext": "Ditt användarnamn eller IP-adress h    ar blockerats automatiskt av MediaWiki.\n\nMotiveringen av blockeringen var:\n\n:<em>$2</em>\n\n* Blockeringen startade: $8\n* Blockeringen gäller till: $6\n* Blockeringen är avsedd för: $7\n\nDin nuvarande IP-adress är $3.\nVänligen ange informationen ovan i alla förfrågningar som du gör i ärendet.",
 	"blockednoreason": "ingen motivering angavs",
 	"whitelistedittext": "Vänligen $1 för att redigera sidor.",
@@ -1549,7 +1551,7 @@
 	"recentchangeslinked-feed": "Relaterade ändringar",
 	"recentchangeslinked-toolbox": "Relaterade ändringar",
 	"recentchangeslinked-title": "Ändringar relaterade till \"$1\"",
-	"recentchangeslinked-summary": "Ange namnet på en sida för att se ändringar på sidor som länkas till eller från denna sida. (För att se medlemmar i en kategori, skriv Kategori:Namnet på kategorin). Ändringar på sidor i [[Special:Watchlist|din bevakningslista]] är <strong>fetstilta</strong>.",
+	"recentchangeslinked-summary": "Ange namnet på en sida för att se ändringar på sidor som länkas till eller från denna sida. (För att se medlemmar i en kategori, skriv {{ns:category}}:Namnet på kategorin). Ändringar på sidor i [[Special:Watchlist|din bevakningslista]] är <strong>fetstilta</strong>.",
 	"recentchangeslinked-page": "Sidnamn:",
 	"recentchangeslinked-to": "Visa ändringar på sidor med länkar till den givna sidan istället",
 	"recentchanges-page-added-to-category": "[[:$1]] lades till i kategorin",
@@ -4071,5 +4073,6 @@
 	"pagedata-title": "Siddata",
 	"pagedata-text": "Denna sida tillhandahåller ett datagränssnitt till sidor. Ange sidans titel i webbadressen med hjälp av undersidesyntax.\n* Innehållsförhandling gäller baserat på att din klients Accept-header. Detta innebär att siddatan kommer att tillhandahållas i det format som din klient föredrar.",
 	"pagedata-not-acceptable": "Inga matchande format finns. MIME-typer som stöds:$1",
-	"pagedata-bad-title": "Ogiltig titel: $1."
+	"pagedata-bad-title": "Ogiltig titel: $1.",
+	"unregistered-user-config": "Av säkerhetsskäl kan inte undersidor med JavaScript, CSS och JSON läsas in för oregistrerade användare."
 }
diff --git a/languages/i18n/szl.json b/languages/i18n/szl.json
index d78fcd1489..3a94c67936 100644
--- a/languages/i18n/szl.json
+++ b/languages/i18n/szl.json
@@ -158,7 +158,7 @@
 	"and": "&#32;a",
 	"faq": "FAQ",
 	"actions": "Akcyje",
-	"namespaces": "Raumy mjan",
+	"namespaces": "Przestrzynie mian",
 	"variants": "Ôpcyje",
 	"navigation-heading": "Menu nawigacyje",
 	"errorpagetitle": "Feler",
@@ -260,7 +260,7 @@
 	"feed-invalid": "Ńywłaściwy typ kanałů informacyjnygo.",
 	"feed-unavailable": "Kanoły informacyjne ńy sům dostympne",
 	"site-rss-feed": "Kanoł RSS {{GRAMMAR:D.lp|$1}}",
-	"site-atom-feed": "Kanŏł Atom {{GRAMMAR:D.lp|$1}}",
+	"site-atom-feed": "Kanoł Atom {{GRAMMAR:D.lp|$1}}",
 	"page-rss-feed": "Kanoł RSS \"$1\"",
 	"page-atom-feed": "Kanoł Atom \"$1\"",
 	"red-link-title": "$1 (niy ma zajty)",
@@ -347,15 +347,15 @@
 	"welcomecreation-msg": "Uotwarli my sam lo Ćebje kůnto.\nPamjyntej coby posztalować [[Special:Preferences|preferencyji]]",
 	"yourname": "Mjano użytkowńika:",
 	"userlogin-yourname": "Mjano używocza",
-	"userlogin-yourname-ph": "Wszkryflej swoje mjano użytkowńika",
+	"userlogin-yourname-ph": "Wkludź swoje miano używacza",
 	"createacct-another-username-ph": "Wszkryflej mjano użytkowńika",
 	"yourpassword": "Hasło:",
 	"userlogin-yourpassword": "Hasło",
-	"userlogin-yourpassword-ph": "Wszkryflej swoje hasło",
-	"createacct-yourpassword-ph": "Wszkryflej hasło",
+	"userlogin-yourpassword-ph": "Wkludź swoje hasło",
+	"createacct-yourpassword-ph": "Wkludź hasło",
 	"yourpasswordagain": "Naszkryflej ausdruk zaś",
 	"createacct-yourpasswordagain": "Potwjyrdź hasło",
-	"createacct-yourpasswordagain-ph": "Wszkryflej hasło jeszcze roz",
+	"createacct-yourpasswordagain-ph": "Wkludź hasło jeszcze rŏz",
 	"userlogin-remembermypassword": "Ńy wylogůwywuj mje",
 	"userlogin-signwithsecure": "Użyj bezpjecznygo połůnczyńa",
 	"yourdomainname": "Twoja domyna",
@@ -375,7 +375,7 @@
 	"userlogin-createanother": "Twůrz inksze kůnto",
 	"createacct-emailrequired": "E-brif",
 	"createacct-emailoptional": "E-brif (uopcjůnalne)",
-	"createacct-email-ph": "Wszkryflej swůj adres do e-brifa",
+	"createacct-email-ph": "Wkludź swojã adresã e-brifa",
 	"createacct-another-email-ph": "Nastow e-brif",
 	"createaccountmail": "Użyj chwilowygo hasła losowo genyrowanygo a wyślij je na wrychtowany adres e-brifa.",
 	"createacct-realname": "Prawdźiwe imje a nazwisko (uopcjůnalńe)",
@@ -718,7 +718,7 @@
 	"searchprofile-images": "Multimedyja",
 	"searchprofile-everything": "Wszyjsko",
 	"searchprofile-advanced": "Rozszerzůne",
-	"searchprofile-articles-tooltip": "Podszukowaniy we zorcie mian $1",
+	"searchprofile-articles-tooltip": "Podszukowaniy we przestrzyni mian $1",
 	"searchprofile-images-tooltip": "Szukej plikōw",
 	"searchprofile-everything-tooltip": "Podszukowaniy cołkij zawartości (a tyż zajtōw dyskusyje)",
 	"searchprofile-advanced-tooltip": "Podszukowaniy we ôbranych zortach mian",
@@ -1429,11 +1429,11 @@
 	"undelete-error-long": "Napotkano felery při wćepywańu nazod plika:\n\n$1",
 	"undelete-show-file-confirm": "Jeżeś echt pewny co chcesz uobejzdrzeć wyćepano wersyjo plika „<nowiki>$1</nowiki>” s $2 $3?",
 	"undelete-show-file-submit": "Ja",
-	"namespace": "Raum mjan:",
+	"namespace": "Przestrzyń mian:",
 	"invert": "Wybjer na uopy",
-	"tooltip-invert": "Uoznacz te pole, coby ukryć půmjany na zajtach we uobranych raumach mjan (a powjůnzanych ze ńimi inkszymi raumami mjan, eli uoznaczůno)",
-	"namespace_association": "powjůnzany raum mjan",
-	"tooltip-namespace_association": "Uoznacz te pole, coby uwzglyndńić zajty dyskusyji i tyjmy powjůnzane ze uobranymi raumami mjan",
+	"tooltip-invert": "Ôznŏcz tyn kastlik, coby skryć pōmiany na zajtach we ôbranych przestrzyniach mian (i swiōnzanych ze nimi inkszymi przestrzyniami mian, eli ôznŏczōno)",
+	"namespace_association": "powiōnzanŏ przestrzyń mian",
+	"tooltip-namespace_association": "Ôznŏcz tyn kastlik, coby zawrzić zajty dyskusyje i tyjmy swiōnzane ze ôbranymi przestrzyniami mian",
 	"blanknamespace": "(przodńo)",
 	"contributions": "Ajnzac {{GENDER:$1|używocza|używoczki}}",
 	"contributions-title": "Wkłod użytkowńika $1",
diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json
index 0226e5c375..db9fe9667e 100644
--- a/languages/i18n/tr.json
+++ b/languages/i18n/tr.json
@@ -600,6 +600,7 @@
 	"botpasswords-existing": "Mevcut bot parolaları",
 	"botpasswords-createnew": "Yeni bir bot parolası oluştur",
 	"botpasswords-editexisting": "Mevcut bir bot parolasını düzenle",
+	"botpasswords-label-needsreset": "(parolanın sıfırlanması gerekiyor)",
 	"botpasswords-label-appid": "Bot ismi:",
 	"botpasswords-label-create": "Oluştur",
 	"botpasswords-label-update": "Güncelle",
@@ -621,6 +622,7 @@
 	"botpasswords-no-provider": "BotPasswordsSessionProvider kullanılamaz.",
 	"botpasswords-restriction-failed": "Bot parolası kısıtlamaları bu oturum açma işlemini önlemektedir.",
 	"botpasswords-invalid-name": "Belirtilen kullanıcı adı bot parolası ayırıcısı içermiyor (\"$1\").",
+	"botpasswords-needs-reset": "\"$1\" {{GENDER:$1|kullanıcısına}} ait \"$2\" adlı bot için bot parolası sıfırlanmalı.",
 	"resetpass_forbidden": "Parolalar değiştirilememektedir",
 	"resetpass_forbidden-reason": "Parolalar değiştirilemez: $1",
 	"resetpass-no-info": "Bu sayfaya doğrudan erişmek için oturum açmanız gereklidir.",
diff --git a/languages/i18n/yo.json b/languages/i18n/yo.json
index e86700b7a7..38f7e624ac 100644
--- a/languages/i18n/yo.json
+++ b/languages/i18n/yo.json
@@ -1115,7 +1115,7 @@
 	"recentchangeslinked-feed": "Àtúnṣe tó báramu",
 	"recentchangeslinked-toolbox": "Àtúnṣe tó báramu",
 	"recentchangeslinked-title": "Àtúnṣe tó báramu mọ́ \"$1\"",
-	"recentchangeslinked-summary": "Àkójọ àwọn àtúnṣe tí a sẹ̀sẹ̀ ṣe sí àwọn ojúewé tó jápọ̀ wá láti ojúewé pàtó kan (tàbí sí ìkan nìnú ẹ̀ka pàtó kan).\nÀwọn ojúewé inú [[Special:Watchlist|ìmójútó yín]] jẹ́ '''kedere'''.",
+	"recentchangeslinked-summary": "Ẹ tẹ orúkọ ojúewé láti rí àwọn àtúnṣe lórí àwọn ojúewé tí wọ́n jápọ̀ sí tàbí jápọ̀ wá láti ọ̀dọ̀ ojúewé nà. (Láti rí àwọn ojúewé inú ẹ̀ka, ẹ tẹ {{ns:category}}:Orúkọ ẹ̀ka).\nÀwọn àtúnṣe ojúewé inú [[Special:Watchlist|Ìtòjọ àmójútó yín]] ni àwọn tó hàn <strong>kedere</strong>.",
 	"recentchangeslinked-page": "Orúkọ ojúewé:",
 	"recentchangeslinked-to": "Àfihàn àwọn àtúnṣe sí àwọn ojúewé tójápọ̀ mọ́ ojúewé ọ̀hún dípò",
 	"upload": "Ìrùsókè fáìlì",
diff --git a/languages/i18n/zgh.json b/languages/i18n/zgh.json
index cc2c27ec29..8e18bf7f37 100644
--- a/languages/i18n/zgh.json
+++ b/languages/i18n/zgh.json
@@ -328,6 +328,8 @@
 	"searchall": "ⴰⴽⴽ",
 	"search-nonefound": "ⵓⵔ ⵍⵍⵉⵏⵜ ⵜⵢⴰⴼⵓⵜⵉⵏ ⵉⵎⵙⴰⵙⴰⵏ ⴷ ⵓⵙⵓⵜⵔ.",
 	"mypreferences": "ⵉⵙⵎⵏⵢⵉⴼⵏ",
+	"prefs-watchlist-days": "ⵓⵙⵙⴰⵏ ⵜⵓⵙⴽⵏⵉⵏ ⴳ ⵓⵎⵓⵖ ⵓⵙⵎⵓⵇⵇⵍ",
+	"recentchangesdays": "ⵓⵙⵙⴰⵏ ⵜⵓⵙⴽⵏⵉⵏ ⴳ ⵉⵙⵏⴼⵉⵍⵏ ⵉⵎⴳⴳⵓⵔⴰ",
 	"prefs-files": "ⵉⴼⴰⵢⵍⵓⵜⵏ",
 	"youremail": "ⵉⵎⴰⵢⵍ:",
 	"yourlanguage": "ⵜⵓⵜⵍⴰⵢⵜ:",
@@ -336,6 +338,7 @@
 	"prefs-signature": "ⴰⵙⴳⵎⴹ",
 	"userrights-reason": "ⵜⴰⵎⵏⵜⵉⵍⵜ:",
 	"group-sysop": "ⵉⵏⵎⵀⴰⵍⵏ",
+	"right-edit": "ⵙⵏⴼⵍ ⵜⴰⵙⵏⵉⵡⵉⵏ",
 	"right-upload": "ⵙⴽⵜⵔ ⵉⴼⴰⵢⵍⵓⵜⵏ",
 	"right-upload_by_url": "ⵙⴽⵜⵔ ⴰⴼⴰⵢⵍⵓ ⵙⴳ URL",
 	"right-writeapi": "ⴰⵙⵙⵎⵔⵙ ⵏ API ⵉ ⵜⵉⵔⵔⴰ",
@@ -355,6 +358,8 @@
 	"recentchanges-label-plusminus": "ⵜⴰⵙⵎⴽⵜⴰ ⵏ ⵜⴰⵙⵏⴰ ⴰⴷ ⵜⵙⵙⵏⴼⵍ ⵙ ⵓⵎⴹⴰⵏ ⴰⴷ ⵏ ⵉⴱⴰⵢⵜⵏ",
 	"recentchanges-legend-heading": "<strong>ⴰⵙⵙⴼⵔⵓ:</strong>",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (ⵥⵔ ⴰⵍⵜⵓ [[Special:NewPages|ⵜⴰⵍⴳⴰⵎⵜ ⵏ ⵜⴰⵙⵏⵉⵡⵉⵏ ⵜⵉⵎⴰⵢⵏⵓⵜⵉⵏ]])",
+	"rcfilters-days-title": "ⵓⵙⵙⴰⵏ ⵉⵎⴳⴳⵓⵔⴰ",
+	"rcfilters-days-show-days": "$1 ⵏ {{PLURAL:$1|ⵡⴰⵙⵙ|ⵡⵓⵙⵙⴰⵏ}}",
 	"rclistfrom": "ⵙⴽⵏ ⵉⵙⵏⴼⵍⵏ ⵉⵎⴰⵢⵏⵓⵜⵏ ⵙⴳ $2,$3",
 	"rcshowhideminor": "$1 ⵉⵙⵏⴼⴰⵍ ⵓⵎⵥⵉⵢⵏ",
 	"rcshowhideminor-show": "ⵙⴽⵏ",
@@ -427,6 +432,7 @@
 	"randompage": "ⵜⴰⵙⵏⴰ ⵜⴰⴷⵀⵎⴰⵙⵜ",
 	"statistics": "ⴰⵙⵏⵎⴽⵜⴰ",
 	"statistics-pages": "ⵜⴰⵙⵏⵉⵡⵉⵏ",
+	"brokenredirects-edit": "ⵙⵏⴼⵍ",
 	"brokenredirects-delete": "ⴽⴽⵙ",
 	"withoutinterwiki-legend": "ⴰⵣⵡⵉⵔ",
 	"nbytes": "$1 {{PLURAL:$1|ⴱⴰⵢⵜ|ⵉⴷ ⴱⴰⵢⵜ}}",
@@ -605,6 +611,7 @@
 	"show-big-image-preview": "ⵜⴰⵙⵎⴽⵜⴰ ⵏ ⵓⵣⵔⵉⵣⵡⴰⵔ ⴰⴷ: $1.",
 	"show-big-image-other": "{{PLURAL:$2|ⵜⴰⴼⵙⴰⵢⵜ|ⵜⵉⴼⵙⴰⵢⵉⵏ}}: ⵢⴰⴹⵏ $1.",
 	"show-big-image-size": "$1 × $2 ⵉⴷ ⴱⵉⴽⵙⵍ",
+	"days": "{{PLURAL:$1|$1 ⵡⴰⵙⵙ|$1 ⵡⵓⵙⵙⴰⵏ}}",
 	"metadata": "ⵎⵉⵜⴰⴷⴰⵜⴰ",
 	"metadata-help": "ⴰⵙⴷⴰⵡ ⴰ ⵢⵓⵎⴰ ⵉⵏⵖⵎⵉⵙⵏ ⵉⵎⵔⵏⴰⵏⵉⵏ, ⵉⵔⵡⴰⵙ ⵉⵙ ⴰⵙ ⵜⵜⵡⴰⵔⵏⵉⵏ ⵙ ⵍⴽⴰⵎⵉⵔⴰ ⵜⴰⵎⵓⵟⵟⵓⵏⵜ ⵏⵖ ⴰⵙⵏⴼⴰⵍ ⴰⵎⵓⵟⵟⵓⵏ ⵉⵜⵜⴰⵡⵙⵎⵔⵙⵏ ⴳ ⵓⵙⵏⴼⵍⵓⵍ ⵏ ⵓⵙⴷⴰⵡ ⴰ.\nⵉⵖ ⵉⵜⵜⵙⵏⴼⵍ ⵓⵙⴷⴰⵡ ⴰ ⵙⴳ ⵡⴰⴷⴷⴰⴷ ⵏⵙ ⴰⵎⵓⴷⴰⵏ, ⴽⵔⴰ ⵏ ⵉⴼⵔⵓⵔⵉⵜⵏ ⵓⵔ ⵔⴰⵏ ⵙⵓⵍ ⴳⵔⵏ ⴳ ⵓⵙⴷⴰⵡ ⵉⵜⵜⵙⵏⴼⵍⵏ.",
 	"metadata-fields": "ⵉⴳⵔⴰⵏ ⵏ ⵎⵉⵜⴰⵉⵙⴼⴽⴰ ⵏ ⵜⵉⵡⵍⴰⴼⵉⵏ ⵏⵏⴰ ⵉⴼⵙⵔⵏ ⴳ ⵜⴱⵔⴰⵜ ⴰⴷ ⵔⴰⴷ ⵉⵍⵉⵏ ⴳ ⵜⴰⵙⵏⴰ ⵏ ⵓⵙⵏⵓⵎⵎⵍ ⵏ ⵜⴰⵡⵍⴰⴼⵜ ⴰⴽⵓⴷ ⵏⵏⴰ ⵉⵎⵓⵏ ⵓⵙⴽⵜⵓⵔ. ⵉⴳⵔⴰⵏ ⵢⴰⴹⵏ ⵔⴰⴷ ⴼⴼⵔⵏ ⵙ ⵓⵎⵕⴰⴹ.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
@@ -647,6 +654,7 @@
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|ⴰⵔⵛⵓⵎ|ⵉⵔⵛⵓⵎⵏ}}]]: $2)",
 	"tags-active-yes": "ⵢⴰⵀ",
 	"tags-active-no": "ⵓⵀⵓ",
+	"tags-edit": "ⵙⵏⴼⵍ",
 	"tags-delete": "ⴽⴽⵙ",
 	"tags-create-reason": "ⵜⴰⵎⵏⵜⵉⵍⵜ:",
 	"tags-delete-reason": "ⵜⴰⵎⵏⵜⵉⵍⵜ:",
diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json
index 1eaf278251..c890f9a7d9 100644
--- a/languages/i18n/zh-hans.json
+++ b/languages/i18n/zh-hans.json
@@ -719,8 +719,8 @@
 	"subject-preview": "主题的预览：",
 	"previewerrortext": "尝试预览您的更改时发生错误。",
 	"blockedtitle": "用户被封禁",
-	"blockedtext": "<strong>您的用户名或IP地址已被封禁。</strong>\n\n执行封禁的管理员是$1。封禁原因是<em>$2</em>。\n\n* 开始时间：$8\n* 到期时间：$6\n* 目标用户：$7\n\n您可以联络$1或其他[[{{MediaWiki:Grouppage-sysop}}|管理员]]讨论该封禁。只有当您在[[Special:Preferences|系统设置]]确认了电子邮件地址且未被禁止使用“电邮联系”功能时，才可以使用它。您当前的IP地址是$3，该封禁ID是#$5。请在您做出的任何查询中包含所有上述详情。",
-	"autoblockedtext": "您的IP地址因曾被一位被$1封禁的用户使用而被自动封禁。封禁原因：\n\n:<em>$2</em>\n\n* 开始时间：$8\n* 到期时间：$6\n* 目标用户：$7\n\n您可以联系$1或其他[[{{MediaWiki:Grouppage-sysop}}|管理员]]申诉该封禁。\n\n请注意，只有当您已在[[Special:Preferences|系统设置]]确认了电子邮件地址且未被禁止使用“电邮联系”功能时，才能发送电子邮件联系管理员。\n\n您当前的IP地址为$3，该封禁ID为#$5。请在您做出的任何查询中包含所有上述详情。",
+	"blockedtext": "<strong>您的用户名或IP地址已被封禁。</strong>\n\n执行封禁的管理员是$1。封禁原因是<em>$2</em>。\n\n* 开始时间：$8\n* 到期时间：$6\n* 目标用户：$7\n\n您可以联络$1或其他[[{{MediaWiki:Grouppage-sysop}}|管理员]]讨论该封禁。只有当您在[[Special:Preferences|系统设置]]确认了电子邮件地址且未被禁止使用“{{int:emailuser}}”功能时，才可以使用它。您当前的IP地址是$3，该封禁ID是#$5。请在您做出的任何查询中包含所有上述详情。",
+	"autoblockedtext": "您的IP地址因曾被一位被$1封禁的用户使用而被自动封禁。封禁原因：\n\n:<em>$2</em>\n\n* 开始时间：$8\n* 到期时间：$6\n* 目标用户：$7\n\n您可以联系$1或其他[[{{MediaWiki:Grouppage-sysop}}|管理员]]申诉该封禁。\n\n请注意，只有当您已在[[Special:Preferences|系统设置]]确认了电子邮件地址且未被禁止使用“{{int:emailuser}}”功能时，才能发送电子邮件联系管理员。\n\n您当前的IP地址为$3，该封禁ID为#$5。请在您做出的任何查询中包含所有上述详情。",
 	"systemblockedtext": "您的用户名或IP地址已被MediaWiki自动封禁。封禁原因：\n\n:<em>$2</em>\n\n* 开始时间：$8\n* 到期时间：$6\n* 目标用户：$7\n\n您当前的IP地址是$3。请在您做出的任何查询中包含所有上述详情。",
 	"blockednoreason": "未给出原因",
 	"whitelistedittext": "请$1以编辑页面。",
diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json
index 3a14a15753..39f83618b0 100644
--- a/languages/i18n/zh-hant.json
+++ b/languages/i18n/zh-hant.json
@@ -134,7 +134,7 @@
 	"tog-watchlisthideminor": "隱藏監視清單中的次要修訂",
 	"tog-watchlisthideliu": "隱藏監視清單中已登入使用者的編輯",
 	"tog-watchlistreloadautomatically": "查詢條件變更時自動重新讀取監視清單（需要使用 JavaScript）",
-	"tog-watchlistunwatchlinks": "添加監視列表條目的直接（取消）監視鏈接（需要JavaScript才能打開功能）",
+	"tog-watchlistunwatchlinks": "為帶有變更的監試頁面添加直接（取消）監視標記（{{int:Watchlist-unwatch}}/{{int:Watchlist-unwatch-undo}}），需要 JavaScript 來打開功能",
 	"tog-watchlisthideanons": "隱藏監視清單中匿名使用者的編輯",
 	"tog-watchlisthidepatrolled": "隱藏監視清單中已巡查的編輯",
 	"tog-watchlisthidecategorization": "隱藏頁面分類",
@@ -442,7 +442,7 @@
 	"cascadeprotected": "此頁面被保護無法編輯，因為此頁面被以下開啟 \"連鎖保護\" 選項的{{PLURAL:$1|一頁|數頁}}保護頁面引用：\n$2",
 	"namespaceprotected": "您沒有權限編輯 <strong>$1</strong> 命名空間的頁面。",
 	"customcssprotected": "您並沒有權限編輯此 CSS 頁面，因為此頁面包含了其他使用者的個人設定。",
-	"customjsonprotected": "您沒有權限編輯此 CSS 頁面，因為此頁面包含了其他使用者的個人設定。",
+	"customjsonprotected": "您沒有權限編輯此JSON頁面，因為此頁面包含了其他使用者的個人設定。",
 	"customjsprotected": "您並沒有權限編輯此 JavaScript 頁面，因為此頁面包含了其他使用者的個人設定。",
 	"mycustomcssprotected": "您沒有權限編輯此 CSS 頁面。",
 	"mycustomjsonprotected": "您沒有權限編輯此 JSON 頁面。",
@@ -559,7 +559,7 @@
 	"noemailprefs": "在您的偏好設定中設定電子郵件地址，讓您可以使用這些功能。",
 	"emailconfirmlink": "確認您的電子郵件地址",
 	"invalidemailaddress": "無法接受格式不正確的電子郵件地址，請輸入正確的電子郵件地址格式或略過填寫該欄位。",
-	"cannotchangeemail": "此 Wiki 禁止更改帳號的電子郵件地址。",
+	"cannotchangeemail": "此 wiki 無法變更帳號的電子郵件地址。",
 	"emaildisabled": "此網站不能傳送電子郵件。",
 	"accountcreated": "已建立帳號",
 	"accountcreatedtext": "使用者帳號 [[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|對話]]) 已建立。",
@@ -596,6 +596,7 @@
 	"botpasswords-existing": "已存在機器人密碼",
 	"botpasswords-createnew": "建立新機器人密碼",
 	"botpasswords-editexisting": "編輯已存在的機器人密碼",
+	"botpasswords-label-needsreset": "（密碼需要重新設定）",
 	"botpasswords-label-appid": "機器人名稱：",
 	"botpasswords-label-create": "建立",
 	"botpasswords-label-update": "更新",
@@ -619,6 +620,7 @@
 	"botpasswords-restriction-failed": "機器人密碼限制已拒絕此次登入。",
 	"botpasswords-invalid-name": "指定的使用者名稱未包含機器人密碼分隔字元 (\"$1\")。",
 	"botpasswords-not-exist": "使用者 \"$1\" 並沒有名稱為 \"$2\" 的機器人密碼。",
+	"botpasswords-needs-reset": "給{{GENDER:$1|使用者}}「$1」的機器人名稱「$2」該機器人密碼已重新設定。",
 	"resetpass_forbidden": "無法變更密碼",
 	"resetpass_forbidden-reason": "無法變更密碼：$1",
 	"resetpass-no-info": "您必須直接登入存取這個頁面。",
@@ -714,8 +716,8 @@
 	"subject-preview": "預覽主旨：",
 	"previewerrortext": "嘗試預覽您的變更時發生錯誤。",
 	"blockedtitle": "使用者已被封鎖",
-	"blockedtext": "<strong>您的使用者名稱或 IP 位址已被封鎖。</strong>\n\n您被 $1 封鎖，\n原因爲 <em>$2</em>。\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 相關封鎖對象：$7\n\n您可以聯絡 $1 或其他的 [[{{MediaWiki:Grouppage-sysop}}|管理員]] 討論封鎖的相關問題。\n若您已在 [[Special:Preferences|偏好設定]] 中設定了一個有效的電子郵件地址，且尚未被封鎖郵件功能，則您可透過 \"Email 聯絡此使用者\" 的功能來聯絡相關管理員。\n您目前的 IP 位址是 $3，此次封鎖的 ID 為 #$5。\n請您在詢問時附註以上詳細訊息。",
-	"autoblockedtext": "因先前的另一位使用者被 $1 封鎖，您的 IP 位址已被自動封鎖。\n原因是：\n\n:<em>$2</em>\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 相關封鎖對象：$7\n\n您可以聯絡 $1 或其他的 [[{{MediaWiki:Grouppage-sysop}}|管理員]] 討論封鎖的相關問題。\n若您已在 [[Special:Preferences|偏好設定]] 中設定了一個有效的電子郵件地址，且尚未被封鎖郵件功能，則您可透過 \"Email 聯絡此使用者\" 的功能來聯絡相關管理員。\n您目前的 IP 位址是 $3，此次封鎖的 ID 為 #$5。\n請您在詢問時附註以上詳細資料。",
+	"blockedtext": "<strong>您的使用者名稱或 IP 位址已被封鎖。</strong>\n\n您被 $1 封鎖，\n原因爲 <em>$2</em>。\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 相關封鎖對象：$7\n\n您可以聯絡 $1 或其他的 [[{{MediaWiki:Grouppage-sysop}}|管理員]] 討論封鎖的相關問題。\n若您已在 [[Special:Preferences|偏好設定]] 中設定了一個有效的電子郵件地址，且尚未被封鎖郵件功能，則您可透過 \"{{int:emailuser}}\" 的功能來聯絡相關管理員。\n您目前的 IP 位址是 $3，此次封鎖的 ID 為 #$5。\n請您在詢問時附註以上詳細訊息。",
+	"autoblockedtext": "因先前的另一位使用者被 $1 封鎖，您的 IP 位址已被自動封鎖。\n原因是：\n\n:<em>$2</em>\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 相關封鎖對象：$7\n\n您可以聯絡 $1 或其他的 [[{{MediaWiki:Grouppage-sysop}}|管理員]] 討論封鎖的相關問題。\n若您已在 [[Special:Preferences|偏好設定]] 中設定了一個有效的電子郵件地址，且尚未被封鎖郵件功能，則您可透過 \"{{int:emailuser}}\" 的功能來聯絡相關管理員。\n您目前的 IP 位址是 $3，此次封鎖的 ID 為 #$5。\n請您在詢問時附註以上詳細資料。",
 	"systemblockedtext": "您的使用者名稱或 IP 位址已被 MediaWiki 自動封鎖，原因如下：\n\n:<em>$2</em>\n\n* 封鎖開始時間：$8\n* 封鎖結束時間：$6\n* 被封鎖的使用者：$7\n\n您目前的 IP 位址為 $3。\n請在做詢問時附上以上資訊。",
 	"blockednoreason": "未說明原因",
 	"whitelistedittext": "請先 $1 才可編輯頁面。",
@@ -738,10 +740,13 @@
 	"blocked-notice-logextract": "此使用者目前已被封鎖。\n以下為最近的封鎖紀錄以供參考：",
 	"clearyourcache": "<strong>注意：</strong>在您儲存之後您必須清除瀏覽器快取才可看到最新的變更。\n* <strong>Firefox / Safari：</strong>按住 <em>Shift</em> 時點選 <em>重新整理</em>，或按 <em>Ctrl-F5</em> 或 <em>Ctrl-R</em> (Mac 則為 <em>⌘-R</em>) \n* <strong>Google Chrome：</strong>按 <em>Ctrl-Shift-R</em> (Mac 則為 <em>⌘-Shift-R</em>) \n* <strong>Internet Explorer：</strong>按住 <em>Ctrl</em> 時點選 <em>重新整理</em>，或按 <em>Ctrl-F5</em>\n* <strong>Opera：</strong>前往 <em>選單 → 設定</em> (在 Mac 為 <em>Opera → 偏好設定</em>) 然後再到 <em>隱私 & 安全性 → 清除瀏覽資料 → 已快取的圖片與檔案</em>。",
 	"usercssyoucanpreview": "<strong>提示：</strong>在儲存之前使用 \"{{int:showpreview}}\" 按鈕來測試您的新 CSS 。",
+	"userjsonyoucanpreview": "<strong>提示：</strong>在儲存之前使用 \"{{int:showpreview}}\" 按鈕來測試您的新 JSON。",
 	"userjsyoucanpreview": "<strong>提示：</strong>在儲存之前使用 \"{{int:showpreview}}\" 按鈕來測試您的新 JavaScript 。",
 	"usercsspreview": "<strong>您目前正預覽您的使用者 CSS，CSS 還尚未儲存！</strong>",
+	"userjsonpreview": "<strong>請注意您僅是在測試/預覽您的使用者 JSON 設定，內容還尚未儲存！</strong>",
 	"userjspreview": "<strong>您目前正預覽您的使用者 JavaScript，JavaScript 還尚未儲存！</strong>",
 	"sitecsspreview": "<strong>您目前正預覽此 CSS，CSS 還尚未儲存！</strong>",
+	"sitejsonpreview": "<strong>請注意您僅是在預覽此 JSON 設定，內容還尚未儲存！</strong>",
 	"sitejspreview": "<strong>您目前正預覽此 JavaScript，JavaScript 還尚未儲存！</strong>",
 	"userinvalidconfigtitle": "<strong>警告：</strong> 無此外觀樣式 \"$1\"。\n自訂的 .css、.json 和 .js 頁面要使用小寫標題，例如：{{ns:user}}:Foo/vector.css 與 {{ns:user}}:Foo/Vector.css 是不同的。",
 	"updated": "(已更新)",
@@ -770,7 +775,7 @@
 	"longpageerror": "<strong>錯誤：您所送出的文字內容共有 {{PLURAL:$1|1 KB|$1 KB}}，已超出系統上限 {{PLURAL:$2|1 KB|$2 KB}}。</strong>\n\n無法儲存。",
 	"readonlywarning": "<strong>警告：資料庫已被鎖定以進行維護，因此無法儲存您目前所做的編輯動作。</strong>\n您可先複製您的文字並貼上到文字檔案中儲存，稍後再儲存您編輯。\n\n鎖定資料庫的系統管理員有以下說明：$1",
 	"protectedpagewarning": "<strong>警告：本頁已經被保護，只有擁有管理員權限的使用者才可編輯。</strong>\n以下提供最近的日誌以便參考：",
-	"semiprotectedpagewarning": "<strong>注意：</strong>本頁已經被保護，只有已註冊的使用者才可編輯。\n以下提供最近的日誌以便參考：",
+	"semiprotectedpagewarning": "<strong>注意：</strong>本頁已經被保護，只有自動確認使用者才可編輯。\n以下提供最近的日誌以便參考：",
 	"cascadeprotectedwarning": "<strong>警告：</strong>由於本頁被下列{{PLURAL:$1|頁面|頁面}}嵌入，所以受連鎖保護。只有得到[[Special:ListGroupRights|特殊權限]]的使用者才可編輯。",
 	"titleprotectedwarning": "<strong>警告：本頁面已被保護，需要 [[Special:ListGroupRights|特殊權限]] 方可建立。</strong>\n以下提供最近的日誌以便參考：",
 	"templatesused": "此頁面使用了以下{{PLURAL:$1|模板}}：",
@@ -840,7 +845,10 @@
 	"expansion-depth-exceeded-category-desc": "超出展開深度限制的頁面。",
 	"expansion-depth-exceeded-warning": "頁面超出展開深度限制",
 	"parser-unstrip-loop-warning": "偵測到 Unstrip 迴圈",
-	"unstrip-depth-warning": "Unstrip 遞迴超出限制 ($1)",
+	"unstrip-depth-warning": "Unstrip 深度超出限制 ($1)",
+	"unstrip-depth-category": "超出 unstrip 深度限制的頁面",
+	"unstrip-size-warning": "Unstrip 大小超出限制 ($1)",
+	"unstrip-size-category": "超出 unstrip 大小限制的頁面",
 	"converter-manual-rule-error": "手動語言轉換規則時偵測到錯誤",
 	"undo-success": "此編輯可以被還原。\n請檢查以下比較表，確認您是否要還原，然後儲存以下變更以完成編輯還原。",
 	"undo-failure": "由於編輯的修訂間有衝突，此編輯不能還原。",
@@ -981,7 +989,7 @@
 	"difference-multipage": "(頁面間的差異)",
 	"lineno": "行 $1：",
 	"compareselectedversions": "比較已選擇的修訂",
-	"showhideselectedversions": "更改已選擇修訂的顯示設定",
+	"showhideselectedversions": "變更已選擇修訂的顯示設定",
 	"editundo": "撤銷",
 	"diff-empty": "(無差異)",
 	"diff-multi-sameuser": "(未顯示同一使用者於中間所作的 $1 次修訂)",
@@ -1065,6 +1073,7 @@
 	"prefs-watchlist-edits": "監視清單中顯示的變更數量上限：",
 	"prefs-watchlist-edits-max": "數量上限：1000",
 	"prefs-watchlist-token": "監視清單金鑰：",
+	"prefs-watchlist-managetokens": "管理令牌",
 	"prefs-misc": "其他",
 	"prefs-resetpass": "變更密碼",
 	"prefs-changeemail": "變更或移除電子郵件地址",
@@ -1080,9 +1089,10 @@
 	"stub-threshold-disabled": "已停用",
 	"recentchangesdays": "近期變更顯示的天數：",
 	"recentchangesdays-max": "最多 $1 {{PLURAL:$1|天}}",
-	"recentchangescount": "預設顯示的編輯數：",
+	"recentchangescount": "在最近變更、頁面歷史、以及日誌裡，所預設顯示的編輯數：",
 	"prefs-help-recentchangescount": "數量上限：1000",
 	"prefs-help-watchlist-token2": "這是您的監視清單的網路訊息源所需密鑰。\n任何人只要知道密鑰就能夠讀取您的監視清單，所以請勿任意與它人共享。\n若有需要[[Special:ResetTokens|您可重設密鑰]]。",
+	"prefs-help-tokenmanagement": "您可以查看並重新設定您帳號裡用來存取您監視清單中訊息來源的密鑰。任何知道該密鑰的人皆可讀取您的監視清單，因此請不要將它分享出去。",
 	"savedprefs": "已儲存您的偏好設定。",
 	"savedrights": "已儲存 {{GENDER:$1|$1}} 的使用者權限。",
 	"timezonelegend": "時區：",
@@ -1419,7 +1429,7 @@
 	"rcfilters-savedqueries-already-saved": "這些過濾已被儲存。變更您的設定，來建立新的已儲存過濾。",
 	"rcfilters-restore-default-filters": "還原預設過濾條件",
 	"rcfilters-clear-all-filters": "清除所有過濾條件",
-	"rcfilters-show-new-changes": "顯示最新更改",
+	"rcfilters-show-new-changes": "檢視最新變更",
 	"rcfilters-search-placeholder": "過濾變更（使用選單或搜尋過濾名稱）",
 	"rcfilters-invalid-filter": "無效的過濾條件",
 	"rcfilters-empty-filter": "沒有使用中的過濾條件。已顯示所有的貢獻。",
@@ -1437,7 +1447,7 @@
 	"rcfilters-filter-editsbyself-label": "您的編輯",
 	"rcfilters-filter-editsbyself-description": "您的貢獻",
 	"rcfilters-filter-editsbyother-label": "其他人的變更",
-	"rcfilters-filter-editsbyother-description": "除了您以外的所有更改",
+	"rcfilters-filter-editsbyother-description": "除了您以外的所有變更。",
 	"rcfilters-filtergroup-userExpLevel": "使用者註冊及經驗",
 	"rcfilters-filter-user-experience-level-registered-label": "已註冊",
 	"rcfilters-filter-user-experience-level-registered-description": "已登入編輯者。",
@@ -1455,7 +1465,12 @@
 	"rcfilters-filter-humans-label": "人工 (非機器人)",
 	"rcfilters-filter-humans-description": "由人類編輯者做出的編輯",
 	"rcfilters-filtergroup-reviewstatus": "審查狀態",
+	"rcfilters-filter-reviewstatus-unpatrolled-description": "未手動或自動標記成已巡查的編輯。",
 	"rcfilters-filter-reviewstatus-unpatrolled-label": "未巡查",
+	"rcfilters-filter-reviewstatus-manual-description": "被手動標示為已巡查的編輯。",
+	"rcfilters-filter-reviewstatus-manual-label": "手動巡查",
+	"rcfilters-filter-reviewstatus-auto-description": "由高階使用者做出的編輯會自動標記成已巡查。",
+	"rcfilters-filter-reviewstatus-auto-label": "自動巡查",
 	"rcfilters-filtergroup-significance": "重要性",
 	"rcfilters-filter-minor-label": "次要編輯",
 	"rcfilters-filter-minor-description": "作者已標示為次要的編輯。",
@@ -1465,14 +1480,14 @@
 	"rcfilters-filter-watchlist-watched-label": "在監視清單內",
 	"rcfilters-filter-watchlist-watched-description": "您的監視清單內的變更",
 	"rcfilters-filter-watchlist-watchednew-label": "新監視清單的變更",
-	"rcfilters-filter-watchlist-watchednew-description": "更改後您尚未檢視的監視頁面變更。",
+	"rcfilters-filter-watchlist-watchednew-description": "變更後您尚未檢視的監視頁面變更。",
 	"rcfilters-filter-watchlist-notwatched-label": "不在監視清單內",
 	"rcfilters-filter-watchlist-notwatched-description": "除了更改您的監視頁面以外的任何事項。",
 	"rcfilters-filtergroup-watchlistactivity": "監視列表活動",
 	"rcfilters-filter-watchlistactivity-unseen-label": "未讀變更",
-	"rcfilters-filter-watchlistactivity-unseen-description": "自從更改發生以來，對您沒有訪問的頁面做出的更改。",
+	"rcfilters-filter-watchlistactivity-unseen-description": "自從變更發生以來，對您沒有造訪的頁面做出的變更。",
 	"rcfilters-filter-watchlistactivity-seen-label": "已讀變更",
-	"rcfilters-filter-watchlistactivity-seen-description": "自從更改發生以來，對您已訪問的頁面做出的更改。",
+	"rcfilters-filter-watchlistactivity-seen-description": "自從變更發生以來，對您已造訪的頁面做出的變更。",
 	"rcfilters-filtergroup-changetype": "變更類型",
 	"rcfilters-filter-pageedits-label": "頁面編輯",
 	"rcfilters-filter-pageedits-description": "對 Wiki 內容、討論、分類說明所做的編輯…",
@@ -1489,7 +1504,7 @@
 	"rcfilters-filter-lastrevision-label": "最新修訂版本",
 	"rcfilters-filter-lastrevision-description": "只包括對頁面的近期變更。",
 	"rcfilters-filter-previousrevision-label": "不是最新修訂版本",
-	"rcfilters-filter-previousrevision-description": "所有不是「最新修訂版本」的更改。",
+	"rcfilters-filter-previousrevision-description": "所有不是「最新修訂版本」的變更。",
 	"rcfilters-filter-excluded": "已排除",
 	"rcfilters-tag-prefix-namespace-inverted": "<strong>:不是</strong>$1",
 	"rcfilters-exclude-button-off": "排除選項",
@@ -1501,13 +1516,13 @@
 	"rcfilters-view-tags-help-icon-tooltip": "了解更多關於標記編輯的資訊",
 	"rcfilters-liveupdates-button": "動態更新",
 	"rcfilters-liveupdates-button-title-on": "關閉動態更新",
-	"rcfilters-liveupdates-button-title-off": "顯示有發生的新更改",
-	"rcfilters-watchlist-markseen-button": "標記所有更改為已查看",
+	"rcfilters-liveupdates-button-title-off": "顯示有發生的新變更",
+	"rcfilters-watchlist-markseen-button": "標記所有變更為已看過",
 	"rcfilters-watchlist-edit-watchlist-button": "編輯您的監視頁面列表",
 	"rcfilters-watchlist-showupdated": "自更改發生以來，對您尚未訪問的頁面做出的更改以<strong>粗體</strong>顯示，並帶有實心圓形標記。",
-	"rcfilters-preference-label": "隱藏改進的最近更改版本",
+	"rcfilters-preference-label": "隱藏改善的最近變更版本",
 	"rcfilters-preference-help": "返回到2017年介面重新設計版，並重新新增這以後增加的工具。",
-	"rcfilters-filter-showlinkedfrom-label": "顯示連結自該頁面的頁面上的更改",
+	"rcfilters-filter-showlinkedfrom-label": "顯示連結自此頁面的頁面上的變更",
 	"rcfilters-filter-showlinkedfrom-option-label": "<strong>連結自</strong>指定頁面的頁面",
 	"rcfilters-filter-showlinkedto-label": "顯示連結到該頁面的頁面上的更改",
 	"rcfilters-filter-showlinkedto-option-label": "<strong>連結到</strong>指定頁面的頁面",
@@ -1554,9 +1569,9 @@
 	"recentchangeslinked-feed": "相關變更",
 	"recentchangeslinked-toolbox": "相關變更",
 	"recentchangeslinked-title": "與 \"$1\" 相關的變更",
-	"recentchangeslinked-summary": "輸入頁面名稱，來查看頁面所連入或連出頁面的變更。（要查看分類成員的話，請輸入 Category:分類名稱）。會對在[[Special:Watchlist|您的監視清單]]上頁面更改為<strong>粗體</strong>顯示。",
+	"recentchangeslinked-summary": "輸入頁面名稱，來查看頁面所連入或連出頁面的變更。（要查看分類成員的話，請輸入{{ns:category}}:分類名稱）。會對在[[Special:Watchlist|您的監視清單]]上頁面更改為<strong>粗體</strong>顯示。",
 	"recentchangeslinked-page": "頁面名稱：",
-	"recentchangeslinked-to": "改顯示連結至指定頁面的變更",
+	"recentchangeslinked-to": "顯示連結至指定頁面的變更",
 	"recentchanges-page-added-to-category": "[[:$1]] 已加入至分類",
 	"recentchanges-page-added-to-category-bundled": "[[:$1]] 已加入至分類，[[Special:WhatLinksHere/$1|此頁面已被其他頁面引用]]",
 	"recentchanges-page-removed-from-category": "[[:$1]] 已自分類移除",
@@ -1974,6 +1989,7 @@
 	"deadendpages": "無連結頁面",
 	"deadendpagestext": "以下在 {{SITENAME}} 中的頁面未連結到其他頁面。",
 	"protectedpages": "受保護頁面",
+	"protectedpages-filters": "篩選：",
 	"protectedpages-indef": "只顯示無限期的保護頁面",
 	"protectedpages-summary": "此頁面列出目前受保護的頁面。 欲查詢受保護標題清單，請參考 [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]]。",
 	"protectedpages-cascade": "只顯示連鎖的保護頁面",
@@ -2317,7 +2333,7 @@
 	"unprotectedarticle": "已解除 \"[[$1]]\" 的保護",
 	"movedarticleprotection": "已移動 \"[[$2]]\" 的保護設定至 \"[[$1]]\"",
 	"protectedarticle-comment": "{{GENDER:$2|受保護}} \"[[$1]]\"",
-	"modifiedarticleprotection-comment": "{{GENDER:$2|已更改}} \"[[$1]]\" 的保護層級",
+	"modifiedarticleprotection-comment": "{{GENDER:$2|已變更}} \"[[$1]]\" 的保護層級",
 	"unprotectedarticle-comment": "{{GENDER:$2|已移除}} \"[[$1]]\" 的保護",
 	"protect-title": "變更 \"$1\" 的保護層級",
 	"protect-title-notallowed": "檢視 \"$1\" 的保護層級",
@@ -2543,7 +2559,7 @@
 	"blocklog-showlog": "此使用者先前被封鎖過。\n以下為封鎖紀錄以供參考：",
 	"blocklog-showsuppresslog": "此使用者先前被封鎖並且隱藏過。\n以下為禁止顯示紀錄以供參考：",
 	"blocklogentry": "已封鎖 [[$1]] 的期限至 $2 $3",
-	"reblock-logentry": "更改 [[$1]] 的封鎖期限至 $2 $3",
+	"reblock-logentry": "變更 [[$1]] 的封鎖設定，到期時間為 $2 $3",
 	"blocklogtext": "此為使用者的封鎖及取消封鎖動作的記錄。\n未列出自動封鎖的 IP 位址。\n請參考 [[Special:BlockList|封鎖清單]] 中的目前正在作業的阻止與封鎖。",
 	"unblocklogentry": "已解除封鎖 $1",
 	"block-log-flags-anononly": "僅限匿名使用者",
@@ -2559,7 +2575,7 @@
 	"ipb_expiry_temp": "隱藏使用者名稱的封鎖不可設定期限。",
 	"ipb_hide_invalid": "無法禁止顯示此帳號；它擁有超過 $1 次的編輯。",
 	"ipb_already_blocked": "已經封鎖 \"$1\"。",
-	"ipb-needreblock": "$1 已經被封鎖。您是否想更改設定？",
+	"ipb-needreblock": "$1 已經被封鎖。您是否想變更設定？",
 	"ipb-otherblocks-header": "其他{{PLURAL:$1|封鎖}}",
 	"unblock-hideuser": "由於此使用者名稱已被設為隱藏，您無法解除封鎖這個使用者。",
 	"ipb_cant_unblock": "錯誤：查無封鎖 ID $1，可能已被解除封鎖。",
@@ -2651,7 +2667,7 @@
 	"fix-double-redirects": "更新所有指向原標題的重新導向頁面",
 	"move-leave-redirect": "留下重新導向頁面",
 	"protectedpagemovewarning": "<strong>警告：</strong>本頁已經被保護，只有擁有管理員權限的使用者才可移動。\n以下提供最近的日誌以便參考：",
-	"semiprotectedpagemovewarning": "<strong>注意：</strong>本頁已經被保護，只有已註冊的使用者才可移動。\n以下提供最近的日誌以便參考：",
+	"semiprotectedpagemovewarning": "<strong>注意：</strong>本頁已經被保護，只有自動確認使用者才可移動。\n以下提供最近的日誌以便參考：",
 	"move-over-sharedrepo": "[[:$1]] 已存在於共用檔案庫，將檔案移動到此標題會覆蓋該共用檔案。",
 	"file-exists-sharedrepo": "選擇的檔案名稱於共用檔案庫已有其他檔案使用。\n請改選擇其他名稱。",
 	"export": "匯出頁面",
@@ -2834,6 +2850,7 @@
 	"group-bot.css": "/* 此 CSS 會影響機器人 */",
 	"group-sysop.css": "/* 這裡的 CSS 會影響管理員 */",
 	"group-bureaucrat.css": "/* 此 CSS 會影響行政員 */",
+	"common.json": "/* 在此的任一 JavaScript 會為全部使用者在所有頁面裡載入。 */",
 	"common.js": "/* 此 JavaScript 會用於使用者載入的每一個頁面。 */",
 	"group-sysop.js": "/* 這裡的 JavaScript 會影響管理員 */",
 	"anonymous": "{{SITENAME}} 的匿名{{PLURAL:$1|使用者}}",
@@ -3551,8 +3568,8 @@
 	"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-changed-redirect-target": "重新導向目標變更",
+	"tag-mw-changed-redirect-target-description": "變更重新導向目標的編輯",
 	"tag-mw-blank": "清空",
 	"tag-mw-blank-description": "清空頁面的編輯",
 	"tag-mw-replace": "替換",
@@ -3713,7 +3730,7 @@
 	"logentry-delete-event": "$1 {{GENDER:$2|已更改}} $3 中 {{PLURAL:$5|1 筆日誌|$5 筆日誌}}的可見性：$4",
 	"logentry-delete-revision": "$1 {{GENDER:$2|已更改}}頁面 $3 中 {{PLURAL:$5|1 筆修訂|$5 筆修訂}}的可見性：$4",
 	"logentry-delete-event-legacy": "$1 {{GENDER:$2|已變更}} $3 中日誌的可見性",
-	"logentry-delete-revision-legacy": "$1 {{GENDER:$2|已更改}}頁面 $3 中修訂的可見性",
+	"logentry-delete-revision-legacy": "$1 {{GENDER:$2|已變更}}頁面 $3 中修訂的可見性",
 	"logentry-suppress-delete": "$1 {{GENDER:$2|已禁止顯示}}頁面 $3",
 	"logentry-suppress-event": "$1 {{GENDER:$2|已暗中更改}} $3 中 {{PLURAL:$5|1 筆日誌|$5 筆日誌}}的可見性：$4",
 	"logentry-suppress-revision": "$1 {{GENDER:$2|已暗中更改}}頁面 $3 中 {{PLURAL:$5|1 筆修訂|$5 筆修訂}}的可見性：$4",
@@ -3752,10 +3769,10 @@
 	"logentry-protect-unprotect": "$1 {{GENDER:$2|已移除}} $3 的保護",
 	"logentry-protect-protect": "$1 {{GENDER:$2|已保護}} $3 $4",
 	"logentry-protect-protect-cascade": "$1 {{GENDER:$2|已保護}} $3 $4 [連鎖]",
-	"logentry-protect-modify": "$1 {{GENDER:$2|已更改}} $3 的保護層級 $4",
-	"logentry-protect-modify-cascade": "$1 {{GENDER:$2|已更改}} $3 的保護層級 $4 [連鎖]",
+	"logentry-protect-modify": "$1 {{GENDER:$2|已變更}} $3 的保護層級 $4",
+	"logentry-protect-modify-cascade": "$1 {{GENDER:$2|已變更}} $3 的保護層級 $4 [連鎖]",
 	"logentry-rights-rights": "$1已將{{GENDER:$6|$3}}的使用者群組從$4{{GENDER:$2|更改}}至$5",
-	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|已更改}} $3 的群組成員資格",
+	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|已變更}} $3 的群組成員資格",
 	"logentry-rights-autopromote": "$1 已自動{{GENDER:$2|提升}}從 $4 成為 $5",
 	"logentry-upload-upload": "$1 {{GENDER:$2|已上傳}} $3",
 	"logentry-upload-overwrite": "$1 {{GENDER:$2|上傳了}}新版本的 $3",
@@ -3829,7 +3846,9 @@
 	"limitreport-templateargumentsize-value": "$1/$2 個{{PLURAL:$2|位元組}}",
 	"limitreport-expansiondepth": "最高展開深度",
 	"limitreport-expensivefunctioncount": "高消耗解析器函數次數",
+	"limitreport-unstrip-depth": "Unstrip 迴圈深度",
 	"limitreport-unstrip-depth-value": "$1/$2",
+	"limitreport-unstrip-size": "Unstrip 傳遞擴充大小",
 	"limitreport-unstrip-size-value": "$1/$2{{PLURAL:$2|位元組}}",
 	"expandtemplates": "展開模板",
 	"expand_templates_intro": "本特殊頁面會將 wiki 文字中的模板展開，可以包含支援的解析器語法，如 <code><nowiki>{{</nowiki>#language:…}}</code> 與變數如 <code><nowiki>{{</nowiki>CURRENTDAY}}</code>。\n實際上，絕大部分在雙括號中的內容都會被展開。",
@@ -3857,12 +3876,12 @@
 	"pagelang-nonexistent-page": "頁面 $1 不存在。",
 	"pagelang-unchanged-language": "頁面 $1 的語言已經設為 $2。",
 	"pagelang-unchanged-language-default": "頁面 $1 的語言已經設為 wiki 的預設內容語言。",
-	"pagelang-db-failed": "資料庫更改頁面語言失敗。",
+	"pagelang-db-failed": "資料庫變更頁面語言失敗。",
 	"right-pagelang": "變更頁面語言",
 	"action-pagelang": "變更頁面語言",
 	"log-name-pagelang": "語言變更日誌",
 	"log-description-pagelang": "此頁為頁面語言的變更日誌。",
-	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|已更改}}頁面 $3 的語言從 $4 到 $5",
+	"logentry-pagelang-pagelang": "$1 已將 $3 的語言從 $4 {{GENDER:$2|變更}}至 $5",
 	"default-skin-not-found": "哎呀！您於 <code dir=\"ltr\">$wgDefaultSkin</code> 設定的 Wiki 預設外觀 <code>$1</code> 無法使用。\n\n您的安裝程序應包含以下{{PLURAL:$4|外觀}}。請參考 [https://www.mediawiki.org/wiki/Manual:Skin_configuration 操作手冊：外觀設定] 以取得如何{{PLURAL:$4|開啟外觀並設為預設值}}的資訊。\n\n$2\n\n; 若您才剛安裝完 MediaWiki：\n: 您大概是使用 git 或直接透過原始碼使用其他方法安裝，這種情況是正常的。請嘗試安裝 [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org 的外觀目錄] 中的部份外觀使用以下方式：\n:* 下載 [https://www.mediawiki.org/wiki/Special:MyLanguage/Download tarball 安裝程式]，該程式包含數個外觀與擴充套件。您可以複製並貼上至 <code>skins/</code> 目錄。\n:* 自 [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org] 下載個別外觀 tarball。\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins 使用 Git 下載外觀]。\n: 若您是 MediaWiki 的開發人員，這麼做應該不會影響到您的 git 儲存庫。\n\n; 若您才剛升級 MediaWiki：\n: MediaWiki 1.24 與較新的版本不再自動開啟已安裝的外觀 (請參考 [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery 操作手冊：外觀自動搜尋])。您可以將下列{{PLURAL:$5|行}}貼上至 <code>LocalSettings.php</code> 來開啟{{PLURAL:$5|所有}}目前已經安裝的{{PLURAL:$5|外觀}}：\n\n<pre dir=\"ltr\">$3</pre>\n\n; 若您才剛修改 <code>LocalSettings.php</code>：\n: 請再次確認您輸入的外觀名稱是否有誤。",
 	"default-skin-not-found-no-skins": "哎呀！您於 <code>$wgDefaultSkin</code> 設定的 Wiki 預設外觀 <code>$1</code> 無法使用。\n\n您未安裝任何的外觀。\n\n; 若您才剛安裝完或升級完 MediaWiki：\n: 您大概是使用 git 或直接透過原始碼使用其他方法安裝，這種情況是正常的。 MediaWiki 1.24 或較新的版本在主要儲存庫中不再包含任何的外觀。 請嘗試安裝 [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org 的外觀目錄] 中的部份外觀使用以下方式：\n:* 下載 [https://www.mediawiki.org/wiki/Special:MyLanguage/Download tarball 安裝程式]，該程式包含數個外觀與擴充套件。 您可以複製並貼上至 <code>skins/</code> 目錄。\n:* 自 [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org] 下載個別外觀 tarball。\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins 使用 Git 下載外觀]。\n: 若您是 MediaWiki 的開發人員，這麼做應該不會影響到您的 git 儲存庫。 請參考 [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Skin_configuration 操作手冊：外觀設定] 以取得如何開啟外觀並設為預設值的資訊。",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (已開啟)",
@@ -4001,7 +4020,7 @@
 	"authmanager-authplugin-setpass-failed-title": "密碼變更失敗",
 	"authmanager-authplugin-setpass-failed-message": "認証外掛已拒絕密碼變更。",
 	"authmanager-authplugin-create-fail": "認証外掛已拒絕帳號建立。",
-	"authmanager-authplugin-setpass-denied": "認証外掛不允許更改密碼。",
+	"authmanager-authplugin-setpass-denied": "驗證外掛程式不允許變更密碼。",
 	"authmanager-authplugin-setpass-bad-domain": "無效網域。",
 	"authmanager-autocreate-noperm": "不允許自動帳號建立。",
 	"authmanager-autocreate-exception": "自動帳號建立因發生錯誤臨時關閉。",
@@ -4059,6 +4078,7 @@
 	"unlinkaccounts-success": "已取消連結帳號。",
 	"authenticationdatachange-ignored": "認證資料變更未被處理，可能未設定提供者？",
 	"userjsispublic": "請注意：JavaScript 子頁面可被其他使用者檢視，不應包含機密資料。",
+	"userjsonispublic": "請注意：JSON 子頁面可被其它使用者檢視，因此不應包含機密資料。",
 	"usercssispublic": "請注意：CSS 子頁面可被其他使用者檢視，不應包含機密資料。",
 	"restrictionsfield-badip": "無效的 IP 位址或範圍：$1",
 	"restrictionsfield-label": "允許的 IP 範圍：",
@@ -4076,5 +4096,6 @@
 	"pagedata-title": "頁面資料",
 	"pagedata-text": "此頁面提供了至頁面的資料介面。請使用子頁面語法在 URL 裡提供頁面標題。\n* 內容協商會基於您客戶端接受標頭來套用，這代表頁面資料會以由您客戶端所首選格式來提供。",
 	"pagedata-not-acceptable": "查無符合的格式，支援的 MIME 類型有：$1",
-	"pagedata-bad-title": "無效的標題：$1。"
+	"pagedata-bad-title": "無效的標題：$1。",
+	"unregistered-user-config": "基於安全緣故未註冊的使用者不會載入 JavaScript、CSS，以及 JSON 使用者子頁面。"
 }
diff --git a/maintenance/archives/patch-externallinks-el_index_60-drop-default.sql b/maintenance/archives/patch-externallinks-el_index_60-drop-default.sql
new file mode 100644
index 0000000000..f9242c52bb
--- /dev/null
+++ b/maintenance/archives/patch-externallinks-el_index_60-drop-default.sql
@@ -0,0 +1,2 @@
+-- @since 1.32
+ALTER TABLE /*$wgDBprefix*/externallinks ALTER COLUMN el_index_60 DROP DEFAULT;
diff --git a/maintenance/categoryChangesAsRdf.php b/maintenance/categoryChangesAsRdf.php
new file mode 100644
index 0000000000..a12cda78b4
--- /dev/null
+++ b/maintenance/categoryChangesAsRdf.php
@@ -0,0 +1,542 @@
+<?php
+/**
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ */
+use Wikimedia\Purtle\RdfWriter;
+use Wikimedia\Purtle\TurtleRdfWriter;
+use Wikimedia\Rdbms\IDatabase;
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script to provide RDF representation of the recent changes in category tree.
+ *
+ * @ingroup Maintenance
+ * @since 1.30
+ */
+class CategoryChangesAsRdf extends Maintenance {
+	/**
+	 * Insert query
+	 */
+	const SPARQL_INSERT = <<<SPARQL
+INSERT DATA {
+%s
+};
+
+SPARQL;
+
+	/**
+	 * Delete/Insert query
+	 */
+	const SPARQL_DELETE_INSERT = <<<SPARQLDI
+DELETE {
+?category ?x ?y
+} INSERT {
+%s
+} WHERE {
+   VALUES ?category {
+     %s
+   }
+};
+
+SPARQLDI;
+
+	/**
+	 * @var RdfWriter
+	 */
+	private $rdfWriter;
+	/**
+	 * Categories RDF helper.
+	 * @var CategoriesRdf
+	 */
+	private $categoriesRdf;
+
+	private $startTS;
+	private $endTS;
+
+	/**
+	 * List of processed page IDs,
+	 * so we don't try to process same thing twice
+	 * @var int[]
+	 */
+	protected $processed = [];
+
+	public function __construct() {
+		parent::__construct();
+
+		$this->addDescription( "Generate RDF dump of category changes in a wiki." );
+
+		$this->setBatchSize( 200 );
+		$this->addOption( 'output', "Output file (default is stdout). Will be overwritten.", false,
+			true, 'o' );
+		$this->addOption( 'start', 'Starting timestamp (inclusive), in ISO or Mediawiki format.',
+			true, true, 's' );
+		$this->addOption( 'end', 'Ending timestamp (exclusive), in ISO or Mediawiki format.', true,
+			true, 'e' );
+	}
+
+	/**
+	 * Initialize external service classes.
+	 */
+	public function initialize() {
+		// SPARQL Update syntax is close to Turtle format, so we can use Turtle writer.
+		$this->rdfWriter = new TurtleRdfWriter();
+		$this->categoriesRdf = new CategoriesRdf( $this->rdfWriter );
+	}
+
+	public function execute() {
+		global $wgRCMaxAge;
+
+		$this->initialize();
+
+		$startTS = new MWTimestamp( $this->getOption( "start" ) );
+		$endTS = new MWTimestamp( $this->getOption( "end" ) );
+		$now = new MWTimestamp();
+
+		if ( $now->getTimestamp() - $startTS->getTimestamp() > $wgRCMaxAge ) {
+			$this->error( "Start timestamp too old, maximum RC age is $wgRCMaxAge!" );
+		}
+		if ( $now->getTimestamp() - $endTS->getTimestamp() > $wgRCMaxAge ) {
+			$this->error( "End timestamp too old, maximum RC age is $wgRCMaxAge!" );
+		}
+
+		$this->startTS = $startTS->getTimestamp();
+		$this->endTS = $endTS->getTimestamp();
+
+		$outFile = $this->getOption( 'output', 'php://stdout' );
+		if ( $outFile === '-' ) {
+			$outFile = 'php://stdout';
+		}
+
+		$output = fopen( $outFile, 'wb' );
+
+		$this->categoriesRdf->setupPrefixes();
+		$this->rdfWriter->start();
+
+		$prefixes = $this->getRdf();
+		// We have to strip @ from prefix, since SPARQL UPDATE doesn't use them
+		// Also strip dot at the end.
+		$prefixes = preg_replace( [ '/^@/m', '/\s*[.]$/m' ], '', $prefixes );
+		fwrite( $output, $prefixes );
+
+		$dbr = $this->getDB( DB_REPLICA, [ 'vslow' ] );
+
+		// Deletes go first because if the page was deleted, other changes
+		// do not matter. This only gets true deletes, i.e. not pages that were restored.
+		$this->handleDeletes( $dbr, $output );
+		// Moves go before additions because if category is moved, we should not process creation
+		// as it would produce wrong data - because create row has old title
+		$this->handleMoves( $dbr, $output );
+		// We need to handle restores too since delete may have happened in previous update.
+		$this->handleRestores( $dbr, $output );
+		$this->handleAdds( $dbr, $output );
+		$this->handleChanges( $dbr, $output );
+
+		// Update timestamp
+		fwrite( $output, $this->updateTS( $this->endTS ) );
+	}
+
+	/**
+	 * Get SPARQL for updating set of categories
+	 * @param IDatabase $dbr
+	 * @param string[] $deleteUrls List of URIs to be deleted, with <>
+	 * @param string[] $pages List of categories: id => title
+	 * @param string $mark Marks which operation requests the query
+	 * @return string SPARQL query
+	 */
+	private function getCategoriesUpdate( IDatabase $dbr, $deleteUrls, $pages, $mark ) {
+		if ( empty( $deleteUrls ) ) {
+			return "";
+		}
+
+		if ( !empty( $pages ) ) {
+			$this->writeParentCategories( $dbr, $pages );
+		}
+
+		return "# $mark\n" . sprintf( self::SPARQL_DELETE_INSERT,
+				$this->getRdf(),
+				implode( ' ', $deleteUrls ) );
+	}
+
+	/**
+	 * Write data for a set of categories
+	 * @param IDatabase $dbr
+	 * @param string[] $pages List of categories: id => title
+	 */
+	private function writeParentCategories( IDatabase $dbr, $pages ) {
+		foreach ( $this->getCategoryLinksIterator( $dbr, array_keys( $pages ) ) as $row ) {
+			$this->categoriesRdf->writeCategoryLinkData( $pages[$row->cl_from], $row->cl_to );
+		}
+	}
+
+	/**
+	 * Generate SPARQL Update code for updating dump timestamp
+	 * @param string|int $timestamp Timestamp for last change
+	 * @return string SPARQL Update query for timestamp.
+	 */
+	public function updateTS( $timestamp ) {
+		$dumpUrl = '<' . $this->categoriesRdf->getDumpURI() . '>';
+		$ts = wfTimestamp( TS_ISO_8601, $timestamp );
+		$tsQuery = <<<SPARQL
+DELETE {
+  $dumpUrl schema:dateModified ?o .
+}
+WHERE {
+  $dumpUrl schema:dateModified ?o .
+};
+INSERT DATA {
+  $dumpUrl schema:dateModified "$ts"^^xsd:dateTime .
+}
+
+SPARQL;
+		return $tsQuery;
+	}
+
+	/**
+	 * Set up standard iterator for retrieving category changes.
+	 * @param IDatabase $dbr
+	 * @param string[] $columns List of additional fields to get
+	 * @param string[] $extra_tables List of additional tables to join
+	 * @return BatchRowIterator
+	 */
+	private function setupChangesIterator(
+		IDatabase $dbr,
+		array $columns = [],
+		array $extra_tables = []
+	) {
+		$tables = [ 'recentchanges', 'page_props', 'category' ];
+		if ( $extra_tables ) {
+			$tables += $extra_tables;
+		}
+		$it = new BatchRowIterator( $dbr,
+			$tables,
+			[ 'rc_timestamp' ],
+			$this->mBatchSize
+		);
+		$this->addTimestampConditions( $it, $dbr );
+		$it->addJoinConditions(
+			[
+				'page_props' => [
+					'LEFT JOIN', [ 'pp_propname' => 'hiddencat', 'pp_page = rc_cur_id' ]
+				],
+				'category' => [
+					'LEFT JOIN', [ 'cat_title = rc_title' ]
+				]
+			]
+		);
+		$it->setFetchColumns( array_merge( $columns, [
+			'rc_title',
+			'rc_cur_id',
+			'pp_propname',
+			'cat_pages',
+			'cat_subcats',
+			'cat_files'
+		] ) );
+		return $it;
+	}
+
+	/**
+	 * Fetch newly created categories
+	 * @param IDatabase $dbr
+	 * @return BatchRowIterator
+	 */
+	protected function getNewCatsIterator( IDatabase $dbr ) {
+		$it = $this->setupChangesIterator( $dbr );
+		$it->addConditions( [
+			'rc_namespace' => NS_CATEGORY,
+			'rc_new' => 1,
+		] );
+		return $it;
+	}
+
+	/**
+	 * Fetch moved categories
+	 * @param IDatabase $dbr
+	 * @return BatchRowIterator
+	 */
+	protected function getMovedCatsIterator( IDatabase $dbr ) {
+		$it = $this->setupChangesIterator( $dbr, [ 'page_title', 'page_namespace' ], [ 'page' ] );
+		$it->addConditions( [
+			'rc_namespace' => NS_CATEGORY,
+			'rc_new' => 0,
+			'rc_log_type' => 'move',
+			'rc_type' => RC_LOG,
+		] );
+		$it->addJoinConditions( [
+			'page' => [ 'INNER JOIN', 'rc_cur_id = page_id' ],
+		] );
+		$this->addIndex( $it );
+		return $it;
+	}
+
+	/**
+	 * Fetch deleted categories
+	 * @param IDatabase $dbr
+	 * @return BatchRowIterator
+	 */
+	protected function getDeletedCatsIterator( IDatabase $dbr ) {
+		$it = new BatchRowIterator( $dbr,
+			'recentchanges',
+			[ 'rc_timestamp' ],
+			$this->mBatchSize
+		);
+		$this->addTimestampConditions( $it, $dbr );
+		$it->addConditions( [
+			'rc_namespace' => NS_CATEGORY,
+			'rc_new' => 0,
+			'rc_log_type' => 'delete',
+			'rc_log_action' => 'delete',
+			'rc_type' => RC_LOG,
+			// We will fetch ones that do not have page record. If they do,
+			// this means they were restored, thus restoring handler will pick it up.
+			'NOT EXISTS (SELECT * FROM page WHERE page_id = rc_cur_id)',
+		] );
+		$this->addIndex( $it );
+		$it->setFetchColumns( [ 'rc_cur_id', 'rc_title' ] );
+		return $it;
+	}
+
+	/**
+	 * Fetch restored categories
+	 * @param IDatabase $dbr
+	 * @return BatchRowIterator
+	 */
+	protected function getRestoredCatsIterator( IDatabase $dbr ) {
+		$it = $this->setupChangesIterator( $dbr );
+		$it->addConditions( [
+			'rc_namespace' => NS_CATEGORY,
+			'rc_new' => 0,
+			'rc_log_type' => 'delete',
+			'rc_log_action' => 'restore',
+			'rc_type' => RC_LOG,
+			// We will only fetch ones that have page record
+			'EXISTS (SELECT page_id FROM page WHERE page_id = rc_cur_id)',
+		] );
+		$this->addIndex( $it );
+		return $it;
+	}
+
+	/**
+	 * Fetch categorization changes
+	 * @param IDatabase $dbr
+	 * @return BatchRowIterator
+	 */
+	protected function getChangedCatsIterator( IDatabase $dbr ) {
+		$it = $this->setupChangesIterator( $dbr );
+		$it->addConditions( [
+			'rc_namespace' => NS_CATEGORY,
+			'rc_new' => 0,
+			'rc_type' => [ RC_EDIT, RC_CATEGORIZE ],
+		] );
+		$this->addIndex( $it );
+		return $it;
+	}
+
+	/**
+	 * Add timestamp limits to iterator
+	 * @param BatchRowIterator $it Iterator
+	 * @param IDatabase $dbr
+	 */
+	private function addTimestampConditions( BatchRowIterator $it, IDatabase $dbr ) {
+		$it->addConditions( [
+			'rc_timestamp >= ' . $dbr->addQuotes( $dbr->timestamp( $this->startTS ) ),
+			'rc_timestamp < ' . $dbr->addQuotes( $dbr->timestamp( $this->endTS ) ),
+		] );
+	}
+
+	/**
+	 * Need to force index, somehow on terbium the optimizer chooses wrong one
+	 * @param BatchRowIterator $it
+	 */
+	private function addIndex( BatchRowIterator $it ) {
+		$it->addOptions( [
+			'USE INDEX' => [ 'recentchanges' => 'new_name_timestamp' ]
+		] );
+	}
+
+	/**
+	 * Get iterator for links for categories.
+	 * @param IDatabase $dbr
+	 * @param array $ids List of page IDs
+	 * @return Traversable
+	 */
+	protected function getCategoryLinksIterator( IDatabase $dbr, array $ids ) {
+		$it = new BatchRowIterator(
+			$dbr,
+			'categorylinks',
+			[ 'cl_from', 'cl_to' ],
+			$this->mBatchSize
+		);
+		$it->addConditions( [
+			'cl_type' => 'subcat',
+			'cl_from' => $ids
+		] );
+		$it->setFetchColumns( [ 'cl_from', 'cl_to' ] );
+		return new RecursiveIteratorIterator( $it );
+	}
+
+	/**
+	 * Get accumulated RDF.
+	 * @return string
+	 */
+	public function getRdf() {
+		return $this->rdfWriter->drain();
+	}
+
+	/**
+	 * Handle category deletes.
+	 * @param IDatabase $dbr
+	 * @param resource $output File to write the output
+	 */
+	public function handleDeletes( IDatabase $dbr, $output ) {
+		// This only does "true" deletes - i.e. those that the page stays deleted
+		foreach ( $this->getDeletedCatsIterator( $dbr ) as $batch ) {
+			$deleteUrls = [];
+			foreach ( $batch as $row ) {
+				// This can produce duplicates, we don't care
+				$deleteUrls[] = '<' . $this->categoriesRdf->labelToUrl( $row->rc_title ) . '>';
+				$this->processed[$row->rc_cur_id] = true;
+			}
+			fwrite( $output, $this->getCategoriesUpdate( $dbr, $deleteUrls, [], "Deletes" ) );
+		}
+	}
+
+	/**
+	 * Write category data to RDF.
+	 * @param stdclass $row Database row
+	 */
+	private function writeCategoryData( $row ) {
+		$this->categoriesRdf->writeCategoryData(
+			$row->rc_title,
+			$row->pp_propname === 'hiddencat',
+			(int)$row->cat_pages - (int)$row->cat_subcats - (int)$row->cat_files,
+			(int)$row->cat_subcats
+		);
+	}
+
+	/**
+	 * @param IDatabase $dbr
+	 * @param resource $output
+	 */
+	public function handleMoves( IDatabase $dbr, $output ) {
+		foreach ( $this->getMovedCatsIterator( $dbr ) as $batch ) {
+			$pages = [];
+			$deleteUrls = [];
+			foreach ( $batch as $row ) {
+				$deleteUrls[] = '<' . $this->categoriesRdf->labelToUrl( $row->rc_title ) . '>';
+
+				if ( isset( $this->processed[$row->rc_cur_id] ) ) {
+					// We already captured this one before
+					continue;
+				}
+
+				if ( $row->page_namespace != NS_CATEGORY ) {
+					// If page was moved out of Category:, we'll just delete
+					continue;
+				}
+				$row->rc_title = $row->page_title;
+				$this->writeCategoryData( $row );
+				$pages[$row->rc_cur_id] = $row->page_title;
+				$this->processed[$row->rc_cur_id] = true;
+			}
+
+			fwrite( $output, $this->getCategoriesUpdate( $dbr, $deleteUrls, $pages, "Moves" ) );
+		}
+	}
+
+	/**
+	 * @param IDatabase $dbr
+	 * @param resource $output
+	 */
+	public function handleRestores( IDatabase $dbr, $output ) {
+		fwrite( $output, "# Restores\n" );
+		// This will only find those restores that were not deleted later.
+		foreach ( $this->getRestoredCatsIterator( $dbr ) as $batch ) {
+			$pages = [];
+			foreach ( $batch as $row ) {
+				if ( isset( $this->processed[$row->rc_cur_id] ) ) {
+					// We already captured this one before
+					continue;
+				}
+				$this->writeCategoryData( $row );
+				$pages[$row->rc_cur_id] = $row->rc_title;
+				$this->processed[$row->rc_cur_id] = true;
+			}
+
+			if ( empty( $pages ) ) {
+				continue;
+			}
+
+			$this->writeParentCategories( $dbr, $pages );
+
+			fwrite( $output, sprintf( self::SPARQL_INSERT, $this->getRdf() ) );
+		}
+	}
+
+	/**
+	 * @param IDatabase $dbr
+	 * @param resource $output
+	 */
+	public function handleAdds( IDatabase $dbr, $output ) {
+		fwrite( $output, "# Additions\n" );
+		foreach ( $this->getNewCatsIterator( $dbr ) as $batch ) {
+			$pages = [];
+			foreach ( $batch as $row ) {
+				if ( isset( $this->processed[$row->rc_cur_id] ) ) {
+					// We already captured this one before
+					continue;
+				}
+				$this->writeCategoryData( $row );
+				$pages[$row->rc_cur_id] = $row->rc_title;
+				$this->processed[$row->rc_cur_id] = true;
+			}
+
+			if ( empty( $pages ) ) {
+				continue;
+			}
+
+			$this->writeParentCategories( $dbr, $pages );
+			fwrite( $output, sprintf( self::SPARQL_INSERT, $this->getRdf() ) );
+		}
+	}
+
+	/**
+	 * @param IDatabase $dbr
+	 * @param resource $output
+	 */
+	public function handleChanges( IDatabase $dbr, $output ) {
+		foreach ( $this->getChangedCatsIterator( $dbr ) as $batch ) {
+			$pages = [];
+			$deleteUrls = [];
+			foreach ( $batch as $row ) {
+				if ( isset( $this->processed[$row->rc_cur_id] ) ) {
+					// We already captured this one before
+					continue;
+				}
+				$this->writeCategoryData( $row );
+				$pages[$row->rc_cur_id] = $row->rc_title;
+				$this->processed[$row->rc_cur_id] = true;
+				$deleteUrls[] = '<' . $this->categoriesRdf->labelToUrl( $row->rc_title ) . '>';
+			}
+
+			fwrite( $output, $this->getCategoriesUpdate( $dbr, $deleteUrls, $pages, "Changes" ) );
+		}
+	}
+}
+
+$maintClass = CategoryChangesAsRdf::class;
+require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/deduplicateArchiveRevId.php b/maintenance/deduplicateArchiveRevId.php
new file mode 100644
index 0000000000..dad79b060d
--- /dev/null
+++ b/maintenance/deduplicateArchiveRevId.php
@@ -0,0 +1,209 @@
+<?php
+
+use Wikimedia\Rdbms\IDatabase;
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script that cleans up archive rows with duplicated ar_rev_id,
+ * both within archive and between archive and revision.
+ *
+ * @ingroup Maintenance
+ * @since 1.32
+ */
+class DeduplicateArchiveRevId extends LoggedUpdateMaintenance {
+
+	/** @var array|null */
+	private $arActorQuery = null;
+
+	private $deleted = 0;
+	private $reassigned = 0;
+
+	public function __construct() {
+		parent::__construct();
+		$this->addDescription(
+			'Clean up duplicate ar_rev_id, both within archive and between archive and revision.'
+		);
+		$this->setBatchSize( 10000 );
+	}
+
+	protected function getUpdateKey() {
+		return __CLASS__;
+	}
+
+	protected function doDBUpdates() {
+		$this->output( "Deduplicating ar_rev_id...\n" );
+
+		$dbw = $this->getDB( DB_MASTER );
+
+		$minId = $dbw->selectField( 'archive', 'MIN(ar_rev_id)', [], __METHOD__ );
+		$maxId = $dbw->selectField( 'archive', 'MAX(ar_rev_id)', [], __METHOD__ );
+		$batchSize = $this->getBatchSize();
+
+		$this->arActorQuery = ActorMigration::newMigration()->getJoin( 'ar_user' );
+		$revActorQuery = ActorMigration::newMigration()->getJoin( 'rev_user' );
+
+		for ( $id = $minId; $id <= $maxId; $id += $batchSize ) {
+			$endId = min( $maxId, $id + $batchSize - 1 );
+
+			$this->beginTransaction( $dbw, __METHOD__ );
+
+			// Lock the archive and revision table rows for the IDs we're checking
+			// to try to prevent deletions or undeletions from confusing things.
+			$dbw->selectRowCount(
+				'archive',
+				1,
+				[ 'ar_rev_id >= ' . (int)$id, 'ar_rev_id <= ' . (int)$endId ],
+				__METHOD__,
+				[ 'FOR UPDATE' ]
+			);
+			$dbw->selectRowCount(
+				'revision',
+				1,
+				[ 'rev_id >= ' . (int)$id, 'rev_id <= ' . (int)$endId ],
+				__METHOD__,
+				[ 'LOCK IN SHARE MODE' ]
+			);
+
+			// Figure out the ar_rev_ids we actually need to look at
+			$res = $dbw->select(
+				[ 'archive', 'revision' ] + $revActorQuery['tables'],
+				[ 'rev_id', 'rev_timestamp', 'rev_sha1' ] + $revActorQuery['fields'],
+				[ 'ar_rev_id >= ' . (int)$id, 'ar_rev_id <= ' . (int)$endId ],
+				__METHOD__,
+				[ 'DISTINCT' ],
+				[ 'revision' => [ 'JOIN', 'ar_rev_id = rev_id' ] ] + $revActorQuery['joins']
+			);
+			$revRows = [];
+			foreach ( $res as $row ) {
+				$revRows[$row->rev_id] = $row;
+			}
+
+			$arRevIds = $dbw->selectFieldValues(
+				[ 'archive' ],
+				'ar_rev_id',
+				[ 'ar_rev_id >= ' . (int)$id, 'ar_rev_id <= ' . (int)$endId ],
+				__METHOD__,
+				[ 'GROUP BY' => 'ar_rev_id', 'HAVING' => 'COUNT(*) > 1' ]
+			);
+			$arRevIds = array_values( array_unique( array_merge( $arRevIds, array_keys( $revRows ) ) ) );
+
+			if ( $arRevIds ) {
+				$this->processArRevIds( $dbw, $arRevIds, $revRows );
+			}
+
+			$this->output( "... $id-$endId\n" );
+			$this->commitTransaction( $dbw, __METHOD__ );
+		}
+
+		$this->output(
+			"Finished deduplicating ar_rev_id. $this->deleted rows deleted, "
+			. "$this->reassigned assigned new IDs.\n"
+		);
+		return true;
+	}
+
+	/**
+	 * Process a set of ar_rev_ids
+	 * @param IDatabase $dbw
+	 * @param int[] $arRevIds IDs to process
+	 * @param object[] $revRows Existing revision-table row data
+	 */
+	private function processArRevIds( IDatabase $dbw, array $arRevIds, array $revRows ) {
+		// Select all the data we need for deduplication
+		$res = $dbw->select(
+			[ 'archive' ] + $this->arActorQuery['tables'],
+			[ 'ar_id', 'ar_rev_id', 'ar_namespace', 'ar_title', 'ar_timestamp', 'ar_sha1' ]
+				+ $this->arActorQuery['fields'],
+			[ 'ar_rev_id' => $arRevIds ],
+			__METHOD__,
+			[],
+			$this->arActorQuery['joins']
+		);
+
+		// Determine which rows we need to delete or reassign
+		$seen = [];
+		$toDelete = [];
+		$toReassign = [];
+		foreach ( $res as $row ) {
+			// Revision-table row exists?
+			if ( isset( $revRows[$row->ar_rev_id] ) ) {
+				$revRow = $revRows[$row->ar_rev_id];
+
+				// Record the rev_id as seen, so the code below will always delete or reassign.
+				if ( !isset( $seen[$revRow->rev_id] ) ) {
+					$seen[$revRow->rev_id] = [
+						'first' => "revision row",
+					];
+				}
+
+				// Delete the archive row if it seems to be the same regardless
+				// of page, because moves can change IDs and titles.
+				if ( $row->ar_timestamp === $revRow->rev_timestamp &&
+					$row->ar_sha1 === $revRow->rev_sha1 &&
+					$row->ar_user === $revRow->rev_user &&
+					$row->ar_user_text === $revRow->rev_user_text
+				) {
+					$this->output(
+						"Row $row->ar_id duplicates revision row for rev_id $revRow->rev_id, deleting\n"
+					);
+					$toDelete[] = $row->ar_id;
+					continue;
+				}
+			}
+
+			$key = $this->getSeenKey( $row );
+			if ( !isset( $seen[$row->ar_rev_id] ) ) {
+				// This rev_id hasn't even been seen yet, nothing to do besides record it.
+				$seen[$row->ar_rev_id] = [
+					'first' => "archive row $row->ar_id",
+					$key => $row->ar_id,
+				];
+			} elseif ( !isset( $seen[$row->ar_rev_id][$key] ) ) {
+				// The rev_id was seen, but not this particular change. Reassign it.
+				$seen[$row->ar_rev_id][$key] = $row->ar_id;
+				$this->output(
+					"Row $row->ar_id conflicts with {$seen[$row->ar_rev_id]['first']} "
+					. "for rev_id $row->ar_rev_id, reassigning\n"
+				);
+				$toReassign[] = $row->ar_id;
+			} else {
+				// The rev_id was seen with a row that matches this change. Delete it.
+				$this->output(
+					"Row $row->ar_id duplicates archive row {$seen[$row->ar_rev_id][$key]} "
+					. "for rev_id $row->ar_rev_id, deleting\n"
+				);
+				$toDelete[] = $row->ar_id;
+			}
+		}
+
+		// Perform the updates
+		if ( $toDelete ) {
+			$dbw->delete( 'archive', [ 'ar_id' => $toDelete ], __METHOD__ );
+			$this->deleted += $dbw->affectedRows();
+		}
+		if ( $toReassign ) {
+			$this->reassigned += PopulateArchiveRevId::reassignArRevIds( $dbw, $toReassign );
+		}
+	}
+
+	/**
+	 * Make a key identifying a "unique" change from a row
+	 * @param object $row
+	 * @return string
+	 */
+	private function getSeenKey( $row ) {
+		return implode( "\n", [
+			$row->ar_namespace,
+			$row->ar_title,
+			$row->ar_timestamp,
+			$row->ar_sha1,
+			$row->ar_user,
+			$row->ar_user_text,
+		] );
+	}
+
+}
+
+$maintClass = "DeduplicateArchiveRevId";
+require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/fixExtLinksProtocolRelative.php b/maintenance/fixExtLinksProtocolRelative.php
index c70b8be7c9..f5861e5a0b 100644
--- a/maintenance/fixExtLinksProtocolRelative.php
+++ b/maintenance/fixExtLinksProtocolRelative.php
@@ -71,11 +71,13 @@ class FixExtLinksProtocolRelative extends LoggedUpdateMaintenance {
 						'el_from' => $row->el_from,
 						'el_to' => $row->el_to,
 						'el_index' => "http:{$row->el_index}",
+						'el_index_60' => substr( "http:{$row->el_index}", 0, 60 ),
 					],
 					[
 						'el_from' => $row->el_from,
 						'el_to' => $row->el_to,
 						'el_index' => "https:{$row->el_index}",
+						'el_index_60' => substr( "https:{$row->el_index}", 0, 60 ),
 					]
 				], __METHOD__, [ 'IGNORE' ]
 			);
diff --git a/maintenance/mssql/archives/patch-externallinks-el_index_60-drop-default.sql b/maintenance/mssql/archives/patch-externallinks-el_index_60-drop-default.sql
new file mode 100644
index 0000000000..7755e66fd0
--- /dev/null
+++ b/maintenance/mssql/archives/patch-externallinks-el_index_60-drop-default.sql
@@ -0,0 +1,13 @@
+DECLARE @sql nvarchar(max)
+SET @sql=''
+
+SELECT @sql= @sql + 'ALTER TABLE /*_*/externallinks DROP CONSTRAINT ' + df.name + '; '
+FROM sys.default_constraints df
+JOIN sys.columns c
+	ON c.object_id = df.parent_object_id
+	AND c.column_id = df.parent_column_id
+WHERE
+	df.parent_object_id =  OBJECT_ID('/*_*/externallinks')
+	AND c.name = 'el_index_60';--
+
+EXEC sp_executesql @sql;
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index 858260b34b..315cb20ce7 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -549,8 +549,7 @@ CREATE TABLE /*_*/externallinks (
 
   -- This is el_index truncated to 60 bytes to allow for sortable queries that
   -- aren't supported by a partial index.
-  -- @todo Drop the default once this is deployed everywhere and code is populating it.
-  el_index_60 varbinary(60) NOT NULL default ''
+  el_index_60 varbinary(60) NOT NULL
 );
 
 CREATE INDEX /*i*/el_from ON /*_*/externallinks (el_from);
diff --git a/maintenance/populateArchiveRevId.php b/maintenance/populateArchiveRevId.php
index b8b9e688e3..e493506237 100644
--- a/maintenance/populateArchiveRevId.php
+++ b/maintenance/populateArchiveRevId.php
@@ -32,6 +32,10 @@ require_once __DIR__ . '/Maintenance.php';
  * @since 1.31
  */
 class PopulateArchiveRevId extends LoggedUpdateMaintenance {
+
+	/** @var array|null Dummy revision row */
+	private static $dummyRev = null;
+
 	public function __construct() {
 		parent::__construct();
 		$this->addDescription( 'Populate ar_rev_id in pre-1.5 rows' );
@@ -58,7 +62,6 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 			return true;
 		}
 
-		$rev = $this->makeDummyRevisionRow( $dbw );
 		$count = 0;
 		while ( true ) {
 			wfWaitForSlaves();
@@ -75,47 +78,60 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 				return true;
 			}
 
-			try {
-				$updates = $dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) use ( $arIds, $rev ) {
-					// Create new rev_ids by inserting dummy rows into revision and then deleting them.
-					$dbw->insert( 'revision', array_fill( 0, count( $arIds ), $rev ), $fname );
-					$revIds = $dbw->selectFieldValues(
-						'revision',
-						'rev_id',
-						[ 'rev_timestamp' => $rev['rev_timestamp'] ],
-						$fname
-					);
-					if ( !is_array( $revIds ) ) {
-						throw new UnexpectedValueException( 'Failed to insert dummy revisions' );
-					}
-					if ( count( $revIds ) !== count( $arIds ) ) {
-						throw new UnexpectedValueException(
-							'Tried to insert ' . count( $arIds ) . ' dummy revisions, but found '
-							. count( $revIds ) . ' matching rows.'
-						);
-					}
-					$dbw->delete( 'revision', [ 'rev_id' => $revIds ], $fname );
-
-					return array_combine( $arIds, $revIds );
-				} );
-			} catch ( UnexpectedValueException $ex ) {
-				$this->fatalError( $ex->getMessage() );
-			}
+			$count += self::reassignArRevIds( $dbw, $arIds, [ 'ar_rev_id' => null ] );
+
+			$min = min( $arIds );
+			$max = max( $arIds );
+			$this->output( " ... $min-$max\n" );
+		}
+	}
 
-			foreach ( $updates as $arId => $revId ) {
-				$dbw->update(
-					'archive',
-					[ 'ar_rev_id' => $revId ],
-					[ 'ar_id' => $arId, 'ar_rev_id' => null ],
-					__METHOD__
+	/**
+	 * Assign new ar_rev_ids to a set of ar_ids.
+	 * @param IDatabase $dbw
+	 * @param int[] $arIds
+	 * @param array $conds Extra conditions for the update
+	 * @return int Number of updated rows
+	 */
+	public static function reassignArRevIds( IDatabase $dbw, array $arIds, array $conds = [] ) {
+		if ( !self::$dummyRev ) {
+			self::$dummyRev = self::makeDummyRevisionRow( $dbw );
+		}
+
+		$updates = $dbw->doAtomicSection( __METHOD__, function ( $dbw, $fname ) use ( $arIds ) {
+			// Create new rev_ids by inserting dummy rows into revision and then deleting them.
+			$dbw->insert( 'revision', array_fill( 0, count( $arIds ), self::$dummyRev ), $fname );
+			$revIds = $dbw->selectFieldValues(
+				'revision',
+				'rev_id',
+				[ 'rev_timestamp' => self::$dummyRev['rev_timestamp'] ],
+				$fname
+			);
+			if ( !is_array( $revIds ) ) {
+				throw new UnexpectedValueException( 'Failed to insert dummy revisions' );
+			}
+			if ( count( $revIds ) !== count( $arIds ) ) {
+				throw new UnexpectedValueException(
+					'Tried to insert ' . count( $arIds ) . ' dummy revisions, but found '
+					. count( $revIds ) . ' matching rows.'
 				);
-				$count += $dbw->affectedRows();
 			}
+			$dbw->delete( 'revision', [ 'rev_id' => $revIds ], $fname );
 
-			$min = min( array_keys( $updates ) );
-			$max = max( array_keys( $updates ) );
-			$this->output( " ... $min-$max\n" );
+			return array_combine( $arIds, $revIds );
+		} );
+
+		$count = 0;
+		foreach ( $updates as $arId => $revId ) {
+			$dbw->update(
+				'archive',
+				[ 'ar_rev_id' => $revId ],
+				[ 'ar_id' => $arId ] + $conds,
+				__METHOD__
+			);
+			$count += $dbw->affectedRows();
 		}
+		return $count;
 	}
 
 	/**
@@ -123,31 +139,41 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 	 *
 	 * The row will have a wildly unlikely timestamp, and possibly a generic
 	 * user and comment, but will otherwise be derived from a revision on the
-	 * wiki's main page.
+	 * wiki's main page or some other revision in the database.
 	 *
 	 * @param IDatabase $dbw
 	 * @return array
 	 */
-	private function makeDummyRevisionRow( IDatabase $dbw ) {
+	private static function makeDummyRevisionRow( IDatabase $dbw ) {
 		$ts = $dbw->timestamp( '11111111111111' );
+		$rev = null;
+
 		$mainPage = Title::newMainPage();
-		if ( !$mainPage ) {
-			$this->fatalError( 'Main page does not exist' );
+		$pageId = $mainPage ? $mainPage->getArticleId() : null;
+		if ( $pageId ) {
+			$rev = $dbw->selectRow(
+				'revision',
+				'*',
+				[ 'rev_page' => $pageId ],
+				__METHOD__,
+				[ 'ORDER BY' => 'rev_timestamp ASC' ]
+			);
 		}
-		$pageId = $mainPage->getArticleId();
-		if ( !$pageId ) {
-			$this->fatalError( $mainPage->getPrefixedText() . ' has no ID' );
+
+		if ( !$rev ) {
+			// No main page? Let's see if there are any revisions at all
+			$rev = $dbw->selectRow(
+				'revision',
+				'*',
+				[],
+				__METHOD__,
+				[ 'ORDER BY' => 'rev_timestamp ASC' ]
+			);
 		}
-		$rev = $dbw->selectRow(
-			'revision',
-			'*',
-			[ 'rev_page' => $pageId ],
-			__METHOD__,
-			[ 'ORDER BY' => 'rev_timestamp ASC' ]
-		);
 		if ( !$rev ) {
-			$this->fatalError( $mainPage->getPrefixedText() . ' has no revisions' );
+			throw new UnexpectedValueException( 'No revisions are available to copy' );
 		}
+
 		unset( $rev->rev_id );
 		$rev = (array)$rev;
 		$rev['rev_timestamp'] = $ts;
@@ -166,7 +192,7 @@ class PopulateArchiveRevId extends LoggedUpdateMaintenance {
 			__METHOD__
 		);
 		if ( $any ) {
-			$this->fatalError( "... Why does your database contain a revision dated $ts?" );
+			throw new UnexpectedValueException( "... Why does your database contain a revision dated $ts?" );
 		}
 
 		return $rev;
diff --git a/maintenance/populateExternallinksIndex60.php b/maintenance/populateExternallinksIndex60.php
new file mode 100644
index 0000000000..9b029fefaa
--- /dev/null
+++ b/maintenance/populateExternallinksIndex60.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Populates the el_index_60 field in the externallinks table.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Maintenance
+ */
+
+require_once __DIR__ . '/Maintenance.php';
+
+/**
+ * Maintenance script that populates the el_index_60 field in the externallinks
+ * table.
+ *
+ * @ingroup Maintenance
+ * @since 1.32
+ */
+class PopulateExternallinksIndex60 extends LoggedUpdateMaintenance {
+	public function __construct() {
+		parent::__construct();
+		$this->addDescription(
+			'Populates the el_index_60 field in the externallinks table' );
+		$this->setBatchSize( 200 );
+	}
+
+	protected function getUpdateKey() {
+		return 'populate externallinks.el_index_60';
+	}
+
+	protected function updateSkippedMessage() {
+		return 'externallinks.el_index_60 already populated.';
+	}
+
+	protected function doDBUpdates() {
+		$dbw = $this->getDB( DB_MASTER );
+		$this->output( "Populating externallinks.el_index_60...\n" );
+
+		$count = 0;
+		$start = 0;
+		$last = $dbw->selectField( 'externallinks', 'MAX(el_id)', '', __METHOD__ );
+		while ( $start <= $last ) {
+			$end = $start + $this->mBatchSize;
+			$this->output( "el_id $start - $end of $last\n" );
+			$res = $dbw->select( 'externallinks', [ 'el_id', 'el_index' ],
+				[
+					"el_id > $start",
+					"el_id <= $end",
+					'el_index_60' => '',
+				],
+				__METHOD__,
+				[ 'ORDER BY' => 'el_id' ]
+			);
+			foreach ( $res as $row ) {
+				$count++;
+				$dbw->update( 'externallinks',
+					[
+						'el_index_60' => substr( $row->el_index, 0, 60 ),
+					],
+					[
+						'el_id' => $row->el_id,
+					], __METHOD__, [ 'IGNORE' ]
+				);
+			}
+			wfWaitForSlaves();
+			$start = $end;
+		}
+		$this->output( "Done, $count rows updated.\n" );
+
+		return true;
+	}
+}
+
+$maintClass = "PopulateExternallinksIndex60";
+require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 1a53359a99..492a0d5a4c 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -373,7 +373,7 @@ CREATE TABLE externallinks (
   el_from     INTEGER     NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   el_to       TEXT        NOT NULL,
   el_index    TEXT        NOT NULL,
-  el_index_60 BYTEA       NOT NULL  DEFAULT ''
+  el_index_60 BYTEA       NOT NULL
 );
 ALTER SEQUENCE externallinks_el_id_seq OWNED BY externallinks.el_id;
 CREATE INDEX externallinks_from_to ON externallinks (el_from,el_to);
diff --git a/maintenance/resources/update-ooui.sh b/maintenance/resources/update-ooui.sh
index 231001de45..889ab42b70 100755
--- a/maintenance/resources/update-ooui.sh
+++ b/maintenance/resources/update-ooui.sh
@@ -43,15 +43,15 @@ rm -r "$REPO_DIR/$TARGET_DIR"
 
 # Core and thematic code and styling
 mkdir -p "$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-core.js{,.map} "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-core.js{,.map.json} "$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-core-{wikimediaui,apex}.css "$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-widgets.js{,.map} "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-widgets.js{,.map.json} "$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-widgets-{wikimediaui,apex}.css "$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars.js{,.map} "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars.js{,.map.json} "$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-toolbars-{wikimediaui,apex}.css "$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-windows.js{,.map} "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-windows.js{,.map.json} "$REPO_DIR/$TARGET_DIR"
 cp ./node_modules/oojs-ui/dist/oojs-ui-windows-{wikimediaui,apex}.css "$REPO_DIR/$TARGET_DIR"
-cp ./node_modules/oojs-ui/dist/oojs-ui-{wikimediaui,apex}.js{,.map} "$REPO_DIR/$TARGET_DIR"
+cp ./node_modules/oojs-ui/dist/oojs-ui-{wikimediaui,apex}.js{,.map.json} "$REPO_DIR/$TARGET_DIR"
 
 # i18n
 mkdir -p "$REPO_DIR/$TARGET_DIR/i18n"
diff --git a/maintenance/sqlite/archives/patch-externallinks-el_index_60-drop-default.sql b/maintenance/sqlite/archives/patch-externallinks-el_index_60-drop-default.sql
new file mode 100644
index 0000000000..1d82f4d4d5
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-externallinks-el_index_60-drop-default.sql
@@ -0,0 +1,21 @@
+-- To change the default on one column, sqlite requires we copy the whole table
+
+CREATE TABLE /*_*/externallinks_tmp (
+  el_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  el_from int unsigned NOT NULL default 0,
+  el_to blob NOT NULL,
+  el_index blob NOT NULL,
+  el_index_60 varbinary(60) NOT NULL
+) /*$wgDBTableOptions*/;
+
+INSERT INTO /*_*/externallinks_tmp
+	SELECT el_id, el_from, el_to, el_index, el_index_60 FROM /*_*/externallinks;
+
+DROP TABLE /*_*/externallinks;
+ALTER TABLE /*_*/externallinks_tmp RENAME TO /*_*/externallinks;
+
+CREATE INDEX /*i*/el_from ON /*_*/externallinks (el_from, el_to(40));
+CREATE INDEX /*i*/el_to ON /*_*/externallinks (el_to(60), el_from);
+CREATE INDEX /*i*/el_index ON /*_*/externallinks (el_index(60));
+CREATE INDEX /*i*/el_index_60 ON /*_*/externallinks (el_index_60, el_id);
+CREATE INDEX /*i*/el_from_index_60 ON /*_*/externallinks (el_from, el_index_60, el_id);
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 34c63ed72a..ed3bd43991 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -932,8 +932,7 @@ CREATE TABLE /*_*/externallinks (
 
   -- This is el_index truncated to 60 bytes to allow for sortable queries that
   -- aren't supported by a partial index.
-  -- @todo Drop the default once this is deployed everywhere and code is populating it.
-  el_index_60 varbinary(60) NOT NULL default ''
+  el_index_60 varbinary(60) NOT NULL
 ) /*$wgDBTableOptions*/;
 
 -- Forward index, for page edit, save
diff --git a/package.json b/package.json
index e9048ec0f1..1f23b1a09b 100644
--- a/package.json
+++ b/package.json
@@ -15,23 +15,23 @@
     "grunt": "1.0.1",
     "grunt-banana-checker": "0.6.0",
     "grunt-contrib-copy": "1.0.0",
-    "grunt-contrib-watch": "1.0.0",
+    "grunt-contrib-watch": "1.0.1",
     "grunt-eslint": "20.1.0",
     "grunt-jsonlint": "1.1.0",
     "grunt-karma": "2.0.0",
     "grunt-stylelint": "0.10.0",
-    "karma": "1.7.1",
+    "karma": "2.0.2",
     "karma-chrome-launcher": "2.2.0",
     "karma-firefox-launcher": "1.0.1",
     "karma-mocha-reporter": "2.2.5",
     "karma-qunit": "2.0.1",
     "postcss-less": "1.1.5",
-    "qunit": "2.5.0",
+    "qunit": "2.6.0",
     "stylelint": "9.2.0",
     "stylelint-config-wikimedia": "0.4.3",
     "wdio-junit-reporter": "0.2.0",
     "wdio-mediawiki": "file:tests/selenium/wdio-mediawiki",
-    "wdio-mocha-framework": "0.5.8",
+    "wdio-mocha-framework": "0.5.13",
     "wdio-sauce-service": "0.3.1",
     "wdio-spec-reporter": "0.0.5",
     "webdriverio": "4.12.0"
diff --git a/resources/Resources.php b/resources/Resources.php
index ea4e5eafe7..77391a8ce7 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -303,8 +303,8 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.spinner' => [
-		'scripts' => 'resources/src/jquery/jquery.spinner.js',
-		'styles' => 'resources/src/jquery/jquery.spinner.css',
+		'scripts' => 'resources/src/jquery.spinner/spinner.js',
+		'styles' => 'resources/src/jquery.spinner/spinner.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.jStorage' => [
@@ -1994,18 +1994,21 @@ return [
 	],
 	'mediawiki.special' => [
 		'styles' => [
-			'resources/src/mediawiki.special/mediawiki.special.css',
-			'resources/src/mediawiki.special/mediawiki.special.userrights.css',
+			'resources/src/mediawiki.special/special.css',
+			'resources/src/mediawiki.special/apisandbox.css',
+			'resources/src/mediawiki.special/comparepages.less',
+			'resources/src/mediawiki.special/edittags.css',
+			'resources/src/mediawiki.special/movePage.css',
+			'resources/src/mediawiki.special/pagesWithProp.css',
+			'resources/src/mediawiki.special/upload.css',
+			'resources/src/mediawiki.special/userrights.css',
+			'resources/src/mediawiki.special/watchlist.css',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.special.apisandbox.styles' => [
-		'targets' => [ 'desktop', 'mobile' ],
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css',
-	],
 	'mediawiki.special.apisandbox' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.css',
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.apisandbox.js',
+		'styles' => 'resources/src/mediawiki.special.apisandbox/apisandbox.css',
+		'scripts' => 'resources/src/mediawiki.special.apisandbox/apisandbox.js',
 		'targets' => [ 'desktop', 'mobile' ],
 		'dependencies' => [
 			'mediawiki.api',
@@ -2034,6 +2037,7 @@ return [
 			'apisandbox-dynamic-parameters-add-label',
 			'apisandbox-dynamic-parameters-add-placeholder',
 			'apisandbox-dynamic-error-exists',
+			'apisandbox-templated-parameter-reason',
 			'apisandbox-deprecated-parameters',
 			'apisandbox-no-parameters',
 			'api-help-param-limit',
@@ -2070,10 +2074,13 @@ return [
 			'apisandbox-multivalue-all-values',
 			'api-format-prettyprint-status',
 			'blanknamespace',
+			'comma-separator',
+			'word-separator',
+			'and'
 		],
 	],
 	'mediawiki.special.block' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.block.js',
+		'scripts' => 'resources/src/mediawiki.special.block.js',
 		'dependencies' => [
 			'oojs-ui-core',
 			'oojs-ui.styles.icons-editing-core',
@@ -2086,7 +2093,7 @@ return [
 		],
 	],
 	'mediawiki.special.changecredentials.js' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changecredentials.js',
+		'scripts' => 'resources/src/mediawiki.special.changecredentials.js',
 		'dependencies' => [
 			'mediawiki.api',
 			'mediawiki.htmlform.ooui'
@@ -2094,39 +2101,33 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.css',
+		'styles' => 'resources/src/mediawiki.special.changeslist.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist.enhanced' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css',
+		'styles' => 'resources/src/mediawiki.special.changeslist.enhanced.css',
 	],
 	'mediawiki.special.changeslist.legend' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css',
+		'styles' => 'resources/src/mediawiki.special.changeslist.legend.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.changeslist.legend.js' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js',
+		'scripts' => 'resources/src/mediawiki.special.changeslist.legend.js',
 		'dependencies' => [
 			'jquery.makeCollapsible',
 			'mediawiki.cookie',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.special.changeslist.visitedstatus' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js',
-	],
-	'mediawiki.special.comparepages.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less',
-	],
 	'mediawiki.special.contributions' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.contributions.js',
+		'scripts' => 'resources/src/mediawiki.special.contributions.js',
 		'dependencies' => [
 			'mediawiki.widgets.DateInputWidget',
 			'mediawiki.jqueryMsg',
 		]
 	],
 	'mediawiki.special.edittags' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.edittags.js',
+		'scripts' => 'resources/src/mediawiki.special.edittags.js',
 		'dependencies' => [
 			'jquery.chosen',
 			'jquery.lengthLimit',
@@ -2136,39 +2137,30 @@ return [
 			'tags-edit-chosen-no-results',
 		],
 	],
-	'mediawiki.special.edittags.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.edittags.css',
-	],
 	'mediawiki.special.import' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.import.js',
+		'scripts' => 'resources/src/mediawiki.special.import.js',
 	],
 	'mediawiki.special.movePage' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.movePage.js',
+		'scripts' => 'resources/src/mediawiki.special.movePage.js',
 		'dependencies' => [
 			'mediawiki.widgets.visibleLengthLimit',
 			'mediawiki.widgets',
 		],
 	],
-	'mediawiki.special.movePage.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.movePage.css',
-	],
 	'mediawiki.special.pageLanguage' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.pageLanguage.js',
+		'scripts' => 'resources/src/mediawiki.special.pageLanguage.js',
 		'dependencies' => [
 			'oojs-ui-core',
 		],
 	],
-	'mediawiki.special.pagesWithProp' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css',
-	],
 	'mediawiki.special.preferences' => [
 		'targets' => [ 'desktop', 'mobile' ],
 		'scripts' => [
-			'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
+			'resources/src/mediawiki.special.preferences/confirmClose.js',
+			'resources/src/mediawiki.special.preferences/convertmessagebox.js',
+			'resources/src/mediawiki.special.preferences/tabs.legacy.js',
+			'resources/src/mediawiki.special.preferences/timezone.js',
+			'resources/src/mediawiki.special.preferences/personalEmail.js',
 		],
 		'messages' => [
 			'prefs-tabs-navigation-hint',
@@ -2184,17 +2176,19 @@ return [
 	],
 	'mediawiki.special.preferences.styles' => [
 		'targets' => [ 'desktop', 'mobile' ],
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css',
+		// legacy
+		'styles' => 'resources/src/mediawiki.special.preferences.styles.css',
 	],
 	'mediawiki.special.preferences.ooui' => [
 		'targets' => [ 'desktop', 'mobile' ],
 		'scripts' => [
-			'resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js',
-			'resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js',
+			// FIXME: This uses files already belonging to another module
+			'resources/src/mediawiki.special.preferences/confirmClose.js',
+			'resources/src/mediawiki.special.preferences/convertmessagebox.js',
+			'resources/src/mediawiki.special.preferences.ooui/editfont.js',
+			'resources/src/mediawiki.special.preferences.ooui/tabs.js',
+			'resources/src/mediawiki.special.preferences/timezone.js',
+			'resources/src/mediawiki.special.preferences/personalEmail.js',
 		],
 		'messages' => [
 			'prefs-tabs-navigation-hint',
@@ -2213,14 +2207,14 @@ return [
 	],
 	'mediawiki.special.preferences.styles.ooui' => [
 		'targets' => [ 'desktop', 'mobile' ],
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.preferences.styles.css',
+		'styles' => 'resources/src/mediawiki.special.preferences.styles.ooui.css',
 	],
 	'mediawiki.special.recentchanges' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.recentchanges.js',
+		'scripts' => 'resources/src/mediawiki.special.recentchanges.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.revisionDelete' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.revisionDelete.js',
+		'scripts' => 'resources/src/mediawiki.special.revisionDelete.js',
 		'messages' => [
 			// @todo Load this message in content language
 			'colon-separator',
@@ -2231,8 +2225,8 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.search' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.js',
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.css',
+		'scripts' => 'resources/src/mediawiki.special.search/search.js',
+		'styles' => 'resources/src/mediawiki.special.search/search.css',
 		'dependencies' => 'mediawiki.widgets.SearchInputWidget',
 		'messages' => [
 			'powersearch-togglelabel',
@@ -2241,7 +2235,7 @@ return [
 		],
 	],
 	'mediawiki.special.search.commonsInterwikiWidget' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js',
+		'scripts' => 'resources/src/mediawiki.special.search.commonsInterwikiWidget.js',
 		'dependencies' => [
 			'mediawiki.api',
 			'mediawiki.Uri',
@@ -2254,24 +2248,23 @@ return [
 		],
 	],
 	'mediawiki.special.search.interwikiwidget.styles' => [
-		'styles' => 'resources/src/mediawiki.special/'
-			. 'mediawiki.special.search.interwikiwidget.styles.less',
+		'styles' => 'resources/src/mediawiki.special.search.interwikiwidget.styles.less',
 		'targets' => [ 'desktop', 'mobile' ]
 	],
 	'mediawiki.special.search.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.search.styles.css',
+		'styles' => 'resources/src/mediawiki.special.search.styles.css',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.special.undelete' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.undelete.js',
+		'scripts' => 'resources/src/mediawiki.special.undelete.js',
 		'dependencies' => [
 			'mediawiki.widgets.visibleLengthLimit',
 			'mediawiki.widgets',
 		],
 	],
 	'mediawiki.special.unwatchedPages' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js',
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css',
+		'scripts' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js',
+		'styles' => 'resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css',
 		'messages' => [
 			'addedwatchtext-short',
 			'removedwatchtext-short',
@@ -2291,9 +2284,9 @@ return [
 	],
 	'mediawiki.special.upload' => [
 		'templates' => [
-			'thumbnail.html' => 'resources/src/mediawiki.special/templates/thumbnail.html',
+			'thumbnail.html' => 'resources/src/mediawiki.special.upload/templates/thumbnail.html',
 		],
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.upload.js',
+		'scripts' => 'resources/src/mediawiki.special.upload/upload.js',
 		'messages' => [
 			'widthheight',
 			'size-bytes',
@@ -2306,7 +2299,7 @@ return [
 			'prefs-editing',
 		],
 		'dependencies' => [
-			'mediawiki.special.upload.styles',
+			'mediawiki.special',
 			'jquery.spinner',
 			'mediawiki.jqueryMsg',
 			'mediawiki.api',
@@ -2318,22 +2311,19 @@ return [
 			'user.options',
 		],
 	],
-	'mediawiki.special.upload.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.upload.styles.css',
-	],
 	'mediawiki.special.userlogin.common.styles' => [
 		'targets' => [ 'desktop', 'mobile' ],
 		'skinStyles' => [
-			'default' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.common.css',
+			'default' => 'resources/src/mediawiki.special.userlogin.common.styles/userlogin.css',
 		],
 	],
 	'mediawiki.special.userlogin.login.styles' => [
 		'styles' => [
-			'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
+			'resources/src/mediawiki.special.userlogin.login.styles/login.css',
 		],
 	],
 	'mediawiki.special.userlogin.signup.js' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
+		'scripts' => 'resources/src/mediawiki.special.userlogin.signup.js',
 		'messages' => [
 			'createacct-emailrequired',
 			'noname',
@@ -2348,18 +2338,21 @@ return [
 	],
 	'mediawiki.special.userlogin.signup.styles' => [
 		'styles' => [
-			'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css',
+			'resources/src/mediawiki.special.userlogin.signup.styles/signup.css',
 		],
 	],
 	'mediawiki.special.userrights' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userrights.js',
+		'scripts' => 'resources/src/mediawiki.special.userrights.js',
 		'dependencies' => [
 			'mediawiki.notification.convertmessagebox',
 			'jquery.lengthLimit',
 		],
 	],
 	'mediawiki.special.watchlist' => [
-		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.js',
+		'scripts' => [
+			'resources/src/mediawiki.special.watchlist/watchlist.js',
+			'resources/src/mediawiki.special.watchlist/visitedstatus.js',
+		],
 		'messages' => [
 			'addedwatchtext',
 			'addedwatchtext-talk',
@@ -2379,11 +2372,8 @@ return [
 			'user.options',
 		],
 	],
-	'mediawiki.special.watchlist.styles' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.watchlist.css',
-	],
 	'mediawiki.special.version' => [
-		'styles' => 'resources/src/mediawiki.special/mediawiki.special.version.css',
+		'styles' => 'resources/src/mediawiki.special.version.css',
 	],
 
 	/* MediaWiki Installer */
diff --git a/resources/src/jquery.spinner/images/spinner-large.gif b/resources/src/jquery.spinner/images/spinner-large.gif
new file mode 100644
index 0000000000..72203fdd7f
Binary files /dev/null and b/resources/src/jquery.spinner/images/spinner-large.gif differ
diff --git a/resources/src/jquery.spinner/images/spinner.gif b/resources/src/jquery.spinner/images/spinner.gif
new file mode 100644
index 0000000000..6146be4e88
Binary files /dev/null and b/resources/src/jquery.spinner/images/spinner.gif differ
diff --git a/resources/src/jquery.spinner/spinner.css b/resources/src/jquery.spinner/spinner.css
new file mode 100644
index 0000000000..9c819a65cb
--- /dev/null
+++ b/resources/src/jquery.spinner/spinner.css
@@ -0,0 +1,36 @@
+.mw-spinner {
+	background-color: transparent;
+	background-position: center center;
+	background-repeat: no-repeat;
+}
+
+.mw-spinner-small {
+	/* @embed */
+	background-image: url( images/spinner.gif );
+	height: 20px;
+	width: 20px;
+	/* Avoid issues with .mw-spinner-block when floated without width. */
+	min-width: 20px;
+}
+
+.mw-spinner-large {
+	/* @embed */
+	background-image: url( images/spinner-large.gif );
+	height: 32px;
+	width: 32px;
+	/* Avoid issues with .mw-spinner-block when floated without width. */
+	min-width: 32px;
+}
+
+.mw-spinner-block {
+	display: block;
+	/* This overrides width from .mw-spinner-large / .mw-spinner-small,
+	 * This is where the min-width kicks in.
+	 */
+	width: 100%;
+}
+
+.mw-spinner-inline {
+	display: inline-block;
+	vertical-align: middle;
+}
diff --git a/resources/src/jquery.spinner/spinner.js b/resources/src/jquery.spinner/spinner.js
new file mode 100644
index 0000000000..9079cc09b7
--- /dev/null
+++ b/resources/src/jquery.spinner/spinner.js
@@ -0,0 +1,114 @@
+/**
+ * jQuery Spinner
+ *
+ * Simple jQuery plugin to create, inject and remove spinners.
+ *
+ * @class jQuery.plugin.spinner
+ */
+( function ( $ ) {
+
+	// Default options for new spinners,
+	// stored outside the function to share between calls.
+	var defaults = {
+		id: undefined,
+		size: 'small',
+		type: 'inline'
+	};
+
+	$.extend( {
+		/**
+		 * Create a spinner element
+		 *
+		 * The argument is an object with options used to construct the spinner (see below).
+		 *
+		 * It is a good practice to keep a reference to the created spinner to be able to remove it
+		 * later. Alternatively, one can use the 'id' option and #removeSpinner (but make sure to choose
+		 * an id that's unlikely to cause conflicts, e.g. with extensions, gadgets or user scripts).
+		 *
+		 * CSS classes used:
+		 *
+		 * - .mw-spinner for every spinner
+		 * - .mw-spinner-small / .mw-spinner-large for size
+		 * - .mw-spinner-block / .mw-spinner-inline for display types
+		 *
+		 * Example:
+		 *
+		 *     // Create a large spinner reserving all available horizontal space.
+		 *     var $spinner = $.createSpinner( { size: 'large', type: 'block' } );
+		 *     // Insert above page content.
+		 *     $( '#mw-content-text' ).prepend( $spinner );
+		 *
+		 *     // Place a small inline spinner next to the "Save" button
+		 *     var $spinner = $.createSpinner( { size: 'small', type: 'inline' } );
+		 *     // Alternatively, just `$.createSpinner();` as these are the default options.
+		 *     $( '#wpSave' ).after( $spinner );
+		 *
+		 *     // The following two are equivalent:
+		 *     $.createSpinner( 'magic' );
+		 *     $.createSpinner( { id: 'magic' } );
+		 *
+		 * @static
+		 * @inheritable
+		 * @param {Object|string} [opts] Options. If a string is given, it will be treated as the value
+		 *   of the `id` option. If an object is given, the possible option keys are:
+		 * @param {string} [opts.id] If given, spinner will be given an id of "mw-spinner-{id}".
+		 * @param {string} [opts.size='small'] 'small' or 'large' for a 20-pixel or 32-pixel spinner.
+		 * @param {string} [opts.type='inline'] 'inline' or 'block'. Inline creates an inline-block with
+		 *   width and height equal to spinner size. Block is a block-level element with width 100%,
+		 *   height equal to spinner size.
+		 * @return {jQuery}
+		 */
+		createSpinner: function ( opts ) {
+			var $spinner;
+
+			if ( opts !== undefined && $.type( opts ) !== 'object' ) {
+				opts = {
+					id: opts
+				};
+			}
+
+			opts = $.extend( {}, defaults, opts );
+
+			$spinner = $( '<div>' ).addClass( 'mw-spinner' ).attr( 'title', '...' );
+			if ( opts.id !== undefined ) {
+				$spinner.attr( 'id', 'mw-spinner-' + opts.id );
+			}
+
+			$spinner.addClass( opts.size === 'large' ? 'mw-spinner-large' : 'mw-spinner-small' );
+			$spinner.addClass( opts.type === 'block' ? 'mw-spinner-block' : 'mw-spinner-inline' );
+
+			return $spinner;
+		},
+
+		/**
+		 * Remove a spinner element
+		 *
+		 * @static
+		 * @inheritable
+		 * @param {string} id Id of the spinner, as passed to #createSpinner
+		 * @return {jQuery} The (now detached) spinner element
+		 */
+		removeSpinner: function ( id ) {
+			return $( '#mw-spinner-' + id ).remove();
+		}
+	} );
+
+	/**
+	 * Inject a spinner after each element in the collection
+	 *
+	 * Inserts spinner as siblings (not children) of the target elements.
+	 * Collection contents remain unchanged.
+	 *
+	 * @param {Object|string} [opts] See #createSpinner
+	 * @return {jQuery}
+	 */
+	$.fn.injectSpinner = function ( opts ) {
+		return this.after( $.createSpinner( opts ) );
+	};
+
+	/**
+	 * @class jQuery
+	 * @mixins jQuery.plugin.spinner
+	 */
+
+}( jQuery ) );
diff --git a/resources/src/jquery/images/spinner-large.gif b/resources/src/jquery/images/spinner-large.gif
deleted file mode 100644
index 72203fdd7f..0000000000
Binary files a/resources/src/jquery/images/spinner-large.gif and /dev/null differ
diff --git a/resources/src/jquery/images/spinner.gif b/resources/src/jquery/images/spinner.gif
deleted file mode 100644
index 6146be4e88..0000000000
Binary files a/resources/src/jquery/images/spinner.gif and /dev/null differ
diff --git a/resources/src/jquery/jquery.spinner.css b/resources/src/jquery/jquery.spinner.css
deleted file mode 100644
index 6c7bd0e660..0000000000
--- a/resources/src/jquery/jquery.spinner.css
+++ /dev/null
@@ -1,40 +0,0 @@
-.mw-spinner {
-	background-color: transparent;
-	background-position: center center;
-	background-repeat: no-repeat;
-}
-
-.mw-spinner-small {
-	/* @embed */
-	background-image: url( images/spinner.gif );
-	height: 20px;
-	width: 20px;
-	/* Avoid issues with .mw-spinner-block when floated without width. */
-	min-width: 20px;
-}
-
-.mw-spinner-large {
-	/* @embed */
-	background-image: url( images/spinner-large.gif );
-	height: 32px;
-	width: 32px;
-	/* Avoid issues with .mw-spinner-block when floated without width. */
-	min-width: 32px;
-}
-
-.mw-spinner-block {
-	display: block;
-	/* This overrides width from .mw-spinner-large / .mw-spinner-small,
-	 * This is where the min-width kicks in.
-	 */
-	width: 100%;
-}
-
-.mw-spinner-inline {
-	display: inline-block;
-	vertical-align: middle;
-
-	/* IE < 8 */
-	zoom: 1;
-	*display: inline; /* stylelint-disable-line declaration-block-no-duplicate-properties */
-}
diff --git a/resources/src/jquery/jquery.spinner.js b/resources/src/jquery/jquery.spinner.js
deleted file mode 100644
index 9079cc09b7..0000000000
--- a/resources/src/jquery/jquery.spinner.js
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * jQuery Spinner
- *
- * Simple jQuery plugin to create, inject and remove spinners.
- *
- * @class jQuery.plugin.spinner
- */
-( function ( $ ) {
-
-	// Default options for new spinners,
-	// stored outside the function to share between calls.
-	var defaults = {
-		id: undefined,
-		size: 'small',
-		type: 'inline'
-	};
-
-	$.extend( {
-		/**
-		 * Create a spinner element
-		 *
-		 * The argument is an object with options used to construct the spinner (see below).
-		 *
-		 * It is a good practice to keep a reference to the created spinner to be able to remove it
-		 * later. Alternatively, one can use the 'id' option and #removeSpinner (but make sure to choose
-		 * an id that's unlikely to cause conflicts, e.g. with extensions, gadgets or user scripts).
-		 *
-		 * CSS classes used:
-		 *
-		 * - .mw-spinner for every spinner
-		 * - .mw-spinner-small / .mw-spinner-large for size
-		 * - .mw-spinner-block / .mw-spinner-inline for display types
-		 *
-		 * Example:
-		 *
-		 *     // Create a large spinner reserving all available horizontal space.
-		 *     var $spinner = $.createSpinner( { size: 'large', type: 'block' } );
-		 *     // Insert above page content.
-		 *     $( '#mw-content-text' ).prepend( $spinner );
-		 *
-		 *     // Place a small inline spinner next to the "Save" button
-		 *     var $spinner = $.createSpinner( { size: 'small', type: 'inline' } );
-		 *     // Alternatively, just `$.createSpinner();` as these are the default options.
-		 *     $( '#wpSave' ).after( $spinner );
-		 *
-		 *     // The following two are equivalent:
-		 *     $.createSpinner( 'magic' );
-		 *     $.createSpinner( { id: 'magic' } );
-		 *
-		 * @static
-		 * @inheritable
-		 * @param {Object|string} [opts] Options. If a string is given, it will be treated as the value
-		 *   of the `id` option. If an object is given, the possible option keys are:
-		 * @param {string} [opts.id] If given, spinner will be given an id of "mw-spinner-{id}".
-		 * @param {string} [opts.size='small'] 'small' or 'large' for a 20-pixel or 32-pixel spinner.
-		 * @param {string} [opts.type='inline'] 'inline' or 'block'. Inline creates an inline-block with
-		 *   width and height equal to spinner size. Block is a block-level element with width 100%,
-		 *   height equal to spinner size.
-		 * @return {jQuery}
-		 */
-		createSpinner: function ( opts ) {
-			var $spinner;
-
-			if ( opts !== undefined && $.type( opts ) !== 'object' ) {
-				opts = {
-					id: opts
-				};
-			}
-
-			opts = $.extend( {}, defaults, opts );
-
-			$spinner = $( '<div>' ).addClass( 'mw-spinner' ).attr( 'title', '...' );
-			if ( opts.id !== undefined ) {
-				$spinner.attr( 'id', 'mw-spinner-' + opts.id );
-			}
-
-			$spinner.addClass( opts.size === 'large' ? 'mw-spinner-large' : 'mw-spinner-small' );
-			$spinner.addClass( opts.type === 'block' ? 'mw-spinner-block' : 'mw-spinner-inline' );
-
-			return $spinner;
-		},
-
-		/**
-		 * Remove a spinner element
-		 *
-		 * @static
-		 * @inheritable
-		 * @param {string} id Id of the spinner, as passed to #createSpinner
-		 * @return {jQuery} The (now detached) spinner element
-		 */
-		removeSpinner: function ( id ) {
-			return $( '#mw-spinner-' + id ).remove();
-		}
-	} );
-
-	/**
-	 * Inject a spinner after each element in the collection
-	 *
-	 * Inserts spinner as siblings (not children) of the target elements.
-	 * Collection contents remain unchanged.
-	 *
-	 * @param {Object|string} [opts] See #createSpinner
-	 * @return {jQuery}
-	 */
-	$.fn.injectSpinner = function ( opts ) {
-		return this.after( $.createSpinner( opts ) );
-	};
-
-	/**
-	 * @class jQuery
-	 * @mixins jQuery.plugin.spinner
-	 */
-
-}( jQuery ) );
diff --git a/resources/src/mediawiki.language/mediawiki.language.init.js b/resources/src/mediawiki.language/mediawiki.language.init.js
index e5cf26e8d3..077473ba01 100644
--- a/resources/src/mediawiki.language/mediawiki.language.init.js
+++ b/resources/src/mediawiki.language/mediawiki.language.init.js
@@ -77,7 +77,11 @@
 			if ( !( langData[ langCode ] instanceof mw.Map ) ) {
 				langData[ langCode ] = new mw.Map();
 			}
-			langData[ langCode ].set( dataKey, value );
+			if ( arguments.length > 2 ) {
+				langData[ langCode ].set( dataKey, value );
+			} else {
+				langData[ langCode ].set( dataKey );
+			}
 		}
 	};
 
diff --git a/resources/src/mediawiki.skinning/content.parsoid.less b/resources/src/mediawiki.skinning/content.parsoid.less
index 27ecb1a4c7..d880e8bebd 100644
--- a/resources/src/mediawiki.skinning/content.parsoid.less
+++ b/resources/src/mediawiki.skinning/content.parsoid.less
@@ -55,7 +55,7 @@ figure[ typeof*='mw:Audio' ] {
 
 	&.mw-halign-right {
 		/* @noflip */
-		margin: 0.5em 0 1.3em 1.4em;
+		margin: 0 0 0.5em 0.5em;
 		/* @noflip */
 		clear: right;
 		/* @noflip */
@@ -64,7 +64,7 @@ figure[ typeof*='mw:Audio' ] {
 
 	&.mw-halign-left {
 		/* @noflip */
-		margin: 0.5em 1.4em 1.3em 0;
+		margin: 0 0.5em 0.5em 0;
 		/* @noflip */
 		clear: left;
 		/* @noflip */
@@ -116,6 +116,15 @@ figure[ typeof~='mw:Audio/Frame' ] {
 	clear: right;
 	float: right;
 
+	&.mw-halign-left {
+		/* @noflip */
+		margin: 0.5em 1.4em 1.3em 0;
+	}
+	&.mw-halign-right {
+		/* @noflip */
+		margin: 0.5em 0 1.3em 1.4em;
+	}
+
 	> *:first-child {
 		> img,
 		> video {
diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.css b/resources/src/mediawiki.special.apisandbox/apisandbox.css
new file mode 100644
index 0000000000..fe5ac416bf
--- /dev/null
+++ b/resources/src/mediawiki.special.apisandbox/apisandbox.css
@@ -0,0 +1,110 @@
+.mw-apisandbox-toolbar {
+	background: #fff;
+	-webkit-position: sticky;
+	position: sticky;
+	top: 0;
+	margin-bottom: -1px;
+	padding: 0.5em 0;
+	border-bottom: 1px solid #a2a9b1;
+	text-align: right;
+	z-index: 1;
+}
+
+#mw-apisandbox-ui .mw-apisandbox-link {
+	display: none;
+}
+
+.mw-apisandbox-popup .oo-ui-popupWidget-body > .oo-ui-widget {
+	vertical-align: middle;
+}
+
+/* So DateTimeInputWidget's calendar popup works... */
+.mw-apisandbox-popup .oo-ui-popupWidget-popup,
+.mw-apisandbox-popup .oo-ui-popupWidget-body {
+	overflow: visible;
+}
+
+/* Display contents of the popup on a single line */
+.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body {
+	display: table;
+}
+
+.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body > * {
+	display: table-cell;
+}
+
+.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body > .oo-ui-buttonWidget {
+	padding-left: 0.5em;
+	width: 1%;
+}
+
+.mw-apisandbox-spacer {
+	display: inline-block;
+	height: 1px;
+	width: 5em;
+}
+
+.mw-apisandbox-help-field {
+	border-bottom: 1px solid rgba( 0, 0, 0, 0.1 );
+}
+
+.mw-apisandbox-help-field:last-child {
+	border-bottom: 0;
+}
+
+.mw-apisandbox-optionalWidget {
+	width: 100%;
+}
+
+.mw-apisandbox-optionalWidget.oo-ui-widget-disabled {
+	position: relative;
+	z-index: 0; /* New stacking context to prevent the cover from leaking out */
+}
+
+.mw-apisandbox-optionalWidget-cover {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	z-index: 2;
+	cursor: pointer;
+}
+
+.mw-apisandbox-optionalWidget-fields {
+	display: table;
+	width: 100%;
+}
+
+.mw-apisandbox-optionalWidget-widget,
+.mw-apisandbox-optionalWidget-checkbox {
+	display: table-cell;
+	vertical-align: middle;
+}
+
+.mw-apisandbox-optionalWidget-checkbox {
+	width: 1%; /* Will be expanded by content */
+	white-space: nowrap;
+	padding-left: 0.5em;
+}
+
+.mw-apisandbox-textInputCode .oo-ui-inputWidget-input {
+	font-family: monospace, monospace;
+	font-size: 0.8125em;
+	-moz-tab-size: 4;
+	tab-size: 4;
+}
+
+.mw-apisandbox-widget-field .oo-ui-textInputWidget {
+	/* Leave at least enough space for icon, indicator, and a sliver of text */
+	min-width: 6em;
+}
+
+.apihelp-deprecated {
+	font-weight: bold;
+	color: #d33;
+}
+
+.apihelp-deprecated-value .oo-ui-labelElement-label {
+	text-decoration: line-through;
+}
diff --git a/resources/src/mediawiki.special.apisandbox/apisandbox.js b/resources/src/mediawiki.special.apisandbox/apisandbox.js
new file mode 100644
index 0000000000..f936658ff3
--- /dev/null
+++ b/resources/src/mediawiki.special.apisandbox/apisandbox.js
@@ -0,0 +1,2073 @@
+( function ( $, mw, OO ) {
+	'use strict';
+	var ApiSandbox, Util, WidgetMethods, Validators,
+		$content, panel, booklet, oldhash, windowManager,
+		formatDropdown,
+		api = new mw.Api(),
+		bookletPages = [],
+		availableFormats = {},
+		resultPage = null,
+		suppressErrors = true,
+		updatingBooklet = false,
+		pages = {},
+		moduleInfoCache = {},
+		baseRequestParams;
+
+	/**
+	 * A wrapper for a widget that provides an enable/disable button
+	 *
+	 * @class
+	 * @private
+	 * @constructor
+	 * @param {OO.ui.Widget} widget
+	 * @param {Object} [config] Configuration options
+	 */
+	function OptionalWidget( widget, config ) {
+		var k;
+
+		config = config || {};
+
+		this.widget = widget;
+		this.$cover = config.$cover ||
+			$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-cover' );
+		this.checkbox = new OO.ui.CheckboxInputWidget( config.checkbox )
+			.on( 'change', this.onCheckboxChange, [], this );
+
+		OptionalWidget[ 'super' ].call( this, config );
+
+		// Forward most methods for convenience
+		for ( k in this.widget ) {
+			if ( $.isFunction( this.widget[ k ] ) && !this[ k ] ) {
+				this[ k ] = this.widget[ k ].bind( this.widget );
+			}
+		}
+
+		widget.connect( this, {
+			change: [ this.emit, 'change' ]
+		} );
+
+		this.$cover.on( 'click', this.onOverlayClick.bind( this ) );
+
+		this.$element
+			.addClass( 'mw-apisandbox-optionalWidget' )
+			.append(
+				this.$cover,
+				$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-fields' ).append(
+					$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-widget' ).append(
+						widget.$element
+					),
+					$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-checkbox' ).append(
+						this.checkbox.$element
+					)
+				)
+			);
+
+		this.setDisabled( widget.isDisabled() );
+	}
+	OO.inheritClass( OptionalWidget, OO.ui.Widget );
+	OptionalWidget.prototype.onCheckboxChange = function ( checked ) {
+		this.setDisabled( !checked );
+	};
+	OptionalWidget.prototype.onOverlayClick = function () {
+		this.setDisabled( false );
+		if ( $.isFunction( this.widget.focus ) ) {
+			this.widget.focus();
+		}
+	};
+	OptionalWidget.prototype.setDisabled = function ( disabled ) {
+		OptionalWidget[ 'super' ].prototype.setDisabled.call( this, disabled );
+		this.widget.setDisabled( this.isDisabled() );
+		this.checkbox.setSelected( !this.isDisabled() );
+		this.$cover.toggle( this.isDisabled() );
+		this.emit( 'change' );
+		return this;
+	};
+
+	WidgetMethods = {
+		textInputWidget: {
+			getApiValue: function () {
+				return this.getValue();
+			},
+			setApiValue: function ( v ) {
+				if ( v === undefined ) {
+					v = this.paramInfo[ 'default' ];
+				}
+				this.setValue( v );
+			},
+			apiCheckValid: function () {
+				var that = this;
+				return this.getValidity().then( function () {
+					return $.Deferred().resolve( true ).promise();
+				}, function () {
+					return $.Deferred().resolve( false ).promise();
+				} ).done( function ( ok ) {
+					ok = ok || suppressErrors;
+					that.setIcon( ok ? null : 'alert' );
+					that.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
+				} );
+			}
+		},
+
+		dateTimeInputWidget: {
+			getValidity: function () {
+				if ( !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '' ) {
+					return $.Deferred().resolve().promise();
+				} else {
+					return $.Deferred().reject().promise();
+				}
+			}
+		},
+
+		tokenWidget: {
+			alertTokenError: function ( code, error ) {
+				windowManager.openWindow( 'errorAlert', {
+					title: Util.parseMsg( 'apisandbox-results-fixtoken-fail', this.paramInfo.tokentype ),
+					message: error,
+					actions: [
+						{
+							action: 'accept',
+							label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
+							flags: 'primary'
+						}
+					]
+				} );
+			},
+			fetchToken: function () {
+				this.pushPending();
+				return api.getToken( this.paramInfo.tokentype )
+					.done( this.setApiValue.bind( this ) )
+					.fail( this.alertTokenError.bind( this ) )
+					.always( this.popPending.bind( this ) );
+			},
+			setApiValue: function ( v ) {
+				WidgetMethods.textInputWidget.setApiValue.call( this, v );
+				if ( v === '123ABC' ) {
+					this.fetchToken();
+				}
+			}
+		},
+
+		passwordWidget: {
+			getApiValueForDisplay: function () {
+				return '';
+			}
+		},
+
+		toggleSwitchWidget: {
+			getApiValue: function () {
+				return this.getValue() ? 1 : undefined;
+			},
+			setApiValue: function ( v ) {
+				this.setValue( Util.apiBool( v ) );
+			},
+			apiCheckValid: function () {
+				return $.Deferred().resolve( true ).promise();
+			}
+		},
+
+		dropdownWidget: {
+			getApiValue: function () {
+				var item = this.getMenu().findSelectedItem();
+				return item === null ? undefined : item.getData();
+			},
+			setApiValue: function ( v ) {
+				var menu = this.getMenu();
+
+				if ( v === undefined ) {
+					v = this.paramInfo[ 'default' ];
+				}
+				if ( v === undefined ) {
+					menu.selectItem();
+				} else {
+					menu.selectItemByData( String( v ) );
+				}
+			},
+			apiCheckValid: function () {
+				var ok = this.getApiValue() !== undefined || suppressErrors;
+				this.setIcon( ok ? null : 'alert' );
+				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
+				return $.Deferred().resolve( ok ).promise();
+			}
+		},
+
+		tagWidget: {
+			parseApiValue: function ( v ) {
+				if ( v === undefined || v === '' || v === '\x1f' ) {
+					return [];
+				} else {
+					v = String( v );
+					if ( v[ 0 ] !== '\x1f' ) {
+						return v.split( '|' );
+					} else {
+						return v.substr( 1 ).split( '\x1f' );
+					}
+				}
+			},
+			getApiValueForTemplates: function () {
+				return this.isDisabled() ? this.parseApiValue( this.paramInfo[ 'default' ] ) : this.getValue();
+			},
+			getApiValue: function () {
+				var items = this.getValue();
+				if ( items.join( '' ).indexOf( '|' ) === -1 ) {
+					return items.join( '|' );
+				} else {
+					return '\x1f' + items.join( '\x1f' );
+				}
+			},
+			setApiValue: function ( v ) {
+				if ( v === undefined ) {
+					v = this.paramInfo[ 'default' ];
+				}
+				this.setValue( this.parseApiValue( v ) );
+			},
+			apiCheckValid: function () {
+				var ok = true,
+					pi = this.paramInfo;
+
+				if ( !suppressErrors ) {
+					ok = this.getApiValue() !== undefined && !(
+						pi.allspecifier !== undefined &&
+						this.getValue().length > 1 &&
+						this.getValue().indexOf( pi.allspecifier ) !== -1
+					);
+				}
+
+				this.setIcon( ok ? null : 'alert' );
+				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
+				return $.Deferred().resolve( ok ).promise();
+			},
+			createTagItemWidget: function ( data, label ) {
+				var item = OO.ui.TagMultiselectWidget.prototype.createTagItemWidget.call( this, data, label );
+				if ( this.paramInfo.deprecatedvalues &&
+					this.paramInfo.deprecatedvalues.indexOf( data ) >= 0
+				) {
+					item.$element.addClass( 'apihelp-deprecated-value' );
+				}
+				return item;
+			}
+		},
+
+		optionalWidget: {
+			getApiValue: function () {
+				return this.isDisabled() ? undefined : this.widget.getApiValue();
+			},
+			setApiValue: function ( v ) {
+				this.setDisabled( v === undefined );
+				this.widget.setApiValue( v );
+			},
+			apiCheckValid: function () {
+				if ( this.isDisabled() ) {
+					return $.Deferred().resolve( true ).promise();
+				} else {
+					return this.widget.apiCheckValid();
+				}
+			}
+		},
+
+		submoduleWidget: {
+			single: function () {
+				var v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue();
+				return v === undefined ? [] : [ { value: v, path: this.paramInfo.submodules[ v ] } ];
+			},
+			multi: function () {
+				var map = this.paramInfo.submodules,
+					v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue();
+				return v === undefined || v === '' ? [] : String( v ).split( '|' ).map( function ( v ) {
+					return { value: v, path: map[ v ] };
+				} );
+			}
+		},
+
+		uploadWidget: {
+			getApiValueForDisplay: function () {
+				return '...';
+			},
+			getApiValue: function () {
+				return this.getValue();
+			},
+			setApiValue: function () {
+				// Can't, sorry.
+			},
+			apiCheckValid: function () {
+				var ok = this.getValue() !== null || suppressErrors;
+				this.setIcon( ok ? null : 'alert' );
+				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
+				return $.Deferred().resolve( ok ).promise();
+			}
+		}
+	};
+
+	Validators = {
+		generic: function () {
+			return !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '';
+		}
+	};
+
+	/**
+	 * @class mw.special.ApiSandbox.Util
+	 * @private
+	 */
+	Util = {
+		/**
+		 * Fetch API module info
+		 *
+		 * @param {string} module Module to fetch data for
+		 * @return {jQuery.Promise}
+		 */
+		fetchModuleInfo: function ( module ) {
+			var apiPromise,
+				deferred = $.Deferred();
+
+			if ( moduleInfoCache.hasOwnProperty( module ) ) {
+				return deferred
+					.resolve( moduleInfoCache[ module ] )
+					.promise( { abort: function () {} } );
+			} else {
+				apiPromise = api.post( {
+					action: 'paraminfo',
+					modules: module,
+					helpformat: 'html',
+					uselang: mw.config.get( 'wgUserLanguage' )
+				} ).done( function ( data ) {
+					var info;
+
+					if ( data.warnings && data.warnings.paraminfo ) {
+						deferred.reject( '???', data.warnings.paraminfo[ '*' ] );
+						return;
+					}
+
+					info = data.paraminfo.modules;
+					if ( !info || info.length !== 1 || info[ 0 ].path !== module ) {
+						deferred.reject( '???', 'No module data returned' );
+						return;
+					}
+
+					moduleInfoCache[ module ] = info[ 0 ];
+					deferred.resolve( info[ 0 ] );
+				} ).fail( function ( code, details ) {
+					if ( code === 'http' ) {
+						details = 'HTTP error: ' + details.exception;
+					} else if ( details.error ) {
+						details = details.error.info;
+					}
+					deferred.reject( code, details );
+				} );
+				return deferred
+					.promise( { abort: apiPromise.abort } );
+			}
+		},
+
+		/**
+		 * Mark all currently-in-use tokens as bad
+		 */
+		markTokensBad: function () {
+			var page, subpages, i,
+				checkPages = [ pages.main ];
+
+			while ( checkPages.length ) {
+				page = checkPages.shift();
+
+				if ( page.tokenWidget ) {
+					api.badToken( page.tokenWidget.paramInfo.tokentype );
+				}
+
+				subpages = page.getSubpages();
+				for ( i = 0; i < subpages.length; i++ ) {
+					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
+						checkPages.push( pages[ subpages[ i ].key ] );
+					}
+				}
+			}
+		},
+
+		/**
+		 * Test an API boolean
+		 *
+		 * @param {Mixed} value
+		 * @return {boolean}
+		 */
+		apiBool: function ( value ) {
+			return value !== undefined && value !== false;
+		},
+
+		/**
+		 * Create a widget for a parameter.
+		 *
+		 * @param {Object} pi Parameter info from API
+		 * @param {Object} opts Additional options
+		 * @return {OO.ui.Widget}
+		 */
+		createWidgetForParameter: function ( pi, opts ) {
+			var widget, innerWidget, finalWidget, items, $content, func,
+				multiModeButton = null,
+				multiModeInput = null,
+				multiModeAllowed = false;
+
+			opts = opts || {};
+
+			switch ( pi.type ) {
+				case 'boolean':
+					widget = new OO.ui.ToggleSwitchWidget();
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.toggleSwitchWidget );
+					pi.required = true; // Avoid wrapping in the non-required widget
+					break;
+
+				case 'string':
+				case 'user':
+					if ( Util.apiBool( pi.multi ) ) {
+						widget = new OO.ui.TagMultiselectWidget( {
+							allowArbitrary: true,
+							allowDuplicates: Util.apiBool( pi.allowsduplicates ),
+							$overlay: true
+						} );
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.tagWidget );
+					} else {
+						widget = new OO.ui.TextInputWidget( {
+							required: Util.apiBool( pi.required )
+						} );
+					}
+					if ( !Util.apiBool( pi.multi ) ) {
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.textInputWidget );
+						widget.setValidation( Validators.generic );
+					}
+					if ( pi.tokentype ) {
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.textInputWidget );
+						$.extend( widget, WidgetMethods.tokenWidget );
+					}
+					break;
+
+				case 'text':
+					widget = new OO.ui.MultilineTextInputWidget( {
+						required: Util.apiBool( pi.required )
+					} );
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.textInputWidget );
+					widget.setValidation( Validators.generic );
+					break;
+
+				case 'password':
+					widget = new OO.ui.TextInputWidget( {
+						type: 'password',
+						required: Util.apiBool( pi.required )
+					} );
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.textInputWidget );
+					$.extend( widget, WidgetMethods.passwordWidget );
+					widget.setValidation( Validators.generic );
+					multiModeAllowed = true;
+					multiModeInput = widget;
+					break;
+
+				case 'integer':
+					widget = new OO.ui.NumberInputWidget( {
+						required: Util.apiBool( pi.required ),
+						isInteger: true
+					} );
+					widget.setIcon = widget.input.setIcon.bind( widget.input );
+					widget.setIconTitle = widget.input.setIconTitle.bind( widget.input );
+					widget.getValidity = widget.input.getValidity.bind( widget.input );
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.textInputWidget );
+					if ( Util.apiBool( pi.enforcerange ) ) {
+						widget.setRange( pi.min || -Infinity, pi.max || Infinity );
+					}
+					multiModeAllowed = true;
+					multiModeInput = widget;
+					break;
+
+				case 'limit':
+					widget = new OO.ui.TextInputWidget( {
+						required: Util.apiBool( pi.required )
+					} );
+					widget.setValidation( function ( value ) {
+						var n, pi = this.paramInfo;
+
+						if ( value === 'max' ) {
+							return true;
+						} else {
+							n = +value;
+							return !isNaN( n ) && isFinite( n ) &&
+								Math.floor( n ) === n &&
+								n >= pi.min && n <= pi.apiSandboxMax;
+						}
+					} );
+					pi.min = pi.min || 0;
+					pi.apiSandboxMax = mw.config.get( 'apihighlimits' ) ? pi.highmax : pi.max;
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.textInputWidget );
+					multiModeAllowed = true;
+					multiModeInput = widget;
+					break;
+
+				case 'timestamp':
+					widget = new mw.widgets.datetime.DateTimeInputWidget( {
+						formatter: {
+							format: '${year|0}-${month|0}-${day|0}T${hour|0}:${minute|0}:${second|0}${zone|short}'
+						},
+						required: Util.apiBool( pi.required ),
+						clearable: false
+					} );
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.textInputWidget );
+					$.extend( widget, WidgetMethods.dateTimeInputWidget );
+					multiModeAllowed = true;
+					break;
+
+				case 'upload':
+					widget = new OO.ui.SelectFileWidget();
+					widget.paramInfo = pi;
+					$.extend( widget, WidgetMethods.uploadWidget );
+					break;
+
+				case 'namespace':
+					items = $.map( mw.config.get( 'wgFormattedNamespaces' ), function ( name, ns ) {
+						if ( ns === '0' ) {
+							name = mw.message( 'blanknamespace' ).text();
+						}
+						return new OO.ui.MenuOptionWidget( { data: ns, label: name } );
+					} ).sort( function ( a, b ) {
+						return a.data - b.data;
+					} );
+					if ( Util.apiBool( pi.multi ) ) {
+						if ( pi.allspecifier !== undefined ) {
+							items.unshift( new OO.ui.MenuOptionWidget( {
+								data: pi.allspecifier,
+								label: mw.message( 'apisandbox-multivalue-all-namespaces', pi.allspecifier ).text()
+							} ) );
+						}
+
+						widget = new OO.ui.MenuTagMultiselectWidget( {
+							menu: { items: items },
+							$overlay: true
+						} );
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.tagWidget );
+					} else {
+						widget = new OO.ui.DropdownWidget( {
+							menu: { items: items },
+							$overlay: true
+						} );
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.dropdownWidget );
+					}
+					break;
+
+				default:
+					if ( !Array.isArray( pi.type ) ) {
+						throw new Error( 'Unknown parameter type ' + pi.type );
+					}
+
+					items = pi.type.map( function ( v ) {
+						var config = {
+							data: String( v ),
+							label: String( v ),
+							classes: []
+						};
+						if ( pi.deprecatedvalues && pi.deprecatedvalues.indexOf( v ) >= 0 ) {
+							config.classes.push( 'apihelp-deprecated-value' );
+						}
+						return new OO.ui.MenuOptionWidget( config );
+					} );
+					if ( Util.apiBool( pi.multi ) ) {
+						if ( pi.allspecifier !== undefined ) {
+							items.unshift( new OO.ui.MenuOptionWidget( {
+								data: pi.allspecifier,
+								label: mw.message( 'apisandbox-multivalue-all-values', pi.allspecifier ).text()
+							} ) );
+						}
+
+						widget = new OO.ui.MenuTagMultiselectWidget( {
+							menu: { items: items },
+							$overlay: true
+						} );
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.tagWidget );
+						if ( Util.apiBool( pi.submodules ) ) {
+							widget.getSubmodules = WidgetMethods.submoduleWidget.multi;
+							widget.on( 'change', ApiSandbox.updateUI );
+						}
+					} else {
+						widget = new OO.ui.DropdownWidget( {
+							menu: { items: items },
+							$overlay: true
+						} );
+						widget.paramInfo = pi;
+						$.extend( widget, WidgetMethods.dropdownWidget );
+						if ( Util.apiBool( pi.submodules ) ) {
+							widget.getSubmodules = WidgetMethods.submoduleWidget.single;
+							widget.getMenu().on( 'select', ApiSandbox.updateUI );
+						}
+						if ( pi.deprecatedvalues ) {
+							widget.getMenu().on( 'select', function ( item ) {
+								this.$element.toggleClass(
+									'apihelp-deprecated-value',
+									pi.deprecatedvalues.indexOf( item.data ) >= 0
+								);
+							}, [], widget );
+						}
+					}
+
+					break;
+			}
+
+			if ( Util.apiBool( pi.multi ) && multiModeAllowed ) {
+				innerWidget = widget;
+
+				multiModeButton = new OO.ui.ButtonWidget( {
+					label: mw.message( 'apisandbox-add-multi' ).text()
+				} );
+				$content = innerWidget.$element.add( multiModeButton.$element );
+
+				widget = new OO.ui.PopupTagMultiselectWidget( {
+					allowArbitrary: true,
+					allowDuplicates: Util.apiBool( pi.allowsduplicates ),
+					$overlay: true,
+					popup: {
+						classes: [ 'mw-apisandbox-popup' ],
+						padded: true,
+						$content: $content
+					}
+				} );
+				widget.paramInfo = pi;
+				$.extend( widget, WidgetMethods.tagWidget );
+
+				func = function () {
+					if ( !innerWidget.isDisabled() ) {
+						innerWidget.apiCheckValid().done( function ( ok ) {
+							if ( ok ) {
+								widget.addTag( innerWidget.getApiValue() );
+								innerWidget.setApiValue( undefined );
+							}
+						} );
+						return false;
+					}
+				};
+
+				if ( multiModeInput ) {
+					multiModeInput.on( 'enter', func );
+				}
+				multiModeButton.on( 'click', func );
+			}
+
+			if ( Util.apiBool( pi.required ) || opts.nooptional ) {
+				finalWidget = widget;
+			} else {
+				finalWidget = new OptionalWidget( widget );
+				finalWidget.paramInfo = pi;
+				$.extend( finalWidget, WidgetMethods.optionalWidget );
+				if ( widget.getSubmodules ) {
+					finalWidget.getSubmodules = widget.getSubmodules.bind( widget );
+					finalWidget.on( 'disable', function () { setTimeout( ApiSandbox.updateUI ); } );
+				}
+				if ( widget.getApiValueForTemplates ) {
+					finalWidget.getApiValueForTemplates = widget.getApiValueForTemplates.bind( widget );
+				}
+				finalWidget.setDisabled( true );
+			}
+
+			widget.setApiValue( pi[ 'default' ] );
+
+			return finalWidget;
+		},
+
+		/**
+		 * Parse an HTML string and call Util.fixupHTML()
+		 *
+		 * @param {string} html HTML to parse
+		 * @return {jQuery}
+		 */
+		parseHTML: function ( html ) {
+			var $ret = $( $.parseHTML( html ) );
+			return Util.fixupHTML( $ret );
+		},
+
+		/**
+		 * Parse an i18n message and call Util.fixupHTML()
+		 *
+		 * @param {string} key Key of message to get
+		 * @param {...Mixed} parameters Values for $N replacements
+		 * @return {jQuery}
+		 */
+		parseMsg: function () {
+			var $ret = mw.message.apply( mw.message, arguments ).parseDom();
+			return Util.fixupHTML( $ret );
+		},
+
+		/**
+		 * Fix HTML for ApiSandbox display
+		 *
+		 * Fixes are:
+		 * - Add target="_blank" to any links
+		 *
+		 * @param {jQuery} $html DOM to process
+		 * @return {jQuery}
+		 */
+		fixupHTML: function ( $html ) {
+			$html.filter( 'a' ).add( $html.find( 'a' ) )
+				.filter( '[href]:not([target])' )
+				.attr( 'target', '_blank' );
+			return $html;
+		},
+
+		/**
+		 * Format a request and return a bunch of menu option widgets
+		 *
+		 * @param {Object} displayParams Query parameters, sanitized for display.
+		 * @param {Object} rawParams Query parameters. You should probably use displayParams instead.
+		 * @return {OO.ui.MenuOptionWidget[]} Each item's data should be an OO.ui.FieldLayout
+		 */
+		formatRequest: function ( displayParams, rawParams ) {
+			var jsonInput,
+				items = [
+					new OO.ui.MenuOptionWidget( {
+						label: Util.parseMsg( 'apisandbox-request-format-url-label' ),
+						data: new OO.ui.FieldLayout(
+							new OO.ui.TextInputWidget( {
+								readOnly: true,
+								value: mw.util.wikiScript( 'api' ) + '?' + $.param( displayParams )
+							} ), {
+								label: Util.parseMsg( 'apisandbox-request-url-label' )
+							}
+						)
+					} ),
+					new OO.ui.MenuOptionWidget( {
+						label: Util.parseMsg( 'apisandbox-request-format-json-label' ),
+						data: new OO.ui.FieldLayout(
+							jsonInput = new OO.ui.MultilineTextInputWidget( {
+								classes: [ 'mw-apisandbox-textInputCode' ],
+								readOnly: true,
+								autosize: true,
+								maxRows: 6,
+								value: JSON.stringify( displayParams, null, '\t' )
+							} ), {
+								label: Util.parseMsg( 'apisandbox-request-json-label' )
+							}
+						).on( 'toggle', function ( visible ) {
+							if ( visible ) {
+								// Call updatePosition instead of adjustSize
+								// because the latter has weird caching
+								// behavior and the former bypasses it.
+								jsonInput.updatePosition();
+							}
+						} )
+					} )
+				];
+
+			mw.hook( 'apisandbox.formatRequest' ).fire( items, displayParams, rawParams );
+
+			return items;
+		},
+
+		/**
+		 * Event handler for when formatDropdown's selection changes
+		 */
+		onFormatDropdownChange: function () {
+			var i,
+				menu = formatDropdown.getMenu(),
+				items = menu.getItems(),
+				selectedField = menu.findSelectedItem() ? menu.findSelectedItem().getData() : null;
+
+			for ( i = 0; i < items.length; i++ ) {
+				items[ i ].getData().toggle( items[ i ].getData() === selectedField );
+			}
+		}
+	};
+
+	/**
+	* Interface to ApiSandbox UI
+	*
+	* @class mw.special.ApiSandbox
+	*/
+	ApiSandbox = {
+		/**
+		 * Initialize the UI
+		 *
+		 * Automatically called on $.ready()
+		 */
+		init: function () {
+			var $toolbar;
+
+			$content = $( '#mw-apisandbox' );
+
+			windowManager = new OO.ui.WindowManager();
+			$( 'body' ).append( windowManager.$element );
+			windowManager.addWindows( {
+				errorAlert: new OO.ui.MessageDialog()
+			} );
+
+			$toolbar = $( '<div>' )
+				.addClass( 'mw-apisandbox-toolbar' )
+				.append(
+					new OO.ui.ButtonWidget( {
+						label: mw.message( 'apisandbox-submit' ).text(),
+						flags: [ 'primary', 'progressive' ]
+					} ).on( 'click', ApiSandbox.sendRequest ).$element,
+					new OO.ui.ButtonWidget( {
+						label: mw.message( 'apisandbox-reset' ).text(),
+						flags: 'destructive'
+					} ).on( 'click', ApiSandbox.resetUI ).$element
+				);
+
+			booklet = new OO.ui.BookletLayout( {
+				expanded: false,
+				outlined: true,
+				autoFocus: false
+			} );
+
+			panel = new OO.ui.PanelLayout( {
+				classes: [ 'mw-apisandbox-container' ],
+				content: [ booklet ],
+				expanded: false,
+				framed: true
+			} );
+
+			pages.main = new ApiSandbox.PageLayout( { key: 'main', path: 'main' } );
+
+			// Parse the current hash string
+			if ( !ApiSandbox.loadFromHash() ) {
+				ApiSandbox.updateUI();
+			}
+
+			$( window ).on( 'hashchange', ApiSandbox.loadFromHash );
+
+			$content
+				.empty()
+				.append( $( '<p>' ).append( Util.parseMsg( 'apisandbox-intro' ) ) )
+				.append(
+					$( '<div>' ).attr( 'id', 'mw-apisandbox-ui' )
+						.append( $toolbar )
+						.append( panel.$element )
+				);
+		},
+
+		/**
+		 * Update the current query when the page hash changes
+		 *
+		 * @return {boolean} Successful
+		 */
+		loadFromHash: function () {
+			var params, m, re,
+				hash = location.hash;
+
+			if ( oldhash === hash ) {
+				return false;
+			}
+			oldhash = hash;
+			if ( hash === '' ) {
+				return false;
+			}
+
+			// I'm surprised this doesn't seem to exist in jQuery or mw.util.
+			params = {};
+			hash = hash.replace( /\+/g, '%20' );
+			re = /([^&=#]+)=?([^&#]*)/g;
+			while ( ( m = re.exec( hash ) ) ) {
+				params[ decodeURIComponent( m[ 1 ] ) ] = decodeURIComponent( m[ 2 ] );
+			}
+
+			ApiSandbox.updateUI( params );
+			return true;
+		},
+
+		/**
+		 * Update the pages in the booklet
+		 *
+		 * @param {Object} [params] Optional query parameters to load
+		 */
+		updateUI: function ( params ) {
+			var i, page, subpages, j, removePages,
+				addPages = [];
+
+			if ( !$.isPlainObject( params ) ) {
+				params = undefined;
+			}
+
+			if ( updatingBooklet ) {
+				return;
+			}
+			updatingBooklet = true;
+			try {
+				if ( params !== undefined ) {
+					pages.main.loadQueryParams( params );
+				}
+				addPages.push( pages.main );
+				if ( resultPage !== null ) {
+					addPages.push( resultPage );
+				}
+				pages.main.apiCheckValid();
+
+				i = 0;
+				while ( addPages.length ) {
+					page = addPages.shift();
+					if ( bookletPages[ i ] !== page ) {
+						for ( j = i; j < bookletPages.length; j++ ) {
+							if ( bookletPages[ j ].getName() === page.getName() ) {
+								bookletPages.splice( j, 1 );
+							}
+						}
+						bookletPages.splice( i, 0, page );
+						booklet.addPages( [ page ], i );
+					}
+					i++;
+
+					if ( page.getSubpages ) {
+						subpages = page.getSubpages();
+						for ( j = 0; j < subpages.length; j++ ) {
+							if ( !pages.hasOwnProperty( subpages[ j ].key ) ) {
+								subpages[ j ].indentLevel = page.indentLevel + 1;
+								pages[ subpages[ j ].key ] = new ApiSandbox.PageLayout( subpages[ j ] );
+							}
+							if ( params !== undefined ) {
+								pages[ subpages[ j ].key ].loadQueryParams( params );
+							}
+							addPages.splice( j, 0, pages[ subpages[ j ].key ] );
+							pages[ subpages[ j ].key ].apiCheckValid();
+						}
+					}
+				}
+
+				if ( bookletPages.length > i ) {
+					removePages = bookletPages.splice( i, bookletPages.length - i );
+					booklet.removePages( removePages );
+				}
+
+				if ( !booklet.getCurrentPageName() ) {
+					booklet.selectFirstSelectablePage();
+				}
+			} finally {
+				updatingBooklet = false;
+			}
+		},
+
+		/**
+		 * Reset button handler
+		 */
+		resetUI: function () {
+			suppressErrors = true;
+			pages = {
+				main: new ApiSandbox.PageLayout( { key: 'main', path: 'main' } )
+			};
+			resultPage = null;
+			ApiSandbox.updateUI();
+		},
+
+		/**
+		 * Submit button handler
+		 *
+		 * @param {Object} [params] Use this set of params instead of those in the form fields.
+		 *   The form fields will be updated to match.
+		 */
+		sendRequest: function ( params ) {
+			var page, subpages, i, query, $result, $focus,
+				progress, $progressText, progressLoading,
+				deferreds = [],
+				paramsAreForced = !!params,
+				displayParams = {},
+				tokenWidgets = [],
+				checkPages = [ pages.main ];
+
+			// Blur any focused widget before submit, because
+			// OO.ui.ButtonWidget doesn't take focus itself (T128054)
+			$focus = $( '#mw-apisandbox-ui' ).find( document.activeElement );
+			if ( $focus.length ) {
+				$focus[ 0 ].blur();
+			}
+
+			suppressErrors = false;
+
+			// save widget state in params (or load from it if we are forced)
+			if ( paramsAreForced ) {
+				ApiSandbox.updateUI( params );
+			}
+			params = {};
+			while ( checkPages.length ) {
+				page = checkPages.shift();
+				if ( page.tokenWidget ) {
+					tokenWidgets.push( page.tokenWidget );
+				}
+				deferreds = deferreds.concat( page.apiCheckValid() );
+				page.getQueryParams( params, displayParams );
+				subpages = page.getSubpages();
+				for ( i = 0; i < subpages.length; i++ ) {
+					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
+						checkPages.push( pages[ subpages[ i ].key ] );
+					}
+				}
+			}
+
+			if ( !paramsAreForced ) {
+				// forced params means we are continuing a query; the base query should be preserved
+				baseRequestParams = $.extend( {}, params );
+			}
+
+			$.when.apply( $, deferreds ).done( function () {
+				var formatItems, menu, selectedLabel, deferred, actions, errorCount;
+
+				// Count how many times `value` occurs in `array`.
+				function countValues( value, array ) {
+					var count, i;
+					count = 0;
+					for ( i = 0; i < array.length; i++ ) {
+						if ( array[ i ] === value ) {
+							count++;
+						}
+					}
+					return count;
+				}
+
+				errorCount = countValues( false, arguments );
+				if ( errorCount > 0 ) {
+					actions = [
+						{
+							action: 'accept',
+							label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
+							flags: 'primary'
+						}
+					];
+					if ( tokenWidgets.length ) {
+						// Check all token widgets' validity separately
+						deferred = $.when.apply( $, tokenWidgets.map( function ( w ) {
+							return w.apiCheckValid();
+						} ) );
+
+						deferred.done( function () {
+							// If only the tokens are invalid, offer to fix them
+							var tokenErrorCount = countValues( false, arguments );
+							if ( tokenErrorCount === errorCount ) {
+								delete actions[ 0 ].flags;
+								actions.push( {
+									action: 'fix',
+									label: mw.message( 'apisandbox-results-fixtoken' ).text(),
+									flags: 'primary'
+								} );
+							}
+						} );
+					} else {
+						deferred = $.Deferred().resolve();
+					}
+					deferred.always( function () {
+						windowManager.openWindow( 'errorAlert', {
+							title: Util.parseMsg( 'apisandbox-submit-invalid-fields-title' ),
+							message: Util.parseMsg( 'apisandbox-submit-invalid-fields-message' ),
+							actions: actions
+						} ).closed.then( function ( data ) {
+							if ( data && data.action === 'fix' ) {
+								ApiSandbox.fixTokenAndResend();
+							}
+						} );
+					} );
+					return;
+				}
+
+				query = $.param( displayParams );
+
+				formatItems = Util.formatRequest( displayParams, params );
+
+				// Force a 'fm' format with wrappedhtml=1, if available
+				if ( params.format !== undefined ) {
+					if ( availableFormats.hasOwnProperty( params.format + 'fm' ) ) {
+						params.format = params.format + 'fm';
+					}
+					if ( params.format.substr( -2 ) === 'fm' ) {
+						params.wrappedhtml = 1;
+					}
+				}
+
+				progressLoading = false;
+				$progressText = $( '<span>' ).text( mw.message( 'apisandbox-sending-request' ).text() );
+				progress = new OO.ui.ProgressBarWidget( {
+					progress: false,
+					$content: $progressText
+				} );
+
+				$result = $( '<div>' )
+					.append( progress.$element );
+
+				resultPage = page = new OO.ui.PageLayout( '|results|', { expanded: false } );
+				page.setupOutlineItem = function () {
+					this.outlineItem.setLabel( mw.message( 'apisandbox-results' ).text() );
+				};
+
+				if ( !formatDropdown ) {
+					formatDropdown = new OO.ui.DropdownWidget( {
+						menu: { items: [] },
+						$overlay: true
+					} );
+					formatDropdown.getMenu().on( 'select', Util.onFormatDropdownChange );
+				}
+
+				menu = formatDropdown.getMenu();
+				selectedLabel = menu.findSelectedItem() ? menu.findSelectedItem().getLabel() : '';
+				if ( typeof selectedLabel !== 'string' ) {
+					selectedLabel = selectedLabel.text();
+				}
+				menu.clearItems().addItems( formatItems );
+				menu.chooseItem( menu.getItemFromLabel( selectedLabel ) || menu.findFirstSelectableItem() );
+
+				// Fire the event to update field visibilities
+				Util.onFormatDropdownChange();
+
+				page.$element.empty()
+					.append(
+						new OO.ui.FieldLayout(
+							formatDropdown, {
+								label: Util.parseMsg( 'apisandbox-request-selectformat-label' )
+							}
+						).$element,
+						formatItems.map( function ( item ) {
+							return item.getData().$element;
+						} ),
+						$result
+					);
+				ApiSandbox.updateUI();
+				booklet.setPage( '|results|' );
+
+				location.href = oldhash = '#' + query;
+
+				api.post( params, {
+					contentType: 'multipart/form-data',
+					dataType: 'text',
+					xhr: function () {
+						var xhr = new window.XMLHttpRequest();
+						xhr.upload.addEventListener( 'progress', function ( e ) {
+							if ( !progressLoading ) {
+								if ( e.lengthComputable ) {
+									progress.setProgress( e.loaded * 100 / e.total );
+								} else {
+									progress.setProgress( false );
+								}
+							}
+						} );
+						xhr.addEventListener( 'progress', function ( e ) {
+							if ( !progressLoading ) {
+								progressLoading = true;
+								$progressText.text( mw.message( 'apisandbox-loading-results' ).text() );
+							}
+							if ( e.lengthComputable ) {
+								progress.setProgress( e.loaded * 100 / e.total );
+							} else {
+								progress.setProgress( false );
+							}
+						} );
+						return xhr;
+					}
+				} )
+					.catch( function ( code, data, result, jqXHR ) {
+						var deferred = $.Deferred();
+
+						if ( code !== 'http' ) {
+							// Not really an error, work around mw.Api thinking it is.
+							deferred.resolve( result, jqXHR );
+						} else {
+							// Just forward it.
+							deferred.reject.apply( deferred, arguments );
+						}
+						return deferred.promise();
+					} )
+					.then( function ( data, jqXHR ) {
+						var m, loadTime, button, clear,
+							ct = jqXHR.getResponseHeader( 'Content-Type' ),
+							loginSuppressed = jqXHR.getResponseHeader( 'MediaWiki-Login-Suppressed' ) || 'false';
+
+						$result.empty();
+						if ( loginSuppressed !== 'false' ) {
+							$( '<div>' )
+								.addClass( 'warning' )
+								.append( Util.parseMsg( 'apisandbox-results-login-suppressed' ) )
+								.appendTo( $result );
+						}
+						if ( /^text\/mediawiki-api-prettyprint-wrapped(?:;|$)/.test( ct ) ) {
+							data = JSON.parse( data );
+							if ( data.modules.length ) {
+								mw.loader.load( data.modules );
+							}
+							if ( data.status && data.status !== 200 ) {
+								$( '<div>' )
+									.addClass( 'api-pretty-header api-pretty-status' )
+									.append( Util.parseMsg( 'api-format-prettyprint-status', data.status, data.statustext ) )
+									.appendTo( $result );
+							}
+							$result.append( Util.parseHTML( data.html ) );
+							loadTime = data.time;
+						} else if ( ( m = data.match( /<pre[ >][\s\S]*<\/pre>/ ) ) ) {
+							$result.append( Util.parseHTML( m[ 0 ] ) );
+							if ( ( m = data.match( /"wgBackendResponseTime":\s*(\d+)/ ) ) ) {
+								loadTime = parseInt( m[ 1 ], 10 );
+							}
+						} else {
+							$( '<pre>' )
+								.addClass( 'api-pretty-content' )
+								.text( data )
+								.appendTo( $result );
+						}
+						if ( paramsAreForced || data[ 'continue' ] ) {
+							$result.append(
+								$( '<div>' ).append(
+									new OO.ui.ButtonWidget( {
+										label: mw.message( 'apisandbox-continue' ).text()
+									} ).on( 'click', function () {
+										ApiSandbox.sendRequest( $.extend( {}, baseRequestParams, data[ 'continue' ] ) );
+									} ).setDisabled( !data[ 'continue' ] ).$element,
+									( clear = new OO.ui.ButtonWidget( {
+										label: mw.message( 'apisandbox-continue-clear' ).text()
+									} ).on( 'click', function () {
+										ApiSandbox.updateUI( baseRequestParams );
+										clear.setDisabled( true );
+										booklet.setPage( '|results|' );
+									} ).setDisabled( !paramsAreForced ) ).$element,
+									new OO.ui.PopupButtonWidget( {
+										$overlay: true,
+										framed: false,
+										icon: 'info',
+										popup: {
+											$content: $( '<div>' ).append( Util.parseMsg( 'apisandbox-continue-help' ) ),
+											padded: true,
+											width: 'auto'
+										}
+									} ).$element
+								)
+							);
+						}
+						if ( typeof loadTime === 'number' ) {
+							$result.append(
+								$( '<div>' ).append(
+									new OO.ui.LabelWidget( {
+										label: mw.message( 'apisandbox-request-time', loadTime ).text()
+									} ).$element
+								)
+							);
+						}
+
+						if ( jqXHR.getResponseHeader( 'MediaWiki-API-Error' ) === 'badtoken' ) {
+							// Flush all saved tokens in case one of them is the bad one.
+							Util.markTokensBad();
+							button = new OO.ui.ButtonWidget( {
+								label: mw.message( 'apisandbox-results-fixtoken' ).text()
+							} );
+							button.on( 'click', ApiSandbox.fixTokenAndResend )
+								.on( 'click', button.setDisabled, [ true ], button )
+								.$element.appendTo( $result );
+						}
+					}, function ( code, data ) {
+						var details = 'HTTP error: ' + data.exception;
+						$result.empty()
+							.append(
+								new OO.ui.LabelWidget( {
+									label: mw.message( 'apisandbox-results-error', details ).text(),
+									classes: [ 'error' ]
+								} ).$element
+							);
+					} );
+			} );
+		},
+
+		/**
+		 * Handler for the "Correct token and resubmit" button
+		 *
+		 * Used on a 'badtoken' error, it re-fetches token parameters for all
+		 * pages and then re-submits the query.
+		 */
+		fixTokenAndResend: function () {
+			var page, subpages, i, k,
+				ok = true,
+				tokenWait = { dummy: true },
+				checkPages = [ pages.main ],
+				success = function ( k ) {
+					delete tokenWait[ k ];
+					if ( ok && $.isEmptyObject( tokenWait ) ) {
+						ApiSandbox.sendRequest();
+					}
+				},
+				failure = function ( k ) {
+					delete tokenWait[ k ];
+					ok = false;
+				};
+
+			while ( checkPages.length ) {
+				page = checkPages.shift();
+
+				if ( page.tokenWidget ) {
+					k = page.apiModule + page.tokenWidget.paramInfo.name;
+					tokenWait[ k ] = page.tokenWidget.fetchToken();
+					tokenWait[ k ]
+						.done( success.bind( page.tokenWidget, k ) )
+						.fail( failure.bind( page.tokenWidget, k ) );
+				}
+
+				subpages = page.getSubpages();
+				for ( i = 0; i < subpages.length; i++ ) {
+					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
+						checkPages.push( pages[ subpages[ i ].key ] );
+					}
+				}
+			}
+
+			success( 'dummy', '' );
+		},
+
+		/**
+		 * Reset validity indicators for all widgets
+		 */
+		updateValidityIndicators: function () {
+			var page, subpages, i,
+				checkPages = [ pages.main ];
+
+			while ( checkPages.length ) {
+				page = checkPages.shift();
+				page.apiCheckValid();
+				subpages = page.getSubpages();
+				for ( i = 0; i < subpages.length; i++ ) {
+					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
+						checkPages.push( pages[ subpages[ i ].key ] );
+					}
+				}
+			}
+		}
+	};
+
+	/**
+	 * PageLayout for API modules
+	 *
+	 * @class
+	 * @private
+	 * @extends OO.ui.PageLayout
+	 * @constructor
+	 * @param {Object} [config] Configuration options
+	 */
+	ApiSandbox.PageLayout = function ( config ) {
+		config = $.extend( { prefix: '', expanded: false }, config );
+		this.displayText = config.key;
+		this.apiModule = config.path;
+		this.prefix = config.prefix;
+		this.paramInfo = null;
+		this.apiIsValid = true;
+		this.loadFromQueryParams = null;
+		this.widgets = {};
+		this.itemsFieldset = null;
+		this.deprecatedItemsFieldset = null;
+		this.templatedItemsCache = {};
+		this.tokenWidget = null;
+		this.indentLevel = config.indentLevel ? config.indentLevel : 0;
+		ApiSandbox.PageLayout[ 'super' ].call( this, config.key, config );
+		this.loadParamInfo();
+	};
+	OO.inheritClass( ApiSandbox.PageLayout, OO.ui.PageLayout );
+	ApiSandbox.PageLayout.prototype.setupOutlineItem = function () {
+		this.outlineItem.setLevel( this.indentLevel );
+		this.outlineItem.setLabel( this.displayText );
+		this.outlineItem.setIcon( this.apiIsValid || suppressErrors ? null : 'alert' );
+		this.outlineItem.setIconTitle(
+			this.apiIsValid || suppressErrors ? '' : mw.message( 'apisandbox-alert-page' ).plain()
+		);
+	};
+
+	function widgetLabelOnClick() {
+		var f = this.getField();
+		if ( $.isFunction( f.setDisabled ) ) {
+			f.setDisabled( false );
+		}
+		if ( $.isFunction( f.focus ) ) {
+			f.focus();
+		}
+	}
+
+	/**
+	 * Create a widget and the FieldLayouts it needs
+	 * @private
+	 * @param {Object} ppi API paraminfo data for the parameter
+	 * @param {string} name API parameter name
+	 * @return {Object}
+	 * @return {OO.ui.Widget} return.widget
+	 * @return {OO.ui.FieldLayout} return.widgetField
+	 * @return {OO.ui.FieldLayout} return.helpField
+	 */
+	ApiSandbox.PageLayout.prototype.makeWidgetFieldLayouts = function ( ppi, name ) {
+		var j, l, widget, descriptionContainer, tmp, flag, count, button, widgetField, helpField, layoutConfig;
+
+		widget = Util.createWidgetForParameter( ppi );
+		if ( ppi.tokentype ) {
+			this.tokenWidget = widget;
+		}
+		if ( this.paramInfo.templatedparameters.length ) {
+			widget.on( 'change', this.updateTemplatedParameters, [ null ], this );
+		}
+
+		descriptionContainer = $( '<div>' );
+
+		tmp = Util.parseHTML( ppi.description );
+		tmp.filter( 'dl' ).makeCollapsible( {
+			collapsed: true
+		} ).children( '.mw-collapsible-toggle' ).each( function () {
+			var $this = $( this );
+			$this.parent().prev( 'p' ).append( $this );
+		} );
+		descriptionContainer.append( $( '<div>' ).addClass( 'description' ).append( tmp ) );
+
+		if ( ppi.info && ppi.info.length ) {
+			for ( j = 0; j < ppi.info.length; j++ ) {
+				descriptionContainer.append( $( '<div>' )
+					.addClass( 'info' )
+					.append( Util.parseHTML( ppi.info[ j ] ) )
+				);
+			}
+		}
+		flag = true;
+		count = Infinity;
+		switch ( ppi.type ) {
+			case 'namespace':
+				flag = false;
+				count = mw.config.get( 'wgFormattedNamespaces' ).length;
+				break;
+
+			case 'limit':
+				if ( ppi.highmax !== undefined ) {
+					descriptionContainer.append( $( '<div>' )
+						.addClass( 'info' )
+						.append(
+							Util.parseMsg(
+								'api-help-param-limit2', ppi.max, ppi.highmax
+							),
+							' ',
+							Util.parseMsg( 'apisandbox-param-limit' )
+						)
+					);
+				} else {
+					descriptionContainer.append( $( '<div>' )
+						.addClass( 'info' )
+						.append(
+							Util.parseMsg( 'api-help-param-limit', ppi.max ),
+							' ',
+							Util.parseMsg( 'apisandbox-param-limit' )
+						)
+					);
+				}
+				break;
+
+			case 'integer':
+				tmp = '';
+				if ( ppi.min !== undefined ) {
+					tmp += 'min';
+				}
+				if ( ppi.max !== undefined ) {
+					tmp += 'max';
+				}
+				if ( tmp !== '' ) {
+					descriptionContainer.append( $( '<div>' )
+						.addClass( 'info' )
+						.append( Util.parseMsg(
+							'api-help-param-integer-' + tmp,
+							Util.apiBool( ppi.multi ) ? 2 : 1,
+							ppi.min, ppi.max
+						) )
+					);
+				}
+				break;
+
+			default:
+				if ( Array.isArray( ppi.type ) ) {
+					flag = false;
+					count = ppi.type.length;
+				}
+				break;
+		}
+		if ( Util.apiBool( ppi.multi ) ) {
+			tmp = [];
+			if ( flag && !( widget instanceof OO.ui.TagMultiselectWidget ) &&
+				!(
+					widget instanceof OptionalWidget &&
+					widget.widget instanceof OO.ui.TagMultiselectWidget
+				)
+			) {
+				tmp.push( mw.message( 'api-help-param-multi-separate' ).parse() );
+			}
+			if ( count > ppi.lowlimit ) {
+				tmp.push(
+					mw.message( 'api-help-param-multi-max', ppi.lowlimit, ppi.highlimit ).parse()
+				);
+			}
+			if ( tmp.length ) {
+				descriptionContainer.append( $( '<div>' )
+					.addClass( 'info' )
+					.append( Util.parseHTML( tmp.join( ' ' ) ) )
+				);
+			}
+		}
+		if ( 'maxbytes' in ppi ) {
+			descriptionContainer.append( $( '<div>' )
+				.addClass( 'info' )
+				.append( Util.parseMsg( 'api-help-param-maxbytes', ppi.maxbytes ) )
+			);
+		}
+		if ( 'maxchars' in ppi ) {
+			descriptionContainer.append( $( '<div>' )
+				.addClass( 'info' )
+				.append( Util.parseMsg( 'api-help-param-maxchars', ppi.maxchars ) )
+			);
+		}
+		if ( ppi.usedTemplateVars && ppi.usedTemplateVars.length ) {
+			tmp = $();
+			for ( j = 0, l = ppi.usedTemplateVars.length; j < l; j++ ) {
+				tmp = tmp.add( $( '<var>' ).text( ppi.usedTemplateVars[ j ] ) );
+				if ( j === l - 2 ) {
+					tmp = tmp.add( mw.message( 'and' ).parseDom() );
+					tmp = tmp.add( mw.message( 'word-separator' ).parseDom() );
+				} else if ( j !== l - 1 ) {
+					tmp = tmp.add( mw.message( 'comma-separator' ).parseDom() );
+				}
+			}
+			descriptionContainer.append( $( '<div>' )
+				.addClass( 'info' )
+				.append( Util.parseMsg(
+					'apisandbox-templated-parameter-reason',
+					ppi.usedTemplateVars.length,
+					tmp
+				) )
+			);
+		}
+
+		helpField = new OO.ui.FieldLayout(
+			new OO.ui.Widget( {
+				$content: '\xa0',
+				classes: [ 'mw-apisandbox-spacer' ]
+			} ), {
+				align: 'inline',
+				classes: [ 'mw-apisandbox-help-field' ],
+				label: descriptionContainer
+			}
+		);
+
+		layoutConfig = {
+			align: 'left',
+			classes: [ 'mw-apisandbox-widget-field' ],
+			label: name
+		};
+
+		if ( ppi.tokentype ) {
+			button = new OO.ui.ButtonWidget( {
+				label: mw.message( 'apisandbox-fetch-token' ).text()
+			} );
+			button.on( 'click', widget.fetchToken, [], widget );
+
+			widgetField = new OO.ui.ActionFieldLayout( widget, button, layoutConfig );
+		} else {
+			widgetField = new OO.ui.FieldLayout( widget, layoutConfig );
+		}
+
+		// We need our own click handler on the widget label to
+		// turn off the disablement.
+		widgetField.$label.on( 'click', widgetLabelOnClick.bind( widgetField ) );
+
+		// Don't grey out the label when the field is disabled,
+		// it makes it too hard to read and our "disabled"
+		// isn't really disabled.
+		widgetField.onFieldDisable( false );
+		widgetField.onFieldDisable = $.noop;
+
+		widgetField.apiParamIndex = ppi.index;
+
+		return {
+			widget: widget,
+			widgetField: widgetField,
+			helpField: helpField
+		};
+	};
+
+	/**
+	 * Update templated parameters in the page
+	 * @private
+	 * @param {Object} [params] Query parameters for initializing the widgets
+	 */
+	ApiSandbox.PageLayout.prototype.updateTemplatedParameters = function ( params ) {
+		var p, toProcess, doProcess, tmp, toRemove,
+			that = this,
+			pi = this.paramInfo,
+			prefix = that.prefix + pi.prefix;
+
+		if ( !pi || !pi.templatedparameters.length ) {
+			return;
+		}
+
+		if ( !$.isPlainObject( params ) ) {
+			params = null;
+		}
+
+		toRemove = {};
+		$.each( this.templatedItemsCache, function ( k, el ) {
+			if ( el.widget.isElementAttached() ) {
+				toRemove[ k ] = el;
+			}
+		} );
+
+		// This bit duplicates the PHP logic in ApiBase::extractRequestParams().
+		// If you update this, see if that needs updating too.
+		toProcess = pi.templatedparameters.map( function ( p ) {
+			return {
+				name: prefix + p.name,
+				info: p,
+				vars: $.extend( {}, p.templatevars ),
+				usedVars: []
+			};
+		} );
+		doProcess = function ( placeholder, target ) {
+			var values, container, index, usedVars, done;
+
+			target = prefix + target;
+
+			if ( !that.widgets[ target ] ) {
+				// The target wasn't processed yet, try the next one.
+				// If all hit this case, the parameter has no expansions.
+				return true;
+			}
+
+			if ( !that.widgets[ target ].getApiValueForTemplates ) {
+				// Not a multi-valued widget, so it can't have expansions.
+				return false;
+			}
+
+			values = that.widgets[ target ].getApiValueForTemplates();
+			if ( !Array.isArray( values ) || !values.length ) {
+				// The target was processed but has no (valid) values.
+				// That means it has no expansions.
+				return false;
+			}
+
+			// Expand this target in the name and all other targets,
+			// then requeue if there are more targets left or create the widget
+			// and add it to the form if all are done.
+			delete p.vars[ placeholder ];
+			usedVars = p.usedVars.concat( [ target ] );
+			placeholder = '{' + placeholder + '}';
+			done = $.isEmptyObject( p.vars );
+			if ( done ) {
+				container = Util.apiBool( p.info.deprecated ) ? that.deprecatedItemsFieldset : that.itemsFieldset;
+				index = container.getItems().findIndex( function ( el ) {
+					return el.apiParamIndex !== undefined && el.apiParamIndex > p.info.index;
+				} );
+				if ( index < 0 ) {
+					index = undefined;
+				}
+			}
+			values.forEach( function ( value ) {
+				var name, newVars;
+
+				if ( !/^[^{}]*$/.exec( value ) ) {
+					// Skip values that make invalid parameter names
+					return;
+				}
+
+				name = p.name.replace( placeholder, value );
+				if ( done ) {
+					if ( that.templatedItemsCache[ name ] ) {
+						tmp = that.templatedItemsCache[ name ];
+					} else {
+						tmp = that.makeWidgetFieldLayouts(
+							$.extend( {}, p.info, { usedTemplateVars: usedVars } ), name
+						);
+						that.templatedItemsCache[ name ] = tmp;
+					}
+					delete toRemove[ name ];
+					if ( !tmp.widget.isElementAttached() ) {
+						that.widgets[ name ] = tmp.widget;
+						container.addItems( [ tmp.widgetField, tmp.helpField ], index );
+						if ( index !== undefined ) {
+							index += 2;
+						}
+					}
+					if ( params ) {
+						tmp.widget.setApiValue( params.hasOwnProperty( name ) ? params[ name ] : undefined );
+					}
+				} else {
+					newVars = {};
+					$.each( p.vars, function ( k, v ) {
+						newVars[ k ] = v.replace( placeholder, value );
+					} );
+					toProcess.push( {
+						name: name,
+						info: p.info,
+						vars: newVars,
+						usedVars: usedVars
+					} );
+				}
+			} );
+			return false;
+		};
+		while ( toProcess.length ) {
+			p = toProcess.shift();
+			$.each( p.vars, doProcess );
+		}
+
+		toRemove = $.map( toRemove, function ( el, name ) {
+			delete that.widgets[ name ];
+			return [ el.widgetField, el.helpField ];
+		} );
+		if ( toRemove.length ) {
+			this.itemsFieldset.removeItems( toRemove );
+			this.deprecatedItemsFieldset.removeItems( toRemove );
+		}
+	};
+
+	/**
+	 * Fetch module information for this page's module, then create UI
+	 */
+	ApiSandbox.PageLayout.prototype.loadParamInfo = function () {
+		var dynamicFieldset, dynamicParamNameWidget,
+			that = this,
+			removeDynamicParamWidget = function ( name, layout ) {
+				dynamicFieldset.removeItems( [ layout ] );
+				delete that.widgets[ name ];
+			},
+			addDynamicParamWidget = function () {
+				var name, layout, widget, button;
+
+				// Check name is filled in
+				name = dynamicParamNameWidget.getValue().trim();
+				if ( name === '' ) {
+					dynamicParamNameWidget.focus();
+					return;
+				}
+
+				if ( that.widgets[ name ] !== undefined ) {
+					windowManager.openWindow( 'errorAlert', {
+						title: Util.parseMsg( 'apisandbox-dynamic-error-exists', name ),
+						actions: [
+							{
+								action: 'accept',
+								label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
+								flags: 'primary'
+							}
+						]
+					} );
+					return;
+				}
+
+				widget = Util.createWidgetForParameter( {
+					name: name,
+					type: 'string',
+					'default': ''
+				}, {
+					nooptional: true
+				} );
+				button = new OO.ui.ButtonWidget( {
+					icon: 'trash',
+					flags: 'destructive'
+				} );
+				layout = new OO.ui.ActionFieldLayout(
+					widget,
+					button,
+					{
+						label: name,
+						align: 'left'
+					}
+				);
+				button.on( 'click', removeDynamicParamWidget, [ name, layout ] );
+				that.widgets[ name ] = widget;
+				dynamicFieldset.addItems( [ layout ], dynamicFieldset.getItems().length - 1 );
+				widget.focus();
+
+				dynamicParamNameWidget.setValue( '' );
+			};
+
+		this.$element.empty()
+			.append( new OO.ui.ProgressBarWidget( {
+				progress: false,
+				text: mw.message( 'apisandbox-loading', this.displayText ).text()
+			} ).$element );
+
+		Util.fetchModuleInfo( this.apiModule )
+			.done( function ( pi ) {
+				var prefix, i, j, tmp,
+					items = [],
+					deprecatedItems = [],
+					buttons = [],
+					filterFmModules = function ( v ) {
+						return v.substr( -2 ) !== 'fm' ||
+							!availableFormats.hasOwnProperty( v.substr( 0, v.length - 2 ) );
+					};
+
+				// This is something of a hack. We always want the 'format' and
+				// 'action' parameters from the main module to be specified,
+				// and for 'format' we also want to simplify the dropdown since
+				// we always send the 'fm' variant.
+				if ( that.apiModule === 'main' ) {
+					for ( i = 0; i < pi.parameters.length; i++ ) {
+						if ( pi.parameters[ i ].name === 'action' ) {
+							pi.parameters[ i ].required = true;
+							delete pi.parameters[ i ][ 'default' ];
+						}
+						if ( pi.parameters[ i ].name === 'format' ) {
+							tmp = pi.parameters[ i ].type;
+							for ( j = 0; j < tmp.length; j++ ) {
+								availableFormats[ tmp[ j ] ] = true;
+							}
+							pi.parameters[ i ].type = tmp.filter( filterFmModules );
+							pi.parameters[ i ][ 'default' ] = 'json';
+							pi.parameters[ i ].required = true;
+						}
+					}
+				}
+
+				// Hide the 'wrappedhtml' parameter on format modules
+				if ( pi.group === 'format' ) {
+					pi.parameters = pi.parameters.filter( function ( p ) {
+						return p.name !== 'wrappedhtml';
+					} );
+				}
+
+				that.paramInfo = pi;
+
+				items.push( new OO.ui.FieldLayout(
+					new OO.ui.Widget( {} ).toggle( false ), {
+						align: 'top',
+						label: Util.parseHTML( pi.description )
+					}
+				) );
+
+				if ( pi.helpurls.length ) {
+					buttons.push( new OO.ui.PopupButtonWidget( {
+						$overlay: true,
+						label: mw.message( 'apisandbox-helpurls' ).text(),
+						icon: 'help',
+						popup: {
+							width: 'auto',
+							padded: true,
+							$content: $( '<ul>' ).append( pi.helpurls.map( function ( link ) {
+								return $( '<li>' ).append( $( '<a>' )
+									.attr( { href: link, target: '_blank' } )
+									.text( link )
+								);
+							} ) )
+						}
+					} ) );
+				}
+
+				if ( pi.examples.length ) {
+					buttons.push( new OO.ui.PopupButtonWidget( {
+						$overlay: true,
+						label: mw.message( 'apisandbox-examples' ).text(),
+						icon: 'code',
+						popup: {
+							width: 'auto',
+							padded: true,
+							$content: $( '<ul>' ).append( pi.examples.map( function ( example ) {
+								var a = $( '<a>' )
+									.attr( 'href', '#' + example.query )
+									.html( example.description );
+								a.find( 'a' ).contents().unwrap(); // Can't nest links
+								return $( '<li>' ).append( a );
+							} ) )
+						}
+					} ) );
+				}
+
+				if ( buttons.length ) {
+					items.push( new OO.ui.FieldLayout(
+						new OO.ui.ButtonGroupWidget( {
+							items: buttons
+						} ), { align: 'top' }
+					) );
+				}
+
+				if ( pi.parameters.length ) {
+					prefix = that.prefix + pi.prefix;
+					for ( i = 0; i < pi.parameters.length; i++ ) {
+						tmp = that.makeWidgetFieldLayouts( pi.parameters[ i ], prefix + pi.parameters[ i ].name );
+						that.widgets[ prefix + pi.parameters[ i ].name ] = tmp.widget;
+						if ( Util.apiBool( pi.parameters[ i ].deprecated ) ) {
+							deprecatedItems.push( tmp.widgetField, tmp.helpField );
+						} else {
+							items.push( tmp.widgetField, tmp.helpField );
+						}
+					}
+				}
+
+				if ( !pi.parameters.length && !Util.apiBool( pi.dynamicparameters ) ) {
+					items.push( new OO.ui.FieldLayout(
+						new OO.ui.Widget( {} ).toggle( false ), {
+							align: 'top',
+							label: Util.parseMsg( 'apisandbox-no-parameters' )
+						}
+					) );
+				}
+
+				that.$element.empty();
+
+				that.itemsFieldset = new OO.ui.FieldsetLayout( {
+					label: that.displayText
+				} );
+				that.itemsFieldset.addItems( items );
+				that.itemsFieldset.$element.appendTo( that.$element );
+
+				if ( Util.apiBool( pi.dynamicparameters ) ) {
+					dynamicFieldset = new OO.ui.FieldsetLayout();
+					dynamicParamNameWidget = new OO.ui.TextInputWidget( {
+						placeholder: mw.message( 'apisandbox-dynamic-parameters-add-placeholder' ).text()
+					} ).on( 'enter', addDynamicParamWidget );
+					dynamicFieldset.addItems( [
+						new OO.ui.FieldLayout(
+							new OO.ui.Widget( {} ).toggle( false ), {
+								align: 'top',
+								label: Util.parseHTML( pi.dynamicparameters )
+							}
+						),
+						new OO.ui.ActionFieldLayout(
+							dynamicParamNameWidget,
+							new OO.ui.ButtonWidget( {
+								icon: 'add',
+								flags: 'progressive'
+							} ).on( 'click', addDynamicParamWidget ),
+							{
+								label: mw.message( 'apisandbox-dynamic-parameters-add-label' ).text(),
+								align: 'left'
+							}
+						)
+					] );
+					$( '<fieldset>' )
+						.append(
+							$( '<legend>' ).text( mw.message( 'apisandbox-dynamic-parameters' ).text() ),
+							dynamicFieldset.$element
+						)
+						.appendTo( that.$element );
+				}
+
+				that.deprecatedItemsFieldset = new OO.ui.FieldsetLayout().addItems( deprecatedItems ).toggle( false );
+				tmp = $( '<fieldset>' )
+					.toggle( !that.deprecatedItemsFieldset.isEmpty() )
+					.append(
+						$( '<legend>' ).append(
+							new OO.ui.ToggleButtonWidget( {
+								label: mw.message( 'apisandbox-deprecated-parameters' ).text()
+							} ).on( 'change', that.deprecatedItemsFieldset.toggle, [], that.deprecatedItemsFieldset ).$element
+						),
+						that.deprecatedItemsFieldset.$element
+					)
+					.appendTo( that.$element );
+				that.deprecatedItemsFieldset.on( 'add', function () {
+					this.toggle( !that.deprecatedItemsFieldset.isEmpty() );
+				}, [], tmp );
+				that.deprecatedItemsFieldset.on( 'remove', function () {
+					this.toggle( !that.deprecatedItemsFieldset.isEmpty() );
+				}, [], tmp );
+
+				// Load stored params, if any, then update the booklet if we
+				// have subpages (or else just update our valid-indicator).
+				tmp = that.loadFromQueryParams;
+				that.loadFromQueryParams = null;
+				if ( $.isPlainObject( tmp ) ) {
+					that.loadQueryParams( tmp );
+				} else {
+					that.updateTemplatedParameters();
+				}
+				if ( that.getSubpages().length > 0 ) {
+					ApiSandbox.updateUI( tmp );
+				} else {
+					that.apiCheckValid();
+				}
+			} ).fail( function ( code, detail ) {
+				that.$element.empty()
+					.append(
+						new OO.ui.LabelWidget( {
+							label: mw.message( 'apisandbox-load-error', that.apiModule, detail ).text(),
+							classes: [ 'error' ]
+						} ).$element,
+						new OO.ui.ButtonWidget( {
+							label: mw.message( 'apisandbox-retry' ).text()
+						} ).on( 'click', that.loadParamInfo, [], that ).$element
+					);
+			} );
+	};
+
+	/**
+	 * Check that all widgets on the page are in a valid state.
+	 *
+	 * @return {jQuery.Promise[]} One promise for each widget, resolved with `false` if invalid
+	 */
+	ApiSandbox.PageLayout.prototype.apiCheckValid = function () {
+		var promises, that = this;
+
+		if ( this.paramInfo === null ) {
+			return [];
+		} else {
+			promises = $.map( this.widgets, function ( widget ) {
+				return widget.apiCheckValid();
+			} );
+			$.when.apply( $, promises ).then( function () {
+				that.apiIsValid = $.inArray( false, arguments ) === -1;
+				if ( that.getOutlineItem() ) {
+					that.getOutlineItem().setIcon( that.apiIsValid || suppressErrors ? null : 'alert' );
+					that.getOutlineItem().setIconTitle(
+						that.apiIsValid || suppressErrors ? '' : mw.message( 'apisandbox-alert-page' ).plain()
+					);
+				}
+			} );
+			return promises;
+		}
+	};
+
+	/**
+	 * Load form fields from query parameters
+	 *
+	 * @param {Object} params
+	 */
+	ApiSandbox.PageLayout.prototype.loadQueryParams = function ( params ) {
+		if ( this.paramInfo === null ) {
+			this.loadFromQueryParams = params;
+		} else {
+			$.each( this.widgets, function ( name, widget ) {
+				var v = params.hasOwnProperty( name ) ? params[ name ] : undefined;
+				widget.setApiValue( v );
+			} );
+			this.updateTemplatedParameters( params );
+		}
+	};
+
+	/**
+	 * Load query params from form fields
+	 *
+	 * @param {Object} params Write query parameters into this object
+	 * @param {Object} displayParams Write query parameters for display into this object
+	 */
+	ApiSandbox.PageLayout.prototype.getQueryParams = function ( params, displayParams ) {
+		$.each( this.widgets, function ( name, widget ) {
+			var value = widget.getApiValue();
+			if ( value !== undefined ) {
+				params[ name ] = value;
+				if ( $.isFunction( widget.getApiValueForDisplay ) ) {
+					value = widget.getApiValueForDisplay();
+				}
+				displayParams[ name ] = value;
+			}
+		} );
+	};
+
+	/**
+	 * Fetch a list of subpage names loaded by this page
+	 *
+	 * @return {Array}
+	 */
+	ApiSandbox.PageLayout.prototype.getSubpages = function () {
+		var ret = [];
+		$.each( this.widgets, function ( name, widget ) {
+			var submodules, i;
+			if ( $.isFunction( widget.getSubmodules ) ) {
+				submodules = widget.getSubmodules();
+				for ( i = 0; i < submodules.length; i++ ) {
+					ret.push( {
+						key: name + '=' + submodules[ i ].value,
+						path: submodules[ i ].path,
+						prefix: widget.paramInfo.submoduleparamprefix || ''
+					} );
+				}
+			}
+		} );
+		return ret;
+	};
+
+	$( ApiSandbox.init );
+
+	module.exports = ApiSandbox;
+
+}( jQuery, mediaWiki, OO ) );
diff --git a/resources/src/mediawiki.special.block.js b/resources/src/mediawiki.special.block.js
new file mode 100644
index 0000000000..180f040135
--- /dev/null
+++ b/resources/src/mediawiki.special.block.js
@@ -0,0 +1,58 @@
+/*!
+ * JavaScript for Special:Block
+ */
+( function ( mw, $ ) {
+	// Like OO.ui.infuse(), but if the element doesn't exist, return null instead of throwing an exception.
+	function infuseOrNull( elem ) {
+		try {
+			return OO.ui.infuse( elem );
+		} catch ( er ) {
+			return null;
+		}
+	}
+
+	$( function () {
+		// This code is also loaded on the "block succeeded" page where there is no form,
+		// so username and expiry fields might also be missing.
+		var blockTargetWidget = infuseOrNull( 'mw-bi-target' ),
+			anonOnlyField = infuseOrNull( $( '#mw-input-wpHardBlock' ).closest( '.oo-ui-fieldLayout' ) ),
+			enableAutoblockField = infuseOrNull( $( '#mw-input-wpAutoBlock' ).closest( '.oo-ui-fieldLayout' ) ),
+			hideUserField = infuseOrNull( $( '#mw-input-wpHideUser' ).closest( '.oo-ui-fieldLayout' ) ),
+			watchUserField = infuseOrNull( $( '#mw-input-wpWatch' ).closest( '.oo-ui-fieldLayout' ) ),
+			expiryWidget = infuseOrNull( 'mw-input-wpExpiry' );
+
+		function updateBlockOptions() {
+			var blocktarget = blockTargetWidget.getValue().trim(),
+				isEmpty = blocktarget === '',
+				isIp = mw.util.isIPAddress( blocktarget, true ),
+				isIpRange = isIp && blocktarget.match( /\/\d+$/ ),
+				isNonEmptyIp = isIp && !isEmpty,
+				expiryValue = expiryWidget.getValue(),
+				// infinityValues  are the values the SpecialBlock class accepts as infinity (sf. wfIsInfinity)
+				infinityValues = [ 'infinite', 'indefinite', 'infinity', 'never' ],
+				isIndefinite = infinityValues.indexOf( expiryValue ) !== -1;
+
+			if ( enableAutoblockField ) {
+				enableAutoblockField.toggle( !( isNonEmptyIp ) );
+			}
+			if ( hideUserField ) {
+				hideUserField.toggle( !( isNonEmptyIp || !isIndefinite ) );
+			}
+			if ( anonOnlyField ) {
+				anonOnlyField.toggle( !( !isIp && !isEmpty ) );
+			}
+			if ( watchUserField ) {
+				watchUserField.toggle( !( isIpRange && !isEmpty ) );
+			}
+		}
+
+		if ( blockTargetWidget ) {
+			// Bind functions so they're checked whenever stuff changes
+			blockTargetWidget.on( 'change', updateBlockOptions );
+			expiryWidget.on( 'change', updateBlockOptions );
+
+			// Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
+			updateBlockOptions();
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.changecredentials.js b/resources/src/mediawiki.special.changecredentials.js
new file mode 100644
index 0000000000..ad8a4f4f06
--- /dev/null
+++ b/resources/src/mediawiki.special.changecredentials.js
@@ -0,0 +1,55 @@
+/*!
+ * JavaScript for change credentials form.
+ */
+( function ( mw, $, OO ) {
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		var api = new mw.Api();
+
+		$root.find( '.mw-changecredentials-validate-password.oo-ui-fieldLayout' ).each( function () {
+			var currentApiPromise,
+				self = OO.ui.FieldLayout.static.infuse( $( this ) );
+
+			self.getField().setValidation( function ( password ) {
+				var d;
+
+				if ( currentApiPromise ) {
+					currentApiPromise.abort();
+					currentApiPromise = undefined;
+				}
+
+				password = password.trim();
+
+				if ( password === '' ) {
+					self.setErrors( [] );
+					return true;
+				}
+
+				d = $.Deferred();
+				currentApiPromise = api.post( {
+					action: 'validatepassword',
+					password: password,
+					formatversion: 2,
+					errorformat: 'html',
+					errorsuselocal: true,
+					uselang: mw.config.get( 'wgUserLanguage' )
+				} ).done( function ( resp ) {
+					var pwinfo = resp.validatepassword,
+						good = pwinfo.validity === 'Good',
+						errors = [];
+
+					currentApiPromise = undefined;
+
+					if ( !good ) {
+						pwinfo.validitymessages.map( function ( m ) {
+							errors.push( new OO.ui.HtmlSnippet( m.html ) );
+						} );
+					}
+					self.setErrors( errors );
+					d.resolve( good );
+				} ).fail( d.reject );
+
+				return d.promise( { abort: currentApiPromise.abort } );
+			} );
+		} );
+	} );
+}( mediaWiki, jQuery, OO ) );
diff --git a/resources/src/mediawiki.special.changeslist.css b/resources/src/mediawiki.special.changeslist.css
new file mode 100644
index 0000000000..65860ea08c
--- /dev/null
+++ b/resources/src/mediawiki.special.changeslist.css
@@ -0,0 +1,56 @@
+/*!
+ * Styling for Special:Watchlist and Special:RecentChanges
+ */
+
+.mw-changeslist-line-watched .mw-title {
+	font-weight: bold;
+}
+
+/*
+ * Titles, including username links, and also tag names
+ * are prone to getting jumbled up
+ * with other titles, usernames, etc. in mixed RTL-LTR environment.
+ */
+.mw-changeslist .mw-tag-marker,
+.mw-changeslist .mw-title {
+	unicode-bidi: embed;
+}
+
+/* Colored watchlist and recent changes numbers */
+.mw-plusminus-pos {
+	color: #006400; /* dark green */
+}
+
+.mw-plusminus-neg {
+	color: #8b0000; /* dark red */
+}
+
+.mw-plusminus-null {
+	color: #a2a9b1; /* gray */
+}
+
+/*
+ * Bidi-isolate these numbers.
+ * See https://phabricator.wikimedia.org/T93484
+ */
+.mw-plusminus-pos,
+.mw-plusminus-neg,
+.mw-plusminus-null {
+	unicode-bidi: -moz-isolate;
+	unicode-bidi: isolate;
+}
+
+/* Prevent FOUC if legend is initially collapsed */
+.mw-changeslist-legend.mw-collapsed .mw-collapsible-content {
+	display: none;
+}
+
+.mw-changeslist-legend.mw-collapsed {
+	margin-bottom: 0;
+}
+
+/* Prevent pushing down the content if legend is collapsed */
+.mw-changeslist-legend.mw-collapsed ~ ul:first-of-type > li:first-child,
+.mw-changeslist-legend.mw-collapsed + h4 + div > table.mw-changeslist-line:first-child {
+	clear: right;
+}
diff --git a/resources/src/mediawiki.special.changeslist.enhanced.css b/resources/src/mediawiki.special.changeslist.enhanced.css
new file mode 100644
index 0000000000..275004f01b
--- /dev/null
+++ b/resources/src/mediawiki.special.changeslist.enhanced.css
@@ -0,0 +1,58 @@
+/*!
+ * Styling for Special:Watchlist and Special:RecentChanges when preference 'usenewrc'
+ * a.k.a. Enhanced Recent Changes is enabled.
+ */
+
+table.mw-enhanced-rc {
+	border: 0;
+	border-spacing: 0;
+}
+
+table.mw-enhanced-rc th,
+table.mw-enhanced-rc td {
+	padding: 0;
+	vertical-align: top;
+}
+
+td.mw-enhanced-rc {
+	white-space: nowrap;
+	font-family: monospace, monospace;
+}
+
+.mw-enhanced-rc-time {
+	font-family: monospace, monospace;
+}
+
+table.mw-enhanced-rc td.mw-enhanced-rc-nested {
+	padding-left: 1em;
+}
+
+/* Show/hide arrows in enhanced changeslist */
+.mw-enhanced-rc .collapsible-expander {
+	float: none;
+}
+
+/* If JS is disabled, the arrows or the placeholder space shouldn't be shown */
+.client-nojs .mw-enhancedchanges-arrow-space {
+	display: none;
+}
+
+.mw-enhancedchanges-arrow {
+	padding-top: 2px;
+}
+
+.mw-enhancedchanges-arrow-space {
+	display: inline-block;
+	*display: inline; /* IE7 and below */
+	zoom: 1;
+	width: 15px;
+	height: 15px;
+}
+
+.mw-enhanced-watched .mw-enhanced-rc-time {
+	font-weight: bold;
+}
+
+span.changedby {
+	font-size: 95%;
+}
diff --git a/resources/src/mediawiki.special.changeslist.legend.css b/resources/src/mediawiki.special.changeslist.legend.css
new file mode 100644
index 0000000000..14f6aeeeff
--- /dev/null
+++ b/resources/src/mediawiki.special.changeslist.legend.css
@@ -0,0 +1,33 @@
+/*!
+ * Styling for changes list legend
+ */
+
+.mw-changeslist-legend {
+	float: right;
+	margin-left: 1em;
+	margin-bottom: 0.5em;
+	clear: right;
+	font-size: 85%;
+	line-height: 1.2em;
+	padding: 0.5em;
+	border: 1px solid #ddd;
+}
+
+.mw-changeslist-legend dl {
+	/* Parent element defines sufficient padding */
+	margin-bottom: 0;
+}
+
+.mw-changeslist-legend dt {
+	float: left;
+	margin: 0 0.5em 0 0;
+}
+
+.mw-changeslist-legend dd {
+	margin-left: 1.5em;
+}
+
+.mw-changeslist-legend dt,
+.mw-changeslist-legend dd {
+	line-height: 1.3em;
+}
diff --git a/resources/src/mediawiki.special.changeslist.legend.js b/resources/src/mediawiki.special.changeslist.legend.js
new file mode 100644
index 0000000000..079276265e
--- /dev/null
+++ b/resources/src/mediawiki.special.changeslist.legend.js
@@ -0,0 +1,24 @@
+/*!
+ * Script for changes list legend
+ */
+
+/* Remember the collapse state of the legend on recent changes and watchlist pages. */
+( function ( mw ) {
+	var
+		cookieName = 'changeslist-state',
+		// Expanded by default
+		doCollapsibleLegend = function ( $container ) {
+			$container.find( '.mw-changeslist-legend' )
+				.makeCollapsible( {
+					collapsed: mw.cookie.get( cookieName ) === 'collapsed'
+				} )
+				.on( 'beforeExpand.mw-collapsible', function () {
+					mw.cookie.set( cookieName, 'expanded' );
+				} )
+				.on( 'beforeCollapse.mw-collapsible', function () {
+					mw.cookie.set( cookieName, 'collapsed' );
+				} );
+		};
+
+	mw.hook( 'wikipage.content' ).add( doCollapsibleLegend );
+}( mediaWiki ) );
diff --git a/resources/src/mediawiki.special.contributions.js b/resources/src/mediawiki.special.contributions.js
new file mode 100644
index 0000000000..f65a2579b8
--- /dev/null
+++ b/resources/src/mediawiki.special.contributions.js
@@ -0,0 +1,12 @@
+( function ( mw, $ ) {
+	$( function () {
+		var startInput = mw.widgets.DateInputWidget.static.infuse( 'mw-date-start' ),
+			endInput = mw.widgets.DateInputWidget.static.infuse( 'mw-date-end' );
+
+		startInput.on( 'deactivate', function ( userSelected ) {
+			if ( userSelected ) {
+				endInput.focus();
+			}
+		} );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.edittags.js b/resources/src/mediawiki.special.edittags.js
new file mode 100644
index 0000000000..4f51e9b761
--- /dev/null
+++ b/resources/src/mediawiki.special.edittags.js
@@ -0,0 +1,38 @@
+/*!
+ * JavaScript for Special:EditTags
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+			$wpReason = $( '#wpReason' ),
+			$tagList = $( '#mw-edittags-tag-list' );
+
+		if ( $tagList.length ) {
+			$tagList.chosen( {
+				/* eslint-disable camelcase */
+				placeholder_text_multiple: mw.msg( 'tags-edit-chosen-placeholder' ),
+				no_results_text: mw.msg( 'tags-edit-chosen-no-results' )
+				/* eslint-enable camelcase */
+			} );
+		}
+
+		$( '#mw-edittags-remove-all' ).on( 'change', function ( e ) {
+			$( '.mw-edittags-remove-checkbox' ).prop( 'checked', e.target.checked );
+		} );
+		$( '.mw-edittags-remove-checkbox' ).on( 'change', function ( e ) {
+			if ( !e.target.checked ) {
+				$( '#mw-edittags-remove-all' ).prop( 'checked', false );
+			}
+		} );
+
+		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
+		// use maxLength because it's leaving room for log entry text.
+		if ( summaryCodePointLimit ) {
+			$wpReason.codePointLimit();
+		} else if ( summaryByteLimit ) {
+			$wpReason.byteLimit();
+		}
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.import.js b/resources/src/mediawiki.special.import.js
new file mode 100644
index 0000000000..2cb96afc48
--- /dev/null
+++ b/resources/src/mediawiki.special.import.js
@@ -0,0 +1,37 @@
+/*!
+ * JavaScript for Special:Import
+ */
+( function ( $ ) {
+	var subprojectListAlreadyShown;
+	function updateImportSubprojectList() {
+		var $projectField = $( '#mw-import-table-interwiki #interwiki' ),
+			$subprojectField = $projectField.parent().find( '#subproject' ),
+			$selected = $projectField.find( ':selected' ),
+			oldValue = $subprojectField.val(),
+			option, options;
+
+		if ( $selected.attr( 'data-subprojects' ) ) {
+			options = $selected.attr( 'data-subprojects' ).split( ' ' ).map( function ( el ) {
+				option = document.createElement( 'option' );
+				option.appendChild( document.createTextNode( el ) );
+				option.setAttribute( 'value', el );
+				if ( oldValue === el && subprojectListAlreadyShown === true ) {
+					option.setAttribute( 'selected', 'selected' );
+				}
+				return option;
+			} );
+			$subprojectField.show().empty().append( options );
+			subprojectListAlreadyShown = true;
+		} else {
+			$subprojectField.hide();
+		}
+	}
+
+	$( function () {
+		var $projectField = $( '#mw-import-table-interwiki #interwiki' );
+		if ( $projectField.length ) {
+			$projectField.change( updateImportSubprojectList );
+			updateImportSubprojectList();
+		}
+	} );
+}( jQuery ) );
diff --git a/resources/src/mediawiki.special.movePage.js b/resources/src/mediawiki.special.movePage.js
new file mode 100644
index 0000000000..d828396ea5
--- /dev/null
+++ b/resources/src/mediawiki.special.movePage.js
@@ -0,0 +1,23 @@
+/*!
+ * JavaScript for Special:MovePage
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+			wpReason = OO.ui.infuse( $( '#wpReason' ) );
+
+		// Infuse for pretty dropdown
+		OO.ui.infuse( $( '#wpNewTitle' ) );
+		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
+		if ( summaryCodePointLimit ) {
+			mw.widgets.visibleCodePointLimit( wpReason, summaryCodePointLimit );
+		} else if ( summaryByteLimit ) {
+			mw.widgets.visibleByteLimit( wpReason, summaryByteLimit );
+		}
+		// Infuse for nicer "help" popup
+		if ( $( '#wpMovetalk-field' ).length ) {
+			OO.ui.infuse( $( '#wpMovetalk-field' ) );
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.pageLanguage.js b/resources/src/mediawiki.special.pageLanguage.js
new file mode 100644
index 0000000000..edfbe1eaab
--- /dev/null
+++ b/resources/src/mediawiki.special.pageLanguage.js
@@ -0,0 +1,11 @@
+/*!
+ * JavaScript module used on Special:PageLanguage
+ */
+( function ( $, OO ) {
+	$( function () {
+		// Select the 'Language select' option if user is trying to select language
+		OO.ui.infuse( 'mw-pl-languageselector' ).on( 'change', function () {
+			OO.ui.infuse( 'mw-pl-options' ).setValue( '2' );
+		} );
+	} );
+}( jQuery, OO ) );
diff --git a/resources/src/mediawiki.special.preferences.ooui/editfont.js b/resources/src/mediawiki.special.preferences.ooui/editfont.js
new file mode 100644
index 0000000000..fe48886027
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences.ooui/editfont.js
@@ -0,0 +1,32 @@
+/*!
+ * JavaScript for Special:Preferences: editfont field enhancements.
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var widget, lastValue;
+
+		try {
+			widget = OO.ui.infuse( $( '#mw-input-wpeditfont' ) );
+		} catch ( err ) {
+			// This preference could theoretically be disabled ($wgHiddenPrefs)
+			return;
+		}
+
+		// Style options
+		widget.dropdownWidget.menu.items.forEach( function ( item ) {
+			item.$label.addClass( 'mw-editfont-' + item.getData() );
+		} );
+
+		function updateLabel( value ) {
+			// Style selected item label
+			widget.dropdownWidget.$label
+				.removeClass( 'mw-editfont-' + lastValue )
+				.addClass( 'mw-editfont-' + value );
+			lastValue = value;
+		}
+
+		widget.on( 'change', updateLabel );
+		updateLabel( widget.getValue() );
+
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences.ooui/tabs.js b/resources/src/mediawiki.special.preferences.ooui/tabs.js
new file mode 100644
index 0000000000..c948ff09f2
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences.ooui/tabs.js
@@ -0,0 +1,138 @@
+/*!
+ * JavaScript for Special:Preferences: Tab navigation.
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var $preferences, tabs, wrapper, previousTab;
+
+		$preferences = $( '#preferences' );
+
+		// Make sure the accessibility tip is selectable so that screen reader users take notice,
+		// but hide it per default to reduce interface clutter. Also make sure it becomes visible
+		// when selected. Similar to jquery.mw-jump
+		$( '<div>' ).addClass( 'mw-navigation-hint' )
+			.text( mw.msg( 'prefs-tabs-navigation-hint' ) )
+			.attr( 'tabIndex', 0 )
+			.on( 'focus blur', function ( e ) {
+				if ( e.type === 'blur' || e.type === 'focusout' ) {
+					$( this ).css( 'height', '0' );
+				} else {
+					$( this ).css( 'height', 'auto' );
+				}
+			} ).prependTo( '#mw-content-text' );
+
+		tabs = new OO.ui.IndexLayout( {
+			expanded: false,
+			// Do not remove focus from the tabs menu after choosing a tab
+			autoFocus: false
+		} );
+
+		mw.config.get( 'wgPreferencesTabs' ).forEach( function ( tabConfig ) {
+			var panel, $panelContents;
+
+			panel = new OO.ui.TabPanelLayout( tabConfig.name, {
+				expanded: false,
+				label: tabConfig.label
+			} );
+			$panelContents = $( '#mw-prefsection-' + tabConfig.name );
+
+			// Hide the unnecessary PHP PanelLayouts
+			// (Do not use .remove(), as that would remove event handlers for everything inside them)
+			$panelContents.parent().detach();
+
+			panel.$element.append( $panelContents );
+			tabs.addTabPanels( [ panel ] );
+
+			// Remove duplicate labels
+			// (This must be after .addTabPanels(), otherwise the tab item doesn't exist yet)
+			$panelContents.children( 'legend' ).remove();
+			$panelContents.attr( 'aria-labelledby', panel.getTabItem().getElementId() );
+		} );
+
+		wrapper = new OO.ui.PanelLayout( {
+			expanded: false,
+			padded: false,
+			framed: true
+		} );
+		wrapper.$element.append( tabs.$element );
+		$preferences.prepend( wrapper.$element );
+
+		function updateHash( panel ) {
+			var scrollTop, active;
+			// Handle hash manually to prevent jumping,
+			// therefore save and restore scrollTop to prevent jumping.
+			scrollTop = $( window ).scrollTop();
+			// Changing the hash apparently causes keyboard focus to be lost?
+			// Save and restore it. This makes no sense though.
+			active = document.activeElement;
+			location.hash = '#mw-prefsection-' + panel.getName();
+			if ( active ) {
+				active.focus();
+			}
+			$( window ).scrollTop( scrollTop );
+		}
+
+		tabs.on( 'set', updateHash );
+
+		/**
+		 * @ignore
+		 * @param {string} name the name of a tab without the prefix ("mw-prefsection-")
+		 * @param {string} [mode] A hash will be set according to the current
+		 *  open section. Set mode 'noHash' to supress this.
+		 */
+		function switchPrefTab( name, mode ) {
+			if ( mode === 'noHash' ) {
+				tabs.off( 'set', updateHash );
+			}
+			tabs.setTabPanel( name );
+			if ( mode === 'noHash' ) {
+				tabs.on( 'set', updateHash );
+			}
+		}
+
+		// Jump to correct section as indicated by the hash.
+		// This function is called onload and onhashchange.
+		function detectHash() {
+			var hash = location.hash,
+				matchedElement, parentSection;
+			if ( hash.match( /^#mw-prefsection-[\w]+$/ ) ) {
+				mw.storage.session.remove( 'mwpreferences-prevTab' );
+				switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
+			} else if ( hash.match( /^#mw-[\w-]+$/ ) ) {
+				matchedElement = document.getElementById( hash.slice( 1 ) );
+				parentSection = $( matchedElement ).parent().closest( '[id^="mw-prefsection-"]' );
+				if ( parentSection.length ) {
+					mw.storage.session.remove( 'mwpreferences-prevTab' );
+					// Switch to proper tab and scroll to selected item.
+					switchPrefTab( parentSection.attr( 'id' ).replace( 'mw-prefsection-', '' ), 'noHash' );
+					matchedElement.scrollIntoView();
+				}
+			}
+		}
+
+		$( window ).on( 'hashchange', function () {
+			var hash = location.hash;
+			if ( hash.match( /^#mw-[\w-]+/ ) ) {
+				detectHash();
+			} else if ( hash === '' ) {
+				switchPrefTab( 'personal', 'noHash' );
+			}
+		} )
+			// Run the function immediately to select the proper tab on startup.
+			.trigger( 'hashchange' );
+
+		// Restore the active tab after saving the preferences
+		previousTab = mw.storage.session.get( 'mwpreferences-prevTab' );
+		if ( previousTab ) {
+			switchPrefTab( previousTab, 'noHash' );
+			// Deleting the key, the tab states should be reset until we press Save
+			mw.storage.session.remove( 'mwpreferences-prevTab' );
+		}
+
+		$( '#mw-prefs-form' ).on( 'submit', function () {
+			var value = tabs.getCurrentTabPanelName();
+			mw.storage.session.set( 'mwpreferences-prevTab', value );
+		} );
+
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences.styles.css b/resources/src/mediawiki.special.preferences.styles.css
new file mode 100644
index 0000000000..33b630a948
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences.styles.css
@@ -0,0 +1,47 @@
+/* Reuses colors from mediawiki.legacy/shared.css */
+.mw-email-not-authenticated .mw-input,
+.mw-email-none .mw-input {
+	border: 1px solid #fde29b;
+	background-color: #fdf1d1;
+	color: #000;
+}
+/* Authenticated email field has its own class too. Unstyled by default */
+/*
+.mw-email-authenticated .mw-input { }
+*/
+/* This breaks due to nolabel styling */
+#preferences > fieldset td.mw-label {
+	width: 20%;
+}
+
+#preferences > fieldset table {
+	width: 100%;
+}
+#preferences > fieldset table.mw-htmlform-matrix {
+	width: auto;
+}
+
+/* The CSS below is also for JS enabled version, because we want to prevent FOUC */
+
+/*
+ * Hide, but keep accessible for screen-readers.
+ * Like .mw-jump, #jump-to-nav from shared.css
+ */
+.client-js .mw-navigation-hint {
+	overflow: hidden;
+	height: 0;
+	zoom: 1;
+}
+
+.client-nojs #preftoc {
+	display: none;
+}
+
+.client-js #preferences > fieldset {
+	display: none;
+}
+
+/* Only the 1st tab is shown by default in JS mode */
+.client-js #preferences #mw-prefsection-personal {
+	display: block;
+}
diff --git a/resources/src/mediawiki.special.preferences.styles.ooui.css b/resources/src/mediawiki.special.preferences.styles.ooui.css
new file mode 100644
index 0000000000..8810318e98
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences.styles.ooui.css
@@ -0,0 +1,118 @@
+/* Reuses colors from mediawiki.legacy/shared.css */
+.mw-email-not-authenticated .oo-ui-labelWidget,
+.mw-email-none .oo-ui-labelWidget {
+	border: 1px solid #fde29b;
+	background-color: #fdf1d1;
+	color: #000;
+	padding: 0.5em;
+}
+/* Authenticated email field has its own class too. Unstyled by default */
+/*
+.mw-email-authenticated .oo-ui-labelWidget { }
+*/
+
+/* This is needed because add extra buttons in a weird way */
+.mw-prefs-buttons .mw-htmlform-submit-buttons {
+	margin: 0;
+	display: inline;
+}
+
+.mw-prefs-buttons {
+	margin-top: 1em;
+}
+
+#prefcontrol {
+	margin-right: 0.5em;
+}
+
+/*
+ * Hide, but keep accessible for screen-readers.
+ * Like .mw-jump, #jump-to-nav from shared.css
+ */
+.client-js .mw-navigation-hint {
+	overflow: hidden;
+	height: 0;
+	zoom: 1;
+}
+
+/* Override OOUI styles so that dropdowns near the bottom of the form don't get clipped,
+ * e.g.'Appearance' / 'Threshold for stub link formatting'. This is hacky and bad, it would be
+ * better solved by setting overlays for the widgets, but we can't do it from PHP... */
+#preferences .oo-ui-panelLayout {
+	position: static;
+	overflow: visible;
+	-webkit-transform: none;
+	transform: none;
+}
+
+#preferences .oo-ui-panelLayout-framed .oo-ui-panelLayout-framed {
+	border-color: #c8ccd1;
+	border-width: 1px 0 0;
+	border-radius: 0;
+	padding-left: 0;
+	padding-right: 0;
+	box-shadow: none;
+}
+
+/* Tweak the margins to reduce the shifting of form contents
+ * after JS code loads and rearranges the page */
+.client-js #preferences > .oo-ui-panelLayout {
+	margin: 1em 0;
+}
+
+.client-js #preferences .oo-ui-panelLayout-framed .oo-ui-panelLayout-framed {
+	margin-left: 0.25em;
+}
+
+.client-js #preferences .oo-ui-tabPanelLayout {
+	padding-top: 0.5em;
+	padding-bottom: 0.5em;
+}
+
+.client-js #preferences .oo-ui-tabPanelLayout .oo-ui-panelLayout-framed {
+	margin-left: 0;
+	margin-bottom: 0;
+	border: 0;
+	padding-top: 0;
+}
+
+.client-js #preferences > .oo-ui-panelLayout > .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-header {
+	margin-bottom: 1em;
+}
+
+/* Make the "Basic information" section more compact */
+/* OOUI's `align: 'left'` for FieldLayouts sucks, so we do our own */
+#mw-htmlform-info > .oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header {
+	width: 20%;
+	display: inline-block;
+	vertical-align: middle;
+	padding: 0;
+}
+
+#mw-htmlform-info > .oo-ui-fieldLayout-align-top .oo-ui-fieldLayout-help {
+	margin-right: 0;
+}
+
+#mw-htmlform-info > .oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
+	width: 80%;
+	display: inline-block;
+	vertical-align: middle;
+}
+
+/* Expand the dropdown and textfield of "Time zone" field to the */
+/* usual maximum width and display them on separate lines. */
+#wpTimeCorrection .oo-ui-dropdownInputWidget,
+#wpTimeCorrection .oo-ui-textInputWidget {
+	display: block;
+	max-width: 50em;
+}
+
+#wpTimeCorrection .oo-ui-textInputWidget {
+	margin-top: 0.5em;
+}
+
+/* HACK: expand width of gadget descriptions.
+ * This should be moved to the Gadgets extension */
+#mw-htmlform-gadgets .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body {
+	max-width: none;
+}
diff --git a/resources/src/mediawiki.special.preferences/confirmClose.js b/resources/src/mediawiki.special.preferences/confirmClose.js
new file mode 100644
index 0000000000..244154b38a
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences/confirmClose.js
@@ -0,0 +1,86 @@
+/*!
+ * JavaScript for Special:Preferences: Enable save button and prevent the window being accidentally
+ * closed when any form field is changed.
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var allowCloseWindow, saveButton, restoreButton,
+			oouiEnabled = $( '#mw-prefs-form' ).hasClass( 'mw-htmlform-ooui' );
+
+		// Check if all of the form values are unchanged.
+		// (This function could be changed to infuse and check OOUI widgets, but that would only make it
+		// slower and more complicated. It works fine to treat them as HTML elements.)
+		function isPrefsChanged() {
+			var inputs = $( '#mw-prefs-form :input[name]' ),
+				input, $input, inputType,
+				index, optIndex,
+				opt;
+
+			for ( index = 0; index < inputs.length; index++ ) {
+				input = inputs[ index ];
+				$input = $( input );
+
+				// Different types of inputs have different methods for accessing defaults
+				if ( $input.is( 'select' ) ) {
+					// <select> has the property defaultSelected for each option
+					for ( optIndex = 0; optIndex < input.options.length; optIndex++ ) {
+						opt = input.options[ optIndex ];
+						if ( opt.selected !== opt.defaultSelected ) {
+							return true;
+						}
+					}
+				} else if ( $input.is( 'input' ) || $input.is( 'textarea' ) ) {
+					// <input> has defaultValue or defaultChecked
+					inputType = input.type;
+					if ( inputType === 'radio' || inputType === 'checkbox' ) {
+						if ( input.checked !== input.defaultChecked ) {
+							return true;
+						}
+					} else if ( input.value !== input.defaultValue ) {
+						return true;
+					}
+				}
+			}
+
+			return false;
+		}
+
+		if ( oouiEnabled ) {
+			saveButton = OO.ui.infuse( $( '#prefcontrol' ) );
+			restoreButton = OO.ui.infuse( $( '#mw-prefs-restoreprefs' ) );
+
+			// Disable the button to save preferences unless preferences have changed
+			// Check if preferences have been changed before JS has finished loading
+			saveButton.setDisabled( !isPrefsChanged() );
+			$( '#preferences .oo-ui-fieldsetLayout' ).on( 'change keyup mouseup', function () {
+				saveButton.setDisabled( !isPrefsChanged() );
+			} );
+		} else {
+			// Disable the button to save preferences unless preferences have changed
+			// Check if preferences have been changed before JS has finished loading
+			$( '#prefcontrol' ).prop( 'disabled', !isPrefsChanged() );
+			$( '#preferences > fieldset' ).on( 'change keyup mouseup', function () {
+				$( '#prefcontrol' ).prop( 'disabled', !isPrefsChanged() );
+			} );
+		}
+
+		// Set up a message to notify users if they try to leave the page without
+		// saving.
+		allowCloseWindow = mw.confirmCloseWindow( {
+			test: isPrefsChanged,
+			message: mw.msg( 'prefswarning-warning', mw.msg( 'saveprefs' ) ),
+			namespace: 'prefswarning'
+		} );
+		$( '#mw-prefs-form' ).on( 'submit', $.proxy( allowCloseWindow, 'release' ) );
+		if ( oouiEnabled ) {
+			restoreButton.on( 'click', function () {
+				allowCloseWindow.release();
+				// The default behavior of events in OOUI is always prevented. Follow the link manually.
+				// Note that middle-click etc. still works, as it doesn't emit a OOUI 'click' event.
+				location.href = restoreButton.getHref();
+			} );
+		} else {
+			$( '#mw-prefs-restoreprefs' ).on( 'click', $.proxy( allowCloseWindow, 'release' ) );
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences/convertmessagebox.js b/resources/src/mediawiki.special.preferences/convertmessagebox.js
new file mode 100644
index 0000000000..e6b7432fbd
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences/convertmessagebox.js
@@ -0,0 +1,9 @@
+/*!
+ * JavaScript for Special:Preferences: Check for successbox to replace with notifications.
+ */
+( function ( $ ) {
+	$( function () {
+		var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' );
+		convertmessagebox();
+	} );
+}( jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences/personalEmail.js b/resources/src/mediawiki.special.preferences/personalEmail.js
new file mode 100644
index 0000000000..f934d59e1e
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences/personalEmail.js
@@ -0,0 +1,24 @@
+/*!
+ * JavaScript for Special:Preferences: Email preferences better UX
+ */
+( function ( $ ) {
+	$( function () {
+		var allowEmail, allowEmailFromNewUsers;
+
+		allowEmail = $( '#wpAllowEmail' );
+		allowEmailFromNewUsers = $( '#wpAllowEmailFromNewUsers' );
+
+		function toggleDisabled() {
+			if ( allowEmail.is( ':checked' ) && allowEmail.is( ':enabled' ) ) {
+				allowEmailFromNewUsers.prop( 'disabled', false );
+			} else {
+				allowEmailFromNewUsers.prop( 'disabled', true );
+			}
+		}
+
+		if ( allowEmail ) {
+			allowEmail.on( 'change', toggleDisabled );
+			toggleDisabled();
+		}
+	} );
+}( jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences/tabs.legacy.js b/resources/src/mediawiki.special.preferences/tabs.legacy.js
new file mode 100644
index 0000000000..0d97d68e84
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences/tabs.legacy.js
@@ -0,0 +1,143 @@
+/*!
+ * JavaScript for Special:Preferences: Tab navigation.
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var $preftoc, $preferences, $fieldsets, labelFunc, previousTab;
+
+		labelFunc = function () {
+			return this.id.replace( /^mw-prefsection/g, 'preftab' );
+		};
+
+		$preftoc = $( '#preftoc' );
+		$preferences = $( '#preferences' );
+
+		$fieldsets = $preferences.children( 'fieldset' )
+			.attr( {
+				role: 'tabpanel',
+				'aria-labelledby': labelFunc
+			} );
+		$fieldsets.not( '#mw-prefsection-personal' )
+			.hide()
+			.attr( 'aria-hidden', 'true' );
+
+		// T115692: The following is kept for backwards compatibility with older skins
+		$preferences.addClass( 'jsprefs' );
+		$fieldsets.addClass( 'prefsection' );
+		$fieldsets.children( 'legend' ).addClass( 'mainLegend' );
+
+		// Make sure the accessibility tip is selectable so that screen reader users take notice,
+		// but hide it per default to reduce interface clutter. Also make sure it becomes visible
+		// when selected. Similar to jquery.mw-jump
+		$( '<div>' ).addClass( 'mw-navigation-hint' )
+			.text( mw.msg( 'prefs-tabs-navigation-hint' ) )
+			.attr( 'tabIndex', 0 )
+			.on( 'focus blur', function ( e ) {
+				if ( e.type === 'blur' || e.type === 'focusout' ) {
+					$( this ).css( 'height', '0' );
+				} else {
+					$( this ).css( 'height', 'auto' );
+				}
+			} ).insertBefore( $preftoc );
+
+		/**
+		 * It uses document.getElementById for security reasons (HTML injections in $()).
+		 *
+		 * @ignore
+		 * @param {string} name the name of a tab without the prefix ("mw-prefsection-")
+		 * @param {string} [mode] A hash will be set according to the current
+		 *  open section. Set mode 'noHash' to surpress this.
+		 */
+		function switchPrefTab( name, mode ) {
+			var $tab, scrollTop;
+			// Handle hash manually to prevent jumping,
+			// therefore save and restore scrollTop to prevent jumping.
+			scrollTop = $( window ).scrollTop();
+			if ( mode !== 'noHash' ) {
+				location.hash = '#mw-prefsection-' + name;
+			}
+			$( window ).scrollTop( scrollTop );
+
+			$preftoc.find( 'li' ).removeClass( 'selected' )
+				.find( 'a' ).attr( {
+					tabIndex: -1,
+					'aria-selected': 'false'
+				} );
+
+			$tab = $( document.getElementById( 'preftab-' + name ) );
+			if ( $tab.length ) {
+				$tab.attr( {
+					tabIndex: 0,
+					'aria-selected': 'true'
+				} ).focus()
+					.parent().addClass( 'selected' );
+
+				$preferences.children( 'fieldset' ).hide().attr( 'aria-hidden', 'true' );
+				$( document.getElementById( 'mw-prefsection-' + name ) ).show().attr( 'aria-hidden', 'false' );
+			}
+		}
+
+		// Enable keyboard users to use left and right keys to switch tabs
+		$preftoc.on( 'keydown', function ( event ) {
+			var keyLeft = 37,
+				keyRight = 39,
+				$el;
+
+			if ( event.keyCode === keyLeft ) {
+				$el = $( '#preftoc li.selected' ).prev().find( 'a' );
+			} else if ( event.keyCode === keyRight ) {
+				$el = $( '#preftoc li.selected' ).next().find( 'a' );
+			} else {
+				return;
+			}
+			if ( $el.length > 0 ) {
+				switchPrefTab( $el.attr( 'href' ).replace( '#mw-prefsection-', '' ) );
+			}
+		} );
+
+		// Jump to correct section as indicated by the hash.
+		// This function is called onload and onhashchange.
+		function detectHash() {
+			var hash = location.hash,
+				matchedElement, parentSection;
+			if ( hash.match( /^#mw-prefsection-[\w]+$/ ) ) {
+				mw.storage.session.remove( 'mwpreferences-prevTab' );
+				switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
+			} else if ( hash.match( /^#mw-[\w-]+$/ ) ) {
+				matchedElement = document.getElementById( hash.slice( 1 ) );
+				parentSection = $( matchedElement ).parent().closest( '[id^="mw-prefsection-"]' );
+				if ( parentSection.length ) {
+					mw.storage.session.remove( 'mwpreferences-prevTab' );
+					// Switch to proper tab and scroll to selected item.
+					switchPrefTab( parentSection.attr( 'id' ).replace( 'mw-prefsection-', '' ), 'noHash' );
+					matchedElement.scrollIntoView();
+				}
+			}
+		}
+
+		$( window ).on( 'hashchange', function () {
+			var hash = location.hash;
+			if ( hash.match( /^#mw-[\w-]+/ ) ) {
+				detectHash();
+			} else if ( hash === '' ) {
+				switchPrefTab( 'personal', 'noHash' );
+			}
+		} )
+			// Run the function immediately to select the proper tab on startup.
+			.trigger( 'hashchange' );
+
+		// Restore the active tab after saving the preferences
+		previousTab = mw.storage.session.get( 'mwpreferences-prevTab' );
+		if ( previousTab ) {
+			switchPrefTab( previousTab, 'noHash' );
+			// Deleting the key, the tab states should be reset until we press Save
+			mw.storage.session.remove( 'mwpreferences-prevTab' );
+		}
+
+		$( '#mw-prefs-form' ).on( 'submit', function () {
+			var value = $( $preftoc ).find( 'li.selected a' ).attr( 'id' ).replace( 'preftab-', '' );
+			mw.storage.session.set( 'mwpreferences-prevTab', value );
+		} );
+
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.preferences/timezone.js b/resources/src/mediawiki.special.preferences/timezone.js
new file mode 100644
index 0000000000..f938bcfb93
--- /dev/null
+++ b/resources/src/mediawiki.special.preferences/timezone.js
@@ -0,0 +1,111 @@
+/*!
+ * JavaScript for Special:Preferences: Timezone field enhancements.
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var $tzSelect, $tzTextbox, timezoneWidget, $localtimeHolder, servertime,
+			oouiEnabled = $( '#mw-prefs-form' ).hasClass( 'mw-htmlform-ooui' );
+
+		// Timezone functions.
+		// Guesses Timezone from browser and updates fields onchange.
+
+		if ( oouiEnabled ) {
+			// This is identical to OO.ui.infuse( ... ), but it makes the class name of the result known.
+			try {
+				timezoneWidget = mw.widgets.SelectWithInputWidget.static.infuse( $( '#wpTimeCorrection' ) );
+			} catch ( err ) {
+				// This preference could theoretically be disabled ($wgHiddenPrefs)
+				timezoneWidget = null;
+			}
+		} else {
+			$tzSelect = $( '#wpTimeCorrection' );
+			$tzTextbox = $( '#wpTimeCorrection-other' );
+		}
+
+		$localtimeHolder = $( '#wpLocalTime' );
+		servertime = parseInt( $( 'input[name="wpServerTime"]' ).val(), 10 );
+
+		function minutesToHours( min ) {
+			var tzHour = Math.floor( Math.abs( min ) / 60 ),
+				tzMin = Math.abs( min ) % 60,
+				tzString = ( ( min >= 0 ) ? '' : '-' ) + ( ( tzHour < 10 ) ? '0' : '' ) + tzHour +
+					':' + ( ( tzMin < 10 ) ? '0' : '' ) + tzMin;
+			return tzString;
+		}
+
+		function hoursToMinutes( hour ) {
+			var minutes,
+				arr = hour.split( ':' );
+
+			arr[ 0 ] = parseInt( arr[ 0 ], 10 );
+
+			if ( arr.length === 1 ) {
+				// Specification is of the form [-]XX
+				minutes = arr[ 0 ] * 60;
+			} else {
+				// Specification is of the form [-]XX:XX
+				minutes = Math.abs( arr[ 0 ] ) * 60 + parseInt( arr[ 1 ], 10 );
+				if ( arr[ 0 ] < 0 ) {
+					minutes *= -1;
+				}
+			}
+			// Gracefully handle non-numbers.
+			if ( isNaN( minutes ) ) {
+				return 0;
+			} else {
+				return minutes;
+			}
+		}
+
+		function updateTimezoneSelection() {
+			var minuteDiff, localTime,
+				type = oouiEnabled ? timezoneWidget.dropdowninput.getValue() : $tzSelect.val(),
+				val = oouiEnabled ? timezoneWidget.textinput.getValue() : $tzTextbox.val();
+
+			if ( type === 'other' ) {
+				// User specified time zone manually in <input>
+				// Grab data from the textbox, parse it.
+				minuteDiff = hoursToMinutes( val );
+			} else {
+				// Time zone not manually specified by user
+				if ( type === 'guess' ) {
+					// Get browser timezone & fill it in
+					minuteDiff = -( new Date().getTimezoneOffset() );
+					if ( oouiEnabled ) {
+						timezoneWidget.textinput.setValue( minutesToHours( minuteDiff ) );
+						timezoneWidget.dropdowninput.setValue( 'other' );
+					} else {
+						$tzTextbox.val( minutesToHours( minuteDiff ) );
+						$tzSelect.val( 'other' );
+					}
+				} else {
+					// Grab data from the dropdown value
+					minuteDiff = parseInt( type.split( '|' )[ 1 ], 10 ) || 0;
+				}
+			}
+
+			// Determine local time from server time and minutes difference, for display.
+			localTime = servertime + minuteDiff;
+
+			// Bring time within the [0,1440) range.
+			localTime = ( ( localTime % 1440 ) + 1440 ) % 1440;
+
+			$localtimeHolder.text( mw.language.convertNumber( minutesToHours( localTime ) ) );
+		}
+
+		if ( oouiEnabled ) {
+			if ( timezoneWidget ) {
+				timezoneWidget.dropdowninput.on( 'change', updateTimezoneSelection );
+				timezoneWidget.textinput.on( 'change', updateTimezoneSelection );
+				updateTimezoneSelection();
+			}
+		} else {
+			if ( $tzSelect.length && $tzTextbox.length ) {
+				$tzSelect.change( updateTimezoneSelection );
+				$tzTextbox.blur( updateTimezoneSelection );
+				updateTimezoneSelection();
+			}
+		}
+
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.recentchanges.js b/resources/src/mediawiki.special.recentchanges.js
new file mode 100644
index 0000000000..29c0feaf17
--- /dev/null
+++ b/resources/src/mediawiki.special.recentchanges.js
@@ -0,0 +1,38 @@
+/*!
+ * JavaScript for Special:RecentChanges
+ */
+( function ( mw, $ ) {
+	var rc, $checkboxes, $select;
+
+	/**
+	 * @class mw.special.recentchanges
+	 * @singleton
+	 */
+	rc = {
+		/**
+		 * Handler to disable/enable the namespace selector checkboxes when the
+		 * special 'all' namespace is selected/unselected respectively.
+		 */
+		updateCheckboxes: function () {
+			// The option element for the 'all' namespace has an empty value
+			var isAllNS = $select.val() === '';
+
+			// Iterates over checkboxes and propagate the selected option
+			$checkboxes.prop( 'disabled', isAllNS );
+		},
+
+		init: function () {
+			$select = $( '#namespace' );
+			$checkboxes = $( '#nsassociated, #nsinvert' );
+
+			// Bind to change event, and trigger once to set the initial state of the checkboxes.
+			rc.updateCheckboxes();
+			$select.change( rc.updateCheckboxes );
+		}
+	};
+
+	$( rc.init );
+
+	module.exports = rc;
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.revisionDelete.js b/resources/src/mediawiki.special.revisionDelete.js
new file mode 100644
index 0000000000..cad9db0e9c
--- /dev/null
+++ b/resources/src/mediawiki.special.revisionDelete.js
@@ -0,0 +1,29 @@
+/*!
+ * JavaScript for Special:RevisionDelete
+ */
+( function ( mw, $ ) {
+	var colonSeparator = mw.message( 'colon-separator' ).text(),
+		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+		$wpRevDeleteReasonList = $( '#wpRevDeleteReasonList' ),
+		$wpReason = $( '#wpReason' ),
+		filterFn = function ( input ) {
+			// Should be built the same as in SpecialRevisionDelete::submit()
+			var comment = $wpRevDeleteReasonList.val();
+			if ( comment === 'other' ) {
+				comment = input;
+			} else if ( input !== '' ) {
+				// Entry from drop down menu + additional comment
+				comment += colonSeparator + input;
+			}
+			return comment;
+		};
+
+	// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
+	if ( summaryCodePointLimit ) {
+		$wpReason.codePointLimit( summaryCodePointLimit, filterFn );
+	} else if ( summaryByteLimit ) {
+		$wpReason.byteLimit( summaryByteLimit, filterFn );
+	}
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.search.commonsInterwikiWidget.js b/resources/src/mediawiki.special.search.commonsInterwikiWidget.js
new file mode 100644
index 0000000000..648bf67540
--- /dev/null
+++ b/resources/src/mediawiki.special.search.commonsInterwikiWidget.js
@@ -0,0 +1,78 @@
+( function ( mw, $ ) {
+
+	var api = new mw.Api(),
+		pageUrl = new mw.Uri(),
+		imagesText = new mw.Message( mw.messages, 'searchprofile-images' ),
+		moreResultsText = new mw.Message( mw.messages, 'search-interwiki-more-results' );
+
+	function itemTemplate( results ) {
+
+		var resultOutput = '', i, result, imageCaption, imageThumbnailSrc;
+
+		for ( i = 0; i < results.length; i++ ) {
+			result = results[ i ];
+			imageCaption = mw.html.element( 'span', { 'class': 'iw-result__mini-gallery__caption' }, result.title );
+			imageThumbnailSrc = ( result.thumbnail ) ? result.thumbnail.source : '';
+			resultOutput += '<div class="iw-result__mini-gallery">' +
+						/* escaping response content */
+						mw.html.element( 'a', {
+							href: '/wiki/' + result.title,
+							'class': 'iw-result__mini-gallery__image',
+							style: 'background-image: url(' + imageThumbnailSrc + ');'
+						}, new mw.html.Raw( imageCaption ) ) +
+					'</div>';
+		}
+
+		return resultOutput;
+	}
+
+	function itemWrapperTemplate( pageQuery, itemTemplateOutput ) {
+
+		return '<li class="iw-resultset iw-resultset--image" data-iw-resultset-pos="0">' +
+				'<div class="iw-result__header">' +
+					'<strong>' + imagesText.escaped() + '</strong>' +
+				'</div>' +
+				'<div class="iw-result__content">' +
+				/* template output has been sanitized by mw.html.element */
+				itemTemplateOutput +
+				'</div>' +
+				'<div class="iw-result__footer">' +
+					'<a href="/w/index.php?title=Special:Search&search=' + encodeURIComponent( pageQuery ) + '&fulltext=1&profile=images">' +
+						moreResultsText.escaped() +
+					'</a>' +
+				'</div>' +
+			'</li>';
+
+	}
+
+	api.get( {
+		action: 'query',
+		generator: 'search',
+		gsrsearch: pageUrl.query.search,
+		gsrnamespace: mw.config.get( 'wgNamespaceIds' ).file,
+		gsrlimit: 3,
+		prop: 'pageimages',
+		pilimit: 3,
+		piprop: 'thumbnail',
+		pithumbsize: 300,
+		formatversion: 2
+	} ).done( function ( resp ) {
+		var results = ( resp.query && resp.query.pages ) ? resp.query.pages : false,
+			multimediaWidgetTemplate;
+
+		if ( !results ) {
+			return;
+		}
+
+		results.sort( function ( a, b ) {
+			return a.index - b.index;
+		} );
+
+		multimediaWidgetTemplate = itemWrapperTemplate( pageUrl.query.search, itemTemplate( results ) );
+		/* we really only need to wait for document ready for DOM manipulation */
+		$( function () {
+			$( '.iw-results' ).append( multimediaWidgetTemplate );
+		} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.search.interwikiwidget.styles.less b/resources/src/mediawiki.special.search.interwikiwidget.styles.less
new file mode 100644
index 0000000000..8ec2735ea4
--- /dev/null
+++ b/resources/src/mediawiki.special.search.interwikiwidget.styles.less
@@ -0,0 +1,121 @@
+/* interwiki search results */
+/*==========================*/
+
+@import 'mediawiki.ui/variables.less';
+@import 'mediawiki.mixins';
+
+.mw-searchresults-has-iw {
+
+	.iw-headline {
+		font-weight: bold;
+	}
+
+	.iw-results {
+		list-style: none;
+		margin: 0;
+	}
+
+	.iw-resultset {
+		.box-sizing(border-box);
+		padding: 0.5em;
+		vertical-align: top;
+		width: 100%;
+		float: left;
+		background-color: @colorGray15;
+		margin-bottom: 1em;
+		word-break: break-word;
+	}
+
+	.iw-result__title {
+		font-size: 108%; /* matching regular search title */
+	}
+
+	.iw-result:after,
+	.iw-result__content:after { /* clearfix */
+		visibility: hidden;
+		display: block;
+		font-size: 0;
+		content: ' ';
+		clear: both;
+		height: 0;
+	}
+
+	.iw-result__footer {
+		float: right;
+		font-size: 97%; /* matching main search result font-size */
+		margin-top: 0.5em;
+	}
+	.iw-result__footer a {
+		vertical-align: middle;
+		font-style: italic;
+	}
+
+	.oo-ui-icon-favicon {
+		padding-right: 1em;
+	}
+
+	/* image search result */
+	.iw-result__mini-gallery {
+		position: relative;
+		float: left;
+		width: 100%;
+		height: 200px;
+		.box-sizing(border-box);
+		padding: 0.25rem;
+	}
+
+	/* second and third images are small */
+	.iw-result__mini-gallery:nth-child( 2 ),
+	.iw-result__mini-gallery:nth-child( 3 ) { /* stylelint-disable-line indentation */
+		width: 50%;
+		height: 100px;
+	}
+
+	.iw-result__mini-gallery__image {
+		display: block;
+		position: relative;
+		width: 100%;
+		height: 100%;
+		background-size: 100% auto;
+		background-size: cover;
+		background-repeat: no-repeat;
+		background-position: center center;
+	}
+
+	/* image gallery text */
+	.iw-result__mini-gallery__image > .iw-result__mini-gallery__caption {
+		visibility: hidden;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+		text-align: center;
+		color: #fff;
+		font-size: 0.8em;
+		padding: 0.5em;
+		background-color: rgba( 0, 0, 0, 0.5 );
+	}
+
+	.iw-result__mini-gallery__image:hover > .iw-result__mini-gallery__caption {
+		visibility: visible;
+	}
+
+	/* tablet and up */
+
+	@media only screen and ( min-width: @deviceWidthTablet ) {
+
+		#mw-interwiki-results {
+			width: 30%;
+			display: inline-block; /* used to align interwiki sidebar with the top of the main search results */
+			margin-left: 8%; /* since inline-block causes whitespace issues, this is 8 instead of 10% */
+		}
+		.mw-search-createlink,
+		.mw-search-nonefound,
+		.mw-search-results,
+		.mw-search-interwiki-header {
+			float: left;
+			width: 60%;
+			clear: left;
+			max-width: 60%;
+		}
+	}
+}
diff --git a/resources/src/mediawiki.special.search.styles.css b/resources/src/mediawiki.special.search.styles.css
new file mode 100644
index 0000000000..ea9b987d37
--- /dev/null
+++ b/resources/src/mediawiki.special.search.styles.css
@@ -0,0 +1,166 @@
+/* Special:Search */
+
+/*
+ * Fixes sister projects box moving down the extract
+ * of the first result (bug #16886).
+ * It only happens when the window is small and
+ * This changes slightly the layout for big screens
+ * where there was space for the extracts and the
+ * sister projects and thus it showed like in any
+ * other browser.
+ *
+ * This will only affect IE 7 and lower
+ */
+.searchresult {
+	display: inline !ie;
+}
+.searchresults {
+	margin: 1em 0 1em 0.4em;
+}
+/* needs extra specificity to override `.mw-body p` selector */
+.mw-body .mw-search-nonefound {
+	margin: 0;
+}
+
+.searchdidyoumean em,
+.searchmatch {
+	font-weight: bold;
+}
+
+.mw-search-results {
+	margin: 0;
+	max-width: 38em;
+}
+
+.mw-search-visualclear {
+	clear: both;
+}
+.mw-search-results li {
+	padding-bottom: 1.2em;
+	list-style: none;
+	list-style-image: none;
+}
+.mw-search-results li a {
+	font-size: 108%;
+}
+.mw-search-result-data {
+	color: #008000;
+	font-size: 97%;
+}
+.mw-search-profile-tabs {
+	background-color: #f8f9fa;
+	margin-top: 1em;
+	border: 1px solid #c8ccd1;
+	border-radius: 2px;
+}
+.search-types {
+	float: left;
+	padding-left: 0.25em;
+}
+.search-types ul {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+.search-types li {
+	float: left;
+	margin: 0;
+	padding: 0;
+}
+.search-types a {
+	display: block;
+	padding: 0.5em;
+}
+.search-types .current a {
+	color: #222;
+	cursor: default;
+}
+.search-types .current a:hover {
+	text-decoration: none;
+}
+.results-info {
+	float: right;
+	padding: 0.5em;
+	padding-right: 0.75em;
+	color: #54595d;
+	font-size: 95%;
+}
+#mw-search-top-table div.oo-ui-actionFieldLayout {
+	float: left;
+	width: 100%;
+}
+
+/* Advanced options menu */
+/*==========================*/
+
+#mw-searchoptions {
+	/* Support: Firefox, needs `clear: both` on `fieldset` when zoom level > 100%, see T176499 */
+	clear: both;
+	padding: 0.5em 0.75em 0.75em 0.75em;
+	background-color: #f8f9fa;
+	margin: -1px 0 0;
+	border: 1px solid #c8ccd1;
+	border-radius: 0 0 2px 2px;
+}
+#mw-searchoptions legend {
+	display: none;
+}
+#mw-searchoptions h4 {
+	padding: 0;
+	margin: 0;
+	float: left;
+}
+#mw-searchoptions table {
+	float: left;
+	margin-right: 3em;
+	border-collapse: collapse;
+}
+#mw-searchoptions table td {
+	padding: 0 1em 0 0;
+	white-space: nowrap;
+}
+#mw-searchoptions .divider {
+	clear: both;
+	border-bottom: 1px solid #eaecf0;
+	padding-top: 0.5em;
+	margin-bottom: 0.5em;
+}
+#mw-search-menu {
+	padding-left: 6em;
+	font-size: 85%;
+}
+
+#mw-search-interwiki {
+	float: right;
+	width: 18em;
+	border: 1px solid #a2a9b1;
+	margin-top: 2ex;
+}
+
+.searchalttitle,
+#mw-search-interwiki li {
+	font-size: 95%;
+}
+.mw-search-interwiki-more {
+	float: right;
+	font-size: 90%;
+}
+#mw-search-interwiki-caption {
+	text-align: center;
+	font-weight: bold;
+	font-size: 95%;
+}
+.mw-search-interwiki-project {
+	font-size: 97%;
+	text-align: left;
+	padding: 0.15em 0.15em 0.2em 0.2em;
+	background-color: #eaecf0;
+	border-top: 1px solid #c8ccd1;
+}
+
+.searchdidyoumean {
+	font-size: 127%;
+	margin-top: 0.8em;
+	/* Note that this color won't affect the link, as desired. */
+	color: #d33;
+}
diff --git a/resources/src/mediawiki.special.search/search.css b/resources/src/mediawiki.special.search/search.css
new file mode 100644
index 0000000000..aad784e222
--- /dev/null
+++ b/resources/src/mediawiki.special.search/search.css
@@ -0,0 +1,9 @@
+#mw-search-togglebox {
+	float: right;
+}
+#mw-search-togglebox label {
+	margin-right: 0.25em;
+}
+#mw-search-togglebox input {
+	margin-left: 0.25em;
+}
diff --git a/resources/src/mediawiki.special.search/search.js b/resources/src/mediawiki.special.search/search.js
new file mode 100644
index 0000000000..e809f2ea93
--- /dev/null
+++ b/resources/src/mediawiki.special.search/search.js
@@ -0,0 +1,60 @@
+/*!
+ * JavaScript for Special:Search
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var $checkboxes, $headerLinks, updateHeaderLinks, searchWidget;
+
+		// Emulate HTML5 autofocus behavior in non HTML5 compliant browsers
+		if ( !( 'autofocus' in document.createElement( 'input' ) ) ) {
+			$( 'input[autofocus]' ).eq( 0 ).focus();
+		}
+
+		// Create check all/none button
+		$checkboxes = $( '#powersearch input[id^=mw-search-ns]' );
+		$( '#mw-search-togglebox' ).append(
+			$( '<label>' )
+				.text( mw.msg( 'powersearch-togglelabel' ) )
+		).append(
+			$( '<input>' ).attr( 'type', 'button' )
+				.attr( 'id', 'mw-search-toggleall' )
+				.prop( 'value', mw.msg( 'powersearch-toggleall' ) )
+				.click( function () {
+					$checkboxes.prop( 'checked', true );
+				} )
+		).append(
+			$( '<input>' ).attr( 'type', 'button' )
+				.attr( 'id', 'mw-search-togglenone' )
+				.prop( 'value', mw.msg( 'powersearch-togglenone' ) )
+				.click( function () {
+					$checkboxes.prop( 'checked', false );
+				} )
+		);
+
+		// Change the header search links to what user entered
+		$headerLinks = $( '.search-types a' );
+		searchWidget = OO.ui.infuse( 'searchText' );
+		updateHeaderLinks = function ( value ) {
+			$headerLinks.each( function () {
+				var parts = $( this ).attr( 'href' ).split( 'search=' ),
+					lastpart = '',
+					prefix = 'search=';
+				if ( parts.length > 1 && parts[ 1 ].indexOf( '&' ) !== -1 ) {
+					lastpart = parts[ 1 ].slice( parts[ 1 ].indexOf( '&' ) );
+				} else {
+					prefix = '&search=';
+				}
+				this.href = parts[ 0 ] + prefix + encodeURIComponent( value ) + lastpart;
+			} );
+		};
+		searchWidget.on( 'change', updateHeaderLinks );
+		updateHeaderLinks( searchWidget.getValue() );
+
+		// When saving settings, use the proper request method (POST instead of GET).
+		$( '#mw-search-powersearch-remember' ).change( function () {
+			this.form.method = this.checked ? 'post' : 'get';
+		} ).trigger( 'change' );
+
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.undelete.js b/resources/src/mediawiki.special.undelete.js
new file mode 100644
index 0000000000..e3cf598454
--- /dev/null
+++ b/resources/src/mediawiki.special.undelete.js
@@ -0,0 +1,23 @@
+/*!
+ * JavaScript for Special:Undelete
+ */
+( function ( mw, $ ) {
+	$( function () {
+		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+			wpComment = OO.ui.infuse( $( '#wpComment' ).closest( '.oo-ui-widget' ) );
+
+		$( '#mw-undelete-invert' ).click( function () {
+			$( '.mw-undelete-revlist input[type="checkbox"]' ).prop( 'checked', function ( i, val ) {
+				return !val;
+			} );
+		} );
+
+		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
+		if ( summaryCodePointLimit ) {
+			mw.widgets.visibleCodePointLimit( wpComment, summaryCodePointLimit );
+		} else if ( summaryByteLimit ) {
+			mw.widgets.visibleByteLimit( wpComment, summaryByteLimit );
+		}
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css
new file mode 100644
index 0000000000..69fec08196
--- /dev/null
+++ b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.css
@@ -0,0 +1,7 @@
+.mw-watched-item {
+	text-decoration: line-through;
+}
+
+.mw-watch-link-disabled {
+	pointer-events: none;
+}
diff --git a/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js
new file mode 100644
index 0000000000..0886f8c7e9
--- /dev/null
+++ b/resources/src/mediawiki.special.unwatchedPages/unwatchedPages.js
@@ -0,0 +1,49 @@
+/*!
+ * JavaScript for Special:UnwatchedPages
+ */
+( function ( mw, $ ) {
+	$( function () {
+		$( 'a.mw-watch-link' ).click( function ( e ) {
+			var promise,
+				api = new mw.Api(),
+				$link = $( this ),
+				$subjectLink = $link.closest( 'li' ).children( 'a' ).eq( 0 ),
+				title = mw.util.getParamValue( 'title', $link.attr( 'href' ) );
+			// nice format
+			title = mw.Title.newFromText( title ).toText();
+			$link.addClass( 'mw-watch-link-disabled' );
+
+			// Preload the notification module for mw.notify
+			mw.loader.load( 'mediawiki.notification' );
+
+			// Use the class to determine whether to watch or unwatch
+			if ( !$subjectLink.hasClass( 'mw-watched-item' ) ) {
+				$link.text( mw.msg( 'watching' ) );
+				promise = api.watch( title ).done( function () {
+					$subjectLink.addClass( 'mw-watched-item' );
+					$link.text( mw.msg( 'unwatch' ) );
+					mw.notify( mw.msg( 'addedwatchtext-short', title ) );
+				} ).fail( function () {
+					$link.text( mw.msg( 'watch' ) );
+					mw.notify( mw.msg( 'watcherrortext', title ), { type: 'error' } );
+				} );
+			} else {
+				$link.text( mw.msg( 'unwatching' ) );
+				promise = api.unwatch( title ).done( function () {
+					$subjectLink.removeClass( 'mw-watched-item' );
+					$link.text( mw.msg( 'watch' ) );
+					mw.notify( mw.msg( 'removedwatchtext-short', title ) );
+				} ).fail( function () {
+					$link.text( mw.msg( 'unwatch' ) );
+					mw.notify( mw.msg( 'watcherrortext', title ), { type: 'error' } );
+				} );
+			}
+
+			promise.always( function () {
+				$link.removeClass( 'mw-watch-link-disabled' );
+			} );
+
+			e.preventDefault();
+		} );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.upload/templates/thumbnail.html b/resources/src/mediawiki.special.upload/templates/thumbnail.html
new file mode 100644
index 0000000000..bf0e7014db
--- /dev/null
+++ b/resources/src/mediawiki.special.upload/templates/thumbnail.html
@@ -0,0 +1,8 @@
+<div id="mw-upload-thumbnail" class="thumb tright">
+	<div class="thumbinner">
+		<div class="thumbcaption">
+			<div class="filename"></div>
+			<div class="fileinfo"></div>
+		</div>
+	</div>
+</div>
diff --git a/resources/src/mediawiki.special.upload/upload.js b/resources/src/mediawiki.special.upload/upload.js
new file mode 100644
index 0000000000..144659a7fb
--- /dev/null
+++ b/resources/src/mediawiki.special.upload/upload.js
@@ -0,0 +1,654 @@
+/**
+ * JavaScript for Special:Upload
+ *
+ * @private
+ * @class mw.special.upload
+ * @singleton
+ */
+
+/* global Uint8Array */
+
+( function ( mw, $ ) {
+	var uploadWarning, uploadTemplatePreview,
+		ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
+		$license = $( '#wpLicense' );
+
+	window.wgUploadWarningObj = uploadWarning = {
+		responseCache: { '': '&nbsp;' },
+		nameToCheck: '',
+		typing: false,
+		delay: 500, // ms
+		timeoutID: false,
+
+		keypress: function () {
+			if ( !ajaxUploadDestCheck ) {
+				return;
+			}
+
+			// Find file to upload
+			if ( !$( '#wpDestFile' ).length || !$( '#wpDestFile-warning' ).length ) {
+				return;
+			}
+
+			this.nameToCheck = $( '#wpDestFile' ).val();
+
+			// Clear timer
+			if ( this.timeoutID ) {
+				clearTimeout( this.timeoutID );
+			}
+			// Check response cache
+			if ( this.responseCache.hasOwnProperty( this.nameToCheck ) ) {
+				this.setWarning( this.responseCache[ this.nameToCheck ] );
+				return;
+			}
+
+			this.timeoutID = setTimeout( function () {
+				uploadWarning.timeout();
+			}, this.delay );
+		},
+
+		checkNow: function ( fname ) {
+			if ( !ajaxUploadDestCheck ) {
+				return;
+			}
+			if ( this.timeoutID ) {
+				clearTimeout( this.timeoutID );
+			}
+			this.nameToCheck = fname;
+			this.timeout();
+		},
+
+		timeout: function () {
+			var $spinnerDestCheck, title;
+			if ( !ajaxUploadDestCheck || this.nameToCheck.trim() === '' ) {
+				return;
+			}
+			$spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
+			title = mw.Title.newFromText( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file );
+
+			( new mw.Api() ).get( {
+				formatversion: 2,
+				action: 'query',
+				// If title is empty, user input is invalid, the API call will produce details about why
+				titles: [ title ? title.getPrefixedText() : this.nameToCheck ],
+				prop: 'imageinfo',
+				iiprop: 'uploadwarning',
+				errorformat: 'html',
+				errorlang: mw.config.get( 'wgUserLanguage' )
+			} ).done( function ( result ) {
+				var
+					resultOut = '',
+					page = result.query.pages[ 0 ];
+				if ( page.imageinfo ) {
+					resultOut = page.imageinfo[ 0 ].html;
+				} else if ( page.invalidreason ) {
+					resultOut = page.invalidreason.html;
+				}
+				uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
+			} ).always( function () {
+				$spinnerDestCheck.remove();
+			} );
+		},
+
+		processResult: function ( result, fileName ) {
+			this.setWarning( result );
+			this.responseCache[ fileName ] = result;
+		},
+
+		setWarning: function ( warning ) {
+			var $warningBox = $( '#wpDestFile-warning' ),
+				$warning = $( $.parseHTML( warning ) );
+			mw.hook( 'wikipage.content' ).fire( $warning );
+			$warningBox.empty().append( $warning );
+
+			// Set a value in the form indicating that the warning is acknowledged and
+			// doesn't need to be redisplayed post-upload
+			if ( !warning ) {
+				$( '#wpDestFileWarningAck' ).val( '' );
+				$warningBox.removeAttr( 'class' );
+			} else {
+				$( '#wpDestFileWarningAck' ).val( '1' );
+				$warningBox.attr( 'class', 'mw-destfile-warning' );
+			}
+
+		}
+	};
+
+	window.wgUploadTemplatePreviewObj = uploadTemplatePreview = {
+
+		responseCache: { '': '' },
+
+		/**
+		 * @param {jQuery} $element The element whose .val() will be previewed
+		 * @param {jQuery} $previewContainer The container to display the preview in
+		 */
+		getPreview: function ( $element, $previewContainer ) {
+			var template = $element.val(),
+				$spinner;
+
+			if ( this.responseCache.hasOwnProperty( template ) ) {
+				this.showPreview( this.responseCache[ template ], $previewContainer );
+				return;
+			}
+
+			$spinner = $.createSpinner().insertAfter( $element );
+
+			( new mw.Api() ).parse( '{{' + template + '}}', {
+				title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
+				prop: 'text',
+				pst: true,
+				uselang: mw.config.get( 'wgUserLanguage' )
+			} ).done( function ( result ) {
+				uploadTemplatePreview.processResult( result, template, $previewContainer );
+			} ).always( function () {
+				$spinner.remove();
+			} );
+		},
+
+		processResult: function ( result, template, $previewContainer ) {
+			this.responseCache[ template ] = result;
+			this.showPreview( this.responseCache[ template ], $previewContainer );
+		},
+
+		showPreview: function ( preview, $previewContainer ) {
+			$previewContainer.html( preview );
+		}
+
+	};
+
+	$( function () {
+		// AJAX wpDestFile warnings
+		if ( ajaxUploadDestCheck ) {
+			// Insert an event handler that fetches upload warnings when wpDestFile
+			// has been changed
+			$( '#wpDestFile' ).change( function () {
+				uploadWarning.checkNow( $( this ).val() );
+			} );
+			// Insert a row where the warnings will be displayed just below the
+			// wpDestFile row
+			$( '#mw-htmlform-description tbody' ).append(
+				$( '<tr>' ).append(
+					$( '<td>' )
+						.attr( 'id', 'wpDestFile-warning' )
+						.attr( 'colspan', 2 )
+				)
+			);
+		}
+
+		if ( mw.config.get( 'wgAjaxLicensePreview' ) && $license.length ) {
+			// License selector check
+			$license.change( function () {
+				// We might show a preview
+				uploadTemplatePreview.getPreview( $license, $( '#mw-license-preview' ) );
+			} );
+
+			// License selector table row
+			$license.closest( 'tr' ).after(
+				$( '<tr>' ).append(
+					$( '<td>' ),
+					$( '<td>' ).attr( 'id', 'mw-license-preview' )
+				)
+			);
+		}
+
+		// fillDestFile setup
+		mw.config.get( 'wgUploadSourceIds' ).forEach( function ( sourceId ) {
+			$( '#' + sourceId ).change( function () {
+				var path, slash, backslash, fname;
+				if ( !mw.config.get( 'wgUploadAutoFill' ) ) {
+					return;
+				}
+				// Remove any previously flagged errors
+				$( '#mw-upload-permitted' ).attr( 'class', '' );
+				$( '#mw-upload-prohibited' ).attr( 'class', '' );
+
+				path = $( this ).val();
+				// Find trailing part
+				slash = path.lastIndexOf( '/' );
+				backslash = path.lastIndexOf( '\\' );
+				if ( slash === -1 && backslash === -1 ) {
+					fname = path;
+				} else if ( slash > backslash ) {
+					fname = path.slice( slash + 1 );
+				} else {
+					fname = path.slice( backslash + 1 );
+				}
+
+				// Clear the filename if it does not have a valid extension.
+				// URLs are less likely to have a useful extension, so don't include them in the
+				// extension check.
+				if (
+					mw.config.get( 'wgCheckFileExtensions' ) &&
+					mw.config.get( 'wgStrictFileExtensions' ) &&
+					Array.isArray( mw.config.get( 'wgFileExtensions' ) ) &&
+					$( this ).attr( 'id' ) !== 'wpUploadFileURL'
+				) {
+					if (
+						fname.lastIndexOf( '.' ) === -1 ||
+						mw.config.get( 'wgFileExtensions' ).map( function ( element ) {
+							return element.toLowerCase();
+						} ).indexOf( fname.slice( fname.lastIndexOf( '.' ) + 1 ).toLowerCase() ) === -1
+					) {
+						// Not a valid extension
+						// Clear the upload and set mw-upload-permitted to error
+						$( this ).val( '' );
+						$( '#mw-upload-permitted' ).attr( 'class', 'error' );
+						$( '#mw-upload-prohibited' ).attr( 'class', 'error' );
+						// Clear wpDestFile as well
+						$( '#wpDestFile' ).val( '' );
+
+						return false;
+					}
+				}
+
+				// Replace spaces by underscores
+				fname = fname.replace( / /g, '_' );
+				// Capitalise first letter if needed
+				if ( mw.config.get( 'wgCapitalizeUploads' ) ) {
+					fname = fname[ 0 ].toUpperCase() + fname.slice( 1 );
+				}
+
+				// Output result
+				if ( $( '#wpDestFile' ).length ) {
+					// Call decodeURIComponent function to remove possible URL-encoded characters
+					// from the file name (T32390). Especially likely with upload-form-url.
+					// decodeURIComponent can throw an exception if input is invalid utf-8
+					try {
+						$( '#wpDestFile' ).val( decodeURIComponent( fname ) );
+					} catch ( err ) {
+						$( '#wpDestFile' ).val( fname );
+					}
+					uploadWarning.checkNow( fname );
+				}
+			} );
+		} );
+	} );
+
+	// Add a preview to the upload form
+	$( function () {
+		/**
+		 * Is the FileAPI available with sufficient functionality?
+		 *
+		 * @return {boolean}
+		 */
+		function hasFileAPI() {
+			return window.FileReader !== undefined;
+		}
+
+		/**
+		 * Check if this is a recognizable image type...
+		 * Also excludes files over 10M to avoid going insane on memory usage.
+		 *
+		 * TODO: Is there a way we can ask the browser what's supported in `<img>`s?
+		 *
+		 * TODO: Put SVG back after working around Firefox 7 bug <https://phabricator.wikimedia.org/T33643>
+		 *
+		 * @param {File} file
+		 * @return {boolean}
+		 */
+		function fileIsPreviewable( file ) {
+			var known = [ 'image/png', 'image/gif', 'image/jpeg', 'image/svg+xml' ],
+				tooHuge = 10 * 1024 * 1024;
+			return ( known.indexOf( file.type ) !== -1 ) && file.size > 0 && file.size < tooHuge;
+		}
+
+		/**
+		 * Format a file size attractively.
+		 *
+		 * TODO: Match numeric formatting
+		 *
+		 * @param {number} s
+		 * @return {string}
+		 */
+		function prettySize( s ) {
+			var sizeMsgs = [ 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ];
+			while ( s >= 1024 && sizeMsgs.length > 1 ) {
+				s /= 1024;
+				sizeMsgs = sizeMsgs.slice( 1 );
+			}
+			return mw.msg( sizeMsgs[ 0 ], Math.round( s ) );
+		}
+
+		/**
+		 * Start loading a file into memory; when complete, pass it as a
+		 * data URL to the callback function. If the callbackBinary is set it will
+		 * first be read as binary and afterwards as data URL. Useful if you want
+		 * to do preprocessing on the binary data first.
+		 *
+		 * @param {File} file
+		 * @param {Function} callback
+		 * @param {Function} callbackBinary
+		 */
+		function fetchPreview( file, callback, callbackBinary ) {
+			var reader = new FileReader();
+			if ( callbackBinary && 'readAsBinaryString' in reader ) {
+				// To fetch JPEG metadata we need a binary string; start there.
+				// TODO
+				reader.onload = function () {
+					callbackBinary( reader.result );
+
+					// Now run back through the regular code path.
+					fetchPreview( file, callback );
+				};
+				reader.readAsBinaryString( file );
+			} else if ( callbackBinary && 'readAsArrayBuffer' in reader ) {
+				// readAsArrayBuffer replaces readAsBinaryString
+				// However, our JPEG metadata library wants a string.
+				// So, this is going to be an ugly conversion.
+				reader.onload = function () {
+					var i,
+						buffer = new Uint8Array( reader.result ),
+						string = '';
+					for ( i = 0; i < buffer.byteLength; i++ ) {
+						string += String.fromCharCode( buffer[ i ] );
+					}
+					callbackBinary( string );
+
+					// Now run back through the regular code path.
+					fetchPreview( file, callback );
+				};
+				reader.readAsArrayBuffer( file );
+			} else if ( 'URL' in window && 'createObjectURL' in window.URL ) {
+				// Supported in Firefox 4.0 and above <https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL>
+				// WebKit has it in a namespace for now but that's ok. ;)
+				//
+				// Lifetime of this URL is until document close, which is fine
+				// for Special:Upload -- if this code gets used on longer-running
+				// pages, add a revokeObjectURL() when it's no longer needed.
+				//
+				// Prefer this over readAsDataURL for Firefox 7 due to bug reading
+				// some SVG files from data URIs <https://bugzilla.mozilla.org/show_bug.cgi?id=694165>
+				callback( window.URL.createObjectURL( file ) );
+			} else {
+				// This ends up decoding the file to base-64 and back again, which
+				// feels horribly inefficient.
+				reader.onload = function () {
+					callback( reader.result );
+				};
+				reader.readAsDataURL( file );
+			}
+		}
+
+		/**
+		 * Clear the file upload preview area.
+		 */
+		function clearPreview() {
+			$( '#mw-upload-thumbnail' ).remove();
+		}
+
+		/**
+		 * Show a thumbnail preview of PNG, JPEG, GIF, and SVG files prior to upload
+		 * in browsers supporting HTML5 FileAPI.
+		 *
+		 * As of this writing, known good:
+		 *
+		 * - Firefox 3.6+
+		 * - Chrome 7.something
+		 *
+		 * TODO: Check file size limits and warn of likely failures
+		 *
+		 * @param {File} file
+		 */
+		function showPreview( file ) {
+			var $canvas,
+				ctx,
+				meta,
+				previewSize = 180,
+				$spinner = $.createSpinner( { size: 'small', type: 'block' } )
+					.css( { width: previewSize, height: previewSize } ),
+				thumb = mw.template.get( 'mediawiki.special.upload', 'thumbnail.html' ).render();
+
+			thumb
+				.find( '.filename' ).text( file.name ).end()
+				.find( '.fileinfo' ).text( prettySize( file.size ) ).end()
+				.find( '.thumbinner' ).prepend( $spinner ).end();
+
+			$canvas = $( '<canvas>' ).attr( { width: previewSize, height: previewSize } );
+			ctx = $canvas[ 0 ].getContext( '2d' );
+			$( '#mw-htmlform-source' ).parent().prepend( thumb );
+
+			fetchPreview( file, function ( dataURL ) {
+				var img = new Image(),
+					rotation = 0;
+
+				if ( meta && meta.tiff && meta.tiff.Orientation ) {
+					rotation = ( 360 - ( function () {
+						// See BitmapHandler class in PHP
+						switch ( meta.tiff.Orientation.value ) {
+							case 8:
+								return 90;
+							case 3:
+								return 180;
+							case 6:
+								return 270;
+							default:
+								return 0;
+						}
+					}() ) ) % 360;
+				}
+
+				img.onload = function () {
+					var info, width, height, x, y, dx, dy, logicalWidth, logicalHeight;
+
+					// Fit the image within the previewSizexpreviewSize box
+					if ( img.width > img.height ) {
+						width = previewSize;
+						height = img.height / img.width * previewSize;
+					} else {
+						height = previewSize;
+						width = img.width / img.height * previewSize;
+					}
+					// Determine the offset required to center the image
+					dx = ( 180 - width ) / 2;
+					dy = ( 180 - height ) / 2;
+					switch ( rotation ) {
+						// If a rotation is applied, the direction of the axis
+						// changes as well. You can derive the values below by
+						// drawing on paper an axis system, rotate it and see
+						// where the positive axis direction is
+						case 0:
+							x = dx;
+							y = dy;
+							logicalWidth = img.width;
+							logicalHeight = img.height;
+							break;
+						case 90:
+
+							x = dx;
+							y = dy - previewSize;
+							logicalWidth = img.height;
+							logicalHeight = img.width;
+							break;
+						case 180:
+							x = dx - previewSize;
+							y = dy - previewSize;
+							logicalWidth = img.width;
+							logicalHeight = img.height;
+							break;
+						case 270:
+							x = dx - previewSize;
+							y = dy;
+							logicalWidth = img.height;
+							logicalHeight = img.width;
+							break;
+					}
+
+					ctx.clearRect( 0, 0, 180, 180 );
+					ctx.rotate( rotation / 180 * Math.PI );
+					ctx.drawImage( img, x, y, width, height );
+					$spinner.replaceWith( $canvas );
+
+					// Image size
+					info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
+						', ' + prettySize( file.size );
+
+					$( '#mw-upload-thumbnail .fileinfo' ).text( info );
+				};
+				img.onerror = function () {
+					// Can happen for example for invalid SVG files
+					clearPreview();
+				};
+				img.src = dataURL;
+			}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
+				var jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' );
+				try {
+					meta = jpegmeta( data, file.fileName );
+					// eslint-disable-next-line no-underscore-dangle, camelcase
+					meta._binary_data = null;
+				} catch ( e ) {
+					meta = null;
+				}
+			} : null );
+		}
+
+		/**
+		 * Check if the file does not exceed the maximum size
+		 *
+		 * @param {File} file
+		 * @return {boolean}
+		 */
+		function checkMaxUploadSize( file ) {
+			var maxSize, $error;
+
+			function getMaxUploadSize( type ) {
+				var sizes = mw.config.get( 'wgMaxUploadSize' );
+
+				if ( sizes[ type ] !== undefined ) {
+					return sizes[ type ];
+				}
+				return sizes[ '*' ];
+			}
+
+			$( '.mw-upload-source-error' ).remove();
+
+			maxSize = getMaxUploadSize( 'file' );
+			if ( file.size > maxSize ) {
+				$error = $( '<p class="error mw-upload-source-error" id="wpSourceTypeFile-error">' +
+					mw.message( 'largefileserver', file.size, maxSize ).escaped() + '</p>' );
+
+				$( '#wpUploadFile' ).after( $error );
+
+				return false;
+			}
+
+			return true;
+		}
+
+		/* Initialization */
+		if ( hasFileAPI() ) {
+			// Update thumbnail when the file selection control is updated.
+			$( '#wpUploadFile' ).change( function () {
+				var file;
+				clearPreview();
+				if ( this.files && this.files.length ) {
+					// Note: would need to be updated to handle multiple files.
+					file = this.files[ 0 ];
+
+					if ( !checkMaxUploadSize( file ) ) {
+						return;
+					}
+
+					if ( fileIsPreviewable( file ) ) {
+						showPreview( file );
+					}
+				}
+			} );
+		}
+	} );
+
+	// Disable all upload source fields except the selected one
+	$( function () {
+		var $rows = $( '.mw-htmlform-field-UploadSourceField' );
+
+		$rows.on( 'change', 'input[type="radio"]', function ( e ) {
+			var currentRow = e.delegateTarget;
+
+			if ( !this.checked ) {
+				return;
+			}
+
+			$( '.mw-upload-source-error' ).remove();
+
+			// Enable selected upload method
+			$( currentRow ).find( 'input' ).prop( 'disabled', false );
+
+			// Disable inputs of other upload methods
+			// (except for the radio button to re-enable it)
+			$rows
+				.not( currentRow )
+				.find( 'input[type!="radio"]' )
+				.prop( 'disabled', true );
+		} );
+
+		// Set initial state
+		if ( !$( '#wpSourceTypeurl' ).prop( 'checked' ) ) {
+			$( '#wpUploadFileURL' ).prop( 'disabled', true );
+		}
+	} );
+
+	$( function () {
+		// Prevent losing work
+		var allowCloseWindow,
+			$uploadForm = $( '#mw-upload-form' );
+
+		if ( !mw.user.options.get( 'useeditwarning' ) ) {
+			// If the user doesn't want edit warnings, don't set things up.
+			return;
+		}
+
+		$uploadForm.data( 'origtext', $uploadForm.serialize() );
+
+		allowCloseWindow = mw.confirmCloseWindow( {
+			test: function () {
+				return $( '#wpUploadFile' ).get( 0 ).files.length !== 0 ||
+					$uploadForm.data( 'origtext' ) !== $uploadForm.serialize();
+			},
+
+			message: mw.msg( 'editwarning-warning' ),
+			namespace: 'uploadwarning'
+		} );
+
+		$uploadForm.submit( function () {
+			allowCloseWindow.release();
+		} );
+	} );
+
+	// Add tabindex to mw-editTools
+	$( function () {
+		// Function to change tabindex for all links within mw-editTools
+		function setEditTabindex( $val ) {
+			$( '.mw-editTools' ).find( 'a' ).each( function () {
+				$( this ).attr( 'tabindex', $val );
+			} );
+		}
+
+		// Change tabindex to 0 if user pressed spaced or enter while focused
+		$( '.mw-editTools' ).on( 'keypress', function ( e ) {
+			// Don't continue if pressed key was not enter or spacebar
+			if ( e.which !== 13 && e.which !== 32 ) {
+				return;
+			}
+
+			// Change tabindex only when main div has focus
+			if ( $( this ).is( ':focus' ) ) {
+				$( this ).find( 'a' ).first().focus();
+				setEditTabindex( '0' );
+			}
+		} );
+
+		// Reset tabindex for elements when user focused out mw-editTools
+		$( '.mw-editTools' ).on( 'focusout', function ( e ) {
+			// Don't continue if relatedTarget is within mw-editTools
+			if ( e.relatedTarget !== null && $( e.relatedTarget ).closest( '.mw-editTools' ).length > 0 ) {
+				return;
+			}
+
+			// Reset tabindex back to -1
+			setEditTabindex( '-1' );
+		} );
+
+		// Set initial tabindex for mw-editTools to 0 and to -1 for all links
+		$( '.mw-editTools' ).attr( 'tabindex', '0' );
+		setEditTabindex( '-1' );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.userlogin.common.styles/images/icon-lock.png b/resources/src/mediawiki.special.userlogin.common.styles/images/icon-lock.png
new file mode 100644
index 0000000000..03f0eecdb4
Binary files /dev/null and b/resources/src/mediawiki.special.userlogin.common.styles/images/icon-lock.png differ
diff --git a/resources/src/mediawiki.special.userlogin.common.styles/userlogin.css b/resources/src/mediawiki.special.userlogin.common.styles/userlogin.css
new file mode 100644
index 0000000000..2366249253
--- /dev/null
+++ b/resources/src/mediawiki.special.userlogin.common.styles/userlogin.css
@@ -0,0 +1,75 @@
+/* User login and signup forms */
+.mw-ui-vform .mw-form-related-link-container {
+	margin-bottom: 0.5em;
+	text-align: center;
+}
+
+.mw-ui-vform .mw-secure {
+	/* @embed */
+	background: url( images/icon-lock.png ) no-repeat left center;
+	margin: 0 0 0 1px;
+	padding: 0 0 0 11px;
+}
+
+/*
+ * When inside the VForm style, disable the border that Vector and other skins
+ * put on the div surrounding the login/create account form.
+ * Also disable the margin and padding that Vector puts around the form.
+ */
+.mw-ui-container #userloginForm,
+.mw-ui-container #userlogin {
+	border: 0;
+	margin: 0;
+	padding: 0;
+}
+
+/* Reposition and resize language links, which appear on a per-wiki basis */
+.mw-ui-container #languagelinks {
+	margin-bottom: 2em;
+	font-size: 0.8em;
+}
+
+/* Put some space under template's header, which may contain CAPTCHA HTML. */
+section.mw-form-header {
+	margin-bottom: 10px;
+}
+
+/* shuffled CAPTCHA */
+#wpCaptchaWord {
+	margin-top: 6px;
+}
+
+.fancycaptcha-captcha-container {
+	background-color: #f8f9fa;
+	margin-bottom: 15px;
+	border: 1px solid #c8ccd1;
+	border-radius: 2px;
+	padding: 8px;
+	text-align: center;
+}
+
+.mw-createacct-captcha-assisted {
+	display: block;
+	margin-top: 0.5em;
+}
+
+/* Put a border around the fancycaptcha-image-container. */
+.fancycaptcha-captcha-and-reload {
+	border: 1px solid #c8ccd1;
+	border-radius: 2px 2px 0 0;
+	/* Other display formats end up too wide */
+	display: table-cell;
+	width: 270px;
+	background-color: #fff;
+}
+
+.fancycaptcha-captcha-container .mw-ui-input {
+	margin-top: -1px;
+	border-color: #c8ccd1;
+	border-radius: 0 0 2px 2px;
+}
+
+/* Make the fancycaptcha-image-container full-width within its parent. */
+.fancycaptcha-image-container {
+	width: 100%;
+}
diff --git a/resources/src/mediawiki.special.userlogin.login.styles/images/glyph-people-large.png b/resources/src/mediawiki.special.userlogin.login.styles/images/glyph-people-large.png
new file mode 100644
index 0000000000..cba3cafb34
Binary files /dev/null and b/resources/src/mediawiki.special.userlogin.login.styles/images/glyph-people-large.png differ
diff --git a/resources/src/mediawiki.special.userlogin.login.styles/login.css b/resources/src/mediawiki.special.userlogin.login.styles/login.css
new file mode 100644
index 0000000000..fe013bc845
--- /dev/null
+++ b/resources/src/mediawiki.special.userlogin.login.styles/login.css
@@ -0,0 +1,29 @@
+/* The login form invites users to create an account */
+#mw-createaccount-cta {
+	width: 20em;
+	/* @embed */
+	background: url( images/glyph-people-large.png ) no-repeat 50%;
+	margin: 0 auto;
+	padding-top: 7.8em;
+	font-weight: bold;
+}
+
+/* Login Button, following 'ButtonWidget (progressive)' from OOUI */
+#mw-createaccount-join {
+	background-color: #f8f9fa;
+	color: #36c;
+}
+#mw-createaccount-join:hover {
+	background-color: #fff;
+	border-color: #859ecc;
+	box-shadow: none;
+}
+#mw-createaccount-join:active {
+	background-color: #eff3fa;
+	color: #2a4b8d;
+	border-color: #2a4b8d;
+}
+#mw-createaccount-join:focus {
+	border-color: #36c;
+	box-shadow: inset 0 0 0 1px #36c;
+}
diff --git a/resources/src/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special.userlogin.signup.js
new file mode 100644
index 0000000000..8a61afbe6a
--- /dev/null
+++ b/resources/src/mediawiki.special.userlogin.signup.js
@@ -0,0 +1,122 @@
+/*!
+ * JavaScript for signup form.
+ */
+( function ( mw, $ ) {
+	// When sending password by email, hide the password input fields.
+	$( function () {
+		// Always required if checked, otherwise it depends, so we use the original
+		var $emailLabel = $( 'label[for="wpEmail"]' ),
+			originalText = $emailLabel.text(),
+			requiredText = mw.message( 'createacct-emailrequired' ).text(),
+			$createByMailCheckbox = $( '#wpCreateaccountMail' ),
+			$beforePwds = $( '.mw-row-password:first' ).prev(),
+			$pwds;
+
+		function updateForCheckbox() {
+			var checked = $createByMailCheckbox.prop( 'checked' );
+			if ( checked ) {
+				$pwds = $( '.mw-row-password' ).detach();
+				$emailLabel.text( requiredText );
+			} else {
+				if ( $pwds ) {
+					$beforePwds.after( $pwds );
+					$pwds = null;
+				}
+				$emailLabel.text( originalText );
+			}
+		}
+
+		$createByMailCheckbox.on( 'change', updateForCheckbox );
+		updateForCheckbox();
+	} );
+
+	// Check if the username is invalid or already taken
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		var $usernameInput = $root.find( '#wpName2' ),
+			$passwordInput = $root.find( '#wpPassword2' ),
+			$emailInput = $root.find( '#wpEmail' ),
+			$realNameInput = $root.find( '#wpRealName' ),
+			api = new mw.Api(),
+			usernameChecker, passwordChecker;
+
+		function checkUsername( username ) {
+			// We could just use .then() if we didn't have to pass on .abort()…
+			var d, apiPromise;
+
+			d = $.Deferred();
+			apiPromise = api.get( {
+				action: 'query',
+				list: 'users',
+				ususers: username,
+				usprop: 'cancreate',
+				formatversion: 2,
+				errorformat: 'html',
+				errorsuselocal: true,
+				uselang: mw.config.get( 'wgUserLanguage' )
+			} )
+				.done( function ( resp ) {
+					var userinfo = resp.query.users[ 0 ];
+
+					if ( resp.query.users.length !== 1 || userinfo.invalid ) {
+						d.resolve( { valid: false, messages: [ mw.message( 'noname' ).parseDom() ] } );
+					} else if ( userinfo.userid !== undefined ) {
+						d.resolve( { valid: false, messages: [ mw.message( 'userexists' ).parseDom() ] } );
+					} else if ( !userinfo.cancreate ) {
+						d.resolve( {
+							valid: false,
+							messages: userinfo.cancreateerror ? userinfo.cancreateerror.map( function ( m ) {
+								return m.html;
+							} ) : []
+						} );
+					} else {
+						d.resolve( { valid: true, messages: [] } );
+					}
+				} )
+				.fail( d.reject );
+
+			return d.promise( { abort: apiPromise.abort } );
+		}
+
+		function checkPassword() {
+			// We could just use .then() if we didn't have to pass on .abort()…
+			var apiPromise,
+				d = $.Deferred();
+
+			if ( $usernameInput.val().trim() === '' ) {
+				d.resolve( { valid: true, messages: [] } );
+				return d.promise();
+			}
+
+			apiPromise = api.post( {
+				action: 'validatepassword',
+				user: $usernameInput.val(),
+				password: $passwordInput.val(),
+				email: $emailInput.val() || '',
+				realname: $realNameInput.val() || '',
+				formatversion: 2,
+				errorformat: 'html',
+				errorsuselocal: true,
+				uselang: mw.config.get( 'wgUserLanguage' )
+			} )
+				.done( function ( resp ) {
+					var pwinfo = resp.validatepassword || {};
+
+					d.resolve( {
+						valid: pwinfo.validity === 'Good',
+						messages: pwinfo.validitymessages ? pwinfo.validitymessages.map( function ( m ) {
+							return m.html;
+						} ) : []
+					} );
+				} )
+				.fail( d.reject );
+
+			return d.promise( { abort: apiPromise.abort } );
+		}
+
+		usernameChecker = new mw.htmlform.Checker( $usernameInput, checkUsername );
+		usernameChecker.attach();
+
+		passwordChecker = new mw.htmlform.Checker( $passwordInput, checkPassword );
+		passwordChecker.attach( $usernameInput.add( $emailInput ).add( $realNameInput ) );
+	} );
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-contributors.png b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-contributors.png
new file mode 100644
index 0000000000..30bf53a868
Binary files /dev/null and b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-contributors.png differ
diff --git a/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-edits.png b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-edits.png
new file mode 100644
index 0000000000..17508f9f2b
Binary files /dev/null and b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-edits.png differ
diff --git a/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-pages.png b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-pages.png
new file mode 100644
index 0000000000..8e37278b50
Binary files /dev/null and b/resources/src/mediawiki.special.userlogin.signup.styles/images/icon-pages.png differ
diff --git a/resources/src/mediawiki.special.userlogin.signup.styles/signup.css b/resources/src/mediawiki.special.userlogin.signup.styles/signup.css
new file mode 100644
index 0000000000..3cfa5a8c44
--- /dev/null
+++ b/resources/src/mediawiki.special.userlogin.signup.styles/signup.css
@@ -0,0 +1,67 @@
+/* Disable the underline that Vector puts on h2 headings, and bold them. */
+.mw-ui-container h2 {
+	border: 0;
+	font-weight: bold;
+}
+
+/* Benefits column CSS to the right (if it fits) of the form. */
+.mw-ui-container #userloginForm {
+	float: left;
+	/* Override the right margin of the form to give space in case a benefits
+	 * column appears to the side. */
+	margin-right: 100px;
+	/* Override `.mw-body-content` to ensure useful, readable paragraphs */
+	line-height: 1.4;
+}
+
+.mw-createacct-benefits-container {
+	/* Keeps this column compact and close to the form, but tends to squish contents. */
+	float: left;
+}
+
+.mw-createacct-benefits-container h2 {
+	margin-bottom: 30px;
+}
+
+.mw-number-text.icon-edits {
+	/* @embed */
+	background: url( images/icon-edits.png ) no-repeat left center;
+}
+
+.mw-number-text.icon-pages {
+	/* @embed */
+	background: url( images/icon-pages.png ) no-repeat left center;
+}
+
+.mw-number-text.icon-contributors {
+	/* @embed */
+	background: url( images/icon-contributors.png ) no-repeat left center;
+}
+
+/*
+ * Special font for numbers in benefits, same as Vector's `@content-heading-font-family`.
+ * Needs an ID so that it's more specific than Vector's div#content h3.
+ */
+#bodyContent .mw-number-text h3 {
+	color: #222;
+	margin: 0;
+	padding: 0;
+	font-family: 'Linux Libertine', 'Georgia', 'Times', serif;
+	font-weight: normal;
+	font-size: 2.2em;
+	line-height: 1.2;
+	text-align: center;
+}
+
+/* Contains a “headlined” number and explanatory text, with space for an icon */
+.mw-number-text {
+	display: block;
+	font-size: 1.2em;
+	color: #444;
+	margin-top: 1em;
+	/* 80px wide icon plus "margin" */
+	padding: 0 0 0 95px;
+	/* Matches max icon height, ensures icon emblem is visible */
+	min-height: 75px;
+	text-align: center;
+}
diff --git a/resources/src/mediawiki.special.userrights.js b/resources/src/mediawiki.special.userrights.js
new file mode 100644
index 0000000000..487e63a67d
--- /dev/null
+++ b/resources/src/mediawiki.special.userrights.js
@@ -0,0 +1,25 @@
+/*!
+ * JavaScript for Special:UserRights
+ */
+( function ( mw, $ ) {
+	var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' ),
+		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
+		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
+		$wpReason = $( '#wpReason' );
+
+	// Replace successbox with notifications
+	convertmessagebox();
+
+	// Dynamically show/hide the "other time" input under each dropdown
+	$( '.mw-userrights-nested select' ).on( 'change', function ( e ) {
+		$( e.target.parentNode ).find( 'input' ).toggle( $( e.target ).val() === 'other' );
+	} );
+
+	// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
+	if ( summaryCodePointLimit ) {
+		$wpReason.codePointLimit( summaryCodePointLimit );
+	} else if ( summaryByteLimit ) {
+		$wpReason.byteLimit( summaryByteLimit );
+	}
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special.version.css b/resources/src/mediawiki.special.version.css
new file mode 100644
index 0000000000..1b8581af4b
--- /dev/null
+++ b/resources/src/mediawiki.special.version.css
@@ -0,0 +1,39 @@
+/*!
+ * Styling for Special:Version
+ */
+.mw-version-ext-name,
+.mw-version-library-name {
+	font-weight: bold;
+}
+
+.mw-version-ext-license,
+.mw-version-ext-vcs-timestamp {
+	white-space: nowrap;
+}
+
+th.mw-version-ext-col-label {
+	font-size: 0.9em;
+}
+
+.mw-version-ext-vcs-version {
+	unicode-bidi: embed;
+}
+
+.mw-version-credits {
+	column-width: 18em;
+	-moz-column-width: 18em;
+	-webkit-column-width: 18em;
+}
+
+.mw-version-credits ul {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.mw-version-license-info strong {
+	font-weight: normal;
+}
+
+.mw-version-license-info em {
+	font-style: normal;
+}
diff --git a/resources/src/mediawiki.special.watchlist/visitedstatus.js b/resources/src/mediawiki.special.watchlist/visitedstatus.js
new file mode 100644
index 0000000000..6b25327d95
--- /dev/null
+++ b/resources/src/mediawiki.special.watchlist/visitedstatus.js
@@ -0,0 +1,12 @@
+/*!
+ * JavaScript for Special:Watchlist
+ */
+( function ( $ ) {
+	$( function () {
+		$( '.mw-changeslist-line-watched .mw-title a' ).on( 'click', function () {
+			$( this )
+				.closest( '.mw-changeslist-line-watched' )
+				.removeClass( 'mw-changeslist-line-watched' );
+		} );
+	} );
+}( jQuery ) );
diff --git a/resources/src/mediawiki.special.watchlist/watchlist.js b/resources/src/mediawiki.special.watchlist/watchlist.js
new file mode 100644
index 0000000000..565ed2c974
--- /dev/null
+++ b/resources/src/mediawiki.special.watchlist/watchlist.js
@@ -0,0 +1,158 @@
+/*!
+ * JavaScript for Special:Watchlist
+ */
+( function ( mw, $, OO ) {
+	$( function () {
+		var api = new mw.Api(), $progressBar, $resetForm = $( '#mw-watchlist-resetbutton' );
+
+		// If the user wants to reset their watchlist, use an API call to do so (no reload required)
+		// Adapted from a user script by User:NQ of English Wikipedia
+		// (User:NQ/WatchlistResetConfirm.js)
+		$resetForm.submit( function ( event ) {
+			var $button = $resetForm.find( 'input[name=mw-watchlist-reset-submit]' );
+
+			event.preventDefault();
+
+			// Disable reset button to prevent multiple concurrent requests
+			$button.prop( 'disabled', true );
+
+			if ( !$progressBar ) {
+				$progressBar = new OO.ui.ProgressBarWidget( { progress: false } ).$element;
+				$progressBar.css( {
+					position: 'absolute', width: '100%'
+				} );
+			}
+			// Show progress bar
+			$resetForm.append( $progressBar );
+
+			// Use action=setnotificationtimestamp to mark all as visited,
+			// then set all watchlist lines accordingly
+			api.postWithToken( 'csrf', {
+				formatversion: 2, action: 'setnotificationtimestamp', entirewatchlist: true
+			} ).done( function () {
+				// Enable button again
+				$button.prop( 'disabled', false );
+				// Hide the button because further clicks can not generate any visual changes
+				$button.css( 'visibility', 'hidden' );
+				$progressBar.detach();
+				$( '.mw-changeslist-line-watched' )
+					.removeClass( 'mw-changeslist-line-watched' )
+					.addClass( 'mw-changeslist-line-not-watched' );
+			} ).fail( function () {
+				// On error, fall back to server-side reset
+				// First remove this submit listener and then re-submit the form
+				$resetForm.off( 'submit' ).submit();
+			} );
+		} );
+
+		// if the user wishes to reload the watchlist whenever a filter changes
+		if ( mw.user.options.get( 'watchlistreloadautomatically' ) ) {
+			// add a listener on all form elements in the header form
+			$( '#mw-watchlist-form input, #mw-watchlist-form select' ).on( 'change', function () {
+				// submit the form when one of the input fields is modified
+				$( '#mw-watchlist-form' ).submit();
+			} );
+		}
+
+		if ( mw.user.options.get( 'watchlistunwatchlinks' ) ) {
+			// Watch/unwatch toggle link:
+			// If a page is on the watchlist, a '×' is shown which, when clicked, removes the page from the watchlist.
+			// After unwatching a page, the '×' becomes a '+', which if clicked re-watches the page.
+			// Unwatched page entries are struck through and have lowered opacity.
+			$( '.mw-changeslist' ).on( 'click', '.mw-unwatch-link, .mw-watch-link', function ( event ) {
+				var $unwatchLink = $( this ), // EnhancedChangesList uses <table> for each row, while OldChangesList uses <li> for each row
+					$watchlistLine = $unwatchLink.closest( 'li, table' )
+						.find( '[data-target-page]' ),
+					pageTitle = $watchlistLine.data( 'targetPage' ),
+					isTalk = mw.Title.newFromText( pageTitle ).getNamespaceId() % 2 === 1;
+
+				// Utility function for looping through each watchlist line that matches
+				// a certain page or its associated page (e.g. Talk)
+				function forEachMatchingTitle( title, callback ) {
+
+					var titleObj = mw.Title.newFromText( title ),
+						pageNamespaceId = titleObj.getNamespaceId(),
+						isTalk = pageNamespaceId % 2 === 1,
+						associatedTitle = mw.Title.makeTitle( isTalk ? pageNamespaceId - 1 : pageNamespaceId + 1,
+							titleObj.getMainText() ).getPrefixedText();
+					$( '.mw-changeslist-line' ).each( function () {
+						var $this = $( this ), $row, $unwatchLink;
+
+						$this.find( '[data-target-page]' ).each( function () {
+							var $this = $( this ), rowTitle = $this.data( 'targetPage' );
+							if ( rowTitle === title || rowTitle === associatedTitle ) {
+
+								// EnhancedChangesList groups log entries by performer rather than target page. Therefore...
+								// * If using OldChangesList, use the <li>
+								// * If using EnhancedChangesList and $this is part of a grouped log entry, use the <td> sub-entry
+								// * If using EnhancedChangesList and $this is not part of a grouped log entry, use the <table> grouped entry
+								$row =
+									$this.closest(
+										'li, table.mw-collapsible.mw-changeslist-log td[data-target-page], table' );
+								$unwatchLink = $row.find( '.mw-unwatch-link, .mw-watch-link' );
+
+								callback( rowTitle, $row, $unwatchLink );
+							}
+						} );
+					} );
+				}
+
+				// Preload the notification module for mw.notify
+				mw.loader.load( 'mediawiki.notification' );
+
+				// Depending on whether we are watching or unwatching, for each entry of the page (and its associated page i.e. Talk),
+				// change the text, tooltip, and non-JS href of the (un)watch button, and update the styling of the watchlist entry.
+				if ( $unwatchLink.hasClass( 'mw-unwatch-link' ) ) {
+					api.unwatch( pageTitle )
+						.done( function () {
+							forEachMatchingTitle( pageTitle,
+								function ( rowPageTitle, $row, $rowUnwatchLink ) {
+									$rowUnwatchLink
+										.text( mw.msg( 'watchlist-unwatch-undo' ) )
+										.attr( 'title', mw.msg( 'tooltip-ca-watch' ) )
+										.attr( 'href',
+											mw.util.getUrl( rowPageTitle, { action: 'watch' } ) )
+										.removeClass( 'mw-unwatch-link loading' )
+										.addClass( 'mw-watch-link' );
+									$row.find(
+										'.mw-changeslist-line-inner, .mw-enhanced-rc-nested' )
+										.addBack( '.mw-enhanced-rc-nested' ) // For matching log sub-entry
+										.addClass( 'mw-changelist-line-inner-unwatched' );
+								} );
+
+							mw.notify(
+								mw.message( isTalk ? 'removedwatchtext-talk' : 'removedwatchtext',
+									pageTitle ), { tag: 'watch-self' } );
+						} );
+				} else {
+					api.watch( pageTitle )
+						.then( function () {
+							forEachMatchingTitle( pageTitle,
+								function ( rowPageTitle, $row, $rowUnwatchLink ) {
+									$rowUnwatchLink
+										.text( mw.msg( 'watchlist-unwatch' ) )
+										.attr( 'title', mw.msg( 'tooltip-ca-unwatch' ) )
+										.attr( 'href',
+											mw.util.getUrl( rowPageTitle, { action: 'unwatch' } ) )
+										.removeClass( 'mw-watch-link loading' )
+										.addClass( 'mw-unwatch-link' );
+									$row.find( '.mw-changelist-line-inner-unwatched' )
+										.addBack( '.mw-enhanced-rc-nested' )
+										.removeClass( 'mw-changelist-line-inner-unwatched' );
+								} );
+
+							mw.notify(
+								mw.message( isTalk ? 'addedwatchtext-talk' : 'addedwatchtext',
+									pageTitle ), { tag: 'watch-self' } );
+						} );
+				}
+
+				event.preventDefault();
+				event.stopPropagation();
+				$unwatchLink.blur();
+			} );
+		}
+	} );
+
+}( mediaWiki, jQuery, OO )
+);
diff --git a/resources/src/mediawiki.special/apisandbox.css b/resources/src/mediawiki.special/apisandbox.css
new file mode 100644
index 0000000000..4dc4c27ab0
--- /dev/null
+++ b/resources/src/mediawiki.special/apisandbox.css
@@ -0,0 +1,3 @@
+.client-js .mw-apisandbox-nojs {
+	display: none;
+}
diff --git a/resources/src/mediawiki.special/comparepages.less b/resources/src/mediawiki.special/comparepages.less
new file mode 100644
index 0000000000..87b7a8b7cb
--- /dev/null
+++ b/resources/src/mediawiki.special/comparepages.less
@@ -0,0 +1,19 @@
+@import 'mediawiki.mixins';
+
+.mw-special-ComparePages .mw-htmlform-ooui-wrapper {
+	width: 100%;
+}
+
+.mw-special-ComparePages .oo-ui-layout.oo-ui-panelLayout.oo-ui-panelLayout-padded.oo-ui-panelLayout-framed {
+	float: left;
+	width: 49%;
+	.box-sizing( border-box );
+}
+
+.mw-special-ComparePages .oo-ui-layout.oo-ui-panelLayout.oo-ui-panelLayout-padded.oo-ui-panelLayout-framed:nth-of-type( 2 ) {
+	margin-left: 2%;
+}
+
+.mw-special-ComparePages .mw-htmlform-submit-buttons {
+	clear: both;
+}
diff --git a/resources/src/mediawiki.special/edittags.css b/resources/src/mediawiki.special/edittags.css
new file mode 100644
index 0000000000..204009c963
--- /dev/null
+++ b/resources/src/mediawiki.special/edittags.css
@@ -0,0 +1,15 @@
+/*!
+ * Styling for Special:EditTags and action=editchangetags
+ */
+#mw-edittags-tags-selector td {
+	vertical-align: top;
+}
+
+#mw-edittags-tags-selector-multi td {
+	vertical-align: top;
+	padding-right: 1.5em;
+}
+
+#mw-edittags-tag-list {
+	min-width: 20em;
+}
diff --git a/resources/src/mediawiki.special/images/glyph-people-large.png b/resources/src/mediawiki.special/images/glyph-people-large.png
deleted file mode 100644
index cba3cafb34..0000000000
Binary files a/resources/src/mediawiki.special/images/glyph-people-large.png and /dev/null differ
diff --git a/resources/src/mediawiki.special/images/icon-contributors.png b/resources/src/mediawiki.special/images/icon-contributors.png
deleted file mode 100644
index 30bf53a868..0000000000
Binary files a/resources/src/mediawiki.special/images/icon-contributors.png and /dev/null differ
diff --git a/resources/src/mediawiki.special/images/icon-edits.png b/resources/src/mediawiki.special/images/icon-edits.png
deleted file mode 100644
index 17508f9f2b..0000000000
Binary files a/resources/src/mediawiki.special/images/icon-edits.png and /dev/null differ
diff --git a/resources/src/mediawiki.special/images/icon-lock.png b/resources/src/mediawiki.special/images/icon-lock.png
deleted file mode 100644
index 03f0eecdb4..0000000000
Binary files a/resources/src/mediawiki.special/images/icon-lock.png and /dev/null differ
diff --git a/resources/src/mediawiki.special/images/icon-pages.png b/resources/src/mediawiki.special/images/icon-pages.png
deleted file mode 100644
index 8e37278b50..0000000000
Binary files a/resources/src/mediawiki.special/images/icon-pages.png and /dev/null differ
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css b/resources/src/mediawiki.special/mediawiki.special.apisandbox.css
deleted file mode 100644
index fe5ac416bf..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.css
+++ /dev/null
@@ -1,110 +0,0 @@
-.mw-apisandbox-toolbar {
-	background: #fff;
-	-webkit-position: sticky;
-	position: sticky;
-	top: 0;
-	margin-bottom: -1px;
-	padding: 0.5em 0;
-	border-bottom: 1px solid #a2a9b1;
-	text-align: right;
-	z-index: 1;
-}
-
-#mw-apisandbox-ui .mw-apisandbox-link {
-	display: none;
-}
-
-.mw-apisandbox-popup .oo-ui-popupWidget-body > .oo-ui-widget {
-	vertical-align: middle;
-}
-
-/* So DateTimeInputWidget's calendar popup works... */
-.mw-apisandbox-popup .oo-ui-popupWidget-popup,
-.mw-apisandbox-popup .oo-ui-popupWidget-body {
-	overflow: visible;
-}
-
-/* Display contents of the popup on a single line */
-.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body {
-	display: table;
-}
-
-.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body > * {
-	display: table-cell;
-}
-
-.mw-apisandbox-popup > .oo-ui-popupWidget-popup > .oo-ui-popupWidget-body > .oo-ui-buttonWidget {
-	padding-left: 0.5em;
-	width: 1%;
-}
-
-.mw-apisandbox-spacer {
-	display: inline-block;
-	height: 1px;
-	width: 5em;
-}
-
-.mw-apisandbox-help-field {
-	border-bottom: 1px solid rgba( 0, 0, 0, 0.1 );
-}
-
-.mw-apisandbox-help-field:last-child {
-	border-bottom: 0;
-}
-
-.mw-apisandbox-optionalWidget {
-	width: 100%;
-}
-
-.mw-apisandbox-optionalWidget.oo-ui-widget-disabled {
-	position: relative;
-	z-index: 0; /* New stacking context to prevent the cover from leaking out */
-}
-
-.mw-apisandbox-optionalWidget-cover {
-	position: absolute;
-	left: 0;
-	right: 0;
-	top: 0;
-	bottom: 0;
-	z-index: 2;
-	cursor: pointer;
-}
-
-.mw-apisandbox-optionalWidget-fields {
-	display: table;
-	width: 100%;
-}
-
-.mw-apisandbox-optionalWidget-widget,
-.mw-apisandbox-optionalWidget-checkbox {
-	display: table-cell;
-	vertical-align: middle;
-}
-
-.mw-apisandbox-optionalWidget-checkbox {
-	width: 1%; /* Will be expanded by content */
-	white-space: nowrap;
-	padding-left: 0.5em;
-}
-
-.mw-apisandbox-textInputCode .oo-ui-inputWidget-input {
-	font-family: monospace, monospace;
-	font-size: 0.8125em;
-	-moz-tab-size: 4;
-	tab-size: 4;
-}
-
-.mw-apisandbox-widget-field .oo-ui-textInputWidget {
-	/* Leave at least enough space for icon, indicator, and a sliver of text */
-	min-width: 6em;
-}
-
-.apihelp-deprecated {
-	font-weight: bold;
-	color: #d33;
-}
-
-.apihelp-deprecated-value .oo-ui-labelElement-label {
-	text-decoration: line-through;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
deleted file mode 100644
index 523a62e75b..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ /dev/null
@@ -1,1864 +0,0 @@
-( function ( $, mw, OO ) {
-	'use strict';
-	var ApiSandbox, Util, WidgetMethods, Validators,
-		$content, panel, booklet, oldhash, windowManager,
-		formatDropdown,
-		api = new mw.Api(),
-		bookletPages = [],
-		availableFormats = {},
-		resultPage = null,
-		suppressErrors = true,
-		updatingBooklet = false,
-		pages = {},
-		moduleInfoCache = {},
-		baseRequestParams;
-
-	/**
-	 * A wrapper for a widget that provides an enable/disable button
-	 *
-	 * @class
-	 * @private
-	 * @constructor
-	 * @param {OO.ui.Widget} widget
-	 * @param {Object} [config] Configuration options
-	 */
-	function OptionalWidget( widget, config ) {
-		var k;
-
-		config = config || {};
-
-		this.widget = widget;
-		this.$cover = config.$cover ||
-			$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-cover' );
-		this.checkbox = new OO.ui.CheckboxInputWidget( config.checkbox )
-			.on( 'change', this.onCheckboxChange, [], this );
-
-		OptionalWidget[ 'super' ].call( this, config );
-
-		// Forward most methods for convenience
-		for ( k in this.widget ) {
-			if ( $.isFunction( this.widget[ k ] ) && !this[ k ] ) {
-				this[ k ] = this.widget[ k ].bind( this.widget );
-			}
-		}
-
-		this.$cover.on( 'click', this.onOverlayClick.bind( this ) );
-
-		this.$element
-			.addClass( 'mw-apisandbox-optionalWidget' )
-			.append(
-				this.$cover,
-				$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-fields' ).append(
-					$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-widget' ).append(
-						widget.$element
-					),
-					$( '<div>' ).addClass( 'mw-apisandbox-optionalWidget-checkbox' ).append(
-						this.checkbox.$element
-					)
-				)
-			);
-
-		this.setDisabled( widget.isDisabled() );
-	}
-	OO.inheritClass( OptionalWidget, OO.ui.Widget );
-	OptionalWidget.prototype.onCheckboxChange = function ( checked ) {
-		this.setDisabled( !checked );
-	};
-	OptionalWidget.prototype.onOverlayClick = function () {
-		this.setDisabled( false );
-		if ( $.isFunction( this.widget.focus ) ) {
-			this.widget.focus();
-		}
-	};
-	OptionalWidget.prototype.setDisabled = function ( disabled ) {
-		OptionalWidget[ 'super' ].prototype.setDisabled.call( this, disabled );
-		this.widget.setDisabled( this.isDisabled() );
-		this.checkbox.setSelected( !this.isDisabled() );
-		this.$cover.toggle( this.isDisabled() );
-		return this;
-	};
-
-	WidgetMethods = {
-		textInputWidget: {
-			getApiValue: function () {
-				return this.getValue();
-			},
-			setApiValue: function ( v ) {
-				if ( v === undefined ) {
-					v = this.paramInfo[ 'default' ];
-				}
-				this.setValue( v );
-			},
-			apiCheckValid: function () {
-				var that = this;
-				return this.getValidity().then( function () {
-					return $.Deferred().resolve( true ).promise();
-				}, function () {
-					return $.Deferred().resolve( false ).promise();
-				} ).done( function ( ok ) {
-					ok = ok || suppressErrors;
-					that.setIcon( ok ? null : 'alert' );
-					that.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
-				} );
-			}
-		},
-
-		dateTimeInputWidget: {
-			getValidity: function () {
-				if ( !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '' ) {
-					return $.Deferred().resolve().promise();
-				} else {
-					return $.Deferred().reject().promise();
-				}
-			}
-		},
-
-		tokenWidget: {
-			alertTokenError: function ( code, error ) {
-				windowManager.openWindow( 'errorAlert', {
-					title: Util.parseMsg( 'apisandbox-results-fixtoken-fail', this.paramInfo.tokentype ),
-					message: error,
-					actions: [
-						{
-							action: 'accept',
-							label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
-							flags: 'primary'
-						}
-					]
-				} );
-			},
-			fetchToken: function () {
-				this.pushPending();
-				return api.getToken( this.paramInfo.tokentype )
-					.done( this.setApiValue.bind( this ) )
-					.fail( this.alertTokenError.bind( this ) )
-					.always( this.popPending.bind( this ) );
-			},
-			setApiValue: function ( v ) {
-				WidgetMethods.textInputWidget.setApiValue.call( this, v );
-				if ( v === '123ABC' ) {
-					this.fetchToken();
-				}
-			}
-		},
-
-		passwordWidget: {
-			getApiValueForDisplay: function () {
-				return '';
-			}
-		},
-
-		toggleSwitchWidget: {
-			getApiValue: function () {
-				return this.getValue() ? 1 : undefined;
-			},
-			setApiValue: function ( v ) {
-				this.setValue( Util.apiBool( v ) );
-			},
-			apiCheckValid: function () {
-				return $.Deferred().resolve( true ).promise();
-			}
-		},
-
-		dropdownWidget: {
-			getApiValue: function () {
-				var item = this.getMenu().findSelectedItem();
-				return item === null ? undefined : item.getData();
-			},
-			setApiValue: function ( v ) {
-				var menu = this.getMenu();
-
-				if ( v === undefined ) {
-					v = this.paramInfo[ 'default' ];
-				}
-				if ( v === undefined ) {
-					menu.selectItem();
-				} else {
-					menu.selectItemByData( String( v ) );
-				}
-			},
-			apiCheckValid: function () {
-				var ok = this.getApiValue() !== undefined || suppressErrors;
-				this.setIcon( ok ? null : 'alert' );
-				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
-				return $.Deferred().resolve( ok ).promise();
-			}
-		},
-
-		tagWidget: {
-			getApiValue: function () {
-				var items = this.getValue();
-				if ( items.join( '' ).indexOf( '|' ) === -1 ) {
-					return items.join( '|' );
-				} else {
-					return '\x1f' + items.join( '\x1f' );
-				}
-			},
-			setApiValue: function ( v ) {
-				if ( v === undefined || v === '' || v === '\x1f' ) {
-					this.setValue( [] );
-				} else {
-					v = String( v );
-					if ( v.indexOf( '\x1f' ) !== 0 ) {
-						this.setValue( v.split( '|' ) );
-					} else {
-						this.setValue( v.substr( 1 ).split( '\x1f' ) );
-					}
-				}
-			},
-			apiCheckValid: function () {
-				var ok = true,
-					pi = this.paramInfo;
-
-				if ( !suppressErrors ) {
-					ok = this.getApiValue() !== undefined && !(
-						pi.allspecifier !== undefined &&
-						this.getValue().length > 1 &&
-						this.getValue().indexOf( pi.allspecifier ) !== -1
-					);
-				}
-
-				this.setIcon( ok ? null : 'alert' );
-				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
-				return $.Deferred().resolve( ok ).promise();
-			},
-			createTagItemWidget: function ( data, label ) {
-				var item = OO.ui.TagMultiselectWidget.prototype.createTagItemWidget.call( this, data, label );
-				if ( this.paramInfo.deprecatedvalues &&
-					this.paramInfo.deprecatedvalues.indexOf( data ) >= 0
-				) {
-					item.$element.addClass( 'apihelp-deprecated-value' );
-				}
-				return item;
-			}
-		},
-
-		optionalWidget: {
-			getApiValue: function () {
-				return this.isDisabled() ? undefined : this.widget.getApiValue();
-			},
-			setApiValue: function ( v ) {
-				this.setDisabled( v === undefined );
-				this.widget.setApiValue( v );
-			},
-			apiCheckValid: function () {
-				if ( this.isDisabled() ) {
-					return $.Deferred().resolve( true ).promise();
-				} else {
-					return this.widget.apiCheckValid();
-				}
-			}
-		},
-
-		submoduleWidget: {
-			single: function () {
-				var v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue();
-				return v === undefined ? [] : [ { value: v, path: this.paramInfo.submodules[ v ] } ];
-			},
-			multi: function () {
-				var map = this.paramInfo.submodules,
-					v = this.isDisabled() ? this.paramInfo[ 'default' ] : this.getApiValue();
-				return v === undefined || v === '' ? [] : String( v ).split( '|' ).map( function ( v ) {
-					return { value: v, path: map[ v ] };
-				} );
-			}
-		},
-
-		uploadWidget: {
-			getApiValueForDisplay: function () {
-				return '...';
-			},
-			getApiValue: function () {
-				return this.getValue();
-			},
-			setApiValue: function () {
-				// Can't, sorry.
-			},
-			apiCheckValid: function () {
-				var ok = this.getValue() !== null || suppressErrors;
-				this.setIcon( ok ? null : 'alert' );
-				this.setIconTitle( ok ? '' : mw.message( 'apisandbox-alert-field' ).plain() );
-				return $.Deferred().resolve( ok ).promise();
-			}
-		}
-	};
-
-	Validators = {
-		generic: function () {
-			return !Util.apiBool( this.paramInfo.required ) || this.getApiValue() !== '';
-		}
-	};
-
-	/**
-	 * @class mw.special.ApiSandbox.Util
-	 * @private
-	 */
-	Util = {
-		/**
-		 * Fetch API module info
-		 *
-		 * @param {string} module Module to fetch data for
-		 * @return {jQuery.Promise}
-		 */
-		fetchModuleInfo: function ( module ) {
-			var apiPromise,
-				deferred = $.Deferred();
-
-			if ( moduleInfoCache.hasOwnProperty( module ) ) {
-				return deferred
-					.resolve( moduleInfoCache[ module ] )
-					.promise( { abort: function () {} } );
-			} else {
-				apiPromise = api.post( {
-					action: 'paraminfo',
-					modules: module,
-					helpformat: 'html',
-					uselang: mw.config.get( 'wgUserLanguage' )
-				} ).done( function ( data ) {
-					var info;
-
-					if ( data.warnings && data.warnings.paraminfo ) {
-						deferred.reject( '???', data.warnings.paraminfo[ '*' ] );
-						return;
-					}
-
-					info = data.paraminfo.modules;
-					if ( !info || info.length !== 1 || info[ 0 ].path !== module ) {
-						deferred.reject( '???', 'No module data returned' );
-						return;
-					}
-
-					moduleInfoCache[ module ] = info[ 0 ];
-					deferred.resolve( info[ 0 ] );
-				} ).fail( function ( code, details ) {
-					if ( code === 'http' ) {
-						details = 'HTTP error: ' + details.exception;
-					} else if ( details.error ) {
-						details = details.error.info;
-					}
-					deferred.reject( code, details );
-				} );
-				return deferred
-					.promise( { abort: apiPromise.abort } );
-			}
-		},
-
-		/**
-		 * Mark all currently-in-use tokens as bad
-		 */
-		markTokensBad: function () {
-			var page, subpages, i,
-				checkPages = [ pages.main ];
-
-			while ( checkPages.length ) {
-				page = checkPages.shift();
-
-				if ( page.tokenWidget ) {
-					api.badToken( page.tokenWidget.paramInfo.tokentype );
-				}
-
-				subpages = page.getSubpages();
-				for ( i = 0; i < subpages.length; i++ ) {
-					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
-						checkPages.push( pages[ subpages[ i ].key ] );
-					}
-				}
-			}
-		},
-
-		/**
-		 * Test an API boolean
-		 *
-		 * @param {Mixed} value
-		 * @return {boolean}
-		 */
-		apiBool: function ( value ) {
-			return value !== undefined && value !== false;
-		},
-
-		/**
-		 * Create a widget for a parameter.
-		 *
-		 * @param {Object} pi Parameter info from API
-		 * @param {Object} opts Additional options
-		 * @return {OO.ui.Widget}
-		 */
-		createWidgetForParameter: function ( pi, opts ) {
-			var widget, innerWidget, finalWidget, items, $content, func,
-				multiModeButton = null,
-				multiModeInput = null,
-				multiModeAllowed = false;
-
-			opts = opts || {};
-
-			switch ( pi.type ) {
-				case 'boolean':
-					widget = new OO.ui.ToggleSwitchWidget();
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.toggleSwitchWidget );
-					pi.required = true; // Avoid wrapping in the non-required widget
-					break;
-
-				case 'string':
-				case 'user':
-					if ( Util.apiBool( pi.multi ) ) {
-						widget = new OO.ui.TagMultiselectWidget( {
-							allowArbitrary: true,
-							allowDuplicates: Util.apiBool( pi.allowsduplicates ),
-							$overlay: true
-						} );
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.tagWidget );
-					} else {
-						widget = new OO.ui.TextInputWidget( {
-							required: Util.apiBool( pi.required )
-						} );
-					}
-					if ( !Util.apiBool( pi.multi ) ) {
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.textInputWidget );
-						widget.setValidation( Validators.generic );
-					}
-					if ( pi.tokentype ) {
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.textInputWidget );
-						$.extend( widget, WidgetMethods.tokenWidget );
-					}
-					break;
-
-				case 'text':
-					widget = new OO.ui.MultilineTextInputWidget( {
-						required: Util.apiBool( pi.required )
-					} );
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.textInputWidget );
-					widget.setValidation( Validators.generic );
-					break;
-
-				case 'password':
-					widget = new OO.ui.TextInputWidget( {
-						type: 'password',
-						required: Util.apiBool( pi.required )
-					} );
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.textInputWidget );
-					$.extend( widget, WidgetMethods.passwordWidget );
-					widget.setValidation( Validators.generic );
-					multiModeAllowed = true;
-					multiModeInput = widget;
-					break;
-
-				case 'integer':
-					widget = new OO.ui.NumberInputWidget( {
-						required: Util.apiBool( pi.required ),
-						isInteger: true
-					} );
-					widget.setIcon = widget.input.setIcon.bind( widget.input );
-					widget.setIconTitle = widget.input.setIconTitle.bind( widget.input );
-					widget.getValidity = widget.input.getValidity.bind( widget.input );
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.textInputWidget );
-					if ( Util.apiBool( pi.enforcerange ) ) {
-						widget.setRange( pi.min || -Infinity, pi.max || Infinity );
-					}
-					multiModeAllowed = true;
-					multiModeInput = widget;
-					break;
-
-				case 'limit':
-					widget = new OO.ui.TextInputWidget( {
-						required: Util.apiBool( pi.required )
-					} );
-					widget.setValidation( function ( value ) {
-						var n, pi = this.paramInfo;
-
-						if ( value === 'max' ) {
-							return true;
-						} else {
-							n = +value;
-							return !isNaN( n ) && isFinite( n ) &&
-								Math.floor( n ) === n &&
-								n >= pi.min && n <= pi.apiSandboxMax;
-						}
-					} );
-					pi.min = pi.min || 0;
-					pi.apiSandboxMax = mw.config.get( 'apihighlimits' ) ? pi.highmax : pi.max;
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.textInputWidget );
-					multiModeAllowed = true;
-					multiModeInput = widget;
-					break;
-
-				case 'timestamp':
-					widget = new mw.widgets.datetime.DateTimeInputWidget( {
-						formatter: {
-							format: '${year|0}-${month|0}-${day|0}T${hour|0}:${minute|0}:${second|0}${zone|short}'
-						},
-						required: Util.apiBool( pi.required ),
-						clearable: false
-					} );
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.textInputWidget );
-					$.extend( widget, WidgetMethods.dateTimeInputWidget );
-					multiModeAllowed = true;
-					break;
-
-				case 'upload':
-					widget = new OO.ui.SelectFileWidget();
-					widget.paramInfo = pi;
-					$.extend( widget, WidgetMethods.uploadWidget );
-					break;
-
-				case 'namespace':
-					items = $.map( mw.config.get( 'wgFormattedNamespaces' ), function ( name, ns ) {
-						if ( ns === '0' ) {
-							name = mw.message( 'blanknamespace' ).text();
-						}
-						return new OO.ui.MenuOptionWidget( { data: ns, label: name } );
-					} ).sort( function ( a, b ) {
-						return a.data - b.data;
-					} );
-					if ( Util.apiBool( pi.multi ) ) {
-						if ( pi.allspecifier !== undefined ) {
-							items.unshift( new OO.ui.MenuOptionWidget( {
-								data: pi.allspecifier,
-								label: mw.message( 'apisandbox-multivalue-all-namespaces', pi.allspecifier ).text()
-							} ) );
-						}
-
-						widget = new OO.ui.MenuTagMultiselectWidget( {
-							menu: { items: items },
-							$overlay: true
-						} );
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.tagWidget );
-					} else {
-						widget = new OO.ui.DropdownWidget( {
-							menu: { items: items },
-							$overlay: true
-						} );
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.dropdownWidget );
-					}
-					break;
-
-				default:
-					if ( !Array.isArray( pi.type ) ) {
-						throw new Error( 'Unknown parameter type ' + pi.type );
-					}
-
-					items = pi.type.map( function ( v ) {
-						var config = {
-							data: String( v ),
-							label: String( v ),
-							classes: []
-						};
-						if ( pi.deprecatedvalues && pi.deprecatedvalues.indexOf( v ) >= 0 ) {
-							config.classes.push( 'apihelp-deprecated-value' );
-						}
-						return new OO.ui.MenuOptionWidget( config );
-					} );
-					if ( Util.apiBool( pi.multi ) ) {
-						if ( pi.allspecifier !== undefined ) {
-							items.unshift( new OO.ui.MenuOptionWidget( {
-								data: pi.allspecifier,
-								label: mw.message( 'apisandbox-multivalue-all-values', pi.allspecifier ).text()
-							} ) );
-						}
-
-						widget = new OO.ui.MenuTagMultiselectWidget( {
-							menu: { items: items },
-							$overlay: true
-						} );
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.tagWidget );
-						if ( Util.apiBool( pi.submodules ) ) {
-							widget.getSubmodules = WidgetMethods.submoduleWidget.multi;
-							widget.on( 'change', ApiSandbox.updateUI );
-						}
-					} else {
-						widget = new OO.ui.DropdownWidget( {
-							menu: { items: items },
-							$overlay: true
-						} );
-						widget.paramInfo = pi;
-						$.extend( widget, WidgetMethods.dropdownWidget );
-						if ( Util.apiBool( pi.submodules ) ) {
-							widget.getSubmodules = WidgetMethods.submoduleWidget.single;
-							widget.getMenu().on( 'select', ApiSandbox.updateUI );
-						}
-						if ( pi.deprecatedvalues ) {
-							widget.getMenu().on( 'select', function ( item ) {
-								this.$element.toggleClass(
-									'apihelp-deprecated-value',
-									pi.deprecatedvalues.indexOf( item.data ) >= 0
-								);
-							}, [], widget );
-						}
-					}
-
-					break;
-			}
-
-			if ( Util.apiBool( pi.multi ) && multiModeAllowed ) {
-				innerWidget = widget;
-
-				multiModeButton = new OO.ui.ButtonWidget( {
-					label: mw.message( 'apisandbox-add-multi' ).text()
-				} );
-				$content = innerWidget.$element.add( multiModeButton.$element );
-
-				widget = new OO.ui.PopupTagMultiselectWidget( {
-					allowArbitrary: true,
-					allowDuplicates: Util.apiBool( pi.allowsduplicates ),
-					$overlay: true,
-					popup: {
-						classes: [ 'mw-apisandbox-popup' ],
-						padded: true,
-						$content: $content
-					}
-				} );
-				widget.paramInfo = pi;
-				$.extend( widget, WidgetMethods.tagWidget );
-
-				func = function () {
-					if ( !innerWidget.isDisabled() ) {
-						innerWidget.apiCheckValid().done( function ( ok ) {
-							if ( ok ) {
-								widget.addTag( innerWidget.getApiValue() );
-								innerWidget.setApiValue( undefined );
-							}
-						} );
-						return false;
-					}
-				};
-
-				if ( multiModeInput ) {
-					multiModeInput.on( 'enter', func );
-				}
-				multiModeButton.on( 'click', func );
-			}
-
-			if ( Util.apiBool( pi.required ) || opts.nooptional ) {
-				finalWidget = widget;
-			} else {
-				finalWidget = new OptionalWidget( widget );
-				finalWidget.paramInfo = pi;
-				$.extend( finalWidget, WidgetMethods.optionalWidget );
-				if ( widget.getSubmodules ) {
-					finalWidget.getSubmodules = widget.getSubmodules.bind( widget );
-					finalWidget.on( 'disable', function () { setTimeout( ApiSandbox.updateUI ); } );
-				}
-				finalWidget.setDisabled( true );
-			}
-
-			widget.setApiValue( pi[ 'default' ] );
-
-			return finalWidget;
-		},
-
-		/**
-		 * Parse an HTML string and call Util.fixupHTML()
-		 *
-		 * @param {string} html HTML to parse
-		 * @return {jQuery}
-		 */
-		parseHTML: function ( html ) {
-			var $ret = $( $.parseHTML( html ) );
-			return Util.fixupHTML( $ret );
-		},
-
-		/**
-		 * Parse an i18n message and call Util.fixupHTML()
-		 *
-		 * @param {string} key Key of message to get
-		 * @param {...Mixed} parameters Values for $N replacements
-		 * @return {jQuery}
-		 */
-		parseMsg: function () {
-			var $ret = mw.message.apply( mw.message, arguments ).parseDom();
-			return Util.fixupHTML( $ret );
-		},
-
-		/**
-		 * Fix HTML for ApiSandbox display
-		 *
-		 * Fixes are:
-		 * - Add target="_blank" to any links
-		 *
-		 * @param {jQuery} $html DOM to process
-		 * @return {jQuery}
-		 */
-		fixupHTML: function ( $html ) {
-			$html.filter( 'a' ).add( $html.find( 'a' ) )
-				.filter( '[href]:not([target])' )
-				.attr( 'target', '_blank' );
-			return $html;
-		},
-
-		/**
-		 * Format a request and return a bunch of menu option widgets
-		 *
-		 * @param {Object} displayParams Query parameters, sanitized for display.
-		 * @param {Object} rawParams Query parameters. You should probably use displayParams instead.
-		 * @return {OO.ui.MenuOptionWidget[]} Each item's data should be an OO.ui.FieldLayout
-		 */
-		formatRequest: function ( displayParams, rawParams ) {
-			var jsonInput,
-				items = [
-					new OO.ui.MenuOptionWidget( {
-						label: Util.parseMsg( 'apisandbox-request-format-url-label' ),
-						data: new OO.ui.FieldLayout(
-							new OO.ui.TextInputWidget( {
-								readOnly: true,
-								value: mw.util.wikiScript( 'api' ) + '?' + $.param( displayParams )
-							} ), {
-								label: Util.parseMsg( 'apisandbox-request-url-label' )
-							}
-						)
-					} ),
-					new OO.ui.MenuOptionWidget( {
-						label: Util.parseMsg( 'apisandbox-request-format-json-label' ),
-						data: new OO.ui.FieldLayout(
-							jsonInput = new OO.ui.MultilineTextInputWidget( {
-								classes: [ 'mw-apisandbox-textInputCode' ],
-								readOnly: true,
-								autosize: true,
-								maxRows: 6,
-								value: JSON.stringify( displayParams, null, '\t' )
-							} ), {
-								label: Util.parseMsg( 'apisandbox-request-json-label' )
-							}
-						).on( 'toggle', function ( visible ) {
-							if ( visible ) {
-								// Call updatePosition instead of adjustSize
-								// because the latter has weird caching
-								// behavior and the former bypasses it.
-								jsonInput.updatePosition();
-							}
-						} )
-					} )
-				];
-
-			mw.hook( 'apisandbox.formatRequest' ).fire( items, displayParams, rawParams );
-
-			return items;
-		},
-
-		/**
-		 * Event handler for when formatDropdown's selection changes
-		 */
-		onFormatDropdownChange: function () {
-			var i,
-				menu = formatDropdown.getMenu(),
-				items = menu.getItems(),
-				selectedField = menu.findSelectedItem() ? menu.findSelectedItem().getData() : null;
-
-			for ( i = 0; i < items.length; i++ ) {
-				items[ i ].getData().toggle( items[ i ].getData() === selectedField );
-			}
-		}
-	};
-
-	/**
-	* Interface to ApiSandbox UI
-	*
-	* @class mw.special.ApiSandbox
-	*/
-	ApiSandbox = {
-		/**
-		 * Initialize the UI
-		 *
-		 * Automatically called on $.ready()
-		 */
-		init: function () {
-			var $toolbar;
-
-			$content = $( '#mw-apisandbox' );
-
-			windowManager = new OO.ui.WindowManager();
-			$( 'body' ).append( windowManager.$element );
-			windowManager.addWindows( {
-				errorAlert: new OO.ui.MessageDialog()
-			} );
-
-			$toolbar = $( '<div>' )
-				.addClass( 'mw-apisandbox-toolbar' )
-				.append(
-					new OO.ui.ButtonWidget( {
-						label: mw.message( 'apisandbox-submit' ).text(),
-						flags: [ 'primary', 'progressive' ]
-					} ).on( 'click', ApiSandbox.sendRequest ).$element,
-					new OO.ui.ButtonWidget( {
-						label: mw.message( 'apisandbox-reset' ).text(),
-						flags: 'destructive'
-					} ).on( 'click', ApiSandbox.resetUI ).$element
-				);
-
-			booklet = new OO.ui.BookletLayout( {
-				expanded: false,
-				outlined: true,
-				autoFocus: false
-			} );
-
-			panel = new OO.ui.PanelLayout( {
-				classes: [ 'mw-apisandbox-container' ],
-				content: [ booklet ],
-				expanded: false,
-				framed: true
-			} );
-
-			pages.main = new ApiSandbox.PageLayout( { key: 'main', path: 'main' } );
-
-			// Parse the current hash string
-			if ( !ApiSandbox.loadFromHash() ) {
-				ApiSandbox.updateUI();
-			}
-
-			$( window ).on( 'hashchange', ApiSandbox.loadFromHash );
-
-			$content
-				.empty()
-				.append( $( '<p>' ).append( Util.parseMsg( 'apisandbox-intro' ) ) )
-				.append(
-					$( '<div>' ).attr( 'id', 'mw-apisandbox-ui' )
-						.append( $toolbar )
-						.append( panel.$element )
-				);
-		},
-
-		/**
-		 * Update the current query when the page hash changes
-		 *
-		 * @return {boolean} Successful
-		 */
-		loadFromHash: function () {
-			var params, m, re,
-				hash = location.hash;
-
-			if ( oldhash === hash ) {
-				return false;
-			}
-			oldhash = hash;
-			if ( hash === '' ) {
-				return false;
-			}
-
-			// I'm surprised this doesn't seem to exist in jQuery or mw.util.
-			params = {};
-			hash = hash.replace( /\+/g, '%20' );
-			re = /([^&=#]+)=?([^&#]*)/g;
-			while ( ( m = re.exec( hash ) ) ) {
-				params[ decodeURIComponent( m[ 1 ] ) ] = decodeURIComponent( m[ 2 ] );
-			}
-
-			ApiSandbox.updateUI( params );
-			return true;
-		},
-
-		/**
-		 * Update the pages in the booklet
-		 *
-		 * @param {Object} [params] Optional query parameters to load
-		 */
-		updateUI: function ( params ) {
-			var i, page, subpages, j, removePages,
-				addPages = [];
-
-			if ( !$.isPlainObject( params ) ) {
-				params = undefined;
-			}
-
-			if ( updatingBooklet ) {
-				return;
-			}
-			updatingBooklet = true;
-			try {
-				if ( params !== undefined ) {
-					pages.main.loadQueryParams( params );
-				}
-				addPages.push( pages.main );
-				if ( resultPage !== null ) {
-					addPages.push( resultPage );
-				}
-				pages.main.apiCheckValid();
-
-				i = 0;
-				while ( addPages.length ) {
-					page = addPages.shift();
-					if ( bookletPages[ i ] !== page ) {
-						for ( j = i; j < bookletPages.length; j++ ) {
-							if ( bookletPages[ j ].getName() === page.getName() ) {
-								bookletPages.splice( j, 1 );
-							}
-						}
-						bookletPages.splice( i, 0, page );
-						booklet.addPages( [ page ], i );
-					}
-					i++;
-
-					if ( page.getSubpages ) {
-						subpages = page.getSubpages();
-						for ( j = 0; j < subpages.length; j++ ) {
-							if ( !pages.hasOwnProperty( subpages[ j ].key ) ) {
-								subpages[ j ].indentLevel = page.indentLevel + 1;
-								pages[ subpages[ j ].key ] = new ApiSandbox.PageLayout( subpages[ j ] );
-							}
-							if ( params !== undefined ) {
-								pages[ subpages[ j ].key ].loadQueryParams( params );
-							}
-							addPages.splice( j, 0, pages[ subpages[ j ].key ] );
-							pages[ subpages[ j ].key ].apiCheckValid();
-						}
-					}
-				}
-
-				if ( bookletPages.length > i ) {
-					removePages = bookletPages.splice( i, bookletPages.length - i );
-					booklet.removePages( removePages );
-				}
-
-				if ( !booklet.getCurrentPageName() ) {
-					booklet.selectFirstSelectablePage();
-				}
-			} finally {
-				updatingBooklet = false;
-			}
-		},
-
-		/**
-		 * Reset button handler
-		 */
-		resetUI: function () {
-			suppressErrors = true;
-			pages = {
-				main: new ApiSandbox.PageLayout( { key: 'main', path: 'main' } )
-			};
-			resultPage = null;
-			ApiSandbox.updateUI();
-		},
-
-		/**
-		 * Submit button handler
-		 *
-		 * @param {Object} [params] Use this set of params instead of those in the form fields.
-		 *   The form fields will be updated to match.
-		 */
-		sendRequest: function ( params ) {
-			var page, subpages, i, query, $result, $focus,
-				progress, $progressText, progressLoading,
-				deferreds = [],
-				paramsAreForced = !!params,
-				displayParams = {},
-				tokenWidgets = [],
-				checkPages = [ pages.main ];
-
-			// Blur any focused widget before submit, because
-			// OO.ui.ButtonWidget doesn't take focus itself (T128054)
-			$focus = $( '#mw-apisandbox-ui' ).find( document.activeElement );
-			if ( $focus.length ) {
-				$focus[ 0 ].blur();
-			}
-
-			suppressErrors = false;
-
-			// save widget state in params (or load from it if we are forced)
-			if ( paramsAreForced ) {
-				ApiSandbox.updateUI( params );
-			}
-			params = {};
-			while ( checkPages.length ) {
-				page = checkPages.shift();
-				if ( page.tokenWidget ) {
-					tokenWidgets.push( page.tokenWidget );
-				}
-				deferreds = deferreds.concat( page.apiCheckValid() );
-				page.getQueryParams( params, displayParams );
-				subpages = page.getSubpages();
-				for ( i = 0; i < subpages.length; i++ ) {
-					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
-						checkPages.push( pages[ subpages[ i ].key ] );
-					}
-				}
-			}
-
-			if ( !paramsAreForced ) {
-				// forced params means we are continuing a query; the base query should be preserved
-				baseRequestParams = $.extend( {}, params );
-			}
-
-			$.when.apply( $, deferreds ).done( function () {
-				var formatItems, menu, selectedLabel, deferred, actions, errorCount;
-
-				// Count how many times `value` occurs in `array`.
-				function countValues( value, array ) {
-					var count, i;
-					count = 0;
-					for ( i = 0; i < array.length; i++ ) {
-						if ( array[ i ] === value ) {
-							count++;
-						}
-					}
-					return count;
-				}
-
-				errorCount = countValues( false, arguments );
-				if ( errorCount > 0 ) {
-					actions = [
-						{
-							action: 'accept',
-							label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
-							flags: 'primary'
-						}
-					];
-					if ( tokenWidgets.length ) {
-						// Check all token widgets' validity separately
-						deferred = $.when.apply( $, tokenWidgets.map( function ( w ) {
-							return w.apiCheckValid();
-						} ) );
-
-						deferred.done( function () {
-							// If only the tokens are invalid, offer to fix them
-							var tokenErrorCount = countValues( false, arguments );
-							if ( tokenErrorCount === errorCount ) {
-								delete actions[ 0 ].flags;
-								actions.push( {
-									action: 'fix',
-									label: mw.message( 'apisandbox-results-fixtoken' ).text(),
-									flags: 'primary'
-								} );
-							}
-						} );
-					} else {
-						deferred = $.Deferred().resolve();
-					}
-					deferred.always( function () {
-						windowManager.openWindow( 'errorAlert', {
-							title: Util.parseMsg( 'apisandbox-submit-invalid-fields-title' ),
-							message: Util.parseMsg( 'apisandbox-submit-invalid-fields-message' ),
-							actions: actions
-						} ).closed.then( function ( data ) {
-							if ( data && data.action === 'fix' ) {
-								ApiSandbox.fixTokenAndResend();
-							}
-						} );
-					} );
-					return;
-				}
-
-				query = $.param( displayParams );
-
-				formatItems = Util.formatRequest( displayParams, params );
-
-				// Force a 'fm' format with wrappedhtml=1, if available
-				if ( params.format !== undefined ) {
-					if ( availableFormats.hasOwnProperty( params.format + 'fm' ) ) {
-						params.format = params.format + 'fm';
-					}
-					if ( params.format.substr( -2 ) === 'fm' ) {
-						params.wrappedhtml = 1;
-					}
-				}
-
-				progressLoading = false;
-				$progressText = $( '<span>' ).text( mw.message( 'apisandbox-sending-request' ).text() );
-				progress = new OO.ui.ProgressBarWidget( {
-					progress: false,
-					$content: $progressText
-				} );
-
-				$result = $( '<div>' )
-					.append( progress.$element );
-
-				resultPage = page = new OO.ui.PageLayout( '|results|', { expanded: false } );
-				page.setupOutlineItem = function () {
-					this.outlineItem.setLabel( mw.message( 'apisandbox-results' ).text() );
-				};
-
-				if ( !formatDropdown ) {
-					formatDropdown = new OO.ui.DropdownWidget( {
-						menu: { items: [] },
-						$overlay: true
-					} );
-					formatDropdown.getMenu().on( 'select', Util.onFormatDropdownChange );
-				}
-
-				menu = formatDropdown.getMenu();
-				selectedLabel = menu.findSelectedItem() ? menu.findSelectedItem().getLabel() : '';
-				if ( typeof selectedLabel !== 'string' ) {
-					selectedLabel = selectedLabel.text();
-				}
-				menu.clearItems().addItems( formatItems );
-				menu.chooseItem( menu.getItemFromLabel( selectedLabel ) || menu.findFirstSelectableItem() );
-
-				// Fire the event to update field visibilities
-				Util.onFormatDropdownChange();
-
-				page.$element.empty()
-					.append(
-						new OO.ui.FieldLayout(
-							formatDropdown, {
-								label: Util.parseMsg( 'apisandbox-request-selectformat-label' )
-							}
-						).$element,
-						formatItems.map( function ( item ) {
-							return item.getData().$element;
-						} ),
-						$result
-					);
-				ApiSandbox.updateUI();
-				booklet.setPage( '|results|' );
-
-				location.href = oldhash = '#' + query;
-
-				api.post( params, {
-					contentType: 'multipart/form-data',
-					dataType: 'text',
-					xhr: function () {
-						var xhr = new window.XMLHttpRequest();
-						xhr.upload.addEventListener( 'progress', function ( e ) {
-							if ( !progressLoading ) {
-								if ( e.lengthComputable ) {
-									progress.setProgress( e.loaded * 100 / e.total );
-								} else {
-									progress.setProgress( false );
-								}
-							}
-						} );
-						xhr.addEventListener( 'progress', function ( e ) {
-							if ( !progressLoading ) {
-								progressLoading = true;
-								$progressText.text( mw.message( 'apisandbox-loading-results' ).text() );
-							}
-							if ( e.lengthComputable ) {
-								progress.setProgress( e.loaded * 100 / e.total );
-							} else {
-								progress.setProgress( false );
-							}
-						} );
-						return xhr;
-					}
-				} )
-					.catch( function ( code, data, result, jqXHR ) {
-						var deferred = $.Deferred();
-
-						if ( code !== 'http' ) {
-							// Not really an error, work around mw.Api thinking it is.
-							deferred.resolve( result, jqXHR );
-						} else {
-							// Just forward it.
-							deferred.reject.apply( deferred, arguments );
-						}
-						return deferred.promise();
-					} )
-					.then( function ( data, jqXHR ) {
-						var m, loadTime, button, clear,
-							ct = jqXHR.getResponseHeader( 'Content-Type' ),
-							loginSuppressed = jqXHR.getResponseHeader( 'MediaWiki-Login-Suppressed' ) || 'false';
-
-						$result.empty();
-						if ( loginSuppressed !== 'false' ) {
-							$( '<div>' )
-								.addClass( 'warning' )
-								.append( Util.parseMsg( 'apisandbox-results-login-suppressed' ) )
-								.appendTo( $result );
-						}
-						if ( /^text\/mediawiki-api-prettyprint-wrapped(?:;|$)/.test( ct ) ) {
-							data = JSON.parse( data );
-							if ( data.modules.length ) {
-								mw.loader.load( data.modules );
-							}
-							if ( data.status && data.status !== 200 ) {
-								$( '<div>' )
-									.addClass( 'api-pretty-header api-pretty-status' )
-									.append( Util.parseMsg( 'api-format-prettyprint-status', data.status, data.statustext ) )
-									.appendTo( $result );
-							}
-							$result.append( Util.parseHTML( data.html ) );
-							loadTime = data.time;
-						} else if ( ( m = data.match( /<pre[ >][\s\S]*<\/pre>/ ) ) ) {
-							$result.append( Util.parseHTML( m[ 0 ] ) );
-							if ( ( m = data.match( /"wgBackendResponseTime":\s*(\d+)/ ) ) ) {
-								loadTime = parseInt( m[ 1 ], 10 );
-							}
-						} else {
-							$( '<pre>' )
-								.addClass( 'api-pretty-content' )
-								.text( data )
-								.appendTo( $result );
-						}
-						if ( paramsAreForced || data[ 'continue' ] ) {
-							$result.append(
-								$( '<div>' ).append(
-									new OO.ui.ButtonWidget( {
-										label: mw.message( 'apisandbox-continue' ).text()
-									} ).on( 'click', function () {
-										ApiSandbox.sendRequest( $.extend( {}, baseRequestParams, data[ 'continue' ] ) );
-									} ).setDisabled( !data[ 'continue' ] ).$element,
-									( clear = new OO.ui.ButtonWidget( {
-										label: mw.message( 'apisandbox-continue-clear' ).text()
-									} ).on( 'click', function () {
-										ApiSandbox.updateUI( baseRequestParams );
-										clear.setDisabled( true );
-										booklet.setPage( '|results|' );
-									} ).setDisabled( !paramsAreForced ) ).$element,
-									new OO.ui.PopupButtonWidget( {
-										$overlay: true,
-										framed: false,
-										icon: 'info',
-										popup: {
-											$content: $( '<div>' ).append( Util.parseMsg( 'apisandbox-continue-help' ) ),
-											padded: true,
-											width: 'auto'
-										}
-									} ).$element
-								)
-							);
-						}
-						if ( typeof loadTime === 'number' ) {
-							$result.append(
-								$( '<div>' ).append(
-									new OO.ui.LabelWidget( {
-										label: mw.message( 'apisandbox-request-time', loadTime ).text()
-									} ).$element
-								)
-							);
-						}
-
-						if ( jqXHR.getResponseHeader( 'MediaWiki-API-Error' ) === 'badtoken' ) {
-							// Flush all saved tokens in case one of them is the bad one.
-							Util.markTokensBad();
-							button = new OO.ui.ButtonWidget( {
-								label: mw.message( 'apisandbox-results-fixtoken' ).text()
-							} );
-							button.on( 'click', ApiSandbox.fixTokenAndResend )
-								.on( 'click', button.setDisabled, [ true ], button )
-								.$element.appendTo( $result );
-						}
-					}, function ( code, data ) {
-						var details = 'HTTP error: ' + data.exception;
-						$result.empty()
-							.append(
-								new OO.ui.LabelWidget( {
-									label: mw.message( 'apisandbox-results-error', details ).text(),
-									classes: [ 'error' ]
-								} ).$element
-							);
-					} );
-			} );
-		},
-
-		/**
-		 * Handler for the "Correct token and resubmit" button
-		 *
-		 * Used on a 'badtoken' error, it re-fetches token parameters for all
-		 * pages and then re-submits the query.
-		 */
-		fixTokenAndResend: function () {
-			var page, subpages, i, k,
-				ok = true,
-				tokenWait = { dummy: true },
-				checkPages = [ pages.main ],
-				success = function ( k ) {
-					delete tokenWait[ k ];
-					if ( ok && $.isEmptyObject( tokenWait ) ) {
-						ApiSandbox.sendRequest();
-					}
-				},
-				failure = function ( k ) {
-					delete tokenWait[ k ];
-					ok = false;
-				};
-
-			while ( checkPages.length ) {
-				page = checkPages.shift();
-
-				if ( page.tokenWidget ) {
-					k = page.apiModule + page.tokenWidget.paramInfo.name;
-					tokenWait[ k ] = page.tokenWidget.fetchToken();
-					tokenWait[ k ]
-						.done( success.bind( page.tokenWidget, k ) )
-						.fail( failure.bind( page.tokenWidget, k ) );
-				}
-
-				subpages = page.getSubpages();
-				for ( i = 0; i < subpages.length; i++ ) {
-					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
-						checkPages.push( pages[ subpages[ i ].key ] );
-					}
-				}
-			}
-
-			success( 'dummy', '' );
-		},
-
-		/**
-		 * Reset validity indicators for all widgets
-		 */
-		updateValidityIndicators: function () {
-			var page, subpages, i,
-				checkPages = [ pages.main ];
-
-			while ( checkPages.length ) {
-				page = checkPages.shift();
-				page.apiCheckValid();
-				subpages = page.getSubpages();
-				for ( i = 0; i < subpages.length; i++ ) {
-					if ( pages.hasOwnProperty( subpages[ i ].key ) ) {
-						checkPages.push( pages[ subpages[ i ].key ] );
-					}
-				}
-			}
-		}
-	};
-
-	/**
-	 * PageLayout for API modules
-	 *
-	 * @class
-	 * @private
-	 * @extends OO.ui.PageLayout
-	 * @constructor
-	 * @param {Object} [config] Configuration options
-	 */
-	ApiSandbox.PageLayout = function ( config ) {
-		config = $.extend( { prefix: '', expanded: false }, config );
-		this.displayText = config.key;
-		this.apiModule = config.path;
-		this.prefix = config.prefix;
-		this.paramInfo = null;
-		this.apiIsValid = true;
-		this.loadFromQueryParams = null;
-		this.widgets = {};
-		this.tokenWidget = null;
-		this.indentLevel = config.indentLevel ? config.indentLevel : 0;
-		ApiSandbox.PageLayout[ 'super' ].call( this, config.key, config );
-		this.loadParamInfo();
-	};
-	OO.inheritClass( ApiSandbox.PageLayout, OO.ui.PageLayout );
-	ApiSandbox.PageLayout.prototype.setupOutlineItem = function () {
-		this.outlineItem.setLevel( this.indentLevel );
-		this.outlineItem.setLabel( this.displayText );
-		this.outlineItem.setIcon( this.apiIsValid || suppressErrors ? null : 'alert' );
-		this.outlineItem.setIconTitle(
-			this.apiIsValid || suppressErrors ? '' : mw.message( 'apisandbox-alert-page' ).plain()
-		);
-	};
-
-	/**
-	 * Fetch module information for this page's module, then create UI
-	 */
-	ApiSandbox.PageLayout.prototype.loadParamInfo = function () {
-		var dynamicFieldset, dynamicParamNameWidget,
-			that = this,
-			removeDynamicParamWidget = function ( name, layout ) {
-				dynamicFieldset.removeItems( [ layout ] );
-				delete that.widgets[ name ];
-			},
-			addDynamicParamWidget = function () {
-				var name, layout, widget, button;
-
-				// Check name is filled in
-				name = dynamicParamNameWidget.getValue().trim();
-				if ( name === '' ) {
-					dynamicParamNameWidget.focus();
-					return;
-				}
-
-				if ( that.widgets[ name ] !== undefined ) {
-					windowManager.openWindow( 'errorAlert', {
-						title: Util.parseMsg( 'apisandbox-dynamic-error-exists', name ),
-						actions: [
-							{
-								action: 'accept',
-								label: OO.ui.msg( 'ooui-dialog-process-dismiss' ),
-								flags: 'primary'
-							}
-						]
-					} );
-					return;
-				}
-
-				widget = Util.createWidgetForParameter( {
-					name: name,
-					type: 'string',
-					'default': ''
-				}, {
-					nooptional: true
-				} );
-				button = new OO.ui.ButtonWidget( {
-					icon: 'trash',
-					flags: 'destructive'
-				} );
-				layout = new OO.ui.ActionFieldLayout(
-					widget,
-					button,
-					{
-						label: name,
-						align: 'left'
-					}
-				);
-				button.on( 'click', removeDynamicParamWidget, [ name, layout ] );
-				that.widgets[ name ] = widget;
-				dynamicFieldset.addItems( [ layout ], dynamicFieldset.getItems().length - 1 );
-				widget.focus();
-
-				dynamicParamNameWidget.setValue( '' );
-			};
-
-		this.$element.empty()
-			.append( new OO.ui.ProgressBarWidget( {
-				progress: false,
-				text: mw.message( 'apisandbox-loading', this.displayText ).text()
-			} ).$element );
-
-		Util.fetchModuleInfo( this.apiModule )
-			.done( function ( pi ) {
-				var prefix, i, j, descriptionContainer, widget, layoutConfig, button, widgetField, helpField, tmp, flag, count,
-					items = [],
-					deprecatedItems = [],
-					buttons = [],
-					filterFmModules = function ( v ) {
-						return v.substr( -2 ) !== 'fm' ||
-							!availableFormats.hasOwnProperty( v.substr( 0, v.length - 2 ) );
-					},
-					widgetLabelOnClick = function () {
-						var f = this.getField();
-						if ( $.isFunction( f.setDisabled ) ) {
-							f.setDisabled( false );
-						}
-						if ( $.isFunction( f.focus ) ) {
-							f.focus();
-						}
-					};
-
-				// This is something of a hack. We always want the 'format' and
-				// 'action' parameters from the main module to be specified,
-				// and for 'format' we also want to simplify the dropdown since
-				// we always send the 'fm' variant.
-				if ( that.apiModule === 'main' ) {
-					for ( i = 0; i < pi.parameters.length; i++ ) {
-						if ( pi.parameters[ i ].name === 'action' ) {
-							pi.parameters[ i ].required = true;
-							delete pi.parameters[ i ][ 'default' ];
-						}
-						if ( pi.parameters[ i ].name === 'format' ) {
-							tmp = pi.parameters[ i ].type;
-							for ( j = 0; j < tmp.length; j++ ) {
-								availableFormats[ tmp[ j ] ] = true;
-							}
-							pi.parameters[ i ].type = tmp.filter( filterFmModules );
-							pi.parameters[ i ][ 'default' ] = 'json';
-							pi.parameters[ i ].required = true;
-						}
-					}
-				}
-
-				// Hide the 'wrappedhtml' parameter on format modules
-				if ( pi.group === 'format' ) {
-					pi.parameters = pi.parameters.filter( function ( p ) {
-						return p.name !== 'wrappedhtml';
-					} );
-				}
-
-				that.paramInfo = pi;
-
-				items.push( new OO.ui.FieldLayout(
-					new OO.ui.Widget( {} ).toggle( false ), {
-						align: 'top',
-						label: Util.parseHTML( pi.description )
-					}
-				) );
-
-				if ( pi.helpurls.length ) {
-					buttons.push( new OO.ui.PopupButtonWidget( {
-						$overlay: true,
-						label: mw.message( 'apisandbox-helpurls' ).text(),
-						icon: 'help',
-						popup: {
-							width: 'auto',
-							padded: true,
-							$content: $( '<ul>' ).append( pi.helpurls.map( function ( link ) {
-								return $( '<li>' ).append( $( '<a>' )
-									.attr( { href: link, target: '_blank' } )
-									.text( link )
-								);
-							} ) )
-						}
-					} ) );
-				}
-
-				if ( pi.examples.length ) {
-					buttons.push( new OO.ui.PopupButtonWidget( {
-						$overlay: true,
-						label: mw.message( 'apisandbox-examples' ).text(),
-						icon: 'code',
-						popup: {
-							width: 'auto',
-							padded: true,
-							$content: $( '<ul>' ).append( pi.examples.map( function ( example ) {
-								var a = $( '<a>' )
-									.attr( 'href', '#' + example.query )
-									.html( example.description );
-								a.find( 'a' ).contents().unwrap(); // Can't nest links
-								return $( '<li>' ).append( a );
-							} ) )
-						}
-					} ) );
-				}
-
-				if ( buttons.length ) {
-					items.push( new OO.ui.FieldLayout(
-						new OO.ui.ButtonGroupWidget( {
-							items: buttons
-						} ), { align: 'top' }
-					) );
-				}
-
-				if ( pi.parameters.length ) {
-					prefix = that.prefix + pi.prefix;
-					for ( i = 0; i < pi.parameters.length; i++ ) {
-						widget = Util.createWidgetForParameter( pi.parameters[ i ] );
-						that.widgets[ prefix + pi.parameters[ i ].name ] = widget;
-						if ( pi.parameters[ i ].tokentype ) {
-							that.tokenWidget = widget;
-						}
-
-						descriptionContainer = $( '<div>' );
-
-						tmp = Util.parseHTML( pi.parameters[ i ].description );
-						tmp.filter( 'dl' ).makeCollapsible( {
-							collapsed: true
-						} ).children( '.mw-collapsible-toggle' ).each( function () {
-							var $this = $( this );
-							$this.parent().prev( 'p' ).append( $this );
-						} );
-						descriptionContainer.append( $( '<div>' ).addClass( 'description' ).append( tmp ) );
-
-						if ( pi.parameters[ i ].info && pi.parameters[ i ].info.length ) {
-							for ( j = 0; j < pi.parameters[ i ].info.length; j++ ) {
-								descriptionContainer.append( $( '<div>' )
-									.addClass( 'info' )
-									.append( Util.parseHTML( pi.parameters[ i ].info[ j ] ) )
-								);
-							}
-						}
-						flag = true;
-						count = 1e100;
-						switch ( pi.parameters[ i ].type ) {
-							case 'namespace':
-								flag = false;
-								count = mw.config.get( 'wgFormattedNamespaces' ).length;
-								break;
-
-							case 'limit':
-								if ( pi.parameters[ i ].highmax !== undefined ) {
-									descriptionContainer.append( $( '<div>' )
-										.addClass( 'info' )
-										.append(
-											Util.parseMsg(
-												'api-help-param-limit2', pi.parameters[ i ].max, pi.parameters[ i ].highmax
-											),
-											' ',
-											Util.parseMsg( 'apisandbox-param-limit' )
-										)
-									);
-								} else {
-									descriptionContainer.append( $( '<div>' )
-										.addClass( 'info' )
-										.append(
-											Util.parseMsg( 'api-help-param-limit', pi.parameters[ i ].max ),
-											' ',
-											Util.parseMsg( 'apisandbox-param-limit' )
-										)
-									);
-								}
-								break;
-
-							case 'integer':
-								tmp = '';
-								if ( pi.parameters[ i ].min !== undefined ) {
-									tmp += 'min';
-								}
-								if ( pi.parameters[ i ].max !== undefined ) {
-									tmp += 'max';
-								}
-								if ( tmp !== '' ) {
-									descriptionContainer.append( $( '<div>' )
-										.addClass( 'info' )
-										.append( Util.parseMsg(
-											'api-help-param-integer-' + tmp,
-											Util.apiBool( pi.parameters[ i ].multi ) ? 2 : 1,
-											pi.parameters[ i ].min, pi.parameters[ i ].max
-										) )
-									);
-								}
-								break;
-
-							default:
-								if ( Array.isArray( pi.parameters[ i ].type ) ) {
-									flag = false;
-									count = pi.parameters[ i ].type.length;
-								}
-								break;
-						}
-						if ( Util.apiBool( pi.parameters[ i ].multi ) ) {
-							tmp = [];
-							if ( flag && !( widget instanceof OO.ui.TagMultiselectWidget ) &&
-								!(
-									widget instanceof OptionalWidget &&
-									widget.widget instanceof OO.ui.TagMultiselectWidget
-								)
-							) {
-								tmp.push( mw.message( 'api-help-param-multi-separate' ).parse() );
-							}
-							if ( count > pi.parameters[ i ].lowlimit ) {
-								tmp.push(
-									mw.message( 'api-help-param-multi-max',
-										pi.parameters[ i ].lowlimit, pi.parameters[ i ].highlimit
-									).parse()
-								);
-							}
-							if ( tmp.length ) {
-								descriptionContainer.append( $( '<div>' )
-									.addClass( 'info' )
-									.append( Util.parseHTML( tmp.join( ' ' ) ) )
-								);
-							}
-						}
-						if ( 'maxbytes' in pi.parameters[ i ] ) {
-							descriptionContainer.append( $( '<div>' )
-								.addClass( 'info' )
-								.append( Util.parseMsg( 'api-help-param-maxbytes', pi.parameters[ i ].maxbytes ) )
-							);
-						}
-						if ( 'maxchars' in pi.parameters[ i ] ) {
-							descriptionContainer.append( $( '<div>' )
-								.addClass( 'info' )
-								.append( Util.parseMsg( 'api-help-param-maxchars', pi.parameters[ i ].maxchars ) )
-							);
-						}
-						helpField = new OO.ui.FieldLayout(
-							new OO.ui.Widget( {
-								$content: '\xa0',
-								classes: [ 'mw-apisandbox-spacer' ]
-							} ), {
-								align: 'inline',
-								classes: [ 'mw-apisandbox-help-field' ],
-								label: descriptionContainer
-							}
-						);
-
-						layoutConfig = {
-							align: 'left',
-							classes: [ 'mw-apisandbox-widget-field' ],
-							label: prefix + pi.parameters[ i ].name
-						};
-
-						if ( pi.parameters[ i ].tokentype ) {
-							button = new OO.ui.ButtonWidget( {
-								label: mw.message( 'apisandbox-fetch-token' ).text()
-							} );
-							button.on( 'click', widget.fetchToken, [], widget );
-
-							widgetField = new OO.ui.ActionFieldLayout( widget, button, layoutConfig );
-						} else {
-							widgetField = new OO.ui.FieldLayout( widget, layoutConfig );
-						}
-
-						// We need our own click handler on the widget label to
-						// turn off the disablement.
-						widgetField.$label.on( 'click', widgetLabelOnClick.bind( widgetField ) );
-
-						// Don't grey out the label when the field is disabled,
-						// it makes it too hard to read and our "disabled"
-						// isn't really disabled.
-						widgetField.onFieldDisable( false );
-						widgetField.onFieldDisable = $.noop;
-
-						if ( Util.apiBool( pi.parameters[ i ].deprecated ) ) {
-							deprecatedItems.push( widgetField, helpField );
-						} else {
-							items.push( widgetField, helpField );
-						}
-					}
-				}
-
-				if ( !pi.parameters.length && !Util.apiBool( pi.dynamicparameters ) ) {
-					items.push( new OO.ui.FieldLayout(
-						new OO.ui.Widget( {} ).toggle( false ), {
-							align: 'top',
-							label: Util.parseMsg( 'apisandbox-no-parameters' )
-						}
-					) );
-				}
-
-				that.$element.empty();
-
-				new OO.ui.FieldsetLayout( {
-					label: that.displayText
-				} ).addItems( items )
-					.$element.appendTo( that.$element );
-
-				if ( Util.apiBool( pi.dynamicparameters ) ) {
-					dynamicFieldset = new OO.ui.FieldsetLayout();
-					dynamicParamNameWidget = new OO.ui.TextInputWidget( {
-						placeholder: mw.message( 'apisandbox-dynamic-parameters-add-placeholder' ).text()
-					} ).on( 'enter', addDynamicParamWidget );
-					dynamicFieldset.addItems( [
-						new OO.ui.FieldLayout(
-							new OO.ui.Widget( {} ).toggle( false ), {
-								align: 'top',
-								label: Util.parseHTML( pi.dynamicparameters )
-							}
-						),
-						new OO.ui.ActionFieldLayout(
-							dynamicParamNameWidget,
-							new OO.ui.ButtonWidget( {
-								icon: 'add',
-								flags: 'progressive'
-							} ).on( 'click', addDynamicParamWidget ),
-							{
-								label: mw.message( 'apisandbox-dynamic-parameters-add-label' ).text(),
-								align: 'left'
-							}
-						)
-					] );
-					$( '<fieldset>' )
-						.append(
-							$( '<legend>' ).text( mw.message( 'apisandbox-dynamic-parameters' ).text() ),
-							dynamicFieldset.$element
-						)
-						.appendTo( that.$element );
-				}
-
-				if ( deprecatedItems.length ) {
-					tmp = new OO.ui.FieldsetLayout().addItems( deprecatedItems ).toggle( false );
-					$( '<fieldset>' )
-						.append(
-							$( '<legend>' ).append(
-								new OO.ui.ToggleButtonWidget( {
-									label: mw.message( 'apisandbox-deprecated-parameters' ).text()
-								} ).on( 'change', tmp.toggle, [], tmp ).$element
-							),
-							tmp.$element
-						)
-						.appendTo( that.$element );
-				}
-
-				// Load stored params, if any, then update the booklet if we
-				// have subpages (or else just update our valid-indicator).
-				tmp = that.loadFromQueryParams;
-				that.loadFromQueryParams = null;
-				if ( $.isPlainObject( tmp ) ) {
-					that.loadQueryParams( tmp );
-				}
-				if ( that.getSubpages().length > 0 ) {
-					ApiSandbox.updateUI( tmp );
-				} else {
-					that.apiCheckValid();
-				}
-			} ).fail( function ( code, detail ) {
-				that.$element.empty()
-					.append(
-						new OO.ui.LabelWidget( {
-							label: mw.message( 'apisandbox-load-error', that.apiModule, detail ).text(),
-							classes: [ 'error' ]
-						} ).$element,
-						new OO.ui.ButtonWidget( {
-							label: mw.message( 'apisandbox-retry' ).text()
-						} ).on( 'click', that.loadParamInfo, [], that ).$element
-					);
-			} );
-	};
-
-	/**
-	 * Check that all widgets on the page are in a valid state.
-	 *
-	 * @return {jQuery.Promise[]} One promise for each widget, resolved with `false` if invalid
-	 */
-	ApiSandbox.PageLayout.prototype.apiCheckValid = function () {
-		var promises, that = this;
-
-		if ( this.paramInfo === null ) {
-			return [];
-		} else {
-			promises = $.map( this.widgets, function ( widget ) {
-				return widget.apiCheckValid();
-			} );
-			$.when.apply( $, promises ).then( function () {
-				that.apiIsValid = $.inArray( false, arguments ) === -1;
-				if ( that.getOutlineItem() ) {
-					that.getOutlineItem().setIcon( that.apiIsValid || suppressErrors ? null : 'alert' );
-					that.getOutlineItem().setIconTitle(
-						that.apiIsValid || suppressErrors ? '' : mw.message( 'apisandbox-alert-page' ).plain()
-					);
-				}
-			} );
-			return promises;
-		}
-	};
-
-	/**
-	 * Load form fields from query parameters
-	 *
-	 * @param {Object} params
-	 */
-	ApiSandbox.PageLayout.prototype.loadQueryParams = function ( params ) {
-		if ( this.paramInfo === null ) {
-			this.loadFromQueryParams = params;
-		} else {
-			$.each( this.widgets, function ( name, widget ) {
-				var v = params.hasOwnProperty( name ) ? params[ name ] : undefined;
-				widget.setApiValue( v );
-			} );
-		}
-	};
-
-	/**
-	 * Load query params from form fields
-	 *
-	 * @param {Object} params Write query parameters into this object
-	 * @param {Object} displayParams Write query parameters for display into this object
-	 */
-	ApiSandbox.PageLayout.prototype.getQueryParams = function ( params, displayParams ) {
-		$.each( this.widgets, function ( name, widget ) {
-			var value = widget.getApiValue();
-			if ( value !== undefined ) {
-				params[ name ] = value;
-				if ( $.isFunction( widget.getApiValueForDisplay ) ) {
-					value = widget.getApiValueForDisplay();
-				}
-				displayParams[ name ] = value;
-			}
-		} );
-	};
-
-	/**
-	 * Fetch a list of subpage names loaded by this page
-	 *
-	 * @return {Array}
-	 */
-	ApiSandbox.PageLayout.prototype.getSubpages = function () {
-		var ret = [];
-		$.each( this.widgets, function ( name, widget ) {
-			var submodules, i;
-			if ( $.isFunction( widget.getSubmodules ) ) {
-				submodules = widget.getSubmodules();
-				for ( i = 0; i < submodules.length; i++ ) {
-					ret.push( {
-						key: name + '=' + submodules[ i ].value,
-						path: submodules[ i ].path,
-						prefix: widget.paramInfo.submoduleparamprefix || ''
-					} );
-				}
-			}
-		} );
-		return ret;
-	};
-
-	$( ApiSandbox.init );
-
-	module.exports = ApiSandbox;
-
-}( jQuery, mediaWiki, OO ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css b/resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css
deleted file mode 100644
index 4dc4c27ab0..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.top.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.client-js .mw-apisandbox-nojs {
-	display: none;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.block.js b/resources/src/mediawiki.special/mediawiki.special.block.js
deleted file mode 100644
index 180f040135..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.block.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*!
- * JavaScript for Special:Block
- */
-( function ( mw, $ ) {
-	// Like OO.ui.infuse(), but if the element doesn't exist, return null instead of throwing an exception.
-	function infuseOrNull( elem ) {
-		try {
-			return OO.ui.infuse( elem );
-		} catch ( er ) {
-			return null;
-		}
-	}
-
-	$( function () {
-		// This code is also loaded on the "block succeeded" page where there is no form,
-		// so username and expiry fields might also be missing.
-		var blockTargetWidget = infuseOrNull( 'mw-bi-target' ),
-			anonOnlyField = infuseOrNull( $( '#mw-input-wpHardBlock' ).closest( '.oo-ui-fieldLayout' ) ),
-			enableAutoblockField = infuseOrNull( $( '#mw-input-wpAutoBlock' ).closest( '.oo-ui-fieldLayout' ) ),
-			hideUserField = infuseOrNull( $( '#mw-input-wpHideUser' ).closest( '.oo-ui-fieldLayout' ) ),
-			watchUserField = infuseOrNull( $( '#mw-input-wpWatch' ).closest( '.oo-ui-fieldLayout' ) ),
-			expiryWidget = infuseOrNull( 'mw-input-wpExpiry' );
-
-		function updateBlockOptions() {
-			var blocktarget = blockTargetWidget.getValue().trim(),
-				isEmpty = blocktarget === '',
-				isIp = mw.util.isIPAddress( blocktarget, true ),
-				isIpRange = isIp && blocktarget.match( /\/\d+$/ ),
-				isNonEmptyIp = isIp && !isEmpty,
-				expiryValue = expiryWidget.getValue(),
-				// infinityValues  are the values the SpecialBlock class accepts as infinity (sf. wfIsInfinity)
-				infinityValues = [ 'infinite', 'indefinite', 'infinity', 'never' ],
-				isIndefinite = infinityValues.indexOf( expiryValue ) !== -1;
-
-			if ( enableAutoblockField ) {
-				enableAutoblockField.toggle( !( isNonEmptyIp ) );
-			}
-			if ( hideUserField ) {
-				hideUserField.toggle( !( isNonEmptyIp || !isIndefinite ) );
-			}
-			if ( anonOnlyField ) {
-				anonOnlyField.toggle( !( !isIp && !isEmpty ) );
-			}
-			if ( watchUserField ) {
-				watchUserField.toggle( !( isIpRange && !isEmpty ) );
-			}
-		}
-
-		if ( blockTargetWidget ) {
-			// Bind functions so they're checked whenever stuff changes
-			blockTargetWidget.on( 'change', updateBlockOptions );
-			expiryWidget.on( 'change', updateBlockOptions );
-
-			// Call them now to set initial state (ie. Special:Block/Foobar?wpBlockExpiry=2+hours)
-			updateBlockOptions();
-		}
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.changecredentials.js b/resources/src/mediawiki.special/mediawiki.special.changecredentials.js
deleted file mode 100644
index ad8a4f4f06..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changecredentials.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*!
- * JavaScript for change credentials form.
- */
-( function ( mw, $, OO ) {
-	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
-		var api = new mw.Api();
-
-		$root.find( '.mw-changecredentials-validate-password.oo-ui-fieldLayout' ).each( function () {
-			var currentApiPromise,
-				self = OO.ui.FieldLayout.static.infuse( $( this ) );
-
-			self.getField().setValidation( function ( password ) {
-				var d;
-
-				if ( currentApiPromise ) {
-					currentApiPromise.abort();
-					currentApiPromise = undefined;
-				}
-
-				password = password.trim();
-
-				if ( password === '' ) {
-					self.setErrors( [] );
-					return true;
-				}
-
-				d = $.Deferred();
-				currentApiPromise = api.post( {
-					action: 'validatepassword',
-					password: password,
-					formatversion: 2,
-					errorformat: 'html',
-					errorsuselocal: true,
-					uselang: mw.config.get( 'wgUserLanguage' )
-				} ).done( function ( resp ) {
-					var pwinfo = resp.validatepassword,
-						good = pwinfo.validity === 'Good',
-						errors = [];
-
-					currentApiPromise = undefined;
-
-					if ( !good ) {
-						pwinfo.validitymessages.map( function ( m ) {
-							errors.push( new OO.ui.HtmlSnippet( m.html ) );
-						} );
-					}
-					self.setErrors( errors );
-					d.resolve( good );
-				} ).fail( d.reject );
-
-				return d.promise( { abort: currentApiPromise.abort } );
-			} );
-		} );
-	} );
-}( mediaWiki, jQuery, OO ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.css
deleted file mode 100644
index 65860ea08c..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/*!
- * Styling for Special:Watchlist and Special:RecentChanges
- */
-
-.mw-changeslist-line-watched .mw-title {
-	font-weight: bold;
-}
-
-/*
- * Titles, including username links, and also tag names
- * are prone to getting jumbled up
- * with other titles, usernames, etc. in mixed RTL-LTR environment.
- */
-.mw-changeslist .mw-tag-marker,
-.mw-changeslist .mw-title {
-	unicode-bidi: embed;
-}
-
-/* Colored watchlist and recent changes numbers */
-.mw-plusminus-pos {
-	color: #006400; /* dark green */
-}
-
-.mw-plusminus-neg {
-	color: #8b0000; /* dark red */
-}
-
-.mw-plusminus-null {
-	color: #a2a9b1; /* gray */
-}
-
-/*
- * Bidi-isolate these numbers.
- * See https://phabricator.wikimedia.org/T93484
- */
-.mw-plusminus-pos,
-.mw-plusminus-neg,
-.mw-plusminus-null {
-	unicode-bidi: -moz-isolate;
-	unicode-bidi: isolate;
-}
-
-/* Prevent FOUC if legend is initially collapsed */
-.mw-changeslist-legend.mw-collapsed .mw-collapsible-content {
-	display: none;
-}
-
-.mw-changeslist-legend.mw-collapsed {
-	margin-bottom: 0;
-}
-
-/* Prevent pushing down the content if legend is collapsed */
-.mw-changeslist-legend.mw-collapsed ~ ul:first-of-type > li:first-child,
-.mw-changeslist-legend.mw-collapsed + h4 + div > table.mw-changeslist-line:first-child {
-	clear: right;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css
deleted file mode 100644
index cb11332e21..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css
+++ /dev/null
@@ -1,69 +0,0 @@
-/*!
- * Styling for Special:Watchlist and Special:RecentChanges when preference 'usenewrc'
- * a.k.a. Enhanced Recent Changes is enabled.
- */
-
-table.mw-enhanced-rc {
-	border: 0;
-	border-spacing: 0;
-}
-
-table.mw-enhanced-rc th,
-table.mw-enhanced-rc td {
-	padding: 0;
-	vertical-align: top;
-}
-
-td.mw-enhanced-rc {
-	white-space: nowrap;
-	font-family: monospace, monospace;
-}
-
-.mw-enhanced-rc-time {
-	font-family: monospace, monospace;
-}
-
-table.mw-enhanced-rc td.mw-enhanced-rc-nested {
-	padding-left: 1em;
-}
-
-/* Show/hide arrows in enhanced changeslist */
-.mw-enhanced-rc .collapsible-expander {
-	float: none;
-}
-
-/* If JS is disabled, the arrows or the placeholder space shouldn't be shown */
-.client-nojs .mw-enhancedchanges-arrow-space {
-	display: none;
-}
-
-/*
- * And if it's enabled, let's optimize the collapsing a little: hide the rows
- * that would be hidden by jquery.makeCollapsible with CSS to save us some
- * reflows and repaints. This doesn't work on browsers that don't fully support
- * CSS2 (IE6), but it's okay, this will be done in JavaScript with old degraded
- * performance instead.
- */
-.client-js table.mw-enhanced-rc.mw-collapsed tr + tr {
-	display: none;
-}
-
-.mw-enhancedchanges-arrow {
-	padding-top: 2px;
-}
-
-.mw-enhancedchanges-arrow-space {
-	display: inline-block;
-	*display: inline; /* IE7 and below */
-	zoom: 1;
-	width: 15px;
-	height: 15px;
-}
-
-.mw-enhanced-watched .mw-enhanced-rc-time {
-	font-weight: bold;
-}
-
-span.changedby {
-	font-size: 95%;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css
deleted file mode 100644
index 14f6aeeeff..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.css
+++ /dev/null
@@ -1,33 +0,0 @@
-/*!
- * Styling for changes list legend
- */
-
-.mw-changeslist-legend {
-	float: right;
-	margin-left: 1em;
-	margin-bottom: 0.5em;
-	clear: right;
-	font-size: 85%;
-	line-height: 1.2em;
-	padding: 0.5em;
-	border: 1px solid #ddd;
-}
-
-.mw-changeslist-legend dl {
-	/* Parent element defines sufficient padding */
-	margin-bottom: 0;
-}
-
-.mw-changeslist-legend dt {
-	float: left;
-	margin: 0 0.5em 0 0;
-}
-
-.mw-changeslist-legend dd {
-	margin-left: 1.5em;
-}
-
-.mw-changeslist-legend dt,
-.mw-changeslist-legend dd {
-	line-height: 1.3em;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js b/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js
deleted file mode 100644
index 079276265e..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.legend.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*!
- * Script for changes list legend
- */
-
-/* Remember the collapse state of the legend on recent changes and watchlist pages. */
-( function ( mw ) {
-	var
-		cookieName = 'changeslist-state',
-		// Expanded by default
-		doCollapsibleLegend = function ( $container ) {
-			$container.find( '.mw-changeslist-legend' )
-				.makeCollapsible( {
-					collapsed: mw.cookie.get( cookieName ) === 'collapsed'
-				} )
-				.on( 'beforeExpand.mw-collapsible', function () {
-					mw.cookie.set( cookieName, 'expanded' );
-				} )
-				.on( 'beforeCollapse.mw-collapsible', function () {
-					mw.cookie.set( cookieName, 'collapsed' );
-				} );
-		};
-
-	mw.hook( 'wikipage.content' ).add( doCollapsibleLegend );
-}( mediaWiki ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js b/resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js
deleted file mode 100644
index 6b25327d95..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.visitedstatus.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*!
- * JavaScript for Special:Watchlist
- */
-( function ( $ ) {
-	$( function () {
-		$( '.mw-changeslist-line-watched .mw-title a' ).on( 'click', function () {
-			$( this )
-				.closest( '.mw-changeslist-line-watched' )
-				.removeClass( 'mw-changeslist-line-watched' );
-		} );
-	} );
-}( jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less b/resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less
deleted file mode 100644
index 87b7a8b7cb..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.comparepages.styles.less
+++ /dev/null
@@ -1,19 +0,0 @@
-@import 'mediawiki.mixins';
-
-.mw-special-ComparePages .mw-htmlform-ooui-wrapper {
-	width: 100%;
-}
-
-.mw-special-ComparePages .oo-ui-layout.oo-ui-panelLayout.oo-ui-panelLayout-padded.oo-ui-panelLayout-framed {
-	float: left;
-	width: 49%;
-	.box-sizing( border-box );
-}
-
-.mw-special-ComparePages .oo-ui-layout.oo-ui-panelLayout.oo-ui-panelLayout-padded.oo-ui-panelLayout-framed:nth-of-type( 2 ) {
-	margin-left: 2%;
-}
-
-.mw-special-ComparePages .mw-htmlform-submit-buttons {
-	clear: both;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.contributions.js b/resources/src/mediawiki.special/mediawiki.special.contributions.js
deleted file mode 100644
index f65a2579b8..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.contributions.js
+++ /dev/null
@@ -1,12 +0,0 @@
-( function ( mw, $ ) {
-	$( function () {
-		var startInput = mw.widgets.DateInputWidget.static.infuse( 'mw-date-start' ),
-			endInput = mw.widgets.DateInputWidget.static.infuse( 'mw-date-end' );
-
-		startInput.on( 'deactivate', function ( userSelected ) {
-			if ( userSelected ) {
-				endInput.focus();
-			}
-		} );
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.css b/resources/src/mediawiki.special/mediawiki.special.css
deleted file mode 100644
index 0676bfc32d..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.css
+++ /dev/null
@@ -1,136 +0,0 @@
-/* Special:AllMessages */
-#mw-allmessagestable .allmessages-customised .am_default {
-	background-color: #fcffc4;
-}
-
-#mw-allmessagestable .allmessages-customised:hover .am_default {
-	background-color: #faff90;
-}
-
-#mw-allmessagestable .am_actual {
-	background-color: #e2ffe2;
-}
-
-#mw-allmessagestable .allmessages-customised:hover + .allmessages-customised .am_actual {
-	background-color: #b1ffb1;
-}
-
-/* Common for Special:Allpages and Special:PrefixIndex */
-.mw-allpages-body,
-.mw-prefixindex-body {
-	columns: 22em 3;
-	-moz-columns: 22em 3;
-	-webkit-columns: 22em 3;
-	break-inside: avoid-column;
-	page-break-inside: avoid;
-	-webkit-column-break-inside: avoid;
-}
-
-.mw-allpages-chunk,
-.mw-prefixindex-list {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-.allpagesredirect {
-	font-style: italic;
-}
-
-/* Special:Block */
-.mw-ipb-conveniencelinks {
-	font-size: 90%;
-	text-align: right;
-}
-
-.mw-block-hideuser,
-.mw-block-confirm {
-	font-weight: bold;
-}
-
-#mw-input-wpReason .oo-ui-dropdownInputWidget,
-#mw-input-wpReason .oo-ui-textInputWidget {
-	display: block;
-	max-width: 50em;
-}
-
-#mw-input-wpReason .oo-ui-textInputWidget {
-	margin-top: 0.5em;
-}
-
-/* Special:BlockList */
-.mw-blocklist .mw-usertoollinks,
-.mw-blocklist-actions {
-	white-space: nowrap;
-	font-size: 90%;
-}
-
-/* Special:Contributions */
-.mw-uctop {
-	font-weight: bold;
-}
-.mw-contributions-form select {
-	vertical-align: middle;
-}
-
-/* Special:EditWatchlist */
-.watchlistredir {
-	font-style: italic;
-}
-
-/* Special:EmailUser */
-#mw-emailuser-sender,
-#mw-emailuser-recipient {
-	font-weight: bold;
-}
-
-/* Special:FileDuplicateSearch */
-#mw-fileduplicatesearch-icon {
-	float: right;
-}
-
-/* Special:ListGroupRights */
-.mw-listgrouprights-table tr {
-	vertical-align: top;
-}
-.listgrouprights-revoked {
-	text-decoration: line-through;
-}
-
-/* Special:RevisionDelete */
-.mw-revdel-editreasons {
-	font-size: 90%;
-	text-align: right;
-}
-
-/* Special:Specialpages */
-.mw-specialpagerestricted {
-	font-weight: bold;
-}
-
-.mw-specialpages-list {
-	-webkit-columns: 16em 2;
-	-moz-columns: 16em 2;
-	columns: 16em 2;
-}
-
-.mw-specialpages-list ul {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-/* Special:Statistics */
-.mw-statistics-numbers {
-	text-align: right;
-}
-
-/* Special:ProtectedPages */
-.mw-protectedpages .mw-usertoollinks,
-.mw-protectedpages-length,
-.mw-protectedpages-actions {
-	white-space: nowrap;
-	font-size: 90%;
-}
-.mw-protectedpages-unknown {
-	color: #72777d;
-	font-size: 90%;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.edittags.css b/resources/src/mediawiki.special/mediawiki.special.edittags.css
deleted file mode 100644
index 204009c963..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.edittags.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Styling for Special:EditTags and action=editchangetags
- */
-#mw-edittags-tags-selector td {
-	vertical-align: top;
-}
-
-#mw-edittags-tags-selector-multi td {
-	vertical-align: top;
-	padding-right: 1.5em;
-}
-
-#mw-edittags-tag-list {
-	min-width: 20em;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.edittags.js b/resources/src/mediawiki.special/mediawiki.special.edittags.js
deleted file mode 100644
index 4f51e9b761..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.edittags.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * JavaScript for Special:EditTags
- */
-( function ( mw, $ ) {
-	$( function () {
-		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
-			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
-			$wpReason = $( '#wpReason' ),
-			$tagList = $( '#mw-edittags-tag-list' );
-
-		if ( $tagList.length ) {
-			$tagList.chosen( {
-				/* eslint-disable camelcase */
-				placeholder_text_multiple: mw.msg( 'tags-edit-chosen-placeholder' ),
-				no_results_text: mw.msg( 'tags-edit-chosen-no-results' )
-				/* eslint-enable camelcase */
-			} );
-		}
-
-		$( '#mw-edittags-remove-all' ).on( 'change', function ( e ) {
-			$( '.mw-edittags-remove-checkbox' ).prop( 'checked', e.target.checked );
-		} );
-		$( '.mw-edittags-remove-checkbox' ).on( 'change', function ( e ) {
-			if ( !e.target.checked ) {
-				$( '#mw-edittags-remove-all' ).prop( 'checked', false );
-			}
-		} );
-
-		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
-		// use maxLength because it's leaving room for log entry text.
-		if ( summaryCodePointLimit ) {
-			$wpReason.codePointLimit();
-		} else if ( summaryByteLimit ) {
-			$wpReason.byteLimit();
-		}
-	} );
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.import.js b/resources/src/mediawiki.special/mediawiki.special.import.js
deleted file mode 100644
index 2cb96afc48..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.import.js
+++ /dev/null
@@ -1,37 +0,0 @@
-/*!
- * JavaScript for Special:Import
- */
-( function ( $ ) {
-	var subprojectListAlreadyShown;
-	function updateImportSubprojectList() {
-		var $projectField = $( '#mw-import-table-interwiki #interwiki' ),
-			$subprojectField = $projectField.parent().find( '#subproject' ),
-			$selected = $projectField.find( ':selected' ),
-			oldValue = $subprojectField.val(),
-			option, options;
-
-		if ( $selected.attr( 'data-subprojects' ) ) {
-			options = $selected.attr( 'data-subprojects' ).split( ' ' ).map( function ( el ) {
-				option = document.createElement( 'option' );
-				option.appendChild( document.createTextNode( el ) );
-				option.setAttribute( 'value', el );
-				if ( oldValue === el && subprojectListAlreadyShown === true ) {
-					option.setAttribute( 'selected', 'selected' );
-				}
-				return option;
-			} );
-			$subprojectField.show().empty().append( options );
-			subprojectListAlreadyShown = true;
-		} else {
-			$subprojectField.hide();
-		}
-	}
-
-	$( function () {
-		var $projectField = $( '#mw-import-table-interwiki #interwiki' );
-		if ( $projectField.length ) {
-			$projectField.change( updateImportSubprojectList );
-			updateImportSubprojectList();
-		}
-	} );
-}( jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.css b/resources/src/mediawiki.special/mediawiki.special.movePage.css
deleted file mode 100644
index 9428fedc96..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.css
+++ /dev/null
@@ -1,7 +0,0 @@
-/*!
- * Styles for Special:MovePage
- */
-
-.movepage-wrapper {
-	width: 50em;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.js b/resources/src/mediawiki.special/mediawiki.special.movePage.js
deleted file mode 100644
index d828396ea5..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * JavaScript for Special:MovePage
- */
-( function ( mw, $ ) {
-	$( function () {
-		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
-			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
-			wpReason = OO.ui.infuse( $( '#wpReason' ) );
-
-		// Infuse for pretty dropdown
-		OO.ui.infuse( $( '#wpNewTitle' ) );
-		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
-		if ( summaryCodePointLimit ) {
-			mw.widgets.visibleCodePointLimit( wpReason, summaryCodePointLimit );
-		} else if ( summaryByteLimit ) {
-			mw.widgets.visibleByteLimit( wpReason, summaryByteLimit );
-		}
-		// Infuse for nicer "help" popup
-		if ( $( '#wpMovetalk-field' ).length ) {
-			OO.ui.infuse( $( '#wpMovetalk-field' ) );
-		}
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.pageLanguage.js b/resources/src/mediawiki.special/mediawiki.special.pageLanguage.js
deleted file mode 100644
index edfbe1eaab..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.pageLanguage.js
+++ /dev/null
@@ -1,11 +0,0 @@
-/*!
- * JavaScript module used on Special:PageLanguage
- */
-( function ( $, OO ) {
-	$( function () {
-		// Select the 'Language select' option if user is trying to select language
-		OO.ui.infuse( 'mw-pl-languageselector' ).on( 'change', function () {
-			OO.ui.infuse( 'mw-pl-options' ).setValue( '2' );
-		} );
-	} );
-}( jQuery, OO ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css b/resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css
deleted file mode 100644
index 7ef75d0c32..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.pagesWithProp.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/* Distinguish actual data from information about it being hidden visually */
-.prop-value-hidden {
-	font-style: italic;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js b/resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js
deleted file mode 100644
index 244154b38a..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.confirmClose.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Enable save button and prevent the window being accidentally
- * closed when any form field is changed.
- */
-( function ( mw, $ ) {
-	$( function () {
-		var allowCloseWindow, saveButton, restoreButton,
-			oouiEnabled = $( '#mw-prefs-form' ).hasClass( 'mw-htmlform-ooui' );
-
-		// Check if all of the form values are unchanged.
-		// (This function could be changed to infuse and check OOUI widgets, but that would only make it
-		// slower and more complicated. It works fine to treat them as HTML elements.)
-		function isPrefsChanged() {
-			var inputs = $( '#mw-prefs-form :input[name]' ),
-				input, $input, inputType,
-				index, optIndex,
-				opt;
-
-			for ( index = 0; index < inputs.length; index++ ) {
-				input = inputs[ index ];
-				$input = $( input );
-
-				// Different types of inputs have different methods for accessing defaults
-				if ( $input.is( 'select' ) ) {
-					// <select> has the property defaultSelected for each option
-					for ( optIndex = 0; optIndex < input.options.length; optIndex++ ) {
-						opt = input.options[ optIndex ];
-						if ( opt.selected !== opt.defaultSelected ) {
-							return true;
-						}
-					}
-				} else if ( $input.is( 'input' ) || $input.is( 'textarea' ) ) {
-					// <input> has defaultValue or defaultChecked
-					inputType = input.type;
-					if ( inputType === 'radio' || inputType === 'checkbox' ) {
-						if ( input.checked !== input.defaultChecked ) {
-							return true;
-						}
-					} else if ( input.value !== input.defaultValue ) {
-						return true;
-					}
-				}
-			}
-
-			return false;
-		}
-
-		if ( oouiEnabled ) {
-			saveButton = OO.ui.infuse( $( '#prefcontrol' ) );
-			restoreButton = OO.ui.infuse( $( '#mw-prefs-restoreprefs' ) );
-
-			// Disable the button to save preferences unless preferences have changed
-			// Check if preferences have been changed before JS has finished loading
-			saveButton.setDisabled( !isPrefsChanged() );
-			$( '#preferences .oo-ui-fieldsetLayout' ).on( 'change keyup mouseup', function () {
-				saveButton.setDisabled( !isPrefsChanged() );
-			} );
-		} else {
-			// Disable the button to save preferences unless preferences have changed
-			// Check if preferences have been changed before JS has finished loading
-			$( '#prefcontrol' ).prop( 'disabled', !isPrefsChanged() );
-			$( '#preferences > fieldset' ).on( 'change keyup mouseup', function () {
-				$( '#prefcontrol' ).prop( 'disabled', !isPrefsChanged() );
-			} );
-		}
-
-		// Set up a message to notify users if they try to leave the page without
-		// saving.
-		allowCloseWindow = mw.confirmCloseWindow( {
-			test: isPrefsChanged,
-			message: mw.msg( 'prefswarning-warning', mw.msg( 'saveprefs' ) ),
-			namespace: 'prefswarning'
-		} );
-		$( '#mw-prefs-form' ).on( 'submit', $.proxy( allowCloseWindow, 'release' ) );
-		if ( oouiEnabled ) {
-			restoreButton.on( 'click', function () {
-				allowCloseWindow.release();
-				// The default behavior of events in OOUI is always prevented. Follow the link manually.
-				// Note that middle-click etc. still works, as it doesn't emit a OOUI 'click' event.
-				location.href = restoreButton.getHref();
-			} );
-		} else {
-			$( '#mw-prefs-restoreprefs' ).on( 'click', $.proxy( allowCloseWindow, 'release' ) );
-		}
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js b/resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js
deleted file mode 100644
index e6b7432fbd..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.convertmessagebox.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Check for successbox to replace with notifications.
- */
-( function ( $ ) {
-	$( function () {
-		var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' );
-		convertmessagebox();
-	} );
-}( jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js b/resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js
deleted file mode 100644
index fe48886027..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.editfont.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: editfont field enhancements.
- */
-( function ( mw, $ ) {
-	$( function () {
-		var widget, lastValue;
-
-		try {
-			widget = OO.ui.infuse( $( '#mw-input-wpeditfont' ) );
-		} catch ( err ) {
-			// This preference could theoretically be disabled ($wgHiddenPrefs)
-			return;
-		}
-
-		// Style options
-		widget.dropdownWidget.menu.items.forEach( function ( item ) {
-			item.$label.addClass( 'mw-editfont-' + item.getData() );
-		} );
-
-		function updateLabel( value ) {
-			// Style selected item label
-			widget.dropdownWidget.$label
-				.removeClass( 'mw-editfont-' + lastValue )
-				.addClass( 'mw-editfont-' + value );
-			lastValue = value;
-		}
-
-		widget.on( 'change', updateLabel );
-		updateLabel( widget.getValue() );
-
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js b/resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js
deleted file mode 100644
index f934d59e1e..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.personalEmail.js
+++ /dev/null
@@ -1,24 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Email preferences better UX
- */
-( function ( $ ) {
-	$( function () {
-		var allowEmail, allowEmailFromNewUsers;
-
-		allowEmail = $( '#wpAllowEmail' );
-		allowEmailFromNewUsers = $( '#wpAllowEmailFromNewUsers' );
-
-		function toggleDisabled() {
-			if ( allowEmail.is( ':checked' ) && allowEmail.is( ':enabled' ) ) {
-				allowEmailFromNewUsers.prop( 'disabled', false );
-			} else {
-				allowEmailFromNewUsers.prop( 'disabled', true );
-			}
-		}
-
-		if ( allowEmail ) {
-			allowEmail.on( 'change', toggleDisabled );
-			toggleDisabled();
-		}
-	} );
-}( jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
deleted file mode 100644
index 8810318e98..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.css
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Reuses colors from mediawiki.legacy/shared.css */
-.mw-email-not-authenticated .oo-ui-labelWidget,
-.mw-email-none .oo-ui-labelWidget {
-	border: 1px solid #fde29b;
-	background-color: #fdf1d1;
-	color: #000;
-	padding: 0.5em;
-}
-/* Authenticated email field has its own class too. Unstyled by default */
-/*
-.mw-email-authenticated .oo-ui-labelWidget { }
-*/
-
-/* This is needed because add extra buttons in a weird way */
-.mw-prefs-buttons .mw-htmlform-submit-buttons {
-	margin: 0;
-	display: inline;
-}
-
-.mw-prefs-buttons {
-	margin-top: 1em;
-}
-
-#prefcontrol {
-	margin-right: 0.5em;
-}
-
-/*
- * Hide, but keep accessible for screen-readers.
- * Like .mw-jump, #jump-to-nav from shared.css
- */
-.client-js .mw-navigation-hint {
-	overflow: hidden;
-	height: 0;
-	zoom: 1;
-}
-
-/* Override OOUI styles so that dropdowns near the bottom of the form don't get clipped,
- * e.g.'Appearance' / 'Threshold for stub link formatting'. This is hacky and bad, it would be
- * better solved by setting overlays for the widgets, but we can't do it from PHP... */
-#preferences .oo-ui-panelLayout {
-	position: static;
-	overflow: visible;
-	-webkit-transform: none;
-	transform: none;
-}
-
-#preferences .oo-ui-panelLayout-framed .oo-ui-panelLayout-framed {
-	border-color: #c8ccd1;
-	border-width: 1px 0 0;
-	border-radius: 0;
-	padding-left: 0;
-	padding-right: 0;
-	box-shadow: none;
-}
-
-/* Tweak the margins to reduce the shifting of form contents
- * after JS code loads and rearranges the page */
-.client-js #preferences > .oo-ui-panelLayout {
-	margin: 1em 0;
-}
-
-.client-js #preferences .oo-ui-panelLayout-framed .oo-ui-panelLayout-framed {
-	margin-left: 0.25em;
-}
-
-.client-js #preferences .oo-ui-tabPanelLayout {
-	padding-top: 0.5em;
-	padding-bottom: 0.5em;
-}
-
-.client-js #preferences .oo-ui-tabPanelLayout .oo-ui-panelLayout-framed {
-	margin-left: 0;
-	margin-bottom: 0;
-	border: 0;
-	padding-top: 0;
-}
-
-.client-js #preferences > .oo-ui-panelLayout > .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-header {
-	margin-bottom: 1em;
-}
-
-/* Make the "Basic information" section more compact */
-/* OOUI's `align: 'left'` for FieldLayouts sucks, so we do our own */
-#mw-htmlform-info > .oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-header {
-	width: 20%;
-	display: inline-block;
-	vertical-align: middle;
-	padding: 0;
-}
-
-#mw-htmlform-info > .oo-ui-fieldLayout-align-top .oo-ui-fieldLayout-help {
-	margin-right: 0;
-}
-
-#mw-htmlform-info > .oo-ui-fieldLayout.oo-ui-fieldLayout-align-top > .oo-ui-fieldLayout-body > .oo-ui-fieldLayout-field {
-	width: 80%;
-	display: inline-block;
-	vertical-align: middle;
-}
-
-/* Expand the dropdown and textfield of "Time zone" field to the */
-/* usual maximum width and display them on separate lines. */
-#wpTimeCorrection .oo-ui-dropdownInputWidget,
-#wpTimeCorrection .oo-ui-textInputWidget {
-	display: block;
-	max-width: 50em;
-}
-
-#wpTimeCorrection .oo-ui-textInputWidget {
-	margin-top: 0.5em;
-}
-
-/* HACK: expand width of gadget descriptions.
- * This should be moved to the Gadgets extension */
-#mw-htmlform-gadgets .oo-ui-fieldLayout.oo-ui-fieldLayout-align-inline > .oo-ui-fieldLayout-body {
-	max-width: none;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css b/resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css
deleted file mode 100644
index 33b630a948..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.styles.legacy.css
+++ /dev/null
@@ -1,47 +0,0 @@
-/* Reuses colors from mediawiki.legacy/shared.css */
-.mw-email-not-authenticated .mw-input,
-.mw-email-none .mw-input {
-	border: 1px solid #fde29b;
-	background-color: #fdf1d1;
-	color: #000;
-}
-/* Authenticated email field has its own class too. Unstyled by default */
-/*
-.mw-email-authenticated .mw-input { }
-*/
-/* This breaks due to nolabel styling */
-#preferences > fieldset td.mw-label {
-	width: 20%;
-}
-
-#preferences > fieldset table {
-	width: 100%;
-}
-#preferences > fieldset table.mw-htmlform-matrix {
-	width: auto;
-}
-
-/* The CSS below is also for JS enabled version, because we want to prevent FOUC */
-
-/*
- * Hide, but keep accessible for screen-readers.
- * Like .mw-jump, #jump-to-nav from shared.css
- */
-.client-js .mw-navigation-hint {
-	overflow: hidden;
-	height: 0;
-	zoom: 1;
-}
-
-.client-nojs #preftoc {
-	display: none;
-}
-
-.client-js #preferences > fieldset {
-	display: none;
-}
-
-/* Only the 1st tab is shown by default in JS mode */
-.client-js #preferences #mw-prefsection-personal {
-	display: block;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js b/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js
deleted file mode 100644
index c948ff09f2..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Tab navigation.
- */
-( function ( mw, $ ) {
-	$( function () {
-		var $preferences, tabs, wrapper, previousTab;
-
-		$preferences = $( '#preferences' );
-
-		// Make sure the accessibility tip is selectable so that screen reader users take notice,
-		// but hide it per default to reduce interface clutter. Also make sure it becomes visible
-		// when selected. Similar to jquery.mw-jump
-		$( '<div>' ).addClass( 'mw-navigation-hint' )
-			.text( mw.msg( 'prefs-tabs-navigation-hint' ) )
-			.attr( 'tabIndex', 0 )
-			.on( 'focus blur', function ( e ) {
-				if ( e.type === 'blur' || e.type === 'focusout' ) {
-					$( this ).css( 'height', '0' );
-				} else {
-					$( this ).css( 'height', 'auto' );
-				}
-			} ).prependTo( '#mw-content-text' );
-
-		tabs = new OO.ui.IndexLayout( {
-			expanded: false,
-			// Do not remove focus from the tabs menu after choosing a tab
-			autoFocus: false
-		} );
-
-		mw.config.get( 'wgPreferencesTabs' ).forEach( function ( tabConfig ) {
-			var panel, $panelContents;
-
-			panel = new OO.ui.TabPanelLayout( tabConfig.name, {
-				expanded: false,
-				label: tabConfig.label
-			} );
-			$panelContents = $( '#mw-prefsection-' + tabConfig.name );
-
-			// Hide the unnecessary PHP PanelLayouts
-			// (Do not use .remove(), as that would remove event handlers for everything inside them)
-			$panelContents.parent().detach();
-
-			panel.$element.append( $panelContents );
-			tabs.addTabPanels( [ panel ] );
-
-			// Remove duplicate labels
-			// (This must be after .addTabPanels(), otherwise the tab item doesn't exist yet)
-			$panelContents.children( 'legend' ).remove();
-			$panelContents.attr( 'aria-labelledby', panel.getTabItem().getElementId() );
-		} );
-
-		wrapper = new OO.ui.PanelLayout( {
-			expanded: false,
-			padded: false,
-			framed: true
-		} );
-		wrapper.$element.append( tabs.$element );
-		$preferences.prepend( wrapper.$element );
-
-		function updateHash( panel ) {
-			var scrollTop, active;
-			// Handle hash manually to prevent jumping,
-			// therefore save and restore scrollTop to prevent jumping.
-			scrollTop = $( window ).scrollTop();
-			// Changing the hash apparently causes keyboard focus to be lost?
-			// Save and restore it. This makes no sense though.
-			active = document.activeElement;
-			location.hash = '#mw-prefsection-' + panel.getName();
-			if ( active ) {
-				active.focus();
-			}
-			$( window ).scrollTop( scrollTop );
-		}
-
-		tabs.on( 'set', updateHash );
-
-		/**
-		 * @ignore
-		 * @param {string} name the name of a tab without the prefix ("mw-prefsection-")
-		 * @param {string} [mode] A hash will be set according to the current
-		 *  open section. Set mode 'noHash' to supress this.
-		 */
-		function switchPrefTab( name, mode ) {
-			if ( mode === 'noHash' ) {
-				tabs.off( 'set', updateHash );
-			}
-			tabs.setTabPanel( name );
-			if ( mode === 'noHash' ) {
-				tabs.on( 'set', updateHash );
-			}
-		}
-
-		// Jump to correct section as indicated by the hash.
-		// This function is called onload and onhashchange.
-		function detectHash() {
-			var hash = location.hash,
-				matchedElement, parentSection;
-			if ( hash.match( /^#mw-prefsection-[\w]+$/ ) ) {
-				mw.storage.session.remove( 'mwpreferences-prevTab' );
-				switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
-			} else if ( hash.match( /^#mw-[\w-]+$/ ) ) {
-				matchedElement = document.getElementById( hash.slice( 1 ) );
-				parentSection = $( matchedElement ).parent().closest( '[id^="mw-prefsection-"]' );
-				if ( parentSection.length ) {
-					mw.storage.session.remove( 'mwpreferences-prevTab' );
-					// Switch to proper tab and scroll to selected item.
-					switchPrefTab( parentSection.attr( 'id' ).replace( 'mw-prefsection-', '' ), 'noHash' );
-					matchedElement.scrollIntoView();
-				}
-			}
-		}
-
-		$( window ).on( 'hashchange', function () {
-			var hash = location.hash;
-			if ( hash.match( /^#mw-[\w-]+/ ) ) {
-				detectHash();
-			} else if ( hash === '' ) {
-				switchPrefTab( 'personal', 'noHash' );
-			}
-		} )
-			// Run the function immediately to select the proper tab on startup.
-			.trigger( 'hashchange' );
-
-		// Restore the active tab after saving the preferences
-		previousTab = mw.storage.session.get( 'mwpreferences-prevTab' );
-		if ( previousTab ) {
-			switchPrefTab( previousTab, 'noHash' );
-			// Deleting the key, the tab states should be reset until we press Save
-			mw.storage.session.remove( 'mwpreferences-prevTab' );
-		}
-
-		$( '#mw-prefs-form' ).on( 'submit', function () {
-			var value = tabs.getCurrentTabPanelName();
-			mw.storage.session.set( 'mwpreferences-prevTab', value );
-		} );
-
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js b/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js
deleted file mode 100644
index 0d97d68e84..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.tabs.legacy.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Tab navigation.
- */
-( function ( mw, $ ) {
-	$( function () {
-		var $preftoc, $preferences, $fieldsets, labelFunc, previousTab;
-
-		labelFunc = function () {
-			return this.id.replace( /^mw-prefsection/g, 'preftab' );
-		};
-
-		$preftoc = $( '#preftoc' );
-		$preferences = $( '#preferences' );
-
-		$fieldsets = $preferences.children( 'fieldset' )
-			.attr( {
-				role: 'tabpanel',
-				'aria-labelledby': labelFunc
-			} );
-		$fieldsets.not( '#mw-prefsection-personal' )
-			.hide()
-			.attr( 'aria-hidden', 'true' );
-
-		// T115692: The following is kept for backwards compatibility with older skins
-		$preferences.addClass( 'jsprefs' );
-		$fieldsets.addClass( 'prefsection' );
-		$fieldsets.children( 'legend' ).addClass( 'mainLegend' );
-
-		// Make sure the accessibility tip is selectable so that screen reader users take notice,
-		// but hide it per default to reduce interface clutter. Also make sure it becomes visible
-		// when selected. Similar to jquery.mw-jump
-		$( '<div>' ).addClass( 'mw-navigation-hint' )
-			.text( mw.msg( 'prefs-tabs-navigation-hint' ) )
-			.attr( 'tabIndex', 0 )
-			.on( 'focus blur', function ( e ) {
-				if ( e.type === 'blur' || e.type === 'focusout' ) {
-					$( this ).css( 'height', '0' );
-				} else {
-					$( this ).css( 'height', 'auto' );
-				}
-			} ).insertBefore( $preftoc );
-
-		/**
-		 * It uses document.getElementById for security reasons (HTML injections in $()).
-		 *
-		 * @ignore
-		 * @param {string} name the name of a tab without the prefix ("mw-prefsection-")
-		 * @param {string} [mode] A hash will be set according to the current
-		 *  open section. Set mode 'noHash' to surpress this.
-		 */
-		function switchPrefTab( name, mode ) {
-			var $tab, scrollTop;
-			// Handle hash manually to prevent jumping,
-			// therefore save and restore scrollTop to prevent jumping.
-			scrollTop = $( window ).scrollTop();
-			if ( mode !== 'noHash' ) {
-				location.hash = '#mw-prefsection-' + name;
-			}
-			$( window ).scrollTop( scrollTop );
-
-			$preftoc.find( 'li' ).removeClass( 'selected' )
-				.find( 'a' ).attr( {
-					tabIndex: -1,
-					'aria-selected': 'false'
-				} );
-
-			$tab = $( document.getElementById( 'preftab-' + name ) );
-			if ( $tab.length ) {
-				$tab.attr( {
-					tabIndex: 0,
-					'aria-selected': 'true'
-				} ).focus()
-					.parent().addClass( 'selected' );
-
-				$preferences.children( 'fieldset' ).hide().attr( 'aria-hidden', 'true' );
-				$( document.getElementById( 'mw-prefsection-' + name ) ).show().attr( 'aria-hidden', 'false' );
-			}
-		}
-
-		// Enable keyboard users to use left and right keys to switch tabs
-		$preftoc.on( 'keydown', function ( event ) {
-			var keyLeft = 37,
-				keyRight = 39,
-				$el;
-
-			if ( event.keyCode === keyLeft ) {
-				$el = $( '#preftoc li.selected' ).prev().find( 'a' );
-			} else if ( event.keyCode === keyRight ) {
-				$el = $( '#preftoc li.selected' ).next().find( 'a' );
-			} else {
-				return;
-			}
-			if ( $el.length > 0 ) {
-				switchPrefTab( $el.attr( 'href' ).replace( '#mw-prefsection-', '' ) );
-			}
-		} );
-
-		// Jump to correct section as indicated by the hash.
-		// This function is called onload and onhashchange.
-		function detectHash() {
-			var hash = location.hash,
-				matchedElement, parentSection;
-			if ( hash.match( /^#mw-prefsection-[\w]+$/ ) ) {
-				mw.storage.session.remove( 'mwpreferences-prevTab' );
-				switchPrefTab( hash.replace( '#mw-prefsection-', '' ) );
-			} else if ( hash.match( /^#mw-[\w-]+$/ ) ) {
-				matchedElement = document.getElementById( hash.slice( 1 ) );
-				parentSection = $( matchedElement ).parent().closest( '[id^="mw-prefsection-"]' );
-				if ( parentSection.length ) {
-					mw.storage.session.remove( 'mwpreferences-prevTab' );
-					// Switch to proper tab and scroll to selected item.
-					switchPrefTab( parentSection.attr( 'id' ).replace( 'mw-prefsection-', '' ), 'noHash' );
-					matchedElement.scrollIntoView();
-				}
-			}
-		}
-
-		$( window ).on( 'hashchange', function () {
-			var hash = location.hash;
-			if ( hash.match( /^#mw-[\w-]+/ ) ) {
-				detectHash();
-			} else if ( hash === '' ) {
-				switchPrefTab( 'personal', 'noHash' );
-			}
-		} )
-			// Run the function immediately to select the proper tab on startup.
-			.trigger( 'hashchange' );
-
-		// Restore the active tab after saving the preferences
-		previousTab = mw.storage.session.get( 'mwpreferences-prevTab' );
-		if ( previousTab ) {
-			switchPrefTab( previousTab, 'noHash' );
-			// Deleting the key, the tab states should be reset until we press Save
-			mw.storage.session.remove( 'mwpreferences-prevTab' );
-		}
-
-		$( '#mw-prefs-form' ).on( 'submit', function () {
-			var value = $( $preftoc ).find( 'li.selected a' ).attr( 'id' ).replace( 'preftab-', '' );
-			mw.storage.session.set( 'mwpreferences-prevTab', value );
-		} );
-
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js b/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js
deleted file mode 100644
index a6ffae9739..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.timezone.js
+++ /dev/null
@@ -1,111 +0,0 @@
-/*!
- * JavaScript for Special:Preferences: Timezone field enhancements.
- */
-( function ( mw, $ ) {
-	$( function () {
-		var $tzSelect, $tzTextbox, timezoneWidget, $localtimeHolder, servertime,
-			oouiEnabled = $( '#mw-prefs-form' ).hasClass( 'mw-htmlform-ooui' );
-
-		// Timezone functions.
-		// Guesses Timezone from browser and updates fields onchange.
-
-		if ( oouiEnabled ) {
-			// This is identical to OO.ui.infuse( ... ), but it makes the class name of the result known.
-			try {
-				timezoneWidget = mw.widgets.SelectWithInputWidget.static.infuse( $( '#wpTimeCorrection' ) );
-			} catch ( err ) {
-				// This preference could theoretically be disabled ($wgHiddenPrefs)
-				timezoneWidget = null;
-			}
-		} else {
-			$tzSelect = $( '#mw-input-wptimecorrection' );
-			$tzTextbox = $( '#mw-input-wptimecorrection-other' );
-		}
-
-		$localtimeHolder = $( '#wpLocalTime' );
-		servertime = parseInt( $( 'input[name="wpServerTime"]' ).val(), 10 );
-
-		function minutesToHours( min ) {
-			var tzHour = Math.floor( Math.abs( min ) / 60 ),
-				tzMin = Math.abs( min ) % 60,
-				tzString = ( ( min >= 0 ) ? '' : '-' ) + ( ( tzHour < 10 ) ? '0' : '' ) + tzHour +
-					':' + ( ( tzMin < 10 ) ? '0' : '' ) + tzMin;
-			return tzString;
-		}
-
-		function hoursToMinutes( hour ) {
-			var minutes,
-				arr = hour.split( ':' );
-
-			arr[ 0 ] = parseInt( arr[ 0 ], 10 );
-
-			if ( arr.length === 1 ) {
-				// Specification is of the form [-]XX
-				minutes = arr[ 0 ] * 60;
-			} else {
-				// Specification is of the form [-]XX:XX
-				minutes = Math.abs( arr[ 0 ] ) * 60 + parseInt( arr[ 1 ], 10 );
-				if ( arr[ 0 ] < 0 ) {
-					minutes *= -1;
-				}
-			}
-			// Gracefully handle non-numbers.
-			if ( isNaN( minutes ) ) {
-				return 0;
-			} else {
-				return minutes;
-			}
-		}
-
-		function updateTimezoneSelection() {
-			var minuteDiff, localTime,
-				type = oouiEnabled ? timezoneWidget.dropdowninput.getValue() : $tzSelect.val(),
-				val = oouiEnabled ? timezoneWidget.textinput.getValue() : $tzTextbox.val();
-
-			if ( type === 'other' ) {
-				// User specified time zone manually in <input>
-				// Grab data from the textbox, parse it.
-				minuteDiff = hoursToMinutes( val );
-			} else {
-				// Time zone not manually specified by user
-				if ( type === 'guess' ) {
-					// Get browser timezone & fill it in
-					minuteDiff = -( new Date().getTimezoneOffset() );
-					if ( oouiEnabled ) {
-						timezoneWidget.textinput.setValue( minutesToHours( minuteDiff ) );
-						timezoneWidget.dropdowninput.setValue( 'other' );
-					} else {
-						$tzTextbox.val( minutesToHours( minuteDiff ) );
-						$tzSelect.val( 'other' );
-					}
-				} else {
-					// Grab data from the dropdown value
-					minuteDiff = parseInt( type.split( '|' )[ 1 ], 10 ) || 0;
-				}
-			}
-
-			// Determine local time from server time and minutes difference, for display.
-			localTime = servertime + minuteDiff;
-
-			// Bring time within the [0,1440) range.
-			localTime = ( ( localTime % 1440 ) + 1440 ) % 1440;
-
-			$localtimeHolder.text( mw.language.convertNumber( minutesToHours( localTime ) ) );
-		}
-
-		if ( oouiEnabled ) {
-			if ( timezoneWidget ) {
-				timezoneWidget.dropdowninput.on( 'change', updateTimezoneSelection );
-				timezoneWidget.textinput.on( 'change', updateTimezoneSelection );
-				updateTimezoneSelection();
-			}
-		} else {
-			if ( $tzSelect.length && $tzTextbox.length ) {
-				$tzSelect.change( updateTimezoneSelection );
-				$tzTextbox.blur( updateTimezoneSelection );
-				updateTimezoneSelection();
-			}
-		}
-
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.recentchanges.js b/resources/src/mediawiki.special/mediawiki.special.recentchanges.js
deleted file mode 100644
index 29c0feaf17..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.recentchanges.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*!
- * JavaScript for Special:RecentChanges
- */
-( function ( mw, $ ) {
-	var rc, $checkboxes, $select;
-
-	/**
-	 * @class mw.special.recentchanges
-	 * @singleton
-	 */
-	rc = {
-		/**
-		 * Handler to disable/enable the namespace selector checkboxes when the
-		 * special 'all' namespace is selected/unselected respectively.
-		 */
-		updateCheckboxes: function () {
-			// The option element for the 'all' namespace has an empty value
-			var isAllNS = $select.val() === '';
-
-			// Iterates over checkboxes and propagate the selected option
-			$checkboxes.prop( 'disabled', isAllNS );
-		},
-
-		init: function () {
-			$select = $( '#namespace' );
-			$checkboxes = $( '#nsassociated, #nsinvert' );
-
-			// Bind to change event, and trigger once to set the initial state of the checkboxes.
-			rc.updateCheckboxes();
-			$select.change( rc.updateCheckboxes );
-		}
-	};
-
-	$( rc.init );
-
-	module.exports = rc;
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js b/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js
deleted file mode 100644
index cad9db0e9c..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.revisionDelete.js
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
- * JavaScript for Special:RevisionDelete
- */
-( function ( mw, $ ) {
-	var colonSeparator = mw.message( 'colon-separator' ).text(),
-		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
-		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
-		$wpRevDeleteReasonList = $( '#wpRevDeleteReasonList' ),
-		$wpReason = $( '#wpReason' ),
-		filterFn = function ( input ) {
-			// Should be built the same as in SpecialRevisionDelete::submit()
-			var comment = $wpRevDeleteReasonList.val();
-			if ( comment === 'other' ) {
-				comment = input;
-			} else if ( input !== '' ) {
-				// Entry from drop down menu + additional comment
-				comment += colonSeparator + input;
-			}
-			return comment;
-		};
-
-	// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
-	if ( summaryCodePointLimit ) {
-		$wpReason.codePointLimit( summaryCodePointLimit, filterFn );
-	} else if ( summaryByteLimit ) {
-		$wpReason.byteLimit( summaryByteLimit, filterFn );
-	}
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js b/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js
deleted file mode 100644
index 648bf67540..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.search.commonsInterwikiWidget.js
+++ /dev/null
@@ -1,78 +0,0 @@
-( function ( mw, $ ) {
-
-	var api = new mw.Api(),
-		pageUrl = new mw.Uri(),
-		imagesText = new mw.Message( mw.messages, 'searchprofile-images' ),
-		moreResultsText = new mw.Message( mw.messages, 'search-interwiki-more-results' );
-
-	function itemTemplate( results ) {
-
-		var resultOutput = '', i, result, imageCaption, imageThumbnailSrc;
-
-		for ( i = 0; i < results.length; i++ ) {
-			result = results[ i ];
-			imageCaption = mw.html.element( 'span', { 'class': 'iw-result__mini-gallery__caption' }, result.title );
-			imageThumbnailSrc = ( result.thumbnail ) ? result.thumbnail.source : '';
-			resultOutput += '<div class="iw-result__mini-gallery">' +
-						/* escaping response content */
-						mw.html.element( 'a', {
-							href: '/wiki/' + result.title,
-							'class': 'iw-result__mini-gallery__image',
-							style: 'background-image: url(' + imageThumbnailSrc + ');'
-						}, new mw.html.Raw( imageCaption ) ) +
-					'</div>';
-		}
-
-		return resultOutput;
-	}
-
-	function itemWrapperTemplate( pageQuery, itemTemplateOutput ) {
-
-		return '<li class="iw-resultset iw-resultset--image" data-iw-resultset-pos="0">' +
-				'<div class="iw-result__header">' +
-					'<strong>' + imagesText.escaped() + '</strong>' +
-				'</div>' +
-				'<div class="iw-result__content">' +
-				/* template output has been sanitized by mw.html.element */
-				itemTemplateOutput +
-				'</div>' +
-				'<div class="iw-result__footer">' +
-					'<a href="/w/index.php?title=Special:Search&search=' + encodeURIComponent( pageQuery ) + '&fulltext=1&profile=images">' +
-						moreResultsText.escaped() +
-					'</a>' +
-				'</div>' +
-			'</li>';
-
-	}
-
-	api.get( {
-		action: 'query',
-		generator: 'search',
-		gsrsearch: pageUrl.query.search,
-		gsrnamespace: mw.config.get( 'wgNamespaceIds' ).file,
-		gsrlimit: 3,
-		prop: 'pageimages',
-		pilimit: 3,
-		piprop: 'thumbnail',
-		pithumbsize: 300,
-		formatversion: 2
-	} ).done( function ( resp ) {
-		var results = ( resp.query && resp.query.pages ) ? resp.query.pages : false,
-			multimediaWidgetTemplate;
-
-		if ( !results ) {
-			return;
-		}
-
-		results.sort( function ( a, b ) {
-			return a.index - b.index;
-		} );
-
-		multimediaWidgetTemplate = itemWrapperTemplate( pageUrl.query.search, itemTemplate( results ) );
-		/* we really only need to wait for document ready for DOM manipulation */
-		$( function () {
-			$( '.iw-results' ).append( multimediaWidgetTemplate );
-		} );
-	} );
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.css b/resources/src/mediawiki.special/mediawiki.special.search.css
deleted file mode 100644
index aad784e222..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.search.css
+++ /dev/null
@@ -1,9 +0,0 @@
-#mw-search-togglebox {
-	float: right;
-}
-#mw-search-togglebox label {
-	margin-right: 0.25em;
-}
-#mw-search-togglebox input {
-	margin-left: 0.25em;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less b/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
deleted file mode 100644
index 8ec2735ea4..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.search.interwikiwidget.styles.less
+++ /dev/null
@@ -1,121 +0,0 @@
-/* interwiki search results */
-/*==========================*/
-
-@import 'mediawiki.ui/variables.less';
-@import 'mediawiki.mixins';
-
-.mw-searchresults-has-iw {
-
-	.iw-headline {
-		font-weight: bold;
-	}
-
-	.iw-results {
-		list-style: none;
-		margin: 0;
-	}
-
-	.iw-resultset {
-		.box-sizing(border-box);
-		padding: 0.5em;
-		vertical-align: top;
-		width: 100%;
-		float: left;
-		background-color: @colorGray15;
-		margin-bottom: 1em;
-		word-break: break-word;
-	}
-
-	.iw-result__title {
-		font-size: 108%; /* matching regular search title */
-	}
-
-	.iw-result:after,
-	.iw-result__content:after { /* clearfix */
-		visibility: hidden;
-		display: block;
-		font-size: 0;
-		content: ' ';
-		clear: both;
-		height: 0;
-	}
-
-	.iw-result__footer {
-		float: right;
-		font-size: 97%; /* matching main search result font-size */
-		margin-top: 0.5em;
-	}
-	.iw-result__footer a {
-		vertical-align: middle;
-		font-style: italic;
-	}
-
-	.oo-ui-icon-favicon {
-		padding-right: 1em;
-	}
-
-	/* image search result */
-	.iw-result__mini-gallery {
-		position: relative;
-		float: left;
-		width: 100%;
-		height: 200px;
-		.box-sizing(border-box);
-		padding: 0.25rem;
-	}
-
-	/* second and third images are small */
-	.iw-result__mini-gallery:nth-child( 2 ),
-	.iw-result__mini-gallery:nth-child( 3 ) { /* stylelint-disable-line indentation */
-		width: 50%;
-		height: 100px;
-	}
-
-	.iw-result__mini-gallery__image {
-		display: block;
-		position: relative;
-		width: 100%;
-		height: 100%;
-		background-size: 100% auto;
-		background-size: cover;
-		background-repeat: no-repeat;
-		background-position: center center;
-	}
-
-	/* image gallery text */
-	.iw-result__mini-gallery__image > .iw-result__mini-gallery__caption {
-		visibility: hidden;
-		position: absolute;
-		bottom: 0;
-		left: 0;
-		text-align: center;
-		color: #fff;
-		font-size: 0.8em;
-		padding: 0.5em;
-		background-color: rgba( 0, 0, 0, 0.5 );
-	}
-
-	.iw-result__mini-gallery__image:hover > .iw-result__mini-gallery__caption {
-		visibility: visible;
-	}
-
-	/* tablet and up */
-
-	@media only screen and ( min-width: @deviceWidthTablet ) {
-
-		#mw-interwiki-results {
-			width: 30%;
-			display: inline-block; /* used to align interwiki sidebar with the top of the main search results */
-			margin-left: 8%; /* since inline-block causes whitespace issues, this is 8 instead of 10% */
-		}
-		.mw-search-createlink,
-		.mw-search-nonefound,
-		.mw-search-results,
-		.mw-search-interwiki-header {
-			float: left;
-			width: 60%;
-			clear: left;
-			max-width: 60%;
-		}
-	}
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.js b/resources/src/mediawiki.special/mediawiki.special.search.js
deleted file mode 100644
index e809f2ea93..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.search.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*!
- * JavaScript for Special:Search
- */
-( function ( mw, $ ) {
-	$( function () {
-		var $checkboxes, $headerLinks, updateHeaderLinks, searchWidget;
-
-		// Emulate HTML5 autofocus behavior in non HTML5 compliant browsers
-		if ( !( 'autofocus' in document.createElement( 'input' ) ) ) {
-			$( 'input[autofocus]' ).eq( 0 ).focus();
-		}
-
-		// Create check all/none button
-		$checkboxes = $( '#powersearch input[id^=mw-search-ns]' );
-		$( '#mw-search-togglebox' ).append(
-			$( '<label>' )
-				.text( mw.msg( 'powersearch-togglelabel' ) )
-		).append(
-			$( '<input>' ).attr( 'type', 'button' )
-				.attr( 'id', 'mw-search-toggleall' )
-				.prop( 'value', mw.msg( 'powersearch-toggleall' ) )
-				.click( function () {
-					$checkboxes.prop( 'checked', true );
-				} )
-		).append(
-			$( '<input>' ).attr( 'type', 'button' )
-				.attr( 'id', 'mw-search-togglenone' )
-				.prop( 'value', mw.msg( 'powersearch-togglenone' ) )
-				.click( function () {
-					$checkboxes.prop( 'checked', false );
-				} )
-		);
-
-		// Change the header search links to what user entered
-		$headerLinks = $( '.search-types a' );
-		searchWidget = OO.ui.infuse( 'searchText' );
-		updateHeaderLinks = function ( value ) {
-			$headerLinks.each( function () {
-				var parts = $( this ).attr( 'href' ).split( 'search=' ),
-					lastpart = '',
-					prefix = 'search=';
-				if ( parts.length > 1 && parts[ 1 ].indexOf( '&' ) !== -1 ) {
-					lastpart = parts[ 1 ].slice( parts[ 1 ].indexOf( '&' ) );
-				} else {
-					prefix = '&search=';
-				}
-				this.href = parts[ 0 ] + prefix + encodeURIComponent( value ) + lastpart;
-			} );
-		};
-		searchWidget.on( 'change', updateHeaderLinks );
-		updateHeaderLinks( searchWidget.getValue() );
-
-		// When saving settings, use the proper request method (POST instead of GET).
-		$( '#mw-search-powersearch-remember' ).change( function () {
-			this.form.method = this.checked ? 'post' : 'get';
-		} ).trigger( 'change' );
-
-	} );
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.styles.css b/resources/src/mediawiki.special/mediawiki.special.search.styles.css
deleted file mode 100644
index ea9b987d37..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.search.styles.css
+++ /dev/null
@@ -1,166 +0,0 @@
-/* Special:Search */
-
-/*
- * Fixes sister projects box moving down the extract
- * of the first result (bug #16886).
- * It only happens when the window is small and
- * This changes slightly the layout for big screens
- * where there was space for the extracts and the
- * sister projects and thus it showed like in any
- * other browser.
- *
- * This will only affect IE 7 and lower
- */
-.searchresult {
-	display: inline !ie;
-}
-.searchresults {
-	margin: 1em 0 1em 0.4em;
-}
-/* needs extra specificity to override `.mw-body p` selector */
-.mw-body .mw-search-nonefound {
-	margin: 0;
-}
-
-.searchdidyoumean em,
-.searchmatch {
-	font-weight: bold;
-}
-
-.mw-search-results {
-	margin: 0;
-	max-width: 38em;
-}
-
-.mw-search-visualclear {
-	clear: both;
-}
-.mw-search-results li {
-	padding-bottom: 1.2em;
-	list-style: none;
-	list-style-image: none;
-}
-.mw-search-results li a {
-	font-size: 108%;
-}
-.mw-search-result-data {
-	color: #008000;
-	font-size: 97%;
-}
-.mw-search-profile-tabs {
-	background-color: #f8f9fa;
-	margin-top: 1em;
-	border: 1px solid #c8ccd1;
-	border-radius: 2px;
-}
-.search-types {
-	float: left;
-	padding-left: 0.25em;
-}
-.search-types ul {
-	margin: 0;
-	padding: 0;
-	list-style: none;
-}
-.search-types li {
-	float: left;
-	margin: 0;
-	padding: 0;
-}
-.search-types a {
-	display: block;
-	padding: 0.5em;
-}
-.search-types .current a {
-	color: #222;
-	cursor: default;
-}
-.search-types .current a:hover {
-	text-decoration: none;
-}
-.results-info {
-	float: right;
-	padding: 0.5em;
-	padding-right: 0.75em;
-	color: #54595d;
-	font-size: 95%;
-}
-#mw-search-top-table div.oo-ui-actionFieldLayout {
-	float: left;
-	width: 100%;
-}
-
-/* Advanced options menu */
-/*==========================*/
-
-#mw-searchoptions {
-	/* Support: Firefox, needs `clear: both` on `fieldset` when zoom level > 100%, see T176499 */
-	clear: both;
-	padding: 0.5em 0.75em 0.75em 0.75em;
-	background-color: #f8f9fa;
-	margin: -1px 0 0;
-	border: 1px solid #c8ccd1;
-	border-radius: 0 0 2px 2px;
-}
-#mw-searchoptions legend {
-	display: none;
-}
-#mw-searchoptions h4 {
-	padding: 0;
-	margin: 0;
-	float: left;
-}
-#mw-searchoptions table {
-	float: left;
-	margin-right: 3em;
-	border-collapse: collapse;
-}
-#mw-searchoptions table td {
-	padding: 0 1em 0 0;
-	white-space: nowrap;
-}
-#mw-searchoptions .divider {
-	clear: both;
-	border-bottom: 1px solid #eaecf0;
-	padding-top: 0.5em;
-	margin-bottom: 0.5em;
-}
-#mw-search-menu {
-	padding-left: 6em;
-	font-size: 85%;
-}
-
-#mw-search-interwiki {
-	float: right;
-	width: 18em;
-	border: 1px solid #a2a9b1;
-	margin-top: 2ex;
-}
-
-.searchalttitle,
-#mw-search-interwiki li {
-	font-size: 95%;
-}
-.mw-search-interwiki-more {
-	float: right;
-	font-size: 90%;
-}
-#mw-search-interwiki-caption {
-	text-align: center;
-	font-weight: bold;
-	font-size: 95%;
-}
-.mw-search-interwiki-project {
-	font-size: 97%;
-	text-align: left;
-	padding: 0.15em 0.15em 0.2em 0.2em;
-	background-color: #eaecf0;
-	border-top: 1px solid #c8ccd1;
-}
-
-.searchdidyoumean {
-	font-size: 127%;
-	margin-top: 0.8em;
-	/* Note that this color won't affect the link, as desired. */
-	color: #d33;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.undelete.js b/resources/src/mediawiki.special/mediawiki.special.undelete.js
deleted file mode 100644
index e3cf598454..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.undelete.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/*!
- * JavaScript for Special:Undelete
- */
-( function ( mw, $ ) {
-	$( function () {
-		var summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
-			summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
-			wpComment = OO.ui.infuse( $( '#wpComment' ).closest( '.oo-ui-widget' ) );
-
-		$( '#mw-undelete-invert' ).click( function () {
-			$( '.mw-undelete-revlist input[type="checkbox"]' ).prop( 'checked', function ( i, val ) {
-				return !val;
-			} );
-		} );
-
-		// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
-		if ( summaryCodePointLimit ) {
-			mw.widgets.visibleCodePointLimit( wpComment, summaryCodePointLimit );
-		} else if ( summaryByteLimit ) {
-			mw.widgets.visibleByteLimit( wpComment, summaryByteLimit );
-		}
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css b/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css
deleted file mode 100644
index 69fec08196..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.css
+++ /dev/null
@@ -1,7 +0,0 @@
-.mw-watched-item {
-	text-decoration: line-through;
-}
-
-.mw-watch-link-disabled {
-	pointer-events: none;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js b/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js
deleted file mode 100644
index 0886f8c7e9..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.unwatchedPages.js
+++ /dev/null
@@ -1,49 +0,0 @@
-/*!
- * JavaScript for Special:UnwatchedPages
- */
-( function ( mw, $ ) {
-	$( function () {
-		$( 'a.mw-watch-link' ).click( function ( e ) {
-			var promise,
-				api = new mw.Api(),
-				$link = $( this ),
-				$subjectLink = $link.closest( 'li' ).children( 'a' ).eq( 0 ),
-				title = mw.util.getParamValue( 'title', $link.attr( 'href' ) );
-			// nice format
-			title = mw.Title.newFromText( title ).toText();
-			$link.addClass( 'mw-watch-link-disabled' );
-
-			// Preload the notification module for mw.notify
-			mw.loader.load( 'mediawiki.notification' );
-
-			// Use the class to determine whether to watch or unwatch
-			if ( !$subjectLink.hasClass( 'mw-watched-item' ) ) {
-				$link.text( mw.msg( 'watching' ) );
-				promise = api.watch( title ).done( function () {
-					$subjectLink.addClass( 'mw-watched-item' );
-					$link.text( mw.msg( 'unwatch' ) );
-					mw.notify( mw.msg( 'addedwatchtext-short', title ) );
-				} ).fail( function () {
-					$link.text( mw.msg( 'watch' ) );
-					mw.notify( mw.msg( 'watcherrortext', title ), { type: 'error' } );
-				} );
-			} else {
-				$link.text( mw.msg( 'unwatching' ) );
-				promise = api.unwatch( title ).done( function () {
-					$subjectLink.removeClass( 'mw-watched-item' );
-					$link.text( mw.msg( 'watch' ) );
-					mw.notify( mw.msg( 'removedwatchtext-short', title ) );
-				} ).fail( function () {
-					$link.text( mw.msg( 'unwatch' ) );
-					mw.notify( mw.msg( 'watcherrortext', title ), { type: 'error' } );
-				} );
-			}
-
-			promise.always( function () {
-				$link.removeClass( 'mw-watch-link-disabled' );
-			} );
-
-			e.preventDefault();
-		} );
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
deleted file mode 100644
index 144659a7fb..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ /dev/null
@@ -1,654 +0,0 @@
-/**
- * JavaScript for Special:Upload
- *
- * @private
- * @class mw.special.upload
- * @singleton
- */
-
-/* global Uint8Array */
-
-( function ( mw, $ ) {
-	var uploadWarning, uploadTemplatePreview,
-		ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
-		$license = $( '#wpLicense' );
-
-	window.wgUploadWarningObj = uploadWarning = {
-		responseCache: { '': '&nbsp;' },
-		nameToCheck: '',
-		typing: false,
-		delay: 500, // ms
-		timeoutID: false,
-
-		keypress: function () {
-			if ( !ajaxUploadDestCheck ) {
-				return;
-			}
-
-			// Find file to upload
-			if ( !$( '#wpDestFile' ).length || !$( '#wpDestFile-warning' ).length ) {
-				return;
-			}
-
-			this.nameToCheck = $( '#wpDestFile' ).val();
-
-			// Clear timer
-			if ( this.timeoutID ) {
-				clearTimeout( this.timeoutID );
-			}
-			// Check response cache
-			if ( this.responseCache.hasOwnProperty( this.nameToCheck ) ) {
-				this.setWarning( this.responseCache[ this.nameToCheck ] );
-				return;
-			}
-
-			this.timeoutID = setTimeout( function () {
-				uploadWarning.timeout();
-			}, this.delay );
-		},
-
-		checkNow: function ( fname ) {
-			if ( !ajaxUploadDestCheck ) {
-				return;
-			}
-			if ( this.timeoutID ) {
-				clearTimeout( this.timeoutID );
-			}
-			this.nameToCheck = fname;
-			this.timeout();
-		},
-
-		timeout: function () {
-			var $spinnerDestCheck, title;
-			if ( !ajaxUploadDestCheck || this.nameToCheck.trim() === '' ) {
-				return;
-			}
-			$spinnerDestCheck = $.createSpinner().insertAfter( '#wpDestFile' );
-			title = mw.Title.newFromText( this.nameToCheck, mw.config.get( 'wgNamespaceIds' ).file );
-
-			( new mw.Api() ).get( {
-				formatversion: 2,
-				action: 'query',
-				// If title is empty, user input is invalid, the API call will produce details about why
-				titles: [ title ? title.getPrefixedText() : this.nameToCheck ],
-				prop: 'imageinfo',
-				iiprop: 'uploadwarning',
-				errorformat: 'html',
-				errorlang: mw.config.get( 'wgUserLanguage' )
-			} ).done( function ( result ) {
-				var
-					resultOut = '',
-					page = result.query.pages[ 0 ];
-				if ( page.imageinfo ) {
-					resultOut = page.imageinfo[ 0 ].html;
-				} else if ( page.invalidreason ) {
-					resultOut = page.invalidreason.html;
-				}
-				uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
-			} ).always( function () {
-				$spinnerDestCheck.remove();
-			} );
-		},
-
-		processResult: function ( result, fileName ) {
-			this.setWarning( result );
-			this.responseCache[ fileName ] = result;
-		},
-
-		setWarning: function ( warning ) {
-			var $warningBox = $( '#wpDestFile-warning' ),
-				$warning = $( $.parseHTML( warning ) );
-			mw.hook( 'wikipage.content' ).fire( $warning );
-			$warningBox.empty().append( $warning );
-
-			// Set a value in the form indicating that the warning is acknowledged and
-			// doesn't need to be redisplayed post-upload
-			if ( !warning ) {
-				$( '#wpDestFileWarningAck' ).val( '' );
-				$warningBox.removeAttr( 'class' );
-			} else {
-				$( '#wpDestFileWarningAck' ).val( '1' );
-				$warningBox.attr( 'class', 'mw-destfile-warning' );
-			}
-
-		}
-	};
-
-	window.wgUploadTemplatePreviewObj = uploadTemplatePreview = {
-
-		responseCache: { '': '' },
-
-		/**
-		 * @param {jQuery} $element The element whose .val() will be previewed
-		 * @param {jQuery} $previewContainer The container to display the preview in
-		 */
-		getPreview: function ( $element, $previewContainer ) {
-			var template = $element.val(),
-				$spinner;
-
-			if ( this.responseCache.hasOwnProperty( template ) ) {
-				this.showPreview( this.responseCache[ template ], $previewContainer );
-				return;
-			}
-
-			$spinner = $.createSpinner().insertAfter( $element );
-
-			( new mw.Api() ).parse( '{{' + template + '}}', {
-				title: $( '#wpDestFile' ).val() || 'File:Sample.jpg',
-				prop: 'text',
-				pst: true,
-				uselang: mw.config.get( 'wgUserLanguage' )
-			} ).done( function ( result ) {
-				uploadTemplatePreview.processResult( result, template, $previewContainer );
-			} ).always( function () {
-				$spinner.remove();
-			} );
-		},
-
-		processResult: function ( result, template, $previewContainer ) {
-			this.responseCache[ template ] = result;
-			this.showPreview( this.responseCache[ template ], $previewContainer );
-		},
-
-		showPreview: function ( preview, $previewContainer ) {
-			$previewContainer.html( preview );
-		}
-
-	};
-
-	$( function () {
-		// AJAX wpDestFile warnings
-		if ( ajaxUploadDestCheck ) {
-			// Insert an event handler that fetches upload warnings when wpDestFile
-			// has been changed
-			$( '#wpDestFile' ).change( function () {
-				uploadWarning.checkNow( $( this ).val() );
-			} );
-			// Insert a row where the warnings will be displayed just below the
-			// wpDestFile row
-			$( '#mw-htmlform-description tbody' ).append(
-				$( '<tr>' ).append(
-					$( '<td>' )
-						.attr( 'id', 'wpDestFile-warning' )
-						.attr( 'colspan', 2 )
-				)
-			);
-		}
-
-		if ( mw.config.get( 'wgAjaxLicensePreview' ) && $license.length ) {
-			// License selector check
-			$license.change( function () {
-				// We might show a preview
-				uploadTemplatePreview.getPreview( $license, $( '#mw-license-preview' ) );
-			} );
-
-			// License selector table row
-			$license.closest( 'tr' ).after(
-				$( '<tr>' ).append(
-					$( '<td>' ),
-					$( '<td>' ).attr( 'id', 'mw-license-preview' )
-				)
-			);
-		}
-
-		// fillDestFile setup
-		mw.config.get( 'wgUploadSourceIds' ).forEach( function ( sourceId ) {
-			$( '#' + sourceId ).change( function () {
-				var path, slash, backslash, fname;
-				if ( !mw.config.get( 'wgUploadAutoFill' ) ) {
-					return;
-				}
-				// Remove any previously flagged errors
-				$( '#mw-upload-permitted' ).attr( 'class', '' );
-				$( '#mw-upload-prohibited' ).attr( 'class', '' );
-
-				path = $( this ).val();
-				// Find trailing part
-				slash = path.lastIndexOf( '/' );
-				backslash = path.lastIndexOf( '\\' );
-				if ( slash === -1 && backslash === -1 ) {
-					fname = path;
-				} else if ( slash > backslash ) {
-					fname = path.slice( slash + 1 );
-				} else {
-					fname = path.slice( backslash + 1 );
-				}
-
-				// Clear the filename if it does not have a valid extension.
-				// URLs are less likely to have a useful extension, so don't include them in the
-				// extension check.
-				if (
-					mw.config.get( 'wgCheckFileExtensions' ) &&
-					mw.config.get( 'wgStrictFileExtensions' ) &&
-					Array.isArray( mw.config.get( 'wgFileExtensions' ) ) &&
-					$( this ).attr( 'id' ) !== 'wpUploadFileURL'
-				) {
-					if (
-						fname.lastIndexOf( '.' ) === -1 ||
-						mw.config.get( 'wgFileExtensions' ).map( function ( element ) {
-							return element.toLowerCase();
-						} ).indexOf( fname.slice( fname.lastIndexOf( '.' ) + 1 ).toLowerCase() ) === -1
-					) {
-						// Not a valid extension
-						// Clear the upload and set mw-upload-permitted to error
-						$( this ).val( '' );
-						$( '#mw-upload-permitted' ).attr( 'class', 'error' );
-						$( '#mw-upload-prohibited' ).attr( 'class', 'error' );
-						// Clear wpDestFile as well
-						$( '#wpDestFile' ).val( '' );
-
-						return false;
-					}
-				}
-
-				// Replace spaces by underscores
-				fname = fname.replace( / /g, '_' );
-				// Capitalise first letter if needed
-				if ( mw.config.get( 'wgCapitalizeUploads' ) ) {
-					fname = fname[ 0 ].toUpperCase() + fname.slice( 1 );
-				}
-
-				// Output result
-				if ( $( '#wpDestFile' ).length ) {
-					// Call decodeURIComponent function to remove possible URL-encoded characters
-					// from the file name (T32390). Especially likely with upload-form-url.
-					// decodeURIComponent can throw an exception if input is invalid utf-8
-					try {
-						$( '#wpDestFile' ).val( decodeURIComponent( fname ) );
-					} catch ( err ) {
-						$( '#wpDestFile' ).val( fname );
-					}
-					uploadWarning.checkNow( fname );
-				}
-			} );
-		} );
-	} );
-
-	// Add a preview to the upload form
-	$( function () {
-		/**
-		 * Is the FileAPI available with sufficient functionality?
-		 *
-		 * @return {boolean}
-		 */
-		function hasFileAPI() {
-			return window.FileReader !== undefined;
-		}
-
-		/**
-		 * Check if this is a recognizable image type...
-		 * Also excludes files over 10M to avoid going insane on memory usage.
-		 *
-		 * TODO: Is there a way we can ask the browser what's supported in `<img>`s?
-		 *
-		 * TODO: Put SVG back after working around Firefox 7 bug <https://phabricator.wikimedia.org/T33643>
-		 *
-		 * @param {File} file
-		 * @return {boolean}
-		 */
-		function fileIsPreviewable( file ) {
-			var known = [ 'image/png', 'image/gif', 'image/jpeg', 'image/svg+xml' ],
-				tooHuge = 10 * 1024 * 1024;
-			return ( known.indexOf( file.type ) !== -1 ) && file.size > 0 && file.size < tooHuge;
-		}
-
-		/**
-		 * Format a file size attractively.
-		 *
-		 * TODO: Match numeric formatting
-		 *
-		 * @param {number} s
-		 * @return {string}
-		 */
-		function prettySize( s ) {
-			var sizeMsgs = [ 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ];
-			while ( s >= 1024 && sizeMsgs.length > 1 ) {
-				s /= 1024;
-				sizeMsgs = sizeMsgs.slice( 1 );
-			}
-			return mw.msg( sizeMsgs[ 0 ], Math.round( s ) );
-		}
-
-		/**
-		 * Start loading a file into memory; when complete, pass it as a
-		 * data URL to the callback function. If the callbackBinary is set it will
-		 * first be read as binary and afterwards as data URL. Useful if you want
-		 * to do preprocessing on the binary data first.
-		 *
-		 * @param {File} file
-		 * @param {Function} callback
-		 * @param {Function} callbackBinary
-		 */
-		function fetchPreview( file, callback, callbackBinary ) {
-			var reader = new FileReader();
-			if ( callbackBinary && 'readAsBinaryString' in reader ) {
-				// To fetch JPEG metadata we need a binary string; start there.
-				// TODO
-				reader.onload = function () {
-					callbackBinary( reader.result );
-
-					// Now run back through the regular code path.
-					fetchPreview( file, callback );
-				};
-				reader.readAsBinaryString( file );
-			} else if ( callbackBinary && 'readAsArrayBuffer' in reader ) {
-				// readAsArrayBuffer replaces readAsBinaryString
-				// However, our JPEG metadata library wants a string.
-				// So, this is going to be an ugly conversion.
-				reader.onload = function () {
-					var i,
-						buffer = new Uint8Array( reader.result ),
-						string = '';
-					for ( i = 0; i < buffer.byteLength; i++ ) {
-						string += String.fromCharCode( buffer[ i ] );
-					}
-					callbackBinary( string );
-
-					// Now run back through the regular code path.
-					fetchPreview( file, callback );
-				};
-				reader.readAsArrayBuffer( file );
-			} else if ( 'URL' in window && 'createObjectURL' in window.URL ) {
-				// Supported in Firefox 4.0 and above <https://developer.mozilla.org/en-US/docs/Web/API/URL/createObjectURL>
-				// WebKit has it in a namespace for now but that's ok. ;)
-				//
-				// Lifetime of this URL is until document close, which is fine
-				// for Special:Upload -- if this code gets used on longer-running
-				// pages, add a revokeObjectURL() when it's no longer needed.
-				//
-				// Prefer this over readAsDataURL for Firefox 7 due to bug reading
-				// some SVG files from data URIs <https://bugzilla.mozilla.org/show_bug.cgi?id=694165>
-				callback( window.URL.createObjectURL( file ) );
-			} else {
-				// This ends up decoding the file to base-64 and back again, which
-				// feels horribly inefficient.
-				reader.onload = function () {
-					callback( reader.result );
-				};
-				reader.readAsDataURL( file );
-			}
-		}
-
-		/**
-		 * Clear the file upload preview area.
-		 */
-		function clearPreview() {
-			$( '#mw-upload-thumbnail' ).remove();
-		}
-
-		/**
-		 * Show a thumbnail preview of PNG, JPEG, GIF, and SVG files prior to upload
-		 * in browsers supporting HTML5 FileAPI.
-		 *
-		 * As of this writing, known good:
-		 *
-		 * - Firefox 3.6+
-		 * - Chrome 7.something
-		 *
-		 * TODO: Check file size limits and warn of likely failures
-		 *
-		 * @param {File} file
-		 */
-		function showPreview( file ) {
-			var $canvas,
-				ctx,
-				meta,
-				previewSize = 180,
-				$spinner = $.createSpinner( { size: 'small', type: 'block' } )
-					.css( { width: previewSize, height: previewSize } ),
-				thumb = mw.template.get( 'mediawiki.special.upload', 'thumbnail.html' ).render();
-
-			thumb
-				.find( '.filename' ).text( file.name ).end()
-				.find( '.fileinfo' ).text( prettySize( file.size ) ).end()
-				.find( '.thumbinner' ).prepend( $spinner ).end();
-
-			$canvas = $( '<canvas>' ).attr( { width: previewSize, height: previewSize } );
-			ctx = $canvas[ 0 ].getContext( '2d' );
-			$( '#mw-htmlform-source' ).parent().prepend( thumb );
-
-			fetchPreview( file, function ( dataURL ) {
-				var img = new Image(),
-					rotation = 0;
-
-				if ( meta && meta.tiff && meta.tiff.Orientation ) {
-					rotation = ( 360 - ( function () {
-						// See BitmapHandler class in PHP
-						switch ( meta.tiff.Orientation.value ) {
-							case 8:
-								return 90;
-							case 3:
-								return 180;
-							case 6:
-								return 270;
-							default:
-								return 0;
-						}
-					}() ) ) % 360;
-				}
-
-				img.onload = function () {
-					var info, width, height, x, y, dx, dy, logicalWidth, logicalHeight;
-
-					// Fit the image within the previewSizexpreviewSize box
-					if ( img.width > img.height ) {
-						width = previewSize;
-						height = img.height / img.width * previewSize;
-					} else {
-						height = previewSize;
-						width = img.width / img.height * previewSize;
-					}
-					// Determine the offset required to center the image
-					dx = ( 180 - width ) / 2;
-					dy = ( 180 - height ) / 2;
-					switch ( rotation ) {
-						// If a rotation is applied, the direction of the axis
-						// changes as well. You can derive the values below by
-						// drawing on paper an axis system, rotate it and see
-						// where the positive axis direction is
-						case 0:
-							x = dx;
-							y = dy;
-							logicalWidth = img.width;
-							logicalHeight = img.height;
-							break;
-						case 90:
-
-							x = dx;
-							y = dy - previewSize;
-							logicalWidth = img.height;
-							logicalHeight = img.width;
-							break;
-						case 180:
-							x = dx - previewSize;
-							y = dy - previewSize;
-							logicalWidth = img.width;
-							logicalHeight = img.height;
-							break;
-						case 270:
-							x = dx - previewSize;
-							y = dy;
-							logicalWidth = img.height;
-							logicalHeight = img.width;
-							break;
-					}
-
-					ctx.clearRect( 0, 0, 180, 180 );
-					ctx.rotate( rotation / 180 * Math.PI );
-					ctx.drawImage( img, x, y, width, height );
-					$spinner.replaceWith( $canvas );
-
-					// Image size
-					info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
-						', ' + prettySize( file.size );
-
-					$( '#mw-upload-thumbnail .fileinfo' ).text( info );
-				};
-				img.onerror = function () {
-					// Can happen for example for invalid SVG files
-					clearPreview();
-				};
-				img.src = dataURL;
-			}, mw.config.get( 'wgFileCanRotate' ) ? function ( data ) {
-				var jpegmeta = mw.loader.require( 'mediawiki.libs.jpegmeta' );
-				try {
-					meta = jpegmeta( data, file.fileName );
-					// eslint-disable-next-line no-underscore-dangle, camelcase
-					meta._binary_data = null;
-				} catch ( e ) {
-					meta = null;
-				}
-			} : null );
-		}
-
-		/**
-		 * Check if the file does not exceed the maximum size
-		 *
-		 * @param {File} file
-		 * @return {boolean}
-		 */
-		function checkMaxUploadSize( file ) {
-			var maxSize, $error;
-
-			function getMaxUploadSize( type ) {
-				var sizes = mw.config.get( 'wgMaxUploadSize' );
-
-				if ( sizes[ type ] !== undefined ) {
-					return sizes[ type ];
-				}
-				return sizes[ '*' ];
-			}
-
-			$( '.mw-upload-source-error' ).remove();
-
-			maxSize = getMaxUploadSize( 'file' );
-			if ( file.size > maxSize ) {
-				$error = $( '<p class="error mw-upload-source-error" id="wpSourceTypeFile-error">' +
-					mw.message( 'largefileserver', file.size, maxSize ).escaped() + '</p>' );
-
-				$( '#wpUploadFile' ).after( $error );
-
-				return false;
-			}
-
-			return true;
-		}
-
-		/* Initialization */
-		if ( hasFileAPI() ) {
-			// Update thumbnail when the file selection control is updated.
-			$( '#wpUploadFile' ).change( function () {
-				var file;
-				clearPreview();
-				if ( this.files && this.files.length ) {
-					// Note: would need to be updated to handle multiple files.
-					file = this.files[ 0 ];
-
-					if ( !checkMaxUploadSize( file ) ) {
-						return;
-					}
-
-					if ( fileIsPreviewable( file ) ) {
-						showPreview( file );
-					}
-				}
-			} );
-		}
-	} );
-
-	// Disable all upload source fields except the selected one
-	$( function () {
-		var $rows = $( '.mw-htmlform-field-UploadSourceField' );
-
-		$rows.on( 'change', 'input[type="radio"]', function ( e ) {
-			var currentRow = e.delegateTarget;
-
-			if ( !this.checked ) {
-				return;
-			}
-
-			$( '.mw-upload-source-error' ).remove();
-
-			// Enable selected upload method
-			$( currentRow ).find( 'input' ).prop( 'disabled', false );
-
-			// Disable inputs of other upload methods
-			// (except for the radio button to re-enable it)
-			$rows
-				.not( currentRow )
-				.find( 'input[type!="radio"]' )
-				.prop( 'disabled', true );
-		} );
-
-		// Set initial state
-		if ( !$( '#wpSourceTypeurl' ).prop( 'checked' ) ) {
-			$( '#wpUploadFileURL' ).prop( 'disabled', true );
-		}
-	} );
-
-	$( function () {
-		// Prevent losing work
-		var allowCloseWindow,
-			$uploadForm = $( '#mw-upload-form' );
-
-		if ( !mw.user.options.get( 'useeditwarning' ) ) {
-			// If the user doesn't want edit warnings, don't set things up.
-			return;
-		}
-
-		$uploadForm.data( 'origtext', $uploadForm.serialize() );
-
-		allowCloseWindow = mw.confirmCloseWindow( {
-			test: function () {
-				return $( '#wpUploadFile' ).get( 0 ).files.length !== 0 ||
-					$uploadForm.data( 'origtext' ) !== $uploadForm.serialize();
-			},
-
-			message: mw.msg( 'editwarning-warning' ),
-			namespace: 'uploadwarning'
-		} );
-
-		$uploadForm.submit( function () {
-			allowCloseWindow.release();
-		} );
-	} );
-
-	// Add tabindex to mw-editTools
-	$( function () {
-		// Function to change tabindex for all links within mw-editTools
-		function setEditTabindex( $val ) {
-			$( '.mw-editTools' ).find( 'a' ).each( function () {
-				$( this ).attr( 'tabindex', $val );
-			} );
-		}
-
-		// Change tabindex to 0 if user pressed spaced or enter while focused
-		$( '.mw-editTools' ).on( 'keypress', function ( e ) {
-			// Don't continue if pressed key was not enter or spacebar
-			if ( e.which !== 13 && e.which !== 32 ) {
-				return;
-			}
-
-			// Change tabindex only when main div has focus
-			if ( $( this ).is( ':focus' ) ) {
-				$( this ).find( 'a' ).first().focus();
-				setEditTabindex( '0' );
-			}
-		} );
-
-		// Reset tabindex for elements when user focused out mw-editTools
-		$( '.mw-editTools' ).on( 'focusout', function ( e ) {
-			// Don't continue if relatedTarget is within mw-editTools
-			if ( e.relatedTarget !== null && $( e.relatedTarget ).closest( '.mw-editTools' ).length > 0 ) {
-				return;
-			}
-
-			// Reset tabindex back to -1
-			setEditTabindex( '-1' );
-		} );
-
-		// Set initial tabindex for mw-editTools to 0 and to -1 for all links
-		$( '.mw-editTools' ).attr( 'tabindex', '0' );
-		setEditTabindex( '-1' );
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.styles.css b/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
deleted file mode 100644
index 626a7e8b58..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.upload.styles.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Styling for Special:Upload
- */
-.mw-destfile-warning {
-	border: 1px solid #fde29b;
-	padding: 0.5em 1em;
-	margin-bottom: 1em;
-	color: #705000;
-	background-color: #fdf1d1;
-}
-
-p.mw-upload-editlicenses {
-	font-size: 90%;
-	text-align: right;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
deleted file mode 100644
index 2366249253..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.css
+++ /dev/null
@@ -1,75 +0,0 @@
-/* User login and signup forms */
-.mw-ui-vform .mw-form-related-link-container {
-	margin-bottom: 0.5em;
-	text-align: center;
-}
-
-.mw-ui-vform .mw-secure {
-	/* @embed */
-	background: url( images/icon-lock.png ) no-repeat left center;
-	margin: 0 0 0 1px;
-	padding: 0 0 0 11px;
-}
-
-/*
- * When inside the VForm style, disable the border that Vector and other skins
- * put on the div surrounding the login/create account form.
- * Also disable the margin and padding that Vector puts around the form.
- */
-.mw-ui-container #userloginForm,
-.mw-ui-container #userlogin {
-	border: 0;
-	margin: 0;
-	padding: 0;
-}
-
-/* Reposition and resize language links, which appear on a per-wiki basis */
-.mw-ui-container #languagelinks {
-	margin-bottom: 2em;
-	font-size: 0.8em;
-}
-
-/* Put some space under template's header, which may contain CAPTCHA HTML. */
-section.mw-form-header {
-	margin-bottom: 10px;
-}
-
-/* shuffled CAPTCHA */
-#wpCaptchaWord {
-	margin-top: 6px;
-}
-
-.fancycaptcha-captcha-container {
-	background-color: #f8f9fa;
-	margin-bottom: 15px;
-	border: 1px solid #c8ccd1;
-	border-radius: 2px;
-	padding: 8px;
-	text-align: center;
-}
-
-.mw-createacct-captcha-assisted {
-	display: block;
-	margin-top: 0.5em;
-}
-
-/* Put a border around the fancycaptcha-image-container. */
-.fancycaptcha-captcha-and-reload {
-	border: 1px solid #c8ccd1;
-	border-radius: 2px 2px 0 0;
-	/* Other display formats end up too wide */
-	display: table-cell;
-	width: 270px;
-	background-color: #fff;
-}
-
-.fancycaptcha-captcha-container .mw-ui-input {
-	margin-top: -1px;
-	border-color: #c8ccd1;
-	border-radius: 0 0 2px 2px;
-}
-
-/* Make the fancycaptcha-image-container full-width within its parent. */
-.fancycaptcha-image-container {
-	width: 100%;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css
deleted file mode 100644
index fe013bc845..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.login.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* The login form invites users to create an account */
-#mw-createaccount-cta {
-	width: 20em;
-	/* @embed */
-	background: url( images/glyph-people-large.png ) no-repeat 50%;
-	margin: 0 auto;
-	padding-top: 7.8em;
-	font-weight: bold;
-}
-
-/* Login Button, following 'ButtonWidget (progressive)' from OOUI */
-#mw-createaccount-join {
-	background-color: #f8f9fa;
-	color: #36c;
-}
-#mw-createaccount-join:hover {
-	background-color: #fff;
-	border-color: #859ecc;
-	box-shadow: none;
-}
-#mw-createaccount-join:active {
-	background-color: #eff3fa;
-	color: #2a4b8d;
-	border-color: #2a4b8d;
-}
-#mw-createaccount-join:focus {
-	border-color: #36c;
-	box-shadow: inset 0 0 0 1px #36c;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
deleted file mode 100644
index 3cfa5a8c44..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.css
+++ /dev/null
@@ -1,67 +0,0 @@
-/* Disable the underline that Vector puts on h2 headings, and bold them. */
-.mw-ui-container h2 {
-	border: 0;
-	font-weight: bold;
-}
-
-/* Benefits column CSS to the right (if it fits) of the form. */
-.mw-ui-container #userloginForm {
-	float: left;
-	/* Override the right margin of the form to give space in case a benefits
-	 * column appears to the side. */
-	margin-right: 100px;
-	/* Override `.mw-body-content` to ensure useful, readable paragraphs */
-	line-height: 1.4;
-}
-
-.mw-createacct-benefits-container {
-	/* Keeps this column compact and close to the form, but tends to squish contents. */
-	float: left;
-}
-
-.mw-createacct-benefits-container h2 {
-	margin-bottom: 30px;
-}
-
-.mw-number-text.icon-edits {
-	/* @embed */
-	background: url( images/icon-edits.png ) no-repeat left center;
-}
-
-.mw-number-text.icon-pages {
-	/* @embed */
-	background: url( images/icon-pages.png ) no-repeat left center;
-}
-
-.mw-number-text.icon-contributors {
-	/* @embed */
-	background: url( images/icon-contributors.png ) no-repeat left center;
-}
-
-/*
- * Special font for numbers in benefits, same as Vector's `@content-heading-font-family`.
- * Needs an ID so that it's more specific than Vector's div#content h3.
- */
-#bodyContent .mw-number-text h3 {
-	color: #222;
-	margin: 0;
-	padding: 0;
-	font-family: 'Linux Libertine', 'Georgia', 'Times', serif;
-	font-weight: normal;
-	font-size: 2.2em;
-	line-height: 1.2;
-	text-align: center;
-}
-
-/* Contains a “headlined” number and explanatory text, with space for an icon */
-.mw-number-text {
-	display: block;
-	font-size: 1.2em;
-	color: #444;
-	margin-top: 1em;
-	/* 80px wide icon plus "margin" */
-	padding: 0 0 0 95px;
-	/* Matches max icon height, ensures icon emblem is visible */
-	min-height: 75px;
-	text-align: center;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js
deleted file mode 100644
index 8a61afbe6a..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*!
- * JavaScript for signup form.
- */
-( function ( mw, $ ) {
-	// When sending password by email, hide the password input fields.
-	$( function () {
-		// Always required if checked, otherwise it depends, so we use the original
-		var $emailLabel = $( 'label[for="wpEmail"]' ),
-			originalText = $emailLabel.text(),
-			requiredText = mw.message( 'createacct-emailrequired' ).text(),
-			$createByMailCheckbox = $( '#wpCreateaccountMail' ),
-			$beforePwds = $( '.mw-row-password:first' ).prev(),
-			$pwds;
-
-		function updateForCheckbox() {
-			var checked = $createByMailCheckbox.prop( 'checked' );
-			if ( checked ) {
-				$pwds = $( '.mw-row-password' ).detach();
-				$emailLabel.text( requiredText );
-			} else {
-				if ( $pwds ) {
-					$beforePwds.after( $pwds );
-					$pwds = null;
-				}
-				$emailLabel.text( originalText );
-			}
-		}
-
-		$createByMailCheckbox.on( 'change', updateForCheckbox );
-		updateForCheckbox();
-	} );
-
-	// Check if the username is invalid or already taken
-	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
-		var $usernameInput = $root.find( '#wpName2' ),
-			$passwordInput = $root.find( '#wpPassword2' ),
-			$emailInput = $root.find( '#wpEmail' ),
-			$realNameInput = $root.find( '#wpRealName' ),
-			api = new mw.Api(),
-			usernameChecker, passwordChecker;
-
-		function checkUsername( username ) {
-			// We could just use .then() if we didn't have to pass on .abort()…
-			var d, apiPromise;
-
-			d = $.Deferred();
-			apiPromise = api.get( {
-				action: 'query',
-				list: 'users',
-				ususers: username,
-				usprop: 'cancreate',
-				formatversion: 2,
-				errorformat: 'html',
-				errorsuselocal: true,
-				uselang: mw.config.get( 'wgUserLanguage' )
-			} )
-				.done( function ( resp ) {
-					var userinfo = resp.query.users[ 0 ];
-
-					if ( resp.query.users.length !== 1 || userinfo.invalid ) {
-						d.resolve( { valid: false, messages: [ mw.message( 'noname' ).parseDom() ] } );
-					} else if ( userinfo.userid !== undefined ) {
-						d.resolve( { valid: false, messages: [ mw.message( 'userexists' ).parseDom() ] } );
-					} else if ( !userinfo.cancreate ) {
-						d.resolve( {
-							valid: false,
-							messages: userinfo.cancreateerror ? userinfo.cancreateerror.map( function ( m ) {
-								return m.html;
-							} ) : []
-						} );
-					} else {
-						d.resolve( { valid: true, messages: [] } );
-					}
-				} )
-				.fail( d.reject );
-
-			return d.promise( { abort: apiPromise.abort } );
-		}
-
-		function checkPassword() {
-			// We could just use .then() if we didn't have to pass on .abort()…
-			var apiPromise,
-				d = $.Deferred();
-
-			if ( $usernameInput.val().trim() === '' ) {
-				d.resolve( { valid: true, messages: [] } );
-				return d.promise();
-			}
-
-			apiPromise = api.post( {
-				action: 'validatepassword',
-				user: $usernameInput.val(),
-				password: $passwordInput.val(),
-				email: $emailInput.val() || '',
-				realname: $realNameInput.val() || '',
-				formatversion: 2,
-				errorformat: 'html',
-				errorsuselocal: true,
-				uselang: mw.config.get( 'wgUserLanguage' )
-			} )
-				.done( function ( resp ) {
-					var pwinfo = resp.validatepassword || {};
-
-					d.resolve( {
-						valid: pwinfo.validity === 'Good',
-						messages: pwinfo.validitymessages ? pwinfo.validitymessages.map( function ( m ) {
-							return m.html;
-						} ) : []
-					} );
-				} )
-				.fail( d.reject );
-
-			return d.promise( { abort: apiPromise.abort } );
-		}
-
-		usernameChecker = new mw.htmlform.Checker( $usernameInput, checkUsername );
-		usernameChecker.attach();
-
-		passwordChecker = new mw.htmlform.Checker( $passwordInput, checkPassword );
-		passwordChecker.attach( $usernameInput.add( $emailInput ).add( $realNameInput ) );
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.css b/resources/src/mediawiki.special/mediawiki.special.userrights.css
deleted file mode 100644
index 1ffdf70ee5..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.css
+++ /dev/null
@@ -1,35 +0,0 @@
-/*!
- * Styling for Special:UserRights
- */
-.mw-userrights-nested {
-	margin-left: 1.2em;
-}
-
-.mw-userrights-nested span {
-	margin-left: 0.3em;
-	display: inline-block;
-	vertical-align: middle;
-}
-
-.mw-userrights-disabled {
-	color: #72777d;
-}
-.mw-userrights-groups * td,
-.mw-userrights-groups * th {
-	padding-right: 1.5em;
-}
-
-.mw-userrights-groups * th {
-	text-align: left;
-}
-
-/* Dynamically show/hide the expiry selection underneath each checkbox */
-input.mw-userrights-groupcheckbox:not( :checked ) ~ .mw-userrights-nested {
-	display: none;
-}
-
-/* Initial hide the expiry fields to prevent a FOUC on loading */
-/* The input fields gets unhidden by JavaScript when needed */
-.client-js .mw-userrights-expiryfield {
-	display: none;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.userrights.js b/resources/src/mediawiki.special/mediawiki.special.userrights.js
deleted file mode 100644
index 487e63a67d..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userrights.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*!
- * JavaScript for Special:UserRights
- */
-( function ( mw, $ ) {
-	var convertmessagebox = require( 'mediawiki.notification.convertmessagebox' ),
-		summaryCodePointLimit = mw.config.get( 'wgCommentCodePointLimit' ),
-		summaryByteLimit = mw.config.get( 'wgCommentByteLimit' ),
-		$wpReason = $( '#wpReason' );
-
-	// Replace successbox with notifications
-	convertmessagebox();
-
-	// Dynamically show/hide the "other time" input under each dropdown
-	$( '.mw-userrights-nested select' ).on( 'change', function ( e ) {
-		$( e.target.parentNode ).find( 'input' ).toggle( $( e.target ).val() === 'other' );
-	} );
-
-	// Limit to bytes or UTF-8 codepoints, depending on MediaWiki's configuration
-	if ( summaryCodePointLimit ) {
-		$wpReason.codePointLimit( summaryCodePointLimit );
-	} else if ( summaryByteLimit ) {
-		$wpReason.byteLimit( summaryByteLimit );
-	}
-
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.version.css b/resources/src/mediawiki.special/mediawiki.special.version.css
deleted file mode 100644
index 1b8581af4b..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.version.css
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * Styling for Special:Version
- */
-.mw-version-ext-name,
-.mw-version-library-name {
-	font-weight: bold;
-}
-
-.mw-version-ext-license,
-.mw-version-ext-vcs-timestamp {
-	white-space: nowrap;
-}
-
-th.mw-version-ext-col-label {
-	font-size: 0.9em;
-}
-
-.mw-version-ext-vcs-version {
-	unicode-bidi: embed;
-}
-
-.mw-version-credits {
-	column-width: 18em;
-	-moz-column-width: 18em;
-	-webkit-column-width: 18em;
-}
-
-.mw-version-credits ul {
-	margin-top: 0;
-	margin-bottom: 0;
-}
-
-.mw-version-license-info strong {
-	font-weight: normal;
-}
-
-.mw-version-license-info em {
-	font-style: normal;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.watchlist.css b/resources/src/mediawiki.special/mediawiki.special.watchlist.css
deleted file mode 100644
index c9861c25e8..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.watchlist.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/*!
- * Styling for elements generated by JavaScript on Special:Watchlist
- */
-.mw-changelist-line-inner-unwatched {
-	text-decoration: line-through;
-	opacity: 0.5;
-}
-
-span.mw-changeslist-line-prefix {
-	display: inline-block;
-}
-/* This can be either a span or a table cell */
-.mw-changeslist-line-prefix {
-	width: 1.25em;
-}
diff --git a/resources/src/mediawiki.special/mediawiki.special.watchlist.js b/resources/src/mediawiki.special/mediawiki.special.watchlist.js
deleted file mode 100644
index 565ed2c974..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.watchlist.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/*!
- * JavaScript for Special:Watchlist
- */
-( function ( mw, $, OO ) {
-	$( function () {
-		var api = new mw.Api(), $progressBar, $resetForm = $( '#mw-watchlist-resetbutton' );
-
-		// If the user wants to reset their watchlist, use an API call to do so (no reload required)
-		// Adapted from a user script by User:NQ of English Wikipedia
-		// (User:NQ/WatchlistResetConfirm.js)
-		$resetForm.submit( function ( event ) {
-			var $button = $resetForm.find( 'input[name=mw-watchlist-reset-submit]' );
-
-			event.preventDefault();
-
-			// Disable reset button to prevent multiple concurrent requests
-			$button.prop( 'disabled', true );
-
-			if ( !$progressBar ) {
-				$progressBar = new OO.ui.ProgressBarWidget( { progress: false } ).$element;
-				$progressBar.css( {
-					position: 'absolute', width: '100%'
-				} );
-			}
-			// Show progress bar
-			$resetForm.append( $progressBar );
-
-			// Use action=setnotificationtimestamp to mark all as visited,
-			// then set all watchlist lines accordingly
-			api.postWithToken( 'csrf', {
-				formatversion: 2, action: 'setnotificationtimestamp', entirewatchlist: true
-			} ).done( function () {
-				// Enable button again
-				$button.prop( 'disabled', false );
-				// Hide the button because further clicks can not generate any visual changes
-				$button.css( 'visibility', 'hidden' );
-				$progressBar.detach();
-				$( '.mw-changeslist-line-watched' )
-					.removeClass( 'mw-changeslist-line-watched' )
-					.addClass( 'mw-changeslist-line-not-watched' );
-			} ).fail( function () {
-				// On error, fall back to server-side reset
-				// First remove this submit listener and then re-submit the form
-				$resetForm.off( 'submit' ).submit();
-			} );
-		} );
-
-		// if the user wishes to reload the watchlist whenever a filter changes
-		if ( mw.user.options.get( 'watchlistreloadautomatically' ) ) {
-			// add a listener on all form elements in the header form
-			$( '#mw-watchlist-form input, #mw-watchlist-form select' ).on( 'change', function () {
-				// submit the form when one of the input fields is modified
-				$( '#mw-watchlist-form' ).submit();
-			} );
-		}
-
-		if ( mw.user.options.get( 'watchlistunwatchlinks' ) ) {
-			// Watch/unwatch toggle link:
-			// If a page is on the watchlist, a '×' is shown which, when clicked, removes the page from the watchlist.
-			// After unwatching a page, the '×' becomes a '+', which if clicked re-watches the page.
-			// Unwatched page entries are struck through and have lowered opacity.
-			$( '.mw-changeslist' ).on( 'click', '.mw-unwatch-link, .mw-watch-link', function ( event ) {
-				var $unwatchLink = $( this ), // EnhancedChangesList uses <table> for each row, while OldChangesList uses <li> for each row
-					$watchlistLine = $unwatchLink.closest( 'li, table' )
-						.find( '[data-target-page]' ),
-					pageTitle = $watchlistLine.data( 'targetPage' ),
-					isTalk = mw.Title.newFromText( pageTitle ).getNamespaceId() % 2 === 1;
-
-				// Utility function for looping through each watchlist line that matches
-				// a certain page or its associated page (e.g. Talk)
-				function forEachMatchingTitle( title, callback ) {
-
-					var titleObj = mw.Title.newFromText( title ),
-						pageNamespaceId = titleObj.getNamespaceId(),
-						isTalk = pageNamespaceId % 2 === 1,
-						associatedTitle = mw.Title.makeTitle( isTalk ? pageNamespaceId - 1 : pageNamespaceId + 1,
-							titleObj.getMainText() ).getPrefixedText();
-					$( '.mw-changeslist-line' ).each( function () {
-						var $this = $( this ), $row, $unwatchLink;
-
-						$this.find( '[data-target-page]' ).each( function () {
-							var $this = $( this ), rowTitle = $this.data( 'targetPage' );
-							if ( rowTitle === title || rowTitle === associatedTitle ) {
-
-								// EnhancedChangesList groups log entries by performer rather than target page. Therefore...
-								// * If using OldChangesList, use the <li>
-								// * If using EnhancedChangesList and $this is part of a grouped log entry, use the <td> sub-entry
-								// * If using EnhancedChangesList and $this is not part of a grouped log entry, use the <table> grouped entry
-								$row =
-									$this.closest(
-										'li, table.mw-collapsible.mw-changeslist-log td[data-target-page], table' );
-								$unwatchLink = $row.find( '.mw-unwatch-link, .mw-watch-link' );
-
-								callback( rowTitle, $row, $unwatchLink );
-							}
-						} );
-					} );
-				}
-
-				// Preload the notification module for mw.notify
-				mw.loader.load( 'mediawiki.notification' );
-
-				// Depending on whether we are watching or unwatching, for each entry of the page (and its associated page i.e. Talk),
-				// change the text, tooltip, and non-JS href of the (un)watch button, and update the styling of the watchlist entry.
-				if ( $unwatchLink.hasClass( 'mw-unwatch-link' ) ) {
-					api.unwatch( pageTitle )
-						.done( function () {
-							forEachMatchingTitle( pageTitle,
-								function ( rowPageTitle, $row, $rowUnwatchLink ) {
-									$rowUnwatchLink
-										.text( mw.msg( 'watchlist-unwatch-undo' ) )
-										.attr( 'title', mw.msg( 'tooltip-ca-watch' ) )
-										.attr( 'href',
-											mw.util.getUrl( rowPageTitle, { action: 'watch' } ) )
-										.removeClass( 'mw-unwatch-link loading' )
-										.addClass( 'mw-watch-link' );
-									$row.find(
-										'.mw-changeslist-line-inner, .mw-enhanced-rc-nested' )
-										.addBack( '.mw-enhanced-rc-nested' ) // For matching log sub-entry
-										.addClass( 'mw-changelist-line-inner-unwatched' );
-								} );
-
-							mw.notify(
-								mw.message( isTalk ? 'removedwatchtext-talk' : 'removedwatchtext',
-									pageTitle ), { tag: 'watch-self' } );
-						} );
-				} else {
-					api.watch( pageTitle )
-						.then( function () {
-							forEachMatchingTitle( pageTitle,
-								function ( rowPageTitle, $row, $rowUnwatchLink ) {
-									$rowUnwatchLink
-										.text( mw.msg( 'watchlist-unwatch' ) )
-										.attr( 'title', mw.msg( 'tooltip-ca-unwatch' ) )
-										.attr( 'href',
-											mw.util.getUrl( rowPageTitle, { action: 'unwatch' } ) )
-										.removeClass( 'mw-watch-link loading' )
-										.addClass( 'mw-unwatch-link' );
-									$row.find( '.mw-changelist-line-inner-unwatched' )
-										.addBack( '.mw-enhanced-rc-nested' )
-										.removeClass( 'mw-changelist-line-inner-unwatched' );
-								} );
-
-							mw.notify(
-								mw.message( isTalk ? 'addedwatchtext-talk' : 'addedwatchtext',
-									pageTitle ), { tag: 'watch-self' } );
-						} );
-				}
-
-				event.preventDefault();
-				event.stopPropagation();
-				$unwatchLink.blur();
-			} );
-		}
-	} );
-
-}( mediaWiki, jQuery, OO )
-);
diff --git a/resources/src/mediawiki.special/movePage.css b/resources/src/mediawiki.special/movePage.css
new file mode 100644
index 0000000000..9428fedc96
--- /dev/null
+++ b/resources/src/mediawiki.special/movePage.css
@@ -0,0 +1,7 @@
+/*!
+ * Styles for Special:MovePage
+ */
+
+.movepage-wrapper {
+	width: 50em;
+}
diff --git a/resources/src/mediawiki.special/pagesWithProp.css b/resources/src/mediawiki.special/pagesWithProp.css
new file mode 100644
index 0000000000..7ef75d0c32
--- /dev/null
+++ b/resources/src/mediawiki.special/pagesWithProp.css
@@ -0,0 +1,4 @@
+/* Distinguish actual data from information about it being hidden visually */
+.prop-value-hidden {
+	font-style: italic;
+}
diff --git a/resources/src/mediawiki.special/special.css b/resources/src/mediawiki.special/special.css
new file mode 100644
index 0000000000..0676bfc32d
--- /dev/null
+++ b/resources/src/mediawiki.special/special.css
@@ -0,0 +1,136 @@
+/* Special:AllMessages */
+#mw-allmessagestable .allmessages-customised .am_default {
+	background-color: #fcffc4;
+}
+
+#mw-allmessagestable .allmessages-customised:hover .am_default {
+	background-color: #faff90;
+}
+
+#mw-allmessagestable .am_actual {
+	background-color: #e2ffe2;
+}
+
+#mw-allmessagestable .allmessages-customised:hover + .allmessages-customised .am_actual {
+	background-color: #b1ffb1;
+}
+
+/* Common for Special:Allpages and Special:PrefixIndex */
+.mw-allpages-body,
+.mw-prefixindex-body {
+	columns: 22em 3;
+	-moz-columns: 22em 3;
+	-webkit-columns: 22em 3;
+	break-inside: avoid-column;
+	page-break-inside: avoid;
+	-webkit-column-break-inside: avoid;
+}
+
+.mw-allpages-chunk,
+.mw-prefixindex-list {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+.allpagesredirect {
+	font-style: italic;
+}
+
+/* Special:Block */
+.mw-ipb-conveniencelinks {
+	font-size: 90%;
+	text-align: right;
+}
+
+.mw-block-hideuser,
+.mw-block-confirm {
+	font-weight: bold;
+}
+
+#mw-input-wpReason .oo-ui-dropdownInputWidget,
+#mw-input-wpReason .oo-ui-textInputWidget {
+	display: block;
+	max-width: 50em;
+}
+
+#mw-input-wpReason .oo-ui-textInputWidget {
+	margin-top: 0.5em;
+}
+
+/* Special:BlockList */
+.mw-blocklist .mw-usertoollinks,
+.mw-blocklist-actions {
+	white-space: nowrap;
+	font-size: 90%;
+}
+
+/* Special:Contributions */
+.mw-uctop {
+	font-weight: bold;
+}
+.mw-contributions-form select {
+	vertical-align: middle;
+}
+
+/* Special:EditWatchlist */
+.watchlistredir {
+	font-style: italic;
+}
+
+/* Special:EmailUser */
+#mw-emailuser-sender,
+#mw-emailuser-recipient {
+	font-weight: bold;
+}
+
+/* Special:FileDuplicateSearch */
+#mw-fileduplicatesearch-icon {
+	float: right;
+}
+
+/* Special:ListGroupRights */
+.mw-listgrouprights-table tr {
+	vertical-align: top;
+}
+.listgrouprights-revoked {
+	text-decoration: line-through;
+}
+
+/* Special:RevisionDelete */
+.mw-revdel-editreasons {
+	font-size: 90%;
+	text-align: right;
+}
+
+/* Special:Specialpages */
+.mw-specialpagerestricted {
+	font-weight: bold;
+}
+
+.mw-specialpages-list {
+	-webkit-columns: 16em 2;
+	-moz-columns: 16em 2;
+	columns: 16em 2;
+}
+
+.mw-specialpages-list ul {
+	margin-top: 0;
+	margin-bottom: 0;
+}
+
+/* Special:Statistics */
+.mw-statistics-numbers {
+	text-align: right;
+}
+
+/* Special:ProtectedPages */
+.mw-protectedpages .mw-usertoollinks,
+.mw-protectedpages-length,
+.mw-protectedpages-actions {
+	white-space: nowrap;
+	font-size: 90%;
+}
+.mw-protectedpages-unknown {
+	color: #72777d;
+	font-size: 90%;
+}
diff --git a/resources/src/mediawiki.special/templates/thumbnail.html b/resources/src/mediawiki.special/templates/thumbnail.html
deleted file mode 100644
index bf0e7014db..0000000000
--- a/resources/src/mediawiki.special/templates/thumbnail.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div id="mw-upload-thumbnail" class="thumb tright">
-	<div class="thumbinner">
-		<div class="thumbcaption">
-			<div class="filename"></div>
-			<div class="fileinfo"></div>
-		</div>
-	</div>
-</div>
diff --git a/resources/src/mediawiki.special/upload.css b/resources/src/mediawiki.special/upload.css
new file mode 100644
index 0000000000..626a7e8b58
--- /dev/null
+++ b/resources/src/mediawiki.special/upload.css
@@ -0,0 +1,15 @@
+/*!
+ * Styling for Special:Upload
+ */
+.mw-destfile-warning {
+	border: 1px solid #fde29b;
+	padding: 0.5em 1em;
+	margin-bottom: 1em;
+	color: #705000;
+	background-color: #fdf1d1;
+}
+
+p.mw-upload-editlicenses {
+	font-size: 90%;
+	text-align: right;
+}
diff --git a/resources/src/mediawiki.special/userrights.css b/resources/src/mediawiki.special/userrights.css
new file mode 100644
index 0000000000..1ffdf70ee5
--- /dev/null
+++ b/resources/src/mediawiki.special/userrights.css
@@ -0,0 +1,35 @@
+/*!
+ * Styling for Special:UserRights
+ */
+.mw-userrights-nested {
+	margin-left: 1.2em;
+}
+
+.mw-userrights-nested span {
+	margin-left: 0.3em;
+	display: inline-block;
+	vertical-align: middle;
+}
+
+.mw-userrights-disabled {
+	color: #72777d;
+}
+.mw-userrights-groups * td,
+.mw-userrights-groups * th {
+	padding-right: 1.5em;
+}
+
+.mw-userrights-groups * th {
+	text-align: left;
+}
+
+/* Dynamically show/hide the expiry selection underneath each checkbox */
+input.mw-userrights-groupcheckbox:not( :checked ) ~ .mw-userrights-nested {
+	display: none;
+}
+
+/* Initial hide the expiry fields to prevent a FOUC on loading */
+/* The input fields gets unhidden by JavaScript when needed */
+.client-js .mw-userrights-expiryfield {
+	display: none;
+}
diff --git a/resources/src/mediawiki.special/watchlist.css b/resources/src/mediawiki.special/watchlist.css
new file mode 100644
index 0000000000..c9861c25e8
--- /dev/null
+++ b/resources/src/mediawiki.special/watchlist.css
@@ -0,0 +1,15 @@
+/*!
+ * Styling for elements generated by JavaScript on Special:Watchlist
+ */
+.mw-changelist-line-inner-unwatched {
+	text-decoration: line-through;
+	opacity: 0.5;
+}
+
+span.mw-changeslist-line-prefix {
+	display: inline-block;
+}
+/* This can be either a span or a table cell */
+.mw-changeslist-line-prefix {
+	width: 1.25em;
+}
diff --git a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
index 05180fd9b6..17f1fb4607 100644
--- a/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
+++ b/resources/src/mediawiki.widgets.datetime/DateTimeInputWidget.js
@@ -353,7 +353,7 @@
 				sz = ( spec.size * 1.15 ) + 'ch';
 			} else {
 				// Add a little for padding
-				sz = ( spec.size * 1.15 ) + 'ch';
+				sz = ( spec.size * 1.25 ) + 'ch';
 			}
 			if ( spec.editable && spec.type !== 'static' ) {
 				if ( spec.type === 'boolean' || spec.type === 'toggleLocal' ) {
diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index b1e1da3347..486fb80487 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -90,15 +90,17 @@
 			// Override #set to also set the global variable
 			this.set = function ( selection, value ) {
 				var s;
-
-				if ( $.isPlainObject( selection ) ) {
-					for ( s in selection ) {
-						setGlobalMapValue( this, s, selection[ s ] );
+				if ( arguments.length > 1 ) {
+					if ( typeof selection !== 'string' ) {
+						return false;
 					}
+					setGlobalMapValue( this, selection, value );
 					return true;
 				}
-				if ( typeof selection === 'string' && arguments.length ) {
-					setGlobalMapValue( this, selection, value );
+				if ( typeof selection === 'object' ) {
+					for ( s in selection ) {
+						setGlobalMapValue( this, s, selection[ s ] );
+					}
 					return true;
 				}
 				return false;
@@ -183,15 +185,18 @@
 		 */
 		set: function ( selection, value ) {
 			var s;
-
-			if ( $.isPlainObject( selection ) ) {
-				for ( s in selection ) {
-					this.values[ s ] = selection[ s ];
+			// Use `arguments.length` because `undefined` is also a valid value.
+			if ( arguments.length > 1 ) {
+				if ( typeof selection !== 'string' ) {
+					return false;
 				}
+				this.values[ selection ] = value;
 				return true;
 			}
-			if ( typeof selection === 'string' && arguments.length > 1 ) {
-				this.values[ selection ] = value;
+			if ( typeof selection === 'object' ) {
+				for ( s in selection ) {
+					this.values[ s ] = selection[ s ];
+				}
 				return true;
 			}
 			return false;
@@ -1266,6 +1271,17 @@
 				}
 			}
 
+			/**
+			 * @private
+			 * @param {string} code JavaScript code
+			 */
+			function domEval( code ) {
+				var script = document.createElement( 'script' );
+				script.text = code;
+				document.head.appendChild( script );
+				script.parentNode.removeChild( script );
+			}
+
 			/**
 			 * Executes a loaded module, making it ready to use
 			 *
@@ -1320,7 +1336,7 @@
 							// Site and user modules are legacy scripts that run in the global scope.
 							// This is transported as a string instead of a function to avoid needing
 							// to use string manipulation to undo the function wrapper.
-							$.globalEval( script );
+							domEval( script );
 							markModuleReady();
 
 						} else {
@@ -1706,7 +1722,7 @@
 				}
 				mw.requestIdleCallback( function () {
 					try {
-						$.globalEval( implementations.join( ';' ) );
+						domEval( implementations.join( ';' ) );
 					} catch ( err ) {
 						cb( err );
 					}
diff --git a/tests/phan/config.php b/tests/phan/config.php
index 5ea72b2738..bd0461a695 100644
--- a/tests/phan/config.php
+++ b/tests/phan/config.php
@@ -317,8 +317,6 @@ return [
 		"PhanParamSignatureRealMismatchTooFewParameters",
 		// approximate error count: 125
 		"PhanParamTooMany",
-		// approximate error count: 1
-		"PhanParamTooManyCallable",
 		// approximate error count: 3
 		"PhanParamTooManyInternal",
 		// approximate error count: 1
@@ -329,10 +327,6 @@ return [
 		"PhanTypeComparisonFromArray",
 		// approximate error count: 2
 		"PhanTypeComparisonToArray",
-		// approximate error count: 3
-		"PhanTypeInvalidRightOperand",
-		// approximate error count: 1
-		"PhanTypeMagicVoidWithReturn",
 		// approximate error count: 218
 		"PhanTypeMismatchArgument",
 		// approximate error count: 13
@@ -341,8 +335,6 @@ return [
 		"PhanTypeMismatchDeclaredParam",
 		// approximate error count: 111
 		"PhanTypeMismatchDeclaredParamNullable",
-		// approximate error count: 1
-		"PhanTypeMismatchDefault",
 		// approximate error count: 5
 		"PhanTypeMismatchDimAssignment",
 		// approximate error count: 2
@@ -355,12 +347,8 @@ return [
 		"PhanTypeMismatchProperty",
 		// approximate error count: 74
 		"PhanTypeMismatchReturn",
-		// approximate error count: 11
-		"PhanTypeMissingReturn",
 		// approximate error count: 5
 		"PhanTypeNonVarPassByRef",
-		// approximate error count: 1
-		"PhanUndeclaredClassInCallable",
 		// approximate error count: 32
 		"PhanUndeclaredConstant",
 		// approximate error count: 233
@@ -369,10 +357,6 @@ return [
 		"PhanUndeclaredProperty",
 		// approximate error count: 3
 		"PhanUndeclaredStaticMethod",
-		// approximate error count: 11
-		"PhanUndeclaredTypeReturnType",
-		// approximate error count: 27
-		"PhanUndeclaredVariable",
 		// approximate error count: 58
 		"PhanUndeclaredVariableDim",
 	],
diff --git a/tests/phpunit/data/categoriesrdf/change.sparql b/tests/phpunit/data/categoriesrdf/change.sparql
new file mode 100644
index 0000000000..d7ec83a526
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/change.sparql
@@ -0,0 +1,16 @@
+# Changes
+DELETE {
+?category ?x ?y
+} INSERT {
+
+<http://acme.test/wiki/Category:Changed_category> a mediawiki:Category ;
+	rdfs:label "Changed category" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer ;
+	mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_30> .
+
+} WHERE {
+   VALUES ?category {
+     <http://acme.test/wiki/Category:Changed_category>
+   }
+};
diff --git a/tests/phpunit/data/categoriesrdf/delete.sparql b/tests/phpunit/data/categoriesrdf/delete.sparql
new file mode 100644
index 0000000000..7fb642dc33
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/delete.sparql
@@ -0,0 +1,10 @@
+# Deletes
+DELETE {
+?category ?x ?y
+} INSERT {
+
+} WHERE {
+   VALUES ?category {
+     <http://acme.test/wiki/Category:Test> <http://acme.test/wiki/Category:Test_2>
+   }
+};
diff --git a/tests/phpunit/data/categoriesrdf/move.sparql b/tests/phpunit/data/categoriesrdf/move.sparql
new file mode 100644
index 0000000000..c9f284ec11
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/move.sparql
@@ -0,0 +1,24 @@
+# Moves
+DELETE {
+?category ?x ?y
+} INSERT {
+
+<http://acme.test/wiki/Category:MovedTo> a mediawiki:Category ;
+	rdfs:label "MovedTo" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer .
+
+<http://acme.test/wiki/Category:AlsoMoved> a mediawiki:Category ;
+	rdfs:label "AlsoMoved" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer .
+
+<http://acme.test/wiki/Category:MovedTo> mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_4> .
+
+<http://acme.test/wiki/Category:AlsoMoved> mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_5> .
+
+} WHERE {
+   VALUES ?category {
+     <http://acme.test/wiki/Category:Test> <http://acme.test/wiki/Category:MovedTo> <http://acme.test/wiki/Category:Test_2> <http://acme.test/wiki/Category:Test_3> <http://acme.test/wiki/Category:Test_4>
+   }
+};
diff --git a/tests/phpunit/data/categoriesrdf/new.sparql b/tests/phpunit/data/categoriesrdf/new.sparql
new file mode 100644
index 0000000000..f9a742d5c1
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/new.sparql
@@ -0,0 +1,19 @@
+# Additions
+INSERT DATA {
+
+<http://acme.test/wiki/Category:New_category> a mediawiki:Category ;
+	rdfs:label "New category" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer .
+
+<http://acme.test/wiki/Category:%D0%9D%D0%BE%D0%B2%D0%B0%D1%8F_%D0%BA%D0%B0%D1%82%D0%B5%D0%B3%D0%BE%D1%80%D0%B8%D1%8F_%F0%9F%98%83> a mediawiki:Category,
+		mediawiki:HiddenCategory ;
+	rdfs:label "Новая категория 😃" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer .
+
+<http://acme.test/wiki/Category:New_category> mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_20> .
+
+<http://acme.test/wiki/Category:%D0%9D%D0%BE%D0%B2%D0%B0%D1%8F_%D0%BA%D0%B0%D1%82%D0%B5%D0%B3%D0%BE%D1%80%D0%B8%D1%8F_%F0%9F%98%83> mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_21> .
+
+};
diff --git a/tests/phpunit/data/categoriesrdf/restore.sparql b/tests/phpunit/data/categoriesrdf/restore.sparql
new file mode 100644
index 0000000000..16c0561463
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/restore.sparql
@@ -0,0 +1,10 @@
+# Restores
+INSERT DATA {
+
+<http://acme.test/wiki/Category:Restored_cat> a mediawiki:Category ;
+	rdfs:label "Restored cat" ;
+	mediawiki:pages "7"^^xsd:integer ;
+	mediawiki:subcategories "2"^^xsd:integer ;
+	mediawiki:isInCategory <http://acme.test/wiki/Category:Parent_of_10> .
+
+};
diff --git a/tests/phpunit/data/categoriesrdf/updatets.txt b/tests/phpunit/data/categoriesrdf/updatets.txt
new file mode 100644
index 0000000000..426bb92fb9
--- /dev/null
+++ b/tests/phpunit/data/categoriesrdf/updatets.txt
@@ -0,0 +1,9 @@
+DELETE {
+  <http://acme.test/wiki/Special:CategoryDump> schema:dateModified ?o .
+}
+WHERE {
+  <http://acme.test/wiki/Special:CategoryDump> schema:dateModified ?o .
+};
+INSERT DATA {
+  <http://acme.test/wiki/Special:CategoryDump> schema:dateModified "2017-08-25T00:29:09Z"^^xsd:dateTime .
+}
diff --git a/tests/phpunit/includes/ContentSecurityPolicyTest.php b/tests/phpunit/includes/ContentSecurityPolicyTest.php
new file mode 100644
index 0000000000..f0fa6118b3
--- /dev/null
+++ b/tests/phpunit/includes/ContentSecurityPolicyTest.php
@@ -0,0 +1,310 @@
+<?php
+
+use Wikimedia\TestingAccessWrapper;
+
+class ContentSecurityPolicyTest extends MediaWikiTestCase {
+	/** @var ContentSecurityPolicy */
+	private $csp;
+
+	protected function setUp() {
+		global $wgUploadDirectory;
+		$this->setMwGlobals( [
+			'wgAllowExternalImages' => false,
+			'wgAllowExternalImagesFrom' => [],
+			'wgAllowImageTag' => false,
+			'wgEnableImageWhitelist' => false,
+			'wgCrossSiteAJAXdomains' => [
+				'sister-site.somewhere.com',
+				'*.wikipedia.org',
+				'??.wikinews.org'
+			],
+			'wgScriptPath' => '/w',
+			'wgForeignFileRepos' => [ [
+				'class' => ForeignAPIRepo::class,
+				'name' => 'wikimediacommons',
+				'apibase' => 'https://commons.wikimedia.org/w/api.php',
+				'url' => 'https://upload.wikimedia.org/wikipedia/commons',
+				'thumbUrl' => 'https://upload.wikimedia.org/wikipedia/commons/thumb',
+				'hashLevels' => 2,
+				'transformVia404' => true,
+				'fetchDescription' => true,
+				'descriptionCacheExpiry' => 43200,
+				'apiThumbCacheExpiry' => 0,
+				'directory' => $wgUploadDirectory,
+				'backend' => 'wikimediacommons-backend',
+			] ],
+		] );
+		// Note, there are some obscure globals which
+		// could affect the results which aren't included above.
+
+		RepoGroup::destroySingleton();
+		$context = RequestContext::getMain();
+		$resp = $context->getRequest()->response();
+		$conf = $context->getConfig();
+		$csp = new ContentSecurityPolicy( 'secret', $resp, $conf );
+		$this->csp = TestingAccessWrapper::newFromObject( $csp );
+
+		return parent::setUp();
+	}
+
+	/**
+	 * @dataProvider providerFalsePositiveBrowser
+	 * @covers ContentSecurityPolicy::falsePositiveBrowser
+	 */
+	public function testFalsePositiveBrowser( $ua, $expected ) {
+		$actual = ContentSecurityPolicy::falsePositiveBrowser( $ua );
+		$this->assertEquals( $expected, $actual, $ua );
+	}
+
+	public function providerFalsePositiveBrowser() {
+		// @codingStandardsIgnoreStart Generic.Files.LineLength
+		return [
+			[ 'Mozilla/5.0 (X11; Linux i686; rv:41.0) Gecko/20100101 Firefox/41.0', true ],
+			[ 'Mozilla/5.0 (X11; U; Linux i686; en-ca) AppleWebKit/531.2+ (KHTML, like Gecko) Version/5.0 Safari/531.2+ Debian/squeeze (2.30.6-1) Epiphany/2.30.6', false ]
+		];
+		// @codingStandardsIgnoreEnd Generic.Files.LineLength
+	}
+
+	/**
+	 * @dataProvider providerMakeCSPDirectives
+	 * @covers ContentSecurityPolicy::makeCSPDirectives
+	 */
+	public function testMakeCSPDirectives(
+		$policy,
+		$expectedFull,
+		$expectedReport,
+		$expectedRestricted
+	) {
+		$actualFull = $this->csp->makeCSPDirectives( $policy, ContentSecurityPolicy::FULL_MODE );
+		$actualReport = $this->csp->makeCSPDirectives(
+			$policy, ContentSecurityPolicy::REPORT_ONLY_MODE
+		);
+		$actualRestricted = $this->csp->makeCSPDirectives(
+			$policy, ContentSecurityPolicy::FULL_MODE_RESTRICTED
+		);
+		$policyJson = formatJson::encode( $policy );
+		$this->assertEquals( $expectedFull, $actualFull, "full: " . $policyJson );
+		$this->assertEquals( $expectedReport, $actualReport, "report: " . $policyJson );
+		$this->assertEquals( $expectedRestricted, $actualRestricted, "restricted: " . $policyJson );
+	}
+
+	public function providerMakeCSPDirectives() {
+		// @codingStandardsIgnoreStart Generic.Files.LineLength
+		return [
+			[ false, '', '', '' ],
+			[
+				true,
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			 ],
+			[
+				[ 'script-src' => [ 'http://example.com', 'http://something,else.com' ] ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' http://example.com http://something%2Celse.com 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' http://example.com http://something%2Celse.com 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' http://example.com http://something%2Celse.com sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'unsafeFallback' => false ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'unsafeFallback' => true ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'default-src' => false ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'default-src' => true ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'",
+			],
+			[
+				[ 'default-src' => [ 'https://foo.com', 'http://bar.com', 'baz.de' ] ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org https://foo.com http://bar.com baz.de sister-site.somewhere.com *.wikipedia.org 'unsafe-inline'",
+			],
+			[
+				[ 'includeCORS' => false ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline'; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline'; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self'; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'includeCORS' => false, 'default-src' => true ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline'; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline'; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self'; default-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org; style-src 'self' data: blob: https://upload.wikimedia.org https://commons.wikimedia.org 'unsafe-inline'",
+			],
+			[
+				[ 'includeCORS' => true ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'report-uri' => false ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'report-uri' => true ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+			[
+				[ 'report-uri' => 'https://example.com/index.php?foo;report=csp' ],
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri https://example.com/index.php?foo%3Breport=csp",
+				"script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri https://example.com/index.php?foo%3Breport=csp",
+				"script-src 'unsafe-eval' 'self' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'",
+			],
+		];
+	}
+
+	/**
+	 * @covers ContentSecurityPolicy::makeCSPDirectives
+	 */
+	public function testMakeCSPDirectivesImage() {
+		global $wgAllowImageTag;
+		$origImg = wfSetVar( $wgAllowImageTag, true );
+
+		$actual = $this->csp->makeCSPDirectives( true, ContentSecurityPolicy::FULL_MODE );
+
+		$wgAllowImageTag = $origImg;
+
+		$expected = "script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json";
+		$this->assertEquals( $expected, $actual );
+	}
+
+	/**
+	 * @covers ContentSecurityPolicy::makeCSPDirectives
+	 */
+	public function testMakeCSPDirectivesReportUri() {
+		$actual = $this->csp->makeCSPDirectives(
+			true,
+			ContentSecurityPolicy::REPORT_ONLY_MODE
+		);
+		$expected = "script-src 'unsafe-eval' 'self' 'nonce-secret' 'unsafe-inline' sister-site.somewhere.com *.wikipedia.org; default-src * data: blob:; style-src * data: blob: 'unsafe-inline'; report-uri /w/api.php?action=cspreport&format=json&reportonly=1";
+		$this->assertEquals( $expected, $actual );
+		// @codingStandardsIgnoreEnd Generic.Files.LineLength
+	}
+
+	/**
+	 * @covers ContentSecurityPolicy::getHeaderName
+	 */
+	public function testGetHeaderName() {
+		$this->assertEquals(
+			$this->csp->getHeaderName( ContentSecurityPolicy::REPORT_ONLY_MODE ),
+			'Content-Security-Policy-Report-Only'
+		);
+		$this->assertEquals(
+			$this->csp->getHeaderName( ContentSecurityPolicy::FULL_MODE ),
+			'Content-Security-Policy'
+		);
+	}
+
+	/**
+	 * @covers ContentSecurityPolicy::getReportUri
+	 */
+	public function testGetReportUri() {
+		$full = $this->csp->getReportUri( ContentSecurityPolicy::FULL_MODE );
+		$fullExpected = '/w/api.php?action=cspreport&format=json';
+		$this->assertEquals( $full, $fullExpected, 'normal report uri' );
+
+		$report = $this->csp->getReportUri( ContentSecurityPolicy::REPORT_ONLY_MODE );
+		$reportExpected = $fullExpected . '&reportonly=1';
+		$this->assertEquals( $report, $reportExpected, 'report only' );
+
+		global $wgScriptPath;
+		$origPath = wfSetVar( $wgScriptPath, '/tl;dr/a,%20wiki' );
+		$esc = $this->csp->getReportUri( ContentSecurityPolicy::FULL_MODE );
+		$escExpected = '/tl%3Bdr/a%2C%20wiki/api.php?action=cspreport&format=json';
+		$wgScriptPath = $origPath;
+		$this->assertEquals( $esc, $escExpected, 'test esc rules' );
+	}
+
+	/**
+	 * @dataProvider providerPrepareUrlForCSP
+	 * @covers ContentSecurityPolicy::prepareUrlForCSP
+	 */
+	public function testPrepareUrlForCSP( $url, $expected ) {
+		$actual = $this->csp->prepareUrlForCSP( $url );
+		$this->assertEquals( $actual, $expected, $url );
+	}
+
+	public function providerPrepareUrlForCSP() {
+		global $wgServer;
+		return [
+			[ $wgServer, false ],
+			[ 'https://example.com', 'https://example.com' ],
+			[ 'https://example.com:200', 'https://example.com:200' ],
+			[ 'http://example.com', 'http://example.com' ],
+			[ 'example.com', 'example.com' ],
+			[ '*.example.com', '*.example.com' ],
+			[ 'https://*.example.com', 'https://*.example.com' ],
+			[ '//example.com', 'example.com' ],
+			[ 'https://example.com/path', 'https://example.com' ],
+			[ 'https://example.com/path:', 'https://example.com' ],
+			[ 'https://example.com/Wikipedia:NPOV', 'https://example.com' ],
+			[ 'https://tl;dr.com', 'https://tl%3Bdr.com' ],
+			[ 'yes,no.com', 'yes%2Cno.com' ],
+			[ '/relative-url', false ],
+			[ '/relativeUrl:withColon', false ],
+			[ 'data:', 'data:' ],
+			[ 'blob:', 'blob:' ],
+		];
+	}
+
+	/**
+	 * @covers ContentSecurityPolicy::escapeUrlForCSP
+	 */
+	public function testEscapeUrlForCSP() {
+		$escaped = $this->csp->escapeUrlForCSP( ',;%2B' );
+		$this->assertEquals( $escaped, '%2C%3B%2B' );
+	}
+
+	/**
+	 * @dataProvider providerCSPIsEnabled
+	 * @covers ContentSecurityPolicy::isEnabled
+	 */
+	public function testCSPIsEnabled( $main, $reportOnly, $expected ) {
+		global $wgCSPReportOnlyHeader, $wgCSPHeader;
+		global $wgCSPHeader;
+		$oldReport = wfSetVar( $wgCSPReportOnlyHeader, $reportOnly );
+		$oldMain = wfSetVar( $wgCSPHeader, $main );
+		$res = ContentSecurityPolicy::isEnabled( RequestContext::getMain()->getConfig() );
+		wfSetVar( $wgCSPReportOnlyHeader, $oldReport );
+		wfSetVar( $wgCSPHeader, $oldMain );
+		$this->assertEquals( $res, $expected );
+	}
+
+	public function providerCSPIsEnabled() {
+		return [
+			[ true, true, true ],
+			[ false, true, true ],
+			[ true, false, true ],
+			[ false, false, false ],
+			[ false, [], true ],
+			[ [], false, true ],
+			[ [ 'default-src' => [ 'foo.example.com' ] ], false, true ],
+		];
+	}
+}
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index 91655eaeee..73447c95c8 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -321,7 +321,7 @@ class OutputPageTest extends MediaWikiTestCase {
 			// Single only=scripts load
 			[
 				[ 'test.foo', ResourceLoaderModule::TYPE_SCRIPTS ],
-				"<script>(window.RLQ=window.RLQ||[]).push(function(){"
+				"<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
 					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.foo\u0026only=scripts\u0026skin=fallback");'
 					. "});</script>"
 			],
@@ -334,10 +334,36 @@ class OutputPageTest extends MediaWikiTestCase {
 			// Private embed (only=scripts)
 			[
 				[ 'test.quux', ResourceLoaderModule::TYPE_SCRIPTS ],
-				"<script>(window.RLQ=window.RLQ||[]).push(function(){"
+				"<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
 					. "mw.test.baz({token:123});\nmw.loader.state({\"test.quux\":\"ready\"});"
 					. "});</script>"
 			],
+			// Load private module (combined)
+			[
+				[ 'test.quux', ResourceLoaderModule::TYPE_COMBINED ],
+				"<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+					. "mw.loader.implement(\"test.quux@1ev0ijv\",function($,jQuery,require,module){"
+					. "mw.test.baz({token:123});},{\"css\":[\".mw-icon{transition:none}"
+					. "\"]});});</script>"
+			],
+			// Load no modules
+			[
+				[ [], ResourceLoaderModule::TYPE_COMBINED ],
+				'',
+			],
+			// noscript group
+			[
+				[ 'test.noscript', ResourceLoaderModule::TYPE_STYLES ],
+				'<noscript><link rel="stylesheet" href="http://127.0.0.1:8080/w/load.php?debug=false&amp;lang=en&amp;modules=test.noscript&amp;only=styles&amp;skin=fallback"/></noscript>'
+			],
+			// Load two modules in separate groups
+			[
+				[ [ 'test.group.foo', 'test.group.bar' ], ResourceLoaderModule::TYPE_COMBINED ],
+				"<script nonce=\"secret\">(window.RLQ=window.RLQ||[]).push(function(){"
+					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.bar\u0026skin=fallback");'
+					. 'mw.loader.load("http://127.0.0.1:8080/w/load.php?debug=false\u0026lang=en\u0026modules=test.group.foo\u0026skin=fallback");'
+					. "});</script>"
+			],
 		];
 		// phpcs:enable
 	}
@@ -352,6 +378,7 @@ class OutputPageTest extends MediaWikiTestCase {
 		$this->setMwGlobals( [
 			'wgResourceLoaderDebug' => false,
 			'wgLoadScript' => 'http://127.0.0.1:8080/w/load.php',
+			'wgCSPReportOnlyHeader' => true,
 		] );
 		$class = new ReflectionClass( OutputPage::class );
 		$method = $class->getMethod( 'makeResourceLoaderLink' );
@@ -360,6 +387,9 @@ class OutputPageTest extends MediaWikiTestCase {
 		$ctx->setSkin( SkinFactory::getDefaultInstance()->makeSkin( 'fallback' ) );
 		$ctx->setLanguage( 'en' );
 		$out = new OutputPage( $ctx );
+		$nonce = $class->getProperty( 'CSPNonce' );
+		$nonce->setAccessible( true );
+		$nonce->setValue( $out, 'secret' );
 		$rl = $out->getResourceLoader();
 		$rl->setMessageBlobStore( new NullMessageBlobStore() );
 		$rl->register( [
@@ -380,6 +410,18 @@ class OutputPageTest extends MediaWikiTestCase {
 				'styles' => '/* pref-animate=off */ .mw-icon { transition: none; }',
 				'group' => 'private',
 			] ),
+			'test.noscript' => new ResourceLoaderTestModule( [
+				'styles' => '.stuff { color: red; }',
+				'group' => 'noscript',
+			] ),
+			'test.group.foo' => new ResourceLoaderTestModule( [
+				'script' => 'mw.doStuff( "foo" );',
+				'group' => 'foo',
+			] ),
+			'test.group.bar' => new ResourceLoaderTestModule( [
+				'script' => 'mw.doStuff( "bar" );',
+				'group' => 'bar',
+			] ),
 		] );
 		$links = $method->invokeArgs( $out, $args );
 		$actualHtml = strval( $links );
diff --git a/tests/phpunit/includes/api/ApiBaseTest.php b/tests/phpunit/includes/api/ApiBaseTest.php
index 4bffc742f6..e7db68eee5 100644
--- a/tests/phpunit/includes/api/ApiBaseTest.php
+++ b/tests/phpunit/includes/api/ApiBaseTest.php
@@ -1272,4 +1272,99 @@ class ApiBaseTest extends ApiTestCase {
 		}
 	}
 
+	/**
+	 * @covers ApiBase::extractRequestParams
+	 */
+	public function testExtractRequestParams() {
+		$request = new FauxRequest( [
+			'xxexists' => 'exists!',
+			'xxmulti' => 'a|b|c|d|{bad}',
+			'xxempty' => '',
+			'xxtemplate-a' => 'A!',
+			'xxtemplate-b' => 'B1|B2|B3',
+			'xxtemplate-c' => '',
+			'xxrecursivetemplate-b-B1' => 'X',
+			'xxrecursivetemplate-b-B3' => 'Y',
+			'xxrecursivetemplate-b-B4' => '?',
+			'xxemptytemplate-' => 'nope',
+			'foo' => 'a|b|c',
+			'xxfoo' => 'a|b|c',
+			'errorformat' => 'raw',
+		] );
+		$context = new DerivativeContext( RequestContext::getMain() );
+		$context->setRequest( $request );
+		$main = new ApiMain( $context );
+
+		$mock = $this->getMockBuilder( ApiBase::class )
+			->setConstructorArgs( [ $main, 'test', 'xx' ] )
+			->setMethods( [ 'getAllowedParams' ] )
+			->getMockForAbstractClass();
+		$mock->method( 'getAllowedParams' )->willReturn( [
+			'notexists' => null,
+			'exists' => null,
+			'multi' => [
+				ApiBase::PARAM_ISMULTI => true,
+			],
+			'empty' => [
+				ApiBase::PARAM_ISMULTI => true,
+			],
+			'template-{m}' => [
+				ApiBase::PARAM_ISMULTI => true,
+				ApiBase::PARAM_TEMPLATE_VARS => [ 'm' => 'multi' ],
+			],
+			'recursivetemplate-{m}-{t}' => [
+				ApiBase::PARAM_TEMPLATE_VARS => [ 't' => 'template-{m}', 'm' => 'multi' ],
+			],
+			'emptytemplate-{m}' => [
+				ApiBase::PARAM_ISMULTI => true,
+				ApiBase::PARAM_TEMPLATE_VARS => [ 'm' => 'empty' ],
+			],
+			'badtemplate-{e}' => [
+				ApiBase::PARAM_TEMPLATE_VARS => [ 'e' => 'exists' ],
+			],
+			'badtemplate2-{e}' => [
+				ApiBase::PARAM_TEMPLATE_VARS => [ 'e' => 'badtemplate2-{e}' ],
+			],
+			'badtemplate3-{x}' => [
+				ApiBase::PARAM_TEMPLATE_VARS => [ 'x' => 'foo' ],
+			],
+		] );
+
+		$this->assertEquals( [
+			'notexists' => null,
+			'exists' => 'exists!',
+			'multi' => [ 'a', 'b', 'c', 'd', '{bad}' ],
+			'empty' => [],
+			'template-a' => [ 'A!' ],
+			'template-b' => [ 'B1', 'B2', 'B3' ],
+			'template-c' => [],
+			'template-d' => null,
+			'recursivetemplate-a-A!' => null,
+			'recursivetemplate-b-B1' => 'X',
+			'recursivetemplate-b-B2' => null,
+			'recursivetemplate-b-B3' => 'Y',
+		], $mock->extractRequestParams() );
+
+		$used = TestingAccessWrapper::newFromObject( $main )->getParamsUsed();
+		sort( $used );
+		$this->assertEquals( [
+			'xxempty',
+			'xxexists',
+			'xxmulti',
+			'xxnotexists',
+			'xxrecursivetemplate-a-A!',
+			'xxrecursivetemplate-b-B1',
+			'xxrecursivetemplate-b-B2',
+			'xxrecursivetemplate-b-B3',
+			'xxtemplate-a',
+			'xxtemplate-b',
+			'xxtemplate-c',
+			'xxtemplate-d',
+		], $used );
+
+		$warnings = $mock->getResult()->getResultData( 'warnings', [ 'Strip' => 'all' ] );
+		$this->assertCount( 1, $warnings );
+		$this->assertSame( 'ignoring-invalid-templated-value', $warnings[0]['code'] );
+	}
+
 }
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index a84cc04514..6e23e53639 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -153,64 +153,75 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$lb->closeAll();
 	}
 
-	public function testLBFactoryMulti() {
-		global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
+	public function testLBFactoryMultiConns() {
+		$factory = $this->newLBFactoryMultiLBs();
 
-		$factory = new LBFactoryMulti( [
-			'sectionsByDB' => [
-				's1wiki' => 's1',
-			],
-			'sectionLoads' => [
-				's1' => [
-					'test-db3' => 0,
-					'test-db4' => 100,
-				],
-				'DEFAULT' => [
-					'test-db1' => 0,
-					'test-db2' => 100,
-				]
-			],
-			'serverTemplate' => [
-				'dbname'      => $wgDBname,
-				'user'        => $wgDBuser,
-				'password'    => $wgDBpassword,
-				'type'        => $wgDBtype,
-				'dbDirectory' => $wgSQLiteDataDir,
-				'flags'       => DBO_DEFAULT
-			],
-			'hostsByName' => [
-				'test-db1'  => $wgDBserver,
-				'test-db2'  => $wgDBserver,
-				'test-db3'  => $wgDBserver,
-				'test-db4'  => $wgDBserver
-			],
-			'loadMonitorClass' => LoadMonitorNull::class
-		] );
-		$lb = $factory->getMainLB();
-
-		$dbw = $lb->getConnection( DB_MASTER );
+		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
 		$this->assertTrue( $dbw->getLBInfo( 'master' ), 'master shows as master' );
 
-		$dbr = $lb->getConnection( DB_REPLICA );
+		$dbr = $factory->getMainLB()->getConnection( DB_REPLICA );
 		$this->assertTrue( $dbr->getLBInfo( 'replica' ), 'slave shows as slave' );
 
-		// Test that LoadBalancer instances made during commitMasterChanges() do not throw
-		// DBTransactionError due to transaction ROUND_* stages being mismatched.
+		// Destructor should trigger without round stage errors
+		unset( $factory );
+	}
+
+	public function testLBFactoryMultiRoundCallbacks() {
+		$called = 0;
+		$countLBsFunc = function ( LBFactoryMulti $factory ) {
+			$count = 0;
+			$factory->forEachLB( function () use ( &$count ) {
+				++$count;
+			} );
+
+			return $count;
+		};
+
+		$factory = $this->newLBFactoryMultiLBs();
+		$this->assertEquals( 0, $countLBsFunc( $factory ) );
+		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
+		$this->assertEquals( 1, $countLBsFunc( $factory ) );
+		// Test that LoadBalancer instances made during pre-commit callbacks in do not
+		// throw DBTransactionError due to transaction ROUND_* stages being mismatched.
 		$factory->beginMasterChanges( __METHOD__ );
-		$dbw->onTransactionPreCommitOrIdle( function () use ( $factory ) {
+		$dbw->onTransactionPreCommitOrIdle( function () use ( $factory, &$called ) {
+			++$called;
 			// Trigger s1 LoadBalancer instantiation during "finalize" stage.
 			// There is no s1wiki DB to select so it is not in getConnection(),
 			// but this fools getMainLB() at least.
 			$factory->getMainLB( 's1wiki' )->getConnection( DB_MASTER );
 		} );
 		$factory->commitMasterChanges( __METHOD__ );
+		$this->assertEquals( 1, $called );
+		$this->assertEquals( 2, $countLBsFunc( $factory ) );
+		$factory->shutdown();
+		$factory->closeAll();
 
-		$count = 0;
-		$factory->forEachLB( function () use ( &$count ) {
-			++$count;
+		$called = 0;
+		$factory = $this->newLBFactoryMultiLBs();
+		$this->assertEquals( 0, $countLBsFunc( $factory ) );
+		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
+		$this->assertEquals( 1, $countLBsFunc( $factory ) );
+		// Test that LoadBalancer instances made during pre-commit callbacks in do not
+		// throw DBTransactionError due to transaction ROUND_* stages being mismatched.hrow
+		// DBTransactionError due to transaction ROUND_* stages being mismatched.
+		$factory->beginMasterChanges( __METHOD__ );
+		$dbw->query( "SELECT 1 as t", __METHOD__ );
+		$dbw->onTransactionResolution( function () use ( $factory, &$called ) {
+			++$called;
+			// Trigger s1 LoadBalancer instantiation during "finalize" stage.
+			// There is no s1wiki DB to select so it is not in getConnection(),
+			// but this fools getMainLB() at least.
+			$factory->getMainLB( 's1wiki' )->getConnection( DB_MASTER );
 		} );
-		$this->assertEquals( 2, $count );
+		$factory->commitMasterChanges( __METHOD__ );
+		$this->assertEquals( 1, $called );
+		$this->assertEquals( 2, $countLBsFunc( $factory ) );
+		$factory->shutdown();
+		$factory->closeAll();
 
+		$factory = $this->newLBFactoryMultiLBs();
+		$dbw = $factory->getMainLB()->getConnection( DB_MASTER );
 		// DBTransactionError should not be thrown
 		$ran = 0;
 		$dbw->onTransactionPreCommitOrIdle( function () use ( &$ran ) {
@@ -223,6 +234,41 @@ class LBFactoryTest extends MediaWikiTestCase {
 		$factory->closeAll();
 	}
 
+	private function newLBFactoryMultiLBs() {
+		global $wgDBserver, $wgDBname, $wgDBuser, $wgDBpassword, $wgDBtype, $wgSQLiteDataDir;
+
+		return new LBFactoryMulti( [
+			'sectionsByDB' => [
+				's1wiki' => 's1',
+			],
+			'sectionLoads' => [
+				's1' => [
+					'test-db3' => 0,
+					'test-db4' => 100,
+				],
+				'DEFAULT' => [
+					'test-db1' => 0,
+					'test-db2' => 100,
+				]
+			],
+			'serverTemplate' => [
+				'dbname' => $wgDBname,
+				'user' => $wgDBuser,
+				'password' => $wgDBpassword,
+				'type' => $wgDBtype,
+				'dbDirectory' => $wgSQLiteDataDir,
+				'flags' => DBO_DEFAULT
+			],
+			'hostsByName' => [
+				'test-db1' => $wgDBserver,
+				'test-db2' => $wgDBserver,
+				'test-db3' => $wgDBserver,
+				'test-db4' => $wgDBserver
+			],
+			'loadMonitorClass' => LoadMonitorNull::class
+		] );
+	}
+
 	/**
 	 * @covers \Wikimedia\Rdbms\ChronologyProtector
 	 */
diff --git a/tests/phpunit/includes/libs/CSSMinTest.php b/tests/phpunit/includes/libs/CSSMinTest.php
index dabf66b320..354dae203b 100644
--- a/tests/phpunit/includes/libs/CSSMinTest.php
+++ b/tests/phpunit/includes/libs/CSSMinTest.php
@@ -35,7 +35,7 @@ class CSSMinTest extends MediaWikiTestCase {
 	public static function provideSerializeStringValue() {
 		return [
 			[ 'Hello World!', '"Hello World!"' ],
-			[ "Null\0Null", "\"Null\\fffd Null\"" ],
+			[ "Null\0Null", "\"Null\xEF\xBF\xBDNull\"" ],
 			[ '"', '"\\""' ],
 			[ "'", '"\'"' ],
 			[ "\\", '"\\\\"' ],
@@ -199,6 +199,9 @@ class CSSMinTest extends MediaWikiTestCase {
 			[ true, '//example.org/x.y.z/image.png' ],
 			[ true, '//localhost/styles.css?query=yes' ],
 			[ true, 'data:image/gif;base64,R0lGODlhAQABAIAAAP8AADAAACwAAAAAAQABAAACAkQBADs=' ],
+			[ false, '' ],
+			[ false, '/' ],
+			[ true, '//' ],
 			[ false, 'x.gif' ],
 			[ false, '/x.gif' ],
 			[ false, './x.gif' ],
@@ -217,6 +220,9 @@ class CSSMinTest extends MediaWikiTestCase {
 
 	public static function provideIsLocalUrls() {
 		return [
+			[ false, '' ],
+			[ false, '/' ],
+			[ false, '//' ],
 			[ false, 'x.gif' ],
 			[ true, '/x.gif' ],
 			[ false, './x.gif' ],
diff --git a/tests/phpunit/includes/parser/ParserOptionsTest.php b/tests/phpunit/includes/parser/ParserOptionsTest.php
index e2ed1d57e0..8c61b0323b 100644
--- a/tests/phpunit/includes/parser/ParserOptionsTest.php
+++ b/tests/phpunit/includes/parser/ParserOptionsTest.php
@@ -25,17 +25,16 @@ class ParserOptionsTest extends MediaWikiTestCase {
 	}
 
 	protected function setUp() {
-		global $wgHooks;
-
 		parent::setUp();
 		self::clearCache();
 
 		$this->setMwGlobals( [
 			'wgRenderHashAppend' => '',
-			'wgHooks' => [
-				'PageRenderingHash' => [],
-			] + $wgHooks,
 		] );
+
+		// This is crazy, but registering false, null, or other falsey values
+		// as a hook callback "works".
+		$this->setTemporaryHook( 'PageRenderingHash', null );
 	}
 
 	protected function tearDown() {
@@ -84,17 +83,13 @@ class ParserOptionsTest extends MediaWikiTestCase {
 	 * @param string $expect Expected value
 	 * @param array $options Options to set
 	 * @param array $globals Globals to set
+	 * @param callable|null $hookFunc PageRenderingHash hook function
 	 */
-	public function testOptionsHash( $usedOptions, $expect, $options, $globals = [] ) {
-		global $wgHooks;
-
-		$globals += [
-			'wgHooks' => [],
-		];
-		$globals['wgHooks'] += [
-			'PageRenderingHash' => [],
-		] + $wgHooks;
+	public function testOptionsHash(
+		$usedOptions, $expect, $options, $globals = [], $hookFunc = null
+	) {
 		$this->setMwGlobals( $globals );
+		$this->setTemporaryHook( 'PageRenderingHash', $hookFunc );
 
 		$popt = ParserOptions::newCanonical();
 		foreach ( $options as $name => $value ) {
@@ -129,14 +124,50 @@ class ParserOptionsTest extends MediaWikiTestCase {
 				[],
 				'canonical!wgRenderHashAppend!onPageRenderingHash',
 				[],
-				[
-					'wgRenderHashAppend' => '!wgRenderHashAppend',
-					'wgHooks' => [ 'PageRenderingHash' => [ [ __CLASS__ . '::onPageRenderingHash' ] ] ],
-				]
+				[ 'wgRenderHashAppend' => '!wgRenderHashAppend' ],
+				[ __CLASS__ . '::onPageRenderingHash' ],
 			],
 		];
 	}
 
+	public function testUsedLazyOptionsInHash() {
+		$this->setTemporaryHook( 'ParserOptionsRegister',
+			function ( &$defaults, &$inCacheKey, &$lazyOptions ) {
+				$lazyFuncs = $this->getMockBuilder( stdClass::class )
+					->setMethods( [ 'neverCalled', 'calledOnce' ] )
+					->getMock();
+				$lazyFuncs->expects( $this->never() )->method( 'neverCalled' );
+				$lazyFuncs->expects( $this->once() )->method( 'calledOnce' )->willReturn( 'value' );
+
+				$defaults += [
+					'opt1' => null,
+					'opt2' => null,
+					'opt3' => null,
+				];
+				$inCacheKey += [
+					'opt1' => true,
+					'opt2' => true,
+				];
+				$lazyOptions += [
+					'opt1' => [ $lazyFuncs, 'calledOnce' ],
+					'opt2' => [ $lazyFuncs, 'neverCalled' ],
+					'opt3' => [ $lazyFuncs, 'neverCalled' ],
+				];
+			}
+		);
+
+		self::clearCache();
+
+		$popt = ParserOptions::newCanonical();
+		$popt->registerWatcher( function () {
+			$this->fail( 'Watcher should not have been called' );
+		} );
+		$this->assertSame( 'opt1=value', $popt->optionsHash( [ 'opt1', 'opt3' ] ) );
+
+		// Second call to see that opt1 isn't resolved a second time
+		$this->assertSame( 'opt1=value', $popt->optionsHash( [ 'opt1', 'opt3' ] ) );
+	}
+
 	public static function onPageRenderingHash( &$confstr ) {
 		$confstr .= '!onPageRenderingHash';
 	}
@@ -192,10 +223,7 @@ class ParserOptionsTest extends MediaWikiTestCase {
 	}
 
 	public function testAllCacheVaryingOptions() {
-		global $wgHooks;
-
-		// $wgHooks is already saved in self::setUp(), so we can modify it freely here
-		$wgHooks['ParserOptionsRegister'] = [];
+		$this->setTemporaryHook( 'ParserOptionsRegister', null );
 		$this->assertSame( [
 			'dateformat', 'numberheadings', 'printable', 'stubthreshold',
 			'thumbsize', 'userlang'
@@ -203,7 +231,7 @@ class ParserOptionsTest extends MediaWikiTestCase {
 
 		self::clearCache();
 
-		$wgHooks['ParserOptionsRegister'][] = function ( &$defaults, &$inCacheKey ) {
+		$this->setTemporaryHook( 'ParserOptionsRegister', function ( &$defaults, &$inCacheKey ) {
 			$defaults += [
 				'foo' => 'foo',
 				'bar' => 'bar',
@@ -213,7 +241,7 @@ class ParserOptionsTest extends MediaWikiTestCase {
 				'foo' => true,
 				'bar' => false,
 			];
-		};
+		} );
 		$this->assertSame( [
 			'dateformat', 'foo', 'numberheadings', 'printable', 'stubthreshold',
 			'thumbsize', 'userlang'
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
index ea3d199efe..e763a19466 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderClientHtmlTest.php
@@ -218,7 +218,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit\Framework\TestCase {
 		// phpcs:enable
 		$expected = self::expandVariables( $expected );
 
-		$this->assertEquals( $expected, $client->getHeadHtml() );
+		$this->assertEquals( $expected, $client->getHeadHtml( false ) );
 	}
 
 	/**
@@ -237,7 +237,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit\Framework\TestCase {
 			. '<script async="" src="/w/load.php?debug=false&amp;lang=nl&amp;modules=startup&amp;only=scripts&amp;skin=fallback&amp;target=example"></script>';
 		// phpcs:enable
 
-		$this->assertEquals( $expected, $client->getHeadHtml() );
+		$this->assertEquals( $expected, $client->getHeadHtml( false ) );
 	}
 
 	/**
@@ -256,7 +256,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit\Framework\TestCase {
 			. '<script async="" src="/w/load.php?debug=false&amp;lang=nl&amp;modules=startup&amp;only=scripts&amp;skin=fallback"></script>';
 		// phpcs:enable
 
-		$this->assertEquals( $expected, $client->getHeadHtml() );
+		$this->assertEquals( $expected, $client->getHeadHtml( false ) );
 	}
 
 	/**
@@ -408,7 +408,7 @@ class ResourceLoaderClientHtmlTest extends PHPUnit\Framework\TestCase {
 	public function testMakeLoad( array $extraQuery, array $modules, $type, $expected ) {
 		$context = self::makeContext( $extraQuery );
 		$context->getResourceLoader()->register( self::makeSampleModules() );
-		$actual = ResourceLoaderClientHtml::makeLoad( $context, $modules, $type, $extraQuery );
+		$actual = ResourceLoaderClientHtml::makeLoad( $context, $modules, $type, $extraQuery, false );
 		$expected = self::expandVariables( $expected );
 		$this->assertEquals( $expected, (string)$actual );
 	}
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderLessVarFileModuleTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderLessVarFileModuleTest.php
index a42e4bed25..bb51de07d7 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderLessVarFileModuleTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderLessVarFileModuleTest.php
@@ -38,6 +38,6 @@ class ResourceLoaderLessVarFileModuleTest extends ResourceLoaderTestCase {
 	public function testEscapeMessage( $msg, $expected ) {
 		$method = new ReflectionMethod( ResourceLoaderLessVarFileModule::class, 'wrapAndEscapeMessage' );
 		$method->setAccessible( true );
-		$this->assertEquals( $expected, $method->invoke( ResourceLoaderLessVarFileModule::class, $msg ) );
+		$this->assertEquals( $expected, $method->invoke( null, $msg ) );
 	}
 }
diff --git a/tests/phpunit/maintenance/categoryChangesRdfTest.php b/tests/phpunit/maintenance/categoryChangesRdfTest.php
new file mode 100644
index 0000000000..30a56f49d4
--- /dev/null
+++ b/tests/phpunit/maintenance/categoryChangesRdfTest.php
@@ -0,0 +1,263 @@
+<?php
+
+/**
+ * Tests for CategoryChangesAsRdf recent changes exporter.
+ *  @covers CategoryChangesAsRdf
+ */
+class CategoryChangesRdfTest extends MediaWikiLangTestCase {
+
+	public function setUp() {
+		parent::setUp();
+		$this->setMwGlobals( [
+			'wgServer' => 'http://acme.test',
+			'wgCanonicalServer' => 'http://acme.test',
+			'wgArticlePath' => '/wiki/$1',
+		] );
+	}
+
+	public function provideCategoryData() {
+		return [
+			'delete category' => [
+				__DIR__ . "/../data/categoriesrdf/delete.sparql",
+				'getDeletedCatsIterator',
+				'handleDeletes',
+				[
+					(object)[ 'rc_title' => 'Test', 'rc_cur_id' => 1, '_processed' => 1 ],
+					(object)[ 'rc_title' => 'Test 2', 'rc_cur_id' => 2, '_processed' => 2 ],
+				],
+			],
+			'move category' => [
+				__DIR__ . "/../data/categoriesrdf/move.sparql",
+				'getMovedCatsIterator',
+				'handleMoves',
+				[
+					(object)[
+						'rc_title' => 'Test',
+						'rc_cur_id' => 4,
+						'page_title' => 'MovedTo',
+						'page_namespace' => NS_CATEGORY,
+						'_processed' => 4,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'MovedTo',
+						'rc_cur_id' => 4,
+						'page_title' => 'MovedAgain',
+						'page_namespace' => NS_CATEGORY,
+						'pp_propname' => 'hiddencat',
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Test 2',
+						'rc_cur_id' => 5,
+						'page_title' => 'AlsoMoved',
+						'page_namespace' => NS_CATEGORY,
+						'_processed' => 5,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Test 3',
+						'rc_cur_id' => 6,
+						'page_title' => 'MovedOut',
+						'page_namespace' => NS_MAIN,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Test 4',
+						'rc_cur_id' => 7,
+						'page_title' => 'Already Done',
+						'page_namespace' => NS_CATEGORY,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+				],
+				[ 7 => true ],
+			],
+			'restore deleted category' => [
+				__DIR__ . "/../data/categoriesrdf/restore.sparql",
+				'getRestoredCatsIterator',
+				'handleRestores',
+				[
+					(object)[
+						'rc_title' => 'Restored cat',
+						'rc_cur_id' => 10,
+						'_processed' => 10,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Restored again',
+						'rc_cur_id' => 10,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Already seen',
+						'rc_cur_id' => 11,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+				],
+				[ 11 => true ],
+			],
+			'new page' => [
+				__DIR__ . "/../data/categoriesrdf/new.sparql",
+				'getNewCatsIterator',
+				'handleAdds',
+				[
+					(object)[
+						'rc_title' => 'New category',
+						'rc_cur_id' => 20,
+						'_processed' => 20,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Новая категория 😃',
+						'rc_cur_id' => 21,
+						'_processed' => 21,
+						'pp_propname' => 'hiddencat',
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Processed already',
+						'rc_cur_id' => 22,
+					],
+				],
+				[ 22 => true ],
+			],
+			'change in categories' => [
+				__DIR__ . "/../data/categoriesrdf/change.sparql",
+				'getChangedCatsIterator',
+				'handleChanges',
+				[
+					(object)[
+						'rc_title' => 'Changed category',
+						'rc_cur_id' => 30,
+						'_processed' => 30,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Changed again',
+						'rc_cur_id' => 30,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+					(object)[
+						'rc_title' => 'Processed already',
+						'rc_cur_id' => 31,
+						'pp_propname' => null,
+						'cat_pages' => 10,
+						'cat_subcats' => 2,
+						'cat_files' => 1,
+					],
+				],
+				[ 31 => true ],
+			],
+
+		];
+	}
+
+	/**
+	 * Mock category links iterator.
+	 * @param $dbr
+	 * @param array $ids
+	 * @return array
+	 */
+	public function getCategoryLinksIterator( $dbr, array $ids ) {
+		$res = [];
+		foreach ( $ids as $pageid ) {
+			$res[] = (object)[ 'cl_from' => $pageid, 'cl_to' => "Parent of $pageid" ];
+		}
+		return $res;
+	}
+
+	/**
+	 * @dataProvider provideCategoryData
+	 * @param string $testFileName Name of the test, defines filename with expected results.
+	 * @param string $iterator Iterator method name to mock
+	 * @param string $handler Handler method to call
+	 * @param array $result Result to be returned from mock iterator
+	 * @param array $preProcessed List of pre-processed items
+	 */
+	public function testSparqlUpdate( $testFileName, $iterator, $handler, $result,
+			array $preProcessed = [] ) {
+		$dumpScript =
+			$this->getMockBuilder( CategoryChangesAsRdf::class )
+				->setMethods( [ $iterator, 'getCategoryLinksIterator' ] )
+				->getMock();
+
+		$dumpScript->expects( $this->any() )
+			->method( 'getCategoryLinksIterator' )
+			->willReturnCallback( [ $this, 'getCategoryLinksIterator' ] );
+
+		$dumpScript->expects( $this->once() )
+			->method( $iterator )
+			->willReturn( [ $result ] );
+
+		$ref = new ReflectionObject( $dumpScript );
+		$processedProperty = $ref->getProperty( 'processed' );
+		$processedProperty->setAccessible( true );
+		$processedProperty->setValue( $dumpScript, $preProcessed );
+
+		$output = fopen( "php://memory", "w+b" );
+		$dbr = wfGetDB( DB_REPLICA );
+		/** @var CategoryChangesAsRdf $dumpScript */
+		$dumpScript->initialize();
+		$dumpScript->getRdf();
+		$dumpScript->$handler( $dbr, $output );
+
+		rewind( $output );
+		$sparql = stream_get_contents( $output );
+		$this->assertFileContains( $testFileName, $sparql );
+
+		$processed = $processedProperty->getValue( $dumpScript );
+		$expectedProcessed = $preProcessed;
+		foreach ( $result as $row ) {
+			if ( isset( $row->_processed ) ) {
+				$this->assertArrayHasKey( $row->_processed, $processed,
+					"ID {$row->_processed} was not processed!" );
+				$expectedProcessed[] = $row->_processed;
+			}
+		}
+		$this->assertArrayEquals( $expectedProcessed, array_keys( $processed ),
+			'Processed array has wrong items' );
+	}
+
+	public function testUpdateTs() {
+		$dumpScript = new CategoryChangesAsRdf();
+		$dumpScript->initialize();
+		$update = $dumpScript->updateTS( 1503620949 );
+		$outFile = __DIR__ . '/../data/categoriesrdf/updatets.txt';
+		$this->assertFileContains( $outFile, $update );
+	}
+
+}
diff --git a/tests/phpunit/structure/ApiStructureTest.php b/tests/phpunit/structure/ApiStructureTest.php
index 77d6e74174..692bd73a9f 100644
--- a/tests/phpunit/structure/ApiStructureTest.php
+++ b/tests/phpunit/structure/ApiStructureTest.php
@@ -60,6 +60,7 @@ class ApiStructureTest extends MediaWikiTestCase {
 		ApiBase::PARAM_ISMULTI_LIMIT2 => [ 'integer' ],
 		ApiBase::PARAM_MAX_BYTES => [ 'integer' ],
 		ApiBase::PARAM_MAX_CHARS => [ 'integer' ],
+		ApiBase::PARAM_TEMPLATE_VARS => [ 'array' ],
 	];
 
 	// param => [ other param that must be present => required value or null ]
@@ -422,6 +423,45 @@ class ApiStructureTest extends MediaWikiTestCase {
 						"$param: PARAM_MAX_BYTES cannot be less than PARAM_MAX_CHARS"
 					);
 				}
+
+				if ( isset( $config[ApiBase::PARAM_TEMPLATE_VARS] ) ) {
+					$this->assertNotSame( [], $config[ApiBase::PARAM_TEMPLATE_VARS],
+						"$param: PARAM_TEMPLATE_VARS cannot be empty" );
+					foreach ( $config[ApiBase::PARAM_TEMPLATE_VARS] as $key => $target ) {
+						$this->assertRegExp( '/^[^{}]+$/', $key,
+							"$param: PARAM_TEMPLATE_VARS key may not contain '{' or '}'" );
+
+						$this->assertContains( '{' . $key . '}', $param,
+							"$param: Name must contain PARAM_TEMPLATE_VARS key {" . $key . "}" );
+						$this->assertArrayHasKey( $target, $params,
+							"$param: PARAM_TEMPLATE_VARS target parameter '$target' does not exist" );
+						$config2 = $params[$target];
+						$this->assertTrue( !empty( $config2[ApiBase::PARAM_ISMULTI] ),
+							"$param: PARAM_TEMPLATE_VARS target parameter '$target' must have PARAM_ISMULTI = true" );
+
+						if ( isset( $config2[ApiBase::PARAM_TEMPLATE_VARS] ) ) {
+							$this->assertNotSame( $param, $target,
+								"$param: PARAM_TEMPLATE_VARS cannot target itself" );
+
+							$this->assertArraySubset(
+								$config2[ApiBase::PARAM_TEMPLATE_VARS],
+								$config[ApiBase::PARAM_TEMPLATE_VARS],
+								true,
+								"$param: PARAM_TEMPLATE_VARS target parameter '$target': "
+								. "the target's PARAM_TEMPLATE_VARS must be a subset of the original."
+							);
+						}
+					}
+
+					$keys = implode( '|',
+						array_map( 'preg_quote', array_keys( $config[ApiBase::PARAM_TEMPLATE_VARS] ) )
+					);
+					$this->assertRegExp( '/^(?>[^{}]+|\{(?:' . $keys . ')\})+$/', $param,
+						"$param: Name may not contain '{' or '}' other than as defined by PARAM_TEMPLATE_VARS" );
+				} else {
+					$this->assertRegExp( '/^[^{}]+$/', $param,
+						"$param: Name may not contain '{' or '}' without PARAM_TEMPLATE_VARS" );
+				}
 			}
 		}
 	}
diff --git a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
index d51dc373dd..d3f65335d3 100644
--- a/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.makeCollapsible.test.js
@@ -374,4 +374,24 @@
 
 		$clone.find( '.mw-collapsible-toggle a' ).trigger( 'click' );
 	} );
+
+	QUnit.test( 'T168689 - nested collapsible divs should keep independent state', function ( assert ) {
+		var $collapsible1 = prepareCollapsible(
+				'<div class="mw-collapsible">' + loremIpsum + '</div>'
+			),
+			$collapsible2 = prepareCollapsible(
+				'<div class="mw-collapsible">' + loremIpsum + '</div>'
+			);
+
+		$collapsible1
+			.append( $collapsible2 )
+			.appendTo( '#qunit-fixture' ).makeCollapsible();
+
+		$collapsible1.on( 'afterCollapse.mw-collapsible', function () {
+			assert.assertTrue( $collapsible1.hasClass( 'mw-collapsed' ), 'after collapsing: parent is collapsed' );
+			assert.assertFalse( $collapsible2.hasClass( 'mw-collapsed' ), 'after collapsing: child is not collapsed' );
+			assert.assertTrue( $collapsible1.find( '> .mw-collapsible-toggle' ).hasClass( 'mw-collapsible-toggle-collapsed' ) );
+			assert.assertFalse( $collapsible2.find( '> .mw-collapsible-toggle' ).hasClass( 'mw-collapsible-toggle-collapsed' ) );
+		} ).find( '> .mw-collapsible-toggle a' ).trigger( 'click' );
+	} );
 }( jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index 119222a61e..75dc66511e 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -113,6 +113,8 @@
 		assert.strictEqual( conf.set( funky, 'Funky' ), false, 'Map.set returns boolean false if key was invalid (Function)' );
 		assert.strictEqual( conf.set( arry, 'Arry' ), false, 'Map.set returns boolean false if key was invalid (Array)' );
 		assert.strictEqual( conf.set( nummy, 'Nummy' ), false, 'Map.set returns boolean false if key was invalid (Number)' );
+		assert.strictEqual( conf.set( null, 'Null' ), false, 'Map.set returns false if key is invalid (null)' );
+		assert.strictEqual( conf.set( {}, 'Object' ), false, 'Map.set returns false if key is invalid (plain object)' );
 
 		conf.set( String( nummy ), 'I used to be a number' );