From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 24 Aug 2016 17:14:35 +0000 (+0000)
Subject: Merge "Sync up with Parsoid parserTests."
X-Git-Tag: 1.31.0-rc.0~5909
X-Git-Url: http://git.cyclocoop.org/%22.%28%24lien.?a=commitdiff_plain;h=b92a94b52f8e30c53794123961f79315adf80a55;hp=52363db5666b0af739a5cbf3d5a9c715e0f8ba11;p=lhc%2Fweb%2Fwiklou.git

Merge "Sync up with Parsoid parserTests."
---

diff --git a/Gemfile b/Gemfile
index 19d2f52315..8a349bf040 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,5 @@
 source 'https://rubygems.org'
 
-gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.1'
+gem 'mediawiki_selenium', '~> 1.7', '>= 1.7.2'
 gem 'rake', '~> 11.1', '>= 11.1.1'
 gem 'rubocop', '~> 0.32.1', require: false
diff --git a/Gemfile.lock b/Gemfile.lock
index 2d6e65594e..982619abde 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -17,16 +17,18 @@ GEM
       faker (>= 1.1.2)
       yml_reader (>= 0.6)
     diff-lcs (1.2.5)
-    domain_name (0.5.20160310)
+    domain_name (0.5.20160615)
       unf (>= 0.0.5, < 1.0.0)
-    faker (1.6.3)
+    faker (1.6.6)
       i18n (~> 0.5)
     faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     faraday-cookie_jar (0.0.6)
       faraday (>= 0.7.4)
       http-cookie (~> 1.0.0)
-    ffi (1.9.10)
+    faraday_middleware (0.10.0)
+      faraday (>= 0.7.4, < 0.10)
+    ffi (1.9.14)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     headless (2.2.3)
@@ -34,14 +36,15 @@ GEM
       domain_name (~> 0.5)
     i18n (0.7.0)
     json (1.8.3)
-    mediawiki_api (0.6.0)
+    mediawiki_api (0.7.0)
       faraday (~> 0.9, >= 0.9.0)
       faraday-cookie_jar (~> 0.0, >= 0.0.6)
-    mediawiki_selenium (1.7.1)
+      faraday_middleware (~> 0.10, >= 0.10.0)
+    mediawiki_selenium (1.7.2)
       cucumber (~> 1.3, >= 1.3.20)
       headless (~> 2.0, >= 2.1.0)
       json (~> 1.8, >= 1.8.1)
-      mediawiki_api (~> 0.6, >= 0.6.0)
+      mediawiki_api (~> 0.7, >= 0.7.0)
       page-object (~> 1.0)
       rest-client (~> 1.6, >= 1.6.7)
       rspec-core (~> 2.14, >= 2.14.4)
@@ -53,7 +56,7 @@ GEM
     multi_test (0.1.2)
     multipart-post (2.0.0)
     netrc (0.11.0)
-    page-object (1.1.1)
+    page-object (1.2.0)
       page_navigation (>= 0.9)
       selenium-webdriver (>= 2.44.0)
       watir-webdriver (>= 0.6.11)
@@ -79,7 +82,7 @@ GEM
       ruby-progressbar (~> 1.4)
     ruby-progressbar (1.7.5)
     rubyzip (1.2.0)
-    selenium-webdriver (2.53.1)
+    selenium-webdriver (2.53.4)
       childprocess (~> 0.5)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
@@ -88,7 +91,7 @@ GEM
     unf (0.1.4)
       unf_ext
     unf_ext (0.0.7.2)
-    watir-webdriver (0.9.1)
+    watir-webdriver (0.9.3)
       selenium-webdriver (>= 2.46.2)
     websocket (1.2.3)
     yml_reader (0.7)
@@ -97,9 +100,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  mediawiki_selenium (~> 1.7, >= 1.7.1)
+  mediawiki_selenium (~> 1.7, >= 1.7.2)
   rake (~> 11.1, >= 11.1.1)
   rubocop (~> 0.32.1)
-
-BUNDLED WITH
-   1.10.6
diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index 80166ad0e6..92ac869535 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -39,7 +39,8 @@ production.
 * (T141604) Extensions can now provide a better error message when their
   maintenance scripts are run without the extension being installed.
 * (T8948) Numeric sorting in categories is now supported by setting $wgCategoryCollation
-  to uca-default-u-kn or uca-<langcode>-u-kn. If migrating from another
+  to 'uca-default-u-kn' or 'uca-<langcode>-u-kn'. If you can't use UCA collations,
+  a 'numeric' collation is also available. If migrating from another
   collation, you will need to run the updateCollation.php maintenance script.
 
 === External library changes in 1.28 ===
@@ -52,6 +53,16 @@ production.
 ==== Removed and replaced external libraries ====
 
 === Bug fixes in 1.28 ===
+* (T137264) SECURITY: XSS in unclosed internal links
+* (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
+* (T133147) SECURITY: Require login to preview user CSS pages
+* (T132926) SECURITY: Do not allow undeleting a revision deleted file if it is
+  the top file
+* (T129738) SECURITY: Make $wgBlockDisablesLogin also restrict logged in
+  permissions
+* (T129738) SECURITY: Make blocks log users out if $wgBlockDisablesLogin is true
+* (T139670) Move 'UserGetRights' call before application of
+  Session::getAllowedUserRights()
 
 === Action API changes in 1.28 ===
 * Added 'maxarticlesize' property to action=query&meta=siteinfo which contains
@@ -61,10 +72,19 @@ production.
 * The following response properties from action=login, deprecated in 1.27, are
   now removed: lgtoken, cookieprefix, sessionid. Clients should handle cookies
   to properly manage session state.
+* Submitting the lgtoken and lgpassword parameters in the query string to
+  action=login is now deprecated and outputs a warning. They should be submitted
+  in the POST body instead.
+* Submitting sensitive authentication request parameters to action=clientlogin,
+  action=createaccount, action=linkaccount, and action=changeauthenticationdata
+  in the query string is now deprecated and outputs a warning. They should be
+  submitted in the POST body instead.
 
 === Action API internal changes in 1.28 ===
 * Added a new hook, 'ApiMakeParserOptions', to allow extensions to better
   interact with ApiParse and ApiExpandTemplates.
+* (T139565) SECURITY: API: Generate head items in the context of the given title
+* (T115333) SECURITY: Check read permission when loading page content in ApiParse
 
 === Languages updated in 1.28 ===
 
@@ -106,6 +126,14 @@ changes to languages because of Phabricator reports.
 * DifferenceEngine::generateDiffBody() was removed (deprecated since 1.21).
 * UploadBase::stashFileGetKey() and UploadBase::stashSession() were deprecated.
   Use ...->stashFile()->getFileKey() instead.
+* "Public domain" was removed as a wiki license option from the installer, in
+  favour of CC-0.
+* AuthenticationRequest::$required is now changed from REQUIRED to PRIMARY_REQUIRED
+  on requests needed by primary providers even if all primaries need them.
+  Primary providers are discouraged from returning multiple REQUIRED requests.
+* OOjs UI PHP widgets constructed with the `'infusable' => true` config option
+  will no longer be automatically infused. You should call `OO.ui.infuse()`
+  on them yourself from your JavaScript code.
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index f6edd94b7d..39102fd358 100644
--- a/autoload.php
+++ b/autoload.php
@@ -372,6 +372,7 @@ $wgAutoloadLocalClasses = [
 	'DoubleRedirectsPage' => __DIR__ . '/includes/specials/SpecialDoubleRedirects.php',
 	'DoubleReplacer' => __DIR__ . '/includes/libs/replacers/DoubleReplacer.php',
 	'DummyLinker' => __DIR__ . '/includes/DummyLinker.php',
+	'DummySearchIndexFieldDefinition' => __DIR__ . '/includes/search/DummySearchIndexFieldDefinition.php',
 	'DummyTermColorer' => __DIR__ . '/maintenance/term/MWTerm.php',
 	'Dump7ZipOutput' => __DIR__ . '/includes/export/Dump7ZipOutput.php',
 	'DumpBZip2Output' => __DIR__ . '/includes/export/DumpBZip2Output.php',
@@ -407,7 +408,7 @@ $wgAutoloadLocalClasses = [
 	'EnhancedChangesList' => __DIR__ . '/includes/changes/EnhancedChangesList.php',
 	'EnotifNotifyJob' => __DIR__ . '/includes/jobqueue/jobs/EnotifNotifyJob.php',
 	'EnqueueJob' => __DIR__ . '/includes/jobqueue/jobs/EnqueueJob.php',
-	'EnqueueableDataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
+	'EnqueueableDataUpdate' => __DIR__ . '/includes/deferred/EnqueueableDataUpdate.php',
 	'EraseArchivedFile' => __DIR__ . '/maintenance/eraseArchivedFile.php',
 	'ErrorPageError' => __DIR__ . '/includes/exception/ErrorPageError.php',
 	'EventRelayer' => __DIR__ . '/includes/libs/eventrelayer/EventRelayer.php',
@@ -513,6 +514,7 @@ $wgAutoloadLocalClasses = [
 	'GitInfo' => __DIR__ . '/includes/GitInfo.php',
 	'GlobalDependency' => __DIR__ . '/includes/cache/CacheDependency.php',
 	'GlobalVarConfig' => __DIR__ . '/includes/config/GlobalVarConfig.php',
+	'HHVMMakeRepo' => __DIR__ . '/maintenance/hhvm/makeRepo.php',
 	'HTMLApiField' => __DIR__ . '/includes/htmlform/fields/HTMLApiField.php',
 	'HTMLAutoCompleteSelectField' => __DIR__ . '/includes/htmlform/fields/HTMLAutoCompleteSelectField.php',
 	'HTMLButtonField' => __DIR__ . '/includes/htmlform/fields/HTMLButtonField.php',
@@ -525,8 +527,11 @@ $wgAutoloadLocalClasses = [
 	'HTMLFileCache' => __DIR__ . '/includes/cache/HTMLFileCache.php',
 	'HTMLFloatField' => __DIR__ . '/includes/htmlform/fields/HTMLFloatField.php',
 	'HTMLForm' => __DIR__ . '/includes/htmlform/HTMLForm.php',
+	'HTMLFormActionFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
+	'HTMLFormElement' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
 	'HTMLFormField' => __DIR__ . '/includes/htmlform/HTMLFormField.php',
 	'HTMLFormFieldCloner' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldCloner.php',
+	'HTMLFormFieldLayout' => __DIR__ . '/includes/htmlform/HTMLFormElement.php',
 	'HTMLFormFieldRequiredOptionsException' => __DIR__ . '/includes/htmlform/HTMLFormFieldRequiredOptionsException.php',
 	'HTMLFormFieldWithButton' => __DIR__ . '/includes/htmlform/fields/HTMLFormFieldWithButton.php',
 	'HTMLHiddenField' => __DIR__ . '/includes/htmlform/fields/HTMLHiddenField.php',
@@ -856,6 +861,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Logger\\NullSpi' => __DIR__ . '/includes/debug/logger/NullSpi.php',
 	'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
 	'MediaWiki\\MediaWikiServices' => __DIR__ . '/includes/MediaWikiServices.php',
+	'MediaWiki\\Search\\ParserOutputSearchDataExtractor' => __DIR__ . '/includes/search/ParserOutputSearchDataExtractor.php',
 	'MediaWiki\\Services\\CannotReplaceActiveServiceException' => __DIR__ . '/includes/Services/CannotReplaceActiveServiceException.php',
 	'MediaWiki\\Services\\ContainerDisabledException' => __DIR__ . '/includes/Services/ContainerDisabledException.php',
 	'MediaWiki\\Services\\DestructibleService' => __DIR__ . '/includes/Services/DestructibleService.php',
@@ -947,7 +953,7 @@ $wgAutoloadLocalClasses = [
 	'MwSql' => __DIR__ . '/maintenance/sql.php',
 	'MySQLField' => __DIR__ . '/includes/db/DatabaseMysqlBase.php',
 	'MySQLMasterPos' => __DIR__ . '/includes/db/DatabaseMysqlBase.php',
-	'MySqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/DBLockManager.php',
+	'MySqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MySqlLockManager.php',
 	'MysqlInstaller' => __DIR__ . '/includes/installer/MysqlInstaller.php',
 	'MysqlUpdater' => __DIR__ . '/includes/installer/MysqlUpdater.php',
 	'NaiveForeignTitleFactory' => __DIR__ . '/includes/title/NaiveForeignTitleFactory.php',
@@ -969,6 +975,7 @@ $wgAutoloadLocalClasses = [
 	'NullLockManager' => __DIR__ . '/includes/filebackend/lockmanager/LockManager.php',
 	'NullRepo' => __DIR__ . '/includes/filerepo/NullRepo.php',
 	'NullStatsdDataFactory' => __DIR__ . '/includes/libs/stats/NullStatsdDataFactory.php',
+	'NumericUppercaseCollation' => __DIR__ . '/includes/collation/NumericUppercaseCollation.php',
 	'OOUIHTMLForm' => __DIR__ . '/includes/htmlform/OOUIHTMLForm.php',
 	'ORAField' => __DIR__ . '/includes/db/DatabaseOracle.php',
 	'ORAResult' => __DIR__ . '/includes/db/DatabaseOracle.php',
@@ -1055,7 +1062,7 @@ $wgAutoloadLocalClasses = [
 	'PopulateRecentChangesSource' => __DIR__ . '/maintenance/populateRecentChangesSource.php',
 	'PopulateRevisionLength' => __DIR__ . '/maintenance/populateRevisionLength.php',
 	'PopulateRevisionSha1' => __DIR__ . '/maintenance/populateRevisionSha1.php',
-	'PostgreSqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/DBLockManager.php',
+	'PostgreSqlLockManager' => __DIR__ . '/includes/filebackend/lockmanager/PostgreSqlLockManager.php',
 	'PostgresBlob' => __DIR__ . '/includes/db/DatabasePostgres.php',
 	'PostgresField' => __DIR__ . '/includes/db/DatabasePostgres.php',
 	'PostgresInstaller' => __DIR__ . '/includes/installer/PostgresInstaller.php',
@@ -1090,6 +1097,7 @@ $wgAutoloadLocalClasses = [
 	'PurgeAction' => __DIR__ . '/includes/actions/PurgeAction.php',
 	'PurgeChangedFiles' => __DIR__ . '/maintenance/purgeChangedFiles.php',
 	'PurgeChangedPages' => __DIR__ . '/maintenance/purgeChangedPages.php',
+	'PurgeJobUtils' => __DIR__ . '/includes/jobqueue/utils/PurgeJobUtils.php',
 	'PurgeList' => __DIR__ . '/maintenance/purgeList.php',
 	'PurgeOldText' => __DIR__ . '/maintenance/purgeOldText.php',
 	'PurgeParserCache' => __DIR__ . '/maintenance/purgeParserCache.php',
diff --git a/composer.json b/composer.json
index 9bd0fa1f07..2243b7cadf 100644
--- a/composer.json
+++ b/composer.json
@@ -25,7 +25,7 @@
 		"ext-xml": "*",
 		"liuggio/statsd-php-client": "1.0.18",
 		"mediawiki/at-ease": "1.1.0",
-		"oojs/oojs-ui": "0.17.7",
+		"oojs/oojs-ui": "0.17.8",
 		"oyejorge/less.php": "1.7.0.10",
 		"php": ">=5.5.9",
 		"psr/log": "1.0.0",
@@ -45,10 +45,10 @@
 	},
 	"require-dev": {
 		"jakub-onderka/php-parallel-lint": "0.9.2",
-		"justinrainbow/json-schema": "~1.6",
+		"justinrainbow/json-schema": "~3.0",
 		"mediawiki/mediawiki-codesniffer": "0.7.2",
 		"monolog/monolog": "~1.18.2",
-		"nikic/php-parser": "1.4.1",
+		"nikic/php-parser": "2.1.0",
 		"nmred/kafka-php": "0.1.5",
 		"phpunit/phpunit": "4.8.24",
 		"wikimedia/avro": "1.7.7"
diff --git a/docs/database.txt b/docs/database.txt
index ba3045ed40..44ec764d95 100644
--- a/docs/database.txt
+++ b/docs/database.txt
@@ -8,7 +8,7 @@ By Tim Starling, January 2006.
 For information about the MediaWiki database layout, such as a 
 description of the tables and their contents, please see:
   https://www.mediawiki.org/wiki/Manual:Database_layout
-  https://gerrit.wikimedia.org/r/gitweb?p=mediawiki/core.git;a=blob_plain;f=maintenance/tables.sql;hb=HEAD
+  https://phabricator.wikimedia.org/diffusion/MW/browse/master/maintenance/tables.sql
 
 
 ------------------------------------------------------------------------
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 5cf8ffeea6..a0ee8bde3a 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -297,16 +297,6 @@ After a user account is created.
 $user: the User object that was created. (Parameter added in 1.7)
 $byEmail: true when account was created "by email" (added in 1.12)
 
-'AddNewAccountApiForm': Allow modifying internal login form when creating an
-account via API.
-$apiModule: the ApiCreateAccount module calling
-$loginForm: the LoginForm used
-
-'AddNewAccountApiResult': Modify API output when creating a new account via API.
-$apiModule: the ApiCreateAccount module calling
-$loginForm: the LoginForm used
-&$result: associative array for API result data
-
 'AfterBuildFeedLinks': Executed in OutputPage.php after all feed links (atom, rss,...)
 are created. Can be used to omit specific feeds from being outputted. You must not use
 this hook to add feeds, use OutputPage::addFeedLink() instead.
@@ -2069,13 +2059,6 @@ $e: The exception (in case of a plain old PHP error, a wrapping ErrorException)
 $suppressed: true if the error was suppressed via
   error_reporting()/wfSuppressWarnings()
 
-'LoginAuthenticateAudit': A login attempt for a valid user account either
-succeeded or failed. No return data is accepted; this hook is for auditing only.
-$user: the User object being authenticated against
-$password: the password being submitted and found wanting
-$retval: a LoginForm class constant with authenticateUserData() return
-  value (SUCCESS, WRONG_PASS, etc.).
-
 'LoginFormValidErrorMessages': Called in LoginForm when a function gets valid
 error messages. Allows to add additional error messages (except messages already
 in LoginForm::$validErrorMessages).
diff --git a/includes/Block.php b/includes/Block.php
index 93df004c5f..79b31bbf58 100644
--- a/includes/Block.php
+++ b/includes/Block.php
@@ -457,6 +457,7 @@ class Block {
 	 *	('id' => block ID, 'autoIds' => array of autoblock IDs)
 	 */
 	public function insert( $dbw = null ) {
+		global $wgBlockDisablesLogin;
 		wfDebug( "Block::insert; timestamp {$this->mTimestamp}\n" );
 
 		if ( $dbw === null ) {
@@ -499,6 +500,13 @@ class Block {
 
 		if ( $affected ) {
 			$auto_ipd_ids = $this->doRetroactiveAutoblock();
+
+			if ( $wgBlockDisablesLogin && $this->target instanceof User ) {
+				// Change user login token to force them to be logged out.
+				$this->target->setToken();
+				$this->target->saveSettings();
+			}
+
 			return [ 'id' => $this->mId, 'autoIds' => $auto_ipd_ids ];
 		}
 
@@ -961,28 +969,40 @@ class Block {
 
 	/**
 	 * Get/set whether the Block prevents a given action
-	 * @param string $action
-	 * @param bool|null $x
-	 * @return bool
+	 *
+	 * @param string $action Action to check
+	 * @param bool|null $x Value for set, or null to just get value
+	 * @return bool|null Null for unrecognized rights.
 	 */
 	public function prevents( $action, $x = null ) {
+		global $wgBlockDisablesLogin;
+		$res = null;
 		switch ( $action ) {
 			case 'edit':
 				# For now... <evil laugh>
-				return true;
-
+				$res = true;
+				break;
 			case 'createaccount':
-				return wfSetVar( $this->mCreateAccount, $x );
-
+				$res = wfSetVar( $this->mCreateAccount, $x );
+				break;
 			case 'sendemail':
-				return wfSetVar( $this->mBlockEmail, $x );
-
+				$res = wfSetVar( $this->mBlockEmail, $x );
+				break;
 			case 'editownusertalk':
-				return wfSetVar( $this->mDisableUsertalk, $x );
-
-			default:
-				return null;
+				$res = wfSetVar( $this->mDisableUsertalk, $x );
+				break;
+			case 'read':
+				$res = false;
+				break;
 		}
+		if ( !$res && $wgBlockDisablesLogin ) {
+			// If a block would disable login, then it should
+			// prevent any action that all users cannot do
+			$anon = new User;
+			$res = $anon->isAllowed( $action ) ? $res : true;
+		}
+
+		return $res;
 	}
 
 	/**
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index a5d8c5bca1..f1afc4cb7a 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -685,7 +685,7 @@ $wgUseSharedUploads = false;
 /**
  * Full path on the web server where shared uploads can be found
  */
-$wgSharedUploadPath = "http://commons.wikimedia.org/shared/images";
+$wgSharedUploadPath = null;
 
 /**
  * Fetch commons image description pages and display them on the local wiki?
@@ -695,7 +695,7 @@ $wgFetchCommonsDescriptions = false;
 /**
  * Path on the file system where shared uploads can be found.
  */
-$wgSharedUploadDirectory = "/var/www/wiki3/images";
+$wgSharedUploadDirectory = null;
 
 /**
  * DB name with metadata about shared directory.
@@ -3193,6 +3193,15 @@ $wgHTMLFormAllowTableFormat = true;
  */
 $wgUseMediaWikiUIEverywhere = false;
 
+/**
+ * Whether to label the store-to-database-and-show-to-others button in the editor
+ * as "Save page"/"Save changes" if false (the default) or, if true, instead as
+ * "Publish page"/"Publish changes".
+ *
+ * @since 1.28
+ */
+$wgEditButtonPublishNotSave = false;
+
 /**
  * Permit other namespaces in addition to the w3.org default.
  *
@@ -5710,6 +5719,8 @@ $wgGrantPermissions['sendemail']['sendemail'] = true;
 
 $wgGrantPermissions['createaccount']['createaccount'] = true;
 
+$wgGrantPermissions['privateinfo']['viewmyprivateinfo'] = true;
+
 /**
  * @var Array Map of grants to their UI grouping
  * @since 1.27
@@ -5743,6 +5754,8 @@ $wgGrantPermissionGroups = [
 	'createaccount'       => 'administration',
 
 	'highvolume'          => 'high-volume',
+
+	'privateinfo'         => 'private-information',
 ];
 
 /**
@@ -8029,9 +8042,13 @@ $wgJobRunRate = 1;
  * When $wgJobRunRate > 0, try to run jobs asynchronously, spawning a new process
  * to handle the job execution, instead of blocking the request until the job
  * execution finishes.
+ *
  * @since 1.23
  */
-$wgRunJobsAsync = true;
+$wgRunJobsAsync = (
+	!function_exists( 'register_postsend_function' ) &&
+	!function_exists( 'fastcgi_finish_request' )
+);
 
 /**
  * Number of rows to update per job
@@ -8246,11 +8263,29 @@ $wgPageLanguageUseDB = false;
 
 /**
  * Global configuration variable for Virtual REST Services.
- * Parameters for different services are to be declared inside
- * $wgVirtualRestConfig['modules'], which is to be treated as an associative
- * array. Global parameters will be merged with service-specific ones. The
- * result will then be passed to VirtualRESTService::__construct() in the
- * module.
+ *
+ * Use the 'path' key to define automatically mounted services. The value for this
+ * key is a map of path prefixes to service configuration. The later is an array of:
+ *   - class : the fully qualified class name
+ *   - options : map of arguments to the class constructor
+ * Such services will be available to handle queries under their path from the VRS
+ * singleton, e.g. MediaWikiServices::getInstance()->getVirtualRESTServiceClient();
+ *
+ * Auto-mounting example for Parsoid:
+ *
+ * $wgVirtualRestConfig['paths']['/parsoid/'] = [
+ *     'class' => 'ParsoidVirtualRESTService',
+ *     'options' => [
+ *         'url' => 'http://localhost:8000',
+ *         'prefix' => 'enwiki',
+ *         'domain' => 'en.wikipedia.org'
+ *     ]
+ * ];
+ *
+ * Parameters for different services can also be declared inside the 'modules' value,
+ * which is to be treated as an associative array. The parameters in 'global' will be
+ * merged with service-specific ones. The result will then be passed to
+ * VirtualRESTService::__construct() in the module.
  *
  * Example config for Parsoid:
  *
@@ -8264,6 +8299,7 @@ $wgPageLanguageUseDB = false;
  * @since 1.25
  */
 $wgVirtualRestConfig = [
+	'paths' => [],
 	'modules' => [],
 	'global' => [
 		# Timeout in seconds
@@ -8338,7 +8374,7 @@ $wgEventRelayerConfig = [
  * PHP version, and chosen database backend. The Wikimedia Foundation shares this data with
  * MediaWiki developers to help guide future development efforts.
  *
- * For details about what data is sent, see: https://www.mediawiki.org/wiki/Pingback
+ * For details about what data is sent, see: https://www.mediawiki.org/wiki/Manual:$wgPingback
  *
  * @var bool
  * @since 1.28
diff --git a/includes/EditPage.php b/includes/EditPage.php
index ee0699383f..738eaecdf8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -401,6 +401,11 @@ class EditPage {
 	 */
 	private $enableApiEditOverride = false;
 
+	/**
+	 * @var IContextSource
+	 */
+	protected $context;
+
 	/**
 	 * @param Article $article
 	 */
@@ -408,6 +413,7 @@ class EditPage {
 		$this->mArticle = $article;
 		$this->page = $article->getPage(); // model object
 		$this->mTitle = $article->getTitle();
+		$this->context = $article->getContext();
 
 		$this->contentModel = $this->mTitle->getContentModel();
 
@@ -422,6 +428,14 @@ class EditPage {
 		return $this->mArticle;
 	}
 
+	/**
+	 * @since 1.28
+	 * @return IContextSource
+	 */
+	public function getContext() {
+		return $this->context;
+	}
+
 	/**
 	 * @since 1.19
 	 * @return Title
@@ -493,7 +507,6 @@ class EditPage {
 	 * the newly-edited page.
 	 */
 	function edit() {
-		global $wgOut, $wgRequest, $wgUser;
 		// Allow extensions to modify/prevent this form or submission
 		if ( !Hooks::run( 'AlternateEdit', [ $this ] ) ) {
 			return;
@@ -501,13 +514,15 @@ class EditPage {
 
 		wfDebug( __METHOD__ . ": enter\n" );
 
+		$request = $this->context->getRequest();
+		$out = $this->context->getOutput();
 		// If they used redlink=1 and the page exists, redirect to the main article
-		if ( $wgRequest->getBool( 'redlink' ) && $this->mTitle->exists() ) {
-			$wgOut->redirect( $this->mTitle->getFullURL() );
+		if ( $request->getBool( 'redlink' ) && $this->mTitle->exists() ) {
+			$out->redirect( $this->mTitle->getFullURL() );
 			return;
 		}
 
-		$this->importFormData( $wgRequest );
+		$this->importFormData( $request );
 		$this->firsttime = false;
 
 		if ( wfReadOnly() && $this->save ) {
@@ -536,7 +551,7 @@ class EditPage {
 			wfDebug( __METHOD__ . ": User can't edit\n" );
 			// Auto-block user's IP if the account was "hard" blocked
 			if ( !wfReadOnly() ) {
-				$user = $wgUser;
+				$user = $this->context->getUser();
 				DeferredUpdates::addCallableUpdate( function () use ( $user ) {
 					$user->spreadAnyEditBlock();
 				} );
@@ -610,15 +625,14 @@ class EditPage {
 	 * @return array
 	 */
 	protected function getEditPermissionErrors( $rigor = 'secure' ) {
-		global $wgUser;
-
-		$permErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $wgUser, $rigor );
+		$user = $this->context->getUser();
+		$permErrors = $this->mTitle->getUserPermissionsErrors( 'edit', $user, $rigor );
 		# Can this title be created?
 		if ( !$this->mTitle->exists() ) {
 			$permErrors = array_merge(
 				$permErrors,
 				wfArrayDiff2(
-					$this->mTitle->getUserPermissionsErrors( 'create', $wgUser, $rigor ),
+					$this->mTitle->getUserPermissionsErrors( 'create', $user, $rigor ),
 					$permErrors
 				)
 			);
@@ -651,13 +665,12 @@ class EditPage {
 	 * @throws PermissionsError
 	 */
 	protected function displayPermissionsError( array $permErrors ) {
-		global $wgRequest, $wgOut;
-
-		if ( $wgRequest->getBool( 'redlink' ) ) {
+		$out = $this->context->getOutput();
+		if ( $this->context->getRequest()->getBool( 'redlink' ) ) {
 			// The edit page was reached via a red link.
 			// Redirect to the article page and let them click the edit tab if
 			// they really want a permission error.
-			$wgOut->redirect( $this->mTitle->getFullURL() );
+			$out->redirect( $this->mTitle->getFullURL() );
 			return;
 		}
 
@@ -672,7 +685,7 @@ class EditPage {
 
 		$this->displayViewSourcePage(
 			$content,
-			$wgOut->formatPermissionsErrorMessage( $permErrors, 'edit' )
+			$out->formatPermissionsErrorMessage( $permErrors, 'edit' )
 		);
 	}
 
@@ -682,29 +695,28 @@ class EditPage {
 	 * @param string $errorMessage additional wikitext error message to display
 	 */
 	protected function displayViewSourcePage( Content $content, $errorMessage = '' ) {
-		global $wgOut;
+		$out = $this->context->getOutput();
+		Hooks::run( 'EditPage::showReadOnlyForm:initial', [ $this, &$out ] );
 
-		Hooks::run( 'EditPage::showReadOnlyForm:initial', [ $this, &$wgOut ] );
-
-		$wgOut->setRobotPolicy( 'noindex,nofollow' );
-		$wgOut->setPageTitle( wfMessage(
+		$out->setRobotPolicy( 'noindex,nofollow' );
+		$out->setPageTitle( wfMessage(
 			'viewsource-title',
 			$this->getContextTitle()->getPrefixedText()
 		) );
-		$wgOut->addBacklinkSubtitle( $this->getContextTitle() );
-		$wgOut->addHTML( $this->editFormPageTop );
-		$wgOut->addHTML( $this->editFormTextTop );
+		$out->addBacklinkSubtitle( $this->getContextTitle() );
+		$out->addHTML( $this->editFormPageTop );
+		$out->addHTML( $this->editFormTextTop );
 
 		if ( $errorMessage !== '' ) {
-			$wgOut->addWikiText( $errorMessage );
-			$wgOut->addHTML( "<hr />\n" );
+			$out->addWikiText( $errorMessage );
+			$out->addHTML( "<hr />\n" );
 		}
 
 		# If the user made changes, preserve them when showing the markup
 		# (This happens when a user is blocked during edit, for instance)
 		if ( !$this->firsttime ) {
 			$text = $this->textbox1;
-			$wgOut->addWikiMsg( 'viewyourtext' );
+			$out->addWikiMsg( 'viewyourtext' );
 		} else {
 			try {
 				$text = $this->toEditText( $content );
@@ -713,21 +725,21 @@ class EditPage {
 				# (e.g. for an old revision with a different model)
 				$text = $content->serialize();
 			}
-			$wgOut->addWikiMsg( 'viewsourcetext' );
+			$out->addWikiMsg( 'viewsourcetext' );
 		}
 
-		$wgOut->addHTML( $this->editFormTextBeforeContent );
+		$out->addHTML( $this->editFormTextBeforeContent );
 		$this->showTextbox( $text, 'wpTextbox1', [ 'readonly' ] );
-		$wgOut->addHTML( $this->editFormTextAfterContent );
+		$out->addHTML( $this->editFormTextAfterContent );
 
-		$wgOut->addHTML( Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
+		$out->addHTML( Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
 			Linker::formatTemplates( $this->getTemplates() ) ) );
 
-		$wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' );
+		$out->addModules( 'mediawiki.action.edit.collapsibleFooter' );
 
-		$wgOut->addHTML( $this->editFormTextBottom );
+		$out->addHTML( $this->editFormTextBottom );
 		if ( $this->mTitle->exists() ) {
-			$wgOut->returnToMain( null, $this->mTitle );
+			$out->returnToMain( null, $this->mTitle );
 		}
 	}
 
@@ -737,18 +749,19 @@ class EditPage {
 	 * @return bool
 	 */
 	protected function previewOnOpen() {
-		global $wgRequest, $wgUser, $wgPreviewOnOpenNamespaces;
-		if ( $wgRequest->getVal( 'preview' ) == 'yes' ) {
+		global $wgPreviewOnOpenNamespaces;
+		$request = $this->context->getRequest();
+		if ( $request->getVal( 'preview' ) == 'yes' ) {
 			// Explicit override from request
 			return true;
-		} elseif ( $wgRequest->getVal( 'preview' ) == 'no' ) {
+		} elseif ( $request->getVal( 'preview' ) == 'no' ) {
 			// Explicit override from request
 			return false;
 		} elseif ( $this->section == 'new' ) {
 			// Nothing *to* preview for new sections
 			return false;
-		} elseif ( ( $wgRequest->getVal( 'preload' ) !== null || $this->mTitle->exists() )
-			&& $wgUser->getOption( 'previewonfirst' )
+		} elseif ( ( $request->getVal( 'preload' ) !== null || $this->mTitle->exists() )
+			&& $this->context->getUser()->getOption( 'previewonfirst' )
 		) {
 			// Standard preference behavior
 			return true;
@@ -801,7 +814,7 @@ class EditPage {
 	 * @throws ErrorPageError
 	 */
 	function importFormData( &$request ) {
-		global $wgContLang, $wgUser;
+		global $wgContLang;
 
 		# Section edit can come from either the form or a link
 		$this->section = $request->getVal( 'wpSection', $request->getVal( 'section' ) );
@@ -913,13 +926,14 @@ class EditPage {
 			$this->watchthis = $request->getCheck( 'wpWatchthis' );
 
 			# Don't force edit summaries when a user is editing their own user or talk page
+			$user = $this->context->getUser();
 			if ( ( $this->mTitle->mNamespace == NS_USER || $this->mTitle->mNamespace == NS_USER_TALK )
-				&& $this->mTitle->getText() == $wgUser->getName()
+				&& $this->mTitle->getText() == $user->getName()
 			) {
 				$this->allowBlankSummary = true;
 			} else {
 				$this->allowBlankSummary = $request->getBool( 'wpIgnoreBlankSummary' )
-					|| !$wgUser->getOption( 'forceeditsummary' );
+					|| !$user->getOption( 'forceeditsummary' );
 			}
 
 			$this->autoSumm = $request->getText( 'wpAutoSummary' );
@@ -1025,7 +1039,6 @@ class EditPage {
 	 * @return bool If the requested section is valid
 	 */
 	function initialiseForm() {
-		global $wgUser;
 		$this->edittime = $this->page->getTimestamp();
 		$this->editRevId = $this->page->getLatest();
 
@@ -1034,20 +1047,21 @@ class EditPage {
 			return false;
 		}
 		$this->textbox1 = $this->toEditText( $content );
+		$user = $this->context->getUser();
 
 		// activate checkboxes if user wants them to be always active
 		# Sort out the "watch" checkbox
-		if ( $wgUser->getOption( 'watchdefault' ) ) {
+		if ( $user->getOption( 'watchdefault' ) ) {
 			# Watch all edits
 			$this->watchthis = true;
-		} elseif ( $wgUser->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) {
+		} elseif ( $user->getOption( 'watchcreations' ) && !$this->mTitle->exists() ) {
 			# Watch creations
 			$this->watchthis = true;
-		} elseif ( $wgUser->isWatched( $this->mTitle ) ) {
+		} elseif ( $user->isWatched( $this->mTitle ) ) {
 			# Already watched
 			$this->watchthis = true;
 		}
-		if ( $wgUser->getOption( 'minordefault' ) && !$this->isNew ) {
+		if ( $user->getOption( 'minordefault' ) && !$this->isNew ) {
 			$this->minoredit = true;
 		}
 		if ( $this->textbox1 === false ) {
@@ -1064,9 +1078,11 @@ class EditPage {
 	 * @since 1.21
 	 */
 	protected function getContentObject( $def_content = null ) {
-		global $wgOut, $wgRequest, $wgUser, $wgContLang;
+		global $wgContLang;
 
 		$content = false;
+		$request = $this->context->getRequest();
+		$user = $this->context->getUser();
 
 		// For message page not locally set, use the i18n message.
 		// For other non-existent articles, use preload text if any.
@@ -1079,10 +1095,10 @@ class EditPage {
 			}
 			if ( $content === false ) {
 				# If requested, preload some text.
-				$preload = $wgRequest->getVal( 'preload',
+				$preload = $request->getVal( 'preload',
 					// Custom preload text for new sections
 					$this->section === 'new' ? 'MediaWiki:addsection-preload' : '' );
-				$params = $wgRequest->getArray( 'preloadparams', [] );
+				$params = $request->getArray( 'preloadparams', [] );
 
 				$content = $this->getPreloadedContent( $preload, $params );
 			}
@@ -1090,15 +1106,15 @@ class EditPage {
 		} else {
 			if ( $this->section != '' ) {
 				// Get section edit text (returns $def_text for invalid sections)
-				$orig = $this->getOriginalContent( $wgUser );
+				$orig = $this->getOriginalContent( $user );
 				$content = $orig ? $orig->getSection( $this->section ) : null;
 
 				if ( !$content ) {
 					$content = $def_content;
 				}
 			} else {
-				$undoafter = $wgRequest->getInt( 'undoafter' );
-				$undo = $wgRequest->getInt( 'undo' );
+				$undoafter = $request->getInt( 'undoafter' );
+				$undo = $request->getInt( 'undo' );
 
 				if ( $undo > 0 && $undoafter > 0 ) {
 					$undorev = Revision::newFromId( $undo );
@@ -1118,8 +1134,8 @@ class EditPage {
 							$undoMsg = 'failure';
 						} else {
 							$oldContent = $this->page->getContent( Revision::RAW );
-							$popts = ParserOptions::newFromUserAndLang( $wgUser, $wgContLang );
-							$newContent = $content->preSaveTransform( $this->mTitle, $wgUser, $popts );
+							$popts = ParserOptions::newFromUserAndLang( $user, $wgContLang );
+							$newContent = $content->preSaveTransform( $this->mTitle, $user, $popts );
 
 							if ( $newContent->equals( $oldContent ) ) {
 								# Tell the user that the undo results in no change,
@@ -1166,12 +1182,13 @@ class EditPage {
 
 					// Messages: undo-success, undo-failure, undo-norev, undo-nochange
 					$class = ( $undoMsg == 'success' ? '' : 'error ' ) . "mw-undo-{$undoMsg}";
-					$this->editFormPageTop .= $wgOut->parse( "<div class=\"{$class}\">" .
+					$this->editFormPageTop .= $this->context->getOutput()->parse(
+						"<div class=\"{$class}\">" .
 						wfMessage( 'undo-' . $undoMsg )->plain() . '</div>', true, /* interface */true );
 				}
 
 				if ( $content === false ) {
-					$content = $this->getOriginalContent( $wgUser );
+					$content = $this->getOriginalContent( $user );
 				}
 			}
 		}
@@ -1368,10 +1385,10 @@ class EditPage {
 	 * @private
 	 */
 	function tokenOk( &$request ) {
-		global $wgUser;
 		$token = $request->getVal( 'wpEditToken' );
-		$this->mTokenOk = $wgUser->matchEditToken( $token );
-		$this->mTokenOkExceptSuffix = $wgUser->matchEditTokenNoSuffix( $token );
+		$user = $this->context->getUser();
+		$this->mTokenOk = $user->matchEditToken( $token );
+		$this->mTokenOkExceptSuffix = $user->matchEditTokenNoSuffix( $token );
 		return $this->mTokenOk;
 	}
 
@@ -1402,7 +1419,7 @@ class EditPage {
 			$val = 'restored';
 		}
 
-		$response = RequestContext::getMain()->getRequest()->response();
+		$response = $this->context->getRequest()->response();
 		$response->setCookie( $postEditKey, $val, time() + self::POST_EDIT_COOKIE_DURATION, [
 			'httpOnly' => false,
 		] );
@@ -1410,15 +1427,13 @@ class EditPage {
 
 	/**
 	 * Attempt submission
-	 * @param array $resultDetails See docs for $result in internalAttemptSave
+	 * @param array|bool $resultDetails See docs for $result in internalAttemptSave
 	 * @throws UserBlockedError|ReadOnlyError|ThrottledError|PermissionsError
 	 * @return Status The resulting status object.
 	 */
 	public function attemptSave( &$resultDetails = false ) {
-		global $wgUser;
-
 		# Allow bots to exempt some edits from bot flagging
-		$bot = $wgUser->isAllowed( 'bot' ) && $this->bot;
+		$bot = $this->context->getUser()->isAllowed( 'bot' ) && $this->bot;
 		$status = $this->internalAttemptSave( $resultDetails, $bot );
 
 		Hooks::run( 'EditPage::attemptSave:after', [ $this, $status, $resultDetails ] );
@@ -1436,8 +1451,6 @@ class EditPage {
 	 * @return bool False, if output is done, true if rest of the form should be displayed
 	 */
 	private function handleStatus( Status $status, $resultDetails ) {
-		global $wgUser, $wgOut;
-
 		/**
 		 * @todo FIXME: once the interface for internalAttemptSave() is made
 		 *   nicer, this should use the message in $status
@@ -1451,9 +1464,11 @@ class EditPage {
 			}
 		}
 
+		$out = $this->context->getOutput();
+
 		// "wpExtraQueryRedirect" is a hidden input to modify
 		// after save URL and is not used by actual edit form
-		$request = RequestContext::getMain()->getRequest();
+		$request = $this->context->getRequest();
 		$extraQueryRedirect = $request->getVal( 'wpExtraQueryRedirect' );
 
 		switch ( $status->value ) {
@@ -1474,7 +1489,7 @@ class EditPage {
 
 			case self::AS_CANNOT_USE_CUSTOM_MODEL:
 			case self::AS_PARSE_ERROR:
-				$wgOut->addWikiText( '<div class="error">' . $status->getWikiText() . '</div>' );
+				$out->addWikiText( '<div class="error">' . "\n" . $status->getWikiText() . '</div>' );
 				return true;
 
 			case self::AS_SUCCESS_NEW_ARTICLE:
@@ -1487,7 +1502,7 @@ class EditPage {
 					}
 				}
 				$anchor = isset( $resultDetails['sectionanchor'] ) ? $resultDetails['sectionanchor'] : '';
-				$wgOut->redirect( $this->mTitle->getFullURL( $query ) . $anchor );
+				$out->redirect( $this->mTitle->getFullURL( $query ) . $anchor );
 				return false;
 
 			case self::AS_SUCCESS_UPDATE:
@@ -1515,7 +1530,7 @@ class EditPage {
 					}
 				}
 
-				$wgOut->redirect( $this->mTitle->getFullURL( $extraQuery ) . $sectionanchor );
+				$out->redirect( $this->mTitle->getFullURL( $extraQuery ) . $sectionanchor );
 				return false;
 
 			case self::AS_SPAM_ERROR:
@@ -1523,7 +1538,7 @@ class EditPage {
 				return false;
 
 			case self::AS_BLOCKED_PAGE_FOR_USER:
-				throw new UserBlockedError( $wgUser->getBlock() );
+				throw new UserBlockedError( $this->context->getUser()->getBlock() );
 
 			case self::AS_IMAGE_REDIRECT_ANON:
 			case self::AS_IMAGE_REDIRECT_LOGGED:
@@ -1551,7 +1566,7 @@ class EditPage {
 				// is if an extension hook aborted from inside ArticleSave.
 				// Render the status object into $this->hookError
 				// FIXME this sucks, we should just use the Status object throughout
-				$this->hookError = '<div class="error">' . $status->getWikiText() .
+				$this->hookError = '<div class="error">' ."\n" . $status->getWikiText() .
 					'</div>';
 				return true;
 		}
@@ -1584,7 +1599,7 @@ class EditPage {
 
 		// Run new style post-section-merge edit filter
 		if ( !Hooks::run( 'EditFilterMergedContent',
-				[ $this->mArticle->getContext(), $content, $status, $this->summary,
+				[ $this->context, $content, $status, $this->summary,
 				$user, $this->minoredit ] )
 		) {
 			# Error messages etc. could be handled within the hook...
@@ -1669,10 +1684,11 @@ class EditPage {
 	 * time.
 	 */
 	function internalAttemptSave( &$result, $bot = false ) {
-		global $wgUser, $wgRequest, $wgParser, $wgMaxArticleSize;
-		global $wgContentHandlerUseDB;
+		global $wgParser, $wgMaxArticleSize, $wgContentHandlerUseDB;
 
 		$status = Status::newGood();
+		$user = $this->context->getUser();
+		$request = $this->context->getRequest();
 
 		if ( !Hooks::run( 'EditPage::attemptSave', [ $this ] ) ) {
 			wfDebug( "Hook 'EditPage::attemptSave' aborted article saving\n" );
@@ -1681,11 +1697,11 @@ class EditPage {
 			return $status;
 		}
 
-		$spam = $wgRequest->getText( 'wpAntispam' );
+		$spam = $request->getText( 'wpAntispam' );
 		if ( $spam !== '' ) {
 			wfDebugLog(
 				'SimpleAntiSpam',
-				$wgUser->getName() .
+				$user->getName() .
 				' editing "' .
 				$this->mTitle->getPrefixedText() .
 				'" submitted bogus field "' .
@@ -1714,9 +1730,9 @@ class EditPage {
 		# Check image redirect
 		if ( $this->mTitle->getNamespace() == NS_FILE &&
 			$textbox_content->isRedirect() &&
-			!$wgUser->isAllowed( 'upload' )
+			!$user->isAllowed( 'upload' )
 		) {
-				$code = $wgUser->isAnon() ? self::AS_IMAGE_REDIRECT_ANON : self::AS_IMAGE_REDIRECT_LOGGED;
+				$code = $user->isAnon() ? self::AS_IMAGE_REDIRECT_ANON : self::AS_IMAGE_REDIRECT_LOGGED;
 				$status->setResult( false, $code );
 
 				return $status;
@@ -1741,7 +1757,7 @@ class EditPage {
 		}
 		if ( $match !== false ) {
 			$result['spam'] = $match;
-			$ip = $wgRequest->getIP();
+			$ip = $request->getIP();
 			$pdbk = $this->mTitle->getPrefixedDBkey();
 			$match = str_replace( "\n", '', $match );
 			wfDebugLog( 'SpamRegex', "$ip spam regex hit [[$pdbk]]: \"$match\"" );
@@ -1764,10 +1780,10 @@ class EditPage {
 			return $status;
 		}
 
-		if ( $wgUser->isBlockedFrom( $this->mTitle, false ) ) {
+		if ( $user->isBlockedFrom( $this->mTitle, false ) ) {
 			// Auto-block user's IP if the account was "hard" blocked
 			if ( !wfReadOnly() ) {
-				$wgUser->spreadAnyEditBlock();
+				$user->spreadAnyEditBlock();
 			}
 			# Check block state against master, thus 'false'.
 			$status->setResult( false, self::AS_BLOCKED_PAGE_FOR_USER );
@@ -1782,8 +1798,8 @@ class EditPage {
 			return $status;
 		}
 
-		if ( !$wgUser->isAllowed( 'edit' ) ) {
-			if ( $wgUser->isAnon() ) {
+		if ( !$user->isAllowed( 'edit' ) ) {
+			if ( $user->isAnon() ) {
 				$status->setResult( false, self::AS_READ_ONLY_PAGE_ANON );
 				return $status;
 			} else {
@@ -1799,7 +1815,7 @@ class EditPage {
 				$status->fatal( 'editpage-cannot-use-custom-model' );
 				$status->value = self::AS_CANNOT_USE_CUSTOM_MODEL;
 				return $status;
-			} elseif ( !$wgUser->isAllowed( 'editcontentmodel' ) ) {
+			} elseif ( !$user->isAllowed( 'editcontentmodel' ) ) {
 				$status->setResult( false, self::AS_NO_CHANGE_CONTENT_MODEL );
 				return $status;
 
@@ -1810,7 +1826,7 @@ class EditPage {
 
 		if ( $this->changeTags ) {
 			$changeTagsStatus = ChangeTags::canAddTagsAccompanyingChange(
-				$this->changeTags, $wgUser );
+				$this->changeTags, $user );
 			if ( !$changeTagsStatus->isOK() ) {
 				$changeTagsStatus->value = self::AS_CHANGE_TAG_ERROR;
 				return $changeTagsStatus;
@@ -1822,7 +1838,7 @@ class EditPage {
 			$status->value = self::AS_READ_ONLY_PAGE;
 			return $status;
 		}
-		if ( $wgUser->pingLimiter() || $wgUser->pingLimiter( 'linkpurge', 0 ) ) {
+		if ( $user->pingLimiter() || $user->pingLimiter( 'linkpurge', 0 ) ) {
 			$status->fatal( 'actionthrottledtext' );
 			$status->value = self::AS_RATE_LIMITED;
 			return $status;
@@ -1842,7 +1858,7 @@ class EditPage {
 
 		if ( $new ) {
 			// Late check for create permission, just in case *PARANOIA*
-			if ( !$this->mTitle->userCan( 'create', $wgUser ) ) {
+			if ( !$this->mTitle->userCan( 'create', $user ) ) {
 				$status->fatal( 'nocreatetext' );
 				$status->value = self::AS_NO_CREATE_PERMISSION;
 				wfDebug( __METHOD__ . ": no create permission\n" );
@@ -1866,7 +1882,7 @@ class EditPage {
 				return $status;
 			}
 
-			if ( !$this->runPostMergeFilters( $textbox_content, $status, $wgUser ) ) {
+			if ( !$this->runPostMergeFilters( $textbox_content, $status, $user ) ) {
 				return $status;
 			}
 
@@ -1902,7 +1918,7 @@ class EditPage {
 			) {
 				$this->isConflict = true;
 				if ( $this->section == 'new' ) {
-					if ( $this->page->getUserText() == $wgUser->getName() &&
+					if ( $this->page->getUserText() == $user->getName() &&
 						$this->page->getComment() == $this->newSectionSummary()
 					) {
 						// Probably a duplicate submission of a new comment.
@@ -1918,7 +1934,7 @@ class EditPage {
 				} elseif ( $this->section == ''
 					&& Revision::userWasLastToEdit(
 						DB_MASTER, $this->mTitle->getArticleID(),
-						$wgUser->getId(), $this->edittime
+						$user->getId(), $this->edittime
 					)
 				) {
 					# Suppress edit conflict with self, except for section edits where merging is required.
@@ -1988,7 +2004,7 @@ class EditPage {
 				return $status;
 			}
 
-			if ( !$this->runPostMergeFilters( $content, $status, $wgUser ) ) {
+			if ( !$this->runPostMergeFilters( $content, $status, $user ) ) {
 				return $status;
 			}
 
@@ -2009,7 +2025,7 @@ class EditPage {
 					return $status;
 				}
 			} elseif ( !$this->allowBlankSummary
-				&& !$content->equals( $this->getOriginalContent( $wgUser ) )
+				&& !$content->equals( $this->getOriginalContent( $user ) )
 				&& !$content->isRedirect()
 				&& md5( $this->summary ) == $this->autoSumm
 			) {
@@ -2079,7 +2095,7 @@ class EditPage {
 			$this->summary,
 			$flags,
 			false,
-			$wgUser,
+			$user,
 			$content->getDefaultFormat(),
 			$this->changeTags
 		);
@@ -2102,7 +2118,7 @@ class EditPage {
 		$result['nullEdit'] = $doEditStatus->hasMessage( 'edit-no-change' );
 		if ( $result['nullEdit'] ) {
 			// We don't know if it was a null edit until now, so increment here
-			$wgUser->pingLimiter( 'linkpurge' );
+			$user->pingLimiter( 'linkpurge' );
 		}
 		$result['redirect'] = $content->isRedirect();
 
@@ -2111,7 +2127,7 @@ class EditPage {
 		// If the content model changed, add a log entry
 		if ( $changingContentModel ) {
 			$this->addContentModelChangeLogEntry(
-				$wgUser,
+				$user,
 				$new ? false : $oldContentModel,
 				$this->contentModel,
 				$this->summary
@@ -2145,13 +2161,12 @@ class EditPage {
 	 * Register the change of watch status
 	 */
 	protected function updateWatchlist() {
-		global $wgUser;
+		$user = $this->context->getUser();
 
-		if ( !$wgUser->isLoggedIn() ) {
+		if ( !$user->isLoggedIn() ) {
 			return;
 		}
 
-		$user = $wgUser;
 		$title = $this->mTitle;
 		$watch = $this->watchthis;
 		// Do this in its own transaction to reduce contention...
@@ -2266,29 +2281,32 @@ class EditPage {
 	}
 
 	function setHeaders() {
-		global $wgOut, $wgUser, $wgAjaxEditStash;
+		global $wgAjaxEditStash;
+
+		$out = $this->context->getOutput();
+		$user = $this->context->getUser();
 
-		$wgOut->addModules( 'mediawiki.action.edit' );
-		$wgOut->addModuleStyles( 'mediawiki.action.edit.styles' );
+		$out->addModules( 'mediawiki.action.edit' );
+		$out->addModuleStyles( 'mediawiki.action.edit.styles' );
 
-		if ( $wgUser->getOption( 'showtoolbar' ) ) {
+		if ( $user->getOption( 'showtoolbar' ) ) {
 			// The addition of default buttons is handled by getEditToolbar() which
 			// has its own dependency on this module. The call here ensures the module
 			// is loaded in time (it has position "top") for other modules to register
 			// buttons (e.g. extensions, gadgets, user scripts).
-			$wgOut->addModules( 'mediawiki.toolbar' );
+			$out->addModules( 'mediawiki.toolbar' );
 		}
 
-		if ( $wgUser->getOption( 'uselivepreview' ) ) {
-			$wgOut->addModules( 'mediawiki.action.edit.preview' );
+		if ( $user->getOption( 'uselivepreview' ) ) {
+			$out->addModules( 'mediawiki.action.edit.preview' );
 		}
 
-		if ( $wgUser->getOption( 'useeditwarning' ) ) {
-			$wgOut->addModules( 'mediawiki.action.edit.editWarning' );
+		if ( $user->getOption( 'useeditwarning' ) ) {
+			$out->addModules( 'mediawiki.action.edit.editWarning' );
 		}
 
 		# Enabled article-related sidebar, toplinks, etc.
-		$wgOut->setArticleRelated( true );
+		$out->setArticleRelated( true );
 
 		$contextTitle = $this->getContextTitle();
 		if ( $this->isConflict ) {
@@ -2311,10 +2329,10 @@ class EditPage {
 		if ( $displayTitle === false ) {
 			$displayTitle = $contextTitle->getPrefixedText();
 		}
-		$wgOut->setPageTitle( wfMessage( $msg, $displayTitle ) );
+		$out->setPageTitle( wfMessage( $msg, $displayTitle ) );
 		# Transmit the name of the message to JavaScript for live preview
 		# Keep Resources.php/mediawiki.action.edit.preview in sync with the possible keys
-		$wgOut->addJsConfigVars( [
+		$out->addJsConfigVars( [
 			'wgEditMessage' => $msg,
 			'wgAjaxEditStash' => $wgAjaxEditStash,
 		] );
@@ -2324,16 +2342,16 @@ class EditPage {
 	 * Show all applicable editing introductions
 	 */
 	protected function showIntro() {
-		global $wgOut, $wgUser;
 		if ( $this->suppressIntro ) {
 			return;
 		}
 
+		$out = $this->context->getOutput();
 		$namespace = $this->mTitle->getNamespace();
 
 		if ( $namespace == NS_MEDIAWIKI ) {
 			# Show a warning if editing an interface message
-			$wgOut->wrapWikiMsg( "<div class='mw-editinginterface'>\n$1\n</div>", 'editinginterface' );
+			$out->wrapWikiMsg( "<div class='mw-editinginterface'>\n$1\n</div>", 'editinginterface' );
 			# If this is a default message (but not css or js),
 			# show a hint that it is translatable on translatewiki.net
 			if ( !$this->mTitle->hasContentModel( CONTENT_MODEL_CSS )
@@ -2341,7 +2359,7 @@ class EditPage {
 			) {
 				$defaultMessageText = $this->mTitle->getDefaultMessageText();
 				if ( $defaultMessageText !== false ) {
-					$wgOut->wrapWikiMsg( "<div class='mw-translateinterface'>\n$1\n</div>",
+					$out->wrapWikiMsg( "<div class='mw-translateinterface'>\n$1\n</div>",
 						'translateinterface' );
 				}
 			}
@@ -2353,11 +2371,11 @@ class EditPage {
 				# there must be a description url to show a hint to shared repo
 				if ( $descUrl ) {
 					if ( !$this->mTitle->exists() ) {
-						$wgOut->wrapWikiMsg( "<div class=\"mw-sharedupload-desc-create\">\n$1\n</div>", [
+						$out->wrapWikiMsg( "<div class=\"mw-sharedupload-desc-create\">\n$1\n</div>", [
 									'sharedupload-desc-create', $file->getRepo()->getDisplayName(), $descUrl
 						] );
 					} else {
-						$wgOut->wrapWikiMsg( "<div class=\"mw-sharedupload-desc-edit\">\n$1\n</div>", [
+						$out->wrapWikiMsg( "<div class=\"mw-sharedupload-desc-edit\">\n$1\n</div>", [
 									'sharedupload-desc-edit', $file->getRepo()->getDisplayName(), $descUrl
 						] );
 					}
@@ -2373,12 +2391,12 @@ class EditPage {
 			$ip = User::isIP( $username );
 			$block = Block::newFromTarget( $user, $user );
 			if ( !( $user && $user->isLoggedIn() ) && !$ip ) { # User does not exist
-				$wgOut->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n$1\n</div>",
+				$out->wrapWikiMsg( "<div class=\"mw-userpage-userdoesnotexist error\">\n$1\n</div>",
 					[ 'userpage-userdoesnotexist', wfEscapeWikiText( $username ) ] );
 			} elseif ( !is_null( $block ) && $block->getType() != Block::TYPE_AUTO ) {
 				# Show log extract if the user is currently blocked
 				LogEventsList::showLogExtract(
-					$wgOut,
+					$out,
 					'block',
 					MWNamespace::getCanonicalName( NS_USER ) . ':' . $block->getTarget(),
 					'',
@@ -2398,8 +2416,8 @@ class EditPage {
 			$helpLink = wfExpandUrl( Skin::makeInternalOrExternalUrl(
 				wfMessage( 'helppage' )->inContentLanguage()->text()
 			) );
-			if ( $wgUser->isLoggedIn() ) {
-				$wgOut->wrapWikiMsg(
+			if ( $this->context->getUser()->isLoggedIn() ) {
+				$out->wrapWikiMsg(
 					// Suppress the external link icon, consider the help url an internal one
 					"<div class=\"mw-newarticletext plainlinks\">\n$1\n</div>",
 					[
@@ -2408,7 +2426,7 @@ class EditPage {
 					]
 				);
 			} else {
-				$wgOut->wrapWikiMsg(
+				$out->wrapWikiMsg(
 					// Suppress the external link icon, consider the help url an internal one
 					"<div class=\"mw-newarticletextanon plainlinks\">\n$1\n</div>",
 					[
@@ -2420,7 +2438,7 @@ class EditPage {
 		}
 		# Give a notice if the user is editing a deleted/moved page...
 		if ( !$this->mTitle->exists() ) {
-			LogEventsList::showLogExtract( $wgOut, [ 'delete', 'move' ], $this->mTitle,
+			LogEventsList::showLogExtract( $out, [ 'delete', 'move' ], $this->mTitle,
 				'',
 				[
 					'lim' => 10,
@@ -2441,9 +2459,8 @@ class EditPage {
 		if ( $this->editintro ) {
 			$title = Title::newFromText( $this->editintro );
 			if ( $title instanceof Title && $title->exists() && $title->userCan( 'read' ) ) {
-				global $wgOut;
 				// Added using template syntax, to take <noinclude>'s into account.
-				$wgOut->addWikiTextTitleTidy(
+				$this->context->getOutput()->addWikiTextTitleTidy(
 					'<div class="mw-editintro">{{:' . $title->getFullText() . '}}</div>',
 					$this->mTitle
 				);
@@ -2493,7 +2510,7 @@ class EditPage {
 	 * content.
 	 *
 	 * @param string|null|bool $text Text to unserialize
-	 * @return Content The content object created from $text. If $text was false
+	 * @return Content|bool|null The content object created from $text. If $text was false
 	 *   or null, false resp. null will be  returned instead.
 	 *
 	 * @throws MWException If unserializing the text results in a Content
@@ -2525,8 +2542,6 @@ class EditPage {
 	 * use the EditPage::showEditForm:fields hook instead.
 	 */
 	function showEditForm( $formCallback = null ) {
-		global $wgOut, $wgUser;
-
 		# need to parse the preview early so that we know which templates are used,
 		# otherwise users with "show preview after edit box" will get a blank list
 		# we parse this near the beginning so that setHeaders can do the title
@@ -2536,7 +2551,8 @@ class EditPage {
 			$previewOutput = $this->getPreviewText();
 		}
 
-		Hooks::run( 'EditPage::showEditForm:initial', [ &$this, &$wgOut ] );
+		$out = $this->context->getOutput();
+		Hooks::run( 'EditPage::showEditForm:initial', [ &$this, &$out ] );
 
 		$this->setHeaders();
 
@@ -2544,13 +2560,14 @@ class EditPage {
 			return;
 		}
 
-		$wgOut->addHTML( $this->editFormPageTop );
+		$out->addHTML( $this->editFormPageTop );
 
-		if ( $wgUser->getOption( 'previewontop' ) ) {
+		$user = $this->context->getUser();
+		if ( $user->getOption( 'previewontop' ) ) {
 			$this->displayPreviewArea( $previewOutput, true );
 		}
 
-		$wgOut->addHTML( $this->editFormTextTop );
+		$out->addHTML( $this->editFormTextTop );
 
 		$showToolbar = true;
 		if ( $this->wasDeletedSinceLastEdit() ) {
@@ -2559,14 +2576,14 @@ class EditPage {
 				// Add an confirmation checkbox and explanation.
 				$showToolbar = false;
 			} else {
-				$wgOut->wrapWikiMsg( "<div class='error mw-deleted-while-editing'>\n$1\n</div>",
+				$out->wrapWikiMsg( "<div class='error mw-deleted-while-editing'>\n$1\n</div>",
 					'deletedwhileediting' );
 			}
 		}
 
 		// @todo add EditForm plugin interface and use it here!
 		//       search for textarea1 and textares2, and allow EditForm to override all uses.
-		$wgOut->addHTML( Html::openElement(
+		$out->addHTML( Html::openElement(
 			'form',
 			[
 				'id' => self::EDITFORM_ID,
@@ -2579,11 +2596,11 @@ class EditPage {
 
 		if ( is_callable( $formCallback ) ) {
 			wfWarn( 'The $formCallback parameter to ' . __METHOD__ . 'is deprecated' );
-			call_user_func_array( $formCallback, [ &$wgOut ] );
+			call_user_func_array( $formCallback, [ &$out ] );
 		}
 
 		// Add an empty field to trip up spambots
-		$wgOut->addHTML(
+		$out->addHTML(
 			Xml::openElement( 'div', [ 'id' => 'antispam-container', 'style' => 'display: none;' ] )
 			. Html::rawElement(
 				'label',
@@ -2602,7 +2619,7 @@ class EditPage {
 			. Xml::closeElement( 'div' )
 		);
 
-		Hooks::run( 'EditPage::showEditForm:fields', [ &$this, &$wgOut ] );
+		Hooks::run( 'EditPage::showEditForm:fields', [ &$this, &$out ] );
 
 		// Put these up at the top to ensure they aren't lost on early form submission
 		$this->showFormBeforeText();
@@ -2616,7 +2633,7 @@ class EditPage {
 			$key = $comment === ''
 				? 'confirmrecreate-noreason'
 				: 'confirmrecreate';
-			$wgOut->addHTML(
+			$out->addHTML(
 				'<div class="mw-confirm-recreate">' .
 					wfMessage( $key, $username, "<nowiki>$comment</nowiki>" )->parse() .
 				Xml::checkLabel( wfMessage( 'recreate' )->text(), 'wpRecreate', 'wpRecreate', false,
@@ -2628,7 +2645,7 @@ class EditPage {
 
 		# When the summary is hidden, also hide them on preview/show changes
 		if ( $this->nosummary ) {
-			$wgOut->addHTML( Html::hidden( 'nosummary', true ) );
+			$out->addHTML( Html::hidden( 'nosummary', true ) );
 		}
 
 		# If a blank edit summary was previously provided, and the appropriate
@@ -2639,15 +2656,15 @@ class EditPage {
 		# For a bit more sophisticated detection of blank summaries, hash the
 		# automatic one and pass that in the hidden field wpAutoSummary.
 		if ( $this->missingSummary || ( $this->section == 'new' && $this->nosummary ) ) {
-			$wgOut->addHTML( Html::hidden( 'wpIgnoreBlankSummary', true ) );
+			$out->addHTML( Html::hidden( 'wpIgnoreBlankSummary', true ) );
 		}
 
 		if ( $this->undidRev ) {
-			$wgOut->addHTML( Html::hidden( 'wpUndidRevision', $this->undidRev ) );
+			$out->addHTML( Html::hidden( 'wpUndidRevision', $this->undidRev ) );
 		}
 
 		if ( $this->selfRedirect ) {
-			$wgOut->addHTML( Html::hidden( 'wpIgnoreSelfRedirect', true ) );
+			$out->addHTML( Html::hidden( 'wpIgnoreSelfRedirect', true ) );
 		}
 
 		if ( $this->hasPresetSummary ) {
@@ -2658,27 +2675,27 @@ class EditPage {
 		}
 
 		$autosumm = $this->autoSumm ? $this->autoSumm : md5( $this->summary );
-		$wgOut->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) );
+		$out->addHTML( Html::hidden( 'wpAutoSummary', $autosumm ) );
 
-		$wgOut->addHTML( Html::hidden( 'oldid', $this->oldid ) );
-		$wgOut->addHTML( Html::hidden( 'parentRevId', $this->getParentRevId() ) );
+		$out->addHTML( Html::hidden( 'oldid', $this->oldid ) );
+		$out->addHTML( Html::hidden( 'parentRevId', $this->getParentRevId() ) );
 
-		$wgOut->addHTML( Html::hidden( 'format', $this->contentFormat ) );
-		$wgOut->addHTML( Html::hidden( 'model', $this->contentModel ) );
+		$out->addHTML( Html::hidden( 'format', $this->contentFormat ) );
+		$out->addHTML( Html::hidden( 'model', $this->contentModel ) );
 
 		if ( $this->section == 'new' ) {
 			$this->showSummaryInput( true, $this->summary );
-			$wgOut->addHTML( $this->getSummaryPreview( true, $this->summary ) );
+			$out->addHTML( $this->getSummaryPreview( true, $this->summary ) );
 		}
 
-		$wgOut->addHTML( $this->editFormTextBeforeContent );
+		$out->addHTML( $this->editFormTextBeforeContent );
 
-		if ( !$this->isCssJsSubpage && $showToolbar && $wgUser->getOption( 'showtoolbar' ) ) {
-			$wgOut->addHTML( EditPage::getEditToolbar( $this->mTitle ) );
+		if ( !$this->isCssJsSubpage && $showToolbar && $user->getOption( 'showtoolbar' ) ) {
+			$out->addHTML( EditPage::getEditToolbar( $this->mTitle ) );
 		}
 
 		if ( $this->blankArticle ) {
-			$wgOut->addHTML( Html::hidden( 'wpIgnoreBlankArticle', true ) );
+			$out->addHTML( Html::hidden( 'wpIgnoreBlankArticle', true ) );
 		}
 
 		if ( $this->isConflict ) {
@@ -2696,7 +2713,7 @@ class EditPage {
 			$this->showContentForm();
 		}
 
-		$wgOut->addHTML( $this->editFormTextAfterContent );
+		$out->addHTML( $this->editFormTextAfterContent );
 
 		$this->showStandardInputs();
 
@@ -2706,19 +2723,19 @@ class EditPage {
 
 		$this->showEditTools();
 
-		$wgOut->addHTML( $this->editFormTextAfterTools . "\n" );
+		$out->addHTML( $this->editFormTextAfterTools . "\n" );
 
-		$wgOut->addHTML( Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
+		$out->addHTML( Html::rawElement( 'div', [ 'class' => 'templatesUsed' ],
 			Linker::formatTemplates( $this->getTemplates(), $this->preview, $this->section != '' ) ) );
 
-		$wgOut->addHTML( Html::rawElement( 'div', [ 'class' => 'hiddencats' ],
+		$out->addHTML( Html::rawElement( 'div', [ 'class' => 'hiddencats' ],
 			Linker::formatHiddenCategories( $this->page->getHiddenCategories() ) ) );
 
 		if ( $this->mParserOutput ) {
-			$wgOut->setLimitReportData( $this->mParserOutput->getLimitReportData() );
+			$out->setLimitReportData( $this->mParserOutput->getLimitReportData() );
 		}
 
-		$wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' );
+		$out->addModules( 'mediawiki.action.edit.collapsibleFooter' );
 
 		if ( $this->isConflict ) {
 			try {
@@ -2731,7 +2748,7 @@ class EditPage {
 					$this->contentFormat,
 					$ex->getMessage()
 				);
-				$wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
+				$out->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
 			}
 		}
 
@@ -2745,14 +2762,14 @@ class EditPage {
 		} else {
 			$mode = 'text';
 		}
-		$wgOut->addHTML( Html::hidden( 'mode', $mode, [ 'id' => 'mw-edit-mode' ] ) );
+		$out->addHTML( Html::hidden( 'mode', $mode, [ 'id' => 'mw-edit-mode' ] ) );
 
 		// Marker for detecting truncated form data.  This must be the last
 		// parameter sent in order to be of use, so do not move me.
-		$wgOut->addHTML( Html::hidden( 'wpUltimateParam', true ) );
-		$wgOut->addHTML( $this->editFormTextBottom . "\n</form>\n" );
+		$out->addHTML( Html::hidden( 'wpUltimateParam', true ) );
+		$out->addHTML( $this->editFormTextBottom . "\n</form>\n" );
 
-		if ( !$wgUser->getOption( 'previewontop' ) ) {
+		if ( !$user->getOption( 'previewontop' ) ) {
 			$this->displayPreviewArea( $previewOutput, false );
 		}
 
@@ -2778,21 +2795,23 @@ class EditPage {
 	 * @return bool
 	 */
 	protected function showHeader() {
-		global $wgOut, $wgUser, $wgMaxArticleSize, $wgLang;
-		global $wgAllowUserCss, $wgAllowUserJs;
+		global $wgMaxArticleSize, $wgAllowUserCss, $wgAllowUserJs;
+
+		$out = $this->context->getOutput();
+		$user = $this->context->getUser();
 
 		if ( $this->mTitle->isTalkPage() ) {
-			$wgOut->addWikiMsg( 'talkpagetext' );
+			$out->addWikiMsg( 'talkpagetext' );
 		}
 
 		// Add edit notices
 		$editNotices = $this->mTitle->getEditNotices( $this->oldid );
 		if ( count( $editNotices ) ) {
-			$wgOut->addHTML( implode( "\n", $editNotices ) );
+			$out->addHTML( implode( "\n", $editNotices ) );
 		} else {
 			$msg = wfMessage( 'editnotice-notext' );
 			if ( !$msg->isDisabled() ) {
-				$wgOut->addHTML(
+				$out->addHTML(
 					'<div class="mw-editnotice-notext">'
 					. $msg->parseAsBlock()
 					. '</div>'
@@ -2801,14 +2820,14 @@ class EditPage {
 		}
 
 		if ( $this->isConflict ) {
-			$wgOut->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
+			$out->wrapWikiMsg( "<div class='mw-explainconflict'>\n$1\n</div>", 'explainconflict' );
 			$this->editRevId = $this->page->getLatest();
 		} else {
 			if ( $this->section != '' && !$this->isSectionEditSupported() ) {
 				// We use $this->section to much before this and getVal('wgSection') directly in other places
 				// at this point we can't reset $this->section to '' to fallback to non-section editing.
 				// Someone is welcome to try refactoring though
-				$wgOut->showErrorPage( 'sectioneditnotsupported-title', 'sectioneditnotsupported-text' );
+				$out->showErrorPage( 'sectioneditnotsupported-title', 'sectioneditnotsupported-text' );
 				return false;
 			}
 
@@ -2822,31 +2841,31 @@ class EditPage {
 			}
 
 			if ( $this->missingComment ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-missingcommenttext'>\n$1\n</div>", 'missingcommenttext' );
+				$out->wrapWikiMsg( "<div id='mw-missingcommenttext'>\n$1\n</div>", 'missingcommenttext' );
 			}
 
 			if ( $this->missingSummary && $this->section != 'new' ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-missingsummary'>\n$1\n</div>", 'missingsummary' );
+				$out->wrapWikiMsg( "<div id='mw-missingsummary'>\n$1\n</div>", 'missingsummary' );
 			}
 
 			if ( $this->missingSummary && $this->section == 'new' ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-missingcommentheader'>\n$1\n</div>", 'missingcommentheader' );
+				$out->wrapWikiMsg( "<div id='mw-missingcommentheader'>\n$1\n</div>", 'missingcommentheader' );
 			}
 
 			if ( $this->blankArticle ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-blankarticle'>\n$1\n</div>", 'blankarticle' );
+				$out->wrapWikiMsg( "<div id='mw-blankarticle'>\n$1\n</div>", 'blankarticle' );
 			}
 
 			if ( $this->selfRedirect ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-selfredirect'>\n$1\n</div>", 'selfredirect' );
+				$out->wrapWikiMsg( "<div id='mw-selfredirect'>\n$1\n</div>", 'selfredirect' );
 			}
 
 			if ( $this->hookError !== '' ) {
-				$wgOut->addWikiText( $this->hookError );
+				$out->addWikiText( $this->hookError );
 			}
 
 			if ( !$this->checkUnicodeCompliantBrowser() ) {
-				$wgOut->addWikiMsg( 'nonunicodebrowser' );
+				$out->addWikiMsg( 'nonunicodebrowser' );
 			}
 
 			if ( $this->section != 'new' ) {
@@ -2854,13 +2873,13 @@ class EditPage {
 				if ( $revision ) {
 					// Let sysop know that this will make private content public if saved
 
-					if ( !$revision->userCan( Revision::DELETED_TEXT, $wgUser ) ) {
-						$wgOut->wrapWikiMsg(
+					if ( !$revision->userCan( Revision::DELETED_TEXT, $user ) ) {
+						$out->wrapWikiMsg(
 							"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
 							'rev-deleted-text-permission'
 						);
 					} elseif ( $revision->isDeleted( Revision::DELETED_TEXT ) ) {
-						$wgOut->wrapWikiMsg(
+						$out->wrapWikiMsg(
 							"<div class='mw-warning plainlinks'>\n$1\n</div>\n",
 							'rev-deleted-text-view'
 						);
@@ -2868,25 +2887,25 @@ class EditPage {
 
 					if ( !$revision->isCurrent() ) {
 						$this->mArticle->setOldSubtitle( $revision->getId() );
-						$wgOut->addWikiMsg( 'editingold' );
+						$out->addWikiMsg( 'editingold' );
 					}
 				} elseif ( $this->mTitle->exists() ) {
 					// Something went wrong
 
-					$wgOut->wrapWikiMsg( "<div class='errorbox'>\n$1\n</div>\n",
+					$out->wrapWikiMsg( "<div class='errorbox'>\n$1\n</div>\n",
 						[ 'missing-revision', $this->oldid ] );
 				}
 			}
 		}
 
 		if ( wfReadOnly() ) {
-			$wgOut->wrapWikiMsg(
+			$out->wrapWikiMsg(
 				"<div id=\"mw-read-only-warning\">\n$1\n</div>",
 				[ 'readonlywarning', wfReadOnlyReason() ]
 			);
-		} elseif ( $wgUser->isAnon() ) {
+		} elseif ( $user->isAnon() ) {
 			if ( $this->formtype != 'preview' ) {
-				$wgOut->wrapWikiMsg(
+				$out->wrapWikiMsg(
 					"<div id='mw-anon-edit-warning' class='warningbox'>\n$1\n</div>",
 					[ 'anoneditwarning',
 						// Log-in link
@@ -2900,7 +2919,7 @@ class EditPage {
 					]
 				);
 			} else {
-				$wgOut->wrapWikiMsg( "<div id=\"mw-anon-preview-warning\" class=\"warningbox\">\n$1</div>",
+				$out->wrapWikiMsg( "<div id=\"mw-anon-preview-warning\" class=\"warningbox\">\n$1</div>",
 					'anonpreviewwarning'
 				);
 			}
@@ -2908,22 +2927,25 @@ class EditPage {
 			if ( $this->isCssJsSubpage ) {
 				# Check the skin exists
 				if ( $this->isWrongCaseCssJsPage ) {
-					$wgOut->wrapWikiMsg(
+					$out->wrapWikiMsg(
 						"<div class='error' id='mw-userinvalidcssjstitle'>\n$1\n</div>",
 						[ 'userinvalidcssjstitle', $this->mTitle->getSkinFromCssJsSubpage() ]
 					);
 				}
-				if ( $this->getTitle()->isSubpageOf( $wgUser->getUserPage() ) ) {
+				if ( $this->getTitle()->isSubpageOf( $user->getUserPage() ) ) {
+					$out->wrapWikiMsg( '<div class="mw-usercssjspublic">$1</div>',
+						$this->isCssSubpage ? 'usercssispublic' : 'userjsispublic'
+					);
 					if ( $this->formtype !== 'preview' ) {
 						if ( $this->isCssSubpage && $wgAllowUserCss ) {
-							$wgOut->wrapWikiMsg(
+							$out->wrapWikiMsg(
 								"<div id='mw-usercssyoucanpreview'>\n$1\n</div>",
 								[ 'usercssyoucanpreview' ]
 							);
 						}
 
 						if ( $this->isJsSubpage && $wgAllowUserJs ) {
-							$wgOut->wrapWikiMsg(
+							$out->wrapWikiMsg(
 								"<div id='mw-userjsyoucanpreview'>\n$1\n</div>",
 								[ 'userjsyoucanpreview' ]
 							);
@@ -2943,7 +2965,7 @@ class EditPage {
 				# Then it must be protected based on static groups (regular)
 				$noticeMsg = 'protectedpagewarning';
 			}
-			LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle, '',
+			LogEventsList::showLogExtract( $out, 'protect', $this->mTitle, '',
 				[ 'lim' => 1, 'msgKey' => [ $noticeMsg ] ] );
 		}
 		if ( $this->mTitle->isCascadeProtected() ) {
@@ -2959,10 +2981,10 @@ class EditPage {
 				}
 			}
 			$notice .= '</div>';
-			$wgOut->wrapWikiMsg( $notice, [ 'cascadeprotectedwarning', $cascadeSourcesCount ] );
+			$out->wrapWikiMsg( $notice, [ 'cascadeprotectedwarning', $cascadeSourcesCount ] );
 		}
 		if ( !$this->mTitle->exists() && $this->mTitle->getRestrictions( 'create' ) ) {
-			LogEventsList::showLogExtract( $wgOut, 'protect', $this->mTitle, '',
+			LogEventsList::showLogExtract( $out, 'protect', $this->mTitle, '',
 				[ 'lim' => 1,
 					'showIfEmpty' => false,
 					'msgKey' => [ 'titleprotectedwarning' ],
@@ -2973,20 +2995,21 @@ class EditPage {
 			$this->contentLength = strlen( $this->textbox1 );
 		}
 
+		$lang = $this->context->getLanguage();
 		if ( $this->tooBig || $this->contentLength > $wgMaxArticleSize * 1024 ) {
-			$wgOut->wrapWikiMsg( "<div class='error' id='mw-edit-longpageerror'>\n$1\n</div>",
+			$out->wrapWikiMsg( "<div class='error' id='mw-edit-longpageerror'>\n$1\n</div>",
 				[
 					'longpageerror',
-					$wgLang->formatNum( round( $this->contentLength / 1024, 3 ) ),
-					$wgLang->formatNum( $wgMaxArticleSize )
+					$lang->formatNum( round( $this->contentLength / 1024, 3 ) ),
+					$lang->formatNum( $wgMaxArticleSize )
 				]
 			);
 		} else {
 			if ( !wfMessage( 'longpage-hint' )->isDisabled() ) {
-				$wgOut->wrapWikiMsg( "<div id='mw-edit-longpage-hint'>\n$1\n</div>",
+				$out->wrapWikiMsg( "<div id='mw-edit-longpage-hint'>\n$1\n</div>",
 					[
 						'longpage-hint',
-						$wgLang->formatSize( strlen( $this->textbox1 ) ),
+						$lang->formatSize( strlen( $this->textbox1 ) ),
 						strlen( $this->textbox1 )
 					]
 				);
@@ -3051,7 +3074,6 @@ class EditPage {
 	 * @param string $summary The text of the summary to display
 	 */
 	protected function showSummaryInput( $isSubjectPreview, $summary = "" ) {
-		global $wgOut;
 		# Add a class if 'missingsummary' is triggered to allow styling of the summary line
 		$summaryClass = $this->missingSummary ? 'mw-summarymissed' : 'mw-summary';
 		if ( $isSubjectPreview ) {
@@ -3070,7 +3092,7 @@ class EditPage {
 			[ 'class' => $summaryClass ],
 			[]
 		);
-		$wgOut->addHTML( "{$label} {$input}" );
+		$this->context->getOutput()->addHTML( "{$label} {$input}" );
 	}
 
 	/**
@@ -3102,9 +3124,9 @@ class EditPage {
 	}
 
 	protected function showFormBeforeText() {
-		global $wgOut;
 		$section = htmlspecialchars( $this->section );
-		$wgOut->addHTML( <<<HTML
+		$out = $this->context->getOutput();
+		$out->addHTML( <<<HTML
 <input type='hidden' value="{$section}" name="wpSection"/>
 <input type='hidden' value="{$this->starttime}" name="wpStarttime" />
 <input type='hidden' value="{$this->edittime}" name="wpEdittime" />
@@ -3114,12 +3136,11 @@ class EditPage {
 HTML
 		);
 		if ( !$this->checkUnicodeCompliantBrowser() ) {
-			$wgOut->addHTML( Html::hidden( 'safemode', '1' ) );
+			$out->addHTML( Html::hidden( 'safemode', '1' ) );
 		}
 	}
 
 	protected function showFormAfterText() {
-		global $wgOut, $wgUser;
 		/**
 		 * To make it harder for someone to slip a user a page
 		 * which submits an edit form to the wiki without their
@@ -3132,7 +3153,10 @@ HTML
 		 * include the constant suffix to prevent editing from
 		 * broken text-mangling proxies.
 		 */
-		$wgOut->addHTML( "\n" . Html::hidden( "wpEditToken", $wgUser->getEditToken() ) . "\n" );
+		$token = $this->context->getUser()->getEditToken();
+		$this->context->getOutput()->addHTML(
+			"\n" . Html::hidden( "wpEditToken", $token ) . "\n"
+		);
 	}
 
 	/**
@@ -3202,8 +3226,6 @@ HTML
 	}
 
 	protected function showTextbox( $text, $name, $customAttribs = [] ) {
-		global $wgOut, $wgUser;
-
 		$wikitext = $this->safeUnicodeOutput( $text );
 		if ( strval( $wikitext ) !== '' ) {
 			// Ensure there's a newline at the end, otherwise adding lines
@@ -3213,11 +3235,12 @@ HTML
 			$wikitext .= "\n";
 		}
 
+		$user = $this->context->getUser();
 		$attribs = $customAttribs + [
 			'accesskey' => ',',
 			'id' => $name,
-			'cols' => $wgUser->getIntOption( 'cols' ),
-			'rows' => $wgUser->getIntOption( 'rows' ),
+			'cols' => $user->getIntOption( 'cols' ),
+			'rows' => $user->getIntOption( 'rows' ),
 			// Avoid PHP notices when appending preferences
 			// (appending allows customAttribs['style'] to still work).
 			'style' => ''
@@ -3227,11 +3250,10 @@ HTML
 		$attribs['lang'] = $pageLang->getHtmlCode();
 		$attribs['dir'] = $pageLang->getDir();
 
-		$wgOut->addHTML( Html::textarea( $name, $wikitext, $attribs ) );
+		$this->context->getOutput()->addHTML( Html::textarea( $name, $wikitext, $attribs ) );
 	}
 
 	protected function displayPreviewArea( $previewOutput, $isOnTop = false ) {
-		global $wgOut;
 		$classes = [];
 		if ( $isOnTop ) {
 			$classes[] = 'ontop';
@@ -3243,7 +3265,8 @@ HTML
 			$attribs['style'] = 'display: none;';
 		}
 
-		$wgOut->addHTML( Xml::openElement( 'div', $attribs ) );
+		$out = $this->context->getOutput();
+		$out->addHTML( Xml::openElement( 'div', $attribs ) );
 
 		if ( $this->formtype == 'preview' ) {
 			$this->showPreview( $previewOutput );
@@ -3252,10 +3275,10 @@ HTML
 			$pageViewLang = $this->mTitle->getPageViewLanguage();
 			$attribs = [ 'lang' => $pageViewLang->getHtmlCode(), 'dir' => $pageViewLang->getDir(),
 				'class' => 'mw-content-' . $pageViewLang->getDir() ];
-			$wgOut->addHTML( Html::rawElement( 'div', $attribs ) );
+			$out->addHTML( Html::rawElement( 'div', $attribs ) );
 		}
 
-		$wgOut->addHTML( '</div>' );
+		$out->addHTML( '</div>' );
 
 		if ( $this->formtype == 'diff' ) {
 			try {
@@ -3267,7 +3290,7 @@ HTML
 					$this->contentFormat,
 					$ex->getMessage()
 				);
-				$wgOut->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
+				$out->addWikiText( '<div class="error">' . $msg->text() . '</div>' );
 			}
 		}
 	}
@@ -3279,14 +3302,14 @@ HTML
 	 * @param string $text The HTML to be output for the preview.
 	 */
 	protected function showPreview( $text ) {
-		global $wgOut;
 		if ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
 			$this->mArticle->openShowCategory();
 		}
+		$out = $this->context->getOutput();
 		# This hook seems slightly odd here, but makes things more
 		# consistent for extensions.
-		Hooks::run( 'OutputPageBeforeHTML', [ &$wgOut, &$text ] );
-		$wgOut->addHTML( $text );
+		Hooks::run( 'OutputPageBeforeHTML', [ &$out, &$text ] );
+		$out->addHTML( $text );
 		if ( $this->mTitle->getNamespace() == NS_CATEGORY ) {
 			$this->mArticle->closeShowCategory();
 		}
@@ -3300,7 +3323,7 @@ HTML
 	 * save and then make a comparison.
 	 */
 	function showDiff() {
-		global $wgUser, $wgContLang, $wgOut;
+		global $wgContLang;
 
 		$oldtitlemsg = 'currentrev';
 		# if message does not exist, show diff against the preloaded default
@@ -3331,8 +3354,9 @@ HTML
 			ContentHandler::runLegacyHooks( 'EditPageGetDiffText', [ $this, &$newContent ] );
 			Hooks::run( 'EditPageGetDiffContent', [ $this, &$newContent ] );
 
-			$popts = ParserOptions::newFromUserAndLang( $wgUser, $wgContLang );
-			$newContent = $newContent->preSaveTransform( $this->mTitle, $wgUser, $popts );
+			$user = $this->context->getUser();
+			$popts = ParserOptions::newFromUserAndLang( $user, $wgContLang );
+			$newContent = $newContent->preSaveTransform( $this->mTitle, $user, $popts );
 		}
 
 		if ( ( $oldContent && !$oldContent->isEmpty() ) || ( $newContent && !$newContent->isEmpty() ) ) {
@@ -3356,7 +3380,7 @@ HTML
 			$difftext = '';
 		}
 
-		$wgOut->addHTML( '<div id="wikiDiff">' . $difftext . '</div>' );
+		$this->context->getOutput()->addHTML( '<div id="wikiDiff">' . $difftext . '</div>' );
 	}
 
 	/**
@@ -3365,8 +3389,7 @@ HTML
 	protected function showHeaderCopyrightWarning() {
 		$msg = 'editpage-head-copy-warn';
 		if ( !wfMessage( $msg )->isDisabled() ) {
-			global $wgOut;
-			$wgOut->wrapWikiMsg( "<div class='editpage-head-copywarn'>\n$1\n</div>",
+			$this->context->getOutput()->wrapWikiMsg( "<div class='editpage-head-copywarn'>\n$1\n</div>",
 				'editpage-head-copy-warn' );
 		}
 	}
@@ -3383,16 +3406,15 @@ HTML
 		$msg = 'editpage-tos-summary';
 		Hooks::run( 'EditPageTosSummary', [ $this->mTitle, &$msg ] );
 		if ( !wfMessage( $msg )->isDisabled() ) {
-			global $wgOut;
-			$wgOut->addHTML( '<div class="mw-tos-summary">' );
-			$wgOut->addWikiMsg( $msg );
-			$wgOut->addHTML( '</div>' );
+			$out = $this->context->getOutput();
+			$out->addHTML( '<div class="mw-tos-summary">' );
+			$out->addWikiMsg( $msg );
+			$out->addHTML( '</div>' );
 		}
 	}
 
 	protected function showEditTools() {
-		global $wgOut;
-		$wgOut->addHTML( '<div class="mw-editTools">' .
+		$this->context->getOutput()->addHTML( '<div class="mw-editTools">' .
 			wfMessage( 'edittools' )->inContentLanguage()->parse() .
 			'</div>' );
 	}
@@ -3452,24 +3474,24 @@ HTML
 	}
 
 	protected function showStandardInputs( &$tabindex = 2 ) {
-		global $wgOut;
-		$wgOut->addHTML( "<div class='editOptions'>\n" );
+		$out = $this->context->getOutput();
+		$out->addHTML( "<div class='editOptions'>\n" );
 
 		if ( $this->section != 'new' ) {
 			$this->showSummaryInput( false, $this->summary );
-			$wgOut->addHTML( $this->getSummaryPreview( false, $this->summary ) );
+			$out->addHTML( $this->getSummaryPreview( false, $this->summary ) );
 		}
 
 		$checkboxes = $this->getCheckboxes( $tabindex,
 			[ 'minor' => $this->minoredit, 'watch' => $this->watchthis ] );
-		$wgOut->addHTML( "<div class='editCheckboxes'>" . implode( $checkboxes, "\n" ) . "</div>\n" );
+		$out->addHTML( "<div class='editCheckboxes'>" . implode( $checkboxes, "\n" ) . "</div>\n" );
 
 		// Show copyright warning.
-		$wgOut->addWikiText( $this->getCopywarn() );
-		$wgOut->addHTML( $this->editFormTextAfterWarn );
+		$out->addWikiText( $this->getCopywarn() );
+		$out->addHTML( $this->editFormTextAfterWarn );
 
-		$wgOut->addHTML( "<div class='editButtons'>\n" );
-		$wgOut->addHTML( implode( $this->getEditButtons( $tabindex ), "\n" ) . "\n" );
+		$out->addHTML( "<div class='editButtons'>\n" );
+		$out->addHTML( implode( $this->getEditButtons( $tabindex ), "\n" ) . "\n" );
 
 		$cancel = $this->getCancelLink();
 		if ( $cancel !== '' ) {
@@ -3489,13 +3511,13 @@ HTML
 			wfMessage( 'word-separator' )->escaped() .
 			wfMessage( 'newwindow' )->parse();
 
-		$wgOut->addHTML( "	<span class='cancelLink'>{$cancel}</span>\n" );
-		$wgOut->addHTML( "	<span class='editHelp'>{$edithelp}</span>\n" );
-		$wgOut->addHTML( "</div><!-- editButtons -->\n" );
+		$out->addHTML( "	<span class='cancelLink'>{$cancel}</span>\n" );
+		$out->addHTML( "	<span class='editHelp'>{$edithelp}</span>\n" );
+		$out->addHTML( "</div><!-- editButtons -->\n" );
 
-		Hooks::run( 'EditPage::showStandardInputs:options', [ $this, $wgOut, &$tabindex ] );
+		Hooks::run( 'EditPage::showStandardInputs:options', [ $this, $out, &$tabindex ] );
 
-		$wgOut->addHTML( "</div><!-- editOptions -->\n" );
+		$out->addHTML( "</div><!-- editOptions -->\n" );
 	}
 
 	/**
@@ -3503,10 +3525,9 @@ HTML
 	 * If you want to use another entry point to this function, be careful.
 	 */
 	protected function showConflict() {
-		global $wgOut;
-
-		if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, &$wgOut ] ) ) {
-			$stats = $wgOut->getContext()->getStats();
+		$out = $this->context->getOutput();
+		if ( Hooks::run( 'EditPageBeforeConflictDiff', [ &$this, &$out ] ) ) {
+			$stats = $this->context->getStats();
 			$stats->increment( 'edit.failures.conflict' );
 			// Only include 'standard' namespaces to avoid creating unknown numbers of statsd metrics
 			if (
@@ -3516,7 +3537,7 @@ HTML
 				$stats->increment( 'edit.failures.conflict.byNamespaceId.' . $this->mTitle->getNamespace() );
 			}
 
-			$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
+			$out->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
 
 			$content1 = $this->toEditContent( $this->textbox1 );
 			$content2 = $this->toEditContent( $this->textbox2 );
@@ -3529,7 +3550,7 @@ HTML
 				wfMessage( 'storedversion' )->text()
 			);
 
-			$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
+			$out->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
 			$this->showTextbox2();
 		}
 	}
@@ -3642,10 +3663,10 @@ HTML
 	 * @return string
 	 */
 	function getPreviewText() {
-		global $wgOut, $wgRawHtml, $wgLang;
-		global $wgAllowUserCss, $wgAllowUserJs;
+		global $wgRawHtml, $wgAllowUserCss, $wgAllowUserJs;
 
-		$stats = $wgOut->getContext()->getStats();
+		$stats = $this->context->getStats();
+		$out = $this->context->getOutput();
 
 		if ( $wgRawHtml && !$this->mTokenOk ) {
 			// Could be an offsite preview attempt. This is very unsafe if
@@ -3655,7 +3676,7 @@ HTML
 				// Do not put big scary notice, if previewing the empty
 				// string, which happens when you initially edit
 				// a category page, due to automatic preview-on-open.
-				$parsedNote = $wgOut->parse( "<div class='previewnote'>" .
+				$parsedNote = $out->parse( "<div class='previewnote'>" .
 					wfMessage( 'session_fail_preview_html' )->text() . "</div>", true, /* interface */true );
 			}
 			$stats->increment( 'edit.failures.session_loss' );
@@ -3677,7 +3698,7 @@ HTML
 
 			# provide a anchor link to the editform
 			$continueEditing = '<span class="mw-continue-editing">' .
-				'[[#' . self::EDITFORM_ID . '|' . $wgLang->getArrow() . ' ' .
+				'[[#' . self::EDITFORM_ID . '|' . $this->context->getLanguage()->getArrow() . ' ' .
 				wfMessage( 'continue-editing' )->text() . ']]</span>';
 			if ( $this->mTriedSave && !$this->mTokenOk ) {
 				if ( $this->mTokenOkExceptSuffix ) {
@@ -3743,7 +3764,7 @@ HTML
 			$parserOutput = $parserResult['parserOutput'];
 			$previewHTML = $parserResult['html'];
 			$this->mParserOutput = $parserOutput;
-			$wgOut->addParserOutputMetadata( $parserOutput );
+			$out->addParserOutputMetadata( $parserOutput );
 
 			if ( count( $parserOutput->getWarnings() ) ) {
 				$note .= "\n\n" . implode( "\n\n", $parserOutput->getWarnings() );
@@ -3769,7 +3790,7 @@ HTML
 
 		$previewhead = "<div class='previewnote'>\n" .
 			'<h2 id="mw-previewheader">' . wfMessage( 'preview' )->escaped() . "</h2>" .
-			$wgOut->parse( $note, true, /* interface */true ) . $conflict . "</div>\n";
+			$out->parse( $note, true, /* interface */true ) . $conflict . "</div>\n";
 
 		$pageViewLang = $this->mTitle->getPageViewLanguage();
 		$attribs = [ 'lang' => $pageViewLang->getHtmlCode(), 'dir' => $pageViewLang->getDir(),
@@ -3784,7 +3805,7 @@ HTML
 	 * @return ParserOptions
 	 */
 	protected function getPreviewParserOptions() {
-		$parserOptions = $this->page->makeParserOptions( $this->mArticle->getContext() );
+		$parserOptions = $this->page->makeParserOptions( $this->context );
 		$parserOptions->setIsPreview( true );
 		$parserOptions->setIsSectionPreview( !is_null( $this->section ) && $this->section !== '' );
 		$parserOptions->enableLimitReport();
@@ -3795,17 +3816,17 @@ HTML
 	 * Parse the page for a preview. Subclasses may override this class, in order
 	 * to parse with different options, or to otherwise modify the preview HTML.
 	 *
-	 * @param Content @content The page content
-	 * @return Associative array with keys:
+	 * @param Content $content The page content
+	 * @return array with keys:
 	 *   - parserOutput: The ParserOutput object
 	 *   - html: The HTML to be displayed
 	 */
 	protected function doPreviewParse( Content $content ) {
-		global $wgUser;
+		$user = $this->context->getUser();
 		$parserOptions = $this->getPreviewParserOptions();
-		$pstContent = $content->preSaveTransform( $this->mTitle, $wgUser, $parserOptions );
+		$pstContent = $content->preSaveTransform( $this->mTitle, $user, $parserOptions );
 		$scopedCallback = $parserOptions->setupFakeRevision(
-			$this->mTitle, $pstContent, $wgUser );
+			$this->mTitle, $pstContent, $user );
 		$parserOutput = $pstContent->getParserOutput( $this->mTitle, null, $parserOptions );
 		ScopedCallback::consume( $scopedCallback );
 		$parserOutput->setEditSectionTokens( false ); // no section edit links
@@ -3981,15 +4002,16 @@ HTML
 	 * @return array
 	 */
 	public function getCheckboxes( &$tabindex, $checked ) {
-		global $wgUser, $wgUseMediaWikiUIEverywhere;
+		global $wgUseMediaWikiUIEverywhere;
 
 		$checkboxes = [];
+		$user = $this->context->getUser();
 
 		// don't show the minor edit checkbox if it's a new page or section
 		if ( !$this->isNew ) {
 			$checkboxes['minor'] = '';
 			$minorLabel = wfMessage( 'minoredit' )->parse();
-			if ( $wgUser->isAllowed( 'minoredit' ) ) {
+			if ( $user->isAllowed( 'minoredit' ) ) {
 				$attribs = [
 					'tabindex' => ++$tabindex,
 					'accesskey' => wfMessage( 'accesskey-minoredit' )->text(),
@@ -4013,7 +4035,7 @@ HTML
 
 		$watchLabel = wfMessage( 'watchthis' )->parse();
 		$checkboxes['watch'] = '';
-		if ( $wgUser->isLoggedIn() ) {
+		if ( $user->isLoggedIn() ) {
 			$attribs = [
 				'tabindex' => ++$tabindex,
 				'accesskey' => wfMessage( 'accesskey-watch' )->text(),
@@ -4047,13 +4069,19 @@ HTML
 	public function getEditButtons( &$tabindex ) {
 		$buttons = [];
 
+		$labelAsPublish = $this->mArticle->getContext()->getConfig()->get( 'EditButtonPublishNotSave' );
+		if ( $labelAsPublish ) {
+			$buttonLabelKey = $this->isNew ? 'publishpage' : 'publishchanges';
+		} else {
+			$buttonLabelKey = $this->isNew ? 'savearticle' : 'savechanges';
+		}
+		$buttonLabel = wfMessage( $buttonLabelKey )->text();
 		$attribs = [
 			'id' => 'wpSave',
 			'name' => 'wpSave',
 			'tabindex' => ++$tabindex,
 		] + Linker::tooltipAndAccesskeyAttribs( 'save' );
-		$buttons['save'] = Html::submitButton( wfMessage( 'savearticle' )->text(),
-			$attribs, [ 'mw-ui-constructive' ] );
+		$buttons['save'] = Html::submitButton( $buttonLabel, $attribs, [ 'mw-ui-constructive' ] );
 
 		++$tabindex; // use the same for preview and live preview
 		$attribs = [
@@ -4082,15 +4110,14 @@ HTML
 	 * they have attempted to edit a nonexistent section.
 	 */
 	function noSuchSectionPage() {
-		global $wgOut;
-
-		$wgOut->prepareErrorPage( wfMessage( 'nosuchsectiontitle' ) );
+		$out = $this->context->getOutput();
+		$out->prepareErrorPage( wfMessage( 'nosuchsectiontitle' ) );
 
 		$res = wfMessage( 'nosuchsectiontext', $this->section )->parseAsBlock();
 		Hooks::run( 'EditPageNoSuchSection', [ &$this, &$res ] );
-		$wgOut->addHTML( $res );
+		$out->addHTML( $res );
 
-		$wgOut->returnToMain( false, $this->mTitle );
+		$out->returnToMain( false, $this->mTitle );
 	}
 
 	/**
@@ -4099,28 +4126,28 @@ HTML
 	 * @param string|array|bool $match Text (or array of texts) which triggered one or more filters
 	 */
 	public function spamPageWithContent( $match = false ) {
-		global $wgOut, $wgLang;
 		$this->textbox2 = $this->textbox1;
 
 		if ( is_array( $match ) ) {
-			$match = $wgLang->listToText( $match );
+			$match = $this->context->getLanguage()->listToText( $match );
 		}
-		$wgOut->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
+		$out = $this->context->getOutput();
+		$out->prepareErrorPage( wfMessage( 'spamprotectiontitle' ) );
 
-		$wgOut->addHTML( '<div id="spamprotected">' );
-		$wgOut->addWikiMsg( 'spamprotectiontext' );
+		$out->addHTML( '<div id="spamprotected">' );
+		$out->addWikiMsg( 'spamprotectiontext' );
 		if ( $match ) {
-			$wgOut->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) );
+			$out->addWikiMsg( 'spamprotectionmatch', wfEscapeWikiText( $match ) );
 		}
-		$wgOut->addHTML( '</div>' );
+		$out->addHTML( '</div>' );
 
-		$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
+		$out->wrapWikiMsg( '<h2>$1</h2>', "yourdiff" );
 		$this->showDiff();
 
-		$wgOut->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
+		$out->wrapWikiMsg( '<h2>$1</h2>', "yourtext" );
 		$this->showTextbox2();
 
-		$wgOut->addReturnTo( $this->getContextTitle(), [ 'action' => 'edit' ] );
+		$out->addReturnTo( $this->getContextTitle(), [ 'action' => 'edit' ] );
 	}
 
 	/**
@@ -4130,9 +4157,9 @@ HTML
 	 * @return bool
 	 */
 	private function checkUnicodeCompliantBrowser() {
-		global $wgBrowserBlackList, $wgRequest;
+		global $wgBrowserBlackList;
 
-		$currentbrowser = $wgRequest->getHeader( 'User-Agent' );
+		$currentbrowser = $this->context->getRequest()->getHeader( 'User-Agent' );
 		if ( $currentbrowser === false ) {
 			// No User-Agent header sent? Trust it by default...
 			return true;
diff --git a/includes/FileDeleteForm.php b/includes/FileDeleteForm.php
index 361058b17a..65638f286f 100644
--- a/includes/FileDeleteForm.php
+++ b/includes/FileDeleteForm.php
@@ -189,31 +189,24 @@ class FileDeleteForm {
 			);
 			$page = WikiPage::factory( $title );
 			$dbw = wfGetDB( DB_MASTER );
-			try {
-				$dbw->startAtomic( __METHOD__ );
-				// delete the associated article first
-				$error = '';
-				$deleteStatus = $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user );
-				// doDeleteArticleReal() returns a non-fatal error status if the page
-				// or revision is missing, so check for isOK() rather than isGood()
-				if ( $deleteStatus->isOK() ) {
-					$status = $file->delete( $reason, $suppress, $user );
-					if ( $status->isOK() ) {
-						$status->value = $deleteStatus->value; // log id
-						$dbw->endAtomic( __METHOD__ );
-					} else {
-						// Page deleted but file still there? rollback page delete
-						wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
-					}
-				} else {
-					// Done; nothing changed
+			$dbw->startAtomic( __METHOD__ );
+			// delete the associated article first
+			$error = '';
+			$deleteStatus = $page->doDeleteArticleReal( $reason, $suppress, 0, false, $error, $user );
+			// doDeleteArticleReal() returns a non-fatal error status if the page
+			// or revision is missing, so check for isOK() rather than isGood()
+			if ( $deleteStatus->isOK() ) {
+				$status = $file->delete( $reason, $suppress, $user );
+				if ( $status->isOK() ) {
+					$status->value = $deleteStatus->value; // log id
 					$dbw->endAtomic( __METHOD__ );
+				} else {
+					// Page deleted but file still there? rollback page delete
+					wfGetLBFactory()->rollbackMasterChanges( __METHOD__ );
 				}
-			} catch ( Exception $e ) {
-				// Rollback before returning to prevent UI from displaying
-				// incorrect "View or restore N deleted edits?"
-				$dbw->rollback( __METHOD__ );
-				throw $e;
+			} else {
+				// Done; nothing changed
+				$dbw->endAtomic( __METHOD__ );
 			}
 		}
 
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 7117f4c29a..0d669083b9 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -811,7 +811,7 @@ function wfUrlProtocolsWithoutProtRel() {
  * 3) Adds a "delimiter" element to the array, either '://', ':' or '//' (see (2)).
  *
  * @param string $url A URL to parse
- * @return string[] Bits of the URL in an associative array, per PHP docs
+ * @return string[]|bool Bits of the URL in an associative array, per PHP docs, false on failure
  */
 function wfParseUrl( $url ) {
 	global $wgUrlProtocols; // Allow all protocols defined in DefaultSettings/LocalSettings.php
diff --git a/includes/Html.php b/includes/Html.php
index 7cb75bba91..8c01448749 100644
--- a/includes/Html.php
+++ b/includes/Html.php
@@ -627,6 +627,17 @@ class Html {
 	 * @return string Raw HTML
 	 */
 	public static function inlineStyle( $contents, $media = 'all' ) {
+		// Don't escape '>' since that is used
+		// as direct child selector.
+		// Remember, in css, there is no "x" for hexadecimal escapes, and
+		// the space immediately after an escape sequence is swallowed.
+		$contents = strtr( $contents, [
+			'<' => '\3C ',
+			// CDATA end tag for good measure, but the main security
+			// is from escaping the '<'.
+			']]>' => '\5D\5D\3E '
+		] );
+
 		if ( preg_match( '/[<&]/', $contents ) ) {
 			$contents = "/*<![CDATA[*/$contents/*]]>*/";
 		}
diff --git a/includes/MWTimestamp.php b/includes/MWTimestamp.php
index 4964fe6cb4..defdc96777 100644
--- a/includes/MWTimestamp.php
+++ b/includes/MWTimestamp.php
@@ -56,10 +56,14 @@ class MWTimestamp {
 	 *
 	 * @since 1.20
 	 *
-	 * @param bool|string|int|float $timestamp Timestamp to set, or false for current time
+	 * @param bool|string|int|float|DateTime $timestamp Timestamp to set, or false for current time
 	 */
 	public function __construct( $timestamp = false ) {
-		$this->setTimestamp( $timestamp );
+		if ( $timestamp instanceof DateTime ) {
+			$this->timestamp = $timestamp;
+		} else {
+			$this->setTimestamp( $timestamp );
+		}
 	}
 
 	/**
diff --git a/includes/MediaWiki.php b/includes/MediaWiki.php
index 7dac0ec30b..77ac76ae4c 100644
--- a/includes/MediaWiki.php
+++ b/includes/MediaWiki.php
@@ -803,10 +803,10 @@ class MediaWiki {
 	 */
 	public function triggerJobs() {
 		$jobRunRate = $this->config->get( 'JobRunRate' );
-		if ( $jobRunRate <= 0 || wfReadOnly() ) {
-			return;
-		} elseif ( $this->getTitle()->isSpecial( 'RunJobs' ) ) {
+		if ( $this->getTitle()->isSpecial( 'RunJobs' ) ) {
 			return; // recursion guard
+		} elseif ( $jobRunRate <= 0 || wfReadOnly() ) {
+			return;
 		}
 
 		if ( $jobRunRate < 1 ) {
@@ -843,7 +843,7 @@ class MediaWiki {
 			$query, $this->config->get( 'SecretKey' ) );
 
 		$errno = $errstr = null;
-		$info = wfParseUrl( $this->config->get( 'Server' ) );
+		$info = wfParseUrl( $this->config->get( 'CanonicalServer' ) );
 		MediaWiki\suppressWarnings();
 		$host = $info['host'];
 		$port = 80;
@@ -872,7 +872,8 @@ class MediaWiki {
 			return;
 		}
 
-		$url = wfAppendQuery( wfScript( 'index' ), $query );
+		$special = SpecialPageFactory::getPage( 'RunJobs' );
+		$url = $special->getPageTitle()->getCanonicalURL( $query );
 		$req = (
 			"POST $url HTTP/1.1\r\n" .
 			"Host: {$info['host']}\r\n" .
@@ -883,7 +884,7 @@ class MediaWiki {
 		$runJobsLogger->info( "Running $n job(s) via '$url'" );
 		// Send a cron API request to be performed in the background.
 		// Give up if this takes too long to send (which should be rare).
-		stream_set_timeout( $sock, 1 );
+		stream_set_timeout( $sock, 2 );
 		$bytes = fwrite( $sock, $req );
 		if ( $bytes !== strlen( $req ) ) {
 			$runJobsLogger->error( "Failed to start cron API (socket write error)" );
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index ac5fbe0108..49891dfd5e 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -28,6 +28,7 @@ use WatchedItemQueryService;
 use SkinFactory;
 use TitleFormatter;
 use TitleParser;
+use VirtualRESTServiceClient;
 use MediaWiki\Interwiki\InterwikiLookup;
 
 /**
@@ -571,6 +572,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'TitleParser' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return VirtualRESTServiceClient
+	 */
+	public function getVirtualRESTServiceClient() {
+		return $this->getService( 'VirtualRESTServiceClient' );
+	}
+
 	///////////////////////////////////////////////////////////////////////////
 	// NOTE: When adding a service getter here, don't forget to add a test
 	// case for it in MediaWikiServicesTest::provideGetters() and in
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 70b6738773..d17f23422d 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -256,7 +256,7 @@ class MovePage {
 		$pageid = $this->oldTitle->getArticleID( Title::GAID_FOR_UPDATE );
 		$protected = $this->oldTitle->isProtected();
 
-		// Do the actual move
+		// Do the actual move; if this fails, it will throw an MWException(!)
 		$nullRevision = $this->moveToInternal( $user, $this->newTitle, $reason, $createRedirect );
 
 		// Refresh the sortkey for this row.  Be careful to avoid resetting
@@ -297,19 +297,25 @@ class MovePage {
 
 		if ( $protected ) {
 			# Protect the redirect title as the title used to be...
-			$dbw->insertSelect( 'page_restrictions', 'page_restrictions',
-				[
-					'pr_page' => $redirid,
-					'pr_type' => 'pr_type',
-					'pr_level' => 'pr_level',
-					'pr_cascade' => 'pr_cascade',
-					'pr_user' => 'pr_user',
-					'pr_expiry' => 'pr_expiry'
-				],
+			$res = $dbw->select(
+				'page_restrictions',
+				'*',
 				[ 'pr_page' => $pageid ],
 				__METHOD__,
-				[ 'IGNORE' ]
+				'FOR UPDATE'
 			);
+			$rowsInsert = [];
+			foreach ( $res as $row ) {
+				$rowsInsert[] = [
+					'pr_page' => $redirid,
+					'pr_type' => $row->pr_type,
+					'pr_level' => $row->pr_level,
+					'pr_cascade' => $row->pr_cascade,
+					'pr_user' => $row->pr_user,
+					'pr_expiry' => $row->pr_expiry
+				];
+			}
+			$dbw->insert( 'page_restrictions', $rowsInsert, __METHOD__, [ 'IGNORE' ] );
 
 			// Build comment for log
 			$comment = wfMessage(
@@ -412,7 +418,7 @@ class MovePage {
 	 *
 	 * @fixme This was basically directly moved from Title, it should be split into smaller functions
 	 * @param User $user the User doing the move
-	 * @param Title $nt The page to move to, which should be a redirect or nonexistent
+	 * @param Title $nt The page to move to, which should be a redirect or non-existent
 	 * @param string $reason The reason for the move
 	 * @param bool $createRedirect Whether to leave a redirect at the old title. Does not check
 	 *   if the user has the suppressredirect right
@@ -430,6 +436,29 @@ class MovePage {
 			$logType = 'move';
 		}
 
+		if ( $moveOverRedirect ) {
+			$overwriteMessage = wfMessage(
+					'delete_and_move_reason',
+					$this->oldTitle->getPrefixedText()
+				)->text();
+			$newpage = WikiPage::factory( $nt );
+			$errs = [];
+			$status = $newpage->doDeleteArticleReal(
+				$overwriteMessage,
+				/* $suppress */ false,
+				$nt->getArticleId(),
+				/* $commit */ false,
+				$errs,
+				$user
+			);
+
+			if ( !$status->isGood() ) {
+				throw new MWException( 'Failed to delete page-move revision: ' . $status );
+			}
+
+			$nt->resetArticleID( false );
+		}
+
 		if ( $createRedirect ) {
 			if ( $this->oldTitle->getNamespace() == NS_CATEGORY
 				&& !wfMessage( 'category-move-redirect-override' )->inContentLanguage()->isDisabled()
@@ -484,19 +513,6 @@ class MovePage {
 
 		$newpage = WikiPage::factory( $nt );
 
-		if ( $moveOverRedirect ) {
-			$newid = $nt->getArticleID();
-			$newcontent = $newpage->getContent();
-
-			# Delete the old redirect. We don't save it to history since
-			# by definition if we've got here it's rather uninteresting.
-			# We have to remove it so that the next step doesn't trigger
-			# a conflict on the unique namespace+title index...
-			$dbw->delete( 'page', [ 'page_id' => $newid ], __METHOD__ );
-
-			$newpage->doDeleteUpdates( $newid, $newcontent );
-		}
-
 		# Save a null revision in the page's history notifying of the move
 		$nullRevision = Revision::newNullRevision( $dbw, $oldid, $comment, true, $user );
 		if ( !is_object( $nullRevision ) ) {
@@ -542,9 +558,7 @@ class MovePage {
 			);
 		}
 
-		if ( !$moveOverRedirect ) {
-			WikiPage::onArticleCreate( $nt );
-		}
+		WikiPage::onArticleCreate( $nt );
 
 		# Recreate the redirect, this time in the other direction.
 		if ( $redirectContent ) {
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index cc377bc6ea..c7499b1b45 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -163,6 +163,9 @@ class OutputPage extends ContextSource {
 	/** @var string */
 	private $rlUserModuleState;
 
+	/** @var array */
+	private $rlExemptStyleModules;
+
 	/** @var array */
 	protected $mJsConfigVars = [];
 
@@ -2660,30 +2663,64 @@ class OutputPage extends ContextSource {
 	public function getRlClient() {
 		if ( !$this->rlClient ) {
 			$context = $this->getRlClientContext();
-			$userModule = $this->getResourceLoader()->getModule( 'user' );
-			// Manually handled by getBottomScripts()
-			$userState = $userModule->isKnownEmpty( $context ) && !$this->isUserModulePreview()
-				? 'ready'
-				: 'loading';
-			$this->rlUserModuleState = $userState;
-
+			$rl = $this->getResourceLoader();
 			$this->addModules( [
 				'user.options',
 				'user.tokens',
 			] );
-			$rlClient = new ResourceLoaderClientHtml( $context );
+			$this->addModuleStyles( [
+				'site.styles',
+				'noscript',
+				'user.styles',
+				'user.cssprefs',
+			] );
+
+			// Prepare exempt modules for buildExemptModules()
+			$exemptGroups = [ 'site' => [], 'noscript' => [], 'private' => [], 'user' => [] ];
+			$exemptStates = [];
+			$moduleStyles = array_filter( $this->getModuleStyles( /*filter*/ true ),
+				function ( $name ) use ( $rl, $context, &$exemptGroups, &$exemptStates ) {
+					$module = $rl->getModule( $name );
+					if ( $module ) {
+						$group = $module->getGroup();
+						if ( $name === 'user.styles' && $this->isUserCssPreview() ) {
+							$exemptStates[$name] = 'ready';
+							// Special case in buildExemptModules()
+							return false;
+						}
+						if ( $name === 'site.styles' ) {
+							// HACK: Technically, 'site.styles' isn't in a separate request group.
+							// But, in order to ensure its styles are in the right position,
+							// pretend it's in a group called 'site'.
+							$group = 'site';
+						}
+						if ( isset( $exemptGroups[$group] ) ) {
+							$exemptStates[$name] = 'ready';
+							if ( !$module->isKnownEmpty( $context ) ) {
+								// E.g. Don't output empty <styles>
+								$exemptGroups[$group][] = $name;
+							}
+							return false;
+						}
+					}
+					return true;
+				}
+			);
+			$this->rlExemptStyleModules = $exemptGroups;
+
+			// Manually handled by getBottomScripts()
+			$userModule = $rl->getModule( 'user' );
+			$userState = $userModule->isKnownEmpty( $context ) && !$this->isUserJsPreview()
+				? 'ready'
+				: 'loading';
+			$this->rlUserModuleState = $exemptStates['user'] = $userState;
+
+			$rlClient = new ResourceLoaderClientHtml( $context, $this->getTarget() );
 			$rlClient->setConfig( $this->getJSVars() );
 			$rlClient->setModules( $this->getModules( /*filter*/ true ) );
-			$rlClient->setModuleStyles( $this->getModuleStyles( /*filter*/ true ) );
+			$rlClient->setModuleStyles( $moduleStyles );
 			$rlClient->setModuleScripts( $this->getModuleScripts( /*filter*/ true ) );
-			$rlClient->setExemptStates( [
-				'user' => $userState,
-				// Manually handled by buildExemptModules() and getBottomScripts()
-				'site.styles' => 'ready',
-				'noscript' => 'ready',
-				'user.cssprefs' => 'ready',
-				'user.styles' => 'ready',
-			] );
+			$rlClient->setExemptStates( $exemptStates );
 			$this->rlClient = $rlClient;
 		}
 		return $this->rlClient;
@@ -2790,9 +2827,12 @@ class OutputPage extends ContextSource {
 	 * @return string|WrappedStringList HTML
 	 */
 	public function makeResourceLoaderLink( $modules, $only, array $extraQuery = [] ) {
+		// Apply 'target' and 'origin' filters
+		$modules = $this->filterModules( (array)$modules, null, $only );
+
 		return ResourceLoaderClientHtml::makeLoad(
 			$this->getRlClientContext(),
-			(array)$modules,
+			$modules,
 			$only,
 			$extraQuery
 		);
@@ -2810,15 +2850,20 @@ class OutputPage extends ContextSource {
 		return WrappedString::join( "\n", $chunks );
 	}
 
-	/** @return bool */
-	private function isUserModulePreview() {
+	private function isUserJsPreview() {
 		return $this->getConfig()->get( 'AllowUserJs' )
-			&& $this->getUser()->isLoggedIn()
 			&& $this->getTitle()
 			&& $this->getTitle()->isJsSubpage()
 			&& $this->userCanPreview();
 	}
 
+	private function isUserCssPreview() {
+		return $this->getConfig()->get( 'AllowUserCss' )
+			&& $this->getTitle()
+			&& $this->getTitle()->isCssSubpage()
+			&& $this->userCanPreview();
+	}
+
 	/**
 	 * JS stuff to put at the bottom of the `<body>`. These are modules with position 'bottom',
 	 * legacy scripts ($this->mScripts), and user JS.
@@ -2838,7 +2883,7 @@ class OutputPage extends ContextSource {
 		//   ensures execution is scheduled after the "site" module.
 		// - Don't load if module state is already resolved as "ready".
 		if ( $this->rlUserModuleState === 'loading' ) {
-			if ( $this->isUserModulePreview() ) {
+			if ( $this->isUserJsPreview() ) {
 				$chunks[] = $this->makeResourceLoaderLink( 'user', ResourceLoaderModule::TYPE_COMBINED,
 					[ 'excludepage' => $this->getTitle()->getPrefixedDBkey() ]
 				);
@@ -3050,6 +3095,11 @@ class OutputPage extends ContextSource {
 		}
 
 		$user = $this->getUser();
+
+		if ( !$user->isLoggedIn() ) {
+			// Anons have predictable edit tokens
+			return false;
+		}
 		if ( !$user->matchEditToken( $request->getVal( 'wpEditToken' ) ) ) {
 			return false;
 		}
@@ -3411,19 +3461,11 @@ class OutputPage extends ContextSource {
 
 		$resourceLoader = $this->getResourceLoader();
 		$chunks = [];
-		// Things that should be appended after the other link and style chunks
+		// Things that go after the ResourceLoaderDynamicStyles marker
 		$append = [];
-		$moduleStyles = [
-			'site.styles',
-			'noscript'
-		];
 
-		// Exempt 'user' styles module.
-		// - May need excludepages for live preview.
-		// - Position after ResourceLoaderDynamicStyles marker
-		if ( $this->getConfig()->get( 'AllowUserCss' ) && $this->getTitle()->isCssSubpage()
-			&& $this->userCanPreview()
-		) {
+		// Exempt 'user' styles module (may need 'excludepages' for live preview)
+		if ( $this->isUserCssPreview() ) {
 			$append[] = $this->makeResourceLoaderLink(
 				'user.styles',
 				ResourceLoaderModule::TYPE_STYLES,
@@ -3437,60 +3479,26 @@ class OutputPage extends ContextSource {
 				$previewedCSS = CSSJanus::transform( $previewedCSS, true, false );
 			}
 			$append[] = Html::inlineStyle( $previewedCSS );
-		} else {
-			$module = $this->getResourceLoader()->getModule( 'user.styles' );
-			if ( !$module->isKnownEmpty( $this->getRlClientContext() ) ) {
-				// Load styles normally
-				$moduleStyles[] = 'user.styles';
-			}
-		}
-
-		// Exempt 'user.cssprefs' module
-		// - Position after ResourceLoaderDynamicStyles marker
-		$moduleStyles[] = 'user.cssprefs';
-
-		$groups = [
-			'other' => [],
-			'site' => [],
-			'noscript' => [],
-			'private' => [],
-			'user' => [],
-		];
-		foreach ( $moduleStyles as $name ) {
-			$module = $resourceLoader->getModule( $name );
-			if ( !$module || $module->isKnownEmpty( $this->getRlClientContext() ) ) {
-				// E.g. Don't output empty <styles> for user.cssprefs
-				continue;
-			}
-			if ( $name === 'site.styles' ) {
-				// HACK: Technically, the 'site.styles' module isn't in a separate request group.
-				// But, in order to ensure its styles are in the right position after the marker,
-				// pretend it's in a group called 'site'.
-				$groups['site'][] = $name;
-				continue;
-			}
-			$group = $module->getGroup();
-			// Use "other" in case. All exempt modules are in one of the known groups though.
-			$groups[isset( $groups[$group] ) ? $group : 'other'][] = $name;
 		}
 
-		// We want site, private and user styles to override dynamically added
-		// styles from modules, but we want dynamically added styles to override
-		// statically added styles from other modules. So the order has to be
-		// other, dynamic, site, private, user. Add statically added styles for
-		// other modules
+		// We want site, private and user styles to override dynamically added styles from
+		// general modules, but we want dynamically added styles to override statically added
+		// style modules. So the order has to be:
+		// - page style modules (formatted by ResourceLoaderClientHtml::getHeadHtml())
+		// - dynamically loaded styles (added by mw.loader before ResourceLoaderDynamicStyles)
+		// - ResourceLoaderDynamicStyles marker
+		// - site/private/user styles
 
 		// Add legacy styles added through addStyle()/addInlineStyle() here
 		$chunks[] = implode( '', $this->buildCssLinksArray() ) . $this->mInlineStyles;
 
-		// Client-side mw.loader will inject dynamic styles before this marker.
 		$chunks[] = Html::element(
 			'meta',
 			[ 'name' => 'ResourceLoaderDynamicStyles', 'content' => '' ]
 		);
 
-		foreach ( [ 'other', 'site', 'noscript', 'private', 'user' ] as $group ) {
-			$chunks[] = $this->makeResourceLoaderLink( $groups[$group],
+		foreach ( $this->rlExemptStyleModules as $group => $moduleNames ) {
+			$chunks[] = $this->makeResourceLoaderLink( $moduleNames,
 				ResourceLoaderModule::TYPE_STYLES
 			);
 		}
@@ -3810,9 +3818,6 @@ class OutputPage extends ContextSource {
 			'oojs-ui.styles.textures',
 			'mediawiki.widgets.styles',
 		] );
-		// Used by 'skipFunction' of the four 'oojs-ui.styles.*' modules. Please don't treat this as a
-		// public API or you'll be severely disappointed when T87871 is fixed and it disappears.
-		$this->addMeta( 'X-OOUI-PHP', '1' );
 	}
 
 	/**
diff --git a/includes/PageProps.php b/includes/PageProps.php
index 3654384722..5579ba5271 100644
--- a/includes/PageProps.php
+++ b/includes/PageProps.php
@@ -84,6 +84,16 @@ class PageProps {
 		$this->cache = new ProcessCacheLRU( self::CACHE_SIZE );
 	}
 
+	/**
+	 * Ensure that cache has at least this size
+	 * @param int $size
+	 */
+	public function ensureCacheSize( $size ) {
+		if ( $this->cache->getSize() < $size ) {
+			$this->cache->resize( $size );
+		}
+	}
+
 	/**
 	 * Given one or more Titles and one or more names of properties,
 	 * returns an associative array mapping page ID to property value.
@@ -92,7 +102,7 @@ class PageProps {
 	 * single Title is provided, it does not need to be passed in an array,
 	 * but an array will always be returned. If a single property name is
 	 * provided, it does not need to be passed in an array. In that case,
-	 * an associtive array mapping page ID to property value will be
+	 * an associative array mapping page ID to property value will be
 	 * returned; otherwise, an associative array mapping page ID to
 	 * an associative array mapping property name to property value will be
 	 * returned. An empty array will be returned if no matching properties
diff --git a/includes/Pingback.php b/includes/Pingback.php
index dd68102391..0039d2b68c 100644
--- a/includes/Pingback.php
+++ b/includes/Pingback.php
@@ -117,6 +117,9 @@ class Pingback {
 	 *
 	 * This is public so we can display it in the installer
 	 *
+	 * Developers: If you're adding a new piece of data to this, please ensure
+	 * that you update https://www.mediawiki.org/wiki/Manual:$wgPingback
+	 *
 	 * @return array
 	 */
 	public function getSystemInfo() {
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 21c6377320..33569e6d1b 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -209,6 +209,24 @@ return [
 		return $services->getService( '_MediaWikiTitleCodec' );
 	},
 
+	'VirtualRESTServiceClient' => function( MediaWikiServices $services ) {
+		$config = $services->getMainConfig()->get( 'VirtualRestConfig' );
+
+		$vrsClient = new VirtualRESTServiceClient( new MultiHttpClient( [] ) );
+		foreach ( $config['paths'] as $prefix => $serviceConfig ) {
+			$class = $serviceConfig['class'];
+			// Merge in the global defaults
+			$constructArg = isset( $serviceConfig['options'] )
+				? $serviceConfig['options']
+				: [];
+			$constructArg += $config['global'];
+			// Make the VRS service available at the mount point
+			$vrsClient->mount( $prefix, [ 'class' => $class, 'config' => $constructArg ] );
+		}
+
+		return $vrsClient;
+	},
+
 	///////////////////////////////////////////////////////////////////////////
 	// NOTE: When adding a service here, don't forget to add a getter function
 	// in the MediaWikiServices class. The convenience getter should just call
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 0b4d048e74..0210ed9d6a 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -48,6 +48,9 @@ class StubObject {
 	/** @var null|string */
 	protected $class;
 
+	/** @var null|callable */
+	protected $factory;
+
 	/** @var array */
 	protected $params;
 
@@ -55,12 +58,17 @@ class StubObject {
 	 * Constructor.
 	 *
 	 * @param string $global Name of the global variable.
-	 * @param string $class Name of the class of the real object.
+	 * @param string|callable $class Name of the class of the real object
+	 *                               or a factory function to call
 	 * @param array $params Parameters to pass to constructor of the real object.
 	 */
 	public function __construct( $global = null, $class = null, $params = [] ) {
 		$this->global = $global;
-		$this->class = $class;
+		if ( is_callable( $class ) ) {
+			$this->factory = $class;
+		} else {
+			$this->class = $class;
+		}
 		$this->params = $params;
 	}
 
@@ -110,8 +118,10 @@ class StubObject {
 	 * @return object
 	 */
 	public function _newObject() {
-		return ObjectFactory::getObjectFromSpec( [
-			'class' => $this->class,
+		$params = $this->factory
+			? [ 'factory' => $this->factory ]
+			: [ 'class' => $this->class ];
+		return ObjectFactory::getObjectFromSpec( $params + [
 			'args' => $this->params,
 			'closure_expansion' => false,
 		] );
diff --git a/includes/Title.php b/includes/Title.php
index ed445cc280..2021e0ab9c 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -2271,13 +2271,17 @@ class Title implements LinkTarget {
 	 * @return array List of errors
 	 */
 	private function checkUserBlock( $action, $user, $errors, $rigor, $short ) {
+		global $wgEmailConfirmToEdit, $wgBlockDisablesLogin;
 		// Account creation blocks handled at userlogin.
 		// Unblocking handled in SpecialUnblock
 		if ( $rigor === 'quick' || in_array( $action, [ 'createaccount', 'unblock' ] ) ) {
 			return $errors;
 		}
 
-		global $wgEmailConfirmToEdit;
+		// Optimize for a very common case
+		if ( $action === 'read' && !$wgBlockDisablesLogin ) {
+			return $errors;
+		}
 
 		if ( $wgEmailConfirmToEdit && !$user->isEmailConfirmed() ) {
 			$errors[] = [ 'confirmedittext' ];
@@ -2434,6 +2438,7 @@ class Title implements LinkTarget {
 			$checks = [
 				'checkPermissionHooks',
 				'checkReadPermissions',
+				'checkUserBlock', // for wgBlockDisablesLogin
 			];
 		# Don't call checkSpecialsAndNSPermissions or checkCSSandJSPermissions
 		# here as it will lead to duplicate error messages. This is okay to do
diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php
index 89ca50c00b..a13609bf5d 100644
--- a/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@ -741,6 +741,8 @@ class WatchedItemStore implements StatsdAwareInterface {
 					global $wgUpdateRowsPerQuery;
 
 					$dbw = $this->getConnection( DB_MASTER );
+					$factory = wfGetLBFactory();
+					$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 
 					$watchersChunks = array_chunk( $watchers, $wgUpdateRowsPerQuery );
 					foreach ( $watchersChunks as $watchersChunk ) {
@@ -754,14 +756,17 @@ class WatchedItemStore implements StatsdAwareInterface {
 							], $fname
 						);
 						if ( count( $watchersChunks ) > 1 ) {
-							$dbw->commit( __METHOD__, 'flush' );
-							wfGetLBFactory()->waitForReplication( [ 'wiki' => $dbw->getWikiID() ] );
+							$factory->commitAndWaitForReplication(
+								__METHOD__, $ticket, [ 'wiki' => $dbw->getWikiID() ]
+							);
 						}
 					}
 					$this->uncacheLinkTarget( $target );
 
 					$this->reuseConnection( $dbw );
-				}
+				},
+				DeferredUpdates::POSTSEND,
+				$dbw
 			);
 		}
 
diff --git a/includes/api/ApiAuthManagerHelper.php b/includes/api/ApiAuthManagerHelper.php
index c970f932d7..a4f54ee6d8 100644
--- a/includes/api/ApiAuthManagerHelper.php
+++ b/includes/api/ApiAuthManagerHelper.php
@@ -157,8 +157,13 @@ class ApiAuthManagerHelper {
 
 		// Collect the fields for all the requests
 		$fields = [];
+		$sensitive = [];
 		foreach ( $reqs as $req ) {
-			$fields += (array)$req->getFieldInfo();
+			$info = (array)$req->getFieldInfo();
+			$fields += $info;
+			$sensitive += array_filter( $info, function ( $opts ) {
+				return !empty( $opts['sensitive'] );
+			} );
 		}
 
 		// Extract the request data for the fields and mark those request
@@ -166,6 +171,16 @@ class ApiAuthManagerHelper {
 		$data = array_intersect_key( $this->module->getRequest()->getValues(), $fields );
 		$this->module->getMain()->markParamsUsed( array_keys( $data ) );
 
+		if ( $sensitive ) {
+			try {
+				$this->module->requirePostedParameters( array_keys( $sensitive ), 'noprefix' );
+			} catch ( UsageException $ex ) {
+				// Make this a warning for now, upgrade to an error in 1.29.
+				$this->module->setWarning( $ex->getMessage() );
+				$this->module->logFeatureUsage( $this->module->getModuleName() . '-params-in-query-string' );
+			}
+		}
+
 		return AuthenticationRequest::loadRequestsFromSubmission( $reqs, $data );
 	}
 
@@ -326,6 +341,7 @@ class ApiAuthManagerHelper {
 			$this->formatMessage( $ret, 'label', $field['label'] );
 			$this->formatMessage( $ret, 'help', $field['help'] );
 			$ret['optional'] = !empty( $field['optional'] );
+			$ret['sensitive'] = !empty( $field['sensitive'] );
 
 			$retFields[$name] = $ret;
 		}
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index b45eacb693..fcb748c202 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -776,6 +776,39 @@ abstract class ApiBase extends ContextSource {
 		}
 	}
 
+	/**
+	 * Die if any of the specified parameters were found in the query part of
+	 * the URL rather than the post body.
+	 * @since 1.28
+	 * @param string[] $params Parameters to check
+	 * @param string $prefix Set to 'noprefix' to skip calling $this->encodeParamName()
+	 */
+	public function requirePostedParameters( $params, $prefix = 'prefix' ) {
+		// Skip if $wgDebugAPI is set or we're in internal mode
+		if ( $this->getConfig()->get( 'DebugAPI' ) || $this->getMain()->isInternalMode() ) {
+			return;
+		}
+
+		$queryValues = $this->getRequest()->getQueryValues();
+		$badParams = [];
+		foreach ( $params as $param ) {
+			if ( $prefix !== 'noprefix' ) {
+				$param = $this->encodeParamName( $param );
+			}
+			if ( array_key_exists( $param, $queryValues ) ) {
+				$badParams[] = $param;
+			}
+		}
+
+		if ( $badParams ) {
+			$this->dieUsage(
+				'The following parameters were found in the query string, but must be in the POST body: '
+					. join( ', ', $badParams ),
+				'mustpostparams'
+			);
+		}
+	}
+
 	/**
 	 * Callback function used in requireOnlyOneParameter to check whether required parameters are set
 	 *
@@ -2197,7 +2230,7 @@ abstract class ApiBase extends ContextSource {
 	 * analysis.
 	 * @param string $feature Feature being used.
 	 */
-	protected function logFeatureUsage( $feature ) {
+	public function logFeatureUsage( $feature ) {
 		$request = $this->getRequest();
 		$s = '"' . addslashes( $feature ) . '"' .
 			' "' . wfUrlencode( str_replace( ' ', '_', $this->getUser()->getName() ) ) . '"' .
@@ -2458,6 +2491,7 @@ abstract class ApiBase extends ContextSource {
 
 		// Build map of extension directories to extension info
 		if ( self::$extensionInfo === null ) {
+			$extDir = $this->getConfig()->get( 'ExtensionDirectory' );
 			self::$extensionInfo = [
 				realpath( __DIR__ ) ?: __DIR__ => [
 					'path' => $IP,
@@ -2465,6 +2499,7 @@ abstract class ApiBase extends ContextSource {
 					'license-name' => 'GPL-2.0+',
 				],
 				realpath( "$IP/extensions" ) ?: "$IP/extensions" => null,
+				realpath( $extDir ) ?: $extDir => null,
 			];
 			$keep = [
 				'path' => null,
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 851252ccd9..9bc0b3a433 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -70,6 +70,14 @@ class ApiLogin extends ApiBase {
 			return;
 		}
 
+		try {
+			$this->requirePostedParameters( [ 'password', 'token' ] );
+		} catch ( UsageException $ex ) {
+			// Make this a warning for now, upgrade to an error in 1.29.
+			$this->setWarning( $ex->getMessage() );
+			$this->logFeatureUsage( 'login-params-in-query-string' );
+		}
+
 		$params = $this->extractRequestParams();
 
 		$result = [];
@@ -155,10 +163,14 @@ class ApiLogin extends ApiBase {
 					$authRes = 'Failed';
 					$message = $res->message;
 					\MediaWiki\Logger\LoggerFactory::getInstance( 'authentication' )
-						->info( __METHOD__ . ': Authentication failed: ' . $message->plain() );
+						->info( __METHOD__ . ': Authentication failed: '
+						. $message->inLanguage( 'en' )->plain() );
 					break;
 
 				default:
+					\MediaWiki\Logger\LoggerFactory::getInstance( 'authentication' )
+						->info( __METHOD__ . ': Authentication failed due to unsupported response type: '
+						. $res->status, $this->getAuthenticationResponseLogData( $res ) );
 					$authRes = 'Aborted';
 					break;
 			}
@@ -273,4 +285,32 @@ class ApiLogin extends ApiBase {
 	public function getHelpUrls() {
 		return 'https://www.mediawiki.org/wiki/API:Login';
 	}
+
+	/**
+	 * Turns an AuthenticationResponse into a hash suitable for passing to Logger
+	 * @param AuthenticationResponse $response
+	 * @return array
+	 */
+	protected function getAuthenticationResponseLogData( AuthenticationResponse $response ) {
+		$ret = [
+			'status' => $response->status,
+		];
+		if ( $response->message ) {
+			$ret['message'] = $response->message->inLanguage( 'en' )->plain();
+		};
+		$reqs = [
+			'neededRequests' => $response->neededRequests,
+			'createRequest' => $response->createRequest,
+			'linkRequest' => $response->linkRequest,
+		];
+		foreach ( $reqs as $k => $v ) {
+			if ( $v ) {
+				$v = is_array( $v ) ? $v : [ $v ];
+				$reqClasses = array_unique( array_map( 'get_class', $v ) );
+				sort( $reqClasses );
+				$ret[$k] = implode( ', ', $reqClasses );
+			}
+		}
+		return $ret;
+	}
 }
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index 0478027678..22b079dee1 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -25,6 +25,8 @@
  * @defgroup API API
  */
 
+use MediaWiki\Logger\LoggerFactory;
+
 /**
  * This is the main API class, used for both external and internal processing.
  * When executed, it will create the requested formatter object,
@@ -206,7 +208,7 @@ class ApiMain extends ApiBase {
 					$config->get( 'CrossSiteAJAXdomainExceptions' )
 				)
 			) ) {
-				MediaWiki\Logger\LoggerFactory::getInstance( 'cors' )->warning(
+				LoggerFactory::getInstance( 'cors' )->warning(
 					'Non-whitelisted CORS request with session cookies', [
 						'origin' => $originHeader,
 						'cookies' => $sessionCookies,
@@ -1101,18 +1103,7 @@ class ApiMain extends ApiBase {
 				$this->dieUsageMsg( [ 'missingparam', 'token' ] );
 			}
 
-			if ( !$this->getConfig()->get( 'DebugAPI' ) &&
-				array_key_exists(
-					$module->encodeParamName( 'token' ),
-					$this->getRequest()->getQueryValues()
-				)
-			) {
-				$this->dieUsage(
-					"The '{$module->encodeParamName( 'token' )}' parameter was " .
-						'found in the query string, but must be in the POST body',
-					'mustposttoken'
-				);
-			}
+			$module->requirePostedParameters( [ 'token' ] );
 
 			if ( !$module->validateToken( $moduleParams['token'], $moduleParams ) ) {
 				$this->dieUsageMsg( 'sessionfailure' );
@@ -1453,6 +1444,7 @@ class ApiMain extends ApiBase {
 	protected function setRequestExpectations( ApiBase $module ) {
 		$limits = $this->getConfig()->get( 'TrxProfilerLimits' );
 		$trxProfiler = Profiler::instance()->getTransactionProfiler();
+		$trxProfiler->setLogger( LoggerFactory::getInstance( 'DBPerformance' ) );
 		if ( $this->getRequest()->hasSafeMethod() ) {
 			$trxProfiler->setExpectations( $limits['GET'], __METHOD__ );
 		} elseif ( $this->getRequest()->wasPosted() && !$module->isWriteMode() ) {
diff --git a/includes/api/ApiParse.php b/includes/api/ApiParse.php
index 35fad4a474..83b5d93e61 100644
--- a/includes/api/ApiParse.php
+++ b/includes/api/ApiParse.php
@@ -36,6 +36,12 @@ class ApiParse extends ApiBase {
 	/** @var Content $pstContent */
 	private $pstContent = null;
 
+	private function checkReadPermissions( Title $title ) {
+		if ( !$title->userCan( 'read', $this->getUser() ) ) {
+			$this->dieUsage( "You don't have permission to view this page", 'permissiondenied' );
+		}
+	}
+
 	public function execute() {
 		// The data is hot but user-dependent, like page views, so we set vary cookies
 		$this->getMain()->setCacheMode( 'anon-public-user-private' );
@@ -102,6 +108,8 @@ class ApiParse extends ApiBase {
 				if ( !$rev ) {
 					$this->dieUsage( "There is no revision ID $oldid", 'missingrev' );
 				}
+
+				$this->checkReadPermissions( $rev->getTitle() );
 				if ( !$rev->userCan( Revision::DELETED_TEXT, $this->getUser() ) ) {
 					$this->dieUsage( "You don't have permission to view deleted revisions", 'permissiondenied' );
 				}
@@ -161,6 +169,8 @@ class ApiParse extends ApiBase {
 				if ( !$titleObj || !$titleObj->exists() ) {
 					$this->dieUsage( "The page you specified doesn't exist", 'missingtitle' );
 				}
+
+				$this->checkReadPermissions( $titleObj );
 				$wgTitle = $titleObj;
 
 				if ( isset( $prop['revid'] ) ) {
diff --git a/includes/api/ApiQueryBacklinksprop.php b/includes/api/ApiQueryBacklinksprop.php
index 3810e90f13..236fb9e06c 100644
--- a/includes/api/ApiQueryBacklinksprop.php
+++ b/includes/api/ApiQueryBacklinksprop.php
@@ -53,6 +53,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
 			'code' => 'lh',
 			'prefix' => 'pl',
 			'linktable' => 'pagelinks',
+			'indexes' => [ 'pl_namespace', 'pl_backlinks_namespace' ],
 			'from_namespace' => true,
 			'showredirects' => true,
 		],
@@ -60,6 +61,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
 			'code' => 'ti',
 			'prefix' => 'tl',
 			'linktable' => 'templatelinks',
+			'indexes' => [ 'tl_namespace', 'tl_backlinks_namespace' ],
 			'from_namespace' => true,
 			'showredirects' => true,
 		],
@@ -67,6 +69,7 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
 			'code' => 'fu',
 			'prefix' => 'il',
 			'linktable' => 'imagelinks',
+			'indexes' => [ 'il_to', 'il_backlinks_namespace' ],
 			'from_namespace' => true,
 			'to_namespace' => NS_FILE,
 			'exampletitle' => 'File:Example.jpg',
@@ -249,6 +252,18 @@ class ApiQueryBacklinksprop extends ApiQueryGeneratorBase {
 		// Override any ORDER BY from above with what we calculated earlier.
 		$this->addOption( 'ORDER BY', array_keys( $sortby ) );
 
+		// MySQL's optimizer chokes if we have too many values in "$bl_title IN
+		// (...)" and chooses the wrong index, so specify the correct index to
+		// use for the query. See T139056 for details.
+		if ( !empty( $settings['indexes'] ) ) {
+			list( $idxNoFromNS, $idxWithFromNS ) = $settings['indexes'];
+			if ( $params['namespace'] !== null && !empty( $settings['from_namespace'] ) ) {
+				$this->addOption( 'USE INDEX', [ $settings['linktable'] => $idxWithFromNS ] );
+			} else {
+				$this->addOption( 'USE INDEX', [ $settings['linktable'] => $idxNoFromNS ] );
+			}
+		}
+
 		$this->addOption( 'LIMIT', $params['limit'] + 1 );
 
 		$res = $this->select( __METHOD__ );
diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index cfc1e4662f..9b45b91923 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -328,7 +328,6 @@ class ApiQueryUsers extends ApiQueryBase {
 			],
 			'attachedwiki' => null,
 			'users' => [
-				ApiBase::PARAM_TYPE => 'user',
 				ApiBase::PARAM_ISMULTI => true
 			],
 			'token' => [
diff --git a/includes/api/ApiUpload.php b/includes/api/ApiUpload.php
index 89d9af8ee8..f7ce55214e 100644
--- a/includes/api/ApiUpload.php
+++ b/includes/api/ApiUpload.php
@@ -240,7 +240,7 @@ class ApiUpload extends ApiBase {
 					'offset' => $this->mUpload->getOffset(),
 				];
 
-				$this->dieUsage( $status->getWikiText( false, false, 'en' ), 'stashfailed', 0, $extradata );
+				$this->dieStatusWithCode( $status, 'stashfailed', $extradata );
 			}
 		}
 
@@ -271,14 +271,20 @@ class ApiUpload extends ApiBase {
 						$filekey,
 						[ 'result' => 'Failure', 'stage' => 'assembling', 'status' => $status ]
 					);
-					$this->dieUsage( $status->getWikiText( false, false, 'en' ), 'stashfailed' );
+					$this->dieStatusWithCode( $status, 'stashfailed' );
+				}
+
+				// We can only get warnings like 'duplicate' after concatenating the chunks
+				$warnings = $this->getApiWarnings();
+				if ( $warnings ) {
+					$result['warnings'] = $warnings;
 				}
 
 				// The fully concatenated file has a new filekey. So remove
 				// the old filekey and fetch the new one.
 				UploadBase::setSessionStatus( $this->getUser(), $filekey, false );
 				$this->mUpload->stash->removeFile( $filekey );
-				$filekey = $this->mUpload->getLocalFile()->getFileKey();
+				$filekey = $this->mUpload->getStashFile()->getFileKey();
 
 				$result['result'] = 'Success';
 			}
@@ -315,8 +321,9 @@ class ApiUpload extends ApiBase {
 	 * @return string|null File key
 	 */
 	private function performStash( $failureMode, &$data = null ) {
+		$isPartial = (bool)$this->mParams['chunk'];
 		try {
-			$status = $this->mUpload->tryStashFile( $this->getUser() );
+			$status = $this->mUpload->tryStashFile( $this->getUser(), $isPartial );
 
 			if ( $status->isGood() && !$status->getValue() ) {
 				// Not actually a 'good' status...
@@ -381,6 +388,29 @@ class ApiUpload extends ApiBase {
 		$this->dieUsage( $parsed['info'], $parsed['code'], 0, $data );
 	}
 
+	/**
+	 * Like dieStatus(), but always uses $overrideCode for the error code, unless the code comes from
+	 * IApiMessage.
+	 *
+	 * @param Status $status
+	 * @param string $overrideCode Error code to use if there isn't one from IApiMessage
+	 * @param array|null $moreExtraData
+	 * @throws UsageException
+	 */
+	public function dieStatusWithCode( $status, $overrideCode, $moreExtraData = null ) {
+		$extraData = null;
+		list( $code, $msg ) = $this->getErrorFromStatus( $status, $extraData );
+		$errors = $status->getErrorsByType( 'error' ) ?: $status->getErrorsByType( 'warning' );
+		if ( !( $errors[0]['message'] instanceof IApiMessage ) ) {
+			$code = $overrideCode;
+		}
+		if ( $moreExtraData ) {
+			$extraData = $extraData ?: [];
+			$extraData += $moreExtraData;
+		}
+		$this->dieUsage( $msg, $code, 0, $extraData );
+	}
+
 	/**
 	 * Select an upload module and set it to mUpload. Dies on failure. If the
 	 * request was a status request and not a true upload, returns false;
@@ -403,11 +433,17 @@ class ApiUpload extends ApiBase {
 			if ( !$progress ) {
 				$this->dieUsage( 'No result in status data', 'missingresult' );
 			} elseif ( !$progress['status']->isGood() ) {
-				$this->dieUsage( $progress['status']->getWikiText( false, false, 'en' ), 'stashfailed' );
+				$this->dieStatusWithCode( $progress['status'], 'stashfailed' );
 			}
 			if ( isset( $progress['status']->value['verification'] ) ) {
 				$this->checkVerification( $progress['status']->value['verification'] );
 			}
+			if ( isset( $progress['status']->value['warnings'] ) ) {
+				$warnings = $this->transformWarnings( $progress['status']->value['warnings'] );
+				if ( $warnings ) {
+					$progress['warnings'] = $warnings;
+				}
+			}
 			unset( $progress['status'] ); // remove Status object
 			$this->getResult()->addValue( null, $this->getModuleName(), $progress );
 
@@ -421,7 +457,7 @@ class ApiUpload extends ApiBase {
 
 		if ( $this->mParams['chunk'] ) {
 			// Chunk upload
-			$this->mUpload = new UploadFromChunks();
+			$this->mUpload = new UploadFromChunks( $this->getUser() );
 			if ( isset( $this->mParams['filekey'] ) ) {
 				if ( $this->mParams['offset'] === 0 ) {
 					$this->dieUsage( 'Cannot supply a filekey when offset is 0', 'badparams' );
@@ -712,7 +748,7 @@ class ApiUpload extends ApiBase {
 			$this->mParams['text'] = $this->mParams['comment'];
 		}
 
-		/** @var $file File */
+		/** @var $file LocalFile */
 		$file = $this->mUpload->getLocalFile();
 
 		// For preferences mode, we want to watch if 'watchdefault' is set,
diff --git a/includes/api/i18n/fr.json b/includes/api/i18n/fr.json
index b34131bbf5..4b42964c27 100644
--- a/includes/api/i18n/fr.json
+++ b/includes/api/i18n/fr.json
@@ -25,7 +25,8 @@
 			"Lbayle",
 			"Verdy p",
 			"Yasten",
-			"Trial"
+			"Trial",
+			"Pols12"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Documentation]]\n* [[mw:API:FAQ|FAQ]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Liste de diffusion]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Annonces de l’API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bogues et demandes]\n</div>\n<strong>État :</strong> Toutes les fonctionnalités affichées sur cette page devraient fonctionner, mais l’API est encore en cours de développement et peut changer à tout moment. Inscrivez-vous à [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ la liste de diffusion mediawiki-api-announce] pour être informé des mises à jour.\n\n<strong>Requêtes erronées :</strong> Si des requêtes erronées sont envoyées à l’API, un en-tête HTTP sera renvoyé avec la clé « MediaWiki-API-Error ». La valeur de cet en-tête et le code d’erreur renvoyé prendront la même valeur. Pour plus d’information, voyez [[mw:API:Errors_and_warnings|API: Errors and warnings]].\n\n<strong>Test :</strong> Pour faciliter le test des requêtes de l’API, voyez [[Special:ApiSandbox]].",
@@ -1269,7 +1270,7 @@
 	"apihelp-stashedit-param-section": "Numéro de section. <kbd>0</kbd> pour la section du haut, <kbd>new</kbd> pour une nouvelle section.",
 	"apihelp-stashedit-param-sectiontitle": "Le titre pour une nouvelle section.",
 	"apihelp-stashedit-param-text": "Contenu de la page.",
-	"apihelp-stashedit-param-stashedtexthash": "Hachage du contenu de la page d’une réserve antérieure à utiliser à la place.",
+	"apihelp-stashedit-param-stashedtexthash": "Empreinte du contenu de la page venant d’une réserve préalable à utiliser à la place.",
 	"apihelp-stashedit-param-contentmodel": "Modèle de contenu du nouveau contenu.",
 	"apihelp-stashedit-param-contentformat": "Format de sérialisation de contenu utilisé pour le texte saisi.",
 	"apihelp-stashedit-param-baserevid": "ID de révision de la révision de base.",
diff --git a/includes/api/i18n/he.json b/includes/api/i18n/he.json
index 08a27d6e19..a28cbda468 100644
--- a/includes/api/i18n/he.json
+++ b/includes/api/i18n/he.json
@@ -219,7 +219,6 @@
 	"apihelp-linkaccount-example-link": "תחילת תהליך הקישור לחשבון מ־<kbd>Example</kbd>.",
 	"apihelp-login-description": "להיכנס ולקבל עוגיות אימות.\n\nהפעולה הזאת צריכה לשמש רק בשילוב [[Special:BotPasswords]]; שימוש לכניסה לחשבון ראשי מיושן ועשוי להיכשל ללא אזהרה. כדי להיכנס בבטחה לחשבון הראשי, יש להשתמש ב־<kbd>[[Special:ApiHelp/clientlogin|action=clientlogin]]</kbd>.",
 	"apihelp-login-description-nobotpasswords": "להיכנס ולקבל עוגיות אימות.\n\nהפעולה הזאת מיושנת ועשויה להיכשל ללא אזהרה. כדי להיכנס בבטחה, יש להשתמש ב־<kbd>[[Special:ApiHelp/clientlogin|action=clientlogin]]</kbd>.",
-	"apihelp-login-description-nonauthmanager": "להיכנס ולקבל עוגיות אימות.\n\nבמקרה של כניסה מוצלחת, העוגיות המקוננות תיכללנה בכותרות תשובות ה־HTTP. במקרה של כניסה כושלת, הניסיונות הבאים יוגבלו למספר ניסויי ניחוש הססמה האוטומטיים.",
 	"apihelp-login-param-name": "שם משתמש.",
 	"apihelp-login-param-password": "ססמה.",
 	"apihelp-login-param-domain": "שם מתחם (רשות).",
@@ -1256,6 +1255,7 @@
 	"apihelp-stashedit-param-section": "מספר הפסקה. <kbd>0</kbd> עבור הפסקה הראשונה, <kbd>new</kbd> עבור פסקה חדשה.",
 	"apihelp-stashedit-param-sectiontitle": "כותרת הפסקה החדשה.",
 	"apihelp-stashedit-param-text": "תוכן הדף.",
+	"apihelp-stashedit-param-stashedtexthash": "גיבוב של תוכן דף מסליק קודם שישמש במקום זה.",
 	"apihelp-stashedit-param-contentmodel": "מודל התוכן של התוכן החדש.",
 	"apihelp-stashedit-param-contentformat": "תסדיר הסדרת תוכן עבור טקסט הקלט.",
 	"apihelp-stashedit-param-baserevid": "מזהה גסה של גרסת הבסיס.",
diff --git a/includes/api/i18n/hu.json b/includes/api/i18n/hu.json
index 7334fab962..e0920f6bf7 100644
--- a/includes/api/i18n/hu.json
+++ b/includes/api/i18n/hu.json
@@ -6,7 +6,8 @@
 			"Tacsipacsi",
 			"ViDam",
 			"Macofe",
-			"Wolf Rex"
+			"Wolf Rex",
+			"Dj"
 		]
 	},
 	"apihelp-main-param-action": "Milyen műveletet hajtson végre.",
@@ -42,6 +43,7 @@
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Ellenőrzött változtatások elrejtése.",
 	"apihelp-login-param-name": "Szerkesztőnév.",
 	"apihelp-login-param-password": "Jelszó.",
+	"apihelp-login-param-domain": "Tartomány (opcionális)",
 	"apihelp-login-example-login": "Bejelentkezés.",
 	"apihelp-logout-example-logout": "Aktuális felhasználó kijelentkeztetése.",
 	"apihelp-mergehistory-description": "Laptörténetek egyesítése",
diff --git a/includes/api/i18n/ja.json b/includes/api/i18n/ja.json
index 2712c136f2..d3ef0e4183 100644
--- a/includes/api/i18n/ja.json
+++ b/includes/api/i18n/ja.json
@@ -8,7 +8,8 @@
 			"Mfuji",
 			"Otokoume",
 			"Sujiniku",
-			"Macofe"
+			"Macofe",
+			"Suchichi02"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|説明文書]]\n* [[mw: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> このページに表示されている機能は全て動作するはずですが、この API は未だ活発に開発されており、変更される可能性があります。アップデートの通知を受け取るには、[https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the mediawiki-api-announce メーリングリスト]に参加してください。\n\n<strong>誤ったリクエスト:</strong> 誤ったリクエストが API に送られた場合、\"MediaWiki-API-Error\" HTTP ヘッダーが送信され、そのヘッダーの値と送り返されるエラーコードは同じ値にセットされます。より詳しい情報は [[mw:API:Errors_and_warnings|API: Errors and warnings]] を参照してください。\n\n<strong>テスト:</strong> API のリクエストのテストは、[[Special:ApiSandbox]]で簡単に行えます。",
@@ -816,6 +817,7 @@
 	"apihelp-query+watchlist-param-prop": "追加で取得するプロパティ:",
 	"apihelp-query+watchlist-paramvalue-prop-ids": "版IDとページIDを追加します。",
 	"apihelp-query+watchlist-paramvalue-prop-title": "ページ名を追加します。",
+	"apihelp-query+watchlist-paramvalue-prop-flags": "編集のフラグを追加します。",
 	"apihelp-query+watchlist-paramvalue-prop-comment": "編集のコメントを追加します。",
 	"apihelp-query+watchlist-paramvalue-prop-parsedcomment": "編集の構文解析されたコメントを追加します。",
 	"apihelp-query+watchlist-paramvalue-prop-timestamp": "編集のタイムスタンプを追加します。",
diff --git a/includes/api/i18n/ko.json b/includes/api/i18n/ko.json
index bad4a12f10..5ae6c87ecc 100644
--- a/includes/api/i18n/ko.json
+++ b/includes/api/i18n/ko.json
@@ -466,7 +466,7 @@
 	"api-help-param-deprecated": "사용되지 않습니다.",
 	"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-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-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/lt.json b/includes/api/i18n/lt.json
index da676a14f1..938c098c05 100644
--- a/includes/api/i18n/lt.json
+++ b/includes/api/i18n/lt.json
@@ -1,19 +1,107 @@
 {
 	"@metadata": {
 		"authors": [
-			"Zygimantus"
+			"Zygimantus",
+			"Eitvys200"
 		]
 	},
+	"apihelp-main-param-action": "Kurį veiksmą atlikti.",
+	"apihelp-main-param-curtimestamp": "Prie rezultato pridėti dabartinę laiko žymę.",
+	"apihelp-block-description": "Blokuoti vartotoją.",
+	"apihelp-block-param-reason": "Blokavimo priežastis.",
+	"apihelp-block-param-nocreate": "Neleisti kurti paskyrų.",
 	"apihelp-createaccount-param-name": "Naudotojo vardas.",
 	"apihelp-createaccount-param-realname": "Vardas (nebūtina).",
 	"apihelp-delete-description": "Ištrinti puslapį.",
+	"apihelp-delete-example-simple": "IÅ¡trinti <kbd>Main Page</kbd>.",
+	"apihelp-delete-example-reason": "Ištrinti <kbd>Main Page</kbd> su priežastimi <kbd>Preparing for move</kbd>.",
+	"apihelp-disabled-description": "Šis modulis buvo išjungtas.",
+	"apihelp-edit-description": "Kurti ir redaguoti puslapius.",
+	"apihelp-edit-param-sectiontitle": "Naujo skyriaus pavadinimas.",
 	"apihelp-edit-param-text": "Puslapio turinys.",
+	"apihelp-edit-param-minor": "Smulkus pakeitimas.",
+	"apihelp-edit-param-notminor": "Nesmulkus pakeitimas.",
+	"apihelp-edit-param-createonly": "Neredaguoti puslapio jei jis jau egzistuoja.",
+	"apihelp-edit-param-watch": "Pridėti puslapį į dabartinio vartotojo stebimųjų sąrašą.",
+	"apihelp-edit-param-unwatch": "Pašalinti puslapį iš dabartinio vartotojo stebimųjų sąrašo.",
+	"apihelp-edit-param-redirect": "Automatiškai išspręsti peradresavimus.",
+	"apihelp-edit-example-edit": "Redaguoti puslapį.",
 	"apihelp-emailuser-description": "Siųsti el. laišką naudotojui.",
+	"apihelp-emailuser-param-target": "El. laiško gavėjas.",
 	"apihelp-expandtemplates-param-title": "Puslapio pavadinimas.",
+	"apihelp-feedcontributions-param-feedformat": "Srauto formatas.",
+	"apihelp-feedcontributions-param-year": "Nuo metų (ir anksčiau).",
+	"apihelp-feedcontributions-param-month": "Nuo mėnesio (ir anksčiau).",
+	"apihelp-feedcontributions-param-tagfilter": "Filtruoti įnašus, kurie turi šias žymes.",
+	"apihelp-feedcontributions-param-deletedonly": "Rodyti tik ištrintus įnašus.",
+	"apihelp-feedcontributions-param-hideminor": "Slėpti nedidelius pakeitimus.",
+	"apihelp-feedrecentchanges-param-feedformat": "Srauto formatas.",
+	"apihelp-feedrecentchanges-param-from": "Rodyti pakeitimus nuo tada.",
+	"apihelp-feedrecentchanges-param-hideminor": "Slėpti smulkius pakeitimus.",
+	"apihelp-feedrecentchanges-param-hidebots": "Slėpti robotų pakeitimus.",
+	"apihelp-feedrecentchanges-param-hideanons": "Slėpti vartotojų anonimų pakeitimus.",
+	"apihelp-feedrecentchanges-param-hideliu": "Slėpti užsiregistravusių vartotojų pakeitimus.",
+	"apihelp-feedrecentchanges-param-hidemyself": "Slėpti pakeitimus, atliktus dabartinio vartotojo.",
+	"apihelp-feedrecentchanges-param-tagfilter": "Filtruoti pagal žymę.",
+	"apihelp-feedrecentchanges-param-target": "Rodyti tik keitimus puslapiuose, pasiekiamuose iš šio puslapio.",
 	"apihelp-feedrecentchanges-example-simple": "Parodyti naujausius keitimus.",
+	"apihelp-feedwatchlist-param-feedformat": "Srauto formatas.",
+	"apihelp-filerevert-param-comment": "Įkėlimo komentaras.",
+	"apihelp-help-example-recursive": "Visa pagalba viename puslapyje.",
+	"apihelp-help-example-help": "Pačio pagalbos modulio pagalba.",
+	"apihelp-imagerotate-description": "Pasukti viena ar daugiau paveikslėlių.",
+	"apihelp-imagerotate-param-rotation": "Kiek laipsnių pasukti paveikslėlį pagal laikrodžio rodyklę.",
+	"apihelp-imagerotate-example-generator": "Pasukti visus paveikslėlius <kbd>Category:Flip</kbd> <kbd>180</kbd> laipsnių.",
+	"apihelp-import-param-xml": "XML failas įkeltas.",
+	"apihelp-login-param-name": "Vartotojo vardas.",
+	"apihelp-login-param-password": "Slaptažodis.",
+	"apihelp-login-param-domain": "Domenas (neprivaloma).",
+	"apihelp-login-example-login": "Prisijungti.",
+	"apihelp-logout-description": "Atsijungti ir išvalyti sesijos duomenis.",
+	"apihelp-logout-example-logout": "Atjungti dabartinė vartotoją.",
+	"apihelp-managetags-example-delete": "Ištrinti <kbd>vandlaism</kbd> žymę su priežastimi <kbd>Misspelt</kbd>",
+	"apihelp-managetags-example-activate": "Aktyvuoti žymę pavadinimu <kbd>spam</kbd> su priežastimi <kbd>For use in edit patrolling</kbd>",
+	"apihelp-managetags-example-deactivate": "Išjungti žymę pavadinimu <kbd>spam</kbd> su priežastimi <kbd>No longer required</kbd>",
+	"apihelp-mergehistory-description": "Sujungti puslapio istorijas.",
+	"apihelp-mergehistory-param-reason": "Istorijos sujungimo priežastis.",
+	"apihelp-mergehistory-example-merge": "Sujungti visą <kbd>Oldpage</kbd> istoriją į <kbd>Newpage</kbd>.",
+	"apihelp-move-description": "Perkelti puslapį.",
+	"apihelp-move-param-to": "Pavadinimas, į kuri pervadinamas puslapis.",
+	"apihelp-move-param-reason": "Pervadinimo priežastis.",
+	"apihelp-move-param-movetalk": "Pervadinti aptarimo puslapį, jei jis egzistuoja.",
+	"apihelp-move-param-noredirect": "Nekurti nukreipimo.",
+	"apihelp-move-param-watch": "Pridėti puslapį ir nukreipimą į dabartinio vartotojo stebimųjų sąrašą.",
+	"apihelp-move-param-unwatch": "Pašalinti puslapį ir nukreipimą iš dabartinio vartotojo stebimųjų sąrašo.",
+	"apihelp-move-param-ignorewarnings": "Ignuoruoti bet kokius įspėjimus.",
+	"apihelp-move-example-move": "Perkelti <kbd>Badtitle</kbd> į <kbd>Goodtitle</kbd> nepaliekant nukreipimo.",
+	"apihelp-opensearch-description": "Ieškoti viki naudojant OpenSearch protokolą.",
+	"apihelp-opensearch-param-limit": "Maksimalus grąžinamas rezultatų skaičius.",
+	"apihelp-opensearch-example-te": "Rasti puslapius prasidedančius su <kbd>Te</kbd>.",
+	"apihelp-options-example-reset": "Nustatyti visus pageidavimus iš naujo.",
+	"apihelp-options-example-change": "Keisti <kbd>skin</kbd> ir <kbd>hideminor</kbd> pageidavimus.",
+	"apihelp-options-example-complex": "Nustatyti visus pageidavimus iš naujo, tada nustatyti <kbd>skin</kbd> ir <kbd>nickname</kbd>.",
+	"apihelp-paraminfo-description": "Gauti informaciją apie API modulius.",
+	"apihelp-protect-example-protect": "Apsaugoti puslapį.",
+	"apihelp-query+allcategories-param-dir": "RÅ«Å¡iavimo kryptis.",
+	"apihelp-query+allcategories-param-min": "Gražinti tik kategorijas, kuriuose yra bent tiek narių.",
+	"apihelp-query+allcategories-param-max": "Gražinti tik kategorijas, kuriuose yra iki tiek narių.",
+	"apihelp-query+allcategories-param-limit": "Kiek kategorijų gražinti.",
+	"apihelp-query+allcategories-paramvalue-prop-size": "Prideda puslapių kategorijoje skaičių.",
 	"apihelp-query+alldeletedrevisions-example-user": "Sąrašas paskutinių 50 ištrintų indėlių pagal vartotoją\n<kbd>Pavyzdys</kbd>.",
+	"apihelp-query+alllinks-paramvalue-prop-title": "Prideda nuorodos pavadinimą.",
+	"apihelp-query+alllinks-param-limit": "Kiek objektų iš viso gražinti.",
+	"apihelp-query+allmessages-param-lang": "Gražinti pranešimus šia kalba.",
 	"apihelp-query+allrevisions-param-namespace": "Rodyti puslapius tik šioje vardų srityje.",
 	"apihelp-query+backlinks-example-simple": "Rodyti nuorodas <kbd>Pagrindinis puslapis</kbd>.",
+	"apihelp-query+blocks-paramvalue-prop-id": "Prideda bloko ID.",
+	"apihelp-query+blocks-paramvalue-prop-user": "Prideda užblokuoto vartotojo vardą.",
+	"apihelp-query+blocks-paramvalue-prop-userid": "Prideda užblokuoto vartotojo ID.",
+	"apihelp-query+blocks-paramvalue-prop-by": "Prideda užblokuoto vartotojo vardą.",
+	"apihelp-query+blocks-paramvalue-prop-byid": "Prideda užblokuoto vartotojo ID.",
+	"apihelp-query+blocks-paramvalue-prop-timestamp": "Prideda blokavimo laiko žymę.",
+	"apihelp-query+blocks-paramvalue-prop-expiry": "Prideda blokavimo pabaigos laiko žymes.",
+	"apihelp-query+blocks-paramvalue-prop-reason": "Prideda blokavimo priežastį.",
+	"apihelp-query+blocks-paramvalue-prop-range": "Prideda blokavimo paveiktų IP adresų diapazoną.",
 	"apihelp-query+watchlist-paramvalue-type-external": "IÅ¡oriniai keitimai.",
 	"apihelp-query+watchlist-paramvalue-type-new": "Puslapio sukūrimai.",
 	"apihelp-stashedit-param-title": "Puslapio pavadinimas buvo redaguotas.",
diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json
index 037aff4526..860b7a771f 100644
--- a/includes/api/i18n/zh-hans.json
+++ b/includes/api/i18n/zh-hans.json
@@ -1027,7 +1027,7 @@
 	"apihelp-query+search-paramvalue-prop-snippet": "Adds a parsed snippet of the page.",
 	"apihelp-query+search-paramvalue-prop-titlesnippet": "Adds a parsed snippet of the page title.",
 	"apihelp-query+search-paramvalue-prop-redirectsnippet": "添加被解析的重定向标题的片段。",
-	"apihelp-query+search-paramvalue-prop-redirecttitle": "Adds the title of the matching redirect.",
+	"apihelp-query+search-paramvalue-prop-redirecttitle": "添加匹配的重定向的标题。",
 	"apihelp-query+search-paramvalue-prop-sectionsnippet": "Adds a parsed snippet of the matching section title.",
 	"apihelp-query+search-paramvalue-prop-sectiontitle": "Adds the title of the matching section.",
 	"apihelp-query+search-paramvalue-prop-categorysnippet": "Adds a parsed snippet of the matching category.",
@@ -1040,7 +1040,7 @@
 	"apihelp-query+search-param-enablerewrites": "启用内部查询重写。一些搜索后端可以重写查询到它认为会给出更好结果的地方，例如纠正拼写错误。",
 	"apihelp-query+search-example-simple": "搜索<kbd>meaning</kbd>。",
 	"apihelp-query+search-example-text": "搜索文本<kbd>meaning</kbd>。",
-	"apihelp-query+search-example-generator": "获得有关搜索<kbd>meaning</kbd>返回页面的页面信息。",
+	"apihelp-query+search-example-generator": "获取有关搜索<kbd>meaning</kbd>返回页面的页面信息。",
 	"apihelp-query+siteinfo-description": "返回有关网站的一般信息。",
 	"apihelp-query+siteinfo-param-prop": "要获取的信息：",
 	"apihelp-query+siteinfo-paramvalue-prop-general": "全部系统信息。",
diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index eab50681cc..acdc01bfea 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -1605,9 +1605,6 @@ class AuthManager implements LoggerAwareInterface {
 			}
 		}
 
-		// Ignore warnings about master connections/writes...hard to avoid here
-		\Profiler::instance()->getTransactionProfiler()->resetExpectations();
-
 		$backoffKey = wfMemcKey( 'AuthManager', 'autocreate-failed', md5( $username ) );
 		if ( $cache->get( $backoffKey ) ) {
 			$this->logger->debug( __METHOD__ . ': {username} denied by prior creation attempt failures', [
@@ -1625,6 +1622,9 @@ class AuthManager implements LoggerAwareInterface {
 			'from' => $from,
 		] );
 
+		// Ignore warnings about master connections/writes...hard to avoid here
+		$trxProfiler = \Profiler::instance()->getTransactionProfiler();
+		$trxProfiler->setSilenced( true );
 		try {
 			$status = $user->addToDatabase();
 			if ( !$status->isOk() ) {
@@ -1652,6 +1652,7 @@ class AuthManager implements LoggerAwareInterface {
 				return $status;
 			}
 		} catch ( \Exception $ex ) {
+			$trxProfiler->setSilenced( false );
 			$this->logger->error( __METHOD__ . ': {username} failed with exception {exception}', [
 				'username' => $username,
 				'exception' => $ex,
@@ -1673,9 +1674,10 @@ class AuthManager implements LoggerAwareInterface {
 
 		// Update user count
 		\DeferredUpdates::addUpdate( new \SiteStatsUpdate( 0, 0, 0, 0, 1 ) );
-
 		// Watch user's userpage and talk page
-		$user->addWatch( $user->getUserPage(), User::IGNORE_USER_RIGHTS );
+		\DeferredUpdates::addCallableUpdate( function () use ( $user ) {
+			$user->addWatch( $user->getUserPage(), User::IGNORE_USER_RIGHTS );
+		} );
 
 		// Log the creation
 		if ( $this->config->get( 'NewUserLog' ) ) {
@@ -1686,12 +1688,10 @@ class AuthManager implements LoggerAwareInterface {
 			$logEntry->setParameters( [
 				'4::userid' => $user->getId(),
 			] );
-			$logid = $logEntry->insert();
+			$logEntry->insert();
 		}
 
-		// Commit database changes, so even if something else later blows up
-		// the newly-created user doesn't get lost.
-		wfGetLBFactory()->commitMasterChanges( __METHOD__ );
+		$trxProfiler->setSilenced( false );
 
 		if ( $login ) {
 			$this->setSessionDataForUser( $user );
@@ -2022,37 +2022,26 @@ class AuthManager implements LoggerAwareInterface {
 
 		// Query them and merge results
 		$reqs = [];
-		$allPrimaryRequired = null;
 		foreach ( $providers as $provider ) {
 			$isPrimary = $provider instanceof PrimaryAuthenticationProvider;
-			$thisRequired = [];
 			foreach ( $provider->getAuthenticationRequests( $providerAction, $options ) as $req ) {
 				$id = $req->getUniqueId();
 
-				// If it's from a Primary, mark it as "primary-required" but
-				// track it for later.
+				// If a required request if from a Primary, mark it as "primary-required" instead
 				if ( $isPrimary ) {
 					if ( $req->required ) {
-						$thisRequired[$id] = true;
 						$req->required = AuthenticationRequest::PRIMARY_REQUIRED;
 					}
 				}
 
-				if ( !isset( $reqs[$id] ) || $req->required === AuthenticationRequest::REQUIRED ) {
+				if (
+					!isset( $reqs[$id] )
+					|| $req->required === AuthenticationRequest::REQUIRED
+					|| $reqs[$id] === AuthenticationRequest::OPTIONAL
+				) {
 					$reqs[$id] = $req;
 				}
 			}
-
-			// Track which requests are required by all primaries
-			if ( $isPrimary ) {
-				$allPrimaryRequired = $allPrimaryRequired === null
-					? $thisRequired
-					: array_intersect_key( $allPrimaryRequired, $thisRequired );
-			}
-		}
-		// Any requests that were required by all primaries are required.
-		foreach ( (array)$allPrimaryRequired as $id => $dummy ) {
-			$reqs[$id]->required = AuthenticationRequest::REQUIRED;
 		}
 
 		// AuthManager has its own req for some actions
diff --git a/includes/auth/AuthenticationRequest.php b/includes/auth/AuthenticationRequest.php
index ff4d52ed92..2474b8b830 100644
--- a/includes/auth/AuthenticationRequest.php
+++ b/includes/auth/AuthenticationRequest.php
@@ -43,7 +43,8 @@ abstract class AuthenticationRequest {
 	const REQUIRED = 1;
 
 	/** Indicates that the request is required by a primary authentication
-	 * provdier, but other primary authentication providers do not require it. */
+	 * provdier. Since the user can choose which primary to authenticate with,
+	 * the request might or might not end up being actually required. */
 	const PRIMARY_REQUIRED = 2;
 
 	/** @var string|null The AuthManager::ACTION_* constant this request was
@@ -101,6 +102,8 @@ abstract class AuthenticationRequest {
 	 *  - label: (Message) Text suitable for a label in an HTML form
 	 *  - help: (Message) Text suitable as a description of what the field is
 	 *  - optional: (bool) If set and truthy, the field may be left empty
+	 *  - sensitive: (bool) If set and truthy, the field is considered sensitive. Code using the
+	 *      request should avoid exposing the value of the field.
 	 *
 	 * @return array As above
 	 */
@@ -314,6 +317,8 @@ abstract class AuthenticationRequest {
 					$options['optional'] = !empty( $options['optional'] );
 				}
 
+				$options['sensitive'] = !empty( $options['sensitive'] );
+
 				if ( !array_key_exists( $name, $merged ) ) {
 					$merged[$name] = $options;
 				} elseif ( $merged[$name]['type'] !== $options['type'] ) {
@@ -332,6 +337,7 @@ abstract class AuthenticationRequest {
 					}
 
 					$merged[$name]['optional'] = $merged[$name]['optional'] && $options['optional'];
+					$merged[$name]['sensitive'] = $merged[$name]['sensitive'] || $options['sensitive'];
 
 					// No way to merge 'value', 'image', 'help', or 'label', so just use
 					// the value from the first request.
diff --git a/includes/auth/EmailNotificationSecondaryAuthenticationProvider.php b/includes/auth/EmailNotificationSecondaryAuthenticationProvider.php
index d32640ea1d..a82f018d48 100644
--- a/includes/auth/EmailNotificationSecondaryAuthenticationProvider.php
+++ b/includes/auth/EmailNotificationSecondaryAuthenticationProvider.php
@@ -50,15 +50,16 @@ class EmailNotificationSecondaryAuthenticationProvider
 			&& $user->getEmail()
 			&& !$this->manager->getAuthenticationSessionData( 'no-email' )
 		) {
-			$status = $user->sendConfirmationMail();
-			$user->saveSettings();
-			if ( $status->isGood() ) {
-				// TODO show 'confirmemail_oncreate' success message
-			} else {
-				// TODO show 'confirmemail_sendfailed' error message
-				$this->logger->warning( 'Could not send confirmation email: ' .
-					$status->getWikiText( false, false, 'en' ) );
-			}
+			// TODO show 'confirmemail_oncreate'/'confirmemail_sendfailed' message
+			wfGetDB( DB_MASTER )->onTransactionIdle( function () use ( $user ) {
+				$user = $user->getInstanceForUpdate();
+				$status = $user->sendConfirmationMail();
+				$user->saveSettings();
+				if ( !$status->isGood() ) {
+					$this->logger->warning( 'Could not send confirmation email: ' .
+						$status->getWikiText( false, false, 'en' ) );
+				}
+			} );
 		}
 
 		return AuthenticationResponse::newPass();
diff --git a/includes/auth/PasswordAuthenticationRequest.php b/includes/auth/PasswordAuthenticationRequest.php
index 187c29ae9f..8550f3e211 100644
--- a/includes/auth/PasswordAuthenticationRequest.php
+++ b/includes/auth/PasswordAuthenticationRequest.php
@@ -53,6 +53,7 @@ class PasswordAuthenticationRequest extends AuthenticationRequest {
 				'type' => 'password',
 				'label' => wfMessage( $passwordLabel ),
 				'help' => wfMessage( 'authmanager-password-help' ),
+				'sensitive' => true,
 			],
 		];
 
@@ -68,6 +69,7 @@ class PasswordAuthenticationRequest extends AuthenticationRequest {
 				'type' => 'password',
 				'label' => wfMessage( $retypeLabel ),
 				'help' => wfMessage( 'authmanager-retype-help' ),
+				'sensitive' => true,
 			];
 		}
 
diff --git a/includes/auth/PrimaryAuthenticationProvider.php b/includes/auth/PrimaryAuthenticationProvider.php
index c44c8fc1c9..35f3287bd4 100644
--- a/includes/auth/PrimaryAuthenticationProvider.php
+++ b/includes/auth/PrimaryAuthenticationProvider.php
@@ -57,6 +57,14 @@ interface PrimaryAuthenticationProvider extends AuthenticationProvider {
 	/** Provider cannot create or link to accounts */
 	const TYPE_NONE = 'none';
 
+	/**
+	 * {@inheritdoc}
+	 *
+	 * Of the requests returned by this method, exactly one should have
+	 * {@link AuthenticationRequest::$required} set to REQUIRED.
+	 */
+	public function getAuthenticationRequests( $action, array $options );
+
 	/**
 	 * Start an authentication flow
 	 *
diff --git a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
index 46cbab5a3a..ed94c1ad2b 100644
--- a/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
+++ b/includes/auth/TemporaryPasswordPrimaryAuthenticationProvider.php
@@ -303,7 +303,11 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 		);
 
 		if ( $sendMail ) {
-			$this->sendPasswordResetEmail( $req );
+			// Send email after DB commit
+			$dbw->onTransactionIdle( function () use ( $req ) {
+				/** @var TemporaryPasswordAuthenticationRequest $req */
+				$this->sendPasswordResetEmail( $req );
+			} );
 		}
 	}
 
@@ -370,7 +374,10 @@ class TemporaryPasswordPrimaryAuthenticationProvider
 		$this->providerChangeAuthenticationData( $req );
 
 		if ( $mailpassword ) {
-			$this->sendNewAccountEmail( $user, $creator, $req->password );
+			// Send email after DB commit
+			wfGetDB( DB_MASTER )->onTransactionIdle( function () use ( $user, $creator, $req ) {
+				$this->sendNewAccountEmail( $user, $creator, $req->password );
+			} );
 		}
 
 		return $mailpassword ? 'byemail' : null;
diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 159cfd93de..daf76dfedd 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -589,16 +589,20 @@ class RecentChange {
 			'pageStatus' => 'changed'
 		];
 
-		DeferredUpdates::addCallableUpdate( function() use ( $rc, $tags ) {
-			$rc->save();
-			if ( $rc->mAttribs['rc_patrolled'] ) {
-				PatrolLog::record( $rc, true, $rc->getPerformer() );
-			}
-			if ( count( $tags ) ) {
-				ChangeTags::addTags( $tags, $rc->mAttribs['rc_id'],
-					$rc->mAttribs['rc_this_oldid'], null, null );
-			}
-		} );
+		DeferredUpdates::addCallableUpdate(
+			function () use ( $rc, $tags ) {
+				$rc->save();
+				if ( $rc->mAttribs['rc_patrolled'] ) {
+					PatrolLog::record( $rc, true, $rc->getPerformer() );
+				}
+				if ( count( $tags ) ) {
+					ChangeTags::addTags( $tags, $rc->mAttribs['rc_id'],
+						$rc->mAttribs['rc_this_oldid'], null, null );
+				}
+			},
+			DeferredUpdates::POSTSEND,
+			wfGetDB( DB_MASTER )
+		);
 
 		return $rc;
 	}
@@ -661,16 +665,20 @@ class RecentChange {
 			'pageStatus' => 'created'
 		];
 
-		DeferredUpdates::addCallableUpdate( function() use ( $rc, $tags ) {
-			$rc->save();
-			if ( $rc->mAttribs['rc_patrolled'] ) {
-				PatrolLog::record( $rc, true, $rc->getPerformer() );
-			}
-			if ( count( $tags ) ) {
-				ChangeTags::addTags( $tags, $rc->mAttribs['rc_id'],
-					$rc->mAttribs['rc_this_oldid'], null, null );
-			}
-		} );
+		DeferredUpdates::addCallableUpdate(
+			function () use ( $rc, $tags ) {
+				$rc->save();
+				if ( $rc->mAttribs['rc_patrolled'] ) {
+					PatrolLog::record( $rc, true, $rc->getPerformer() );
+				}
+				if ( count( $tags ) ) {
+					ChangeTags::addTags( $tags, $rc->mAttribs['rc_id'],
+						$rc->mAttribs['rc_this_oldid'], null, null );
+				}
+			},
+			DeferredUpdates::POSTSEND,
+			wfGetDB( DB_MASTER )
+		);
 
 		return $rc;
 	}
diff --git a/includes/collation/Collation.php b/includes/collation/Collation.php
index fe254afdc5..881c8c23fe 100644
--- a/includes/collation/Collation.php
+++ b/includes/collation/Collation.php
@@ -49,6 +49,8 @@ abstract class Collation {
 		switch ( $collationName ) {
 			case 'uppercase':
 				return new UppercaseCollation;
+			case 'numeric':
+				return new NumericUppercaseCollation;
 			case 'identity':
 				return new IdentityCollation;
 			case 'uca-default':
diff --git a/includes/collation/NumericUppercaseCollation.php b/includes/collation/NumericUppercaseCollation.php
new file mode 100644
index 0000000000..4bf2f737fb
--- /dev/null
+++ b/includes/collation/NumericUppercaseCollation.php
@@ -0,0 +1,58 @@
+<?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
+ *
+ * @file
+ */
+
+/**
+ * Collation that orders text with numbers "naturally", so that 'Foo 1' < 'Foo 2' < 'Foo 12'.
+ *
+ * Note that this only works in terms of sequences of digits, and the behavior for decimal fractions
+ * or pretty-formatted numbers may be unexpected.
+ *
+ * @since 1.28
+ */
+class NumericUppercaseCollation extends UppercaseCollation {
+	public function getSortKey( $string ) {
+		$sortkey = parent::getSortKey( $string );
+
+		// For each sequence of digits, insert the digit '0' and then the length of the sequence
+		// (encoded in two bytes) before it. That's all folks, it sorts correctly now! The '0' ensures
+		// correct position (where digits would normally sort), then the length will be compared putting
+		// shorter numbers before longer ones; if identical, then the characters will be compared, which
+		// generates the correct results for numbers of equal length.
+		$sortkey = preg_replace_callback( '/\d+/', function ( $matches ) {
+			$len = strlen( $matches[0] );
+			// This allows sequences of up to 65536 numeric characters to be handled correctly. One byte
+			// would allow only for 256, which doesn't feel future-proof.
+			$prefix = chr( floor( $len / 256 ) ) . chr( $len % 256 );
+			return '0' . $prefix . $matches[0];
+		}, $sortkey );
+
+		return $sortkey;
+	}
+
+	public function getFirstLetter( $string ) {
+		if ( preg_match( '/^\d/', $string ) ) {
+			// Note that we pass 0 and 9 as normal params, not numParams(). This only works for 0-9
+			// and not localised digits, so we don't want them to be converted.
+			return wfMessage( 'category-header-numerals' )->params( 0, 9 )->text();
+		} else {
+			return parent::getFirstLetter( $string );
+		}
+	}
+}
diff --git a/includes/content/CodeContentHandler.php b/includes/content/CodeContentHandler.php
index 2bbf6ca7b2..20893bb0e7 100644
--- a/includes/content/CodeContentHandler.php
+++ b/includes/content/CodeContentHandler.php
@@ -64,11 +64,4 @@ abstract class CodeContentHandler extends TextContentHandler {
 		throw new MWException( 'Subclass must override' );
 	}
 
-	/**
-	 * @param SearchEngine $engine
-	 * @return array
-	 */
-	public function getFieldsForSearchIndex( SearchEngine $engine ) {
-		return [];
-	}
 }
diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index 7184980ede..41fdef5709 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -1,4 +1,7 @@
 <?php
+
+use MediaWiki\Search\ParserOutputSearchDataExtractor;
+
 /**
  * Base class for content handling.
  *
@@ -1156,62 +1159,19 @@ abstract class ContentHandler {
 	 *
 	 * @param string $event Event name
 	 * @param array $args Parameters passed to hook functions
-	 * @param bool $warn Whether to log a warning.
-	 *                    Default to self::$enableDeprecationWarnings.
-	 *                    May be set to false for testing.
+	 * @param string|null $deprecatedVersion Emit a deprecation notice
+	 *   when the hook is run for the provided version
 	 *
 	 * @return bool True if no handler aborted the hook
-	 *
-	 * @see ContentHandler::$enableDeprecationWarnings
 	 */
 	public static function runLegacyHooks( $event, $args = [],
-		$warn = null
+		$deprecatedVersion = null
 	) {
 
-		if ( $warn === null ) {
-			$warn = self::$enableDeprecationWarnings;
-		}
-
 		if ( !Hooks::isRegistered( $event ) ) {
 			return true; // nothing to do here
 		}
 
-		if ( $warn ) {
-			// Log information about which handlers are registered for the legacy hook,
-			// so we can find and fix them.
-
-			$handlers = Hooks::getHandlers( $event );
-			$handlerInfo = [];
-
-			MediaWiki\suppressWarnings();
-
-			foreach ( $handlers as $handler ) {
-				if ( is_array( $handler ) ) {
-					if ( is_object( $handler[0] ) ) {
-						$info = get_class( $handler[0] );
-					} else {
-						$info = $handler[0];
-					}
-
-					if ( isset( $handler[1] ) ) {
-						$info .= '::' . $handler[1];
-					}
-				} elseif ( is_object( $handler ) ) {
-					$info = get_class( $handler[0] );
-					$info .= '::on' . $event;
-				} else {
-					$info = $handler;
-				}
-
-				$handlerInfo[] = $info;
-			}
-
-			MediaWiki\restoreWarnings();
-
-			wfWarn( "Using obsolete hook $event via ContentHandler::runLegacyHooks()! Handlers: " .
-				implode( ', ', $handlerInfo ), 2 );
-		}
-
 		// convert Content objects to text
 		$contentObjects = [];
 		$contentTexts = [];
@@ -1229,7 +1189,7 @@ abstract class ContentHandler {
 		}
 
 		// call the hook functions
-		$ok = Hooks::run( $event, $args );
+		$ok = Hooks::run( $event, $args, $deprecatedVersion );
 
 		// see if the hook changed the text
 		foreach ( $contentTexts as $k => $orig ) {
@@ -1251,24 +1211,40 @@ abstract class ContentHandler {
 
 	/**
 	 * Get fields definition for search index
+	 *
+	 * @todo Expose title, redirect, namespace, text, source_text, text_bytes
+	 *       field mappings here. (see T142670 and T143409)
+	 *
 	 * @param SearchEngine $engine
 	 * @return SearchIndexField[] List of fields this content handler can provide.
 	 * @since 1.28
 	 */
 	public function getFieldsForSearchIndex( SearchEngine $engine ) {
-		/* Default fields:
-		/*
-		 * namespace
-		 * namespace_text
-		 * redirect
-		 * source_text
-		 * suggest
-		 * timestamp
-		 * title
-		 * text
-		 * text_bytes
-		 */
-		return [];
+		$fields['category'] = $engine->makeSearchFieldMapping(
+			'category',
+			SearchIndexField::INDEX_TYPE_TEXT
+		);
+
+		$fields['category']->setFlag( SearchIndexField::FLAG_CASEFOLD );
+
+		$fields['external_link'] = $engine->makeSearchFieldMapping(
+			'external_link',
+			SearchIndexField::INDEX_TYPE_KEYWORD
+		);
+
+		$fields['outgoing_link'] = $engine->makeSearchFieldMapping(
+			'outgoing_link',
+			SearchIndexField::INDEX_TYPE_KEYWORD
+		);
+
+		$fields['template'] = $engine->makeSearchFieldMapping(
+			'template',
+			SearchIndexField::INDEX_TYPE_KEYWORD
+		);
+
+		$fields['template']->setFlag( SearchIndexField::FLAG_CASEFOLD );
+
+		return $fields;
 	}
 
 	/**
@@ -1298,16 +1274,26 @@ abstract class ContentHandler {
 	 */
 	public function getDataForSearchIndex( WikiPage $page, ParserOutput $output,
 	                                       SearchEngine $engine ) {
-		$fields = [];
+		$fieldData = [];
 		$content = $page->getContent();
+
 		if ( $content ) {
+			$searchDataExtractor = new ParserOutputSearchDataExtractor();
+
+			$fieldData['category'] = $searchDataExtractor->getCategories( $output );
+			$fieldData['external_link'] = $searchDataExtractor->getExternalLinks( $output );
+			$fieldData['outgoing_link'] = $searchDataExtractor->getOutgoingLinks( $output );
+			$fieldData['template'] = $searchDataExtractor->getTemplates( $output );
+
 			$text = $content->getTextForSearchIndex();
-			$fields['text'] = $text;
-			$fields['source_text'] = $text;
-			$fields['text_bytes'] = $content->getSize();
+
+			$fieldData['text'] = $text;
+			$fieldData['source_text'] = $text;
+			$fieldData['text_bytes'] = $content->getSize();
 		}
-		Hooks::run( 'SearchDataForIndex', [ &$fields, $this, $page, $output, $engine ] );
-		return $fields;
+
+		Hooks::run( 'SearchDataForIndex', [ &$fieldData, $this, $page, $output, $engine ] );
+		return $fieldData;
 	}
 
 	/**
diff --git a/includes/content/JsonContent.php b/includes/content/JsonContent.php
index 40d9277470..14c81823cf 100644
--- a/includes/content/JsonContent.php
+++ b/includes/content/JsonContent.php
@@ -86,7 +86,7 @@ class JsonContent extends TextContent {
 			return $this;
 		}
 
-		return new static( $this->beautifyJSON() );
+		return new static( self::normalizeLineEndings( $this->beautifyJSON() ) );
 	}
 
 	/**
diff --git a/includes/content/TextContent.php b/includes/content/TextContent.php
index 225522e92d..7bb4def2a6 100644
--- a/includes/content/TextContent.php
+++ b/includes/content/TextContent.php
@@ -147,9 +147,28 @@ class TextContent extends AbstractContent {
 		}
 	}
 
+	/**
+	 * Do a "\r\n" -> "\n" and "\r" -> "\n" transformation
+	 * as well as trim trailing whitespace
+	 *
+	 * This was formerly part of Parser::preSaveTransform, but
+	 * for non-wikitext content models they probably still want
+	 * to normalize line endings without all of the other PST
+	 * changes.
+	 *
+	 * @since 1.28
+	 * @param $text
+	 * @return string
+	 */
+	public static function normalizeLineEndings( $text ) {
+		return str_replace( [ "\r\n", "\r" ], "\n", rtrim( $text ) );
+	}
+
 	/**
 	 * Returns a Content object with pre-save transformations applied.
-	 * This implementation just trims trailing whitespace.
+	 *
+	 * At a minimum, subclasses should make sure to call TextContent::normalizeLineEndings()
+	 * either directly or part of Parser::preSaveTransform().
 	 *
 	 * @param Title $title
 	 * @param User $user
@@ -159,7 +178,7 @@ class TextContent extends AbstractContent {
 	 */
 	public function preSaveTransform( Title $title, User $user, ParserOptions $popts ) {
 		$text = $this->getNativeData();
-		$pst = rtrim( $text );
+		$pst = self::normalizeLineEndings( $text );
 
 		return ( $text === $pst ) ? $this : new static( $pst, $this->getModel() );
 	}
diff --git a/includes/content/TextContentHandler.php b/includes/content/TextContentHandler.php
index 74cbd16965..09cdcee143 100644
--- a/includes/content/TextContentHandler.php
+++ b/includes/content/TextContentHandler.php
@@ -143,9 +143,10 @@ class TextContentHandler extends ContentHandler {
 	}
 
 	public function getFieldsForSearchIndex( SearchEngine $engine ) {
-		$fields = [];
+		$fields = parent::getFieldsForSearchIndex( $engine );
 		$fields['language'] =
 			$engine->makeSearchFieldMapping( 'language', SearchIndexField::INDEX_TYPE_KEYWORD );
+
 		return $fields;
 	}
 
diff --git a/includes/content/WikiTextStructure.php b/includes/content/WikiTextStructure.php
index e83c213c0e..9768d3666e 100644
--- a/includes/content/WikiTextStructure.php
+++ b/includes/content/WikiTextStructure.php
@@ -58,50 +58,6 @@ class WikiTextStructure {
 		$this->parserOutput = $parserOutput;
 	}
 
-	/**
-	 * Get categories in the text.
-	 * @return string[]
-	 */
-	public function categories() {
-		$categories = [];
-		foreach ( array_keys( $this->parserOutput->getCategories() ) as $key ) {
-			$categories[] = Category::newFromName( $key )->getTitle()->getText();
-		}
-		return $categories;
-	}
-
-	/**
-	 * Get outgoing links.
-	 * @return string[]
-	 */
-	public function outgoingLinks() {
-		$outgoingLinks = [];
-		foreach ( $this->parserOutput->getLinks() as $linkedNamespace => $namespaceLinks ) {
-			foreach ( array_keys( $namespaceLinks ) as $linkedDbKey ) {
-				$outgoingLinks[] =
-					Title::makeTitle( $linkedNamespace, $linkedDbKey )->getPrefixedDBkey();
-			}
-		}
-		return $outgoingLinks;
-	}
-
-	/**
-	 * Get templates in the text.
-	 * @return string[]
-	 */
-	public function templates() {
-		$templates = [];
-		foreach ( $this->parserOutput->getTemplates() as $tNS => $templatesInNS ) {
-			foreach ( array_keys( $templatesInNS ) as $tDbKey ) {
-				$templateTitle = Title::makeTitleSafe( $tNS, $tDbKey );
-				if ( $templateTitle && $templateTitle->exists() ) {
-					$templates[] = $templateTitle->getPrefixedText();
-				}
-			}
-		}
-		return $templates;
-	}
-
 	/**
 	 * Get headings on the page.
 	 * @return string[]
diff --git a/includes/content/WikitextContent.php b/includes/content/WikitextContent.php
index a63819dd42..92967282c4 100644
--- a/includes/content/WikitextContent.php
+++ b/includes/content/WikitextContent.php
@@ -138,7 +138,6 @@ class WikitextContent extends TextContent {
 
 		$text = $this->getNativeData();
 		$pst = $wgParser->preSaveTransform( $text, $title, $user, $popts );
-		rtrim( $pst );
 
 		return ( $text === $pst ) ? $this : new static( $pst );
 	}
diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php
index d9f1e8639d..1c46d28806 100644
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -109,14 +109,7 @@ class WikitextContentHandler extends TextContentHandler {
 	}
 
 	public function getFieldsForSearchIndex( SearchEngine $engine ) {
-		$fields = [];
-
-		$fields['category'] =
-			$engine->makeSearchFieldMapping( 'category', SearchIndexField::INDEX_TYPE_TEXT );
-		$fields['category']->setFlag( SearchIndexField::FLAG_CASEFOLD );
-
-		$fields['external_link'] =
-			$engine->makeSearchFieldMapping( 'external_link', SearchIndexField::INDEX_TYPE_KEYWORD );
+		$fields = parent::getFieldsForSearchIndex( $engine );
 
 		$fields['heading'] =
 			$engine->makeSearchFieldMapping( 'heading', SearchIndexField::INDEX_TYPE_TEXT );
@@ -130,13 +123,6 @@ class WikitextContentHandler extends TextContentHandler {
 		$fields['opening_text']->setFlag( SearchIndexField::FLAG_SCORING |
 		                                  SearchIndexField::FLAG_NO_HIGHLIGHT );
 
-		$fields['outgoing_link'] =
-			$engine->makeSearchFieldMapping( 'outgoing_link', SearchIndexField::INDEX_TYPE_KEYWORD );
-
-		$fields['template'] =
-			$engine->makeSearchFieldMapping( 'template', SearchIndexField::INDEX_TYPE_KEYWORD );
-		$fields['template']->setFlag( SearchIndexField::FLAG_CASEFOLD );
-
 		// FIXME: this really belongs in separate file handler but files
 		// do not have separate handler. Sadness.
 		$fields['file_text'] =
@@ -154,7 +140,11 @@ class WikitextContentHandler extends TextContentHandler {
 	protected function getFileText( Title $title ) {
 		$file = wfLocalFile( $title );
 		if ( $file && $file->exists() ) {
-			return $file->getHandler()->getEntireText( $file );
+			$handler = $file->getHandler();
+			if ( !$handler ) {
+				return null;
+			}
+			return $handler->getEntireText( $file );
 		}
 
 		return null;
@@ -165,11 +155,7 @@ class WikitextContentHandler extends TextContentHandler {
 		$fields = parent::getDataForSearchIndex( $page, $parserOutput, $engine );
 
 		$structure = new WikiTextStructure( $parserOutput );
-		$fields['external_link'] = array_keys( $parserOutput->getExternalLinks() );
-		$fields['category'] = $structure->categories();
 		$fields['heading'] = $structure->headings();
-		$fields['outgoing_link'] = $structure->outgoingLinks();
-		$fields['template'] = $structure->templates();
 		// text fields
 		$fields['opening_text'] = $structure->getOpeningText();
 		$fields['text'] = $structure->getMainText(); // overwrites one from ContentHandler
diff --git a/includes/db/CloneDatabase.php b/includes/db/CloneDatabase.php
index 3cd09e257f..577c98dc72 100644
--- a/includes/db/CloneDatabase.php
+++ b/includes/db/CloneDatabase.php
@@ -129,25 +129,11 @@ class CloneDatabase {
 	 */
 	public static function changePrefix( $prefix ) {
 		global $wgDBprefix;
-		wfGetLBFactory()->forEachLB( [ 'CloneDatabase', 'changeLBPrefix' ], [ $prefix ] );
+		wfGetLBFactory()->forEachLB( function( $lb ) use ( $prefix ) {
+			$lb->forEachOpenConnection( function ( $db ) use ( $prefix ) {
+				$db->tablePrefix( $prefix );
+			} );
+		} );
 		$wgDBprefix = $prefix;
 	}
-
-	/**
-	 * @param LoadBalancer $lb
-	 * @param string $prefix
-	 * @return void
-	 */
-	public static function changeLBPrefix( $lb, $prefix ) {
-		$lb->forEachOpenConnection( [ 'CloneDatabase', 'changeDBPrefix' ], [ $prefix ] );
-	}
-
-	/**
-	 * @param DatabaseBase $db
-	 * @param string $prefix
-	 * @return void
-	 */
-	public static function changeDBPrefix( $db, $prefix ) {
-		$db->tablePrefix( $prefix );
-	}
 }
diff --git a/includes/db/DBConnRef.php b/includes/db/DBConnRef.php
index 53862b96da..e5b6d050d8 100644
--- a/includes/db/DBConnRef.php
+++ b/includes/db/DBConnRef.php
@@ -55,6 +55,10 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
+	public function explicitTrxActive() {
+		return $this->__call( __FUNCTION__, func_get_args() );
+	}
+
 	public function tablePrefix( $prefix = null ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
@@ -445,7 +449,7 @@ class DBConnRef implements IDatabase {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
-	public function begin( $fname = __METHOD__ ) {
+	public function begin( $fname = __METHOD__, $mode = IDatabase::TRANSACTION_EXPLICIT ) {
 		return $this->__call( __FUNCTION__, func_get_args() );
 	}
 
diff --git a/includes/db/Database.php b/includes/db/Database.php
index 5023acd868..6ddc9f7a41 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -32,24 +32,35 @@
 abstract class DatabaseBase implements IDatabase {
 	/** Number of times to re-try an operation in case of deadlock */
 	const DEADLOCK_TRIES = 4;
-
 	/** Minimum time to wait before retry, in microseconds */
 	const DEADLOCK_DELAY_MIN = 500000;
-
 	/** Maximum time to wait before retry */
 	const DEADLOCK_DELAY_MAX = 1500000;
 
+	/** How long before it is worth doing a dummy query to test the connection */
+	const PING_TTL = 1.0;
+
+	/** @var string SQL query */
 	protected $mLastQuery = '';
+	/** @var bool */
 	protected $mDoneWrites = false;
+	/** @var string|bool */
 	protected $mPHPError = false;
-
-	protected $mServer, $mUser, $mPassword, $mDBname;
+	/** @var string */
+	protected $mServer;
+	/** @var string */
+	protected $mUser;
+	/** @var string */
+	protected $mPassword;
+	/** @var string */
+	protected $mDBname;
 
 	/** @var BagOStuff APC cache */
 	protected $srvCache;
 
 	/** @var resource Database connection */
 	protected $mConn = null;
+	/** @var bool */
 	protected $mOpened = false;
 
 	/** @var array[] List of (callable, method name) */
@@ -61,20 +72,27 @@ abstract class DatabaseBase implements IDatabase {
 	/** @var bool Whether to suppress triggering of post-commit callbacks */
 	protected $suppressPostCommitCallbacks = false;
 
+	/** @var string */
 	protected $mTablePrefix;
+	/** @var string */
 	protected $mSchema;
+	/** @var integer */
 	protected $mFlags;
+	/** @var bool */
 	protected $mForeign;
+	/** @var array */
 	protected $mLBInfo = [];
+	/** @var bool|null */
 	protected $mDefaultBigSelects = null;
+	/** @var array|bool */
 	protected $mSchemaVars = false;
 	/** @var array */
 	protected $mSessionVars = [];
-
+	/** @var array|null */
 	protected $preparedArgs;
-
+	/** @var string|bool|null Stashed value of html_errors INI setting */
 	protected $htmlErrors;
-
+	/** @var string */
 	protected $delimiter = ';';
 
 	/**
@@ -177,6 +195,9 @@ abstract class DatabaseBase implements IDatabase {
 	 */
 	protected $allViews = null;
 
+	/** @var float UNIX timestamp */
+	protected $lastPing = 0.0;
+
 	/** @var TransactionProfiler */
 	protected $trxProfiler;
 
@@ -703,7 +724,7 @@ abstract class DatabaseBase implements IDatabase {
 						" performing implicit commit before closing connection!" );
 				}
 
-				$this->commit( __METHOD__, 'flush' );
+				$this->commit( __METHOD__, self::FLUSHING_INTERNAL );
 			}
 
 			$closed = $this->closeConnection();
@@ -786,8 +807,8 @@ abstract class DatabaseBase implements IDatabase {
 		$priorWritesPending = $this->writesOrCallbacksPending();
 		$this->mLastQuery = $sql;
 
-		$isWriteQuery = $this->isWriteQuery( $sql );
-		if ( $isWriteQuery ) {
+		$isWrite = $this->isWriteQuery( $sql );
+		if ( $isWrite ) {
 			$reason = $this->getReadOnlyReason();
 			if ( $reason !== false ) {
 				throw new DBReadOnlyError( $this, "Database is read-only: $reason" );
@@ -815,54 +836,26 @@ abstract class DatabaseBase implements IDatabase {
 		if ( !$this->mTrxLevel && $this->getFlag( DBO_TRX )
 			&& $this->isTransactableQuery( $sql )
 		) {
-			$this->begin( __METHOD__ . " ($fname)" );
+			$this->begin( __METHOD__ . " ($fname)", self::TRANSACTION_INTERNAL );
 			$this->mTrxAutomatic = true;
 		}
 
 		# Keep track of whether the transaction has write queries pending
-		if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $isWriteQuery ) {
+		if ( $this->mTrxLevel && !$this->mTrxDoneWrites && $isWrite ) {
 			$this->mTrxDoneWrites = true;
 			$this->getTransactionProfiler()->transactionWritingIn(
 				$this->mServer, $this->mDBname, $this->mTrxShortId );
 		}
 
-		$isMaster = !is_null( $this->getLBInfo( 'master' ) );
-		# generalizeSQL will probably cut down the query to reasonable
-		# logging size most of the time. The substr is really just a sanity check.
-		if ( $isMaster ) {
-			$queryProf = 'query-m: ' . substr( DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-			$totalProf = 'DatabaseBase::query-master';
-		} else {
-			$queryProf = 'query: ' . substr( DatabaseBase::generalizeSQL( $sql ), 0, 255 );
-			$totalProf = 'DatabaseBase::query';
-		}
-		# Include query transaction state
-		$queryProf .= $this->mTrxShortId ? " [TRX#{$this->mTrxShortId}]" : "";
-
-		$profiler = Profiler::instance();
-		if ( !$profiler instanceof ProfilerStub ) {
-			$totalProfSection = $profiler->scopedProfileIn( $totalProf );
-			$queryProfSection = $profiler->scopedProfileIn( $queryProf );
-		}
-
 		if ( $this->debug() ) {
 			wfDebugLog( 'queries', sprintf( "%s: %s", $this->mDBname, $commentedSql ) );
 		}
 
-		$queryId = MWDebug::query( $sql, $fname, $isMaster );
-
 		# Avoid fatals if close() was called
 		$this->assertOpen();
 
-		# Do the query and handle errors
-		$startTime = microtime( true );
-		$ret = $this->doQuery( $commentedSql );
-		$queryRuntime = microtime( true ) - $startTime;
-		# Log the query time and feed it into the DB trx profiler
-		$this->getTransactionProfiler()->recordQueryCompletion(
-			$queryProf, $startTime, $isWriteQuery, $this->affectedRows() );
-
-		MWDebug::queryTime( $queryId );
+		# Send the query to the server
+		$ret = $this->doProfiledQuery( $sql, $commentedSql, $isWrite, $fname );
 
 		# Try reconnecting if the connection was lost
 		if ( false === $ret && $this->wasErrorReissuable() ) {
@@ -883,12 +876,7 @@ abstract class DatabaseBase implements IDatabase {
 					$this->reportQueryError( $lastError, $lastErrno, $sql, $fname );
 				} else {
 					# Should be safe to silently retry the query
-					$startTime = microtime( true );
-					$ret = $this->doQuery( $commentedSql );
-					$queryRuntime = microtime( true ) - $startTime;
-					# Log the query time and feed it into the DB trx profiler
-					$this->getTransactionProfiler()->recordQueryCompletion(
-						$queryProf, $startTime, $isWriteQuery, $this->affectedRows() );
+					$ret = $this->doProfiledQuery( $sql, $commentedSql, $isWrite, $fname );
 				}
 			} else {
 				wfDebug( "Failed\n" );
@@ -913,16 +901,47 @@ abstract class DatabaseBase implements IDatabase {
 
 		$res = $this->resultObject( $ret );
 
-		// Destroy profile sections in the opposite order to their creation
-		ScopedCallback::consume( $queryProfSection );
-		ScopedCallback::consume( $totalProfSection );
+		return $res;
+	}
 
-		if ( $isWriteQuery && $this->mTrxLevel ) {
-			$this->mTrxWriteDuration += $queryRuntime;
-			$this->mTrxWriteCallers[] = $fname;
+	private function doProfiledQuery( $sql, $commentedSql, $isWrite, $fname ) {
+		$isMaster = !is_null( $this->getLBInfo( 'master' ) );
+		# generalizeSQL() will probably cut down the query to reasonable
+		# logging size most of the time. The substr is really just a sanity check.
+		if ( $isMaster ) {
+			$queryProf = 'query-m: ' . substr( DatabaseBase::generalizeSQL( $sql ), 0, 255 );
+		} else {
+			$queryProf = 'query: ' . substr( DatabaseBase::generalizeSQL( $sql ), 0, 255 );
 		}
 
-		return $res;
+		# Include query transaction state
+		$queryProf .= $this->mTrxShortId ? " [TRX#{$this->mTrxShortId}]" : "";
+
+		$profiler = Profiler::instance();
+		if ( !( $profiler instanceof ProfilerStub ) ) {
+			$queryProfSection = $profiler->scopedProfileIn( $queryProf );
+		}
+
+		$startTime = microtime( true );
+		$ret = $this->doQuery( $commentedSql );
+		$queryRuntime = microtime( true ) - $startTime;
+
+		unset( $queryProfSection ); // profile out (if set)
+
+		if ( $ret !== false ) {
+			$this->lastPing = $startTime;
+			if ( $isWrite && $this->mTrxLevel ) {
+				$this->mTrxWriteDuration += $queryRuntime;
+				$this->mTrxWriteCallers[] = $fname;
+			}
+		}
+
+		$this->getTransactionProfiler()->recordQueryCompletion(
+			$queryProf, $startTime, $isWrite, $this->affectedRows()
+		);
+		MWDebug::query( $sql, $fname, $isMaster, $queryRuntime );
+
+		return $ret;
 	}
 
 	private function canRecoverFromDisconnect( $sql, $priorWritesPending ) {
@@ -2203,7 +2222,7 @@ abstract class DatabaseBase implements IDatabase {
 
 		$useTrx = !$this->mTrxLevel;
 		if ( $useTrx ) {
-			$this->begin( $fname );
+			$this->begin( $fname, self::TRANSACTION_INTERNAL );
 		}
 		try {
 			# Update any existing conflicting row(s)
@@ -2221,7 +2240,7 @@ abstract class DatabaseBase implements IDatabase {
 			throw $e;
 		}
 		if ( $useTrx ) {
-			$this->commit( $fname );
+			$this->commit( $fname, self::TRANSACTION_INTERNAL );
 		}
 
 		return $ok;
@@ -2520,7 +2539,7 @@ abstract class DatabaseBase implements IDatabase {
 			$this->mTrxPreCommitCallbacks[] = [ $callback, wfGetCaller() ];
 		} else {
 			// If no transaction is active, then make one for this callback
-			$this->begin( __METHOD__ );
+			$this->begin( __METHOD__, self::TRANSACTION_INTERNAL );
 			try {
 				call_user_func( $callback );
 				$this->commit( __METHOD__ );
@@ -2559,7 +2578,7 @@ abstract class DatabaseBase implements IDatabase {
 
 		$autoTrx = $this->getFlag( DBO_TRX ); // automatic begin() enabled?
 		/** @var Exception $e */
-		$e = $ePrior = null; // last exception
+		$e = null; // first exception
 		do { // callbacks may add callbacks :)
 			$callbacks = array_merge(
 				$this->mTrxIdleCallbacks,
@@ -2577,11 +2596,9 @@ abstract class DatabaseBase implements IDatabase {
 					} else {
 						$this->clearFlag( DBO_TRX ); // restore auto-commit
 					}
-				} catch ( Exception $e ) {
-					if ( $ePrior ) {
-						MWExceptionHandler::logException( $ePrior );
-					}
-					$ePrior = $e;
+				} catch ( Exception $ex ) {
+					MWExceptionHandler::logException( $ex );
+					$e = $e ?: $ex;
 					// Some callbacks may use startAtomic/endAtomic, so make sure
 					// their transactions are ended so other callbacks don't fail
 					if ( $this->trxLevel() ) {
@@ -2592,7 +2609,7 @@ abstract class DatabaseBase implements IDatabase {
 		} while ( count( $this->mTrxIdleCallbacks ) );
 
 		if ( $e instanceof Exception ) {
-			throw $e; // re-throw any last exception
+			throw $e; // re-throw any first exception
 		}
 	}
 
@@ -2602,9 +2619,10 @@ abstract class DatabaseBase implements IDatabase {
 	 * This method should not be used outside of Database/LoadBalancer
 	 *
 	 * @since 1.22
+	 * @throws Exception
 	 */
 	public function runOnTransactionPreCommitCallbacks() {
-		$e = $ePrior = null; // last exception
+		$e = null; // first exception
 		do { // callbacks may add callbacks :)
 			$callbacks = $this->mTrxPreCommitCallbacks;
 			$this->mTrxPreCommitCallbacks = []; // consumed (and recursion guard)
@@ -2612,23 +2630,21 @@ abstract class DatabaseBase implements IDatabase {
 				try {
 					list( $phpCallback ) = $callback;
 					call_user_func( $phpCallback );
-				} catch ( Exception $e ) {
-					if ( $ePrior ) {
-						MWExceptionHandler::logException( $ePrior );
-					}
-					$ePrior = $e;
+				} catch ( Exception $ex ) {
+					MWExceptionHandler::logException( $ex );
+					$e = $e ?: $ex;
 				}
 			}
 		} while ( count( $this->mTrxPreCommitCallbacks ) );
 
 		if ( $e instanceof Exception ) {
-			throw $e; // re-throw any last exception
+			throw $e; // re-throw any first exception
 		}
 	}
 
 	final public function startAtomic( $fname = __METHOD__ ) {
 		if ( !$this->mTrxLevel ) {
-			$this->begin( $fname );
+			$this->begin( $fname, self::TRANSACTION_INTERNAL );
 			$this->mTrxAutomatic = true;
 			// If DBO_TRX is set, a series of startAtomic/endAtomic pairs will result
 			// in all changes being in one transaction to keep requests transactional.
@@ -2651,58 +2667,43 @@ abstract class DatabaseBase implements IDatabase {
 		}
 
 		if ( !$this->mTrxAtomicLevels && $this->mTrxAutomaticAtomic ) {
-			$this->commit( $fname, 'flush' );
+			$this->commit( $fname, self::FLUSHING_INTERNAL );
 		}
 	}
 
 	final public function doAtomicSection( $fname, callable $callback ) {
 		$this->startAtomic( $fname );
 		try {
-			call_user_func_array( $callback, [ $this, $fname ] );
+			$res = call_user_func_array( $callback, [ $this, $fname ] );
 		} catch ( Exception $e ) {
 			$this->rollback( $fname );
 			throw $e;
 		}
 		$this->endAtomic( $fname );
+
+		return $res;
 	}
 
-	final public function begin( $fname = __METHOD__ ) {
-		if ( $this->mTrxLevel ) { // implicit commit
+	final public function begin( $fname = __METHOD__, $mode = self::TRANSACTION_EXPLICIT ) {
+		// Protect against mismatched atomic section, transaction nesting, and snapshot loss
+		if ( $this->mTrxLevel ) {
 			if ( $this->mTrxAtomicLevels ) {
-				// If the current transaction was an automatic atomic one, then we definitely have
-				// a problem. Same if there is any unclosed atomic level.
 				$levels = implode( ', ', $this->mTrxAtomicLevels );
-				throw new DBUnexpectedError(
-					$this,
-					"Got explicit BEGIN from $fname while atomic section(s) $levels are open."
-				);
+				$msg = "$fname: Got explicit BEGIN while atomic section(s) $levels are open.";
+				throw new DBUnexpectedError( $this, $msg );
 			} elseif ( !$this->mTrxAutomatic ) {
-				// We want to warn about inadvertently nested begin/commit pairs, but not about
-				// auto-committing implicit transactions that were started by query() via DBO_TRX
-				throw new DBUnexpectedError(
-					$this,
-					"$fname: Transaction already in progress (from {$this->mTrxFname}), " .
-						" performing implicit commit!"
-				);
-			} elseif ( $this->mTrxDoneWrites ) {
-				// The transaction was automatic and has done write operations
-				throw new DBUnexpectedError(
-					$this,
-					"$fname: Automatic transaction with writes in progress" .
-						" (from {$this->mTrxFname}), performing implicit commit!\n"
-				);
-			}
-
-			$this->runOnTransactionPreCommitCallbacks();
-			$writeTime = $this->pendingWriteQueryDuration();
-			$this->doCommit( $fname );
-			if ( $this->mTrxDoneWrites ) {
-				$this->mDoneWrites = microtime( true );
-				$this->getTransactionProfiler()->transactionWritingOut(
-					$this->mServer, $this->mDBname, $this->mTrxShortId, $writeTime );
+				$msg = "$fname: Explicit transaction already active (from {$this->mTrxFname}).";
+				throw new DBUnexpectedError( $this, $msg );
+			} else {
+				// @TODO: make this an exception at some point
+				$msg = "$fname: Implicit transaction already active (from {$this->mTrxFname}).";
+				wfLogDBError( $msg );
+				return; // join the main transaction set
 			}
-
-			$this->runOnTransactionIdleCallbacks( self::TRIGGER_COMMIT );
+		} elseif ( $this->getFlag( DBO_TRX ) && $mode !== self::TRANSACTION_INTERNAL ) {
+			// @TODO: make this an exception at some point
+			wfLogDBError( "$fname: Implicit transaction expected (DBO_TRX set)." );
+			return; // let any writes be in the main transaction
 		}
 
 		// Avoid fatals if close() was called
@@ -2742,28 +2743,27 @@ abstract class DatabaseBase implements IDatabase {
 			$levels = implode( ', ', $this->mTrxAtomicLevels );
 			throw new DBUnexpectedError(
 				$this,
-				"Got COMMIT while atomic sections $levels are still open"
+				"$fname: Got COMMIT while atomic sections $levels are still open."
 			);
 		}
 
-		if ( $flush === 'flush' ) {
+		if ( $flush === self::FLUSHING_INTERNAL || $flush === self::FLUSHING_ALL_PEERS ) {
 			if ( !$this->mTrxLevel ) {
 				return; // nothing to do
 			} elseif ( !$this->mTrxAutomatic ) {
 				throw new DBUnexpectedError(
 					$this,
-					"$fname: Flushing an explicit transaction, getting out of sync!"
+					"$fname: Flushing an explicit transaction, getting out of sync."
 				);
 			}
 		} else {
 			if ( !$this->mTrxLevel ) {
-				wfWarn( "$fname: No transaction to commit, something got out of sync!" );
+				wfWarn( "$fname: No transaction to commit, something got out of sync." );
 				return; // nothing to do
 			} elseif ( $this->mTrxAutomatic ) {
-				throw new DBUnexpectedError(
-					$this,
-					"$fname: Explicit commit of implicit transaction."
-				);
+				// @TODO: make this an exception at some point
+				wfLogDBError( "$fname: Explicit commit of implicit transaction." );
+				return; // wait for the main transaction set commit round
 			}
 		}
 
@@ -2796,14 +2796,19 @@ abstract class DatabaseBase implements IDatabase {
 	}
 
 	final public function rollback( $fname = __METHOD__, $flush = '' ) {
-		if ( $flush !== 'flush' ) {
+		if ( $flush === self::FLUSHING_INTERNAL || $flush === self::FLUSHING_ALL_PEERS ) {
 			if ( !$this->mTrxLevel ) {
-				wfWarn( "$fname: No transaction to rollback, something got out of sync!" );
 				return; // nothing to do
 			}
 		} else {
 			if ( !$this->mTrxLevel ) {
+				wfWarn( "$fname: No transaction to rollback, something got out of sync." );
 				return; // nothing to do
+			} elseif ( $this->getFlag( DBO_TRX ) ) {
+				throw new DBUnexpectedError(
+					$this,
+					"$fname: Expected mass rollback of all peer databases (DBO_TRX set)."
+				);
 			}
 		}
 
@@ -2837,10 +2842,7 @@ abstract class DatabaseBase implements IDatabase {
 		}
 	}
 
-	/**
-	 * @return bool
-	 */
-	protected function explicitTrxActive() {
+	public function explicitTrxActive() {
 		return $this->mTrxLevel && ( $this->mTrxAtomicLevels || !$this->mTrxAutomatic );
 	}
 
@@ -2945,6 +2947,9 @@ abstract class DatabaseBase implements IDatabase {
 	}
 
 	public function ping() {
+		if ( $this->isOpen() && ( microtime( true ) - $this->lastPing ) < self::PING_TTL ) {
+			return true;
+		}
 		try {
 			// This will reconnect if possible, or error out if not
 			$this->query( "SELECT 1 AS ping", __METHOD__ );
@@ -2958,8 +2963,18 @@ abstract class DatabaseBase implements IDatabase {
 	 * @return bool
 	 */
 	protected function reconnect() {
-		# Stub. Not essential to override.
-		return true;
+		$this->closeConnection();
+		$this->mOpened = false;
+		$this->mConn = false;
+		try {
+			$this->open( $this->mServer, $this->mUser, $this->mPassword, $this->mDBname );
+			$this->lastPing = microtime( true );
+			$ok = true;
+		} catch ( DBConnectionError $e ) {
+			$ok = false;
+		}
+
+		return $ok;
 	}
 
 	public function getSessionLagStatus() {
@@ -3297,16 +3312,32 @@ abstract class DatabaseBase implements IDatabase {
 	}
 
 	public function getScopedLockAndFlush( $lockKey, $fname, $timeout ) {
+		if ( $this->writesOrCallbacksPending() ) {
+			// This only flushes transactions to clear snapshots, not to write data
+			throw new DBUnexpectedError(
+				$this,
+				"$fname: Cannot COMMIT to clear snapshot because writes are pending."
+			);
+		}
+
 		if ( !$this->lock( $lockKey, $fname, $timeout ) ) {
 			return null;
 		}
 
 		$unlocker = new ScopedCallback( function () use ( $lockKey, $fname ) {
-			$this->commit( __METHOD__, 'flush' );
-			$this->unlock( $lockKey, $fname );
+			if ( $this->trxLevel() ) {
+				// There is a good chance an exception was thrown, causing any early return
+				// from the caller. Let any error handler get a chance to issue rollback().
+				// If there isn't one, let the error bubble up and trigger server-side rollback.
+				$this->onTransactionResolution( function () use ( $lockKey, $fname ) {
+					$this->unlock( $lockKey, $fname );
+				} );
+			} else {
+				$this->unlock( $lockKey, $fname );
+			}
 		} );
 
-		$this->commit( __METHOD__, 'flush' );
+		$this->commit( __METHOD__, self::FLUSHING_INTERNAL );
 
 		return $unlocker;
 	}
diff --git a/includes/db/DatabaseMysqlBase.php b/includes/db/DatabaseMysqlBase.php
index 6380fe7654..fa3756cf2d 100644
--- a/includes/db/DatabaseMysqlBase.php
+++ b/includes/db/DatabaseMysqlBase.php
@@ -599,15 +599,6 @@ abstract class DatabaseMysqlBase extends Database {
 		return strlen( $name ) && $name[0] == '`' && substr( $name, -1, 1 ) == '`';
 	}
 
-	function reconnect() {
-		$this->closeConnection();
-		$this->mOpened = false;
-		$this->mConn = false;
-		$this->open( $this->mServer, $this->mUser, $this->mPassword, $this->mDBname );
-
-		return true;
-	}
-
 	function getLag() {
 		if ( $this->getLagDetectionMethod() === 'pt-heartbeat' ) {
 			return $this->getLagFromPtHeartbeat();
@@ -767,9 +758,6 @@ abstract class DatabaseMysqlBase extends Database {
 			return 0; // already reached this point for sure
 		}
 
-		// Commit any open transactions
-		$this->commit( __METHOD__, 'flush' );
-
 		// Call doQuery() directly, to avoid opening a transaction if DBO_TRX is set
 		if ( $this->useGTIDs && $pos->gtids ) {
 			// Wait on the GTID set (MariaDB only)
diff --git a/includes/db/DatabasePostgres.php b/includes/db/DatabasePostgres.php
index 867aeb8705..1ecdd26088 100644
--- a/includes/db/DatabasePostgres.php
+++ b/includes/db/DatabasePostgres.php
@@ -149,7 +149,7 @@ class SavepointPostgres {
 		$this->didbegin = false;
 		/* If we are not in a transaction, we need to be for savepoint trickery */
 		if ( !$dbw->trxLevel() ) {
-			$dbw->begin( "FOR SAVEPOINT" );
+			$dbw->begin( "FOR SAVEPOINT", DatabasePostgres::TRANSACTION_INTERNAL );
 			$this->didbegin = true;
 		}
 	}
@@ -1207,7 +1207,7 @@ __INDEXATTR__;
 	 * @param string $desiredSchema
 	 */
 	function determineCoreSchema( $desiredSchema ) {
-		$this->begin( __METHOD__ );
+		$this->begin( __METHOD__, self::TRANSACTION_INTERNAL );
 		if ( $this->schemaExists( $desiredSchema ) ) {
 			if ( in_array( $desiredSchema, $this->getSchemas() ) ) {
 				$this->mCoreSchema = $desiredSchema;
diff --git a/includes/db/DatabaseSqlite.php b/includes/db/DatabaseSqlite.php
index 9d0a0f7124..5bbba886e1 100644
--- a/includes/db/DatabaseSqlite.php
+++ b/includes/db/DatabaseSqlite.php
@@ -911,7 +911,7 @@ class DatabaseSqlite extends Database {
 	public function lock( $lockName, $method, $timeout = 5 ) {
 		if ( !is_dir( "{$this->dbDir}/locks" ) ) { // create dir as needed
 			if ( !is_writable( $this->dbDir ) || !mkdir( "{$this->dbDir}/locks" ) ) {
-				throw new DBError( "Cannot create directory \"{$this->dbDir}/locks\"." );
+				throw new DBError( $this, "Cannot create directory \"{$this->dbDir}/locks\"." );
 			}
 		}
 
diff --git a/includes/db/IDatabase.php b/includes/db/IDatabase.php
index 43592e2743..25100db0dc 100644
--- a/includes/db/IDatabase.php
+++ b/includes/db/IDatabase.php
@@ -33,11 +33,23 @@
  * @ingroup Database
  */
 interface IDatabase {
-	/* Constants to onTransactionResolution() callbacks */
+	/** @var int Callback triggered immediately due to no active transaction */
 	const TRIGGER_IDLE = 1;
+	/** @var int Callback triggered by commit */
 	const TRIGGER_COMMIT = 2;
+	/** @var int Callback triggered by rollback */
 	const TRIGGER_ROLLBACK = 3;
 
+	/** @var string Transaction is requested by regular caller outside of the DB layer */
+	const TRANSACTION_EXPLICIT = '';
+	/** @var string Transaction is requested interally via DBO_TRX/startAtomic() */
+	const TRANSACTION_INTERNAL = 'implicit';
+
+	/** @var string Transaction operation comes from service managing all DBs */
+	const FLUSHING_ALL_PEERS = 'flush';
+	/** @var string Transaction operation comes from the database class internally */
+	const FLUSHING_INTERNAL = 'flush';
+
 	/**
 	 * A string describing the current software version, and possibly
 	 * other details in a user-friendly way. Will be listed on Special:Version, etc.
@@ -91,6 +103,12 @@ interface IDatabase {
 	 */
 	public function trxTimestamp();
 
+	/**
+	 * @return bool Whether an explicit transaction or atomic sections are still open
+	 * @since 1.28
+	 */
+	public function explicitTrxActive();
+
 	/**
 	 * Get/set the table prefix.
 	 * @param string $prefix The table prefix to set, or omitted to leave it unchanged.
@@ -1335,6 +1353,7 @@ interface IDatabase {
 	 *
 	 * @param string $fname Caller name (usually __METHOD__)
 	 * @param callable $callback Callback that issues DB updates
+	 * @return mixed $res Result of the callback (since 1.28)
 	 * @throws DBError
 	 * @throws RuntimeException
 	 * @throws UnexpectedValueException
@@ -1346,6 +1365,10 @@ interface IDatabase {
 	 * Begin a transaction. If a transaction is already in progress,
 	 * that transaction will be committed before the new transaction is started.
 	 *
+	 * Only call this from code with outer transcation scope.
+	 * See https://www.mediawiki.org/wiki/Database_transactions for details.
+	 * Nesting of transactions is not supported.
+	 *
 	 * Note that when the DBO_TRX flag is set (which is usually the case for web
 	 * requests, but not for maintenance scripts), any previous database query
 	 * will have started a transaction automatically.
@@ -1355,20 +1378,23 @@ interface IDatabase {
 	 * automatically because of the DBO_TRX flag.
 	 *
 	 * @param string $fname
+	 * @param string $mode A situationally valid IDatabase::TRANSACTION_* constant [optional]
 	 * @throws DBError
 	 */
-	public function begin( $fname = __METHOD__ );
+	public function begin( $fname = __METHOD__, $mode = self::TRANSACTION_EXPLICIT );
 
 	/**
 	 * Commits a transaction previously started using begin().
 	 * If no transaction is in progress, a warning is issued.
 	 *
+	 * Only call this from code with outer transcation scope.
+	 * See https://www.mediawiki.org/wiki/Database_transactions for details.
 	 * Nesting of transactions is not supported.
 	 *
 	 * @param string $fname
-	 * @param string $flush Flush flag, set to 'flush' to disable warnings about
-	 *   explicitly committing implicit transactions, or calling commit when no
-	 *   transaction is in progress.
+	 * @param string $flush Flush flag, set to situationally valid IDatabase::FLUSHING_*
+	 *   constant to disable warnings about explicitly committing implicit transactions,
+	 *   or calling commit when no transaction is in progress.
 	 *
 	 *   This will trigger an exception if there is an ongoing explicit transaction.
 	 *
@@ -1383,13 +1409,17 @@ interface IDatabase {
 	 * Rollback a transaction previously started using begin().
 	 * If no transaction is in progress, a warning is issued.
 	 *
-	 * No-op on non-transactional databases.
+	 * Only call this from code with outer transcation scope.
+	 * See https://www.mediawiki.org/wiki/Database_transactions for details.
+	 * Nesting of transactions is not supported. If a serious unexpected error occurs,
+	 * throwing an Exception is preferrable, using a pre-installed error handler to trigger
+	 * rollback (in any case, failure to issue COMMIT will cause rollback server-side).
 	 *
 	 * @param string $fname
-	 * @param string $flush Flush flag, set to 'flush' to disable warnings about
-	 *   calling rollback when no transaction is in progress. This will silently
-	 *   break any ongoing explicit transaction. Only set the flush flag if you
-	 *   are sure that it is safe to ignore these warnings in your context.
+	 * @param string $flush Flush flag, set to a situationally valid IDatabase::FLUSHING_*
+	 *   constant to disable warnings about calling rollback when no transaction is in
+	 *   progress. This will silently break any ongoing explicit transaction. Only set the
+	 *   flush flag if you are sure that it is safe to ignore these warnings in your context.
 	 * @throws DBUnexpectedError
 	 * @since 1.23 Added $flush parameter
 	 */
@@ -1554,10 +1584,14 @@ interface IDatabase {
 	/**
 	 * Acquire a named lock, flush any transaction, and return an RAII style unlocker object
 	 *
+	 * Only call this from outer transcation scope and when only one DB will be affected.
+	 * See https://www.mediawiki.org/wiki/Database_transactions for details.
+	 *
 	 * This is suitiable for transactions that need to be serialized using cooperative locks,
 	 * where each transaction can see each others' changes. Any transaction is flushed to clear
 	 * out stale REPEATABLE-READ snapshot data. Once the returned object falls out of PHP scope,
-	 * any transaction will be committed and the lock will be released.
+	 * the lock will be released unless a transaction is active. If one is active, then the lock
+	 * will be released when it either commits or rolls back.
 	 *
 	 * If the lock acquisition failed, then no transaction flush happens, and null is returned.
 	 *
diff --git a/includes/db/loadbalancer/LBFactory.php b/includes/db/loadbalancer/LBFactory.php
index 4078a3926e..b320544e01 100644
--- a/includes/db/loadbalancer/LBFactory.php
+++ b/includes/db/loadbalancer/LBFactory.php
@@ -42,6 +42,8 @@ abstract class LBFactory implements DestructibleService {
 	/** @var WANObjectCache */
 	protected $wanCache;
 
+	/** @var mixed */
+	protected $ticket;
 	/** @var string|bool Reason all LBs are read-only or false if not */
 	protected $readOnlyReason = false;
 
@@ -72,6 +74,7 @@ abstract class LBFactory implements DestructibleService {
 			$this->wanCache = WANObjectCache::newEmpty();
 		}
 		$this->trxLogger = LoggerFactory::getInstance( 'DBTransaction' );
+		$this->ticket = mt_rand();
 	}
 
 	/**
@@ -231,6 +234,7 @@ abstract class LBFactory implements DestructibleService {
 	 * @param string $fname Caller name
 	 * @param array $options Options map:
 	 *   - maxWriteDuration: abort if more than this much time was spent in write queries
+	 * @throws Exception
 	 */
 	public function commitMasterChanges( $fname = __METHOD__, array $options = [] ) {
 		// Perform all pre-commit callbacks, aborting on failure
@@ -242,9 +246,18 @@ abstract class LBFactory implements DestructibleService {
 		// Actually perform the commit on all master DB connections
 		$this->forEachLBCallMethod( 'commitMasterChanges', [ $fname ] );
 		// Run all post-commit callbacks
-		$this->forEachLBCallMethod( 'runMasterPostCommitCallbacks' );
+		/** @var Exception $e */
+		$e = null; // first callback exception
+		$this->forEachLB( function ( LoadBalancer $lb ) use ( &$e ) {
+			$ex = $lb->runMasterPostCommitCallbacks();
+			$e = $e ?: $ex;
+		} );
 		// Commit any dangling DBO_TRX transactions from callbacks on one DB to another DB
 		$this->forEachLBCallMethod( 'commitMasterChanges', [ $fname ] );
+		// Throw any last post-commit callback error
+		if ( $e instanceof Exception ) {
+			throw $e;
+		}
 	}
 
 	/**
@@ -404,6 +417,44 @@ abstract class LBFactory implements DestructibleService {
 		}
 	}
 
+	/**
+	 * Get a token asserting that no transaction writes are active
+	 *
+	 * @param string $fname Caller name (e.g. __METHOD__)
+	 * @return mixed A value to pass to commitAndWaitForReplication()
+	 * @since 1.28
+	 */
+	public function getEmptyTransactionTicket( $fname ) {
+		if ( $this->hasMasterChanges() ) {
+			$this->trxLogger->error( __METHOD__ . ": $fname does not have outer scope." );
+			return null;
+		}
+
+		return $this->ticket;
+	}
+
+	/**
+	 * Convenience method for safely running commitMasterChanges()/waitForReplication()
+	 *
+	 * This will commit and wait unless $ticket indicates it is unsafe to do so
+	 *
+	 * @param string $fname Caller name (e.g. __METHOD__)
+	 * @param mixed $ticket Result of getOuterTransactionScopeTicket()
+	 * @param array $opts Options to waitForReplication()
+	 * @throws DBReplicationWaitError
+	 * @since 1.28
+	 */
+	public function commitAndWaitForReplication( $fname, $ticket, array $opts = [] ) {
+		if ( $ticket !== $this->ticket ) {
+			$logger = LoggerFactory::getInstance( 'DBPerformance' );
+			$logger->error( __METHOD__ . ": cannot commit; $fname does not have outer scope." );
+			return;
+		}
+
+		$this->commitMasterChanges( $fname );
+		$this->waitForReplication( $opts );
+	}
+
 	/**
 	 * Disable the ChronologyProtector for all load balancers
 	 *
diff --git a/includes/db/loadbalancer/LBFactoryMulti.php b/includes/db/loadbalancer/LBFactoryMulti.php
index 0f3ca932a9..4b9cccc86a 100644
--- a/includes/db/loadbalancer/LBFactoryMulti.php
+++ b/includes/db/loadbalancer/LBFactoryMulti.php
@@ -364,6 +364,8 @@ class LBFactoryMulti extends LBFactory {
 			}
 			$serverInfo['hostName'] = $serverName;
 			$serverInfo['load'] = $load;
+			$serverInfo += [ 'flags' => DBO_DEFAULT ];
+
 			$servers[] = $serverInfo;
 		}
 
diff --git a/includes/db/loadbalancer/LBFactorySimple.php b/includes/db/loadbalancer/LBFactorySimple.php
index 14baf2e7b0..3702c8b05d 100644
--- a/includes/db/loadbalancer/LBFactorySimple.php
+++ b/includes/db/loadbalancer/LBFactorySimple.php
@@ -56,6 +56,7 @@ class LBFactorySimple extends LBFactory {
 				} else {
 					$server['slave'] = true;
 				}
+				$server += [ 'flags' => DBO_DEFAULT ];
 			}
 		} else {
 			global $wgDBserver, $wgDBuser, $wgDBpassword, $wgDBname, $wgDBtype, $wgDebugDumpSql;
diff --git a/includes/db/loadbalancer/LoadBalancer.php b/includes/db/loadbalancer/LoadBalancer.php
index a7c486c69c..13a08796cb 100644
--- a/includes/db/loadbalancer/LoadBalancer.php
+++ b/includes/db/loadbalancer/LoadBalancer.php
@@ -1062,7 +1062,7 @@ class LoadBalancer {
 	 */
 	public function commitAll( $fname = __METHOD__ ) {
 		$this->forEachOpenConnection( function ( DatabaseBase $conn ) use ( $fname ) {
-			$conn->commit( $fname, 'flush' );
+			$conn->commit( $fname, IDatabase::FLUSHING_ALL_PEERS );
 		} );
 	}
 
@@ -1090,6 +1090,15 @@ class LoadBalancer {
 	public function approveMasterChanges( array $options ) {
 		$limit = isset( $options['maxWriteDuration'] ) ? $options['maxWriteDuration'] : 0;
 		$this->forEachOpenMasterConnection( function ( DatabaseBase $conn ) use ( $limit ) {
+			// If atomic sections or explicit transactions are still open, some caller must have
+			// caught an exception but failed to properly rollback any changes. Detect that and
+			// throw and error (causing rollback).
+			if ( $conn->explicitTrxActive() ) {
+				throw new DBTransactionError(
+					$conn,
+					"Explicit transaction still active. A caller may have caught an error."
+				);
+			}
 			// Assert that the time to replicate the transaction will be sane.
 			// If this fails, then all DB transactions will be rollback back together.
 			$time = $conn->pendingWriteQueryDuration();
@@ -1099,6 +1108,14 @@ class LoadBalancer {
 					wfMessage( 'transaction-duration-limit-exceeded', $time, $limit )->text()
 				);
 			}
+			// If a connection sits idle while slow queries execute on another, that connection
+			// may end up dropped before the commit round is reached. Ping servers to detect this.
+			if ( $conn->writesOrCallbacksPending() && !$conn->ping() ) {
+				throw new DBTransactionError(
+					$conn,
+					"A connection to the {$conn->getDBname()} database was lost before commit."
+				);
+			}
 		} );
 	}
 
@@ -1109,20 +1126,28 @@ class LoadBalancer {
 	public function commitMasterChanges( $fname = __METHOD__ ) {
 		$this->forEachOpenMasterConnection( function ( DatabaseBase $conn ) use ( $fname ) {
 			if ( $conn->writesOrCallbacksPending() ) {
-				$conn->commit( $fname, 'flush' );
+				$conn->commit( $fname, IDatabase::FLUSHING_ALL_PEERS );
 			}
 		} );
 	}
 
 	/**
 	 * Issue all pending post-commit callbacks
+	 * @return Exception|null The first exception or null if there were none
 	 * @since 1.28
 	 */
 	public function runMasterPostCommitCallbacks() {
-		$this->forEachOpenMasterConnection( function ( DatabaseBase $db ) {
+		$e = null; // first exception
+		$this->forEachOpenMasterConnection( function ( DatabaseBase $db ) use ( &$e ) {
 			$db->setPostCommitCallbackSupression( false );
-			$db->runOnTransactionIdleCallbacks( IDatabase::TRIGGER_COMMIT );
+			try {
+				$db->runOnTransactionIdleCallbacks( IDatabase::TRIGGER_COMMIT );
+			} catch ( Exception $ex ) {
+				$e = $e ?: $ex;
+			}
 		} );
+
+		return $e;
 	}
 
 	/**
@@ -1143,7 +1168,7 @@ class LoadBalancer {
 			foreach ( $conns2[$masterIndex] as $conn ) {
 				if ( $conn->trxLevel() && $conn->writesOrCallbacksPending() ) {
 					try {
-						$conn->rollback( $fname, 'flush' );
+						$conn->rollback( $fname, IDatabase::FLUSHING_ALL_PEERS );
 					} catch ( DBError $e ) {
 						MWExceptionHandler::logException( $e );
 						$failedServers[] = $conn->getServer();
diff --git a/includes/debug/MWDebug.php b/includes/debug/MWDebug.php
index d90ef8a7d1..6ce5829388 100644
--- a/includes/debug/MWDebug.php
+++ b/includes/debug/MWDebug.php
@@ -347,10 +347,11 @@ class MWDebug {
 	 * @param string $sql
 	 * @param string $function
 	 * @param bool $isMaster
+	 * @param float $runTime Query run time
 	 * @return int ID number of the query to pass to queryTime or -1 if the
 	 *  debugger is disabled
 	 */
-	public static function query( $sql, $function, $isMaster ) {
+	public static function query( $sql, $function, $isMaster, $runTime ) {
 		if ( !self::$enabled ) {
 			return -1;
 		}
@@ -384,28 +385,12 @@ class MWDebug {
 			'sql' => $sql,
 			'function' => $function,
 			'master' => (bool)$isMaster,
-			'time' => 0.0,
-			'_start' => microtime( true ),
+			'time' => $runTime,
 		];
 
 		return count( self::$query ) - 1;
 	}
 
-	/**
-	 * Calculates how long a query took.
-	 *
-	 * @since 1.19
-	 * @param int $id
-	 */
-	public static function queryTime( $id ) {
-		if ( $id === -1 || !self::$enabled ) {
-			return;
-		}
-
-		self::$query[$id]['time'] = microtime( true ) - self::$query[$id]['_start'];
-		unset( self::$query[$id]['_start'] );
-	}
-
 	/**
 	 * Returns a list of files included, along with their size
 	 *
diff --git a/includes/deferred/AtomicSectionUpdate.php b/includes/deferred/AtomicSectionUpdate.php
index 0da5d7dde3..a348719211 100644
--- a/includes/deferred/AtomicSectionUpdate.php
+++ b/includes/deferred/AtomicSectionUpdate.php
@@ -9,7 +9,7 @@ class AtomicSectionUpdate implements DeferrableUpdate, DeferrableCallback {
 	private $dbw;
 	/** @var string */
 	private $fname;
-	/** @var callable */
+	/** @var callable|null */
 	private $callback;
 
 	/**
diff --git a/includes/deferred/AutoCommitUpdate.php b/includes/deferred/AutoCommitUpdate.php
index ef5903b668..d26cf9d1c6 100644
--- a/includes/deferred/AutoCommitUpdate.php
+++ b/includes/deferred/AutoCommitUpdate.php
@@ -9,7 +9,7 @@ class AutoCommitUpdate implements DeferrableUpdate, DeferrableCallback {
 	private $dbw;
 	/** @var string */
 	private $fname;
-	/** @var callable */
+	/** @var callable|null */
 	private $callback;
 
 	/**
diff --git a/includes/deferred/DataUpdate.php b/includes/deferred/DataUpdate.php
index 2865461e5e..281ac24d9c 100644
--- a/includes/deferred/DataUpdate.php
+++ b/includes/deferred/DataUpdate.php
@@ -30,10 +30,21 @@
  *       subclasses can override the beginTransaction() and commitTransaction() methods.
  */
 abstract class DataUpdate implements DeferrableUpdate {
+	/** @var mixed Result from LBFactory::getEmptyTransactionTicket() */
+	protected $ticket;
+
 	public function __construct() {
 		// noop
 	}
 
+	/**
+	 * @param mixed $ticket Result of getEmptyTransactionTicket()
+	 * @since 1.28
+	 */
+	public function setTransactionTicket( $ticket ) {
+		$this->ticket = $ticket;
+	}
+
 	/**
 	 * Begin an appropriate transaction, if any.
 	 * This default implementation does nothing.
@@ -144,18 +155,3 @@ abstract class DataUpdate implements DeferrableUpdate {
 		return $remaining;
 	}
 }
-
-/**
- * Interface that marks a DataUpdate as enqueuable via the JobQueue
- *
- * Such updates must be representable using IJobSpecification, so that
- * they can be serialized into jobs and enqueued for later execution
- *
- * @since 1.27
- */
-interface EnqueueableDataUpdate {
-	/**
-	 * @return array (wiki => wiki ID, job => IJobSpecification)
-	 */
-	public function getAsJobSpecification();
-}
diff --git a/includes/deferred/DeferredUpdates.php b/includes/deferred/DeferredUpdates.php
index 9768838c0a..ee14e1a89d 100644
--- a/includes/deferred/DeferredUpdates.php
+++ b/includes/deferred/DeferredUpdates.php
@@ -68,9 +68,12 @@ class DeferredUpdates {
 	 *
 	 * @param callable $callable
 	 * @param integer $type DeferredUpdates constant (PRESEND or POSTSEND) (since 1.27)
+	 * @param IDatabase|null $dbw Abort if this DB is rolled back [optional] (since 1.28)
 	 */
-	public static function addCallableUpdate( $callable, $type = self::POSTSEND ) {
-		self::addUpdate( new MWCallableUpdate( $callable, wfGetCaller() ), $type );
+	public static function addCallableUpdate(
+		$callable, $type = self::POSTSEND, IDatabase $dbw = null
+	) {
+		self::addUpdate( new MWCallableUpdate( $callable, wfGetCaller(), $dbw ), $type );
 	}
 
 	/**
diff --git a/includes/deferred/EnqueueableDataUpdate.php b/includes/deferred/EnqueueableDataUpdate.php
new file mode 100644
index 0000000000..ffeb740d41
--- /dev/null
+++ b/includes/deferred/EnqueueableDataUpdate.php
@@ -0,0 +1,15 @@
+<?php
+/**
+ * Interface that marks a DataUpdate as enqueuable via the JobQueue
+ *
+ * Such updates must be representable using IJobSpecification, so that
+ * they can be serialized into jobs and enqueued for later execution
+ *
+ * @since 1.27
+ */
+interface EnqueueableDataUpdate {
+	/**
+	 * @return array (wiki => wiki ID, job => IJobSpecification)
+	 */
+	public function getAsJobSpecification();
+}
diff --git a/includes/deferred/LinksDeletionUpdate.php b/includes/deferred/LinksDeletionUpdate.php
index 0009781f56..47f2b21ff5 100644
--- a/includes/deferred/LinksDeletionUpdate.php
+++ b/includes/deferred/LinksDeletionUpdate.php
@@ -54,6 +54,7 @@ class LinksDeletionUpdate extends SqlDataUpdate implements EnqueueableDataUpdate
 	public function doUpdate() {
 		$config = RequestContext::getMain()->getConfig();
 		$batchSize = $config->get( 'UpdateRowsPerQuery' );
+		$factory = wfGetLBFactory();
 
 		// Page may already be deleted, so don't just getId()
 		$id = $this->pageId;
@@ -77,8 +78,9 @@ class LinksDeletionUpdate extends SqlDataUpdate implements EnqueueableDataUpdate
 		foreach ( $catBatches as $catBatch ) {
 			$this->page->updateCategoryCounts( [], $catBatch, $id );
 			if ( count( $catBatches ) > 1 ) {
-				$this->mDb->commit( __METHOD__, 'flush' );
-				wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] );
+				$factory->commitAndWaitForReplication(
+					__METHOD__, $this->ticket, [ 'wiki' => $this->mDb->getWikiID() ]
+				);
 			}
 		}
 
@@ -173,8 +175,9 @@ class LinksDeletionUpdate extends SqlDataUpdate implements EnqueueableDataUpdate
 			foreach ( $rcIdBatches as $rcIdBatch ) {
 				$this->mDb->delete( 'recentchanges', [ 'rc_id' => $rcIdBatch ], __METHOD__ );
 				if ( count( $rcIdBatches ) > 1 ) {
-					$this->mDb->commit( __METHOD__, 'flush' );
-					wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] );
+					$factory->commitAndWaitForReplication(
+						__METHOD__, $this->ticket, [ 'wiki' => $this->mDb->getWikiID() ]
+					);
 				}
 			}
 		}
@@ -185,6 +188,7 @@ class LinksDeletionUpdate extends SqlDataUpdate implements EnqueueableDataUpdate
 
 	private function batchDeleteByPK( $table, array $conds, array $pk, $bSize ) {
 		$dbw = $this->mDb; // convenience
+		$factory = wfGetLBFactory();
 		$res = $dbw->select( $table, $pk, $conds, __METHOD__ );
 
 		$pkDeleteConds = [];
@@ -192,8 +196,9 @@ class LinksDeletionUpdate extends SqlDataUpdate implements EnqueueableDataUpdate
 			$pkDeleteConds[] = $this->mDb->makeList( (array)$row, LIST_AND );
 			if ( count( $pkDeleteConds ) >= $bSize ) {
 				$dbw->delete( $table, $dbw->makeList( $pkDeleteConds, LIST_OR ), __METHOD__ );
-				$dbw->commit( __METHOD__, 'flush' );
-				wfGetLBFactory()->waitForReplication( [ 'wiki' => $dbw->getWikiID() ] );
+				$factory->commitAndWaitForReplication(
+					__METHOD__, $this->ticket, [ 'wiki' => $this->mDb->getWikiID() ]
+				);
 				$pkDeleteConds = [];
 			}
 		}
diff --git a/includes/deferred/LinksUpdate.php b/includes/deferred/LinksUpdate.php
index 22944eb7a6..5e02c5cc6c 100644
--- a/includes/deferred/LinksUpdate.php
+++ b/includes/deferred/LinksUpdate.php
@@ -304,7 +304,7 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
 	 * @param array $cats
 	 */
 	function invalidateCategories( $cats ) {
-		$this->invalidatePages( NS_CATEGORY, array_keys( $cats ) );
+		PurgeJobUtils::invalidatePages( $this->mDb, NS_CATEGORY, array_keys( $cats ) );
 	}
 
 	/**
@@ -323,7 +323,7 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
 	 * @param array $images
 	 */
 	function invalidateImageDescriptions( $images ) {
-		$this->invalidatePages( NS_FILE, array_keys( $images ) );
+		PurgeJobUtils::invalidatePages( $this->mDb, NS_FILE, array_keys( $images ) );
 	}
 
 	/**
@@ -335,6 +335,7 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
 	 */
 	private function incrTableUpdate( $table, $prefix, $deletions, $insertions ) {
 		$bSize = RequestContext::getMain()->getConfig()->get( 'UpdateRowsPerQuery' );
+		$factory = wfGetLBFactory();
 
 		if ( $table === 'page_props' ) {
 			$fromField = 'pp_page';
@@ -386,15 +387,17 @@ class LinksUpdate extends SqlDataUpdate implements EnqueueableDataUpdate {
 
 		foreach ( $deleteWheres as $deleteWhere ) {
 			$this->mDb->delete( $table, $deleteWhere, __METHOD__ );
-			$this->mDb->commit( __METHOD__, 'flush' );
-			wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] );
+			$factory->commitAndWaitForReplication(
+				__METHOD__, $this->ticket, [ 'wiki' => $this->mDb->getWikiID() ]
+			);
 		}
 
 		$insertBatches = array_chunk( $insertions, $bSize );
 		foreach ( $insertBatches as $insertBatch ) {
 			$this->mDb->insert( $table, $insertBatch, __METHOD__, 'IGNORE' );
-			$this->mDb->commit( __METHOD__, 'flush' );
-			wfGetLBFactory()->waitForReplication( [ 'wiki' => $this->mDb->getWikiID() ] );
+			$factory->commitAndWaitForReplication(
+				__METHOD__, $this->ticket, [ 'wiki' => $this->mDb->getWikiID() ]
+			);
 		}
 
 		if ( count( $insertions ) ) {
diff --git a/includes/deferred/MWCallableUpdate.php b/includes/deferred/MWCallableUpdate.php
index d63c292ba9..47b162c270 100644
--- a/includes/deferred/MWCallableUpdate.php
+++ b/includes/deferred/MWCallableUpdate.php
@@ -4,7 +4,7 @@
  * Deferrable Update for closure/callback
  */
 class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
-	/** @var callable */
+	/** @var callable|null */
 	private $callback;
 	/** @var string */
 	private $fname;
@@ -12,14 +12,27 @@ class MWCallableUpdate implements DeferrableUpdate, DeferrableCallback {
 	/**
 	 * @param callable $callback
 	 * @param string $fname Calling method
+	 * @param IDatabase|null $dbw Abort if this DB is rolled back [optional] (since 1.28)
 	 */
-	public function __construct( callable $callback, $fname = 'unknown' ) {
+	public function __construct( callable $callback, $fname = 'unknown', IDatabase $dbw = null ) {
 		$this->callback = $callback;
 		$this->fname = $fname;
+
+		if ( $dbw && $dbw->trxLevel() ) {
+			$dbw->onTransactionResolution( [ $this, 'cancelOnRollback' ] );
+		}
 	}
 
 	public function doUpdate() {
-		call_user_func( $this->callback );
+		if ( $this->callback ) {
+			call_user_func( $this->callback );
+		}
+	}
+
+	public function cancelOnRollback( $trigger ) {
+		if ( $trigger === IDatabase::TRIGGER_ROLLBACK ) {
+			$this->callback = null;
+		}
 	}
 
 	public function getOrigin() {
diff --git a/includes/deferred/SqlDataUpdate.php b/includes/deferred/SqlDataUpdate.php
index 9740cbe254..ff06915a77 100644
--- a/includes/deferred/SqlDataUpdate.php
+++ b/includes/deferred/SqlDataUpdate.php
@@ -98,53 +98,4 @@ abstract class SqlDataUpdate extends DataUpdate {
 			$this->mHasTransaction = false;
 		}
 	}
-
-	/**
-	 * Invalidate the cache of a list of pages from a single namespace.
-	 * This is intended for use by subclasses.
-	 *
-	 * @param int $namespace Namespace number
-	 * @param array $dbkeys
-	 */
-	protected function invalidatePages( $namespace, array $dbkeys ) {
-		if ( $dbkeys === [] ) {
-			return;
-		}
-
-		$dbw = $this->mDb;
-		$dbw->onTransactionPreCommitOrIdle( function() use ( $dbw, $namespace, $dbkeys ) {
-			/**
-			 * Determine which pages need to be updated
-			 * This is necessary to prevent the job queue from smashing the DB with
-			 * large numbers of concurrent invalidations of the same page
-			 */
-			$now = $dbw->timestamp();
-			$ids = $dbw->selectFieldValues( 'page',
-				'page_id',
-				[
-					'page_namespace' => $namespace,
-					'page_title' => $dbkeys,
-					'page_touched < ' . $dbw->addQuotes( $now )
-				],
-				__METHOD__
-			);
-
-			if ( $ids === [] ) {
-				return;
-			}
-
-			/**
-			 * Do the update
-			 * We still need the page_touched condition, in case the row has changed since
-			 * the non-locking select above.
-			 */
-			$dbw->update( 'page',
-				[ 'page_touched' => $now ],
-				[
-					'page_id' => $ids,
-					'page_touched < ' . $dbw->addQuotes( $now )
-				], __METHOD__
-			);
-		} );
-	}
 }
diff --git a/includes/filebackend/lockmanager/DBLockManager.php b/includes/filebackend/lockmanager/DBLockManager.php
index b61b08dd11..cccf71a929 100644
--- a/includes/filebackend/lockmanager/DBLockManager.php
+++ b/includes/filebackend/lockmanager/DBLockManager.php
@@ -26,9 +26,8 @@
  *
  * This is meant for multi-wiki systems that may share files.
  *
- * All lock requests for a resource, identified by a hash string, will map
- * to one bucket. Each bucket maps to one or several peer DBs, each on their
- * own server, all having the filelocks.sql tables (with row-level locking).
+ * All lock requests for a resource, identified by a hash string, will map to one bucket.
+ * Each bucket maps to one or several peer DBs, each on their own server.
  * A majority of peer DBs must agree for a lock to be acquired.
  *
  * Caching is used to avoid hitting servers that are down.
@@ -145,33 +144,38 @@ abstract class DBLockManager extends QuorumLockManager {
 	 * @param string $lockDb
 	 * @return IDatabase
 	 * @throws DBError
+	 * @throws UnexpectedValueException
 	 */
 	protected function getConnection( $lockDb ) {
 		if ( !isset( $this->conns[$lockDb] ) ) {
-			$db = null;
 			if ( $lockDb === 'localDBMaster' ) {
-				$db = $this->getLocalLB()->getConnection( DB_MASTER, [], $this->domain );
+				$lb = $this->getLocalLB();
+				$db = $lb->getConnection( DB_MASTER, [], $this->domain );
+				# Do not mess with settings if the LoadBalancer is the main singleton
+				# to avoid clobbering the settings of handles from wfGetDB( DB_MASTER ).
+				$init = ( wfGetLB() !== $lb );
 			} elseif ( isset( $this->dbServers[$lockDb] ) ) {
 				$config = $this->dbServers[$lockDb];
 				$db = DatabaseBase::factory( $config['type'], $config );
+				$init = true;
+			} else {
+				throw new UnexpectedValueException( "No server called '$lockDb'." );
 			}
-			if ( !$db ) {
-				return null; // config error?
+
+			if ( $init ) {
+				$db->clearFlag( DBO_TRX );
+				# If the connection drops, try to avoid letting the DB rollback
+				# and release the locks before the file operations are finished.
+				# This won't handle the case of DB server restarts however.
+				$options = [];
+				if ( $this->lockExpiry > 0 ) {
+					$options['connTimeout'] = $this->lockExpiry;
+				}
+				$db->setSessionOptions( $options );
+				$this->initConnection( $lockDb, $db );
 			}
+
 			$this->conns[$lockDb] = $db;
-			$this->conns[$lockDb]->clearFlag( DBO_TRX );
-			# If the connection drops, try to avoid letting the DB rollback
-			# and release the locks before the file operations are finished.
-			# This won't handle the case of DB server restarts however.
-			$options = [];
-			if ( $this->lockExpiry > 0 ) {
-				$options['connTimeout'] = $this->lockExpiry;
-			}
-			$this->conns[$lockDb]->setSessionOptions( $options );
-			$this->initConnection( $lockDb, $this->conns[$lockDb] );
-		}
-		if ( !$this->conns[$lockDb]->trxLevel() ) {
-			$this->conns[$lockDb]->begin( __METHOD__ ); // start transaction
 		}
 
 		return $this->conns[$lockDb];
@@ -240,203 +244,3 @@ abstract class DBLockManager extends QuorumLockManager {
 		}
 	}
 }
-
-/**
- * MySQL version of DBLockManager that supports shared locks.
- * All locks are non-blocking, which avoids deadlocks.
- *
- * @ingroup LockManager
- */
-class MySqlLockManager extends DBLockManager {
-	/** @var array Mapping of lock types to the type actually used */
-	protected $lockTypeMap = [
-		self::LOCK_SH => self::LOCK_SH,
-		self::LOCK_UW => self::LOCK_SH,
-		self::LOCK_EX => self::LOCK_EX
-	];
-
-	protected function getLocalLB() {
-		// Use a separate connection so releaseAllLocks() doesn't rollback the main trx
-		return wfGetLBFactory()->newMainLB( $this->domain );
-	}
-
-	protected function initConnection( $lockDb, IDatabase $db ) {
-		# Let this transaction see lock rows from other transactions
-		$db->query( "SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;" );
-	}
-
-	/**
-	 * Get a connection to a lock DB and acquire locks on $paths.
-	 * This does not use GET_LOCK() per http://bugs.mysql.com/bug.php?id=1118.
-	 *
-	 * @see DBLockManager::getLocksOnServer()
-	 * @param string $lockSrv
-	 * @param array $paths
-	 * @param string $type
-	 * @return Status
-	 */
-	protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
-		$status = Status::newGood();
-
-		$db = $this->getConnection( $lockSrv ); // checked in isServerUp()
-
-		$keys = []; // list of hash keys for the paths
-		$data = []; // list of rows to insert
-		$checkEXKeys = []; // list of hash keys that this has no EX lock on
-		# Build up values for INSERT clause
-		foreach ( $paths as $path ) {
-			$key = $this->sha1Base36Absolute( $path );
-			$keys[] = $key;
-			$data[] = [ 'fls_key' => $key, 'fls_session' => $this->session ];
-			if ( !isset( $this->locksHeld[$path][self::LOCK_EX] ) ) {
-				$checkEXKeys[] = $key;
-			}
-		}
-
-		# Block new writers (both EX and SH locks leave entries here)...
-		$db->insert( 'filelocks_shared', $data, __METHOD__, [ 'IGNORE' ] );
-		# Actually do the locking queries...
-		if ( $type == self::LOCK_SH ) { // reader locks
-			$blocked = false;
-			# Bail if there are any existing writers...
-			if ( count( $checkEXKeys ) ) {
-				$blocked = $db->selectField( 'filelocks_exclusive', '1',
-					[ 'fle_key' => $checkEXKeys ],
-					__METHOD__
-				);
-			}
-			# Other prospective writers that haven't yet updated filelocks_exclusive
-			# will recheck filelocks_shared after doing so and bail due to this entry.
-		} else { // writer locks
-			$encSession = $db->addQuotes( $this->session );
-			# Bail if there are any existing writers...
-			# This may detect readers, but the safe check for them is below.
-			# Note: if two writers come at the same time, both bail :)
-			$blocked = $db->selectField( 'filelocks_shared', '1',
-				[ 'fls_key' => $keys, "fls_session != $encSession" ],
-				__METHOD__
-			);
-			if ( !$blocked ) {
-				# Build up values for INSERT clause
-				$data = [];
-				foreach ( $keys as $key ) {
-					$data[] = [ 'fle_key' => $key ];
-				}
-				# Block new readers/writers...
-				$db->insert( 'filelocks_exclusive', $data, __METHOD__ );
-				# Bail if there are any existing readers...
-				$blocked = $db->selectField( 'filelocks_shared', '1',
-					[ 'fls_key' => $keys, "fls_session != $encSession" ],
-					__METHOD__
-				);
-			}
-		}
-
-		if ( $blocked ) {
-			foreach ( $paths as $path ) {
-				$status->fatal( 'lockmanager-fail-acquirelock', $path );
-			}
-		}
-
-		return $status;
-	}
-
-	/**
-	 * @see QuorumLockManager::releaseAllLocks()
-	 * @return Status
-	 */
-	protected function releaseAllLocks() {
-		$status = Status::newGood();
-
-		foreach ( $this->conns as $lockDb => $db ) {
-			if ( $db->trxLevel() ) { // in transaction
-				try {
-					$db->rollback( __METHOD__ ); // finish transaction and kill any rows
-				} catch ( DBError $e ) {
-					$status->fatal( 'lockmanager-fail-db-release', $lockDb );
-				}
-			}
-		}
-
-		return $status;
-	}
-}
-
-/**
- * PostgreSQL version of DBLockManager that supports shared locks.
- * All locks are non-blocking, which avoids deadlocks.
- *
- * @ingroup LockManager
- */
-class PostgreSqlLockManager extends DBLockManager {
-	/** @var array Mapping of lock types to the type actually used */
-	protected $lockTypeMap = [
-		self::LOCK_SH => self::LOCK_SH,
-		self::LOCK_UW => self::LOCK_SH,
-		self::LOCK_EX => self::LOCK_EX
-	];
-
-	protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
-		$status = Status::newGood();
-		if ( !count( $paths ) ) {
-			return $status; // nothing to lock
-		}
-
-		$db = $this->getConnection( $lockSrv ); // checked in isServerUp()
-		$bigints = array_unique( array_map(
-			function ( $key ) {
-				return Wikimedia\base_convert( substr( $key, 0, 15 ), 16, 10 );
-			},
-			array_map( [ $this, 'sha1Base16Absolute' ], $paths )
-		) );
-
-		// Try to acquire all the locks...
-		$fields = [];
-		foreach ( $bigints as $bigint ) {
-			$fields[] = ( $type == self::LOCK_SH )
-				? "pg_try_advisory_lock_shared({$db->addQuotes( $bigint )}) AS K$bigint"
-				: "pg_try_advisory_lock({$db->addQuotes( $bigint )}) AS K$bigint";
-		}
-		$res = $db->query( 'SELECT ' . implode( ', ', $fields ), __METHOD__ );
-		$row = $res->fetchRow();
-
-		if ( in_array( 'f', $row ) ) {
-			// Release any acquired locks if some could not be acquired...
-			$fields = [];
-			foreach ( $row as $kbigint => $ok ) {
-				if ( $ok === 't' ) { // locked
-					$bigint = substr( $kbigint, 1 ); // strip off the "K"
-					$fields[] = ( $type == self::LOCK_SH )
-						? "pg_advisory_unlock_shared({$db->addQuotes( $bigint )})"
-						: "pg_advisory_unlock({$db->addQuotes( $bigint )})";
-				}
-			}
-			if ( count( $fields ) ) {
-				$db->query( 'SELECT ' . implode( ', ', $fields ), __METHOD__ );
-			}
-			foreach ( $paths as $path ) {
-				$status->fatal( 'lockmanager-fail-acquirelock', $path );
-			}
-		}
-
-		return $status;
-	}
-
-	/**
-	 * @see QuorumLockManager::releaseAllLocks()
-	 * @return Status
-	 */
-	protected function releaseAllLocks() {
-		$status = Status::newGood();
-
-		foreach ( $this->conns as $lockDb => $db ) {
-			try {
-				$db->query( "SELECT pg_advisory_unlock_all()", __METHOD__ );
-			} catch ( DBError $e ) {
-				$status->fatal( 'lockmanager-fail-db-release', $lockDb );
-			}
-		}
-
-		return $status;
-	}
-}
diff --git a/includes/filebackend/lockmanager/MySqlLockManager.php b/includes/filebackend/lockmanager/MySqlLockManager.php
new file mode 100644
index 0000000000..0536091bc4
--- /dev/null
+++ b/includes/filebackend/lockmanager/MySqlLockManager.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * MySQL version of DBLockManager that supports shared locks.
+ *
+ * All lock servers must have the innodb table defined in locking/filelocks.sql.
+ * All locks are non-blocking, which avoids deadlocks.
+ *
+ * @ingroup LockManager
+ */
+class MySqlLockManager extends DBLockManager {
+	/** @var array Mapping of lock types to the type actually used */
+	protected $lockTypeMap = [
+		self::LOCK_SH => self::LOCK_SH,
+		self::LOCK_UW => self::LOCK_SH,
+		self::LOCK_EX => self::LOCK_EX
+	];
+
+	protected function getLocalLB() {
+		// Use a separate connection so releaseAllLocks() doesn't rollback the main trx
+		return wfGetLBFactory()->newMainLB( $this->domain );
+	}
+
+	protected function initConnection( $lockDb, IDatabase $db ) {
+		# Let this transaction see lock rows from other transactions
+		$db->query( "SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;" );
+		# Do everything in a transaction as it all gets rolled back eventually
+		$db->startAtomic( __CLASS__ );
+	}
+
+	/**
+	 * Get a connection to a lock DB and acquire locks on $paths.
+	 * This does not use GET_LOCK() per http://bugs.mysql.com/bug.php?id=1118.
+	 *
+	 * @see DBLockManager::getLocksOnServer()
+	 * @param string $lockSrv
+	 * @param array $paths
+	 * @param string $type
+	 * @return Status
+	 */
+	protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
+		$status = Status::newGood();
+
+		$db = $this->getConnection( $lockSrv ); // checked in isServerUp()
+
+		$keys = []; // list of hash keys for the paths
+		$data = []; // list of rows to insert
+		$checkEXKeys = []; // list of hash keys that this has no EX lock on
+		# Build up values for INSERT clause
+		foreach ( $paths as $path ) {
+			$key = $this->sha1Base36Absolute( $path );
+			$keys[] = $key;
+			$data[] = [ 'fls_key' => $key, 'fls_session' => $this->session ];
+			if ( !isset( $this->locksHeld[$path][self::LOCK_EX] ) ) {
+				$checkEXKeys[] = $key;
+			}
+		}
+
+		# Block new writers (both EX and SH locks leave entries here)...
+		$db->insert( 'filelocks_shared', $data, __METHOD__, [ 'IGNORE' ] );
+		# Actually do the locking queries...
+		if ( $type == self::LOCK_SH ) { // reader locks
+			$blocked = false;
+			# Bail if there are any existing writers...
+			if ( count( $checkEXKeys ) ) {
+				$blocked = $db->selectField( 'filelocks_exclusive', '1',
+					[ 'fle_key' => $checkEXKeys ],
+					__METHOD__
+				);
+			}
+			# Other prospective writers that haven't yet updated filelocks_exclusive
+			# will recheck filelocks_shared after doing so and bail due to this entry.
+		} else { // writer locks
+			$encSession = $db->addQuotes( $this->session );
+			# Bail if there are any existing writers...
+			# This may detect readers, but the safe check for them is below.
+			# Note: if two writers come at the same time, both bail :)
+			$blocked = $db->selectField( 'filelocks_shared', '1',
+				[ 'fls_key' => $keys, "fls_session != $encSession" ],
+				__METHOD__
+			);
+			if ( !$blocked ) {
+				# Build up values for INSERT clause
+				$data = [];
+				foreach ( $keys as $key ) {
+					$data[] = [ 'fle_key' => $key ];
+				}
+				# Block new readers/writers...
+				$db->insert( 'filelocks_exclusive', $data, __METHOD__ );
+				# Bail if there are any existing readers...
+				$blocked = $db->selectField( 'filelocks_shared', '1',
+					[ 'fls_key' => $keys, "fls_session != $encSession" ],
+					__METHOD__
+				);
+			}
+		}
+
+		if ( $blocked ) {
+			foreach ( $paths as $path ) {
+				$status->fatal( 'lockmanager-fail-acquirelock', $path );
+			}
+		}
+
+		return $status;
+	}
+
+	/**
+	 * @see QuorumLockManager::releaseAllLocks()
+	 * @return Status
+	 */
+	protected function releaseAllLocks() {
+		$status = Status::newGood();
+
+		foreach ( $this->conns as $lockDb => $db ) {
+			if ( $db->trxLevel() ) { // in transaction
+				try {
+					$db->rollback( __METHOD__ ); // finish transaction and kill any rows
+				} catch ( DBError $e ) {
+					$status->fatal( 'lockmanager-fail-db-release', $lockDb );
+				}
+			}
+		}
+
+		return $status;
+	}
+}
diff --git a/includes/filebackend/lockmanager/PostgreSqlLockManager.php b/includes/filebackend/lockmanager/PostgreSqlLockManager.php
new file mode 100644
index 0000000000..d55b5ae060
--- /dev/null
+++ b/includes/filebackend/lockmanager/PostgreSqlLockManager.php
@@ -0,0 +1,79 @@
+<?php
+/**
+ * PostgreSQL version of DBLockManager that supports shared locks.
+ * All locks are non-blocking, which avoids deadlocks.
+ *
+ * @ingroup LockManager
+ */
+class PostgreSqlLockManager extends DBLockManager {
+	/** @var array Mapping of lock types to the type actually used */
+	protected $lockTypeMap = [
+		self::LOCK_SH => self::LOCK_SH,
+		self::LOCK_UW => self::LOCK_SH,
+		self::LOCK_EX => self::LOCK_EX
+	];
+
+	protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
+		$status = Status::newGood();
+		if ( !count( $paths ) ) {
+			return $status; // nothing to lock
+		}
+
+		$db = $this->getConnection( $lockSrv ); // checked in isServerUp()
+		$bigints = array_unique( array_map(
+			function ( $key ) {
+				return Wikimedia\base_convert( substr( $key, 0, 15 ), 16, 10 );
+			},
+			array_map( [ $this, 'sha1Base16Absolute' ], $paths )
+		) );
+
+		// Try to acquire all the locks...
+		$fields = [];
+		foreach ( $bigints as $bigint ) {
+			$fields[] = ( $type == self::LOCK_SH )
+				? "pg_try_advisory_lock_shared({$db->addQuotes( $bigint )}) AS K$bigint"
+				: "pg_try_advisory_lock({$db->addQuotes( $bigint )}) AS K$bigint";
+		}
+		$res = $db->query( 'SELECT ' . implode( ', ', $fields ), __METHOD__ );
+		$row = $res->fetchRow();
+
+		if ( in_array( 'f', $row ) ) {
+			// Release any acquired locks if some could not be acquired...
+			$fields = [];
+			foreach ( $row as $kbigint => $ok ) {
+				if ( $ok === 't' ) { // locked
+					$bigint = substr( $kbigint, 1 ); // strip off the "K"
+					$fields[] = ( $type == self::LOCK_SH )
+						? "pg_advisory_unlock_shared({$db->addQuotes( $bigint )})"
+						: "pg_advisory_unlock({$db->addQuotes( $bigint )})";
+				}
+			}
+			if ( count( $fields ) ) {
+				$db->query( 'SELECT ' . implode( ', ', $fields ), __METHOD__ );
+			}
+			foreach ( $paths as $path ) {
+				$status->fatal( 'lockmanager-fail-acquirelock', $path );
+			}
+		}
+
+		return $status;
+	}
+
+	/**
+	 * @see QuorumLockManager::releaseAllLocks()
+	 * @return Status
+	 */
+	protected function releaseAllLocks() {
+		$status = Status::newGood();
+
+		foreach ( $this->conns as $lockDb => $db ) {
+			try {
+				$db->query( "SELECT pg_advisory_unlock_all()", __METHOD__ );
+			} catch ( DBError $e ) {
+				$status->fatal( 'lockmanager-fail-db-release', $lockDb );
+			}
+		}
+
+		return $status;
+	}
+}
diff --git a/includes/filebackend/lockmanager/RedisLockManager.php b/includes/filebackend/lockmanager/RedisLockManager.php
index 6095aeede4..4121ecb29d 100644
--- a/includes/filebackend/lockmanager/RedisLockManager.php
+++ b/includes/filebackend/lockmanager/RedisLockManager.php
@@ -81,10 +81,12 @@ class RedisLockManager extends QuorumLockManager {
 	protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
 		$status = Status::newGood();
 
+		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+
 		$server = $this->lockServers[$lockSrv];
 		$conn = $this->redisPool->getConnection( $server );
 		if ( !$conn ) {
-			foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
+			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-acquirelock', $path );
 			}
 
@@ -157,7 +159,7 @@ LUA;
 		}
 
 		if ( $res === false ) {
-			foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
+			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-acquirelock', $path );
 			}
 		} else {
@@ -172,10 +174,12 @@ LUA;
 	protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
 		$status = Status::newGood();
 
+		$pathList = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+
 		$server = $this->lockServers[$lockSrv];
 		$conn = $this->redisPool->getConnection( $server );
 		if ( !$conn ) {
-			foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
+			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-releaselock', $path );
 			}
 
@@ -225,7 +229,7 @@ LUA;
 		}
 
 		if ( $res === false ) {
-			foreach ( array_merge( array_values( $pathsByType ) ) as $path ) {
+			foreach ( $pathList as $path ) {
 				$status->fatal( 'lockmanager-fail-releaselock', $path );
 			}
 		} else {
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index b8be4eaa5e..40141c9cd0 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -117,6 +117,9 @@ class LocalFile extends File {
 	/** @var bool Whether the row was upgraded on load */
 	private $upgraded;
 
+	/** @var bool Whether the row was scheduled to upgrade on load */
+	private $upgrading;
+
 	/** @var bool True if the image row is locked */
 	private $locked;
 
@@ -559,37 +562,43 @@ class LocalFile extends File {
 	 */
 	function maybeUpgradeRow() {
 		global $wgUpdateCompatibleMetadata;
-		if ( wfReadOnly() ) {
+
+		if ( wfReadOnly() || $this->upgrading ) {
 			return;
 		}
 
 		$upgrade = false;
-		if ( is_null( $this->media_type ) ||
-			$this->mime == 'image/svg'
-		) {
+		if ( is_null( $this->media_type ) || $this->mime == 'image/svg' ) {
 			$upgrade = true;
 		} else {
 			$handler = $this->getHandler();
 			if ( $handler ) {
 				$validity = $handler->isMetadataValid( $this, $this->getMetadata() );
-				if ( $validity === MediaHandler::METADATA_BAD
-					|| ( $validity === MediaHandler::METADATA_COMPATIBLE && $wgUpdateCompatibleMetadata )
-				) {
+				if ( $validity === MediaHandler::METADATA_BAD ) {
 					$upgrade = true;
+				} elseif ( $validity === MediaHandler::METADATA_COMPATIBLE ) {
+					$upgrade = $wgUpdateCompatibleMetadata;
 				}
 			}
 		}
 
 		if ( $upgrade ) {
-			try {
-				$this->upgradeRow();
-			} catch ( LocalFileLockError $e ) {
-				// let the other process handle it (or do it next time)
-			}
-			$this->upgraded = true; // avoid rework/retries
+			$this->upgrading = true;
+			// Defer updates unless in auto-commit CLI mode
+			DeferredUpdates::addCallableUpdate( function() {
+				$this->upgrading = false; // avoid duplicate updates
+				try {
+					$this->upgradeRow();
+				} catch ( LocalFileLockError $e ) {
+					// let the other process handle it (or do it next time)
+				}
+			} );
 		}
 	}
 
+	/**
+	 * @return bool Whether upgradeRow() ran for this object
+	 */
 	function getUpgraded() {
 		return $this->upgraded;
 	}
@@ -639,7 +648,7 @@ class LocalFile extends File {
 		$this->invalidateCache();
 
 		$this->unlock(); // done
-
+		$this->upgraded = true; // avoid rework/retries
 	}
 
 	/**
@@ -964,6 +973,33 @@ class LocalFile extends File {
 		DeferredUpdates::addUpdate( new CdnCacheUpdate( $urls ), DeferredUpdates::PRESEND );
 	}
 
+	/**
+	 * Prerenders a configurable set of thumbnails
+	 *
+	 * @since 1.28
+	 */
+	public function prerenderThumbnails() {
+		global $wgUploadThumbnailRenderMap;
+
+		$jobs = [];
+
+		$sizes = $wgUploadThumbnailRenderMap;
+		rsort( $sizes );
+
+		foreach ( $sizes as $size ) {
+			if ( $this->isVectorized() || $this->getWidth() > $size ) {
+				$jobs[] = new ThumbnailRenderJob(
+					$this->getTitle(),
+					[ 'transformParams' => [ 'width' => $size ] ]
+				);
+			}
+		}
+
+		if ( $jobs ) {
+			JobQueueGroup::singleton()->lazyPush( $jobs );
+		}
+	}
+
 	/**
 	 * Delete a list of thumbnails visible at urls
 	 * @param string $dir Base dir of the files.
@@ -1516,6 +1552,8 @@ class LocalFile extends File {
 						# Update backlink pages pointing to this title if created
 						LinksUpdate::queueRecursiveJobsForTable( $this->getTitle(), 'imagelinks' );
 					}
+
+					$this->prerenderThumbnails();
 				}
 			),
 			DeferredUpdates::PRESEND
@@ -2178,8 +2216,9 @@ class LocalFileDeleteBatch {
 	}
 
 	protected function doDBInserts() {
+		$now = time();
 		$dbw = $this->file->repo->getMasterDB();
-		$encTimestamp = $dbw->addQuotes( $dbw->timestamp() );
+		$encTimestamp = $dbw->addQuotes( $dbw->timestamp( $now ) );
 		$encUserId = $dbw->addQuotes( $this->user->getId() );
 		$encReason = $dbw->addQuotes( $this->reason );
 		$encGroup = $dbw->addQuotes( 'deleted' );
@@ -2201,15 +2240,15 @@ class LocalFileDeleteBatch {
 		}
 
 		if ( $deleteCurrent ) {
-			$concat = $dbw->buildConcat( [ "img_sha1", $encExt ] );
-			$where = [ 'img_name' => $this->file->getName() ];
-			$dbw->insertSelect( 'filearchive', 'image',
+			$dbw->insertSelect(
+				'filearchive',
+				'image',
 				[
 					'fa_storage_group' => $encGroup,
 					'fa_storage_key' => $dbw->conditional(
 						[ 'img_sha1' => '' ],
 						$dbw->addQuotes( '' ),
-						$concat
+						$dbw->buildConcat( [ "img_sha1", $encExt ] )
 					),
 					'fa_deleted_user' => $encUserId,
 					'fa_deleted_timestamp' => $encTimestamp,
@@ -2230,44 +2269,56 @@ class LocalFileDeleteBatch {
 					'fa_user' => 'img_user',
 					'fa_user_text' => 'img_user_text',
 					'fa_timestamp' => 'img_timestamp',
-					'fa_sha1' => 'img_sha1',
-				], $where, __METHOD__ );
+					'fa_sha1' => 'img_sha1'
+				],
+				[ 'img_name' => $this->file->getName() ],
+				__METHOD__
+			);
 		}
 
 		if ( count( $oldRels ) ) {
-			$concat = $dbw->buildConcat( [ "oi_sha1", $encExt ] );
-			$where = [
-				'oi_name' => $this->file->getName(),
-				'oi_archive_name' => array_keys( $oldRels ) ];
-			$dbw->insertSelect( 'filearchive', 'oldimage',
+			$res = $dbw->select(
+				'oldimage',
+				OldLocalFile::selectFields(),
 				[
-					'fa_storage_group' => $encGroup,
-					'fa_storage_key' => $dbw->conditional(
-						[ 'oi_sha1' => '' ],
-						$dbw->addQuotes( '' ),
-						$concat
-					),
-					'fa_deleted_user' => $encUserId,
-					'fa_deleted_timestamp' => $encTimestamp,
-					'fa_deleted_reason' => $encReason,
-					'fa_deleted' => $this->suppress ? $bitfield : 'oi_deleted',
-
-					'fa_name' => 'oi_name',
-					'fa_archive_name' => 'oi_archive_name',
-					'fa_size' => 'oi_size',
-					'fa_width' => 'oi_width',
-					'fa_height' => 'oi_height',
-					'fa_metadata' => 'oi_metadata',
-					'fa_bits' => 'oi_bits',
-					'fa_media_type' => 'oi_media_type',
-					'fa_major_mime' => 'oi_major_mime',
-					'fa_minor_mime' => 'oi_minor_mime',
-					'fa_description' => 'oi_description',
-					'fa_user' => 'oi_user',
-					'fa_user_text' => 'oi_user_text',
-					'fa_timestamp' => 'oi_timestamp',
-					'fa_sha1' => 'oi_sha1',
-				], $where, __METHOD__ );
+					'oi_name' => $this->file->getName(),
+					'oi_archive_name' => array_keys( $oldRels )
+				],
+				__METHOD__,
+				[ 'FOR UPDATE' ]
+			);
+			$rowsInsert = [];
+			foreach ( $res as $row ) {
+				$rowsInsert[] = [
+					// Deletion-specific fields
+					'fa_storage_group' => 'deleted',
+					'fa_storage_key' => ( $row->oi_sha1 === '' )
+						? ''
+						: "{$row->oi_sha1}{$dotExt}",
+					'fa_deleted_user' => $this->user->getId(),
+					'fa_deleted_timestamp' => $dbw->timestamp( $now ),
+					'fa_deleted_reason' => $this->reason,
+					// Counterpart fields
+					'fa_deleted' => $this->suppress ? $bitfield : $row->oi_deleted,
+					'fa_name' => $row->oi_name,
+					'fa_archive_name' => $row->oi_archive_name,
+					'fa_size' => $row->oi_size,
+					'fa_width' => $row->oi_width,
+					'fa_height' => $row->oi_height,
+					'fa_metadata' => $row->oi_metadata,
+					'fa_bits' => $row->oi_bits,
+					'fa_media_type' => $row->oi_media_type,
+					'fa_major_mime' => $row->oi_major_mime,
+					'fa_minor_mime' => $row->oi_minor_mime,
+					'fa_description' => $row->oi_description,
+					'fa_user' => $row->oi_user,
+					'fa_user_text' => $row->oi_user_text,
+					'fa_timestamp' => $row->oi_timestamp,
+					'fa_sha1' => $row->oi_sha1
+				];
+			}
+
+			$dbw->insert( 'filearchive', $rowsInsert, __METHOD__ );
 		}
 	}
 
@@ -2558,8 +2609,9 @@ class LocalFileRestoreBatch {
 
 				// The live (current) version cannot be hidden!
 				if ( !$this->unsuppress && $row->fa_deleted ) {
-					$storeBatch[] = [ $deletedUrl, 'public', $destRel ];
-					$this->cleanupBatch[] = $row->fa_storage_key;
+					$status->fatal( 'undeleterevdel' );
+					$this->file->unlock();
+					return $status;
 				}
 			} else {
 				$archiveName = $row->fa_archive_name;
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index ff37e24e2f..3c88594eac 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -354,6 +354,26 @@ class HTMLForm extends ContextSource {
 		$this->mFieldTree = $loadedDescriptor;
 	}
 
+	/**
+	 * @param string $fieldname
+	 * @return bool
+	 */
+	public function hasField( $fieldname ) {
+		return isset( $this->mFlatFields[$fieldname] );
+	}
+
+	/**
+	 * @param string $fieldname
+	 * @return HTMLFormField
+	 * @throws DomainException on invalid field name
+	 */
+	public function getField( $fieldname ) {
+		if ( !$this->hasField( $fieldname ) ) {
+			throw new DomainException( __METHOD__ . ': no field named ' . $fieldname );
+		}
+		return $this->mFlatFields[$fieldname];
+	}
+
 	/**
 	 * Set format in which to display the form
 	 *
diff --git a/includes/htmlform/HTMLFormElement.php b/includes/htmlform/HTMLFormElement.php
new file mode 100644
index 0000000000..089213cff5
--- /dev/null
+++ b/includes/htmlform/HTMLFormElement.php
@@ -0,0 +1,65 @@
+<?php
+
+/**
+ * Allows custom data specific to HTMLFormField to be set for OOjs UI forms. A matching JS widget
+ * (defined in htmlform.Element.js) picks up the extra config when constructed using OO.ui.infuse().
+ *
+ * Currently only supports passing 'hide-if' data.
+ */
+trait HTMLFormElement {
+
+	protected $hideIf = null;
+	protected $modules = null;
+
+	public function initializeHTMLFormElement( array $config = [] ) {
+		// Properties
+		$this->hideIf = isset( $config['hideIf'] ) ? $config['hideIf'] : null;
+		$this->modules = isset( $config['modules'] ) ? $config['modules'] : [];
+
+		// Initialization
+		if ( $this->hideIf ) {
+			$this->addClasses( [ 'mw-htmlform-hide-if' ] );
+		}
+		if ( $this->modules ) {
+			// JS code must be able to read this before infusing (before OOjs UI is even loaded),
+			// so we put this in a separate attribute (not with the rest of the config).
+			// And it's not needed anymore after infusing, so we don't put it in JS config at all.
+			$this->setAttributes( [ 'data-mw-modules' => implode( ',', $this->modules ) ] );
+		}
+		$this->registerConfigCallback( function( &$config ) {
+			if ( $this->hideIf !== null ) {
+				$config['hideIf'] = $this->hideIf;
+			}
+		} );
+	}
+}
+
+class HTMLFormFieldLayout extends OOUI\FieldLayout {
+	use HTMLFormElement;
+
+	public function __construct( $fieldWidget, array $config = [] ) {
+		// Parent constructor
+		parent::__construct( $fieldWidget, $config );
+		// Traits
+		$this->initializeHTMLFormElement( $config );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.htmlform.FieldLayout';
+	}
+}
+
+class HTMLFormActionFieldLayout extends OOUI\ActionFieldLayout {
+	use HTMLFormElement;
+
+	public function __construct( $fieldWidget, $buttonWidget = false, array $config = [] ) {
+		// Parent constructor
+		parent::__construct( $fieldWidget, $buttonWidget, $config );
+		// Traits
+		$this->initializeHTMLFormElement( $config );
+	}
+
+	protected function getJavaScriptClassName() {
+		return 'mw.htmlform.ActionFieldLayout';
+	}
+}
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 5f6460d3df..25b4ccacaf 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -61,7 +61,7 @@ abstract class HTMLFormField {
 	 * @return bool
 	 */
 	public function canDisplayErrors() {
-		return true;
+		return $this->hasVisibleOutput();
 	}
 
 	/**
@@ -455,10 +455,6 @@ abstract class HTMLFormField {
 			$this->mFilterCallback = $params['filter-callback'];
 		}
 
-		if ( isset( $params['flatlist'] ) ) {
-			$this->mClass .= ' mw-htmlform-flatlist';
-		}
-
 		if ( isset( $params['hidelabel'] ) ) {
 			$this->mShowEmptyLabels = false;
 		}
@@ -626,12 +622,31 @@ abstract class HTMLFormField {
 			'infusable' => $infusable,
 		];
 
+		$preloadModules = false;
+
+		if ( $infusable && $this->shouldInfuseOOUI() ) {
+			$preloadModules = true;
+			$config['classes'][] = 'mw-htmlform-field-autoinfuse';
+		}
+
 		// the element could specify, that the label doesn't need to be added
 		$label = $this->getLabel();
 		if ( $label ) {
 			$config['label'] = new OOUI\HtmlSnippet( $label );
 		}
 
+		if ( $this->mHideIf ) {
+			$preloadModules = true;
+			$config['hideIf'] = $this->mHideIf;
+		}
+
+		$config['modules'] = $this->getOOUIModules();
+
+		if ( $preloadModules ) {
+			$this->mParent->getOutput()->addModules( 'mediawiki.htmlform.ooui' );
+			$this->mParent->getOutput()->addModules( $this->getOOUIModules() );
+		}
+
 		return $this->getFieldLayoutOOUI( $inputField, $config );
 	}
 
@@ -650,9 +665,31 @@ abstract class HTMLFormField {
 	protected function getFieldLayoutOOUI( $inputField, $config ) {
 		if ( isset( $this->mClassWithButton ) ) {
 			$buttonWidget = $this->mClassWithButton->getInputOOUI( '' );
-			return new OOUI\ActionFieldLayout( $inputField, $buttonWidget, $config );
+			return new HTMLFormActionFieldLayout( $inputField, $buttonWidget, $config );
 		}
-		return new OOUI\FieldLayout( $inputField, $config );
+		return new HTMLFormFieldLayout( $inputField, $config );
+	}
+
+	/**
+	 * Whether the field should be automatically infused. Note that all OOjs UI HTMLForm fields are
+	 * infusable (you can call OO.ui.infuse() on them), but not all are infused by default, since
+	 * there is no benefit in doing it e.g. for buttons and it's a small performance hit on page load.
+	 *
+	 * @return bool
+	 */
+	protected function shouldInfuseOOUI() {
+		// Always infuse fields with help text, since the interface for it is nicer with JS
+		return $this->getHelpText() !== null;
+	}
+
+	/**
+	 * Get the list of extra ResourceLoader modules which must be loaded client-side before it's
+	 * possible to infuse this field's OOjs UI widget.
+	 *
+	 * @return string[]
+	 */
+	protected function getOOUIModules() {
+		return [];
 	}
 
 	/**
diff --git a/includes/htmlform/fields/HTMLComboboxField.php b/includes/htmlform/fields/HTMLComboboxField.php
index 778aedbc8a..0c3bc5a913 100644
--- a/includes/htmlform/fields/HTMLComboboxField.php
+++ b/includes/htmlform/fields/HTMLComboboxField.php
@@ -56,4 +56,8 @@ class HTMLComboboxField extends HTMLTextField {
 			'disabled' => $disabled,
 		] + $attribs );
 	}
+
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
 }
diff --git a/includes/htmlform/fields/HTMLFormFieldCloner.php b/includes/htmlform/fields/HTMLFormFieldCloner.php
index f39f54be1a..5d8f491881 100644
--- a/includes/htmlform/fields/HTMLFormFieldCloner.php
+++ b/includes/htmlform/fields/HTMLFormFieldCloner.php
@@ -257,7 +257,7 @@ class HTMLFormFieldCloner extends HTMLFormField {
 	 * @param array $values
 	 * @return string
 	 */
-	protected function getInputHTMLForKey( $key, $values ) {
+	protected function getInputHTMLForKey( $key, array $values ) {
 		$displayFormat = isset( $this->mParams['format'] )
 			? $this->mParams['format']
 			: $this->mParent->getDisplayFormat();
diff --git a/includes/htmlform/fields/HTMLMultiSelectField.php b/includes/htmlform/fields/HTMLMultiSelectField.php
index a231b2f6b1..c9fcb0992f 100644
--- a/includes/htmlform/fields/HTMLMultiSelectField.php
+++ b/includes/htmlform/fields/HTMLMultiSelectField.php
@@ -4,6 +4,29 @@
  * Multi-select field
  */
 class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable {
+	/**
+	 * @param array $params
+	 *   In adition to the usual HTMLFormField parameters, this can take the following fields:
+	 *   - dropdown: If given, the options will be displayed inside a dropdown with a text field that
+	 *     can be used to filter them. This is desirable mostly for very long lists of options.
+	 *     This only works for users with JavaScript support and falls back to the list of checkboxes.
+	 *   - flatlist: If given, the options will be displayed on a single line (wrapping to following
+	 *     lines if necessary), rather than each one on a line of its own. This is desirable mostly
+	 *     for very short lists of concisely labelled options.
+	 */
+	public function __construct( $params ) {
+		parent::__construct( $params );
+
+		// For backwards compatibility, also handle the old way with 'cssclass' => 'mw-chosen'
+		if ( isset( $params['dropdown'] ) || strpos( $this->mClass, 'mw-chosen' ) !== false ) {
+			$this->mClass .= ' mw-htmlform-dropdown';
+		}
+
+		if ( isset( $params['flatlist'] ) ) {
+			$this->mClass .= ' mw-htmlform-flatlist';
+		}
+	}
+
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
 
@@ -28,6 +51,10 @@ class HTMLMultiSelectField extends HTMLFormField implements HTMLNestedFilterable
 	}
 
 	function getInputHTML( $value ) {
+		if ( isset( $this->mParams['dropdown'] ) ) {
+			$this->mParent->getOutput()->addModules( 'jquery.chosen' );
+		}
+
 		$value = HTMLFormField::forceToStringRecursive( $value );
 		$html = $this->formatOptions( $this->getOptions(), $value );
 
diff --git a/includes/htmlform/fields/HTMLRadioField.php b/includes/htmlform/fields/HTMLRadioField.php
index e5b5e68f20..f9f035d4d7 100644
--- a/includes/htmlform/fields/HTMLRadioField.php
+++ b/includes/htmlform/fields/HTMLRadioField.php
@@ -4,6 +4,21 @@
  * Radio checkbox fields.
  */
 class HTMLRadioField extends HTMLFormField {
+	/**
+	 * @param array $params
+	 *   In adition to the usual HTMLFormField parameters, this can take the following fields:
+	 *   - flatlist: If given, the options will be displayed on a single line (wrapping to following
+	 *     lines if necessary), rather than each one on a line of its own. This is desirable mostly
+	 *     for very short lists of concisely labelled options.
+	 */
+	public function __construct( $params ) {
+		parent::__construct( $params );
+
+		if ( isset( $params['flatlist'] ) ) {
+			$this->mClass .= ' mw-htmlform-flatlist';
+		}
+	}
+
 	function validate( $value, $alldata ) {
 		$p = parent::validate( $value, $alldata );
 
@@ -57,6 +72,10 @@ class HTMLRadioField extends HTMLFormField {
 		) );
 	}
 
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
+
 	function formatOptions( $options, $value ) {
 		global $wgUseMediaWikiUIEverywhere;
 
diff --git a/includes/htmlform/fields/HTMLSelectField.php b/includes/htmlform/fields/HTMLSelectField.php
index b6ad46c5ae..40b31b58f5 100644
--- a/includes/htmlform/fields/HTMLSelectField.php
+++ b/includes/htmlform/fields/HTMLSelectField.php
@@ -65,4 +65,8 @@ class HTMLSelectField extends HTMLFormField {
 			'disabled' => $disabled,
 		] + $attribs );
 	}
+
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
 }
diff --git a/includes/htmlform/fields/HTMLSelectNamespace.php b/includes/htmlform/fields/HTMLSelectNamespace.php
index ef219690fd..230790dbeb 100644
--- a/includes/htmlform/fields/HTMLSelectNamespace.php
+++ b/includes/htmlform/fields/HTMLSelectNamespace.php
@@ -33,4 +33,13 @@ class HTMLSelectNamespace extends HTMLFormField {
 			'includeAllValue' => $this->mAllValue,
 		] );
 	}
+
+	protected function getOOUIModules() {
+		// FIXME: NamespaceInputWidget should be in its own module (probably?)
+		return [ 'mediawiki.widgets' ];
+	}
+
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
 }
diff --git a/includes/htmlform/fields/HTMLTitleTextField.php b/includes/htmlform/fields/HTMLTitleTextField.php
index fcf721a57b..a15b90e333 100644
--- a/includes/htmlform/fields/HTMLTitleTextField.php
+++ b/includes/htmlform/fields/HTMLTitleTextField.php
@@ -73,7 +73,6 @@ class HTMLTitleTextField extends HTMLTextField {
 	}
 
 	protected function getInputWidget( $params ) {
-		$this->mParent->getOutput()->addModules( 'mediawiki.widgets' );
 		if ( $this->mParams['namespace'] !== false ) {
 			$params['namespace'] = $this->mParams['namespace'];
 		}
@@ -81,6 +80,15 @@ class HTMLTitleTextField extends HTMLTextField {
 		return new TitleInputWidget( $params );
 	}
 
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
+
+	protected function getOOUIModules() {
+		// FIXME: TitleInputWidget should be in its own module
+		return [ 'mediawiki.widgets' ];
+	}
+
 	public function getInputHtml( $value ) {
 		// add mw-searchInput class to enable search suggestions for non-OOUI, too
 		$this->mClass .= 'mw-searchInput';
diff --git a/includes/htmlform/fields/HTMLUserTextField.php b/includes/htmlform/fields/HTMLUserTextField.php
index 5a7e0b9b85..14b5e59573 100644
--- a/includes/htmlform/fields/HTMLUserTextField.php
+++ b/includes/htmlform/fields/HTMLUserTextField.php
@@ -40,11 +40,17 @@ class HTMLUserTextField extends HTMLTextField {
 	}
 
 	protected function getInputWidget( $params ) {
-		$this->mParent->getOutput()->addModules( 'mediawiki.widgets.UserInputWidget' );
-
 		return new UserInputWidget( $params );
 	}
 
+	protected function shouldInfuseOOUI() {
+		return true;
+	}
+
+	protected function getOOUIModules() {
+		return [ 'mediawiki.widgets.UserInputWidget' ];
+	}
+
 	public function getInputHtml( $value ) {
 		// add the required module and css class for user suggestions in non-OOUI mode
 		$this->mParent->getOutput()->addModules( 'mediawiki.userSuggest' );
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 5e3758daf0..d508d7689d 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -294,10 +294,6 @@ abstract class Installer {
 			'url' => 'https://creativecommons.org/publicdomain/zero/1.0/',
 			'icon' => '$wgResourceBasePath/resources/assets/licenses/cc-0.png',
 		],
-		'pd' => [
-			'url' => '',
-			'icon' => '$wgResourceBasePath/resources/assets/licenses/public-domain.png',
-		],
 		'gfdl' => [
 			'url' => 'https://www.gnu.org/copyleft/fdl.html',
 			'icon' => '$wgResourceBasePath/resources/assets/licenses/gnu-fdl.png',
diff --git a/includes/installer/i18n/hu.json b/includes/installer/i18n/hu.json
index f97b6dc46c..cc197c859d 100644
--- a/includes/installer/i18n/hu.json
+++ b/includes/installer/i18n/hu.json
@@ -56,8 +56,8 @@
 	"config-env-php": "A PHP verziója: $1",
 	"config-env-hhvm": "HHVM verziója: $1",
 	"config-unicode-using-intl": "A rendszer Unicode normalizálására az [http://pecl.php.net/intl intl PECL kiterjesztést] használja.",
-	"config-unicode-pure-php-warning": "'''Figyelmeztetés''': Az Unicode normalizáláshoz szükséges [http://pecl.php.net/intl intl PECL kiterjesztés] nem érhető el, helyette a lassú, PHP alapú implementáció lesz használva.\nHa nagy látogatottságú oldalt üzemeltetsz, itt találhatsz további információkat [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations a témáról].",
-	"config-unicode-update-warning": "'''Figyelmeztetés''': Az Unicode normalizáláshoz szükséges burkolókönyvtár [http://site.icu-project.org/ ICU projekt] függvénykönyvtárának régebbi változatát használja.\nHa ügyelni kívánsz a Unicode használatára, fontold meg a [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations frissítését].",
+	"config-unicode-pure-php-warning": "<strong>Figyelmeztetés:</strong> Az Unicode normalizáláshoz szükséges [http://pecl.php.net/intl intl PECL kiterjesztés] nem érhető el, helyette a lassú, PHP-alapú implementáció lesz használatban.\nHa nagy látogatottságú oldalt üzemeltetsz, [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations itt] találhatsz további információkat a témáról.",
+	"config-unicode-update-warning": "<strong>Figyelmeztetés:</strong> Az Unicode normalizáláshoz szükséges burkolókönyvtár [http://site.icu-project.org/ ICU projekt] függvénykönyvtárának régebbi változatát használja.\nHa ügyelni kívánsz a Unicode használatára, fontold meg a [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations frissítését].",
 	"config-no-db": "Nem sikerült egyetlen használható adatbázis-illesztőprogramot sem találni. Telepítened kell egyet a PHP-hez.\nA következő {{PLURAL:$2|adatbázistípus támogatott|adatbázistípusok támogatottak}}: $1.\n\nHa a PHP-t magad fordítottad, konfiguráld újra úgy, hogy engedélyezve legyen egy adatbáziskliens, pl. a <code>./configure --with-mysql</code> parancs használatával.\nHa a PHP-t Debian vagy Ubuntu csomaggal telepítetted, akkor szükséged lesz például a php5-mysql csomagra is.",
 	"config-outdated-sqlite": "<strong>Figyelmeztetés:</strong> SQLite $1 verziód van, ami alacsonyabb a legalább szükséges $2 verziónál. Az SQLite nem lesz elérhető.",
 	"config-no-fts3": "'''Figyelmeztetés''': Az SQLite [//sqlite.org/fts3.html FTS3 modul] nélkül lett fordítva, a keresési funkciók nem fognak működni ezen a rendszeren.",
@@ -176,7 +176,7 @@
 	"config-ns-site-name": "Ugyanaz, mint a wiki neve: $1",
 	"config-ns-other": "Más (meg kell adni)",
 	"config-ns-other-default": "SajátWiki",
-	"config-project-namespace-help": "A Wikipédia példáját követve számos wiki elkülöníti egy '''projekt névtérbe''' az irányelveit a tartalommal rendelkező lapoktól\nAz ebben a névtérben található lapok nevei egy előtaggal kezdődnek, amit itt adhatsz meg.\nÁltalában az előtag a wiki nevéből származik, de nem tartalmazhat írásjeleket, például „#”-t vagy „:”-t.",
+	"config-project-namespace-help": "A Wikipédia példáját követve számos wiki elkülöníti az irányelveit a tartalmi lapoktól egy '''projektnévtérbe'''.\nAz ebben a névtérben található lapok nevei egy előtaggal kezdődnek, amit itt adhatsz meg.\nÁltalában az előtag a wiki nevéből származik, de nem tartalmazhat írásjeleket, például „#”-t vagy „:”-t.",
 	"config-ns-invalid": "A megadott névtér („<nowiki>$1</nowiki>”) érvénytelen.\nVálassz másik projektnévteret!",
 	"config-ns-conflict": "A megadott névtér („<nowiki>$1</nowiki>”) ütközik az egyik alapértelmezett MediaWiki-névtérrel.\nVálassz másik projektnévteret!",
 	"config-admin-box": "Adminisztrátori fiók",
@@ -236,7 +236,7 @@
 	"config-logo": "A logó URL-címe:",
 	"config-logo-help": "A MediaWiki alapértelmezett felülete helyet ad egy 135×160 pixeles logónak a bal felső sarokban.\nTölts fel egy megfelelő méretű képet, majd írd be ide az URL-címét!\n\nHasználhatsz  <code>$wgStylePath</code>-t vagy <code>$wgScriptPath</code>-t, ha más méretű a logód.\n\nHa nem szeretnél logót használni, egyszerűen hagyd üresen a mezőt.",
 	"config-instantcommons": "Instant Commons engedélyezése",
-	"config-instantcommons-help": "Az [https://www.mediawiki.org/wiki/InstantCommons Instant Commons] lehetővé teszi, hogy a wikin használhassák a [https://commons.wikimedia.org/ Wikimedia Commons] oldalon található képeket, hangokat és más médiafájlokat.\nA használatához a MediaWikinek internethozzáférésre van szüksége.\n\nA funkcióról és hogy hogyan állítható be más wikik esetén [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgForeignFileRepos a kézikönyvben] találhatsz további információkat.",
+	"config-instantcommons-help": "Az [https://www.mediawiki.org/wiki/InstantCommons Instant Commons] lehetővé teszi, hogy a wikin használhassák a [https://commons.wikimedia.org/ Wikimédia Commons] oldalon található képeket, hangokat és más médiafájlokat.\nA használatához a MediaWikinek internet-hozzáférésre van szüksége.\n\nA funkcióról és hogy hogyan állítható be más wikik esetén [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgForeignFileRepos a kézikönyvben] találhatsz további információkat.",
 	"config-cc-error": "A Creative Commons-licencválasztó nem tért vissza eredménnyel.\nAdd meg kézzel a licencet.",
 	"config-cc-again": "Válassz újra…",
 	"config-cc-not-chosen": "Válaszd ki a kívánt Creative Commons licencet, majd kattints a „proceed”!",
@@ -294,12 +294,12 @@
 	"config-install-mainpage": "Kezdőlap létrehozása az alapértelmezett tartalommal",
 	"config-install-extension-tables": "Táblák létrehozása az engedélyezett kiterjesztésekhez",
 	"config-install-mainpage-failed": "Nemsikerült létrehozni a kezdőlapot: $1",
-	"config-install-done": "'''Gratulálunk!'''\nA MediaWiki telepítése sikeresen befejeződött.\n\nA telepítő elkészítette a <code>LocalSettings.php</code> fájlt, amely tartalmazza az összes beállítást.\n\nEzt le kell tölteni, majd elhelyezni a wiki telepítési könyvtárába (az a könyvtár, ahol az index.php is található).\n\nA letöltés automatikusan elindul. Ha mégsem indulna el, vagy megszakítottad, az alábbi linkre kattintva újra letöltheted:\n\n$3\n\n'''Megjegyzés''': Ha ezt most nem teszed meg, és kilépsz a telepítésből, az elkészített konfigurációs fájlt nem tudod elérni a későbbiekben.\n\nHa végeztél a fájl elhelyezésével, '''[$2 beléphetsz a wikibe]'''.",
+	"config-install-done": "<strong>Gratulálunk!</strong>\nA MediaWiki telepítése sikeresen befejeződött.\n\nA telepítő elkészítette a <code>LocalSettings.php</code> fájlt, amely tartalmazza az összes beállítást.\n\nEzt le kell tölteni, majd elhelyezni a wiki telepítési könyvtárába (az a könyvtár, ahol az index.php is található).\n\nA letöltés automatikusan elindul. Ha mégsem indulna el, vagy megszakítottad, az alábbi linkre kattintva újra letöltheted:\n\n$3\n\n<strong>Megjegyzés:</strong> Ha ezt most nem teszed meg, és kilépsz a telepítésből, az elkészített konfigurációs fájlt nem tudod elérni a későbbiekben.\n\nHa végeztél a fájl elhelyezésével, <strong>[$2 beléphetsz a wikibe]</strong>.",
 	"config-download-localsettings": "<code>LocalSettings.php</code> letöltése",
 	"config-help": "segítség",
 	"config-help-tooltip": "kattints a kibontáshoz",
 	"config-nofile": "\"$1\" fájl nem található. Törölve lett?",
 	"config-extension-link": "Tudtad, hogy a wikid támogat [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions kiterjesztéseket]?\n\nBöngészhetsz [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category kiterjesztéseket kategóriánként] vagy válogathatsz a [https://www.mediawiki.org/wiki/Extension_Matrix kiterjesztésmátrixból] az összes kiterjesztés áttekintéséhez.",
-	"mainpagetext": "'''A MediaWiki telepítése sikeresen befejeződött.'''",
+	"mainpagetext": "<strong>A MediaWiki telepítése sikeresen befejeződött.</strong>",
 	"mainpagedocfooter": "Ha segítségre van szükséged a wikiszoftver használatához, akkor keresd fel a [https://meta.wikimedia.org/wiki/Help:Contents User's Guide] oldalt.\n\n== Alapok (angol nyelven) ==\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Beállítások listája]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki GyIK]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki-kiadások levelezőlistája]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources A MediaWiki fordítása a saját nyelvedre]"
 }
diff --git a/includes/installer/i18n/lt.json b/includes/installer/i18n/lt.json
index fcba685ca3..22cceb42a9 100644
--- a/includes/installer/i18n/lt.json
+++ b/includes/installer/i18n/lt.json
@@ -98,6 +98,7 @@
 	"config-mysql-innodb": "InnoDB",
 	"config-mysql-myisam": "MyISAM",
 	"config-mysql-charset": "Duomenų bazės simbolių rinkinys:",
+	"config-mysql-binary": "Dvejetainis",
 	"config-mysql-utf8": "UTF-8",
 	"config-mssql-auth": "Autentifikavimo tipas:",
 	"config-mssql-sqlauth": "SQL Serverio autentifikavimas",
@@ -149,14 +150,24 @@
 	"config-install-user": "Kuriamas duomenų bazės naudotojas",
 	"config-install-user-alreadyexists": "Naudotojas „$1“ jau yra",
 	"config-install-user-create-failed": "Nepavyko sukurti naudotojo „$1“: $2",
+	"config-install-user-missing": "Nurodytas vartotojas „$1“ neegzistuoja.",
+	"config-install-user-missing-create": "Nurodytas vartotojas „$1“ neegzistuoja.\nPrašome pažymėti „sukurti paskyrą“ laukelį žemiau jei norite jį sukurti.",
 	"config-install-tables": "Kuriamos lentelės",
+	"config-install-tables-exist": "<strong>Įspėjimas:</strong> MediaWiki lentelės, atrodo, jau egzistuoja.\nKūrimas praleidžiamas.",
+	"config-install-tables-failed": "<strong>Klaida:</strong> Lentelės sukūrimas nepavyko dėl šios klaidos: $1",
+	"config-install-interwiki-list": "Nepavyko perskaityti failo <code>interwiki.list</code>.",
+	"config-install-interwiki-exists": "<strong>Įspėjimas:</strong> Interwiki lentelė, atrodo, jau turi įrašų.\nNumatytasis sąrašas praleidžiamas.",
 	"config-install-stats": "Inicijuojamos statistikos",
 	"config-install-keys": "Generuojami slapti raktai",
+	"config-install-sysop": "Administratoriaus vartotojo paskyra kuriama",
+	"config-install-mainpage": "Kuriamas pagrindinis puslapis su numatytu turiniu",
+	"config-install-extension-tables": "Kuriamos lentelės įgalintiems plėtiniams",
+	"config-install-mainpage-failed": "Nepavyko įterpti pagrindinio puslapio: $1",
 	"config-install-done": "'''Sveikiname!'''\nJūs sėkmingai įdiegėte MediaWiki.\n\nĮdiegimo programa sukūrė <code>LocalSettings.php</code> failą.\nJame yra visos jūsų konfigūracijos.\n\nJums reikės atsisiųsti ir įdėti jį į savo wiki įdiegimo bazę (pačiame kataloge, kaip index.php). Atsisiuntimas turėtų prasidėti automatiškai.\n\nJei atsisiuntimas nebuvo pasiūlytas, arba jį atšaukėte, galite iš naujo atsisiųsti paspaudę žemiau esančią nuorodą:\n\n$3\n\n'''Pastaba:''' Jei jūs to nepadarysite dabar, tada šis sukurtas konfigūracijos failas nebus galimas vėliau, jei išeisite iš įdiegimo be atsisiuntimo.\n\nKai baigsite, jūs galėsite '''[$2 įeiti į savo viki]'''.",
 	"config-download-localsettings": "Atsisiųsti <code>LocalSettings.php</code>",
 	"config-help": "pagalba",
 	"config-help-tooltip": "spustelėkite išplėtimui",
 	"config-nofile": "Failas \"$1\" nerastas. Ar jis buvo ištrintas?",
-	"mainpagetext": "'''MediaWiki sėkmingai įdiegta.'''",
+	"mainpagetext": "<strong>MediaWiki sėkmingai įdiegta.</strong>",
 	"mainpagedocfooter": "Informacijos apie wiki programinės įrangos naudojimą, ieškokite [https://meta.wikimedia.org/wiki/Help:Contents žinyne].\n\n== Pradžiai ==\n\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Konfigūracijos nustatymų sąrašas]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki DUK]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce MediaWiki pranešimai paštu apie naujas versijas]"
 }
diff --git a/includes/installer/i18n/vi.json b/includes/installer/i18n/vi.json
index f2f56d0803..08aa8c1ad9 100644
--- a/includes/installer/i18n/vi.json
+++ b/includes/installer/i18n/vi.json
@@ -200,6 +200,7 @@
 	"config-subscribe": "Theo dõi [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce danh sách thư thông báo phát hành].",
 	"config-subscribe-help": "thông báo an ninh.\nBạn nên đồng ý với nó và cập nhật bản cài đặt MediaWiki của bạn khi phiên bản mới xuất hiện.",
 	"config-subscribe-noemail": "Bạn đã cố gắng để đăng ký vào danh sách thư thông báo phát hành mà không cung cấp một địa chỉ thư điện tử nào cả.\nVui lòng cung cấp một địa chỉ thư điện tử nếu bạn muốn đăng ký vào danh sách thư.",
+	"config-pingback": "Chia sẻ dữ liệu về bản cài đặt này với nhóm phát triển MediaWiki.",
 	"config-almost-done": "Bạn gần như đã hoàn tất!\nBây giờ bạn có thể bỏ qua cấu hình còn lại và cài đặt wiki ngay bây giờ.",
 	"config-optional-continue": "Hỏi tôi về thêm chi tiết.",
 	"config-optional-skip": "Chán quá, cài đặt wiki rỗi.",
diff --git a/includes/jobqueue/JobQueueDB.php b/includes/jobqueue/JobQueueDB.php
index 479ec3289c..3a1da13645 100644
--- a/includes/jobqueue/JobQueueDB.php
+++ b/includes/jobqueue/JobQueueDB.php
@@ -245,10 +245,7 @@ class JobQueueDB extends JobQueue {
 				count( $rowSet ) + count( $rowList ) - count( $rows )
 			);
 		} catch ( DBError $e ) {
-			if ( $flags & self::QOS_ATOMIC ) {
-				$dbw->rollback( $method );
-			}
-			throw $e;
+			$this->throwDBException( $e );
 		}
 		if ( $flags & self::QOS_ATOMIC ) {
 			$dbw->endAtomic( $method );
@@ -264,7 +261,6 @@ class JobQueueDB extends JobQueue {
 	protected function doPop() {
 		$dbw = $this->getMasterDB();
 		try {
-			$dbw->commit( __METHOD__, 'flush' ); // flush existing transaction
 			$autoTrx = $dbw->getFlag( DBO_TRX ); // get current setting
 			$dbw->clearFlag( DBO_TRX ); // make each query its own transaction
 			$scopedReset = new ScopedCallback( function () use ( $dbw, $autoTrx ) {
@@ -460,7 +456,6 @@ class JobQueueDB extends JobQueue {
 
 		$dbw = $this->getMasterDB();
 		try {
-			$dbw->commit( __METHOD__, 'flush' ); // flush existing transaction
 			$autoTrx = $dbw->getFlag( DBO_TRX ); // get current setting
 			$dbw->clearFlag( DBO_TRX ); // make each query its own transaction
 			$scopedReset = new ScopedCallback( function () use ( $dbw, $autoTrx ) {
diff --git a/includes/jobqueue/JobRunner.php b/includes/jobqueue/JobRunner.php
index a132dc5204..5f48dca3da 100644
--- a/includes/jobqueue/JobRunner.php
+++ b/includes/jobqueue/JobRunner.php
@@ -21,6 +21,7 @@
  * @ingroup JobQueue
  */
 
+use MediaWiki\MediaWikiServices;
 use MediaWiki\Logger\LoggerFactory;
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
@@ -122,7 +123,8 @@ class JobRunner implements LoggerAwareInterface {
 		}
 
 		// Flush any pending DB writes for sanity
-		wfGetLBFactory()->commitAll( __METHOD__ );
+		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+		$lbFactory->commitAll( __METHOD__ );
 
 		// Catch huge single updates that lead to slave lag
 		$trxProfiler = Profiler::instance()->getTransactionProfiler();
@@ -176,9 +178,11 @@ class JobRunner implements LoggerAwareInterface {
 					$backoffs = $this->syncBackoffDeltas( $backoffs, $backoffDeltas, $wait );
 				}
 
+				$lbFactory->commitMasterChanges( __METHOD__ ); // flush any JobQueueDB writes
 				$info = $this->executeJob( $job, $stats, $popTime );
 				if ( $info['status'] !== false || !$job->allowRetries() ) {
 					$group->ack( $job ); // succeeded or job cannot be retried
+					$lbFactory->commitMasterChanges( __METHOD__ ); // flush any JobQueueDB writes
 				}
 
 				// Back off of certain jobs for a while (for throttling and for errors)
@@ -212,7 +216,7 @@ class JobRunner implements LoggerAwareInterface {
 				$timePassed = microtime( true ) - $lastCheckTime;
 				if ( $timePassed >= self::LAG_CHECK_PERIOD || $timePassed < 0 ) {
 					try {
-						wfGetLBFactory()->waitForReplication( [
+						$lbFactory->waitForReplication( [
 							'ifWritesSince' => $lastCheckTime,
 							'timeout' => self::MAX_ALLOWED_LAG
 						] );
@@ -257,6 +261,7 @@ class JobRunner implements LoggerAwareInterface {
 		$msg = $job->toString() . " STARTING";
 		$this->logger->debug( $msg );
 		$this->debugCallback( $msg );
+		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 
 		// Run the job...
 		$rssStart = $this->getMaxRssKb();
@@ -284,7 +289,7 @@ class JobRunner implements LoggerAwareInterface {
 		// Commit all outstanding connections that are in a transaction
 		// to get a fresh repeatable read snapshot on every connection.
 		// Note that jobs are still responsible for handling slave lag.
-		wfGetLBFactory()->commitAll( __METHOD__ );
+		$lbFactory->commitAll( __METHOD__ );
 		// Clear out title cache data from prior snapshots
 		LinkCache::singleton()->clear();
 		$timeMs = intval( ( microtime( true ) - $jobStartTime ) * 1000 );
@@ -522,23 +527,12 @@ class JobRunner implements LoggerAwareInterface {
 			// This will trigger a rollback in the main loop
 			throw new DBError( $dbwSerial, "Timed out waiting on commit queue." );
 		}
-		// Wait for the generic slave to catch up
+		// Wait for the slave DBs to catch up
 		$pos = $lb->getMasterPos();
 		if ( $pos ) {
-			$lb->waitForOne( $pos );
+			$lb->waitForAll( $pos );
 		}
 
-		$fname = __METHOD__;
-		// Re-ping all masters with transactions. This throws DBError if some
-		// connection died while waiting on locks/slaves, triggering a rollback.
-		wfGetLBFactory()->forEachLB( function( LoadBalancer $lb ) use ( $fname ) {
-			$lb->forEachOpenConnection( function( IDatabase $conn ) use ( $fname ) {
-				if ( $conn->writesOrCallbacksPending() ) {
-					$conn->ping();
-				}
-			} );
-		} );
-
 		// Actually commit the DB master changes
 		wfGetLBFactory()->commitMasterChanges( __METHOD__ );
 
diff --git a/includes/jobqueue/jobs/AssembleUploadChunksJob.php b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
index 1e804c4575..060cabb627 100644
--- a/includes/jobqueue/jobs/AssembleUploadChunksJob.php
+++ b/includes/jobqueue/jobs/AssembleUploadChunksJob.php
@@ -73,8 +73,12 @@ class AssembleUploadChunksJob extends Job {
 				return false;
 			}
 
+			// We can only get warnings like 'duplicate' after concatenating the chunks
+			$status = Status::newGood();
+			$status->value = [ 'warnings' => $upload->checkWarnings() ];
+
 			// We have a new filekey for the fully concatenated file
-			$newFileKey = $upload->getLocalFile()->getFileKey();
+			$newFileKey = $upload->getStashFile()->getFileKey();
 
 			// Remove the old stash file row and first chunk file
 			$upload->stash->removeFileNoAuth( $this->params['filekey'] );
@@ -95,7 +99,7 @@ class AssembleUploadChunksJob extends Job {
 					'stage' => 'assembling',
 					'filekey' => $newFileKey,
 					'imageinfo' => $imageInfo,
-					'status' => Status::newGood()
+					'status' => $status
 				]
 			);
 		} catch ( Exception $e ) {
diff --git a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
index 57e69b422d..b561021b29 100644
--- a/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
+++ b/includes/jobqueue/jobs/CategoryMembershipChangeJob.php
@@ -64,7 +64,7 @@ class CategoryMembershipChangeJob extends Job {
 			return false;
 		}
 		// Clear any stale REPEATABLE-READ snapshot
-		$dbr->commit( __METHOD__, 'flush' );
+		wfGetLBFactory()->commitAll( __METHOD__ );
 
 		$cutoffUnix = wfTimestamp( TS_UNIX, $this->params['revTimestamp'] );
 		// Using ENQUEUE_FUDGE_SEC handles jobs inserted out of revision order due to the delay
@@ -157,6 +157,9 @@ class CategoryMembershipChangeJob extends Job {
 		}
 
 		$dbw = wfGetDB( DB_MASTER );
+		$factory = wfGetLBFactory();
+		$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
+
 		$catMembChange = new CategoryMembershipChange( $title, $newRev );
 		$catMembChange->checkTemplateLinks();
 
@@ -167,8 +170,7 @@ class CategoryMembershipChangeJob extends Job {
 			$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
 			$catMembChange->triggerCategoryAddedNotification( $categoryTitle );
 			if ( $insertCount++ && ( $insertCount % $batchSize ) == 0 ) {
-				$dbw->commit( __METHOD__, 'flush' );
-				wfGetLBFactory()->waitForReplication();
+				$factory->commitAndWaitForReplication( __METHOD__, $ticket );
 			}
 		}
 
@@ -176,8 +178,7 @@ class CategoryMembershipChangeJob extends Job {
 			$categoryTitle = Title::makeTitle( NS_CATEGORY, $categoryName );
 			$catMembChange->triggerCategoryRemovedNotification( $categoryTitle );
 			if ( $insertCount++ && ( $insertCount++ % $batchSize ) == 0 ) {
-				$dbw->commit( __METHOD__, 'flush' );
-				wfGetLBFactory()->waitForReplication();
+				$factory->commitAndWaitForReplication( __METHOD__, $ticket );
 			}
 		}
 	}
diff --git a/includes/jobqueue/jobs/DeleteLinksJob.php b/includes/jobqueue/jobs/DeleteLinksJob.php
index f39f8fde05..8d565bd1d9 100644
--- a/includes/jobqueue/jobs/DeleteLinksJob.php
+++ b/includes/jobqueue/jobs/DeleteLinksJob.php
@@ -20,6 +20,7 @@
  * @file
  * @ingroup JobQueue
  */
+use \MediaWiki\MediaWikiServices;
 
 /**
  * Job to prune link tables for pages that were deleted
@@ -52,10 +53,12 @@ class DeleteLinksJob extends Job {
 			return false;
 		}
 
+		$factory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
 		$timestamp = isset( $this->params['timestamp'] ) ? $this->params['timestamp'] : null;
-
 		$page = WikiPage::factory( $this->title ); // title when deleted
+
 		$update = new LinksDeletionUpdate( $page, $pageId, $timestamp );
+		$update->setTransactionTicket( $factory->getEmptyTransactionTicket( __METHOD__ ) );
 		DataUpdate::runUpdates( [ $update ] );
 
 		return true;
diff --git a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
index a14cdd7bab..f09ba57b53 100644
--- a/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
+++ b/includes/jobqueue/jobs/HTMLCacheUpdateJob.php
@@ -113,11 +113,12 @@ class HTMLCacheUpdateJob extends Job {
 		$touchTimestamp = wfTimestampNow();
 
 		$dbw = wfGetDB( DB_MASTER );
+		$factory = wfGetLBFactory();
+		$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 		// Update page_touched (skipping pages already touched since the root job).
 		// Check $wgUpdateRowsPerQuery for sanity; batch jobs are sized by that already.
 		foreach ( array_chunk( $pageIds, $wgUpdateRowsPerQuery ) as $batch ) {
-			$dbw->commit( __METHOD__, 'flush' );
-			wfGetLBFactory()->waitForReplication();
+			$factory->commitAndWaitForReplication( __METHOD__, $ticket );
 
 			$dbw->update( 'page',
 				[ 'page_touched' => $dbw->timestamp( $touchTimestamp ) ],
diff --git a/includes/jobqueue/jobs/RecentChangesUpdateJob.php b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
index fbc1572512..2fd3899f9f 100644
--- a/includes/jobqueue/jobs/RecentChangesUpdateJob.php
+++ b/includes/jobqueue/jobs/RecentChangesUpdateJob.php
@@ -81,6 +81,8 @@ class RecentChangesUpdateJob extends Job {
 			return; // already in progress
 		}
 
+		$factory = wfGetLBFactory();
+		$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 		$cutoff = $dbw->timestamp( time() - $wgRCMaxAge );
 		do {
 			$rcIds = $dbw->selectFieldValues( 'recentchanges',
@@ -91,14 +93,11 @@ class RecentChangesUpdateJob extends Job {
 			);
 			if ( $rcIds ) {
 				$dbw->delete( 'recentchanges', [ 'rc_id' => $rcIds ], __METHOD__ );
-			}
-			// Commit in chunks to avoid slave lag
-			$dbw->commit( __METHOD__, 'flush' );
-
-			if ( count( $rcIds ) === $wgUpdateRowsPerQuery ) {
 				// There might be more, so try waiting for slaves
 				try {
-					wfGetLBFactory()->waitForReplication( [ 'timeout' => 3 ] );
+					$factory->commitAndWaitForReplication(
+						__METHOD__, $ticket, [ 'timeout' => 3 ]
+					);
 				} catch ( DBReplicationWaitError $e ) {
 					// Another job will continue anyway
 					break;
@@ -121,6 +120,8 @@ class RecentChangesUpdateJob extends Job {
 		// JobRunner uses DBO_TRX, but doesn't call begin/commit itself;
 		// onTransactionIdle() will run immediately since there is no trx.
 		$dbw->onTransactionIdle( function() use ( $dbw, $days, $window ) {
+			$factory = wfGetLBFactory();
+			$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 			// Avoid disconnect/ping() cycle that makes locks fall off
 			$dbw->setSessionOptions( [ 'connTimeout' => 900 ] );
 
@@ -204,7 +205,7 @@ class RecentChangesUpdateJob extends Job {
 				}
 				foreach ( array_chunk( $newRows, 500 ) as $rowBatch ) {
 					$dbw->insert( 'querycachetwo', $rowBatch, __METHOD__ );
-					wfGetLBFactory()->waitForReplication();
+					$factory->commitAndWaitForReplication( __METHOD__, $ticket );
 				}
 			}
 
diff --git a/includes/jobqueue/jobs/RefreshLinksJob.php b/includes/jobqueue/jobs/RefreshLinksJob.php
index 8fba72894b..9cdb1617d1 100644
--- a/includes/jobqueue/jobs/RefreshLinksJob.php
+++ b/includes/jobqueue/jobs/RefreshLinksJob.php
@@ -241,7 +241,10 @@ class RefreshLinksJob extends Job {
 			$parserOutput
 		);
 
+		$factory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+		$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 		foreach ( $updates as $key => $update ) {
+			$update->setTransactionTicket( $ticket );
 			// FIXME: This code probably shouldn't be here?
 			// Needed by things like Echo notifications which need
 			// to know which user caused the links update
diff --git a/includes/jobqueue/utils/PurgeJobUtils.php b/includes/jobqueue/utils/PurgeJobUtils.php
new file mode 100644
index 0000000000..329bc23603
--- /dev/null
+++ b/includes/jobqueue/utils/PurgeJobUtils.php
@@ -0,0 +1,71 @@
+<?php
+/**
+ * Base code for update jobs that put some secondary data extracted
+ * from article content into the database.
+ *
+ * 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
+ */
+class PurgeJobUtils {
+	/**
+	 * Invalidate the cache of a list of pages from a single namespace.
+	 * This is intended for use by subclasses.
+	 *
+	 * @param IDatabase $dbw
+	 * @param int $namespace Namespace number
+	 * @param array $dbkeys
+	 */
+	public static function invalidatePages( IDatabase $dbw, $namespace, array $dbkeys ) {
+		if ( $dbkeys === [] ) {
+			return;
+		}
+
+		$dbw->onTransactionPreCommitOrIdle( function() use ( $dbw, $namespace, $dbkeys ) {
+			// Determine which pages need to be updated.
+			// This is necessary to prevent the job queue from smashing the DB with
+			// large numbers of concurrent invalidations of the same page.
+			$now = $dbw->timestamp();
+			$ids = $dbw->selectFieldValues(
+				'page',
+				'page_id',
+				[
+					'page_namespace' => $namespace,
+					'page_title' => $dbkeys,
+					'page_touched < ' . $dbw->addQuotes( $now )
+				],
+				__METHOD__
+			);
+
+			if ( $ids === [] ) {
+				return;
+			}
+
+			// Do the update.
+			// We still need the page_touched condition, in case the row has changed since
+			// the non-locking select above.
+			$dbw->update(
+				'page',
+				[ 'page_touched' => $now ],
+				[
+					'page_id' => $ids,
+					'page_touched < ' . $dbw->addQuotes( $now )
+				],
+				__METHOD__
+			);
+		} );
+	}
+}
diff --git a/includes/libs/ProcessCacheLRU.php b/includes/libs/ProcessCacheLRU.php
index 5a933914c6..03e23edbb7 100644
--- a/includes/libs/ProcessCacheLRU.php
+++ b/includes/libs/ProcessCacheLRU.php
@@ -149,4 +149,12 @@ class ProcessCacheLRU {
 		unset( $this->cache[$key] );
 		$this->cache[$key] = $item;
 	}
+
+	/**
+	 * Get cache size
+	 * @return int
+	 */
+	public function getSize() {
+		return $this->maxCacheKeys;
+	}
 }
diff --git a/includes/libs/objectcache/EmptyBagOStuff.php b/includes/libs/objectcache/EmptyBagOStuff.php
index 408212a1b3..3f66c06c9f 100644
--- a/includes/libs/objectcache/EmptyBagOStuff.php
+++ b/includes/libs/objectcache/EmptyBagOStuff.php
@@ -31,6 +31,10 @@ class EmptyBagOStuff extends BagOStuff {
 		return false;
 	}
 
+	public function add( $key, $value, $exp = 0 ) {
+		return true;
+	}
+
 	public function set( $key, $value, $exp = 0, $flags = 0 ) {
 		return true;
 	}
diff --git a/includes/libs/objectcache/WANObjectCache.php b/includes/libs/objectcache/WANObjectCache.php
index 143042cfde..c40c819861 100644
--- a/includes/libs/objectcache/WANObjectCache.php
+++ b/includes/libs/objectcache/WANObjectCache.php
@@ -33,6 +33,7 @@ use Psr\Log\NullLogger;
  * This class is intended for caching data from primary stores.
  * If the get() method does not return a value, then the caller
  * should query the new value and backfill the cache using set().
+ * The preferred way to do this logic is through getWithSetCallback().
  * When querying the store on cache miss, the closest DB replica
  * should be used. Try to avoid heavyweight DB master or quorum reads.
  * When the source data changes, a purge method should be called.
@@ -43,16 +44,23 @@ use Psr\Log\NullLogger;
  *
  * The simplest purge method is delete().
  *
- * Instances of this class must be configured to point to a valid
- * PubSub endpoint, and there must be listeners on the cache servers
- * that subscribe to the endpoint and update the caches.
+ * There are two supported ways to handle broadcasted operations:
+ *   - a) Configure the 'purge' EventRelayer to point to a valid PubSub endpoint
+ *        that has subscribed listeners on the cache servers applying the cache updates.
+ *   - b) Ignore the 'purge' EventRelayer configuration (default is NullEventRelayer)
+ *        and set up mcrouter as the underlying cache backend, using one of the memcached
+ *        BagOStuff classes as 'cache'. Use OperationSelectorRoute in the mcrouter settings
+ *        to configure 'set' and 'delete' operations to go to all DCs via AllAsyncRoute and
+ *        configure other operations to go to the local DC via PoolRoute (for reference,
+ *        see https://github.com/facebook/mcrouter/wiki/List-of-Route-Handles).
  *
- * Broadcasted operations like delete() and touchCheckKey() are done
- * synchronously in the local datacenter, but are relayed asynchronously.
- * This means that callers in other datacenters will see older values
- * for however many milliseconds the datacenters are apart. As with
- * any cache, this should not be relied on for cases where reads are
- * used to determine writes to source (e.g. non-cache) data stores.
+ * Broadcasted operations like delete() and touchCheckKey() are done asynchronously
+ * in all datacenters this way, though the local one should likely be near immediate.
+ *
+ * This means that callers in all datacenters may see older values for however many
+ * milliseconds that the purge took to reach that datacenter. As with any cache, this
+ * should not be relied on for cases where reads are used to determine writes to source
+ * (e.g. non-cache) data stores, except when reading immutable data.
  *
  * All values are wrapped in metadata arrays. Keys use a "WANCache:" prefix
  * to avoid collisions with keys that are not wrapped as metadata arrays. The
@@ -60,6 +68,7 @@ use Psr\Log\NullLogger;
  *   - a) "WANCache:v" : used for regular value keys
  *   - b) "WANCache:i" : used for temporarily storing values of tombstoned keys
  *   - c) "WANCache:t" : used for storing timestamp "check" keys
+ *   - d) "WANCache:m" : used for temporary mutex keys to avoid cache stampedes
  *
  * @ingroup Cache
  * @since 1.26
@@ -129,6 +138,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	const VALUE_KEY_PREFIX = 'WANCache:v:';
 	const INTERIM_KEY_PREFIX = 'WANCache:i:';
 	const TIME_KEY_PREFIX = 'WANCache:t:';
+	const MUTEX_KEY_PREFIX = 'WANCache:m:';
 
 	const PURGE_VAL_PREFIX = 'PURGED:';
 
@@ -456,8 +466,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 *
 	 * When using potentially long-running ACID transactions, a good pattern is
 	 * to use a pre-commit hook to issue the delete. This means that immediately
-	 * after commit, callers will see the tombstone in cache in the local datacenter
-	 * and in the others upon relay. It also avoids the following race condition:
+	 * after commit, callers will see the tombstone in cache upon purge relay.
+	 * It also avoids the following race condition:
 	 *   - a) T1 begins, changes a row, and calls delete()
 	 *   - b) The HOLDOFF_TTL passes, expiring the delete() tombstone
 	 *   - c) T2 starts, reads the row and calls set() due to a cache miss
@@ -495,18 +505,11 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 		$key = self::VALUE_KEY_PREFIX . $key;
 
 		if ( $ttl <= 0 ) {
-			// Update the local datacenter immediately
-			$ok = $this->cache->delete( $key );
 			// Publish the purge to all datacenters
-			$ok = $this->relayDelete( $key ) && $ok;
+			$ok = $this->relayDelete( $key );
 		} else {
-			// Update the local datacenter immediately
-			$ok = $this->cache->set( $key,
-				$this->makePurgeValue( microtime( true ), self::HOLDOFF_NONE ),
-				$ttl
-			);
 			// Publish the purge to all datacenters
-			$ok = $this->relayPurge( $key, $ttl, self::HOLDOFF_NONE ) && $ok;
+			$ok = $this->relayPurge( $key, $ttl, self::HOLDOFF_NONE );
 		}
 
 		return $ok;
@@ -559,8 +562,9 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * keys, the relevant "check" keys must be supplied for this to work.
 	 *
 	 * The "check" key essentially represents a last-modified field.
-	 * When touched, keys using it via get(), getMulti(), or getWithSetCallback()
-	 * will be invalidated. It is treated as being HOLDOFF_TTL seconds in the future
+	 * When touched, the field will be updated on all cache servers.
+	 * Keys using it via get(), getMulti(), or getWithSetCallback() will
+	 * be invalidated. It is treated as being HOLDOFF_TTL seconds in the future
 	 * by those methods to avoid race conditions where dependent keys get updated
 	 * with stale values (e.g. from a DB slave).
 	 *
@@ -569,7 +573,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * When a few important keys get a large number of hits, a high cache
 	 * time is usually desired as well as "lockTSE" logic. The resetCheckKey()
 	 * method is less appropriate in such cases since the "time since expiry"
-	 * cannot be inferred.
+	 * cannot be inferred, causing any get() after the reset to treat the key
+	 * as being "hot", resulting in more stale value usage.
 	 *
 	 * Note that "check" keys won't collide with other regular keys.
 	 *
@@ -582,14 +587,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * @return bool True if the item was purged or not found, false on failure
 	 */
 	final public function touchCheckKey( $key, $holdoff = self::HOLDOFF_TTL ) {
-		$key = self::TIME_KEY_PREFIX . $key;
-		// Update the local datacenter immediately
-		$ok = $this->cache->set( $key,
-			$this->makePurgeValue( microtime( true ), $holdoff ),
-			self::CHECK_KEY_TTL
-		);
 		// Publish the purge to all datacenters
-		return $this->relayPurge( $key, self::CHECK_KEY_TTL, $holdoff ) && $ok;
+		return $this->relayPurge( self::TIME_KEY_PREFIX . $key, self::CHECK_KEY_TTL, $holdoff );
 	}
 
 	/**
@@ -597,11 +596,14 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 *
 	 * This is similar to touchCheckKey() in that keys using it via get(), getMulti(),
 	 * or getWithSetCallback() will be invalidated. The differences are:
-	 *   - a) The timestamp will be deleted from all caches and lazily
+	 *   - a) The "check" key will be deleted from all caches and lazily
 	 *        re-initialized when accessed (rather than set everywhere)
 	 *   - b) Thus, dependent keys will be known to be invalid, but not
 	 *        for how long (they are treated as "just" purged), which
 	 *        effects any lockTSE logic in getWithSetCallback()
+	 *   - c) Since "check" keys are initialized only on the server the key hashes
+	 *        to, any temporary ejection of that server will cause the value to be
+	 *        seen as purged as a new server will initialize the "check" key.
 	 *
 	 * The advantage is that this does not place high TTL keys on every cache
 	 * server, making it better for code that will cache many different keys
@@ -620,11 +622,8 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * @return bool True if the item was purged or not found, false on failure
 	 */
 	final public function resetCheckKey( $key ) {
-		$key = self::TIME_KEY_PREFIX . $key;
-		// Update the local datacenter immediately
-		$ok = $this->cache->delete( $key );
 		// Publish the purge to all datacenters
-		return $this->relayDelete( $key ) && $ok;
+		return $this->relayDelete( self::TIME_KEY_PREFIX . $key );
 	}
 
 	/**
@@ -908,7 +907,7 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 		$lockAcquired = false;
 		if ( $useMutex ) {
 			// Acquire a datacenter-local non-blocking lock
-			if ( $this->cache->lock( $key, 0, self::LOCK_TTL ) ) {
+			if ( $this->cache->add( self::MUTEX_KEY_PREFIX . $key, 1, self::LOCK_TTL ) ) {
 				// Lock acquired; this thread should update the key
 				$lockAcquired = true;
 			} elseif ( $value !== false && $this->isValid( $value, $versioned, $asOf, $minTime ) ) {
@@ -945,11 +944,15 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 		if ( ( $isTombstone && $lockTSE > 0 ) && $value !== false && $ttl >= 0 ) {
 			$tempTTL = max( 1, (int)$lockTSE ); // set() expects seconds
 			$wrapped = $this->wrap( $value, $tempTTL, $asOf );
-			$this->cache->set( self::INTERIM_KEY_PREFIX . $key, $wrapped, $tempTTL );
-		}
-
-		if ( $lockAcquired ) {
-			$this->cache->unlock( $key );
+			// Avoid using set() to avoid pointless mcrouter broadcasting
+			$this->cache->merge(
+				self::INTERIM_KEY_PREFIX . $key,
+				function () use ( $wrapped ) {
+					return $wrapped;
+				},
+				$tempTTL,
+				1
+			);
 		}
 
 		if ( $value !== false && $ttl >= 0 ) {
@@ -958,6 +961,11 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 			$this->set( $key, $value, $ttl, $setOpts );
 		}
 
+		if ( $lockAcquired ) {
+			// Avoid using delete() to avoid pointless mcrouter broadcasting
+			$this->cache->changeTTL( self::MUTEX_KEY_PREFIX . $key, 1 );
+		}
+
 		return $value;
 	}
 
@@ -1045,17 +1053,25 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * @return bool Success
 	 */
 	protected function relayPurge( $key, $ttl, $holdoff ) {
-		$event = $this->cache->modifySimpleRelayEvent( [
-			'cmd' => 'set',
-			'key' => $key,
-			'val' => 'PURGED:$UNIXTIME$:' . (int)$holdoff,
-			'ttl' => max( $ttl, 1 ),
-			'sbt' => true, // substitute $UNIXTIME$ with actual microtime
-		] );
-
-		$ok = $this->purgeRelayer->notify( $this->purgeChannel, $event );
-		if ( !$ok ) {
-			$this->lastRelayError = self::ERR_RELAY;
+		if ( $this->purgeRelayer instanceof EventRelayerNull ) {
+			// This handles the mcrouter and the single-DC case
+			$ok = $this->cache->set( $key,
+				$this->makePurgeValue( microtime( true ), self::HOLDOFF_NONE ),
+				$ttl
+			);
+		} else {
+			$event = $this->cache->modifySimpleRelayEvent( [
+				'cmd' => 'set',
+				'key' => $key,
+				'val' => 'PURGED:$UNIXTIME$:' . (int)$holdoff,
+				'ttl' => max( $ttl, 1 ),
+				'sbt' => true, // substitute $UNIXTIME$ with actual microtime
+			] );
+
+			$ok = $this->purgeRelayer->notify( $this->purgeChannel, $event );
+			if ( !$ok ) {
+				$this->lastRelayError = self::ERR_RELAY;
+			}
 		}
 
 		return $ok;
@@ -1068,14 +1084,19 @@ class WANObjectCache implements IExpiringStore, LoggerAwareInterface {
 	 * @return bool Success
 	 */
 	protected function relayDelete( $key ) {
-		$event = $this->cache->modifySimpleRelayEvent( [
-			'cmd' => 'delete',
-			'key' => $key,
-		] );
-
-		$ok = $this->purgeRelayer->notify( $this->purgeChannel, $event );
-		if ( !$ok ) {
-			$this->lastRelayError = self::ERR_RELAY;
+		if ( $this->purgeRelayer instanceof EventRelayerNull ) {
+			// This handles the mcrouter and the single-DC case
+			$ok = $this->cache->delete( $key );
+		} else {
+			$event = $this->cache->modifySimpleRelayEvent( [
+				'cmd' => 'delete',
+				'key' => $key,
+			] );
+
+			$ok = $this->purgeRelayer->notify( $this->purgeChannel, $event );
+			if ( !$ok ) {
+				$this->lastRelayError = self::ERR_RELAY;
+			}
 		}
 
 		return $ok;
diff --git a/includes/libs/virtualrest/VirtualRESTServiceClient.php b/includes/libs/virtualrest/VirtualRESTServiceClient.php
index f304bd9f45..0864e5c964 100644
--- a/includes/libs/virtualrest/VirtualRESTServiceClient.php
+++ b/includes/libs/virtualrest/VirtualRESTServiceClient.php
@@ -45,9 +45,9 @@
  */
 class VirtualRESTServiceClient {
 	/** @var MultiHttpClient */
-	protected $http;
-	/** @var VirtualRESTService[] Map of (prefix => VirtualRESTService) */
-	protected $instances = [];
+	private $http;
+	/** @var array Map of (prefix => VirtualRESTService|array) */
+	private $instances = [];
 
 	const VALID_MOUNT_REGEX = '#^/[0-9a-z]+/([0-9a-z]+/)*$#';
 
@@ -61,15 +61,24 @@ class VirtualRESTServiceClient {
 	/**
 	 * Map a prefix to service handler
 	 *
+	 * If $instance is in array, it must have these keys:
+	 *   - class : string; fully qualified VirtualRESTService class name
+	 *   - config : array; map of parameters that is the first __construct() argument
+	 *
 	 * @param string $prefix Virtual path
-	 * @param VirtualRESTService $instance
+	 * @param VirtualRESTService|array $instance Service or info to yield the service
 	 */
-	public function mount( $prefix, VirtualRESTService $instance ) {
+	public function mount( $prefix, $instance ) {
 		if ( !preg_match( self::VALID_MOUNT_REGEX, $prefix ) ) {
 			throw new UnexpectedValueException( "Invalid service mount point '$prefix'." );
 		} elseif ( isset( $this->instances[$prefix] ) ) {
 			throw new UnexpectedValueException( "A service is already mounted on '$prefix'." );
 		}
+		if ( !( $instance instanceof VirtualRESTService ) ) {
+			if ( !isset( $instance['class'] ) || !isset( $instance['config'] ) ) {
+				throw new UnexpectedValueException( "Missing 'class' or 'config' ('$prefix')." );
+			}
+		}
 		$this->instances[$prefix] = $instance;
 	}
 
@@ -104,7 +113,7 @@ class VirtualRESTServiceClient {
 		};
 
 		$matches = []; // matching prefixes (mount points)
-		foreach ( $this->instances as $prefix => $service ) {
+		foreach ( $this->instances as $prefix => $unused ) {
 			if ( strpos( $path, $prefix ) === 0 ) {
 				$matches[] = $prefix;
 			}
@@ -112,8 +121,8 @@ class VirtualRESTServiceClient {
 		usort( $matches, $cmpFunc );
 
 		// Return the most specific prefix and corresponding service
-		return isset( $matches[0] )
-			? [ $matches[0], $this->instances[$matches[0]] ]
+		return $matches
+			? [ $matches[0], $this->getInstance( $matches[0] ) ]
 			: [ null, null ];
 	}
 
@@ -216,7 +225,7 @@ class VirtualRESTServiceClient {
 			// defer the original or to set a proxy response to the original.
 			$newReplaceReqsByService = [];
 			foreach ( $replaceReqsByService as $prefix => $servReqs ) {
-				$service = $this->instances[$prefix];
+				$service = $this->getInstance( $prefix );
 				foreach ( $service->onRequests( $servReqs, $idFunc ) as $index => $req ) {
 					// Services use unique IDs for replacement requests
 					if ( isset( $servReqs[$index] ) || isset( $origPending[$index] ) ) {
@@ -237,8 +246,6 @@ class VirtualRESTServiceClient {
 					$checkReqIndexesByPrefix[$prefix][$index] = 1;
 				}
 			}
-			// Update index of requests to inspect for replacement
-			$replaceReqsByService = $newReplaceReqsByService;
 			// Run the actual work HTTP requests
 			foreach ( $this->http->runMulti( $executeReqs ) as $index => $ranReq ) {
 				$doneReqs[$index] = $ranReq;
@@ -252,7 +259,7 @@ class VirtualRESTServiceClient {
 			// forced by setting 'response' rather than actually be sent over the wire.
 			$newReplaceReqsByService = [];
 			foreach ( $checkReqIndexesByPrefix as $prefix => $servReqIndexes ) {
-				$service = $this->instances[$prefix];
+				$service = $this->getInstance( $prefix );
 				// $doneReqs actually has the requests (with 'response' set)
 				$servReqs = array_intersect_key( $doneReqs, $servReqIndexes );
 				foreach ( $service->onResponses( $servReqs, $idFunc ) as $index => $req ) {
@@ -290,4 +297,26 @@ class VirtualRESTServiceClient {
 
 		return $responses;
 	}
+
+	/**
+	 * @param string $prefix
+	 * @return VirtualRESTService
+	 */
+	private function getInstance( $prefix ) {
+		if ( !isset( $this->instances[$prefix] ) ) {
+			throw new RunTimeException( "No service registered at prefix '{$prefix}'." );
+		}
+
+		if ( !( $this->instances[$prefix] instanceof VirtualRESTService ) ) {
+			$config = $this->instances[$prefix]['config'];
+			$class = $this->instances[$prefix]['class'];
+			$service = new $class( $config );
+			if ( !( $service instanceof VirtualRESTService ) ) {
+				throw new UnexpectedValueException( "Registered service has the wrong class." );
+			}
+			$this->instances[$prefix] = $service;
+		}
+
+		return $this->instances[$prefix];
+	}
 }
diff --git a/includes/objectcache/SqlBagOStuff.php b/includes/objectcache/SqlBagOStuff.php
index c48880fe79..9ab28aa44e 100644
--- a/includes/objectcache/SqlBagOStuff.php
+++ b/includes/objectcache/SqlBagOStuff.php
@@ -21,6 +21,8 @@
  * @ingroup Cache
  */
 
+use \MediaWiki\MediaWikiServices;
+
 /**
  * Class to store objects in the database
  *
@@ -276,6 +278,7 @@ class SqlBagOStuff extends BagOStuff {
 			if ( isset( $dataRows[$key] ) ) { // HIT?
 				$row = $dataRows[$key];
 				$this->debug( "get: retrieved data; expiry time is " . $row->exptime );
+				$db = null;
 				try {
 					$db = $this->getDB( $row->serverIndex );
 					if ( $this->isExpired( $db, $row->exptime ) ) { // MISS
@@ -284,7 +287,7 @@ class SqlBagOStuff extends BagOStuff {
 						$values[$key] = $this->unserialize( $db->decodeBlob( $row->value ) );
 					}
 				} catch ( DBQueryError $e ) {
-					$this->handleWriteError( $e, $row->serverIndex );
+					$this->handleWriteError( $e, $db, $row->serverIndex );
 				}
 			} else { // MISS
 				$this->debug( 'get: no matching rows' );
@@ -306,10 +309,11 @@ class SqlBagOStuff extends BagOStuff {
 		$result = true;
 		$exptime = (int)$expiry;
 		foreach ( $keysByTable as $serverIndex => $serverKeys ) {
+			$db = null;
 			try {
 				$db = $this->getDB( $serverIndex );
 			} catch ( DBError $e ) {
-				$this->handleWriteError( $e, $serverIndex );
+				$this->handleWriteError( $e, $db, $serverIndex );
 				$result = false;
 				continue;
 			}
@@ -342,7 +346,7 @@ class SqlBagOStuff extends BagOStuff {
 						__METHOD__
 					);
 				} catch ( DBError $e ) {
-					$this->handleWriteError( $e, $serverIndex );
+					$this->handleWriteError( $e, $db, $serverIndex );
 					$result = false;
 				}
 
@@ -364,6 +368,7 @@ class SqlBagOStuff extends BagOStuff {
 
 	protected function cas( $casToken, $key, $value, $exptime = 0 ) {
 		list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
+		$db = null;
 		try {
 			$db = $this->getDB( $serverIndex );
 			$exptime = intval( $exptime );
@@ -394,7 +399,7 @@ class SqlBagOStuff extends BagOStuff {
 				__METHOD__
 			);
 		} catch ( DBQueryError $e ) {
-			$this->handleWriteError( $e, $serverIndex );
+			$this->handleWriteError( $e, $db, $serverIndex );
 
 			return false;
 		}
@@ -404,6 +409,7 @@ class SqlBagOStuff extends BagOStuff {
 
 	public function delete( $key ) {
 		list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
+		$db = null;
 		try {
 			$db = $this->getDB( $serverIndex );
 			$db->delete(
@@ -411,7 +417,7 @@ class SqlBagOStuff extends BagOStuff {
 				[ 'keyname' => $key ],
 				__METHOD__ );
 		} catch ( DBError $e ) {
-			$this->handleWriteError( $e, $serverIndex );
+			$this->handleWriteError( $e, $db, $serverIndex );
 			return false;
 		}
 
@@ -420,6 +426,7 @@ class SqlBagOStuff extends BagOStuff {
 
 	public function incr( $key, $step = 1 ) {
 		list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
+		$db = null;
 		try {
 			$db = $this->getDB( $serverIndex );
 			$step = intval( $step );
@@ -455,7 +462,7 @@ class SqlBagOStuff extends BagOStuff {
 				$newValue = null;
 			}
 		} catch ( DBError $e ) {
-			$this->handleWriteError( $e, $serverIndex );
+			$this->handleWriteError( $e, $db, $serverIndex );
 			return null;
 		}
 
@@ -471,6 +478,28 @@ class SqlBagOStuff extends BagOStuff {
 		return $ok;
 	}
 
+	public function changeTTL( $key, $expiry = 0 ) {
+		list( $serverIndex, $tableName ) = $this->getTableByKey( $key );
+		$db = null;
+		try {
+			$db = $this->getDB( $serverIndex );
+			$db->update(
+				$tableName,
+				[ 'exptime' => $db->timestamp( $this->convertExpiry( $expiry ) ) ],
+				[ 'keyname' => $key, 'exptime > ' . $db->addQuotes( $db->timestamp( time() ) ) ],
+				__METHOD__
+			);
+			if ( $db->affectedRows() == 0 ) {
+				return false;
+			}
+		} catch ( DBError $e ) {
+			$this->handleWriteError( $e, $db, $serverIndex );
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * @param IDatabase $db
 	 * @param string $exptime
@@ -521,6 +550,7 @@ class SqlBagOStuff extends BagOStuff {
 	 */
 	public function deleteObjectsExpiringBefore( $timestamp, $progressCallback = false ) {
 		for ( $serverIndex = 0; $serverIndex < $this->numServers; $serverIndex++ ) {
+			$db = null;
 			try {
 				$db = $this->getDB( $serverIndex );
 				$dbTimestamp = $db->timestamp( $timestamp );
@@ -583,7 +613,7 @@ class SqlBagOStuff extends BagOStuff {
 					}
 				}
 			} catch ( DBError $e ) {
-				$this->handleWriteError( $e, $serverIndex );
+				$this->handleWriteError( $e, $db, $serverIndex );
 				return false;
 			}
 		}
@@ -597,13 +627,14 @@ class SqlBagOStuff extends BagOStuff {
 	 */
 	public function deleteAll() {
 		for ( $serverIndex = 0; $serverIndex < $this->numServers; $serverIndex++ ) {
+			$db = null;
 			try {
 				$db = $this->getDB( $serverIndex );
 				for ( $i = 0; $i < $this->shards; $i++ ) {
 					$db->delete( $this->getTableNameByShard( $i ), '*', __METHOD__ );
 				}
 			} catch ( DBError $e ) {
-				$this->handleWriteError( $e, $serverIndex );
+				$this->handleWriteError( $e, $db, $serverIndex );
 				return false;
 			}
 		}
@@ -673,18 +704,19 @@ class SqlBagOStuff extends BagOStuff {
 	 * Handle a DBQueryError which occurred during a write operation.
 	 *
 	 * @param DBError $exception
+	 * @param IDatabase|null $db DB handle or null if connection failed
 	 * @param int $serverIndex
+	 * @throws Exception
 	 */
-	protected function handleWriteError( DBError $exception, $serverIndex ) {
-		if ( $exception instanceof DBConnectionError ) {
+	protected function handleWriteError( DBError $exception, IDatabase $db = null, $serverIndex ) {
+		if ( !$db ) {
 			$this->markServerDown( $exception, $serverIndex );
-		}
-		if ( $exception->db && $exception->db->wasReadOnlyError() ) {
-			if ( $exception->db->trxLevel() ) {
-				try {
-					$exception->db->rollback( __METHOD__ );
-				} catch ( DBError $e ) {
-				}
+		} elseif ( $db->wasReadOnlyError() ) {
+			if ( $db->trxLevel() && $this->usesMainDB() ) {
+				// Errors like deadlocks and connection drops already cause rollback.
+				// For consistency, we have no choice but to throw an error and trigger
+				// complete rollback if the main DB is also being used as the cache DB.
+				throw $exception;
 			}
 		}
 
@@ -704,7 +736,7 @@ class SqlBagOStuff extends BagOStuff {
 	 * @param DBError $exception
 	 * @param int $serverIndex
 	 */
-	protected function markServerDown( $exception, $serverIndex ) {
+	protected function markServerDown( DBError $exception, $serverIndex ) {
 		unset( $this->conns[$serverIndex] ); // bug T103435
 
 		if ( isset( $this->connFailureTimes[$serverIndex] ) ) {
@@ -741,11 +773,19 @@ class SqlBagOStuff extends BagOStuff {
 		}
 	}
 
+	/**
+	 * @return bool Whether the main DB is used, e.g. wfGetDB( DB_MASTER )
+	 */
+	protected function usesMainDB() {
+		return !$this->serverInfos;
+	}
+
 	protected function waitForSlaves() {
-		if ( !$this->serverInfos ) {
+		if ( $this->usesMainDB() ) {
 			// Main LB is used; wait for any slaves to catch up
 			try {
-				wfGetLBFactory()->waitForReplication( [ 'wiki' => wfWikiID() ] );
+				$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+				$lbFactory->waitForReplication( [ 'wiki' => wfWikiID() ] );
 				return true;
 			} catch ( DBReplicationWaitError $e ) {
 				return false;
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 8eba1ccf7b..3851d15e60 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -90,6 +90,14 @@ class WikiPage implements Page, IDBAccessObject {
 		$this->mTitle = $title;
 	}
 
+	/**
+	 * Makes sure that the mTitle object is cloned
+	 * to the newly cloned WikiPage.
+	 */
+	public function __clone() {
+		$this->mTitle = clone $this->mTitle;
+	}
+
 	/**
 	 * Create a WikiPage object of the appropriate class for the given title.
 	 *
@@ -887,9 +895,13 @@ class WikiPage implements Page, IDBAccessObject {
 		// Update the DB post-send if the page has not cached since now
 		$that = $this;
 		$latest = $this->getLatest();
-		DeferredUpdates::addCallableUpdate( function() use ( $that, $retval, $latest ) {
-			$that->insertRedirectEntry( $retval, $latest );
-		} );
+		DeferredUpdates::addCallableUpdate(
+			function () use ( $that, $retval, $latest ) {
+				$that->insertRedirectEntry( $retval, $latest );
+			},
+			DeferredUpdates::POSTSEND,
+			wfGetDB( DB_MASTER )
+		);
 
 		return $retval;
 	}
@@ -1048,9 +1060,9 @@ class WikiPage implements Page, IDBAccessObject {
 	 * @param bool          $forceParse Force reindexing, regardless of cache settings
 	 * @return bool|ParserOutput ParserOutput or false if the revision was not found
 	 */
-	public function getParserOutput( ParserOptions $parserOptions, $oldid = null,
-	                                 $forceParse = false ) {
-
+	public function getParserOutput(
+		ParserOptions $parserOptions, $oldid = null, $forceParse = false
+	) {
 		$useParserCache =
 			( !$forceParse ) && $this->shouldCheckParserCache( $parserOptions, $oldid );
 		wfDebug( __METHOD__ .
@@ -1758,7 +1770,6 @@ class WikiPage implements Page, IDBAccessObject {
 			$revisionId = $revision->insertOn( $dbw );
 			// Update page_latest and friends to reflect the new revision
 			if ( !$this->updateRevisionOn( $dbw, $revision, null, $meta['oldIsRedirect'] ) ) {
-				$dbw->rollback( __METHOD__ ); // sanity; this should never happen
 				throw new MWException( "Failed to update page row to use new revision." );
 			}
 
@@ -1908,7 +1919,6 @@ class WikiPage implements Page, IDBAccessObject {
 		$revisionId = $revision->insertOn( $dbw );
 		// Update the page record with revision data
 		if ( !$this->updateRevisionOn( $dbw, $revision, 0 ) ) {
-			$dbw->rollback( __METHOD__ ); // sanity; this should never happen
 			throw new MWException( "Failed to update page row to use new revision." );
 		}
 
@@ -2863,6 +2873,10 @@ class WikiPage implements Page, IDBAccessObject {
 			return $status;
 		}
 
+		// Given the lock above, we can be confident in the title and page ID values
+		$namespace = $this->getTitle()->getNamespace();
+		$dbKey = $this->getTitle()->getDBkey();
+
 		// At this point we are now comitted to returning an OK
 		// status unless some DB query error or other exception comes up.
 		// This way callers don't have to call rollback() if $status is bad
@@ -2883,57 +2897,58 @@ class WikiPage implements Page, IDBAccessObject {
 			$bitfield = 'rev_deleted';
 		}
 
-		/**
-		 * For now, shunt the revision data into the archive table.
-		 * Text is *not* removed from the text table; bulk storage
-		 * is left intact to avoid breaking block-compression or
-		 * immutable storage schemes.
-		 *
-		 * For backwards compatibility, note that some older archive
-		 * table entries will have ar_text and ar_flags fields still.
-		 *
-		 * In the future, we may keep revisions and mark them with
-		 * the rev_deleted field, which is reserved for this purpose.
-		 */
-
-		$row = [
-			'ar_namespace'  => 'page_namespace',
-			'ar_title'      => 'page_title',
-			'ar_comment'    => 'rev_comment',
-			'ar_user'       => 'rev_user',
-			'ar_user_text'  => 'rev_user_text',
-			'ar_timestamp'  => 'rev_timestamp',
-			'ar_minor_edit' => 'rev_minor_edit',
-			'ar_rev_id'     => 'rev_id',
-			'ar_parent_id'  => 'rev_parent_id',
-			'ar_text_id'    => 'rev_text_id',
-			'ar_text'       => '\'\'', // Be explicit to appease
-			'ar_flags'      => '\'\'', // MySQL's "strict mode"...
-			'ar_len'        => 'rev_len',
-			'ar_page_id'    => 'page_id',
-			'ar_deleted'    => $bitfield,
-			'ar_sha1'       => 'rev_sha1',
-		];
-
-		if ( $wgContentHandlerUseDB ) {
-			$row['ar_content_model'] = 'rev_content_model';
-			$row['ar_content_format'] = 'rev_content_format';
-		}
+		// For now, shunt the revision data into the archive table.
+		// Text is *not* removed from the text table; bulk storage
+		// is left intact to avoid breaking block-compression or
+		// immutable storage schemes.
+		// In the future, we may keep revisions and mark them with
+		// the rev_deleted field, which is reserved for this purpose.
 
-		// Copy all the page revisions into the archive table
-		$dbw->insertSelect(
-			'archive',
-			[ 'page', 'revision' ],
-			$row,
-			[
-				'page_id' => $id,
-				'page_id = rev_page'
-			],
-			__METHOD__
+		// Get all of the page revisions
+		$res = $dbw->select(
+			'revision',
+			Revision::selectFields(),
+			[ 'rev_page' => $id ],
+			__METHOD__,
+			'FOR UPDATE'
 		);
+		// Build their equivalent archive rows
+		$rowsInsert = [];
+		foreach ( $res as $row ) {
+			$rowInsert = [
+				'ar_namespace'  => $namespace,
+				'ar_title'      => $dbKey,
+				'ar_comment'    => $row->rev_comment,
+				'ar_user'       => $row->rev_user,
+				'ar_user_text'  => $row->rev_user_text,
+				'ar_timestamp'  => $row->rev_timestamp,
+				'ar_minor_edit' => $row->rev_minor_edit,
+				'ar_rev_id'     => $row->rev_id,
+				'ar_parent_id'  => $row->rev_parent_id,
+				'ar_text_id'    => $row->rev_text_id,
+				'ar_text'       => '',
+				'ar_flags'      => '',
+				'ar_len'        => $row->rev_len,
+				'ar_page_id'    => $id,
+				'ar_deleted'    => $bitfield,
+				'ar_sha1'       => $row->rev_sha1,
+			];
+			if ( $wgContentHandlerUseDB ) {
+				$rowInsert['ar_content_model'] = $row->rev_content_model;
+				$rowInsert['ar_content_format'] = $row->rev_content_format;
+			}
+			$rowsInsert[] = $rowInsert;
+		}
+		// Copy them into the archive table
+		$dbw->insert( 'archive', $rowsInsert, __METHOD__ );
 		// Save this so we can pass it to the ArticleDeleteComplete hook.
 		$archivedRevisionCount = $dbw->affectedRows();
 
+		// Clone the title and wikiPage, so we have the information we need when
+		// we log and run the ArticleDeleteComplete hook.
+		$logTitle = clone $this->mTitle;
+		$wikiPageBeforeDelete = clone $this;
+
 		// Now that it's safely backed up, delete it
 		$dbw->delete( 'page', [ 'page_id' => $id ], __METHOD__ );
 
@@ -2941,9 +2956,6 @@ class WikiPage implements Page, IDBAccessObject {
 			$dbw->delete( 'revision', [ 'rev_page' => $id ], __METHOD__ );
 		}
 
-		// Clone the title, so we have the information we need when we log
-		$logTitle = clone $this->mTitle;
-
 		// Log the deletion, if the page was suppressed, put it in the suppression log instead
 		$logtype = $suppress ? 'suppress' : 'delete';
 
@@ -2962,8 +2974,15 @@ class WikiPage implements Page, IDBAccessObject {
 
 		$this->doDeleteUpdates( $id, $content );
 
-		Hooks::run( 'ArticleDeleteComplete',
-			[ &$this, &$user, $reason, $id, $content, $logEntry, $archivedRevisionCount ] );
+		Hooks::run( 'ArticleDeleteComplete', [
+			&$wikiPageBeforeDelete,
+			&$user,
+			$reason,
+			$id,
+			$content,
+			$logEntry,
+			$archivedRevisionCount
+		] );
 		$status->value = $logid;
 
 		// Show log excerpt on 404 pages rather than just a link
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 206ad00ef6..b116bd4451 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -2158,7 +2158,7 @@ class Parser {
 				$might_be_img = true;
 				$text = $m[2];
 				if ( strpos( $m[1], '%' ) !== false ) {
-					$m[1] = rawurldecode( $m[1] );
+					$m[1] = str_replace( [ '<', '>' ], [ '&lt;', '&gt;' ], rawurldecode( $m[1] ) );
 				}
 				$trail = "";
 			} else { # Invalid form; output directly
@@ -4364,11 +4364,11 @@ class Parser {
 		$this->startParse( $title, $options, self::OT_WIKI, $clearState );
 		$this->setUser( $user );
 
-		$pairs = [
-			"\r\n" => "\n",
-			"\r" => "\n",
-		];
-		$text = str_replace( array_keys( $pairs ), array_values( $pairs ), $text );
+		// We still normalize line endings for backwards-compatibility
+		// with other code that just calls PST, but this should already
+		// be handled in TextContent subclasses
+		$text = TextContent::normalizeLineEndings( $text );
+
 		if ( $options->getPreSaveTransform() ) {
 			$text = $this->pstPass2( $text, $user );
 		}
@@ -4446,9 +4446,6 @@ class Parser {
 			$text = preg_replace( $p2, '[[\\1]]', $text );
 		}
 
-		# Trim trailing whitespace
-		$text = rtrim( $text );
-
 		return $text;
 	}
 
diff --git a/includes/parser/Preprocessor_DOM.php b/includes/parser/Preprocessor_DOM.php
index a28c0aa439..5da7cd7441 100644
--- a/includes/parser/Preprocessor_DOM.php
+++ b/includes/parser/Preprocessor_DOM.php
@@ -539,7 +539,7 @@ class Preprocessor_DOM extends Preprocessor {
 			} elseif ( $found == 'line-end' ) {
 				$piece = $stack->top;
 				// A heading must be open, otherwise \n wouldn't have been in the search list
-				assert( '$piece->open == "\n"' );
+				assert( $piece->open === "\n" );
 				$part = $piece->getCurrentPart();
 				// Search back through the input to see if it has a proper close.
 				// Do this using the reversed string since the other solutions
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 012288fa4c..8a4637ea1e 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -475,7 +475,7 @@ class Preprocessor_Hash extends Preprocessor {
 			} elseif ( $found == 'line-end' ) {
 				$piece = $stack->top;
 				// A heading must be open, otherwise \n wouldn't have been in the search list
-				assert( '$piece->open == "\n"' );
+				assert( $piece->open === "\n" );
 				$part = $piece->getCurrentPart();
 				// Search back through the input to see if it has a proper close.
 				// Do this using the reversed string since the other solutions
diff --git a/includes/resourceloader/ResourceLoaderClientHtml.php b/includes/resourceloader/ResourceLoaderClientHtml.php
index 3093cdef10..dc70af458e 100644
--- a/includes/resourceloader/ResourceLoaderClientHtml.php
+++ b/includes/resourceloader/ResourceLoaderClientHtml.php
@@ -33,6 +33,9 @@ class ResourceLoaderClientHtml {
 	/** @var ResourceLoader */
 	private $resourceLoader;
 
+	/** @var string|null */
+	private $target;
+
 	/** @var array */
 	private $config = [];
 
@@ -53,10 +56,12 @@ class ResourceLoaderClientHtml {
 
 	/**
 	 * @param ResourceLoaderContext $context
+	 * @param aray $target [optional] Custom 'target' parameter for the startup module
 	 */
-	public function __construct( ResourceLoaderContext $context ) {
+	public function __construct( ResourceLoaderContext $context, $target = null ) {
 		$this->context = $context;
 		$this->resourceLoader = $context->getResourceLoader();
+		$this->target = $target;
 	}
 
 	/**
@@ -316,7 +321,13 @@ class ResourceLoaderClientHtml {
 		}
 
 		// Async scripts. Once the startup is loaded, inline RLQ scripts will run.
-		$chunks[] = $this->getLoad( 'startup', ResourceLoaderModule::TYPE_SCRIPTS );
+		// Pass-through a custom target from OutputPage (T143066).
+		$startupQuery = $this->target ? [ 'target' => $this->target ] : [];
+		$chunks[] = $this->getLoad(
+			'startup',
+			ResourceLoaderModule::TYPE_SCRIPTS,
+			$startupQuery
+		);
 
 		return WrappedStringList::join( "\n", $chunks );
 	}
@@ -358,8 +369,8 @@ class ResourceLoaderClientHtml {
 		return self::makeContext( $this->context, $group, $type );
 	}
 
-	private function getLoad( $modules, $only ) {
-		return self::makeLoad( $this->context, (array)$modules, $only );
+	private function getLoad( $modules, $only, array $extraQuery = [] ) {
+		return self::makeLoad( $this->context, (array)$modules, $only, $extraQuery );
 	}
 
 	private static function makeContext( ResourceLoaderContext $mainContext, $group, $type,
diff --git a/includes/resourceloader/ResourceLoaderImageModule.php b/includes/resourceloader/ResourceLoaderImageModule.php
index 3b3bdf7e11..43327c91cc 100644
--- a/includes/resourceloader/ResourceLoaderImageModule.php
+++ b/includes/resourceloader/ResourceLoaderImageModule.php
@@ -393,6 +393,8 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 	public function getDefinitionSummary( ResourceLoaderContext $context ) {
 		$this->loadFromDefinition();
 		$summary = parent::getDefinitionSummary( $context );
+
+		$options = [];
 		foreach ( [
 			'localBasePath',
 			'images',
@@ -401,29 +403,27 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 			'selectorWithoutVariant',
 			'selectorWithVariant',
 		] as $member ) {
-			$summary[$member] = $this->{$member};
+			$options[$member] = $this->{$member};
 		};
+
+		$summary[] = [
+			'options' => $options,
+			'fileHashes' => $this->getFileHashes( $context ),
+		];
 		return $summary;
 	}
 
 	/**
-	 * Get the last modified timestamp of this module.
-	 *
-	 * @param ResourceLoaderContext $context Context in which to calculate
-	 *     the modified time
-	 * @return int UNIX timestamp
+	 * Helper method for getDefinitionSummary.
 	 */
-	public function getModifiedTime( ResourceLoaderContext $context ) {
+	protected function getFileHashes( ResourceLoaderContext $context ) {
 		$this->loadFromDefinition();
 		$files = [];
 		foreach ( $this->getImages( $context ) as $name => $image ) {
 			$files[] = $image->getPath( $context );
 		}
-
 		$files = array_values( array_unique( $files ) );
-		$filesMtime = max( array_map( [ __CLASS__, 'safeFilemtime' ], $files ) );
-
-		return $filesMtime;
+		return array_map( [ __CLASS__, 'safeFileHash' ], $files );
 	}
 
 	/**
@@ -455,4 +455,11 @@ class ResourceLoaderImageModule extends ResourceLoaderModule {
 		$this->loadFromDefinition();
 		return $this->position;
 	}
+
+	/**
+	 * @return string
+	 */
+	public function getType() {
+		return self::LOAD_STYLES;
+	}
 }
diff --git a/includes/revisiondelete/RevDelList.php b/includes/revisiondelete/RevDelList.php
index d365bf6fe5..48604e1a01 100644
--- a/includes/revisiondelete/RevDelList.php
+++ b/includes/revisiondelete/RevDelList.php
@@ -275,7 +275,8 @@ abstract class RevDelList extends RevisionListBase {
 			function () use ( $visibilityChangeMap ) {
 				$this->doPostCommitUpdates( $visibilityChangeMap );
 			},
-			DeferredUpdates::PRESEND
+			DeferredUpdates::PRESEND,
+			$dbw
 		);
 
 		$dbw->endAtomic( __METHOD__ );
diff --git a/includes/search/DummySearchIndexFieldDefinition.php b/includes/search/DummySearchIndexFieldDefinition.php
new file mode 100644
index 0000000000..a2a6760192
--- /dev/null
+++ b/includes/search/DummySearchIndexFieldDefinition.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * Dummy implementation of SearchIndexFieldDefinition for testing purposes.
+ *
+ * @since 1.28
+ */
+class DummySearchIndexFieldDefinition extends SearchIndexFieldDefinition {
+
+	/**
+	 * @param SearchEngine $engine
+	 *
+	 * @return array
+	 */
+	public function getMapping( SearchEngine $engine ) {
+		$mapping = [
+			'name' => $this->name,
+			'type' => $this->type,
+			'flags' => $this->flags,
+			'subfields' => []
+		];
+
+		foreach ( $this->subfields as $subfield ) {
+			$mapping['subfields'][] = $subfield->getMapping();
+		}
+
+		return $mapping;
+	}
+
+}
diff --git a/includes/search/ParserOutputSearchDataExtractor.php b/includes/search/ParserOutputSearchDataExtractor.php
new file mode 100644
index 0000000000..df653f1240
--- /dev/null
+++ b/includes/search/ParserOutputSearchDataExtractor.php
@@ -0,0 +1,92 @@
+<?php
+
+namespace MediaWiki\Search;
+
+use Category;
+use ParserOutput;
+use Title;
+
+/**
+ * Extracts data from ParserOutput for indexing in the search engine.
+ *
+ * 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.28
+ */
+class ParserOutputSearchDataExtractor {
+
+	/**
+	 * Get a list of categories, as an array with title text strings.
+	 *
+	 * @return string[]
+	 */
+	public function getCategories( ParserOutput $parserOutput ) {
+		$categories = [];
+
+		foreach ( $parserOutput->getCategoryLinks() as $key ) {
+			$categories[] = Category::newFromName( $key )->getTitle()->getText();
+		}
+
+		return $categories;
+	}
+
+	/**
+	 * Get a list of external links from ParserOutput, as an array of strings.
+	 *
+	 * @return string[]
+	 */
+	public function getExternalLinks( ParserOutput $parserOutput ) {
+		return array_keys( $parserOutput->getExternalLinks() );
+	}
+
+	/**
+	 * Get a list of outgoing wiki links (including interwiki links), as
+	 * an array of prefixed title strings.
+	 *
+	 * @return string[]
+	 */
+	public function getOutgoingLinks( ParserOutput $parserOutput ) {
+		$outgoingLinks = [];
+
+		foreach ( $parserOutput->getLinks() as $linkedNamespace => $namespaceLinks ) {
+			foreach ( array_keys( $namespaceLinks ) as $linkedDbKey ) {
+				$outgoingLinks[] =
+					Title::makeTitle( $linkedNamespace, $linkedDbKey )->getPrefixedDBkey();
+			}
+		}
+
+		return $outgoingLinks;
+	}
+
+	/**
+	 * Get a list of templates used in the ParserOutput content, as prefixed title strings
+	 *
+	 * @return string[]
+	 */
+	public function getTemplates( ParserOutput $parserOutput ) {
+		$templates = [];
+
+		foreach ( $parserOutput->getTemplates() as $tNS => $templatesInNS ) {
+			foreach ( array_keys( $templatesInNS ) as $tDbKey ) {
+				$templateTitle = Title::makeTitle( $tNS, $tDbKey );
+				$templates[] = $templateTitle->getPrefixedText();
+			}
+		}
+
+		return $templates;
+	}
+
+}
diff --git a/includes/search/SearchIndexFieldDefinition.php b/includes/search/SearchIndexFieldDefinition.php
index 3a86c82d0d..8a06b65ed7 100644
--- a/includes/search/SearchIndexFieldDefinition.php
+++ b/includes/search/SearchIndexFieldDefinition.php
@@ -2,8 +2,10 @@
 
 /**
  * Basic infrastructure of the field definition.
- * Specific engines will need to override it at least for getMapping,
- * but can reuse other parts.
+ *
+ * Specific engines should extend this class and at at least,
+ * override the getMapping method, but can reuse other parts.
+ *
  * @since 1.28
  */
 abstract class SearchIndexFieldDefinition implements SearchIndexField {
@@ -115,4 +117,12 @@ abstract class SearchIndexFieldDefinition implements SearchIndexField {
 		$this->subfields = $subfields;
 		return $this;
 	}
+
+	/**
+	 * @param SearchEngine $engine
+	 *
+	 * @return array
+	 */
+	abstract public function getMapping( SearchEngine $engine );
+
 }
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index 749a6860c3..b4be461949 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -478,6 +478,9 @@ class SkinTemplate extends Skin {
 		$tpl->set( 'sidebar', $this->buildSidebar() );
 		$tpl->set( 'nav_urls', $this->buildNavUrls() );
 
+		// Do this last in case hooks above add bottom scripts
+		$tpl->set( 'bottomscripts', $this->bottomScripts() );
+
 		// Set the head scripts near the end, in case the above actions resulted in added scripts
 		$tpl->set( 'headelement', $out->headElement( $this ) );
 
@@ -508,9 +511,6 @@ class SkinTemplate extends Skin {
 		// See Skin::afterContentHook() for further documentation.
 		$tpl->set( 'dataAfterContent', $this->afterContentHook() );
 
-		// Do this last in case hooks above add bottom scripts
-		$tpl->set( 'bottomscripts', $this->bottomScripts() );
-
 		return $tpl;
 	}
 
diff --git a/includes/specialpage/AuthManagerSpecialPage.php b/includes/specialpage/AuthManagerSpecialPage.php
index 85b8dc3ad6..68f0d00ddb 100644
--- a/includes/specialpage/AuthManagerSpecialPage.php
+++ b/includes/specialpage/AuthManagerSpecialPage.php
@@ -536,7 +536,7 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 		$form->setAction( $this->getFullTitle()->getFullURL( $this->getPreservedParams() ) );
 		$form->addHiddenField( $this->getTokenName(), $this->getToken()->toString() );
 		$form->addHiddenField( 'authAction', $this->authAction );
-		$form->suppressDefaultSubmit( !$this->needsSubmitButton( $formDescriptor ) );
+		$form->suppressDefaultSubmit( !$this->needsSubmitButton( $requests ) );
 
 		return $form;
 	}
@@ -554,24 +554,38 @@ abstract class AuthManagerSpecialPage extends SpecialPage {
 	}
 
 	/**
-	 * Returns true if the form has fields which take values. If all available providers use the
-	 * redirect flow, the form might contain nothing but submit buttons, in which case we should
-	 * not add an extra submit button which does nothing.
+	 * Returns true if the form built from the given AuthenticationRequests has fields which take
+	 * values. If all available providers use the redirect flow, the form might contain nothing
+	 * but submit buttons, in which case we should not add an extra submit button which does nothing.
 	 *
-	 * @param array $formDescriptor A HTMLForm descriptor
+	 * @param AuthenticationRequest[] $requests An array of AuthenticationRequests from which the
+	 *  form will be built
 	 * @return bool
 	 */
-	protected function needsSubmitButton( $formDescriptor ) {
-		return (bool)array_filter( $formDescriptor, function ( $item ) {
-			$class = false;
-			if ( array_key_exists( 'class', $item ) ) {
-				$class = $item['class'];
-			} elseif ( array_key_exists( 'type', $item ) ) {
-				$class = HTMLForm::$typeMappings[$item['type']];
+	protected function needsSubmitButton( array $requests ) {
+		foreach ( $requests as $req ) {
+			if ( $req->required === AuthenticationRequest::PRIMARY_REQUIRED &&
+				$this->doesRequestNeedsSubmitButton( $req )
+			) {
+				return true;
 			}
-			return !is_a( $class, \HTMLInfoField::class, true ) &&
-				!is_a( $class, \HTMLSubmitField::class, true );
-		} );
+		}
+		return false;
+	}
+
+	/**
+	 * Checks if the given AuthenticationRequest needs a submit button or not.
+	 *
+	 * @param AuthenticationRequest $req The request to check
+	 * @return bool
+	 */
+	protected function doesRequestNeedsSubmitButton( AuthenticationRequest $req ) {
+		foreach ( $req->getFieldInfo() as $field => $info ) {
+			if ( $info['type'] === 'button' ) {
+				return false;
+			}
+		}
+		return true;
 	}
 
 	/**
diff --git a/includes/specialpage/LoginSignupSpecialPage.php b/includes/specialpage/LoginSignupSpecialPage.php
index 8a2e0d65b0..22c38cb21b 100644
--- a/includes/specialpage/LoginSignupSpecialPage.php
+++ b/includes/specialpage/LoginSignupSpecialPage.php
@@ -585,7 +585,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		$this->fakeTemplate = $fakeTemplate; // FIXME there should be a saner way to pass this to the hook
 		// this will call onAuthChangeFormFields()
 		$formDescriptor = static::fieldInfoToFormDescriptor( $requests, $fieldInfo, $this->authAction );
-		$this->postProcessFormDescriptor( $formDescriptor );
+		$this->postProcessFormDescriptor( $formDescriptor, $requests );
 
 		$context = $this->getContext();
 		if ( $context->getRequest() !== $this->getRequest() ) {
@@ -616,36 +616,6 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 			$form->setId( 'userlogin2' );
 		}
 
-		// add pre/post text
-		// header used by ConfirmEdit, CondfirmAccount, Persona, WikimediaIncubator, SemanticSignup
-		// should be above the error message but HTMLForm doesn't support that
-		$form->addHeaderText( $fakeTemplate->get( 'header' ) );
-
-		// FIXME the old form used this for error/warning messages which does not play well with
-		// HTMLForm (maybe it could with a subclass?); for now only display it for signups
-		// (where the JS username validation needs it) and alway empty
-		if ( $this->isSignup() ) {
-			// used by the mediawiki.special.userlogin.signup.js module
-			$statusAreaAttribs = [ 'id' => 'mw-createacct-status-area' ];
-			// $statusAreaAttribs += $msg ? [ 'class' => "{$msgType}box" ] : [ 'style' => 'display: none;' ];
-			$form->addHeaderText( Html::element( 'div', $statusAreaAttribs ) );
-		}
-
-		// header used by MobileFrontend
-		$form->addHeaderText( $fakeTemplate->get( 'formheader' ) );
-
-		// blank signup footer for site customization
-		if ( $this->isSignup() && $this->showExtraInformation() ) {
-			// Use signupend-https for HTTPS requests if it's not blank, signupend otherwise
-			$signupendMsg = $this->msg( 'signupend' );
-			$signupendHttpsMsg = $this->msg( 'signupend-https' );
-			if ( !$signupendMsg->isDisabled() ) {
-				$signupendText = ( $usingHTTPS && !$signupendHttpsMsg->isBlank() )
-					? $signupendHttpsMsg ->parse() : $signupendMsg->parse();
-				$form->addPostText( Html::rawElement( 'div', [ 'id' => 'signupend' ], $signupendText ) );
-			}
-		}
-
 		// warning header for non-standard workflows (e.g. security reauthentication)
 		if ( !$this->isSignup() && $this->getUser()->isLoggedIn() ) {
 			$reauthMessage = $this->securityLevel ? 'userlogin-reauth' : 'userlogin-loggedin';
@@ -653,52 +623,6 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 				$this->msg( $reauthMessage )->params( $this->getUser()->getName() )->parse() ) );
 		}
 
-		if ( !$this->isSignup() && $this->showExtraInformation() ) {
-			$passwordReset = new PasswordReset( $this->getConfig(), AuthManager::singleton() );
-			if ( $passwordReset->isAllowed( $this->getUser() ) ) {
-				$form->addFooterText( Html::rawElement(
-					'div',
-					[ 'class' => 'mw-ui-vform-field mw-form-related-link-container' ],
-					Linker::link(
-						SpecialPage::getTitleFor( 'PasswordReset' ),
-						$this->msg( 'userlogin-resetpassword-link' )->escaped()
-					)
-				) );
-			}
-
-			// Don't show a "create account" link if the user can't.
-			if ( $this->showCreateAccountLink() ) {
-				// link to the other action
-				$linkTitle = $this->getTitleFor( $this->isSignup() ? 'Userlogin' :'CreateAccount' );
-				$linkq = $this->getReturnToQueryStringFragment();
-				// Pass any language selection on to the mode switch link
-				if ( $wgLoginLanguageSelector && $this->mLanguage ) {
-					$linkq .= '&uselang=' . $this->mLanguage;
-				}
-
-				$loggedIn = $this->getUser()->isLoggedIn();
-				$createOrLoginHtml = Html::rawElement( 'div',
-					[ 'id' => 'mw-createaccount' . ( !$loggedIn ? '-cta' : '' ),
-						'class' => ( $loggedIn ? 'mw-form-related-link-container' : 'mw-ui-vform-field' ) ],
-					( $loggedIn ? '' : $this->msg( 'userlogin-noaccount' )->escaped() )
-					. Html::element( 'a',
-						[
-							'id' => 'mw-createaccount-join' . ( $loggedIn ? '-loggedin' : '' ),
-							'href' => $linkTitle->getLocalURL( $linkq ),
-							'class' => ( $loggedIn ? '' : 'mw-ui-button' ),
-							'tabindex' => 100,
-						],
-						$this->msg(
-							( $this->getUser()->isLoggedIn() ?
-								'userlogin-createanother' :
-								'userlogin-joinproject'
-							) )->escaped()
-					)
-				);
-				$form->addFooterText( $createOrLoginHtml );
-			}
-		}
-
 		$form->suppressDefaultSubmit();
 
 		$this->authForm = $form;
@@ -837,7 +761,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 		array $requests, array $fieldInfo, array &$formDescriptor, $action
 	) {
 		$coreFieldDescriptors = $this->getFieldDefinitions( $this->fakeTemplate );
-		$specialFields = array_merge( [ 'extraInput', 'linkcontainer', 'entryError' ],
+		$specialFields = array_merge( [ 'extraInput' ],
 			array_keys( $this->fakeTemplate->getExtraInputDefinitions() ) );
 
 		// keep the ordering from getCoreFieldDescriptors() where there is no explicit weight
@@ -846,14 +770,19 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 				$formDescriptor[$fieldName] : [];
 
 			// remove everything that is not in the fieldinfo, is not marked as a supplemental field
-			// to something in the fieldinfo, and is not a generic or B/C field or a submit button
+			// to something in the fieldinfo, is not B/C for the pre-AuthManager templates,
+			// and is not an info field or a submit button
 			if (
 				!isset( $fieldInfo[$fieldName] )
 				&& (
 					!isset( $coreField['baseField'] )
 					|| !isset( $fieldInfo[$coreField['baseField']] )
-				) && !in_array( $fieldName, $specialFields, true )
-				&& ( !isset( $coreField['type'] ) || $coreField['type'] !== 'submit' )
+				)
+				&& !in_array( $fieldName, $specialFields, true )
+				&& (
+					!isset( $coreField['type'] )
+					|| !in_array( $coreField['type'], [ 'submit', 'info' ], true )
+				)
 			) {
 				$coreFieldDescriptors[$fieldName] = null;
 				continue;
@@ -892,13 +821,12 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	 * @return array
 	 */
 	protected function getFieldDefinitions( $template ) {
-		global $wgEmailConfirmToEdit;
+		global $wgEmailConfirmToEdit, $wgLoginLanguageSelector;
 
 		$isLoggedIn = $this->getUser()->isLoggedIn();
 		$continuePart = $this->isContinued() ? 'continue-' : '';
 		$anotherPart = $isLoggedIn ? 'another-' : '';
-		$expiration = $this->getRequest()->getSession()->getProvider()
-			->getRememberUserDuration();
+		$expiration = $this->getRequest()->getSession()->getProvider()->getRememberUserDuration();
 		$expirationDays = ceil( $expiration / ( 3600 * 24 ) );
 		$secureLoginLink = '';
 		if ( $this->mSecureLoginUrl ) {
@@ -910,6 +838,14 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 
 		if ( $this->isSignup() ) {
 			$fieldDefinitions = [
+				'statusarea' => [
+					// used by the mediawiki.special.userlogin.signup.js module for error display
+					// FIXME merge this with HTMLForm's normal status (error) area
+					'type' => 'info',
+					'raw' => true,
+					'default' => Html::element( 'div', [ 'id' => 'mw-createacct-status-area' ] ),
+					'weight' => -105,
+				],
 				'username' => [
 					'label-message' => 'userlogin-yourname',
 					// FIXME help-message does not match old formatting
@@ -1056,6 +992,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 				],
 			];
 		}
+
 		$fieldDefinitions['username'] += [
 			'type' => 'text',
 			'name' => 'wpName',
@@ -1072,6 +1009,19 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 			// 'required' => true,
 		];
 
+		if ( $template->get( 'header' ) || $template->get( 'formheader' ) ) {
+			// B/C for old extensions that haven't been converted to AuthManager (or have been
+			// but somebody is using the old version) and still use templates via the
+			// UserCreateForm/UserLoginForm hook.
+			// 'header' used by ConfirmEdit, CondfirmAccount, Persona, WikimediaIncubator, SemanticSignup
+			// 'formheader' used by MobileFrontend
+			$fieldDefinitions['header'] = [
+				'type' => 'info',
+				'raw' => true,
+				'default' => $template->get( 'header' ) ?: $template->get( 'formheader' ),
+				'weight' => - 110,
+			];
+		}
 		if ( $this->mEntryError ) {
 			$fieldDefinitions['entryError'] = [
 				'type' => 'info',
@@ -1082,9 +1032,77 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 				'weight' => -100,
 			];
 		}
-
 		if ( !$this->showExtraInformation() ) {
-			unset( $fieldDefinitions['linkcontainer'] );
+			unset( $fieldDefinitions['linkcontainer'], $fieldDefinitions['signupend'] );
+		}
+		if ( $this->isSignup() && $this->showExtraInformation() ) {
+			// blank signup footer for site customization
+			// uses signupend-https for HTTPS requests if it's not blank, signupend otherwise
+			$signupendMsg = $this->msg( 'signupend' );
+			$signupendHttpsMsg = $this->msg( 'signupend-https' );
+			if ( !$signupendMsg->isDisabled() ) {
+				$usingHTTPS = $this->getRequest()->getProtocol() === 'https';
+				$signupendText = ( $usingHTTPS && !$signupendHttpsMsg->isBlank() )
+					? $signupendHttpsMsg ->parse() : $signupendMsg->parse();
+				$fieldDefinitions['signupend'] = [
+					'type' => 'info',
+					'raw' => true,
+					'default' => Html::rawElement( 'div', [ 'id' => 'signupend' ], $signupendText ),
+					'weight' => 225,
+				];
+			}
+		}
+		if ( !$this->isSignup() && $this->showExtraInformation() ) {
+			$passwordReset = new PasswordReset( $this->getConfig(), AuthManager::singleton() );
+			if ( $passwordReset->isAllowed( $this->getUser() ) ) {
+				$fieldDefinitions['passwordReset'] = [
+					'type' => 'info',
+					'raw' => true,
+					'cssclass' => 'mw-form-related-link-container',
+					'default' => Linker::link(
+						SpecialPage::getTitleFor( 'PasswordReset' ),
+						$this->msg( 'userlogin-resetpassword-link' )->escaped()
+					),
+					'weight' => 230,
+				];
+			}
+
+			// Don't show a "create account" link if the user can't.
+			if ( $this->showCreateAccountLink() ) {
+				// link to the other action
+				$linkTitle = $this->getTitleFor( $this->isSignup() ? 'Userlogin' :'CreateAccount' );
+				$linkq = $this->getReturnToQueryStringFragment();
+				// Pass any language selection on to the mode switch link
+				if ( $wgLoginLanguageSelector && $this->mLanguage ) {
+					$linkq .= '&uselang=' . $this->mLanguage;
+				}
+				$loggedIn = $this->getUser()->isLoggedIn();
+
+				$fieldDefinitions['createOrLogin'] = [
+					'type' => 'info',
+					'raw' => true,
+					'linkQuery' => $linkq,
+					'default' => function ( $params ) use ( $loggedIn, $linkTitle ) {
+						return Html::rawElement( 'div',
+							[ 'id' => 'mw-createaccount' . ( !$loggedIn ? '-cta' : '' ),
+								'class' => ( $loggedIn ? 'mw-form-related-link-container' : 'mw-ui-vform-field' ) ],
+							( $loggedIn ? '' : $this->msg( 'userlogin-noaccount' )->escaped() )
+							. Html::element( 'a',
+								[
+									'id' => 'mw-createaccount-join' . ( $loggedIn ? '-loggedin' : '' ),
+									'href' => $linkTitle->getLocalURL( $params['linkQuery'] ),
+									'class' => ( $loggedIn ? '' : 'mw-ui-button' ),
+									'tabindex' => 100,
+								],
+								$this->msg(
+									$loggedIn ? 'userlogin-createanother' : 'userlogin-joinproject'
+								)->escaped()
+							)
+						);
+					},
+					'weight' => 235,
+				];
+			}
 		}
 
 		$fieldDefinitions = $this->getBCFieldDefinitions( $fieldDefinitions, $template );
@@ -1237,7 +1255,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 	/**
 	 * @param array $formDescriptor
 	 */
-	protected function postProcessFormDescriptor( &$formDescriptor ) {
+	protected function postProcessFormDescriptor( &$formDescriptor, $requests ) {
 		// Pre-fill username (if not creating an account, T46775).
 		if (
 			isset( $formDescriptor['username'] ) &&
@@ -1255,7 +1273,7 @@ abstract class LoginSignupSpecialPage extends AuthManagerSpecialPage {
 
 		// don't show a submit button if there is nothing to submit (i.e. the only form content
 		// is other submit buttons, for redirect flows)
-		if ( !$this->needsSubmitButton( $formDescriptor ) ) {
+		if ( !$this->needsSubmitButton( $requests ) ) {
 			unset( $formDescriptor['createaccount'], $formDescriptor['loginattempt'] );
 		}
 
diff --git a/includes/specials/SpecialChangeCredentials.php b/includes/specials/SpecialChangeCredentials.php
index d98504da46..ff70848e25 100644
--- a/includes/specials/SpecialChangeCredentials.php
+++ b/includes/specials/SpecialChangeCredentials.php
@@ -149,7 +149,7 @@ class SpecialChangeCredentials extends AuthManagerSpecialPage {
 		return $form;
 	}
 
-	protected function needsSubmitButton( $formDescriptor ) {
+	protected function needsSubmitButton( array $requests ) {
 		// Change/remove forms show are built from a single AuthenticationRequest and do not allow
 		// for redirect flow; they always need a submit button.
 		return true;
diff --git a/includes/specials/SpecialConfirmemail.php b/includes/specials/SpecialConfirmemail.php
index a656c2ea11..7b4e9db01e 100644
--- a/includes/specials/SpecialConfirmemail.php
+++ b/includes/specials/SpecialConfirmemail.php
@@ -49,10 +49,9 @@ class EmailConfirmation extends UnlistedSpecialPage {
 	function execute( $code ) {
 		// Ignore things like master queries/connections on GET requests.
 		// It's very convenient to just allow formless link usage.
-		Profiler::instance()->getTransactionProfiler()->resetExpectations();
+		$trxProfiler = Profiler::instance()->getTransactionProfiler();
 
 		$this->setHeaders();
-
 		$this->checkReadOnly();
 		$this->checkPermissions();
 
@@ -70,7 +69,9 @@ class EmailConfirmation extends UnlistedSpecialPage {
 				$this->getOutput()->addWikiMsg( 'confirmemail_noemail' );
 			}
 		} else {
+			$trxProfiler->setSilenced( true );
 			$this->attemptConfirm( $code );
+			$trxProfiler->setSilenced( false );
 		}
 	}
 
@@ -146,7 +147,7 @@ class EmailConfirmation extends UnlistedSpecialPage {
 	 *
 	 * @param string $code Confirmation code
 	 */
-	function attemptConfirm( $code ) {
+	private function attemptConfirm( $code ) {
 		$user = User::newFromConfirmationCode( $code, User::READ_LATEST );
 		if ( !is_object( $user ) ) {
 			$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
diff --git a/includes/specials/SpecialEmailInvalidate.php b/includes/specials/SpecialEmailInvalidate.php
index b5c66ff6dc..d2e3e7f132 100644
--- a/includes/specials/SpecialEmailInvalidate.php
+++ b/includes/specials/SpecialEmailInvalidate.php
@@ -39,12 +39,15 @@ class EmailInvalidation extends UnlistedSpecialPage {
 	function execute( $code ) {
 		// Ignore things like master queries/connections on GET requests.
 		// It's very convenient to just allow formless link usage.
-		Profiler::instance()->getTransactionProfiler()->resetExpectations();
+		$trxProfiler = Profiler::instance()->getTransactionProfiler();
 
 		$this->setHeaders();
 		$this->checkReadOnly();
 		$this->checkPermissions();
+
+		$trxProfiler->setSilenced( true );
 		$this->attemptInvalidate( $code );
+		$trxProfiler->setSilenced( false );
 	}
 
 	/**
@@ -53,7 +56,7 @@ class EmailInvalidation extends UnlistedSpecialPage {
 	 *
 	 * @param string $code Confirmation code
 	 */
-	function attemptInvalidate( $code ) {
+	private function attemptInvalidate( $code ) {
 		$user = User::newFromConfirmationCode( $code, User::READ_LATEST );
 		if ( !is_object( $user ) ) {
 			$this->getOutput()->addWikiMsg( 'confirmemail_invalid' );
diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 3e66ab08d3..fe977398a4 100644
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -201,6 +201,7 @@ class SpecialExport extends SpecialPage {
 				'buttontype' => 'submit',
 				'buttonname' => 'addcat',
 				'buttondefault' => $this->msg( 'export-addcat' )->text(),
+				'hide-if' => [ '===', 'exportall', '1' ],
 			],
 		];
 		if ( $config->get( 'ExportFromNamespaces' ) ) {
@@ -216,6 +217,7 @@ class SpecialExport extends SpecialPage {
 					'buttontype' => 'submit',
 					'buttonname' => 'addns',
 					'buttondefault' => $this->msg( 'export-addns' )->text(),
+					'hide-if' => [ '===', 'exportall', '1' ],
 				],
 			];
 		}
@@ -240,6 +242,7 @@ class SpecialExport extends SpecialPage {
 				'nodata' => true,
 				'rows' => 10,
 				'default' => $page,
+				'hide-if' => [ '===', 'exportall', '1' ],
 			],
 		];
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index d0c44c33fd..9cc6745b26 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -353,6 +353,7 @@ class MovePageForm extends UnlistedSpecialPage {
 					'help' => new OOUI\HtmlSnippet( $this->msg( 'movepagetalktext' )->parseAsBlock() ),
 					'align' => 'inline',
 					'infusable' => true,
+					'id' => 'wpMovetalk-field',
 				]
 			);
 		}
diff --git a/includes/specials/SpecialMyLanguage.php b/includes/specials/SpecialMyLanguage.php
index d11fbe638a..9cb6d4b529 100644
--- a/includes/specials/SpecialMyLanguage.php
+++ b/includes/specials/SpecialMyLanguage.php
@@ -91,7 +91,7 @@ class SpecialMyLanguage extends RedirectSpecialArticle {
 
 		$uiCode = $this->getLanguage()->getCode();
 		$proposed = $base->getSubpage( $uiCode );
-		if ( $uiCode !== $this->getConfig()->get( 'LanguageCode' ) && $proposed && $proposed->exists() ) {
+		if ( $proposed && $proposed->exists() && $uiCode !== $base->getPageLanguage()->getCode() ) {
 			return $proposed;
 		} elseif ( $provided && $provided->exists() ) {
 			return $provided;
diff --git a/includes/specials/SpecialRunJobs.php b/includes/specials/SpecialRunJobs.php
index ce5533fbf0..e1e2049d16 100644
--- a/includes/specials/SpecialRunJobs.php
+++ b/includes/specials/SpecialRunJobs.php
@@ -40,7 +40,6 @@ class SpecialRunJobs extends UnlistedSpecialPage {
 
 	public function execute( $par = '' ) {
 		$this->getOutput()->disable();
-
 		if ( wfReadOnly() ) {
 			// HTTP 423 Locked
 			HttpStatus::header( 423 );
diff --git a/includes/specials/SpecialSearch.php b/includes/specials/SpecialSearch.php
index 9690d45bc9..26b86f9762 100644
--- a/includes/specials/SpecialSearch.php
+++ b/includes/specials/SpecialSearch.php
@@ -100,6 +100,25 @@ class SpecialSearch extends SpecialPage {
 	 * @param string $par
 	 */
 	public function execute( $par ) {
+		$request = $this->getRequest();
+
+		// Fetch the search term
+		$search = str_replace( "\n", " ", $request->getText( 'search' ) );
+
+		// Historically search terms have been accepted not only in the search query
+		// parameter, but also as part of the primary url. This can have PII implications
+		// in releasing page view data. As such issue a 301 redirect to the correct
+		// URL.
+		if ( strlen( $par ) && !strlen( $search ) ) {
+			$query = $request->getValues();
+			unset( $query['title'] );
+			// Strip underscores from title parameter; most of the time we'll want
+			// text form here. But don't strip underscores from actual text params!
+			$query['search'] = str_replace( '_', ' ', $par );
+			$this->getOutput()->redirect( $this->getPageTitle()->getFullURL( $query ), 301 );
+			return;
+		}
+
 		$this->setHeaders();
 		$this->outputHeader();
 		$out = $this->getOutput();
@@ -110,15 +129,6 @@ class SpecialSearch extends SpecialPage {
 		] );
 		$this->addHelpLink( 'Help:Searching' );
 
-		// Strip underscores from title parameter; most of the time we'll want
-		// text form here. But don't strip underscores from actual text params!
-		$titleParam = str_replace( '_', ' ', $par );
-
-		$request = $this->getRequest();
-
-		// Fetch the search term
-		$search = str_replace( "\n", " ", $request->getText( 'search', $titleParam ) );
-
 		$this->load();
 		if ( !is_null( $request->getVal( 'nsRemember' ) ) ) {
 			$this->saveNamespaces();
diff --git a/includes/specials/SpecialTags.php b/includes/specials/SpecialTags.php
index e957b3c5da..47bed62642 100644
--- a/includes/specials/SpecialTags.php
+++ b/includes/specials/SpecialTags.php
@@ -142,7 +142,7 @@ class SpecialTags extends SpecialPage {
 			Xml::tags( 'th', null, $this->msg( 'tags-source-header' )->parse() ) .
 			Xml::tags( 'th', null, $this->msg( 'tags-active-header' )->parse() ) .
 			Xml::tags( 'th', null, $this->msg( 'tags-hitcount-header' )->parse() ) .
-			( $userCanManage ?
+			( ( $userCanManage || $userCanDelete ) ?
 				Xml::tags( 'th', [ 'class' => 'unsortable' ],
 					$this->msg( 'tags-actions-header' )->parse() ) :
 				'' )
@@ -266,7 +266,7 @@ class SpecialTags extends SpecialPage {
 
 		}
 
-		if ( $actionLinks ) {
+		if ( $showDeleteActions || $showManageActions ) {
 			$newRow .= Xml::tags( 'td', null, $this->getLanguage()->pipeList( $actionLinks ) );
 		}
 
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 03c864a387..e2f7763251 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -44,7 +44,7 @@ abstract class UploadBase {
 	protected $mDesiredDestName, $mDestName, $mRemoveTempFile, $mSourceType;
 	protected $mTitle = false, $mTitleError = 0;
 	protected $mFilteredName, $mFinalExtension;
-	protected $mLocalFile, $mFileSize, $mFileProps;
+	protected $mLocalFile, $mStashFile, $mFileSize, $mFileProps;
 	protected $mBlackListedExtensions;
 	protected $mJavaDetected, $mSVGNSError;
 
@@ -774,27 +774,6 @@ abstract class UploadBase {
 	 * @since  1.25
 	 */
 	public function postProcessUpload() {
-		global $wgUploadThumbnailRenderMap;
-
-		$jobs = [];
-
-		$sizes = $wgUploadThumbnailRenderMap;
-		rsort( $sizes );
-
-		$file = $this->getLocalFile();
-
-		foreach ( $sizes as $size ) {
-			if ( $file->isVectorized() || $file->getWidth() > $size ) {
-				$jobs[] = new ThumbnailRenderJob(
-					$file->getTitle(),
-					[ 'transformParams' => [ 'width' => $size ] ]
-				);
-			}
-		}
-
-		if ( $jobs ) {
-			JobQueueGroup::singleton()->push( $jobs );
-		}
 	}
 
 	/**
@@ -933,7 +912,7 @@ abstract class UploadBase {
 	/**
 	 * Return the local file and initializes if necessary.
 	 *
-	 * @return LocalFile|UploadStashFile|null
+	 * @return LocalFile|null
 	 */
 	public function getLocalFile() {
 		if ( is_null( $this->mLocalFile ) ) {
@@ -945,23 +924,29 @@ abstract class UploadBase {
 	}
 
 	/**
-	 * Like stashFile(), but respects extensions' wishes to prevent the stashing.
+	 * @return UploadStashFile|null
+	 */
+	public function getStashFile() {
+		return $this->mStashFile;
+	}
+
+	/**
+	 * Like stashFile(), but respects extensions' wishes to prevent the stashing. verifyUpload() must
+	 * be called before calling this method (unless $isPartial is true).
 	 *
 	 * Upload stash exceptions are also caught and converted to an error status.
 	 *
 	 * @since 1.28
 	 * @param User $user
+	 * @param bool $isPartial Pass `true` if this is a part of a chunked upload (not a complete file).
 	 * @return Status If successful, value is an UploadStashFile instance
 	 */
-	public function tryStashFile( User $user ) {
-		$props = $this->mFileProps;
-		$error = null;
-		Hooks::run( 'UploadStashFile', [ $this, $user, $props, &$error ] );
-		if ( $error ) {
-			if ( !is_array( $error ) ) {
-				$error = [ $error ];
+	public function tryStashFile( User $user, $isPartial = false ) {
+		if ( !$isPartial ) {
+			$error = $this->runUploadStashFileHook( $user );
+			if ( $error ) {
+				return call_user_func_array( 'Status::newFatal', $error );
 			}
-			return call_user_func_array( 'Status::newFatal', $error );
 		}
 		try {
 			$file = $this->doStashFile( $user );
@@ -971,6 +956,22 @@ abstract class UploadBase {
 		}
 	}
 
+	/**
+	 * @param User $user
+	 * @return array|null Error message and parameters, null if there's no error
+	 */
+	protected function runUploadStashFileHook( User $user ) {
+		$props = $this->mFileProps;
+		$error = null;
+		Hooks::run( 'UploadStashFile', [ $this, $user, $props, &$error ] );
+		if ( $error ) {
+			if ( !is_array( $error ) ) {
+				$error = [ $error ];
+			}
+		}
+		return $error;
+	}
+
 	/**
 	 * If the user does not supply all necessary information in the first upload
 	 * form submission (either by accident or by design) then we may want to
@@ -1003,7 +1004,7 @@ abstract class UploadBase {
 	protected function doStashFile( User $user = null ) {
 		$stash = RepoGroup::singleton()->getLocalRepo()->getUploadStash( $user );
 		$file = $stash->stashFile( $this->mTempPath, $this->getSourceType() );
-		$this->mLocalFile = $file;
+		$this->mStashFile = $file;
 
 		return $file;
 	}
@@ -1981,18 +1982,16 @@ abstract class UploadBase {
 	 * @return array Image info
 	 */
 	public function getImageInfo( $result ) {
-		$file = $this->getLocalFile();
-		/** @todo This cries out for refactoring.
-		 *  We really want to say $file->getAllInfo(); here.
-		 * Perhaps "info" methods should be moved into files, and the API should
-		 * just wrap them in queries.
-		 */
-		if ( $file instanceof UploadStashFile ) {
+		$localFile = $this->getLocalFile();
+		$stashFile = $this->getStashFile();
+		// Calling a different API module depending on whether the file was stashed is less than optimal.
+		// In fact, calling API modules here at all is less than optimal. Maybe it should be refactored.
+		if ( $stashFile ) {
 			$imParam = ApiQueryStashImageInfo::getPropertyNames();
-			$info = ApiQueryStashImageInfo::getInfo( $file, array_flip( $imParam ), $result );
+			$info = ApiQueryStashImageInfo::getInfo( $stashFile, array_flip( $imParam ), $result );
 		} else {
 			$imParam = ApiQueryImageInfo::getPropertyNames();
-			$info = ApiQueryImageInfo::getInfo( $file, array_flip( $imParam ), $result );
+			$info = ApiQueryImageInfo::getInfo( $localFile, array_flip( $imParam ), $result );
 		}
 
 		return $info;
diff --git a/includes/upload/UploadFromChunks.php b/includes/upload/UploadFromChunks.php
index cc1d69854a..9145a854f3 100644
--- a/includes/upload/UploadFromChunks.php
+++ b/includes/upload/UploadFromChunks.php
@@ -38,12 +38,11 @@ class UploadFromChunks extends UploadFromFile {
 	/**
 	 * Setup local pointers to stash, repo and user (similar to UploadFromStash)
 	 *
-	 * @param User|null $user Default: null
+	 * @param User $user
 	 * @param UploadStash|bool $stash Default: false
 	 * @param FileRepo|bool $repo Default: false
 	 */
-	public function __construct( $user = null, $stash = false, $repo = false ) {
-		// user object. sometimes this won't exist, as when running from cron.
+	public function __construct( User $user, $stash = false, $repo = false ) {
 		$this->user = $user;
 
 		if ( $repo ) {
@@ -77,18 +76,18 @@ class UploadFromChunks extends UploadFromFile {
 
 		$this->verifyChunk();
 		// Create a local stash target
-		$this->mLocalFile = parent::doStashFile( $user );
+		$this->mStashFile = parent::doStashFile( $user );
 		// Update the initial file offset (based on file size)
-		$this->mOffset = $this->mLocalFile->getSize();
-		$this->mFileKey = $this->mLocalFile->getFileKey();
+		$this->mOffset = $this->mStashFile->getSize();
+		$this->mFileKey = $this->mStashFile->getFileKey();
 
 		// Output a copy of this first to chunk 0 location:
-		$this->outputChunk( $this->mLocalFile->getPath() );
+		$this->outputChunk( $this->mStashFile->getPath() );
 
 		// Update db table to reflect initial "chunk" state
 		$this->updateChunkStatus();
 
-		return $this->mLocalFile;
+		return $this->mStashFile;
 	}
 
 	/**
@@ -159,12 +158,25 @@ class UploadFromChunks extends UploadFromFile {
 			return $status;
 		}
 
-		// Update the mTempPath and mLocalFile
+		// Update the mTempPath and mStashFile
 		// (for FileUpload or normal Stash to take over)
 		$tStart = microtime( true );
-		$this->mLocalFile = parent::doStashFile( $this->user );
+		// This is a re-implementation of UploadBase::tryStashFile(), we can't call it because we
+		// override doStashFile() with completely different functionality in this class...
+		$error = $this->runUploadStashFileHook( $this->user );
+		if ( $error ) {
+			call_user_func_array( [ $status, 'fatal' ], $error );
+			return $status;
+		}
+		try {
+			$this->mStashFile = parent::doStashFile( $this->user );
+		} catch ( UploadStashException $e ) {
+			$status->fatal( 'uploadstash-exception', get_class( $e ), $e->getMessage() );
+			return $status;
+		}
+
 		$tAmount = microtime( true ) - $tStart;
-		$this->mLocalFile->setLocalReference( $tmpFile ); // reuse (e.g. for getImageInfo())
+		$this->mStashFile->setLocalReference( $tmpFile ); // reuse (e.g. for getImageInfo())
 		wfDebugLog( 'fileconcatenate', "Stashed combined file ($i chunks) in $tAmount seconds." );
 
 		return $status;
@@ -235,8 +247,6 @@ class UploadFromChunks extends UploadFromFile {
 			$this->getOffset() . ' inx:' . $this->getChunkIndex() . "\n" );
 
 		$dbw = $this->repo->getMasterDB();
-		// Use a quick transaction since we will upload the full temp file into shared
-		// storage, which takes time for large files. We don't want to hold locks then.
 		$dbw->update(
 			'uploadstash',
 			[
@@ -247,7 +257,6 @@ class UploadFromChunks extends UploadFromFile {
 			[ 'us_key' => $this->mFileKey ],
 			__METHOD__
 		);
-		$dbw->commit( __METHOD__, 'flush' );
 	}
 
 	/**
diff --git a/includes/upload/UploadFromStash.php b/includes/upload/UploadFromStash.php
index 50bcbc4260..1fbdb7d86d 100644
--- a/includes/upload/UploadFromStash.php
+++ b/includes/upload/UploadFromStash.php
@@ -143,24 +143,6 @@ class UploadFromStash extends UploadBase {
 		return $this->mFileProps['sha1'];
 	}
 
-	/*
-	 * protected function verifyFile() inherited
-	 */
-
-	/**
-	 * Stash the file.
-	 *
-	 * @param User $user
-	 * @return UploadStashFile
-	 */
-	protected function doStashFile( User $user = null ) {
-		// replace mLocalFile with an instance of UploadStashFile, which adds some methods
-		// that are useful for stashed files.
-		$this->mLocalFile = parent::doStashFile( $user );
-
-		return $this->mLocalFile;
-	}
-
 	/**
 	 * Remove a temporarily kept file stashed by saveTempUploadedFile().
 	 * @return bool Success
diff --git a/includes/user/User.php b/includes/user/User.php
index 7ba1d91314..a9ccc4ed52 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1537,9 +1537,12 @@ class User implements IDBAccessObject {
 		foreach ( LanguageConverter::$languagesWithVariants as $langCode ) {
 			$defOpt[$langCode == $wgContLang->getCode() ? 'variant' : "variant-$langCode"] = $langCode;
 		}
-		$namespaces = MediaWikiServices::getInstance()->getSearchEngineConfig()->searchableNamespaces();
-		foreach ( $namespaces as $nsnum => $nsname ) {
-			$defOpt['searchNs' . $nsnum] = !empty( $wgNamespacesToBeSearchedDefault[$nsnum] );
+
+		// NOTE: don't use SearchEngineConfig::getSearchableNamespaces here,
+		// since extensions may change the set of searchable namespaces depending
+		// on user groups/permissions.
+		foreach ( $wgNamespacesToBeSearchedDefault as $nsnum => $val ) {
+			$defOpt['searchNs' . $nsnum] = (boolean)$val;
 		}
 		$defOpt['skin'] = Skin::normalizeKey( $wgDefaultSkin );
 
@@ -3131,6 +3134,7 @@ class User implements IDBAccessObject {
 	public function getRights() {
 		if ( is_null( $this->mRights ) ) {
 			$this->mRights = self::getGroupPermissions( $this->getEffectiveGroups() );
+			Hooks::run( 'UserGetRights', [ $this, &$this->mRights ] );
 
 			// Deny any rights denied by the user's session, unless this
 			// endpoint has no sessions.
@@ -3141,9 +3145,24 @@ class User implements IDBAccessObject {
 				}
 			}
 
-			Hooks::run( 'UserGetRights', [ $this, &$this->mRights ] );
 			// Force reindexation of rights when a hook has unset one of them
 			$this->mRights = array_values( array_unique( $this->mRights ) );
+
+			// If block disables login, we should also remove any
+			// extra rights blocked users might have, in case the
+			// blocked user has a pre-existing session (T129738).
+			// This is checked here for cases where people only call
+			// $user->isAllowed(). It is also checked in Title::checkUserBlock()
+			// to give a better error message in the common case.
+			$config = RequestContext::getMain()->getConfig();
+			if (
+				$this->isLoggedIn() &&
+				$config->get( 'BlockDisablesLogin' ) &&
+				$this->isBlocked()
+			) {
+				$anon = new User;
+				$this->mRights = array_intersect( $this->mRights, $anon->getRights() );
+			}
 		}
 		return $this->mRights;
 	}
@@ -3958,7 +3977,6 @@ class User implements IDBAccessObject {
 		$noPass = PasswordFactory::newInvalidPassword()->toString();
 
 		$dbw = wfGetDB( DB_MASTER );
-		$inWrite = $dbw->writesOrCallbacksPending();
 		$seqVal = $dbw->nextSequenceValue( 'user_user_id_seq' );
 		$dbw->insert( 'user',
 			[
@@ -3977,25 +3995,17 @@ class User implements IDBAccessObject {
 			[ 'IGNORE' ]
 		);
 		if ( !$dbw->affectedRows() ) {
-			// The queries below cannot happen in the same REPEATABLE-READ snapshot.
-			// Handle this by COMMIT, if possible, or by LOCK IN SHARE MODE otherwise.
-			if ( $inWrite ) {
-				// Can't commit due to pending writes that may need atomicity.
-				// This may cause some lock contention unlike the case below.
-				$options = [ 'LOCK IN SHARE MODE' ];
-				$flags = self::READ_LOCKING;
-			} else {
-				// Often, this case happens early in views before any writes when
-				// using CentralAuth. It's should be OK to commit and break the snapshot.
-				$dbw->commit( __METHOD__, 'flush' );
-				$options = [];
-				$flags = self::READ_LATEST;
-			}
-			$this->mId = $dbw->selectField( 'user', 'user_id',
-				[ 'user_name' => $this->mName ], __METHOD__, $options );
+			// Use locking reads to bypass any REPEATABLE-READ snapshot.
+			$this->mId = $dbw->selectField(
+				'user',
+				'user_id',
+				[ 'user_name' => $this->mName ],
+				__METHOD__,
+				[ 'LOCK IN SHARE MODE' ]
+			);
 			$loaded = false;
 			if ( $this->mId ) {
-				if ( $this->loadFromDatabase( $flags ) ) {
+				if ( $this->loadFromDatabase( self::READ_LOCKING ) ) {
 					$loaded = true;
 				}
 			}
@@ -4187,6 +4197,8 @@ class User implements IDBAccessObject {
 	 * login credentials aren't being hijacked with a foreign form
 	 * submission.
 	 *
+	 * The $salt for 'edit' and 'csrf' tokens is the default (empty string).
+	 *
 	 * @since 1.19
 	 * @param string|array $salt Array of Strings Optional function-specific data for hashing
 	 * @param WebRequest|null $request WebRequest object to use or null to use $wgRequest
diff --git a/includes/utils/BatchRowWriter.php b/includes/utils/BatchRowWriter.php
index ffb7053b38..a6e47c8976 100644
--- a/includes/utils/BatchRowWriter.php
+++ b/includes/utils/BatchRowWriter.php
@@ -20,6 +20,8 @@
  * @file
  * @ingroup Maintenance
  */
+use \MediaWiki\MediaWikiServices;
+
 class BatchRowWriter {
 	/**
 	 * @var IDatabase $db The database to write to
@@ -54,7 +56,8 @@ class BatchRowWriter {
 	 *  names to update values to apply to the row.
 	 */
 	public function write( array $updates ) {
-		$this->db->begin();
+		$lbFactory = MediaWikiServices::getInstance()->getDBLoadBalancerFactory();
+		$ticket = $lbFactory->getEmptyTransactionTicket( __METHOD__ );
 
 		foreach ( $updates as $update ) {
 			$this->db->update(
@@ -65,7 +68,6 @@ class BatchRowWriter {
 			);
 		}
 
-		$this->db->commit();
-		wfGetLBFactory()->waitForReplication();
+		$lbFactory->commitAndWaitForReplication( __METHOD__, $ticket );
 	}
 }
diff --git a/languages/Language.php b/languages/Language.php
index d96710a626..cb3b4b8832 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -25,11 +25,6 @@
  * @defgroup Language Language
  */
 
-if ( !defined( 'MEDIAWIKI' ) ) {
-	echo "This file is part of MediaWiki, it is not a valid entry point.\n";
-	exit( 1 );
-}
-
 use CLDRPluralRuleParser\Evaluator;
 
 /**
@@ -1041,6 +1036,7 @@ class Language {
 	 *    xin  n (month number) in Iranian calendar
 	 *    xiy  y (two digit year) in Iranian calendar
 	 *    xiY  Y (full year) in Iranian calendar
+	 *    xit  t (days in month) in Iranian calendar
 	 *
 	 *    xjj  j (day number) in Hebrew calendar
 	 *    xjF  F (month name) in Hebrew calendar
@@ -1336,6 +1332,13 @@ class Language {
 					}
 					$num = substr( $iranian[0], -2 );
 					break;
+				case 'xit':
+					$usedIranianYear = true;
+					if ( !$iranian ) {
+						$iranian = self::tsToIranian( $ts );
+					}
+					$num = self::$IRANIAN_DAYS[$iranian[1] - 1];
+					break;
 				case 'a':
 					$usedAMPM = true;
 					$s .= intval( substr( $ts, 8, 2 ) ) < 12 ? 'am' : 'pm';
diff --git a/languages/i18n/af.json b/languages/i18n/af.json
index 7bdc09701c..d6534b698a 100644
--- a/languages/i18n/af.json
+++ b/languages/i18n/af.json
@@ -524,8 +524,6 @@
 	"passwordreset-emailtext-user": "Gebruiker $1 op die webtuiste {{SITENAME}} het u gebruikersgegewens vir {{SITENAME}} ($4) opgevra.\nDie volgende {{PLURAL:$3|gebruiker is|gebruikers is}} aan die e-posadres gekoppel:\n\n$2\n\n{{PLURAL:$3|Die tydelike wagwoord verval|Hierdie tydelike wagwoorde verval}} oor {{PLURAL:$5|een dag|$5 dae}}.\nMeld asseblief aan en verander u wagwoord nou. As u dit nie versoek het nie, of as u die oorspronklike wagwoord nog ken en dit nie wil verander nie, ignoreer die berig en hou aan om u ou wagwoord te gebruik.",
 	"passwordreset-emailelement": "Gebruikersnaam: \n$1\n\nTydelike wagwoord: \n$2",
 	"passwordreset-emailsentemail": "'n E-pos is gestuur om u wagwoord te herstel.",
-	"passwordreset-emailsent-capture": "'n E-pos vir die herstel van 'n wagwoord is gestuur. Dit word hieronder vertoon.",
-	"passwordreset-emailerror-capture": "'n E-pos vir die herstel van 'n wagwoord is saamgestel. Dit word hieronder vertoon. Die uitstuur daarvan na die {{GENDER:$2|gebruiker}} het egter gefaal: $1",
 	"changeemail": "Wysig E-posadres",
 	"changeemail-header": "Wysig rekening se e-posadres",
 	"changeemail-no-info": "U moet aangemeld wees om regstreeks toegang tot die bladsy te kry.",
@@ -689,7 +687,6 @@
 	"undo-nochange": "Die wysiging is klaarblyklik reeds teruggerol.",
 	"undo-summary": "Rol weergawe $1 deur [[Special:Contributions/$2|$2]] ([[User talk:$2|bespreek]]) terug.",
 	"undo-summary-username-hidden": "Rol weergawe $1 deur 'n versteekte gebruiker terug",
-	"cantcreateaccounttitle": "Kan nie rekening skep nie",
 	"cantcreateaccount-text": "Die registrasie van nuwe rekeninge vanaf die IP-adres ('''$1''') is geblok deur [[User:$3|$3]].\n\nDie rede verskaf deur $3 is ''$2''",
 	"viewpagelogs": "Bekyk logboeke vir hierdie bladsy",
 	"nohistory": "Daar is geen wysigingsgeskiedenis vir hierdie bladsy nie.",
@@ -3110,11 +3107,12 @@
 	"mediastatistics-header-total": "Alle lêers",
 	"json-error-syntax": "Sintaksfout",
 	"headline-anchor-title": "Skakel na die afdeling",
-	"special-characters-group-latin": "Latyns",
-	"special-characters-group-latinextended": "Latyns uitgebreid",
+	"special-characters-group-latin": "Latyn",
+	"special-characters-group-latinextended": "Latyn uitgebrei",
 	"special-characters-group-ipa": "IFA",
 	"special-characters-group-symbols": "Simbole",
 	"special-characters-group-greek": "Grieks",
+	"special-characters-group-greekextended": "Grieks uitgebrei",
 	"special-characters-group-cyrillic": "Cyrillies",
 	"special-characters-group-arabic": "Arabies",
 	"special-characters-group-arabicextended": "Arabies uitgebrei",
@@ -3127,7 +3125,7 @@
 	"special-characters-group-gujarati": "Gujarati",
 	"special-characters-group-devanagari": "Devanagari",
 	"special-characters-group-thai": "Thai",
-	"special-characters-group-lao": "Lao",
+	"special-characters-group-lao": "Laosiaans",
 	"special-characters-group-khmer": "Khmer",
 	"special-characters-title-minus": "minusteken",
 	"mw-widgets-dateinput-no-date": "Geen datum gekies nie",
diff --git a/languages/i18n/ang.json b/languages/i18n/ang.json
index d10b150fcd..0646f21de1 100644
--- a/languages/i18n/ang.json
+++ b/languages/i18n/ang.json
@@ -14,7 +14,9 @@
 			"아라",
 			"Dpk",
 			"Macofe",
-			"WhatamIdoing"
+			"WhatamIdoing",
+			"Hogweard",
+			"Amire80"
 		]
 	},
 	"tog-underline": "Mearc under hlencan:",
@@ -125,6 +127,8 @@
 	"october-date": "$1. Winterfylleðes",
 	"november-date": "$1. Blōtmōnaðes",
 	"december-date": "$1. Ǣrran Gēolan",
+	"period-am": "on undernmǣl",
+	"period-pm": "on ofernōn",
 	"pagecategories": "{{PLURAL:$1|Flocc|Floccas}}",
 	"category_header": "Trametas in \"$1\" flocce",
 	"subcategories": "Underfloccas",
@@ -223,7 +227,9 @@
 	"jumptonavigation": "þurhfōr",
 	"jumptosearch": "sēcan",
 	"view-pool-error": "Wālā, þā þegntōlas nū oferlīce wyrcaþ.\nTō mænige brūcendas gesēcaþ tō sēonne þisne tramet.\nWē biddaþ þæt þū abīde scortne tīman ǣr þū gesēce to sēonne þisne tramet eft.\n\n$1",
+	"pool-queuefull": "Pundfaldes forepenn is full",
 	"pool-errorunknown": "Uncūþ wōh",
+	"pool-servererror": "Seo pundaldgetalere þēgnung nis gearo",
 	"aboutsite": "Gecȳþness ymbe {{GRAMMAR:wrēgendlīc|{{SITENAME}}}}",
 	"aboutpage": "Project:Gefrǣge",
 	"copyright": "Man mæg innunge under $1 findan, būton þǣr hit is elles amearcod.",
@@ -440,6 +446,7 @@
 	"minoredit": "Þēos is lytel adihtung",
 	"watchthis": "Behealdan þisne tramet",
 	"savearticle": "Hordian tramet",
+	"publishpage": "Geswutele tramet",
 	"publishchanges": "Geswutele wrixlung",
 	"preview": "Forebysen",
 	"showpreview": "Īwan forebysene",
@@ -1058,7 +1065,7 @@
 	"watchlisttools-view": "Sēon andwendunga",
 	"watchlisttools-edit": "Sēon and adihtan behealdungtæl",
 	"watchlisttools-raw": "Adihtan hrēaw behealdungtæl",
-	"signature": "[[{{ns:user}}:$1|$2]]\n([[{{ns:user_talk}}:$1|mōtung]])",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|mōtung]])",
 	"version": "Fadung",
 	"version-specialpages": "Syndrige trametas",
 	"version-other": "Ōðer",
diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index 80df33f75f..3b40a0518a 100644
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -1847,7 +1847,7 @@
 	"activeusers-hidebots": "أخف البوتات",
 	"activeusers-hidesysops": "أخف الإداريين",
 	"activeusers-noresult": "لم يعثر على أي مستخدمين",
-	"activeusers-submit": "لعرض المستخدمين النشطين",
+	"activeusers-submit": "عرض المستخدمين النشطين",
 	"listgrouprights": "صلاحيات مجموعات المستخدمين",
 	"listgrouprights-summary": "التالي قائمة بمجموعات المستخدمين المعرفة في هذا الويكي، بصلاحياتهم المصاحبة.\nربما تكون هناك [[{{MediaWiki:Listgrouprights-helppage}}|معلومات إضافية]] حول الصلاحيات المنفردة.",
 	"listgrouprights-key": "عنوان:\n* <span class=\"listgrouprights-granted\">صلاحية ممنوحة</span>\n* <span class=\"listgrouprights-revoked\">صلاحية مسحوبة</span>",
@@ -2098,7 +2098,7 @@
 	"undeletedrevisions-files": "أسترجعت {{PLURAL:$1||مراجعة واحدة|مراجعتان|$1 مراجعات|$1 مراجعة}}  و{{PLURAL:$2||ملف واحد|ملفان|$2 ملفات|$2 ملفًا|$2 ملف}}",
 	"undeletedfiles": "أسترجع {{PLURAL:$1||ملف واحد|ملفان|$1 ملفات|$1 ملفًا|$1 ملف}}",
 	"cannotundelete": "فشل الاسترجاع؛\n$1",
-	"undeletedpage": "'''تم استرجاع $1'''\n\nراجع [[Special:Log/delete|سجل الحدف]] لمعاينة عمليات الحذف والاسترجاعات الحديثة.",
+	"undeletedpage": "'''تم استرجاع $1'''\n\nراجع [[Special:Log/delete|سجل الحذف]] لمعاينة عمليات الحذف والاسترجاعات الحديثة.",
 	"undelete-header": "انظر الصفحات المحذوفة حديثا في [[Special:Log/delete|سجل الحذف]].",
 	"undelete-search-title": "البحث في الصفحات المحذوفة",
 	"undelete-search-box": "ابحث في الصفحات المحذوفة",
diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json
index 4c8c6d0209..417ca02f24 100644
--- a/languages/i18n/ast.json
+++ b/languages/i18n/ast.json
@@ -1197,6 +1197,7 @@
 	"grant-group-high-volume": "Facer una actividá d'altu volume",
 	"grant-group-customization": "Personalización y preferencies",
 	"grant-group-administration": "Facer aiciones alministratives",
+	"grant-group-private-information": "Acceder a datos privaos sobre ti",
 	"grant-group-other": "Actividaes variaes",
 	"grant-blockusers": "Bloquiar y desbloquiar usuarios",
 	"grant-createaccount": "Crear cuentes",
@@ -1211,6 +1212,7 @@
 	"grant-highvolume": "Ediciones de gran volume",
 	"grant-oversight": "Tapecer usuarios y desaniciar revisiones",
 	"grant-patrol": "Patrullar los cambios fechos nes páxines",
+	"grant-privateinfo": "Acceder a información privada",
 	"grant-protect": "Protexer y desprotexer páxines",
 	"grant-rollback": "Desfacer los cambios fechos nes páxines",
 	"grant-sendemail": "Unviar corréu a otros usuarios",
@@ -1270,6 +1272,7 @@
 	"action-applychangetags": "aplicar etiquetes xunto colos cambios",
 	"action-changetags": "amestar y desaniciar etiquetes arbitraries en revisiones individuales y entraes del rexistru",
 	"action-deletechangetags": "desaniciar etiquetes de la base de datos",
+	"action-purge": "purgar esta páxina",
 	"nchanges": "{{PLURAL:$1|un cambiu|$1 cambios}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|dende la última visita}}",
 	"enhancedrc-history": "historial",
@@ -1516,6 +1519,7 @@
 	"uploadstash-errclear": "Falló'l desaniciu de los ficheros.",
 	"uploadstash-refresh": "Anovar la llista de ficheros",
 	"uploadstash-thumbnail": "ver miniatura",
+	"uploadstash-exception": "Nun pudo guardase la subida nel almacén ($1): «$2».",
 	"invalid-chunk-offset": "Allugamientu inválidu del fragmentu",
 	"img-auth-accessdenied": "Accesu denegáu",
 	"img-auth-nopathinfo": "Falta PATH_INFO.\nEl to sirvidor nun ta configuráu pa pasar esta información.\nPue tar basáu en CGI y nun tener sofitu pa img_auth.\nVer https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization",
@@ -1932,9 +1936,11 @@
 	"watchnologin": "Non identificáu",
 	"addwatch": "Amestar a la llista de siguimientu",
 	"addedwatchtext": "«[[:$1]]» y la so páxina d'alderique amestáronse a la to [[Special:Watchlist|llista de siguimientu]].",
+	"addedwatchtext-talk": "«[[:$1]]» y la so páxina asociada amestáronse a la to [[Special:Watchlist|llista de siguimientu]].",
 	"addedwatchtext-short": "Amestóse la páxina «$1» a la to llista de siguimientu.",
 	"removewatch": "Desaniciar de la llista de siguimientu",
 	"removedwatchtext": "«[[:$1]]» y la so páxina d'alderique desaniciáronse de la to [[Special:Watchlist|llista de siguimientu]].",
+	"removedwatchtext-talk": "«[[:$1]]» y la so páxina asociada desaniciáronse de la to [[Special:Watchlist|llista de siguimientu]].",
 	"removedwatchtext-short": "Desanicióse la páxina «$1» de la to llista de siguimientu.",
 	"watch": "Vixilar",
 	"watchthispage": "Vixilar esta páxina",
@@ -2106,6 +2112,7 @@
 	"undeletehistorynoadmin": "Esta páxina foi esborrada. El motivu del esborráu amuésase\nnel resume d'embaxo, amás de detalles de los usuarios qu'editaron esta páxina enantes\nde ser esborrada. El testu actual d'estes revisiones esborraes ta disponible namái pa los alministradores.",
 	"undelete-revision": "Revisión esborrada de $1 ($4, a les $5) fecha por $3:",
 	"undeleterevision-missing": "Falta la revisión o nun ye válida. Sieque l'enllaz nun seya correutu, o que la\nrevisión fuera restaurada o eliminada del archivu.",
+	"undeleterevision-duplicate-revid": "{{PLURAL:$1|Una revisión nun pudo|$1 revisiones nun pudieron}} restaurase porque {{PLURAL:$1|taba usándose la so|taben usándose les sos}} <code>rev_id</code>.",
 	"undelete-nodiff": "Nun s'atopó revisión previa.",
 	"undeletebtn": "Restaurar",
 	"undeletelink": "ver/restaurar",
@@ -2115,7 +2122,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|1 revisión restaurada|$1 revisiones restauraes}}",
 	"undeletedrevisions-files": "{{PLURAL:$1|1 revisión|$1 revisiones}} y {{PLURAL:$2|1 archivu|$2 archivos}} restauraos",
 	"undeletedfiles": "{{PLURAL:$1|1 archivu restauráu|$1 archivos restauraos}}",
-	"cannotundelete": "Falló la restauración:\n$1",
+	"cannotundelete": "Falló total o parcialmente la restauración:\n$1",
 	"undeletedpage": "'''Restauróse $1'''\n\nConsulta'l [[Special:Log/delete|rexistru d'esborraos]] pa ver los esborraos y restauraciones de recién.",
 	"undelete-header": "Mira nel [[Special:Log/delete|rexistru d'esborraos]] les páxines esborraes recién.",
 	"undelete-search-title": "Buscar páxines desaniciaes",
@@ -2153,8 +2160,8 @@
 	"sp-contributions-newbies-sub": "Namái les cuentes nueves",
 	"sp-contributions-newbies-title": "Contribuciones d'usuariu pa cuentes nueves",
 	"sp-contributions-blocklog": "rexistru de bloqueos",
-	"sp-contributions-suppresslog": "collaboraciones del usuariu desaniciaes",
-	"sp-contributions-deleted": "Contribuciones d'usuariu desaniciaes",
+	"sp-contributions-suppresslog": "collaboraciones {{GENDER:$1|del usuariu|de la usuaria}} suprimíes",
+	"sp-contributions-deleted": "collaboraciones {{GENDER:$1|del usuariu|de la usuaria}} desaniciaes",
 	"sp-contributions-uploads": "xubes",
 	"sp-contributions-logs": "rexistros",
 	"sp-contributions-talk": "alderique",
@@ -3704,8 +3711,24 @@
 	"authform-notoken": "Falta token",
 	"authform-wrongtoken": "Token incorreutu",
 	"specialpage-securitylevel-not-allowed-title": "Nun ta permitío",
+	"specialpage-securitylevel-not-allowed": "Sentímoslo, nun tienes permisu pa usar esta páxina porque nun pudo comprobase la to identidá.",
+	"authpage-cannot-login": "Nun pudo empecipiase l'aniciu de sesión.",
+	"authpage-cannot-login-continue": "Nun pudo siguise col aniciu de sesión. Probablemente la sesión caducó.",
+	"authpage-cannot-create": "Nun pudo empecipiase la creación de la cuenta.",
+	"authpage-cannot-create-continue": "Nun pudo siguise la creación de cuenta. Probablemente la sesión caducó.",
+	"authpage-cannot-link": "Nun pudo empecipiase l'enllazáu de la cuenta.",
+	"authpage-cannot-link-continue": "Nun pudo siguise col enllazáu de cuenta. Probablemente la sesión caducó.",
 	"cannotauth-not-allowed-title": "Permisu refugáu",
 	"cannotauth-not-allowed": "Nun tienes permisu pa usar esta páxina",
+	"changecredentials": "Camudar les credenciales",
+	"changecredentials-submit": "Camudar credenciales",
+	"changecredentials-invalidsubpage": "$1 nun ye un tipu de credencial válidu.",
+	"changecredentials-success": "Camudáronse les tos credenciales.",
+	"removecredentials": "Desaniciar credenciales",
+	"removecredentials-submit": "Desaniciar credenciales",
+	"removecredentials-invalidsubpage": "$1 nun ye un tipu de credencial válidu.",
+	"removecredentials-success": "Desaniciáronse les tos credenciales.",
+	"credentialsform-provider": "Tipu de credenciales:",
 	"credentialsform-account": "Nome de la cuenta:",
 	"cannotlink-no-provider-title": "Nun hai cuentes enllazables",
 	"cannotlink-no-provider": "Nun hai cuentes enllazables.",
@@ -3713,5 +3736,6 @@
 	"linkaccounts-success-text": "Enllazóse la cuenta.",
 	"linkaccounts-submit": "Enllazar cuentes",
 	"unlinkaccounts": "Desenllazar cuentes",
-	"unlinkaccounts-success": "Desenllazóse la cuenta."
+	"unlinkaccounts-success": "Desenllazóse la cuenta.",
+	"authenticationdatachange-ignored": "Nun se xestionó'l cambéu de los datos d'autentificacion. ¿Seique, nun se configuró un fornidor?"
 }
diff --git a/languages/i18n/az.json b/languages/i18n/az.json
index 026c3f8d6c..3432c23dbb 100644
--- a/languages/i18n/az.json
+++ b/languages/i18n/az.json
@@ -1331,6 +1331,10 @@
 	"alllogstext": "{{SITENAME}} üçün bütün mövcud qeydlərin birgə göstərişi.\nQeyd növü, istifadəçi adı və ya təsir edilmiş səhifəni seçməklə daha spesifik ola bilərsiniz.",
 	"logempty": "Jurnalda uyğun qeyd tapılmadı.",
 	"log-title-wildcard": "Bu mətnlə başlayan başlıqları axtar",
+	"checkbox-select": "Seçin: $1",
+	"checkbox-all": "Hamısı",
+	"checkbox-none": "Heç biri",
+	"checkbox-invert": "Çevir",
 	"allpages": "Bütün səhifələr",
 	"nextpage": "Sonrakı səhifə ($1)",
 	"prevpage": "Əvvəlki səhifə ($1)",
diff --git a/languages/i18n/azb.json b/languages/i18n/azb.json
index c2a09db56a..1a537ce957 100644
--- a/languages/i18n/azb.json
+++ b/languages/i18n/azb.json
@@ -2305,9 +2305,9 @@
 	"tooltip-undo": "ائدیلمیش ديَیشیکلیگی گئری قايتار و گئری قايتارما سببینی قئيد ائتمک اۆچون سێناق گؤستریشینی آچ",
 	"tooltip-preferences-save": "ترجیحلری ساخلا",
 	"tooltip-summary": "قیسا بیر خولاصه‌‌ یازین",
-	"anonymous": "{{SITENAME}} سایتینین آنونیم {{PLURAL:$1|یستیفادچیسی|یستیفاده‌چی‌لری}}",
+	"anonymous": "{{SITENAME}} سایتینین تانینمامیش {{PLURAL:$1|یشلدن|یشلدنلری}}",
 	"siteuser": "{{SITENAME}} ایستیفاده‌چی‌سی $1",
-	"anonuser": "{{SITENAME}} آنونیم ایستیفاده‌چی‌سی $1",
+	"anonuser": "{{SITENAME}} آنونیم ایشلدن $1",
 	"lastmodifiedatby": "بۇ صحیفه‌‌ سوْنونجو دفعه‌‌ $1، $2 تاریخینده دَییشیلیب.",
 	"othercontribs": "$1-این ایشینه اساسلانیب.",
 	"others": "آیریلار",
diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json
index e5a0f8d1e8..51f186e9f4 100644
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -177,7 +177,7 @@
 	"tagline": "Зьвесткі з {{GRAMMAR:родны|{{SITENAME}}}}",
 	"help": "Дапамога",
 	"search": "Пошук",
-	"search-ignored-headings": " #<!-- не зьмяняйце гэты радок --> <pre>\n# Загалоўкі, якія мусіць ігнараваць пошукавы рухавік.\n# Зьмены будуць ужытыя па наступным індэксаваньні старонкі.\n# Вы можаце змусіць пераіндэксаваць старонку пустым рэдагаваньнем.\n# Сынтакс наступны:\n#   * Усё, што пачынаецца з \"#\" — камэнтар\n#   * Усякі непусты радок — загаловак, які трэба ігнараваць\nКрыніцы\nВонкавыя спасылкі\nГлядзіце таксама\n #</pre> <!-- не зьмяняйце гэты радок -->",
+	"search-ignored-headings": " #<!-- не зьмяняйце гэты радок --> <pre>\n# Загалоўкі, якія мусіць ігнараваць пошукавы рухавік.\n# Зьмены будуць ужытыя па наступным індэксаваньні старонкі.\n# Вы можаце змусіць пераіндэксаваць старонку пустым рэдагаваньнем.\n# Сынтакс наступны:\n#   * Усё, што пачынаецца з «#» і да канца радку — камэнтар\n#   * Усякі непусты радок — загаловак, які трэба ігнараваць\nКрыніцы\nВонкавыя спасылкі\nГлядзіце таксама\n #</pre> <!-- не зьмяняйце гэты радок -->",
 	"searchbutton": "Пошук",
 	"go": "Старонка",
 	"searcharticle": "Старонка",
@@ -1198,6 +1198,7 @@
 	"grant-group-high-volume": "Выкананьне дзеяньняў з высокай інтэнсіўнасьцю",
 	"grant-group-customization": "Налады і перавагі",
 	"grant-group-administration": "Выкананьне адміністрацыйных дзеяньняў",
+	"grant-group-private-information": "Доступ да прыватных зьвестак пра вас",
 	"grant-group-other": "Розная актыўнасьць",
 	"grant-blockusers": "Блякаваньне і разблякаваньне ўдзельнікаў",
 	"grant-createaccount": "Стварыць рахункі",
@@ -1212,6 +1213,7 @@
 	"grant-highvolume": "Рэдагаваньне з высокай інтэнсіўнасьцю",
 	"grant-oversight": "Хаваньне ўдзельнікаў і вэрсіяў старонак",
 	"grant-patrol": "Патруляваньне зьменаў старонак",
+	"grant-privateinfo": "Доступ да прыватных зьвестак",
 	"grant-protect": "Абарона і зьняцьце абароны старонак",
 	"grant-rollback": "Адкат зьменаў старонак",
 	"grant-sendemail": "Адпраўка лістоў электроннай пошты іншым удзельнікам",
@@ -1516,6 +1518,7 @@
 	"uploadstash-errclear": "Не атрымалася ачысьціць файлы.",
 	"uploadstash-refresh": "Абнавіць сьпіс файлаў.",
 	"uploadstash-thumbnail": "прагляд мініятуры",
+	"uploadstash-exception": "Не магу захаваць загрузку ў сховішчы ($1): «$2».",
 	"invalid-chunk-offset": "Няслушнае зрушэньне фрагмэнту",
 	"img-auth-accessdenied": "Доступ забаронены",
 	"img-auth-nopathinfo": "Адсутнічае PATH_INFO.\nВаш сэрвэр не ўстаноўлены на пропуск гэтай інфармацыі.\nМагчма, ён працуе праз CGI і не падтрымлівае img_auth.\nГлядзіце https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization.",
@@ -2116,7 +2119,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|адноўленая $1 вэрсія|адноўленыя $1 вэрсіі|адноўленыя $1 вэрсіяў}}",
 	"undeletedrevisions-files": "адноўленыя $1 {{PLURAL:$1|вэрсія|вэрсіі|вэрсіяў}} і $2 {{PLURAL:$2|файл|файлы|файлаў}}",
 	"undeletedfiles": "{{PLURAL:$1|адноўлены $1 файл|адноўленыя $1 файлы|адноўленыя $1 файлаў}}",
-	"cannotundelete": "Памылка аднаўленьня:\n$1",
+	"cannotundelete": "Некаторыя або ўсе аднаўленьні не былі выкананыя:\n$1",
 	"undeletedpage": "'''Старонка $1 была адноўленая'''\n\nГлядзіце [[Special:Log/delete|журнал выдаленьняў]] для прагляду апошніх выдаленьняў і аднаўненьняў.",
 	"undelete-header": "Глядзіце [[Special:Log/delete|журнал выдаленьняў]] для прагляду апошніх выдаленьняў.",
 	"undelete-search-title": "Пошук выдаленых старонак",
@@ -2154,8 +2157,8 @@
 	"sp-contributions-newbies-sub": "Унёсак пачынаючых",
 	"sp-contributions-newbies-title": "Унёсак удзельнікаў з новых рахункаў",
 	"sp-contributions-blocklog": "журнал блякаваньняў",
-	"sp-contributions-suppresslog": "выдалены ўнёсак удзельніка",
-	"sp-contributions-deleted": "выдалены ўнёсак удзельніка",
+	"sp-contributions-suppresslog": "выдалены ўнёсак {{GENDER:$1|удзельніка|удзельніцы}}",
+	"sp-contributions-deleted": "выдалены ўнёсак {{GENDER:$1|удзельніка|удзельніцы}}",
 	"sp-contributions-uploads": "загрузкі",
 	"sp-contributions-logs": "журналы падзеяў",
 	"sp-contributions-talk": "гутаркі",
@@ -3611,6 +3614,26 @@
 	"log-action-filter-import": "Тып імпарту:",
 	"log-action-filter-move": "Тып пераносу:",
 	"log-action-filter-all": "Усе",
+	"log-action-filter-block-block": "Заблякаваць",
+	"log-action-filter-block-reblock": "Зьмяненьне блякаваньня",
+	"log-action-filter-block-unblock": "Разблякаваць",
+	"log-action-filter-contentmodel-change": "Зьмена мадэлі зьместу",
+	"log-action-filter-delete-delete": "Выдаленьне старонкі",
+	"log-action-filter-delete-restore": "Аднаўленьне старонкі",
+	"log-action-filter-delete-event": "Выдаленьне журналу",
+	"log-action-filter-delete-revision": "Выдаленьне вэрсіі",
+	"log-action-filter-managetags-create": "Стварэньне цэтлікаў",
+	"log-action-filter-managetags-delete": "Выдаленьне цэтлікаў",
+	"log-action-filter-managetags-activate": "Актывацыя цэтлікаў",
+	"log-action-filter-managetags-deactivate": "Дэактывацыя цэтлікаў",
+	"log-action-filter-newusers-autocreate": "Аўтаматычнае стварэньне",
+	"log-action-filter-patrol-autopatrol": "Аўтаматычнае патруляваньне",
+	"log-action-filter-protect-protect": "Абарона",
+	"log-action-filter-protect-unprotect": "Зьняцьце абароны",
+	"log-action-filter-rights-autopromote": "Аўтаматычнае зьмяненьне",
+	"log-action-filter-upload-upload": "Новая загрузка",
+	"authmanager-realname-label": "Сапраўднае імя",
+	"authmanager-provider-temporarypassword": "Часовы пароль",
 	"changecredentials": "Зьмена ўліковых зьвестак",
 	"removecredentials": "Выдаленьне ўліковых зьвестак",
 	"removecredentials-submit": "Выдаліць уліковыя зьвесткі",
diff --git a/languages/i18n/be.json b/languages/i18n/be.json
index fdb5b84ae6..42348b034a 100644
--- a/languages/i18n/be.json
+++ b/languages/i18n/be.json
@@ -190,6 +190,7 @@
 	"tagline": "З пляцоўкі {{SITENAME}}",
 	"help": "Даведка",
 	"search": "Знайсці",
+	"search-ignored-headings": " #<!-- не змяняйце гэты радок --> <pre>\n# Загалоўкі, якія будзе ігнараваць рухавік пошуку.\n# Змены набудуць моц па наступным індэксаванні старонкі.\n# Вы можаце змусіць пераіндэксаванне старонкі, зрабіўшы пустое рэдагаванне.\n# Сінтаксіс наступны:\n#   * Усё ад сімвала \"#\" да канца радка - каментарый.\n#   * Кожны непусты радок - дакладны загаловак, які трэба ігнараваць, з рэгістрам і інш.\nКрыніцы\nСпасылкі\nГл. таксама\n #</pre> <!-- не змяняйце гэты радок -->",
 	"searchbutton": "Знайсці",
 	"go": "Пераход",
 	"searcharticle": "Артыкул",
@@ -474,7 +475,7 @@
 	"nocookiesnew": "Рахунак быў створаны, але ў сістэму вы не ўвайшлі. {{SITENAME}} карыстаецца квіткамі (кукі), каб апрацоўваць уваходы ўдзельнікаў, а гэтая функцыянальнасць адключана ў вашым браўзеры. Уключыце квіткі ў браўзеры, тады ўваходзьце са сваімі новымі імем удзельніка і паролем.",
 	"nocookieslogin": "{{SITENAME}} карыстаецца квіткамі (кукі), каб пазнаваць удзельнікаў. У вашым браўзеры квіткі не дазволены. Дазвольце іх працу і паспрабуйце ізноў.",
 	"nocookiesfornew": "Уліковы запіс карыстальніка не быў створаны, бо мы не змаглі пацвердзіць яго крыніцы. \nУпэўніцеся, што кукі ўключаныя, абнавіце старонку і паспрабуйце яшчэ раз.",
-	"createacct-loginerror": "Уліковы запіс быў паспяхова створаны, але Вы не змаглі аўтарызавацц аўтаматычна. Калі ласка, перайдзіце да старонкі [[Адмысловае:Імя_ўдзельніка|ручной аўтарызацыі]].",
+	"createacct-loginerror": "Уліковы запіс быў паспяхова створаны, але Вы не змаглі аўтарызавацца аўтаматычна. Калі ласка, перайдзіце да старонкі [[Special:UserLogin|ручной аўтарызацыі]].",
 	"noname": "Вы не вызначылі правільнага імя ўдзельніка.",
 	"loginsuccesstitle": "Паспяховы ўваход у сістэму",
 	"loginsuccess": "<strong>Цяпер Вы ўвайшлі на {{SITENAME}} як \"$1\".</strong>",
@@ -594,13 +595,11 @@
 	"passwordreset-emailelement": "Імя ўдзельніка: \n$1\n\nЧасовы пароль: \n$2",
 	"passwordreset-emailsentemail": "Калі гэты адрас электроннай пошты злучаны з вашым уліковым запісам, будзе адпраўлены ліст пра скід пароля.",
 	"passwordreset-emailsentusername": "Калі ёсць адрас электроннай пошты, злучаны з гэтым імем удзельніка, то будзе дасланы ліст пра скід пароля.",
-	"passwordreset-emailsent-capture": "Ніжэй прыведзены адпраўлены ліст пра скід пароля.",
-	"passwordreset-emailerror-capture": "Ніжэй прыведзены створаны ліст пра скід пароля, яго адпраўка не атрымалася па прычыне: $1",
+	"passwordreset-emailsent-capture2": "{{PLURAL:$1|Электронны ліст|электронныя лісты}} скіду пароля адпраўлены. {{PLURAL:$1|Імя ўдзельніка і пароль|Спіс імён удзельнікаў і паролі}} паказаны ніжэй.",
 	"passwordreset-invalideamil": "Няслушны адрас электроннай пошты",
 	"passwordreset-nodata": "Не былі пададзены ні імя ўдзельніка, ні адрас электроннай пошты",
 	"changeemail": "Змяніць або выдаліць адрас электроннай пошты",
 	"changeemail-header": "Запоўніце гэтую форму, каб змяніць свой адрас электроннай пошты. Калі хочаце выдаліць адрас электроннай пошты, злучаны з вашым уліковым запісам, пакіньце поле новага адраса электроннай пошты пустым пры адпраўцы формы.",
-	"changeemail-passwordrequired": "Вам трэба будзе ўвесці свой пароль, каб пацвердзіць гэта змяненне.",
 	"changeemail-no-info": "Каб звяртацца непасрэдна да гэтай старонкі, вам варта прадставіцца сістэме.",
 	"changeemail-oldemail": "Бягучы адрас электроннай пошты:",
 	"changeemail-newemail": "Новы адрас электроннай пошты:",
@@ -783,7 +782,6 @@
 	"undo-nochange": "Выглядае на тое, што праўка ўжо была адкочаная.",
 	"undo-summary": "Адкат версіі $1 аўтарства [[Special:Contributions/$2|$2]] ([[User talk:$2|размова]])",
 	"undo-summary-username-hidden": "Адкат версіі $1 схаванага ўдзельніка",
-	"cantcreateaccounttitle": "Немагчыма стварыць рахунак",
 	"cantcreateaccount-text": "Стварэнне рахункаў было забаронена для гэтага адрасу IP ('''$1''').\n\nЗабарона зроблена ўдзельнікам [[User:$3|$3]], з такім тлумачэннем: ''$2''",
 	"cantcreateaccount-range-text": "Стварэнне ўліковага запісу ўдзельніка з IP-адрасоў у дыяпазоне <strong>$1</strong>, што ўключае ваш адрас IP (<strong>$4</strong>), было забаронена {{GENDER:$3|ўдзельнікам|ўдзельніцай}} [[User:$3|$3]].\n\n$3 {{GENDER:$3|патлумачыў|патлумачыла}} гэта так: <em>$2</em>",
 	"viewpagelogs": "Паказаць журналы для гэтай старонкі",
@@ -2136,6 +2134,7 @@
 	"sp-contributions-username": "Адрас IP або імя ўдзельніка:",
 	"sp-contributions-toponly": "Паказваць толькі праўкі, якія з'яўляюцца апошнімі версіямі",
 	"sp-contributions-newonly": "Паказваць толькі праўкі, якімі створаны старонкі",
+	"sp-contributions-hideminor": "Схаваць дробныя праўкі",
 	"sp-contributions-submit": "Пошук",
 	"whatlinkshere": "Сюды спасылаюцца",
 	"whatlinkshere-title": "Старонкі, якія спасылаюцца на \"$1\"",
@@ -2154,6 +2153,7 @@
 	"whatlinkshere-hidelinks": "$1 спасылкі",
 	"whatlinkshere-hideimages": "$1 спасылкі на выявы",
 	"whatlinkshere-filters": "Фільтры",
+	"whatlinkshere-submit": "Далей",
 	"autoblockid": "Аўтаблакіроўка #$1",
 	"block": "Заблакаваць удзельніка",
 	"unblock": "Разблакаваць удзельніка",
@@ -2275,6 +2275,7 @@
 	"lockdbsuccesstext": "База даных была зачынена.\n<br />Памятайце, каб [[Special:UnlockDB|сцерці файл-замок]] пасля завяршэння абслугоўвання.",
 	"unlockdbsuccesstext": "База дадзеных была адмыкнутая.",
 	"lockfilenotwritable": "Немагчыма запісаць у файл-замок базы даных. Каб зачыняць базу, трэба, каб веб-сервер мог запісваць у гэты файл.",
+	"databaselocked": "База звестак ужо заблакаваная.",
 	"databasenotlocked": "База дадзеных не замкнутая.",
 	"lockedbyandtime": "($1 $2 $3)",
 	"move-page": "Перанесці $1",
@@ -3460,6 +3461,9 @@
 	"special-characters-title-endash": "кароткі працяжнік",
 	"special-characters-title-emdash": "доўгі працяжнік",
 	"special-characters-title-minus": "мінус",
+	"mw-widgets-dateinput-no-date": "Дата не выбрана",
+	"mw-widgets-titleinput-description-new-page": "старонка яшчэ не існуе",
+	"mw-widgets-titleinput-description-redirect": "перанакіраванне на $1",
 	"log-action-filter-all": "Усе",
 	"log-action-filter-block-block": "заблакаваць",
 	"log-action-filter-block-reblock": "Змена блакіроўкі",
diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json
index f7f6f55c54..41d32b5e5d 100644
--- a/languages/i18n/bg.json
+++ b/languages/i18n/bg.json
@@ -535,7 +535,15 @@
 	"botpasswords-label-cancel": "Отказване",
 	"botpasswords-label-delete": "Изтриване",
 	"botpasswords-label-resetpassword": "Възстановяване на парола",
+	"botpasswords-label-restrictions": "Ограничения на употребата:",
+	"botpasswords-created-title": "Паролата на бота е създадена",
+	"botpasswords-created-body": "Паролата на бот „$1“ на потребител „$2“ е създадена.",
+	"botpasswords-updated-title": "Паролата на бота е обновена",
+	"botpasswords-updated-body": "Паролата на бот „$1“ на потребител „$2“ е обновена.",
+	"botpasswords-deleted-title": "Паролата на бота е изтрита",
+	"botpasswords-deleted-body": "Паролата на бот „$1“ на потребител „$2“ е премахната.",
 	"resetpass_forbidden": "Не е разрешена смяна на паролата",
+	"resetpass_forbidden-reason": "Паролите не могат да се променят: $1",
 	"resetpass-no-info": "За да достъпвате тази страница директно, необходимо е да влезете в системата.",
 	"resetpass-submit-loggedin": "Промяна на паролата",
 	"resetpass-submit-cancel": "Отказ",
@@ -737,6 +745,7 @@
 	"undo-failure": "Редакцията не може да бъде върната поради конфликтни междинни редакции.",
 	"undo-norev": "Редакцията не може да бъде върната, тъй като не съществува или е била изтрита.",
 	"undo-summary": "Премахната редакция $1 на [[Special:Contributions/$2|$2]] ([[User talk:$2|беседа]])",
+	"undo-summary-username-hidden": "Отмяна на редакция $1 от скрит потребител",
 	"cantcreateaccount-text": "[[User:$3|Потребител:$3]] е блокирал(а) създаването на сметки от този IP-адрес ('''$1''').\n\nПричината, изложена от $3, е ''$2''",
 	"viewpagelogs": "Преглед на извършените административни действия по страницата",
 	"nohistory": "Няма редакционна история за тази страница.",
@@ -1122,11 +1131,15 @@
 	"right-sendemail": "Изпращане на е-писма до другите потребители",
 	"right-passwordreset": "Преглеждане на е-писма за възстановяване на парола",
 	"grant-group-email": "Изпращане на е-писмо",
+	"grant-createaccount": "Създаване на сметки",
+	"grant-createeditmovepage": "Създаване, редактиране и преместване на страници",
 	"grant-delete": "Изтриване на страници, редакции и записи в дневника",
+	"grant-editmycssjs": "Редактиране на личния CSS/JavaScript",
 	"grant-editmyoptions": "Редактиране на вашите потребителски настройки",
 	"grant-editmywatchlist": "редактиране на списъка ви за наблюдение",
 	"grant-editpage": "Редактиране на съществуващи страници",
 	"grant-editprotected": "Редактиране на защитени страници",
+	"grant-uploadfile": "Качване на нови файлове",
 	"grant-basic": "Основни права",
 	"grant-viewdeleted": "Преглед на изтрити файлове и страници",
 	"grant-viewmywatchlist": "преглед на списъка ви за наблюдение",
@@ -1192,7 +1205,7 @@
 	"recentchanges-legend-heading": "<strong>Легенда:</strong>",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (вижте също [[Special:NewPages|списъка с нови страници]])",
 	"recentchanges-submit": "Покажи",
-	"rcnotefrom": "Дадени са промените от <strong>$2</strong> (до <strong>$1</strong> показани).",
+	"rcnotefrom": "{{PLURAL:$5|Дадена е промяната|Дадени са промените}} от <strong>$3, $4</strong> (до <strong>$1</strong> показани).",
 	"rclistfrom": "Показване на промени, като се започва от $3 $2",
 	"rcshowhideminor": "$1 на малки промени",
 	"rcshowhideminor-show": "Показване",
@@ -1238,6 +1251,9 @@
 	"recentchangeslinked-summary": "Тук се показват последните промени на страниците, към които се препраща от дадена страница. При избиране на категория, се показват промените по страниците, влизащи в нея. ''Пример:'' Ако изберете страницата '''А''', която съдържа препратки към '''Б''' и '''В''', тогава ще можете да прегледате промените по '''Б''' и '''В'''.\n\nАко пък сложите отметка пред '''Обръщане на релацията''', ще можете да прегледате промените в обратна посока: ще се включат тези страници, които съдържат препратки към посочената страница.\n\nСтраниците от списъка ви за наблюдение се показват в '''получер'''.",
 	"recentchangeslinked-page": "Име на страницата:",
 	"recentchangeslinked-to": "Обръщане на релацията, така че да се показват промените на страниците, сочещи към избраната страница",
+	"recentchanges-page-added-to-category": "[[:$1]] е добавена към категория",
+	"recentchanges-page-added-to-category-bundled": "[[:$1]] е добавена към категория, [[Special:WhatLinksHere/$1|към страницата сочат други страници]]",
+	"recentchanges-page-removed-from-category": "[[:$1]] е премахната от категория",
 	"upload": "Качи файл",
 	"uploadbtn": "Качване",
 	"reuploaddesc": "Връщане към формуляра за качване.",
@@ -1305,6 +1321,7 @@
 	"php-uploaddisabledtext": "Качванията на файлове са спрени през PHP. Проверете настройката file_uploads.",
 	"uploadscripted": "Файлът съдържа HTML или скриптов код, който може да бъде погрешно  интерпретиран от браузъра.",
 	"uploadscriptednamespace": "Този SVG файл съдържа неправилно именно пространство „$1“",
+	"uploadinvalidxml": "XML-кода в качения файл не може да бъде анализиран.",
 	"uploadvirus": "Файлът съдържа вирус! Подробности: $1",
 	"uploadjava": "Файлът е ZIP файл, който съдържа Java .class файл.\nКачването на Java файлове не е позволено, тъй като могат да причинят заобикаляне на ограниченията за сигурност.",
 	"upload-source": "Изходен файл",
@@ -1362,9 +1379,10 @@
 	"uploadstash-summary": "Тази страница предоставя достъп до файловете, които са качени (или са в процес на качване), но все още не са публикувани в уикито. Тези файлове не са достъпни само за потребителя, който ги е качил.",
 	"uploadstash-clear": "Изчистване на скритите качвания",
 	"uploadstash-nofiles": "Нямате скрити файлове",
-	"uploadstash-badtoken": "Извършване на това действие е неуспешно, вероятно заради изтекла сесия. Опитайте отново.",
+	"uploadstash-badtoken": "Извършване на това действие е неуспешно, вероятно заради изтекла сесия. Моля, опитайте отново.",
 	"uploadstash-errclear": "Изчистването на файловете беше неуспешно.",
 	"uploadstash-refresh": "Обновяване на списъка с файлове",
+	"uploadstash-thumbnail": "преглед на миниатюра",
 	"img-auth-accessdenied": "Достъпът е отказан",
 	"img-auth-nopathinfo": "Липсва PATH_INFO.\nВашият сървър не е конфигуриран да предава тази информация.\nТой може да е базиран на CGI и да не може да поддържа img_auth.\nВижте https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization.",
 	"img-auth-notindir": "Търсеният път не е в настроената директория за качвания.",
@@ -1591,12 +1609,17 @@
 	"pager-older-n": "{{PLURAL:$1|по-стара 1|по-стари $1}}",
 	"suppress": "Премахване от публичния архив",
 	"querypage-disabled": "Тази специална страница е изключена, защото затруднява производителността на уикито.",
+	"apihelp": "Помощ за API",
 	"apihelp-no-such-module": "Модул \"$1\" не беше намерен.",
+	"apisandbox": "Пясъчник за API",
 	"apisandbox-fullscreen": "Разшири полето",
 	"apisandbox-reset": "Изчистване",
+	"apisandbox-retry": "Повторен опит",
 	"apisandbox-examples": "Примери",
+	"apisandbox-dynamic-parameters-add-label": "Добавяне на параметър:",
 	"apisandbox-dynamic-parameters-add-placeholder": "Име на параметъра",
 	"apisandbox-results": "Резултати",
+	"apisandbox-request-url-label": "URL-адрес на заявката:",
 	"booksources": "Източници на книги",
 	"booksources-search-legend": "Търсене на информация за книга",
 	"booksources-search": "Търсене",
@@ -1800,6 +1823,8 @@
 	"changecontentmodel-title-label": "Заглавие на страницата",
 	"changecontentmodel-reason-label": "Причина:",
 	"changecontentmodel-success-text": "Типът на съдържанието на [[:$1]] е успешно променен.",
+	"logentry-contentmodel-change-revertlink": "връщане",
+	"logentry-contentmodel-change-revert": "връщане",
 	"protectlogpage": "Дневник на защитата",
 	"protectlogtext": "Списък на промените в защитата за страницата.\nМожете да прегледате и [[Special:ProtectedPages|списъка на текущо защитените страници]].",
 	"protectedarticle": "защити „[[$1]]“",
@@ -1924,6 +1949,7 @@
 	"sp-contributions-username": "IP-адрес или потребителско име:",
 	"sp-contributions-toponly": "Показване само на последните редакции",
 	"sp-contributions-newonly": "Показване само на редакции за създаването на страници",
+	"sp-contributions-hideminor": "Скриване на малки промени",
 	"sp-contributions-submit": "Търсене",
 	"whatlinkshere": "Какво сочи насам",
 	"whatlinkshere-title": "Страници, които сочат към „$1“",
@@ -1984,9 +2010,9 @@
 	"unblocked-ip": "[[Special:Contributions/$1|$1]] е отблокиран.",
 	"blocklist": "Блокирани потребители",
 	"ipblocklist": "Блокирани потребители",
-	"ipblocklist-legend": "Откриване на блокиран потребител",
+	"ipblocklist-legend": "Търсене на блокиран потребител",
 	"blocklist-userblocks": "Скриване на блокирани потребителски сметки",
-	"blocklist-tempblocks": "Скриване на срочните блокирания",
+	"blocklist-tempblocks": "Скриване на срочни блокирания",
 	"blocklist-addressblocks": "Скриване на отделни блокирани IP адреси",
 	"blocklist-rangeblocks": "Скриване на блокиранията по IP диапазон",
 	"blocklist-timestamp": "Дата и час",
@@ -1998,7 +2024,7 @@
 	"ipblocklist-submit": "Търсене",
 	"ipblocklist-localblock": "Локално блокиране",
 	"ipblocklist-otherblocks": "{{PLURAL:$1|Друго блокиране|Други блокирания}}",
-	"infiniteblock": "неограничено",
+	"infiniteblock": "неограничен",
 	"expiringblock": "изтича на $1 в $2",
 	"anononlyblock": "само анон.",
 	"noautoblockblock": "автоблокировката е изключена",
@@ -2329,6 +2355,7 @@
 	"pageinfo-toolboxlink": "Информация за страницата",
 	"pageinfo-redirectsto": "Пренасочване към",
 	"pageinfo-redirectsto-info": "инфо",
+	"pageinfo-contentpage": "Отчита се като страница със съдържание",
 	"pageinfo-contentpage-yes": "Да",
 	"pageinfo-protect-cascading": "Каскадни защити, започващи от тази страница",
 	"pageinfo-protect-cascading-yes": "Да",
diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json
index 97596c4d05..aa81ac2b05 100644
--- a/languages/i18n/bn.json
+++ b/languages/i18n/bn.json
@@ -1185,6 +1185,7 @@
 	"right-changetags": "নির্দিষ্ট সংস্করণ এবং দীর্ঘ সম্পাদনাগুলোতে [[Special:Tags|ট্যাগ]] সংযোজন ও অপসারণ করুন",
 	"right-deletechangetags": "ডাটাবেজ থেকে [[Special:Tags|ট্যাগ]] অপসারণ করা",
 	"grant-group-email": "ইমেইল পাঠান",
+	"grant-group-private-information": "আপনার সম্পর্কিত ব্যক্তিগত তথ্যে প্রবেশাধিকার পায়",
 	"grant-group-other": "বিবিধ কার্যকলাপ",
 	"grant-createaccount": "অ্যাকাউন্ট তৈরি করুন",
 	"grant-createeditmovepage": "পাতা তৈরি, সম্পাদনা এবং স্থানান্তর করুন",
@@ -1192,6 +1193,7 @@
 	"grant-editmyoptions": "আপনার ব্যবহারকারী পছন্দসমূহ সম্পাদনা করুন",
 	"grant-editmywatchlist": "আপনার নজরতালিকা সম্পাদনা করুন",
 	"grant-editprotected": "সংরক্ষিত পাতা সম্পাদনা করুন",
+	"grant-privateinfo": "ব্যক্তিগত তথ্যে প্রবেশাধিকার",
 	"grant-sendemail": "অন্য ব্যবহারকারীকে ইমেইল পাঠান",
 	"grant-uploadfile": "নতুন ফাইল আপলোড করুন",
 	"grant-basic": "মৌলিক অধিকার",
@@ -3532,6 +3534,7 @@
 	"log-action-filter-rights-autopromote": "স্বয়ংক্রিয় পরিবর্তন",
 	"log-action-filter-upload-upload": "নতুন আপলোড",
 	"log-action-filter-upload-overwrite": "পুনঃআপলোড",
+	"authmanager-create-from-login": "আপনার একাউন্ট তৈরি করতে, নীচের ক্ষেত্রগুলি পূরণ করুন।",
 	"authmanager-authplugin-setpass-failed-title": "পাসওয়ার্ড পরিবর্তন ব্যর্থ হয়েছে",
 	"authmanager-authplugin-setpass-bad-domain": "অবৈধ ডোমেইন।",
 	"authmanager-autocreate-noperm": "স্বয়ংক্রিয় অ্যাকাউন্ট সৃষ্টি মঞ্জুরিপ্রাপ্ত নয়।",
diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json
index 2773c85186..dcc4c5c93b 100644
--- a/languages/i18n/ce.json
+++ b/languages/i18n/ce.json
@@ -531,8 +531,6 @@
 	"passwordreset-emailtext-user": "{{SITENAME}} ($4) проектера декъашхочо $1 хьа декъашхочун пароль кхоссар дехна,\nоьцу электронан адресца дихкина ду {{PLURAL:$3|1хӀара декъашхочун дӀаяздар|хӀара декъашхочун дӀаяздар}}:\n\n$2\n\n{{PLURAL:$3|ХӀара хана пароль|ХӀара хана паролаш}} лелар ю {{PLURAL:$5|$5 дийнахь}}.\nСистемин чугӀой харжа керла пароль. \nХьой пароль кхоссар дехна дацахь я хьалхалера пароль дага еънехь хӀума цадеш Ӏад битта хӀара хаам хьа йиш ю шира пароль лелаян.",
 	"passwordreset-emailelement": "Декъашхочун цӀе: \n$1\n\nХанна пароль: \n$2",
 	"passwordreset-emailsentemail": "Электронан хаам баийтина кхоьссинчу паролах лаьцна хаам чохь болуш.",
-	"passwordreset-emailsent-capture": "Электронан хаам баийтина кхоьссинчу паролах лаьцна хаам чохь болуш. \nцуна йозане хьажа йиш ю лахахь.",
-	"passwordreset-emailerror-capture": "Пароль кхоссаран хаам чохь болуш электронан кехат кхоьллина, цуна йоза хьажа йиш ю лахахь, амма иза {{GENDER:$2|декъашхочунга}} дӀадахьийта тар цаделира бахьнехь: $1",
 	"changeemail": "Хийца электронан пошт",
 	"changeemail-header": "Электронан поштан адрес хийцар",
 	"changeemail-no-info": "ХӀара агӀо лело системин чугӀо.",
@@ -687,7 +685,6 @@
 	"undo-nochange": "Нисдар хьалхо юхадяьккхиначух тера ду.",
 	"undo-summary": "Юхадаьккхина {{GENDER:$2|декъашхочун}} [[Special:Contributions/$2|$2]] ([[User talk:$2|дийц.]]) нисдар $1",
 	"undo-summary-username-hidden": "Юхадаьккхина декъашхочун нисдарш $1, цунна цӀе дӀахьулйина",
-	"cantcreateaccounttitle": "Декъашхочун дӀаяздар кхолла йиш яц",
 	"viewpagelogs": "Гайта хӀокху агӀонан тептар",
 	"nohistory": "ХӀокху агӀонан хийцамаш ца бина.",
 	"currentrev": "Карара верси",
@@ -2531,6 +2528,8 @@
 	"confirmrecreate-noreason": "Декъашхочо [[User:$1|$1]] ([[User talk:$1|дийцаре]]) хӀара агӀо дӀаяьккхина, ахьа иза тая йолийча. Дехар до, тешал де, хьо иза агӀо меттахӀотто лууш ву/ю але.",
 	"recreate": "Юха кхолла",
 	"confirm_purge_button": "ХӀаъ",
+	"confirm-purge-top": "ХӀокху агӀона кэш дӀацӀанъян?",
+	"confirm-purge-bottom": "Кэш дӀацӀанйиначул тӀехьа цуна тӀеххьара верси гойтур ю.",
 	"confirm-watch-button": "ХӀаъ",
 	"confirm-watch-top": "ТӀетоха хӀара агӀо хьан тергаме могӀам юкъа?",
 	"confirm-unwatch-button": "ХӀаъ",
diff --git a/languages/i18n/ckb.json b/languages/i18n/ckb.json
index 052c3ce33f..1fb24014a6 100644
--- a/languages/i18n/ckb.json
+++ b/languages/i18n/ckb.json
@@ -273,7 +273,7 @@
 	"editlink": "دەستکاری",
 	"viewsourcelink": "بینینی سەرچاوە",
 	"editsectionhint": "دەستکاریکردنی بەش: $1",
-	"toc": "ناوەڕۆک",
+	"toc": "پێرست",
 	"showtoc": "نیشانیبدە",
 	"hidetoc": "بیشارەوە",
 	"collapsible-collapse": "کۆی بکەوە",
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index 8b0d350e85..7e9eecfb20 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -33,7 +33,8 @@
 			"Matma Rex",
 			"Dvorapa",
 			"Walter Klosse",
-			"Martin Urbanec"
+			"Martin Urbanec",
+			"Marek Pavlica"
 		]
 	},
 	"tog-underline": "Podtrhávat odkazy:",
@@ -1218,6 +1219,7 @@
 	"grant-group-high-volume": "Velkoobjemové činnosti",
 	"grant-group-customization": "Nastavení a přizpůsobení",
 	"grant-group-administration": "Provádění správcovských činností",
+	"grant-group-private-information": "Přístup k soukromým údajům o vás",
 	"grant-group-other": "Různé činnosti",
 	"grant-blockusers": "Blokovat a odblokovávat uživatele",
 	"grant-createaccount": "Zakládat účty",
@@ -1232,6 +1234,7 @@
 	"grant-highvolume": "Hromadné editace",
 	"grant-oversight": "Skrývat uživatele a utajovat revize",
 	"grant-patrol": "Patrolovat změny stránek",
+	"grant-privateinfo": "Přístup k soukromým údajům",
 	"grant-protect": "Zamykat a odemykat stránky",
 	"grant-rollback": "Vracet editace zpět",
 	"grant-sendemail": "Posílat e-maily ostatním uživatelům",
@@ -1538,6 +1541,7 @@
 	"uploadstash-errclear": "Soubory se nepodařilo vymazat.",
 	"uploadstash-refresh": "Aktualizovat seznam souborů",
 	"uploadstash-thumbnail": "zobrazit náhled",
+	"uploadstash-exception": "Načtený soubor se nepodařilo uložit do skrýše ($1): „$2“.",
 	"invalid-chunk-offset": "Neplatný posun bloku",
 	"img-auth-accessdenied": "Přístup odepřen",
 	"img-auth-nopathinfo": "Chybí PATH_INFO.\nVáš server není nastaven tak, aby tuto informaci poskytoval.\nMožná funguje pomocí CGI a img_auth na něm nemůže fungovat.\nVizte https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization.",
@@ -1907,7 +1911,7 @@
 	"trackingcategories-name": "Název hlášení",
 	"trackingcategories-desc": "Kritéria pro vložení do kategorie",
 	"restricted-displaytitle-ignored": "Stránky s ignorovanými zobrazovanými názvy",
-	"restricted-displaytitle-ignored-desc": "Stránka obsahuje příkaz <code><nowiki>{{DISPLAYTITLE}}</nowiki></code>, který se ignoruje, protože není ekvivalentní skutečnému názvu stránky.",
+	"restricted-displaytitle-ignored-desc": "Stránka obsahuje příkaz <code><nowiki>{{DISPLAYTITLE}}</nowiki></code>, který se ignoruje, neboť není ekvivalentní skutečnému názvu stránky.",
 	"noindex-category-desc": "Stránka není indexována roboty, protože obsahuje kouzelné slovo <code><nowiki>__NOINDEX__</nowiki></code> a je ve jmenném prostoru, ve kterém je tento příznak dovolen.",
 	"index-category-desc": "Stránka obsahuje kouzelné slovo <code><nowiki>__INDEX__</nowiki></code> (a je ve jmenném prostoru, ve kterém je tento příznak dovolen), takže je indexována roboty, přestože by normálně nebyla.",
 	"post-expand-template-inclusion-category-desc": "Stránka je po rozbalení všech šablon větší než <code>$wgMaxArticleSize</code>, takže některé šablony rozbaleny nebyly.",
diff --git a/languages/i18n/de.json b/languages/i18n/de.json
index 49e0a22103..8a8fe7bbc3 100644
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -1276,6 +1276,7 @@
 	"grant-group-high-volume": "Massenaktivitäten ausführen",
 	"grant-group-customization": "Anpassung und Einstellungen",
 	"grant-group-administration": "Administrative Aktionen ausführen",
+	"grant-group-private-information": "Auf private Daten über dich zugreifen",
 	"grant-group-other": "Verschiedene Aktivitäten",
 	"grant-blockusers": "Benutzer sperren und freigeben",
 	"grant-createaccount": "Benutzerkonten erstellen",
@@ -1290,6 +1291,7 @@
 	"grant-highvolume": "Massenbearbeitungen",
 	"grant-oversight": "Benutzer verstecken und Versionen unterdrücken",
 	"grant-patrol": "Änderungen an Seiten kontrollieren",
+	"grant-privateinfo": "Auf private Informationen zugreifen",
 	"grant-protect": "Seiten schützen und freigeben",
 	"grant-rollback": "Änderungen an Seiten zurücksetzen",
 	"grant-sendemail": "E-Mails an andere Benutzer versenden",
diff --git a/languages/i18n/diq.json b/languages/i18n/diq.json
index ae2cd3815a..608f042548 100644
--- a/languages/i18n/diq.json
+++ b/languages/i18n/diq.json
@@ -136,7 +136,7 @@
 	"august-date": "Tebaxe $1",
 	"september-date": "Keşkelun $1",
 	"october-date": "Tışrino Verên $1",
-	"november-date": "$1 Kelverdan",
+	"november-date": "Tışrino Peyên $1",
 	"december-date": "Kanun $1",
 	"period-am": "AM",
 	"period-pm": "PM",
@@ -169,7 +169,7 @@
 	"anontalk": "Werênayış",
 	"navigation": "Pusula",
 	"and": "&#32;u",
-	"qbfind": "Bıvêne",
+	"qbfind": "Bıvin",
 	"qbbrowse": "Çım ra viyarne",
 	"qbedit": "Bıvurne",
 	"qbpageoptions": "Ena pele",
@@ -217,7 +217,7 @@
 	"talkpagelinktext": "werênayış",
 	"specialpage": "Pela xısusiye",
 	"personaltools": "Hacetê şexsiy",
-	"articlepage": "Pela zerreki bıvêne",
+	"articlepage": "Pera zerreki bıvin",
 	"talk": "Werênayış",
 	"views": "Asayışi",
 	"toolbox": "Haceti",
@@ -226,14 +226,14 @@
 	"imagepage": "Pera dosya bıasne",
 	"mediawikipage": "Pera mesaci bıasne",
 	"templatepage": "Pera şabloni bıasne",
-	"viewhelppage": "Pela peşti bıvêne",
+	"viewhelppage": "Pera peşti bıvin",
 	"categorypage": "Pela kategoriya bıasne",
 	"viewtalkpage": "Werênayışi bıvêne",
 	"otherlanguages": "Zıwananê binan de",
 	"redirectedfrom": "($1 ra kırışı yê)",
 	"redirectpagesub": "Pela berdışi",
 	"redirectto": "Beno hetê:",
-	"lastmodifiedat": "Ena pele tewr peyên roca $1, seate $2 de rocneya.",
+	"lastmodifiedat": "Per roca $1, sehat $2 de biye neye.",
 	"viewcount": "Ena pele {{PLURAL:$1|rae|$1 rey}} vêniya.",
 	"protectedpage": "Pela pawıtiye",
 	"jumpto": "Şo be:",
@@ -292,7 +292,7 @@
 	"confirmable-yes": "Eya",
 	"confirmable-no": "Nê",
 	"thisisdeleted": "Bıvêne ya zi $1 peyser biya?",
-	"viewdeleted": "$1 bıvêne?",
+	"viewdeleted": "$1 bıvin?",
 	"restorelink": "{{PLURAL:$1|jew vurnayış besteriya|$1 vurnayışi besteriyaye}}",
 	"feedlinks": "Warikerdış:",
 	"feed-invalid": "Qeydey cıresnayışê  beğşi nêvêreno.",
@@ -355,7 +355,7 @@
 	"perfcached": "Datay cı ver hazır biye. No semedê ra nıkayin niyo! tewr zaf {{PLURAL:$1|netice|$1 netice}} debêno de",
 	"perfcachedts": "Cêr de malumatê nımıteyi esti, demdê newe kerdışo peyın: $1. Tewr zaf {{PLURAL:$4|netice|$4 neticey cı}} debyayo de",
 	"querypage-no-updates": "Rocanebiyayışê na pele nıka cadayiyê.\nDayiyi tiya nıka newe nêbenê.",
-	"viewsource": "Çımey bıvêne",
+	"viewsource": "Çemi bıvin",
 	"viewsource-title": "Cı geyrayışê $1'i bıvin",
 	"actionthrottled": "Kerden peysnaya",
 	"actionthrottledtext": "Riyê tedbirê anti-spami ra,  wextê do kılmek de şıma nê fealiyeti nêşkenê zaf zêde bıkerê, şıma ki no hedi viyarna ra.\nÇend deqey ra tepeya reyna bıcerrebnên.",
@@ -420,7 +420,7 @@
 	"nologinlink": "Yew hesab ake",
 	"createaccount": "Hesab vıraze",
 	"gotaccount": "Hesabê şıma esto? '''$1'''.",
-	"gotaccountlink": "Ronıştış ak",
+	"gotaccountlink": "Cıkewtış",
 	"userlogin-resetlink": "Melumatê cıkewtışi xo vira kerdê?",
 	"userlogin-resetpassword-link": "Parola xo kerda xo vira?",
 	"userlogin-helplink2": "Heqa qeydbiyayışi de peşti bıgêrên",
@@ -519,7 +519,7 @@
 	"botpasswords-label-appid": "Nameyê boti:",
 	"botpasswords-label-create": "Vıraze",
 	"botpasswords-label-update": "Rocane ke",
-	"botpasswords-label-cancel": "Bıtexelne",
+	"botpasswords-label-cancel": "Ä°btal ke",
 	"botpasswords-label-delete": "Bestere",
 	"botpasswords-label-resetpassword": "Parola raçarne",
 	"botpasswords-label-grants-column": "Dayen",
@@ -529,7 +529,7 @@
 	"resetpass_forbidden": "parolayi nêvuryayi",
 	"resetpass-no-info": "şıma gani hesab akere u hona bıeşke bırese cı",
 	"resetpass-submit-loggedin": "Parola bıvurne",
-	"resetpass-submit-cancel": "Bıtexelne",
+	"resetpass-submit-cancel": "Ä°btal ke",
 	"resetpass-wrong-oldpass": "parolayo parola maqbul niyo.\nşıma ya parolaye xo vurnayo ya zi parolayo muwaqqat waşto.",
 	"resetpass-recycled": "Parolaya şımaya newiye wa paroloya şımaya verêne ra ferqıne bo.",
 	"resetpass-temp-emailed": "E postaya rışyayê yubkoda şıma ronıştış akerdo.  Ronıştışi xo temammkerdışi rê yu parolaya newi lazım a",
@@ -591,9 +591,9 @@
 	"hr_tip": "Xeta verardiye (teserrufın bıgureyne/bıxebetne)",
 	"summary": "Xulasa:",
 	"subject": "Mewzu:",
-	"minoredit": "No yew vurnayışo werdiyo",
-	"watchthis": "Ena pele seyr ke",
-	"savearticle": "Pele qeyd ke",
+	"minoredit": "Vurriyayışo werdiyo",
+	"watchthis": "Seyr kı",
+	"savearticle": "Qeyd kı",
 	"savechanges": "Vurnayışan qeyd ke",
 	"publishpage": "Perer bıhesırne",
 	"publishchanges": "Vurnayışa vıla ke",
@@ -623,7 +623,7 @@
 	"accmailtext": "[[User talk:$1|$1]] parolayo ke raşt ameyo şırawiyo na adres $2.\n\nQey na hesabê newe parola, cıkewtış dıma şıma eşkeni na qısım de ''[[Special:ChangePassword|parola bıvurn]]'' bıvurni.",
 	"newarticle": "(Newe)",
 	"newarticletext": "To yew gıre tıkna be ra yew pela ke hewna çıniya.\nSeba afernayışê pele ra, qutiya metnê cêrêni bıgurene (seba melumati qaytê [$1 pela peşti] ke).\nEke be ğeletine ameya tiya, wa gocega <strong>peyser</strong>i programê xo de bıtıkne.",
-	"anontalkpagetext": "----''No pel, pel o karbero hesab a nêkerdeyan o, ya zi karbero hesab akerdeyan o labele pê hesabê xo nêkewto de. No sebeb ra ma IP adres şuxulneni û ney IP adresan herkes eşkeno bıvino. Eke şıma qayil niye ina bo xo ri [[Special:CreateAccount|yew hesab bıvıraze]] veyaxut [[Special:UserLogin|hesab akere]].''",
+	"anontalkpagetext": "----''Na per, perêk kı karbero hesab a nêkerdeyan o, ya zi karbero hesab akerdeyan o labele pê hesabê xo nêkewto de. No sebeb ra ma IP adres xebetneno û ney IP adresan herkes nêşeno bıvino. Eke şıma qayil niye ina bo xorê [[Special:CreateAccount|yew hesab bıvıraze]] veya xut [[Special:UserLogin|hesab akere]].''",
 	"noarticletext": "Ena pele de hewna theba çıniyo.\nTı şenê zerreyê pelanê binan de [[Special:Search/{{PAGENAME}}|qandê  sernameyê ena pele cı geyre]],\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} qeydan miyan de cı geyre],\nya zi [{{fullurl:{{FULLPAGENAME}}|action=edit}} ena pele vıraze]</span>.{{MediaWiki mesaca pera newi}}",
 	"noarticletext-nopermission": "Ena pele de hewna theba çıniyo.\nTı şenay zerreyê pelanê binan de [[Special:Search/{{PAGENAME}}|seba sernameyê na pele cı geyre]], ya zi <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} qeydan miyan de cı geyre]</span>, ema destur çıniyo ke na pele vırazê.",
 	"missing-revision": "Rewizyonê name dê pela da #$1 \"{{FULLPAGENAME}}\" dı çıniyo.\n\nNo normal de tarix dê pelanê besterneyan dı ena xırabin asena.\nDetayê besternayışi [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} tiya dı] aseno.",
@@ -728,7 +728,7 @@
 	"undo-summary": "Vırnayışê $1'i [[Special:Contributions/$2|$2i]] ([[User talk:$2|Werênayış]]) peyser gırot",
 	"undo-summary-username-hidden": "Rewizyona veri $1'i hewada",
 	"cantcreateaccount-text": "Hesabvıraştışê na IP adrese ('''$1''') terefê [[User:$3|$3]] kılit biyo.\n\nSebebo ke terefê $3 ra diyao ''$2''",
-	"viewpagelogs": "Seba na pele rê qeydan bımocne",
+	"viewpagelogs": "Qeydanê ena perer bıvin",
 	"nohistory": "Verê vurnayışanê na pele çıniyo.",
 	"currentrev": "Çımraviyarnayışo rocane",
 	"currentrev-asof": "$1 ra tepya mewcud weziyeta pela",
@@ -742,7 +742,7 @@
 	"last": "peyên",
 	"page_first": "verên",
 	"page_last": "peyên",
-	"histlegend": "Ferqê weçinıtışi: Qutiya versiyonan seba têversanayış işaret ke û dest be ''enter''i ya zi gocega cêrêne ro ne.<br />\nCedwel: <strong>({{int:ferq}})</strong> = ferqê verziyonê peyêni, <strong>({{int:peyên}})</strong> = ferqê versiyonê verêni, <strong>{{int:q}}</strong> = vurnayışo werdi.",
+	"histlegend": "Ferqê weçinıtışi: Qutiya versiyonan qandé pêver sanayış işaret ke u dest be ''enter''i ya zi gocega cêrêne ro ne.<br />\nCedwel: <strong>({{int:ferq}})</strong> = ferqê versiyonê peyêni, <strong>({{int:peyên}})</strong> = ferqê versiyonê verêni, <strong>{{int:q}}</strong> = vurnayışo werdi.",
 	"history-fieldset-title": "Tarixi bıvêne",
 	"history-show-deleted": "Tenya esterıtey",
 	"histfirst": "Verênêr",
@@ -852,7 +852,7 @@
 	"lineno": "Xeta $1:",
 	"compareselectedversions": "Rewizyonanê weçineyan pêver ke",
 	"showhideselectedversions": "Revizyonanê weçinıtan bımocne/bınımne",
-	"editundo": "peyser bıgê",
+	"editundo": "peyser bıya",
 	"diff-empty": "(Babetna niyo)",
 	"diff-multi-sameuser": "(Terefê eyni karberi ra {{PLURAL:$1|yew revizyono miyanên nêmocno|$1 revizyonê miyanêni nêmocnê}})",
 	"diff-multi-otherusers": "(Terefê {{PLURAL:$2|yew karberi|$2 karberan}} ra {{PLURAL:$1|yew revizyono miyanên nêmocno|$1 revizyonê miyanêni nêmocnê}})",
@@ -869,7 +869,7 @@
 	"next-page": "Pela peyên",
 	"prevn-title": "$1o verên  {{PLURAL:$1|netice|neticeyan}}",
 	"nextn-title": "$1o ke yeno {{PLURAL:$1|netice|neticey}}",
-	"shown-title": "bimocne $1î  {{PLURAL:$1|netice|neticeyan}} ser her pel",
+	"shown-title": "Herg per sero $1 {{PLURAL:$1|netici|netica}} bıasne",
 	"viewprevnext": "($1 {{int:pipe-separator}} $2) ($3) bıvênên",
 	"searchmenu-exists": "''Ena 'Wikipediya de ser \"[[:$1]]\" yew pel esto'''",
 	"searchmenu-new": "<strong>Na wiki de pela \"[[:$1]]\" vıraze!</strong> {{PLURAL:$2|0=|Sewbina pela ke şıma geyrayê cı aye bıvênê.|Yew zi neticanê cıgeyrayışê xo bıvênê.}}",
@@ -1168,7 +1168,7 @@
 	"rightslogtext": "Ena listeyê loganê ke heqqa karbaranî mucneno.",
 	"action-read": "ena pela wanayış",
 	"action-edit": "ena pela bıvurnê",
-	"action-createpage": "Ena perer bıvıraze",
+	"action-createpage": "na perer bıvıraz",
 	"action-createtalk": "pelanê werênayışi bıvıraze",
 	"action-createaccount": "hesabê nê karberi bıvıraze",
 	"action-autocreateaccount": "nê hesabê karberiyê teberi otomatik vıraze",
@@ -1217,14 +1217,14 @@
 	"enhancedrc-history": "tarix",
 	"recentchanges": "Vurriyayışê peyêni",
 	"recentchanges-legend": "Tercihê vurnayışanê peyênan",
-	"recentchanges-summary": "\"Wiki sero vurnayışanê peyênan ena perer ra teqib ke.\"\n{{vp-diq}}",
+	"recentchanges-summary": "Wiki sero vurriyayışê peyêni asenê.",
 	"recentchanges-noresult": "Goreyê kriteranê kıfşkerdeyan ra qet yew vurnayış nêvêniya.",
 	"recentchanges-feed-description": "Ena feed dı vurnayişanê tewr peniyan teqip bık.",
-	"recentchanges-label-newpage": "Enê vurnayışi ra yew pela newiye vıraziye",
-	"recentchanges-label-minor": "No yew vurnayışo werdiyo",
-	"recentchanges-label-bot": "Eno vurnayış terefê yew boti ra vıraziyo",
+	"recentchanges-label-newpage": "Pera newiy vıraziya ya",
+	"recentchanges-label-minor": "Vurriyayışo werdiyo",
+	"recentchanges-label-bot": "Ena vırnayışa boti ya",
 	"recentchanges-label-unpatrolled": "Eno vurnayış hewna dewriya nêbiyo",
-	"recentchanges-label-plusminus": "Ebadê pele de bazê bayti de vayeyê cı",
+	"recentchanges-label-plusminus": "No nımre erca ebata perer asıneno (maypuşt)",
 	"recentchanges-legend-heading": "<strong>Kıtabekê Vurriyayışê peyêni:</strong>",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|Lista pelanê neweyan]] zi bıvêne)",
 	"recentchanges-legend-plusminus": "''(±123)''",
@@ -1252,7 +1252,7 @@
 	"rcshowhidecategorization": "kategorizasyonê pele $1",
 	"rcshowhidecategorization-show": "Bıasne",
 	"rcshowhidecategorization-hide": "Bınımne",
-	"rclinks": "$2 rocan de $1 vurriyayışanê peyêna bıasne <br />$3",
+	"rclinks": "Peyniya $2 rocan de $1 vurriyayışê <br />$3 asenê",
 	"diff": "ferq",
 	"hist": "verên",
 	"hide": "Bınımne",
@@ -1277,7 +1277,7 @@
 	"recentchangeslinked-summary": "Lista cêrêne, pela bêlikerdiye rê (ya zi karberanê kategoriya bêlikerdiye rê) pelanê gırêdayoğan de lista de vurnayışê peyênana.\n[[Special:Watchlist|Lista şımaya seyrkedışi de]] peli be nuşteyo '''qolınd''' bêli kerdê.",
 	"recentchangeslinked-page": "Nameyê pele:",
 	"recentchangeslinked-to": "Heruna pela ke yena dayene, vurnayışanê pelanê ke daye ra gırêdayiyê inan bımocne",
-	"recentchanges-page-added-to-category": "[[:$1]] kerd be kategoriye",
+	"recentchanges-page-added-to-category": "[[:$1]] de kerd kategori miyan",
 	"recentchanges-page-removed-from-category": "[[:$1]] kategoriye ra vet",
 	"autochange-username": "MediaWiki vurnayışo otomatik",
 	"upload": "Dosya bar ke",
@@ -1820,7 +1820,7 @@
 	"removedwatchtext": "Ena pela \"[[:$1]]\" biya wedariya [[Special:Watchlist|listeyê seyr-kerdışi şıma]].",
 	"removedwatchtext-short": "Pera $1`i listeya seyran de şıma ra wedari yê",
 	"watch": "Seyr ke",
-	"watchthispage": "Ena pele seyr ke",
+	"watchthispage": "Seyr kı",
 	"unwatch": "Teqib meke",
 	"unwatchthispage": "temaşa kerdışê peli vındarn.",
 	"notanarticle": "mebhesê peli niyo",
@@ -1977,7 +1977,7 @@
 	"undeleterevision-missing": "revizyonê nemeqbul u vindbiyayeyi.\nRevizyoni ya hewn a biyê ya arşiw ra veciyayê ya zi cıresayişê şımayi şaş o.",
 	"undelete-nodiff": "revizyonê verıni nidiya",
 	"undeletebtn": "Timar bike",
-	"undeletelink": "bıvêne/peyser biya",
+	"undeletelink": "bıewni/peyser biya",
 	"undeleteviewlink": "bıvin",
 	"undeleteinvert": "Weçinayışi dimlaşt ke",
 	"undeletecomment": "Sebeb:",
@@ -2091,7 +2091,7 @@
 	"unblocked-id": "Blokê $1î wedariyayo",
 	"blocklist": "Karberê kılitbiyayey",
 	"ipblocklist": "Karberê kılitbiyayey",
-	"ipblocklist-legend": "Yew karberê kılitbiyayey bıvêne",
+	"ipblocklist-legend": "Karberê kılit biyayey bıvin",
 	"blocklist-userblocks": "Kılitkerdışê hesaban bınımne",
 	"blocklist-tempblocks": "Kılitkerdışan mıweqet bınımne",
 	"blocklist-addressblocks": "Tenya kılitkerdışanê IPy bınımne",
@@ -2192,8 +2192,8 @@
 	"articleexists": "Ena nameyê pela database ma dı esta ya zi tı raşt nınuşt. .\nYewna name bınus.",
 	"cantmove-titleprotected": "şıma nêşkeni yew peli bıhewelnê tiya çunke pawıyeno",
 	"movetalk": "Pela werênayışiê elaqedare bere",
-	"move-subpages": "pelê bınini bıkırış($1 heta tiya)",
-	"move-talk-subpages": "pelê bınini yê pelê werê ameyeşi bıkırış ($1 heta tiya)",
+	"move-subpages": "Peranê bınênan bıkırış (hetana $1)",
+	"move-talk-subpages": "Bın peranê peranê vatena bıkırış (hetana $1)",
 	"movepage-page-exists": "maddeya $1i ca ra esta u newe ra otomatikmen nênusyena.",
 	"movepage-page-moved": "pelê $1i kırışiya pelê $2i.",
 	"movepage-page-unmoved": "pelê $1i nêkırışiyeno sernameyê $2i.",
@@ -2390,7 +2390,7 @@
 	"anonymous": "{{PLURAL:$1|karberê|karberê}} anonimi yê keyepelê {{SITENAME}}i",
 	"siteuser": "karberê {{SITENAME}}i $1",
 	"anonuser": "karberê anonim o {{SITENAME}}i $1",
-	"lastmodifiedatby": "Ena pele tewr peyên roca $2, $1 de tereftê $3 ra vuriya ya.",
+	"lastmodifiedatby": "Ena per tewr peyên roca $2, $1 de terefê $3 ra vurmaya ya.",
 	"othercontribs": "xebatê $1 ıney geriyayo diqqeti/geriyayo nezer.",
 	"others": "bini",
 	"siteusers": "{{SITENAME}} {{PLURAL:$2|karberê ey|karberanê ey}} $1",
@@ -3168,7 +3168,7 @@
 	"fileduplicatesearch-result-1": "Dosyayê ''$1î'' de hem-kopya çini yo.",
 	"fileduplicatesearch-result-n": "Dosyayê ''$1î'' de {{PLURAL:$2|1 hem-kopya|$2 hem-kopyayî'}} esto.",
 	"fileduplicatesearch-noresults": "Ebe namey \"$1\" ra dosya nêdiyayê.",
-	"specialpages": "Pelê xısusiyi",
+	"specialpages": "Page bağsey",
 	"specialpages-note-top": "Kıtabek",
 	"specialpages-note": "* Pelê xasê normali.\n* <span class=\"mw-specialpagerestricted\">Pelê xasê nımıtey.</span>",
 	"specialpages-group-maintenance": "Raporê pawıtışi",
@@ -3286,7 +3286,7 @@
 	"feedback-bugcheck": "Harika! Sadece [xırabina ke $1 ] çınyayışê cı kontrol keno.",
 	"feedback-bugnew": "Mı qontrol ke. Xetaya newi xeber ke",
 	"feedback-bugornote": "Jew mersela teferruato teknik esta şıma reca malumatê şıma hazıro se [ $1  jew xırab rapor] bıvinê.Zewbi zi, formê cerê xo rê şenê karfiyê. Vatışê xo pela da \"[ $3  $2 ]\", namey karber dê xoya piya u wasteriya karfiye.",
-	"feedback-cancel": "Bıtexelne",
+	"feedback-cancel": "İbtal kı",
 	"feedback-close": "Biya star",
 	"feedback-error1": "Xeta: API ra neticey ne vıcyay",
 	"feedback-error2": "Xeta: Timar kerdış nebı",
diff --git a/languages/i18n/dty.json b/languages/i18n/dty.json
index fd75693e53..6b1e3662f3 100644
--- a/languages/i18n/dty.json
+++ b/languages/i18n/dty.json
@@ -252,7 +252,7 @@
 	"versionrequiredtext": "ये पाना प्रयोग गर्नका लागि MediaWiki $1 संस्करण चाहिन्छ ।\nहेर  [[Special:Version|version page]]",
 	"ok": "भयो",
 	"retrievedfrom": " \"$1\" बठे निकालिया",
-	"youhavenewmessages": "तमखी लेखा($3)मी $1 ($2) छ ।",
+	"youhavenewmessages": "तमखी लेखा($3)मी $1($2) छ ।",
 	"youhavenewmessagesfromusers": "तमखी लेखा {{PLURAL:$3|प्रयोगकर्ता|$3 प्रयोगकर्तान}}($2)बठे$1",
 	"youhavenewmessagesmanyusers": "तमलाई धेरै प्रयोगकर्ताहरू($2) बठे $1 छ ।",
 	"newmessageslinkplural": "{{PLURAL:$1|एक नौलो रैबार|999=नौला रैबारहरू}}",
@@ -339,6 +339,9 @@
 	"title-invalid-interwiki": "अनुरोध गरियाको शिर्षकमी अन्तर विकि लिङ्क छ जइलाई शिर्षकमी प्रयोग गद्द नाइपाइनो ।",
 	"title-invalid-talk-namespace": "निवेदन गरियाको पानाको शिर्षकले उपलब्ध नभएका कुरडी पानालाई सन्दर्भको रूपमी राख्याको छ ।",
 	"title-invalid-characters": "निवेदन गरियाको यै पानाको शिर्षकमी अवैध अक्षर रयाको छः \"$1\" ।",
+	"title-invalid-leading-colon": "निवेदन गरिया पृष्ठको शिर्षकको शुरूमी अवैध कोलोन रया छ ।",
+	"perfcached": "तलका डाटाहरू क्याचमी रया कुराहरू हुन्। अपटुडेट नहुन लाई सक्दान। बर्ति {{PLURAL:$1|नतिजा|$1 नतिजाहरू}} क्याचमी उपलब्ध छ।",
+	"perfcachedts": "तलतिरको आँकडा क्याच हो र $1 पहिला अद्यतन गरिया थ्यो। येई क्याचमी उपलब्ध {{PLURAL:$4|एउटा कारण हो|$4 कारणहरू हुन्}}।",
 	"viewsource": "स्रोत हेर",
 	"viewsource-title": " $1 को स्रोत हेर",
 	"actionthrottled": "कार्य रोकिईयो",
@@ -778,18 +781,23 @@
 	"prefs-rc": "नौला परिवर्तनहरू",
 	"prefs-watchlist": "मेरो ध्यान सूची",
 	"prefs-editwatchlist": "अवलोकनसूची सम्पादन",
+	"prefs-editwatchlist-label": "आफना अवलोकनसूचीमी रया इन्ट्रीलाई सम्पादन गर:",
+	"prefs-editwatchlist-edit": "आफना अवलोकनसूचीमी रया शीर्षकलाई धेकाउन्या तथा हटाउन्या",
 	"prefs-editwatchlist-raw": "कच्चा अवलोकनसूची सम्पादन गद्दा",
 	"prefs-editwatchlist-clear": "तमरो अवलोकनसूची मेटा",
 	"prefs-watchlist-days": "ध्यान सूचीमी धेकाउने दिनहरू:",
+	"prefs-watchlist-days-max": "भौत $1 {{PLURAL:$1|दिन|दिन}}",
+	"prefs-watchlist-edits": "उच्चतम परिवर्तन संख्या बढाइएको निगरानी सूचीमी  धकाउनका लागि :",
 	"prefs-watchlist-edits-max": "सबै है ज्यादा संख्या : १०००",
 	"prefs-watchlist-token": "अवलोकन सूची टोकन:",
 	"prefs-misc": "साधारण",
 	"prefs-resetpass": "पासवर्ड परिवर्तन गर",
-	"prefs-changeemail": "इमेल परिवर्तन गर्न्या",
+	"prefs-changeemail": "इमेल ठेगाना बदेल वा हटा",
 	"prefs-setemail": "इमेल ठेगाना प्रविष्ट गर्न्या",
 	"prefs-email": "इमेल  विकल्पहरू",
 	"prefs-rendering": "स्वरुप",
 	"saveprefs": "संग्रह",
+	"restoreprefs": "सबै पूर्वनिर्धारित स्थिती कायम गर्ने(सबै खण्डहरूमी)",
 	"prefs-editing": "सम्पादन",
 	"rows": "हरफहरू :",
 	"columns": "स्तम्भहरू :",
@@ -929,6 +937,13 @@
 	"right-sendemail": "अन्य प्रयोगकर्तानलाई इमेल पठाउन्या",
 	"grant-editmycssjs": "तमरो प्रयोगकर्ता CSS/JavaScript सम्पादन गर",
 	"grant-editmyoptions": "तमरा प्रयोगकर्ता अभिरूचीहरूलाई सम्पादन गर",
+	"grant-editmywatchlist": "तमरो अवलोकनसूची सम्पादन गर",
+	"grant-editpage": "भैरया पृष्ठहरू सम्पादन गर",
+	"grant-editprotected": "सुरक्षित पृष्ठ सम्पादन",
+	"grant-highvolume": "उच्च मात्रा सम्पादन",
+	"grant-basic": "आधारभूत अधिकार",
+	"grant-viewdeleted": "नयाँ फाइलहरू अपलोड\nसम्पादन गर",
+	"grant-viewmywatchlist": "आफनो अबलोकन सुची हेर",
 	"newuserlogpage": "प्रयोगकर्ता श्रृजना लग",
 	"action-move-subpages": "यै पानाको रे यैका उपपानाको नाम बदल्न्या",
 	"action-unwatchedpages": "कसैले ध्यान नराख्याका पाननको सूची हेद्या",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cf5710af95..892ac2c2c1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -1255,6 +1255,7 @@
 	"grant-group-high-volume": "Perform high volume activity",
 	"grant-group-customization": "Customization and preferences",
 	"grant-group-administration": "Perform administrative actions",
+	"grant-group-private-information": "Access private data about you",
 	"grant-group-other": "Miscellaneous activity",
 	"grant-blockusers": "Block and unblock users",
 	"grant-createaccount": "Create accounts",
@@ -1269,6 +1270,7 @@
 	"grant-highvolume": "High-volume editing",
 	"grant-oversight": "Hide users and suppress revisions",
 	"grant-patrol": "Patrol changes to pages",
+	"grant-privateinfo": "Access private information",
 	"grant-protect": "Protect and unprotect pages",
 	"grant-rollback": "Rollback changes to pages",
 	"grant-sendemail": "Send email to other users",
@@ -4193,5 +4195,7 @@
 	"linkaccounts-submit": "Link accounts",
 	"unlinkaccounts": "Unlink accounts",
 	"unlinkaccounts-success": "The account was unlinked.",
-	"authenticationdatachange-ignored": "The authentication data change was not handled. Maybe no provider was configured?"
+	"authenticationdatachange-ignored": "The authentication data change was not handled. Maybe no provider was configured?",
+	"userjsispublic": "Please note: JavaScript subpages should not contain confidential data as they are viewable by other users.",
+	"usercssispublic": "Please note: CSS subpages should not contain confidential data as they are viewable by other users."
 }
diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index 323671c617..13eb863c4e 100644
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -777,7 +777,7 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Malplena objeto",
 	"content-json-empty-array": "Malplena tabelo",
-	"deprecated-self-close-category": "Paĝoj kun nevalida memferma HTML‑etikedon",
+	"deprecated-self-close-category": "Paĝoj kun nevalida memferma HTML‑etikedo",
 	"duplicate-args-warning": "'''Averto:''' [[:$1]] vokas al [[:$2]] kun pli ol unu valoro por la parametro \"$3\". Nur la lasta liverita valoro estos uzata.",
 	"duplicate-args-category": "Paĝoj kun pluroblaj argumentoj en ŝablonvokoj",
 	"duplicate-args-category-desc": "La paĝo enhavas uzon de ŝablono kun pluroble uzitaj argumentoj, kiel ekzemple <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> aŭ <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
@@ -2022,7 +2022,7 @@
 	"actionfailed": "Ago malsukcesis",
 	"deletedtext": "\"$1\" estas forigita.\nVidu la paĝon $2 por registro de lastatempaj forigoj.",
 	"dellogpage": "Protokolo pri forigoj",
-	"dellogpagetext": "Jen listo de la plej lastaj forigoj el la datumaro.\nĈiuj tempoj sekvas la horzonon UTC.",
+	"dellogpagetext": "Jen listo de la plej lastaj forigoj.",
 	"deletionlog": "protokolo pri forigoj",
 	"reverted": "Malfaris al antaÅ­a revisio",
 	"deletecomment": "Kialo:",
diff --git a/languages/i18n/es.json b/languages/i18n/es.json
index c4f01aae04..3d1d03935a 100644
--- a/languages/i18n/es.json
+++ b/languages/i18n/es.json
@@ -1982,7 +1982,7 @@
 	"linksearch-ok": "Buscar",
 	"linksearch-text": "Se pueden usar caracteres comodín como \"*.wikipedia.org\".\nEs necesario, por lo menos, un dominio de alto nivel, por ejemplo \"*.org\".<br />\n{{PLURAL:$2|Protocolo soportado|Protocolos soportados}}: $1 (si no se especifica ninguno, el predeterminado es http://).",
 	"linksearch-line": "$1 enlazado desde $2",
-	"linksearch-error": "Los comodines sólo pueden aparecer al principio del nombre de sitio.",
+	"linksearch-error": "Los comodines solo pueden aparecer al principio del nombre de sitio.",
 	"listusersfrom": "Mostrar usuarios que empiecen por:",
 	"listusers-submit": "Mostrar",
 	"listusers-noresult": "No se encontró al usuario.",
@@ -2123,7 +2123,7 @@
 	"confirm": "Confirmar",
 	"excontent": "el contenido era: «$1»",
 	"excontentauthor": "el contenido era: «$1», y el único autor fue «[[Special:Contributions/$2|$2]]» ([[User talk:$2|discusión]])",
-	"exbeforeblank": "El contenido antes de blanquear era: «$1»",
+	"exbeforeblank": "el contenido antes de blanquear era: «$1»",
 	"delete-confirm": "Borrar «$1»",
 	"delete-legend": "Borrar",
 	"historywarning": "<strong>Atención:</strong> la página que estás a punto de borrar tiene un historial con $1 {{PLURAL:$1|revisión|revisiones}}:",
@@ -2293,8 +2293,8 @@
 	"sp-contributions-newbies-sub": "Para cuentas nuevas",
 	"sp-contributions-newbies-title": "Contribuciones de usuarios nuevos",
 	"sp-contributions-blocklog": "registro de bloqueos",
-	"sp-contributions-suppresslog": "contribuciones de usuario suprimidas",
-	"sp-contributions-deleted": "contribuciones de usuario borradas",
+	"sp-contributions-suppresslog": "contribuciones de {{GENDER:$1|usuario|usuaria}} suprimidas",
+	"sp-contributions-deleted": "contribuciones de {{GENDER:$1|usuario|usuaria}} borradas",
 	"sp-contributions-uploads": "subidas",
 	"sp-contributions-logs": "registros",
 	"sp-contributions-talk": "discusión",
diff --git a/languages/i18n/fa.json b/languages/i18n/fa.json
index cd16fd10e7..cfc4e4d322 100644
--- a/languages/i18n/fa.json
+++ b/languages/i18n/fa.json
@@ -816,7 +816,7 @@
 	"undo-success": "این ویرایش را می‌توان خنثی کرد.\nلطفاً تفاوت زیر را بررسی کنید تا تأیید کنید که این چیزی است که می‌خواهید انجام دهید، سپس تغییرات زیر را ذخیره کنید تا خنثی‌سازی ویرایش را به پایان ببرید.",
 	"undo-failure": "به علت تعارض با ویرایش‌های میانی، این ویرایش را نمی‌توان خنثی کرد.",
 	"undo-norev": "این ویرایش را نمی‌توان خنثی کرد چون وجود ندارد یا حذف شده‌است.",
-	"undo-nochange": "به نظر می‌رسد ویرایش از پیش واگردانی شده است.",
+	"undo-nochange": "به نظر می‌رسد ویرایش از پیش خنثی‌سازی شده است.",
 	"undo-summary": "خنثی‌سازی ویرایش $1 توسط [[Special:Contributions/$2|$2]] ([[User talk:$2|بحث]])",
 	"undo-summary-username-hidden": "خنثی‌سازی نسخهٔ $1 به دست یک کاربر پنهان‌شده",
 	"cantcreateaccount-text": "امكان ساختن حساب کاربری از این این نشانی آی‌پی ('''$1''') توسط [[User:$3|$3]] سلب شده است.\n\nدلیل ارائه شده توسط $3 چنین است: $2",
@@ -3498,7 +3498,7 @@
 	"logentry-protect-modify-cascade": "$1 سطح حفاظت برای $3 $4 را {{GENDER:$2|تغییر داد}}[آبشاری]",
 	"logentry-rights-rights": "$1 دسترسی $3 را از گروه $4 به $5 تغییر داد",
 	"logentry-rights-rights-legacy": "$1 گروه عضویت $3 را {{GENDER:$2|تغییر داد}}",
-	"logentry-rights-autopromote": "$1 به طور خودکار از $4 به $5 {{GENDER:$2|ارتقاء داد}}",
+	"logentry-rights-autopromote": "$1 به طور خودکار از $4 به $5 {{GENDER:$2|ارتقاء یافت}}",
 	"logentry-upload-upload": "$1 $3 را {{GENDER:$2|بارگذاری کرد}}",
 	"logentry-upload-overwrite": "$1 نسخهٔ تازه‌ای از $3 را {{GENDER:$2|بارگذاری کرد}}",
 	"logentry-upload-revert": "$1 {{GENDER:$2|بارگذاری کرد}} $3",
diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index dbc0cf177b..5710a6f20a 100644
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -1333,6 +1333,7 @@
 	"grant-group-high-volume": "Effectuer une activité de fort volume",
 	"grant-group-customization": "Personnalisation et préférences",
 	"grant-group-administration": "Effectuer des actions administratives",
+	"grant-group-private-information": "Accéder à vos données privées",
 	"grant-group-other": "Activités diverses",
 	"grant-blockusers": "Bloquer et débloquer des utilisateurs",
 	"grant-createaccount": "Créer des comptes",
@@ -1347,6 +1348,7 @@
 	"grant-highvolume": "Modification de gros volumes",
 	"grant-oversight": "Masquer les utilisateurs et supprimer les révisions",
 	"grant-patrol": "Vérifier les modifications de pages",
+	"grant-privateinfo": "Accéder aux informations privées",
 	"grant-protect": "Protéger et déprotéger des pages",
 	"grant-rollback": "Révoquer des modifications sur des pages",
 	"grant-sendemail": "Envoyer des courriels aux autres utilisateurs",
@@ -1484,7 +1486,7 @@
 	"upload_directory_missing": "Le répertoire d’import de fichier ($1) est introuvable et n’a pas pu être créé par le serveur web.",
 	"upload_directory_read_only": "Le serveur web n’a pas accès en écriture au répertoire d’import de fichier ($1).",
 	"uploaderror": "Erreur lors de l’import",
-	"upload-recreate-warning": "'''Attention : Un fichier portant ce nom a été supprimé ou déplacé.'''\n\nLe journal des suppressions et celui des déplacements de cette page sont affichés ici pour informations :",
+	"upload-recreate-warning": "<strong>Attention : Un fichier portant ce nom a été supprimé ou déplacé.</strong>\n\nLe journal des suppressions et celui des déplacements de cette page sont affichés ici pour informations :",
 	"uploadtext": "Utilisez ce formulaire pour importer des fichiers sur le serveur.\nPour voir ou rechercher des images précédemment envoyées, consultez la [[Special:FileList|liste des images]]. L’import est aussi enregistré dans le [[Special:Log/upload|journal d’import des fichiers]], et les suppressions dans le [[Special:Log/delete|journal des suppressions]].\n\nPour inclure un fichier dans une page, utilisez un lien de la forme :\n* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichier.jpg]]</nowiki></code>''', pour afficher le fichier en pleine résolution (dans le cas d’une image) ;\n* '''<code><nowiki>[[</nowiki>{{ns:file}}<nowiki>:fichier.png|200px|thumb|left|texte descriptif]]</nowiki></code>''' pour utiliser une miniature de 200 pixels de large dans une boîte à gauche avec « texte descriptif » comme description ;\n* '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:fichier.ogg]]</nowiki></code>''' pour lier directement vers le fichier sans l’afficher.",
 	"upload-permitted": "{{PLURAL:$2|Format|Formats}} de fichiers {{PLURAL:$2|autorisé|autorisés}} : $1.",
 	"upload-preferred": "{{PLURAL:$2|Format|Formats}} de fichiers {{PLURAL:$2|préféré|préférés}} : $1.",
@@ -1520,12 +1522,12 @@
 	"unknown-error": "Une erreur inconnue s’est produite.",
 	"tmp-create-error": "Impossible de créer le fichier temporaire.",
 	"tmp-write-error": "Erreur d'écriture du fichier temporaire.",
-	"large-file": "Les fichiers importés ne devraient pas dépasser $1 ; ce fichier fait $2.",
-	"largefileserver": "La taille de ce fichier est supérieure au maximum autorisé.",
+	"large-file": "Les fichiers importés ne devraient pas dépasser $1 ; \nce fichier fait $2.",
+	"largefileserver": "La taille de ce fichier est supérieure au maximum autorisé par le serveur.",
 	"emptyfile": "Le fichier que vous voulez importer semble vide.\nCeci peut être dû à une erreur dans le nom du fichier.\nVeuillez vérifier que vous désirez vraiment importer ce fichier.",
 	"windows-nonascii-filename": "Ce wiki ne supporte pas les noms de fichiers avec des caractères spéciaux.",
 	"fileexists": "Un fichier existe déjà sous ce nom.\nMerci de vérifier <strong>[[:$1]]</strong> si vous n'êtes pas certain{{GENDER:||e|}} de vouloir le remplacer.\n[[$1|thumb]]",
-	"filepageexists": "La page de description pour ce fichier a déjà été créée ici <strong>[[:$1]]</strong>, mais aucun fichier n'existe actuellement sous ce nom.\nLe résumé que vous allez spécifier n'apparaîtra pas sur la page de description.\nPour que ce soit le cas, vous devrez modifier manuellement la page. [[$1|thumb]]",
+	"filepageexists": "La page de description pour ce fichier a déjà été créée ici <strong>[[:$1]]</strong>, mais aucun fichier n'existe actuellement sous ce nom.\nLe résumé que vous allez spécifier n'apparaîtra pas sur la page de description.\nPour que ce soit le cas, vous devrez modifier manuellement la page. \n[[$1|thumb]]",
 	"fileexists-extension": "Un fichier existe avec un nom proche : [[$2|thumb]]\n* Nom du fichier à importer : <strong>[[:$1]]</strong>\n* Nom du fichier existant : <strong>[[:$2]]</strong>\nPeut-être voulez-vous utiliser un nom plus explicite ?",
 	"fileexists-thumbnail-yes": "Le fichier semble être une image en taille réduite <em>(vignette)</em>. \n[[$1|thumb]]\nVeuillez vérifier le fichier <strong>[[:$1]]</strong>.\nSi le fichier vérifié est la même image avec la taille initiale, il n'y a pas besoin d'importer une version réduite.",
 	"file-thumbnail-no": "Le nom du fichier commence par <strong>$1</strong>.\nIl est possible qu'il s'agisse d'une version réduite <em>(vignette)</em>.\nSi vous disposez du fichier en haute résolution, importez-le, sinon veuillez modifier son nom.",
@@ -1544,12 +1546,12 @@
 	"uploadscripted": "Ce fichier contient du code HTML ou un script qui pourrait être interprété de façon incorrecte par un navigateur web.",
 	"upload-scripted-pi-callback": "Impossible de charger un fichier qui contient des instructions de traitement de feuille de style XML.",
 	"uploaded-script-svg": "Élément scriptable « $1 » trouvé dans le fichier SVG téléchargé.",
-	"uploaded-hostile-svg": "CSS non sûr trouvé dans l’élément style d’un fichier SVG téléchargé.",
+	"uploaded-hostile-svg": "CSS non sûr trouvé dans l’élément style d’un fichier SVG téléversé.",
 	"uploaded-event-handler-on-svg": "Fixer des attributs de gestionnaire d’événement <code>$1=\"$2\"</code> n’est pas autorisé dans les fichiers SVG.",
 	"uploaded-href-attribute-svg": "les attributs href dans les fichiers SVG ne sont autorisés que pour faire référence à des cibles http:// ou https://, <code>&lt;$1 $2=\"$3\"&gt;</code> trouvé.",
-	"uploaded-href-unsafe-target-svg": "href vers des données non sûres trouvé dans le fichier SVG téléchargé : URI cible <code>&lt;$1 $2=\"$3\"&gt;</code>.",
+	"uploaded-href-unsafe-target-svg": "Un href vers des données non sûres a été trouvé dans le fichier SVG téléchargé : URI cible <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploaded-animate-svg": "Balise « animate » trouvée, qui pourrait modifier le href en utilisant l’attribut « from » <code>&lt;$1 $2=\"$3\"&gt;</code> dans le fichier SVG téléchargé.",
-	"uploaded-setting-event-handler-svg": "Positionner des attributs de gestionnaire d’événement est bloqué, <code>&lt;$1 $2=\"$3\"&gt;</code> trouvé dans le fichier SVG téléchargé.",
+	"uploaded-setting-event-handler-svg": "Positionner les attributs du gestionnaire d’événements n'est pas possbile, <code>&lt;$1 $2=\"$3\"&gt;</code> trouvé dans le fichier SVG téléchargé.",
 	"uploaded-setting-href-svg": "L’utilisation de la balise « set » pour ajouter un attribut « href » à l’élément parent est interdite.",
 	"uploaded-wrong-setting-svg": "L’utilisation de la balise « set » pour ajouter une cible distante/données/script à un attribut quelconque est interdite. <code>&lt;set to=\"$1\"&gt;</code> a été trouvé dans le fichier SVG téléchargé.",
 	"uploaded-setting-handler-svg": "Les SVG qui positionnent l’attribut « handler » avec distant/données/script sont interdits. <code>$1=\"$2\"</code> a été trouvé dans le fichier SVG téléchargé.",
@@ -1647,7 +1649,7 @@
 	"zip-unsupported": "Le fichier est une archive ZIP qui utilise des caractéristiques non supportées par MediaWiki. \nSa sécurité ne peut pas être correctement vérifiée.",
 	"uploadstash": "Cache d’import",
 	"uploadstash-summary": "Cette page donne accès aux fichiers qui sont importés (ou en cours d’importation), mais ne sont pas encore publiés dans le wiki. Ces fichiers ne sont pas encore visibles, sauf pour l’utilisateur qui les a importés.",
-	"uploadstash-clear": "Effacer les fichiers en cache",
+	"uploadstash-clear": "Effacer les fichiers en cache d'import",
 	"uploadstash-nofiles": "Vous n’avez pas de fichiers en cache d’import.",
 	"uploadstash-badtoken": "L’exécution de cette action a échoué, peut-être parce que vos informations d’identification ont expiré. Veuillez réessayer.",
 	"uploadstash-errclear": "La suppression des fichiers a échoué.",
@@ -1721,7 +1723,7 @@
 	"nolinkstoimage": "Aucune page n'utilise ce fichier.",
 	"morelinkstoimage": "Voir [[Special:WhatLinksHere/$1|plus de liens]] vers ce fichier.",
 	"linkstoimage-redirect": "$1 (redirection de fichier) $2",
-	"duplicatesoffile": "{{PLURAL:$1|Le fichier suivant est un duplicata|Les fichiers suivants sont des duplicatas}} de celui-ci ([[Special:FileDuplicateSearch/$2|plus de détails]]) :",
+	"duplicatesoffile": "{{PLURAL:$1|Le fichier suivant est un doublon|Les $1 fichiers suivants sont des doublons}} de celui-ci ([[Special:FileDuplicateSearch/$2|plus de détails]]) :",
 	"sharedupload": "Ce fichier provient de : $1. Il peut être utilisé par d'autres projets.",
 	"sharedupload-desc-there": "Ce fichier provient de : $1. Il peut être utilisé par d'autres projets.\nVeuillez consulter [$2 sa page de description] pour plus d'informations.",
 	"sharedupload-desc-here": "Ce fichier provient de $1. Il peut être utilisé par d'autres projets.\nSa description sur sa [$2 page de description] est affichée ci-dessous.",
@@ -1737,27 +1739,27 @@
 	"upload-disallowed-here": "Vous ne pouvez pas remplacer ce fichier.",
 	"filerevert": "Rétablir $1",
 	"filerevert-legend": "Rétablir le fichier",
-	"filerevert-intro": "Vous êtes sur le point de rétablir le fichier '''[[Media:$1|$1]]''' à la [$4 version du $2 à $3].",
+	"filerevert-intro": "Vous êtes sur le point de rétablir le fichier <strong>[[Media:$1|$1]]</strong> à la [$4 version du $2 à $3].",
 	"filerevert-comment": "Motif :",
-	"filerevert-defaultcomment": "Retour sur la version du $2, $1 ($3)",
+	"filerevert-defaultcomment": "Retour sur la version du $1 à $2 ($3)",
 	"filerevert-submit": "Rétablir",
-	"filerevert-success": "'''[[Media:$1|$1]]''' a été rétabli à [$4 la version du $2 à $3].",
+	"filerevert-success": "<strong>[[Media:$1|$1]]</strong> a été rétabli à [$4 la version du $2 à $3].",
 	"filerevert-badversion": "Il n'y a pas localement de version antérieure du fichier qui porte la date indiquée.",
 	"filedelete": "Supprimer $1",
 	"filedelete-legend": "Supprimer le fichier",
-	"filedelete-intro": "Vous êtes sur le point de supprimer '''[[Media:$1|$1]]''' ainsi que tout son historique.",
-	"filedelete-intro-old": "Vous êtes en train d'effacer la version de '''[[Media:$1|$1]]''' du [$4 $2 à $3].",
+	"filedelete-intro": "Vous êtes sur le point de supprimer <strong>[[Media:$1|$1]]</strong> ainsi que tout son historique.",
+	"filedelete-intro-old": "Vous êtes en train de supprimer la version <strong>[[Media:$1|$1]]</strong> du [$4 $2 à $3].",
 	"filedelete-comment": "Motif :",
 	"filedelete-submit": "Supprimer",
-	"filedelete-success": "'''$1''' a été supprimé.",
-	"filedelete-success-old": "La version de '''[[Media:$1|$1]]''' du $2 à $3 a été supprimée.",
-	"filedelete-nofile": "'''$1''' n'existe pas.",
-	"filedelete-nofile-old": "Il n'existe aucune version archivée de '''$1''' avec les attributs indiqués.",
+	"filedelete-success": "<strong>$1</strong> a été supprimé.",
+	"filedelete-success-old": "La version de <strong>[[Media:$1|$1]]</strong> du $2 à $3 a été supprimée.",
+	"filedelete-nofile": "<strong>$1</strong> n'existe pas.",
+	"filedelete-nofile-old": "Il n'existe aucune version archivée de <strong>$1</strong> avec les attributs indiqués.",
 	"filedelete-otherreason": "Motif autre / supplémentaire :",
 	"filedelete-reason-otherlist": "Autre motif",
 	"filedelete-reason-dropdown": "* Motifs fréquents de suppression de fichiers\n** Violation du droit d'auteur\n** Fichier dupliqué",
-	"filedelete-edit-reasonlist": "Modifier les motifs fréquents de suppression",
-	"filedelete-maintenance": "La suppression et restauration de fichiers est temporairement désactivée durant la maintenance.",
+	"filedelete-edit-reasonlist": "Modifier les motifs de suppression",
+	"filedelete-maintenance": "La suppression et la restauration de fichiers sont  temporairement désactivées durant la maintenance.",
 	"filedelete-maintenance-title": "Impossible de supprimer le fichier",
 	"mimesearch": "Recherche par type de contenu MIME",
 	"mimesearch-summary": "Cette page vous permet de filtrer les fichiers par leur type de contenu MIME.\nEntrée : type_de_contenu/sous-type ou type_de_contenu/*, par ex. <code>image/jpeg</code>.",
@@ -1775,7 +1777,7 @@
 	"randompage-nopages": "Il n'y a aucune page dans {{PLURAL:$2|l'espace de noms|les espaces de noms}} : $1.",
 	"randomincategory": "Page au hasard dans la catégorie",
 	"randomincategory-invalidcategory": "« $1 » n’est pas un nom de catégorie valide.",
-	"randomincategory-nopages": "Il n’y a pas de page dans [[:Category:$1]].",
+	"randomincategory-nopages": "Il n’y a pas de pages dans la catégorie [[:Category:$1|$1]].",
 	"randomincategory-category": "Catégorie :",
 	"randomincategory-legend": "Page aléatoire dans la catégorie",
 	"randomincategory-submit": "Lancer",
@@ -1827,11 +1829,11 @@
 	"ntransclusions": "Utilisé sur $1 {{PLURAL:$1|page|pages}}",
 	"specialpage-empty": "Il n'y a aucun résultat à afficher.",
 	"lonelypages": "Pages orphelines",
-	"lonelypagestext": "Les pages suivantes ne sont ni pointées, ni incluses par d'autres pages du wiki.",
-	"uncategorizedpages": "Pages sans catégories",
+	"lonelypagestext": "Les pages suivantes ne sont ni pointées, ni incluses dans d'autres pages de {{SITENAME}}.",
+	"uncategorizedpages": "Pages sans catégorie",
 	"uncategorizedcategories": "Catégories sans catégories",
-	"uncategorizedimages": "Fichiers sans catégories",
-	"uncategorizedtemplates": "Modèles sans catégories",
+	"uncategorizedimages": "Fichiers sans catégorie",
+	"uncategorizedtemplates": "Modèles sans catégorie",
 	"unusedcategories": "Catégories inutilisées",
 	"unusedimages": "Fichiers orphelins",
 	"wantedcategories": "Catégories les plus demandées",
@@ -1839,8 +1841,8 @@
 	"wantedpages-summary": "Liste des pages inexistantes ayant le plus de lien vers elles, en excluant les pages n’ayant que des redirections pointant vers elles. Pour avoir une liste des pages inexistantes qui ont des redirections pointant vers elles, voyez [[{{#special:BrokenRedirects}}|la liste des redirections cassées]].",
 	"wantedpages-badtitle": "Titre invalide dans les résultats : $1",
 	"wantedfiles": "Fichiers les plus demandés",
-	"wantedfiletext-cat": "Les fichiers suivants sont utilisés, mais n'existent pas localement. S'ils se trouvent sur un dépôt partagé, ils peuvent être listés ici, bien qu'ils soient, de fait, déjà disponibles. Tous ces faux positifs seront <del>barrés</del>. En outre, les pages qui intègrent des fichiers qui n'existent pas sont répertoriées dans [[:$1]].",
-	"wantedfiletext-cat-noforeign": "Les fichiers suivants sont utilisés mais n'existent pas. De plus, les pages qui intègrent les fichiers qui n'existent pas sont listés dans [[:$1]].",
+	"wantedfiletext-cat": "Les fichiers suivants sont utilisés, mais n'existent pas localement. Les fichiers qui se trouvent sur un dépôt externe peuvent être listés ici, bien qu'ils soient, de fait, déjà disponibles. Tous ces faux positifs seront <del>barrés</del>. En outre, les pages qui intègrent des fichiers qui n'existent pas sont répertoriées dans [[:$1]].",
+	"wantedfiletext-cat-noforeign": "Les fichiers suivants sont utilisés mais n'existent pas. De plus, les pages qui intègrent les fichiers qui n'existent pas sont listées dans [[:$1]].",
 	"wantedfiletext-nocat": "Les fichiers suivants sont utilisés, mais n'existent pas localement. S'ils se trouvent sur un dépôt partagé, ils peuvent être listés ici, bien qu'ils soient, de fait, déjà disponibles. Tous ces faux positifs seront <del>barrés</del>.",
 	"wantedfiletext-nocat-noforeign": "Les fichiers suivants sont utilisés mais n'existent pas.",
 	"wantedtemplates": "Modèles demandés",
@@ -1858,13 +1860,13 @@
 	"shortpages": "Pages courtes",
 	"longpages": "Pages longues",
 	"deadendpages": "Pages en impasse",
-	"deadendpagestext": "Les pages suivantes ne contiennent aucun lien vers d'autres pages du wiki.",
+	"deadendpagestext": "Les pages suivantes ne contiennent aucun lien vers d'autres pages dans le wiki {{SITENAME}}.",
 	"protectedpages": "Pages protégées",
 	"protectedpages-indef": "Uniquement les protections indéfinies",
 	"protectedpages-summary": "Cette page liste les pages existantes actuellement protégées. Pour une liste des titres protégés contre la création, voir [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].",
 	"protectedpages-cascade": "Uniquement les protections en cascade",
 	"protectedpages-noredirect": "Masquer les redirections",
-	"protectedpagesempty": "Aucune page n'est protégée de cette façon.",
+	"protectedpagesempty": "Aucune page n'est protégée avec ces paramètres.",
 	"protectedpages-timestamp": "Horodatage",
 	"protectedpages-page": "Page",
 	"protectedpages-expiry": "Expire le",
@@ -1879,9 +1881,9 @@
 	"protectedtitlesempty": "Aucun titre n'est actuellement protégé avec ces paramètres.",
 	"protectedtitles-submit": "Afficher les titres",
 	"listusers": "Liste des utilisateurs",
-	"listusers-editsonly": "Ne montrer que les utilisateurs ayant au moins une contribution",
+	"listusers-editsonly": "Ne montrer que les utilisateurs ayant fait des modifications.",
 	"listusers-creationsort": "Trier par date de création",
-	"listusers-desc": "Trier en ordre descendant",
+	"listusers-desc": "Trier par ordre décroissant",
 	"usereditcount": "$1 modification{{PLURAL:$1||s}}",
 	"usercreated": "{{GENDER:$3|Créé}} le $1 à $2",
 	"newpages": "Nouvelles pages",
@@ -1890,27 +1892,27 @@
 	"ancientpages": "Pages les plus anciennement modifiées",
 	"move": "Renommer",
 	"movethispage": "Renommer cette page",
-	"unusedimagestext": "Les fichiers suivants existent, mais ne sont inclus dans aucune page.\nVeuillez noter que d’autres sites peuvent avoir un lien direct vers un fichier, et donc qu’un fichier peut être listé ici alors qu’il est en réalité utilisé sur ces sites.",
-	"unusedcategoriestext": "Les catégories suivantes existent mais aucune page ou catégorie ne les utilise.",
+	"unusedimagestext": "Les fichiers suivants existent, mais ne sont inclus dans aucune page.\nVeuillez noter que d’autres sites peuvent accéder à ces fichiers à l’aide de liens directs (URLs), et donc qu’un fichier peut être listé ici alors qu’il est utilisé par ces sites.",
+	"unusedcategoriestext": "Les pages de catégories suivantes existent, mais aucune page ou catégorie ne les utilise.",
 	"notargettitle": "Pas de cible",
 	"notargettext": "Vous n'avez pas indiqué une page ou un utilisateur sur lequel vous souhaitez effectuer cette action.",
 	"nopagetitle": "Page cible inexistante",
 	"nopagetext": "La page cible que vous avez indiquée n'existe pas.",
-	"pager-newer-n": "{{PLURAL:$1|plus récente|$1 plus récentes}}",
-	"pager-older-n": "{{PLURAL:$1|plus ancienne|$1 plus anciennes}}",
+	"pager-newer-n": "{{PLURAL:$1|1 plus récente|$1 plus récentes}}",
+	"pager-older-n": "{{PLURAL:$1|1 plus ancienne|$1 plus anciennes}}",
 	"suppress": "Supprimer",
 	"querypage-disabled": "Cette page spéciale est désactivée pour des raisons de performances.",
 	"apihelp": "Aide de l’API",
 	"apihelp-no-such-module": "Le module « $1 » est introuvable.",
-	"apisandbox": "Bac à sable API",
+	"apisandbox": "Bac à sable de l'API",
 	"apisandbox-jsonly": "Le bac à sable de l'API nécessite JavaScript",
-	"apisandbox-api-disabled": "API est désactivé sur ce site.",
+	"apisandbox-api-disabled": "L'API est désactivé sur ce site.",
 	"apisandbox-intro": "Utilisez cette page pour expérimenter l’<strong>API webservice de MediaWiki</strong>.\nReportez-vous à [[mw:API:Main page|la documentation de l’API]] pour plus de détails sur l’utilisation de l’API. Exemple: [https://www.mediawiki.org/wiki/API#A_simple_example obtenir le contenu d'une page principale]. Choisissez une option pour voir d'autres exemples.",
 	"apisandbox-fullscreen": "Développer le panneau",
 	"apisandbox-fullscreen-tooltip": "Étendre le panneau du bac à sable pour remplir la fenêtre du navigateur.",
 	"apisandbox-unfullscreen": "Afficher la page",
 	"apisandbox-unfullscreen-tooltip": "Réduire le panneau du bac à sable, pour que les liens de navigation de MediaWiki soient disponibles.",
-	"apisandbox-submit": "Faire la demande",
+	"apisandbox-submit": "Envoyer la requête",
 	"apisandbox-reset": "Effacer",
 	"apisandbox-retry": "Réessayer",
 	"apisandbox-loading": "Chargement des informations du module \"$1\" de l'API...",
@@ -1947,7 +1949,7 @@
 	"log": "Journaux d’opérations",
 	"logeventslist-submit": "Lister",
 	"all-logs-page": "Tous les journaux publics",
-	"alllogstext": "Affichage combiné de tous les journaux disponibles sur {{SITENAME}}.<br />\nVous pouvez personnaliser l'affichage en sélectionnant le type de journal, le nom d'utilisateur ou la page concernée (ces deux derniers étant sensibles à la casse).",
+	"alllogstext": "Affichage combiné de tous les journaux disponibles sur {{SITENAME}}.\nVous pouvez personnaliser l'affichage en sélectionnant le type de journal, le nom d'utilisateur ou la page concernée (ces deux derniers étant sensibles à la casse).",
 	"logempty": "Aucune opération correspondante dans les journaux.",
 	"log-title-wildcard": "Chercher parmi les titres commençant par ce texte",
 	"showhideselectedlogentries": "Afficher/masquer les entrées de journal sélectionnées",
@@ -1965,7 +1967,7 @@
 	"allinnamespace": "Toutes les pages (dans l'espace de noms $1)",
 	"allpagessubmit": "Lister",
 	"allpagesprefix": "Afficher les pages commençant par :",
-	"allpagesbadtitle": "Le titre de page indiqué est incorrect : il contient un préfixe inter-langue ou inter-wiki réservé, ou contient un ou plusieurs caractères inutilisables dans les titres.",
+	"allpagesbadtitle": "Le titre de page indiqué est incorrect : il contient un préfixe inter-langue ou inter-wiki réservé.\nIl pourrait aussi contenir un ou plusieurs caractères inutilisables dans les titres.",
 	"allpages-bad-ns": "{{SITENAME}} n'a pas d'espace de noms « $1 ».",
 	"allpages-hide-redirects": "Masquer les redirections",
 	"cachedspecial-viewing-cached-ttl": "Vous visualisez une version de cette page mise en cache, qui peut être datée d’au plus $1.",
@@ -2002,7 +2004,7 @@
 	"listgrouprights-key": "Légende :\n*<span class=\"listgrouprights-granted\">Droit octroyé</span>\n*<span class=\"listgrouprights-revoked\">Droit révoqué</span>",
 	"listgrouprights-group": "Groupe",
 	"listgrouprights-rights": "Droits associés",
-	"listgrouprights-helppage": "Help:Droits des groupes",
+	"listgrouprights-helppage": "Help:Droits de groupes",
 	"listgrouprights-members": "(liste des membres)",
 	"listgrouprights-addgroup": "Ajouter des membres {{PLURAL:$2|au groupe|aux groupes}} : $1",
 	"listgrouprights-removegroup": "Retirer des membres {{PLURAL:$2|du groupe|des groupes}} : $1",
@@ -2026,17 +2028,17 @@
 	"trackingcategories-desc": "Critère d’inclusion de la catégorie",
 	"restricted-displaytitle-ignored": "Pages avec des titres d'affichage ignorés",
 	"restricted-displaytitle-ignored-desc": "La page a un <code><nowiki>{{DISPLAYTITLE}}</nowiki></code> ignoré parce qu'il n'est pas équivalent au titre actuel de la page.",
-	"noindex-category-desc": "La page contient <code><nowiki>__NOINDEX__</nowiki></code> et est dans un espace de noms où ce marquage est autorisé ; elle ne sera donc pas indexée par les robots.",
-	"index-category-desc": "La page contient <code><nowiki>__INDEX__</nowiki></code> et est dans un espace de noms où ce marquage est autorisé ; elle sera donc indexée par les robots alors qu’elle ne l’aurait pas été normalement.",
+	"noindex-category-desc": "La page n'est pas indexée par les robots car elle contient le mot magique <code><nowiki>__NOINDEX__</nowiki></code> et se trouve dans un espace de noms où ce marquage est autorisé.",
+	"index-category-desc": "La page contient <code><nowiki>__INDEX__</nowiki></code> (et est dans un espace de noms où ce marquage est autorisé), et  sera donc indexée par les robots alors qu’elle ne l’aurait pas été normalement.",
 	"post-expand-template-inclusion-category-desc": "La taille de la page dépasse <code>$wgMaxArticleSize</code> après le développement de tous ses modèles ; certains n’ont donc pas été développés.",
 	"post-expand-template-argument-category-desc": "La page dépasse <code>$wgMaxArticleSize</code> après avoir développé l’argument d’un modèle (quelque chose entre accolades triples, comme <code>{{{Foo}}}</code>).",
 	"expensive-parserfunction-category-desc": "La page utilise trop de fonctions coûteuses de l’analyseur (comme <code>#ifexist</code>). Voyez [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
 	"broken-file-category-desc": "La page contient un lien de fichier incorrect (un lien pour inclure un fichier alors que celui-ci n’existe pas).",
-	"hidden-category-category-desc": "La catégorie contient <code><nowiki>__HIDDENCAT__</nowiki></code> dans son contenu, ce qui empêche son affichage dans la zone des liens de catégorie sur les pages, par défaut.",
+	"hidden-category-category-desc": "La catégorie contient <code><nowiki>__HIDDENCAT__</nowiki></code> dans son contenu, ce qui empêche son affichage dans la zone des liens de catégorie sur les pages par défaut.",
 	"trackingcategories-nodesc": "Aucune description disponible.",
 	"trackingcategories-disabled": "La catégorie est désactivée",
 	"mailnologin": "Pas d'adresse d'expéditeur",
-	"mailnologintext": "Vous devez être [[Special:UserLogin|identifié]] et avoir indiqué une adresse électronique valide dans vos [[Special:Preferences|préférences]] pour pouvoir envoyer des courriels à d'autres utilisateurs.",
+	"mailnologintext": "Vous devez être [[Special:UserLogin|connecté]] et avoir indiqué une adresse électronique valide dans vos [[Special:Preferences|préférences]] pour pouvoir envoyer des courriels à d'autres utilisateurs.",
 	"emailuser": "Lui envoyer un courriel",
 	"emailuser-title-target": "Envoyer un courriel à {{GENDER:$1|cet utilisateur|cette utilisatrice}}",
 	"emailuser-title-notarget": "Envoyer un courriel à l'utilisateur",
@@ -2061,8 +2063,8 @@
 	"emailccsubject": "Copie de votre message à $1 : $2",
 	"emailsent": "Courriel envoyé",
 	"emailsenttext": "Votre message a été envoyé par courriel.",
-	"emailuserfooter": "Ce courriel a été envoyé par « $1 » à « $2 » par la fonction « {{int:emailuser}} » de {{SITENAME}}.",
-	"usermessage-summary": "A laissé un message système.",
+	"emailuserfooter": "Ce courriel a été {{GENDER:$1|envoyé}} par « $1 » à « {{GENDER:$2|$2}} » par la fonction « {{int:emailuser}} » de {{SITENAME}}.",
+	"usermessage-summary": "Laisser un message système.",
 	"usermessage-editor": "Messager du système",
 	"watchlist": "Liste de suivi",
 	"mywatchlist": "Liste de suivi",
@@ -2083,10 +2085,10 @@
 	"unwatch": "Ne plus suivre",
 	"unwatchthispage": "Ne plus suivre",
 	"notanarticle": "Ce n'est pas une page de contenu",
-	"notvisiblerev": "La version a été supprimée",
+	"notvisiblerev": "La dernière version relue par un utilisateur différent, a été supprimée",
 	"watchlist-details": "{{PLURAL:$1|$1 page|$1 pages}} dans votre liste de suivi, sans compter les pages de discussion.",
 	"wlheader-enotif": "La notification par courriel est activée.",
-	"wlheader-showupdated": "Les pages qui ont été modifiées depuis votre dernière visite sont affichées en '''gras'''.",
+	"wlheader-showupdated": "Les pages qui ont été modifiées depuis votre dernière visite sont affichées en <strong>gras</strong>.",
 	"wlnote": "Ci-dessous {{PLURAL:$1|figure la dernière modification effectuée|figurent les <strong>$1</strong> dernières modifications effectuées}} durant {{PLURAL:$2|la dernière heure|les <strong>$2</strong> dernières heures}}, jusqu'au $3, $4.",
 	"wlshowlast": "Montrer les dernières $1 heures, les derniers $2 jours",
 	"watchlist-hide": "Masquer",
diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json
index 10bb66a157..f76e5b85ca 100644
--- a/languages/i18n/gl.json
+++ b/languages/i18n/gl.json
@@ -22,7 +22,8 @@
 			"VaiPolaSombra",
 			"Macofe",
 			"Banjo",
-			"Josep Maria Roca Peña"
+			"Josep Maria Roca Peña",
+			"Luan"
 		]
 	},
 	"tog-underline": "Subliñar as ligazóns:",
@@ -1206,6 +1207,7 @@
 	"grant-group-high-volume": "Realizar actividades de alto volume",
 	"grant-group-customization": "Personalización e preferencias",
 	"grant-group-administration": "Realizar accións administrativas",
+	"grant-group-private-information": "Acceder a datos privados sobre ti",
 	"grant-group-other": "Outras actividades",
 	"grant-blockusers": "Bloquear e desbloquear usuarios",
 	"grant-createaccount": "Crear contas",
@@ -1220,6 +1222,7 @@
 	"grant-highvolume": "Edicións de gran volume",
 	"grant-oversight": "Agochar usuarios e eliminar revisións",
 	"grant-patrol": "Patrullar os cambios feitos nas páxinas",
+	"grant-privateinfo": "Acceder a información privada",
 	"grant-protect": "Protexer e desprotexer páxinas",
 	"grant-rollback": "Reverter os cambios feitos nas páxinas",
 	"grant-sendemail": "Enviar correos electrónicos a outros usuarios",
@@ -2119,6 +2122,7 @@
 	"undeletehistorynoadmin": "Esta páxina foi borrada.\nO motivo do borrado consta no resumo que aparece a continuación, xunto cos detalles dos usuarios que editaron esta páxina antes da súa eliminación.\nO texto destas revisións eliminadas só está á disposición dos administradores.",
 	"undelete-revision": "Revisión eliminada de \"$1\" (o $4 ás $5) feita por $3:",
 	"undeleterevision-missing": "Revisión non válida ou inexistente. Pode que a ligazón conteña un erro ou que a revisión se restaurase ou eliminase do arquivo.",
+	"undeleterevision-duplicate-revid": "{{PLURAL:$1|Unha revisión non pode ser restaurada|$1 revisións non poden ser restauradas}} porque {{PLURAL:$1|o seu|os seus}}  <code>rev_id</code> xa {{PLURAL:$1|está|están}} en uso.",
 	"undelete-nodiff": "Non se atopou ningunha revisión anterior.",
 	"undeletebtn": "Restaurar",
 	"undeletelink": "ver/restaurar",
@@ -2128,7 +2132,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|Restaurouse $1 revisión|Restauráronse $1 revisións}}",
 	"undeletedrevisions-files": "Restauráronse $1 {{PLURAL:$1|revisión|revisións}} e $2 {{PLURAL:$2|ficheiro|ficheiros}}",
 	"undeletedfiles": "{{PLURAL:$1|Restaurouse $1 ficheiro|Restauráronse $1 ficheiros}}",
-	"cannotundelete": "Houbo un erro durante a restauración:\n$1",
+	"cannotundelete": "Algunhas ou todas as restauracións fallaronː\n$1",
 	"undeletedpage": "'''A páxina \"$1\" foi restaurada'''\n\nComprobe o [[Special:Log/delete|rexistro de borrados]] para ver as entradas recentes no rexistro de páxinas eliminadas e restauradas.",
 	"undelete-header": "Consulte [[Special:Log/delete|no rexistro de borrados]] as páxinas borradas recentemente.",
 	"undelete-search-title": "Procurar páxinas borradas",
@@ -2166,8 +2170,8 @@
 	"sp-contributions-newbies-sub": "Contribucións dos usuarios novos",
 	"sp-contributions-newbies-title": "Contribucións dos usuarios novos",
 	"sp-contributions-blocklog": "rexistro de bloqueos",
-	"sp-contributions-suppresslog": "contribucións borradas do usuario",
-	"sp-contributions-deleted": "contribucións borradas do usuario",
+	"sp-contributions-suppresslog": "contribucións {{GENDER:$1|do usuario|da usuaria}} suprimidas",
+	"sp-contributions-deleted": "contribucións {{GENDER:$1|do usuario|da usuaria}} borradas",
 	"sp-contributions-uploads": "cargas",
 	"sp-contributions-logs": "rexistros",
 	"sp-contributions-talk": "conversa",
diff --git a/languages/i18n/gor.json b/languages/i18n/gor.json
index b14e01a580..432338d71c 100644
--- a/languages/i18n/gor.json
+++ b/languages/i18n/gor.json
@@ -6,7 +6,8 @@
 			"Marwan Mohamad",
 			"Matma Rex",
 			"NoiX180",
-			"Zhoelyakin"
+			"Zhoelyakin",
+			"Amire80"
 		]
 	},
 	"tog-underline": "Garisiyi totibawa pranala",
@@ -737,7 +738,7 @@
 	"exif-orientation-1": "Normal",
 	"namespacesall": "nga'amila",
 	"monthsall": "nga'amila",
-	"signature": "[[{{ns:user}}:$1|$2]]\n([[{{ns:user_talk}}:$1|bisala]])",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|bisala]])",
 	"specialpages": "Halaman Spesial",
 	"tag-filter": "[[Special:Tags|Tag]]filter:",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag}}]]: $2)",
diff --git a/languages/i18n/got.json b/languages/i18n/got.json
index 090585a7cf..75ce391b7e 100644
--- a/languages/i18n/got.json
+++ b/languages/i18n/got.json
@@ -175,14 +175,14 @@
 	"nstab-user": "𐌱𐍂𐌿𐌺𐌾𐌰𐌻𐌰𐌿𐍆𐍃",
 	"nstab-special": "𐌿𐍃𐍃𐌹𐌽𐌳𐍃 𐌻𐌰𐌿𐍆𐍃",
 	"nstab-project": "𐍆𐌰𐌿𐍂𐌰𐍅𐌰𐌿𐍂𐍀𐌰𐌻𐌰𐌿𐍆𐍃",
-	"nstab-image": "𐍆𐌴𐌹𐌻𐌰",
+	"nstab-image": "𐍆𐌰𐌴𐌹𐌻",
 	"nstab-template": "𐍃𐌺𐌴𐌹𐍂𐌴𐌹𐌽𐌹𐍆𐍂𐌹𐍃𐌰𐌷𐍄𐍃",
 	"nstab-help": "𐌷𐌹𐌻𐍀𐌰𐌻𐌰𐌿𐍆𐍃",
 	"nstab-category": "𐌺𐌿𐌽𐌹",
 	"mainpage-nstab": "𐌰𐌽𐌰𐍃𐍄𐍉𐌳𐌴𐌹𐌽𐌹𐌻𐌰𐌿𐍆𐍃",
 	"error": "𐌰𐌹𐍂𐌶𐌴𐌹",
 	"databaseerror-error": "𐌰𐌹𐍂𐌶𐌴𐌹: $1",
-	"missing-article": "𐍃𐌰 𐌳𐌰𐍄𐌰𐌱𐌿𐍃 𐌽𐌹 𐌲𐌰𐌽𐌰𐌼 𐌸𐌰𐌽𐌰 𐌱𐍉𐌺𐌰𐍅𐌰𐌿𐍂𐌳𐌰𐌽 𐌴𐌹 𐌹𐍄𐌰 𐍃𐌺𐌰𐌻 𐌱𐌹𐌲𐌹𐍄𐌰𐌽: \"$1\" $2\n\n(The data base did not find the text of a page that it should have found, named \"$1\" $2.\n\nThis is usually caused by following an outdated diff or history link to a page that has been deleted.\n\nIf this is not the case, you may have found a bug in the software.\nPlease report this to an [[Special:ListUsers/sysop|administrator]], making note of the URL.)",
+	"missing-article": "𐌳𐌰𐍄𐌰𐌱𐌴𐍃 𐌽𐌹 𐌱𐌹𐌲𐌰𐍄 𐌱𐍉𐌺𐍉𐍃 𐌻𐌰𐌿𐌱𐌹𐍃 𐌸𐌹𐌶𐌴𐌹 𐍃𐌺𐌿𐌻𐌳𐌴𐌳𐌹 𐌱𐌹𐌲𐌹𐍄𐌰𐌽, 𐌷𐌰𐌹𐍄𐌰𐌽𐍃 \"$1\" $2. \n\n𐌸𐌰𐍄𐌰 𐌿𐍆𐍄𐌰 𐍅𐌰𐌹𐍂𐌸𐌹𐌸 𐌾𐌰𐌱𐌰𐌹 𐌻𐌰𐌹𐍃𐍄𐌾𐌰𐌳𐌰 𐍆𐌰𐌹𐍂𐌽𐌾𐌰 𐌳𐌹𐍆𐍆 𐌸𐌰𐌿 𐍃𐍀𐌹𐌻𐌻𐌰𐌲𐌰𐍅𐌹𐍃𐍃 𐍃𐌴𐌹 𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌹𐌳𐌰 𐌹𐍃𐍄. 𐌽𐌹𐌱𐌰𐌹 𐌹𐍃𐍄, 𐌼𐌰𐌷𐍄𐍃 𐌹𐍃𐍄 𐌴𐌹 𐌱𐌹𐌲𐌴𐍄𐌴𐌹𐍃 𐌰𐌹𐍂𐌶𐌴𐌹𐌽 𐌹𐌽 𐍃𐌰𐌿𐍆𐍄𐍅𐌰𐌹𐍂𐌰. \n\n𐌱𐌹𐌳𐌾𐌰𐌼 𐌸𐌿𐌺, 𐌼𐌴𐍂𐌴𐌹 𐌸𐌰𐍄𐌰 𐌳𐌿 [[Special:ListUsers/sysop\n|𐍂𐌴𐌹𐌺]] 𐌲𐌹𐍆𐌿𐌷 𐌲𐌰𐍅𐌹𐍃𐍃.",
 	"badtitle": "𐌿𐌽𐍂𐌰𐌹𐌷𐍄𐌰𐍄𐌰 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹",
 	"badtitletext": "𐍆𐍂𐌰𐌹𐌷𐌰𐌽𐍃 𐌻𐌰𐌿𐍆𐍃 𐍅𐌰𐍃 𐌿𐌽𐌲𐌰𐌼𐌰𐌲𐌰𐌽𐌳𐍃, 𐌻𐌰𐌿𐍃, 𐌰𐌹𐌸𐌸𐌰𐌿 𐌿𐌽𐍂𐌰𐌹𐌷𐍄𐌰𐌱𐌰 𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐍃 𐌼𐌹𐌸𐍂𐌰𐌶𐌳𐌰 𐌸𐌰𐌿 𐌼𐌹𐌸-𐍅𐌹𐌺𐌹 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹. 𐌼𐌰𐌲𐌹 𐌷𐌰𐌱𐌰𐌽 𐌰𐌹𐌽𐌰 𐌸𐌰𐌿 𐌼𐌰𐌽𐌰𐌲𐌹𐌶𐍉𐍃 𐌱𐍉𐌺𐍉𐍃 𐌱𐍂𐌿𐌺𐌹𐌳𐍉𐍃 𐌹𐌽 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌾𐌰𐌼.",
 	"viewsource": "𐍃𐌰𐌹𐍈 𐌱𐍂𐌿𐌽𐌽𐌰𐌽",
@@ -204,7 +204,7 @@
 	"logout": "𐌰𐍆𐌻𐌴𐌹𐌸",
 	"userlogout": "𐌰𐍆𐌻𐌴𐌹𐌸",
 	"userlogin-noaccount": "𐌽𐌹 𐌷𐌰𐌱𐌰𐌹𐍃 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽?",
-	"userlogin-joinproject": "𐌲𐌰𐌳𐌰𐌹𐌻𐌴𐌹 {{SITENAME}}",
+	"userlogin-joinproject": "𐌲𐌰𐌳𐌰𐌹𐌻𐌴𐌹 𐌹𐌽 𐌽𐌰𐍄𐌾𐌰𐍃𐍄𐌰𐌳𐌰 {{SITENAME}}",
 	"nologinlink": "𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
 	"createaccount": "𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
 	"gotaccount": "𐌾𐌿 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽 𐌷𐌰𐌱𐌰𐌹𐍃? $1.",
@@ -219,7 +219,7 @@
 	"createacct-benefit-heading": "{{SITENAME}} 𐍄𐌰𐍅𐌹𐌸 𐌹𐍃𐍄 𐍆𐍂𐌰𐌼 𐌼𐌰𐌽𐌽𐌰𐌼 𐍃𐍅𐌴 𐌸𐌿𐌺.",
 	"createacct-benefit-body1": "{{PLURAL:$1|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|𐌻𐌰𐌿𐍆𐍃|𐌻𐌰𐌿𐌱𐍉𐍃}}",
-	"loginlanguagelabel": "Razda: $1",
+	"loginlanguagelabel": "𐍂𐌰𐌶𐌳𐌰: $1",
 	"pt-login": "𐌰𐍄𐌲𐌰𐌲𐌲",
 	"pt-login-button": "𐌰𐍄𐌲𐌰𐌲𐌲",
 	"pt-createaccount": "𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
@@ -235,9 +235,9 @@
 	"headline_sample": "𐌿𐍆𐌰𐍂𐍃𐍄𐍂𐌹𐌺𐌰𐌱𐍉𐌺𐍉𐍃",
 	"headline_tip": "𐌷𐌰𐌿𐌷𐌹𐌸𐌰 •𐌱• 𐌿𐍆𐌰𐍂𐍃𐍄𐍂𐌹𐌺𐍃",
 	"nowiki_sample": "𐍃𐌰𐍄𐌴𐌹 𐌱𐍉𐌺𐍉𐍃 𐌹𐌽𐌿𐌷 𐌲𐌰𐍂𐍅𐌹 𐌷𐌴𐍂",
-	"nowiki_tip": "𐌿𐌽𐍅𐌹𐍄𐌾𐌹𐍃 𐍅𐌹𐌺𐌹𐍃𐌽𐌴𐌹𐌸𐌾𐌰𐌽𐌳𐍃",
-	"image_tip": "𐌹𐌽𐌽𐌱𐍉𐌳𐌰𐌽𐍃 𐍆𐌴𐌹𐌻𐌰",
-	"media_tip": "𐍄𐌰𐌹𐌺𐌾𐌰𐌱𐌰𐌽𐌳𐌾𐌹𐍃 𐍆𐌴𐌹𐌻𐌰𐌽𐌹𐍃",
+	"nowiki_tip": "𐌽𐌹 𐌱𐍂𐌿𐌺𐌴𐌹 𐍅𐌹𐌺𐌹-𐍆𐌰𐌿𐍂𐌼𐌰𐍄𐌴𐌹𐌽𐌰𐌹𐍃",
+	"image_tip": "\n𐌹𐌽𐌱𐌰𐌳𐌹𐌸 𐍆𐌰𐌴𐌹𐌻",
+	"media_tip": "𐌲𐌰𐍅𐌹𐍃𐍃 𐌳𐌿 𐍆𐌰𐌴𐌹𐌻𐌰",
 	"sig_tip": "𐌸𐌴𐌹𐌽𐌰 𐌿𐍆𐌼𐌴𐌻𐌴𐌹𐌽𐍃 𐌼𐌹𐌸 𐌲𐌻𐌰𐌲𐌲𐍅𐌰𐌼𐌼𐌰 𐌼𐌴𐌻𐌰",
 	"hr_tip": "𐍂𐌰𐌹𐌷𐍄𐍃 𐍃𐍄𐍂𐌹𐌺𐍃 (𐌽𐌹 𐌱𐍂𐌿𐌺𐌴𐌹 𐌿𐍆𐌰𐍂𐍆𐌹𐌻𐌿)",
 	"summary": "𐌼𐌰𐌿𐍂𐌲𐌿𐍃 𐍃𐌺𐌴𐌹𐍂𐌴𐌹𐌽𐍃:",
@@ -272,17 +272,17 @@
 	"currentrev-asof": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐌰 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃 𐍆𐍂𐌰𐌼 $1",
 	"revisionasof": "𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃 𐍆𐍂𐌰𐌼 $1",
 	"revision-info": "𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃 𐌹𐌽 $1 𐍆𐍂𐌰𐌼 {{GENDER:$6|$2}}$7",
-	"previousrevision": "←𐌰𐌹𐍂𐌹𐍃 𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃",
-	"nextrevision": "Iftuma máideins→",
-	"currentrevisionlink": "𐌽𐌿𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃",
+	"previousrevision": "← 𐌰𐌹𐍂𐌹𐌶𐌴𐌹 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃",
+	"nextrevision": "𐌽𐌹𐌿𐌾𐌹𐌶𐌴𐌹 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃 →",
+	"currentrevisionlink": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐌰 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃",
 	"cur": "𐌽𐌿",
 	"next": "𐌹𐍆𐍄𐌿𐌼𐌰",
 	"last": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍃",
-	"page_first": "frumists",
+	"page_first": "𐍆𐍂𐌿𐌼𐌹𐍃𐍄𐍃",
 	"page_last": "𐍃𐍀𐌴𐌳𐌿𐌼𐌹𐍃𐍄𐍃",
 	"histfirst": "𐌰𐌻𐌸𐌹𐌶𐍉",
 	"histlast": "𐌽𐌹𐌿𐌾𐌹𐍃𐍄𐍉",
-	"history-feed-item-nocomment": "$1 at $2",
+	"history-feed-item-nocomment": "$1 𐌰𐍄 $2",
 	"rev-delundel": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹 𐌰𐌽𐌰𐍃𐌹𐌿𐌽",
 	"revdel-restore": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹 𐌰𐌽𐌰𐍃𐌹𐌿𐌽",
 	"revertmerge": "𐌿𐌽𐌲𐌰𐍄𐌹𐌻𐍉𐍃",
@@ -295,15 +295,15 @@
 	"searchresults-title": "𐍃𐍉𐌺𐌴𐌹𐌽𐌰𐌹𐍃 𐍄𐍉𐌾𐌰 𐍆𐌰𐌿𐍂 \"$1\"",
 	"prevn": "𐌰𐍆𐍄𐌿𐌼𐌰 {{PLURAL:$1|$1}}",
 	"nextn": "𐌹𐍆𐍄𐌿𐌼𐌰 {{PLURAL:$1|$1}}",
-	"prevn-title": "𐍆𐌰𐌹𐍂𐌽𐌰 $1 {{PLURAL:$1|𐍄𐌰𐌿𐌹|𐍄𐌰𐌿𐌾𐍉𐍃}}",
-	"nextn-title": "𐌰𐍆𐍄𐌿𐌼𐌰 $1 {{PLURAL:$1|𐍄𐌰𐌿𐌹|𐍄𐌰𐌿𐌾𐍉𐍃}}",
+	"prevn-title": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄(𐌰) $1 {{PLURAL:$1|𐍄𐌰𐌿𐌹|𐍄𐍉𐌾𐌰}}",
+	"nextn-title": "𐌰𐍆𐍄𐌿𐌼(𐌰) $1 {{PLURAL:$1|𐍄𐌰𐌿𐌹|𐍄𐍉𐌾𐌰}}",
 	"shown-title": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 $1 {{PLURAL:$1|𐍄𐌰𐌿𐌹|𐍄𐍉𐌾𐌰}} 𐍈𐌰𐍂𐌾𐌰𐌼𐌼𐌴𐌷 𐌻𐌰𐌿𐌱𐌰.",
 	"viewprevnext": "𐍃𐌹𐌿𐌽𐌴𐌹𐍃 ($1 {{int:pipe-separator}} $2) ($3)",
 	"searchmenu-new": "<strong>𐍃𐌺𐌰𐍀𐌴𐌹 𐌻𐌰𐌿𐍆 \"[[:$1]]\" 𐌰𐌽𐌰 𐌸𐌹𐌶𐌰𐌹 𐍅𐌹𐌺𐌹!</strong> {{{{PLURAL:$2|0=|𐍃𐌰𐌹 𐌾𐌰𐌷 𐌻𐌰𐌿𐍆 𐌱𐌹𐌲𐌹𐍄𐌰𐌽𐌰 𐌸𐌴𐌹𐌽𐌰𐌹 𐍃𐍉𐌺𐌴𐌹𐌽𐌰𐌹.|𐍃𐌰𐌹 𐌾𐌰𐌷 𐍄𐍉𐌾𐌰 𐍃𐍉𐌺𐌴𐌹𐌽𐌰𐌹𐍃 𐌱𐌹𐌲𐌹𐍄𐌰𐌽𐌰.}}",
 	"searchprofile-articles": "𐌷𐌰𐌱𐌰𐌽𐌳𐌰𐌽𐍃 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"searchprofile-images": "𐌼𐌰𐌽𐌰𐌲𐌼𐌴𐌳𐌾𐌰",
 	"searchprofile-everything": "𐌰𐌻𐌻",
-	"searchprofile-advanced": "𐍆𐌰𐌹𐍂𐍂𐌰𐍆𐍂𐌰𐌼𐌰",
+	"searchprofile-advanced": "𐌼𐌰𐌽𐌰𐌲𐍆𐌰𐌻𐌸",
 	"searchprofile-articles-tooltip": "𐍃𐍉𐌺𐌴𐌹 𐌹𐌽 $1",
 	"searchprofile-images-tooltip": "𐍃𐍉𐌺𐌾𐌹𐍃 𐍆𐌴𐌹𐌻𐌰𐌽𐍃",
 	"searchprofile-everything-tooltip": "𐍃𐍉𐌺𐌴𐌹 𐌰𐌻𐌻 𐌸𐌰𐍄𐌰 (𐌾𐌰𐌷 𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰𐌻𐌰𐌿𐌱𐌰𐌽𐍃)",
@@ -311,7 +311,7 @@
 	"search-result-size": "$1 ({{PLURAL:$2|•𐌰• 𐍅𐌰𐌿𐍂𐌳|•$2• 𐍅𐌰𐌿𐍂𐌳𐌰}})",
 	"search-redirect": "(𐌰𐍆𐍄𐍂𐌰𐍅𐌴𐌹𐍄𐍃 𐍆𐍂𐌰𐌼 𐌸𐌰𐌼𐌼𐌰 $1)",
 	"search-section": "(𐍆𐌴𐍂𐌰 $1)",
-	"search-suggest": "𐍄𐌰𐌹𐌺𐌽𐌹𐌳𐌰 𐌸𐌿: $1",
+	"search-suggest": "𐌲𐌰𐌼𐌰𐌽𐍄: $1",
 	"searchall": "𐌰𐌻𐌻𐍃",
 	"search-showingresults": "{{ZPLURAL:$4|𐍄𐌰𐌿𐌹 <strong>$1 𐍅𐌰𐌹𐌷𐍄𐌰𐌹𐍃 <strong>$3|𐍄𐍉𐌾𐌰 <strong>$1 - $2 𐍅𐌰𐌹𐌷𐍄𐌰𐌹𐍃 <strong>$3}}",
 	"search-nonefound": "𐌽𐌹 𐍄𐌰𐌿𐌹 𐍅𐌰𐍃 𐍃𐌰𐌼𐌰𐌽𐌰 𐍃𐍅𐌰 𐍃𐍉𐌺𐌴𐌹𐌽.",
@@ -319,13 +319,13 @@
 	"preferences": "𐌼𐌴𐌹𐌽𐍉𐍃 𐌱𐍂𐌿𐌺𐌾𐌰𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌴𐌹𐍃",
 	"mypreferences": "𐌲𐌰𐌻𐌴𐌹𐌺𐌰𐌽𐌳𐌴𐌹𐌽𐍃 𐍅𐌰𐌹𐌷𐍄𐍃",
 	"prefs-skin": "𐍆𐌹𐌻𐌻",
-	"skin-preview": "Faúrsaiƕa",
+	"skin-preview": "𐍆𐌰𐌿𐍂𐌰𐍃𐌰𐌹𐍈",
 	"saveprefs": "𐌲𐌰𐍆𐌰𐍃𐍄",
 	"searchresultshead": "𐍃𐍉𐌺𐌴𐌹",
-	"grouppage-sysop": "{{ns:project}}:𐍃𐌴𐌹𐌳𐍉𐍆𐌰𐌸𐍃",
+	"grouppage-sysop": "{{ns:project}}:𐍂𐌴𐌹𐌺𐍃",
 	"right-writeapi": "𐌱𐍂𐌿𐌺𐌴𐌹𐌽𐍃 API 𐌼𐌴𐌻𐌴𐌹𐌽𐌰𐌹𐍃",
 	"rightslog": "Niutandis stutjanlog",
-	"nchanges": "$1 {{PLURAL:$1|máidein|máideins}}",
+	"nchanges": "$1 {{PLURAL:$1|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃}}",
 	"enhancedrc-history": "𐍃𐍀𐌹𐌻𐌻",
 	"recentchanges": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
 	"recentchanges-summary": "𐌰𐍆𐌰𐍂𐌻𐌰𐌹𐍃𐍄𐌴𐌹 𐌸𐌰𐌹𐌼 𐌰𐌽𐌳𐍅𐌰𐌹𐍂𐌸𐌹𐍃𐍄𐍉𐌼 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐌼 𐌳𐌿 𐍅𐌹𐌺𐌾𐌰 𐌰𐌽𐌰 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰.",
@@ -352,7 +352,7 @@
 	"rclinks": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍉𐍃 $1 𐌹𐌽𐌼𐌰𐌹𐌳𐌹𐌽𐌹𐌽𐍃 𐌹𐌽 𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐌰𐌹𐌼 $2 𐌳𐌰𐌲𐌰𐌼 <br />$3",
 	"diff": "𐌼𐌹𐍃𐍃",
 	"hist": "𐍃𐍀𐌹𐌻𐌻",
-	"hide": "𐍆𐌹𐌻𐌷𐌰𐌽",
+	"hide": "𐌰𐍆𐍆𐌹𐌻𐌷",
 	"show": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹",
 	"minoreditletter": "l",
 	"newpageletter": "N",
@@ -369,7 +369,7 @@
 	"uploadlogpage": "Log af Ushlaþan",
 	"filedesc": "𐌼𐌰𐌿𐍂𐌲𐌿𐍃 𐍃𐌺𐌴𐌹𐍂𐌴𐌹𐌽𐍃",
 	"watchthisupload": "Witan so seido",
-	"imgfile": "Feilans",
+	"imgfile": "𐍆𐌰𐌴𐌹𐌻",
 	"listfiles": "Feilans tala",
 	"file-anchor-link": "𐍆𐌴𐌹𐌻𐌰𐌽𐍃",
 	"filehist": "𐍆𐌴𐌹𐌻𐌰𐌽𐍃 𐌰𐌹𐍂𐌹𐍃",
@@ -395,7 +395,7 @@
 	"nbytes": "$1 {{PLURAL:$1|𐌱𐌹𐍄|𐌱𐌰𐍄𐌰}}",
 	"ncategories": "$1 {{PLURAL:$1|𐌺𐌿𐌽𐌾𐌰|𐌺𐌿𐌽𐌾𐍉𐍃}}",
 	"nlinks": "$1 {{PLURAL:$1|𐌲𐌰𐍅𐌹𐍃𐍃|𐌲𐌰𐍅𐌹𐍃𐍃𐌴𐌹𐍃}}",
-	"nmembers": "$1 {{PLURAL:$1|niutand|niutanda}}",
+	"nmembers": "$1 {{PLURAL:$1|𐌲𐌰𐌳𐌰𐌹𐌻𐌰|𐌲𐌰𐌳𐌰𐌹𐌻𐌰𐌽𐍃}}",
 	"wantedpages": "𐌲𐌰𐌹𐍂𐌽𐌹𐌳𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"shortpages": "𐌼𐌰𐌿𐍂𐌲𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"longpages": "𐌻𐌰𐌲𐌲𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
@@ -420,7 +420,7 @@
 	"emailuser": "{{GENDER: 𐍃𐌰𐌽𐌳𐌴𐌹 𐌴-𐌱𐍉𐌺𐍉𐍃 𐌳𐌿 𐌸𐌰𐌼𐌼𐌰 𐌱𐍂𐌿𐌺𐌾𐌰𐌽𐌳|𐍃𐌰𐌽𐌳𐌴𐌹 𐌴-𐌱𐍉𐌺𐍉𐍃 𐌳𐌿 𐌸𐌹𐌶𐌰𐌹 𐌱𐍂𐌿𐌺𐌾𐌰𐌽𐌳𐌾𐌰𐌹}}",
 	"watchlist": "𐍅𐌹𐍄𐌰𐍅𐌹𐌺𐍉",
 	"mywatchlist": "𐌻𐌰𐌹𐍃𐍄𐌰𐌻𐌴𐌹𐍃𐍄𐌰",
-	"watch": "𐍅𐌰𐍂𐌰𐌽",
+	"watch": "𐌰𐍄𐍅𐌹𐍄",
 	"watchthispage": "𐌰𐍄𐍅𐌹𐍄 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰",
 	"unwatch": "𐌽𐌹𐍅𐌰𐍂𐌰𐌽",
 	"watchlist-details": "{{PLURAL:$1|$1 𐌻𐌰𐌿𐍆𐍃|$1 𐌻𐌰𐌿𐌱𐍉𐍃}} 𐌰𐌽𐌰 𐌸𐌴𐌹𐌽𐌰𐌹 𐍅𐌹𐍄𐌰𐍅𐌹𐌺𐍉𐌽, 𐌽𐌹 𐍃𐌿𐌽𐌳𐍂𐍉 𐍂𐌰𐌷𐌽𐌾𐌰𐌽𐌳𐌰 𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰𐌻𐌰𐌿𐌱𐍉𐍃.",
@@ -435,7 +435,7 @@
 	"deletereasonotherlist": "𐌰𐌽𐌸𐌰𐍂 𐌼𐌹𐍄𐍉𐌽𐍃",
 	"rollbacklink": "𐌰𐍆𐍅𐌰𐌻𐍅𐌴𐌹",
 	"rollbacklinkcount": "𐌰𐍆𐍅𐌰𐌻𐍅𐌴𐌹 $1 {{PLURAL:$1|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽|𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌹𐌽𐍃}}",
-	"protectlogpage": "Log af Baírgjan",
+	"protectlogpage": "𐍆𐍂𐌹𐌸𐌿𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌹𐌽𐍃",
 	"prot_1movedto2": "[[$1]] 𐌼𐌹𐌸𐍃𐌰𐍄𐌹𐌸 𐌳𐌿 [[$2]]",
 	"protect-level-sysop": "𐌰𐌽𐌳𐌻𐌴𐍄𐌹𐌸 𐌸𐌰𐍄𐌰𐌹𐌽𐌴𐌹 𐍂𐌴𐌹𐌺𐍃",
 	"protect-expiring": "𐌿𐍃𐍄𐌹𐌿𐌷𐌹𐌸 $1 (UTC)",
@@ -462,9 +462,9 @@
 	"whatlinkshere-title": "𐌻𐌰𐌿𐌱𐍉𐍃 𐌸𐌰𐌹𐌴𐌹 𐍄𐌰𐌹𐌺𐌽𐌾𐌰𐌽𐌳 𐌳𐌿 \"$1\"",
 	"whatlinkshere-page": "𐌻𐌰𐌿𐍆𐍃:",
 	"linkshere": "𐌹𐍆𐍄𐌿𐌼𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃 𐌱𐍂𐌹𐌲𐌲𐌰𐌽𐌳 𐌸𐌿𐌺  <strong>[[:$1]]</strong>:",
-	"isredirect": "𐍄𐌰𐌹𐌺𐌾𐌰𐍃𐌴𐌹𐌳𐍉",
-	"istemplate": "ináukan",
-	"whatlinkshere-prev": "{{PLURAL:$1|aftuma|aftumans $1}}",
+	"isredirect": "𐌰𐌻𐌾𐌰𐍂 𐌱𐍂𐌹𐌲𐌲𐌰𐌽𐌳𐍃 𐌻𐌰𐌿𐍆𐍃",
+	"istemplate": "𐍄𐍂𐌰𐌽𐍃𐌺𐌻𐌿𐍃𐌾𐍉",
+	"whatlinkshere-prev": "{{PLURAL:$1|𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐌰|𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐌰𐌽𐍃 $1}}",
 	"whatlinkshere-next": "{{PLURAL:$1|iftuma|iftumans $1}}",
 	"whatlinkshere-links": "← 𐌲𐌰𐍅𐌹𐍃𐍃𐌴𐌹𐍃",
 	"whatlinkshere-hidelinks": "$1 𐌲𐌰𐍅𐌹𐍃𐍃𐌴𐌹𐍃",
@@ -493,13 +493,13 @@
 	"tooltip-pt-watchlist": "𐍅𐌹𐌺𐍉 𐌻𐌰𐌿𐌱𐌴 𐌸𐌹𐌶𐌴𐌴𐌹 𐌰𐍄𐍅𐌰𐌹𐍃𐍄 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌹𐌼",
 	"tooltip-pt-mycontris": "A list of {{GENDER:|your}} 𐌱𐌹𐌰𐌿𐌺𐌰𐌹𐌽𐌴𐌹𐍃 𐌱𐍂𐌿𐌺𐌾𐌰𐌽𐌳𐌹𐍃",
 	"tooltip-pt-login": "𐍄𐌹𐌼𐍂𐌾𐌰𐌶𐌰 𐌳𐌿 𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽, 𐌹𐌸 𐌽𐌹𐍃𐍄 𐍃𐌺𐌿𐌻𐌳 𐌸𐌿𐍃",
-	"tooltip-pt-logout": "𐌻𐌴𐌹𐌸𐌰𐌽",
+	"tooltip-pt-logout": "𐌰𐍆𐌻𐌴𐌹𐌸",
 	"tooltip-pt-createaccount": "𐌱𐌰𐍄𐌹𐌶𐍉 𐌹𐍃𐍄 𐌸𐌿𐍃 𐍃𐌺𐌰𐍀𐌾𐌰𐌽 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽, 𐌹𐌸 𐍃𐌺𐌿𐌻𐌳 𐌽𐌹𐍃𐍄",
 	"tooltip-ca-talk": "𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌹 𐌱𐌹 𐌷𐌰𐌱𐌰𐌽𐌳𐌰𐌽 𐌻𐌰𐌿𐍆",
 	"tooltip-ca-edit": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆",
 	"tooltip-ca-addsection": "𐌰𐌽𐌰𐍃𐍄𐍉𐌳𐌴𐌹 𐌽𐌹𐌿𐌾𐌰 𐌳𐌰𐌹𐌻",
 	"tooltip-ca-viewsource": "𐍃𐌰 𐌻𐌰𐌿𐍆𐍃 𐌷𐌰𐌱𐌰𐌹𐌸 𐌼𐌿𐌽𐌳. 𐌼𐌰𐌲𐍄 𐌸𐌹𐍃 𐌻𐌰𐌿𐌱𐌹𐍃 𐌼𐌿𐌽𐌳 𐍃𐌰𐌹𐍈𐌰𐌽.",
-	"tooltip-ca-history": "𐌰𐍆𐍄𐌿𐌼𐍉𐍃 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍉𐍃 𐌸𐌹𐍃 𐌻𐌰𐌿𐌱𐌹𐍃",
+	"tooltip-ca-history": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍉𐍃 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍉𐍃 𐌸𐌹𐍃 𐌻𐌰𐌿𐌱𐌹𐍃",
 	"tooltip-ca-protect": "𐌱𐌰𐌹𐍂𐌲𐌰 𐌸𐍉 𐍃𐌴𐌹𐌳𐍉",
 	"tooltip-ca-delete": "𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌴𐌹 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰",
 	"tooltip-ca-move": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆",
@@ -540,7 +540,7 @@
 	"previousdiff": "← 𐍆𐌰𐌹𐍂𐌽𐌹𐌶𐌴𐌹 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃",
 	"nextdiff": "𐌽𐌹𐌿𐌾𐌹𐌶𐌴𐌹 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍃 →",
 	"file-info-size": "$1 × $2 𐍀𐌹𐌺𐍃𐌴𐌻𐌰, 𐍆𐌴𐌹𐌻𐍅𐌰𐌷𐍃𐍄𐌿𐍃: $3, 𐌼𐌹𐌼𐌴 𐌺𐌿𐌽𐌹: $4",
-	"show-big-image": "𐍆𐍂𐌿𐌼𐌹𐍃𐍄𐌰 𐌳𐌰𐍄𐌰",
+	"show-big-image": "𐍆𐍂𐌿𐌼𐌹𐍃𐍄 𐍆𐌰𐌴𐌹𐌻",
 	"show-big-image-preview": "𐌼𐌹𐌺𐌹𐌻𐌴𐌹 𐌸𐌹𐌶𐍉𐍃 𐍆𐌰𐌿𐍂𐌰𐍃𐌹𐌿𐌽𐌰𐌹𐍃: $1.",
 	"show-big-image-size": "$1 × $2 𐍆𐍂𐌹𐍃𐌰𐌷𐍄𐌹𐍃𐍄𐌰𐌱𐌴𐌹𐍃",
 	"ilsubmit": "𐍃𐍉𐌺𐌴𐌹",
diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index 84e13effa0..7f73d575e7 100644
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -995,7 +995,7 @@
 	"datedefault": "ברירת המחדל",
 	"prefs-labs": "אפשרויות מעבדה",
 	"prefs-user-pages": "דפי משתמש",
-	"prefs-personal": "פרטי המשתמש",
+	"prefs-personal": "פרטי ה{{GENDER:|משתמש|משתמשת}}",
 	"prefs-rc": "שינויים אחרונים",
 	"prefs-watchlist": "רשימת המעקב",
 	"prefs-editwatchlist": "עריכת רשימת המעקב",
@@ -1216,10 +1216,11 @@
 	"grant-group-file-interaction": "אינטראקציה עם קבצים",
 	"grant-group-watchlist-interaction": "אינטראקציה עם רשימת המעקב שלך",
 	"grant-group-email": "שליחת דוא\"ל",
-	"grant-group-high-volume": "ביצוי פעולות מרובות",
+	"grant-group-high-volume": "ביצוע פעולות מרובות",
 	"grant-group-customization": "התאמה אישית והעדפות",
 	"grant-group-administration": "ביצוע פעולות ניהול",
-	"grant-group-other": "פעילות שונה",
+	"grant-group-private-information": "גישה למידע פרטי על עצמך",
+	"grant-group-other": "פעולות שונות",
 	"grant-blockusers": "חסימת משתמשים ושחרורם",
 	"grant-createaccount": "יצירת חשבונות",
 	"grant-createeditmovepage": "יצירה, עריכה והעברה של דפים",
@@ -1233,6 +1234,7 @@
 	"grant-highvolume": "ביצוע עריכות מרובות",
 	"grant-oversight": "החבאת משתמשים והעלמת גרסאות",
 	"grant-patrol": "ניטור שינויים לדפים",
+	"grant-privateinfo": "גישה למידע פרטי",
 	"grant-protect": "הפעלת הגנה על דפים והסרתה",
 	"grant-rollback": "שחזור שינויים בדפים",
 	"grant-sendemail": "שליחת דואר אלקטרוני למשתמשים אחרים",
@@ -3351,7 +3353,7 @@
 	"tags-active-yes": "כן",
 	"tags-active-no": "לא",
 	"tags-source-extension": "הוגדר על־ידי הרחבה",
-	"tags-source-manual": "הוחל באופן ידני על־ידי משתמשים ובוטים",
+	"tags-source-manual": "מוחל באופן ידני על־ידי משתמשים ובוטים",
 	"tags-source-none": "אינו בשימוש כעת",
 	"tags-edit": "עריכה",
 	"tags-delete": "מחיקה",
diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json
index e4b81bf0ea..ef1b90a0f4 100644
--- a/languages/i18n/hr.json
+++ b/languages/i18n/hr.json
@@ -604,13 +604,13 @@
 	"blockedtext": "'''Vaše suradničko ime ili IP adresa je blokirana'''\n\nBlokirao Vas je $1.\nRazlog blokiranja je sljedeći: ''$2''.\n\n* Početak blokade: $8\n* Istek blokade: $6\n* Ime blokiranog suradnika: $7\n\nMožete kontaktirati $1 ili jednog od [[{{MediaWiki:Grouppage-sysop}}|administratora]] kako bi Vam pojasnili razlog blokiranja.\n\nPrimijetite da ne možete koristiti opciju \"Pošalji mu e-poruku\" ako niste upisali valjanu adresu e-pošte u Vašim [[Special:Preferences|suradničkim postavkama]] i ako niste u tome onemogućeni prilikom blokiranja.\n\nVaša trenutačna IP adresa je $3, a oznaka bloka #$5. Molimo navedite ovaj broj kod svakog upita vezano za razlog blokiranja.",
 	"autoblockedtext": "Vaša IP adresa automatski je blokirana zbog toga što ju je koristio drugi suradnik, kojeg je blokirao $1.\nRazlog blokiranja je sljedeći:\n\n:''$2''\n\n* Početak blokade: $8\n* Blokada istječe: $6\n* Ime blokiranog suradnika: $7\n\nMožete kontaktirati $1 ili jednog od [[{{MediaWiki:Grouppage-sysop}}|administratora]] kako bi Vam pojasnili razlog blokiranja.\n\nPrimijetite da ne možete rabiti opciju \"Pošalji mu e-poruku\" ako niste upisali valjanu adresu e-pošte u Vašim [[Special:Preferences|suradničkim postavkama]] i ako niste u tome onemogućeni prilikom blokiranja.\n\nVaša trenutačna IP adresa je $3, a oznaka bloka #$5. Molimo navedite ovaj broj kod svakog upita vezano za razlog blokiranja.",
 	"blockednoreason": "bez obrazloženja",
-	"whitelistedittext": "Za uređivanje stranice morate se $1.",
+	"whitelistedittext": "Za uređivanje stranice molimo $1.",
 	"confirmedittext": "Morate potvrditi Vašu adresu e-pošte prije nego što Vam bude omogućeno uređivanje. Molim unesite i ovjerite Vašu adresu e-pošte u [[Special:Preferences|suradničkim postavkama]].",
 	"nosuchsectiontitle": "Ne mogu pronaći odlomak",
 	"nosuchsectiontext": "Pokušali ste uređivati odlomak koji ne postoji.\nMožda je premješten ili izbrisan dok ste pregledavali stranicu.",
 	"loginreqtitle": "Nužna prijava",
 	"loginreqlink": "prijavite se",
-	"loginreqpagetext": "Morate se $1 da biste vidjeli ostale stranice.",
+	"loginreqpagetext": "Da biste vidjeli ostale stranice, molimo $1.",
 	"accmailtitle": "Lozinka poslana.",
 	"accmailtext": "Nova lozinka za [[User talk:$1|$1]] je poslana na $2.\n\nNakon prijave, lozinka za ovaj novi račun može biti promijenjena na stranici ''[[Special:ChangePassword|promijeni lozinku]]'' nakon prijave.",
 	"newarticle": "(Novo)",
@@ -1231,7 +1231,7 @@
 	"reuploaddesc": "Vratite se u obrazac za postavljanje.",
 	"upload-tryagain": "Pošalji izmijenjeni opis datoteke",
 	"uploadnologin": "Niste prijavljeni",
-	"uploadnologintext": "Za postavljanje datoteka morate biti $1.",
+	"uploadnologintext": "Da biste postavljali datoteke, molimo $1.",
 	"upload_directory_missing": "Mapa za datoteke ($1) nedostaje i webserver ju ne može napraviti.",
 	"upload_directory_read_only": "Server ne može pisati u direktorij za postavljanje ($1).",
 	"uploaderror": "Pogreška kod postavljanja",
diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json
index 9ad03b88a2..d241144047 100644
--- a/languages/i18n/hu.json
+++ b/languages/i18n/hu.json
@@ -568,13 +568,14 @@
 	"botpasswords-bad-appid": "A(z) „$1” botnév érvénytelen.",
 	"botpasswords-insert-failed": "A(z) „$1” botnév hozzáadása sikertelen. Nem lehet, hogy már hozzá lett adva?",
 	"botpasswords-created-title": "Botjelszó létrehozva",
-	"botpasswords-created-body": "Bot jelszó \"$1\" sikeresen létrehozva.",
+	"botpasswords-created-body": "\"$2\" felhasználó \"$1\" bot jelszava létrehozva.",
 	"botpasswords-updated-title": "Botjelszó frissítve",
-	"botpasswords-updated-body": "Bot jelszó \"$1\" frissítése sikerült.",
+	"botpasswords-updated-body": "\"$2\" felhasználó \"$1\" bot jelszava módosítva.",
 	"botpasswords-deleted-title": "Botjelszó törölve",
-	"botpasswords-deleted-body": "Bot jelszó \"$1\" törölve.",
+	"botpasswords-deleted-body": "\"$2\" felhasználó \"$1\" bot jelszava törölve.",
 	"botpasswords-no-provider": "A BotPasswordsSessionProvider nem áll rendelkezésre.",
 	"resetpass_forbidden": "A jelszavak nem változtathatók meg",
+	"resetpass_forbidden-reason": "A jelszavakat nem változtathatóak meg: $1",
 	"resetpass-no-info": "Be kell jelentkezned, hogy közvetlenül elérd ezt a lapot.",
 	"resetpass-submit-loggedin": "Jelszó megváltoztatása",
 	"resetpass-submit-cancel": "Mégse",
@@ -646,6 +647,7 @@
 	"minoredit": "Apró változtatás",
 	"watchthis": "A lap figyelése",
 	"savearticle": "Lap mentése",
+	"savechanges": "Módosítások mentése",
 	"publishpage": "Lap közzététele",
 	"publishchanges": "Változtatások közzététele",
 	"preview": "Előnézet",
diff --git a/languages/i18n/ilo.json b/languages/i18n/ilo.json
index 8d570eccf9..0cca8aaaf9 100644
--- a/languages/i18n/ilo.json
+++ b/languages/i18n/ilo.json
@@ -27,6 +27,7 @@
 	"tog-watchdefault": "Agnayon kadagiti panid ken papeles nga inurnosko iti listaan ti bambantayak",
 	"tog-watchmoves": "Agnayon kadagiti panid ken papeles nga inyalisko iti listaan ti bambantayak",
 	"tog-watchdeletion": "Agnayon kadagiti panid ken papeles nga inikkatko iti listaan ti bambantayak",
+	"tog-watchuploads": "Inayon dagiti baro a papeles iti bambantayak",
 	"tog-watchrollback": "Agnayon kadagiti panid nga adda inramidko nga insubli iti bambantayak",
 	"tog-minordefault": "Markaan amin dagiti inurnos a kas bassit babaen ti kasisigud",
 	"tog-previewontop": "Ipakita ti panagipadas sakbay ti pagurnosan a kahon",
@@ -51,7 +52,7 @@
 	"tog-ccmeonemails": "Patulodandak kadagiti kopia ti esurat nga ipatulodko kadagiti sabali nga agar-aramat",
 	"tog-diffonly": "Saan nga iparang ti linaon ti panid dita baba dagiti pagiddiatan",
 	"tog-showhiddencats": "Ipakita dagiti nailemmeng a kategoria",
-	"tog-norollbackdiff": "Laksiden ti paggiddiatan kalpasan ti panagaramid ti panagisubli",
+	"tog-norollbackdiff": "Saan nga ipakita ti paggiddiatan kalpasan ti panagaramid ti panagisubli",
 	"tog-useeditwarning": "Pakaunaannak no pumanawak iti maysa pagurnosan a panid nga addaan iti saan a naidulin a sinuksukatan",
 	"tog-prefershttps": "Kankanayon nga agusar ti natalged a koneksion no nakastrek",
 	"underline-always": "Kanayon",
@@ -404,6 +405,7 @@
 	"password-change-forbidden": "Saanmo a mabaliwan dagiti kontrasenias iti daytoy a wiki.",
 	"externaldberror": "Mabalin nga adda biddut iti pannakapasingked ti database wenno saanka a mapalubosan a mangpabaro ti akinruar a pakabilangam.",
 	"login": "Sumrek",
+	"login-security": "Pasingkedan ti identidadmo",
 	"nav-login-createaccount": "Sumrek / agpartuat iti pakabilangan",
 	"userlogin": "Sumrek / agpartuat iti pakabilangan",
 	"userloginnocreate": "Sumrek",
@@ -421,18 +423,23 @@
 	"userlogin-resetpassword-link": "Nalipatam ti kontraseniasmo?",
 	"userlogin-helplink2": "Tulong iti panagserrek",
 	"userlogin-loggedin": "Nakastrekkan a kas ni {{GENDER:$1|$1}}.\nUsaren ti porma dita baba tapno sumrek a kas sabali nga agar-aramat.",
+	"userlogin-reauth": "Nasken a sumrekka manen tapno mapasingkedan a sika ni {{GENDER:$1|$1}}.",
 	"userlogin-createanother": "Agpartuat iti sabali a pakabilangan",
 	"createacct-emailrequired": "Esurat a pagtaengan",
 	"createacct-emailoptional": "Esurat a pagtaengan (pagpilian)",
 	"createacct-email-ph": "Ikabil ti esurat a pagtaengam",
 	"createacct-another-email-ph": "Ikabil ti esurat a pagtaengan",
 	"createaccountmail": "Agusar iti pugto a temporario a kontrasenias ken ipatulod iti naisangayan nga esurat a pagtaengan",
+	"createaccountmail-help": "Mabalin a mausar a panagpartuat ti pakabilangan para iti sabali a tao a saan a makaammo iti kontrasenias.",
 	"createacct-realname": "Pudno a nagan (pagpilian)",
 	"createaccountreason": "Rason:",
 	"createacct-reason": "Rason",
 	"createacct-reason-ph": "Apay nga agparpartuatka manen iti sabali a pakabilangan",
+	"createacct-reason-help": "Ti mensahe a naipakita iti listaan iti panagpartuat ti pakabilangan",
 	"createacct-submit": "Partuatem ti pakabilangam",
 	"createacct-another-submit": "Agpartuat iti pakabilangan",
+	"createacct-continue-submit": "Agtuloy iti panagpartuat ti pakabilangan",
+	"createacct-another-continue-submit": "Agtuloy iti panagpartuat ti pakabilangan",
 	"createacct-benefit-heading": "Ti {{SITENAME}} ket inar-aramid babaen ti tattao a kasla kenka.",
 	"createacct-benefit-body1": "{{PLURAL:$1|nga inurnos|nga inur-urnos}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|a panid|a pampanid}}",
@@ -446,6 +453,7 @@
 	"nocookiesnew": "Napartuaten ti pakabilangan ti agar-aramat, ngem saanka a nakastrek.\nTi {{SITENAME}} ket agus-usar kadagiti galietas tapno maiserrek dagiti agar-aramat.\nNabaldado dagiti galietam.\nPangngaasi a pakabaelam ida, ken sumrekka nga agusar iti baro a naganmo ken kontrasenias.",
 	"nocookieslogin": "Ti {{SITENAME}} ket agus-usar kadagiti galietas tapno maiserrek dagiti agar-aramat.\nNabaldado dagiti galietam.\nPangngaasi a pakabaelam ida ken padasem manen ti sumrek.",
 	"nocookiesfornew": "Ti pakabilangan ti agar-aramat ket saan a napartuat, saanmi a mapasingkedan ti taudanna.\nSiguraduem a napakabaelan dagita galietam, ikarga manen daytoy a panid ken padasen manen.",
+	"createacct-loginerror": "Balligi ti pannakapartuat ti pakabilangan ngem saanka a mabalin nga automatiko a maiserrek. Pangngaasi a mapan iti [[Special:UserLogin|manual a panagserrek]].",
 	"noname": "Saanmo a nainaganan ti umisu a nagan ti agar-aramat.",
 	"loginsuccesstitle": "Nakastrek",
 	"loginsuccess": "<strong>Nakastrekkan iti {{SITENAME}} a kas ni \"$1\".</strong>",
@@ -466,7 +474,7 @@
 	"noemail": "Awan ti esurat a pagtaengan a nairehistro para kenni agar-aramat \"$1\".",
 	"noemailcreate": "Nasken a mangitedka ti pudno nga esurat a pagtaengan.",
 	"passwordsent": "Naipatuloden ti baro a kontrasenias iti esurat a pagtaengan a nairehistro kenni \"$1\".\nPangngaasi a sumrekka manen kalpasan ti pannakaawatmo.",
-	"blocked-mailpassword": "Ti IP a pagtaengam ket naserraan manipud iti panagurnos, ken isu a saan a mapalubosan nga agusar ti annong ti panagipulang ti kontrasenias tapno mapawilan ti panagabuso.",
+	"blocked-mailpassword": "Ti adresmo ti IP ket naserraan manipud iti panagurnos. Tapno mapawilan ti panagabuso, saan a maipalubos ti agusar ti panagipulang ti kontrasenias manipud iti daytoy nga adres ti IP.",
 	"eauthentsent": "Naipatuloden ti pammatalged nga esurat iti naikeddeng nga esurat a pagtaengan.\nSakbay a maipatulod ti ania man nga esurat iti pakabilangan, masapul a surotem dagiti maibagbaga iti esurat, tapno mapatalgedan ti pakabilangan ket agpayso a kukuam.",
 	"throttled-mailpassword": "Ti panangisaad manen ti kontrasenias ket naipatuloden, iti kaunegan ti napalabas  {{PLURAL:$1|nga oras|a $1 nga or-oras}}.\nTapno maipawilan ti panagabuso, maysa laeng a panangisaad manen ti kontrasenias ti maipatulod iti tunggal {{PLURAL:$1|maysa nga oras|$1 nga or-oras}}.",
 	"mailerror": "Biddut iti panangipatulod ti surat: $1",
@@ -490,6 +498,7 @@
 	"createacct-another-realname-tip": "Saan a nasken ti pudno a nagan.\nNo kayatmo nga ited, mausarto daytoy para iti panangited ti pammadayaw para kadagiti obrada.",
 	"pt-login": "Sumrek",
 	"pt-login-button": "Sumrek",
+	"pt-login-continue-button": "Agtuloy a sumrek",
 	"pt-createaccount": "Agpartuat iti pakabilangan",
 	"pt-userlogout": "Rummuar",
 	"php-mail-error-unknown": "Di ammo a biddut iti surat ti annong ti PHP().",
@@ -536,6 +545,7 @@
 	"botpasswords-invalid-name": "Ti naibaga a nagan ti agar-aramat ket saan nga aglaon iti panangisina ti kontrasenias ti bot (\"$1\").",
 	"botpasswords-not-exist": "Ti agar-aramat \"$1\" ket awanan iti kontrasenias ti bot nga agnagan iti \"$2\".",
 	"resetpass_forbidden": "Saan a masukatan dagiti kontrasenias",
+	"resetpass_forbidden-reason": "Saan a mabaliwan ti kontrasenias: $1",
 	"resetpass-no-info": "Masapul a nakastrekka tapno dagus a makapanka iti daytoy a panid.",
 	"resetpass-submit-loggedin": "Sukatan ti kontrasenias",
 	"resetpass-submit-cancel": "Ukasen",
@@ -563,6 +573,13 @@
 	"passwordreset-emailelement": "Nagan ti agar-aramat: \n$1\n\nTemporario a kontrasenias: \n$2",
 	"passwordreset-emailsentemail": "No daytoy nga adres ti esurat ket mainaig iti pakabilangam, maipatulodto ti maysa nga esurat iti panangisaad manen ti kontrasenias.",
 	"passwordreset-emailsentusername": "No adda adres ti esurat a mainaig iti daytoy a nagan ti agar-aramat, addanto maipatulod nga esurat iti panangisaad manen ti kontrasenia.",
+	"passwordreset-emailsent-capture2": "Naipatulodan {{PLURAL:$1|ti esurat|dagiti esurat}} ti panangisaad manen ti kontrasenias. Ti {{PLURAL:$1|nagan ti agar-aramat ken kontrasenias|listaan dagiti nagan ti agar-aramat ken dagiti kontrasenias}} ket naipakita dita baba.",
+	"passwordreset-emailerror-capture2": "Napaay ti panangitulod ti usurat iti {{GENDER:$2|agar-aramat}}: $1 Ti {{PLURAL:$3|nagan ti agar-aramat ken kontrasenias|listaan dagiti agar-aramat ken dagiti kontrasenias}} ket naipakita dita baba.",
+	"passwordreset-nocaller": "Nasken a maited ti maysa nga agtawtawag",
+	"passwordreset-nosuchcaller": "Awan ti agtawtawag: $1",
+	"passwordreset-ignored": "Saan a natengngel ti panangisaad manen ti kontrasenias. Mabalin a saan a nakompigura ti mangited?",
+	"passwordreset-invalideamil": "Imbalido nga adres ti esurat",
+	"passwordreset-nodata": "Saan a naited ti nagan ti agar-aramat wenno maysa nga adres ti esurat",
 	"changeemail": "Sukatan wenno ikkaten ti adres ti esurat",
 	"changeemail-header": "Kompletuen daytoy a porma tapno masukatan ti adres ti esuratmo. No kayatmo a maikkat ti pannakainaig iti ania man nga adres ti esurat manipud iti pakabilangam, ibati a blanko ti baro nga adres ti esurat no ited ti porma.",
 	"changeemail-no-info": "Masapul a nakastrekka tapno dagus a makapan iti ditoy a panid.",
@@ -603,6 +620,9 @@
 	"minoredit": "Daytoy ket bassit a panagurnos",
 	"watchthis": "Bantayan daytoy a panid",
 	"savearticle": "Idulin ti panid",
+	"savechanges": "Idulin dagiti binaliwan",
+	"publishpage": "Ipablaak ti panid",
+	"publishchanges": "Ipablaak dagiti binaliwan",
 	"preview": "Ipadas",
 	"showpreview": "Ipakita ti ipadas",
 	"showdiff": "Ipakita dagiti sinukatan",
@@ -638,7 +658,7 @@
 	"userpage-userdoesnotexist": "Ti pakabilangan ti agar-aramat ni \"$1\" ket saan a nakarehistro. \nPangngaasi a kitaem no kayatmo ti agpartuat/agurnos iti daytoy a panid.",
 	"userpage-userdoesnotexist-view": "Ti pakabilangan ti agar-aramat ni \"$1\" ket saan a nakarehistro.",
 	"blocked-notice-logextract": "Agdama a naserraan daytoy nga agar-aramat.\nTi naudi a listaan ti pannakaserra ket naited dita baba para iti reperensia:",
-	"clearyourcache": "<strong>Nota:</strong> Kalpasan ti panangidulin, koma ket masapul nga ipalabas ti cahe ti pagbasabasam tapno makita dagiti sinukatam.\n* <strong>Firefox / Safari:</strong>  Tenglen ti <em>Shift</em> bayat a pinduten ti <em>Reload</em>, wenno talmegan ti <em>Ctrl-F5</em> wenno <em>Ctrl-R</em> (<em>⌘-R</em> iti Mac)\n* <strong>Google Chrome:</strong> Talmegan ti <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> iti Mac)\n* <strong>Internet Explorer:</strong> Tenglen ti <em>Ctrl</em> bayat a pinduten ti <em>Refresh</em>, wenno talmegan ti <em>Ctrl-F5</em>\n* <strong>Opera:</strong> Dalusan ti cache idiay <em>Tools → Preferences</em>",
+	"clearyourcache": "<strong>Nota:</strong> Kalpasan ti panangidulin, koma ket masapul nga ipalabas ti cahe ti pagbasabasam tapno makita dagiti sinukatam.\n* <strong>Firefox / Safari:</strong>  Tenglen ti <em>Shift</em> bayat a pinduten ti <em>Reload</em>, wenno talmegan ti <em>Ctrl-F5</em> wenno <em>Ctrl-R</em> (<em>⌘-R</em> iti Mac)\n* <strong>Google Chrome:</strong> Talmegan ti <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> iti Mac)\n* <strong>Internet Explorer:</strong> Tenglen ti <em>Ctrl</em> bayat a pinduten ti <em>Refresh</em>, wenno talmegan ti <em>Ctrl-F5</em>\n* <strong>Opera:</strong> Mapan iti <em>Menu → Settings</em> (<em>Opera → Preferences</em> iti Mac) ken kalpasanna iti <em>Privacy & security → Clear browsing data → Cached images and files</em>.",
 	"usercssyoucanpreview": "<strong>Paammo:</strong>  Usaren ti buton ti \"{{int:showpreview}}\" tapno masubokan ti baro a CSS sakbay nga agidulin.",
 	"userjsyoucanpreview": "<strong>Pammo:</strong> Usaren ti buton ti \"{{int:showpreview}}\" tapno masubokan ti baro a JavaScript sakbay nga agidulin.",
 	"usercsspreview": "<strong>Laglagipem nga ipadpadasmo laeng ti bukodmo a CSS ti agar-aramat.\nSaan pay a naidulin!</strong>",
@@ -714,6 +734,8 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Awan linaon a banag",
 	"content-json-empty-array": "Awan linaon a rimpuok",
+	"deprecated-self-close-category": "Pampanid nga agus-usar kadagiti imbalido a bukod nga agrikrikep nga etiketa ti HTML",
+	"deprecated-self-close-category-desc": "Ti panid ket aglaon kadagiti imbalido a bukod nga agrikrikep nga etiketa ti HTML, a kas ti <code>&lt;b/></code> wenno <code>&lt;span/></code>.  Agbaliwton ti panagkukua dagitoy tapno maitunos iti espesipikasion ti HTML5, isu a nasukatanen ti usarda iti wikitext.",
 	"duplicate-args-warning": "<strong>Ballaag:</strong> Tawtawagan ti [[:$1]] ti [[:$2]] iti ad-adu ngem maysa a pateg para iti parametro \"$3\". Mausarto laeng ti naudi a naited a pateg.",
 	"duplicate-args-category": "Pampanid nga agus-usar kadagiti duplikado nga argumento kadagiti panagtawag ti plantilia",
 	"duplicate-args-category-desc": "Ti panid ket aglaon kadagiti panagtawag ti plantilia nga agus-usar kadagiti duplikado dagiti argumento, a kas ti <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> wenno <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
@@ -1153,9 +1175,10 @@
 	"right-override-export-depth": "Agipan kadagiti panid a mairaman dagiti naisilpo a panid agingana iti kauneg ti 5",
 	"right-sendemail": "Agipatulod iti esurat kadagiti sabali nga agar-aramat",
 	"right-passwordreset": "Agkita kadagiti esurat ti panangisaad manen ti kontrasenias",
-	"right-managechangetags": "Agpartuat ken agikkat kadagiti [[Special:Tags|etiketa]] manipud iti database",
+	"right-managechangetags": "Agpartuat ken (de)aktibuen [[Special:Tags|etiketa]]",
 	"right-applychangetags": "Ipakat dagiti [[Special:Tags|etiketa]] a mairaman dagiti nabaliwan",
 	"right-changetags": "Agnayon ken agikkat kadagiti arbitario nga [[Special:Tags|etiketa]] kadagiti agmaymaysa a rebision ken dagiti naikabkabil iti listaan",
+	"right-deletechangetags": "Ikkaten dagiti [[Special:Tags|etiketa]] manipud iti database",
 	"grant-generic": "Raay ti karbengan ti \"$1\"",
 	"grant-group-page-interaction": "Makitignay kadagiti panid",
 	"grant-group-file-interaction": "Makitignay iti midia",
@@ -1164,6 +1187,7 @@
 	"grant-group-high-volume": "Agaramid iti adu iti tomo nga aktibidad",
 	"grant-group-customization": "Kustomisasion ken dagiti kakaykayatan",
 	"grant-group-administration": "Agaramid kadagiti administratibo nga aksion",
+	"grant-group-private-information": "Serrekan ti pribado a datos a maipanggep kenka",
 	"grant-group-other": "Nadumaduma nga aktibidad",
 	"grant-blockusers": "Serraan ken ikkaten ti serra dagiti agar-aramat",
 	"grant-createaccount": "Agpartuat kadagiti pakabilangan",
@@ -1178,6 +1202,7 @@
 	"grant-highvolume": "Adu a tomo a panagurnos",
 	"grant-oversight": "Ilemmeng dagiti agar-aramat ken lappedan dagiti rebision",
 	"grant-patrol": "Patruliaan dagiti panagbaliw kadagiti panid",
+	"grant-privateinfo": "Serrekan ti pribado a pakaammo",
 	"grant-protect": "Salakniban ken ikkaten ti salaknib dagiti panid",
 	"grant-rollback": "Isubli dagiti panagbaliw kadagiti panid",
 	"grant-sendemail": "Agipatulod iti esurat kadagiti sabali nga agar-aramat",
@@ -1192,8 +1217,8 @@
 	"rightslogtext": "Daytoy ket listaan dagiti sinukatan a karbengan ti agar-aramat.",
 	"action-read": "agbasa iti datoy a panid",
 	"action-edit": "agurnos iti daytoy a panid",
-	"action-createpage": "agpartuat kadagiti panid",
-	"action-createtalk": "agpartuat kadagiti pagtungtungan a panid",
+	"action-createpage": "partuaten daytoy a panid",
+	"action-createtalk": "partuaten daytoy a pagtungtungan a panid",
 	"action-createaccount": "agpartuat iti pakabilangan daytoy nga agar-aramat",
 	"action-autocreateaccount": "automatiko a partuaten daytoy nga akinruar a pakabilangan ti agar-aramat",
 	"action-history": "agkita iti pakasaritaan iti daytoy a panid",
@@ -1233,9 +1258,11 @@
 	"action-viewmyprivateinfo": "agkita iti bukodmo a pribado a pakaammo",
 	"action-editmyprivateinfo": "agurnos iti bukodmo a pribado a pakaammo",
 	"action-editcontentmodel": "urnosen ti modelo ti linaon iti panid",
-	"action-managechangetags": "agpartuat ken agikkat kadagiti etiketa manipud iti database",
+	"action-managechangetags": "agpartuat ken (de)aktibuen kadagiti etiketa",
 	"action-applychangetags": "ipakat dagiti etiketa a mairaman dagiti nabaliwan",
 	"action-changetags": "agnayon ken agikkat kadagiti arbitario nga etiketa kadagiti agmaymaysa a rebision ken dagiti naikabkabil iti listaan",
+	"action-deletechangetags": "ikkaten dagiti etiketa manipud iti database",
+	"action-purge": "purgaen daytoy a panid",
 	"nchanges": "$1 {{PLURAL:$1|sinukatan|dagiti sinukatan}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|manipud iti naudi a panagsarungkar}}",
 	"enhancedrc-history": "pakasaritaan",
@@ -1299,9 +1326,9 @@
 	"recentchangeslinked-page": "Nagan ti panid:",
 	"recentchangeslinked-to": "Ipakita dagiti sinukatan kadagiti panid nga imbes a naisilpo iti naited a panid",
 	"recentchanges-page-added-to-category": "nainayon ti [[:$1]] iti kategoria",
-	"recentchanges-page-added-to-category-bundled": "nainayon ti [[:$1]] ken [[Special:WhatLinksHere/$1|{{PLURAL:$2|maysa a panid|$2 a pampanid}}]] iti kategoria",
+	"recentchanges-page-added-to-category-bundled": "Nainayon ti [[:$1]] iti kategoria ken [[Special:WhatLinksHere/$1|daytoy a panid ket nairaman iti kaunegan dagiti sabali a panid]]",
 	"recentchanges-page-removed-from-category": "naikkat ti [[:$1]] manipud iti kategoria",
-	"recentchanges-page-removed-from-category-bundled": "Naikkat ti [[:$1]] ken {{PLURAL:$2|maysa a panid|$2 a pampanid}} manipud iti kategoria",
+	"recentchanges-page-removed-from-category-bundled": "Naikkat ti [[:$1]] manipud iti kategoria ken, [[Special:WhatLinksHere/$1|daytoy a panid ket nairaman iti kaunegan dagiti sabali a panid]]",
 	"autochange-username": "Automatiko a panagbaliw iti MediaWiki",
 	"upload": "Agikarga iti papeles",
 	"uploadbtn": "Agikarga iti papeles",
@@ -1380,6 +1407,8 @@
 	"uploaded-setting-event-handler-svg": "Naserraan ti panangisaad ti kadagiti gupit ti panagtengngel ti pasamak, nakabiruk iti <code>&lt;$1 $2=\"$3\"&gt;</code> iti naikarga a papeles ti SVG.",
 	"uploaded-setting-href-svg": "Ti panagusar ti etiketa ti \"set\" tapno mainayon ti gupit ti \"href\" iti elemento ti nagannak ket naserraan.",
 	"uploaded-wrong-setting-svg": "Ti panagusar ti etiketa ti \"set\" tapno mainayon ti puntaan nga remote/data/script iti ania man a gupit ket naserraan. Nabirukan ti <code>&lt;set to=\"$1\"&gt;</code> iti naikarga a papeles ti SVG.",
+	"uploaded-setting-handler-svg": "Naserraan ti SVG a nangisaad ti gupit ti \"handler\" nga addaan iti remote/data/script. Nabirukan ti <code>$1=\"$2\"</code> iti naikarga a papeles ti SVG.",
+	"uploaded-remote-url-svg": "Naserraan ti SVG a nangisaad ti gupit iti ania man nga estilo nga addaan iti remote nga URL. Nabirukan ti <code>$1=\"$2\"</code> iti naikarga a papeles ti SVG.",
 	"uploaded-image-filter-svg": "Nakabiruk ti sagat ti ladawan nga addaan iti URL: <code>&lt;$1 $2=\"$3\"&gt;</code> iti naikarga a papeles ti SVG.",
 	"uploadscriptednamespace": "Daytoy a papeles ti SVG ket aglaon iti maysa a saan a mabalin a nagan ti espasio ti \"$1\".",
 	"uploadinvalidxml": "Ti XML iti naikarga a papeles ket saan a maiwaswas.",
@@ -1394,6 +1423,7 @@
 	"upload-options": "Dagiti pagpilian ti panagikarga",
 	"watchthisupload": "Bantayan daytoy a papeles",
 	"filewasdeleted": "Ti papeles iti daytoy a nagan ket dati a naikarga ken kanungpalan a naikkat.\nNasken a kitaem ti $1 sakbay nga agtuloy a mangikarga manen.",
+	"filename-thumb-name": "Daytoy ket kasla titulo ti bassit a ladawan. Pangngaasi a saan nga agikarga kadagiti bassit a ladawan iti agpada a wiki. Wenno saan, pangngaasi a simpaen ti nagan ti papeles tapno makaibuksilan, ken awan ti pasakbay ti bassit a ladawan.",
 	"filename-bad-prefix": "Ti nagan ti papeles nga ikarkargam ket mangrugi iti <strong>\"$1\"</strong>,  ken saan a deskriptibo a nagan a kadawyan nga automatiko nga ited babaen dagiti digital a kamera.\nPangngaasi nga agpili ti nasaysayaat a deskriptibo a nagan ti papelesmo.",
 	"upload-proto-error": "Saan a husto a protokol",
 	"upload-proto-error-text": "Ti adayo a panagikarga ket makasapul kadagiti URL a mangrugi iti <code>http://</code> wenno <code>ftp://</code>.",
@@ -1404,6 +1434,9 @@
 	"upload-too-many-redirects": "Ti URL ket naglaon kadagiti adu unay a baw-ing",
 	"upload-http-error": "Adda napasamak a biddut ti HTTP: $1",
 	"upload-copy-upload-invalid-domain": "Dagiti kopia a panagikarga ket saan a magun-od manipud iti daytoy a dominio.",
+	"upload-foreign-cant-upload": "Daytoy a wiki ket saan a nakompigura a mangikarga kadagiti papeles iti kiniddaw a ganganaet a repositorio ti papeles.",
+	"upload-foreign-cant-load-config": "Napaay a nangikarga ti kompigurasion para kadagiti panangikarga ti papeles iti ganganaet a repositorio ti papeles.",
+	"upload-dialog-disabled": "Nabaldado iti daytoy a wiki dagiti panangikarga ti papeles iti daytoy a dialogo.",
 	"upload-dialog-title": "Agikarga iti papeles",
 	"upload-dialog-button-cancel": "Ukasen",
 	"upload-dialog-button-done": "Nalpasen",
@@ -1411,13 +1444,20 @@
 	"upload-dialog-button-upload": "Agikarga",
 	"upload-form-label-infoform-title": "Dagiti salaysay",
 	"upload-form-label-infoform-name": "Nagan",
+	"upload-form-label-infoform-name-tooltip": "Ti naisangayan a deskriptibo a titulo para iti papeles, nga agserbinto a kas ti nagan ti papeles. Mabalinmo ti agusar ti naranas a pagsasao nga agraman kadagiti baetan. Saan nga iraman ti pagpaatiddog ti papeles.",
 	"upload-form-label-infoform-description": "Deskripsion",
+	"upload-form-label-infoform-description-tooltip": "Ipalawag bassit dagiti amin a nalatak a maipanggep iti obra.\nPara iti retrato, ibaga dagiti nangruna a banag a nailadladawan, ti okasion, wenno ti lugar.",
 	"upload-form-label-usage-title": "Panagusar",
 	"upload-form-label-usage-filename": "Nagan ti papeles",
 	"upload-form-label-own-work": "Daytoy ket bukodko nga obra",
 	"upload-form-label-infoform-categories": "Katkategoria",
 	"upload-form-label-infoform-date": "Petsa",
+	"upload-form-label-own-work-message-generic-local": "Pasingkedak nga ikarkargak daytoy a papeles a sumursurot kadagiti termino ti serbisio ken dagiti annuroten ti lisensia iti {{SITENAME}}.",
+	"upload-form-label-not-own-work-message-generic-local": "No saanka a makaikarga iti daytoy a papeles babaen dagiti annuroten iti {{SITENAME}}, pangngaasi nga irekep daytoy a dialogo ken padasen ti sabali a pamay-an.",
 	"upload-form-label-not-own-work-local-generic-local": "Mabalinmo pay a padasen [[Special:Upload|ti kasisigud a pagikargaan a panid]].",
+	"upload-form-label-own-work-message-generic-foreign": "Maawatak nga agikarkargaak iti daytoy a papeles iti pagbibingayan a repositorio. Pasingkedak nga ar-aramidek a sumursurot kadagiti termino ti serbisio ken dagiti annuroten ti lisensia idiay.",
+	"upload-form-label-not-own-work-message-generic-foreign": "No saanka a makaikarga iti daytoy a papeles babaen dagiti annuroten iti pagbibingayan a repositorio, pangngaasi nga irekep daytoy a dialogo ken padasen ti sabali a pamay-an.",
+	"upload-form-label-not-own-work-local-generic-foreign": "Malinmo pay a padasen ti panagusar [[Special:Upload|ti panid a pagikargaan iti {{SITENAME}}]], no daytoy a panid ket mabalin a maikarga idiay babaen dagiti bukodda nga annuroten.",
 	"backend-fail-stream": "Saan a maipan ti papeles $1.",
 	"backend-fail-backup": "Saan a makaidulin ti kapada ti papeles ti $1.",
 	"backend-fail-notexists": "Awan ti papeles ti $1.",
@@ -1466,6 +1506,8 @@
 	"uploadstash-badtoken": "Napaay ti panagtungpal dayta nga aramid. Mabalin a ti talekmo nga agurnos ket nagpason. Pangngaasi a padasen manen.",
 	"uploadstash-errclear": "Napaay ti panagdalus kadagiti papeles.",
 	"uploadstash-refresh": "Pasadiwaen dagiti listaan ti papeles",
+	"uploadstash-thumbnail": "kitaen ti bassit a ladawan",
+	"uploadstash-exception": "Saan a naidulin ti panangikarga iti stash ($1): \"$2\".",
 	"invalid-chunk-offset": "Imbalido a pirgis ti timbengan",
 	"img-auth-accessdenied": "Nalibak ti iseserrek",
 	"img-auth-nopathinfo": "Ti servermo ket saan a naisaad nga agipasa iti daytoy a pakaammo.\nMabalin a naibatay iti CGI ken saan a makasuporta ti img_auth.\nKitaen ti https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization .",
@@ -1825,6 +1867,7 @@
 	"listgrouprights-namespaceprotection-namespace": "Nagan ti espasio",
 	"listgrouprights-namespaceprotection-restrictedto": "Karbengan wenno karkarbengan a mangpalubos nga agurnos ti agar-aramat",
 	"listgrants": "Dagiti sagut",
+	"listgrants-summary": "Ti sumagand ket listaan dagiti sagut nga agraman kadagiti mainaig a panagserrek kadagiti karbengan ti agar-aramat. Dagiti agar-aramat ket mabalinda ti mangipalubos kadagiti aplikasion a mausarda iti bukodda a pakabilangan, ngem addaan iti limitado a pammalubos a naibatay kadagiti sagut nga inted ti agar-aramat iti aplikasion. Nupay kasta ti maysa nga aplikasion nga agtigtignay para iti agar-aramat ket saan a pudno a makausar kadagiti karbengan nga awanan iti agar-aramat.\nMabalin nga adda iti [[{{MediaWiki:Listgrouprights-helppage}}|maipatinayon a pakaammo]] a maipanggep kadagiti indibidual a karbengan.",
 	"listgrants-grant": "Sagut",
 	"listgrants-rights": "Dagiti karbengan",
 	"trackingcategories": "Pagsurotan a katkategoria",
@@ -1832,6 +1875,8 @@
 	"trackingcategories-msg": "Pagsurotan a kategoria",
 	"trackingcategories-name": "Nagan ti mensahe",
 	"trackingcategories-desc": "Kriteria ti panangiraman ti kategoria",
+	"restricted-displaytitle-ignored": "Pampanid nga addaan kadagiti di naikaskaso a titulo ti panangiparang",
+	"restricted-displaytitle-ignored-desc": "Ti panid ket addaan iti maysa a di naikaskaso a <code><nowiki>{{DISPLAYTITLE}}</nowiki></code> gapu ta saan a kapada iti pudno a titulo ti panid.",
 	"noindex-category-desc": "Ti panid ket saan naipagsurotan babaen dagiti robot gapu ta addaan iti salamangka a balikas iti <code><nowiki>__NOINDEX__</nowiki></code> ken adda iti nagan ti espasio a maipalubos ti wagayway.",
 	"index-category-desc": "Ti panid ket addaan iti <code><nowiki>__INDEX__</nowiki></code> (ken adda iti nagan ti espasio a maipalubos ti wagayway), ken isu a naipagsurotan babaen dagiti robot ngem no iti kadawyan ket saan.",
 	"post-expand-template-inclusion-category-desc": "Ti kadakkel ti panid ket dakdakkel ngem <code>$wgMaxArticleSize</code> kalpasan ti panangipadakkel amin dagiti plantilia, isu nga adda met dagiti plantilia a saan a naipadakkel",
@@ -1878,9 +1923,11 @@
 	"watchnologin": "Saan a nakastrek",
 	"addwatch": "Inayon iti listaan ti bambantayan",
 	"addedwatchtext": "Ti \"[[:$1]]\" ken ti tungtunganna a panid ket nainayonen iti [[Special:Watchlist|listaan ti bambantayam]].",
+	"addedwatchtext-talk": "Ti \"[[:$1]]\" ken ti mainaig a panidna ket nainayoen iti [[Special:Watchlist|bambantayam]].",
 	"addedwatchtext-short": "Ti panid ti \"$1\" ket nainayonen iti listaan ti bambantayam.",
 	"removewatch": "Ikkaten manipud ti listaan ti bambantayan",
 	"removedwatchtext": "Ti \"[[:$1]]\" ken ti tungtunganna a panid ket naikkaten manipud iti [[Special:Watchlist|listaan ti bambantayam]].",
+	"removedwatchtext-talk": "Ti \"[[:$1]]\" ken ti mainaig a panidna ket naikkaten manipud iti [[Special:Watchlist|bambantayam]].",
 	"removedwatchtext-short": "Ti panid ti \"$1\" ket naikkaten manipud ti listaan ti bambantayam.",
 	"watch": "Bantayan",
 	"watchthispage": "Bantayan daytoy a panid",
@@ -1956,12 +2003,14 @@
 	"rollbacklinkcount": "agisubli ti $1 {{PLURAL:$1|nga inurnos|nga inur-urnos}}",
 	"rollbacklinkcount-morethan": "agisubli ti ad-adu ngem $1 {{PLURAL:$1|nga inurnos|nga inur-urnos}}",
 	"rollbackfailed": "Napaay ti panangisubli",
+	"rollback-missingparam": "Awan dagiti nasken a parametro iti kiddaw.",
 	"cantrollback": "Saan a maisubli ti panagurnos;\nti naudi a nakaaramid ket iti laeng nagsurat iti daytoy a panid.",
 	"alreadyrolled": "Saan a maipasubli ti kinaudi a panagurnos iti [[:$1]] babaen ni [[User:$2|$2]] ([[User talk:$2|tungtungan]]{{int:pipe-separator}}[[Special:Contributions/$2|{{int:contribslink}}]]);\nadda sabali a naurnos wenno nagipasubli ti panid.\n\nTi kinaudi a panagurnos ti daytoy a panid ket babaen ni [[User:$3|$3]] ([[User talk:$3|tungtungan]]{{int:pipe-separator}}[[Special:Contributions/$3|{{int:contribslink}}]]).",
 	"editcomment": "Ti pakabuklan idi ti panagurnos ket: <em>$1</em>.",
 	"revertpage": "Insubli ti panagurnos babaen ni [[Special:Contributions/$2|$2]] ([[User talk:$2|tungtungan]]), naisubli ti kinaudi a rebision babaen ni [[User:$1|$1]]",
 	"revertpage-nouser": "Naisubli dagiti inurnos babaen ti nailemmeng nga agar-aramat iti kinaudi a rebision babaen ni {{GENDER:$1|[[User:$1|$1]]}}",
 	"rollback-success": "Naibabawi dagiti panagurnos babaen ni $1;\nnaisubli manen ti naudi a rebision babaen ni $2.",
+	"rollback-success-notify": "Naibabawi dagiti panagurnos babaen ni $1;\nisubli ti naudi a rebision babaen ni $2. [$3 Ipakita dagiti binaliwan]",
 	"sessionfailure-title": "Napaay ti sesion",
 	"sessionfailure": "Adda parikut ti sesion ti panagserrekmo;\ndaytoy nga aramid ket naibabawi a kas pagpawilan ti panaghijack ti sesion.\nAgsublika iti naggapuam a panid, ikargam manen ti panid ken padasen manen.",
 	"changecontentmodel": "Baliwan ti modelo ti linaon ti panid",
@@ -1974,8 +2023,11 @@
 	"changecontentmodel-success-text": "Nabaliwanen ti kita ti linaon ti [[:$1]].",
 	"changecontentmodel-cannot-convert": "Ti linaon iti [[:$1]] ket saan a mabaliwan iti kita ti $2.",
 	"changecontentmodel-nodirectediting": "Ti modelo ti linaon ti $1 ket saan a mangsuporta ti dagus a panagurnos",
+	"changecontentmodel-emptymodels-title": "Awan ti magun-od kadagiti modelo ti linaon",
+	"changecontentmodel-emptymodels-text": "Ti linaon iti [[:$1]] ket saan a mabaliwan iti ania man a kita.",
 	"log-name-contentmodel": "Listaan ti panagbaliw ti modelo ti linaon",
 	"log-description-contentmodel": "Dagiti pasamak a mainaig kadagiti modelo ti linaon ti panid",
+	"logentry-contentmodel-new": "{{GENDER:$2|Pinartuat}} ni $1 ti panid ti $3 a nagusar ti saan a kasisigud a modelo ti linaon ti \"$5\"",
 	"logentry-contentmodel-change": "{{GENDER:$2|Binaliwan}} ni $1 ti modelo ti panid ti $3 manipud ti \"$4\" iti \"$5\"",
 	"logentry-contentmodel-change-revertlink": "isubli",
 	"logentry-contentmodel-change-revert": "isubli",
@@ -2047,6 +2099,7 @@
 	"undeletehistorynoadmin": "Daytoy a panid ket naikkaten.\nTi rason ti panagikkat ket naipakita iti pakabuklan dita baba, ken dagita a salaysay ti agar-aramat a nagurnos iti daytoy a panid sakbay a naikkat.\nTi husto a testo dagitoy a naikat a rebision ket magun-od laeng dagiti administrador.",
 	"undelete-revision": "Naikkat ti rebision ti $1 (manipud idi $4, $5) babaen ni $3:",
 	"undeleterevision-missing": "Imbalido wenno napukaw a rebision.\nAddaanka ngata ti madi a silpo, wenno ti rebision ket mabalin a naipasubli wenno naikkat manipud ti arkibo.",
+	"undeleterevision-duplicate-revid": "Saan a maisubli {{PLURAL:$1|ti maysa a rebision|dagiti $1 a rebision}}, gapu ta {{PLURAL:$1|ti bukona|dagiti bukodda}} nga <code>rev_id</code> ket naus-usaren.",
 	"undelete-nodiff": "Awan ti nasarakan kadagiti dati a rebision.",
 	"undeletebtn": "Isubli",
 	"undeletelink": "kitaen/isubli",
@@ -2056,7 +2109,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|1 a rebision|dagiti $1 a rebision}} ti naisubli",
 	"undeletedrevisions-files": "{{PLURAL:$1|1 a rebision|dagiti $1 a rebision}} ken {{PLURAL:$2|1 a papeles|dagiti $2 a papeles}} ti naisubli",
 	"undeletedfiles": "{{PLURAL:$1|1 a papeles|dagiti $1 a papeles}} ti naisubli",
-	"cannotundelete": "Napaay ti panagisubli iti panagikkat:\n$1",
+	"cannotundelete": "Napaay ti sangkabassit wenno amin iti panagisubli ti panagikkat:\n$1",
 	"undeletedpage": "<strong>Naisublin ti $1</strong>\n\nBinsiren ti [[Special:Log/delete|listaan ti panagikkat]] para iti rehistro dagiti kaudian panagikkat ken naisubsubli.",
 	"undelete-header": "Kitaen [[Special:Log/delete|ti listaan ti panagikkat]] kadagiti kaudian a naikkat a panid.",
 	"undelete-search-title": "Biruken dagiti naikkat a panid",
@@ -2094,8 +2147,8 @@
 	"sp-contributions-newbies-sub": "Para kadagiti kabarbaro a pakabilangan",
 	"sp-contributions-newbies-title": "Dagiti kontribusion para kadagiti baro a pakabilangan",
 	"sp-contributions-blocklog": "listaan ti serra",
-	"sp-contributions-suppresslog": "pasardengen dagiti kontribusion ti agar-aramat",
-	"sp-contributions-deleted": "dagiti naikkat a kontribusion ti agar-aramat",
+	"sp-contributions-suppresslog": "dagiti napasardeng a kontribusion ti {{GENDER:$1|agar-aramat}}",
+	"sp-contributions-deleted": "dagiti naikkat a kontribusion ti {{GENDER:$1|agar-aramat}}",
 	"sp-contributions-uploads": "dagiti naikarga",
 	"sp-contributions-logs": "dagiti listaan",
 	"sp-contributions-talk": "tungtungan",
@@ -2106,6 +2159,7 @@
 	"sp-contributions-username": "IP a pagtaengan wenno nagan ti agar-aramat:",
 	"sp-contributions-toponly": "Ipakita laeng dagiti inurnos dagiti kaudian a rebision",
 	"sp-contributions-newonly": "Ipakita laeng dagiti inurnos a pannakapartuat ti pampanid",
+	"sp-contributions-hideminor": "Ilemmeng dagiti bassit a panagurnos",
 	"sp-contributions-submit": "Biruken",
 	"whatlinkshere": "Dagiti nakasilpo ditoy",
 	"whatlinkshere-title": "Pampanid a nakasilpo iti \"$1\"",
@@ -2130,7 +2184,7 @@
 	"unblock": "Ikkaten ti serra ti agar-aramat",
 	"blockip": "Serraan ti {{GENDER:$1|agar-aramat}}",
 	"blockip-legend": "Serraan ti agar-aramat",
-	"blockiptext": "Usaren ti porma dita baba tapno maserraan ti panagsurat manipud iti naisangayan nga IP a pagtaengan wenno nagan ti agar-aramat.\nUsaren laeng daytoy tapno pawilan ti bandalismo, ken panagtunos iti [[{{MediaWiki:Policy-url}}|annuroten]].\nIkkan ti naisangayan a rason dita baba (kas pagarigan, dakamaten ti maysa a panid a nabandalismo) .",
+	"blockiptext": "Usaren ti porma dita baba tapno maserraan ti panagserrek ti panagsurat manipud iti naisangayan nga adres ti IP wenno nagan ti agar-aramat.\nDaytoy ket nasken laeng a maaramid tapno mapawilan ti bandalismo, ken segun iti [[{{MediaWiki:Policy-url}}|annuroten]].\nIkabil ti naisangayan a rason dita baba (kas pagarigan, ti panagdakamat kadagiti naisangayan a panid a nabandalismo).\nMabalinmo a serraan dagiti sakup ti adres ti IP babaen ti panagusar ti sintaksis ti [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR]; ti kadakkelan a maipalubos a sakup ket /$1 para iti IPv4 ken /$2 para iti IPv6.",
 	"ipaddressorusername": "IP a pagtaengan wenno nagan ti agar-aramat:",
 	"ipbexpiry": "Agpaso:",
 	"ipbreason": "Rason:",
@@ -2158,6 +2212,7 @@
 	"ipb-unblock": "Lukatan ti serra ti nagan ti agar-aramat wenno IP a pagtaengan",
 	"ipb-blocklist": "Kitaen dagiti adda a serra",
 	"ipb-blocklist-contribs": "Dagiti kontribusion para kenni {{GENDER:$1|$1}}",
+	"ipb-blocklist-duration-left": "$1 ti nabati",
 	"unblockip": "Lukatan ti serra ti agar-aramat",
 	"unblockiptext": "Usaren ti porma dita baba tapno maisubli ti panagserrek ti panagsurat ti dati a naserran nga IP a pagtaengan wenno nagan ti agar-aramat.",
 	"ipusubmit": "Ikkaten daytoy a serra",
@@ -2245,12 +2300,13 @@
 	"lockdbsuccesstext": "Nabalunetan ti database.<br />\nLaglagipem nga [[Special:UnlockDB|ikkaten ti balunetna]] kalpasan a malpaska nga agsimpa.",
 	"unlockdbsuccesstext": "Nalukatanen ti database.",
 	"lockfilenotwritable": "Ti papeles ti balunet ti database ket saan a masuratan.\nTapno mabalunetan ken malukatan ti database, nasken daytoy a masuratan babaen ti web server.",
+	"databaselocked": "Ti database ket agdaman a nabalutenan.",
 	"databasenotlocked": "Saan a nabalunetan ti database.",
 	"lockedbyandtime": "(ni {{GENDER:$1|$1}} idi $2, $3)",
 	"move-page": "Iyalis ti $1",
 	"move-page-legend": "Iyalis ti panid",
-	"movepagetext": "Ti panagusar ti porma dita baba, ket mangnagan manen ti panid, a mangiyalis amin ti pakasaritaanna iti baro a nagan.\nTi daan a titulo ket agbalin a baw-ing a panid iti baro a titulo.\nMapabarom a kas automatiko dagiti baw-ing a nakatudo dita kasisigud a titulo.\nNo agpilika a saanmo a kayat, siguraduem a kitaen ti [[Special:DoubleRedirects|doble]] wenno [[Special:BrokenRedirects|nadadael a baw-ing]].\nRenbbengmo ti mangpatalged nga amin a silpo ket agtultuloy a nakatudo iti nasken a papananda.\n\nLaglagipen a ti panid ket <strong>saan</strong> a maiyalis no addan sigud a panid iti baro a titulo, malaksid no ti kinaudi ket maysa a baw-ing ken awan ti napalabas a pakasaritaan ti panag-urnos. \nKayat a sawen daytoy a mabalinmo a suktan ti nagan ti maysa a panid manipud iti punto ti pannakasukat ti nagan no nagbiddutka, ken saan mo a mabalin a suratan manen ti addaan a panid.\n\n<strong>Ballaag!</strong>\nMabalin a maysa daytoy a nakaro ken saan a bigla a panagbaliw iti maysa a nasikat a panid;\npangngaasim a pasingkedam a maawatam ti ibunga daytoy sakbay nga agtuloyka a mangbaliw.",
-	"movepagetext-noredirectfixer": "Ti panagusar ti kinabuklan dita baba, ket panaganan ti panid, iyalisna amin ti pakasaritaanna iti baro a nagan.\nTi daan a titulo ket agbalin baw-ing a panid idiay baro a titulo.\nPasaruduam a kitaen ti [[Special:DoubleRedirects|doble]] wenno [[Special:BrokenRedirects|nadadael a baw-ing]].\nRebbengem ti mangpatalged nga amin a silpo ket agtultuloy a nakatudo iti nasken a papananda.\n\nLaglagipen a ti panid ket <strong>saan</strong> a maiyalis no addan sigud a panid iti baro a titulo, malaksid no awan linaonna wenno no maysa a baw-ing a panid ken awan ti panagbaliw iti pakasaritaan ti napalabas. \nKayat a sawen daytoy a mabalinmo a suktan ti nagan ti maysa a panid manipud iti punto ti pannakasukat ti nagan no nagbiddutka, ken saanmo a mabalin a suratan manen ti addaan a panid.\n\n<strong>Ballaag!</strong>\nMabalin a maysa daytoy a nakaro ken saan a bigla a panagbaliw iti maysa a nasikat a panid;\npangngaasim ta pasingkedam a maawatam ti ibunga daytoy sakbay nga agtuloyka a mangbaliw.",
+	"movepagetext": "Ti panagusar ti porma dita baba, ket mangnagan manen ti panid, a mangiyalis amin ti pakasaritaanna iti baro a nagan.\nTi daan a titulo ket agbalin a baw-ing a panid iti baro a titulo.\nMapabarom a kas automatiko dagiti baw-ing a nakatudo dita kasisigud a titulo.\nNo agpilika a saanmo a kayat, siguraduem a kitaen ti [[Special:DoubleRedirects|doble]] wenno [[Special:BrokenRedirects|nadadael a baw-ing]].\nRebbengmo ti mangpatalged nga amin a silpo ket agtultuloy a nakatudo iti nasken a papananda.\n\nLaglagipen a ti panid ket <strong>saan</strong> a maiyalis no addaan iti sigud a panid iti baro a titulo, malaksid no ti kinaudi ket maysa a baw-ing ken awan ti napalabas a pakasaritaan ti panagurnos. \nKayat a sawen daytoy a mabalinmo a sukatan ti nagan ti maysa a panid manipud iti punto ti pannakasukat ti nagan no nagbiddutka, ken saanmo a mabalin a suratan manen ti addaan a panid.\n\n<strong>Nota:</strong>\nMabalin a maysa daytoy a nakaro ken saan a bigla a panagbaliw iti maysa a nasikat a panid;\npangngaasim a pasingkedam a maawatam ti ibunga daytoy sakbay nga agtuloyka a mangbaliw.",
+	"movepagetext-noredirectfixer": "Ti panagusar ti kinabuklan dita baba, ket panaganan ti panid, iyalisna amin ti pakasaritaanna iti baro a nagan.\nTi daan a titulo ket agbalin baw-ing a panid idiay baro a titulo.\nSiguraduem a kitaen ti [[Special:DoubleRedirects|doble]] wenno [[Special:BrokenRedirects|nadadael a baw-ing]].\nRebbengem ti mangpatalged nga amin a silpo ket agtultuloy a nakatudo iti nasken a papananda.\n\nLaglagipen a ti panid ket <strong>saan</strong> a maiyalis no addaan iti sigud a panid iti baro a titulo, malaksid no awan linaonna wenno no maysa a baw-ing a panid ken awan ti panagbaliw iti pakasaritaan ti napalabas. \nKayat a sawen daytoy a mabalinmo a sukatan ti nagan ti maysa a panid manipud iti punto ti pannakasukat ti nagan no nagbiddutka, ken saanmo a mabalin a suratan manen ti addaan a panid.\n\n<strong>Nota:</strong>\nMabalin a maysa daytoy a nakaro ken saan a bigla a panagbaliw iti maysa a nasikat a panid;\npangngaasim ta pasingkedam a maawatam ti ibunga daytoy sakbay nga agtuloyka a mangbaliw.",
 	"movepagetalktext": "No kur-item daytoy a kahon, automatikonto a maiyalis ti mainaig a tungtungan a panid, malaksid no addanto idiay iti adda linaon a tungtungan a panid.\n\nIti daytoy a kaso, masapul nga iyalis wenno manual nga itiponmo ti panid no kayatmo.",
 	"moveuserpage-warning": "<strong>Ballaag:</strong> Mangrugrugika nga agiyalis ti panid ti agar-aramat. Pangngaasi a laglapipen a ti panid ket isu laeng ti maiyalis ken ti agar-aramat ket <em>saanto</em> a managanan.",
 	"movecategorypage-warning": "<strong>Ballaag:</strong> Mangiyal-aliskan iti panid ti kategoria. Pangngaasi a laglagipen a ti maiyalisto laeng ket ti panid ken ti aniaman a pampanid iti daan a kategoria ket <em>saanto</em> a maikategoria iti baro.",
@@ -2382,7 +2438,7 @@
 	"import-nonewrevisions": "Awan dagiti naala a rebision (mabalin nga adda amin dagitoyen, wenno nalabsan gapu kadagiti biddut).",
 	"xml-error-string": "$1 iti linia $2, tukol $3 (byte $4): $5",
 	"import-upload": "Ikarga ti datos ti XML",
-	"import-token-mismatch": "Napukaw ti sesion ti datos.\nPangngaasi a padasen manen.",
+	"import-token-mismatch": "Pannakapukaw ti sesion ti datos.\n\nMabalin a nakaruarka. <strong>Pangngaasi a pasingkedan a nakastrekka pay laeng ken padasem manen</strong>.\nNo saan pay a mabalin, padasem ti [[Special:UserLogout|rummuar]] ken sumrek manen, ken kitaen no ti pagpasabasam ket mangipalubos kadagiti galieta manipud iti daytoy a sitio.",
 	"import-invalid-interwiki": "Saan a makaala manipud ti nainaganan a wiki.",
 	"import-error-edit": "Ti panid ti \"$1\" ket saan idi a naala ngamin ket saanmo a mabalin nga urnosen.",
 	"import-error-create": "Ti panid ti \"$1\" ket saan idi a naala ngamin ket saanmo a mabalin a partuaten.",
@@ -2458,6 +2514,7 @@
 	"tooltip-ca-nstab-category": "Kitaen ti panid ti kategoria",
 	"tooltip-minoredit": "Markaan daytoy a kas bassit a panag-urnos",
 	"tooltip-save": "Idulin dagiti sinukatam",
+	"tooltip-publish": "Ipablaak dagiti binaliwam",
 	"tooltip-preview": "Ipadas dagiti sinukatam, pangngaasi nga usarem daytoy sakbay nga idulin ti panid!",
 	"tooltip-diff": "Ipakita no ania dagiti sinukatan nga inaramidmo iti testo",
 	"tooltip-compareselectedversions": "Kitaen ti naggidiatan dagiti dua a napili a bersion iti daytoy a panid.",
@@ -2573,6 +2630,7 @@
 	"svg-long-error": "Saan nga umiso a papeles ti SVG: $1",
 	"show-big-image": "Kasisigud a papeles",
 	"show-big-image-preview": "Kadakkel daytoy a panagipadas: $1.",
+	"show-big-image-preview-differ": "Kadakkel daytoy a panangipadas ti $3 iti daytoy a papeles ti $2: $1.",
 	"show-big-image-other": "Sabali {{PLURAL:$2|a resolusion|kadagiti resolusion}}: $1.",
 	"show-big-image-size": "$1 × $2 dagiti piksel",
 	"file-info-gif-looped": "nasiluan",
@@ -2588,6 +2646,7 @@
 	"newimages-legend": "Sagat",
 	"newimages-label": "Nagan ti papeles (wenno pasetna) :",
 	"newimages-showbots": "Ipakita dagiti naikarga babaen dagiti bot",
+	"newimages-hidepatrolled": "Ilemmeng dagiti panangikarga a napatruliaan",
 	"noimages": "Awan ti makita.",
 	"ilsubmit": "Biruken",
 	"bydate": "babaen ti petsa",
@@ -2988,6 +3047,8 @@
 	"confirm-watch-top": "Inayon daytoy a panid iti listaan ti bambantayam?",
 	"confirm-unwatch-button": "Sige",
 	"confirm-unwatch-top": "Ikkatem daytoy a panid manipud ti listaan ti bambantayam?",
+	"confirm-rollback-button": "Sige",
+	"confirm-rollback-top": "Isubli dagiti panagurnos iti daytoy a panid?",
 	"quotation-marks": "\"$1\"",
 	"imgmultipageprev": "← napalabas a panid",
 	"imgmultipagenext": "sumaruno a panid →",
@@ -3026,7 +3087,7 @@
 	"watchlistedit-raw-done": "Napabaron ti listaan ti bambantayam.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|1 a titulo|$1 kadagiti titulo}} ti nainayon:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|1 a titulo|$1 kadagiti titulo}} ti naikkat:",
-	"watchlistedit-clear-title": "Nadalusanen ti listaan ti bambantayan",
+	"watchlistedit-clear-title": "Dalusan ti listaan ti bambantayan",
 	"watchlistedit-clear-legend": "Dalusan ti listaan ti bambantayan",
 	"watchlistedit-clear-explain": "Amin dagiti titulo ket maikkatto manipud ti listaan ti bambantayam",
 	"watchlistedit-clear-titles": "Dagiti titulo:",
@@ -3042,6 +3103,7 @@
 	"timezone-local": "Lokal",
 	"duplicate-defaultsort": "<strong>Ballag:</strong> Kasisigud a panagilasin ti \"$2\" ket tuonana ti immuna a kasisigud a panagilasin ti \"$1\".",
 	"duplicate-displaytitle": "<strong>Ballaag:</strong> Ti maiparang a titulo ti \"$2\" ket tuonanna ti immmuna a maiparang a titulo ti \"$1\".",
+	"restricted-displaytitle": "<strong>Ballaag:</strong> Di naikaskaso ti titulo ti panagiparang ti \"$1\" gapu ta saan a kapada ti pudno a titulo ti panid.",
 	"invalid-indicator-name": "<strong>Biddut:</strong> Ti gupit ti <code>name</code> a panangipakita ti kasasaad ti panid ket nasken nga adda linaon.",
 	"version": "Bersion",
 	"version-extensions": "Dagiti naisaad a pagpaatiddog",
@@ -3089,7 +3151,7 @@
 	"version-libraries-description": "Deskripsion",
 	"version-libraries-authors": "Dagiti mannurat",
 	"redirect": "Baw-ing babaen ti papeles, agar-aramat, panid, rebision, wenno ID ti listaan",
-	"redirect-summary": "Daytoy nga espesial a panid ket maibaw-ing iti papeles (iti nagan ti papeles), ti panid (iti ID ti rebision wenno ID ti panid), wenno ti panid ti agar-aramat (iti numeriko nga ID ti agar-aramat). Panagusar:\n[[{{#Special:Redirect}}/file/Example.jpg]], \n[[{{#Special:Redirect}}/page/64308]], \n[[{{#Special:Redirect}}/revision/328429]], wenno\n[[{{#Special:Redirect}}/user/101]].",
+	"redirect-summary": "Daytoy nga espesial a panid ket maibaw-ing iti papeles (naited ti nagan ti papeles), ti panid (naited a rebision ti ID wenno ID ti panid), wenno ti panid ti agar-aramat (iti numeriko nga ID ti agar-aramat), wenno ti naikabil iti listaan (naited ti listaan ti ID). Panagusar:\n[[{{#Special:Redirect}}/file/Example.jpg]], \n[[{{#Special:Redirect}}/page/64308]], \n[[{{#Special:Redirect}}/revision/328429]], \n[[{{#Special:Redirect}}/user/101]], wenno\n[[{{#Special:Redirect}}/logid/186]].",
 	"redirect-submit": "Inkan",
 	"redirect-lookup": "Kitaen:",
 	"redirect-value": "Pateg:",
@@ -3173,6 +3235,7 @@
 	"tags-delete-not-found": "Awan ti etiketa ti \"$1\".",
 	"tags-delete-too-many-uses": "Ti etiketa ti \"$1\" ket naipakat iti ad-adu ngem $2 {{PLURAL:$2|a rebision|kadagiti rebision}}, a ti kaibuksillanna ket saan a mabalin a maikkat.",
 	"tags-delete-warnings-after-delete": "Ti etiketa ti \"$1\" ket naikkat, ngem nakita {{PLURAL:$2|ti sumaganad a ballaag|dagiti sumaganad a ballaag}}:",
+	"tags-delete-no-permission": "Awan ti pammalubosmo nga agikkat kadagiti etiketa ti panagbaliw.",
 	"tags-activate-title": "Patarayen ti etiketa",
 	"tags-activate-question": "Isagsaganamon a patarayen ti etiketa ti \"$1\".",
 	"tags-activate-reason": "Rason:",
@@ -3299,7 +3362,7 @@
 	"logentry-protect-protect-cascade": "{{GENDER:$2|Sinalakniban}} ni $1 ti $3 $4 [sariap]",
 	"logentry-protect-modify": "{{GENDER:$2|Binaliwan}} ni $1 ti agpang ti salaknib para iti $3 $4",
 	"logentry-protect-modify-cascade": "{{GENDER:$2|Binaliwan}} ni $1 ti agpang ti salaknib para iti $3 $4 [sariap]",
-	"logentry-rights-rights": "Ni $1 ket {{GENDER:$2|binaliwanna}} ti grupo a pannakaikameng para kenni $3 manipud ti $4 iti $5",
+	"logentry-rights-rights": "Ni $1 ket {{GENDER:$2|binaliwanna}} ti grupo a pannakaikameng para kenni {{GENDER:$6|$3}} manipud iti $4 iti $5",
 	"logentry-rights-rights-legacy": "Ni $1 ket {{GENDER:$2|binaliwanna}} ti grupo a pannakaikameng para kenni $3",
 	"logentry-rights-autopromote": "Ni $1 ket automatiko idi a {{GENDER:$2|naipangato}} manipud ti $4 iti $5",
 	"logentry-upload-upload": "Ni $1 ket {{GENDER:$2|inkargana}} ti $3",
@@ -3332,6 +3395,7 @@
 	"searchsuggest-containing": "naglaon ti...",
 	"api-error-badaccess-groups": "Saanka mapalubosan nga agikarga kadagiti papeles iti daytoy a wiki.",
 	"api-error-badtoken": "Akin-uneg a biddut: Dakes a tandaan.",
+	"api-error-blocked": "Naserraankan manipud iti panagurnos.",
 	"api-error-copyuploaddisabled": "Ti panagikarga babaen ti URL ket nabaldado iti daytoy server.",
 	"api-error-duplicate": "Adda {{PLURAL:$1|sabali a papeles|dagiti sabali a papeles}} nga addan iti daytoy a sitio nga agraman iti agpada a linaon.",
 	"api-error-duplicate-archive": "Adda {{PLURAL:$1|idi sabali a papeles|dagidi sabali a papeles}} nga addaan ditoy a sitio nga agpada ti linaonda, ngem {{PLURAL:$1|daytoy|dagitoy}} ket naikkat.",
@@ -3451,13 +3515,14 @@
 	"json-error-unsupported-type": "Naited ti pateg iti kita a saan a maikodigo",
 	"headline-anchor-title": "Isilpo iti daytoy a paset",
 	"special-characters-group-latin": "Latin",
-	"special-characters-group-latinextended": "Latin napaatiddog",
+	"special-characters-group-latinextended": "Naipaatiddog a Latin",
 	"special-characters-group-ipa": "IPA",
 	"special-characters-group-symbols": "Dagiti simbolo",
 	"special-characters-group-greek": "Griego",
+	"special-characters-group-greekextended": "Naipaatiddog a Griego",
 	"special-characters-group-cyrillic": "Siriliko",
 	"special-characters-group-arabic": "Arabiko",
-	"special-characters-group-arabicextended": "Arabiko a napaatiddog",
+	"special-characters-group-arabicextended": "Naipaatiddog nga Arabiko",
 	"special-characters-group-persian": "Persiano",
 	"special-characters-group-hebrew": "Hebreo",
 	"special-characters-group-bangla": "Bangla",
@@ -3481,5 +3546,126 @@
 	"sessionprovider-generic": "Dagiti sesion ti $1",
 	"sessionprovider-mediawiki-session-cookiesessionprovider": "dagiti sesion a naibatay iti galieta",
 	"sessionprovider-nocookies": "Mabalin a nabaldado dagiti galieta. Siguraduem a pinakabaelam dagiti galieta ken mangrugi manen.",
-	"randomrootpage": "Pugto a ramut a panid"
+	"randomrootpage": "Pugto a ramut a panid",
+	"log-action-filter-block": "Kita ti serra:",
+	"log-action-filter-contentmodel": "Kita ti panagbaliw ti modelo ti linaon:",
+	"log-action-filter-delete": "Kita ti panagikkat:",
+	"log-action-filter-import": "Kita ti import:",
+	"log-action-filter-managetags": "Kita ti aksion ti panagtaripato ti etiketa:",
+	"log-action-filter-move": "Kita ti panagiyalis:",
+	"log-action-filter-newusers": "Kita ti panagpartuat ti pakabilangan:",
+	"log-action-filter-patrol": "Kita ti patrulia:",
+	"log-action-filter-protect": "Kita ti salaknib:",
+	"log-action-filter-rights": "Kita ti panagbaliw ti karbengan:",
+	"log-action-filter-suppress": "Kita ti panagpasardeng:",
+	"log-action-filter-upload": "Kita ti panangikarga:",
+	"log-action-filter-all": "Amin",
+	"log-action-filter-block-block": "Serra",
+	"log-action-filter-block-reblock": "Panagbaliw ti serra",
+	"log-action-filter-block-unblock": "Ikkaten ti serra",
+	"log-action-filter-contentmodel-change": "Panagbaliw ti Contentmodel",
+	"log-action-filter-contentmodel-new": "Panagpartuat ti panid iti saan a pagalagadan a Contentmodel",
+	"log-action-filter-delete-delete": "Panagikkat ti panid",
+	"log-action-filter-delete-restore": "Panangisubli ti panagikkat ti panid",
+	"log-action-filter-delete-event": "Panagikkat ti listaan",
+	"log-action-filter-delete-revision": "Panagikkat ti rebision",
+	"log-action-filter-import-interwiki": "Transwiki nga import",
+	"log-action-filter-import-upload": "Import babaen ti panangikarga ti XML",
+	"log-action-filter-managetags-create": "Panagpartuat ti etiketa",
+	"log-action-filter-managetags-delete": "Panagikkat ti etiketa",
+	"log-action-filter-managetags-activate": "Paaktibuen ti etiketa",
+	"log-action-filter-managetags-deactivate": "Deaktibuen ti etiketa",
+	"log-action-filter-move-move": "Iyalis a saan a mangisurat manen kadagiti baw-ing",
+	"log-action-filter-move-move_redir": "Iyalis a mangisurat manen kadagiti baw-ing",
+	"log-action-filter-newusers-create": "Panagpartuat babaen ti di ammo nga agar-aramat",
+	"log-action-filter-newusers-create2": "Panagpartuat babaen ti nairehistro nga agar-aramat",
+	"log-action-filter-newusers-autocreate": "Automatiko a panagpartuat",
+	"log-action-filter-newusers-byemail": "Panagpartuat nga addaan iti kontrasenias a naipatulod babaen ti esurat",
+	"log-action-filter-patrol-patrol": "Manual a patrulia",
+	"log-action-filter-patrol-autopatrol": "Automatiko a patrulia",
+	"log-action-filter-protect-protect": "Salaknib",
+	"log-action-filter-protect-modify": "Panagbaliw ti salaknib",
+	"log-action-filter-protect-unprotect": "Panagikkat ti salaknib",
+	"log-action-filter-protect-move_prot": "Salaknib ti panagiyalis",
+	"log-action-filter-rights-rights": "Manual a panagbaliw",
+	"log-action-filter-rights-autopromote": "Automatiko a panagbaliw",
+	"log-action-filter-suppress-event": "Panagpasardeng ti listaan",
+	"log-action-filter-suppress-revision": "Panagpasardeng ti rebision",
+	"log-action-filter-suppress-delete": "Panagpasardeng ti panid",
+	"log-action-filter-suppress-block": "Panagpasardeng ti agar-aramat babaen ti serra",
+	"log-action-filter-suppress-reblock": "Panagpasardeng ti agar-aramat babaen ti panagserra manen",
+	"log-action-filter-upload-upload": "Baro a panangikarga",
+	"log-action-filter-upload-overwrite": "Panangikarga manen",
+	"authmanager-authn-not-in-progress": "Saan nga agprogprogreso ti pammasingked wenno napukaw ti datos ti sesion. Pangngaasi a mangrugi manen iti pagrugian.",
+	"authmanager-authn-no-primary": "Dagiti naited a kredensial ket saan a mapasingkedan.",
+	"authmanager-authn-no-local-user": "Dagiti naited a kredensial ket saanda a mainaig iti sino man nga agar-aramat iti daytoy a wiki.",
+	"authmanager-authn-no-local-user-link": "Dagiti naited a kredensial ket husto ngem saanda a mainaig iti sino man nga agar-aramat iti daytoy a wiki. Sumrek iti sabali a waya, wenno agpartuat iti baro a pakabilangan, ken addaankanto iti maysa a pagpilian a mangisipo kadagiti dati a kredensialmo iti dayta a pakabilangan.",
+	"authmanager-authn-autocreate-failed": "Napaay ti automatiko a panagpartuat iti lokal a pakabilangan: $1",
+	"authmanager-change-not-supported": "Dagiti naited a kredensial ket saan a mabaliwan, gapu ta awan ti mangusar kaniada.",
+	"authmanager-create-disabled": "Nabaldado ti panagpartuat ti pakabilangan.",
+	"authmanager-create-from-login": "Tapno mapartuat ti pakabilangam, pangngaasi a punnuen dagiti pagikabilan dita baba.",
+	"authmanager-create-not-in-progress": "Saan nga agprogprogreso ti panagpartuat ti pakabilangan wenno napukaw ti datos ti sesion. Pangngaasi a mangrugi manen iti pagrugian.",
+	"authmanager-create-no-primary": "Dagiti naited a kredensial ket saan a mabalin a mausar para iti panagpartuat ti pakabilangan.",
+	"authmanager-link-no-primary": "Dagiti naited a kredensial ket saan a mabalin a mausar para iti panangisilpo ti pakabilangan.",
+	"authmanager-link-not-in-progress": "Saan nga agprogprogreso ti panangisilpo ti pakabilangan wenno napukaw ti datos ti sesion. Pangngaasi a mangrugi manen iti pagrugian.",
+	"authmanager-authplugin-setpass-failed-title": "Napaay ti panagbaliw ti kontrasenias",
+	"authmanager-authplugin-setpass-failed-message": "Ti plugin ti pammasingked ket di nangipalubos ti panagbaliw ti kontrasenias.",
+	"authmanager-authplugin-create-fail": "Ti plugin ti pammasingked ket di nangipalubos ti panagpartuat ti pakabilangan.",
+	"authmanager-authplugin-setpass-denied": "Ti plugin ti pammasingked ket saan a mangipalubos iti panagbaliw kadagiti kontrasenias.",
+	"authmanager-authplugin-setpass-bad-domain": "Imbalido a dominio.",
+	"authmanager-autocreate-noperm": "Saan a maipalubos ti automatiko a panagpartuat ti pakabilangan.",
+	"authmanager-autocreate-exception": "Temporario a nabaldado ti automatiko a panagpartuat iti pakabilangan gapu kadagiti dati a biddut.",
+	"authmanager-userdoesnotexist": "Ti pakabilangan ti agar-aramat ni \"$1\" ket saan a nakarehistro.",
+	"authmanager-userlogin-remembermypassword-help": "No ti kontrasenias ket nasken koma a malagip para iti napapaut ngem ti kaatiddog ti sesion.",
+	"authmanager-username-help": "Nagan ti agar-aramat para iti pammasingked.",
+	"authmanager-password-help": "Kontrasenias para iti pammasingked.",
+	"authmanager-domain-help": "Dominio para iti akinruar a pammasingked.",
+	"authmanager-retype-help": "Kontrasenias manen tapno mapasingkedan.",
+	"authmanager-email-label": "Esurat",
+	"authmanager-email-help": "Adres ti esurat",
+	"authmanager-realname-label": "Pudno a nagan",
+	"authmanager-realname-help": "Pudno a nagan ti agar-aramat",
+	"authmanager-provider-password": "Naibatay iti kontrasenias a pammasingked",
+	"authmanager-provider-password-domain": "Naibatay iti kontrasenias ken dominio a pammasingked",
+	"authmanager-provider-temporarypassword": "Temporario a kontrasenias",
+	"authprovider-confirmlink-message": "Naibatay kadagiti kinaudi a panagpadasmo a panagserrek, dagiti sumaganad a pakabilangan ket mabalin a maisilpo iti pakabilangam iti wiki. Ti panangisilpo kaniada ket mangipalubos iti panagserrek babaen kadagita a pakabilangan. Pangngaasi nga agpili no ania kadagita ti nasken a maisilpo.",
+	"authprovider-confirmlink-request-label": "Dagiti pakabilangan a nasken koma a naisilpo",
+	"authprovider-confirmlink-success-line": "$1: Balligi a naisilpo.",
+	"authprovider-confirmlink-failed": "Saan a napno a nagballigi ti panangisilpo ti pakabilangan: $1",
+	"authprovider-confirmlink-ok-help": "Agtuloy kalpasan ti panangipakita kadagiti mensahe ti pannakapaay ti panangisilpo.",
+	"authprovider-resetpass-skip-label": "Libtawan",
+	"authprovider-resetpass-skip-help": "Libtawan ti panangisaad manen ti kontrasenias.",
+	"authform-nosession-login": "Balligi ti pammasingked, ngem ti pagbasabasam ket saanna a \"malagip\" a nakastrek.\n\n$1",
+	"authform-nosession-signup": "Napartuat ti pakabilangan, ngem ti pagbasabasam ket saanna a \"malagip\" a nakastrek.\n\n$1",
+	"authform-newtoken": "Napukaw a tandaan. $1",
+	"authform-notoken": "Napukaw a tandaan",
+	"authform-wrongtoken": "Kamali a tandaan",
+	"specialpage-securitylevel-not-allowed-title": "Saan a maipalubos",
+	"specialpage-securitylevel-not-allowed": "Pasensia, saanka a mapalubosan nga agusar iti daytoy a panid gapu ta saan a mapasingkedan ti identidadmo.",
+	"authpage-cannot-login": "Saan a mabalin ti mangrugi a sumrek.",
+	"authpage-cannot-login-continue": "Saan a mabalin ti agtuloy a sumrek. Mabalin a nagsardeng ti sesionmo.",
+	"authpage-cannot-create": "Saan a mabalin ti mangrugi nga agpartuat iti pakabilangan.",
+	"authpage-cannot-create-continue": "Saan a mabalin ti agtuloy iti panagpartuat iti pakabilangan. Mabalin a nagsardeng ti sesionmo.",
+	"authpage-cannot-link": "Saan a mabalin ti mangrugi iti panangisilpo ti pakabilangan.",
+	"authpage-cannot-link-continue": "Saan a mabalin ti agtuloy iti panangisilpo ti pakabilangan. Mabalin a nagsardeng ti sesionmo.",
+	"cannotauth-not-allowed-title": "Nalibak ti pammalubos",
+	"cannotauth-not-allowed": "Saanka a mapalubosan nga agusar iti daytoy a panid",
+	"changecredentials": "Baliwan dagiti kredensial",
+	"changecredentials-submit": "Baliwan dagiti kredensial",
+	"changecredentials-invalidsubpage": "Ti $1 ket saan a husto a kita ti kredensial.",
+	"changecredentials-success": "Nabaliwanen dagiti kredensialmo.",
+	"removecredentials": "Ikkaten dagiti kredensial",
+	"removecredentials-submit": "Ikkaten dagiti kredensial",
+	"removecredentials-invalidsubpage": "Ti $1 ket saan a husto a kita ti kredensial.",
+	"removecredentials-success": "Naiyalisen dagiti kredesialmo.",
+	"credentialsform-provider": "Kita dagiti kredensial:",
+	"credentialsform-account": "Nagan ti pakabilangan:",
+	"cannotlink-no-provider-title": "Awan dagiti mabalin a maisilpo a pakabilangan",
+	"cannotlink-no-provider": "Awan dagiti mabalin a maisilpo a pakabilangan.",
+	"linkaccounts": "Isilpo dagiti pakabilangan",
+	"linkaccounts-success-text": "Naisilpon ti pakabilangan.",
+	"linkaccounts-submit": "Isilpo dagiti pakabilangan",
+	"unlinkaccounts": "Ikkaten ti silpo dagiti pakabilangan",
+	"unlinkaccounts-success": "Ti pakabilangan ket naikkat iti pannakaisilpo.",
+	"authenticationdatachange-ignored": "Saan a natengngel ti panagbaliw ti datos ti pammasingked. Mabalin nga awan ti nakompigura a mangited?"
 }
diff --git a/languages/i18n/it.json b/languages/i18n/it.json
index 72788b3572..b8074882f8 100644
--- a/languages/i18n/it.json
+++ b/languages/i18n/it.json
@@ -1283,6 +1283,7 @@
 	"grant-group-high-volume": "Esegue azioni massive",
 	"grant-group-customization": "Personalizzazione e preferenze",
 	"grant-group-administration": "Esegue azioni amministrative",
+	"grant-group-private-information": "Accede ai dati privati su di te",
 	"grant-group-other": "Attività varie",
 	"grant-blockusers": "Blocca e sblocca utenti",
 	"grant-createaccount": "Crea un'utenza",
@@ -1297,6 +1298,7 @@
 	"grant-highvolume": "Modifiche massive",
 	"grant-oversight": "Nasconde utenti e sopprime le versioni",
 	"grant-patrol": "Segna le modifiche alle pagine come verificate",
+	"grant-privateinfo": "Accede a informazioni private",
 	"grant-protect": "Protegge e sprotegge pagine",
 	"grant-rollback": "Rollback delle modifiche alle pagine",
 	"grant-sendemail": "Invia email ad altri utenti",
@@ -2196,6 +2198,7 @@
 	"undeletehistorynoadmin": "Questa pagina è stata cancellata.\nIl motivo della cancellazione è mostrato qui sotto, assieme ai dettagli dell'utente che ha modificato questa pagina prima della cancellazione.\nIl testo contenuto nelle versioni cancellate è disponibile solo agli amministratori.",
 	"undelete-revision": "Versione cancellata della pagina $1, inserita il $4 alle $5 da $3:",
 	"undeleterevision-missing": "Versione errata o mancante. Il collegamento è errato oppure la versione è stata già ripristinata o eliminata dall'archivio.",
+	"undeleterevision-duplicate-revid": "{{PLURAL:$1|Una versione non può essere ripristinata|$1 versioni non possono essere ripristinate}}, poiché {{PLURAL:$1|il suo|i loro}} <code>rev_id</code> {{PLURAL:$1|è già utilizzato|sono già utilizzati}}.",
 	"undelete-nodiff": "Non è stata trovata nessuna versione precedente.",
 	"undeletebtn": "Ripristina",
 	"undeletelink": "visualizza/ripristina",
@@ -2205,7 +2208,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|Una versione recuperata|$1 versioni recuperate}}",
 	"undeletedrevisions-files": "{{PLURAL:$1|Una versione|$1 versioni}} e $2 file recuperati",
 	"undeletedfiles": "{{PLURAL:$1|Un file recuperato|$1 file recuperati}}",
-	"cannotundelete": "Ripristino non riuscito:\n$1",
+	"cannotundelete": "Alcuni o tutti i ripristini non riusciti:\n$1",
 	"undeletedpage": "'''La pagina $1 è stata recuperata'''\n\nConsulta il [[Special:Log/delete|registro delle cancellazioni]] per vedere le cancellazioni e i recuperi più recenti.",
 	"undelete-header": "Consulta il [[Special:Log/delete|registro delle cancellazioni]] per vedere le cancellazioni più recenti.",
 	"undelete-search-title": "Ricerca nelle pagine cancellate",
diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json
index 491e492a4b..321c5d46b4 100644
--- a/languages/i18n/ja.json
+++ b/languages/i18n/ja.json
@@ -2162,6 +2162,7 @@
 	"undeletehistorynoadmin": "このページは削除されています。\n削除の理由は、削除前にこのページを編集していた利用者の詳細情報と共に、以下に表示されています。\n管理者以外の利用者には、削除された各版の本文への制限がかけられています。",
 	"undelete-revision": "削除されたページ $1 の $4 $5 時点での $3 による版:",
 	"undeleterevision-missing": "無効または存在しない版です。\n間違ったリンクをたどったか、この版は既に復元されたか、もしくは保存版から除去された可能性があります。",
+	"undeleterevision-duplicate-revid": "<code>rev_id</code> は既に使用されているため、{{PLURAL:$1|1件の版|$1件の版}}を復元できませんでした。",
 	"undelete-nodiff": "これより前の版はありません。",
 	"undeletebtn": "復元",
 	"undeletelink": "閲覧/復元",
@@ -2171,7 +2172,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|$1版}}を復元しました",
 	"undeletedrevisions-files": "{{PLURAL:$1|$1版}}と{{PLURAL:$2|$2ファイル}}を復元しました",
 	"undeletedfiles": "{{PLURAL:$1|$1ファイル}}を復元しました",
-	"cannotundelete": "復元に失敗しました:\n$1",
+	"cannotundelete": "復元に一部またはすべて失敗しました:\n$1",
 	"undeletedpage": "<strong>$1を復元しました。</strong>\n\n最近の削除と復元の記録については[[Special:Log/delete|削除記録]]を参照してください。",
 	"undelete-header": "最近削除されたページは[[Special:Log/delete|削除記録]]で確認できます。",
 	"undelete-search-title": "削除されたページの検索",
diff --git a/languages/i18n/jv.json b/languages/i18n/jv.json
index f3a64098d8..f70f5813af 100644
--- a/languages/i18n/jv.json
+++ b/languages/i18n/jv.json
@@ -150,7 +150,7 @@
 	"listingcontinuesabbrev": "samb.",
 	"index-category": "Kaca kaindhèksan",
 	"noindex-category": "Kaca ora kaindhèksan",
-	"broken-file-category": "Kaca mawa pranala berkas rusak",
+	"broken-file-category": "Kaca mawa pranala barkas rusak",
 	"about": "Bab",
 	"article": "Kaca isi",
 	"newwindow": "(buka mawa jendhéla anyar)",
@@ -341,8 +341,8 @@
 	"no-null-revision": "Ora isa nggawe revisi 'null' anyar kanggo kaca \"$1\"",
 	"badtitle": "Sesirah ala",
 	"badtitletext": "Sesirahing kaca sing dikarepaké ora sah, suwung, utawa salah nggayut nyang sesirah antarabasa utawa antarawiki.\nIku mungkin ngandhut pralambang siji utawa luwih sing ora kena dianggo tumrap sesirah iki.",
-	"perfcached": "Data iki mung dijupuk saka papan singgahan lan mungkin ora kaanyaran. Maksimum {{PLURAL:$1|sak asil|$1 asil}} sumadhiya nèng papan singgahan.",
-	"perfcachedts": "Data iki mung dijupuk saka papan singgahan lan mungkin dianyari pungkasan $1. Maksimum {{PLURAL:$4|sak asil|$4 asil}} sumadhiya nèng papan singgahan.",
+	"perfcached": "Data ing ngisor iki kasimpen ing telih lan mungkin durung dianyari. Paling akèh ana {{PLURAL:$1|sakasil|$1 kasil}} sumadhiya ing telih iku.",
+	"perfcachedts": "Data ing ngisor iki kasimpen ing telih, lan pungkasan dianyari $1. Paling akèh ana {{PLURAL:$4|sakasil|$4 kasil}} sumadhiya ing telih iku.",
 	"querypage-no-updates": "Update saka kaca iki lagi dipatèni. Data sing ana ing kéné saiki ora bisa bakal dibalèni unggah manèh.",
 	"viewsource": "Deleng sumber",
 	"viewsource-title": "Delok sumberé $1",
@@ -577,6 +577,7 @@
 	"anoneditwarning": "<strong>Penget:</strong> Panjenengan boten mlebet log. Alamat IP Panjenengan badhe katingal dening publik manawi Panjenengan ngayahi ewah-ewahan. Manawi Panjenengan  <strong>[$1 mlebet log]</strong> utawai <strong>[$2 damel akun]</strong>, suntingan Panjenengan badhe kaatribusekaken dhumateng  nama pangangge Panjenengan, lan rupi-rupi  kauntungan sanesipun.",
 	"anonpreviewwarning": "''Sampéyan durung mlebu log. Nyimpen bakal nyathet alamat IP Sampéyan nèng riwayat sunting kaca iki.''",
 	"missingsummary": "'''Pènget:''' Panjenengan ora nglebokaké ringkesan panyuntingan. Menawa panjenengan mencèt tombol Simpen manèh, suntingan panjenengan bakal kasimpen tanpa ringkesan panyuntingan.",
+	"selfredirect": "<strong>Pélik:</strong> Sampéyan ngalih kaca iki iya nyang kaca iki dhéwé.\nSampéyan mungkin salah wènèh tujuan kanggo alihan utawa salah mbesut kaca.\nYèn sampéyan ngeklik \"{{int:savearticle}}\" manèh, kaca alihan bakal digawé.",
 	"missingcommenttext": "Mangga isi tanggapan ing ngisor iki.",
 	"missingcommentheader": "'''Pangéling:''' Sampéyan durung nyadhiyakaké judhul/jejer kanggo tanggepan iki.\nYèn Sampéyan klik \"{{int:savearticle}}\" manèh, suntingan Sampéyan bakal kasimpen tanpa kuwi.",
 	"summary-preview": "Pratuduh tingkesan:",
@@ -853,6 +854,7 @@
 	"searchrelated": "magepokan",
 	"searchall": "kabèh",
 	"showingresults": "Ing ngisor iki dituduhaké {{PLURAL:$1|'''1''' kasil|'''$1''' kasil}}, wiwitané saking #<strong>$2</strong>.",
+	"showingresultsinrange": "Nuduhaké nganti {{PLURAL:$1|<strong>1</strong> kasil|<strong>$1</strong> kasil}} sajeroning penthangan #<strong>$2</strong> tekan #<strong>$3</strong>.",
 	"search-showingresults": "{{PLURAL:$4|Asil <strong>$1</strong> dari <strong>$3</strong>|Asil <strong>$1 - $2</strong> saking <strong>$3</strong>}}",
 	"search-nonefound": "Ora ana kasil sing cocog karo pitakonan (''query'').",
 	"powersearch-legend": "Panggolèkan sabanjuré (''advance search'')",
@@ -927,7 +929,7 @@
 	"prefs-searchoptions": "Golèk",
 	"prefs-namespaces": "Ruang jeneng / Bilik jeneng",
 	"default": "baku",
-	"prefs-files": "Berkas",
+	"prefs-files": "Barkas",
 	"prefs-custom-css": "CSS priangga",
 	"prefs-custom-js": "JavaScript priangga",
 	"prefs-common-css-js": "CSS/JS didumaké kanggo kabèh kulit:",
@@ -1023,7 +1025,7 @@
 	"right-move-rootuserpages": "Ngalih kaca panganggo oyod",
 	"right-movefile": "Mindhah berkas",
 	"right-suppressredirect": "Aja nggawé pangalihan saka kaca sing lawas yèn mindhah sawijining kaca",
-	"right-upload": "Ngunggahaké berkas-berkas",
+	"right-upload": "Unggah barkas",
 	"right-reupload": "Tindhihana sawijining berkas sing wis ana",
 	"right-reupload-own": "Nimpa sawijining berkas sing wis ana lan diunggahaké déning panganggo sing padha",
 	"right-reupload-shared": "Timpanana berkas-berkas ing khazanah binagi sacara lokal",
@@ -1083,7 +1085,7 @@
 	"grant-createaccount": "Gawé akun",
 	"grant-createeditmovepage": "Gawé, besut, lan lih kaca",
 	"grant-delete": "Busak kaca, owahan, lan isian cathetan",
-	"newuserlogpage": "Cathetan panganggo anyar",
+	"newuserlogpage": "Log naraguna anyar",
 	"newuserlogpagetext": "Ing ngisor iki kapacak log pandaftaran panganggo anyar.",
 	"rightslog": "Log pangowahan hak aksès",
 	"rightslogtext": "Ing ngisor iki kapacak log pangowahan marang hak-hak panganggo.",
@@ -1205,7 +1207,7 @@
 	"upload-prohibited": "Jenis berkas sing dilarang: $1.",
 	"uploadlogpage": "Log pangunggahan",
 	"uploadlogpagetext": "Ing ngisor iki kapacak log pangunggahan berkas sing anyar dhéwé.\nMangga mirsani [[Special:NewFiles|galeri berkas-berkas anyar]] kanggo pratélan visual.",
-	"filename": "Jeneng berkas",
+	"filename": "Jeneng barkas",
 	"filedesc": "Tingkesan",
 	"fileuploadsummary": "Ringkesan:",
 	"filereuploadsummary": "Owah-owahan berkas:",
@@ -1249,7 +1251,7 @@
 	"file-deleted-duplicate": "Sawijining berkas persis berkas iki ([[:$1]]) wis tau dibusak. Mangga panjenengan priksani sajarah pambusakan berkas kasebut sadurungé nerusaké ngunggahaké berkas kuwi manèh.",
 	"uploadwarning": "Pèngetan pangunggahan berkas",
 	"uploadwarning-text": "Mangga owah katrangan berkas nèng ngisor lan coba manèh.",
-	"savefile": "Simpen berkas",
+	"savefile": "Simpen barkas",
 	"uploaddisabled": "Nuwun sèwu, fasilitas pangunggahan dipatèni.",
 	"copyuploaddisabled": "Ngunggah mawa URL dipatèni.",
 	"uploaddisabledtext": "Pangunggahan berkas ora diidinaké.",
@@ -1257,7 +1259,7 @@
 	"uploadscripted": "Berkas iki ngandhut HTML utawa kode sing bisa diinterpretasi salah déning panjlajah wèb.",
 	"uploadvirus": "Berkas iki ngamot virus! Détil: $1",
 	"uploadjava": "Berkas kuwi berkas ZIP sing kaisi berkas .class Java.\nNgungga berkas Java ora dililakaké amarga bisa nyebabaké ngluwèhaké wates kamanan.",
-	"upload-source": "Berkas sumber",
+	"upload-source": "Barkas sumber",
 	"sourcefilename": "Jeneng berkas sumber:",
 	"sourceurl": "URL sumber:",
 	"destfilename": "Jeneng berkas sing dituju",
@@ -1370,7 +1372,7 @@
 	"listfiles_thumb": "Gambar mini",
 	"listfiles_date": "Tanggal",
 	"listfiles_name": "Jeneng",
-	"listfiles_user": "Panganggo",
+	"listfiles_user": "Naraguna",
 	"listfiles_size": "Ukuran (bita)",
 	"listfiles_description": "Dèskripsi",
 	"listfiles_count": "Vèrsi",
@@ -1389,7 +1391,7 @@
 	"filehist-thumb": "Gambar cilik",
 	"filehist-thumbtext": "Gambar cilik kanggo owahan $1",
 	"filehist-nothumb": "Ora ana miniatur",
-	"filehist-user": "Panganggo",
+	"filehist-user": "Naraguna",
 	"filehist-dimensions": "Alang ujur",
 	"filehist-filesize": "Gedhené berkas",
 	"filehist-comment": "Tanggapan",
@@ -1482,8 +1484,8 @@
 	"brokenredirectstext": "Pengalihan ing ngisor iki tumuju menyang kaca sing ora ana:",
 	"brokenredirects-edit": "besut",
 	"brokenredirects-delete": "busak",
-	"withoutinterwiki": "Kaca tanpa pranala antarbasa",
-	"withoutinterwiki-summary": "Kaca-kaca iki ora nduwé pranala menyang vèrsi ing  basa liyané:",
+	"withoutinterwiki": "Kaca tanpa pranala basa",
+	"withoutinterwiki-summary": "Kaca-kaca ing ngisor iki ora nggayut nyang vèrsi basa liyané.",
 	"withoutinterwiki-legend": "Préfiks",
 	"withoutinterwiki-submit": "Tuduhna",
 	"fewestrevisions": "Artikel mawa owah-owahan sithik dhéwé",
@@ -1517,7 +1519,7 @@
 	"mostlinkedtemplates": "Kaca paling akèh transklusi",
 	"mostcategories": "Kaca sing kategoriné akèh dhéwé",
 	"mostimages": "Berkas sing kerep dhéwé dienggo",
-	"mostinterwikis": "Halaman dengan interwiki terbanyak",
+	"mostinterwikis": "Kaca mawa interwiki paling akèh",
 	"mostrevisions": "Kaca mawa pangowahan sing akèh dhéwé",
 	"prefixindex": "Kabèh kaca mawa ater-ater",
 	"prefixindex-namespace": "Kabèh kaca mawa ater-ater (bilik jeneng $1)",
@@ -1526,7 +1528,7 @@
 	"shortpages": "Kaca cendhak",
 	"longpages": "Kaca dawa",
 	"deadendpages": "Kaca-kaca buntu (tanpa pranala)",
-	"deadendpagestext": "kaca-kaca iki ora nduwé pranala tekan ngendi waé ing wiki iki..",
+	"deadendpagestext": "Kaca-kaca ing ngisor iki ora nggayut nyang kaca liya ing {{SITENAME}}.",
 	"protectedpages": "Kaca sing direksa",
 	"protectedpages-indef": "Namung pangreksan ora langgeng waé",
 	"protectedpages-cascade": "Amung kaca rineksan kang runtut",
@@ -1574,7 +1576,7 @@
 	"booksources-invalid-isbn": "ISBN sing diwènèhaké katonané ora valid; priksa kasalahan penyalinan saka sumber asli.",
 	"specialloguserlabel": "Panampil:",
 	"speciallogtitlelabel": "Patujon (judhul utawa panganggo) :",
-	"log": "Cathetan",
+	"log": "Log",
 	"all-logs-page": "Kabèh log publik",
 	"alllogstext": "Gabungan tampilam kabèh log sing ana ing {{SITENAME}}.\nPanjenengan bisa mbatesi tampilan kanthi milih jinis log, jeneng panganggo (sènsitif aksara gedhé/cilik), utawa kaca sing magepokan (uga sènsitif aksara gedhé/cilik).",
 	"logempty": "Ora ditemokaké èntri log sing pas.",
@@ -1716,10 +1718,10 @@
 	"delete-legend": "Busak",
 	"historywarning": "'''Pènget''': Kaca sing bakal panjenengan busak ana sajarahé kanthi $1 {{PLURAL:$1|révisi|révisi}}:",
 	"confirmdeletetext": "Panjenengan bakal mbusak kaca utawa berkas iki minangka permanèn karo kabèh sajarahé saka basis data. Pastèkna dhisik menawa panjenengan pancèn nggayuh iki, ngerti kabèh akibat lan konsekwènsiné, lan apa sing bakal panjenengan tumindak iku cocog karo [[{{MediaWiki:Policy-url}}|kawicaksanan {{SITENAME}}]].",
-	"actioncomplete": "Proses tuntas",
+	"actioncomplete": "Kasil diayahi",
 	"actionfailed": "Tindakan gagal",
-	"deletedtext": "\"$1\" sampun kabusak. Coba pirsani $2 kanggé log paling énggal kaca ingkang kabusak.",
-	"dellogpage": "Cathetan busakan",
+	"deletedtext": "\"$1\" wis dibusak. \nDelenga $2 minangka rekamaning busak-busakan pungkasan.",
+	"dellogpage": "Log busak",
 	"dellogpagetext": "Ing ngisor iki kapacak log pambusakan kaca sing anyar dhéwé.",
 	"deletionlog": "Cathetan sing dibusak",
 	"reverted": "Dibalèkaké ing revisi sadurungé",
@@ -1744,7 +1746,7 @@
 	"rollback-success": "Suntingan dibalèkaké déning $1;\ndiowahi bali menyang vèrsi pungkasan déning $2.",
 	"sessionfailure-title": "Sèsi gagal",
 	"sessionfailure": "Katoné ana masalah karo sèsi log panjenengan; log panjenengan wis dibatalaké kanggo nyegah pambajakan. Mangga mencèt tombol \"back\" lan unggahaké manèh kaca sadurungé mlebu log, lan coba manèh.",
-	"protectlogpage": "Cathetan pangreksan",
+	"protectlogpage": "Log reksa",
 	"protectlogtext": "Ngisor iki daptar owahan saka panjagan kaca.\nDelok [[Special:ProtectedPages|daptar kaca sing dijaga]] kanggo daptar panjagan kaca paling anyar.",
 	"protectedarticle": "ngreksa \"[[$1]]\"",
 	"modifiedarticleprotection": "ngowahi tingkat pangreksan \"[[$1]]\"",
@@ -1785,7 +1787,7 @@
 	"protect-otherreason-op": "Alesan liya",
 	"protect-dropdown": "*Alesan umum pangreksan\n** Vandalisme makaping-kaping\n** Spam makaping-kaping\n** Perang suntingan\n** Kaca kerep disunting",
 	"protect-edit-reasonlist": "Mbesut jalaraning pangreksa",
-	"protect-expiry-options": "1 jam:1 hour,1 dina:1 day,1 minggu:1 week,2 minggu:2 weeks,1 sasi:1 month,3 sasi:3 months,6 sasi:6 months,1 taun:1 year,tanpa wates:infinite",
+	"protect-expiry-options": "1 jam:1 hour,1 dina:1 day,1 minggu:1 week,2 minggu:2 weeks,1 wulan:1 month,3 wulan:3 months,6 wulan:6 months,1 taun:1 year,tanpa wates:infinite",
 	"restriction-type": "Pangreksan:",
 	"restriction-level": "Tingkatan pambatesan:",
 	"minimum-size": "Ukuran minimum",
@@ -1870,7 +1872,7 @@
 	"whatlinkshere": "Sing nggayut mréné",
 	"whatlinkshere-title": "Kaca mawa pranala nggayut \"$1\"",
 	"whatlinkshere-page": "Kaca:",
-	"linkshere": "Kaca-kaca iki nduwé pranala menyang '''[[:$1]]''':",
+	"linkshere": "Kaca-kaca ing ngisor iki nggayut nyang '''[[:$1]]''':",
 	"nolinkshere": "Ora ana kaca sing nduwé pranala menyang '''[[:$1]]'''.",
 	"nolinkshere-ns": " Ora ana kaca sing nduwé pranala menyang '''[[:$1]]''' ing bilik jeneng sing kapilih.",
 	"isredirect": "kaca lih-lihan",
@@ -1900,7 +1902,7 @@
 	"ipbenableautoblock": "Blokir alamat IP pungkasan sing dienggo déning pengguna iki sacara otomatis, lan kabèh alamat sabanjuré sing dicoba arep dienggo nyunting.",
 	"ipbsubmit": "Kirimna",
 	"ipbother": "Wektu liya",
-	"ipboptions": "2 jam:2 hours,1 dina:1 day,3 dina:3 days,1 minggu:1 week,2 minggu:2 weeks,1 sasi:1 month,3 sasi:3 months,6 sasi:6 months,1 taun:1 year,tanpa wates:infinite",
+	"ipboptions": "2 jam:2 hours,1 dina:1 day,3 dina:3 days,1 minggu:1 week,2 minggu:2 weeks,1 wulan:1 month,3 wulan:3 months,6 wulan:6 months,1 taun:1 year,tanpa wates:infinite",
 	"ipbhidename": "Delikna jeneng panganggo saka suntingan lan pratélan",
 	"ipbwatchuser": "Wasi kaca panganggoning lan kaca gegunemaning panganggo iki",
 	"ipb-disableusertalk": "Alangi panganggo iki nyunting kaca gunemané nalika diblokir",
@@ -1956,8 +1958,8 @@
 	"blocklogpage": "Log pamblokiran",
 	"blocklog-showlog": "Panganggo iki wis tau diblokir sakdurungé.\nLog blokiran sumadhiya nèng ngisor kanggo rujukan:",
 	"blocklog-showsuppresslog": "Panganggo iki wis tau diblokir lan didhelikaké sakdurungé.\nLog brèdèlan sumadhiya nèng ngisor kanggo rujukan:",
-	"blocklogentry": "mblokir \"[[$1]]\" dipun watesi wekdalipun $2 $3",
-	"reblock-logentry": "Ngowahi sèting pamblokiran [[$1]] kanthi wektu daluwarsa $2 $3",
+	"blocklogentry": "mblokir [[$1]] kanthi wektu kadaluwarsa $2 $3",
+	"reblock-logentry": "ngowah setèlan blokir tumrap [[$1]] kanthi wektu kadaluwarsa $2 $3",
 	"blocklogtext": "Ing ngisor iki kapacak log pamblokiran lan panjabelan blokir panganggo.\nAlamat IP sing diblokir sacara otomatis ora ana ing daftar iki.\nMangga mirsani [[Special:BlockList|daftar panganggo sing diblokir]] kanggo daftar blokir pungkasan.",
 	"unblocklogentry": "njabel blokir \"$1\"",
 	"block-log-flags-anononly": "namung panganggo anonim waé",
@@ -1969,6 +1971,7 @@
 	"block-log-flags-hiddenname": "jeneng panganggo didhelikaké",
 	"range_block_disabled": "Fungsi pamblokir blok IP kanggo para opsis dipatèni.",
 	"ipb_expiry_invalid": "Wektu kadaluwarsa ora absah.",
+	"ipb_expiry_old": "Wektu kadaluwarsa ana ing nguni.",
 	"ipb_expiry_temp": "Pamblokiran tumrap jeneng panganggo sing didhelikaké kudu permanèn.",
 	"ipb_hide_invalid": "Ora bisa ndhelikaké akun iki; manawa wis kakèhan suntingan.",
 	"ipb_already_blocked": "\"$1\" wis diblokir",
@@ -2030,7 +2033,7 @@
 	"movepage-page-moved": "Kaca $1 wis dipindhah menyang $2.",
 	"movepage-page-unmoved": "Kaca $1 ora bisa dialihaké menyang $2.",
 	"movepage-max-pages": "Paling akèh $1 {{PLURAL:$1|kaca|kaca}} wis dialihaké lan ora ana manèh sing bakal dialihaké sacara otomatis.",
-	"movelogpage": "Cathetan lih-lihan",
+	"movelogpage": "Log alih",
 	"movelogpagetext": "Ing ngisor iki kapacak log pangalihan kaca.",
 	"movesubpage": "{{PLURAL:$1|Anak-kaca|Anak-kaca}}",
 	"movesubpagetext": "Kaca iki nduwèni $1 {{PLURAL:$1|anak-kaca|anak-kaca}} kaya kapacak ing ngisor.",
@@ -2104,7 +2107,7 @@
 	"import-interwiki-history": "Tuladen kabèh vèrsi lawas saka kaca iki",
 	"import-interwiki-templates": "Katutna kabèh cithakan",
 	"import-interwiki-submit": "Impor",
-	"import-upload-filename": "Jeneng berkas:",
+	"import-upload-filename": "Jeneng barkas:",
 	"import-comment": "Komentar:",
 	"importtext": "Mangga èkspor berkas saka wiki sumber nganggo [[Special:Export|prangkat èkspor]].\nSimpen nèng komputer Sampéyan lan unggaha nèng kéné.",
 	"importstart": "Ngimpor kaca...",
@@ -2331,7 +2334,7 @@
 	"hours": "{{PLURAL:$1|$1 jam|$1 jam}}",
 	"days": "{{PLURAL:$1|$1 dina|$1 dina}}",
 	"weeks": "{{PLURAL:$1|minggu|minggu}}",
-	"months": "{{PLURAL:$1|$1 sasi|$1 sasi}}",
+	"months": "{{PLURAL:$1|$1 wulan}}",
 	"years": "{{PLURAL:$1|$1 taun|$1 taun}}",
 	"ago": "$1 kapungkur",
 	"just-now": "baru saja",
@@ -2418,7 +2421,7 @@
 	"exif-subjectlocation": "Lokasi subjèk",
 	"exif-exposureindex": "Indhèks pajanan",
 	"exif-sensingmethod": "Métodhe pangindran",
-	"exif-filesource": "Sumber berkas",
+	"exif-filesource": "Sumber barkas",
 	"exif-scenetype": "Tipe panyawangan",
 	"exif-customrendered": "Prosès nggawé gambar",
 	"exif-exposuremode": "Modhe pajanan",
@@ -2812,7 +2815,7 @@
 	"redirect-user": "ID panganggo",
 	"redirect-page": "ID kaca",
 	"redirect-revision": "Revisi kaca",
-	"redirect-file": "Jeneng berkas",
+	"redirect-file": "Jeneng barkas",
 	"redirect-not-exists": "Nilai ora ditemokaké",
 	"fileduplicatesearch": "Golèk berkas duplikat",
 	"fileduplicatesearch-summary": "Golèk duplikat berkas adhedhasar biji hash-é.",
@@ -2906,6 +2909,10 @@
 	"revdelete-uname-unhid": "jeneng panganggo dituduhaké",
 	"revdelete-restricted": "rèstriksi ditrapaké marang para opsis",
 	"revdelete-unrestricted": "rèstriksi marang para opsis dijabel",
+	"logentry-block-block": "$1 {{GENDER:$2|mblokir}} {{GENDER:$4|$3}} kanthi wektu kadaluwarsa $5 $6",
+	"logentry-block-reblock": "$1 {{GENDER:$2|ngowah}} setèlan blokir tumrap {{GENDER:$4|$3}} kanthi wektu kadaluwarsa $5 $6",
+	"logentry-suppress-block": "$1 {{GENDER:$2|mblokir}} {{GENDER:$4|$3}} kanthi wektu kadaluwarsa $5 $6",
+	"logentry-suppress-reblock": "$1 {{GENDER:$2|ngowah}} setèlan blokir tumrap {{GENDER:$4|$3}} kanthi wektu kadaluwarsa $5 $6",
 	"logentry-move-move": "$1 {{GENDER:$2|ngalih}} kaca $3 nyang $4",
 	"logentry-move-move-noredirect": "$1 {{GENDER:$2|mindhahaké}} kaca $3 nèng $4 tanpa ninggalaké pangalihan",
 	"logentry-move-move_redir": "$1 {{GENDER:$2|mindhahaké}} kaca $3 nèng $4 nindesi pangalihan liyane",
diff --git a/languages/i18n/kk-cyrl.json b/languages/i18n/kk-cyrl.json
index c634c56cc2..f6df3c30c1 100644
--- a/languages/i18n/kk-cyrl.json
+++ b/languages/i18n/kk-cyrl.json
@@ -1201,7 +1201,7 @@
 	"recentchanges-label-minor": "Бұл шағын өңдеме",
 	"recentchanges-label-bot": "Бұл өңдемені бот жасады.",
 	"recentchanges-label-unpatrolled": "Бұл өңдеме әлі тексеруден өтпеді.",
-	"recentchanges-label-plusminus": "Байт бойынша беттің өзгеріс өлшемі",
+	"recentchanges-label-plusminus": "Байт бойынша беттің өзгеріс мөлшері",
 	"recentchanges-legend-heading": "<strong>Шартты белгілер:</strong>",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (қ: [[Special:NewPages|бөлек бетте]])",
 	"recentchanges-legend-plusminus": "(<em>±123</em>)",
@@ -2008,6 +2008,7 @@
 	"sp-contributions-username": "IP-мекенжайы немесе қатысушы аты:",
 	"sp-contributions-toponly": "Өңдемелердің тек соңғы нұсқаларын көрсету",
 	"sp-contributions-newonly": "Бет бастау өңдемелерін ғана көрсету",
+	"sp-contributions-hideminor": "Шағын өңдемелерді жасыру",
 	"sp-contributions-submit": "Іздеу",
 	"whatlinkshere": "Мұнда сілтейтін беттер",
 	"whatlinkshere-title": "$1 дегенге сілтейтін беттер",
diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json
index 5b666c7ca5..fd27331454 100644
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -75,7 +75,7 @@
 	"tog-numberheadings": "자동으로 머릿글 번호 매기기",
 	"tog-showtoolbar": "편집 도구 모음 보이기",
 	"tog-editondblclick": "더블 클릭으로 문서 편집하기",
-	"tog-editsectiononrightclick": "제목을 오른쪽 클릭해서 문단 편집하기 활성화",
+	"tog-editsectiononrightclick": "문단 제목을 오른쪽 클릭해서 문단 편집하기 활성화",
 	"tog-watchcreations": "내가 만든 문서와 내가 올린 파일을 주시문서 목록에 추가",
 	"tog-watchdefault": "내가 편집한 문서와 파일을 주시문서 목록에 추가",
 	"tog-watchmoves": "내가 이동한 문서와 파일을 주시문서 목록에 추가",
@@ -93,7 +93,7 @@
 	"tog-oldsig": "현재 서명:",
 	"tog-fancysig": "서명을 위키텍스트로 취급 (자동으로 링크를 걸지 않음)",
 	"tog-uselivepreview": "실시간 미리 보기 사용하기",
-	"tog-forceeditsummary": "편집 요약을 쓰지 않았을 때 물어보기",
+	"tog-forceeditsummary": "편집 요약을 쓰지 않았을 때 내게 물어보기",
 	"tog-watchlisthideown": "주시문서 목록에서 내 편집을 숨기기",
 	"tog-watchlisthidebots": "주시문서 목록에서 봇 편집을 숨기기",
 	"tog-watchlisthideminor": "주시문서 목록에서 사소한 편집을 숨기기",
@@ -106,12 +106,12 @@
 	"tog-diffonly": "편집 차이를 비교할 때 문서 내용을 보지 않기",
 	"tog-showhiddencats": "숨은 분류 보이기",
 	"tog-norollbackdiff": "되돌리기 후 차이를 보지 않기",
-	"tog-useeditwarning": "바꾼 내용을 저장하지 않고 편집 페이지를 벗어날 때 알림",
+	"tog-useeditwarning": "바꾼 내용을 저장하지 않고 편집 페이지를 벗어날 때 내게 경고하기",
 	"tog-prefershttps": "로그인할 때 항상 보안 연결 사용",
 	"underline-always": "항상",
 	"underline-never": "항상 치지 않기",
 	"underline-default": "스킨 또는 브라우저 기본값",
-	"editfont-style": "편집 영역의 글꼴:",
+	"editfont-style": "편집 영역의 글꼴 형식:",
 	"editfont-default": "브라우저 기본값",
 	"editfont-monospace": "고정폭 글꼴",
 	"editfont-sansserif": "산세리프 글꼴",
@@ -536,7 +536,7 @@
 	"acct_creation_throttle_hit": "당신의 IP 주소를 이용한 방문자가 이전에 이미 {{PLURAL:$1|계정 $1개}}를 만들어, 계정 만들기 한도를 초과하였습니다.\n따라서 지금은 이 IP 주소로는 더 이상 계정을 만들 수 없습니다.",
 	"emailauthenticated": "이메일 주소가 $2 $3에 인증되었습니다.",
 	"emailnotauthenticated": "이메일 주소를 인증하지 않았습니다.\n이메일 확인 절차를 거치지 않으면 다음 이메일 기능을 사용할 수 없습니다.",
-	"noemailprefs": "이 기능을 사용하기 위해서는 사용자 환경 설정에서 이메일 주소를 설정해야 합니다.",
+	"noemailprefs": "이 기능을 사용하려면 사용자 환경 설정에서 이메일 주소를 지정하세요.",
 	"emailconfirmlink": "이메일 주소 확인",
 	"invalidemailaddress": "이메일 주소의 형식이 잘못되어 인식할 수 없습니다.\n정상적인 형식의 이메일을 입력하거나 칸을 비워 주세요.",
 	"cannotchangeemail": "이 위키에서는 계정의 이메일 주소를 바꿀 수 없습니다.",
@@ -868,7 +868,7 @@
 	"rev-showdeleted": "보이기",
 	"revisiondelete": "판 삭제/되살리기",
 	"revdelete-nooldid-title": "대상 판이 잘못되었습니다.",
-	"revdelete-nooldid-text": "이 기능을 수행할 특정 판을 제시하지 않았거나 해당 판이 없습니다. 또는 현재 판을 숨기려 하고 있을 수도 있습니다.",
+	"revdelete-nooldid-text": "이 기능을 수행할 대상 판을 지정하지 않았거나 해당 판이 존재하지 않습니다. 아니면 현재 판을 숨기려 하고 있을 수도 있습니다.",
 	"revdelete-no-file": "해당 파일이 존재하지 않습니다.",
 	"revdelete-show-file-confirm": "정말 \"<nowiki>$1</nowiki>\" 파일의 삭제된 $2 $3 버전을 보시겠습니까?",
 	"revdelete-show-file-submit": "예",
@@ -990,7 +990,7 @@
 	"search-category": "(분류 $1)",
 	"search-file-match": "(내용이 일치하는 파일 있음)",
 	"search-suggest": "$1 문서를 찾고 있으신가요?",
-	"search-rewritten": "$1의 결과를 보여주고 있습니다. $2를 대신 검색합니다.",
+	"search-rewritten": "$1의 결과를 보여주고 있습니다. $2을(를) 대신 검색합니다.",
 	"search-interwiki-caption": "자매 프로젝트",
 	"search-interwiki-default": "$1로부터의 결과:",
 	"search-interwiki-more": "(더 보기)",
@@ -1011,7 +1011,7 @@
 	"search-external": "바깥 검색",
 	"searchdisabled": "{{SITENAME}} 검색이 비활성화되어 있습니다.\n검색이 작동하지 않는 동안 Google을 통해 검색할 수 있습니다.\n검색 엔진의 내용은 최신이 아닐 수 있다는 점을 참고하세요.",
 	"search-error": "검색하는 동안 오류가 발생했습니다: $1",
-	"preferences": "사용자 환경 설정",
+	"preferences": "환경 설정",
 	"mypreferences": "환경 설정",
 	"prefs-edits": "편집 수:",
 	"prefsnologintext2": "사용자 환경 설정을 바꾸려면 로그인하세요.",
@@ -1037,8 +1037,8 @@
 	"prefs-resetpass": "비밀번호 바꾸기",
 	"prefs-changeemail": "이메일 주소를 바꾸거나 제거하기",
 	"prefs-setemail": "이메일 주소 설정하기",
-	"prefs-email": "이메일 설정",
-	"prefs-rendering": "문서 보이기",
+	"prefs-email": "이메일 옵션",
+	"prefs-rendering": "보이기",
 	"saveprefs": "저장",
 	"restoreprefs": "(모든 부분에서) 모두 기본 설정으로 되돌리기",
 	"prefs-editing": "편집",
@@ -1052,7 +1052,7 @@
 	"recentchangesdays-max": "최대 $1{{PLURAL:$1|일}}",
 	"recentchangescount": "기본으로 보여줄 편집 수:",
 	"prefs-help-recentchangescount": "이 설정은 최근 바뀜, 문서 역사와 기록에 적용됩니다.",
-	"prefs-help-watchlist-token2": "내 주시문서 목록의 웹 피드의 비밀 키입니다.\n비밀 키를 알고 있는 사람은 내 주시문서 목록을 읽을 수 있으니 비밀 키를 알리지 마세요.\n필요하다면 [[Special:ResetTokens|비밀 키를 재설정할 수 있습니다]].",
+	"prefs-help-watchlist-token2": "내 주시문서 목록의 웹 피드의 비밀 키입니다.\n이 키를 알고 있는 사람은 내 주시문서 목록을 읽을 수 있으니 이 키를 공유하지 마세요.\n필요하다면 [[Special:ResetTokens|이 키를 재설정할 수 있습니다]].",
 	"savedprefs": "설정을 저장했습니다.",
 	"savedrights": "$1의 사용자 권한이 저장되었습니다.",
 	"timezonelegend": "시간대:",
@@ -1104,17 +1104,17 @@
 	"prefs-help-email-others": "자신의 사용자 문서나 토론 문서에 있는 이메일 보내기 링크로 다른 사용자가 연락할 수 있게 할 수도 있습니다.\n이 경우에도 이메일 주소는 다른 사용자가 연락할 때 공개되지 않습니다.",
 	"prefs-help-email-required": "이메일 주소가 필요합니다.",
 	"prefs-info": "기본 정보",
-	"prefs-i18n": "언어 설정",
+	"prefs-i18n": "국제화",
 	"prefs-signature": "서명",
 	"prefs-dateformat": "날짜 형식",
 	"prefs-timeoffset": "시차 설정",
-	"prefs-advancedediting": "일반 설정",
+	"prefs-advancedediting": "일반 옵션",
 	"prefs-editor": "편집기",
 	"prefs-preview": "미리 보기",
-	"prefs-advancedrc": "고급 설정",
-	"prefs-advancedrendering": "고급 설정",
-	"prefs-advancedsearchoptions": "고급 설정",
-	"prefs-advancedwatchlist": "고급 설정",
+	"prefs-advancedrc": "고급 옵션",
+	"prefs-advancedrendering": "고급 옵션",
+	"prefs-advancedsearchoptions": "고급 옵션",
+	"prefs-advancedwatchlist": "고급 옵션",
 	"prefs-displayrc": "표시 설정",
 	"prefs-displaywatchlist": "표시 설정",
 	"prefs-tokenwatchlist": "토큰",
@@ -1244,6 +1244,7 @@
 	"grant-group-high-volume": "대량의 작업 수행",
 	"grant-group-customization": "사용자 최적화 및 환경 설정",
 	"grant-group-administration": "관리 기능 수행",
+	"grant-group-private-information": "당신에 관한 개인 데이터 접근",
 	"grant-group-other": "기타 활동",
 	"grant-blockusers": "사용자 차단 또는 차단 해제",
 	"grant-createaccount": "계정 만들기",
@@ -1257,7 +1258,8 @@
 	"grant-editprotected": "보호된 문서 편집하기",
 	"grant-highvolume": "대용량 편집",
 	"grant-oversight": "사용자 숨기기와 판 억제",
-	"grant-patrol": "페이지 검토",
+	"grant-patrol": "페이지 변경 사항 점검",
+	"grant-privateinfo": "개인 정보 접근",
 	"grant-protect": "문서 보호 및 보호 해제",
 	"grant-rollback": "문서의 바뀜을 되돌리기",
 	"grant-sendemail": "다른 사용자에게 이메일 보내기",
@@ -2615,7 +2617,7 @@
 	"creditspage": "문서 기여자",
 	"nocredits": "이 문서에서는 기여자 정보가 없습니다.",
 	"spamprotectiontitle": "스팸 막기 필터",
-	"spamprotectiontext": "스팸 필터가 문서 저장을 막았습니다.\n바깥 사이트로 연결하는 링크 중에 블랙리스트에 포함된 사이트가 있을 것입니다.",
+	"spamprotectiontext": "저장하려던 글은 스팸 필터에 차단되었습니다.\n블랙리스트에 포함된 외부 사이트의 링크 때문일 수 있습니다.",
 	"spamprotectionmatch": "문제가 되는 부분은 다음과 같습니다: $1",
 	"spambot_username": "미디어위키 스팸 정리",
 	"spam_reverting": "$1에 대한 링크를 포함하지 않는 최신 버전으로 되돌림",
@@ -3380,7 +3382,7 @@
 	"tags-edit-success": "바뀜이 적용되었습니다.",
 	"tags-edit-failure": "수정 사항이 적용될 수 없습니다: $1",
 	"tags-edit-nooldid-title": "대상 판이 잘못되었습니다",
-	"tags-edit-nooldid-text": "이 기능을 수행할 특정 판을 제시하지 않았거나 해당 판이 없습니다.",
+	"tags-edit-nooldid-text": "이 기능을 수행할 대상 판을 지정하지 않았거나 해당 판이 존재하지 않습니다.",
 	"tags-edit-none-selected": "추가하거나 제거할 최소 하나 이상의 태그를 선택하세요.",
 	"comparepages": "문서 비교",
 	"compare-page1": "첫 번째 문서",
diff --git a/languages/i18n/ky.json b/languages/i18n/ky.json
index 7896792566..0d7d482427 100644
--- a/languages/i18n/ky.json
+++ b/languages/i18n/ky.json
@@ -447,8 +447,6 @@
 	"passwordreset-emailtitle": "{{SITENAME}} сайтындагы эсеп жазуусу жөнүндөгү маалымат",
 	"passwordreset-emailelement": "Колдонуучу аты: \n$1\n\nУбактылуу сырсөз: \n$2",
 	"passwordreset-emailsentemail": "Сырсөздү алмаштыруу эмейлге жөнөтүлдү.",
-	"passwordreset-emailsent-capture": "Төмөндө көрсөтүлгөн эмейлге сырсөздү алмаштыруучу кат жөнөтүлдү.",
-	"passwordreset-emailerror-capture": "Төмөндө көрсөтүлгөн дарекке сырсөздү алмаштыруу кат түзүлдү,бирок аны  {{GENDER:$2|катышуучуга}} жөнөтүү оңунан чыккан жок: $1",
 	"changeemail": "E-mail даректи өзгөртүү",
 	"changeemail-header": "Эл. почтанын дарегин өзгөртүү",
 	"changeemail-no-info": "Бул баракка түз кайрылыш үчүн, сиз системага киришиңиз керек.",
@@ -536,7 +534,6 @@
 	"post-expand-template-argument-warning": "'''Эскертүү:''' Бул барак, жок дегенде, абдан чоң көлөмдүү калыптын бир жүйөсүн камтыйт жана  жайылганда өлчөмү абдан чоң болуп кетет. \nУшул сыяктуу жүйөлөр аттатылды.",
 	"post-expand-template-argument-category": "Калыптардын аттатылган жүйөлөрүн камтыган барактар",
 	"parser-template-loop-warning": "Калыптарда илмек бар:[[$1]]",
-	"cantcreateaccounttitle": "Эсеп жазуусун түзүү мүмкүн эмес",
 	"viewpagelogs": "Бул барактын журналдарын көрүү",
 	"nohistory": "Бул барактын өзгөртүүлөр тарыхы жок",
 	"currentrev": "Соңку версиясы",
@@ -1347,7 +1344,7 @@
 	"watchlisttools-view": "Тийиштүү өзгөрүүлөрдү кароо",
 	"watchlisttools-edit": "Көзөмөл тизмесин кароо жана оңдоо",
 	"watchlisttools-raw": "Жетиле элек көзөмөл тизмени оңдоо",
-	"signature": "[[{{ns:колдонуучу}}:$1|$2]] ([[{{ns:колдонуучу_баарлашуу}}:$1|баарлашуу]])",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|баарлашуу]])",
 	"duplicate-defaultsort": "'''Эскертүү:''' \"$2\" белгиленген ылгоочу ачкыч \"$1\" мурунку белгиленген ылгоочу ачкычты жокко чыгарат.",
 	"version": "Версия",
 	"version-extensions": "Орнотулган кеңейтүүлөр",
diff --git a/languages/i18n/la.json b/languages/i18n/la.json
index d2d6046202..1994b0db35 100644
--- a/languages/i18n/la.json
+++ b/languages/i18n/la.json
@@ -968,7 +968,7 @@
 	"shared-repo-from": "apud {{grammar:accusative|$1}}",
 	"shared-repo": "repositorium commune",
 	"shared-repo-name-wikimediacommons": "Vicimedia Communia",
-	"upload-disallowed-here": "Hunc facisculum substituere tibi non licet.",
+	"upload-disallowed-here": "Hunc fasciculum substituere tibi non licet.",
 	"filerevert": "Revertere $1",
 	"filerevert-legend": "Reverti fasciculum",
 	"filerevert-intro": "Reversurus es '''[[Media:$1|$1]]''' ad [$4 redactionem quae $2, $3 facta erat].",
diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json
index 995237c035..f9bb80c298 100644
--- a/languages/i18n/lb.json
+++ b/languages/i18n/lb.json
@@ -461,6 +461,7 @@
 	"nocookiesnew": "De Benotzerkont gouf ugeluecht, awer Dir sidd net ageloggt.\n{{SITENAME}} brauch fir dës Funktioun Cookien.\nDir hutt d'Cookien desaktivéiert.\nAktivéiert déi w.e.g. a loggt Iech da mat Ärem neie Benotzernomm a mat dem respektive Passwuert an.",
 	"nocookieslogin": "{{SITENAME}} benotzt Cookië beim Umelle vun de Benotzer.\nDir hutt Cookien ausgeschalt.\nAktivéiert d'Cookien w.e.g. a versicht et nach eng Kéier.",
 	"nocookiesfornew": "De Benotzerkont gouf net ugeluecht, well mir seng Quell net bestëmme konnten.\nVergewëssert Iech datt Dir Cookien zouloosst, luet dës Säit nei a probéiert nach emol.",
+	"createacct-loginerror": "De Benotzerkont gouf ugeluecht, mä Dir konnt net automatesch ageloggt ginn. [[Special:UserLogin|Loggt Iech w.e.g. manuell an]].",
 	"noname": "Dir hutt kee gëltege Benotzernumm uginn.",
 	"loginsuccesstitle": "Ageloggt",
 	"loginsuccess": "'''Dir sidd elo als \"$1\" op {{SITENAME}} ugemellt.'''",
@@ -533,15 +534,18 @@
 	"botpasswords-label-cancel": "Ofbriechen",
 	"botpasswords-label-delete": "Läschen",
 	"botpasswords-label-resetpassword": "D'Passwuert zrécksetzen",
+	"botpasswords-help-grants": "All Berechtegung gëtt Zougang op déi Benotzerrechter déi e Benotzerkont schonn huet. Kuckt d'[[Special:ListGrants|Tabell vun de Berechtigunge]] fir méi Informatiounen.",
 	"botpasswords-label-restrictions": "Limite fir d'Benotzen:",
 	"botpasswords-label-grants-column": "Accordéiert",
 	"botpasswords-bad-appid": "Den Numm vum Bot \"$1\" ass net valabel.",
 	"botpasswords-insert-failed": "De Botnumm \"$1\" konnt net dobäigesat ginn. Gouf e schonn derbäigesat?",
+	"botpasswords-created-title": "Botpasswuert ugeluecht",
 	"botpasswords-created-body": "D'Botpasswuert fir de Bot-Numm \"$1\" vum Benotzer ''$2'' gouf ugeluecht.",
 	"botpasswords-updated-title": "Botpasswuert aktualiséiert",
 	"botpasswords-updated-body": "D'Botpasswuert fir de Bot-Numm \"$1\" vum Benotzer ''$2'' gouf aktualiséiert.",
 	"botpasswords-deleted-title": "Botpasswuert geläscht",
 	"botpasswords-deleted-body": "D'Botpasswuert fir de Bot-Numm \"$1\" vum Benotzer ''$2'' gouf geläscht.",
+	"botpasswords-newpassword": "Dat neit Passwuert fir sech mat <strong>$1</strong> anzeloggen ass <strong>$2</strong>.\n<em>Versuergt dat fir sech spéider dorop ze referéieren.</em>",
 	"botpasswords-not-exist": "De Benotzer \"$1\" huet kee Botpasswuert mam Numm \"$2\".",
 	"resetpass_forbidden": "Passwierder kënnen net geännert ginn.",
 	"resetpass_forbidden-reason": "Passwierder kënnen net geännert ginn: $1",
@@ -1089,6 +1093,7 @@
 	"right-createpage": "Säiten uleeën (déi keng Diskussiounssäite sinn)",
 	"right-createtalk": "Diskussiounssäiten uleeën",
 	"right-createaccount": "Nei Benotzerkonten uleeën",
+	"right-autocreateaccount": "Automatesch alogge mat engem externe Benotzerkont",
 	"right-minoredit": "Ännerungen als kleng markéieren",
 	"right-move": "Säite réckelen",
 	"right-move-subpages": "Säiten zesumme mat hiren Ënnersäite réckelen",
@@ -1160,6 +1165,7 @@
 	"grant-group-high-volume": "Massenaktivitéiten ausféieren",
 	"grant-group-customization": "Upassungen an Astellungen",
 	"grant-group-administration": "Administrativ Aktioune maachen",
+	"grant-group-private-information": "Op perséinlech Date vun Iech zougräifen",
 	"grant-group-other": "Verschidden Aktivitéiten",
 	"grant-blockusers": "Benotzer spären an d'Spären ophiewen",
 	"grant-createaccount": "Benotzerkonten opmaachen",
@@ -1174,6 +1180,7 @@
 	"grant-highvolume": "Massenännerungen",
 	"grant-oversight": "Benotzer verstoppen a Versioune läschen",
 	"grant-patrol": "Ännerungen op Säiten kontrolléieren",
+	"grant-privateinfo": "Op perséinlech Informatiounen zougräifen",
 	"grant-protect": "Säite spären an entspären",
 	"grant-rollback": "Ännerungen op Säiten zrécksetzen",
 	"grant-sendemail": "Anere Benotzer E-Maile schécken",
@@ -1240,7 +1247,7 @@
 	"recentchanges-feed-description": "Verfollegt mat dësem Feed déi rezent Ännerungen op {{SITENAME}}.",
 	"recentchanges-label-newpage": "Mat dëser Ännerung gouf eng nei Säit ugeluecht",
 	"recentchanges-label-minor": "Dëst ass eng kleng Ännerung",
-	"recentchanges-label-bot": "Dës Ännerung gouf vun engem Bot gemaacht",
+	"recentchanges-label-bot": "Dës Ännerung gouf vun engem Bot gemaach",
 	"recentchanges-label-unpatrolled": "Dës Ännerung gouf nach net nogekuckt",
 	"recentchanges-label-plusminus": "D'Gréisst vun der Säit huet sech ëm déi Zuel vu Bytes geännert",
 	"recentchanges-legend-heading": "<strong>Legend:</strong>",
@@ -1700,11 +1707,13 @@
 	"apihelp": "API-Hëllef",
 	"apihelp-no-such-module": "Modul \"$1\" net fonnt.",
 	"apisandbox": "API-Sandkëscht",
+	"apisandbox-jsonly": "Fir d'API-Sandkëscht ze benotze braucht Dir JavaScript.",
 	"apisandbox-api-disabled": "API ass op dësem Site ausgeschalt.",
 	"apisandbox-unfullscreen": "Säit weisen",
 	"apisandbox-submit": "Ufro maachen",
 	"apisandbox-reset": "Eidel maachen",
 	"apisandbox-retry": "Nach eng Kéier probéieren",
+	"apisandbox-no-parameters": "Dësen API-Modul huet keng Parameteren.",
 	"apisandbox-helpurls": "Hëllef-Linken",
 	"apisandbox-examples": "Beispiller",
 	"apisandbox-dynamic-parameters": "Zousätzlech Parameteren",
@@ -2215,6 +2224,7 @@
 	"lockdbsuccesstext": "D'{{SITENAME}}-Datebank gouf gespaart. <br />\nDenkt drun [[Special:UnlockDB|d'Spär erëm ewechzehuele]] soubaal d'Maintenance-Aarbechte fäerdeg sinn.",
 	"unlockdbsuccesstext": "D'Spär vun der Datebank ass opgehuewen.",
 	"lockfilenotwritable": "De Fichier mat de Späre vun der Datebank kann net geännert ginn.\nFir d'Datebank ze spären oder fir d'Spär opzehiewe muss dëse Fichier vum Webserver geännert kënne ginn.",
+	"databaselocked": "D'Datebank ass scho gespaart.",
 	"databasenotlocked": "D'Datebank ass net gespaart.",
 	"lockedbyandtime": "(vum $1 de(n) $2 ëm $3 Auer)",
 	"move-page": "Réckel $1",
@@ -3309,6 +3319,7 @@
 	"api-error-unknownerror": "Onbekannte Feeler: \"$1\".",
 	"api-error-uploaddisabled": "D'Eroplueden ass op dëser Wiki ausgeschalt.",
 	"api-error-verification-error": "Dëse Fichier kéint korrupt sinn, oder en huet eng falsch Erweiderung.",
+	"api-error-was-deleted": "E Fichier mat dësem Numm gouf virdrun eropgelueden an duerno geläscht.",
 	"duration-seconds": "$1 {{PLURAL:$1|Sekonn|Sekonnen}}",
 	"duration-minutes": "$1 {{PLURAL:$1|Minutt|Minutten}}",
 	"duration-hours": "$1 {{PLURAL:$1|Stonn|Stonnen}}",
diff --git a/languages/i18n/lt.json b/languages/i18n/lt.json
index a59c30bbf7..86a2ba430d 100644
--- a/languages/i18n/lt.json
+++ b/languages/i18n/lt.json
@@ -78,7 +78,7 @@
 	"tog-ccmeonemails": "Siųsti man laiškų, kuriuos siunčiu kitiems naudotojams, kopijas",
 	"tog-diffonly": "Nerodyti puslapio turinio po skirtumais",
 	"tog-showhiddencats": "Rodyti paslėptas kategorijas",
-	"tog-norollbackdiff": "Nepaisyti skirtumo atlikus atmetimą",
+	"tog-norollbackdiff": "Nerodyti skirtumo atlikus atmetimą",
 	"tog-useeditwarning": "Perspėti mane, kai palieku redagavimo puslapį, o jame yra neišsaugotų pakeitimų",
 	"tog-prefershttps": "Prisiregistruojant visada naudokite saugų ryšį",
 	"underline-always": "Visada",
@@ -1333,7 +1333,7 @@
 	"show": "Rodyti",
 	"minoreditletter": "S",
 	"newpageletter": "N",
-	"boteditletter": "R",
+	"boteditletter": "r",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|stebintis naudotojas|stebintys naudotojai|stebinčių naudotojų}}]",
 	"rc_categories": "Riboti kategorijoms (atskirkite su „|“)",
 	"rc_categories_any": "Bet kuris iš pasirinktųjų",
@@ -2115,7 +2115,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|atkurta $1 versija|atkurtos $1 versijos|atkurta $1 versijų}}",
 	"undeletedrevisions-files": "{{PLURAL:$1|atkurta $1 versija|atkurtos $1 versijos|atkurta $1 versijų}} ir $2 {{PLURAL:$2|failas|failai|failų}}",
 	"undeletedfiles": "{{PLURAL:$1|atkurtas $1 failas|atkurti $1 failai|atkurta $1 failų}}",
-	"cannotundelete": "Atkūrimas nepavyko:\n$1",
+	"cannotundelete": "Visi arba kai kurie atkūrimai nepavyko:\n$1",
 	"undeletedpage": "'''$1 buvo atkurtas'''\n\nPeržiūrėkite [[Special:Log/delete|trynimų sąrašą]], norėdami rasti paskutinių trynimų ir atkūrimų sąrašą.",
 	"undelete-header": "Kad sužinotumėte, kurie puslapiai paskiausiai ištrinti, žiūrėkite [[Special:Log/delete|šalinimų sąrašą]].",
 	"undelete-search-title": "Panaikintų puslapių paieška",
@@ -3520,9 +3520,9 @@
 	"pagelang-submit": "Pateikti",
 	"right-pagelang": "Keisti puslapio kalbą",
 	"action-pagelang": "keisti puslapio kalbą",
-	"log-name-pagelang": "Keisti kalbos žurnalą",
+	"log-name-pagelang": "Kalbos keitimų žurnalas",
 	"log-description-pagelang": "Tai pakeitimų žurnalas puslapio kalbomis.",
-	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|pakeitė}} puslapio kalbą $3 iš $4 į $5.",
+	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|pakeitė}} $3 kalbą iš $4 į $5",
 	"default-skin-not-found": "Ups! Jūsų viki numatytoji išvaizda, nustatyta <code dir=\"ltr\">$wgDefaultSkin</code> kaip <code>$1</code>, yra negalima.\n\nPanašu, kad Jūsų instaliacija turi {{PLURAL:$4|šią išvaizdą|šias išvaizdas}}. Žiūrėkite [https://www.mediawiki.org/wiki/Manual:Skin_configuration Instrukcija: Išvaizdos konfigūracija] dėl informacijos kaip įgalinti {{PLURAL:$4|ją|jas ir pasirinkti numatytąją}}.\n\n$2\n\n; Jei ką tik įsidiegėte MediaWiki:\n: Jūs tikriausiai įsidiegėte iš git arba tiesiai iš kodo naudodami kitą metodą. To ir buvo tikimasi. Pabandykite įdiegti išvaizdų iš [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org išvaizdų katalogo]:\n:* Atsisiųsti [https://www.mediawiki.org/wiki/Download tvarkyklę], kuri turi keletą išvaizdų ir plėtinių. Jūs galėsite nukopijuoti ir įklijuoti <code>skins/</code> katalogą iš jo.\n:* Atsisiųsti individualias išvaizdas iš [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Naudoti Git išvaizdoms atsisiųsti].\n: Tai neturėtų trukdyti jūsų git saugyklai jei Jūs esate MediaWiki kūrėjas.\n\n; Jei Jūs ką tik atnaujinote MediaWiki:\n: MediaWiki 1.24 ir naujesnės versijos daugiau automatiškai nebeįgalina įdiegtų išvaizdų (žiūrėkite [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Instrukcija: Išvaizdų automatinis aptikimas]). Jūs galite įklijuoti {{PLURAL:$5|šią eilutę|šias eilutes}} į <code>LocalSettings.php</code>, kad įgalintumėte {{PLURAL:$5||visus}} šiuo metu {{PLURAL:$5|įdiegtą išvaizdą|įdiegtas išvaizdas}}:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Jei Jūs ką tik pakeitėte <code>LocalSettings.php</code>:\n: Dar kartą patikrinkite išvaizdos pavadinimą ar nepadarėte spausdinimo klaidos.",
 	"default-skin-not-found-no-skins": "Ups! Jūsų viki numatytoji išvaizdą, nurodyta <code>$wgDefaultSkin</code> <code>$1</code>, yra negalima.\n\nJūs neturite įdiegtų išvaizdų.\n\n; Jei ką tik įsidiegėte MediaWiki:\n: Jūs tikriausiai įsidiegėte iš git arba tiesiai iš kodo naudodami kitą metodą. To buvo tikimasi. Pabandykite įsidiegti išvaizdų iš [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org išvaizdų katalogo] taip:\n:* Parsisiųsdami  [https://www.mediawiki.org/wiki/Download tvarkyklę], kuri turi kelias išvaizdas ir plėtinius. Jūs galite nukopijuoti ir įklijuoti <code>skins/</code> katalogą iš jos.\n:* Persiųsdami individualias išvaizdas iš [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Naudodami Git išvaizdų parsisiuntimui].\n: Tai neturėtų trukdyti Jūsų git saugyklai jei Jūs esate MediaWiki kūrėjas. Žiūrėkite [https://www.mediawiki.org/wiki/Manual:Skin_configuration Instrukcija: Išvaizdos konfigūracija] dėl informacijos kaip įgalinti išvaizdas ir pasirinkti numatytąją.",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (įgalinta)",
@@ -3563,6 +3563,7 @@
 	"special-characters-group-ipa": "IPA",
 	"special-characters-group-symbols": "Simboliai",
 	"special-characters-group-greek": "Graikų",
+	"special-characters-group-greekextended": "Graikų išplėstinis",
 	"special-characters-group-cyrillic": "Kirilica",
 	"special-characters-group-arabic": "Arabų",
 	"special-characters-group-arabicextended": "Arabic extended",
@@ -3611,8 +3612,15 @@
 	"log-action-filter-managetags-deactivate": "Žymės deaktyvavimas",
 	"log-action-filter-newusers-autocreate": "Automatinis kūrimas",
 	"log-action-filter-protect-protect": "Apsauga",
+	"log-action-filter-protect-modify": "Apsaugos keitimas",
+	"log-action-filter-protect-move_prot": "Apsauga perkelta",
+	"log-action-filter-rights-rights": "Rankinis keitimas",
+	"log-action-filter-rights-autopromote": "Automatinis keitimas",
 	"log-action-filter-upload-upload": "Naujas įkėlimas",
 	"log-action-filter-upload-overwrite": "Kelti iš naujo",
+	"authmanager-create-disabled": "Paskyros kūrimas yra išjungtas.",
+	"authmanager-create-from-login": "Norėdami sukurti paskyrą užpildykite laukelius žemiau.",
+	"authmanager-authplugin-setpass-failed-title": "Slaptažodžio keitimas nepavyko",
 	"authmanager-authplugin-setpass-bad-domain": "Negalimas domenas.",
 	"authmanager-autocreate-noperm": "Automatinis paskyros kūrimas neleidžiamas.",
 	"authmanager-autocreate-exception": "Automatinis paskyros kūrimas laikinai neleidžiamas dėl ankstesnių klaidų.",
@@ -3638,6 +3646,9 @@
 	"specialpage-securitylevel-not-allowed-title": "Neleidžiama",
 	"cannotauth-not-allowed-title": "Teisė nesuteikta",
 	"cannotauth-not-allowed": "JÅ«s negalite naudotis Å¡iuo puslapiu",
+	"credentialsform-account": "Paskyros vardas:",
+	"cannotlink-no-provider-title": "Nėra paskyrų, kurias galima susieti",
+	"cannotlink-no-provider": "Nėra paskyrų, kurias galima susieti",
 	"linkaccounts": "Susieti paskyras",
 	"linkaccounts-success-text": "Paskyra buvo susieta.",
 	"linkaccounts-submit": "Susieti paskyras",
diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json
index ecd1cf0542..89742ebb51 100644
--- a/languages/i18n/lv.json
+++ b/languages/i18n/lv.json
@@ -503,6 +503,8 @@
 	"botpasswords-label-resetpassword": "Atiestatīt paroli",
 	"botpasswords-label-restrictions": "Lietošanas ierobežojumi:",
 	"botpasswords-label-grants-column": "Piešķirts",
+	"botpasswords-created-title": "Bota parole izveidota",
+	"botpasswords-updated-title": "Bota parole atjaunināta",
 	"botpasswords-deleted-title": "Bota parole dzēsta",
 	"resetpass_forbidden": "Paroles nav iespējams nomainīt",
 	"resetpass-no-info": "Jums ir nepieciešams ieiet, lai tūlīt piekļūtu šai lapai.",
@@ -524,7 +526,7 @@
 	"passwordreset-emailsentemail": "Paroles atiestatīšanas e-pasts ir nosūtīts.",
 	"passwordreset-nosuchcaller": "Izsaucējs nepastāv: $1",
 	"passwordreset-invalideamil": "Nederīga e-pasta adrese",
-	"changeemail": "Mainīt e-pasta adresi",
+	"changeemail": "Mainīt vai noņemt e-pasta adresi",
 	"changeemail-header": "Mainīt konta e-pasta adresi",
 	"changeemail-oldemail": "Pašreizējā e-pasta adrese:",
 	"changeemail-newemail": "Jaunā e-pasta adrese:",
@@ -745,6 +747,9 @@
 	"mergehistory-submit": "Apvienot versijas",
 	"mergehistory-empty": "Neviena versija nevar tikt apvienota",
 	"mergehistory-fail": "Nav iespējams apvienot hronoloģiju, lūdzu, pārbaudiet vēlreiz lapu un laika parametrus.",
+	"mergehistory-fail-bad-timestamp": "Laika zīmogs ir nederīgs.",
+	"mergehistory-fail-invalid-source": "Avota lapa ir nederīga.",
+	"mergehistory-fail-invalid-dest": "Mērķa lapa ir nederīga.",
 	"mergehistory-no-source": "Avota lapa $1 nepastāv.",
 	"mergehistory-no-destination": "Mērķa lapa $1 nepastāv.",
 	"mergehistory-invalid-source": "Avota lapas nosaukumam jābūt derīgam.",
@@ -1711,7 +1716,7 @@
 	"sp-contributions-newbies": "Rādīt jauno lietotāju devumu",
 	"sp-contributions-newbies-sub": "Jaunie lietotāji",
 	"sp-contributions-blocklog": "Bloķēšanas reģistrs",
-	"sp-contributions-deleted": "dzēstais dalībnieka devums",
+	"sp-contributions-deleted": "dzēstais {{GENDER:$1|dalībnieka|dalībnieces}} devums",
 	"sp-contributions-uploads": "augšupielādes",
 	"sp-contributions-logs": "reģistri",
 	"sp-contributions-talk": "diskusija",
diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json
index 893d69ca2b..fe9097d3aa 100644
--- a/languages/i18n/mk.json
+++ b/languages/i18n/mk.json
@@ -18,7 +18,8 @@
 			"Milicevic01",
 			"Macofe",
 			"Nemo bis",
-			"Matma Rex"
+			"Matma Rex",
+			"Kaldari"
 		]
 	},
 	"tog-underline": "Потцртување на врски:",
@@ -145,9 +146,9 @@
 	"hidden-category-category": "Скриени категории",
 	"category-subcat-count": "{{PLURAL:$2|Оваа категорија ја содржи само следнава поткатегорија.|Оваа категорија {{PLURAL:$1|ја содржи следнава поткатегорија|ги содржи следниве $1 поткатегории}} од вкупно $2.}}",
 	"category-subcat-count-limited": "Оваа категорија {{PLURAL:$1|ја содржи следнава поткатегорија|ги содржи следниве $1 поткатегории}}.",
-	"category-article-count": "{{#ifeq:$2|Оваа категорија содржи само една страница.|{{PLURAL:$1|Прикажана е една|Прикажани се $1}} од вкупно $2 страници во категоријата.}}",
+	"category-article-count": "{{PLURAL:$2|Оваа категорија содржи само една страница.|{{PLURAL:$1|Прикажана е една|Прикажани се $1}} од вкупно $2 страници во категоријата.}}",
 	"category-article-count-limited": "{{PLURAL:$1|Следната страница е|Следните $1 страници се}} во оваа категорија.",
-	"category-file-count": "{{#ifeq:$2|Оваа категорија содржи само една податотека.|{{PLURAL:$1|Прикажана е една|Прикажани се $1}} од вкупно $2 податотеки во категоријата.}}",
+	"category-file-count": "{{PLURAL:$2|Оваа категорија содржи само една податотека.|{{PLURAL:$1|Прикажана е една|Прикажани се $1}} од вкупно $2 податотеки во категоријата.}}",
 	"category-file-count-limited": "{{PLURAL:$1|Следнава податотека е|Следниве $1 податотеки се}} во оваа категорија.",
 	"listingcontinuesabbrev": "продолжува",
 	"index-category": "Индексирани страници",
@@ -1209,6 +1210,7 @@
 	"grant-group-high-volume": "Вршење на активности од голем обем",
 	"grant-group-customization": "Прилагодувања и поставки",
 	"grant-group-administration": "Вршење на административни дејства",
+	"grant-group-private-information": "Пристап до лични податоци за вас",
 	"grant-group-other": "Разни активности",
 	"grant-blockusers": "Блокирање и одблокирање корисници",
 	"grant-createaccount": "Правење сметки",
@@ -1223,6 +1225,7 @@
 	"grant-highvolume": "Високообемно уредување",
 	"grant-oversight": "Скривање на корисници и преработки",
 	"grant-patrol": "Патрола на измени во страници",
+	"grant-privateinfo": "Пристап до лични информации",
 	"grant-protect": "Заштита на незаштитени страници",
 	"grant-rollback": "Отповикување на измени во страници",
 	"grant-sendemail": "Испраќање на е-пошта до други корисници",
diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json
index ebb6a50b12..d8bf6e3e7c 100644
--- a/languages/i18n/mr.json
+++ b/languages/i18n/mr.json
@@ -606,11 +606,8 @@
 	"passwordreset-emailelement": "सदस्यनाव: \n$1\n\nअस्थायी परवलीचा शब्द: \n$2",
 	"passwordreset-emailsentemail": "जर हा विपत्रपत्ता आपल्या खात्याशी संलग्न असेल तर, परवलीच्या शब्दाच्या पुनर्स्थापनेबाबत एक विपत्र पाठवण्यात येईल.",
 	"passwordreset-emailsentusername": "जर या सदस्यनावाशी संलग्न विपत्रपत्ता असेल तर, परवलीचा शब्द पुनर्स्थापनाबाबत विपत्र पाठविल्या जाईल.",
-	"passwordreset-emailsent-capture": "'परवलीचा शब्द' पुनर्स्थापनेबाबत एक विपत्र पाठवण्यात आले आहे जे खाली दर्शविण्यात आले आहे.",
-	"passwordreset-emailerror-capture": "'परवलीचा शब्द' पुनर्स्थापनेबाबत एक विपत्र निर्माण करण्यात आले, जे खाली दर्शविण्यात आले आहे.परंतु,{{GENDER:$2|सदस्य}}ला पाठविणे असफल झाले: $1",
 	"changeemail": "विपत्रपत्ता बदला किंवा हटवा",
 	"changeemail-header": "आपला विपत्रपत्ता बदलण्यास हे आवेदन पूर्ण करा.जर आपणास आपल्या खात्याशी संलग्न कोणताही विपत्रपत्ता हटवायचा असेल तर,आवेदन सादर करण्यापूर्वी, नविन विपत्रपत्त्यासाठी असलेली जागा कोरी ठेवा.",
-	"changeemail-passwordrequired": "हे बदल नक्की करण्यासाठी आपणास आपला परवलीचा शब्द टाकावा लागेल.",
 	"changeemail-no-info": "हे पान थेट बघण्यासठी तुम्हाला सनोंद-प्रवेशित असावे लागेल.",
 	"changeemail-oldemail": "सध्याचा ईमेल पत्ता :",
 	"changeemail-newemail": "नवा ईमेल पत्ता:",
@@ -788,7 +785,6 @@
 	"undo-nochange": "असे दिसते कि हे संपादन पूर्ववत केल्या गेले आहे.",
 	"undo-summary": "[[Special:Contributions/$2|$2]] ([[User talk:$2|चर्चा]])यांची आवृत्ती $1 परतवली.",
 	"undo-summary-username-hidden": "अज्ञात सदस्याची $1 आवृत्ती परतवा",
-	"cantcreateaccounttitle": "खाते उघडू शकत नाही",
 	"cantcreateaccount-text": "('''$1''')या आंतरजाल अंकपत्त्याकडूनच्या खाते निर्मितीस [[User:$3|$3]]ने अटकाव केला आहे.\n\n$3ने ''$2'' कारण दिले आहे.",
 	"cantcreateaccount-range-text": "<strong>$1</strong>आवाक्यातील आंतरजाल अंकपत्ते,ज्यात आपल्या (<strong>$4</strong>) या अंकपत्त्याचा समावेश आहे, [[User:$3|$3]] ने त्यांच्या खाते निर्मितीस प्रतिबंध केला आहे.\n\n$3 ने <em>$2</em>कारण दिले आहे.",
 	"viewpagelogs": "या पानाच्या नोंदी पहा",
@@ -2027,7 +2023,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|1 आवर्तन|$1 आवर्तने}} पुनर्स्थापित",
 	"undeletedrevisions-files": "{{PLURAL:$1|1 आवर्तन|$1 आवर्तने}}आणि {{PLURAL:$2|1 संचिका|$2 संचिका}} पुनर्स्थापित",
 	"undeletedfiles": "{{PLURAL:$1|1 संचिका|$1 संचिका}} पुनर्स्थापित",
-	"cannotundelete": "उलटवणे फसले:$1",
+	"cannotundelete": "काही किंवा सर्वच उलटवणे फसले:$1",
 	"undeletedpage": "<strong>$1ला पुनर्स्थापित केले</strong>\n\nअलिकडिल वगळलेल्या आणि पुनर्स्थापितांच्या नोंदीकरिता [[Special:Log/delete|वगळल्याच्या नोंदी]] पहा .",
 	"undelete-header": "अलीकडील वगळलेल्या पानांकरिता [[Special:Log/delete|वगळलेल्या नोंदी]] पहा.",
 	"undelete-search-title": "वगळलेली पाने शोधा",
@@ -2064,8 +2060,8 @@
 	"sp-contributions-newbies-sub": "नवशिक्यांसाठी",
 	"sp-contributions-newbies-title": "नवीन खात्यांसाठी सदस्य योगदान",
 	"sp-contributions-blocklog": "रोध नोंदी",
-	"sp-contributions-suppresslog": "सदस्य योगदानाचे दमन केले",
-	"sp-contributions-deleted": "वगळलेली सदस्य संपादने",
+	"sp-contributions-suppresslog": "{{GENDER:$1|सदस्य}} योगदानाचे दमन केले",
+	"sp-contributions-deleted": "वगळलेली {{GENDER:$1|सदस्य}} संपादने",
 	"sp-contributions-uploads": "अपभारणे",
 	"sp-contributions-logs": "नोंदी",
 	"sp-contributions-talk": "चर्चा",
diff --git a/languages/i18n/my.json b/languages/i18n/my.json
index 21bf1d89a7..482171a9d5 100644
--- a/languages/i18n/my.json
+++ b/languages/i18n/my.json
@@ -631,7 +631,7 @@
 	"shown-title": "စာမျက်နှာတစ်ခုလျှင် ရလဒ် $1 {{PLURAL:$1|ခု|ခု}} ပြရန်",
 	"viewprevnext": "($1 {{int:မှ}} $2) အထိကြား ရလဒ် ($3) ခုကို ကြည့်ရန်",
 	"searchmenu-exists": "'''ဤဝီကီတွင် \"[[:$1]]\" အမည်နှင့် စာမျက်နှာတစ်ခုရှိသည်။'''",
-	"searchmenu-new": "<strong>ဤဝီကီတွင် \"[[:$1]]\" စာမျက်နှာကို ဖန်တီးပါ!</strong> {{PLURAL:$2|0=|သင့်ရှာဖွေမှုနှင့် စာမျက်နှာကိုလည်း ကြည့်ပါ။|ရှာဖွေမှု ရလဒ်များကိုလည်း ကြည်ါပါ။}}",
+	"searchmenu-new": "<strong>ဤဝီကီတွင် \"[[:$1]]\" စာမျက်နှာကို ဖန်တီးပါ!</strong> {{PLURAL:$2|0=|သင့်ရှာဖွေမှုနှင့် စာမျက်နှာကိုလည်း ကြည့်ပါ။|ရှာဖွေမှု ရလဒ်များကိုလည်း ကြည့်ပါ။}}",
 	"searchprofile-articles": "မာတိကာစာမျက်နှာများ",
 	"searchprofile-images": "မာလတီမီဒီယာ",
 	"searchprofile-everything": "အားလုံး",
diff --git a/languages/i18n/nap.json b/languages/i18n/nap.json
index c756f47e2e..b13f5f9189 100644
--- a/languages/i18n/nap.json
+++ b/languages/i18n/nap.json
@@ -1266,6 +1266,7 @@
 	"action-applychangetags": "appreca tag pe' tramente ca se fanno 'e cagnamiente vuoste",
 	"action-changetags": "azzecca o lèva tag a caso dint'a verziune nnividuale e riggistre 'e log",
 	"action-deletechangetags": "scancellare 'e tag d' 'o database",
+	"action-purge": "agghiuorna sta paggena",
 	"nchanges": "$1 {{PLURAL:$1|cagnamiento|cagnamiente}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|'a ll'urdema visita}}",
 	"enhancedrc-history": "cronologgia",
@@ -1510,6 +1511,7 @@
 	"uploadstash-errclear": "'A pulezzia d' 'e file scassaje.",
 	"uploadstash-refresh": "Agghiuorna l'elenco d' 'e file",
 	"uploadstash-thumbnail": "vide miniatura",
+	"uploadstash-exception": "Nun s'è pututo sarvà 'a càrreca dint' 'a stash ($1): \"$2\".",
 	"invalid-chunk-offset": "Distanza d' 'a parte nun valida",
 	"img-auth-accessdenied": "Acciesso negato",
 	"img-auth-nopathinfo": "PATH_INFO mancante.\n'O server nun è mpustato pe' passà sta nfurmazione.\nPuò darse ca, essenno basato ncopp'a CGI, nun putesse suppurtà img_auth.\nVide https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization",
@@ -1925,9 +1927,11 @@
 	"watchnologin": "Acciesso nun affettuato",
 	"addwatch": "Miette dint' 'a l'elenco 'e paggene cuntrullate",
 	"addedwatchtext": "'A paggena \"[[:$1]]\" e 'a paggena 'e chiacchiera è stata azzeccata dint'a l'elenco 'e [[Special:Watchlist|paggene cuntrullate]].",
+	"addedwatchtext-talk": "\"[[:$1]]\" e 'a paggena 'e chiacchiera suòccia è stata azzeccata dint'a l'elenco 'e [[Special:Watchlist|paggene cuntrullate]] vuosto.",
 	"addedwatchtext-short": "Chista paggena \"$1\" è stata azzeccata a l'elenco 'e paggene cuntrullate.",
 	"removewatch": "Leva 'a l'elenco 'e paggene cuntrullate",
-	"removedwatchtext": "\"[[:$1]]\" 'e 'a paggena 'e chiacchiera soja so' state scancellata 'a l'elenco [[Special:Watchlist|'e paggene cuntrullate]] vuosto.",
+	"removedwatchtext": "\"[[:$1]]\" e 'a paggena 'e chiacchiera soja so' state scancellate 'a l'elenco [[Special:Watchlist|'e paggene cuntrullate]] vuosto.",
+	"removedwatchtext-talk": "\"[[:$1]]\" e 'a paggena 'e chiacchiera soja so' state luvate 'a l'elenco [[Special:Watchlist|'e paggene cuntrullate]] vuosto.",
 	"removedwatchtext-short": "Chista paggena \"$1\" è stata luvata a l'elenco 'e paggene cuntrullate.",
 	"watch": "Secuta",
 	"watchthispage": "Tiene d'uocchio sta paggena",
diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json
index 150527fbec..581cc97d3c 100644
--- a/languages/i18n/nb.json
+++ b/languages/i18n/nb.json
@@ -67,6 +67,7 @@
 	"tog-watchdefault": "Legg til sider og filer jeg endrer på i min overvåkingsliste",
 	"tog-watchmoves": "Legg til sider og filer jeg flytter til min overvåkingsliste",
 	"tog-watchdeletion": "Legg til sider og filer jeg sletter i min overvåkingsliste",
+	"tog-watchuploads": "Legg til nye filer jeg laster opp i overvåkningslisten min",
 	"tog-watchrollback": "Legg til sider hvor jeg har utført tilbakestilling i min overvåkningsliste",
 	"tog-minordefault": "Merk i utgangspunktet alle redigeringer som mindre",
 	"tog-previewontop": "Vis forhåndsvisningen over redigeringsboksen",
@@ -210,6 +211,7 @@
 	"tagline": "Fra {{SITENAME}}",
 	"help": "Hjelp",
 	"search": "Søk",
+	"search-ignored-headings": " #<!-- la denne linjen stå akkurat som den er --> <pre>\n# Overskrifter som vil bli ignorert ved søking.\n# Endringer på denne siden trer i kraft ved neste indeksering.\n# Du kan fremtvinge en reindeksering av en gitt side ved å gjøre en nullredigering.\n# Syntaksen er som følger:\n#   * Alt fra et \"#\"-tegn til slutten av en linje er en kommentar.\n#   * Enhver ikke-tom linje regnes som en ordrett tittel (inkludert skille mellom store og små bokstaver) som skal ignoreres.\nReferanser\nKilder\nEksterne lenker\nSe også\n #</pre> <!-- la denne linjen stå akkurat som den er -->",
 	"searchbutton": "Søk",
 	"go": "GÃ¥",
 	"searcharticle": "GÃ¥",
@@ -575,11 +577,11 @@
 	"botpasswords-insert-failed": "Kunne ikke legge til robotnavnet \"$1\". Har det allerede blitt lagt til?",
 	"botpasswords-update-failed": "Kunne ikke oppdatere robotnavnet \"$1\". Er det slettet?",
 	"botpasswords-created-title": "Robotpassord opprettet",
-	"botpasswords-created-body": "Robotpassordet \"$1\" ble opprettet.",
+	"botpasswords-created-body": "Robotpassordet for boten «$1» til brukeren «$2» ble opprettet.",
 	"botpasswords-updated-title": "Robotpassord oppdatert",
-	"botpasswords-updated-body": "Robotpassordet \"$1\" ble oppdatert.",
+	"botpasswords-updated-body": "Robotpassordet for boten «$1» til brukeren «$2» ble oppdatert.",
 	"botpasswords-deleted-title": "Robotpassord slettet",
-	"botpasswords-deleted-body": "Robotpassordet \"$1\" ble slettet.",
+	"botpasswords-deleted-body": "Robotpassordet for boten «$1» til brukeren «$2» ble slettet.",
 	"botpasswords-newpassword": "Det nye passordet for å logge inn med <strong>$1</strong> er <strong>$2</strong>. <em>Vennligst lagre dette for fremtidig referanse.</em>",
 	"botpasswords-no-provider": "BotPasswordsSessionProvider er ikke tilgjengelig.",
 	"botpasswords-restriction-failed": "Begrensninger for robotpassord tillater ikke denne innloggingen.",
@@ -590,7 +592,7 @@
 	"resetpass-no-info": "Du må være logget inn for å gå til denne siden direkte",
 	"resetpass-submit-loggedin": "Endre passord",
 	"resetpass-submit-cancel": "Avbryt",
-	"resetpass-wrong-oldpass": "Ugyldig midlertidig eller nåværende passord.\nDu kan ha allerede byttet passordet, eller bedt om et nytt midlertidig passord.",
+	"resetpass-wrong-oldpass": "Ugyldig midlertidig eller aktivt passord.\nDet kan tenkes at allerede har gjennomført et vellykket bytte av passord, eller bedt om et nytt midlertidig passord.",
 	"resetpass-recycled": "Vær vennlig å endre passordet til noe annen enn gjeldende passord.",
 	"resetpass-temp-emailed": "Du logget inn med en midlertidig kode sendt på e-post.\nFor å avslutte innloggingen må du angi et nytt passord her:",
 	"resetpass-temp-password": "Midlertidig passord:",
@@ -614,6 +616,10 @@
 	"passwordreset-emailelement": "Brukernavn: \n$1\n\nMidlertidig passord: \n$2",
 	"passwordreset-emailsentemail": "Hvis denne epostadressen er koblet til din konto, så vil det bli sendt en epost om tilbakestilling av passord.",
 	"passwordreset-emailsentusername": "Hvis det finnes en epostadresse knyttet til dette brukernavnet, vil en epost med informasjon om tilbakestilling av passord bli sendt.",
+	"passwordreset-emailsent-capture2": "{{PLURAL:$1|E-post}} om passordtilbakestilling har blitt sendt. {{PLURAL:$1|Brukernavnet og passordet|Listen over brukernavn og passord}} vises under.",
+	"passwordreset-emailerror-capture2": "Kunne ikke sende e-post til {{GENDER:$2|brukeren}}: $1 {{PLURAL:$3|Brukernavnet og passordet|Listen over brukernavn og passord}} vises under.",
+	"passwordreset-invalideamil": "Ugyldig e-postadresse",
+	"passwordreset-nodata": "Verken et brukernavn eller en e-postadresse ble oppgitt",
 	"changeemail": "Endre eller fjerne epostadresse",
 	"changeemail-header": "Fyll ut dette skjemaet for å bytte din epost-adresse. Hvis du vil fjerne epostadressen fra din konto, kan du la ny epostadresse-feltet være tomt når.",
 	"changeemail-no-info": "Du må være innlogget for å få direkte tilgang til denne siden.",
@@ -656,6 +662,7 @@
 	"minoredit": "Dette er en mindre endring",
 	"watchthis": "Overvåk denne siden",
 	"savearticle": "Lagre siden",
+	"savechanges": "Lagre endringer",
 	"publishpage": "Publiser siden",
 	"publishchanges": "Publiser endringene",
 	"preview": "Forhåndsvisning",
@@ -686,14 +693,14 @@
 	"accmailtext": "Et tilfeldig passord for [[User talk:$1|$1]] har blitt sendt til $2. Det kan endres på [[Special:ChangePassword|passordendringssiden]] under innlogging.",
 	"newarticle": "(Ny)",
 	"newarticletext": "Du har fulgt en lenke til en side som ikke finnes ennå.\nFor å opprette siden, begynn å skrive i boksen under (se [$1 hjelpesiden] for mer informasjon).\nOm du havnet her ved en feil, trykk '''tilbake''' i nettleseren.",
-	"anontalkpagetext": "----\n''Dette er en diskusjonsside for en uregistrert bruker som ikke har opprettet konto eller ikke er logget inn.\nVi er derfor nødt til å bruke den numeriske IP-adressen til å identifisere ham eller henne.\nEn IP-adresse kan være delt mellom flere brukere.\nHvis du er en uregistrert bruker og synes at du har fått irrelevante kommentarer på en slik side, [[Special:CreateAccount|opprett en konto]] eller [[Special:UserLogin|logg inn]] så vi unngår fremtidige forvekslinger med andre uregistrerte brukere.''",
+	"anontalkpagetext": "----\n<em>Dette er en diskusjonsside for en anonym bruker som ikke har opprettet konto enda, eller som ikke bruker den.</em>\nVi er derfor nødt til å bruke den numeriske IP-adressen til å identifisere ham eller henne.\nEn IP-adresse kan være delt mellom flere brukere.\nHvis du er en anonym bruker og opplever å få irrelevante kommentarer rettet mot deg, [[Special:CreateAccount|opprett en konto]] eller [[Special:UserLogin|logg inn]] for å unngå fremtidige forvekslinger med andre anonyme brukere.",
 	"noarticletext": "Det er for tiden ingen tekst på denne siden.\nDu kan [[Special:Search/{{PAGENAME}}|søke etter denne sidetittelen]] på andre sider,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} søke i relaterte logger],\neller [{{fullurl:{{FULLPAGENAME}}|action=edit}} opprette siden]</span>.",
 	"noarticletext-nopermission": "Det er for tiden ingen tekst på denne siden.\nDu kan [[Special:Search/{{PAGENAME}}|søke etter sidens tittel]] blant andre sider, eller <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} søke i relevante logger]</span>, men du har ikke tillatelse til å opprette denne siden.",
 	"missing-revision": "Revisjonen #$1 av siden med navnet \"{{FULLPAGENAME}}\" eksisterer ikke.\n\nDette skyldes som regel at en gammel historikklenke er fulgt til en side som er slettet.\nDetaljer kan finnes i [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} sletteloggen].",
 	"userpage-userdoesnotexist": "Brukerkontoen «$1» er ikke registrert.\nSjekk om du ønsker å opprette/redigere denne siden.",
 	"userpage-userdoesnotexist-view": "Kontoen «$1» er ikke registrert.",
 	"blocked-notice-logextract": "Denne brukeren er for tiden blokkert.\nSiste blokkeringsloggelement kan sees nedenfor.",
-	"clearyourcache": "'''Merk:''' Etter lagring vil det kanskje være nødvendig at nettleseren sletter hurtiglageret sitt for at endringene skal tre i kraft.\n* '''Firefox / Safari:''' Hold ''Shift'' mens du klikker på ''Oppdater'' eller trykk ''Ctrl-F5'' eller ''Ctrl-R'' (''⌘-R'' på en Mac)\n* '''Google Chrome:''' Trykk ''Ctrl-Shift-R'' (''⌘-Shift-R'' på en Mac)\n* '''Internet Explorer:''' Hold ''Ctrl'' mens du klikker på ''Oppdater'' eller trykk ''Ctrl-F5''\n* '''Opera:''' Tøm hurtiglageret i ''Verktøy → Innstillinger''",
+	"clearyourcache": "<strong>Merk:</strong> Etter lagring vil det kanskje være nødvendig at nettleseren sletter hurtiglageret sitt for at endringene skal tre i kraft.\n* <strong>Firefox / Safari:</strong> Hold <em>Shift</em> mens du klikker på <em>Oppdater</em> eller trykk <em>Ctrl-F5</em> eller <em>Ctrl-R</em> (<em>⌘-R</em> på en Mac)\n* <strong>Google Chrome:</strong> Trykk <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> på en Mac)\n* <strong>Internet Explorer:</strong> Hold <em>Ctrl</em> mens du klikker på <em>Oppdater</em> eller trykk <em>Ctrl-F5</em>\n* <strong>Opera:</strong> Tøm hurtiglageret i <em>Meny → Innstillinger</em> og deretter <em>Personvern & sikkerhet → Slett surfedata → Mellomlagrede bilder og filer</em>.",
 	"usercssyoucanpreview": "'''Tips:''' Bruk «{{int:showpreview}}»-knappen for å teste din nye CSS før du lagrer.",
 	"userjsyoucanpreview": "'''Tips:''' Bruk «{{int:showpreview}}»-knappen for å teste ditt nye JS før du lagrer.",
 	"usercsspreview": "'''Husk at dette bare er en forhåndsvisning av din bruker-CSS og at den ikke er lagret!'''",
@@ -707,7 +714,7 @@
 	"continue-editing": "GÃ¥ til redigeringsfeltet",
 	"previewconflict": "Slik vil teksten i redigeringsvinduet se ut dersom du lagrer den.",
 	"session_fail_preview": "'''Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.'''\n\nDu kan ha blitt logget ut. <strong>Sjekk at du fortsatt er innlogget og prøv igjen.</strong>\nOm det fortsetter å gå galt, prøv å [[Special:UserLogout|logge ut]] og så inn igjen, og sjekk at nettleseren din godtar informasjonskapsler fra denne siden.",
-	"session_fail_preview_html": "'''Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.'''\n\n''Fordi {{SITENAME}} har rå HTML slått på, er forhåndsvisningen skjult for å forhindre JavaScript-angrep.''\n\n'''Om dette er et legitimt redigeringsforsøk, prøv igjen. Om det da ikke fungerer, prøv å [[Special:UserLogout|logge ut]] og logge inn igjen.'''",
+	"session_fail_preview_html": "Beklager! Klarte ikke å lagre redigeringen din på grunn av tap av øktdata.\n\n<em>Fordi {{SITENAME}} har rå HTML slått på, er forhåndsvisningen skjult for å forhindre JavaScript-angrep.</em>\n\n<strong>Om dette er et legitimt redigeringsforsøk, prøv igjen.</strong> Om det fortsatt ikke fungerer, prøv å [[Special:UserLogout|logge ut]] og logge inn igjen og sjekk at nettleseren din godtar informasjonskapsler fra dette nettstedet.",
 	"token_suffix_mismatch": "'''Redigeringen din har blitt avvist fordi klienten din ikke hadde punktasjonstegn i redigeringsteksten. Redigeringen har blitt avvist for å hindre ødeleggelse av artikkelteksten. Dette forekommer av og til når man bruker vevbaserte anonyme proxytjenester.'''",
 	"edit_form_incomplete": "'''Deler av redigeringsskjemaet nådde ikke tjeneren; dobbelsjekk at redigeringen er korrekt og prøv igjen.'''",
 	"editing": "Redigerer $1",
@@ -874,9 +881,9 @@
 	"revdelete-unsuppress": "Fjern betingelser på gjenopprettede revisjoner",
 	"revdelete-log": "Årsak:",
 	"revdelete-submit": "Utfør på {{PLURAL:$1|valgt revisjon|valgte revisjoner}}",
-	"revdelete-success": "'''Revisjonssynlighet vellykket oppdatert.'''",
+	"revdelete-success": "Revisjonssynlighet ble oppdatert.",
 	"revdelete-failure": "'''Kunne ikke endre versjonssynligheten:'''\n$1",
-	"logdelete-success": "'''Hendelsessynlighet satt.'''",
+	"logdelete-success": "Hendelsessynlighet ble satt.",
 	"logdelete-failure": "'''Loggens synlighet kunne ikke bli stilt inn:'''\n$1",
 	"revdel-restore": "endre synlighet",
 	"pagehist": "Sidehistorikk",
@@ -1119,7 +1126,7 @@
 	"userrights-unchangeable-col": "Grupper du ikke kan endre",
 	"userrights-irreversible-marker": "$1 *",
 	"userrights-conflict": "En konflikt med endringen av brukerrettigheter! Vær vennlig å sjekke og på nytt bekrefte endringene dine.",
-	"userrights-removed-self": "Du har fjernet dine egne rettigheter. Du har derfor ikke lengere adgang til denne siden.",
+	"userrights-removed-self": "Du har fjernet dine egne rettigheter. Du har derfor ikke lengre adgang til denne siden.",
 	"group": "Gruppe:",
 	"group-user": "Brukere",
 	"group-autoconfirmed": "Autobekreftede brukere",
@@ -1211,9 +1218,10 @@
 	"right-override-export-depth": "Eksporter sider inkludert lenkede sider til en dypde på 5",
 	"right-sendemail": "Send e-post til andre brukere",
 	"right-passwordreset": "Vis e-poster over tilbakestilte passord",
-	"right-managechangetags": "Opprette og slette [[Special:Tags|tagger]] fra databasen",
+	"right-managechangetags": "Opprette og (de)aktivere [[Special:Tags|tagger]]",
 	"right-applychangetags": "Legg til [[Special:Tags|merker]] sammen med ens endringer",
 	"right-changetags": "Legg til og fjern vilkårlige [[Special:Tags|merker]] på individuelle revisjoner og loggposter",
+	"right-deletechangetags": "Slette [[Special:Tags|tagger]] fra databasen",
 	"grant-generic": "Rettighetspakken «$1»",
 	"grant-group-page-interaction": "Interagere med sider",
 	"grant-group-file-interaction": "Interagere med media",
@@ -1250,8 +1258,8 @@
 	"rightslogtext": "Dette er en logg over endringer av brukerrettigheter.",
 	"action-read": "se denne siden",
 	"action-edit": "redigere denne siden",
-	"action-createpage": "opprette sider",
-	"action-createtalk": "opprette diskusjonssider",
+	"action-createpage": "opprette denne siden",
+	"action-createtalk": "opprette denne diskusjonssiden",
 	"action-createaccount": "opprette denne kontoen",
 	"action-history": "se historikken til denne siden",
 	"action-minoredit": "merke denne redigeringen som mindre",
@@ -1290,9 +1298,10 @@
 	"action-viewmyprivateinfo": "vise din private informasjon",
 	"action-editmyprivateinfo": "rediger din private informasjon",
 	"action-editcontentmodel": "rediger innholdsmodellen til en side",
-	"action-managechangetags": "opprette og slette tagger fra databasen",
+	"action-managechangetags": "opprette og (de)aktivere tagger",
 	"action-applychangetags": "bruk merker sammen med dine endringer",
 	"action-changetags": "legg til og fjern vilkårlige merker på individuelle revisjoner og loggposter",
+	"action-deletechangetags": "slette tagger fra databasen",
 	"nchanges": "$1 {{PLURAL:$1|endring|endringer}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|siden forrige besøk}}",
 	"enhancedrc-history": "historikk",
@@ -1357,9 +1366,9 @@
 	"recentchangeslinked-page": "Sidenavn:",
 	"recentchangeslinked-to": "Vis endringer på sider som lenker til den gitte siden istedet",
 	"recentchanges-page-added-to-category": "[[:$1]] lagt til kategori",
-	"recentchanges-page-added-to-category-bundled": "[[:$1]] og [[Special:WhatLinksHere/$1|{{PLURAL:$2|én side|$2 sider}}]] lagt til kategori",
+	"recentchanges-page-added-to-category-bundled": "[[:$1]] lagt til i kategori, [[Special:WhatLinksHere/$1|denne siden er inkludert i andre sider]]",
 	"recentchanges-page-removed-from-category": "[[:$1]] fjernet fra kategori",
-	"recentchanges-page-removed-from-category-bundled": "[[:$1]] og {{PLURAL:$2|én side|$2 sider}} fjernet fra kategori",
+	"recentchanges-page-removed-from-category-bundled": "[[:$1]] fjernet fra kategori, [[Special:WhatLinksHere/$1|denne siden er inkludert i andre sider]]",
 	"autochange-username": "Automatisk MediaWiki-endring",
 	"upload": "Last opp fil",
 	"uploadbtn": "Last opp fil",
@@ -1495,7 +1504,7 @@
 	"backend-fail-read": "Klarte ikke lese filen $1.",
 	"backend-fail-create": "Kunne ikke opprette filen $1.",
 	"backend-fail-maxsize": "Kunne ikke skrive filen $1 fordi den er større enn {{PLURAL:$2|én byte|$2 bytes}}.",
-	"backend-fail-readonly": "Underliggende \"$1\" er satt skrivebeskyttet fordi: \"$2\"",
+	"backend-fail-readonly": "Lagringssystemet «$1» er midlertidig skrivebeskyttet fordi: <em>$2</em>",
 	"backend-fail-synced": "Fila «$1» er i en inkonsistent status innen de interne bakstykkene",
 	"backend-fail-connect": "Kunne ikke koble til filbackend «$1».",
 	"backend-fail-internal": "En ukjent feil oppsto i filbackend «$1».",
@@ -1522,8 +1531,8 @@
 	"uploadstash-summary": "Denne siden gir tilgang til filer som har blitt lastet opp (eller er i ferd med å bli lastet opp) men som ennå ikke er publisert til wikien. Disse filene er ikke synlige for andre enn brukeren som lastet dem opp.",
 	"uploadstash-clear": "Fjern stashede filer",
 	"uploadstash-nofiles": "Du har ingen stashede filer.",
-	"uploadstash-badtoken": "Utføringen av den handlingen var mislykket, kanskje fordi redigeringsrettighetene dine har utløpt. Prøv igjen.",
-	"uploadstash-errclear": "Fjerning av filene var mislykket.",
+	"uploadstash-badtoken": "Utføringen av handlingen feilet, kanskje fordi redigeringsrettighetene dine har utløpt. Prøv igjen.",
+	"uploadstash-errclear": "Filene lot seg ikke fjerne.",
 	"uploadstash-refresh": "Oppdater listen over filer",
 	"invalid-chunk-offset": "Ugyldig delforskyvning",
 	"img-auth-accessdenied": "Ingen tilgang",
@@ -1773,13 +1782,13 @@
 	"apihelp-no-such-module": "Modulen «$1» ikke funnet.",
 	"apisandbox": "API-sandkasse",
 	"apisandbox-api-disabled": "API er deaktivert på dette nettstedet.",
-	"apisandbox-intro": "Bruk denne siden for å eksperimentere med '''MediaWiki web service APIet'''.\nSjekk [https://www.mediawiki.org/wiki/API:Main_page API-dokumentasjonen] for mer informasjon om bruk av APIet. Eksempel: [https://www.mediawiki.org/wiki/API#A_simple_example hente innholdet til en hovedside]. Velg en handling for å se flere eksempler.\n\nMerk at du kan utføre handlinger her som fører til endringer på wikien.",
+	"apisandbox-intro": "Bruk denne siden for å eksperimentere med <strong>MediaWiki webtjeneste-APIet</strong>.\nSjekk [[mw:API:Main page|API-dokumentasjonen]] for mer informasjon om bruk av APIet. Eksempel: [https://www.mediawiki.org/wiki/API#A_simple_example hente innholdet til en hovedside]. Velg en handling for å se flere eksempler.\n\nMerk at du kan utføre handlinger her som fører til endringer på wikien.",
 	"apisandbox-submit": "Foreta en forespørsel",
 	"apisandbox-reset": "Tilbakestill",
-	"apisandbox-examples": "Eksempel",
-	"apisandbox-results": "Resultat",
+	"apisandbox-examples": "Eksempler",
+	"apisandbox-results": "Resultater",
 	"apisandbox-request-url-label": "Forespurt URL:",
-	"apisandbox-request-time": "Forespørselstid: $1",
+	"apisandbox-request-time": "Forespørselstid: {{PLURAL:$1|$1 ms}}",
 	"booksources": "Bokkilder",
 	"booksources-search-legend": "Søk etter bokkilder",
 	"booksources-search": "Søk",
@@ -1858,7 +1867,7 @@
 	"listgrouprights-namespaceprotection-header": "Navneromsbegrensinger",
 	"listgrouprights-namespaceprotection-namespace": "Navnerom",
 	"listgrouprights-namespaceprotection-restrictedto": "Rettighet(er) som tillater at brukeren redigerer",
-	"listgrants-summary": "Følgende er en liste over OAuth-tildelinger og hvilke brukerrettigheter de gir tilgang til. Brukere kan autorisere applikasjoner til å bruke kontoen deres, med rettigheter begrenset til de gitt av tildelingene brukeren har godkjent. En applikasjon som handler på vegne av en bruker kan imidlertid aldri benytte seg av rettigheter brukeren ikke selv har.\nDet kan finnes [[{{MediaWiki:Listgrouprights-helppage}}|ytterligere informasjon]] om de ulike rettighetene.",
+	"listgrants-summary": "Følgende er en liste over tildelinger samt hvilke brukerrettigheter de gir tilgang til. Brukere kan autorisere applikasjoner til å bruke kontoen deres, med rettigheter begrenset til de gitt av tildelingene brukeren har godkjent. En applikasjon som handler på vegne av en bruker kan imidlertid aldri benytte seg av rettigheter brukeren ikke selv har.\nDet kan finnes [[{{MediaWiki:Listgrouprights-helppage}}|ytterligere informasjon]] om de ulike rettighetene.",
 	"listgrants-rights": "Rettigheter",
 	"trackingcategories": "Sporingskategori",
 	"trackingcategories-summary": "Denne siden lister sporingskategorier som er automatisk befolket av Mediawiki-programvaren. Navnene deres kan endres ved å redigere de tilhørende systembeskjedene i {{ns:8}}-navnerommet.",
@@ -1984,7 +1993,7 @@
 	"delete-toobig": "Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Muligheten til å slette slike sider er begrenset for å unngå utilsiktet forstyrring av {{SITENAME}}.",
 	"delete-warning-toobig": "Denne siden har en stor redigeringshistorikk, med over {{PLURAL:$1|$1&nbsp;revisjon|$1&nbsp;revisjoner}}. Sletting av denne siden kan forstyrre databasen til {{SITENAME}}; vær varsom.",
 	"deleteprotected": "Du kan ikke slette denne siden fordi den er beskyttet.",
-	"deleting-backlinks-warning": "'''Advarsel:''' [[Special:WhatLinksHere/{{FULLPAGENAME}}|Andre sider]] lenker til eller inkluderer siden du er i ferd med å slette.",
+	"deleting-backlinks-warning": "<strong>Advarsel:</strong> [[Special:WhatLinksHere/{{FULLPAGENAME}}|Andre sider]] lenker til eller inkluderer siden du er i ferd med å slette.",
 	"rollback": "Fjern redigeringer",
 	"rollbacklink": "tilbakestill",
 	"rollbacklinkcount": "tilbakestill {{PLURAL:$1|én endring|$1 endringer}}",
@@ -2089,7 +2098,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|Én revisjon|$1 revisjoner}} gjenopprettet",
 	"undeletedrevisions-files": "{{PLURAL:$1|Én revisjon|$1 revisjoner}} og {{PLURAL:$2|én fil|$2 filer}} gjenopprettet",
 	"undeletedfiles": "{{PLURAL:$1|Én fil|$1 filer}} gjenopprettet",
-	"cannotundelete": "Gjennoppretting feilet:\n$1",
+	"cannotundelete": "Deler av eller hele gjennopprettingen feilet:\n$1",
 	"undeletedpage": "'''$1 ble gjenopprettet'''\n\nSjekk [[Special:Log/delete|slettingsloggen]] for en liste over nylige slettinger og gjenopprettelser.",
 	"undelete-header": "Se [[Special:Log/delete|slettingsloggen]] for nylig slettede sider.",
 	"undelete-search-title": "Søk i slettede sider",
@@ -2510,7 +2519,7 @@
 	"lastmodifiedatby": "Denne siden ble sist redigert $1 kl. $2 av $3.",
 	"othercontribs": "Basert på arbeid av $1.",
 	"others": "andre",
-	"siteusers": "{{SITENAME}}-{{PLURAL:$2|bruker|brukere}} $1",
+	"siteusers": "{{SITENAME}}-{{PLURAL:$2|{{GENDER:$1|bruker}}|brukere}} $1",
 	"anonusers": "{{SITENAME}}s {{PLURAL:$2|anonyme bruker|anonyme brukere}} $1",
 	"creditspage": "Sidekrediteringer",
 	"nocredits": "Ingen krediteringer er tilgjengelig for denne siden.",
@@ -3017,8 +3026,8 @@
 	"scarytranscludefailed-httpstatus": "[Henting av mal for $1 feilet: HTTP $2]",
 	"scarytranscludetoolong": "[URL-en er for lang]",
 	"deletedwhileediting": "'''Advarsel:''' Denne siden har blitt slettet etter at du begynte å redigere den!",
-	"confirmrecreate": "«[[User:$1|$1]]» ([[User talk:$1|diskusjon]]) slettet siden etter at du begynte å redigere den, med begrunnelsen «$2». Vennligst bekreft at du vil gjenopprette siden.",
-	"confirmrecreate-noreason": "Brukeren [[User:$1|$1]] ([[User talk:$1|diskusjon]]) slettet denne siden etter at du begynte å redigere. Bekreft at du virkelig ønsker å gjenopprette denne siden.",
+	"confirmrecreate": "Brukeren [[User:$1|$1]] ([[User talk:$1|diskusjon]]) {{GENDER:$1|slettet}} siden etter at du begynte å redigere den, med begrunnelsen:\n: <em>$2</em>\nVennligst bekreft at du vil gjenopprette siden.",
+	"confirmrecreate-noreason": "Brukeren [[User:$1|$1]] ([[User talk:$1|diskusjon]]) {{GENDER:$1|slettet}} denne siden etter at du begynte å redigere. Bekreft at du virkelig ønsker å gjenopprette denne siden.",
 	"recreate": "Gjenopprett",
 	"confirm_purge_button": "OK",
 	"confirm-purge-top": "Vil du slette tjenerens mellomlagrede versjon (''cache'') av denne siden?",
@@ -3065,7 +3074,7 @@
 	"watchlistedit-raw-done": "Overvåkningslisten din er oppdatert.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|Én tittel|$1 titler}} ble lagt til:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|Én tittel|$1 titler}} ble fjernet:",
-	"watchlistedit-clear-title": "Rensket overvåkningslisten",
+	"watchlistedit-clear-title": "Tøm overvåkningslisten",
 	"watchlistedit-clear-legend": "Rensk overvåkninslisten",
 	"watchlistedit-clear-explain": "Alle titlene blir fjernet fra overvåkningslisten din",
 	"watchlistedit-clear-titles": "Titler:",
@@ -3263,7 +3272,7 @@
 	"tags-edit-revision-legend": "Legg til eller fjern fra {{PLURAL:$1|denne revisjonen|alle revisjoner}}",
 	"tags-edit-logentry-legend": "Legg til eller fjern fra {{PLURAL:$1|denne loggposten|alle loggposter}}",
 	"tags-edit-existing-tags": "Eksisterende merker:",
-	"tags-edit-existing-tags-none": "«Ingen»",
+	"tags-edit-existing-tags-none": "<em>Ingen</em>",
 	"tags-edit-new-tags": "Nye merker:",
 	"tags-edit-add": "Legg til disse merkene:",
 	"tags-edit-remove": "Fjern disse merkene:",
@@ -3273,7 +3282,7 @@
 	"tags-edit-reason": "Årsak:",
 	"tags-edit-revision-submit": "Utfør endringene på {{PLURAL:$1|denne revisjonen|$1 revisjoner}}",
 	"tags-edit-logentry-submit": "Utfør endringene på {{PLURAL:$1|denne loggposten|$1 loggposter}}",
-	"tags-edit-success": "Endringene ble suksessfullt utført.",
+	"tags-edit-success": "Endringene ble utført.",
 	"tags-edit-failure": "Denne endringen kunne ikke bli utført:\n$1",
 	"tags-edit-nooldid-title": "Ugyldig målrevisjon",
 	"tags-edit-nooldid-text": "Du har enten ikke angitt noen målversjon for denne funksjonen, eller så har du angitt en revisjon som ikke finnes.",
@@ -3363,7 +3372,7 @@
 	"logentry-protect-protect-cascade": "$1 {{GENDER:$2|beskyttet}} $3 $4 [cascading]",
 	"logentry-protect-modify": "$1 {{GENDER:$2|endret}} beskyttelsesnivå for $3 $4",
 	"logentry-protect-modify-cascade": "$1 {{GENDER:$2|endret}} beskyttelsesnivå for $3 $4 [cascading]",
-	"logentry-rights-rights": "$1 {{GENDER:$2|endret}} gruppemedlemskap for $3 fra $4 til $5",
+	"logentry-rights-rights": "$1 {{GENDER:$2|endret}} gruppemedlemskap for {{GENDER:$6|$3}} fra $4 til $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|endret}} gruppemedlemskap for $3",
 	"logentry-rights-autopromote": "$1 ble automatisk {{GENDER:$2|forfremmet}} fra $4 til $5",
 	"logentry-upload-upload": "$1 {{GENDER:$2|lastet opp}} $3",
@@ -3494,7 +3503,7 @@
 	"expand_templates_preview": "Forhåndsvisning",
 	"expand_templates_preview_fail_html": "<em>Fordi {{SITENAME}} har slått på rå HTML og sesjonsdata ble tapt er forhåndsvisningen skjult for å beskytte mot JavaScript-angrep.</em>\n\n<strong>Om dette er et legitimt forsøk på å forhåndsvise, prøv igjen.</strong> Om det fortsatt ikke fungerer, prøv å [[Special:UserLogout|logge ut]] og logge inn igjen.",
 	"expand_templates_preview_fail_html_anon": "<em>Fordi {{SITENAME}} har slått på rå HTML og du ikke er logget inn er forhåndsvisningen skjult for å beskytte mot JavaScript-angrep.</em>\n\n<strong>Om dette er et legitimt forsøk på å forhåndsvise, [[Special:UserLogin|logg inn]] og prøv igjen.</strong>",
-	"pagelanguage": "Valg av sidespråk",
+	"pagelanguage": "Endre sidespråk",
 	"pagelang-name": "Side",
 	"pagelang-language": "Språk",
 	"pagelang-use-default": "Bruk standardspråk",
@@ -3502,9 +3511,9 @@
 	"pagelang-submit": "Lagre",
 	"right-pagelang": "Endre sidespråk",
 	"action-pagelang": "endre sidespråket",
-	"log-name-pagelang": "Endre språklogg",
+	"log-name-pagelang": "Logg for språkendringer",
 	"log-description-pagelang": "Dette er en logg som viser endringer i sidespråk",
-	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|endret}} sidespråk for $3 fra $4 til $5.",
+	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|endret}} språk for $3 fra $4 til $5.",
 	"default-skin-not-found": "Ops! Standarddrakten for wikien din, definert i <code dir=\"ltr\">$wgDefaultSkin</code> som <code>$1</code>, er ikke tilgjengelig.\n\nInstallasjonen din ser ut til å inneholde følgende {{PLURAL:$4|drakt|drakter}}. Se [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] for informasjon om hvordan du kan slå {{PLURAL:$4|denne på|disse på og velge en standarddrakt}}.\n\n$2\n\n; Om du nettopp har installert MediaWiki:\n: Du har trolig installert fra git, eller direkte fra kildekoden med en annen metode. Dette er forventet. Prøv å installere noen drakter fra [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org sin draktbase] ved å\n:* laste ned [https://www.mediawiki.org/wiki/Download tarball-installereren], som kommer med flere drakter og utvidelser. Du kan kopiere og lime inn <code>skins/</code>-mappen fra denne.\n:* laste ned individuelle drakter fra [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* klone en av <code>mediawiki/skins/*</code>-lagrene via git inn i <code>skins/</code> -mappen av din MediaWiki-installasjon.\n: Å gjøre dette skal ikke forstyrre git-mappen din om du er en MediaWiki-utvikler.\n\n; Om du nettopp har oppgradert MediaWiki:\n: MediaWiki 1.24 og nyere slår ikke lenger på automatisk installerte drakter (se [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manual: Skin autodiscovery]). Du kan lime inn følgende {{PLURAL:$5|linje|linjer}} i <code>LocalSettings.php</code> for å slå på {{PLURAL:$5|den|alle}} nåværende installerte {{PLURAL:$5|drakten|drakter}}:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Om du nettopp har endret <code>LocalSettings.php</code>:\n: Dobbelsjekk draktnavnene for skrivefeil.",
 	"default-skin-not-found-no-skins": "Ops! Standarddrakten for wikien din, definert i <code>$wgDefaultSkin</code> som <code>$1</code>, er ikke tilgjengelig.\n\nDu har ingen installerte drakter.\n\n;Om du nettopp har installert eller oppgradert MediaWiki:\n: Du installerte trolig fra git, eller direkte fra kildekoden med en annen metode. Dette er forventet. MediaWiki 1.24 og nyere inkluderer ingen drakter i hovedarkivet. Prøv å installere noen drakter fra [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.orgs draktmappe], ved å:\n:* laste ned [https://www.mediawiki.org/wiki/Download tarball-installereren], som kommer med mange drakter og tillegg. Du kan kopiere og lime inn <code>skins/</code>-mappen fra denne.\n:* laste ned individuelle drakt-tarballer fra [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* klone en av <code>mediawiki/skins/*</code>-arkivene via git til <code dir=\"ltr\">skins/</code>-mappa i din MediaWiki-installasjon.\n: Å gjøre dette vil ikke forstyrre ditt git-arkiv om du er en MediaWiki-utvikler. Se [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual:Skin configuration] for informasjon om hvordan du slår på drakter og velger en standarddrakt.",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (slått på)",
diff --git a/languages/i18n/nds.json b/languages/i18n/nds.json
index 6cd436aacb..3fc66f5154 100644
--- a/languages/i18n/nds.json
+++ b/languages/i18n/nds.json
@@ -2222,5 +2222,25 @@
 	"expand_templates_remove_comments": "Kommentaren rutnehmen",
 	"expand_templates_generate_xml": "XML-Parser-Boom wiesen",
 	"expand_templates_preview": "Vörschau",
-	"pagelang-language": "Spraak"
+	"pagelang-language": "Spraak",
+	"special-characters-group-latin": "Latiensch",
+	"special-characters-group-latinextended": "Latiensch verwiedert",
+	"special-characters-group-ipa": "Internatschonal Phoneetsch Alphabet",
+	"special-characters-group-symbols": "Symbolen",
+	"special-characters-group-greek": "Greeksch",
+	"special-characters-group-greekextended": "Greeksch verwiedert",
+	"special-characters-group-cyrillic": "Kyrillisch",
+	"special-characters-group-arabic": "Araabsch",
+	"special-characters-group-arabicextended": "Araabsch verwiedert",
+	"special-characters-group-persian": "Persisch",
+	"special-characters-group-hebrew": "Hebrääsch",
+	"special-characters-group-bangla": "Bengaalsch",
+	"special-characters-group-tamil": "Tamilsch",
+	"special-characters-group-telugu": "Telugu",
+	"special-characters-group-sinhala": "Singaleesch",
+	"special-characters-group-gujarati": "Gujarati",
+	"special-characters-group-devanagari": "Devanagari",
+	"special-characters-group-thai": "Thailändsch",
+	"special-characters-group-lao": "Laotisch",
+	"special-characters-group-khmer": "Khmer"
 }
diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json
index 4a0ba418d9..5c69a6d87c 100644
--- a/languages/i18n/nl.json
+++ b/languages/i18n/nl.json
@@ -508,6 +508,8 @@
 	"createacct-reason-ph": "Waarom u een andere account aanmaakt",
 	"createacct-submit": "Account aanmaken",
 	"createacct-another-submit": "Account aanmaken",
+	"createacct-continue-submit": "Doorgaan met het maken van een account",
+	"createacct-another-continue-submit": "Doorgaan met het maken van een account",
 	"createacct-benefit-heading": "{{SITENAME}} wordt gemaakt door mensen zoals u.",
 	"createacct-benefit-body1": "bewerking{{PLURAL:$1||en}}",
 	"createacct-benefit-body2": "pagina{{PLURAL:$1||'s}}",
@@ -604,9 +606,9 @@
 	"botpasswords-created-title": "Botwachtwoord aangemaakt",
 	"botpasswords-created-body": "Het botwachtwoord voor botnaam \"$1\" van gebruiker \"$2\" is gemaakt.",
 	"botpasswords-updated-title": "Botwachtwoord bijgewerkt",
-	"botpasswords-updated-body": "Het botwachtwoord \"$1\" is succesvol bijgewerkt.",
+	"botpasswords-updated-body": "Het botwachtwoord voor de bot \"$1\" van gebruiker \"$2\" is succesvol bijgewerkt.",
 	"botpasswords-deleted-title": "Botwachtwoord verwijderd",
-	"botpasswords-deleted-body": "Het botwachtwoord \"$1\" is verwijderd.",
+	"botpasswords-deleted-body": "Het botwachtwoord voor de bot \"$1\" van gebruiker \"$2\" is verwijderd.",
 	"botpasswords-newpassword": "Het nieuwe wachtwoord om aan te melden met <strong>$1</strong> is nu <strong>$2</strong>. <em>Bewaar dit goed voor toekomstig gebruik.</em>",
 	"botpasswords-no-provider": "BotPasswordsSessionProvider is niet beschikbaar.",
 	"botpasswords-restriction-failed": "Botwachtwoordbeperkingen maken het aanmelden onmogelijk.",
@@ -722,7 +724,7 @@
 	"userpage-userdoesnotexist": "U bewerkt een gebruikerspagina van een gebruiker die niet bestaat (gebruiker \"$1\").\nControleer of u deze pagina wel wilt aanmaken of bewerken.",
 	"userpage-userdoesnotexist-view": "De gebruiker \"$1\" is niet geregistreerd.",
 	"blocked-notice-logextract": "Deze gebruiker is op het moment geblokkeerd.\nDe laatste regel uit het blokkeerlogboek wordt hieronder ter referentie weergegeven:",
-	"clearyourcache": "'''Let op!''' Nadat u de wijzigingen hebt opgeslagen is het wellicht nodig uw browsercache te legen.\n* '''Firefox / Safari:''' houd ''Shift'' ingedrukt terwijl u op ''Vernieuwen'' klikt of druk op ''Ctrl-F5'' of ''Ctrl-R'' (''⌘-Shift-R'' op een Mac)\n* '''Google Chrome:''' druk op ''Ctrl-Shift-R'' (''⌘-Shift-R'' op een Mac)\n* '''Internet Explorer:''' houd ''Ctrl'' ingedrukt terwijl u op ''Vernieuwen'' klikt of druk op ''Ctrl-F5''\n* '''Opera:''' leeg uw cache in ''Extra → Voorkeuren''",
+	"clearyourcache": "<strong>Opmerking:</strong> nadat u de wijzigingen hebt opgeslagen is het wellicht nodig uw browsercache te legen.\n* <strong>Firefox / Safari:</strong> houd <em>Shift</em> ingedrukt terwijl u op <em>Vernieuwen</em> klikt of druk op <em>Ctrl-F5</em> of <em>Ctrl-R</em> (<em>⌘-Shift-R</em> op een Mac)\n* <strong>Google Chrome:</strong> druk op <em>Ctrl-Shift-R</em> (<em>⌘-Shift-R</em> op een Mac)\n* <strong>Internet Explorer:</strong> houd <em>Ctrl</em> ingedrukt terwijl u op <em>Vernieuwen</em> klikt of druk op <em>Ctrl-F5</em>\n* '''Opera:''' ga naar <em>Menu → Instellingen</em> (<em>Opera → Voorkeuren</em> op een Mac) en daarna naar <em>Privacy & beveiliging → Browsegegevens wissen... →  Tijdelijk opgeslgen afbeeldingen en bestanden</em>.",
 	"usercssyoucanpreview": "'''Tip:''' gebruik de knop \"{{int:showpreview}}\" om uw nieuwe CSS te testen alvorens op te slaan.",
 	"userjsyoucanpreview": "'''Tip:''' gebruik de knop \"{{int:showpreview}}\" om uw nieuwe JavaScript te testen alvorens op te slaan.",
 	"usercsspreview": "'''Dit is alleen een voorvertoning van uw persoonlijke CSS.'''\n'''Deze is nog niet opgeslagen!'''",
@@ -1279,7 +1281,7 @@
 	"action-read": "deze pagina te bekijken",
 	"action-edit": "deze pagina te bewerken",
 	"action-createpage": "deze pagina aan te maken",
-	"action-createtalk": "overlegpagina's aan te maken",
+	"action-createtalk": "deze overlegpagina aan te maken",
 	"action-createaccount": "deze gebruiker aan te maken",
 	"action-autocreateaccount": "dit externe gebruikersaccount automatisch aanmaken",
 	"action-history": "de geschiedenis van deze pagina te bekijken",
@@ -1319,9 +1321,10 @@
 	"action-viewmyprivateinfo": "uw eigen privégegevens te bekijken",
 	"action-editmyprivateinfo": "uw eigen privégegevens te bewerken",
 	"action-editcontentmodel": "het paginainhoudmodel te bewerken",
-	"action-managechangetags": "labels aan te maken en te verwijderen",
+	"action-managechangetags": "labels aan te maken en te (de)activeren",
 	"action-applychangetags": "labels aan uw bewerkingen toe te voegen",
 	"action-changetags": "willekeurige labels toe te voegen aan en te verwijderen van versies en logboekregels",
+	"action-deletechangetags": "labels uit de database te verwijderen",
 	"action-purge": "Schoon deze pagina op",
 	"nchanges": "$1 {{PLURAL:$1|bewerking|bewerkingen}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|sinds uw laatste bezoek}}",
diff --git a/languages/i18n/nn.json b/languages/i18n/nn.json
index bffd6e9be4..10d005d1be 100644
--- a/languages/i18n/nn.json
+++ b/languages/i18n/nn.json
@@ -1619,7 +1619,7 @@
 	"emailuser-title-target": "Send epost åt {{GENDER:$1|brukaren}}",
 	"emailuser-title-notarget": "Send e-post åt brukar",
 	"emailpagetext": "Du kan nytte skjemaet nedanfor til å sende ein e-post til denne {{GENDER:$1|brukaren}}.\nE-postadressa du har sett i [[Special:Preferences|innstillingane dine]] vil dukke opp i «frå»-feltet på denne e-posten, så mottakaren er i stand til å svare.",
-	"defemailsubject": "{{SITENAME}} epost frå brukar \"$1\"",
+	"defemailsubject": "{{SITENAME}}-e-post frå brukar «$1»",
 	"usermaildisabled": "Brukare-post slegen av",
 	"usermaildisabledtext": "Du kan ikkje senda e-postar til andre brukarar på wikien",
 	"noemailtitle": "Inga e-postadresse",
@@ -2719,7 +2719,7 @@
 	"recreate": "Attopprett",
 	"confirm_purge_button": "OK",
 	"confirm-purge-top": "Vil du slette tenarane sin mellomlagra versjon av denne sida?",
-	"confirm-purge-bottom": "Reinsing av ei side slettar mellomlageret og tvinger fram den nyaste versjonen.",
+	"confirm-purge-bottom": "Reinsing av ei side slettar mellomlageret og tvingar fram den nyaste versjonen.",
 	"confirm-watch-button": "OK",
 	"confirm-watch-top": "Legg denne sida til i overvakingslista di?",
 	"confirm-unwatch-button": "OK",
diff --git a/languages/i18n/oc.json b/languages/i18n/oc.json
index 0a13f2967f..33fc57f2fd 100644
--- a/languages/i18n/oc.json
+++ b/languages/i18n/oc.json
@@ -522,8 +522,6 @@
 	"passwordreset-emailtext-user": "L'utilizaire $1 sus {{SITENAME}} a demandat una reïnicializacion de vòstre senhal per {{SITENAME}} ($4). {{PLURAL:$3|Lo compte d'utilizaire seguent es associat|Los comptes d'utilizaires seguents son associats}} a aquesta adreça de corrièr electronic :\n\n$2\n\n{{PLURAL:$3|Aqueste senhal temporari expirarà|Aquestes senhals temporaris expiraràn}} dins {{PLURAL:$5|un jorn|$5 jorns}}. Ara, vos cal vos connectar e causir un senhal novèl. Se aquesta demanda proven pas de vos, o que vos sètz remembrat de vòstre senhal inicial, e que lo volètz pas mai modificar, podètz ignorar aqueste messatge e contunhar d'utilizar vòstre ancian senhal.",
 	"passwordreset-emailelement": "Utilizaire: \n$1\n\nSenhal temporari: \n$2",
 	"passwordreset-emailsentemail": "Un corrièr electronic de reïnicializacion de senhal es estat mandat.",
-	"passwordreset-emailsent-capture": "Un corrièr electronic de reïnicializacion senhal es estat mandat, qu'es afichat çaijós.",
-	"passwordreset-emailerror-capture": "Un corrièr electronic de reïnicializacion de senhal es estat generat, qu'es afichat çaijós, mas lo mandadís a l'{{GENDER:$2|utilizaire}} a fracassat : $1",
 	"changeemail": "Cambiar o suprimir l'adreça electronica",
 	"changeemail-header": "Cambiar l'adreça electronica del compte",
 	"changeemail-no-info": "Vos cal èsser connectat per aver accès a aquesta pagina.",
@@ -564,8 +562,9 @@
 	"minoredit": "Aquò es un cambiament menor",
 	"watchthis": "Seguir aquesta pagina",
 	"savearticle": "Salvar",
+	"publishchanges": "Publicar las modificacions",
 	"preview": "Previsualizar",
-	"showpreview": "Previsualizacion",
+	"showpreview": "Previsualizar",
 	"showdiff": "Veire los cambiaments",
 	"blankarticle": "<strong>Atencion :</strong> La pagina que creatz es voida.\nSe clicatz tornarmai sus « {{int:savearticle}} », la pagina serà creada sens cap de contengut.",
 	"anoneditwarning": "<strong>Atencion :<strong> sètz pas connectat.\nVòstra adreça IP serà visibla per tot lo monde se fasètz de modificacions. Se <strong>[$1 vos connectatz]</strong> o <strong>[$2 creatz un compte]</strong>, vòstras modificacions seràn atribuidas a vòstre nom d’utilizaire, entre autres avantatges.",
@@ -695,7 +694,6 @@
 	"undo-nochange": "Sembla que la modificacion es ja estada anullada.",
 	"undo-summary": "Anullacion de las modificacions $1 de [[Special:Contributions/$2|$2]] ([[User talk:$2|discutir]] | [[Special:Contributions/$2|{{MediaWiki:Contribslink}}]])",
 	"undo-summary-username-hidden": "Anullar la revision $1 per un utilizaire amagat",
-	"cantcreateaccounttitle": "Podètz pas crear de compte.",
 	"cantcreateaccount-text": "La creacion de compte dempuèi aquesta adreça IP ('''$1''') es estada blocada per [[User:$3|$3]].\n\nLa rason balhada per $3 èra ''$2''.",
 	"cantcreateaccount-range-text": "La creacion de compte dempuèi las adreças IP dins la plaja <strong>$1</strong>, que compren vòstra agreça IP (<strong>$4</strong>) son estadas blocadas per [[User:$3|$3]].\n\nLo motiu provesit per $3 es <em>$2</em>",
 	"viewpagelogs": "Vejatz las operacions per aquesta pagina",
@@ -2236,6 +2234,7 @@
 	"tooltip-ca-nstab-category": "Vejatz la pagina de la categoria",
 	"tooltip-minoredit": "Marcar mas modificacions coma un cambiament menor",
 	"tooltip-save": "Salvar vòstras modificacions",
+	"tooltip-publish": "Publicar vòstras modificacions",
 	"tooltip-preview": "Mercé de previsualizar vòstras modificacions abans de salvar!",
 	"tooltip-diff": "Aficha los cambiaments qu'avètz aportats al tèxte",
 	"tooltip-compareselectedversions": "Afichar las diferéncias entre doas versions d'aquesta pagina",
diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index f6b9259e18..fe587b167d 100644
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -2211,8 +2211,8 @@
 	"sp-contributions-newbies-sub": "Dla nowych użytkowników",
 	"sp-contributions-newbies-title": "Wkład nowych użytkowników",
 	"sp-contributions-blocklog": "blokady",
-	"sp-contributions-suppresslog": "utajniony wkład użytkownika",
-	"sp-contributions-deleted": "usunięty wkład użytkownika",
+	"sp-contributions-suppresslog": "utajniony wkład {{GENDER:$1|użytkownika|użytkowniczki}}",
+	"sp-contributions-deleted": "usunięty wkład {{GENDER:$1|użytkownika|użytkowniczki}}",
 	"sp-contributions-uploads": "przesłane pliki",
 	"sp-contributions-logs": "rejestry",
 	"sp-contributions-talk": "dyskusja",
diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json
index f50e348f2a..a4514e7a52 100644
--- a/languages/i18n/pt-br.json
+++ b/languages/i18n/pt-br.json
@@ -819,6 +819,7 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Objeto vazio",
 	"content-json-empty-array": "Array vazia",
+	"deprecated-self-close-category": "Páginas com etiquetas HTML de autofechamento não válidas",
 	"duplicate-args-warning": "<strong> Aviso: </strong> [[:$1]] está chamando [[:$2]] com mais de um valor para o parâmetro \"$3\". Será utilizado apenas o último valor fornecido.",
 	"duplicate-args-category": "Páginas com argumentos de predefinições duplicados",
 	"duplicate-args-category-desc": "A pagina contem modelos que usam argumentos duplicados, como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> ou <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json
index 4db45fca12..2989d3b2d1 100644
--- a/languages/i18n/pt.json
+++ b/languages/i18n/pt.json
@@ -597,7 +597,7 @@
 	"botpasswords-insert-failed": "Falhou ao adicionar o nome do robô \"$1\". Já foi adicionado?",
 	"botpasswords-update-failed": "Falha ao atualizar o nome do robô \"$1\". Será que foi eliminado?",
 	"botpasswords-created-title": "Criada palavra-passe para o robô",
-	"botpasswords-created-body": "O robô palavra-passe para o nome do robô \"$1\" do utilizador \"$2\" foi criado.",
+	"botpasswords-created-body": "A palavra-passe de robô para o robô \"$1\" do utilizador \"$2\" foi criada.",
 	"botpasswords-updated-title": "A palavra-passe de robô foi actualizada.",
 	"botpasswords-updated-body": "O robô palavra-passe para o nome do robô \"$1\" do utilizador \"$2\" foi atualizado.",
 	"botpasswords-deleted-title": "Palavra-passe de robô eliminada",
@@ -792,6 +792,7 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Objeto vazio",
 	"content-json-empty-array": "Matriz vazia",
+	"deprecated-self-close-category": "Páginas com etiquetas HTML de autofechamento não válidas",
 	"duplicate-args-warning": "<strong>Aviso:</strong> [[:$1]] chama [[:$2]] com mais de um valor para o parâmetro \"$3\". Somente o último valor fornecido será utilizado.",
 	"duplicate-args-category": "Páginas com argumentos de predefinições duplicados",
 	"duplicate-args-category-desc": "A página contém campos de predefinições que utilizam duplicatas de argumentos, tais como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> ou <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
@@ -1241,6 +1242,7 @@
 	"grant-group-high-volume": "Realizar actividades em grande quantidade",
 	"grant-group-customization": "Personalização e preferências",
 	"grant-group-administration": "Executar acções administrativas",
+	"grant-group-private-information": "Aceder aos seus dados privados",
 	"grant-group-other": "Actividade diversa",
 	"grant-blockusers": "Bloquear e desbloquear utilizadores",
 	"grant-createaccount": "Criar contas",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 2f315e8532..6a3d604ae7 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -1430,7 +1430,7 @@
 	"right-applychangetags": "{{doc-right|applychangetags}}",
 	"right-changetags": "{{doc-right|changetags}}",
 	"right-deletechangetags": "{{doc-right|deletechangetags}}",
-	"grant-generic": "Used if the grant name is not defined. Parameters:\n* $1 - grant name\n\nDefined grants (grant name refers: blockusers, createeditmovepage, ...):\n* {{msg-mw|grant-checkuser}}\n* {{msg-mw|grant-blockusers}}\n* {{msg-mw|grant-createaccount}}\n* {{msg-mw|grant-createeditmovepage}}\n* {{msg-mw|grant-delete}}\n* {{msg-mw|grant-editinterface}}\n* {{msg-mw|grant-editmycssjs}}\n* {{msg-mw|grant-editmyoptions}}\n* {{msg-mw|grant-editmywatchlist}}\n* {{msg-mw|grant-editpage}}\n* {{msg-mw|grant-editprotected}}\n* {{msg-mw|grant-highvolume}}\n* {{msg-mw|grant-oversight}}\n* {{msg-mw|grant-patrol}}\n* {{msg-mw|grant-protect}}\n* {{msg-mw|grant-rollback}}\n* {{msg-mw|grant-sendemail}}\n* {{msg-mw|grant-uploadeditmovefile}}\n* {{msg-mw|grant-uploadfile}}\n* {{msg-mw|grant-basic}}\n* {{msg-mw|grant-viewdeleted}}\n* {{msg-mw|grant-viewmywatchlist}}",
+	"grant-generic": "Used if the grant name is not defined. Parameters:\n* $1 - grant name\n\nDefined grants (grant name refers: blockusers, createeditmovepage, ...):\n* {{msg-mw|grant-checkuser}}\n* {{msg-mw|grant-blockusers}}\n* {{msg-mw|grant-createaccount}}\n* {{msg-mw|grant-createeditmovepage}}\n* {{msg-mw|grant-delete}}\n* {{msg-mw|grant-editinterface}}\n* {{msg-mw|grant-editmycssjs}}\n* {{msg-mw|grant-editmyoptions}}\n* {{msg-mw|grant-editmywatchlist}}\n* {{msg-mw|grant-editpage}}\n* {{msg-mw|grant-editprotected}}\n* {{msg-mw|grant-highvolume}}\n* {{msg-mw|grant-oversight}}\n* {{msg-mw|grant-patrol}}\n* {{msg-mw|grant-privateinfo}}\n* {{msg-mw|grant-protect}}\n* {{msg-mw|grant-rollback}}\n* {{msg-mw|grant-sendemail}}\n* {{msg-mw|grant-uploadeditmovefile}}\n* {{msg-mw|grant-uploadfile}}\n* {{msg-mw|grant-basic}}\n* {{msg-mw|grant-viewdeleted}}\n* {{msg-mw|grant-viewmywatchlist}}",
 	"grant-group-page-interaction": "{{Related|grant-group}}",
 	"grant-group-file-interaction": "{{Related|grant-group}}",
 	"grant-group-watchlist-interaction": "{{Related|grant-group}}",
@@ -1438,28 +1438,30 @@
 	"grant-group-high-volume": "{{Related|Grant-group}}",
 	"grant-group-customization": "{{Related|Grant-group}}",
 	"grant-group-administration": "{{Related|Grant-group}}",
+	"grant-group-private-information": "{{Related|Grant-group}}",
 	"grant-group-other": "{{Related|Grant-group}}",
 	"grant-blockusers": "Name for grant \"blockusers\".\n{{Related|Grant}}",
-	"grant-createaccount": "Name for grant \"createaccount\".\n{{Related|grant}}",
-	"grant-createeditmovepage": "Name for grant \"createeditmovepage\".\n{{Related|grant}}",
-	"grant-delete": "Name for grant \"delete\".\n{{Related|grant}}",
-	"grant-editinterface": "Name for grant \"editinterface\".\n\n\"JS\" stands for \"JavaScript\".\n{{Related|grant}}",
-	"grant-editmycssjs": "Name for grant \"editmycssjs\".\n\n\"JS\" stands for \"JavaScript\".\n{{Related|grant}}",
-	"grant-editmyoptions": "Name for grant \"editmyoptions\".\n{{Related|grant}}",
-	"grant-editmywatchlist": "Name for grant \"editmywatchlist\".\n{{Related|grant}}\n{{Identical|Edit your watchlist}}",
-	"grant-editpage": "Name for grant \"editpage\".\n{{Related|grant}}",
-	"grant-editprotected": "Name for grant \"editprotected\".\n{{Related|grant}}",
-	"grant-highvolume": "Name for grant \"highvolume\".\n{{Related|grant}}",
-	"grant-oversight": "Name for grant \"oversight\".\n{{Related|grant}}",
-	"grant-patrol": "Name for grant \"patrol\".\n{{Related|grant}}",
-	"grant-protect": "Name for grant \"protect\".\n{{Related|grant}}",
-	"grant-rollback": "Name for grant \"rollback\".\n{{Related|grant}}",
-	"grant-sendemail": "Name for grant \"sendemail\".\n{{Related|grant}}",
-	"grant-uploadeditmovefile": "Name for grant \"uploadeditmovefile\".\n{{Related|grant}}",
-	"grant-uploadfile": "Name for grant \"uploadfile\".\n{{Related|grant}}\n{{Identical|Upload new file}}",
-	"grant-basic": "Name for grant \"basic\".\n{{Related|grant}}",
-	"grant-viewdeleted": "Name for grant \"viewdeleted\".\n{{Related|grant}}",
-	"grant-viewmywatchlist": "Name for grant \"viewmywatchlist\".\n{{Related|grant}}\n{{Identical|View your watchlist}}",
+	"grant-createaccount": "Name for grant \"createaccount\".\n{{Related|Grant}}",
+	"grant-createeditmovepage": "Name for grant \"createeditmovepage\".\n{{Related|Grant}}",
+	"grant-delete": "Name for grant \"delete\".\n{{Related|Grant}}",
+	"grant-editinterface": "Name for grant \"editinterface\".\n\n\"JS\" stands for \"JavaScript\".\n{{Related|Grant}}",
+	"grant-editmycssjs": "Name for grant \"editmycssjs\".\n\n\"JS\" stands for \"JavaScript\".\n{{Related|Grant}}",
+	"grant-editmyoptions": "Name for grant \"editmyoptions\".\n{{Related|Grant}}",
+	"grant-editmywatchlist": "Name for grant \"editmywatchlist\".\n{{Related|Grant}}\n{{Identical|Edit your watchlist}}",
+	"grant-editpage": "Name for grant \"editpage\".\n{{Related|Grant}}",
+	"grant-editprotected": "Name for grant \"editprotected\".\n{{Related|Grant}}",
+	"grant-highvolume": "Name for grant \"highvolume\".\n{{Related|Grant}}",
+	"grant-oversight": "Name for grant \"oversight\".\n{{Related|Grant}}",
+	"grant-patrol": "Name for grant \"patrol\".\n{{Related|Grant}}",
+	"grant-privateinfo": "Name for grant \"privateinfo\".\n{{Related|Grant}}",
+	"grant-protect": "Name for grant \"protect\".\n{{Related|Grant}}",
+	"grant-rollback": "Name for grant \"rollback\".\n{{Related|Grant}}",
+	"grant-sendemail": "Name for grant \"sendemail\".\n{{Related|Grant}}",
+	"grant-uploadeditmovefile": "Name for grant \"uploadeditmovefile\".\n{{Related|Grant}}",
+	"grant-uploadfile": "Name for grant \"uploadfile\".\n{{Related|Grant}}\n{{Identical|Upload new file}}",
+	"grant-basic": "Name for grant \"basic\".\n{{Related|Grant}}",
+	"grant-viewdeleted": "Name for grant \"viewdeleted\".\n{{Related|Grant}}",
+	"grant-viewmywatchlist": "Name for grant \"viewmywatchlist\".\n{{Related|Grant}}\n{{Identical|View your watchlist}}",
 	"newuserlogpage": "{{doc-logpage}}\n\nPart of the \"Newuserlog\" extension. It is both the title of [[Special:Log/newusers]] and the link you can see in [[Special:RecentChanges]].",
 	"newuserlogpagetext": "Part of the \"Newuserlog\" extension. It is the description you can see on [[Special:Log/newusers]].",
 	"rightslog": "{{doc-logpage}}\n\nIn [[Special:Log]]",
@@ -3846,7 +3848,7 @@
 	"tags-active-yes": "Table cell contents if given tag is \"active\".\n\nSee also:\n* {{msg-mw|Tags-active-no}}\n{{Identical|Yes}}",
 	"tags-active-no": "Table cell contents if given tag is not \"active\".\n\nSee also:\n* {{msg-mw|Tags-active-yes}}\n{{Identical|No}}",
 	"tags-source-extension": "Table cell contents if given tag can be applied automatically by a software [[mw:Manual:Extensions|extension]].\n\nSee also:\n* {{msg-mw|Tags-source-manual}}\n* {{msg-mw|Tags-source-none}}",
-	"tags-source-manual": "Table cell contents if given tag can be applied by users or bots.\n\nSee also:\n* {{msg-mw|Tags-source-extension}}\n* {{msg-mw|Tags-source-none}}",
+	"tags-source-manual": "\"Applied\" is not past tense, but an adjective that describes an action that sometimes happens, as in the sentence: \"(this tag is usually) applied by users and bots\".\n\nTable cell contents if given tag can be applied by users or bots.\n\nSee also:\n* {{msg-mw|Tags-source-extension}}\n* {{msg-mw|Tags-source-none}}",
 	"tags-source-none": "Table cell contents if given tag is no longer in use. (It was applied in the past, but it is currently not applied.)\n\nSee also:\n* {{msg-mw|Tags-source-extension}}\n* {{msg-mw|Tags-source-manual}}",
 	"tags-edit": "Used on [[Special:Tags]]. Verb. Used as display text on a link to create/edit a description.\n{{Identical|Edit}}",
 	"tags-delete": "Used on [[Special:Tags]]. Verb. Used as display text on a link to delete a tag.\n{{Identical|Delete}}",
diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json
index f7b7c946cb..953be9cf45 100644
--- a/languages/i18n/ru.json
+++ b/languages/i18n/ru.json
@@ -1278,6 +1278,7 @@
 	"grant-group-high-volume": "Выполнение действий с высокой интенсивностью",
 	"grant-group-customization": "Настройки и предпочтения",
 	"grant-group-administration": "Выполнение административных действий",
+	"grant-group-private-information": "Доступ к личной информации о вас",
 	"grant-group-other": "Разная активность",
 	"grant-blockusers": "Блокировка и разблокировка учётных записей",
 	"grant-createaccount": "Создание учётных записей",
@@ -1292,6 +1293,7 @@
 	"grant-highvolume": "Редактирование с высокой интенсивностью",
 	"grant-oversight": "Сокрытие правок участников и версий страниц",
 	"grant-patrol": "Патрулирование изменений страниц",
+	"grant-privateinfo": "Доступ к личной информации",
 	"grant-protect": "Защита страниц и снятие защиты",
 	"grant-rollback": "Откат изменений страниц",
 	"grant-sendemail": "Отправка электронной почты другим участникам",
@@ -2019,9 +2021,11 @@
 	"watchnologin": "Нужно представиться системе",
 	"addwatch": "Добавить в список наблюдения",
 	"addedwatchtext": "Страница «[[:$1]]» вместе с её обсуждением были добавлены в ваш [[Special:Watchlist|список наблюдения]].",
+	"addedwatchtext-talk": "«[[:$1]]» вместе со связанной с ней страницей были добавлены в ваш [[Special:Watchlist|список наблюдения]].",
 	"addedwatchtext-short": "Страница «$1» была добавлена в ваш список наблюдения.",
 	"removewatch": "Удалить из списка наблюдения",
 	"removedwatchtext": "Страница «[[:$1]]» вместе с её обсуждением были удалены из вашего [[Special:Watchlist|списка наблюдения]].",
+	"removedwatchtext-talk": "«[[:$1]]» вместе со связанной с ней страницей были удалены из вашего [[Special:Watchlist|списка наблюдения]].",
 	"removedwatchtext-short": "Страница «$1» была удалена из вашего списка наблюдения.",
 	"watch": "Следить",
 	"watchthispage": "Наблюдать за этой страницей",
@@ -2193,6 +2197,7 @@
 	"undeletehistorynoadmin": "Статья была удалена. Причина удаления и список участников, редактировавших статью до её удаления, показаны ниже. Текст удалённой статьи могут просмотреть только администраторы.",
 	"undelete-revision": "Удалённая версия $1 (от $4 $5) участника $3:",
 	"undeleterevision-missing": "Неверная или отсутствующая версия. Возможно, вы перешли по неправильной ссылке, либо версия могла быть удалена из архива.",
+	"undeleterevision-duplicate-revid": "$1 {{PLURAL:$1|версия|версий|версии}} не могут быть восстановлены, поскольку {{PLURAL:$1|её|их}} <code>rev_id</code> уже используется.",
 	"undelete-nodiff": "Не найдено предыдущей версии.",
 	"undeletebtn": "Восстановить",
 	"undeletelink": "просмотреть/восстановить",
@@ -2202,7 +2207,7 @@
 	"undeletedrevisions": "{{PLURAL:$1|восстановлено|восстановлены}} $1 {{PLURAL:$1|изменение|изменения|изменений}}",
 	"undeletedrevisions-files": "восстановлены $1 {{PLURAL:$1|версия|версии|версий}} и $2 {{PLURAL:$2|файл|файла|файлов}}",
 	"undeletedfiles": "{{PLURAL:$1|восстановлен|восстановлены}} $1 {{PLURAL:$1|файл|файла|файлов}}",
-	"cannotundelete": "Ошибка восстановления:\n$1",
+	"cannotundelete": "Некоторые или все ваши восстановления не удались:\n$1",
 	"undeletedpage": "'''Страница «$1» была восстановлена.'''\n\nДля просмотра списка последних удалений и восстановлений см. [[Special:Log/delete|журнал удалений]].",
 	"undelete-header": "Список недавно удалённых страниц можно посмотреть в [[Special:Log/delete|журнале удалений]].",
 	"undelete-search-title": "Поиск удалённых страниц",
@@ -2240,8 +2245,8 @@
 	"sp-contributions-newbies-sub": "С новых учётных записей",
 	"sp-contributions-newbies-title": "Вклад с недавно созданных учётных записей",
 	"sp-contributions-blocklog": "блокировки",
-	"sp-contributions-suppresslog": "удалённый вклад участника",
-	"sp-contributions-deleted": "удалённые правки",
+	"sp-contributions-suppresslog": "удалённый вклад {{GENDER:$1|участника|участницы}}",
+	"sp-contributions-deleted": "удалённые правки {{GENDER:$1|участника|участницы}}",
 	"sp-contributions-uploads": "загрузки",
 	"sp-contributions-logs": "журналы",
 	"sp-contributions-talk": "обсуждение",
diff --git a/languages/i18n/sah.json b/languages/i18n/sah.json
index 643d1654be..4dca72d436 100644
--- a/languages/i18n/sah.json
+++ b/languages/i18n/sah.json
@@ -143,7 +143,7 @@
 	"category-subcat-count-limited": "Бу категория {{PLURAL:$1|субкатегориялаах|$1 субкатегориялардаах}}.",
 	"category-article-count": "{{PLURAL:$2|Бу категория манна эрэ көстүбүт субкатегориялаах.|$2 категорияттан {{PLURAL:$1|субкатегорията|$1 субкатегориялара}} көрдөрүлүннүлэр.}}",
 	"category-article-count-limited": "Бу категорияҕа {{PLURAL:$1|1 эрэ сирэй|$1 сирэй}} баар.",
-	"category-file-count": "{{PLURAL:$2|Бу категория манна эрэ көстүбүт билэлээх.|$2 категорияттан {{PLURAL:$1|билэтэ|$1 билэлэрэ}} көрдөрүлүннүлэр.}}",
+	"category-file-count": "{{PLURAL:$2|Бу категория манна эрэ көстүбүт билэлээх.|Бу категорияҕа баар $2 билэттэн {{PLURAL:$1|билэтэ|$1 билэтэ}} көрдөрүлүннэ.}}",
 	"category-file-count-limited": "Бу категорияҕа  {{PLURAL:$1|соҕотох билэ|$1 билэ}} баар.",
 	"listingcontinuesabbrev": "(салгыыта)",
 	"index-category": "Индекстэммит сирэйдэр",
@@ -396,7 +396,7 @@
 	"userlogin-yourname-ph": "Бэлиэ-ааккын киллэр",
 	"createacct-another-username-ph": "Ааккын суруй",
 	"yourpassword": "Киирии тыла:",
-	"userlogin-yourpassword": "Киирии тыл",
+	"userlogin-yourpassword": "Аһарык",
 	"userlogin-yourpassword-ph": "Киирии тылгын суруй",
 	"createacct-yourpassword-ph": "Киирии тылгын суруй",
 	"yourpasswordagain": "Киирии тылгын хатылаа:",
@@ -465,14 +465,14 @@
 	"passwordtooshort": "Киирии тылыҥ наһаа кылгас.\nКырата {{PLURAL:$1|1 бэлиэлээх|$1 бэлиэлээх}} буолуохтаах.",
 	"passwordtoolong": "Аһарык {{PLURAL:$1|1 бэлиэттэн|$1 бэлиэттэн}} уһун буолуо суохтаах.",
 	"passwordtoopopular": "Элбэхтэ туттуллар аһарыктары туттар сатаммат. Бука диэн атын аһарыкта тал.",
-	"password-name-match": "Киирии тыл ааккыттан атын буолуохтаах.",
+	"password-name-match": "Аһарыгыҥ ааккыттан атын буолуохтаах.",
 	"password-login-forbidden": "Маннык ааты уонна киирии тылы туһаныы бобуллар.",
 	"mailmypassword": "Киирии тылы саҥардыы",
 	"passwordremindertitle": "{{SITENAME}} киирии тылын санатыы",
-	"passwordremindertext": "Ким эрэ (бадаҕа эн бу IP-аадырыстан: $1), {{SITENAME}} ($4) киирии тылын саҥаттан ыытыҥ диэбит.\n\"$2\" кыттааччы быстах киирии тыла билигин маннык: \"$3\".\nӨскө маны эн чахчы көрдөөбүт буоллаххына, систиэмэҕэ саҥаттан киирэҥҥин киирии тылгын уларытыаххын сөп.\nБыстах киири тыл {{PLURAL:$5|биир хонук|$5 хонук устата}} үлэлиир.\n\nӨскөтүн киирии тылы саҥаттан көрдөөбөтөх буоллаххына,\nэбэтэр урукку киирии тылгын өйдөөн кэлбит буоллаххына,\nбу сурукка ааххайыма уонна урукку киирии тылгын салгыы туһан.",
+	"passwordremindertext": "Ким эрэ (бадаҕа эн бу IP-аадырыстан: $1), {{SITENAME}} ($4) аһарыгын саҥаттан ыытыҥ диэбит.\n\"$2\" кыттааччы быстах аһарыга билигин маннык: \"$3\".\nӨскө маны эн чахчы көрдөөбүт буоллаххына, систиэмэҕэ саҥаттан киирэҥҥин аһарыккын уларытыаххын сөп.\nБыстах аһарык {{PLURAL:$5|биир хонук|$5 хонук устата}} үлэлиир.\n\nӨскөтүн аһарыгы саҥаттан көрдөөбөтөх буоллаххына,\nэбэтэр урукку аһарыккн өйдөөн кэлбит буоллаххына,\nбу суругу ааххайыма уонна урукку аһарыккын салгыы туһан.",
 	"noemail": "\"$1\" ааттаах киһиэхэ эл. почтата ыйыллыбатах.",
 	"noemailcreate": "Электроннай почтаҥ сөптөөх аадырыһын суруйуохтааххын",
-	"passwordsent": "Саҥа киирии тыл \"$1\" эл. почтатыгар ыытылынна.\nСистемаҕа саҥа киирии тылы туһанан киир.",
+	"passwordsent": "Саҥа аһарык тыл \"$1\" эл. почтатыгар ыытылынна.\nТиһиккэ киирэргэ саҥа аһарыгы туһан.",
 	"blocked-mailpassword": "Эн IP аадырыскыттан манна тугу эмэ уларытар бобуллубут,\nонон киирии тылы өйдөтөр кыах эмиэ суох.",
 	"eauthentsent": "Эл. почтаҕар сурук ыытылынна.\nБу аадырыс эйиэнэ буоларын бигэргэтэргэ өссө тугу гыныахтааҕыҥ туһунан сурукка кэпсэниллэр.",
 	"throttled-mailpassword": "Киирии тылы өйдөтөр тэрил бүтэһик {{PLURAL:$1|чаас|$1 чаас}} иһигэр туттулла сылдьыбыт.\nКөмүскэнэр соруктан сылтаан киирии тылы {{PLURAL:$1|чааска|$1 чааска}} биирдэ эрэ ыйытыахха сөп.",
@@ -506,8 +506,8 @@
 	"resetpass_announce": "Түмүктүүргэ саҥа киирии тылла суруй.",
 	"resetpass_text": "<!-- Тиэкиһи манна эбэн суруйуҥ -->",
 	"resetpass_header": "Аат киирии тылын уларытыы",
-	"oldpassword": "Эргэ киирии тыл:",
-	"newpassword": "Саҥа киирии тыл:",
+	"oldpassword": "Эргэ аһарык:",
+	"newpassword": "Саҥа аһарык:",
 	"retypenew": "Саҥа киирии тылы хатылаа:",
 	"resetpass_submit": "Киирии тылы уларыт уонна киир",
 	"changepassword-success": "Киирии тылыҥ этэҥҥэ уларыйда!",
@@ -547,10 +547,10 @@
 	"resetpass-no-info": "Ааккын билиһиннэрдэххинэ эрэ бу сирэйгэ быһа тиийиэххин сөп.",
 	"resetpass-submit-loggedin": "Киирии тылы уларытыы",
 	"resetpass-submit-cancel": "Салҕаама",
-	"resetpass-wrong-oldpass": "Киирии тыл сөп түбэспэтэ.\nБаҕар уларыппытыҥ буолуо эбэтэр быстах кэмҥэ туттуллар киирии тылы оҥотторбутуҥ буолуо.",
+	"resetpass-wrong-oldpass": "Аһарык сөп түбэспэтэ.\nБаҕар уларыппытыҥ эбэтэр быстах кэмҥэ туттуллар аһарыгы оҥотторбутуҥ буолуо.",
 	"resetpass-recycled": "Бука диэн, билиҥҥи киирии тылтан атыны суруй.",
 	"resetpass-temp-emailed": "Быстах кэмҥэ туттуллар киирии тылынан киирдиҥ.\nТүмүктүүргэ саҥа киирии тылы суруйуохтааххын:",
-	"resetpass-temp-password": "Быстах кэмҥэ туттуллар киирии тыл:",
+	"resetpass-temp-password": "Быстах кэмҥэ туттуллар аһарык:",
 	"resetpass-abort-generic": "Киирии тылы уларытыыны кэҥэтии тохтотто.",
 	"resetpass-expired": "Киирии тылыҥ болдьоҕо ааспыт эбит. Бука диэн, саҥа киирии тылла туруорун.",
 	"resetpass-expired-soft": "Киирии тылыҥ болдьоҕо бүппүт, онон уларытыллыахтаах эбит. Бука диэн атын киирии тылы суруй эбэтэр маня баттаан кэлин киллэрээр \"{{int:authprovider-resetpass-skip-label}}\".",
@@ -568,14 +568,11 @@
 	"passwordreset-emailtitle": "{{SITENAME}} бырайыакка аатын туһунан",
 	"passwordreset-emailtext-ip": "Ким эрэ (баҕар эн буолуо, бу IP-ттан $1)  {{SITENAME}} ($4) бырайыакка киирии тылы уларытар туһунан ыйытык биэрбит.\nБу электрон аадырыһы кытта бу {{PLURAL:$3|аат ситимнээх|ааттар ситимнээхтэр}}:\n\n$2\n\nБу быстах кэмҥэ аналлаах {{PLURAL:$3|киирии тыл|кирии тыллар}} {{PLURAL:$5|биир күн үлэлиэҕэ|$5 күн үлэлиэхтэрэ}}.\nЭн тиһиликкэ ааккын этэн саҥа киирии тылы киллэриэхтээххин.\nӨскө бу ыйытыгы ыыппатах буоллаххына, эбэтэр урукку киирии тылгын өйдөөн кэлбит буоллаххына \nбу биллэриини ааххайыа суоххун сөп.\nОччоҕо урукку киирии тылыҥ оннунан хаалыа.",
 	"passwordreset-emailtext-user": "$1 диэн кыттааччы  {{SITENAME}} ($4) бырайыакка киирии тылгын уларытар туһунан ыйытык ыыппыт.\nБу электрон аадырыһы кытта бу {{PLURAL:$3|аат ситимнээх|ааттар ситимнээхтэр}}\n\n$2\n\nБу быстах кэмҥэ аналлаах {{PLURAL:$3|киирии тыл|кирии тыллар}} {{PLURAL:$5|биир күн үлэлиэҕэ|$5 күн үлэлиэхтэрэ}}.\nЭн тиһиликкэ ааккын этэн саҥа киирии тылы киллэриэхтээххин.\nӨскө бу ыйытыгы ыыппатах буоллаххына, эбэтэр урукку киирии тылгын өйдөөн кэлбит буоллаххына \nбу биллэриини ааххайыа суоххун сөп.\nОччоҕо урукку киирии тылыҥ оннунан хаалыа.",
-	"passwordreset-emailelement": "Кыттааччы: \n$1\n\nБыстах киирии тыл: \n$2",
+	"passwordreset-emailelement": "Кыттааччы: \n$1\n\nБыстах аһарык тыл: \n$2",
 	"passwordreset-emailsentemail": "Өскө бу Эн ааккар баайыллыбыт аадырыс буоллаҕына, аһарык тылы уларытар туһунан сурук барыа.",
 	"passwordreset-emailsentusername": "Өскө бу аакка баайыллыбыт аадырыс баар буоллаҕына, аһарык тылы уларытар туһунан сурук онно барыа.",
-	"passwordreset-emailsent-capture": "Киирии тылы уларытар туһунан сурук аллара эмиэ көрдөрүлүннэ.",
-	"passwordreset-emailerror-capture": "Манна киирии тылы уларытар туһунан сурук көрдөрүлүннэ. Ол эрэн сурук бу төрүөттэн $2 кыттааччыга сатаан барбата: $1",
 	"changeemail": "Аадырыһы уларытыы уонна сотуу",
 	"changeemail-header": "Бу форманы толорон аадырыскын уларыт. Уларытыыны бигэргэтэргэ аһарыккын киллэриэхтээххин. Почтаҥ аадырыһыттан бэлиэ-ааккыттан араарыаххын баҕарар буоллаххына аадырыһы сотон баран бигэргэтэн кэбиһээр.",
-	"changeemail-passwordrequired": "Бу дьайыыны бигэргэтэргэ аһарык тылгын киллэриэхтээххин.",
 	"changeemail-no-info": "Бу сирэйгэ чопчу тиийэргэ, тиһиликкэ бэлиэтэммит ааккын этиэхтиэххин.",
 	"changeemail-oldemail": "Билиҥҥи аадырыс:",
 	"changeemail-newemail": "Саҥа аадырыс:",
@@ -640,8 +637,8 @@
 	"loginreqtitle": "Бэйэҕин билиһиннэр",
 	"loginreqlink": "Ааккын эт",
 	"loginreqpagetext": "Атын сирэйдэри көрөргө маны оҥоруохтааххын: $1.",
-	"accmailtitle": "Киирии тыл ыытылынна.",
-	"accmailtext": "[[User talk:$1|$1]] кыттааччыга түбэспиччэ бэлиэлэртэн оҥоһуллубут киирии тыл бу аадырыска $2 ыытылынна.\nТиһиккэ бэлиэтэнэн баран киирии тылгын ''[[Special:ChangePassword|уларытыаххын]]'' сөп.",
+	"accmailtitle": "Аһарык ыытылынна.",
+	"accmailtext": "[[User talk:$1|$1]] кыттааччыга түбэспиччэ бэлиэлэртэн оҥоһуллубут аһарык тыл бу аадырыска $2 ыытылынна.\nТиһиккэ бэлиэтэнэн баран аһарыккын ''[[Special:ChangePassword|уларытыаххын]]'' сөп.",
 	"newarticle": "(Саҥа ыстатыйа)",
 	"newarticletext": "Эн суох сирэйгэ киирэ сатаатыҥ.\nМаннык ааттаах саҥа ыстатыйаны оҥорор буоллаххына, аллара баар түннүккэ суруй\n(сиһ. [$1 көмөнү] көрүөххүн сөп).\nӨскө манна сыыһа киирбит буоллаххына интэриниэтиҥ бырагыраамматын \"төнүн\" диэххин сөп.",
 	"anontalkpagetext": "----''Бу аатын эппэтэх кыттааччы ырытар сирэйэ.\nIP-аадырыһа эрэ көстөр.\nБиир IP-аадырыс хас да киһиэхэ бэриллиэн сөп. Өскө атын киһиэхэ суруллубут суругу алҕас туппут буоллаххына, бэйэҥ [[Special:CreateAccount|ааккын билиһиннэр]] эбэтэр [[Special:UserLogin|киир]], оччоҕо кэлин да булкуур тахсыа суоҕа.''",
@@ -755,7 +752,6 @@
 	"undo-nochange": "Бу уларытыы хайыы-үйэ сотуллубут курдук.",
 	"undo-summary": "[[Special:Contributions/$2|$2]] кыттааччы ([[User talk:$2|ырытыы]] | [[Special:Contributions/$2|{{MediaWiki:Contribslink}}]]) $1 нүөмэрдээх уларытыытын сотон оннугар түһэрэргэ.",
 	"undo-summary-username-hidden": "Кистэммит кыттааччы $1 уларытыытын төннөр",
-	"cantcreateaccounttitle": "Саҥа ааты киллэрэр сатаммат",
 	"cantcreateaccount-text": "[[User:$3|$3]] кыттааччы бу IP-ттан ('''$1''') саҥа бэлиэтэниини бопто.\n\nБыһаарыыта: $3 - ''$2''",
 	"cantcreateaccount-range-text": "Бу IP-диапазонтан <strong>$1</strong> ааты бэлиэтиири [[User:$3|$3]] боппут. Эн IP-аадырыһыҥ (<strong>$4</strong>) онно киирсэр эбит. \n\nЫйыллыбыт төрүөтэ: $2.",
 	"viewpagelogs": "Бу сирэй сурунаалларын көрүү",
@@ -3516,6 +3512,5 @@
 	"mw-widgets-dateinput-no-date": "Күнэ-дьыла ыйыллыбатах",
 	"mw-widgets-titleinput-description-new-page": "сирэй суох эбит",
 	"mw-widgets-titleinput-description-redirect": "манна $1 утаарыы",
-	"api-error-blacklisted": "Бука диэн өйдөнөр аатта тал дуу.",
 	"randomrootpage": "Түбэһиэх төрүт сирэй."
 }
diff --git a/languages/i18n/si.json b/languages/i18n/si.json
index 87c4234af6..cb5735d1a3 100644
--- a/languages/i18n/si.json
+++ b/languages/i18n/si.json
@@ -32,7 +32,8 @@
 			"Roonyh",
 			"Matma Rex",
 			"SusithCM",
-			"Sandaru"
+			"Sandaru",
+			1100100
 		]
 	},
 	"tog-underline": "සබැඳි යටීර කිරීම:",
@@ -146,6 +147,8 @@
 	"october-date": "ඔක්තොම්බර් $1",
 	"november-date": "නොවැම්බර් $1",
 	"december-date": "දෙසැම්බර් $1",
+	"period-am": "පෙ.ව.",
+	"period-pm": "ප.ව.",
 	"pagecategories": "{{PLURAL:$1|ප්‍රවර්ගය|ප්‍රවර්ග}}",
 	"category_header": "\"$1\" ප්‍රවර්ගයට අයත් පිටු",
 	"subcategories": "උපප්‍රවර්ග",
@@ -401,6 +404,8 @@
 	"virus-scanfailed": "පරිලෝකනය අසාර්ථක විය (කේතය $1)",
 	"virus-unknownscanner": "නොහඳුනන ප්‍රතිවයිරසයක්:",
 	"logouttext": "<strong>ඔබ දැන් ගිණුමෙන් නික්මී ඇත.</strong>\n\nඔබගේ බ්‍රවුසරයෙහි පූර්වාපේක්‍ෂී සංචිතය (කෑෂය) පිරිසිදුකරන තෙක්, සමහරක් පිටු විසින් ඔබ තවදුරටත් පිවිසී ඇති බවක් දිගටම පෙන්නුම් කිරීමට ඉඩ ඇත.",
+	"cannotlogoutnow-title": "දැන් නික්මීමට නොහැකිය",
+	"cannotlogoutnow-text": "$1 භාවිතා කරන විට නික්මීමට නොහැකිය.",
 	"welcomeuser": "ආයුබෝවන්, $1!",
 	"welcomecreation-msg": "ඔබගේ ගිණුම තනා ඇත.\nඔබගේ [[Special:Preferences|{{SITENAME}} අභිරුචීන්]] නෙස් කිරීමට අමතක නොකරන්න.",
 	"yourname": "පරිශීලක නාමය:",
@@ -417,10 +422,13 @@
 	"remembermypassword": "මාගේ පිවිසීම මෙම ගවේෂක මතකයෙහි (උපරිම ලෙස {{PLURAL:$1|දින|දින}}) $1 ක් මතක තබාගන්න",
 	"userlogin-remembermypassword": "මා ප්‍රවිසීම් තත්වයේම තබන්න",
 	"userlogin-signwithsecure": "ආරක්‍ෂිත සබඳතාව භාවිතා කරන්න",
+	"cannotloginnow-title": "දැන් පිවිසීමට නොහැකිය",
+	"cannotloginnow-text": "$1 භාවිතා කරන විට පිවිසීමට නොහැකිය.",
 	"yourdomainname": "ඔබගේ වසම:",
 	"password-change-forbidden": "ඔබට මෙම විකියෙහි මුරපද වෙනස් කල නොහැක.",
 	"externaldberror": "එක්කෝ සත්‍යාවත් දත්ත-ගබඩා දෝෂයක් පැවතුනි නැතිනම් ඔබගේ බාහිර ගිණුම යාවත්කාලීන කිරීමට ඔබ හට අවසර දී නොමැත.",
 	"login": "පිවිසෙන්න",
+	"login-security": "ඔබේ අනන්‍යතාවය තහවුරු කරන්න",
 	"nav-login-createaccount": "පිවිසෙන්න / නව ගිණුමක් තනන්න",
 	"userlogin": "පිවිසෙන්න / නව ගිණුමක් තනන්න",
 	"userloginnocreate": "ප්‍රවිෂ්ට වන්න",
@@ -428,7 +436,7 @@
 	"userlogout": "නික්මීම",
 	"notloggedin": "ප්‍රවිසී නැත",
 	"userlogin-noaccount": "ගිණුමක් නොමැතිද?",
-	"userlogin-joinproject": "{{SITENAME}}හා එක්වන්න",
+	"userlogin-joinproject": "{{SITENAME}} හා එක්වන්න",
 	"nologin": "ඔබ හට ගිණුමක් නොමැතිද? '''$1'''.",
 	"nologinlink": "ගිණුමක් තනන්න",
 	"createaccount": "අලුත් ගිණුමක් තනන්න",
@@ -450,6 +458,8 @@
 	"createacct-reason-ph": "ඔබ තවත් ගිණුමක් තනන්නේ කුමක් නිසාද",
 	"createacct-submit": "ඔබේ ගිණුම තනන්න",
 	"createacct-another-submit": "ගිණුමක් තනන්න",
+	"createacct-continue-submit": "ගිණුම තැනීම ඉදිරියට කරගෙන යන්න",
+	"createacct-another-continue-submit": "ගිණුම තැනීම ඉදිරියට කරගෙන යන්න",
 	"createacct-benefit-heading": "{{SITENAME}} ඔබ වැනි අයෙක් විසින් නිමවා ඇත",
 	"createacct-benefit-body1": "{{PLURAL:$1|සංස්කරණය|සංස්කරණ}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|පිටුව|පිටු}}",
@@ -463,7 +473,7 @@
 	"nocookieslogin": "පරිශීලකයන් ප්‍රවිෂ්ට කර ගැනීම සඳහා, {{SITENAME}} විසින් කුකී භාවිතා කරනු ලැබේ.\nඔබ විසින් කුකී අක්‍රීය නොට ඇත.\nකරුණාකර, ඒවා සක්‍රීය කොට, නැවත උත්සාහ ‍කරන්න.",
 	"nocookiesfornew": "මූලාශ්‍රය තහවුරු කරගත නොහැකි වුනු බැවින් පරිශීලක ගිණුම නොතැනිනි.\nකුකීස් සක්‍රීය බව තහවුරු කරගෙන, මෙම පිටුව ප්‍රතිපූරණය කර නැවත උත්සාහ කරන්න.",
 	"noname": "වලංගු පරිශීලක-නාමයක් සඳහන් කිරීමට ඔබ අසමත් වී ඇත.",
-	"loginsuccesstitle": "පිවිසුම සාර්ථකයි!",
+	"loginsuccesstitle": "ප්‍රවිෂ්ට වී ඇත",
 	"loginsuccess": "'''දැන් ඔබ , \"$1\" ලෙස, {{SITENAME}} වෙත පිවිස සිටී.'''",
 	"nosuchuser": "\"$1\" යන නමැති පරිශීලකයෙකු නොමැත.\nපරිශීලක නාමයන්හි මහාප්‍රාණ ආදිය සැලකේ (case sensitive).\nඔබගේ අක්ෂර-වින්‍යාසය පිරික්සා බැලීම හෝ, [[Special:CreateAccount|නව ගිණුමක් තැනීම]] හෝ සිදුකරන්න.",
 	"nosuchusershort": "\"$1\" නමින් පරිශීලකයෙකු නොමැත.\nඅක්‍ෂර-වින්‍යාසය පිරික්සා බලන්න.",
@@ -518,8 +528,15 @@
 	"newpassword": "නව මුර-පදය:",
 	"retypenew": "නව මුර-පදය නැවත ඇතුළු කරන්න:",
 	"resetpass_submit": "මුර-පදය පූරණය කොට ඉන් පසු ප්‍රවිෂ්ට වන්න",
-	"changepassword-success": "ඔබගේ මුර-පදය සාර්ථක ලෙස වෙනස් කරන ලදී!",
+	"changepassword-success": "ඔබගේ මුරපදය වෙනස් කරන ලදී!",
 	"changepassword-throttled": "ඔබ විසින් මෑතදී  පමණට වඩා වාර ගණනක් පිවිසීමෙහි උත්සාහයන් දරා ඇත.\nයළි උත්සාහ කිරීමට පෙර $1 වේලාවක් රැඳී සිටින්න.",
+	"botpasswords-label-appid": "රොබෝ නාමය:",
+	"botpasswords-label-create": "තනන්න",
+	"botpasswords-label-update": "යාවත්කාලීන කරන්න",
+	"botpasswords-label-cancel": "අවලංගු කරන්න",
+	"botpasswords-label-delete": "මකන්න",
+	"botpasswords-label-resetpassword": "මුරපදය යළි පිහිටුවන්න",
+	"botpasswords-label-grants-column": "අවසර දෙන ලදී",
 	"resetpass_forbidden": "මුර-පදයන් වෙනස් කිරීම  සිදු කල නොහැක",
 	"resetpass-no-info": "මෙම පිටුව සෘජු ලෙස පරිශීලනය කෙරුමට ඔබ පළමු ප්‍රවිෂ්ට විය යුතුය.",
 	"resetpass-submit-loggedin": "මුර-පදය වෙනස්කරන්න",
@@ -547,8 +564,7 @@
 	"passwordreset-emailtext-user": "{{SITENAME}} හි පරිශීලක $1,{{SITENAME}}($4)සඳහා මුරපදය යලි පිහිටුවීමට ඉල්ලා ඇත.\n\n$2\n\n{{PLURAL:$3|මෙම මුරපදය|මෙම මුරපද}}{{PLURAL:$5|එක් දිනකින්|දවස්$5කින්}}කල් ඉකුත් වනු ඇත.\nඔබ දැන් ඇතුළු වී නව මුරපදයක් තේරිය යුතුය.මෙම ඉල්ලීම වෙන කෙනෙකු විසින් හෝ ඔබට ඔබගේ මුල් මුරපදය මතක නම් හෝ ඔබ තව දුරටත් එය වෙනස් කිරීමට අදහස් නොකරයි නම් හෝ ඔබ මෙම පනිවිඩය නොසලකාහැර ඔබගේ පැරණි මුරපදය භාවිතා කරන්න.",
 	"passwordreset-emailelement": "පරිශීලක නාමය: \n$1\n\nතාවකාලික මුරපදය: \n$2",
 	"passwordreset-emailsentemail": "මුර-පදය නැවත සකස් කිරීම පිළිබඳව විද්‍යුත් තැපෑලක් යවන ලදී.",
-	"passwordreset-emailsent-capture": "මුර-පදය වෙනස් කිරීම පිළිබඳව විද්‍යුත් තැපෑලක් යවන ලදී, එය පහත දැක්වේ.",
-	"passwordreset-emailerror-capture": "සිහිකැඳවුම් ඊ-තැපෑල ජනිත කරනු ලැබූ අතර, එය පහත දැක්වේ, නමුත් එය {{GENDER:$2|}}පරිශීලකයාට යැවීම අසාර්ථක වුනි: $1",
+	"passwordreset-invalideamil": "වලංගු නැති ඊමේල් ලිපිනය",
 	"changeemail": "විද්‍යුත් තැපෑල වෙනස් කරන්න හෝ ඉවත් කරන්න",
 	"changeemail-header": "ගිණුම් විද්‍යුත් තැපැල් ලිපිනය වෙනස් කරන්න",
 	"changeemail-no-info": "මෙම පිටුව සෘජු ලෙස සම්ප්‍රවේශය කෙරුමට පළමුව ඔබ ප්‍රවිෂ්ටව සිටිය යුතුය.",
@@ -589,6 +605,9 @@
 	"minoredit": "මෙය සුළු සංස්කරණයකි",
 	"watchthis": "මෙම පිටුව මුර කරන්න",
 	"savearticle": "පිටුව සුරකින්න",
+	"savechanges": "වෙනස්කම් සුරකින්න",
+	"publishpage": "පිටුව පළ කරන්න",
+	"publishchanges": "වෙනස්කම් පළ කරන්න",
 	"preview": "පෙරදසුන",
 	"showpreview": "පෙරදසුන පෙන්වන්න",
 	"showdiff": "වෙනස්කිරීම් පෙන්වන්න",
@@ -598,7 +617,7 @@
 	"missingsummary": "'''සිහිගැන්වීමයි:''' ඔබ විසින් සංස්කරණ සාරාංශයක් සපයා නොමැත.\nඔබ නැවතත් සුරැකීම ක්ලික් කලහොත්, ඔබගේ සංස්කරණය එවැන්නක් විරහිතවම සුරැකෙනු ඇත.",
 	"selfredirect": "<Strong>අවවාදයයි:</strong> ඔබ තමන් වෙත මෙම පිටුව හරවා යවයි ඇත. \nඔබ යළි-යොමුවීම් සඳහා වැරදි ඉලක්කය නිශ්චිතව දක්වා ඇති විය හැක, හෝ ඔබ වැරදි පිටුව සංස්කරණය කල හැක. \nඔබ ක්ලික් නම් \"{{int:savearticle}}\" නැවතත්, යළි-යොමුවීම් කෙසේ හෝ නිර්මාණය කරනු ඇත.",
 	"missingcommenttext": "කරුණාකර පහතින් පරිකථනයක් ඇතුළු කරන්න.",
-	"missingcommentheader": "'''සිහිගැන්වීමයි:''' මෙම පරිකථනය සඳහා ඔබ විසින් විෂයයක්/සිරස්තලයක් සපයා නොමැත.\nඔබ නැවතත් \"{{int:savearticle}}\" ක්ලික් කලහොත්, ඔබගේ සංස්කරණය එවැන්නක් විරහිතවම සුරැකෙනු ඇත.",
+	"missingcommentheader": "<strong>සිහිගැන්වීමයි:</strong>  මෙම පරිකථනය සඳහා ඔබ විසින් විෂයයක්/සිරස්තලයක් සපයා නොමැත.\nඔබ නැවතත් \"{{int:savearticle}}\" ක්ලික් කලහොත්, ඔබගේ සංස්කරණය එවැන්නක් විරහිතවම සුරැකෙනු ඇත.",
 	"summary-preview": "සාරාංශ පෙර-දසුන:",
 	"subject-preview": "විෂයය හි පෙර දසුන:",
 	"previewerrortext": "ඔබේ වෙනස්කම් පෙරදසුන් කිරීමට උත්සාහ දරන අතර දෝෂයක් ඇතිවිය.",
@@ -724,7 +743,6 @@
 	"undo-nochange": "මෙම සංස්කරණය දැනටමත් අතහැර දමන ලද කර ඇති බව පෙනී යයි.",
 	"undo-summary": " [[Special:Contributions/$2|$2]] මගින් සිදුකල  $1 සංශෝධනය අහෝසි කරන්න ([[User talk:$2|සාකච්ඡා]])",
 	"undo-summary-username-hidden": "සැඟවුණු පරිශීලකයෙක් විසින් සංශෝධනය $1 අස් කරන්න",
-	"cantcreateaccounttitle": "ගිණුම තැනිය නොහැක",
 	"cantcreateaccount-text": "මෙම IP ලිපිනය ('''$1''') මගින් ගිණුම් තැනීම [[User:$3|$3]] විසින් වාරණය කොට ඇත.\n\n$3 විසින් සපයා ඇති හේතුව ''$2'' වේ",
 	"cantcreateaccount-range-text": "ඔබේ IP ලිපිනය ('' '$4' '') ද ඇතුළත් වන පරාසය තුළ IP ලිපිනයන් '' '$1', '' සිට ගිණුම් තැනීම  [[User:$3|$3]] විසින් වාරණය කොට ඇත. $3 විසින් දී ඇති හේතුව '' '$2' වේ",
 	"viewpagelogs": "මෙම පිටුව පිලිබඳ සටහන් නරඹන්න",
@@ -3251,6 +3269,5 @@
 	"special-characters-title-endash": "en තේජස",
 	"special-characters-title-emdash": "em තේජස",
 	"special-characters-title-minus": "ඍණ ලකුණ",
-	"api-error-blacklisted": "කරුණාකර වෙනස්, විස්තරාත්මක මාතෘකාවක් තෝරන්න.",
 	"randomrootpage": "අහඹු මූල පිටුව"
 }
diff --git a/languages/i18n/sk.json b/languages/i18n/sk.json
index 4ba4a01718..efe836e901 100644
--- a/languages/i18n/sk.json
+++ b/languages/i18n/sk.json
@@ -413,6 +413,7 @@
 	"password-change-forbidden": "Na tejto wiki si nemôžete zmeniť heslo.",
 	"externaldberror": "Buď nastala chyba externej autentifikačnej databázy alebo vám nie je povolené aktualizovať váš externý účet.",
 	"login": "Prihlásiť",
+	"login-security": "Overte svoju identitu",
 	"nav-login-createaccount": "Prihlásenie / vytvorenie účtu",
 	"userlogin": "Prihlásenie / vytvorenie účtu",
 	"userloginnocreate": "Prihlásiť",
@@ -430,18 +431,23 @@
 	"userlogin-resetpassword-link": "Zabudli ste heslo?",
 	"userlogin-helplink2": "Pomoc s prihlásením",
 	"userlogin-loggedin": "Ste už {{GENDER:$1|prihĺasený|prihlásená}} ako $1.\nPomocou formulára nižšie sa môžete prihlásiť ako iný redaktor.",
+	"userlogin-reauth": "Aby ste preukázali, že ste $1, musíte sa znovu prihlásiť.",
 	"userlogin-createanother": "Vytvoriť ďalší účet",
 	"createacct-emailrequired": "E-mailová adresa",
 	"createacct-emailoptional": "E-mailová adresa (nepovinné)",
 	"createacct-email-ph": "Zadajte vašu e-mailovú adresu",
 	"createacct-another-email-ph": "Zadajte vašu e-mailovú adresu",
 	"createaccountmail": "Použiť dočasné náhodné heslo a poslať ho na uvedenú e-mailovú adresu",
+	"createaccountmail-help": "Môže byť použité na vytvorenie účtu pre inú osobu bez prezradenia hesla.",
 	"createacct-realname": "Skutočné meno (nepovinné)",
 	"createaccountreason": "Dôvod:",
 	"createacct-reason": "Dôvod",
 	"createacct-reason-ph": "Prečo si vytvárate ďalší účet",
+	"createacct-reason-help": "Správa zobrazená v knihe nových používateľov",
 	"createacct-submit": "Vytvoriť účet",
 	"createacct-another-submit": "Vytvoriť účet",
+	"createacct-continue-submit": "Pokračovať v zakladaní účtu",
+	"createacct-another-continue-submit": "Pokračovať v zakladaní účtu",
 	"createacct-benefit-heading": "{{GRAMMAR:akuzatív|{{SITENAME}}}} tvoria ľudia ako vy.",
 	"createacct-benefit-body1": "{{PLURAL:$1|úprava|úpravy|úprav}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|stránka|stránky|stránok}}",
@@ -455,6 +461,7 @@
 	"nocookiesnew": "Používateľské konto bolo vytvorené, ale nie ste prihlásený. {{SITENAME}} používa cookies na prihlásenie. Máte cookies vypnuté. Zapnite ich a potom sa prihláste pomocou vášho nového používateľského mena a hesla.",
 	"nocookieslogin": "{{SITENAME}} používa cookies na prihlásenie. Vy máte cookies vypnuté. Prosíme, zapnite ich a skúste znovu.",
 	"nocookiesfornew": "Používateľský účet nebol vytvorený, pretože sme nemohli potvrdiť jeho zdroj. \nUbezpečte sa, že máte povolené cookies, obnovte túto stránku a skúste to znova.",
+	"createacct-loginerror": "Účet bol úspešne vytvorený, ale neboli ste automaticky prihlásený. Prosím, [[Special:UserLogin|prihláste sa]].",
 	"noname": "Nezadali ste platné používateľské meno.",
 	"loginsuccesstitle": "Prihlásenie úspešné",
 	"loginsuccess": "'''Teraz ste prihlásený do {{GRAMMAR:genitív|{{SITENAME}}}} ako „$1“.'''",
@@ -492,13 +499,14 @@
 	"createaccount-title": "Vytvorenie účtu na {{GRAMMAR:lokál|{{SITENAME}}}}",
 	"createaccount-text": "Niekto vytvoril účet pre vašu emailovú adresu na {{GRAMMAR:lokál|{{SITENAME}}}}\n($4) s názvom „$2“, s heslom „$3“. Mali by ste sa prihlásiť a svoje heslo teraz zmeniť.\n\nAk bol účet vytvorený omylom, túto správu môžete ignorovať.",
 	"login-throttled": "Uskutočnili ste príliš mnoho neúspešných pokusov o prihlásenie.\nProsím, počkajte $1 predtým, než to skúsite znova.",
-	"login-abort-generic": "Vaše prihlásenie nebolo úspešné - zrušené",
+	"login-abort-generic": "Vaše prihlásenie bolo neúspešné – zrušené",
 	"login-migrated-generic": "Váš účet bol presťahovaný a vaše používateľské meno už viac na tejto wiki neexistuje.",
 	"loginlanguagelabel": "Jazyk: $1",
 	"suspicious-userlogout": "Vaša požiadavka odhlásiť sa bola zamietnutá, pretože to vyzerá, že ju poslal pokazený prehliadač alebo proxy server.",
 	"createacct-another-realname-tip": "Skutočné meno je nepovinné.\nAk sa rozhodnete ho poskytnúť, použije sa na označenie vašej práce.",
 	"pt-login": "Prihlásiť sa",
 	"pt-login-button": "Prihlásiť sa",
+	"pt-login-continue-button": "Pokračovať v prihlasovaní",
 	"pt-createaccount": "Vytvoriť účet",
 	"pt-userlogout": "Odhlásiť sa",
 	"php-mail-error-unknown": "Neznáma chyba vo funkcii PHP mail()",
@@ -514,6 +522,12 @@
 	"resetpass_submit": "Nastaviť heslo a prihlásiť sa",
 	"changepassword-success": "Vaše heslo bolo úspešne zmenené!",
 	"changepassword-throttled": "Uskutočnili ste príliš mnoho neúspešných pokusov o prihlásenie. Prosím, počkajte $1 predtým, než to skúsite znova.",
+	"botpasswords": "Heslá pre botov",
+	"botpasswords-summary": "<em>Heslá pre botov</em> umožňujú pristupovať k redaktorskému účtu prostredníctvom API bez použitia hlavných prihlasovacích údajov účtu. Redaktorské oprávnenia dostupné po prihlásení pomocou hesla pre botov môžu byť obmedzené.\n\nAk neviete, k čomu by ste to mohli použiť, pravdepodobne by ste to použiť nemali. Nikto by vám nikdy nemal žiadať, aby ste si tu vygenerovali heslo a dali mu ho.",
+	"botpasswords-disabled": "Heslá pre botov sú zakázané.",
+	"botpasswords-no-central-id": "Aby ste mohli použiť heslá pre botov musíte byť prihlásený k centrálnemu účtu.",
+	"botpasswords-existing": "Jestvujúce heslá pre botov",
+	"botpasswords-createnew": "Vytvoriť nové heslo pre botov",
 	"botpasswords-label-appid": "Názov bota:",
 	"botpasswords-label-create": "Vytvoriť",
 	"botpasswords-label-update": "Aktualizovať",
@@ -524,7 +538,7 @@
 	"resetpass-no-info": "Aby ste mohli priamo pristupovať k tejto stránke, musíte sa prihlásiť.",
 	"resetpass-submit-loggedin": "Zmeniť heslo",
 	"resetpass-submit-cancel": "Zrušiť",
-	"resetpass-wrong-oldpass": "Neplatné dočasné alebo aktuálne heslo.\nJe možné, že sa vám už podarilo úspešne zmeniť svoje heslo alebo ste si vyžiadali nové dočasné heslo.",
+	"resetpass-wrong-oldpass": "Neplatné, dočasné alebo aktuálne heslo.\nJe možné, že sa vám už podarilo úspešne zmeniť svoje heslo alebo ste si vyžiadali nové dočasné heslo.",
 	"resetpass-recycled": "Ako nové heslo si prosím nastavte niečo iné než súčasné heslo.",
 	"resetpass-temp-emailed": "Prihlasujete sa dočasným heslom, zaslaným e-mailom. Aby ste dokončili prihlásenie, nastavte si tu nové heslo:",
 	"resetpass-temp-password": "Dočasné heslo:",
@@ -546,13 +560,10 @@
 	"passwordreset-emailtext-ip": "Niekto (pravdepodobne vy z IP adresy $1) požiadal o obnovenie vášho hesla na {{GRAMMAR:genitív|{{SITENAME}}}} ($4). {{PLURAL:$3|Nasledujúci používateľský účet je spojený|Nasledujúce používateľské účty sú spojené}}\ns touto emailovou adresou:\n\n$2\n\n{{PLURAL:$3|Platnosť tohto dočasného hesla vyprší|Platnosť týchto dočasných hesiel vyprší}} o {{PLURAL:$5|jeden deň|$5 dni|$5 dní}}.\nMali by ste sa prihlásiť teraz a zvoliť nové heslo. Ak túto žiadosť podal niekto iný alebo\nak ste si spomenuli svoje pôvodné heslo a už ho chcete zmeniť, môžete túto správu\nignorovať a ďalej používať vaše staré heslo.",
 	"passwordreset-emailtext-user": "Používateľ $1 na {{GRAMMAR:genitív|{{SITENAME}}}} požiadal o obnovenie vášho hesla na na {{GRAMMAR:genitív|{{SITENAME}}}} ($4). {{PLURAL:$3|Nasledujúci používateľský účet je spojený|Nasledujúce používateľské účty sú spojené}}\ns touto emailovou adresou:\n\n$2\n\n{{PLURAL:$3|Platnosť tohto dočasného hesla vyprší|Platnosť týchto dočasných hesiel vyprší}} o {{PLURAL:$5|jeden deň|$5 dni|$5 dní}}.\nMali by ste sa prihlásiť teraz a zvoliť nové heslo. Ak túto žiadosť podal niekto iný alebo\nak ste si spomenuli svoje pôvodné heslo a už ho chcete zmeniť, môžete túto správu\nignorovať a ďalej používať vaše staré heslo.",
 	"passwordreset-emailelement": "Používateľské meno: \n$1\n\nDočasné heslo:\n$2",
-	"passwordreset-emailsentemail": "Pokiaľ je toto e-mailová adresa, zaregistrovaná k vášmu účtu, bude na ňu zaslaný e-mail pre získanie nového hesla.",
+	"passwordreset-emailsentemail": "Pokiaľ je toto e-mailová adresa zaregistrovaná k vášmu účtu, bude na ňu zaslaný e-mail pre získanie nového hesla.",
 	"passwordreset-emailsentusername": "Pokiaľ je príslušná mailová adresa zaregistrovaná, bude na ňu zaslaný e-mail s novým heslom.",
-	"passwordreset-emailsent-capture": "Bol odoslaný email s novým heslom, ktorý je zobrazený nižšie.",
-	"passwordreset-emailerror-capture": "Bol odoslaný email s novým heslom, ktorý je zobrazený nižšie, ale nepodarilo sa ho odoslať {{GENDER:$2|používateľovi}}: $1",
 	"changeemail": "Zmeniť alebo odstrániť e-mailovú adresu",
 	"changeemail-header": "Zmena e-mailovej adresy pre účet",
-	"changeemail-passwordrequired": "Pre potvrdenie tejto zmeny budete musieť zadať svoje heslo.",
 	"changeemail-no-info": "Na prístup k tejto stránke musíte byť prihlásený.",
 	"changeemail-oldemail": "Súčasná e-mailová adresa:",
 	"changeemail-newemail": "Nová e-mailová adresa:",
@@ -731,7 +742,6 @@
 	"undo-nochange": "Zdá sa, že úprava už bola zrušená.",
 	"undo-summary": "Revízia $1 používateľa [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusia]]) bola vrátená",
 	"undo-summary-username-hidden": "Vrátiť revíziu $1, ktorú vykonal skrytý používateľ",
-	"cantcreateaccounttitle": "Nie je možné vytvoriť účet",
 	"cantcreateaccount-text": "Zakladanie nových účtov z tejto IP adresy ('''$1''') bolo zablokované {{GENDER:$3|používateľom|používateľkou}} [[User:$3|$3]].\n\nDôvod, ktorý $3 {{GENDER:$3|uviedol|uviedla}}, je: ''$2''",
 	"cantcreateaccount-range-text": "Zakladanie nových účtov z IP adries v rozsahu <strong>$1</strong>, ktorý zahŕňa aj vašu IP adresu (<strong>$4</strong>), bolo zablokované {{GENDER:$3|používateľom|používateľkou}} [[User:$3|$3]].\n\nDôvod, ktorý $3 {{GENDER:$3|uviedol|uviedla}}, je: <em>$2</em>",
 	"viewpagelogs": "Zobraziť záznamy pre túto stránku",
diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json
index d1f7ea4624..7ef457b23b 100644
--- a/languages/i18n/sl.json
+++ b/languages/i18n/sl.json
@@ -1198,6 +1198,7 @@
 	"grant-group-high-volume": "Izvajanje visokoobsežnih dejavnosti",
 	"grant-group-customization": "Prilagoditve in nastavitve",
 	"grant-group-administration": "Izvajanje administrativnih dejanj",
+	"grant-group-private-information": "Dostop do zasebnih podatkov o vas",
 	"grant-group-other": "Druga dejavnost",
 	"grant-blockusers": "Blokiranje in odblokiranje uporabnikov",
 	"grant-createaccount": "Ustvarjanje računov",
@@ -1212,6 +1213,7 @@
 	"grant-highvolume": "Visokoobsežno urejanje",
 	"grant-oversight": "Skrivanje uporabnikov in zatiranje redakcij",
 	"grant-patrol": "Nadzor sprememb strani",
+	"grant-privateinfo": "Dostop do zasebnih podatkov",
 	"grant-protect": "Zaščita in odstranitev zaščite strani",
 	"grant-rollback": "Razveljavitev sprememb strani",
 	"grant-sendemail": "Pošiljanje e-pošte drugim uporabnikom",
diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json
index 4e5103fdac..3cea9f206f 100644
--- a/languages/i18n/sv.json
+++ b/languages/i18n/sv.json
@@ -1258,6 +1258,7 @@
 	"grant-group-high-volume": "Utför aktivitet av hög volym",
 	"grant-group-customization": "Anpassning och inställningar",
 	"grant-group-administration": "Utför administrativa åtgärder",
+	"grant-group-private-information": "Få tillgång till privat data om dig",
 	"grant-group-other": "Diverse aktivitet",
 	"grant-blockusers": "Blockera och avblockera användare",
 	"grant-createaccount": "Skapa konton",
@@ -1272,6 +1273,7 @@
 	"grant-highvolume": "Hög volymsredigering",
 	"grant-oversight": "Dölj användare och censurera versioner",
 	"grant-patrol": "Patrullera ändringar på sidor",
+	"grant-privateinfo": "Få tillgång till privat information",
 	"grant-protect": "Skydda och ta bort skydd på sidor",
 	"grant-rollback": "Rulla tillbaka ändringar på sidor",
 	"grant-sendemail": "Skicka e-post till andra användare",
@@ -1568,8 +1570,8 @@
 	"lockmanager-fail-svr-release": "Kunde inte frigöra låsen på servern $1.",
 	"zip-file-open-error": "Ett fel inträffade när filen öppnades för en ZIP-kontroll.",
 	"zip-wrong-format": "Den angivna filen var inte en ZIP-fil.",
-	"zip-bad": "Filen är en skadad eller annars oläsbar ZIP fil.\nDen kan inte säkerhetskontrolleras ordentligt.",
-	"zip-unsupported": "Filen är en ZIP-fil som använder ZIP funktioner som inte stöds av MediaWiki.\nDen kan inte säkerhetskontrolleras ordentligt.",
+	"zip-bad": "Filen är en skadad eller annars oläsbar ZIP-fil.\nDen kan inte säkerhetskontrolleras ordentligt.",
+	"zip-unsupported": "Filen är en ZIP-fil som använder ZIP-funktioner som inte stöds av MediaWiki.\nDen kan inte säkerhetskontrolleras ordentligt.",
 	"uploadstash": "Temporära lagringsytan för uppladdningar",
 	"uploadstash-summary": "Denna sida ger tillgång till filer som är uppladdade (eller håller på att laddas upp) men som ännu inte är publicerade till wikin. Dessa filer är inte synliga för någon annan än den användare som laddade upp dem.",
 	"uploadstash-clear": "Rensa temporärt lagrade filer",
@@ -1832,7 +1834,7 @@
 	"apisandbox-api-disabled": "API är inaktiverat på denna webbplats.",
 	"apisandbox-intro": "Använd den här sidan för att experimentera med <strong>MediaWikis API för webbtjänster</strong>.\nSe [[mw:API:Main page|API-dokumentationen]] för ytterligare detaljer kring API-användningen. Exempel: [https://www.mediawiki.org/wiki/API#A_simple_example få innehållet från en huvudsida]. Välj en handling för att se fler exempel.\n\nObservera att även om detta är en sandlåda kan handlingar du utför på denna sida påverka wikin.",
 	"apisandbox-fullscreen": "Utvidga panel",
-	"apisandbox-fullscreen-tooltip": "Utvidga sandlådspanelen för att fylla webbläsarens fönster.",
+	"apisandbox-fullscreen-tooltip": "Utvidga sandlådspanelen till att fylla webbläsarens fönster.",
 	"apisandbox-unfullscreen": "Visa sida",
 	"apisandbox-unfullscreen-tooltip": "Förminska sandlådspanelen så MediaWikis navigeringslänkar syns.",
 	"apisandbox-submit": "Utför begäran",
@@ -2172,7 +2174,7 @@
 	"undeletehistorynoadmin": "Den här sidan har blivit raderad. Anledningen till detta anges i sammanfattningen nedan, tillsammans med uppgifter om de användare som redigerat sidan innan den raderades. Enbart administratörerna har tillgång till den raderade texten.",
 	"undelete-revision": "Raderad version av $1 (från den $4 kl. $5) av $3.",
 	"undeleterevision-missing": "Versionen finns inte eller är felaktig. Versionen kan ha återställts eller tagits bort från arkivet, du kan också ha följt en felaktig länk.",
-	"undeleterevision-duplicate-revid": "{{PLURAL:$1|En sidversion|$1 sidversioner}} kunde inte återställas, eftersom dess <code>rev_id</code> användes redan.",
+	"undeleterevision-duplicate-revid": "{{PLURAL:$1|En sidversion|$1 sidversioner}} kunde inte återställas, eftersom dess <code>rev_id</code> redan användes.",
 	"undelete-nodiff": "Ingen tidigare version hittades.",
 	"undeletebtn": "Återställ",
 	"undeletelink": "visa/återställ",
diff --git a/languages/i18n/te.json b/languages/i18n/te.json
index 8368ac5e5f..4377326b2e 100644
--- a/languages/i18n/te.json
+++ b/languages/i18n/te.json
@@ -959,17 +959,17 @@
 	"prefs-watchlist-token": "వీక్షణాజాబితా టోకెను:",
 	"prefs-misc": "ఇతరత్రా",
 	"prefs-resetpass": "సంకేతపదాన్ని మార్చుకోండి",
-	"prefs-changeemail": "ఈ-మెయిలు చిరునామా మార్పు",
+	"prefs-changeemail": "ఈ-మెయిలు చిరునామా మార్పు లేదా తొలగింపు",
 	"prefs-setemail": "ఓ ఈమెయిల్ చిరునామా ఇవ్వండి",
 	"prefs-email": "ఈ-మెయిల్ ఎంపికలు",
 	"prefs-rendering": "రూపురేఖలు",
 	"saveprefs": "భద్రపరచు",
 	"restoreprefs": "అప్రమేయ అమరికలను పునఃస్థాపించు (అన్ని విభాగాల్లోనూ)",
-	"prefs-editing": "సవరిస్తున్నారు",
+	"prefs-editing": "దిద్దుబాట్లు",
 	"rows": "అడ్డు వరుసలు:",
 	"columns": "నిలువు వరుసలు:",
 	"searchresultshead": "వెతుకు",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">మొలక లింకు</a> ఫార్మాటింగు కొరకు హద్దు (బైట్లు):",
+	"stub-threshold": "మొలక లింకు ఫార్మాటింగు కొరకు హద్దు ($1):",
 	"stub-threshold-sample-link": "నమూనా",
 	"stub-threshold-disabled": "అచేతనం",
 	"recentchangesdays": "ఇటీవలి మార్పులు లో చూపించవలసిన రోజులు:",
@@ -978,6 +978,7 @@
 	"prefs-help-recentchangescount": "ఇది ఇటీవలి మార్పులు, పేజీ చరిత్రలు, మరియు చిట్టాలకు వర్తిస్తుంది.",
 	"prefs-help-watchlist-token2": "మీ వీక్షణజాబితా యొక్క జాలవడ్డింపుకు చెందిన రహస్య తాళమిది.\nఈ తాళం తెలిసిన ఎవరైనా మీ వీక్షణజాబితాను చదవగలుగుతారు. అందుచేత దీన్ని ఎవరికీ ఇవ్వకండి.\n[[Special:ResetTokens|దాన్ని మార్చాలంటే ఇక్కడ నొక్కండి]].",
 	"savedprefs": "మీ అభిరుచులను భద్రపరిచాం.",
+	"savedrights": "{{GENDER:$1|$1}} వాడుకరి హక్కులను భద్రపరచాం.",
 	"timezonelegend": "కాల మండలం:",
 	"localtime": "స్థానిక సమయం:",
 	"timezoneuseserverdefault": "వికీ అప్రమేయాన్ని ఉపయోగించు ($1)",
@@ -1017,7 +1018,7 @@
 	"badsig": "సంతకం చెల్లనిది.\nHTML ట్యాగులను ఒకసారి సరిచూసుకోండి.",
 	"badsiglength": "మీ సంతకం చాలా పెద్దగా ఉంది.\nఇది తప్పనిసరిగా $1 {{PLURAL:$1|అక్షరం|అక్షరాల}} లోపులోనే ఉండాలి.",
 	"yourgender": "మిమ్మల్ని మీరు ఎలా వర్ణించుకుంటారు?",
-	"gender-unknown": "వెల్లడించడానికి నేను ఇష్టపడట్లేదు",
+	"gender-unknown": "సాఫ్టువేరు మిమ్మల్ని ఉల్లేఖించే సందర్భంలో, వీలైనంతవరకు లింగ తటస్థతను అవలంబిస్తుంది",
 	"gender-male": "అతను వికీ పేజీలను సరిదిద్దుతాడు",
 	"gender-female": "ఆమె వికీ పేజీలను సరిదిద్దుతుంది",
 	"prefs-help-gender": "ఈ అభిరుచిని అమర్చుకోవడం ఐచ్చికం.\nమిమ్మల్ని సంబోధించేప్పుడూ మిమ్మల్ని పేర్కొనేప్పుడూ వ్యాకరణపరంగా సరైన లింగాన్ని  వాడటానికి ఈ విలువ ఉపయోగపడుతుంది.\nఈ సమాచారం బహిరంగం.",
@@ -1043,14 +1044,15 @@
 	"prefs-tokenwatchlist": "టోకెన్",
 	"prefs-diffs": "తేడాలు",
 	"prefs-help-prefershttps": "ఈ అభిరుచి మీరు పైసారి లాగినైనపుడు అమలౌతుంది.",
+	"prefswarning-warning": "మీ అభిరుచులలో మీరు చేసిన మార్పులను ఇంకా భద్రపరచలేదు. మీరు \"$1\" ను నొక్కకుండా ఈ పేజీని వదలి వెళ్తే, మీ అభిరుచులు భద్రం కావు.",
 	"prefs-tabs-navigation-hint": "చిట్కా: ట్యాబుల జాబితాలో ఓ ట్యాబు నుండి మరోదానికి వెళ్ళేందుకు కుడి ఎడమ బాణాల కీలను వాడవచ్చు.",
 	"userrights": "వాడుకరి హక్కుల నిర్వహణ",
 	"userrights-lookup-user": "వాడుకరి సమూహాలను నిర్వహించండి",
 	"userrights-user-editname": "వాడుకరిపేరును ఇవ్వండి:",
-	"editusergroup": "వాడుకరి గుంపులను మార్చు",
-	"editinguser": "వాడుకరి '''[[User:$1|$1]]''' $2 యొక్క వాడుకరి హక్కులను మారుస్తున్నారు",
+	"editusergroup": "{{GENDER:$1|వాడుకరి}} గుంపులను మార్చు",
+	"editinguser": "{{GENDER:$1|వాడుకరి}} <strong>[[వాడుకరి:$1|$1]]</strong> $2 యొక్క వాడుకరి హక్కులను మారుస్తున్నారు",
 	"userrights-editusergroup": "వాడుకరి సమూహాలను మార్చండి",
-	"saveusergroups": "వాడుకరి గుంపులను భద్రపరచు",
+	"saveusergroups": "{{GENDER:$1|వాడుకరి}} గుంపులను భద్రపరచు",
 	"userrights-groupsmember": "సభ్యులు:",
 	"userrights-groupsmember-auto": "సంభావిత సభ్యులు:",
 	"userrights-groups-help": "ఈ వాడుకరి ఏయే గుంపులలో ఉండాలో మీరు మార్చవచ్చు.\n* టిక్కు పెట్టివుంటే ఆ గుంపులో ఈ వాడుకరి ఉన్నట్టు.\n* టిక్కు లేకుంటే ఆ గుంపులో ఈ వాడుకరి లేనట్టు.\n* * ఉంటే ఒకసారి ఆ గుంపుని చేర్చాక మీరు తీసివేయలేరు, లేదా తీసివేసాక తిరిగి చేర్చలేరు.",
@@ -1062,7 +1064,7 @@
 	"userrights-changeable-col": "మీరు మార్చదగిన గుంపులు",
 	"userrights-unchangeable-col": "మీరు మార్చలేని గుంపులు",
 	"userrights-conflict": "వాడుకరి హక్కుల మార్పులలో ఘర్షణ! మీ మార్పులను సమీక్షించి, నిర్ధారించండి.",
-	"userrights-removed-self": "మీ హక్కులను మీరు విజయవంతంగా తొలగించుకున్నారు. తద్వారా, ఈ పేజీని చూడడానికి మీకు ఇక అనుమతి లేదు.",
+	"userrights-removed-self": "మీ హక్కులను మీరు తొలగించుకున్నారు. ఇక, మీరీ పేజీని చూడలేరు.",
 	"group": "గుంపు:",
 	"group-user": "వాడుకరులు",
 	"group-autoconfirmed": "ఆటోమాటిగ్గా నిర్ధారించబడిన వాడుకరులు",
@@ -1156,6 +1158,11 @@
 	"right-managechangetags": "డేటాబేసులో [[Special:Tags|ట్యాగుల]]ను సృష్టించడం, తొలగించడం",
 	"right-applychangetags": "తన మార్పులతో [[Special:Tags|ట్యాగుల]]ను ఆపాదించడం",
 	"right-changetags": "విడి కూర్పులకు, చిట్టా పద్దులకు ఏవైనా [[Special:Tags|ట్యాగుల]]ను చేర్చడం, తొలగించడం",
+	"right-deletechangetags": "[[ప్రత్యేక:Tags|ట్యాగులను]] డేటాబేసు నుండి తొలగించు",
+	"grant-generic": "\"$1\" హక్కుల కట్ట",
+	"grant-group-email": "ఈమెయిలు పంపించడం",
+	"grant-group-administration": "నిర్వాహక చర్యలు చేపట్టడం",
+	"grant-group-private-information": "మీ గోపనీయ డేటాను చూడడం",
 	"newuserlogpage": "కొత్త వాడుకరుల చిట్టా",
 	"newuserlogpagetext": "ఇది వాడుకరి నమోదుల చిట్టా.",
 	"rightslog": "వాడుకరుల హక్కుల మార్పుల చిట్టా",
diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json
index c2c40dcd6c..66e7a0ee30 100644
--- a/languages/i18n/tr.json
+++ b/languages/i18n/tr.json
@@ -85,7 +85,8 @@
 			"Imabadplayer",
 			"Ä°nternion",
 			"Hbseren",
-			"Kumkumuk"
+			"Kumkumuk",
+			"Basak"
 		]
 	},
 	"tog-underline": "Bağlantıların altını çiz:",
@@ -260,7 +261,7 @@
 	"print": "Yazdır",
 	"view": "Görüntüle",
 	"view-foreign": "$1 üzerinde gör",
-	"edit": "Değiştir",
+	"edit": "Düzenle",
 	"edit-local": "Yerel açıklamayı düzenle",
 	"create": "Oluştur",
 	"create-local": "Yerel açıklama ekle",
@@ -696,6 +697,7 @@
 	"savearticle": "Sayfayı kaydet",
 	"savechanges": "Değişiklikleri kaydet",
 	"publishpage": "Sayfayı yayımla",
+	"publishchanges": "Değişiklikleri yayımla",
 	"preview": "Önizleme",
 	"showpreview": "Önizlemeyi göster",
 	"showdiff": "Değişiklikleri göster",
diff --git a/languages/i18n/uk.json b/languages/i18n/uk.json
index c601325d33..f81a37cacb 100644
--- a/languages/i18n/uk.json
+++ b/languages/i18n/uk.json
@@ -688,8 +688,8 @@
 	"watchthis": "Спостерігати за цією сторінкою",
 	"savearticle": "Зберегти сторінку",
 	"savechanges": "Зберегти зміни",
-	"publishpage": "Опублікувати сторінку",
-	"publishchanges": "Опублікувати зміни",
+	"publishpage": "Зберегти сторінку",
+	"publishchanges": "Зберегти зміни",
 	"preview": "Попередній перегляд",
 	"showpreview": "Попередній перегляд",
 	"showdiff": "Показати зміни",
@@ -1259,6 +1259,7 @@
 	"grant-group-high-volume": "Виконувати великий обсяг діяльності",
 	"grant-group-customization": "Налаштування і переваги",
 	"grant-group-administration": "Виконувати адміністративні дії",
+	"grant-group-private-information": "Доступ до приватних даних про Вас",
 	"grant-group-other": "Різна діяльність",
 	"grant-blockusers": "Блокувати і розблокувати користувачів",
 	"grant-createaccount": "Створювати облікові записи",
@@ -1273,6 +1274,7 @@
 	"grant-highvolume": "Редагування у великих обсягах",
 	"grant-oversight": "Приховувати користувачів і версії",
 	"grant-patrol": "Патрулювати зміни на сторінках",
+	"grant-privateinfo": "Доступ до приватних даних",
 	"grant-protect": "Захищати і знімати захист сторінок",
 	"grant-rollback": "Відкочувати зміни на сторінках",
 	"grant-sendemail": "Надсилати пошту іншим користувачам",
diff --git a/languages/i18n/ur.json b/languages/i18n/ur.json
index b00ef272b4..ea5f273894 100644
--- a/languages/i18n/ur.json
+++ b/languages/i18n/ur.json
@@ -528,6 +528,8 @@
 	"minoredit": "معمولی ترمیم",
 	"watchthis": "یہ صفحہ زیر نظر کیجیۓ",
 	"savearticle": "محفوظ",
+	"publishpage": "شائع کریں",
+	"publishchanges": "تبدیلیاں شائع کریں",
 	"preview": "نمائش",
 	"showpreview": "نمائش",
 	"showdiff": "تبدیلیاں دکھاؤ",
@@ -1041,7 +1043,7 @@
 	"shortpages": "چھوٹے صفحات",
 	"longpages": "طویل ترین صفحات",
 	"deadendpages": "مردہ صفحات",
-	"protectedpages": "محفوظ شدہ صفحات",
+	"protectedpages": "محفوظ کردہ صفحات",
 	"protectedpages-noredirect": "رجوع مکررات چھپائیں",
 	"protectedpages-timestamp": "وقت کی مہر",
 	"protectedpages-page": "صفحہ",
@@ -1259,6 +1261,7 @@
 	"sp-contributions-search": "تلاش برائے مساہمات",
 	"sp-contributions-username": "آئی.پی پتہ یا اسمِ صارف:",
 	"sp-contributions-toponly": "صرف حالیہ ترین نظرثانی ترمیمات دِکھاؤ",
+	"sp-contributions-hideminor": "معمولی ترامیم چھپائیں",
 	"sp-contributions-submit": "تلاش",
 	"whatlinkshere": "ادھر کونسا ربط ہے",
 	"whatlinkshere-title": "\"$1\" سے مربوط صفحات",
@@ -1386,6 +1389,7 @@
 	"pageinfo-hidden-categories": "پوشیدہ {{PLURAL:$1|زمرہ|زمرہ جات}} ($1)",
 	"pageinfo-toolboxlink": "معلومات صفحہ",
 	"markaspatrolledtext": "اس صفحہ کو بطور مراجعت شدہ نشان زد کریں",
+	"markedaspatrollederrornotify": "بطور مراجعت نشان زد نہیں کیا جا سکا۔",
 	"deletedrevision": "حذف شدہ پرانی ترمیم $1۔",
 	"previousdiff": "← پُرانی تدوین",
 	"nextdiff": "صفحہ کا نام:",
diff --git a/languages/i18n/uz.json b/languages/i18n/uz.json
index 7b604e7d4e..71b389fbdb 100644
--- a/languages/i18n/uz.json
+++ b/languages/i18n/uz.json
@@ -469,6 +469,8 @@
 	"minoredit": "Bu kichik tahrir",
 	"watchthis": "Sahifani kuzatish",
 	"savearticle": "Saqla",
+	"publishpage": "Sahifani chop et",
+	"publishchanges": "Oʻzgarishlarni chop et",
 	"preview": "Ko‘rib chiqish",
 	"showpreview": "Koʻrib chiqish",
 	"showdiff": "Kiritilgan o‘zgarishlar",
@@ -540,7 +542,6 @@
 	"undo-success": "Tahrirni bekor qilish imkoniyati bor. Iltimos, solishtirish oynasini koʻrib chiqib, aynan shu oʻzgarishlarni bekor qilmoqchiligingizga ishonch hosil qiling va undan keyin «Saqla» tugmasini bosing.",
 	"undo-failure": "Keyingi tahrirlar bilan chalkashib ketgani sababli, ushbu tahrirni alohida oʻzini bekor qilishni iloji yoʻq.",
 	"undo-summary": "[[Special:Contributions/$2|$2]] ([[User talk:$2|mun.]]) tomonidan qilingan $1-sonli tahrir qaytarildi",
-	"cantcreateaccounttitle": "Ro‘yxatdan o‘tib bo‘lmadi",
 	"cantcreateaccount-text": "[[User:$3|$3]] ushbu IP manzil (<strong>$1</strong>) orqali ro‘yxatdan o‘tishni bloklab qo‘ygan.\n\n$3 <em>$2</em>ni sabab qilib ko‘rsatdi",
 	"cantcreateaccount-range-text": "[[User:$3|$3]] <strong>$1</strong> sohaga tegishli IP manzillar, shu jumladan sizning IP manzilingiz (<strong>$4</strong>), orqali ro‘yxatdan o‘tishni bloklab qo‘ygan.\n\n$3 <em>$2</em>ni sabab qilib ko‘rsatdi",
 	"viewpagelogs": "Ushbu sahifaga doir qaydlarni koʻrsat",
diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json
index 14059a5c45..2afd3625d0 100644
--- a/languages/i18n/vi.json
+++ b/languages/i18n/vi.json
@@ -544,7 +544,7 @@
 	"changepassword-throttled": "Bạn đã thử đăng nhập gần đây nhiều lần quá. Xin chờ $1 trước khi bạn thử lần nữa.",
 	"botpasswords": "Mật khẩu Bot",
 	"botpasswords-summary": "<em>Mật khẩu bot</em> cho phép truy cập một tài khoản người dùng qua API mà không sử dụng thông tin chứng nhận chính của tài khoản. Các quyền người dùng có thể bị hạn chế khi đăng nhập dùng mật khẩu bot.\n\nNếu bạn không hiểu tại sao cần sử dụng mật khẩu bot, có lẽ bạn không nên sử dụng nó. Không ai bao giờ có lý do chính đáng để yêu cầu bạn tạo ra một mật khẩu bot và cung cấp nó cho họ.",
-	"botpasswords-disabled": "Mật khẩu Bot bị vô hiệu hoá.",
+	"botpasswords-disabled": "Mật khẩu bot bị vô hiệu hóa.",
 	"botpasswords-no-central-id": "Để sử dụng mật khẩu bot, bạn phải đăng nhập vào một tài khoản tập trung.",
 	"botpasswords-existing": "Mật khẩu bot hiện tại",
 	"botpasswords-createnew": "Tạo một mật khẩu mới bot",
@@ -1219,6 +1219,7 @@
 	"grant-group-high-volume": "Hoạt động với tần số cao",
 	"grant-group-customization": "Tùy biến và tùy chọn",
 	"grant-group-administration": "Thực hiện các hành động bảo quản",
+	"grant-group-private-information": "Truy cập dữ liệu cá nhân của bạn",
 	"grant-group-other": "Hoạt động khác",
 	"grant-blockusers": "Cấm và bỏ cấm người dùng",
 	"grant-createaccount": "Mở tài khoản",
@@ -1233,6 +1234,7 @@
 	"grant-highvolume": "Sửa đổi tốc độ cao",
 	"grant-oversight": "Ẩn người dùng và phiên bản",
 	"grant-patrol": "Tuần tra các thay đổi trang",
+	"grant-privateinfo": "Truy cập dữ liệu cá nhân",
 	"grant-protect": "Khóa và mở khóa các trang",
 	"grant-rollback": "Lùi một loạt thay đổi vào một trang",
 	"grant-sendemail": "Gửi thư điện tử cho người dùng khác",
@@ -1539,6 +1541,7 @@
 	"uploadstash-errclear": "Việc dọn sạch các tập tin bị thất bại.",
 	"uploadstash-refresh": "Làm mới danh sách tập tin",
 	"uploadstash-thumbnail": "xem hình thu nhỏ",
+	"uploadstash-exception": "Không thể lưu tập tin vào hàng đợi tải lên ($1): “$2”.",
 	"invalid-chunk-offset": "Khúc lệch (chunk offset) không hợp lệ",
 	"img-auth-accessdenied": "Không cho phép truy cập",
 	"img-auth-nopathinfo": "Thiếu PATH_INFO.\nMáy chủ của bạn không được thiết lập để truyền thông tin này.\nCó thể do nó dựa trên CGI và không hỗ trợ img_auth.\nXem [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization hướng dẫn điều khiển truy cập hình ảnh].",
@@ -1955,9 +1958,11 @@
 	"watchnologin": "Chưa đăng nhập",
 	"addwatch": "Thêm vào danh sách theo dõi",
 	"addedwatchtext": "“[[:$1]]” cùng trang thảo luận đã vào [[Special:Watchlist|danh sách theo dõi]] của bạn.",
+	"addedwatchtext-talk": "“[[:$1]]” cùng trang đi kèm đã vào [[Special:Watchlist|danh sách theo dõi]] của bạn.",
 	"addedwatchtext-short": "Trang “$1” đã được thêm vào danh sách theo dõi của bạn.",
 	"removewatch": "Gỡ khỏi danh sách theo dõi",
 	"removedwatchtext": "“[[:$1]]” cùng trang thảo luận đã được đưa ra khỏi [[Special:Watchlist|danh sách theo dõi]] của bạn.",
+	"removedwatchtext-talk": "“[[:$1]]” cùng trang đi kèm đã được đưa ra khỏi [[Special:Watchlist|danh sách theo dõi]] của bạn.",
 	"removedwatchtext-short": "Trang “$1” đã được xóa khỏi danh sách theo dõi của bạn.",
 	"watch": "Theo dõi",
 	"watchthispage": "Theo dõi trang này",
@@ -2129,6 +2134,7 @@
 	"undeletehistorynoadmin": "Trang này đã bị xóa.\nLý do xóa trang được hiển thị dưới đây, cùng với thông tin về những người đã sửa đổi trang này trước khi bị xóa.\nChỉ có bảo quản viên mới xem được văn bản đầy đủ của những phiên bản trang bị xóa.",
 	"undelete-revision": "Phiên bản đã xóa của $1 (vào lúc $4 tại $5) do $3 sửa đổi:",
 	"undeleterevision-missing": "Phiên bản này không hợp lệ hay không tồn tại. Đây có thể là một địa chỉ sai, hoặc là phiên bản đã được phục hồi hoặc đã xóa khỏi kho lưu trữ.",
+	"undeleterevision-duplicate-revid": "Không thể phục hồi {{PLURAL:$1|một phiên bản|$1 phiên bản}} vì <code>rev_id</code> của {{PLURAL:$1|nó|chúng}} đã được sử dụng.",
 	"undelete-nodiff": "Không tìm thấy phiên bản cũ hơn.",
 	"undeletebtn": "Phục hồi",
 	"undeletelink": "xem lại/phục hồi",
@@ -2138,7 +2144,7 @@
 	"undeletedrevisions": "$1 phiên bản được phục hồi",
 	"undeletedrevisions-files": "$1 phiên bản và $2 tập tin đã được phục hồi",
 	"undeletedfiles": "$1 tập tin đã được phục hồi",
-	"cannotundelete": "Phục hồi thất bại:\n$1",
+	"cannotundelete": "Phục hồi bị thất bại một phần hoặc hoàn toàn:\n$1",
 	"undeletedpage": "'''$1 đã được khôi phục'''\n\nXem nhật trình xóa và phục hồi các trang gần đây tại [[Special:Log/delete|nhật trình xóa]].",
 	"undelete-header": "Xem các trang bị xóa gần đây tại [[Special:Log/delete|nhật trình xóa]].",
 	"undelete-search-title": "Tìm kiếm trang đã bị xóa",
@@ -2176,8 +2182,8 @@
 	"sp-contributions-newbies-sub": "Các thành viên mới",
 	"sp-contributions-newbies-title": "Đóng góp của các thành viên mới",
 	"sp-contributions-blocklog": "nhật trình cấm",
-	"sp-contributions-suppresslog": "đóng góp của người dùng đã bị xóa hẳn",
-	"sp-contributions-deleted": "đóng góp đã bị xóa của thành viên",
+	"sp-contributions-suppresslog": "đóng góp của {{GENDER:$1}}người dùng đã bị xóa hẳn",
+	"sp-contributions-deleted": "đóng góp đã bị xóa của {{GENDER:$1}}thành viên",
 	"sp-contributions-uploads": "tập tin tải lên",
 	"sp-contributions-logs": "nhật trình",
 	"sp-contributions-talk": "thảo luận",
diff --git a/languages/i18n/yo.json b/languages/i18n/yo.json
index 907bb21513..73f4629b49 100644
--- a/languages/i18n/yo.json
+++ b/languages/i18n/yo.json
@@ -210,7 +210,7 @@
 	"otherlanguages": "Àwọn èdè míràn",
 	"redirectedfrom": "(Àtúnjúwe láti $1)",
 	"redirectpagesub": "Ojúewé àtúnjúwe",
-	"redirectto": "àtúnjúwe sí",
+	"redirectto": "Àtúnjúwe sí:",
 	"lastmodifiedat": "Àtunṣe ojúewé yi gbẹ̀yìn wáyé ni ago $2, ọjọ́ọdún $1.",
 	"viewcount": "A ti wo ojúewé yi ni {{PLURAL:$1|ẹ̀kan péré|iye ìgbà $1}}.",
 	"protectedpage": "Ojúewé oníàbò",
@@ -511,7 +511,7 @@
 	"subject": "Orí ọ̀rọ̀/àkọlé:",
 	"minoredit": "Àtúnṣe kékeré nìyí",
 	"watchthis": "M'ójútó ojúewé yìí",
-	"savearticle": "Ṣe àtẹ̀jáde ojú ewé",
+	"savearticle": "Ìdásí ojúewé",
 	"publishpage": "Ṣàtẹ̀jáde ojú ewé",
 	"publishchanges": "Ṣàtẹ̀jáde àtúnṣe",
 	"preview": "Àyẹ̀wò",
@@ -797,7 +797,7 @@
 	"search-external": "Àwárí lóde",
 	"searchdisabled": "Ṣíṣàwárí nínú {{SITENAME}} wà ní dídálẹ́kun.\nNí báyìí ná ẹ le ṣàwárí lọ́dọ̀ Google.\nÀkíyèsí pé àwọn atọ́ka wọn fún àkóónú {{SITENAME}} le mọ́ jẹ́ tuntun.",
 	"search-error": "Àṣìṣe ṣẹlẹ̀ fún ìwárí: $1",
-	"preferences": "Àwọn ààyò",
+	"preferences": "Àwọn ìfẹ́ràn",
 	"mypreferences": "Àwọn ìfẹ́ràn",
 	"prefs-edits": "Iye àwọn àtúnṣe:",
 	"prefsnologintext2": "Ẹ jọ̀wọ́ ẹ $1 láti ṣe ìyípadà àwọn ìfẹ́ràn yín.",
@@ -1737,7 +1737,7 @@
 	"whatlinkshere-links": "← àwọn ìjápọ̀",
 	"whatlinkshere-hideredirs": "$1 àtúnjúwe",
 	"whatlinkshere-hidetrans": "$1 ìkómọ́ra",
-	"whatlinkshere-hidelinks": "$1 Àwọn ìjápọ̀",
+	"whatlinkshere-hidelinks": "Ìjápọ̀ $1",
 	"whatlinkshere-hideimages": "$1 àwọn ìjápọ̀ fáìlì",
 	"whatlinkshere-filters": "Ajọ̀",
 	"autoblockid": "Ìdínàaláraẹni #$1",
@@ -1999,11 +1999,11 @@
 	"javascripttest-qunit-intro": "Ẹ wo [$1 ìwé aṣàlàyé ìdánwò] ní mediawiki.org.",
 	"tooltip-pt-userpage": "Ojúewé oníṣe rẹ",
 	"tooltip-pt-anonuserpage": "Ojúewé oníṣe fún àdírẹ́ẹ̀sì IP tí ẹ únlò láti ṣàtúnṣe",
-	"tooltip-pt-mytalk": "Ojúewé ọ̀rọ̀ rẹ",
+	"tooltip-pt-mytalk": "Ojúewé ọ̀rọ̀ {{GENDER:|rẹ}}",
 	"tooltip-pt-anontalk": "Ọ̀rọ̀ nípa àtúnṣe láti àdírẹ́ẹ̀sì IP yìí",
 	"tooltip-pt-preferences": "Àwọn ìfẹ́ràn rẹ",
 	"tooltip-pt-watchlist": "Àkójọ àwọn ojúewé tí ẹ̀ ún mójútó bóyá wọ́nyí padà",
-	"tooltip-pt-mycontris": "Àkójọ àwọn àfikún rẹ",
+	"tooltip-pt-mycontris": "Àtójọ àwọn àfikún {{GENDER:|rẹ}}",
 	"tooltip-pt-login": "A gbà yín níyànjú kí ẹwọlé, bótilẹ̀jẹ́pẹ́ kò pọndandan.",
 	"tooltip-pt-logout": "Ìjáde",
 	"tooltip-pt-createaccount": "Ó dára kí ẹ dá àkópamọ́ kí ẹ sì ṣe ìtẹ̀jáwọlé, ṣùgbọ́n kò pọn dandan",
@@ -2573,7 +2573,7 @@
 	"revdelete-uname-unhid": "orúkọ oníṣe kò pamọ́",
 	"revdelete-restricted": "ṣe ìmúlò ìpàlà fún àwọn olúmójútó",
 	"revdelete-unrestricted": "yọ ìpàlà fún àwọn olúmójútó",
-	"logentry-move-move": "$1 ṣeyípòdà ojúewé $3 sí $4",
+	"logentry-move-move": "$1 {{GENDER:$2|ṣeyípòdà}} ojúewé $3 sí $4",
 	"logentry-move-move-noredirect": "$1 ṣeyípòdà ojúewé $3 sí $4 láìfi àtúnjúwe sílẹ̀",
 	"logentry-move-move_redir": "$1 ṣeyípòdà ojúewé $3 sí $4 lórí àtúnjúwe",
 	"logentry-move-move_redir-noredirect": "$1 ṣeyípòdà ojúewé $3 sí $4 lórí àtúnjúwe láìfi àtúnjúwe sílẹ̀",
diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json
index 1764b36cd9..30767865e6 100644
--- a/languages/i18n/zh-hans.json
+++ b/languages/i18n/zh-hans.json
@@ -1278,6 +1278,7 @@
 	"grant-group-high-volume": "执行大量活动",
 	"grant-group-customization": "自定义与设置",
 	"grant-group-administration": "执行管理操作",
+	"grant-group-private-information": "访问有关您的私有数据",
 	"grant-group-other": "杂项活动",
 	"grant-blockusers": "封禁与解封用户",
 	"grant-createaccount": "创建账户",
@@ -1292,6 +1293,7 @@
 	"grant-highvolume": "大容量编辑",
 	"grant-oversight": "隐藏用户和阻止修订",
 	"grant-patrol": "巡查对页面的更改",
+	"grant-privateinfo": "访问私有信息",
 	"grant-protect": "保护页面和取消页面保护",
 	"grant-rollback": "回退对页面的更改",
 	"grant-sendemail": "给其他用户发送电子邮件",
@@ -3482,7 +3484,7 @@
 	"revdelete-uname-unhid": "公开用户名",
 	"revdelete-restricted": "应用对管理员的限制",
 	"revdelete-unrestricted": "删除对管理员的限制",
-	"logentry-block-block": "$1{{GENDER:$2|封禁了}}{{GENDER:$4|$3}}，期限为$5 $6",
+	"logentry-block-block": "$1{{GENDER:$2|封禁了}}{{GENDER:$4|$3}}，到期时间为$5 $6",
 	"logentry-block-unblock": "$1{{GENDER:$2|解封了}}{{GENDER:$4|$3}}",
 	"logentry-block-reblock": "$1将{{GENDER:$4|$3}}的封禁设置{{GENDER:$2|更改为}}持续时间$5 $6",
 	"logentry-suppress-block": "$1{{GENDER:$2|封禁了}}{{GENDER:$4|$3}}，持续时间$5 $6",
@@ -3772,7 +3774,7 @@
 	"log-action-filter-upload-upload": "新上传",
 	"log-action-filter-upload-overwrite": "重新上传",
 	"authmanager-authn-not-in-progress": "身份验证尚未进行，或会话数据丢失。请从头重新开始。",
-	"authmanager-authn-no-primary": "提供的证书不能被验证。",
+	"authmanager-authn-no-primary": "提供的凭据不能被认证。",
 	"authmanager-authn-no-local-user": "提供的证书没有与该wiki上的任何用户相关联。",
 	"authmanager-authn-no-local-user-link": "提供的证书有效，但没有与该wiki上的任何用户相关联。请通过不同方式登录，或创建一个新用户，然后您将拥有一个把您之前的证书链接到对应账户的选项。",
 	"authmanager-authn-autocreate-failed": "所有账户的自动创建失败：$1",
diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json
index e58564ccc5..0b01858ad4 100644
--- a/languages/i18n/zh-hant.json
+++ b/languages/i18n/zh-hant.json
@@ -2253,13 +2253,13 @@
 	"unblock": "解除封鎖使用者",
 	"blockip": "封鎖{{GENDER:$1|使用者}}",
 	"blockip-legend": "封鎖使用者",
-	"blockiptext": "填寫以下表單可封鎖特定 IP 位址或使用者名稱的存取權限。\n這個動作應用來避免破壞行為，可根據 [[{{MediaWiki:Policy-url}}|管理政策]]。\n請在下方填寫一個具體的原因 (例如：引述一段破壞頁面的事實)。\n您可以使用 [https://en.wikipedia.org/wiki/Classless_Inter-Domain_Routing CIDR] 語法格式封鎖 IP 範圍，最大允許的範圍 IPv4 為 /$1、IPv6 為 /$2。",
+	"blockiptext": "填寫以下表單可封鎖特定 IP 位址或使用者的編輯權限。\n只有為了防止破壞，並符合[[{{MediaWiki:Policy-url}}|方針或政策]]的情況下方可採取此行動。\n請在下方填寫一個具體的原因（例如：引述一個被破壞的頁面）。\n您可以使用[//zh.wikipedia.org/wiki/无类别域间路由 CIDR]語法格式封鎖 IP 範圍，最大允許的範圍 IPv4 為 /$1、IPv6 為 /$2。",
 	"ipaddressorusername": "IP 位址或使用者名稱：",
 	"ipbexpiry": "期限：",
 	"ipbreason": "原因：",
 	"ipbreason-dropdown": "*常見的封鎖原因\n** 填寫不實資訊\n** 刪除頁面內容\n** 散佈外部廣告連結\n** 在頁面填寫無意義文字\n** 無禮的行為、攻擊／騷擾別人\n** 濫用多個帳號\n** 使用不受歡迎的使用者名稱",
 	"ipb-hardblock": "禁止使用此 IP 位址登入的使用者編輯",
-	"ipbcreateaccount": "防止帳號建立",
+	"ipbcreateaccount": "防止建立新帳號",
 	"ipbemailban": "禁止使用者傳送電子郵件",
 	"ipbenableautoblock": "自動封鎖此使用者最後使用的 IP 位址，以及所有之後嘗試編輯使用的 IP 位址",
 	"ipbsubmit": "封鎖此使用者",
@@ -2267,7 +2267,7 @@
 	"ipboptions": "2 小時:2 hours,1 天:1 day,3 天:3 days,1 週:1 week,2 週:2 weeks,1 個月:1 month,3 個月:3 months,6 個月:6 months,1 年:1 year,無限期:infinite",
 	"ipbhidename": "在編輯及清單中隱藏使用者名稱",
 	"ipbwatchuser": "監視這位使用者的使用者頁面及其對話頁面",
-	"ipb-disableusertalk": "防止此使用者在封期間編輯他自己的對話頁面",
+	"ipb-disableusertalk": "阻止此使用者在封禁期間編輯自己的對話頁面",
 	"ipb-change-block": "使用現有設定重新封鎖使用者",
 	"ipb-confirm": "確認封鎖",
 	"badipaddress": "無效的 IP 位址",
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 1fa701e6f1..2d04f63069 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -250,8 +250,8 @@ $namespaceNames = [
 	NS_MEDIA            => 'Médiá',
 	NS_SPECIAL          => 'Špeciálne',
 	NS_TALK             => 'Diskusia',
-	NS_USER             => 'Redaktor',
-	NS_USER_TALK        => 'Diskusia_s_redaktorom',
+	NS_USER             => 'Užívateľ',
+	NS_USER_TALK        => 'Diskusia_s_užívateľom',
 	NS_PROJECT_TALK     => 'Diskusia_k_{{GRAMMAR:datív|$1}}',
 	NS_FILE             => 'Súbor',
 	NS_FILE_TALK        => 'Diskusia_k_súboru',
@@ -267,6 +267,8 @@ $namespaceNames = [
 
 $namespaceAliases = [
 	"Komentár"               => NS_TALK,
+	'Redaktor'               => NS_USER,
+	'Diskusia_s_redaktorom'  => NS_USER_TALK,
 	"Komentár_k_redaktorovi" => NS_USER_TALK,
 	"Komentár_k_Wikipédii"   => NS_PROJECT_TALK,
 	'Obrázok' => NS_FILE,
@@ -275,6 +277,11 @@ $namespaceAliases = [
 	"Komentár_k_MediaWiki"   => NS_MEDIAWIKI_TALK,
 ];
 
+$namespaceGenderAliases = [
+	NS_USER => [ 'male' => 'Užívateľ', 'female' => 'Užívateľka' ],
+	NS_USER_TALK => [ 'male' => 'Diskusia_s_užívateľom', 'female' => 'Diskusia_s_užívateľkou' ],
+];
+
 $separatorTransformTable = [
 	',' => "\xc2\xa0",
 	'.' => ','
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 8368aabebb..ab316c0632 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -907,7 +907,7 @@ abstract class Maintenance {
 
 		// Description ...
 		if ( $this->mDescription ) {
-			$this->output( "\n" . $this->mDescription . "\n" );
+			$this->output( "\n" . wordwrap( $this->mDescription, $screenWidth ) . "\n" );
 		}
 		$output = "\nUsage: php " . basename( $this->mSelf );
 
diff --git a/maintenance/cleanupCaps.php b/maintenance/cleanupCaps.php
index 693125994c..2da45ca192 100644
--- a/maintenance/cleanupCaps.php
+++ b/maintenance/cleanupCaps.php
@@ -32,13 +32,15 @@
 require_once __DIR__ . '/cleanupTable.inc';
 
 /**
- * Maintenance script to clean up broken page links when somebody turns on $wgCapitalLinks.
+ * Maintenance script to clean up broken page links when somebody turns
+ * on or off $wgCapitalLinks.
  *
  * @ingroup Maintenance
  */
 class CapsCleanup extends TableCleanup {
 
 	private $user;
+	private $namespace;
 
 	public function __construct() {
 		parent::__construct();
@@ -47,25 +49,66 @@ class CapsCleanup extends TableCleanup {
 	}
 
 	public function execute() {
-		global $wgCapitalLinks;
-
-		if ( $wgCapitalLinks ) {
-			$this->error( "\$wgCapitalLinks is on -- no need for caps links cleanup.", true );
-		}
-
 		$this->user = User::newSystemUser( 'Conversion script', [ 'steal' => true ] );
 
 		$this->namespace = intval( $this->getOption( 'namespace', 0 ) );
+
+		if ( MWNamespace::isCapitalized( $this->namespace ) ) {
+			$this->output( "Will be moving pages to first letter capitalized titles" );
+			$callback = 'processRowToUppercase';
+		} else {
+			$this->output( "Will be moving pages to first letter lowercase titles" );
+			$callback = 'processRowToLowercase';
+		}
+
 		$this->dryrun = $this->hasOption( 'dry-run' );
 
 		$this->runTable( [
 			'table' => 'page',
 			'conds' => [ 'page_namespace' => $this->namespace ],
 			'index' => 'page_id',
-			'callback' => 'processRow' ] );
+			'callback' => $callback ] );
 	}
 
-	protected function processRow( $row ) {
+	protected function processRowToUppercase( $row ) {
+		global $wgContLang;
+
+		$current = Title::makeTitle( $row->page_namespace, $row->page_title );
+		$display = $current->getPrefixedText();
+		$lower = $row->page_title;
+		$upper = $wgContLang->ucfirst( $row->page_title );
+		if ( $upper == $lower ) {
+			$this->output( "\"$display\" already uppercase.\n" );
+
+			return $this->progress( 0 );
+		}
+
+		$target = Title::makeTitle( $row->page_namespace, $upper );
+		if ( $target->exists() ) {
+			// Prefix "CapsCleanup" to bypass the conflict
+			$target = Title::newFromText( __CLASS__ . '/' . $display );
+		}
+		$ok = $this->movePage(
+			$current,
+			$target,
+			'Converting page title to first-letter uppercase',
+			false
+		);
+		if ( $ok ) {
+			$this->progress( 1 );
+			if ( $row->page_namespace == $this->namespace ) {
+				$talk = $target->getTalkPage();
+				$row->page_namespace = $talk->getNamespace();
+				if ( $talk->exists() ) {
+					return $this->processRowToUppercase( $row );
+				}
+			}
+		}
+
+		return $this->progress( 0 );
+	}
+
+	protected function processRowToLowercase( $row ) {
 		global $wgContLang;
 
 		$current = Title::makeTitle( $row->page_namespace, $row->page_title );
@@ -79,35 +122,51 @@ class CapsCleanup extends TableCleanup {
 		}
 
 		$target = Title::makeTitle( $row->page_namespace, $lower );
-		$targetDisplay = $target->getPrefixedText();
 		if ( $target->exists() ) {
+			$targetDisplay = $target->getPrefixedText();
 			$this->output( "\"$display\" skipped; \"$targetDisplay\" already exists\n" );
 
 			return $this->progress( 0 );
 		}
 
-		if ( $this->dryrun ) {
-			$this->output( "\"$display\" -> \"$targetDisplay\": DRY RUN, NOT MOVED\n" );
-			$ok = true;
-		} else {
-			$mp = new MovePage( $current, $target );
-			$status = $mp->move( $this->user, 'Converting page titles to lowercase', true );
-			$ok = $status->isOK() ? 'OK' : $status->getWikiText( false, false, 'en' );
-			$this->output( "\"$display\" -> \"$targetDisplay\": $ok\n" );
-		}
+		$ok = $this->movePage( $current, $target, 'Converting page titles to lowercase', true );
 		if ( $ok === true ) {
 			$this->progress( 1 );
 			if ( $row->page_namespace == $this->namespace ) {
 				$talk = $target->getTalkPage();
 				$row->page_namespace = $talk->getNamespace();
 				if ( $talk->exists() ) {
-					return $this->processRow( $row );
+					return $this->processRowToLowercase( $row );
 				}
 			}
 		}
 
 		return $this->progress( 0 );
 	}
+
+	/**
+	 * @param Title $current
+	 * @param Title $target
+	 * @param string $reason
+	 * @param bool $createRedirect
+	 * @return bool Success
+	 */
+	private function movePage( Title $current, Title $target, $reason, $createRedirect ) {
+		$display = $current->getPrefixedText();
+		$targetDisplay = $target->getPrefixedText();
+
+		if ( $this->dryrun ) {
+			$this->output( "\"$display\" -> \"$targetDisplay\": DRY RUN, NOT MOVED\n" );
+			$ok = 'OK';
+		} else {
+			$mp = new MovePage( $current, $target );
+			$status = $mp->move( $this->user, $reason, $createRedirect );
+			$ok = $status->isOK() ? 'OK' : $status->getWikiText( false, false, 'en' );
+			$this->output( "\"$display\" -> \"$targetDisplay\": $ok\n" );
+		}
+
+		return $ok === 'OK';
+	}
 }
 
 $maintClass = "CapsCleanup";
diff --git a/maintenance/findDeprecated.php b/maintenance/findDeprecated.php
index bc1b34aa67..94b7fb4429 100644
--- a/maintenance/findDeprecated.php
+++ b/maintenance/findDeprecated.php
@@ -71,6 +71,9 @@ class DeprecatedInterfaceFinder extends FileAwareNodeVisitor {
 	 * indicating that it is a hard-deprecated interface.
 	 */
 	public function isHardDeprecated( PhpParser\Node $node ) {
+		if ( !$node->stmts ) {
+			return false;
+		}
 		foreach ( $node->stmts as $stmt ) {
 			if (
 				$stmt instanceof PhpParser\Node\Expr\FuncCall
@@ -142,7 +145,7 @@ class FindDeprecated extends Maintenance {
 		$files = $this->getFiles();
 		$chunkSize = ceil( count( $files ) / 72 );
 
-		$parser = new PhpParser\Parser( new PhpParser\Lexer\Emulative );
+		$parser = ( new PhpParser\ParserFactory )->create( PhpParser\ParserFactory::PREFER_PHP7 );
 		$traverser = new PhpParser\NodeTraverser;
 		$finder = new DeprecatedInterfaceFinder;
 		$traverser->addVisitor( $finder );
diff --git a/maintenance/hhvm/makeRepo.php b/maintenance/hhvm/makeRepo.php
new file mode 100644
index 0000000000..a0fe381c79
--- /dev/null
+++ b/maintenance/hhvm/makeRepo.php
@@ -0,0 +1,161 @@
+<?php
+
+require __DIR__ . '/../Maintenance.php';
+
+class HHVMMakeRepo extends Maintenance {
+	function __construct() {
+		parent::__construct();
+		$this->addDescription( 'Compile PHP sources for this MediaWiki instance, ' .
+			'and generate an HHVM bytecode file to be used with HHVM\'s ' .
+			'RepoAuthoritative mode. The MediaWiki core installation path and ' .
+			'all registered extensions are automatically searched for the file ' .
+			'extensions *.php, *.inc, *.php5 and *.phtml.' );
+		$this->addOption( 'output', 'Output filename', true, true, 'o' );
+		$this->addOption( 'input-dir', 'Add an input directory. ' .
+			'This can be specified multiple times.', false, true, 'd', true );
+		$this->addOption( 'exclude-dir', 'Directory to exclude. ' .
+			'This can be specified multiple times.', false, true, false, true );
+		$this->addOption( 'extension', 'Extra file extension', false, true, false, true );
+		$this->addOption( 'hhvm', 'Location of HHVM binary', false, true );
+		$this->addOption( 'base-dir', 'The root of all source files. ' .
+			'This must match hhvm.server.source_root in the server\'s configuration file. ' .
+			'By default, the MW core install path will be used.',
+			false, true );
+		$this->addOption( 'verbose', 'Log level 0-3', false, true, 'v' );
+	}
+
+	private static function startsWith( $subject, $search ) {
+		return substr( $subject, 0, strlen( $search ) === $search );
+	}
+
+	function execute() {
+		global $wgExtensionCredits, $IP;
+
+		$dirs = [ $IP ];
+
+		foreach ( $wgExtensionCredits as $type => $extensions ) {
+			foreach ( $extensions as $extension ) {
+				if ( isset( $extension['path'] )
+					&& !self::startsWith( $extension['path'], $IP )
+				) {
+					$dirs[] = dirname( $extension['path'] );
+				}
+			}
+		}
+
+		$dirs = array_merge( $dirs, $this->getOption( 'input-dir', [] ) );
+		$fileExts =
+			[
+				'php' => true,
+				'inc' => true,
+				'php5' => true,
+				'phtml' => true
+			] +
+			array_flip( $this->getOption( 'extension', [] ) );
+
+		$dirs = array_unique( $dirs );
+
+		$baseDir = $this->getOption( 'base-dir', $IP );
+		$excludeDirs = array_map( 'realpath', $this->getOption( 'exclude-dir', [] ) );
+
+		if ( $baseDir !== '' && substr( $baseDir, -1 ) !== '/' ) {
+			$baseDir .= '/';
+		}
+
+		$unfilteredFiles = [ "$IP/LocalSettings.php" ];
+		foreach ( $dirs as $dir ) {
+			$this->appendDir( $unfilteredFiles, $dir );
+		}
+
+		$files = [];
+		foreach ( $unfilteredFiles as $file ) {
+			$dotPos = strrpos( $file, '.' );
+			$slashPos = strrpos( $file, '/' );
+			if ( $dotPos === false || $slashPos === false || $dotPos < $slashPos ) {
+				continue;
+			}
+			$extension = substr( $file, $dotPos + 1 );
+			if ( !isset( $fileExts[$extension] ) ) {
+				continue;
+			}
+			$canonical = realpath( $file );
+			foreach ( $excludeDirs as $excluded ) {
+				if ( self::startsWith( $canonical, $excluded ) ) {
+					continue 2;
+				}
+			}
+			if ( self::startsWith( $file, $baseDir ) ) {
+				$file = substr( $file, strlen( $baseDir ) );
+			}
+			$files[] = $file;
+		}
+
+		$files = array_unique( $files );
+
+		print "Found " . count( $files ) . " files in " .
+			count( $dirs ) . " directories\n";
+
+		$tmpDir = wfTempDir() . '/mw-make-repo' . mt_rand( 0, 1<<31 );
+		if ( !mkdir( $tmpDir ) ) {
+			$this->error( 'Unable to create temporary directory', 1 );
+		}
+		file_put_contents( "$tmpDir/file-list", implode( "\n", $files ) );
+
+		$hhvm = $this->getOption( 'hhvm', 'hhvm' );
+		$verbose = $this->getOption( 'verbose', 3 );
+		$cmd = wfEscapeShellArg(
+			$hhvm,
+			'--hphp',
+		    '--target', 'hhbc',
+			'--format', 'binary',
+			'--force', '1',
+			'--keep-tempdir', '1',
+			'--log', $verbose,
+			'-v', 'AllVolatile=true',
+			'--input-dir', $baseDir,
+			'--input-list', "$tmpDir/file-list",
+			'--output-dir', $tmpDir );
+		print "$cmd\n";
+		passthru( $cmd, $ret );
+		if ( $ret ) {
+			$this->cleanupTemp( $tmpDir );
+			$this->error( "Error: HHVM returned error code $ret", 1 );
+		}
+		if ( !rename( "$tmpDir/hhvm.hhbc", $this->getOption( 'output' ) ) ) {
+			$this->cleanupTemp( $tmpDir );
+			$this->error( "Error: unable to rename output file", 1 );
+		}
+		$this->cleanupTemp( $tmpDir );
+		return 0;
+	}
+
+	private function cleanupTemp( $tmpDir ) {
+		if ( file_exists( "$tmpDir/hhvm.hhbc" ) ) {
+			unlink( "$tmpDir/hhvm.hhbc" );
+		}
+		if ( file_exists( "$tmpDir/Stats.js" ) ) {
+			unlink( "$tmpDir/Stats.js" );
+		}
+
+		unlink( "$tmpDir/file-list" );
+		rmdir( $tmpDir );
+	}
+
+	private function appendDir( &$files, $dir ) {
+		$iter = new RecursiveIteratorIterator(
+			new RecursiveDirectoryIterator(
+				$dir,
+				FilesystemIterator::UNIX_PATHS
+			),
+			RecursiveIteratorIterator::LEAVES_ONLY
+		);
+		foreach ( $iter as $file => $fileInfo ) {
+			if ( $fileInfo->isFile() ) {
+				$files[] = $file;
+			}
+		}
+	}
+}
+
+$maintClass = 'HHVMMakeRepo';
+require RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/hhvm/run-server b/maintenance/hhvm/run-server
new file mode 100755
index 0000000000..2d71b8712e
--- /dev/null
+++ b/maintenance/hhvm/run-server
@@ -0,0 +1,28 @@
+#!/usr/bin/hhvm -f
+<?php
+
+require __DIR__ . '/../Maintenance.php';
+
+class RunHipHopServer extends Maintenance {
+	function __construct() {
+		parent::__construct();
+	}
+
+	function execute() {
+		global $IP;
+
+		passthru(
+			'cd ' . wfEscapeShellArg( $IP ) . " && " .
+			wfEscapeShellArg(
+				'hhvm',
+				'-c', __DIR__."/server.conf",
+				'--mode=server',
+				'--port=8080'
+			),
+			$ret
+		);
+		exit( $ret );
+	}
+}
+$maintClass = 'RunHipHopServer';
+require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/hhvm/server.conf b/maintenance/hhvm/server.conf
new file mode 100644
index 0000000000..558bdad8ce
--- /dev/null
+++ b/maintenance/hhvm/server.conf
@@ -0,0 +1,30 @@
+Log {
+	Level = Warning
+	UseLogFile = true
+	NativeStackTrace = true
+	InjectedStackTrace = true
+}
+Debug {
+	FullBacktrace = true
+	ServerStackTrace = true
+	ServerErrorMessage = true
+	TranslateSource = true
+}
+Server {
+	EnableStaticContentCache = false
+	EnableStaticContentFromDisk = true
+	AlwaysUseRelativePath = true
+}
+VirtualHost {
+	* {
+		ServerName = localhost
+		Pattern = .
+		RewriteRules {
+			* {
+				pattern = ^/wiki/(.*)$
+				to = /index.php?title=$1
+				qsa = true
+			}
+		}
+	}
+}
diff --git a/maintenance/hiphop/run-server b/maintenance/hiphop/run-server
deleted file mode 100755
index 2d71b8712e..0000000000
--- a/maintenance/hiphop/run-server
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/hhvm -f
-<?php
-
-require __DIR__ . '/../Maintenance.php';
-
-class RunHipHopServer extends Maintenance {
-	function __construct() {
-		parent::__construct();
-	}
-
-	function execute() {
-		global $IP;
-
-		passthru(
-			'cd ' . wfEscapeShellArg( $IP ) . " && " .
-			wfEscapeShellArg(
-				'hhvm',
-				'-c', __DIR__."/server.conf",
-				'--mode=server',
-				'--port=8080'
-			),
-			$ret
-		);
-		exit( $ret );
-	}
-}
-$maintClass = 'RunHipHopServer';
-require_once RUN_MAINTENANCE_IF_MAIN;
diff --git a/maintenance/hiphop/server.conf b/maintenance/hiphop/server.conf
deleted file mode 100644
index 558bdad8ce..0000000000
--- a/maintenance/hiphop/server.conf
+++ /dev/null
@@ -1,30 +0,0 @@
-Log {
-	Level = Warning
-	UseLogFile = true
-	NativeStackTrace = true
-	InjectedStackTrace = true
-}
-Debug {
-	FullBacktrace = true
-	ServerStackTrace = true
-	ServerErrorMessage = true
-	TranslateSource = true
-}
-Server {
-	EnableStaticContentCache = false
-	EnableStaticContentFromDisk = true
-	AlwaysUseRelativePath = true
-}
-VirtualHost {
-	* {
-		ServerName = localhost
-		Pattern = .
-		RewriteRules {
-			* {
-				pattern = ^/wiki/(.*)$
-				to = /index.php?title=$1
-				qsa = true
-			}
-		}
-	}
-}
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 8fd25a6786..d6a9ba81fd 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -596,6 +596,8 @@ class NamespaceConflictChecker extends Maintenance {
 
 		$this->db->delete( 'page', [ 'page_id' => $id ], __METHOD__ );
 
+		$this->commitTransaction( $this->db, __METHOD__ );
+
 		/* Call LinksDeletionUpdate to delete outgoing links from the old title,
 		 * and update category counts.
 		 *
@@ -605,9 +607,8 @@ class NamespaceConflictChecker extends Maintenance {
 		 * accidentally introduce an assumption of title validity to the code we
 		 * are calling.
 		 */
-		$update = new LinksDeletionUpdate( $wikiPage );
-		$update->doUpdate();
-		$this->commitTransaction( $this->db, __METHOD__ );
+		$updates = [ new LinksDeletionUpdate( $wikiPage ) ];
+		DataUpdate::runUpdates( $updates );
 
 		return true;
 	}
diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index bdbb347899..aea966ffb2 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -139,6 +139,7 @@ class RefreshImageMetadata extends Maintenance {
 			}
 
 			foreach ( $res as $row ) {
+				// LocalFile will upgrade immediately here if obsolete
 				$file = $repo->newFileFromRow( $row );
 				if ( $file->getUpgraded() ) {
 					// File was upgraded.
diff --git a/maintenance/validateRegistrationFile.php b/maintenance/validateRegistrationFile.php
index 9cf7b2bdc8..bd34a50eab 100644
--- a/maintenance/validateRegistrationFile.php
+++ b/maintenance/validateRegistrationFile.php
@@ -8,7 +8,7 @@ class ValidateRegistrationFile extends Maintenance {
 		$this->addArg( 'path', 'Path to extension.json/skin.json file.', true );
 	}
 	public function execute() {
-		if ( !class_exists( 'JsonSchema\Uri\UriRetriever' ) ) {
+		if ( !class_exists( 'JsonSchema\Validato' ) ) {
 			$this->error( 'The JsonSchema library cannot be found, please install it through composer.', 1 );
 		}
 
@@ -38,11 +38,8 @@ class ValidateRegistrationFile extends Maintenance {
 			$this->output( "Warning: $path is using a deprecated schema, and should be updated to "
 				. ExtensionRegistry::MANIFEST_VERSION . "\n" );
 		}
-		$retriever = new JsonSchema\Uri\UriRetriever();
-		$schema = $retriever->retrieve( 'file://' . $schemaPath );
-
-		$validator = new JsonSchema\Validator();
-		$validator->check( $data, $schema );
+		$validator = new JsonSchema\Validator;
+		$validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] );
 		if ( $validator->isValid() ) {
 			$this->output( "$path validates against the version $version schema!\n" );
 		} else {
diff --git a/mw-config/overrides/README b/mw-config/overrides/README
index 68e0fad631..9a9d84db2f 100644
--- a/mw-config/overrides/README
+++ b/mw-config/overrides/README
@@ -5,7 +5,7 @@ you can override classes used by the installer.
 You can override 3 classes:
 * LocalSettingsGenerator - generates LocalSettings.php
 * WebInstaller - web installer UI
-* CliInstaller - command line installer
+* CliInstaller - command-line installer
 
 Example override:
 
diff --git a/resources/Resources.php b/resources/Resources.php
index 0d8cfd62fe..cfaaf5f1bd 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -979,7 +979,6 @@ return [
 		],
 		'dependencies' => [
 			'jquery.footHovzer',
-			'jquery.tipsy',
 		],
 		'position' => 'bottom',
 	],
@@ -1068,7 +1067,17 @@ return [
 		'styles' => 'resources/src/mediawiki/mediawiki.hlist.css',
 	],
 	'mediawiki.htmlform' => [
-		'scripts' => 'resources/src/mediawiki/mediawiki.htmlform.js',
+		'scripts' => [
+			'resources/src/mediawiki/htmlform/htmlform.js',
+			'resources/src/mediawiki/htmlform/autocomplete.js',
+			'resources/src/mediawiki/htmlform/autoinfuse.js',
+			'resources/src/mediawiki/htmlform/checkmatrix.js',
+			'resources/src/mediawiki/htmlform/cloner.js',
+			'resources/src/mediawiki/htmlform/hide-if.js',
+			'resources/src/mediawiki/htmlform/multiselect.js',
+			'resources/src/mediawiki/htmlform/selectandother.js',
+			'resources/src/mediawiki/htmlform/selectorother.js',
+		],
 		'dependencies' => [
 			'mediawiki.RegExp',
 			'jquery.byteLimit',
@@ -1080,13 +1089,22 @@ return [
 		],
 		'targets' => [ 'desktop', 'mobile' ],
 	],
+	'mediawiki.htmlform.ooui' => [
+		'scripts' => [
+			'resources/src/mediawiki/htmlform/htmlform.Element.js',
+		],
+		'dependencies' => [
+			'oojs-ui-core',
+		],
+		'targets' => [ 'desktop', 'mobile' ],
+	],
 	'mediawiki.htmlform.styles' => [
-		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
+		'styles' => 'resources/src/mediawiki/htmlform/styles.css',
 		'position' => 'top',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'mediawiki.htmlform.ooui.styles' => [
-		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
+		'styles' => 'resources/src/mediawiki/htmlform/ooui.styles.css',
 		'position' => 'top',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
@@ -1429,10 +1447,6 @@ return [
 		'scripts' => 'resources/src/mediawiki/mediawiki.experiments.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
-	'mediawiki.raggett' => [
-		'styles' => 'resources/src/mediawiki/mediawiki.raggett.css',
-		'targets' => [ 'desktop', 'mobile' ],
-	],
 
 	/* MediaWiki Action */
 
diff --git a/resources/ResourcesOOUI.php b/resources/ResourcesOOUI.php
index b31fe829f8..c3a287dc8d 100644
--- a/resources/ResourcesOOUI.php
+++ b/resources/ResourcesOOUI.php
@@ -68,6 +68,9 @@ return call_user_func( function () {
 			'es5-shim',
 			'oojs',
 			'oojs-ui-core.styles',
+			'oojs-ui.styles.icons',
+			'oojs-ui.styles.indicators',
+			'oojs-ui.styles.textures',
 			'mediawiki.language',
 		],
 		'targets' => [ 'desktop', 'mobile' ],
@@ -78,14 +81,6 @@ return call_user_func( function () {
 		'styles' => 'resources/src/oojs-ui-local.css', // HACK, see inside the file
 		'skinStyles' => $getSkinSpecific( 'core' ),
 		'targets' => [ 'desktop', 'mobile' ],
-		// ResourceLoaderImageModule doesn't support 'skipFunction', so instead we set this up so that
-		// this module is skipped together with its dependencies. Nothing else depends on these modules.
-		'dependencies' => [
-			'oojs-ui.styles.icons',
-			'oojs-ui.styles.indicators',
-			'oojs-ui.styles.textures',
-		],
-		'skipFunction' => 'resources/src/oojs-ui-styles-skip.js',
 	];
 
 	// Additional widgets and layouts module.
diff --git a/resources/assets/licenses/README b/resources/assets/licenses/README
new file mode 100644
index 0000000000..dae2549b14
--- /dev/null
+++ b/resources/assets/licenses/README
@@ -0,0 +1,4 @@
+These license icons are used in LocalSettings.php files that are generated by
+the installer. Although "Public domain" has been removed from the installer as
+an option, the public-domain.png image needs to remain here to support older
+installations that refer to it in LocalSettings.php.
diff --git a/resources/lib/oojs-ui/i18n/ckb.json b/resources/lib/oojs-ui/i18n/ckb.json
index d2a998c005..999fae047a 100644
--- a/resources/lib/oojs-ui/i18n/ckb.json
+++ b/resources/lib/oojs-ui/i18n/ckb.json
@@ -4,7 +4,8 @@
 			"Calak",
 			"Muhammed taha",
 			"Serwan",
-			"Pirehelokan"
+			"Pirehelokan",
+			"Sarchia"
 		]
 	},
 	"ooui-toolbar-more": "زیاتر",
@@ -16,5 +17,7 @@
 	"ooui-dialog-process-dismiss": "لێگەڕان",
 	"ooui-dialog-process-retry": "دیسان ھەوڵ بدە",
 	"ooui-dialog-process-continue": "درێژە بدە",
-	"ooui-selectfile-placeholder": "ھیچ فایلێک ھەڵنەبژێراوە"
+	"ooui-selectfile-button-select": "پەڕگەیەک دەستنیشان بکە",
+	"ooui-selectfile-placeholder": "ھیچ فایلێک ھەڵنەبژێراوە",
+	"ooui-selectfile-dragdrop-placeholder": "پەڕگەکان بخەرە ئێرە"
 }
diff --git a/resources/lib/oojs-ui/i18n/da.json b/resources/lib/oojs-ui/i18n/da.json
index 30e3efaed2..e193fb0a45 100644
--- a/resources/lib/oojs-ui/i18n/da.json
+++ b/resources/lib/oojs-ui/i18n/da.json
@@ -8,12 +8,18 @@
 			"Palnatoke",
 			"Simeondahl",
 			"Tehnix",
-			"Macofe"
+			"Macofe",
+			"Peter Alberti"
 		]
 	},
 	"ooui-outline-control-move-down": "Flyt ned",
 	"ooui-outline-control-move-up": "Flyt op",
 	"ooui-toolbar-more": "Mere",
 	"ooui-toolgroup-expand": "Mere",
+	"ooui-toolgroup-collapse": "Færre",
+	"ooui-dialog-message-accept": "OK",
+	"ooui-dialog-message-reject": "Afbryd",
+	"ooui-dialog-process-error": "Noget gik galt",
+	"ooui-dialog-process-retry": "Prøv igen",
 	"ooui-dialog-process-continue": "Fortsæt"
 }
diff --git a/resources/lib/oojs-ui/i18n/diq.json b/resources/lib/oojs-ui/i18n/diq.json
index 881ff67414..bf6b087337 100644
--- a/resources/lib/oojs-ui/i18n/diq.json
+++ b/resources/lib/oojs-ui/i18n/diq.json
@@ -6,11 +6,24 @@
 			"Kghbln",
 			"Marmase",
 			"Mirzali",
-			"Se4598"
+			"Se4598",
+			"Kumkumuk"
 		]
 	},
 	"ooui-outline-control-move-down": "Bendi bere cêr",
 	"ooui-outline-control-move-up": "Bendi bere cor",
 	"ooui-outline-control-remove": "Obcey wedare",
-	"ooui-toolbar-more": "Zewbi"
+	"ooui-toolbar-more": "Zewbi",
+	"ooui-toolgroup-expand": "Dehana",
+	"ooui-toolgroup-collapse": "Deha tayn",
+	"ooui-dialog-message-accept": "TEMAM",
+	"ooui-dialog-message-reject": "Bıtexelne",
+	"ooui-dialog-process-error": "Tayê çi ğelet şi...",
+	"ooui-dialog-process-dismiss": "Racın",
+	"ooui-dialog-process-retry": "Fına bıcerbın",
+	"ooui-dialog-process-continue": "Dewam ke",
+	"ooui-selectfile-button-select": "Yu dosya weçinê",
+	"ooui-selectfile-not-supported": "Dosya weçinayış desteg nêvine na",
+	"ooui-selectfile-placeholder": "Dosya nêwçineya",
+	"ooui-selectfile-dragdrop-placeholder": "Dosya tiyara ake"
 }
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js
index 6a38d0d9f6..b272331605 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-core-apex.css b/resources/lib/oojs-ui/oojs-ui-core-apex.css
index 72591ccc4a..c13ac7af93 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-element-hidden {
 	display: none !important;
@@ -16,7 +16,8 @@
 	cursor: pointer;
 	display: inline-block;
 	vertical-align: middle;
-	font: inherit;
+	font-family: inherit;
+	font-size: inherit;
 	line-height: normal;
 	white-space: nowrap;
 	-webkit-touch-callout: none;
@@ -361,8 +362,8 @@
 	color: #d45353;
 }
 .oo-ui-fieldLayout-messages .oo-ui-labelWidget {
-	padding: 0;
-	line-height: 1.875em;
+	padding: 0.1em 0;
+	line-height: 1.5em;
 	vertical-align: middle;
 }
 .oo-ui-actionFieldLayout {
@@ -932,6 +933,8 @@
 }
 .oo-ui-menuSelectWidget {
 	position: absolute;
+	width: 100%;
+	z-index: 4;
 	background-color: #ffffff;
 	margin-top: -1px;
 	border: 1px solid #cccccc;
@@ -1000,10 +1003,6 @@
 .oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle {
 	cursor: pointer;
 }
-.oo-ui-dropdownWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-dropdownWidget:last-child {
 	margin-right: 0;
 }
@@ -1054,10 +1053,6 @@
 	max-width: 50em;
 	margin-right: 0.5em;
 }
-.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator {
 	cursor: pointer;
 }
@@ -1118,3 +1113,58 @@
 .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget {
 	margin-right: 0;
 }
+.oo-ui-progressBarWidget {
+	max-width: 50em;
+	background-color: #ffffff;
+	border: 1px solid #cccccc;
+	border-radius: 0.25em;
+	overflow: hidden;
+}
+.oo-ui-progressBarWidget-bar {
+	height: 1em;
+	border-right: 1px solid #cccccc;
+	-webkit-transition: width 250ms ease, margin-left 250ms ease;
+	   -moz-transition: width 250ms ease, margin-left 250ms ease;
+	        transition: width 250ms ease, margin-left 250ms ease;
+	background-color: #cde7f4;
+	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0, #eaf4fa), color-stop(100%, #b0d9ee));
+	background-image: -webkit-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%);
+	background-image:    -moz-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%);
+	background-image:         linear-gradient(to bottom, #eaf4fa 0, #b0d9ee 100%);
+	-ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffeaf4fa', endColorstr='#ffb0d9ee' )";
+}
+.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar {
+	-webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	   -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	        animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	width: 40%;
+	margin-left: -10%;
+	border-left: 1px solid #a6cee1;
+}
+.oo-ui-progressBarWidget.oo-ui-widget-disabled {
+	opacity: 0.6;
+}
+@-webkit-keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
+@-moz-keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
+@keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index 23ecccda71..4e8f65c66c 100644
--- a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-element-hidden {
 	display: none !important;
@@ -16,7 +16,8 @@
 	cursor: pointer;
 	display: inline-block;
 	vertical-align: middle;
-	font: inherit;
+	font-family: inherit;
+	font-size: inherit;
 	line-height: normal;
 	white-space: nowrap;
 	-webkit-touch-callout: none;
@@ -62,6 +63,7 @@
 	margin-left: 0;
 }
 .oo-ui-buttonElement.oo-ui-iconElement > .oo-ui-buttonElement-button > .oo-ui-indicatorElement-indicator {
+	margin-right: 0.25em;
 	margin-left: 0.46875em;
 }
 .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button .oo-ui-indicatorElement-indicator {
@@ -185,11 +187,15 @@
 .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button {
 	background-color: #d9d9d9;
 	border-color: #d9d9d9;
-	box-shadow: none;
 }
 .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button {
 	background-color: #999999;
 	color: #ffffff;
+	border-color: #999999;
+	z-index: 3;
+}
+.oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-buttonElement-active > .oo-ui-buttonElement-button:focus {
+	border-color: #347bff;
 }
 .oo-ui-buttonElement-framed.oo-ui-widget-enabled.oo-ui-flaggedElement-progressive > .oo-ui-buttonElement-button {
 	color: #347bff;
@@ -451,8 +457,8 @@
 }
 .oo-ui-fieldLayout-messages .oo-ui-labelWidget {
 	display: table-cell;
-	padding: 0;
-	line-height: 1.875;
+	padding: 0.1em 0;
+	line-height: 1.5;
 	vertical-align: middle;
 }
 .oo-ui-actionFieldLayout {
@@ -700,6 +706,10 @@
 	border-bottom-right-radius: 2px;
 	border-top-right-radius: 2px;
 }
+.oo-ui-buttonGroupWidget.oo-ui-widget-enabled .oo-ui-buttonElement .oo-ui-buttonElement-button:focus {
+	border-color: #347bff;
+	z-index: 3;
+}
 .oo-ui-popupWidget {
 	position: absolute;
 	/* @noflip */
@@ -1225,6 +1235,8 @@
 }
 .oo-ui-menuSelectWidget {
 	position: absolute;
+	width: 100%;
+	z-index: 4;
 	background-color: #ffffff;
 	margin-top: -1px;
 	border: 1px solid #aaaaaa;
@@ -1275,7 +1287,6 @@
 	position: relative;
 	width: 100%;
 	max-width: 50em;
-	background-color: #ffffff;
 	margin-right: 0.5em;
 }
 .oo-ui-dropdownWidget-handle {
@@ -1301,10 +1312,6 @@
 .oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle {
 	cursor: pointer;
 }
-.oo-ui-dropdownWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-dropdownWidget:last-child {
 	margin-right: 0;
 }
@@ -1328,7 +1335,13 @@
 .oo-ui-dropdownWidget-handle .oo-ui-labelElement-label {
 	margin: 0 1em;
 }
-.oo-ui-dropdownWidget:hover .oo-ui-dropdownWidget-handle {
+.oo-ui-dropdownWidget.oo-ui-widget-enabled .oo-ui-dropdownWidget-handle {
+	background-color: #ffffff;
+	-webkit-transition: border-color 100ms;
+	   -moz-transition: border-color 100ms;
+	        transition: border-color 100ms;
+}
+.oo-ui-dropdownWidget.oo-ui-widget-enabled:hover .oo-ui-dropdownWidget-handle {
 	border-color: #aaaaaa;
 }
 .oo-ui-dropdownWidget.oo-ui-widget-disabled .oo-ui-dropdownWidget-handle {
@@ -1356,10 +1369,6 @@
 	max-width: 50em;
 	margin-right: 0.5em;
 }
-.oo-ui-comboBoxInputWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-comboBoxInputWidget.oo-ui-widget-enabled > .oo-ui-indicatorElement-indicator {
 	cursor: pointer;
 }
@@ -1419,3 +1428,52 @@
 .oo-ui-checkboxMultioptionWidget .oo-ui-checkboxInputWidget {
 	margin-right: 0;
 }
+.oo-ui-progressBarWidget {
+	max-width: 50em;
+	background-color: #ffffff;
+	border: 1px solid #cccccc;
+	border-radius: 2px;
+	overflow: hidden;
+}
+.oo-ui-progressBarWidget-bar {
+	background-color: #dddddd;
+	height: 1em;
+	-webkit-transition: width 200ms, margin-left 200ms;
+	   -moz-transition: width 200ms, margin-left 200ms;
+	        transition: width 200ms, margin-left 200ms;
+}
+.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar {
+	-webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	   -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	        animation: oo-ui-progressBarWidget-slide 2s infinite linear;
+	width: 40%;
+	margin-left: -10%;
+	border-left-width: 1px;
+}
+.oo-ui-progressBarWidget.oo-ui-widget-disabled {
+	opacity: 0.6;
+}
+@-webkit-keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
+@-moz-keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
+@keyframes oo-ui-progressBarWidget-slide {
+	from {
+		margin-left: -40%;
+	}
+	to {
+		margin-left: 100%;
+	}
+}
diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js
index 4d32961d66..cd1a3de0a7 100644
--- a/resources/lib/oojs-ui/oojs-ui-core.js
+++ b/resources/lib/oojs-ui/oojs-ui-core.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
@@ -2026,6 +2026,7 @@ OO.ui.mixin.ButtonElement.prototype.toggleFramed = function ( framed ) {
 OO.ui.mixin.ButtonElement.prototype.setActive = function ( value ) {
 	this.active = !!value;
 	this.$element.toggleClass( 'oo-ui-buttonElement-active', this.active );
+	this.updateThemeClasses();
 	return this;
 };
 
@@ -7325,6 +7326,103 @@ OO.ui.FloatingMenuSelectWidget.prototype.toggle = function ( visible ) {
 	return this;
 };
 
+/**
+ * Progress bars visually display the status of an operation, such as a download,
+ * and can be either determinate or indeterminate:
+ *
+ * - **determinate** process bars show the percent of an operation that is complete.
+ *
+ * - **indeterminate** process bars use a visual display of motion to indicate that an operation
+ *   is taking place. Because the extent of an indeterminate operation is unknown, the bar does
+ *   not use percentages.
+ *
+ * The value of the `progress` configuration determines whether the bar is determinate or indeterminate.
+ *
+ *     @example
+ *     // Examples of determinate and indeterminate progress bars.
+ *     var progressBar1 = new OO.ui.ProgressBarWidget( {
+ *         progress: 33
+ *     } );
+ *     var progressBar2 = new OO.ui.ProgressBarWidget();
+ *
+ *     // Create a FieldsetLayout to layout progress bars
+ *     var fieldset = new OO.ui.FieldsetLayout;
+ *     fieldset.addItems( [
+ *        new OO.ui.FieldLayout( progressBar1, {label: 'Determinate', align: 'top'}),
+ *        new OO.ui.FieldLayout( progressBar2, {label: 'Indeterminate', align: 'top'})
+ *     ] );
+ *     $( 'body' ).append( fieldset.$element );
+ *
+ * @class
+ * @extends OO.ui.Widget
+ *
+ * @constructor
+ * @param {Object} [config] Configuration options
+ * @cfg {number|boolean} [progress=false] The type of progress bar (determinate or indeterminate).
+ *  To create a determinate progress bar, specify a number that reflects the initial percent complete.
+ *  By default, the progress bar is indeterminate.
+ */
+OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) {
+	// Configuration initialization
+	config = config || {};
+
+	// Parent constructor
+	OO.ui.ProgressBarWidget.parent.call( this, config );
+
+	// Properties
+	this.$bar = $( '<div>' );
+	this.progress = null;
+
+	// Initialization
+	this.setProgress( config.progress !== undefined ? config.progress : false );
+	this.$bar.addClass( 'oo-ui-progressBarWidget-bar' );
+	this.$element
+		.attr( {
+			role: 'progressbar',
+			'aria-valuemin': 0,
+			'aria-valuemax': 100
+		} )
+		.addClass( 'oo-ui-progressBarWidget' )
+		.append( this.$bar );
+};
+
+/* Setup */
+
+OO.inheritClass( OO.ui.ProgressBarWidget, OO.ui.Widget );
+
+/* Static Properties */
+
+OO.ui.ProgressBarWidget.static.tagName = 'div';
+
+/* Methods */
+
+/**
+ * Get the percent of the progress that has been completed. Indeterminate progresses will return `false`.
+ *
+ * @return {number|boolean} Progress percent
+ */
+OO.ui.ProgressBarWidget.prototype.getProgress = function () {
+	return this.progress;
+};
+
+/**
+ * Set the percent of the process completed or `false` for an indeterminate process.
+ *
+ * @param {number|boolean} progress Progress percent or `false` for indeterminate
+ */
+OO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) {
+	this.progress = progress;
+
+	if ( progress !== false ) {
+		this.$bar.css( 'width', this.progress + '%' );
+		this.$element.attr( 'aria-valuenow', this.progress );
+	} else {
+		this.$bar.css( 'width', '' );
+		this.$element.removeAttr( 'aria-valuenow' );
+	}
+	this.$element.toggleClass( 'oo-ui-progressBarWidget-indeterminate', progress === false );
+};
+
 /**
  * InputWidget is the base class for all input widgets, which
  * include {@link OO.ui.TextInputWidget text inputs}, {@link OO.ui.CheckboxInputWidget checkbox inputs},
@@ -8590,7 +8688,8 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) {
 	// Events
 	this.$input.on( {
 		keypress: this.onKeyPress.bind( this ),
-		blur: this.onBlur.bind( this )
+		blur: this.onBlur.bind( this ),
+		focus: this.onFocus.bind( this )
 	} );
 	this.$input.one( {
 		focus: this.onElementAttach.bind( this )
@@ -8602,6 +8701,7 @@ OO.ui.TextInputWidget = function OoUiTextInputWidget( config ) {
 		change: 'onChange',
 		disable: 'onDisable'
 	} );
+	this.on( 'change', OO.ui.debounce( this.onDebouncedChange.bind( this ), 250 ) );
 
 	// Initialization
 	this.$element
@@ -8744,6 +8844,16 @@ OO.ui.TextInputWidget.prototype.onBlur = function () {
 	this.setValidityFlag();
 };
 
+/**
+ * Handle focus events.
+ *
+ * @private
+ * @param {jQuery.Event} e Focus event
+ */
+OO.ui.TextInputWidget.prototype.onFocus = function () {
+	this.setValidityFlag( true );
+};
+
 /**
  * Handle element attach events.
  *
@@ -8765,10 +8875,19 @@ OO.ui.TextInputWidget.prototype.onElementAttach = function () {
  */
 OO.ui.TextInputWidget.prototype.onChange = function () {
 	this.updateSearchIndicator();
-	this.setValidityFlag();
 	this.adjustSize();
 };
 
+/**
+ * Handle debounced change events.
+ *
+ * @param {string} value
+ * @private
+ */
+OO.ui.TextInputWidget.prototype.onDebouncedChange = function () {
+	this.setValidityFlag();
+};
+
 /**
  * Handle disable events.
  *
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index ff18605ce5..ab1e9ea4ee 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
@@ -48,9 +48,7 @@ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) {
 	if ( element.supports( [ 'hasFlag' ] ) ) {
 		isFramed = element.supports( [ 'isFramed' ] ) && element.isFramed();
 		isActive = element.supports( [ 'isActive' ] ) && element.isActive();
-		if (
-			( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) )
-		) {
+		if ( isFramed && ( isActive || element.isDisabled() || element.hasFlag( 'primary' ) ) ) {
 			// Button with a dark background, use white icon
 			variants.invert = true;
 		} else if ( !isFramed && element.isDisabled() ) {
diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
index d69ebfafa9..75fd654f19 100644
--- a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-popupTool .oo-ui-popupWidget-popup,
 .oo-ui-popupTool .oo-ui-popupWidget-anchor {
diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
index 5b60528e6c..0b55308b98 100644
--- a/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-toolbars-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-popupTool .oo-ui-popupWidget-popup,
 .oo-ui-popupTool .oo-ui-popupWidget-anchor {
@@ -93,24 +93,21 @@
 	line-height: 2.1;
 	padding: 0 0.4em;
 }
+.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > .oo-ui-tool-link .oo-ui-tool-title {
+	color: #555555;
+}
 .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:hover {
 	background-color: #eeeeee;
 }
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title {
-	color: #555555;
-}
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled {
-	box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07);
+.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active {
 	background-color: #e5e5e5;
+	box-shadow: inset 0 0.07em 0.07em 0 rgba(0, 0, 0, 0.07);
 }
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-tool-active.oo-ui-widget-enabled:hover {
+.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active:hover {
 	background-color: #eeeeee;
 }
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-tool-title {
-	color: #cccccc;
-}
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-iconElement-icon {
-	opacity: 0.2;
+.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled.oo-ui-tool-active:active {
+	background-color: #e5e5e5;
 }
 .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled > .oo-ui-tool-link .oo-ui-iconElement-icon {
 	opacity: 0.7;
@@ -118,13 +115,12 @@
 .oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:hover > .oo-ui-tool-link .oo-ui-iconElement-icon {
 	opacity: 0.9;
 }
-.oo-ui-barToolGroup.oo-ui-widget-enabled > .oo-ui-toolGroup-tools > .oo-ui-tool.oo-ui-widget-enabled:active {
-	background-color: #e7e7e7;
-}
-.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-tool-title {
+.oo-ui-barToolGroup.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-tool-title,
+.oo-ui-barToolGroup.oo-ui-widget-disabled .oo-ui-tool > .oo-ui-tool-link .oo-ui-tool-title {
 	color: #cccccc;
 }
-.oo-ui-barToolGroup.oo-ui-widget-disabled > .oo-ui-toolGroup-tools > .oo-ui-tool > a.oo-ui-tool-link .oo-ui-iconElement-icon {
+.oo-ui-barToolGroup.oo-ui-widget-enabled .oo-ui-tool.oo-ui-widget-disabled > .oo-ui-tool-link .oo-ui-iconElement-icon,
+.oo-ui-barToolGroup.oo-ui-widget-disabled .oo-ui-tool > .oo-ui-tool-link .oo-ui-iconElement-icon {
 	opacity: 0.2;
 }
 .oo-ui-popupToolGroup {
@@ -210,12 +206,6 @@
 .oo-ui-toolbar-narrow .oo-ui-popupToolGroup.oo-ui-labelElement.oo-ui-indicatorElement .oo-ui-popupToolGroup-handle .oo-ui-labelElement-label {
 	margin-right: 1.75em;
 }
-.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:hover {
-	background-color: #eeeeee;
-}
-.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:active {
-	background-color: #e5e5e5;
-}
 .oo-ui-popupToolGroup-handle {
 	padding: 0.3125em;
 	height: 2.5em;
@@ -242,6 +232,12 @@
 .oo-ui-toolbar-narrow .oo-ui-popupToolGroup-handle .oo-ui-iconElement-icon {
 	left: 0;
 }
+.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:hover {
+	background-color: #eeeeee;
+}
+.oo-ui-popupToolGroup.oo-ui-widget-enabled .oo-ui-popupToolGroup-handle:active {
+	background-color: #e5e5e5;
+}
 .oo-ui-popupToolGroup-header {
 	line-height: 2.6;
 	margin: 0 0.6em;
@@ -292,9 +288,6 @@
 .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover {
 	background-color: #eeeeee;
 }
-.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:active {
-	background-color: #e7e7e7;
-}
 .oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover .oo-ui-tool-link .oo-ui-iconElement-icon {
 	opacity: 0.9;
 }
@@ -305,20 +298,14 @@
 .oo-ui-listToolGroup .oo-ui-tool-active.oo-ui-widget-enabled:hover {
 	background-color: #eeeeee;
 }
-.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title {
-	color: #cccccc;
-}
-.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-accel {
-	color: #dddddd;
-}
-.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon {
-	opacity: 0.2;
-}
-.oo-ui-listToolGroup.oo-ui-widget-disabled {
+.oo-ui-listToolGroup.oo-ui-widget-disabled,
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-title,
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-accel {
 	color: #cccccc;
 }
 .oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator,
-.oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon {
+.oo-ui-listToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon,
+.oo-ui-listToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-iconElement-icon {
 	opacity: 0.2;
 }
 .oo-ui-menuToolGroup .oo-ui-tool {
@@ -345,17 +332,13 @@
 .oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-enabled:hover {
 	background-color: #eeeeee;
 }
-.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-tool-title {
-	color: #cccccc;
-}
-.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-link .oo-ui-iconElement-icon {
-	opacity: 0.2;
-}
-.oo-ui-menuToolGroup.oo-ui-widget-disabled {
+.oo-ui-menuToolGroup.oo-ui-widget-disabled,
+.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-tool-title {
 	color: #cccccc;
 }
 .oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-indicatorElement-indicator,
-.oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon {
+.oo-ui-menuToolGroup.oo-ui-widget-disabled .oo-ui-iconElement-icon,
+.oo-ui-menuToolGroup .oo-ui-tool.oo-ui-widget-disabled .oo-ui-iconElement-icon {
 	opacity: 0.2;
 }
 .oo-ui-toolbar {
diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js
index 5254c76c15..18fda5715d 100644
--- a/resources/lib/oojs-ui/oojs-ui-toolbars.js
+++ b/resources/lib/oojs-ui/oojs-ui-toolbars.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css
index a267b7fc29..b0e87af00b 100644
--- a/resources/lib/oojs-ui/oojs-ui-widgets-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-widgets-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-draggableElement-handle,
 .oo-ui-draggableElement-handle.oo-ui-widget {
@@ -32,10 +32,6 @@
 .oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement {
 	display: inline-block;
 }
-.oo-ui-lookupElement > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable {
 	overflow-y: hidden;
 }
@@ -195,9 +191,6 @@
 	padding: 0;
 	background-color: transparent;
 }
-.oo-ui-buttonOptionWidget .oo-ui-buttonElement-button {
-	position: relative;
-}
 .oo-ui-buttonOptionWidget.oo-ui-iconElement .oo-ui-iconElement-icon,
 .oo-ui-buttonOptionWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
 	position: static;
@@ -318,61 +311,6 @@
 	left: 2.25em;
 	margin-left: -2px;
 }
-.oo-ui-progressBarWidget {
-	max-width: 50em;
-	background-color: #ffffff;
-	border: 1px solid #cccccc;
-	border-radius: 0.25em;
-	overflow: hidden;
-}
-.oo-ui-progressBarWidget-bar {
-	height: 1em;
-	border-right: 1px solid #cccccc;
-	-webkit-transition: width 250ms ease, margin-left 250ms ease;
-	   -moz-transition: width 250ms ease, margin-left 250ms ease;
-	        transition: width 250ms ease, margin-left 250ms ease;
-	background-color: #cde7f4;
-	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0, #eaf4fa), color-stop(100%, #b0d9ee));
-	background-image: -webkit-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%);
-	background-image:    -moz-linear-gradient(top, #eaf4fa 0, #b0d9ee 100%);
-	background-image:         linear-gradient(to bottom, #eaf4fa 0, #b0d9ee 100%);
-	-ms-filter: "progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffeaf4fa', endColorstr='#ffb0d9ee' )";
-}
-.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar {
-	-webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	   -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	        animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	width: 40%;
-	margin-left: -10%;
-	border-left: 1px solid #a6cee1;
-}
-.oo-ui-progressBarWidget.oo-ui-widget-disabled {
-	opacity: 0.6;
-}
-@-webkit-keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
-@-moz-keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
-@keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
 .oo-ui-selectFileWidget {
 	display: inline-block;
 	vertical-align: middle;
@@ -414,20 +352,8 @@
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	text-overflow: ellipsis;
-}
-.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType {
-	float: right;
-}
 .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
-.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	position: absolute;
 }
 .oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
@@ -438,57 +364,68 @@
 	    -ms-user-select: none;
 	        user-select: none;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-label {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	text-overflow: ellipsis;
+}
+.oo-ui-selectFileWidget-fileType {
+	display: none;
+}
+.oo-ui-selectFileWidget-clearButton {
+	position: absolute;
 	z-index: 2;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget {
+.oo-ui-selectFileWidget-dropTarget {
+	position: relative;
 	cursor: default;
-	height: 5.5em;
-	padding: 0;
+	height: 8.815em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel,
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel,
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton,
+.oo-ui-selectFileWidget-dropTarget .oo-ui-iconElement-icon {
 	display: none;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail {
-	height: 5.5em;
-	width: 5.5em;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail {
+	width: 7.815em;
 	position: absolute;
-	background-size: cover;
+	top: 0.5em;
+	bottom: 0.5em;
+	left: 0.5em;
 	background-position: center center;
+	background-repeat: no-repeat;
+	background-size: contain;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending {
+	background-repeat: repeat;
 	background-size: auto;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon {
 	opacity: 0.4;
-	background-color: #cccccc;
-	height: 5.5em;
-	width: 5.5em;
+	height: 7.815em;
+	width: 7.815em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info {
-	border: 0;
-	background: none;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info {
 	display: block;
 	height: 100%;
 	width: auto;
-	margin-left: 5.5em;
+	margin-left: 8.815em;
+	border: 0;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	display: block;
 	position: relative;
+	top: inherit;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileName {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-fileName {
 	display: block;
+	padding-top: 0.5em;
 	padding-right: 2.375em;
-	overflow: hidden;
-	text-overflow: ellipsis;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType {
-	display: block;
-	float: none;
-}
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
-	position: absolute;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-clearButton {
 	right: 0.5em;
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail,
@@ -497,7 +434,7 @@
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton {
 	display: block;
-	margin: 0.7em;
+	margin: 2.2em 1em 1em;
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget,
 .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
@@ -528,6 +465,12 @@
 .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button {
 	cursor: no-drop;
 }
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
+	height: auto;
+}
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	padding: 1em;
+}
 .oo-ui-selectFileWidget:last-child {
 	margin-right: 0;
 }
@@ -541,100 +484,110 @@
 	border-radius: 0.25em 0 0 0.25em;
 	border-width: 1px 0 1px 1px;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
-	top: 0;
-	right: 0;
-	height: 2.3em;
-	margin-right: 0.775em;
-}
 .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	top: 0;
 	left: 0;
 	height: 2.3em;
 	margin-left: 0.3em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
+	top: 0;
+	right: 0;
+	height: 2.3em;
+	margin-right: 0.775em;
+}
+.oo-ui-selectFileWidget-label {
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	        box-sizing: border-box;
+	left: 0.5em;
+	right: 2.175em;
 	line-height: 2.3em;
 	margin: 0;
 	overflow: hidden;
 	white-space: nowrap;
-	-webkit-box-sizing: border-box;
-	   -moz-box-sizing: border-box;
-	        box-sizing: border-box;
 	text-overflow: ellipsis;
-	left: 0.5em;
-	right: 0.5em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label > .oo-ui-selectFileWidget-fileType {
+.oo-ui-selectFileWidget-fileType {
 	color: #888888;
+	display: block;
+	margin-top: 0.25em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-clearButton {
 	top: 0;
+	right: 0;
 	width: 1.875em;
 	margin-right: 0;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
 	height: 2.3em;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
-	color: #cccccc;
-	text-shadow: 0 1px 1px #ffffff;
-	border-color: #dddddd;
-	background-color: #f3f3f3;
-}
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
-	opacity: 0.2;
-}
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label {
 	color: #cccccc;
 }
-.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-label {
 	left: 2.475em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
-	right: 2.175em;
-}
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
-	right: 0;
-}
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-label {
 	right: 4.2625em;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-clearButton {
 	right: 2.0875em;
 }
-.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-label {
 	right: 0.5em;
 }
-.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
-.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label {
 	right: 2em;
 }
 .oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop.oo-ui-selectFileWidget-dropTarget {
 	background-color: #e1f3ff;
 }
-.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
-.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
-	color: #cccccc;
-	text-shadow: 0 1px 1px #ffffff;
-	border-color: #dddddd;
-	background-color: #f3f3f3;
-}
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget {
+.oo-ui-selectFileWidget-dropTarget {
 	background-color: #ffffff;
 	border: 1px solid #aaaaaa;
-	margin-bottom: 0.5em;
 	vertical-align: middle;
 	border-radius: 0.25em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
 	border-radius: 0.25em;
 }
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	line-height: 1.4;
+	overflow: inherit;
+	white-space: normal;
+}
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget {
 	border-style: dashed;
 }
+.oo-ui-selectFileWidget.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
+	background-color: #f3f3f3;
+	color: #cccccc;
+	border-color: #dddddd;
+	text-shadow: 0 1px 1px #ffffff;
+}
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info {
+	background-color: #f3f3f3;
+	color: #cccccc;
+	border-color: #dddddd;
+	text-shadow: 0 1px 1px #ffffff;
+}
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
+	opacity: 0.2;
+}
 .oo-ui-outlineOptionWidget {
 	position: relative;
 	cursor: pointer;
@@ -785,10 +738,6 @@
 .oo-ui-capsuleMultiselectWidget-group {
 	display: inline;
 }
-.oo-ui-capsuleMultiselectWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-capsuleMultiselectWidget-handle {
 	background-color: #ffffff;
 	cursor: text;
diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
index 8145ef9acd..9632bac829 100644
--- a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-draggableElement-handle,
 .oo-ui-draggableElement-handle.oo-ui-widget {
@@ -32,10 +32,6 @@
 .oo-ui-draggableGroupElement-horizontal .oo-ui-draggableElement {
 	display: inline-block;
 }
-.oo-ui-lookupElement > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-bookletLayout-stackLayout.oo-ui-stackLayout-continuous > .oo-ui-panelLayout-scrollable {
 	overflow-y: hidden;
 }
@@ -186,11 +182,6 @@
 .oo-ui-buttonSelectWidget:focus {
 	outline: 0;
 }
-.oo-ui-buttonSelectWidget:focus .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected .oo-ui-buttonElement-button {
-	border-color: #347bff;
-	box-shadow: inset 0 0 0 1px #347bff;
-	z-index: 2;
-}
 .oo-ui-buttonSelectWidget .oo-ui-buttonOptionWidget .oo-ui-buttonElement-button {
 	border-radius: 0;
 	margin-left: -1px;
@@ -204,13 +195,14 @@
 	border-bottom-right-radius: 2px;
 	border-top-right-radius: 2px;
 }
+.oo-ui-buttonSelectWidget.oo-ui-widget-enabled:focus .oo-ui-buttonOptionWidget.oo-ui-optionWidget-selected .oo-ui-buttonElement-button {
+	border-color: #347bff;
+	box-shadow: inset 0 0 0 1px #347bff;
+}
 .oo-ui-buttonOptionWidget {
 	display: inline-block;
 	padding: 0;
 }
-.oo-ui-buttonOptionWidget .oo-ui-buttonElement-button {
-	position: relative;
-}
 .oo-ui-buttonOptionWidget.oo-ui-iconElement .oo-ui-iconElement-icon,
 .oo-ui-buttonOptionWidget.oo-ui-indicatorElement .oo-ui-indicatorElement-indicator {
 	position: static;
@@ -242,8 +234,9 @@
 	   -moz-transform: translateZ(0);
 	    -ms-transform: translateZ(0);
 	        transform: translateZ(0);
-	height: 2em;
 	width: 3.5em;
+	min-height: 26px;
+	height: 2em;
 	border: 1px solid #767676;
 	border-radius: 1em;
 	background-color: #ffffff;
@@ -281,12 +274,12 @@
 	        transition: border-color 100ms;
 }
 .oo-ui-toggleSwitchWidget-grip {
-	top: 0.35em;
+	top: 0.3125em;
 	min-width: 16px;
-	width: 1.2em;
+	width: 1.25em;
 	min-height: 16px;
-	height: 1.2em;
-	border-radius: 1.2em;
+	height: 1.25em;
+	border-radius: 1.25em;
 	-webkit-transition: left 100ms, margin-left 100ms;
 	   -moz-transition: left 100ms, margin-left 100ms;
 	        transition: left 100ms, margin-left 100ms;
@@ -362,55 +355,6 @@
 .oo-ui-toggleSwitchWidget.oo-ui-widget-disabled .oo-ui-toggleSwitchWidget-grip {
 	background-color: #ffffff;
 }
-.oo-ui-progressBarWidget {
-	max-width: 50em;
-	background-color: #ffffff;
-	border: 1px solid #cccccc;
-	border-radius: 2px;
-	overflow: hidden;
-}
-.oo-ui-progressBarWidget-bar {
-	background-color: #dddddd;
-	height: 1em;
-	-webkit-transition: width 200ms, margin-left 200ms;
-	   -moz-transition: width 200ms, margin-left 200ms;
-	        transition: width 200ms, margin-left 200ms;
-}
-.oo-ui-progressBarWidget-indeterminate .oo-ui-progressBarWidget-bar {
-	-webkit-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	   -moz-animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	        animation: oo-ui-progressBarWidget-slide 2s infinite linear;
-	width: 40%;
-	margin-left: -10%;
-	border-left-width: 1px;
-}
-.oo-ui-progressBarWidget.oo-ui-widget-disabled {
-	opacity: 0.6;
-}
-@-webkit-keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
-@-moz-keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
-@keyframes oo-ui-progressBarWidget-slide {
-	from {
-		margin-left: -40%;
-	}
-	to {
-		margin-left: 100%;
-	}
-}
 .oo-ui-selectFileWidget {
 	display: inline-block;
 	vertical-align: middle;
@@ -452,20 +396,8 @@
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
-	position: absolute;
-	top: 0;
-	bottom: 0;
-	left: 0;
-	right: 0;
-	text-overflow: ellipsis;
-}
-.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType {
-	float: right;
-}
 .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
-.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	position: absolute;
 }
 .oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
@@ -476,57 +408,68 @@
 	    -ms-user-select: none;
 	        user-select: none;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-label {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	text-overflow: ellipsis;
+}
+.oo-ui-selectFileWidget-fileType {
+	display: none;
+}
+.oo-ui-selectFileWidget-clearButton {
+	position: absolute;
 	z-index: 2;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget {
+.oo-ui-selectFileWidget-dropTarget {
+	position: relative;
 	cursor: default;
-	height: 5.5em;
-	padding: 0;
+	height: 8.815em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel,
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel,
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton,
+.oo-ui-selectFileWidget-dropTarget .oo-ui-iconElement-icon {
 	display: none;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail {
-	height: 5.5em;
-	width: 5.5em;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail {
+	width: 7.815em;
 	position: absolute;
-	background-size: cover;
+	top: 0.5em;
+	bottom: 0.5em;
+	left: 0.5em;
 	background-position: center center;
+	background-repeat: no-repeat;
+	background-size: contain;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail.oo-ui-pendingElement-pending {
+	background-repeat: repeat;
 	background-size: auto;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail > .oo-ui-selectFileWidget-noThumbnail-icon {
 	opacity: 0.4;
-	background-color: #cccccc;
-	height: 5.5em;
-	width: 5.5em;
+	height: 7.815em;
+	width: 7.815em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info {
-	border: 0;
-	background: none;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info {
 	display: block;
 	height: 100%;
 	width: auto;
-	margin-left: 5.5em;
+	margin-left: 8.815em;
+	border: 0;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	display: block;
 	position: relative;
+	top: inherit;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileName {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-fileName {
 	display: block;
+	padding-top: 0.5em;
 	padding-right: 2.375em;
-	overflow: hidden;
-	text-overflow: ellipsis;
-}
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-fileType {
-	display: block;
-	float: none;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
-	position: absolute;
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-clearButton {
 	right: 0.5em;
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-thumbnail,
@@ -535,7 +478,7 @@
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton {
 	display: block;
-	margin: 0.7em;
+	margin: 2.2em 1em 1em;
 }
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget,
 .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
@@ -566,6 +509,12 @@
 .oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-buttonElement-button {
 	cursor: no-drop;
 }
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
+	height: auto;
+}
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	padding: 1em;
+}
 .oo-ui-selectFileWidget:last-child {
 	margin-right: 0;
 }
@@ -585,110 +534,101 @@
 	height: 2.3em;
 	margin-left: 0.5em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
+	top: 0;
+	right: 0;
+	height: 2.3em;
+	margin-right: 0.775em;
+}
+.oo-ui-selectFileWidget-label {
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
 	display: block;
+	right: 2.375em;
 	line-height: 2.3;
 	margin: 0;
 	overflow: hidden;
 	white-space: nowrap;
 	text-overflow: ellipsis;
-	left: 0;
-	right: 0;
 	padding-left: 0.5em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label > .oo-ui-selectFileWidget-fileType {
+.oo-ui-selectFileWidget-fileType {
 	color: #888888;
+	display: block;
+	margin-top: 0.25em;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget-clearButton {
 	top: 0;
 	right: 0;
-	height: 2.3em;
-	margin-right: 0.775em;
-}
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
-	top: 0;
 	min-width: 24px;
 	width: 1.875em;
 	margin-right: 0;
 }
-.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-clearButton .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
 	height: 2.3em;
 }
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
-	background-color: #f3f3f3;
-	color: #cccccc;
-	text-shadow: 0 1px 1px #ffffff;
-	border-color: #dddddd;
-	cursor: default;
-}
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
-	opacity: 0.2;
-}
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label {
 	color: #cccccc;
 }
-.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-label {
 	left: 2.875em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
-	right: 2.375em;
-}
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
-	right: 0;
-}
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-label {
 	right: 4.4625em;
 	padding-left: 0;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-clearButton {
 	right: 2.0875em;
 }
-.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
-	right: 0.5em;
-}
-.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
-.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-label {
 	right: 2em;
-	padding-left: 0;
 }
 .oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop.oo-ui-selectFileWidget-dropTarget {
 	background-color: #ebf2ff;
 }
-.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
-.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
-	border-color: #dddddd;
-	background-color: #f3f3f3;
-}
-.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info,
-.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-info,
-.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel,
-.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-dropLabel {
-	color: #cccccc;
-	text-shadow: 0 1px 1px #ffffff;
-}
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget {
+.oo-ui-selectFileWidget-dropTarget {
 	background-color: #ffffff;
 	border: 1px solid #cccccc;
-	margin-bottom: 0.5em;
 	vertical-align: middle;
 	overflow: hidden;
 	border-radius: 2px;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
 	border-radius: 2px;
 }
+.oo-ui-selectFileWidget-dropTarget .oo-ui-selectFileWidget-label {
+	line-height: 1.4;
+	overflow: inherit;
+	white-space: normal;
+}
 .oo-ui-selectFileWidget-empty.oo-ui-selectFileWidget-dropTarget {
 	background-color: #eeeeee;
 	border-style: dashed;
 }
+.oo-ui-selectFileWidget.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled.oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-notsupported.oo-ui-selectFileWidget-dropTarget {
+	background-color: #f3f3f3;
+	border-color: #dddddd;
+}
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info {
+	background-color: #f3f3f3;
+	color: #cccccc;
+	border-color: #dddddd;
+	text-shadow: 0 1px 1px #ffffff;
+}
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-empty.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
+	opacity: 0.2;
+}
 .oo-ui-widget-disabled .oo-ui-selectFileWidget-dropLabel {
 	display: none;
 }
@@ -838,13 +778,7 @@
 .oo-ui-capsuleMultiselectWidget-group {
 	display: inline;
 }
-.oo-ui-capsuleMultiselectWidget > .oo-ui-menuSelectWidget {
-	z-index: 1;
-	width: 100%;
-}
 .oo-ui-capsuleMultiselectWidget-handle {
-	background-color: #ffffff;
-	cursor: text;
 	min-height: 2.4em;
 	margin-right: 0.5em;
 	padding: 0.15em 0.25em;
@@ -891,7 +825,14 @@
 	top: 0;
 	margin: 0.3em;
 }
-.oo-ui-capsuleMultiselectWidget:hover .oo-ui-capsuleMultiselectWidget-handle {
+.oo-ui-capsuleMultiselectWidget.oo-ui-widget-enabled .oo-ui-capsuleMultiselectWidget-handle {
+	background-color: #ffffff;
+	cursor: text;
+	-webkit-transition: border-color 100ms;
+	   -moz-transition: border-color 100ms;
+	        transition: border-color 100ms;
+}
+.oo-ui-capsuleMultiselectWidget.oo-ui-widget-enabled:hover .oo-ui-capsuleMultiselectWidget-handle {
 	border-color: #aaaaaa;
 }
 .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle {
@@ -899,7 +840,6 @@
 	text-shadow: 0 1px 1px #ffffff;
 	border-color: #dddddd;
 	background-color: #f3f3f3;
-	cursor: default;
 }
 .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle > .oo-ui-iconElement-icon,
 .oo-ui-capsuleMultiselectWidget.oo-ui-widget-disabled .oo-ui-capsuleMultiselectWidget-handle > .oo-ui-indicatorElement-indicator {
diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js
index cd62339005..7a386331fc 100644
--- a/resources/lib/oojs-ui/oojs-ui-widgets.js
+++ b/resources/lib/oojs-ui/oojs-ui-widgets.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
@@ -4770,103 +4770,6 @@ OO.ui.SelectFileWidget.prototype.setDisabled = function ( disabled ) {
 	return this;
 };
 
-/**
- * Progress bars visually display the status of an operation, such as a download,
- * and can be either determinate or indeterminate:
- *
- * - **determinate** process bars show the percent of an operation that is complete.
- *
- * - **indeterminate** process bars use a visual display of motion to indicate that an operation
- *   is taking place. Because the extent of an indeterminate operation is unknown, the bar does
- *   not use percentages.
- *
- * The value of the `progress` configuration determines whether the bar is determinate or indeterminate.
- *
- *     @example
- *     // Examples of determinate and indeterminate progress bars.
- *     var progressBar1 = new OO.ui.ProgressBarWidget( {
- *         progress: 33
- *     } );
- *     var progressBar2 = new OO.ui.ProgressBarWidget();
- *
- *     // Create a FieldsetLayout to layout progress bars
- *     var fieldset = new OO.ui.FieldsetLayout;
- *     fieldset.addItems( [
- *        new OO.ui.FieldLayout( progressBar1, {label: 'Determinate', align: 'top'}),
- *        new OO.ui.FieldLayout( progressBar2, {label: 'Indeterminate', align: 'top'})
- *     ] );
- *     $( 'body' ).append( fieldset.$element );
- *
- * @class
- * @extends OO.ui.Widget
- *
- * @constructor
- * @param {Object} [config] Configuration options
- * @cfg {number|boolean} [progress=false] The type of progress bar (determinate or indeterminate).
- *  To create a determinate progress bar, specify a number that reflects the initial percent complete.
- *  By default, the progress bar is indeterminate.
- */
-OO.ui.ProgressBarWidget = function OoUiProgressBarWidget( config ) {
-	// Configuration initialization
-	config = config || {};
-
-	// Parent constructor
-	OO.ui.ProgressBarWidget.parent.call( this, config );
-
-	// Properties
-	this.$bar = $( '<div>' );
-	this.progress = null;
-
-	// Initialization
-	this.setProgress( config.progress !== undefined ? config.progress : false );
-	this.$bar.addClass( 'oo-ui-progressBarWidget-bar' );
-	this.$element
-		.attr( {
-			role: 'progressbar',
-			'aria-valuemin': 0,
-			'aria-valuemax': 100
-		} )
-		.addClass( 'oo-ui-progressBarWidget' )
-		.append( this.$bar );
-};
-
-/* Setup */
-
-OO.inheritClass( OO.ui.ProgressBarWidget, OO.ui.Widget );
-
-/* Static Properties */
-
-OO.ui.ProgressBarWidget.static.tagName = 'div';
-
-/* Methods */
-
-/**
- * Get the percent of the progress that has been completed. Indeterminate progresses will return `false`.
- *
- * @return {number|boolean} Progress percent
- */
-OO.ui.ProgressBarWidget.prototype.getProgress = function () {
-	return this.progress;
-};
-
-/**
- * Set the percent of the process completed or `false` for an indeterminate process.
- *
- * @param {number|boolean} progress Progress percent or `false` for indeterminate
- */
-OO.ui.ProgressBarWidget.prototype.setProgress = function ( progress ) {
-	this.progress = progress;
-
-	if ( progress !== false ) {
-		this.$bar.css( 'width', this.progress + '%' );
-		this.$element.attr( 'aria-valuenow', this.progress );
-	} else {
-		this.$bar.css( 'width', '' );
-		this.$element.removeAttr( 'aria-valuenow' );
-	}
-	this.$element.toggleClass( 'oo-ui-progressBarWidget-indeterminate', !progress );
-};
-
 /**
  * SearchWidgets combine a {@link OO.ui.TextInputWidget text input field}, where users can type a search query,
  * and a menu of search results, which is displayed beneath the query
diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css
index 55f891a23c..2f6c1a020b 100644
--- a/resources/lib/oojs-ui/oojs-ui-windows-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-windows-apex.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-actionWidget.oo-ui-pendingElement-pending {
 	background-image: /* @embed */ url(themes/apex/images/textures/pending.gif);
@@ -345,6 +345,7 @@
 	width: 0;
 	height: 0;
 	overflow: hidden;
+	z-index: 4;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-active {
 	width: auto;
diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
index 0d3976fcce..465e17bdf5 100644
--- a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:27Z
+ * Date: 2016-08-16T21:13:53Z
  */
 .oo-ui-window {
 	background: transparent;
@@ -320,6 +320,7 @@
 	width: 0;
 	height: 0;
 	overflow: hidden;
+	z-index: 4;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-active {
 	width: auto;
diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js
index 0e9dbf19fa..510399dc63 100644
--- a/resources/lib/oojs-ui/oojs-ui-windows.js
+++ b/resources/lib/oojs-ui/oojs-ui-windows.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.17.7
+ * OOjs UI v0.17.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2016 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2016-08-03T16:38:22Z
+ * Date: 2016-08-16T21:13:48Z
  */
 ( function ( OO ) {
 
diff --git a/resources/src/jquery/jquery.makeCollapsible.js b/resources/src/jquery/jquery.makeCollapsible.js
index 501e898ebd..ac60e8f435 100644
--- a/resources/src/jquery/jquery.makeCollapsible.js
+++ b/resources/src/jquery/jquery.makeCollapsible.js
@@ -347,7 +347,8 @@
 					}
 
 				} else if ( $collapsible.parent().is( 'li' ) &&
-					$collapsible.parent().children( '.mw-collapsible' ).size() === 1
+					$collapsible.parent().children( '.mw-collapsible' ).length === 1 &&
+					$collapsible.find( '> .mw-collapsible-toggle' ).length === 0
 				) {
 					// special case of one collapsible in <li> tag
 					$toggleLink = buildDefaultToggleLink();
diff --git a/resources/src/mediawiki.skinning/content.css b/resources/src/mediawiki.skinning/content.css
index 563db0098d..d9cdf5a67f 100644
--- a/resources/src/mediawiki.skinning/content.css
+++ b/resources/src/mediawiki.skinning/content.css
@@ -254,8 +254,9 @@ div.tleft {
 	margin: .5em 1.4em 1.3em 0;
 }
 
-/* Hide elements that are marked as "empty" according to legacy Tidy rules
+/* Hide elements that are marked as "empty" according to legacy Tidy rules,
+ * except if a client script removes the mw-hide-empty-elt class from the body
  */
-.mw-empty-elt, .mw-empty-li {
+body.mw-hide-empty-elt .mw-empty-elt {
 	display: none;
 }
diff --git a/resources/src/mediawiki.special/mediawiki.special.movePage.js b/resources/src/mediawiki.special/mediawiki.special.movePage.js
index 6d88c51c5a..9af81b8e94 100644
--- a/resources/src/mediawiki.special/mediawiki.special.movePage.js
+++ b/resources/src/mediawiki.special/mediawiki.special.movePage.js
@@ -2,6 +2,10 @@
  * JavaScript for Special:MovePage
  */
 jQuery( function () {
+	// Infuse for pretty dropdown
 	OO.ui.infuse( 'wpNewTitle' );
+	// Limit to 255 bytes, not characters
 	OO.ui.infuse( 'wpReason' ).$input.byteLimit();
+	// Infuse for nicer "help" popup
+	OO.ui.infuse( 'wpMovetalk-field' );
 } );
diff --git a/resources/src/mediawiki.ui/components/icons.less b/resources/src/mediawiki.ui/components/icons.less
index 9b9d32470d..0035601697 100644
--- a/resources/src/mediawiki.ui/components/icons.less
+++ b/resources/src/mediawiki.ui/components/icons.less
@@ -26,14 +26,15 @@
 
 .mw-ui-icon {
 	position: relative;
+	line-height: @iconSize;
 	min-height: @iconSize;
 	min-width: @iconSize;
 
 	// Standalone icons
 	//
 	// Markup:
-	// <div class="mw-ui-icon mw-ui-icon-element mw-ui-icon-ok">OK</div><br/>
-	// <div class="mw-ui-icon mw-ui-icon-element mw-ui-icon-ok mw-ui-button mw-ui-progressive">OK</div><br/>
+	// <div class="mw-ui-icon mw-ui-icon-element mw-ui-icon-ok">OK</div><br>
+	// <div class="mw-ui-icon mw-ui-icon-element mw-ui-icon-ok mw-ui-button mw-ui-progressive">OK</div><br>
 	// <button class="mw-ui-icon mw-ui-icon-ok mw-ui-icon-element mw-ui-button mw-ui-quiet" title="">Close</button>
 	//
 	// Styleguide 6.1.1.
@@ -79,4 +80,14 @@
 			margin-right: @iconGutterWidth;
 		}
 	}
-}
+
+	// Icons small for elements like indicators
+	//
+	// Markup:
+	// <div class="mw-ui-icon mw-ui-icon-small mw-ui-icon-help"></div>
+	//
+	// Styleguide 6.1.3
+	&.mw-ui-icon-small:before {
+		background-size: 66.67% auto; // 66.67% of 24px equals 16px
+	}
+}
\ No newline at end of file
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
index 0bdf02e877..946823d119 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategoryCapsuleItemWidget.js
@@ -55,6 +55,10 @@
 			$.each( response.query.pages, function ( index, page ) {
 				var title = new ForeignTitle( page.title ).getPrefixedText();
 				cache.existenceCache[ title ] = !page.missing;
+				if ( !queue[ title ] ) {
+					// Debugging for T139130
+					throw new Error( 'No queue for "' + title + '", requested "' + titles.join( '|' ) + '"' );
+				}
 				queue[ title ].resolve( cache.existenceCache[ title ] );
 			} );
 		} );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 7b7ef3dc74..86018a4498 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -75,6 +75,10 @@
 		border-radius: 0.1em;
 		line-height: 1.275em;
 		background-color: #fff;
+
+		> .oo-ui-labelElement-label {
+			padding: 0;
+		}
 	}
 
 	&.oo-ui-indicatorElement .mw-widget-dateInputWidget-handle > .oo-ui-indicatorElement-indicator {
diff --git a/resources/src/mediawiki/htmlform/autocomplete.js b/resources/src/mediawiki/htmlform/autocomplete.js
new file mode 100644
index 0000000000..8157975560
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/autocomplete.js
@@ -0,0 +1,25 @@
+/*
+ * HTMLForm enhancements:
+ * Set up autocomplete fields.
+ */
+( function ( mw, $ ) {
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		var $autocomplete = $root.find( '.mw-htmlform-autocomplete' );
+		if ( $autocomplete.length ) {
+			mw.loader.using( 'jquery.suggestions', function () {
+				$autocomplete.suggestions( {
+					fetch: function ( val ) {
+						var $el = $( this );
+						$el.suggestions( 'suggestions',
+							$.grep( $el.data( 'autocomplete' ), function ( v ) {
+								return v.indexOf( val ) === 0;
+							} )
+						);
+					}
+				} );
+			} );
+		}
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/autoinfuse.js b/resources/src/mediawiki/htmlform/autoinfuse.js
new file mode 100644
index 0000000000..f2e0f4dd2c
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/autoinfuse.js
@@ -0,0 +1,32 @@
+/*
+ * HTMLForm enhancements:
+ * Infuse some OOjs UI HTMLForm fields (those which benefit from always being infused).
+ */
+( function ( mw, $ ) {
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		var $oouiNodes, modules, extraModules;
+
+		$oouiNodes = $root.find( '.mw-htmlform-field-autoinfuse' );
+		if ( $oouiNodes.length ) {
+			// The modules are preloaded (added server-side in HTMLFormField, and the individual fields
+			// which need extra ones), but this module doesn't depend on them. Wait until they're loaded.
+			modules = [ 'mediawiki.htmlform.ooui' ];
+			$oouiNodes.each( function () {
+				var data = $( this ).data( 'mw-modules' );
+				if ( data ) {
+					// We can trust this value, 'data-mw-*' attributes are banned from user content in Sanitizer
+					extraModules = data.split( ',' );
+					modules.push.apply( modules, extraModules );
+				}
+			} );
+			mw.loader.using( modules ).done( function () {
+				$oouiNodes.each( function () {
+					OO.ui.infuse( this );
+				} );
+			} );
+		}
+
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/checkmatrix.js b/resources/src/mediawiki/htmlform/checkmatrix.js
new file mode 100644
index 0000000000..b825f12b98
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/checkmatrix.js
@@ -0,0 +1,16 @@
+/*
+ * HTMLForm enhancements:
+ * Show fancy tooltips for checkmatrix fields.
+ */
+( function ( mw ) {
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		var $matrixTooltips = $root.find( '.mw-htmlform-matrix .mw-htmlform-tooltip' );
+		if ( $matrixTooltips.length ) {
+			mw.loader.using( 'jquery.tipsy', function () {
+				$matrixTooltips.tipsy( { gravity: 's' } );
+			} );
+		}
+	} );
+
+}( mediaWiki ) );
diff --git a/resources/src/mediawiki/htmlform/cloner.js b/resources/src/mediawiki/htmlform/cloner.js
new file mode 100644
index 0000000000..ab81580bee
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/cloner.js
@@ -0,0 +1,36 @@
+/*
+ * HTMLForm enhancements:
+ * Add/remove cloner clones without having to resubmit the form.
+ */
+( function ( mw, $ ) {
+
+	var cloneCounter = 0;
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		$root.find( '.mw-htmlform-cloner-delete-button' ).filter( ':input' ).click( function ( ev ) {
+			ev.preventDefault();
+			$( this ).closest( 'li.mw-htmlform-cloner-li' ).remove();
+		} );
+
+		$root.find( '.mw-htmlform-cloner-create-button' ).filter( ':input' ).click( function ( ev ) {
+			var $ul, $li, html;
+
+			ev.preventDefault();
+
+			$ul = $( this ).prev( 'ul.mw-htmlform-cloner-ul' );
+
+			html = $ul.data( 'template' ).replace(
+				new RegExp( mw.RegExp.escape( $ul.data( 'uniqueId' ) ), 'g' ),
+				'clone' + ( ++cloneCounter )
+			);
+
+			$li = $( '<li>' )
+				.addClass( 'mw-htmlform-cloner-li' )
+				.html( html )
+				.appendTo( $ul );
+
+			mw.hook( 'htmlform.enhance' ).fire( $li );
+		} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/hide-if.js b/resources/src/mediawiki/htmlform/hide-if.js
new file mode 100644
index 0000000000..cb717afad5
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/hide-if.js
@@ -0,0 +1,252 @@
+/*
+ * HTMLForm enhancements:
+ * Set up 'hide-if' behaviors for form fields that have them.
+ */
+( function ( mw, $ ) {
+
+	/*jshint -W024*/
+
+	/**
+	 * Helper function for hide-if to find the nearby form field.
+	 *
+	 * Find the closest match for the given name, "closest" being the minimum
+	 * level of parents to go to find a form field matching the given name or
+	 * ending in array keys matching the given name (e.g. "baz" matches
+	 * "foo[bar][baz]").
+	 *
+	 * @ignore
+	 * @private
+	 * @param {jQuery} $el
+	 * @param {string} name
+	 * @return {jQuery|OO.ui.Widget|null}
+	 */
+	function hideIfGetField( $el, name ) {
+		var $found, $p, $widget,
+			suffix = name.replace( /^([^\[]+)/, '[$1]' );
+
+		function nameFilter() {
+			return this.name === name ||
+				( this.name === ( 'wp' + name ) ) ||
+				this.name.slice( -suffix.length ) === suffix;
+		}
+
+		for ( $p = $el.parent(); $p.length > 0; $p = $p.parent() ) {
+			$found = $p.find( '[name]' ).filter( nameFilter );
+			if ( $found.length ) {
+				$widget = $found.closest( '.oo-ui-widget[data-ooui]' );
+				if ( $widget.length ) {
+					return OO.ui.Widget.static.infuse( $widget );
+				}
+				return $found;
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Helper function for hide-if to return a test function and list of
+	 * dependent fields for a hide-if specification.
+	 *
+	 * @ignore
+	 * @private
+	 * @param {jQuery} $el
+	 * @param {Array} spec
+	 * @return {Array}
+	 * @return {Array} return.0 Dependent fields, array of jQuery objects or OO.ui.Widgets
+	 * @return {Function} return.1 Test function
+	 */
+	function hideIfParse( $el, spec ) {
+		var op, i, l, v, field, $field, fields, func, funcs, getVal;
+
+		op = spec[ 0 ];
+		l = spec.length;
+		switch ( op ) {
+			case 'AND':
+			case 'OR':
+			case 'NAND':
+			case 'NOR':
+				funcs = [];
+				fields = [];
+				for ( i = 1; i < l; i++ ) {
+					if ( !$.isArray( spec[ i ] ) ) {
+						throw new Error( op + ' parameters must be arrays' );
+					}
+					v = hideIfParse( $el, spec[ i ] );
+					fields = fields.concat( v[ 0 ] );
+					funcs.push( v[ 1 ] );
+				}
+
+				l = funcs.length;
+				switch ( op ) {
+					case 'AND':
+						func = function () {
+							var i;
+							for ( i = 0; i < l; i++ ) {
+								if ( !funcs[ i ]() ) {
+									return false;
+								}
+							}
+							return true;
+						};
+						break;
+
+					case 'OR':
+						func = function () {
+							var i;
+							for ( i = 0; i < l; i++ ) {
+								if ( funcs[ i ]() ) {
+									return true;
+								}
+							}
+							return false;
+						};
+						break;
+
+					case 'NAND':
+						func = function () {
+							var i;
+							for ( i = 0; i < l; i++ ) {
+								if ( !funcs[ i ]() ) {
+									return true;
+								}
+							}
+							return false;
+						};
+						break;
+
+					case 'NOR':
+						func = function () {
+							var i;
+							for ( i = 0; i < l; i++ ) {
+								if ( funcs[ i ]() ) {
+									return false;
+								}
+							}
+							return true;
+						};
+						break;
+				}
+
+				return [ fields, func ];
+
+			case 'NOT':
+				if ( l !== 2 ) {
+					throw new Error( 'NOT takes exactly one parameter' );
+				}
+				if ( !$.isArray( spec[ 1 ] ) ) {
+					throw new Error( 'NOT parameters must be arrays' );
+				}
+				v = hideIfParse( $el, spec[ 1 ] );
+				fields = v[ 0 ];
+				func = v[ 1 ];
+				return [ fields, function () {
+					return !func();
+				} ];
+
+			case '===':
+			case '!==':
+				if ( l !== 3 ) {
+					throw new Error( op + ' takes exactly two parameters' );
+				}
+				field = hideIfGetField( $el, spec[ 1 ] );
+				if ( !field ) {
+					return [ [], function () {
+						return false;
+					} ];
+				}
+				v = spec[ 2 ];
+
+				if ( field instanceof OO.ui.Widget ) {
+					if ( field.supports( 'isSelected' ) ) {
+						getVal = function () {
+							var selected = field.isSelected();
+							return selected ? field.getValue() : '';
+						};
+					} else {
+						getVal = function () {
+							return field.getValue();
+						};
+					}
+				} else {
+					$field = $( field );
+					if ( $field.prop( 'type' ) === 'radio' || $field.prop( 'type' ) === 'checkbox' ) {
+						getVal = function () {
+							var $selected = $field.filter( ':checked' );
+							return $selected.length ? $selected.val() : '';
+						};
+					} else {
+						getVal = function () {
+							return $field.val();
+						};
+					}
+				}
+
+				switch ( op ) {
+					case '===':
+						func = function () {
+							return getVal() === v;
+						};
+						break;
+					case '!==':
+						func = function () {
+							return getVal() !== v;
+						};
+						break;
+				}
+
+				return [ [ field ], func ];
+
+			default:
+				throw new Error( 'Unrecognized operation \'' + op + '\'' );
+		}
+	}
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		$root.find( '.mw-htmlform-hide-if' ).each( function () {
+			var v, i, fields, test, func, spec, self, modules, data,extraModules,
+				$el = $( this );
+
+			modules = [];
+			if ( $el.is( '[data-ooui]' ) ) {
+				modules.push( 'mediawiki.htmlform.ooui' );
+				data = $el.data( 'mw-modules' );
+				if ( data ) {
+					// We can trust this value, 'data-mw-*' attributes are banned from user content in Sanitizer
+					extraModules = data.split( ',' );
+					modules.push.apply( modules, extraModules );
+				}
+			}
+
+			mw.loader.using( modules ).done( function () {
+				if ( $el.is( '[data-ooui]' ) ) {
+					// self should be a FieldLayout that mixes in mw.htmlform.Element
+					self = OO.ui.FieldLayout.static.infuse( $el );
+					spec = self.hideIf;
+					// The original element has been replaced with infused one
+					$el = self.$element;
+				} else {
+					self = $el;
+					spec = $el.data( 'hideIf' );
+				}
+
+				if ( !spec ) {
+					return;
+				}
+
+				v = hideIfParse( $el, spec );
+				fields = v[ 0 ];
+				test = v[ 1 ];
+				// The .toggle() method works mostly the same for jQuery objects and OO.ui.Widget
+				func = function () {
+					self.toggle( !test() );
+				};
+				for ( i = 0; i < fields.length; i++ ) {
+					// The .on() method works mostly the same for jQuery objects and OO.ui.Widget
+					fields[ i ].on( 'change', func );
+				}
+				func();
+			} );
+		} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/htmlform.Element.js b/resources/src/mediawiki/htmlform/htmlform.Element.js
new file mode 100644
index 0000000000..37474f6833
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/htmlform.Element.js
@@ -0,0 +1,45 @@
+( function ( mw ) {
+
+	mw.htmlform = {};
+
+	/**
+	 * Allows custom data specific to HTMLFormField to be set for OOjs UI forms. This picks up the
+	 * extra config from a matching PHP widget (defined in HTMLFormElement.php) when constructed using
+	 * OO.ui.infuse().
+	 *
+	 * Currently only supports passing 'hide-if' data.
+	 *
+	 * @ignore
+	 */
+	mw.htmlform.Element = function ( config ) {
+		// Configuration initialization
+		config = config || {};
+
+		// Properties
+		this.hideIf = config.hideIf;
+
+		// Initialization
+		if ( this.hideIf ) {
+			this.$element.addClass( 'mw-htmlform-hide-if' );
+		}
+	};
+
+	mw.htmlform.FieldLayout = function ( config ) {
+		// Parent constructor
+		mw.htmlform.FieldLayout.parent.call( this, config );
+		// Mixin constructors
+		mw.htmlform.Element.call( this, config );
+	};
+	OO.inheritClass( mw.htmlform.FieldLayout, OO.ui.FieldLayout );
+	OO.mixinClass( mw.htmlform.FieldLayout, mw.htmlform.Element );
+
+	mw.htmlform.ActionFieldLayout = function ( config ) {
+		// Parent constructor
+		mw.htmlform.ActionFieldLayout.parent.call( this, config );
+		// Mixin constructors
+		mw.htmlform.Element.call( this, config );
+	};
+	OO.inheritClass( mw.htmlform.ActionFieldLayout, OO.ui.ActionFieldLayout );
+	OO.mixinClass( mw.htmlform.ActionFieldLayout, mw.htmlform.Element );
+
+}( mediaWiki ) );
diff --git a/resources/src/mediawiki/htmlform/htmlform.js b/resources/src/mediawiki/htmlform/htmlform.js
new file mode 100644
index 0000000000..19f8f3ece5
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/htmlform.js
@@ -0,0 +1,7 @@
+( function ( mw, $ ) {
+
+	$( function () {
+		mw.hook( 'htmlform.enhance' ).fire( $( document ) );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/images/question.png b/resources/src/mediawiki/htmlform/images/question.png
new file mode 100644
index 0000000000..acce58c8ce
Binary files /dev/null and b/resources/src/mediawiki/htmlform/images/question.png differ
diff --git a/resources/src/mediawiki/htmlform/images/question.svg b/resources/src/mediawiki/htmlform/images/question.svg
new file mode 100644
index 0000000000..98fbe8dd75
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/images/question.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="21.059" height="21.06"><path fill="#575757" d="M10.529 0c-5.814 0-10.529 4.714-10.529 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53s-4.712-10.529-10.529-10.529zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5h-2.205v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638l-1.051-1.807c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/></svg>
\ No newline at end of file
diff --git a/resources/src/mediawiki/htmlform/multiselect.js b/resources/src/mediawiki/htmlform/multiselect.js
new file mode 100644
index 0000000000..a8786efa5b
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/multiselect.js
@@ -0,0 +1,67 @@
+/*
+ * HTMLForm enhancements:
+ * Convert multiselect fields from checkboxes to Chosen selector when requested.
+ */
+( function ( mw, $ ) {
+
+	function addMulti( $oldContainer, $container ) {
+		var name = $oldContainer.find( 'input:first-child' ).attr( 'name' ),
+			oldClass = ( ' ' + $oldContainer.attr( 'class' ) + ' ' ).replace( /(mw-htmlform-field-HTMLMultiSelectField|mw-chosen|mw-htmlform-dropdown)/g, '' ),
+			$select = $( '<select>' ),
+			dataPlaceholder = mw.message( 'htmlform-chosen-placeholder' );
+		oldClass = $.trim( oldClass );
+		$select.attr( {
+			name: name,
+			multiple: 'multiple',
+			'data-placeholder': dataPlaceholder.plain(),
+			'class': 'htmlform-chzn-select mw-input ' + oldClass
+		} );
+		$oldContainer.find( 'input' ).each( function () {
+			var $oldInput = $( this ),
+			checked = $oldInput.prop( 'checked' ),
+			$option = $( '<option>' );
+			$option.prop( 'value', $oldInput.prop( 'value' ) );
+			if ( checked ) {
+				$option.prop( 'selected', true );
+			}
+			$option.text( $oldInput.prop( 'value' ) );
+			$select.append( $option );
+		} );
+		$container.append( $select );
+	}
+
+	function convertCheckboxesToMulti( $oldContainer, type ) {
+		var $fieldLabel = $( '<td>' ),
+		$td = $( '<td>' ),
+		$fieldLabelText = $( '<label>' ),
+		$container;
+		if ( type === 'tr' ) {
+			addMulti( $oldContainer, $td );
+			$container = $( '<tr>' );
+			$container.append( $td );
+		} else if ( type === 'div' ) {
+			$fieldLabel = $( '<div>' );
+			$container = $( '<div>' );
+			addMulti( $oldContainer, $container );
+		}
+		$fieldLabel.attr( 'class', 'mw-label' );
+		$fieldLabelText.text( $oldContainer.find( '.mw-label label' ).text() );
+		$fieldLabel.append( $fieldLabelText );
+		$container.prepend( $fieldLabel );
+		$oldContainer.replaceWith( $container );
+		return $container;
+	}
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		if ( $root.find( '.mw-htmlform-dropdown' ).length ) {
+			mw.loader.using( 'jquery.chosen', function () {
+				$root.find( '.mw-htmlform-dropdown' ).each( function () {
+					var type = this.nodeName.toLowerCase(),
+						$converted = convertCheckboxesToMulti( $( this ), type );
+					$converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } );
+				} );
+			} );
+		}
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/ooui.styles.css b/resources/src/mediawiki/htmlform/ooui.styles.css
new file mode 100644
index 0000000000..a9e75d7163
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/ooui.styles.css
@@ -0,0 +1,29 @@
+/* OOUIHTMLForm styles */
+
+.mw-htmlform-ooui-wrapper {
+	margin: 1em 0;
+}
+
+.mw-htmlform-ooui .mw-htmlform-submit-buttons {
+	margin-top: 1em;
+}
+
+.mw-htmlform-ooui .mw-htmlform-field-HTMLCheckMatrix,
+.mw-htmlform-ooui .mw-htmlform-matrix,
+.mw-htmlform-ooui .mw-htmlform-matrix tr {
+	width: 100%;
+}
+
+.mw-htmlform-ooui .mw-htmlform-matrix tr td.first {
+	margin-right: 5%;
+	width: 39%;
+}
+
+/* Flatlist styling for PHP widgets... */
+.mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline,
+/* ...and for JS widgets */
+.mw-htmlform-flatlist .oo-ui-optionWidget,
+.mw-htmlform-flatlist .oo-ui-multioptionWidget {
+	display: inline-block;
+	margin-right: 1em;
+}
diff --git a/resources/src/mediawiki/htmlform/selectandother.js b/resources/src/mediawiki/htmlform/selectandother.js
new file mode 100644
index 0000000000..95227d0194
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/selectandother.js
@@ -0,0 +1,41 @@
+/*
+ * HTMLForm enhancements:
+ * Add a dynamic max length to the reason field of SelectAndOther.
+ */
+( function ( mw, $ ) {
+
+	// cache the separator to avoid object creation on each keypress
+	var colonSeparator = mw.message( 'colon-separator' ).text();
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		// This checks the length together with the value from the select field
+		// When the reason list is changed and the bytelimit is longer than the allowed,
+		// nothing is done
+		$root
+			.find( '.mw-htmlform-select-and-other-field' )
+			.each( function () {
+				var $this = $( this ),
+					// find the reason list
+					$reasonList = $root.find( '#' + $this.data( 'id-select' ) ),
+					// cache the current selection to avoid expensive lookup
+					currentValReasonList = $reasonList.val();
+
+				$reasonList.change( function () {
+					currentValReasonList = $reasonList.val();
+				} );
+
+				$this.byteLimit( function ( input ) {
+					// Should be built the same as in HTMLSelectAndOtherField::loadDataFromRequest
+					var comment = currentValReasonList;
+					if ( comment === 'other' ) {
+						comment = input;
+					} else if ( input !== '' ) {
+						// Entry from drop down menu + additional comment
+						comment += colonSeparator + input;
+					}
+					return comment;
+				} );
+			} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/selectorother.js b/resources/src/mediawiki/htmlform/selectorother.js
new file mode 100644
index 0000000000..66879e9e14
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/selectorother.js
@@ -0,0 +1,61 @@
+/*
+ * HTMLForm enhancements:
+ * Animate the SelectOrOther fields, to only show the text field when 'other' is selected.
+ */
+( function ( mw, $ ) {
+
+	/**
+	 * @class jQuery.plugin.htmlform
+	 */
+
+	/**
+	 * jQuery plugin to fade or snap to visible state.
+	 *
+	 * @param {boolean} [instantToggle=false]
+	 * @return {jQuery}
+	 * @chainable
+	 */
+	$.fn.goIn = function ( instantToggle ) {
+		if ( instantToggle === true ) {
+			return this.show();
+		}
+		return this.stop( true, true ).fadeIn();
+	};
+
+	/**
+	 * jQuery plugin to fade or snap to hiding state.
+	 *
+	 * @param {boolean} [instantToggle=false]
+	 * @return {jQuery}
+	 * @chainable
+	 */
+	$.fn.goOut = function ( instantToggle ) {
+		if ( instantToggle === true ) {
+			return this.hide();
+		}
+		return this.stop( true, true ).fadeOut();
+	};
+
+	mw.hook( 'htmlform.enhance' ).add( function ( $root ) {
+		/**
+		 * @ignore
+		 * @param {boolean|jQuery.Event} instant
+		 */
+		function handleSelectOrOther( instant ) {
+			var $other = $root.find( '#' + $( this ).attr( 'id' ) + '-other' );
+			$other = $other.add( $other.siblings( 'br' ) );
+			if ( $( this ).val() === 'other' ) {
+				$other.goIn( instant );
+			} else {
+				$other.goOut( instant );
+			}
+		}
+
+		$root
+			.on( 'change', '.mw-htmlform-select-or-other', handleSelectOrOther )
+			.each( function () {
+				handleSelectOrOther.call( this, true );
+			} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/htmlform/styles.css b/resources/src/mediawiki/htmlform/styles.css
new file mode 100644
index 0000000000..1603130f40
--- /dev/null
+++ b/resources/src/mediawiki/htmlform/styles.css
@@ -0,0 +1,49 @@
+/* HTMLForm styles */
+
+table.mw-htmlform-nolabel td.mw-label {
+	display: none;
+}
+
+.mw-htmlform-invalid-input td.mw-input input {
+	border-color: #f00;
+}
+
+.mw-htmlform-flatlist div.mw-htmlform-flatlist-item {
+	display: inline;
+	margin-right: 1em;
+	white-space: nowrap;
+}
+
+/* HTMLCheckMatrix */
+
+.mw-htmlform-matrix td {
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+
+tr.mw-htmlform-vertical-label td.mw-label {
+	text-align: left !important;
+}
+
+.mw-icon-question {
+	/* SVG support using a transparent gradient to guarantee cross-browser
+	 * compatibility (browsers able to understand gradient syntax support also SVG).
+	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
+	background-image: url( images/question.png );
+	/* @embed */
+	background-image: linear-gradient( transparent, transparent ), url( images/question.svg );
+	background-repeat: no-repeat;
+	background-size: 13px 13px;
+	display: inline-block;
+	height: 13px;
+	width: 13px;
+	margin-left: 4px;
+}
+
+.mw-icon-question:lang(ar),
+.mw-icon-question:lang(fa),
+.mw-icon-question:lang(ur) {
+	-webkit-transform: scaleX( -1 );
+	-ms-transform: scaleX( -1 );
+	transform: scaleX( -1 );
+}
diff --git a/resources/src/mediawiki/images/question.png b/resources/src/mediawiki/images/question.png
deleted file mode 100644
index acce58c8ce..0000000000
Binary files a/resources/src/mediawiki/images/question.png and /dev/null differ
diff --git a/resources/src/mediawiki/images/question.svg b/resources/src/mediawiki/images/question.svg
deleted file mode 100644
index 98fbe8dd75..0000000000
--- a/resources/src/mediawiki/images/question.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="21.059" height="21.06"><path fill="#575757" d="M10.529 0c-5.814 0-10.529 4.714-10.529 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53s-4.712-10.529-10.529-10.529zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5h-2.205v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638l-1.051-1.807c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/></svg>
\ No newline at end of file
diff --git a/resources/src/mediawiki/mediawiki.htmlform.css b/resources/src/mediawiki/mediawiki.htmlform.css
deleted file mode 100644
index 1603130f40..0000000000
--- a/resources/src/mediawiki/mediawiki.htmlform.css
+++ /dev/null
@@ -1,49 +0,0 @@
-/* HTMLForm styles */
-
-table.mw-htmlform-nolabel td.mw-label {
-	display: none;
-}
-
-.mw-htmlform-invalid-input td.mw-input input {
-	border-color: #f00;
-}
-
-.mw-htmlform-flatlist div.mw-htmlform-flatlist-item {
-	display: inline;
-	margin-right: 1em;
-	white-space: nowrap;
-}
-
-/* HTMLCheckMatrix */
-
-.mw-htmlform-matrix td {
-	padding-left: 0.5em;
-	padding-right: 0.5em;
-}
-
-tr.mw-htmlform-vertical-label td.mw-label {
-	text-align: left !important;
-}
-
-.mw-icon-question {
-	/* SVG support using a transparent gradient to guarantee cross-browser
-	 * compatibility (browsers able to understand gradient syntax support also SVG).
-	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-	background-image: url( images/question.png );
-	/* @embed */
-	background-image: linear-gradient( transparent, transparent ), url( images/question.svg );
-	background-repeat: no-repeat;
-	background-size: 13px 13px;
-	display: inline-block;
-	height: 13px;
-	width: 13px;
-	margin-left: 4px;
-}
-
-.mw-icon-question:lang(ar),
-.mw-icon-question:lang(fa),
-.mw-icon-question:lang(ur) {
-	-webkit-transform: scaleX( -1 );
-	-ms-transform: scaleX( -1 );
-	transform: scaleX( -1 );
-}
diff --git a/resources/src/mediawiki/mediawiki.htmlform.js b/resources/src/mediawiki/mediawiki.htmlform.js
deleted file mode 100644
index c3464ea8f8..0000000000
--- a/resources/src/mediawiki/mediawiki.htmlform.js
+++ /dev/null
@@ -1,417 +0,0 @@
-/**
- * Utility functions for jazzing up HTMLForm elements.
- *
- * @class jQuery.plugin.htmlform
- */
-( function ( mw, $ ) {
-
-	var cloneCounter = 0;
-
-	/**
-	 * Helper function for hide-if to find the nearby form field.
-	 *
-	 * Find the closest match for the given name, "closest" being the minimum
-	 * level of parents to go to find a form field matching the given name or
-	 * ending in array keys matching the given name (e.g. "baz" matches
-	 * "foo[bar][baz]").
-	 *
-	 * @private
-	 * @param {jQuery} $el
-	 * @param {string} name
-	 * @return {jQuery|null}
-	 */
-	function hideIfGetField( $el, name ) {
-		var $found, $p,
-			suffix = name.replace( /^([^\[]+)/, '[$1]' );
-
-		function nameFilter() {
-			return this.name === name ||
-				( this.name === ( 'wp' + name ) ) ||
-				this.name.slice( -suffix.length ) === suffix;
-		}
-
-		for ( $p = $el.parent(); $p.length > 0; $p = $p.parent() ) {
-			$found = $p.find( '[name]' ).filter( nameFilter );
-			if ( $found.length ) {
-				return $found;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Helper function for hide-if to return a test function and list of
-	 * dependent fields for a hide-if specification.
-	 *
-	 * @private
-	 * @param {jQuery} $el
-	 * @param {Array} spec
-	 * @return {Array}
-	 * @return {jQuery} return.0 Dependent fields
-	 * @return {Function} return.1 Test function
-	 */
-	function hideIfParse( $el, spec ) {
-		var op, i, l, v, $field, $fields, fields, func, funcs, getVal;
-
-		op = spec[ 0 ];
-		l = spec.length;
-		switch ( op ) {
-			case 'AND':
-			case 'OR':
-			case 'NAND':
-			case 'NOR':
-				funcs = [];
-				fields = [];
-				for ( i = 1; i < l; i++ ) {
-					if ( !$.isArray( spec[ i ] ) ) {
-						throw new Error( op + ' parameters must be arrays' );
-					}
-					v = hideIfParse( $el, spec[ i ] );
-					fields = fields.concat( v[ 0 ].toArray() );
-					funcs.push( v[ 1 ] );
-				}
-				$fields = $( fields );
-
-				l = funcs.length;
-				switch ( op ) {
-					case 'AND':
-						func = function () {
-							var i;
-							for ( i = 0; i < l; i++ ) {
-								if ( !funcs[ i ]() ) {
-									return false;
-								}
-							}
-							return true;
-						};
-						break;
-
-					case 'OR':
-						func = function () {
-							var i;
-							for ( i = 0; i < l; i++ ) {
-								if ( funcs[ i ]() ) {
-									return true;
-								}
-							}
-							return false;
-						};
-						break;
-
-					case 'NAND':
-						func = function () {
-							var i;
-							for ( i = 0; i < l; i++ ) {
-								if ( !funcs[ i ]() ) {
-									return true;
-								}
-							}
-							return false;
-						};
-						break;
-
-					case 'NOR':
-						func = function () {
-							var i;
-							for ( i = 0; i < l; i++ ) {
-								if ( funcs[ i ]() ) {
-									return false;
-								}
-							}
-							return true;
-						};
-						break;
-				}
-
-				return [ $fields, func ];
-
-			case 'NOT':
-				if ( l !== 2 ) {
-					throw new Error( 'NOT takes exactly one parameter' );
-				}
-				if ( !$.isArray( spec[ 1 ] ) ) {
-					throw new Error( 'NOT parameters must be arrays' );
-				}
-				v = hideIfParse( $el, spec[ 1 ] );
-				$fields = v[ 0 ];
-				func = v[ 1 ];
-				return [ $fields, function () {
-					return !func();
-				} ];
-
-			case '===':
-			case '!==':
-				if ( l !== 3 ) {
-					throw new Error( op + ' takes exactly two parameters' );
-				}
-				$field = hideIfGetField( $el, spec[ 1 ] );
-				if ( !$field ) {
-					return [ $(), function () {
-						return false;
-					} ];
-				}
-				v = spec[ 2 ];
-
-				if ( $field.first().prop( 'type' ) === 'radio' ||
-					$field.first().prop( 'type' ) === 'checkbox'
-				) {
-					getVal = function () {
-						var $selected = $field.filter( ':checked' );
-						return $selected.length ? $selected.val() : '';
-					};
-				} else {
-					getVal = function () {
-						return $field.val();
-					};
-				}
-
-				switch ( op ) {
-					case '===':
-						func = function () {
-							return getVal() === v;
-						};
-						break;
-					case '!==':
-						func = function () {
-							return getVal() !== v;
-						};
-						break;
-				}
-
-				return [ $field, func ];
-
-			default:
-				throw new Error( 'Unrecognized operation \'' + op + '\'' );
-		}
-	}
-
-	/**
-	 * jQuery plugin to fade or snap to visible state.
-	 *
-	 * @param {boolean} [instantToggle=false]
-	 * @return {jQuery}
-	 * @chainable
-	 */
-	$.fn.goIn = function ( instantToggle ) {
-		if ( instantToggle === true ) {
-			return this.show();
-		}
-		return this.stop( true, true ).fadeIn();
-	};
-
-	/**
-	 * jQuery plugin to fade or snap to hiding state.
-	 *
-	 * @param {boolean} [instantToggle=false]
-	 * @return {jQuery}
-	 * @chainable
-	 */
-	$.fn.goOut = function ( instantToggle ) {
-		if ( instantToggle === true ) {
-			return this.hide();
-		}
-		return this.stop( true, true ).fadeOut();
-	};
-
-	function enhance( $root ) {
-		var $matrixTooltips, $autocomplete,
-			// cache the separator to avoid object creation on each keypress
-			colonSeparator = mw.message( 'colon-separator' ).text();
-
-		/**
-		 * @ignore
-		 * @param {boolean|jQuery.Event} instant
-		 */
-		function handleSelectOrOther( instant ) {
-			var $other = $root.find( '#' + $( this ).attr( 'id' ) + '-other' );
-			$other = $other.add( $other.siblings( 'br' ) );
-			if ( $( this ).val() === 'other' ) {
-				$other.goIn( instant );
-			} else {
-				$other.goOut( instant );
-			}
-		}
-
-		// Animate the SelectOrOther fields, to only show the text field when
-		// 'other' is selected.
-		$root
-			.on( 'change', '.mw-htmlform-select-or-other', handleSelectOrOther )
-			.each( function () {
-				handleSelectOrOther.call( this, true );
-			} );
-
-		// Add a dynamic max length to the reason field of SelectAndOther
-		// This checks the length together with the value from the select field
-		// When the reason list is changed and the bytelimit is longer than the allowed,
-		// nothing is done
-		$root
-			.find( '.mw-htmlform-select-and-other-field' )
-			.each( function () {
-				var $this = $( this ),
-					// find the reason list
-					$reasonList = $root.find( '#' + $this.data( 'id-select' ) ),
-					// cache the current selection to avoid expensive lookup
-					currentValReasonList = $reasonList.val();
-
-				$reasonList.change( function () {
-					currentValReasonList = $reasonList.val();
-				} );
-
-				$this.byteLimit( function ( input ) {
-					// Should be built the same as in HTMLSelectAndOtherField::loadDataFromRequest
-					var comment = currentValReasonList;
-					if ( comment === 'other' ) {
-						comment = input;
-					} else if ( input !== '' ) {
-						// Entry from drop down menu + additional comment
-						comment += colonSeparator + input;
-					}
-					return comment;
-				} );
-			} );
-
-		// Set up hide-if elements
-		$root.find( '.mw-htmlform-hide-if' ).each( function () {
-			var v, $fields, test, func,
-				$el = $( this ),
-				spec = $el.data( 'hideIf' );
-
-			if ( !spec ) {
-				return;
-			}
-
-			v = hideIfParse( $el, spec );
-			$fields = v[ 0 ];
-			test = v[ 1 ];
-			func = function () {
-				if ( test() ) {
-					$el.hide();
-				} else {
-					$el.show();
-				}
-			};
-			$fields.on( 'change', func );
-			func();
-		} );
-
-		function addMulti( $oldContainer, $container ) {
-			var name = $oldContainer.find( 'input:first-child' ).attr( 'name' ),
-				oldClass = ( ' ' + $oldContainer.attr( 'class' ) + ' ' ).replace( /(mw-htmlform-field-HTMLMultiSelectField|mw-chosen)/g, '' ),
-				$select = $( '<select>' ),
-				dataPlaceholder = mw.message( 'htmlform-chosen-placeholder' );
-			oldClass = $.trim( oldClass );
-			$select.attr( {
-				name: name,
-				multiple: 'multiple',
-				'data-placeholder': dataPlaceholder.plain(),
-				'class': 'htmlform-chzn-select mw-input ' + oldClass
-			} );
-			$oldContainer.find( 'input' ).each( function () {
-				var $oldInput = $( this ),
-				checked = $oldInput.prop( 'checked' ),
-				$option = $( '<option>' );
-				$option.prop( 'value', $oldInput.prop( 'value' ) );
-				if ( checked ) {
-					$option.prop( 'selected', true );
-				}
-				$option.text( $oldInput.prop( 'value' ) );
-				$select.append( $option );
-			} );
-			$container.append( $select );
-		}
-
-		function convertCheckboxesToMulti( $oldContainer, type ) {
-			var $fieldLabel = $( '<td>' ),
-			$td = $( '<td>' ),
-			$fieldLabelText = $( '<label>' ),
-			$container;
-			if ( type === 'tr' ) {
-				addMulti( $oldContainer, $td );
-				$container = $( '<tr>' );
-				$container.append( $td );
-			} else if ( type === 'div' ) {
-				$fieldLabel = $( '<div>' );
-				$container = $( '<div>' );
-				addMulti( $oldContainer, $container );
-			}
-			$fieldLabel.attr( 'class', 'mw-label' );
-			$fieldLabelText.text( $oldContainer.find( '.mw-label label' ).text() );
-			$fieldLabel.append( $fieldLabelText );
-			$container.prepend( $fieldLabel );
-			$oldContainer.replaceWith( $container );
-			return $container;
-		}
-
-		if ( $root.find( '.mw-chosen' ).length ) {
-			mw.loader.using( 'jquery.chosen', function () {
-				$root.find( '.mw-chosen' ).each( function () {
-					var type = this.nodeName.toLowerCase(),
-						$converted = convertCheckboxesToMulti( $( this ), type );
-					$converted.find( '.htmlform-chzn-select' ).chosen( { width: 'auto' } );
-				} );
-			} );
-		}
-
-		$matrixTooltips = $root.find( '.mw-htmlform-matrix .mw-htmlform-tooltip' );
-		if ( $matrixTooltips.length ) {
-			mw.loader.using( 'jquery.tipsy', function () {
-				$matrixTooltips.tipsy( { gravity: 's' } );
-			} );
-		}
-
-		// Set up autocomplete fields
-		$autocomplete = $root.find( '.mw-htmlform-autocomplete' );
-		if ( $autocomplete.length ) {
-			mw.loader.using( 'jquery.suggestions', function () {
-				$autocomplete.suggestions( {
-					fetch: function ( val ) {
-						var $el = $( this );
-						$el.suggestions( 'suggestions',
-							$.grep( $el.data( 'autocomplete' ), function ( v ) {
-								return v.indexOf( val ) === 0;
-							} )
-						);
-					}
-				} );
-			} );
-		}
-
-		// Add/remove cloner clones without having to resubmit the form
-		$root.find( '.mw-htmlform-cloner-delete-button' ).filter( ':input' ).click( function ( ev ) {
-			ev.preventDefault();
-			$( this ).closest( 'li.mw-htmlform-cloner-li' ).remove();
-		} );
-
-		$root.find( '.mw-htmlform-cloner-create-button' ).filter( ':input' ).click( function ( ev ) {
-			var $ul, $li, html;
-
-			ev.preventDefault();
-
-			$ul = $( this ).prev( 'ul.mw-htmlform-cloner-ul' );
-
-			html = $ul.data( 'template' ).replace(
-				new RegExp( mw.RegExp.escape( $ul.data( 'uniqueId' ) ), 'g' ),
-				'clone' + ( ++cloneCounter )
-			);
-
-			$li = $( '<li>' )
-				.addClass( 'mw-htmlform-cloner-li' )
-				.html( html )
-				.appendTo( $ul );
-
-			enhance( $li );
-		} );
-
-		mw.hook( 'htmlform.enhance' ).fire( $root );
-
-	}
-
-	$( function () {
-		enhance( $( document ) );
-	} );
-
-	/**
-	 * @class jQuery
-	 * @mixins jQuery.plugin.htmlform
-	 */
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki/mediawiki.htmlform.ooui.css b/resources/src/mediawiki/mediawiki.htmlform.ooui.css
deleted file mode 100644
index a9e75d7163..0000000000
--- a/resources/src/mediawiki/mediawiki.htmlform.ooui.css
+++ /dev/null
@@ -1,29 +0,0 @@
-/* OOUIHTMLForm styles */
-
-.mw-htmlform-ooui-wrapper {
-	margin: 1em 0;
-}
-
-.mw-htmlform-ooui .mw-htmlform-submit-buttons {
-	margin-top: 1em;
-}
-
-.mw-htmlform-ooui .mw-htmlform-field-HTMLCheckMatrix,
-.mw-htmlform-ooui .mw-htmlform-matrix,
-.mw-htmlform-ooui .mw-htmlform-matrix tr {
-	width: 100%;
-}
-
-.mw-htmlform-ooui .mw-htmlform-matrix tr td.first {
-	margin-right: 5%;
-	width: 39%;
-}
-
-/* Flatlist styling for PHP widgets... */
-.mw-htmlform-flatlist .oo-ui-fieldLayout-align-inline,
-/* ...and for JS widgets */
-.mw-htmlform-flatlist .oo-ui-optionWidget,
-.mw-htmlform-flatlist .oo-ui-multioptionWidget {
-	display: inline-block;
-	margin-right: 1em;
-}
diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 11784fb721..491564ade7 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -788,17 +788,17 @@
 			 * State machine:
 			 *
 			 * - `registered`:
-			 *    The module is known to the system but not yet requested.
+			 *    The module is known to the system but not yet required.
 			 *    Meta data is registered via mw.loader#register. Calls to that method are
 			 *    generated server-side by the startup module.
 			 * - `loading`:
-			 *    The module is requested through mw.loader (either directly or as dependency of
-			 *    another module). The client will be fetching module contents from the server.
+			 *    The module was required through mw.loader (either directly or as dependency of
+			 *    another module). The client will fetch module contents from the server.
 			 *    The contents are then stashed in the registry via mw.loader#implement.
 			 * - `loaded`:
-			 *    The module has been requested from the server and stashed via mw.loader#implement.
-			 *    If the module has no more dependencies in-fight, the module will be executed
-			 *    right away. Otherwise execution is deferred, controlled via #handlePending.
+			 *    The module has been loaded from the server and stashed via mw.loader#implement.
+			 *    If the module has no more dependencies in-flight, the module will be executed
+			 *    immediately. Otherwise execution is deferred, controlled via #handlePending.
 			 * - `executing`:
 			 *    The module is being executed.
 			 * - `ready`:
@@ -823,10 +823,7 @@
 				//
 				sources = {},
 
-				// List of modules which will be loaded as when ready
-				batch = [],
-
-				// Pending queueModuleScript() requests
+				// For queueModuleScript()
 				handlingPendingRequests = false,
 				pendingRequests = [],
 
@@ -836,10 +833,10 @@
 				/**
 				 * List of callback jobs waiting for modules to be ready.
 				 *
-				 * Jobs are created by #request() and run by #handlePending().
+				 * Jobs are created by #enqueue() and run by #handlePending().
 				 *
 				 * Typically when a job is created for a module, the job's dependencies contain
-				 * both the module being requested and all its recursive dependencies.
+				 * both the required module and all its recursive dependencies.
 				 *
 				 * Format:
 				 *
@@ -1439,15 +1436,16 @@
 			}
 
 			/**
-			 * Adds all dependencies to the queue with optional callbacks to be run
-			 * when the dependencies are ready or fail
+			 * Add one or more modules to the module load queue.
+			 *
+			 * See also #work().
 			 *
 			 * @private
 			 * @param {string|string[]} dependencies Module name or array of string module names
 			 * @param {Function} [ready] Callback to execute when all dependencies are ready
 			 * @param {Function} [error] Callback to execute when any dependency fails
 			 */
-			function request( dependencies, ready, error ) {
+			function enqueue( dependencies, ready, error ) {
 				// Allow calling by single module name
 				if ( typeof dependencies === 'string' ) {
 					dependencies = [ dependencies ];
@@ -1520,7 +1518,7 @@
 			}
 
 			/**
-			 * Load modules from load.php
+			 * Make a network request to load modules from the server.
 			 *
 			 * @private
 			 * @param {Object} moduleMap Module map, see #buildModulesString
@@ -1528,12 +1526,12 @@
 			 * @param {string} sourceLoadScript URL of load.php
 			 */
 			function doRequest( moduleMap, currReqBase, sourceLoadScript ) {
-				var request = $.extend(
+				var query = $.extend(
 					{ modules: buildModulesString( moduleMap ) },
 					currReqBase
 				);
-				request = sortQuery( request );
-				addScript( sourceLoadScript + '?' + $.param( request ) );
+				query = sortQuery( query );
+				addScript( sourceLoadScript + '?' + $.param( query ) );
 			}
 
 			/**
@@ -1558,6 +1556,112 @@
 				} );
 			}
 
+			/**
+			 * Create network requests for a batch of modules.
+			 *
+			 * This is an internal method for #work(). This must not be called directly
+			 * unless the modules are already registered, and no request is in progress,
+			 * and the module state has already been set to `loading`.
+			 *
+			 * @private
+			 * @param {string[]} batch
+			 */
+			function batchRequest( batch ) {
+				var reqBase, splits, maxQueryLength, b, bSource, bGroup, bSourceGroup,
+					source, group, i, modules, sourceLoadScript,
+					currReqBase, currReqBaseLength, moduleMap, l,
+					lastDotIndex, prefix, suffix, bytesAdded;
+
+				if ( !batch.length ) {
+					return;
+				}
+
+				// Always order modules alphabetically to help reduce cache
+				// misses for otherwise identical content.
+				batch.sort();
+
+				// Build a list of query parameters common to all requests
+				reqBase = {
+					skin: mw.config.get( 'skin' ),
+					lang: mw.config.get( 'wgUserLanguage' ),
+					debug: mw.config.get( 'debug' )
+				};
+				maxQueryLength = mw.config.get( 'wgResourceLoaderMaxQueryLength', 2000 );
+
+				// Split module list by source and by group.
+				splits = {};
+				for ( b = 0; b < batch.length; b++ ) {
+					bSource = registry[ batch[ b ] ].source;
+					bGroup = registry[ batch[ b ] ].group;
+					if ( !hasOwn.call( splits, bSource ) ) {
+						splits[ bSource ] = {};
+					}
+					if ( !hasOwn.call( splits[ bSource ], bGroup ) ) {
+						splits[ bSource ][ bGroup ] = [];
+					}
+					bSourceGroup = splits[ bSource ][ bGroup ];
+					bSourceGroup.push( batch[ b ] );
+				}
+
+				for ( source in splits ) {
+
+					sourceLoadScript = sources[ source ];
+
+					for ( group in splits[ source ] ) {
+
+						// Cache access to currently selected list of
+						// modules for this group from this source.
+						modules = splits[ source ][ group ];
+
+						currReqBase = $.extend( {
+							version: getCombinedVersion( modules )
+						}, reqBase );
+						// For user modules append a user name to the query string.
+						if ( group === 'user' && mw.config.get( 'wgUserName' ) !== null ) {
+							currReqBase.user = mw.config.get( 'wgUserName' );
+						}
+						currReqBaseLength = $.param( currReqBase ).length;
+						// We may need to split up the request to honor the query string length limit,
+						// so build it piece by piece.
+						l = currReqBaseLength + 9; // '&modules='.length == 9
+
+						moduleMap = {}; // { prefix: [ suffixes ] }
+
+						for ( i = 0; i < modules.length; i++ ) {
+							// Determine how many bytes this module would add to the query string
+							lastDotIndex = modules[ i ].lastIndexOf( '.' );
+
+							// If lastDotIndex is -1, substr() returns an empty string
+							prefix = modules[ i ].substr( 0, lastDotIndex );
+							suffix = modules[ i ].slice( lastDotIndex + 1 );
+
+							bytesAdded = hasOwn.call( moduleMap, prefix )
+								? suffix.length + 3 // '%2C'.length == 3
+								: modules[ i ].length + 3; // '%7C'.length == 3
+
+							// If the url would become too long, create a new one,
+							// but don't create empty requests
+							if ( maxQueryLength > 0 && !$.isEmptyObject( moduleMap ) && l + bytesAdded > maxQueryLength ) {
+								// This url would become too long, create a new one, and start the old one
+								doRequest( moduleMap, currReqBase, sourceLoadScript );
+								moduleMap = {};
+								l = currReqBaseLength + 9;
+								mw.track( 'resourceloader.splitRequest', { maxQueryLength: maxQueryLength } );
+							}
+							if ( !hasOwn.call( moduleMap, prefix ) ) {
+								moduleMap[ prefix ] = [];
+							}
+							moduleMap[ prefix ].push( suffix );
+							l += bytesAdded;
+						}
+						// If there's anything left in moduleMap, request that too
+						if ( !$.isEmptyObject( moduleMap ) ) {
+							doRequest( moduleMap, currReqBase, sourceLoadScript );
+						}
+					}
+				}
+			}
+
 			/* Public Members */
 			return {
 				/**
@@ -1577,29 +1681,18 @@
 				addStyleTag: newStyleTag,
 
 				/**
-				 * Batch-request queued dependencies from the server.
+				 * Start loading of all queued module dependencies.
 				 *
 				 * @protected
 				 */
 				work: function () {
-					var	reqBase, splits, maxQueryLength, q, b, bSource, bGroup, bSourceGroup,
-						source, concatSource, origBatch, group, i, modules, sourceLoadScript,
-						currReqBase, currReqBaseLength, moduleMap, l,
-						lastDotIndex, prefix, suffix, bytesAdded;
-
-					// Build a list of request parameters common to all requests.
-					reqBase = {
-						skin: mw.config.get( 'skin' ),
-						lang: mw.config.get( 'wgUserLanguage' ),
-						debug: mw.config.get( 'debug' )
-					};
-					// Split module batch by source and by group.
-					splits = {};
-					maxQueryLength = mw.config.get( 'wgResourceLoaderMaxQueryLength', 2000 );
+					var q, batch, concatSource, origBatch;
+
+					batch = [];
 
 					// Appends a list of modules from the queue to the batch
 					for ( q = 0; q < queue.length; q++ ) {
-						// Only request modules which are registered
+						// Only load modules which are registered
 						if ( hasOwn.call( registry, queue[ q ] ) && registry[ queue[ q ] ].state === 'registered' ) {
 							// Prevent duplicate entries
 							if ( $.inArray( queue[ q ], batch ) === -1 ) {
@@ -1647,97 +1740,14 @@
 						}
 					}
 
-					// Early exit if there's nothing to load...
-					if ( !batch.length ) {
-						return;
-					}
-
-					// The queue has been processed into the batch, clear up the queue.
+					// Now that the queue has been processed into a batch, clear up the queue.
+					// This MUST happen before we initiate any network request. Else it's possible
+					// that a script will be locally cached, instantly load, and work the queue
+					// again; all before we've cleared it causing each request to include modules
+					// which are already loaded.
 					queue = [];
 
-					// Always order modules alphabetically to help reduce cache
-					// misses for otherwise identical content.
-					batch.sort();
-
-					// Split batch by source and by group.
-					for ( b = 0; b < batch.length; b++ ) {
-						bSource = registry[ batch[ b ] ].source;
-						bGroup = registry[ batch[ b ] ].group;
-						if ( !hasOwn.call( splits, bSource ) ) {
-							splits[ bSource ] = {};
-						}
-						if ( !hasOwn.call( splits[ bSource ], bGroup ) ) {
-							splits[ bSource ][ bGroup ] = [];
-						}
-						bSourceGroup = splits[ bSource ][ bGroup ];
-						bSourceGroup.push( batch[ b ] );
-					}
-
-					// Clear the batch - this MUST happen before we append any
-					// script elements to the body or it's possible that a script
-					// will be locally cached, instantly load, and work the batch
-					// again, all before we've cleared it causing each request to
-					// include modules which are already loaded.
-					batch = [];
-
-					for ( source in splits ) {
-
-						sourceLoadScript = sources[ source ];
-
-						for ( group in splits[ source ] ) {
-
-							// Cache access to currently selected list of
-							// modules for this group from this source.
-							modules = splits[ source ][ group ];
-
-							currReqBase = $.extend( {
-								version: getCombinedVersion( modules )
-							}, reqBase );
-							// For user modules append a user name to the request.
-							if ( group === 'user' && mw.config.get( 'wgUserName' ) !== null ) {
-								currReqBase.user = mw.config.get( 'wgUserName' );
-							}
-							currReqBaseLength = $.param( currReqBase ).length;
-							// We may need to split up the request to honor the query string length limit,
-							// so build it piece by piece.
-							l = currReqBaseLength + 9; // '&modules='.length == 9
-
-							moduleMap = {}; // { prefix: [ suffixes ] }
-
-							for ( i = 0; i < modules.length; i++ ) {
-								// Determine how many bytes this module would add to the query string
-								lastDotIndex = modules[ i ].lastIndexOf( '.' );
-
-								// If lastDotIndex is -1, substr() returns an empty string
-								prefix = modules[ i ].substr( 0, lastDotIndex );
-								suffix = modules[ i ].slice( lastDotIndex + 1 );
-
-								bytesAdded = hasOwn.call( moduleMap, prefix )
-									? suffix.length + 3 // '%2C'.length == 3
-									: modules[ i ].length + 3; // '%7C'.length == 3
-
-								// If the request would become too long, create a new one,
-								// but don't create empty requests
-								if ( maxQueryLength > 0 && !$.isEmptyObject( moduleMap ) && l + bytesAdded > maxQueryLength ) {
-									// This request would become too long, create a new one
-									// and fire off the old one
-									doRequest( moduleMap, currReqBase, sourceLoadScript );
-									moduleMap = {};
-									l = currReqBaseLength + 9;
-									mw.track( 'resourceloader.splitRequest', { maxQueryLength: maxQueryLength } );
-								}
-								if ( !hasOwn.call( moduleMap, prefix ) ) {
-									moduleMap[ prefix ] = [];
-								}
-								moduleMap[ prefix ].push( suffix );
-								l += bytesAdded;
-							}
-							// If there's anything left in moduleMap, request that too
-							if ( !$.isEmptyObject( moduleMap ) ) {
-								doRequest( moduleMap, currReqBase, sourceLoadScript );
-							}
-						}
-					}
+					batchRequest( batch );
 				},
 
 				/**
@@ -1833,7 +1843,7 @@
 				/**
 				 * Implement a module given the components that make up the module.
 				 *
-				 * When #load or #using requests one or more modules, the server
+				 * When #load() or #using() requests one or more modules, the server
 				 * response contain calls to this function.
 				 *
 				 * @param {string} module Name of module
@@ -1925,8 +1935,8 @@
 							dependencies
 						);
 					} else {
-						// Not all dependencies are ready: queue up a request
-						request( dependencies, function () {
+						// Not all dependencies are ready, add to the load queue
+						enqueue( dependencies, function () {
 							deferred.resolve( mw.loader.require );
 						}, deferred.reject );
 					}
@@ -1991,8 +2001,8 @@
 					if ( allReady( filtered ) || anyFailed( filtered ) ) {
 						return;
 					}
-					// Since some modules are not yet ready, queue up a request.
-					request( filtered, undefined, undefined );
+					// Some modules are not yet ready, add to module load queue.
+					enqueue( filtered, undefined, undefined );
 				},
 
 				/**
diff --git a/resources/src/mediawiki/mediawiki.raggett.css b/resources/src/mediawiki/mediawiki.raggett.css
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/resources/src/mediawiki/page/gallery-slideshow.js b/resources/src/mediawiki/page/gallery-slideshow.js
index 85ded4443e..3b2c86eb72 100644
--- a/resources/src/mediawiki/page/gallery-slideshow.js
+++ b/resources/src/mediawiki/page/gallery-slideshow.js
@@ -325,6 +325,11 @@
 		var api, title, params,
 			imageSrc = $img.attr( 'src' );
 
+		// Reject promise if there is no thumbnail image
+		if ( $img[ 0 ] === undefined ) {
+			return $.Deferred().reject();
+		}
+
 		if ( this.imageInfoCache[ imageSrc ] === undefined ) {
 			api = new mw.Api();
 			// TODO: This supports only gallery of images
diff --git a/resources/src/mediawiki/page/ready.js b/resources/src/mediawiki/page/ready.js
index 3b779d19af..d228f3e302 100644
--- a/resources/src/mediawiki/page/ready.js
+++ b/resources/src/mediawiki/page/ready.js
@@ -36,7 +36,7 @@
 
 	// Things outside the wikipage content
 	$( function () {
-		var $nodes, $oouiNodes;
+		var $nodes;
 
 		if ( !supportsPlaceholder ) {
 			// Exclude content to avoid hitting it twice for the (first) wikipage content
@@ -46,21 +46,6 @@
 		// Add accesskey hints to the tooltips
 		$( '[accesskey]' ).updateTooltipAccessKeys();
 
-		// Infuse OOUI widgets, if any are present
-		$oouiNodes = $( '[data-ooui]' );
-		if ( $oouiNodes.length ) {
-			// FIXME: We should only load the widgets that are being infused
-			mw.loader.using( [
-				'mediawiki.widgets',
-				'mediawiki.widgets.UserInputWidget',
-				'mediawiki.widgets.SearchInputWidget'
-			] ).done( function () {
-				$oouiNodes.each( function () {
-					OO.ui.infuse( this );
-				} );
-			} );
-		}
-
 		$nodes = $( '.catlinks[data-mw="interface"]' );
 		if ( $nodes.length ) {
 			/**
diff --git a/resources/src/mediawiki/page/watch.js b/resources/src/mediawiki/page/watch.js
index c59f5ba97a..b860dbdbb8 100644
--- a/resources/src/mediawiki/page/watch.js
+++ b/resources/src/mediawiki/page/watch.js
@@ -108,9 +108,6 @@
 		$links.click( function ( e ) {
 			var action, api, $link;
 
-			// Preload the notification module for mw.notify
-			mw.loader.load( 'mediawiki.notification' );
-
 			action = mwUriGetAction( this.href );
 
 			if ( action !== 'watch' && action !== 'unwatch' ) {
@@ -128,6 +125,9 @@
 
 			updateWatchLink( $link, action, 'loading' );
 
+			// Preload the notification module for mw.notify
+			mw.loader.load( 'mediawiki.notification' );
+
 			api = new mw.Api();
 
 			api[ action ]( title )
diff --git a/resources/src/oojs-ui-styles-skip.js b/resources/src/oojs-ui-styles-skip.js
deleted file mode 100644
index 57c905a345..0000000000
--- a/resources/src/oojs-ui-styles-skip.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Skip function for OOjs UI PHP style modules.
- *
- * The `<meta name="X-OOUI-PHP" />` is added to pages by OutputPage::enableOOUI().
- *
- * Looking for elements in the DOM might be expensive, but it's probably better than double-loading
- * 200 KB of CSS with embedded images because of bug T87871.
- */
-return !!jQuery( 'meta[name="X-OOUI-PHP"]' ).length;
diff --git a/tests/browser/environments.yml b/tests/browser/environments.yml
index 35eb153f04..8740e5d17a 100644
--- a/tests/browser/environments.yml
+++ b/tests/browser/environments.yml
@@ -23,12 +23,12 @@ mw-vagrant-guest:
   mediawiki_url: http://127.0.0.1/wiki/
 
 beta:
-  mediawiki_url: http://en.wikipedia.beta.wmflabs.org/wiki/
+  mediawiki_url: https://en.wikipedia.beta.wmflabs.org/wiki/
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
 test2:
-  mediawiki_url: http://test2.wikipedia.org/wiki/
+  mediawiki_url: https://test2.wikipedia.org/wiki/
   mediawiki_user: Selenium_user
   # mediawiki_password: SET THIS IN THE ENVIRONMENT!
 
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 9b85d3fe61..e965e2d537 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -174,10 +174,6 @@ class ParserTest {
 			echo "Warning: tidy is not installed, skipping some tests\n";
 		}
 
-		if ( !extension_loaded( 'gd' ) ) {
-			echo "Warning: GD extension is not present, thumbnailing tests will probably fail\n";
-		}
-
 		$this->hooks = [];
 		$this->functionHooks = [];
 		$this->transparentHooks = [];
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index f308b8ed59..3e9fef8826 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -27236,3 +27236,12 @@ Thumbnail output
 </div>
 </div>
 !! end
+
+!! test
+unclosed internal link XSS (T137264)
+!! wikitext
+[[#%3Cscript%3Ealert(1)%3C/script%3E|
+!! html
+<p>[[#&lt;script&gt;alert(1)&lt;/script&gt;|
+</p>
+!! end
diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index ac8c43b1ec..8c2b143e80 100644
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -324,6 +324,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 			'_MediaWikiTitleCodec' => [ '_MediaWikiTitleCodec', MediaWikiTitleCodec::class ],
 			'TitleFormatter' => [ 'TitleFormatter', TitleFormatter::class ],
 			'TitleParser' => [ 'TitleParser', TitleParser::class ],
+			'VirtualRESTServiceClient' => [ 'VirtualRESTServiceClient', VirtualRESTServiceClient::class ]
 		];
 	}
 
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index 99b9029bc3..788d304295 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -3087,7 +3087,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
 		$actual = $this->manager->getAuthenticationRequests( AuthManager::ACTION_LOGIN );
 		$expected = [
 			$rememberReq,
-			$makeReq( "primary-shared", AuthenticationRequest::REQUIRED ),
+			$makeReq( "primary-shared", AuthenticationRequest::PRIMARY_REQUIRED ),
 			$makeReq( "required", AuthenticationRequest::PRIMARY_REQUIRED ),
 			$makeReq( "required2", AuthenticationRequest::PRIMARY_REQUIRED ),
 			$makeReq( "optional", AuthenticationRequest::OPTIONAL ),
@@ -3107,10 +3107,10 @@ class AuthManagerTest extends \MediaWikiTestCase {
 		$actual = $this->manager->getAuthenticationRequests( AuthManager::ACTION_LOGIN );
 		$expected = [
 			$rememberReq,
-			$makeReq( "primary-shared", AuthenticationRequest::REQUIRED ),
-			$makeReq( "required", AuthenticationRequest::REQUIRED ),
+			$makeReq( "primary-shared", AuthenticationRequest::PRIMARY_REQUIRED ),
+			$makeReq( "required", AuthenticationRequest::PRIMARY_REQUIRED ),
 			$makeReq( "optional", AuthenticationRequest::OPTIONAL ),
-			$makeReq( "foo", AuthenticationRequest::REQUIRED ),
+			$makeReq( "foo", AuthenticationRequest::PRIMARY_REQUIRED ),
 			$makeReq( "bar", AuthenticationRequest::REQUIRED ),
 			$makeReq( "baz", AuthenticationRequest::REQUIRED ),
 		];
diff --git a/tests/phpunit/includes/auth/AuthenticationRequestTest.php b/tests/phpunit/includes/auth/AuthenticationRequestTest.php
index a7df221700..7d2ba8d749 100644
--- a/tests/phpunit/includes/auth/AuthenticationRequestTest.php
+++ b/tests/phpunit/includes/auth/AuthenticationRequestTest.php
@@ -172,6 +172,7 @@ class AuthenticationRequestTest extends \MediaWikiTestCase {
 				'type' => 'string',
 				'label' => $msg,
 				'help' => $msg,
+				'sensitive' => true,
 			],
 			'string3' => [
 				'type' => 'string',
@@ -206,6 +207,7 @@ class AuthenticationRequestTest extends \MediaWikiTestCase {
 		$expect = $req1->getFieldInfo();
 		foreach ( $expect as $name => &$options ) {
 			$options['optional'] = !empty( $options['optional'] );
+			$options['sensitive'] = !empty( $options['sensitive'] );
 		}
 		unset( $options );
 		$this->assertEquals( $expect, $fields );
@@ -225,8 +227,10 @@ class AuthenticationRequestTest extends \MediaWikiTestCase {
 
 		$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
 		$expect += $req2->getFieldInfo();
+		$expect['string1']['sensitive'] = true;
 		$expect['string2']['optional'] = false;
 		$expect['string3']['optional'] = false;
+		$expect['string3']['sensitive'] = false;
 		$expect['select']['options']['bar'] = $msg;
 		$this->assertEquals( $expect, $fields );
 
@@ -237,6 +241,7 @@ class AuthenticationRequestTest extends \MediaWikiTestCase {
 		$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
 		$expect += $req2->getFieldInfo();
 		$expect['string1']['optional'] = false;
+		$expect['string1']['sensitive'] = true;
 		$expect['string3']['optional'] = false;
 		$expect['select']['optional'] = false;
 		$expect['select']['options']['bar'] = $msg;
@@ -246,7 +251,11 @@ class AuthenticationRequestTest extends \MediaWikiTestCase {
 
 		$fields = AuthenticationRequest::mergeFieldInfo( [ $req1, $req2 ] );
 		$expect = $req1->getFieldInfo() + $req2->getFieldInfo();
+		foreach ( $expect as $name => &$options ) {
+			$options['sensitive'] = !empty( $options['sensitive'] );
+		}
 		$expect['string1']['optional'] = false;
+		$expect['string1']['sensitive'] = true;
 		$expect['string2']['optional'] = true;
 		$expect['string3']['optional'] = true;
 		$expect['select']['optional'] = false;
diff --git a/tests/phpunit/includes/auth/AuthenticationRequestTestCase.php b/tests/phpunit/includes/auth/AuthenticationRequestTestCase.php
index aa0e3c70f5..b5c8a36cd1 100644
--- a/tests/phpunit/includes/auth/AuthenticationRequestTestCase.php
+++ b/tests/phpunit/includes/auth/AuthenticationRequestTestCase.php
@@ -32,6 +32,13 @@ abstract class AuthenticationRequestTestCase extends \MediaWikiTestCase {
 			if ( isset( $data['image'] ) ) {
 				$this->assertType( 'string', $data['image'], "Field $field, image" );
 			}
+			if ( isset( $data['sensitive'] ) ) {
+				$this->assertType( 'bool', $data['sensitive'], "Field $field, sensitive" );
+			}
+			if ( $data['type'] === 'password' ) {
+				$this->assertTrue( !empty( $data['sensitive'] ),
+					"Field $field, password field must be sensitive" );
+			}
 
 			switch ( $data['type'] ) {
 				case 'string':
diff --git a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
index 18c46f7cc5..c52c3e9f54 100644
--- a/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/EmailNotificationSecondaryAuthenticationProviderTest.php
@@ -60,19 +60,25 @@ class EmailNotificationSecondaryAuthenticationProviderTest extends \PHPUnit_Fram
 		$creator = $this->getMock( 'User' );
 		$userWithoutEmail = $this->getMock( 'User' );
 		$userWithoutEmail->expects( $this->any() )->method( 'getEmail' )->willReturn( '' );
+		$userWithoutEmail->expects( $this->any() )->method( 'getInstanceForUpdate' )->willReturnSelf();
 		$userWithoutEmail->expects( $this->never() )->method( 'sendConfirmationMail' );
 		$userWithEmailError = $this->getMock( 'User' );
 		$userWithEmailError->expects( $this->any() )->method( 'getEmail' )->willReturn( 'foo@bar.baz' );
+		$userWithEmailError->expects( $this->any() )->method( 'getInstanceForUpdate' )->willReturnSelf();
 		$userWithEmailError->expects( $this->any() )->method( 'sendConfirmationMail' )
 			->willReturn( \Status::newFatal( 'fail' ) );
 		$userExpectsConfirmation = $this->getMock( 'User' );
 		$userExpectsConfirmation->expects( $this->any() )->method( 'getEmail' )
 			->willReturn( 'foo@bar.baz' );
+		$userExpectsConfirmation->expects( $this->any() )->method( 'getInstanceForUpdate' )
+			->willReturnSelf();
 		$userExpectsConfirmation->expects( $this->once() )->method( 'sendConfirmationMail' )
 			->willReturn( \Status::newGood() );
 		$userNotExpectsConfirmation = $this->getMock( 'User' );
 		$userNotExpectsConfirmation->expects( $this->any() )->method( 'getEmail' )
 			->willReturn( 'foo@bar.baz' );
+		$userNotExpectsConfirmation->expects( $this->any() )->method( 'getInstanceForUpdate' )
+			->willReturnSelf();
 		$userNotExpectsConfirmation->expects( $this->never() )->method( 'sendConfirmationMail' );
 
 		$provider = new EmailNotificationSecondaryAuthenticationProvider( [
diff --git a/tests/phpunit/includes/content/ContentHandlerTest.php b/tests/phpunit/includes/content/ContentHandlerTest.php
index bb9050fbd3..39948ca130 100644
--- a/tests/phpunit/includes/content/ContentHandlerTest.php
+++ b/tests/phpunit/includes/content/ContentHandlerTest.php
@@ -376,8 +376,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
 		$content = new WikitextContent( 'test text' );
 		$ok = ContentHandler::runLegacyHooks(
 			'testRunLegacyHooks',
-			[ 'foo', &$content, 'bar' ],
-			false
+			[ 'foo', &$content, 'bar' ]
 		);
 
 		$this->assertTrue( $ok, "runLegacyHooks should have returned true" );
@@ -415,6 +414,32 @@ class ContentHandlerTest extends MediaWikiTestCase {
 		$this->assertInstanceOf( $handlerClass, $handler );
 	}
 
+	public function testGetFieldsForSearchIndex() {
+		$searchEngine = $this->newSearchEngine();
+
+		$handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
+
+		$fields = $handler->getFieldsForSearchIndex( $searchEngine );
+
+		$this->assertArrayHasKey( 'category', $fields );
+		$this->assertArrayHasKey( 'external_link', $fields );
+		$this->assertArrayHasKey( 'outgoing_link', $fields );
+		$this->assertArrayHasKey( 'template', $fields );
+	}
+
+	private function newSearchEngine() {
+		$searchEngine = $this->getMockBuilder( 'SearchEngine' )
+			->getMock();
+
+		$searchEngine->expects( $this->any() )
+			->method( 'makeSearchFieldMapping' )
+			->will( $this->returnCallback( function( $name, $type ) {
+					return new DummySearchIndexFieldDefinition( $name, $type );
+			} ) );
+
+		return $searchEngine;
+	}
+
 	/**
 	 * @covers ContentHandler::getDataForSearchIndex
 	 */
@@ -425,7 +450,7 @@ class ContentHandlerTest extends MediaWikiTestCase {
 
 		$this->setTemporaryHook( 'SearchDataForIndex',
 			function ( &$fields, ContentHandler $handler, WikiPage $page, ParserOutput $output,
-			           SearchEngine $engine ) {
+					   SearchEngine $engine ) {
 				$fields['testDataField'] = 'test content';
 			} );
 
diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php
index ac8342826c..b290f8f281 100644
--- a/tests/phpunit/includes/content/TextContentTest.php
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -102,6 +102,11 @@ class TextContentTest extends MediaWikiLangTestCase {
 				" Foo \n ",
 				' Foo',
 			],
+			[
+				# 2: newline normalization
+				"LF\n\nCRLF\r\n\r\nCR\r\rEND",
+				"LF\n\nCRLF\n\nCR\n\nEND",
+			],
 		];
 	}
 
@@ -454,4 +459,30 @@ class TextContentTest extends MediaWikiLangTestCase {
 			$this->assertEquals( $expectedNative, $converted->getNativeData() );
 		}
 	}
+
+	/**
+	 * @covers TextContent::normalizeLineEndings
+	 * @dataProvider provideNormalizeLineEndings
+	 */
+	public function testNormalizeLineEndings( $input, $expected ) {
+		$this->assertEquals( $expected, TextContent::normalizeLineEndings( $input ) );
+	}
+
+	public static function provideNormalizeLineEndings() {
+		return [
+			[
+				"Foo\r\nbar",
+				"Foo\nbar"
+			],
+			[
+				"Foo\rbar",
+				"Foo\nbar"
+			],
+			[
+				"Foobar\n  ",
+				"Foobar"
+			]
+		];
+	}
+
 }
diff --git a/tests/phpunit/includes/content/WikitextStructureTest.php b/tests/phpunit/includes/content/WikitextStructureTest.php
index 6d83057b7e..4301fb8c35 100644
--- a/tests/phpunit/includes/content/WikitextStructureTest.php
+++ b/tests/phpunit/includes/content/WikitextStructureTest.php
@@ -25,61 +25,6 @@ class WikitextStructureTest extends MediaWikiLangTestCase {
 		return new WikiTextStructure( $this->getParserOutput( $text ) );
 	}
 
-	public function testCategories() {
-		$text = <<<END
-We also have a {{Template}} and an {{Another template}} in addition. 
-This text also has [[Category:Some Category| ]] and then [[Category:Yet another category]].
-And [[Category:Some Category| this category]] is repeated.
-END;
-		$struct = $this->getStructure( $text );
-		$cats = $struct->categories();
-		$this->assertCount( 2, $cats );
-		$this->assertContains( "Some Category", $cats );
-		$this->assertContains( "Yet another category", $cats );
-	}
-
-	public function testOutgoingLinks() {
-		$text = <<<END
-Here I add link to [[Some Page]]. And [[Some Page|This same page]] gets linked twice. 
-We also have [[File:Image.jpg|image]].
-We also have a {{Template}} and an {{Another template}} in addition. 
-Some templates are {{lowercase}}.
-And [[Some_Page]] is linked again. 
-It also has [[Category:Some Category| ]] and then [[Category:Yet another category]].
-Also link to a [[Talk:TestTitle|talk page]] is here. 
-END;
-		$struct = $this->getStructure( $text );
-		$links = $struct->outgoingLinks();
-		$this->assertContains( "Some_Page", $links );
-		$this->assertContains( "Template:Template", $links );
-		$this->assertContains( "Template:Another_template", $links );
-		$this->assertContains( "Template:Lowercase", $links );
-		$this->assertContains( "Talk:TestTitle", $links );
-		$this->assertCount( 5, $links );
-	}
-
-	public function testTemplates() {
-		$text = <<<END
-We have a {{Template}} and an {{Another template}} in addition. 
-Some templates are {{lowercase}}. And this {{Template}} is repeated. 
-Here is {{another_template|with=argument}}.
-This is a template that {{Xdoes not exist}}.
-END;
-		$this->setTemporaryHook( 'TitleExists', function ( Title $title, &$exists ) {
-			$txt = $title->getBaseText();
-			if ( $txt[0] != 'X' ) {
-				$exists = true;
-			}
-			return true;
-		} );
-		$struct = $this->getStructure( $text );
-		$templates = $struct->templates();
-		$this->assertCount( 3, $templates );
-		$this->assertContains( "Template:Template", $templates );
-		$this->assertContains( "Template:Another template", $templates );
-		$this->assertContains( "Template:Lowercase", $templates );
-	}
-
 	public function testHeadings() {
 		$text = <<<END
 Some text here
diff --git a/tests/phpunit/includes/db/DatabaseTest.php b/tests/phpunit/includes/db/DatabaseTest.php
index 723f1c319e..7e55a7327a 100644
--- a/tests/phpunit/includes/db/DatabaseTest.php
+++ b/tests/phpunit/includes/db/DatabaseTest.php
@@ -285,8 +285,42 @@ class DatabaseTest extends MediaWikiTestCase {
 			$called = true;
 			$db->setFlag( DBO_TRX );
 		} );
-		$db->rollback( __METHOD__ );
+		$db->rollback( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
 		$this->assertFalse( $db->getFlag( DBO_TRX ), 'DBO_TRX restored to default' );
 		$this->assertTrue( $called, 'Callback reached' );
 	}
+
+	public function testGetScopedLock() {
+		$db = $this->db;
+
+		$db->setFlag( DBO_TRX );
+		try {
+			$this->badLockingMethodImplicit( $db );
+		} catch ( RunTimeException $e ) {
+			$this->assertTrue( $db->trxLevel() > 0, "Transaction not committed." );
+		}
+		$db->clearFlag( DBO_TRX );
+		$db->rollback( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
+		$this->assertTrue( $db->lockIsFree( 'meow', __METHOD__ ) );
+
+		try {
+			$this->badLockingMethodExplicit( $db );
+		} catch ( RunTimeException $e ) {
+			$this->assertTrue( $db->trxLevel() > 0, "Transaction not committed." );
+		}
+		$db->rollback( __METHOD__, IDatabase::FLUSHING_ALL_PEERS );
+		$this->assertTrue( $db->lockIsFree( 'meow', __METHOD__ ) );
+	}
+
+	private function badLockingMethodImplicit( IDatabase $db ) {
+		$lock = $db->getScopedLockAndFlush( 'meow', __METHOD__, 1 );
+		$db->query( "SELECT 1" ); // trigger DBO_TRX
+		throw new RunTimeException( "Uh oh!" );
+	}
+
+	private function badLockingMethodExplicit( IDatabase $db ) {
+		$lock = $db->getScopedLockAndFlush( 'meow', __METHOD__, 1 );
+		$db->begin( __METHOD__ );
+		throw new RunTimeException( "Uh oh!" );
+	}
 }
diff --git a/tests/phpunit/includes/libs/ObjectFactoryTest.php b/tests/phpunit/includes/libs/ObjectFactoryTest.php
index a4871a64c4..f8dda6f8af 100644
--- a/tests/phpunit/includes/libs/ObjectFactoryTest.php
+++ b/tests/phpunit/includes/libs/ObjectFactoryTest.php
@@ -44,6 +44,7 @@ class ObjectFactoryTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * @covers ObjectFactory::getObjectFromSpec
+	 * @covers ObjectFactory::expandClosures
 	 */
 	public function testClosureExpansionEnabled() {
 		$obj = ObjectFactory::getObjectFromSpec( [
@@ -80,6 +81,44 @@ class ObjectFactoryTest extends PHPUnit_Framework_TestCase {
 		$this->assertSame( 'unwrapped', $obj->setterArgs[0] );
 	}
 
+	/**
+	 * @covers ObjectFactory::getObjectFromSpec
+	 */
+	public function testGetObjectFromFactory() {
+		$args = [ 'a', 'b' ];
+		$obj = ObjectFactory::getObjectFromSpec( [
+			'factory' => function ( $a, $b ) {
+				return new ObjectFactoryTestFixture( $a, $b );
+			},
+			'args' => $args,
+		] );
+		$this->assertSame( $args, $obj->args );
+	}
+
+	/**
+	 * @covers ObjectFactory::getObjectFromSpec
+	 * @expectedException InvalidArgumentException
+	 */
+	public function testGetObjectFromInvalid() {
+		$args = [ 'a', 'b' ];
+		$obj = ObjectFactory::getObjectFromSpec( [
+			// Missing 'class' or 'factory'
+			'args' => $args,
+		] );
+	}
+
+	/**
+	 * @covers ObjectFactory::getObjectFromSpec
+	 * @dataProvider provideConstructClassInstance
+	 */
+	public function testGetObjectFromClass( $args ) {
+		$obj = ObjectFactory::getObjectFromSpec( [
+			'class' => 'ObjectFactoryTestFixture',
+			'args' => $args,
+		] );
+		$this->assertSame( $args, $obj->args );
+	}
+
 	/**
 	 * @covers ObjectFactory::constructClassInstance
 	 * @dataProvider provideConstructClassInstance
@@ -91,7 +130,7 @@ class ObjectFactoryTest extends PHPUnit_Framework_TestCase {
 		$this->assertSame( $args, $obj->args );
 	}
 
-	public function provideConstructClassInstance() {
+	public static function provideConstructClassInstance() {
 		// These args go to 11. I thought about making 10 one louder, but 11!
 		return [
 			'0 args' => [ [] ],
@@ -110,6 +149,7 @@ class ObjectFactoryTest extends PHPUnit_Framework_TestCase {
 	}
 
 	/**
+	 * @covers ObjectFactory::constructClassInstance
 	 * @expectedException InvalidArgumentException
 	 */
 	public function testNamedArgs() {
diff --git a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
index 7fe8055444..a01cc6b7b8 100644
--- a/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/CachedBagOStuffTest.php
@@ -5,6 +5,10 @@
  */
 class CachedBagOStuffTest extends PHPUnit_Framework_TestCase {
 
+	/**
+	 * @covers CachedBagOStuff::__construct
+	 * @covers CachedBagOStuff::doGet
+	 */
 	public function testGetFromBackend() {
 		$backend = new HashBagOStuff;
 		$cache = new CachedBagOStuff( $backend );
@@ -16,6 +20,10 @@ class CachedBagOStuffTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals( 'bar', $cache->get( 'foo' ), 'cached' );
 	}
 
+	/**
+	 * @covers CachedBagOStuff::set
+	 * @covers CachedBagOStuff::delete
+	 */
 	public function testSetAndDelete() {
 		$backend = new HashBagOStuff;
 		$cache = new CachedBagOStuff( $backend );
@@ -30,6 +38,10 @@ class CachedBagOStuffTest extends PHPUnit_Framework_TestCase {
 		}
 	}
 
+	/**
+	 * @covers CachedBagOStuff::set
+	 * @covers CachedBagOStuff::delete
+	 */
 	public function testWriteCacheOnly() {
 		$backend = new HashBagOStuff;
 		$cache = new CachedBagOStuff( $backend );
@@ -50,6 +62,9 @@ class CachedBagOStuffTest extends PHPUnit_Framework_TestCase {
 		$this->assertEquals( 'old', $cache->get( 'foo' ) ); // Reloaded from backend
 	}
 
+	/**
+	 * @covers CachedBagOStuff::doGet
+	 */
 	public function testCacheBackendMisses() {
 		$backend = new HashBagOStuff;
 		$cache = new CachedBagOStuff( $backend );
diff --git a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
index fce09ae58d..c4db0cf8bf 100644
--- a/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/HashBagOStuffTest.php
@@ -5,6 +5,9 @@
  */
 class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 
+	/**
+	 * @covers HashBagOStuff::delete
+	 */
 	public function testDelete() {
 		$cache = new HashBagOStuff();
 		for ( $i = 0; $i < 10; $i++ ) {
@@ -15,6 +18,9 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 		}
 	}
 
+	/**
+	 * @covers HashBagOStuff::clear
+	 */
 	public function testClear() {
 		$cache = new HashBagOStuff();
 		for ( $i = 0; $i < 10; $i++ ) {
@@ -27,6 +33,10 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 		}
 	}
 
+	/**
+	 * @covers HashBagOStuff::doGet
+	 * @covers HashBagOStuff::expire
+	 */
 	public function testExpire() {
 		$cache = new HashBagOStuff();
 		$cacheInternal = TestingAccessWrapper::newFromObject( $cache );
@@ -45,6 +55,9 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * Ensure maxKeys eviction prefers keeping new keys.
+	 *
+	 * @covers HashBagOStuff::__construct
+	 * @covers HashBagOStuff::set
 	 */
 	public function testEvictionAdd() {
 		$cache = new HashBagOStuff( [ 'maxKeys' => 10 ] );
@@ -62,6 +75,9 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 	/**
 	 * Ensure maxKeys eviction prefers recently set keys
 	 * even if the keys pre-exist.
+	 *
+	 * @covers HashBagOStuff::__construct
+	 * @covers HashBagOStuff::set
 	 */
 	public function testEvictionSet() {
 		$cache = new HashBagOStuff( [ 'maxKeys' => 3 ] );
@@ -85,6 +101,10 @@ class HashBagOStuffTest extends PHPUnit_Framework_TestCase {
 
 	/**
 	 * Ensure maxKeys eviction prefers recently retrieved keys (LRU).
+	 *
+	 * @covers HashBagOStuff::__construct
+	 * @covers HashBagOStuff::doGet
+	 * @covers HashBagOStuff::hasKey
 	 */
 	public function testEvictionGet() {
 		$cache = new HashBagOStuff( [ 'maxKeys' => 3 ] );
diff --git a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
index 6df74d6c39..38d63e341c 100644
--- a/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/MultiWriteBagOStuffTest.php
@@ -23,6 +23,10 @@ class MultiWriteBagOStuffTest extends MediaWikiTestCase {
 		] );
 	}
 
+	/**
+	 * @covers MultiWriteBagOStuff::set
+	 * @covers MultiWriteBagOStuff::doWrite
+	 */
 	public function testSetImmediate() {
 		$key = wfRandomString();
 		$value = wfRandomString();
@@ -34,6 +38,9 @@ class MultiWriteBagOStuffTest extends MediaWikiTestCase {
 		$this->assertEquals( $value, $this->cache2->get( $key ), 'Written to tier 2' );
 	}
 
+	/**
+	 * @covers MultiWriteBagOStuff
+	 */
 	public function testSyncMerge() {
 		$key = wfRandomString();
 		$value = wfRandomString();
@@ -69,6 +76,9 @@ class MultiWriteBagOStuffTest extends MediaWikiTestCase {
 		$dbw->commit();
 	}
 
+	/**
+	 * @covers MultiWriteBagOStuff::set
+	 */
 	public function testSetDelayed() {
 		$key = wfRandomString();
 		$value = wfRandomString();
diff --git a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
index 6a3cd15fcc..35005f5c6a 100644
--- a/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
+++ b/tests/phpunit/includes/libs/objectcache/WANObjectCacheTest.php
@@ -206,8 +206,10 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$value = wfRandomString();
 
 		$calls = 0;
-		$func = function() use ( &$calls, $value ) {
+		$func = function() use ( &$calls, $value, $cache, $key ) {
 			++$calls;
+			// Immediately kill any mutex rather than waiting a second
+			$cache->delete( $cache::MUTEX_KEY_PREFIX . $key );
 			return $value;
 		};
 
@@ -216,7 +218,7 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$this->assertEquals( 1, $calls, 'Value was populated' );
 
 		// Acquire a lock to verify that getWithSetCallback uses lockTSE properly
-		$this->internalCache->lock( $key, 0 );
+		$this->internalCache->add( $cache::MUTEX_KEY_PREFIX . $key, 1, 0 );
 
 		$checkKeys = [ wfRandomString() ]; // new check keys => force misses
 		$ret = $cache->getWithSetCallback( $key, 30, $func,
@@ -246,9 +248,11 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$value = wfRandomString();
 
 		$calls = 0;
-		$func = function( $oldValue, &$ttl, &$setOpts ) use ( &$calls, $value ) {
+		$func = function( $oldValue, &$ttl, &$setOpts ) use ( &$calls, $value, $cache, $key ) {
 			++$calls;
 			$setOpts['since'] = microtime( true ) - 10;
+			// Immediately kill any mutex rather than waiting a second
+			$cache->delete( $cache::MUTEX_KEY_PREFIX . $key );
 			return $value;
 		};
 
@@ -261,7 +265,7 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$this->assertEquals( 1, $calls, 'Value was generated' );
 
 		// Acquire a lock to verify that getWithSetCallback uses lockTSE properly
-		$this->internalCache->lock( $key, 0 );
+		$this->internalCache->add( $cache::MUTEX_KEY_PREFIX . $key, 1, 0 );
 		$ret = $cache->getWithSetCallback( $key, 30, $func, [ 'lockTSE' => 5 ] );
 		$this->assertEquals( $value, $ret );
 		$this->assertEquals( 1, $calls, 'Callback was not used' );
@@ -278,8 +282,10 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$busyValue = wfRandomString();
 
 		$calls = 0;
-		$func = function() use ( &$calls, $value ) {
+		$func = function() use ( &$calls, $value, $cache, $key ) {
 			++$calls;
+			// Immediately kill any mutex rather than waiting a second
+			$cache->delete( $cache::MUTEX_KEY_PREFIX . $key );
 			return $value;
 		};
 
@@ -288,7 +294,7 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$this->assertEquals( 1, $calls, 'Value was populated' );
 
 		// Acquire a lock to verify that getWithSetCallback uses busyValue properly
-		$this->internalCache->lock( $key, 0 );
+		$this->internalCache->add( $cache::MUTEX_KEY_PREFIX . $key, 1, 0 );
 
 		$checkKeys = [ wfRandomString() ]; // new check keys => force misses
 		$ret = $cache->getWithSetCallback( $key, 30, $func,
@@ -307,13 +313,13 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$this->assertEquals( $busyValue, $ret, 'Callback was not used; used busy value' );
 		$this->assertEquals( 2, $calls, 'Callback was not used; used busy value' );
 
-		$this->internalCache->unlock( $key );
+		$this->internalCache->delete( $cache::MUTEX_KEY_PREFIX . $key );
 		$ret = $cache->getWithSetCallback( $key, 30, $func,
 			[ 'lockTSE' => 30, 'busyValue' => $busyValue, 'checkKeys' => $checkKeys ] );
 		$this->assertEquals( $value, $ret, 'Callback was used; saved interim' );
 		$this->assertEquals( 3, $calls, 'Callback was used; saved interim' );
 
-		$this->internalCache->lock( $key, 0 );
+		$this->internalCache->add( $cache::MUTEX_KEY_PREFIX . $key, 1, 0 );
 		$ret = $cache->getWithSetCallback( $key, 30, $func,
 			[ 'busyValue' => $busyValue, 'checkKeys' => $checkKeys ] );
 		$this->assertEquals( $value, $ret, 'Callback was not used; used interim' );
@@ -694,4 +700,26 @@ class WANObjectCacheTest extends MediaWikiTestCase {
 		$this->cache->set( $key, $value, 30, $opts );
 		$this->assertEquals( false, $this->cache->get( $key ), "Pending value not written." );
 	}
+
+	public function testMcRouterSupport() {
+		$localBag = $this->getMock( 'EmptyBagOStuff', [ 'set', 'delete' ] );
+		$localBag->expects( $this->never() )->method( 'set' );
+		$localBag->expects( $this->never() )->method( 'delete' );
+		$wanCache = new WANObjectCache( [
+			'cache' => $localBag,
+			'pool' => 'testcache-hash',
+			'relayer' => new EventRelayerNull( [] )
+		] );
+		$valFunc = function () {
+			return 1;
+		};
+
+		// None of these should use broadcasting commands (e.g. SET, DELETE)
+		$wanCache->get( 'x' );
+		$wanCache->get( 'x', $ctl, [ 'check1' ] );
+		$wanCache->getMulti( [ 'x', 'y' ] );
+		$wanCache->getMulti( [ 'x', 'y' ], $ctls, [ 'check2' ] );
+		$wanCache->getWithSetCallback( 'p', 30, $valFunc );
+		$wanCache->getCheckKeyTime( 'zzz' );
+	}
 }
diff --git a/tests/phpunit/includes/search/ParserOutputSearchDataExtractorTest.php b/tests/phpunit/includes/search/ParserOutputSearchDataExtractorTest.php
new file mode 100644
index 0000000000..69d0b76f25
--- /dev/null
+++ b/tests/phpunit/includes/search/ParserOutputSearchDataExtractorTest.php
@@ -0,0 +1,70 @@
+<?php
+
+use MediaWiki\Search\ParserOutputSearchDataExtractor;
+
+/**
+ * @group Search
+ * @covers MediaWiki\Search\ParserOutputSearchDataExtractor
+ */
+class ParserOutputSearchDataExtractorTest extends MediaWikiLangTestCase {
+
+	public function testGetCategories() {
+		$categories = [
+			'Foo_bar' => 'Bar',
+			'New_page' => ''
+		];
+
+		$parserOutput = new ParserOutput( '', [], $categories );
+
+		$searchDataExtractor = new ParserOutputSearchDataExtractor();
+
+		$this->assertEquals(
+			[ 'Foo bar', 'New page' ],
+			$searchDataExtractor->getCategories( $parserOutput )
+		);
+	}
+
+	public function testGetExternalLinks() {
+		$parserOutput = new ParserOutput();
+
+		$parserOutput->addExternalLink( 'https://foo' );
+		$parserOutput->addExternalLink( 'https://bar' );
+
+		$searchDataExtractor = new ParserOutputSearchDataExtractor();
+
+		$this->assertEquals(
+			[ 'https://foo', 'https://bar' ],
+			$searchDataExtractor->getExternalLinks( $parserOutput )
+		);
+	}
+
+	public function testGetOutgoingLinks() {
+		$parserOutput = new ParserOutput();
+
+		$parserOutput->addLink( Title::makeTitle( NS_MAIN, 'Foo_bar' ), 1 );
+		$parserOutput->addLink( Title::makeTitle( NS_HELP, 'Contents' ), 2 );
+
+		$searchDataExtractor = new ParserOutputSearchDataExtractor();
+
+		// this indexes links with db key
+		$this->assertEquals(
+			[ 'Foo_bar', 'Help:Contents' ],
+			$searchDataExtractor->getOutgoingLinks( $parserOutput )
+		);
+	}
+
+	public function testGetTemplates() {
+		$title = Title::makeTitle( NS_TEMPLATE, 'Cite_news' );
+
+		$parserOutput = new ParserOutput();
+		$parserOutput->addTemplate( $title, 10, 100 );
+
+		$searchDataExtractor = new ParserOutputSearchDataExtractor();
+
+		$this->assertEquals(
+			[ 'Template:Cite news' ],
+			$searchDataExtractor->getTemplates( $parserOutput )
+		);
+	}
+
+}
diff --git a/tests/phpunit/includes/search/SearchEngineTest.php b/tests/phpunit/includes/search/SearchEngineTest.php
index 081cb38830..0b34b6f9b5 100644
--- a/tests/phpunit/includes/search/SearchEngineTest.php
+++ b/tests/phpunit/includes/search/SearchEngineTest.php
@@ -172,11 +172,17 @@ class SearchEngineTest extends MediaWikiLangTestCase {
 					$name,
 					$type
 				] )->getMock();
+
 			$mockField->expects( $this->any() )->method( 'getMapping' )->willReturn( [
 				'testData' => 'test',
 				'name' => $name,
 				'type' => $type,
 			] );
+
+			$mockField->expects( $this->any() )
+				->method( 'merge' )
+				->willReturn( $mockField );
+
 			return $mockField;
 		};
 
diff --git a/tests/phpunit/includes/user/UserTest.php b/tests/phpunit/includes/user/UserTest.php
index bd076ba30f..985554b86d 100644
--- a/tests/phpunit/includes/user/UserTest.php
+++ b/tests/phpunit/includes/user/UserTest.php
@@ -92,6 +92,57 @@ class UserTest extends MediaWikiTestCase {
 		$this->assertNotContains( 'nukeworld', $rights );
 	}
 
+	/**
+	 * @covers User::getRights
+	 */
+	public function testUserGetRightsHooks() {
+		$user = new User;
+		$user->addGroup( 'unittesters' );
+		$user->addGroup( 'testwriters' );
+		$userWrapper = TestingAccessWrapper::newFromObject( $user );
+
+		$rights = $user->getRights();
+		$this->assertContains( 'test', $rights, 'sanity check' );
+		$this->assertContains( 'runtest', $rights, 'sanity check' );
+		$this->assertContains( 'writetest', $rights, 'sanity check' );
+		$this->assertNotContains( 'nukeworld', $rights, 'sanity check' );
+
+		// Add a hook manipluating the rights
+		$this->mergeMwGlobalArrayValue( 'wgHooks', [ 'UserGetRights' => [ function ( $user, &$rights ) {
+			$rights[] = 'nukeworld';
+			$rights = array_diff( $rights, [ 'writetest' ] );
+		} ] ] );
+
+		$userWrapper->mRights = null;
+		$rights = $user->getRights();
+		$this->assertContains( 'test', $rights );
+		$this->assertContains( 'runtest', $rights );
+		$this->assertNotContains( 'writetest', $rights );
+		$this->assertContains( 'nukeworld', $rights );
+
+		// Add a Session that limits rights
+		$mock = $this->getMockBuilder( stdclass::class )
+			->setMethods( [ 'getAllowedUserRights', 'deregisterSession', 'getSessionId' ] )
+			->getMock();
+		$mock->method( 'getAllowedUserRights' )->willReturn( [ 'test', 'writetest' ] );
+		$mock->method( 'getSessionId' )->willReturn(
+			new MediaWiki\Session\SessionId( str_repeat( 'X', 32 ) )
+		);
+		$session = MediaWiki\Session\TestUtils::getDummySession( $mock );
+		$mockRequest = $this->getMockBuilder( FauxRequest::class )
+			->setMethods( [ 'getSession' ] )
+			->getMock();
+		$mockRequest->method( 'getSession' )->willReturn( $session );
+		$userWrapper->mRequest = $mockRequest;
+
+		$userWrapper->mRights = null;
+		$rights = $user->getRights();
+		$this->assertContains( 'test', $rights );
+		$this->assertNotContains( 'runtest', $rights );
+		$this->assertNotContains( 'writetest', $rights );
+		$this->assertNotContains( 'nukeworld', $rights );
+	}
+
 	/**
 	 * @dataProvider provideGetGroupsWithPermission
 	 * @covers User::getGroupsWithPermission
diff --git a/tests/phpunit/specials/SpecialSearchTest.php b/tests/phpunit/specials/SpecialSearchTest.php
new file mode 100644
index 0000000000..20e88f5a5b
--- /dev/null
+++ b/tests/phpunit/specials/SpecialSearchTest.php
@@ -0,0 +1,23 @@
+<?php
+
+class SpecialSearchText extends \PHPUnit_Framework_TestCase {
+	public function testSubPageRedirect() {
+		$ctx = new RequestContext;
+
+		SpecialPageFactory::executePath(
+			Title::newFromText( 'Special:Search/foo_bar' ),
+			$ctx
+		);
+		$url = $ctx->getOutput()->getRedirect();
+		// some older versions of hhvm have a bug that doesn't parse relative
+		// urls with a port, so help it out a little bit.
+		// https://github.com/facebook/hhvm/issues/7136
+		$url = wfExpandUrl( $url, PROTO_CURRENT );
+
+		$parts = parse_url( $url );
+		$this->assertEquals( '/w/index.php', $parts['path'] );
+		parse_str( $parts['query'], $query );
+		$this->assertEquals( 'Special:Search', $query['title'] );
+		$this->assertEquals( 'foo bar', $query['search'] );
+	}
+}
diff --git a/tests/phpunit/structure/ExtensionJsonValidationTest.php b/tests/phpunit/structure/ExtensionJsonValidationTest.php
index 275c0d1794..711eab647e 100644
--- a/tests/phpunit/structure/ExtensionJsonValidationTest.php
+++ b/tests/phpunit/structure/ExtensionJsonValidationTest.php
@@ -74,11 +74,9 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase {
 			$version <= ExtensionRegistry::MANIFEST_VERSION,
 			"$path is using a non-supported schema version"
 		);
-		$retriever = new JsonSchema\Uri\UriRetriever();
-		$schema = $retriever->retrieve( 'file://' . $schemaPath );
 
-		$validator = new JsonSchema\Validator();
-		$validator->check( $data, $schema );
+		$validator = new JsonSchema\Validator;
+		$validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] );
 		if ( $validator->isValid() ) {
 			// All good.
 			$this->assertTrue( true );
diff --git a/tests/phpunit/structure/ResourcesTest.php b/tests/phpunit/structure/ResourcesTest.php
index 6446416109..86ce53f339 100644
--- a/tests/phpunit/structure/ResourcesTest.php
+++ b/tests/phpunit/structure/ResourcesTest.php
@@ -86,6 +86,25 @@ class ResourcesTest extends MediaWikiTestCase {
 		}
 	}
 
+	/**
+	 * Verify that all specified messages actually exist.
+	 */
+	public function testMissingMessages() {
+		$data = self::getAllModules();
+		$validDeps = array_keys( $data['modules'] );
+		$lang = Language::factory( 'en' );
+
+		/** @var ResourceLoaderModule $module */
+		foreach ( $data['modules'] as $moduleName => $module ) {
+			foreach ( $module->getMessages() as $msgKey ) {
+				$this->assertTrue(
+					wfMessage( $msgKey )->useDatabase( false )->inLanguage( $lang )->exists(),
+					"Message '$msgKey' required by '$moduleName' must exist"
+				);
+			}
+		}
+	}
+
 	/**
 	 * Verify that all dependencies of all modules are always satisfiable with the 'targets' defined
 	 * for the involved modules.
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index 95f28c85b9..e30088dbc8 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -74,6 +74,7 @@ return [
 			'tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.template.mustache.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.test.js',
+			'tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.html.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js',
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
new file mode 100644
index 0000000000..41d800a0a7
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@ -0,0 +1,685 @@
+( function ( mw, $ ) {
+	QUnit.module( 'mediawiki (mw.loader)' );
+
+	mw.loader.addSource(
+		'testloader',
+		QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/load.mock.php' )
+	);
+
+	/**
+	 * The sync style load test (for @import). This is, in a way, also an open bug for
+	 * ResourceLoader ("execute js after styles are loaded"), but browsers don't offer a
+	 * way to get a callback from when a stylesheet is loaded (that is, including any
+	 * `@import` rules inside). To work around this, we'll have a little time loop to check
+	 * if the styles apply.
+	 *
+	 * Note: This test originally used new Image() and onerror to get a callback
+	 * when the url is loaded, but that is fragile since it doesn't monitor the
+	 * same request as the css @import, and Safari 4 has issues with
+	 * onerror/onload not being fired at all in weird cases like this.
+	 */
+	function assertStyleAsync( assert, $element, prop, val, fn ) {
+		var styleTestStart,
+			el = $element.get( 0 ),
+			styleTestTimeout = ( QUnit.config.testTimeout || 5000 ) - 200;
+
+		function isCssImportApplied() {
+			// Trigger reflow, repaint, redraw, whatever (cross-browser)
+			var x = $element.css( 'height' );
+			x = el.innerHTML;
+			el.className = el.className;
+			x = document.documentElement.clientHeight;
+
+			return $element.css( prop ) === val;
+		}
+
+		function styleTestLoop() {
+			var styleTestSince = new Date().getTime() - styleTestStart;
+			// If it is passing or if we timed out, run the real test and stop the loop
+			if ( isCssImportApplied() || styleTestSince > styleTestTimeout ) {
+				assert.equal( $element.css( prop ), val,
+					'style "' + prop + ': ' + val + '" from url is applied (after ' + styleTestSince + 'ms)'
+				);
+
+				if ( fn ) {
+					fn();
+				}
+
+				return;
+			}
+			// Otherwise, keep polling
+			setTimeout( styleTestLoop );
+		}
+
+		// Start the loop
+		styleTestStart = new Date().getTime();
+		styleTestLoop();
+	}
+
+	function urlStyleTest( selector, prop, val ) {
+		return QUnit.fixurl(
+			mw.config.get( 'wgScriptPath' ) +
+				'/tests/qunit/data/styleTest.css.php?' +
+				$.param( {
+					selector: selector,
+					prop: prop,
+					val: val
+				} )
+		);
+	}
+
+	QUnit.test( 'Basic', 2, function ( assert ) {
+		var isAwesomeDone;
+
+		mw.loader.testCallback = function () {
+			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module is.awesome: isAwesomeDone should still be undefined' );
+			isAwesomeDone = true;
+		};
+
+		mw.loader.implement( 'test.callback', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
+
+		return mw.loader.using( 'test.callback', function () {
+			assert.strictEqual( isAwesomeDone, true, 'test.callback module should\'ve caused isAwesomeDone to be true' );
+			delete mw.loader.testCallback;
+
+		}, function () {
+			assert.ok( false, 'Error callback fired while loader.using "test.callback" module' );
+		} );
+	} );
+
+	QUnit.test( 'Object method as module name', 2, function ( assert ) {
+		var isAwesomeDone;
+
+		mw.loader.testCallback = function () {
+			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module hasOwnProperty: isAwesomeDone should still be undefined' );
+			isAwesomeDone = true;
+		};
+
+		mw.loader.implement( 'hasOwnProperty', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ], {}, {} );
+
+		return mw.loader.using( 'hasOwnProperty', function () {
+			assert.strictEqual( isAwesomeDone, true, 'hasOwnProperty module should\'ve caused isAwesomeDone to be true' );
+			delete mw.loader.testCallback;
+
+		}, function () {
+			assert.ok( false, 'Error callback fired while loader.using "hasOwnProperty" module' );
+		} );
+	} );
+
+	QUnit.test( '.using( .. ) Promise', 2, function ( assert ) {
+		var isAwesomeDone;
+
+		mw.loader.testCallback = function () {
+			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module is.awesome: isAwesomeDone should still be undefined' );
+			isAwesomeDone = true;
+		};
+
+		mw.loader.implement( 'test.promise', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
+
+		return mw.loader.using( 'test.promise' )
+		.done( function () {
+			assert.strictEqual( isAwesomeDone, true, 'test.promise module should\'ve caused isAwesomeDone to be true' );
+			delete mw.loader.testCallback;
+
+		} )
+		.fail( function () {
+			assert.ok( false, 'Error callback fired while loader.using "test.promise" module' );
+		} );
+	} );
+
+	QUnit.test( '.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-a"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.a',
+			function () {
+				assert.equal(
+					$element.css( 'float' ),
+					'right',
+					'style is applied'
+				);
+			},
+			{
+				all: '.mw-test-implement-a { float: right; }'
+			}
+		);
+
+		return mw.loader.using( 'test.implement.a' );
+	} );
+
+	QUnit.test( '.implement( styles={ "url": { <media>: [url, ..] } } )', 7, function ( assert ) {
+		var $element1 = $( '<div class="mw-test-implement-b1"></div>' ).appendTo( '#qunit-fixture' ),
+			$element2 = $( '<div class="mw-test-implement-b2"></div>' ).appendTo( '#qunit-fixture' ),
+			$element3 = $( '<div class="mw-test-implement-b3"></div>' ).appendTo( '#qunit-fixture' ),
+			done = assert.async();
+
+		assert.notEqual(
+			$element1.css( 'text-align' ),
+			'center',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element2.css( 'float' ),
+			'left',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element3.css( 'text-align' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.b',
+			function () {
+				// Note: done() must only be called when the entire test is
+				// complete. So, make sure that we don't start until *both*
+				// assertStyleAsync calls have completed.
+				var pending = 2;
+				assertStyleAsync( assert, $element2, 'float', 'left', function () {
+					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
+
+					pending--;
+					if ( pending === 0 ) {
+						done();
+					}
+				} );
+				assertStyleAsync( assert, $element3, 'float', 'right', function () {
+					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
+
+					pending--;
+					if ( pending === 0 ) {
+						done();
+					}
+				} );
+			},
+			{
+				url: {
+					print: [ urlStyleTest( '.mw-test-implement-b1', 'text-align', 'center' ) ],
+					screen: [
+						// bug 40834: Make sure it actually works with more than 1 stylesheet reference
+						urlStyleTest( '.mw-test-implement-b2', 'float', 'left' ),
+						urlStyleTest( '.mw-test-implement-b3', 'float', 'right' )
+					]
+				}
+			}
+		);
+
+		mw.loader.load( 'test.implement.b' );
+	} );
+
+	// Backwards compatibility
+	QUnit.test( '.implement( styles={ <media>: text } ) (back-compat)', 2, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-c"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.c',
+			function () {
+				assert.equal(
+					$element.css( 'float' ),
+					'right',
+					'style is applied'
+				);
+			},
+			{
+				all: '.mw-test-implement-c { float: right; }'
+			}
+		);
+
+		return mw.loader.using( 'test.implement.c' );
+	} );
+
+	// Backwards compatibility
+	QUnit.test( '.implement( styles={ <media>: [url, ..] } ) (back-compat)', 4, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-d"></div>' ).appendTo( '#qunit-fixture' ),
+			$element2 = $( '<div class="mw-test-implement-d2"></div>' ).appendTo( '#qunit-fixture' ),
+			done = assert.async();
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element2.css( 'text-align' ),
+			'center',
+			'style is clear'
+		);
+
+		mw.loader.implement(
+			'test.implement.d',
+			function () {
+				assertStyleAsync( assert, $element, 'float', 'right', function () {
+					assert.notEqual( $element2.css( 'text-align' ), 'center', 'print style is not applied (bug 40500)' );
+					done();
+				} );
+			},
+			{
+				all: [ urlStyleTest( '.mw-test-implement-d', 'float', 'right' ) ],
+				print: [ urlStyleTest( '.mw-test-implement-d2', 'text-align', 'center' ) ]
+			}
+		);
+
+		mw.loader.load( 'test.implement.d' );
+	} );
+
+	// @import (bug 31676)
+	QUnit.test( '.implement( styles has @import )', 7, function ( assert ) {
+		var isJsExecuted, $element,
+			done = assert.async();
+
+		mw.loader.implement(
+			'test.implement.import',
+			function () {
+				assert.strictEqual( isJsExecuted, undefined, 'script not executed multiple times' );
+				isJsExecuted = true;
+
+				assert.equal( mw.loader.getState( 'test.implement.import' ), 'executing', 'module state during implement() script execution' );
+
+				$element = $( '<div class="mw-test-implement-import">Foo bar</div>' ).appendTo( '#qunit-fixture' );
+
+				assert.equal( mw.msg( 'test-foobar' ), 'Hello Foobar, $1!', 'messages load before script execution' );
+
+				assertStyleAsync( assert, $element, 'float', 'right', function () {
+					assert.equal( $element.css( 'text-align' ), 'center',
+						'CSS styles after the @import rule are working'
+					);
+
+					done();
+				} );
+			},
+			{
+				css: [
+					'@import url(\''
+						+ urlStyleTest( '.mw-test-implement-import', 'float', 'right' )
+						+ '\');\n'
+						+ '.mw-test-implement-import { text-align: center; }'
+				]
+			},
+			{
+				'test-foobar': 'Hello Foobar, $1!'
+			}
+		);
+
+		mw.loader.using( 'test.implement.import' ).always( function () {
+			assert.strictEqual( isJsExecuted, true, 'script executed' );
+			assert.equal( mw.loader.getState( 'test.implement.import' ), 'ready', 'module state after script execution' );
+		} );
+	} );
+
+	QUnit.test( '.implement( dependency with styles )', 4, function ( assert ) {
+		var $element = $( '<div class="mw-test-implement-e"></div>' ).appendTo( '#qunit-fixture' ),
+			$element2 = $( '<div class="mw-test-implement-e2"></div>' ).appendTo( '#qunit-fixture' );
+
+		assert.notEqual(
+			$element.css( 'float' ),
+			'right',
+			'style is clear'
+		);
+		assert.notEqual(
+			$element2.css( 'float' ),
+			'left',
+			'style is clear'
+		);
+
+		mw.loader.register( [
+			[ 'test.implement.e', '0', [ 'test.implement.e2' ] ],
+			[ 'test.implement.e2', '0' ]
+		] );
+
+		mw.loader.implement(
+			'test.implement.e',
+			function () {
+				assert.equal(
+					$element.css( 'float' ),
+					'right',
+					'Depending module\'s style is applied'
+				);
+			},
+			{
+				all: '.mw-test-implement-e { float: right; }'
+			}
+		);
+
+		mw.loader.implement(
+			'test.implement.e2',
+			function () {
+				assert.equal(
+					$element2.css( 'float' ),
+					'left',
+					'Dependency\'s style is applied'
+				);
+			},
+			{
+				all: '.mw-test-implement-e2 { float: left; }'
+			}
+		);
+
+		return mw.loader.using( 'test.implement.e' );
+	} );
+
+	QUnit.test( '.implement( only scripts )', 1, function ( assert ) {
+		mw.loader.implement( 'test.onlyscripts', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.onlyscripts' ), 'ready' );
+	} );
+
+	QUnit.test( '.implement( only messages )', 2, function ( assert ) {
+		assert.assertFalse( mw.messages.exists( 'bug_29107' ), 'Verify that the test message doesn\'t exist yet' );
+
+		// jscs: disable requireCamelCaseOrUpperCaseIdentifiers
+		mw.loader.implement( 'test.implement.msgs', [], {}, { bug_29107: 'loaded' } );
+		// jscs: enable requireCamelCaseOrUpperCaseIdentifiers
+
+		return mw.loader.using( 'test.implement.msgs', function () {
+			assert.ok( mw.messages.exists( 'bug_29107' ), 'Bug 29107: messages-only module should implement ok' );
+		}, function () {
+			assert.ok( false, 'Error callback fired while implementing "test.implement.msgs" module' );
+		} );
+	} );
+
+	QUnit.test( '.implement( empty )', 1, function ( assert ) {
+		mw.loader.implement( 'test.empty' );
+		assert.strictEqual( mw.loader.getState( 'test.empty' ), 'ready' );
+	} );
+
+	QUnit.test( 'Broken indirect dependency', 4, function ( assert ) {
+		// don't emit an error event
+		this.sandbox.stub( mw, 'track' );
+
+		mw.loader.register( [
+			[ 'test.module1', '0' ],
+			[ 'test.module2', '0', [ 'test.module1' ] ],
+			[ 'test.module3', '0', [ 'test.module2' ] ]
+		] );
+		mw.loader.implement( 'test.module1', function () {
+			throw new Error( 'expected' );
+		}, {}, {} );
+		assert.strictEqual( mw.loader.getState( 'test.module1' ), 'error', 'Expected "error" state for test.module1' );
+		assert.strictEqual( mw.loader.getState( 'test.module2' ), 'error', 'Expected "error" state for test.module2' );
+		assert.strictEqual( mw.loader.getState( 'test.module3' ), 'error', 'Expected "error" state for test.module3' );
+
+		assert.strictEqual( mw.track.callCount, 1 );
+	} );
+
+	QUnit.test( 'Circular dependency', 1, function ( assert ) {
+		mw.loader.register( [
+			[ 'test.circle1', '0', [ 'test.circle2' ] ],
+			[ 'test.circle2', '0', [ 'test.circle3' ] ],
+			[ 'test.circle3', '0', [ 'test.circle1' ] ]
+		] );
+		assert.throws( function () {
+			mw.loader.using( 'test.circle3' );
+		}, /Circular/, 'Detect circular dependency' );
+	} );
+
+	QUnit.test( 'Out-of-order implementation', 9, function ( assert ) {
+		mw.loader.register( [
+			[ 'test.module4', '0' ],
+			[ 'test.module5', '0', [ 'test.module4' ] ],
+			[ 'test.module6', '0', [ 'test.module5' ] ]
+		] );
+		mw.loader.implement( 'test.module4', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'registered', 'Expected "registered" state for test.module6' );
+		mw.loader.implement( 'test.module6', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'loaded', 'Expected "loaded" state for test.module6' );
+		mw.loader.implement( 'test.module5', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
+		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'ready', 'Expected "ready" state for test.module5' );
+		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'ready', 'Expected "ready" state for test.module6' );
+	} );
+
+	QUnit.test( 'Missing dependency', 13, function ( assert ) {
+		mw.loader.register( [
+			[ 'test.module7', '0' ],
+			[ 'test.module8', '0', [ 'test.module7' ] ],
+			[ 'test.module9', '0', [ 'test.module8' ] ]
+		] );
+		mw.loader.implement( 'test.module8', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'registered', 'Expected "registered" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'loaded', 'Expected "loaded" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'registered', 'Expected "registered" state for test.module9' );
+		mw.loader.state( 'test.module7', 'missing' );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
+		mw.loader.implement( 'test.module9', function () {} );
+		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
+		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
+		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
+		mw.loader.using(
+			[ 'test.module7' ],
+			function () {
+				assert.ok( false, 'Success fired despite missing dependency' );
+				assert.ok( true, 'QUnit expected() count dummy' );
+			},
+			function ( e, dependencies ) {
+				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
+				assert.deepEqual( dependencies, [ 'test.module7' ], 'Error callback called with module test.module7' );
+			}
+		);
+		mw.loader.using(
+			[ 'test.module9' ],
+			function () {
+				assert.ok( false, 'Success fired despite missing dependency' );
+				assert.ok( true, 'QUnit expected() count dummy' );
+			},
+			function ( e, dependencies ) {
+				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
+				dependencies.sort();
+				assert.deepEqual(
+					dependencies,
+					[ 'test.module7', 'test.module8', 'test.module9' ],
+					'Error callback called with all three modules as dependencies'
+				);
+			}
+		);
+	} );
+
+	QUnit.test( 'Dependency handling', 5, function ( assert ) {
+		var done = assert.async();
+		mw.loader.register( [
+			// [module, version, dependencies, group, source]
+			[ 'testMissing', '1', [], null, 'testloader' ],
+			[ 'testUsesMissing', '1', [ 'testMissing' ], null, 'testloader' ],
+			[ 'testUsesNestedMissing', '1', [ 'testUsesMissing' ], null, 'testloader' ]
+		] );
+
+		function verifyModuleStates() {
+			assert.equal( mw.loader.getState( 'testMissing' ), 'missing', 'Module not known to server must have state "missing"' );
+			assert.equal( mw.loader.getState( 'testUsesMissing' ), 'error', 'Module with missing dependency must have state "error"' );
+			assert.equal( mw.loader.getState( 'testUsesNestedMissing' ), 'error', 'Module with indirect missing dependency must have state "error"' );
+		}
+
+		mw.loader.using( [ 'testUsesNestedMissing' ],
+			function () {
+				assert.ok( false, 'Error handler should be invoked.' );
+				assert.ok( true ); // Dummy to reach QUnit expect()
+
+				verifyModuleStates();
+
+				done();
+			},
+			function ( e, badmodules ) {
+				assert.ok( true, 'Error handler should be invoked.' );
+				// As soon as server spits out state('testMissing', 'missing');
+				// it will bubble up and trigger the error callback.
+				// Therefor the badmodules array is not testUsesMissing or testUsesNestedMissing.
+				assert.deepEqual( badmodules, [ 'testMissing' ], 'Bad modules as expected.' );
+
+				verifyModuleStates();
+
+				done();
+			}
+		);
+	} );
+
+	QUnit.test( 'Skip-function handling', 5, function ( assert ) {
+		mw.loader.register( [
+			// [module, version, dependencies, group, source, skip]
+			[ 'testSkipped', '1', [], null, 'testloader', 'return true;' ],
+			[ 'testNotSkipped', '1', [], null, 'testloader', 'return false;' ],
+			[ 'testUsesSkippable', '1', [ 'testSkipped', 'testNotSkipped' ], null, 'testloader' ]
+		] );
+
+		function verifyModuleStates() {
+			assert.equal( mw.loader.getState( 'testSkipped' ), 'ready', 'Module is ready when skipped' );
+			assert.equal( mw.loader.getState( 'testNotSkipped' ), 'ready', 'Module is ready when not skipped but loaded' );
+			assert.equal( mw.loader.getState( 'testUsesSkippable' ), 'ready', 'Module is ready when skippable dependencies are ready' );
+		}
+
+		return mw.loader.using( [ 'testUsesSkippable' ],
+			function () {
+				assert.ok( true, 'Success handler should be invoked.' );
+				assert.ok( true ); // Dummy to match error handler and reach QUnit expect()
+
+				verifyModuleStates();
+			},
+			function ( e, badmodules ) {
+				assert.ok( false, 'Error handler should not be invoked.' );
+				assert.deepEqual( badmodules, [], 'Bad modules as expected.' );
+
+				verifyModuleStates();
+			}
+		);
+	} );
+
+	QUnit.asyncTest( '.load( "//protocol-relative" ) - T32825', 2, function ( assert ) {
+		// This bug was actually already fixed in 1.18 and later when discovered in 1.17.
+		// Test is for regressions!
+
+		// Forge a URL to the test callback script
+		var target = QUnit.fixurl(
+			mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
+		);
+
+		// Confirm that mw.loader.load() works with protocol-relative URLs
+		target = target.replace( /https?:/, '' );
+
+		assert.equal( target.slice( 0, 2 ), '//',
+			'URL must be relative to test relative URLs!'
+		);
+
+		// Async!
+		// The target calls QUnit.start
+		mw.loader.load( target );
+	} );
+
+	QUnit.asyncTest( '.load( "/absolute-path" )', 2, function ( assert ) {
+		// Forge a URL to the test callback script
+		var target = QUnit.fixurl(
+			mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
+		);
+
+		// Confirm that mw.loader.load() works with absolute-paths (relative to current hostname)
+		assert.equal( target.slice( 0, 1 ), '/', 'URL is relative to document root' );
+
+		// Async!
+		// The target calls QUnit.start
+		mw.loader.load( target );
+	} );
+
+	QUnit.test( 'Executing race - T112232', 2, function ( assert ) {
+		var done = false;
+
+		// The red herring schedules its CSS buffer first. In T112232, a bug in the
+		// state machine would cause the job for testRaceLoadMe to run with an earlier job.
+		mw.loader.implement(
+			'testRaceRedHerring',
+			function () {},
+			{ css: [ '.mw-testRaceRedHerring {}' ] }
+		);
+		mw.loader.implement(
+			'testRaceLoadMe',
+			function () {
+				done = true;
+			},
+			{ css: [ '.mw-testRaceLoadMe { float: left; }' ] }
+		);
+
+		mw.loader.load( [ 'testRaceRedHerring', 'testRaceLoadMe' ] );
+		return mw.loader.using( 'testRaceLoadMe', function () {
+			assert.strictEqual( done, true, 'script ran' );
+			assert.strictEqual( mw.loader.getState( 'testRaceLoadMe' ), 'ready', 'state' );
+		} );
+	} );
+
+	QUnit.test( 'require()', 6, function ( assert ) {
+		mw.loader.register( [
+			[ 'test.require1', '0' ],
+			[ 'test.require2', '0' ],
+			[ 'test.require3', '0' ],
+			[ 'test.require4', '0', [ 'test.require3' ] ]
+		] );
+		mw.loader.implement( 'test.require1', function () {} );
+		mw.loader.implement( 'test.require2', function ( $, jQuery, require, module ) {
+			module.exports = 1;
+		} );
+		mw.loader.implement( 'test.require3', function ( $, jQuery, require, module ) {
+			module.exports = function () {
+				return 'hello world';
+			};
+		} );
+		mw.loader.implement( 'test.require4', function ( $, jQuery, require, module ) {
+			var other = require( 'test.require3' );
+			module.exports = {
+				pizza: function () {
+					return other();
+				}
+			};
+		} );
+		return mw.loader.using( [ 'test.require1', 'test.require2', 'test.require3', 'test.require4' ] )
+		.then( function ( require ) {
+			var module1, module2, module3, module4;
+
+			module1 = require( 'test.require1' );
+			module2 = require( 'test.require2' );
+			module3 = require( 'test.require3' );
+			module4 = require( 'test.require4' );
+
+			assert.strictEqual( typeof module1, 'object', 'export of module with no export' );
+			assert.strictEqual( module2, 1, 'export a number' );
+			assert.strictEqual( module3(), 'hello world', 'export a function' );
+			assert.strictEqual( typeof module4.pizza, 'function', 'export an object' );
+			assert.strictEqual( module4.pizza(), 'hello world', 'module can require other modules' );
+
+			assert.throws( function () {
+				require( '_badmodule' );
+			}, /is not loaded/, 'Requesting non-existent modules throws error.' );
+		} );
+	} );
+
+	QUnit.test( 'require() in debug mode', 1, function ( assert ) {
+		var path = mw.config.get( 'wgScriptPath' );
+		mw.loader.register( [
+			[ 'test.require.define', '0' ],
+			[ 'test.require.callback', '0', [ 'test.require.define' ] ]
+		] );
+		mw.loader.implement( 'test.require.callback', [ QUnit.fixurl( path + '/tests/qunit/data/requireCallMwLoaderTestCallback.js' ) ] );
+		mw.loader.implement( 'test.require.define', [ QUnit.fixurl( path + '/tests/qunit/data/defineCallMwLoaderTestCallback.js' ) ] );
+
+		return mw.loader.using( 'test.require.callback' ).then( function ( require ) {
+			var exported = require( 'test.require.callback' );
+			assert.strictEqual( exported, 'Require worked.Define worked.',
+				'module.exports worked in debug mode' );
+		}, function () {
+			assert.ok( false, 'Error callback fired while loader.using "test.require.callback" module' );
+		} );
+	} );
+
+}( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index baec37c9e2..ab463a9720 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1,5 +1,5 @@
 /*jshint -W024 */
-( function ( mw, $ ) {
+( function ( mw ) {
 	var specialCharactersPageName,
 		// Can't mock SITENAME since jqueryMsg caches it at load
 		siteName = mw.config.get( 'wgSiteName' );
@@ -32,11 +32,6 @@
 		}
 	} ) );
 
-	mw.loader.addSource(
-		'testloader',
-		QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/load.mock.php' )
-	);
-
 	QUnit.test( 'Initial check', 8, function ( assert ) {
 		assert.ok( window.jQuery, 'jQuery defined' );
 		assert.ok( window.$, '$ defined' );
@@ -349,619 +344,6 @@
 		assert.equal( mw.msg( 'int-msg' ), 'Some Other Message', 'int is resolved' );
 	} );
 
-	/**
-	 * The sync style load test (for @import). This is, in a way, also an open bug for
-	 * ResourceLoader ("execute js after styles are loaded"), but browsers don't offer a
-	 * way to get a callback from when a stylesheet is loaded (that is, including any
-	 * `@import` rules inside). To work around this, we'll have a little time loop to check
-	 * if the styles apply.
-	 *
-	 * Note: This test originally used new Image() and onerror to get a callback
-	 * when the url is loaded, but that is fragile since it doesn't monitor the
-	 * same request as the css @import, and Safari 4 has issues with
-	 * onerror/onload not being fired at all in weird cases like this.
-	 */
-	function assertStyleAsync( assert, $element, prop, val, fn ) {
-		var styleTestStart,
-			el = $element.get( 0 ),
-			styleTestTimeout = ( QUnit.config.testTimeout || 5000 ) - 200;
-
-		function isCssImportApplied() {
-			// Trigger reflow, repaint, redraw, whatever (cross-browser)
-			var x = $element.css( 'height' );
-			x = el.innerHTML;
-			el.className = el.className;
-			x = document.documentElement.clientHeight;
-
-			return $element.css( prop ) === val;
-		}
-
-		function styleTestLoop() {
-			var styleTestSince = new Date().getTime() - styleTestStart;
-			// If it is passing or if we timed out, run the real test and stop the loop
-			if ( isCssImportApplied() || styleTestSince > styleTestTimeout ) {
-				assert.equal( $element.css( prop ), val,
-					'style "' + prop + ': ' + val + '" from url is applied (after ' + styleTestSince + 'ms)'
-				);
-
-				if ( fn ) {
-					fn();
-				}
-
-				return;
-			}
-			// Otherwise, keep polling
-			setTimeout( styleTestLoop );
-		}
-
-		// Start the loop
-		styleTestStart = new Date().getTime();
-		styleTestLoop();
-	}
-
-	function urlStyleTest( selector, prop, val ) {
-		return QUnit.fixurl(
-			mw.config.get( 'wgScriptPath' ) +
-				'/tests/qunit/data/styleTest.css.php?' +
-				$.param( {
-					selector: selector,
-					prop: prop,
-					val: val
-				} )
-		);
-	}
-
-	QUnit.test( 'mw.loader', 2, function ( assert ) {
-		var isAwesomeDone;
-
-		mw.loader.testCallback = function () {
-			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module is.awesome: isAwesomeDone should still be undefined' );
-			isAwesomeDone = true;
-		};
-
-		mw.loader.implement( 'test.callback', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
-
-		return mw.loader.using( 'test.callback', function () {
-			assert.strictEqual( isAwesomeDone, true, 'test.callback module should\'ve caused isAwesomeDone to be true' );
-			delete mw.loader.testCallback;
-
-		}, function () {
-			assert.ok( false, 'Error callback fired while loader.using "test.callback" module' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader with Object method as module name', 2, function ( assert ) {
-		var isAwesomeDone;
-
-		mw.loader.testCallback = function () {
-			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module hasOwnProperty: isAwesomeDone should still be undefined' );
-			isAwesomeDone = true;
-		};
-
-		mw.loader.implement( 'hasOwnProperty', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ], {}, {} );
-
-		return mw.loader.using( 'hasOwnProperty', function () {
-			assert.strictEqual( isAwesomeDone, true, 'hasOwnProperty module should\'ve caused isAwesomeDone to be true' );
-			delete mw.loader.testCallback;
-
-		}, function () {
-			assert.ok( false, 'Error callback fired while loader.using "hasOwnProperty" module' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader.using( .. ) Promise', 2, function ( assert ) {
-		var isAwesomeDone;
-
-		mw.loader.testCallback = function () {
-			assert.strictEqual( isAwesomeDone, undefined, 'Implementing module is.awesome: isAwesomeDone should still be undefined' );
-			isAwesomeDone = true;
-		};
-
-		mw.loader.implement( 'test.promise', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
-
-		return mw.loader.using( 'test.promise' )
-		.done( function () {
-			assert.strictEqual( isAwesomeDone, true, 'test.promise module should\'ve caused isAwesomeDone to be true' );
-			delete mw.loader.testCallback;
-
-		} )
-		.fail( function () {
-			assert.ok( false, 'Error callback fired while loader.using "test.promise" module' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader.implement( styles={ "css": [text, ..] } )', 2, function ( assert ) {
-		var $element = $( '<div class="mw-test-implement-a"></div>' ).appendTo( '#qunit-fixture' );
-
-		assert.notEqual(
-			$element.css( 'float' ),
-			'right',
-			'style is clear'
-		);
-
-		mw.loader.implement(
-			'test.implement.a',
-			function () {
-				assert.equal(
-					$element.css( 'float' ),
-					'right',
-					'style is applied'
-				);
-			},
-			{
-				all: '.mw-test-implement-a { float: right; }'
-			}
-		);
-
-		return mw.loader.using( 'test.implement.a' );
-	} );
-
-	QUnit.test( 'mw.loader.implement( styles={ "url": { <media>: [url, ..] } } )', 7, function ( assert ) {
-		var $element1 = $( '<div class="mw-test-implement-b1"></div>' ).appendTo( '#qunit-fixture' ),
-			$element2 = $( '<div class="mw-test-implement-b2"></div>' ).appendTo( '#qunit-fixture' ),
-			$element3 = $( '<div class="mw-test-implement-b3"></div>' ).appendTo( '#qunit-fixture' ),
-			done = assert.async();
-
-		assert.notEqual(
-			$element1.css( 'text-align' ),
-			'center',
-			'style is clear'
-		);
-		assert.notEqual(
-			$element2.css( 'float' ),
-			'left',
-			'style is clear'
-		);
-		assert.notEqual(
-			$element3.css( 'text-align' ),
-			'right',
-			'style is clear'
-		);
-
-		mw.loader.implement(
-			'test.implement.b',
-			function () {
-				// Note: done() must only be called when the entire test is
-				// complete. So, make sure that we don't start until *both*
-				// assertStyleAsync calls have completed.
-				var pending = 2;
-				assertStyleAsync( assert, $element2, 'float', 'left', function () {
-					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
-
-					pending--;
-					if ( pending === 0 ) {
-						done();
-					}
-				} );
-				assertStyleAsync( assert, $element3, 'float', 'right', function () {
-					assert.notEqual( $element1.css( 'text-align' ), 'center', 'print style is not applied' );
-
-					pending--;
-					if ( pending === 0 ) {
-						done();
-					}
-				} );
-			},
-			{
-				url: {
-					print: [ urlStyleTest( '.mw-test-implement-b1', 'text-align', 'center' ) ],
-					screen: [
-						// bug 40834: Make sure it actually works with more than 1 stylesheet reference
-						urlStyleTest( '.mw-test-implement-b2', 'float', 'left' ),
-						urlStyleTest( '.mw-test-implement-b3', 'float', 'right' )
-					]
-				}
-			}
-		);
-
-		mw.loader.load( 'test.implement.b' );
-	} );
-
-	// Backwards compatibility
-	QUnit.test( 'mw.loader.implement( styles={ <media>: text } ) (back-compat)', 2, function ( assert ) {
-		var $element = $( '<div class="mw-test-implement-c"></div>' ).appendTo( '#qunit-fixture' );
-
-		assert.notEqual(
-			$element.css( 'float' ),
-			'right',
-			'style is clear'
-		);
-
-		mw.loader.implement(
-			'test.implement.c',
-			function () {
-				assert.equal(
-					$element.css( 'float' ),
-					'right',
-					'style is applied'
-				);
-			},
-			{
-				all: '.mw-test-implement-c { float: right; }'
-			}
-		);
-
-		return mw.loader.using( 'test.implement.c' );
-	} );
-
-	// Backwards compatibility
-	QUnit.test( 'mw.loader.implement( styles={ <media>: [url, ..] } ) (back-compat)', 4, function ( assert ) {
-		var $element = $( '<div class="mw-test-implement-d"></div>' ).appendTo( '#qunit-fixture' ),
-			$element2 = $( '<div class="mw-test-implement-d2"></div>' ).appendTo( '#qunit-fixture' ),
-			done = assert.async();
-
-		assert.notEqual(
-			$element.css( 'float' ),
-			'right',
-			'style is clear'
-		);
-		assert.notEqual(
-			$element2.css( 'text-align' ),
-			'center',
-			'style is clear'
-		);
-
-		mw.loader.implement(
-			'test.implement.d',
-			function () {
-				assertStyleAsync( assert, $element, 'float', 'right', function () {
-					assert.notEqual( $element2.css( 'text-align' ), 'center', 'print style is not applied (bug 40500)' );
-					done();
-				} );
-			},
-			{
-				all: [ urlStyleTest( '.mw-test-implement-d', 'float', 'right' ) ],
-				print: [ urlStyleTest( '.mw-test-implement-d2', 'text-align', 'center' ) ]
-			}
-		);
-
-		mw.loader.load( 'test.implement.d' );
-	} );
-
-	// @import (bug 31676)
-	QUnit.test( 'mw.loader.implement( styles has @import )', 7, function ( assert ) {
-		var isJsExecuted, $element,
-			done = assert.async();
-
-		mw.loader.implement(
-			'test.implement.import',
-			function () {
-				assert.strictEqual( isJsExecuted, undefined, 'script not executed multiple times' );
-				isJsExecuted = true;
-
-				assert.equal( mw.loader.getState( 'test.implement.import' ), 'executing', 'module state during implement() script execution' );
-
-				$element = $( '<div class="mw-test-implement-import">Foo bar</div>' ).appendTo( '#qunit-fixture' );
-
-				assert.equal( mw.msg( 'test-foobar' ), 'Hello Foobar, $1!', 'messages load before script execution' );
-
-				assertStyleAsync( assert, $element, 'float', 'right', function () {
-					assert.equal( $element.css( 'text-align' ), 'center',
-						'CSS styles after the @import rule are working'
-					);
-
-					done();
-				} );
-			},
-			{
-				css: [
-					'@import url(\''
-						+ urlStyleTest( '.mw-test-implement-import', 'float', 'right' )
-						+ '\');\n'
-						+ '.mw-test-implement-import { text-align: center; }'
-				]
-			},
-			{
-				'test-foobar': 'Hello Foobar, $1!'
-			}
-		);
-
-		mw.loader.using( 'test.implement.import' ).always( function () {
-			assert.strictEqual( isJsExecuted, true, 'script executed' );
-			assert.equal( mw.loader.getState( 'test.implement.import' ), 'ready', 'module state after script execution' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader.implement( dependency with styles )', 4, function ( assert ) {
-		var $element = $( '<div class="mw-test-implement-e"></div>' ).appendTo( '#qunit-fixture' ),
-			$element2 = $( '<div class="mw-test-implement-e2"></div>' ).appendTo( '#qunit-fixture' );
-
-		assert.notEqual(
-			$element.css( 'float' ),
-			'right',
-			'style is clear'
-		);
-		assert.notEqual(
-			$element2.css( 'float' ),
-			'left',
-			'style is clear'
-		);
-
-		mw.loader.register( [
-			[ 'test.implement.e', '0', [ 'test.implement.e2' ] ],
-			[ 'test.implement.e2', '0' ]
-		] );
-
-		mw.loader.implement(
-			'test.implement.e',
-			function () {
-				assert.equal(
-					$element.css( 'float' ),
-					'right',
-					'Depending module\'s style is applied'
-				);
-			},
-			{
-				all: '.mw-test-implement-e { float: right; }'
-			}
-		);
-
-		mw.loader.implement(
-			'test.implement.e2',
-			function () {
-				assert.equal(
-					$element2.css( 'float' ),
-					'left',
-					'Dependency\'s style is applied'
-				);
-			},
-			{
-				all: '.mw-test-implement-e2 { float: left; }'
-			}
-		);
-
-		return mw.loader.using( 'test.implement.e' );
-	} );
-
-	QUnit.test( 'mw.loader.implement( only scripts )', 1, function ( assert ) {
-		mw.loader.implement( 'test.onlyscripts', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.onlyscripts' ), 'ready' );
-	} );
-
-	QUnit.test( 'mw.loader.implement( only messages )', 2, function ( assert ) {
-		assert.assertFalse( mw.messages.exists( 'bug_29107' ), 'Verify that the test message doesn\'t exist yet' );
-
-		// jscs: disable requireCamelCaseOrUpperCaseIdentifiers
-		mw.loader.implement( 'test.implement.msgs', [], {}, { bug_29107: 'loaded' } );
-		// jscs: enable requireCamelCaseOrUpperCaseIdentifiers
-
-		return mw.loader.using( 'test.implement.msgs', function () {
-			assert.ok( mw.messages.exists( 'bug_29107' ), 'Bug 29107: messages-only module should implement ok' );
-		}, function () {
-			assert.ok( false, 'Error callback fired while implementing "test.implement.msgs" module' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader.implement( empty )', 1, function ( assert ) {
-		mw.loader.implement( 'test.empty' );
-		assert.strictEqual( mw.loader.getState( 'test.empty' ), 'ready' );
-	} );
-
-	QUnit.test( 'mw.loader with broken indirect dependency', 4, function ( assert ) {
-		// don't emit an error event
-		this.sandbox.stub( mw, 'track' );
-
-		mw.loader.register( [
-			[ 'test.module1', '0' ],
-			[ 'test.module2', '0', [ 'test.module1' ] ],
-			[ 'test.module3', '0', [ 'test.module2' ] ]
-		] );
-		mw.loader.implement( 'test.module1', function () {
-			throw new Error( 'expected' );
-		}, {}, {} );
-		assert.strictEqual( mw.loader.getState( 'test.module1' ), 'error', 'Expected "error" state for test.module1' );
-		assert.strictEqual( mw.loader.getState( 'test.module2' ), 'error', 'Expected "error" state for test.module2' );
-		assert.strictEqual( mw.loader.getState( 'test.module3' ), 'error', 'Expected "error" state for test.module3' );
-
-		assert.strictEqual( mw.track.callCount, 1 );
-	} );
-
-	QUnit.test( 'mw.loader with circular dependency', 1, function ( assert ) {
-		mw.loader.register( [
-			[ 'test.circle1', '0', [ 'test.circle2' ] ],
-			[ 'test.circle2', '0', [ 'test.circle3' ] ],
-			[ 'test.circle3', '0', [ 'test.circle1' ] ]
-		] );
-		assert.throws( function () {
-			mw.loader.using( 'test.circle3' );
-		}, /Circular/, 'Detect circular dependency' );
-	} );
-
-	QUnit.test( 'mw.loader out-of-order implementation', 9, function ( assert ) {
-		mw.loader.register( [
-			[ 'test.module4', '0' ],
-			[ 'test.module5', '0', [ 'test.module4' ] ],
-			[ 'test.module6', '0', [ 'test.module5' ] ]
-		] );
-		mw.loader.implement( 'test.module4', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
-		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
-		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'registered', 'Expected "registered" state for test.module6' );
-		mw.loader.implement( 'test.module6', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
-		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'registered', 'Expected "registered" state for test.module5' );
-		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'loaded', 'Expected "loaded" state for test.module6' );
-		mw.loader.implement( 'test.module5', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
-		assert.strictEqual( mw.loader.getState( 'test.module5' ), 'ready', 'Expected "ready" state for test.module5' );
-		assert.strictEqual( mw.loader.getState( 'test.module6' ), 'ready', 'Expected "ready" state for test.module6' );
-	} );
-
-	QUnit.test( 'mw.loader missing dependency', 13, function ( assert ) {
-		mw.loader.register( [
-			[ 'test.module7', '0' ],
-			[ 'test.module8', '0', [ 'test.module7' ] ],
-			[ 'test.module9', '0', [ 'test.module8' ] ]
-		] );
-		mw.loader.implement( 'test.module8', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'registered', 'Expected "registered" state for test.module7' );
-		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'loaded', 'Expected "loaded" state for test.module8' );
-		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'registered', 'Expected "registered" state for test.module9' );
-		mw.loader.state( 'test.module7', 'missing' );
-		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
-		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
-		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
-		mw.loader.implement( 'test.module9', function () {} );
-		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'missing', 'Expected "missing" state for test.module7' );
-		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
-		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
-		mw.loader.using(
-			[ 'test.module7' ],
-			function () {
-				assert.ok( false, 'Success fired despite missing dependency' );
-				assert.ok( true, 'QUnit expected() count dummy' );
-			},
-			function ( e, dependencies ) {
-				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
-				assert.deepEqual( dependencies, [ 'test.module7' ], 'Error callback called with module test.module7' );
-			}
-		);
-		mw.loader.using(
-			[ 'test.module9' ],
-			function () {
-				assert.ok( false, 'Success fired despite missing dependency' );
-				assert.ok( true, 'QUnit expected() count dummy' );
-			},
-			function ( e, dependencies ) {
-				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
-				dependencies.sort();
-				assert.deepEqual(
-					dependencies,
-					[ 'test.module7', 'test.module8', 'test.module9' ],
-					'Error callback called with all three modules as dependencies'
-				);
-			}
-		);
-	} );
-
-	QUnit.test( 'mw.loader dependency handling', 5, function ( assert ) {
-		var done = assert.async();
-		mw.loader.register( [
-			// [module, version, dependencies, group, source]
-			[ 'testMissing', '1', [], null, 'testloader' ],
-			[ 'testUsesMissing', '1', [ 'testMissing' ], null, 'testloader' ],
-			[ 'testUsesNestedMissing', '1', [ 'testUsesMissing' ], null, 'testloader' ]
-		] );
-
-		function verifyModuleStates() {
-			assert.equal( mw.loader.getState( 'testMissing' ), 'missing', 'Module not known to server must have state "missing"' );
-			assert.equal( mw.loader.getState( 'testUsesMissing' ), 'error', 'Module with missing dependency must have state "error"' );
-			assert.equal( mw.loader.getState( 'testUsesNestedMissing' ), 'error', 'Module with indirect missing dependency must have state "error"' );
-		}
-
-		mw.loader.using( [ 'testUsesNestedMissing' ],
-			function () {
-				assert.ok( false, 'Error handler should be invoked.' );
-				assert.ok( true ); // Dummy to reach QUnit expect()
-
-				verifyModuleStates();
-
-				done();
-			},
-			function ( e, badmodules ) {
-				assert.ok( true, 'Error handler should be invoked.' );
-				// As soon as server spits out state('testMissing', 'missing');
-				// it will bubble up and trigger the error callback.
-				// Therefor the badmodules array is not testUsesMissing or testUsesNestedMissing.
-				assert.deepEqual( badmodules, [ 'testMissing' ], 'Bad modules as expected.' );
-
-				verifyModuleStates();
-
-				done();
-			}
-		);
-	} );
-
-	QUnit.test( 'mw.loader skin-function handling', 5, function ( assert ) {
-		mw.loader.register( [
-			// [module, version, dependencies, group, source, skip]
-			[ 'testSkipped', '1', [], null, 'testloader', 'return true;' ],
-			[ 'testNotSkipped', '1', [], null, 'testloader', 'return false;' ],
-			[ 'testUsesSkippable', '1', [ 'testSkipped', 'testNotSkipped' ], null, 'testloader' ]
-		] );
-
-		function verifyModuleStates() {
-			assert.equal( mw.loader.getState( 'testSkipped' ), 'ready', 'Module is ready when skipped' );
-			assert.equal( mw.loader.getState( 'testNotSkipped' ), 'ready', 'Module is ready when not skipped but loaded' );
-			assert.equal( mw.loader.getState( 'testUsesSkippable' ), 'ready', 'Module is ready when skippable dependencies are ready' );
-		}
-
-		return mw.loader.using( [ 'testUsesSkippable' ],
-			function () {
-				assert.ok( true, 'Success handler should be invoked.' );
-				assert.ok( true ); // Dummy to match error handler and reach QUnit expect()
-
-				verifyModuleStates();
-			},
-			function ( e, badmodules ) {
-				assert.ok( false, 'Error handler should not be invoked.' );
-				assert.deepEqual( badmodules, [], 'Bad modules as expected.' );
-
-				verifyModuleStates();
-			}
-		);
-	} );
-
-	QUnit.asyncTest( 'mw.loader( "//protocol-relative" ) (bug 30825)', 2, function ( assert ) {
-		// This bug was actually already fixed in 1.18 and later when discovered in 1.17.
-		// Test is for regressions!
-
-		// Forge a URL to the test callback script
-		var target = QUnit.fixurl(
-			mw.config.get( 'wgServer' ) + mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
-		);
-
-		// Confirm that mw.loader.load() works with protocol-relative URLs
-		target = target.replace( /https?:/, '' );
-
-		assert.equal( target.slice( 0, 2 ), '//',
-			'URL must be relative to test relative URLs!'
-		);
-
-		// Async!
-		// The target calls QUnit.start
-		mw.loader.load( target );
-	} );
-
-	QUnit.asyncTest( 'mw.loader( "/absolute-path" )', 2, function ( assert ) {
-		// Forge a URL to the test callback script
-		var target = QUnit.fixurl(
-			mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/qunitOkCall.js'
-		);
-
-		// Confirm that mw.loader.load() works with absolute-paths (relative to current hostname)
-		assert.equal( target.slice( 0, 1 ), '/', 'URL is relative to document root' );
-
-		// Async!
-		// The target calls QUnit.start
-		mw.loader.load( target );
-	} );
-
-	QUnit.test( 'mw.loader() executing race (T112232)', 2, function ( assert ) {
-		var done = false;
-
-		// The red herring schedules its CSS buffer first. In T112232, a bug in the
-		// state machine would cause the job for testRaceLoadMe to run with an earlier job.
-		mw.loader.implement(
-			'testRaceRedHerring',
-			function () {},
-			{ css: [ '.mw-testRaceRedHerring {}' ] }
-		);
-		mw.loader.implement(
-			'testRaceLoadMe',
-			function () {
-				done = true;
-			},
-			{ css: [ '.mw-testRaceLoadMe { float: left; }' ] }
-		);
-
-		mw.loader.load( [ 'testRaceRedHerring', 'testRaceLoadMe' ] );
-		return mw.loader.using( 'testRaceLoadMe', function () {
-			assert.strictEqual( done, true, 'script ran' );
-			assert.strictEqual( mw.loader.getState( 'testRaceLoadMe' ), 'ready', 'state' );
-		} );
-	} );
-
 	QUnit.test( 'mw.hook', 13, function ( assert ) {
 		var hook, add, fire, chars, callback;
 
@@ -1054,67 +436,4 @@
 		);
 	} );
 
-	QUnit.test( 'mw.loader require()', 6, function ( assert ) {
-		mw.loader.register( [
-			[ 'test.require1', '0' ],
-			[ 'test.require2', '0' ],
-			[ 'test.require3', '0' ],
-			[ 'test.require4', '0', [ 'test.require3' ] ]
-		] );
-		mw.loader.implement( 'test.require1', function () {} );
-		mw.loader.implement( 'test.require2', function ( $, jQuery, require, module ) {
-			module.exports = 1;
-		} );
-		mw.loader.implement( 'test.require3', function ( $, jQuery, require, module ) {
-			module.exports = function () {
-				return 'hello world';
-			};
-		} );
-		mw.loader.implement( 'test.require4', function ( $, jQuery, require, module ) {
-			var other = require( 'test.require3' );
-			module.exports = {
-				pizza: function () {
-					return other();
-				}
-			};
-		} );
-		return mw.loader.using( [ 'test.require1', 'test.require2', 'test.require3', 'test.require4' ] )
-		.then( function ( require ) {
-			var module1, module2, module3, module4;
-
-			module1 = require( 'test.require1' );
-			module2 = require( 'test.require2' );
-			module3 = require( 'test.require3' );
-			module4 = require( 'test.require4' );
-
-			assert.strictEqual( typeof module1, 'object', 'export of module with no export' );
-			assert.strictEqual( module2, 1, 'export a number' );
-			assert.strictEqual( module3(), 'hello world', 'export a function' );
-			assert.strictEqual( typeof module4.pizza, 'function', 'export an object' );
-			assert.strictEqual( module4.pizza(), 'hello world', 'module can require other modules' );
-
-			assert.throws( function () {
-				require( '_badmodule' );
-			}, /is not loaded/, 'Requesting non-existent modules throws error.' );
-		} );
-	} );
-
-	QUnit.test( 'mw.loader require() in debug mode', 1, function ( assert ) {
-		var path = mw.config.get( 'wgScriptPath' );
-		mw.loader.register( [
-			[ 'test.require.define', '0' ],
-			[ 'test.require.callback', '0', [ 'test.require.define' ] ]
-		] );
-		mw.loader.implement( 'test.require.callback', [ QUnit.fixurl( path + '/tests/qunit/data/requireCallMwLoaderTestCallback.js' ) ] );
-		mw.loader.implement( 'test.require.define', [ QUnit.fixurl( path + '/tests/qunit/data/defineCallMwLoaderTestCallback.js' ) ] );
-
-		return mw.loader.using( 'test.require.callback' ).then( function ( require ) {
-			var exported = require( 'test.require.callback' );
-			assert.strictEqual( exported, 'Require worked.Define worked.',
-				'module.exports worked in debug mode' );
-		}, function () {
-			assert.ok( false, 'Error callback fired while loader.using "test.require.callback" module' );
-		} );
-	} );
-
-}( mediaWiki, jQuery ) );
+}( mediaWiki ) );