From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 4 Oct 2016 21:41:43 +0000 (+0000)
Subject: Merge "parserTests: Do not check for DjVu support"
X-Git-Tag: 1.31.0-rc.0~5213
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=bcd377cd008f8a8628ab727c3fa90090725d6c10;hp=8fd5a3b79337b20049925b025ca866e9ef164317;p=lhc%2Fweb%2Fwiklou.git

Merge "parserTests: Do not check for DjVu support"
---

diff --git a/RELEASE-NOTES-1.28 b/RELEASE-NOTES-1.28
index a24f97a1f6..8b7dced7f8 100644
--- a/RELEASE-NOTES-1.28
+++ b/RELEASE-NOTES-1.28
@@ -6,6 +6,7 @@ MediaWiki 1.28 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.28 ===
+* $wgSend404Code now affects status code of action=history if the page is not there.
 * BREAKING CHANGE: $wgHTTPProxy is now *required* for all external requests
   made by MediaWiki via a proxy. Relying on the http_proxy environment
   variable is no longer supported.
@@ -65,12 +66,17 @@ production.
 
 ==== Upgraded external libraries ====
 * Updated es5-shim from v4.1.5 to v4.5.8
+* Updated composer/semver from v1.4.1 to v1.4.2
+* Updated wikimedia/php-session-serializer from v1.0.3 to v1.0.4
 
 ==== New external libraries ====
+* Added wikimedia/scoped-callback v1.0.0
+* Added wikimedia/wait-condition-loop v1.0.1
 
 ==== Removed and replaced external libraries ====
 
 === Bug fixes in 1.28 ===
+* (T146496) action=history pages should return 404 HTTP error code if the page does not exist
 * (T137264) SECURITY: XSS in unclosed internal links
 * (T133147) SECURITY: Escape '<' and ']]>' in inline <style> blocks
 * (T133147) SECURITY: Require login to preview user CSS pages
diff --git a/autoload.php b/autoload.php
index ec15c996b9..ffd6557f5d 100644
--- a/autoload.php
+++ b/autoload.php
@@ -5,6 +5,7 @@ global $wgAutoloadLocalClasses;
 
 $wgAutoloadLocalClasses = [
 	'APCBagOStuff' => __DIR__ . '/includes/libs/objectcache/APCBagOStuff.php',
+	'APCUBagOStuff' => __DIR__ . '/includes/libs/objectcache/APCUBagOStuff.php',
 	'AbstractContent' => __DIR__ . '/includes/content/AbstractContent.php',
 	'Action' => __DIR__ . '/includes/actions/Action.php',
 	'ActiveUsersPager' => __DIR__ . '/includes/specials/pagers/ActiveUsersPager.php',
@@ -242,7 +243,7 @@ $wgAutoloadLocalClasses = [
 	'CheckStorage' => __DIR__ . '/maintenance/storage/checkStorage.php',
 	'CheckSyntax' => __DIR__ . '/maintenance/checkSyntax.php',
 	'CheckUsernames' => __DIR__ . '/maintenance/checkUsernames.php',
-	'ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php',
+	'ChronologyProtector' => __DIR__ . '/includes/libs/rdbms/ChronologyProtector.php',
 	'ClassCollector' => __DIR__ . '/includes/utils/AutoloadGenerator.php',
 	'CleanupAncientTables' => __DIR__ . '/maintenance/cleanupAncientTables.php',
 	'CleanupBlocks' => __DIR__ . '/maintenance/cleanupBlocks.php',
@@ -294,10 +295,11 @@ $wgAutoloadLocalClasses = [
 	'CreateAndPromote' => __DIR__ . '/maintenance/createAndPromote.php',
 	'CreateFileOp' => __DIR__ . '/includes/libs/filebackend/fileop/CreateFileOp.php',
 	'CreditsAction' => __DIR__ . '/includes/actions/CreditsAction.php',
+	'CryptRand' => __DIR__ . '/includes/libs/CryptRand.php',
 	'CssContent' => __DIR__ . '/includes/content/CssContent.php',
 	'CssContentHandler' => __DIR__ . '/includes/content/CssContentHandler.php',
 	'CsvStatsOutput' => __DIR__ . '/maintenance/language/StatOutputs.php',
-	'CurlHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+	'CurlHttpRequest' => __DIR__ . '/includes/http/CurlHttpRequest.php',
 	'DBAccessBase' => __DIR__ . '/includes/dao/DBAccessBase.php',
 	'DBAccessError' => __DIR__ . '/includes/libs/rdbms/exception/DBAccessError.php',
 	'DBAccessObjectUtils' => __DIR__ . '/includes/dao/DBAccessObjectUtils.php',
@@ -317,7 +319,7 @@ $wgAutoloadLocalClasses = [
 	'DBUnexpectedError' => __DIR__ . '/includes/libs/rdbms/exception/DBUnexpectedError.php',
 	'DataUpdate' => __DIR__ . '/includes/deferred/DataUpdate.php',
 	'Database' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
-	'DatabaseBase' => __DIR__ . '/includes/libs/rdbms/database/DatabaseBase.php',
+	'DatabaseBase' => __DIR__ . '/includes/libs/rdbms/database/Database.php',
 	'DatabaseDomain' => __DIR__ . '/includes/libs/rdbms/database/DatabaseDomain.php',
 	'DatabaseInstaller' => __DIR__ . '/includes/installer/DatabaseInstaller.php',
 	'DatabaseLag' => __DIR__ . '/maintenance/lag.php',
@@ -466,6 +468,7 @@ $wgAutoloadLocalClasses = [
 	'FileBackendStoreShardListIterator' => __DIR__ . '/includes/libs/filebackend/FileBackendStore.php',
 	'FileBasedSiteLookup' => __DIR__ . '/includes/site/FileBasedSiteLookup.php',
 	'FileCacheBase' => __DIR__ . '/includes/cache/FileCacheBase.php',
+	'FileContentHandler' => __DIR__ . '/includes/content/FileContentHandler.php',
 	'FileContentsHasher' => __DIR__ . '/includes/utils/FileContentsHasher.php',
 	'FileDeleteForm' => __DIR__ . '/includes/FileDeleteForm.php',
 	'FileDependency' => __DIR__ . '/includes/cache/CacheDependency.php',
@@ -574,7 +577,7 @@ $wgAutoloadLocalClasses = [
 	'Html' => __DIR__ . '/includes/Html.php',
 	'HtmlArmor' => __DIR__ . '/includes/libs/HtmlArmor.php',
 	'HtmlFormatter' => __DIR__ . '/includes/HtmlFormatter.php',
-	'Http' => __DIR__ . '/includes/HttpFunctions.php',
+	'Http' => __DIR__ . '/includes/http/Http.php',
 	'HttpError' => __DIR__ . '/includes/exception/HttpError.php',
 	'HttpStatus' => __DIR__ . '/includes/libs/HttpStatus.php',
 	'IApiMessage' => __DIR__ . '/includes/api/ApiMessage.php',
@@ -662,7 +665,6 @@ $wgAutoloadLocalClasses = [
 	'KkConverter' => __DIR__ . '/languages/classes/LanguageKk.php',
 	'KuConverter' => __DIR__ . '/languages/classes/LanguageKu.php',
 	'LBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactory.php',
-	'LBFactoryMW' => __DIR__ . '/includes/db/loadbalancer/LBFactoryMW.php',
 	'LBFactoryMulti' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactoryMulti.php',
 	'LBFactorySimple' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactorySimple.php',
 	'LBFactorySingle' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactorySingle.php',
@@ -770,7 +772,7 @@ $wgAutoloadLocalClasses = [
 	'MWCallableUpdate' => __DIR__ . '/includes/deferred/MWCallableUpdate.php',
 	'MWContentSerializationException' => __DIR__ . '/includes/content/ContentHandler.php',
 	'MWCryptHKDF' => __DIR__ . '/includes/utils/MWCryptHKDF.php',
-	'MWCryptHash' => __DIR__ . '/includes/utils/MWCryptHash.php',
+	'MWCryptHash' => __DIR__ . '/includes/libs/MWCryptHash.php',
 	'MWCryptRand' => __DIR__ . '/includes/utils/MWCryptRand.php',
 	'MWDebug' => __DIR__ . '/includes/debug/MWDebug.php',
 	'MWDocGen' => __DIR__ . '/maintenance/mwdocgen.php',
@@ -779,7 +781,8 @@ $wgAutoloadLocalClasses = [
 	'MWExceptionRenderer' => __DIR__ . '/includes/exception/MWExceptionRenderer.php',
 	'MWFileProps' => __DIR__ . '/includes/utils/MWFileProps.php',
 	'MWGrants' => __DIR__ . '/includes/utils/MWGrants.php',
-	'MWHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+	'MWHttpRequest' => __DIR__ . '/includes/http/MWHttpRequest.php',
+	'MWLBFactory' => __DIR__ . '/includes/db/MWLBFactory.php',
 	'MWMemcached' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
 	'MWMessagePack' => __DIR__ . '/includes/libs/MWMessagePack.php',
 	'MWNamespace' => __DIR__ . '/includes/MWNamespace.php',
@@ -920,7 +923,7 @@ $wgAutoloadLocalClasses = [
 	'MediaWiki\\Widget\\TitleInputWidget' => __DIR__ . '/includes/widget/TitleInputWidget.php',
 	'MediaWiki\\Widget\\UserInputWidget' => __DIR__ . '/includes/widget/UserInputWidget.php',
 	'MemCachedClientforWiki' => __DIR__ . '/includes/compat/MemcachedClientCompat.php',
-	'MemcLockManager' => __DIR__ . '/includes/filebackend/lockmanager/MemcLockManager.php',
+	'MemcLockManager' => __DIR__ . '/includes/libs/lockmanager/MemcLockManager.php',
 	'MemcachedBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedBagOStuff.php',
 	'MemcachedClient' => __DIR__ . '/includes/libs/objectcache/MemcachedClient.php',
 	'MemcachedPeclBagOStuff' => __DIR__ . '/includes/libs/objectcache/MemcachedPeclBagOStuff.php',
@@ -1055,7 +1058,7 @@ $wgAutoloadLocalClasses = [
 	'Pbkdf2Password' => __DIR__ . '/includes/password/Pbkdf2Password.php',
 	'PerRowAugmentor' => __DIR__ . '/includes/search/PerRowAugmentor.php',
 	'PermissionsError' => __DIR__ . '/includes/exception/PermissionsError.php',
-	'PhpHttpRequest' => __DIR__ . '/includes/HttpFunctions.php',
+	'PhpHttpRequest' => __DIR__ . '/includes/http/PhpHttpRequest.php',
 	'PhpXmlBugTester' => __DIR__ . '/includes/installer/PhpBugTests.php',
 	'Pingback' => __DIR__ . '/includes/Pingback.php',
 	'PoolCounter' => __DIR__ . '/includes/poolcounter/PoolCounter.php',
@@ -1234,7 +1237,7 @@ $wgAutoloadLocalClasses = [
 	'SamplingStatsdClient' => __DIR__ . '/includes/libs/stats/SamplingStatsdClient.php',
 	'Sanitizer' => __DIR__ . '/includes/Sanitizer.php',
 	'SavepointPostgres' => __DIR__ . '/includes/libs/rdbms/database/utils/SavepointPostgres.php',
-	'ScopedCallback' => __DIR__ . '/includes/libs/ScopedCallback.php',
+	'ScopedCallback' => __DIR__ . '/includes/compat/ScopedCallback.php',
 	'ScopedLock' => __DIR__ . '/includes/libs/lockmanager/ScopedLock.php',
 	'SearchApi' => __DIR__ . '/includes/api/SearchApi.php',
 	'SearchDatabase' => __DIR__ . '/includes/search/SearchDatabase.php',
@@ -1515,7 +1518,6 @@ $wgAutoloadLocalClasses = [
 	'VirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTService.php',
 	'VirtualRESTServiceClient' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTServiceClient.php',
 	'WANObjectCache' => __DIR__ . '/includes/libs/objectcache/WANObjectCache.php',
-	'WaitConditionLoop' => __DIR__ . '/includes/libs/WaitConditionLoop.php',
 	'WantedCategoriesPage' => __DIR__ . '/includes/specials/SpecialWantedcategories.php',
 	'WantedFilesPage' => __DIR__ . '/includes/specials/SpecialWantedfiles.php',
 	'WantedPagesPage' => __DIR__ . '/includes/specials/SpecialWantedpages.php',
diff --git a/composer.json b/composer.json
index eedaa4e55c..884b64fde5 100644
--- a/composer.json
+++ b/composer.json
@@ -16,7 +16,7 @@
 		"wiki": "https://www.mediawiki.org/"
 	},
 	"require": {
-		"composer/semver": "1.4.1",
+		"composer/semver": "1.4.2",
 		"cssjanus/cssjanus": "1.1.2",
 		"ext-ctype": "*",
 		"ext-iconv": "*",
@@ -25,7 +25,7 @@
 		"ext-xml": "*",
 		"liuggio/statsd-php-client": "1.0.18",
 		"mediawiki/at-ease": "1.1.0",
-		"oojs/oojs-ui": "0.17.9",
+		"oojs/oojs-ui": "0.17.10",
 		"oyejorge/less.php": "1.7.0.10",
 		"php": ">=5.5.9",
 		"psr/log": "1.0.0",
@@ -36,14 +36,17 @@
 		"wikimedia/composer-merge-plugin": "1.3.1",
 		"wikimedia/html-formatter": "1.0.1",
 		"wikimedia/ip-set": "1.1.0",
-		"wikimedia/php-session-serializer": "1.0.3",
+		"wikimedia/php-session-serializer": "1.0.4",
 		"wikimedia/relpath": "1.0.3",
 		"wikimedia/running-stat": "1.1.0",
+		"wikimedia/scoped-callback": "1.0.0",
 		"wikimedia/utfnormal": "1.0.3",
+		"wikimedia/wait-condition-loop": "1.0.1",
 		"wikimedia/wrappedstring": "2.2.0",
 		"zordius/lightncandy": "0.23"
 	},
 	"require-dev": {
+		"composer/spdx-licenses": "1.1.4",
 		"jakub-onderka/php-parallel-lint": "0.9.2",
 		"justinrainbow/json-schema": "~3.0",
 		"mediawiki/mediawiki-codesniffer": "0.7.2",
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 384bfb4b10..84a404a2e2 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -51,224 +51,7 @@
 		},
 		"license-name": {
 			"type": "string",
-			"description": "Short identifier for the license under which the extension is released.",
-			"enum": [
-				"AFL-1.1",
-				"AFL-1.2",
-				"AFL-2.0",
-				"AFL-2.1",
-				"AFL-3.0",
-				"APL-1.0",
-				"Aladdin",
-				"ANTLR-PD",
-				"Apache-1.0",
-				"Apache-1.1",
-				"Apache-2.0",
-				"APSL-1.0",
-				"APSL-1.1",
-				"APSL-1.2",
-				"APSL-2.0",
-				"Artistic-1.0",
-				"Artistic-1.0-cl8",
-				"Artistic-1.0-Perl",
-				"Artistic-2.0",
-				"AAL",
-				"BitTorrent-1.0",
-				"BitTorrent-1.1",
-				"BSL-1.0",
-				"BSD-2-Clause",
-				"BSD-2-Clause-FreeBSD",
-				"BSD-2-Clause-NetBSD",
-				"BSD-3-Clause",
-				"BSD-3-Clause-Clear",
-				"BSD-4-Clause",
-				"BSD-4-Clause-UC",
-				"CECILL-1.0",
-				"CECILL-1.1",
-				"CECILL-2.0",
-				"CECILL-B",
-				"CECILL-C",
-				"ClArtistic",
-				"CNRI-Python",
-				"CNRI-Python-GPL-Compatible",
-				"CPOL-1.02",
-				"CDDL-1.0",
-				"CDDL-1.1",
-				"CPAL-1.0",
-				"CPL-1.0",
-				"CATOSL-1.1",
-				"Condor-1.1",
-				"CC-BY-1.0",
-				"CC-BY-2.0",
-				"CC-BY-2.5",
-				"CC-BY-3.0",
-				"CC-BY-ND-1.0",
-				"CC-BY-ND-2.0",
-				"CC-BY-ND-2.5",
-				"CC-BY-ND-3.0",
-				"CC-BY-NC-1.0",
-				"CC-BY-NC-2.0",
-				"CC-BY-NC-2.5",
-				"CC-BY-NC-3.0",
-				"CC-BY-NC-ND-1.0",
-				"CC-BY-NC-ND-2.0",
-				"CC-BY-NC-ND-2.5",
-				"CC-BY-NC-ND-3.0",
-				"CC-BY-NC-SA-1.0",
-				"CC-BY-NC-SA-2.0",
-				"CC-BY-NC-SA-2.5",
-				"CC-BY-NC-SA-3.0",
-				"CC-BY-SA-1.0",
-				"CC-BY-SA-2.0",
-				"CC-BY-SA-2.5",
-				"CC-BY-SA-3.0",
-				"CC0-1.0",
-				"CUA-OPL-1.0",
-				"D-FSL-1.0",
-				"WTFPL",
-				"EPL-1.0",
-				"eCos-2.0",
-				"ECL-1.0",
-				"ECL-2.0",
-				"EFL-1.0",
-				"EFL-2.0",
-				"Entessa",
-				"ErlPL-1.1",
-				"EUDatagrid",
-				"EUPL-1.0",
-				"EUPL-1.1",
-				"Fair",
-				"Frameworx-1.0",
-				"FTL",
-				"AGPL-1.0",
-				"AGPL-3.0",
-				"GFDL-1.1",
-				"GFDL-1.2",
-				"GFDL-1.3",
-				"GPL-1.0",
-				"GPL-1.0+",
-				"GPL-2.0",
-				"GPL-2.0+",
-				"GPL-2.0-with-autoconf-exception",
-				"GPL-2.0-with-bison-exception",
-				"GPL-2.0-with-classpath-exception",
-				"GPL-2.0-with-font-exception",
-				"GPL-2.0-with-GCC-exception",
-				"GPL-3.0",
-				"GPL-3.0+",
-				"GPL-3.0-with-autoconf-exception",
-				"GPL-3.0-with-GCC-exception",
-				"LGPL-2.1",
-				"LGPL-2.1+",
-				"LGPL-3.0",
-				"LGPL-3.0+",
-				"LGPL-2.0",
-				"LGPL-2.0+",
-				"gSOAP-1.3b",
-				"HPND",
-				"IBM-pibs",
-				"IPL-1.0",
-				"Imlib2",
-				"IJG",
-				"Intel",
-				"IPA",
-				"ISC",
-				"JSON",
-				"LPPL-1.3a",
-				"LPPL-1.0",
-				"LPPL-1.1",
-				"LPPL-1.2",
-				"LPPL-1.3c",
-				"Libpng",
-				"LPL-1.02",
-				"LPL-1.0",
-				"MS-PL",
-				"MS-RL",
-				"MirOS",
-				"MIT",
-				"Motosoto",
-				"MPL-1.0",
-				"MPL-1.1",
-				"MPL-2.0",
-				"MPL-2.0-no-copyleft-exception",
-				"Multics",
-				"NASA-1.3",
-				"Naumen",
-				"NBPL-1.0",
-				"NGPL",
-				"NOSL",
-				"NPL-1.0",
-				"NPL-1.1",
-				"Nokia",
-				"NPOSL-3.0",
-				"NTP",
-				"OCLC-2.0",
-				"ODbL-1.0",
-				"PDDL-1.0",
-				"OGTSL",
-				"OLDAP-2.2.2",
-				"OLDAP-1.1",
-				"OLDAP-1.2",
-				"OLDAP-1.3",
-				"OLDAP-1.4",
-				"OLDAP-2.0",
-				"OLDAP-2.0.1",
-				"OLDAP-2.1",
-				"OLDAP-2.2",
-				"OLDAP-2.2.1",
-				"OLDAP-2.3",
-				"OLDAP-2.4",
-				"OLDAP-2.5",
-				"OLDAP-2.6",
-				"OLDAP-2.7",
-				"OPL-1.0",
-				"OSL-1.0",
-				"OSL-2.0",
-				"OSL-2.1",
-				"OSL-3.0",
-				"OLDAP-2.8",
-				"OpenSSL",
-				"PHP-3.0",
-				"PHP-3.01",
-				"PostgreSQL",
-				"Python-2.0",
-				"QPL-1.0",
-				"RPSL-1.0",
-				"RPL-1.1",
-				"RPL-1.5",
-				"RHeCos-1.1",
-				"RSCPL",
-				"Ruby",
-				"SAX-PD",
-				"SGI-B-1.0",
-				"SGI-B-1.1",
-				"SGI-B-2.0",
-				"OFL-1.0",
-				"OFL-1.1",
-				"SimPL-2.0",
-				"Sleepycat",
-				"SMLNJ",
-				"SugarCRM-1.1.3",
-				"SISSL",
-				"SISSL-1.2",
-				"SPL-1.0",
-				"Watcom-1.0",
-				"NCSA",
-				"VSL-1.0",
-				"W3C",
-				"WXwindows",
-				"Xnet",
-				"X11",
-				"XFree86-1.1",
-				"YPL-1.0",
-				"YPL-1.1",
-				"Zimbra-1.3",
-				"Zlib",
-				"ZPL-1.1",
-				"ZPL-2.0",
-				"ZPL-2.1",
-				"Unlicense"
-			]
+			"description": "SPDX identifier for the license under which the extension is released."
 		},
 		"requires": {
 			"type": "object",
diff --git a/docs/extension.schema.v1.json b/docs/extension.schema.v1.json
index c4a1a8dbd0..94999270a1 100644
--- a/docs/extension.schema.v1.json
+++ b/docs/extension.schema.v1.json
@@ -51,224 +51,7 @@
 		},
 		"license-name": {
 			"type": "string",
-			"description": "Short identifier for the license under which the extension is released.",
-			"enum": [
-				"AFL-1.1",
-				"AFL-1.2",
-				"AFL-2.0",
-				"AFL-2.1",
-				"AFL-3.0",
-				"APL-1.0",
-				"Aladdin",
-				"ANTLR-PD",
-				"Apache-1.0",
-				"Apache-1.1",
-				"Apache-2.0",
-				"APSL-1.0",
-				"APSL-1.1",
-				"APSL-1.2",
-				"APSL-2.0",
-				"Artistic-1.0",
-				"Artistic-1.0-cl8",
-				"Artistic-1.0-Perl",
-				"Artistic-2.0",
-				"AAL",
-				"BitTorrent-1.0",
-				"BitTorrent-1.1",
-				"BSL-1.0",
-				"BSD-2-Clause",
-				"BSD-2-Clause-FreeBSD",
-				"BSD-2-Clause-NetBSD",
-				"BSD-3-Clause",
-				"BSD-3-Clause-Clear",
-				"BSD-4-Clause",
-				"BSD-4-Clause-UC",
-				"CECILL-1.0",
-				"CECILL-1.1",
-				"CECILL-2.0",
-				"CECILL-B",
-				"CECILL-C",
-				"ClArtistic",
-				"CNRI-Python",
-				"CNRI-Python-GPL-Compatible",
-				"CPOL-1.02",
-				"CDDL-1.0",
-				"CDDL-1.1",
-				"CPAL-1.0",
-				"CPL-1.0",
-				"CATOSL-1.1",
-				"Condor-1.1",
-				"CC-BY-1.0",
-				"CC-BY-2.0",
-				"CC-BY-2.5",
-				"CC-BY-3.0",
-				"CC-BY-ND-1.0",
-				"CC-BY-ND-2.0",
-				"CC-BY-ND-2.5",
-				"CC-BY-ND-3.0",
-				"CC-BY-NC-1.0",
-				"CC-BY-NC-2.0",
-				"CC-BY-NC-2.5",
-				"CC-BY-NC-3.0",
-				"CC-BY-NC-ND-1.0",
-				"CC-BY-NC-ND-2.0",
-				"CC-BY-NC-ND-2.5",
-				"CC-BY-NC-ND-3.0",
-				"CC-BY-NC-SA-1.0",
-				"CC-BY-NC-SA-2.0",
-				"CC-BY-NC-SA-2.5",
-				"CC-BY-NC-SA-3.0",
-				"CC-BY-SA-1.0",
-				"CC-BY-SA-2.0",
-				"CC-BY-SA-2.5",
-				"CC-BY-SA-3.0",
-				"CC0-1.0",
-				"CUA-OPL-1.0",
-				"D-FSL-1.0",
-				"WTFPL",
-				"EPL-1.0",
-				"eCos-2.0",
-				"ECL-1.0",
-				"ECL-2.0",
-				"EFL-1.0",
-				"EFL-2.0",
-				"Entessa",
-				"ErlPL-1.1",
-				"EUDatagrid",
-				"EUPL-1.0",
-				"EUPL-1.1",
-				"Fair",
-				"Frameworx-1.0",
-				"FTL",
-				"AGPL-1.0",
-				"AGPL-3.0",
-				"GFDL-1.1",
-				"GFDL-1.2",
-				"GFDL-1.3",
-				"GPL-1.0",
-				"GPL-1.0+",
-				"GPL-2.0",
-				"GPL-2.0+",
-				"GPL-2.0-with-autoconf-exception",
-				"GPL-2.0-with-bison-exception",
-				"GPL-2.0-with-classpath-exception",
-				"GPL-2.0-with-font-exception",
-				"GPL-2.0-with-GCC-exception",
-				"GPL-3.0",
-				"GPL-3.0+",
-				"GPL-3.0-with-autoconf-exception",
-				"GPL-3.0-with-GCC-exception",
-				"LGPL-2.1",
-				"LGPL-2.1+",
-				"LGPL-3.0",
-				"LGPL-3.0+",
-				"LGPL-2.0",
-				"LGPL-2.0+",
-				"gSOAP-1.3b",
-				"HPND",
-				"IBM-pibs",
-				"IPL-1.0",
-				"Imlib2",
-				"IJG",
-				"Intel",
-				"IPA",
-				"ISC",
-				"JSON",
-				"LPPL-1.3a",
-				"LPPL-1.0",
-				"LPPL-1.1",
-				"LPPL-1.2",
-				"LPPL-1.3c",
-				"Libpng",
-				"LPL-1.02",
-				"LPL-1.0",
-				"MS-PL",
-				"MS-RL",
-				"MirOS",
-				"MIT",
-				"Motosoto",
-				"MPL-1.0",
-				"MPL-1.1",
-				"MPL-2.0",
-				"MPL-2.0-no-copyleft-exception",
-				"Multics",
-				"NASA-1.3",
-				"Naumen",
-				"NBPL-1.0",
-				"NGPL",
-				"NOSL",
-				"NPL-1.0",
-				"NPL-1.1",
-				"Nokia",
-				"NPOSL-3.0",
-				"NTP",
-				"OCLC-2.0",
-				"ODbL-1.0",
-				"PDDL-1.0",
-				"OGTSL",
-				"OLDAP-2.2.2",
-				"OLDAP-1.1",
-				"OLDAP-1.2",
-				"OLDAP-1.3",
-				"OLDAP-1.4",
-				"OLDAP-2.0",
-				"OLDAP-2.0.1",
-				"OLDAP-2.1",
-				"OLDAP-2.2",
-				"OLDAP-2.2.1",
-				"OLDAP-2.3",
-				"OLDAP-2.4",
-				"OLDAP-2.5",
-				"OLDAP-2.6",
-				"OLDAP-2.7",
-				"OPL-1.0",
-				"OSL-1.0",
-				"OSL-2.0",
-				"OSL-2.1",
-				"OSL-3.0",
-				"OLDAP-2.8",
-				"OpenSSL",
-				"PHP-3.0",
-				"PHP-3.01",
-				"PostgreSQL",
-				"Python-2.0",
-				"QPL-1.0",
-				"RPSL-1.0",
-				"RPL-1.1",
-				"RPL-1.5",
-				"RHeCos-1.1",
-				"RSCPL",
-				"Ruby",
-				"SAX-PD",
-				"SGI-B-1.0",
-				"SGI-B-1.1",
-				"SGI-B-2.0",
-				"OFL-1.0",
-				"OFL-1.1",
-				"SimPL-2.0",
-				"Sleepycat",
-				"SMLNJ",
-				"SugarCRM-1.1.3",
-				"SISSL",
-				"SISSL-1.2",
-				"SPL-1.0",
-				"Watcom-1.0",
-				"NCSA",
-				"VSL-1.0",
-				"W3C",
-				"WXwindows",
-				"Xnet",
-				"X11",
-				"XFree86-1.1",
-				"YPL-1.0",
-				"YPL-1.1",
-				"Zimbra-1.3",
-				"Zlib",
-				"ZPL-1.1",
-				"ZPL-2.0",
-				"ZPL-2.1",
-				"Unlicense"
-			]
+			"description": "SPDX identifier for the license under which the extension is released."
 		},
 		"requires": {
 			"type": "object",
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 2bfeb66ef4..2dc1270a91 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1019,6 +1019,18 @@ $user: user initiating the action
 uses are in active use.
 &$tags: list of all active tags. Append to this array.
 
+'ChangeTagsAfterUpdateTags': Called after tags have been updated with the
+ChangeTags::updateTags function. Params:
+$addedTags: tags effectively added in the update
+$removedTags: tags effectively removed in the update
+$prevTags: tags that were present prior to the update
+$rc_id: recentchanges table id
+$rev_id: revision table id
+$log_id: logging table id
+$params: tag params
+$rc: RecentChange being tagged when the tagging accompanies the action or null
+$user: User who performed the tagging when the tagging is subsequent to the action or null
+
 'Collation::factory': Called if $wgCategoryCollation is an unknown collation.
 $collationName: Name of the collation in question
 &$collationObject: Null. Replace with a subclass of the Collation class that
diff --git a/includes/CategoryViewer.php b/includes/CategoryViewer.php
index 53e855bdb0..c858dd7164 100644
--- a/includes/CategoryViewer.php
+++ b/includes/CategoryViewer.php
@@ -321,6 +321,8 @@ class CategoryViewer extends ContextSource {
 				array_merge(
 					LinkCache::getSelectFields(),
 					[
+						'page_namespace',
+						'page_title',
 						'cl_sortkey',
 						'cat_id',
 						'cat_title',
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 7facf2fcf7..2ae33b2584 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -2211,7 +2211,7 @@ $wgCacheDirectory = false;
  *   - CACHE_NONE:       Do not cache
  *   - CACHE_DB:         Store cache objects in the DB
  *   - CACHE_MEMCACHED:  MemCached, must specify servers in $wgMemCachedServers
- *   - CACHE_ACCEL:      APC, XCache or WinCache
+ *   - CACHE_ACCEL:      APC, APCU, XCache or WinCache
  *   - (other):          A string may be used which identifies a cache
  *                       configuration in $wgObjectCaches.
  *
@@ -2288,6 +2288,7 @@ $wgObjectCaches = [
 	],
 
 	'apc' => [ 'class' => 'APCBagOStuff', 'reportDupes' => false ],
+	'apcu' => [ 'class' => 'APCUBagOStuff', 'reportDupes' => false ],
 	'xcache' => [ 'class' => 'XCacheBagOStuff', 'reportDupes' => false ],
 	'wincache' => [ 'class' => 'WinCacheBagOStuff', 'reportDupes' => false ],
 	'memcached-php' => [ 'class' => 'MemcachedPhpBagOStuff', 'loggroup' => 'memcached' ],
@@ -5532,13 +5533,7 @@ $wgApplyIpBlocksToXff = false;
  * elapses.
  *
  * @par Example:
- * To set a generic maximum of 4 hits in 60 seconds:
- * @code
- *     $wgRateLimits = [ 4, 60 ];
- * @endcode
- *
- * @par Example:
- * You could also limit per action and then type of users.
+ * Limits per configured per action and then type of users.
  * @code
  *     $wgRateLimits = [
  *         'edit' => [
@@ -5547,8 +5542,20 @@ $wgApplyIpBlocksToXff = false;
  *             'newbie' => [ x, y ], // each new autoconfirmed accounts; overrides 'user'
  *             'ip' => [ x, y ], // each anon and recent account
  *             'subnet' => [ x, y ], // ... within a /24 subnet in IPv4 or /64 in IPv6
+ *             'groupName' => [ x, y ], // by group membership
  *         ]
- *     ]
+ *     ];
+ * @endcode
+ *
+ * @par Normally, the 'noratelimit' right allows a user to bypass any rate
+ * limit checks. This can be disabled on a per-action basis by setting the
+ * special '&can-bypass' key to false in that action's configuration.
+ * @code
+ *     $wgRateLimits = [
+ *         'some-action' => [
+ *             '&can-bypass' => false,
+ *             'user' => [ x, y ],
+ *     ];
  * @endcode
  *
  * @warning Requires that $wgMainCacheType is set to something persistent
@@ -6022,7 +6029,7 @@ $wgTrxProfilerLimits = [
 	'JobRunner' => [
 		'readQueryTime' => 30,
 		'writeQueryTime' => 5,
-		'maxAffected' => 1000
+		'maxAffected' => 500 // ballpark of $wgUpdateRowsPerQuery
 	],
 	// Command-line scripts
 	'Maintenance' => [
diff --git a/includes/Defines.php b/includes/Defines.php
index 529dfb39be..02930ea815 100644
--- a/includes/Defines.php
+++ b/includes/Defines.php
@@ -77,8 +77,13 @@ define( 'NS_CATEGORY_TALK', 15 );
  * When writing code that should be compatible with older MediaWiki
  * versions, either stick to the old names or define the new constants
  * yourself, if they're not defined already.
+ *
+ * @deprecated since 1.14
  */
 define( 'NS_IMAGE', NS_FILE );
+/**
+ * @deprecated since 1.14
+ */
 define( 'NS_IMAGE_TALK', NS_FILE_TALK );
 /**@}*/
 
diff --git a/includes/EditPage.php b/includes/EditPage.php
index f449283bf5..c0c0048db8 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -3300,6 +3300,12 @@ HTML
 			'id' => $name,
 			'cols' => $wgUser->getIntOption( 'cols' ),
 			'rows' => $wgUser->getIntOption( 'rows' ),
+			// The following classes can be used here:
+			// * mw-editfont-default
+			// * mw-editfont-monospace
+			// * mw-editfont-sans-serif
+			// * mw-editfont-serif
+			'class' => 'mw-editfont-' . $wgUser->getOption( 'editfont' ),
 			// Avoid PHP notices when appending preferences
 			// (appending allows customAttribs['style'] to still work).
 			'style' => ''
@@ -4149,7 +4155,7 @@ HTML
 			'name' => 'wpSave',
 			'tabindex' => ++$tabindex,
 		] + Linker::tooltipAndAccesskeyAttribs( 'save' );
-		$buttons['save'] = Html::submitButton( $buttonLabel, $attribs, [ 'mw-ui-constructive' ] );
+		$buttons['save'] = Html::submitButton( $buttonLabel, $attribs, [ 'mw-ui-progressive' ] );
 
 		++$tabindex; // use the same for preview and live preview
 		$attribs = [
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 5fe4b4efea..2b6088edeb 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -27,6 +27,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 use Liuggio\StatsdClient\Sender\SocketSender;
 use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\Session\SessionManager;
+use Wikimedia\ScopedCallback;
 
 // Hide compatibility functions from Doxygen
 /// @cond
@@ -3066,7 +3067,7 @@ function wfSplitWikiID( $wiki ) {
  * @todo Replace calls to wfGetDB with calls to LoadBalancer::getConnection()
  *       on an injected instance of LoadBalancer.
  *
- * @return DatabaseBase
+ * @return Database
  */
 function wfGetDB( $db, $groups = [], $wiki = false ) {
 	return wfGetLB( $wiki )->getConnection( $db, $groups, $wiki );
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
deleted file mode 100644
index 2ca5e1b71f..0000000000
--- a/includes/HttpFunctions.php
+++ /dev/null
@@ -1,1122 +0,0 @@
-<?php
-/**
- * Various HTTP related functions.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup HTTP
- */
-
-/**
- * @defgroup HTTP HTTP
- */
-
-use MediaWiki\Logger\LoggerFactory;
-
-/**
- * Various HTTP related functions
- * @ingroup HTTP
- */
-class Http {
-	static public $httpEngine = false;
-
-	/**
-	 * Perform an HTTP request
-	 *
-	 * @param string $method HTTP method. Usually GET/POST
-	 * @param string $url Full URL to act on. If protocol-relative, will be expanded to an http:// URL
-	 * @param array $options Options to pass to MWHttpRequest object.
-	 *	Possible keys for the array:
-	 *    - timeout             Timeout length in seconds
-	 *    - connectTimeout      Timeout for connection, in seconds (curl only)
-	 *    - postData            An array of key-value pairs or a url-encoded form data
-	 *    - proxy               The proxy to use.
-	 *                          Otherwise it will use $wgHTTPProxy (if set)
-	 *                          Otherwise it will use the environment variable "http_proxy" (if set)
-	 *    - noProxy             Don't use any proxy at all. Takes precedence over proxy value(s).
-	 *    - sslVerifyHost       Verify hostname against certificate
-	 *    - sslVerifyCert       Verify SSL certificate
-	 *    - caInfo              Provide CA information
-	 *    - maxRedirects        Maximum number of redirects to follow (defaults to 5)
-	 *    - followRedirects     Whether to follow redirects (defaults to false).
-	 *		                    Note: this should only be used when the target URL is trusted,
-	 *		                    to avoid attacks on intranet services accessible by HTTP.
-	 *    - userAgent           A user agent, if you want to override the default
-	 *                          MediaWiki/$wgVersion
-	 * @param string $caller The method making this request, for profiling
-	 * @return string|bool (bool)false on failure or a string on success
-	 */
-	public static function request( $method, $url, $options = [], $caller = __METHOD__ ) {
-		wfDebug( "HTTP: $method: $url\n" );
-
-		$options['method'] = strtoupper( $method );
-
-		if ( !isset( $options['timeout'] ) ) {
-			$options['timeout'] = 'default';
-		}
-		if ( !isset( $options['connectTimeout'] ) ) {
-			$options['connectTimeout'] = 'default';
-		}
-
-		$req = MWHttpRequest::factory( $url, $options, $caller );
-		$status = $req->execute();
-
-		if ( $status->isOK() ) {
-			return $req->getContent();
-		} else {
-			$errors = $status->getErrorsByType( 'error' );
-			$logger = LoggerFactory::getInstance( 'http' );
-			$logger->warning( $status->getWikiText( false, false, 'en' ),
-				[ 'error' => $errors, 'caller' => $caller, 'content' => $req->getContent() ] );
-			return false;
-		}
-	}
-
-	/**
-	 * Simple wrapper for Http::request( 'GET' )
-	 * @see Http::request()
-	 * @since 1.25 Second parameter $timeout removed. Second parameter
-	 * is now $options which can be given a 'timeout'
-	 *
-	 * @param string $url
-	 * @param array $options
-	 * @param string $caller The method making this request, for profiling
-	 * @return string|bool false on error
-	 */
-	public static function get( $url, $options = [], $caller = __METHOD__ ) {
-		$args = func_get_args();
-		if ( isset( $args[1] ) && ( is_string( $args[1] ) || is_numeric( $args[1] ) ) ) {
-			// Second was used to be the timeout
-			// And third parameter used to be $options
-			wfWarn( "Second parameter should not be a timeout.", 2 );
-			$options = isset( $args[2] ) && is_array( $args[2] ) ?
-				$args[2] : [];
-			$options['timeout'] = $args[1];
-			$caller = __METHOD__;
-		}
-		return Http::request( 'GET', $url, $options, $caller );
-	}
-
-	/**
-	 * Simple wrapper for Http::request( 'POST' )
-	 * @see Http::request()
-	 *
-	 * @param string $url
-	 * @param array $options
-	 * @param string $caller The method making this request, for profiling
-	 * @return string|bool false on error
-	 */
-	public static function post( $url, $options = [], $caller = __METHOD__ ) {
-		return Http::request( 'POST', $url, $options, $caller );
-	}
-
-	/**
-	 * A standard user-agent we can use for external requests.
-	 * @return string
-	 */
-	public static function userAgent() {
-		global $wgVersion;
-		return "MediaWiki/$wgVersion";
-	}
-
-	/**
-	 * Checks that the given URI is a valid one. Hardcoding the
-	 * protocols, because we only want protocols that both cURL
-	 * and php support.
-	 *
-	 * file:// should not be allowed here for security purpose (r67684)
-	 *
-	 * @todo FIXME this is wildly inaccurate and fails to actually check most stuff
-	 *
-	 * @param string $uri URI to check for validity
-	 * @return bool
-	 */
-	public static function isValidURI( $uri ) {
-		return preg_match(
-			'/^https?:\/\/[^\/\s]\S*$/D',
-			$uri
-		);
-	}
-
-	/**
-	 * Gets the relevant proxy from $wgHTTPProxy
-	 *
-	 * @return mixed The proxy address or an empty string if not set.
-	 */
-	public static function getProxy() {
-		global $wgHTTPProxy;
-
-		if ( $wgHTTPProxy ) {
-			return $wgHTTPProxy;
-		}
-
-		return "";
-	}
-}
-
-/**
- * This wrapper class will call out to curl (if available) or fallback
- * to regular PHP if necessary for handling internal HTTP requests.
- *
- * Renamed from HttpRequest to MWHttpRequest to avoid conflict with
- * PHP's HTTP extension.
- */
-class MWHttpRequest {
-	const SUPPORTS_FILE_POSTS = false;
-
-	protected $content;
-	protected $timeout = 'default';
-	protected $headersOnly = null;
-	protected $postData = null;
-	protected $proxy = null;
-	protected $noProxy = false;
-	protected $sslVerifyHost = true;
-	protected $sslVerifyCert = true;
-	protected $caInfo = null;
-	protected $method = "GET";
-	protected $reqHeaders = [];
-	protected $url;
-	protected $parsedUrl;
-	protected $callback;
-	protected $maxRedirects = 5;
-	protected $followRedirects = false;
-
-	/**
-	 * @var CookieJar
-	 */
-	protected $cookieJar;
-
-	protected $headerList = [];
-	protected $respVersion = "0.9";
-	protected $respStatus = "200 Ok";
-	protected $respHeaders = [];
-
-	public $status;
-
-	/**
-	 * @var Profiler
-	 */
-	protected $profiler;
-
-	/**
-	 * @var string
-	 */
-	protected $profileName;
-
-	/**
-	 * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
-	 * @param array $options (optional) extra params to pass (see Http::request())
-	 * @param string $caller The method making this request, for profiling
-	 * @param Profiler $profiler An instance of the profiler for profiling, or null
-	 */
-	protected function __construct(
-		$url, $options = [], $caller = __METHOD__, $profiler = null
-	) {
-		global $wgHTTPTimeout, $wgHTTPConnectTimeout;
-
-		$this->url = wfExpandUrl( $url, PROTO_HTTP );
-		$this->parsedUrl = wfParseUrl( $this->url );
-
-		if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
-			$this->status = Status::newFatal( 'http-invalid-url', $url );
-		} else {
-			$this->status = Status::newGood( 100 ); // continue
-		}
-
-		if ( isset( $options['timeout'] ) && $options['timeout'] != 'default' ) {
-			$this->timeout = $options['timeout'];
-		} else {
-			$this->timeout = $wgHTTPTimeout;
-		}
-		if ( isset( $options['connectTimeout'] ) && $options['connectTimeout'] != 'default' ) {
-			$this->connectTimeout = $options['connectTimeout'];
-		} else {
-			$this->connectTimeout = $wgHTTPConnectTimeout;
-		}
-		if ( isset( $options['userAgent'] ) ) {
-			$this->setUserAgent( $options['userAgent'] );
-		}
-
-		$members = [ "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo",
-				"method", "followRedirects", "maxRedirects", "sslVerifyCert", "callback" ];
-
-		foreach ( $members as $o ) {
-			if ( isset( $options[$o] ) ) {
-				// ensure that MWHttpRequest::method is always
-				// uppercased. Bug 36137
-				if ( $o == 'method' ) {
-					$options[$o] = strtoupper( $options[$o] );
-				}
-				$this->$o = $options[$o];
-			}
-		}
-
-		if ( $this->noProxy ) {
-			$this->proxy = ''; // noProxy takes precedence
-		}
-
-		// Profile based on what's calling us
-		$this->profiler = $profiler;
-		$this->profileName = $caller;
-	}
-
-	/**
-	 * Simple function to test if we can make any sort of requests at all, using
-	 * cURL or fopen()
-	 * @return bool
-	 */
-	public static function canMakeRequests() {
-		return function_exists( 'curl_init' ) || wfIniGetBool( 'allow_url_fopen' );
-	}
-
-	/**
-	 * Generate a new request object
-	 * @param string $url Url to use
-	 * @param array $options (optional) extra params to pass (see Http::request())
-	 * @param string $caller The method making this request, for profiling
-	 * @throws MWException
-	 * @return CurlHttpRequest|PhpHttpRequest
-	 * @see MWHttpRequest::__construct
-	 */
-	public static function factory( $url, $options = null, $caller = __METHOD__ ) {
-		if ( !Http::$httpEngine ) {
-			Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
-		} elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
-			throw new MWException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' .
-				' Http::$httpEngine is set to "curl"' );
-		}
-
-		switch ( Http::$httpEngine ) {
-			case 'curl':
-				return new CurlHttpRequest( $url, $options, $caller, Profiler::instance() );
-			case 'php':
-				if ( !wfIniGetBool( 'allow_url_fopen' ) ) {
-					throw new MWException( __METHOD__ . ': allow_url_fopen ' .
-						'needs to be enabled for pure PHP http requests to ' .
-						'work. If possible, curl should be used instead. See ' .
-						'http://php.net/curl.'
-					);
-				}
-				return new PhpHttpRequest( $url, $options, $caller, Profiler::instance() );
-			default:
-				throw new MWException( __METHOD__ . ': The setting of Http::$httpEngine is not valid.' );
-		}
-	}
-
-	/**
-	 * Get the body, or content, of the response to the request
-	 *
-	 * @return string
-	 */
-	public function getContent() {
-		return $this->content;
-	}
-
-	/**
-	 * Set the parameters of the request
-	 *
-	 * @param array $args
-	 * @todo overload the args param
-	 */
-	public function setData( $args ) {
-		$this->postData = $args;
-	}
-
-	/**
-	 * Take care of setting up the proxy (do nothing if "noProxy" is set)
-	 *
-	 * @return void
-	 */
-	public function proxySetup() {
-		// If there is an explicit proxy set and proxies are not disabled, then use it
-		if ( $this->proxy && !$this->noProxy ) {
-			return;
-		}
-
-		// Otherwise, fallback to $wgHTTPProxy if this is not a machine
-		// local URL and proxies are not disabled
-		if ( self::isLocalURL( $this->url ) || $this->noProxy ) {
-			$this->proxy = '';
-		} else {
-			$this->proxy = Http::getProxy();
-		}
-	}
-
-	/**
-	 * Check if the URL can be served by localhost
-	 *
-	 * @param string $url Full url to check
-	 * @return bool
-	 */
-	private static function isLocalURL( $url ) {
-		global $wgCommandLineMode, $wgLocalVirtualHosts;
-
-		if ( $wgCommandLineMode ) {
-			return false;
-		}
-
-		// Extract host part
-		$matches = [];
-		if ( preg_match( '!^https?://([\w.-]+)[/:].*$!', $url, $matches ) ) {
-			$host = $matches[1];
-			// Split up dotwise
-			$domainParts = explode( '.', $host );
-			// Check if this domain or any superdomain is listed as a local virtual host
-			$domainParts = array_reverse( $domainParts );
-
-			$domain = '';
-			$countParts = count( $domainParts );
-			for ( $i = 0; $i < $countParts; $i++ ) {
-				$domainPart = $domainParts[$i];
-				if ( $i == 0 ) {
-					$domain = $domainPart;
-				} else {
-					$domain = $domainPart . '.' . $domain;
-				}
-
-				if ( in_array( $domain, $wgLocalVirtualHosts ) ) {
-					return true;
-				}
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Set the user agent
-	 * @param string $UA
-	 */
-	public function setUserAgent( $UA ) {
-		$this->setHeader( 'User-Agent', $UA );
-	}
-
-	/**
-	 * Set an arbitrary header
-	 * @param string $name
-	 * @param string $value
-	 */
-	public function setHeader( $name, $value ) {
-		// I feel like I should normalize the case here...
-		$this->reqHeaders[$name] = $value;
-	}
-
-	/**
-	 * Get an array of the headers
-	 * @return array
-	 */
-	public function getHeaderList() {
-		$list = [];
-
-		if ( $this->cookieJar ) {
-			$this->reqHeaders['Cookie'] =
-				$this->cookieJar->serializeToHttpRequest(
-					$this->parsedUrl['path'],
-					$this->parsedUrl['host']
-				);
-		}
-
-		foreach ( $this->reqHeaders as $name => $value ) {
-			$list[] = "$name: $value";
-		}
-
-		return $list;
-	}
-
-	/**
-	 * Set a read callback to accept data read from the HTTP request.
-	 * By default, data is appended to an internal buffer which can be
-	 * retrieved through $req->getContent().
-	 *
-	 * To handle data as it comes in -- especially for large files that
-	 * would not fit in memory -- you can instead set your own callback,
-	 * in the form function($resource, $buffer) where the first parameter
-	 * is the low-level resource being read (implementation specific),
-	 * and the second parameter is the data buffer.
-	 *
-	 * You MUST return the number of bytes handled in the buffer; if fewer
-	 * bytes are reported handled than were passed to you, the HTTP fetch
-	 * will be aborted.
-	 *
-	 * @param callable $callback
-	 * @throws MWException
-	 */
-	public function setCallback( $callback ) {
-		if ( !is_callable( $callback ) ) {
-			throw new MWException( 'Invalid MwHttpRequest callback' );
-		}
-		$this->callback = $callback;
-	}
-
-	/**
-	 * A generic callback to read the body of the response from a remote
-	 * server.
-	 *
-	 * @param resource $fh
-	 * @param string $content
-	 * @return int
-	 */
-	public function read( $fh, $content ) {
-		$this->content .= $content;
-		return strlen( $content );
-	}
-
-	/**
-	 * Take care of whatever is necessary to perform the URI request.
-	 *
-	 * @return Status
-	 */
-	public function execute() {
-
-		$this->content = "";
-
-		if ( strtoupper( $this->method ) == "HEAD" ) {
-			$this->headersOnly = true;
-		}
-
-		$this->proxySetup(); // set up any proxy as needed
-
-		if ( !$this->callback ) {
-			$this->setCallback( [ $this, 'read' ] );
-		}
-
-		if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
-			$this->setUserAgent( Http::userAgent() );
-		}
-
-	}
-
-	/**
-	 * Parses the headers, including the HTTP status code and any
-	 * Set-Cookie headers.  This function expects the headers to be
-	 * found in an array in the member variable headerList.
-	 */
-	protected function parseHeader() {
-
-		$lastname = "";
-
-		foreach ( $this->headerList as $header ) {
-			if ( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) {
-				$this->respVersion = $match[1];
-				$this->respStatus = $match[2];
-			} elseif ( preg_match( "#^[ \t]#", $header ) ) {
-				$last = count( $this->respHeaders[$lastname] ) - 1;
-				$this->respHeaders[$lastname][$last] .= "\r\n$header";
-			} elseif ( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) {
-				$this->respHeaders[strtolower( $match[1] )][] = $match[2];
-				$lastname = strtolower( $match[1] );
-			}
-		}
-
-		$this->parseCookies();
-
-	}
-
-	/**
-	 * Sets HTTPRequest status member to a fatal value with the error
-	 * message if the returned integer value of the status code was
-	 * not successful (< 300) or a redirect (>=300 and < 400).  (see
-	 * RFC2616, section 10,
-	 * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a
-	 * list of status codes.)
-	 */
-	protected function setStatus() {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		if ( (int)$this->respStatus > 399 ) {
-			list( $code, $message ) = explode( " ", $this->respStatus, 2 );
-			$this->status->fatal( "http-bad-status", $code, $message );
-		}
-	}
-
-	/**
-	 * Get the integer value of the HTTP status code (e.g. 200 for "200 Ok")
-	 * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
-	 * for a list of status codes.)
-	 *
-	 * @return int
-	 */
-	public function getStatus() {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		return (int)$this->respStatus;
-	}
-
-	/**
-	 * Returns true if the last status code was a redirect.
-	 *
-	 * @return bool
-	 */
-	public function isRedirect() {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		$status = (int)$this->respStatus;
-
-		if ( $status >= 300 && $status <= 303 ) {
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns an associative array of response headers after the
-	 * request has been executed.  Because some headers
-	 * (e.g. Set-Cookie) can appear more than once the, each value of
-	 * the associative array is an array of the values given.
-	 *
-	 * @return array
-	 */
-	public function getResponseHeaders() {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		return $this->respHeaders;
-	}
-
-	/**
-	 * Returns the value of the given response header.
-	 *
-	 * @param string $header
-	 * @return string|null
-	 */
-	public function getResponseHeader( $header ) {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		if ( isset( $this->respHeaders[strtolower( $header )] ) ) {
-			$v = $this->respHeaders[strtolower( $header )];
-			return $v[count( $v ) - 1];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Tells the MWHttpRequest object to use this pre-loaded CookieJar.
-	 *
-	 * @param CookieJar $jar
-	 */
-	public function setCookieJar( $jar ) {
-		$this->cookieJar = $jar;
-	}
-
-	/**
-	 * Returns the cookie jar in use.
-	 *
-	 * @return CookieJar
-	 */
-	public function getCookieJar() {
-		if ( !$this->respHeaders ) {
-			$this->parseHeader();
-		}
-
-		return $this->cookieJar;
-	}
-
-	/**
-	 * Sets a cookie. Used before a request to set up any individual
-	 * cookies. Used internally after a request to parse the
-	 * Set-Cookie headers.
-	 * @see Cookie::set
-	 * @param string $name
-	 * @param mixed $value
-	 * @param array $attr
-	 */
-	public function setCookie( $name, $value = null, $attr = null ) {
-		if ( !$this->cookieJar ) {
-			$this->cookieJar = new CookieJar;
-		}
-
-		$this->cookieJar->setCookie( $name, $value, $attr );
-	}
-
-	/**
-	 * Parse the cookies in the response headers and store them in the cookie jar.
-	 */
-	protected function parseCookies() {
-
-		if ( !$this->cookieJar ) {
-			$this->cookieJar = new CookieJar;
-		}
-
-		if ( isset( $this->respHeaders['set-cookie'] ) ) {
-			$url = parse_url( $this->getFinalUrl() );
-			foreach ( $this->respHeaders['set-cookie'] as $cookie ) {
-				$this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
-			}
-		}
-
-	}
-
-	/**
-	 * Returns the final URL after all redirections.
-	 *
-	 * Relative values of the "Location" header are incorrect as
-	 * stated in RFC, however they do happen and modern browsers
-	 * support them.  This function loops backwards through all
-	 * locations in order to build the proper absolute URI - Marooned
-	 * at wikia-inc.com
-	 *
-	 * Note that the multiple Location: headers are an artifact of
-	 * CURL -- they shouldn't actually get returned this way. Rewrite
-	 * this when bug 29232 is taken care of (high-level redirect
-	 * handling rewrite).
-	 *
-	 * @return string
-	 */
-	public function getFinalUrl() {
-		$headers = $this->getResponseHeaders();
-
-		// return full url (fix for incorrect but handled relative location)
-		if ( isset( $headers['location'] ) ) {
-			$locations = $headers['location'];
-			$domain = '';
-			$foundRelativeURI = false;
-			$countLocations = count( $locations );
-
-			for ( $i = $countLocations - 1; $i >= 0; $i-- ) {
-				$url = parse_url( $locations[$i] );
-
-				if ( isset( $url['host'] ) ) {
-					$domain = $url['scheme'] . '://' . $url['host'];
-					break; // found correct URI (with host)
-				} else {
-					$foundRelativeURI = true;
-				}
-			}
-
-			if ( $foundRelativeURI ) {
-				if ( $domain ) {
-					return $domain . $locations[$countLocations - 1];
-				} else {
-					$url = parse_url( $this->url );
-					if ( isset( $url['host'] ) ) {
-						return $url['scheme'] . '://' . $url['host'] .
-							$locations[$countLocations - 1];
-					}
-				}
-			} else {
-				return $locations[$countLocations - 1];
-			}
-		}
-
-		return $this->url;
-	}
-
-	/**
-	 * Returns true if the backend can follow redirects. Overridden by the
-	 * child classes.
-	 * @return bool
-	 */
-	public function canFollowRedirects() {
-		return true;
-	}
-}
-
-/**
- * MWHttpRequest implemented using internal curl compiled into PHP
- */
-class CurlHttpRequest extends MWHttpRequest {
-	const SUPPORTS_FILE_POSTS = true;
-
-	protected $curlOptions = [];
-	protected $headerText = "";
-
-	/**
-	 * @param resource $fh
-	 * @param string $content
-	 * @return int
-	 */
-	protected function readHeader( $fh, $content ) {
-		$this->headerText .= $content;
-		return strlen( $content );
-	}
-
-	public function execute() {
-
-		parent::execute();
-
-		if ( !$this->status->isOK() ) {
-			return $this->status;
-		}
-
-		$this->curlOptions[CURLOPT_PROXY] = $this->proxy;
-		$this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout;
-
-		// Only supported in curl >= 7.16.2
-		if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) {
-			$this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
-		}
-
-		$this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
-		$this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback;
-		$this->curlOptions[CURLOPT_HEADERFUNCTION] = [ $this, "readHeader" ];
-		$this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects;
-		$this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression
-
-		$this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent'];
-
-		$this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost ? 2 : 0;
-		$this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert;
-
-		if ( $this->caInfo ) {
-			$this->curlOptions[CURLOPT_CAINFO] = $this->caInfo;
-		}
-
-		if ( $this->headersOnly ) {
-			$this->curlOptions[CURLOPT_NOBODY] = true;
-			$this->curlOptions[CURLOPT_HEADER] = true;
-		} elseif ( $this->method == 'POST' ) {
-			$this->curlOptions[CURLOPT_POST] = true;
-			$postData = $this->postData;
-			// Don't interpret POST parameters starting with '@' as file uploads, because this
-			// makes it impossible to POST plain values starting with '@' (and causes security
-			// issues potentially exposing the contents of local files).
-			// The PHP manual says this option was introduced in PHP 5.5 defaults to true in PHP 5.6,
-			// but we support lower versions, and the option doesn't exist in HHVM 5.6.99.
-			if ( defined( 'CURLOPT_SAFE_UPLOAD' ) ) {
-				$this->curlOptions[CURLOPT_SAFE_UPLOAD] = true;
-			} elseif ( is_array( $postData ) ) {
-				// In PHP 5.2 and later, '@' is interpreted as a file upload if POSTFIELDS
-				// is an array, but not if it's a string. So convert $req['body'] to a string
-				// for safety.
-				$postData = wfArrayToCgi( $postData );
-			}
-			$this->curlOptions[CURLOPT_POSTFIELDS] = $postData;
-
-			// Suppress 'Expect: 100-continue' header, as some servers
-			// will reject it with a 417 and Curl won't auto retry
-			// with HTTP 1.0 fallback
-			$this->reqHeaders['Expect'] = '';
-		} else {
-			$this->curlOptions[CURLOPT_CUSTOMREQUEST] = $this->method;
-		}
-
-		$this->curlOptions[CURLOPT_HTTPHEADER] = $this->getHeaderList();
-
-		$curlHandle = curl_init( $this->url );
-
-		if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
-			throw new MWException( "Error setting curl options." );
-		}
-
-		if ( $this->followRedirects && $this->canFollowRedirects() ) {
-			MediaWiki\suppressWarnings();
-			if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
-				wfDebug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
-					"Probably open_basedir is set.\n" );
-				// Continue the processing. If it were in curl_setopt_array,
-				// processing would have halted on its entry
-			}
-			MediaWiki\restoreWarnings();
-		}
-
-		if ( $this->profiler ) {
-			$profileSection = $this->profiler->scopedProfileIn(
-				__METHOD__ . '-' . $this->profileName
-			);
-		}
-
-		$curlRes = curl_exec( $curlHandle );
-		if ( curl_errno( $curlHandle ) == CURLE_OPERATION_TIMEOUTED ) {
-			$this->status->fatal( 'http-timed-out', $this->url );
-		} elseif ( $curlRes === false ) {
-			$this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
-		} else {
-			$this->headerList = explode( "\r\n", $this->headerText );
-		}
-
-		curl_close( $curlHandle );
-
-		if ( $this->profiler ) {
-			$this->profiler->scopedProfileOut( $profileSection );
-		}
-
-		$this->parseHeader();
-		$this->setStatus();
-
-		return $this->status;
-	}
-
-	/**
-	 * @return bool
-	 */
-	public function canFollowRedirects() {
-		$curlVersionInfo = curl_version();
-		if ( $curlVersionInfo['version_number'] < 0x071304 ) {
-			wfDebug( "Cannot follow redirects with libcurl < 7.19.4 due to CVE-2009-0037\n" );
-			return false;
-		}
-
-		if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
-			if ( strval( ini_get( 'open_basedir' ) ) !== '' ) {
-				wfDebug( "Cannot follow redirects when open_basedir is set\n" );
-				return false;
-			}
-		}
-
-		return true;
-	}
-}
-
-class PhpHttpRequest extends MWHttpRequest {
-
-	private $fopenErrors = [];
-
-	/**
-	 * @param string $url
-	 * @return string
-	 */
-	protected function urlToTcp( $url ) {
-		$parsedUrl = parse_url( $url );
-
-		return 'tcp://' . $parsedUrl['host'] . ':' . $parsedUrl['port'];
-	}
-
-	/**
-	 * Returns an array with a 'capath' or 'cafile' key
-	 * that is suitable to be merged into the 'ssl' sub-array of
-	 * a stream context options array.
-	 * Uses the 'caInfo' option of the class if it is provided, otherwise uses the system
-	 * default CA bundle if PHP supports that, or searches a few standard locations.
-	 * @return array
-	 * @throws DomainException
-	 */
-	protected function getCertOptions() {
-		$certOptions = [];
-		$certLocations = [];
-		if ( $this->caInfo ) {
-			$certLocations = [ 'manual' => $this->caInfo ];
-		} elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
-			// @codingStandardsIgnoreStart Generic.Files.LineLength
-			// Default locations, based on
-			// https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
-			// PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves.
-			// PHP 5.6+ gets the CA location from OpenSSL as long as it is not set manually,
-			// so we should leave capath/cafile empty there.
-			// @codingStandardsIgnoreEnd
-			$certLocations = array_filter( [
-				getenv( 'SSL_CERT_DIR' ),
-				getenv( 'SSL_CERT_PATH' ),
-				'/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al
-				'/etc/ssl/certs',  # Debian et al
-				'/etc/pki/tls/certs/ca-bundle.trust.crt',
-				'/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
-				'/System/Library/OpenSSL', # OSX
-			] );
-		}
-
-		foreach ( $certLocations as $key => $cert ) {
-			if ( is_dir( $cert ) ) {
-				$certOptions['capath'] = $cert;
-				break;
-			} elseif ( is_file( $cert ) ) {
-				$certOptions['cafile'] = $cert;
-				break;
-			} elseif ( $key === 'manual' ) {
-				// fail more loudly if a cert path was manually configured and it is not valid
-				throw new DomainException( "Invalid CA info passed: $cert" );
-			}
-		}
-
-		return $certOptions;
-	}
-
-	/**
-	 * Custom error handler for dealing with fopen() errors.
-	 * fopen() tends to fire multiple errors in succession, and the last one
-	 * is completely useless (something like "fopen: failed to open stream")
-	 * so normal methods of handling errors programmatically
-	 * like get_last_error() don't work.
-	 */
-	public function errorHandler( $errno, $errstr ) {
-		$n = count( $this->fopenErrors ) + 1;
-		$this->fopenErrors += [ "errno$n" => $errno, "errstr$n" => $errstr ];
-	}
-
-	public function execute() {
-
-		parent::execute();
-
-		if ( is_array( $this->postData ) ) {
-			$this->postData = wfArrayToCgi( $this->postData );
-		}
-
-		if ( $this->parsedUrl['scheme'] != 'http'
-			&& $this->parsedUrl['scheme'] != 'https' ) {
-			$this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] );
-		}
-
-		$this->reqHeaders['Accept'] = "*/*";
-		$this->reqHeaders['Connection'] = 'Close';
-		if ( $this->method == 'POST' ) {
-			// Required for HTTP 1.0 POSTs
-			$this->reqHeaders['Content-Length'] = strlen( $this->postData );
-			if ( !isset( $this->reqHeaders['Content-Type'] ) ) {
-				$this->reqHeaders['Content-Type'] = "application/x-www-form-urlencoded";
-			}
-		}
-
-		// Set up PHP stream context
-		$options = [
-			'http' => [
-				'method' => $this->method,
-				'header' => implode( "\r\n", $this->getHeaderList() ),
-				'protocol_version' => '1.1',
-				'max_redirects' => $this->followRedirects ? $this->maxRedirects : 0,
-				'ignore_errors' => true,
-				'timeout' => $this->timeout,
-				// Curl options in case curlwrappers are installed
-				'curl_verify_ssl_host' => $this->sslVerifyHost ? 2 : 0,
-				'curl_verify_ssl_peer' => $this->sslVerifyCert,
-			],
-			'ssl' => [
-				'verify_peer' => $this->sslVerifyCert,
-				'SNI_enabled' => true,
-				'ciphers' => 'HIGH:!SSLv2:!SSLv3:-ADH:-kDH:-kECDH:-DSS',
-				'disable_compression' => true,
-			],
-		];
-
-		if ( $this->proxy ) {
-			$options['http']['proxy'] = $this->urlToTcp( $this->proxy );
-			$options['http']['request_fulluri'] = true;
-		}
-
-		if ( $this->postData ) {
-			$options['http']['content'] = $this->postData;
-		}
-
-		if ( $this->sslVerifyHost ) {
-			// PHP 5.6.0 deprecates CN_match, in favour of peer_name which
-			// actually checks SubjectAltName properly.
-			if ( version_compare( PHP_VERSION, '5.6.0', '>=' ) ) {
-				$options['ssl']['peer_name'] = $this->parsedUrl['host'];
-			} else {
-				$options['ssl']['CN_match'] = $this->parsedUrl['host'];
-			}
-		}
-
-		$options['ssl'] += $this->getCertOptions();
-
-		$context = stream_context_create( $options );
-
-		$this->headerList = [];
-		$reqCount = 0;
-		$url = $this->url;
-
-		$result = [];
-
-		if ( $this->profiler ) {
-			$profileSection = $this->profiler->scopedProfileIn(
-				__METHOD__ . '-' . $this->profileName
-			);
-		}
-		do {
-			$reqCount++;
-			$this->fopenErrors = [];
-			set_error_handler( [ $this, 'errorHandler' ] );
-			$fh = fopen( $url, "r", false, $context );
-			restore_error_handler();
-
-			if ( !$fh ) {
-				// HACK for instant commons.
-				// If we are contacting (commons|upload).wikimedia.org
-				// try again with CN_match for en.wikipedia.org
-				// as php does not handle SubjectAltName properly
-				// prior to "peer_name" option in php 5.6
-				if ( isset( $options['ssl']['CN_match'] )
-					&& ( $options['ssl']['CN_match'] === 'commons.wikimedia.org'
-						|| $options['ssl']['CN_match'] === 'upload.wikimedia.org' )
-				) {
-					$options['ssl']['CN_match'] = 'en.wikipedia.org';
-					$context = stream_context_create( $options );
-					continue;
-				}
-				break;
-			}
-
-			$result = stream_get_meta_data( $fh );
-			$this->headerList = $result['wrapper_data'];
-			$this->parseHeader();
-
-			if ( !$this->followRedirects ) {
-				break;
-			}
-
-			# Handle manual redirection
-			if ( !$this->isRedirect() || $reqCount > $this->maxRedirects ) {
-				break;
-			}
-			# Check security of URL
-			$url = $this->getResponseHeader( "Location" );
-
-			if ( !Http::isValidURI( $url ) ) {
-				wfDebug( __METHOD__ . ": insecure redirection\n" );
-				break;
-			}
-		} while ( true );
-		if ( $this->profiler ) {
-			$this->profiler->scopedProfileOut( $profileSection );
-		}
-
-		$this->setStatus();
-
-		if ( $fh === false ) {
-			if ( $this->fopenErrors ) {
-				LoggerFactory::getInstance( 'http' )->warning( __CLASS__
-					. ': error opening connection: {errstr1}', $this->fopenErrors );
-			}
-			$this->status->fatal( 'http-request-error' );
-			return $this->status;
-		}
-
-		if ( $result['timed_out'] ) {
-			$this->status->fatal( 'http-timed-out', $this->url );
-			return $this->status;
-		}
-
-		// If everything went OK, or we received some error code
-		// get the response body content.
-		if ( $this->status->isOK() || (int)$this->respStatus >= 300 ) {
-			while ( !feof( $fh ) ) {
-				$buf = fread( $fh, 8192 );
-
-				if ( $buf === false ) {
-					$this->status->fatal( 'http-read-error' );
-					break;
-				}
-
-				if ( strlen( $buf ) ) {
-					call_user_func( $this->callback, $fh, $buf );
-				}
-			}
-		}
-		fclose( $fh );
-
-		return $this->status;
-	}
-}
diff --git a/includes/MediaWikiServices.php b/includes/MediaWikiServices.php
index b16044e12d..0f56797d49 100644
--- a/includes/MediaWikiServices.php
+++ b/includes/MediaWikiServices.php
@@ -3,6 +3,7 @@ namespace MediaWiki;
 
 use Config;
 use ConfigFactory;
+use CryptRand;
 use EventRelayerGroup;
 use GenderCache;
 use GlobalVarConfig;
@@ -522,6 +523,14 @@ class MediaWikiServices extends ServiceContainer {
 		return $this->getService( 'WatchedItemQueryService' );
 	}
 
+	/**
+	 * @since 1.28
+	 * @return CryptRand
+	 */
+	public function getCryptRand() {
+		return $this->getService( 'CryptRand' );
+	}
+
 	/**
 	 * @since 1.28
 	 * @return MediaHandlerFactory
diff --git a/includes/MovePage.php b/includes/MovePage.php
index 5f1dd3fdf6..8ee562a309 100644
--- a/includes/MovePage.php
+++ b/includes/MovePage.php
@@ -131,6 +131,14 @@ class MovePage {
 				ContentHandler::getLocalizedName( $this->oldTitle->getContentModel() ),
 				ContentHandler::getLocalizedName( $this->newTitle->getContentModel() )
 			);
+		} elseif (
+			!ContentHandler::getForTitle( $this->oldTitle )->canBeUsedOn( $this->newTitle )
+		) {
+			$status->fatal(
+				'content-not-allowed-here',
+				ContentHandler::getLocalizedName( $this->oldTitle->getContentModel() ),
+				$this->newTitle->getPrefixedText()
+			);
 		}
 
 		// Image-specific checks
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index b2e7d94337..a69c0e6692 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2215,6 +2215,8 @@ class OutputPage extends ContextSource {
 	 * @throws MWException
 	 */
 	public function output( $return = false ) {
+		global $wgContLang;
+
 		if ( $this->mDoNothing ) {
 			return $return ? '' : null;
 		}
@@ -2261,7 +2263,7 @@ class OutputPage extends ContextSource {
 		ob_start();
 
 		$response->header( 'Content-type: ' . $config->get( 'MimeType' ) . '; charset=UTF-8' );
-		$response->header( 'Content-language: ' . $config->get( 'ContLang' )->getHtmlCode() );
+		$response->header( 'Content-language: ' . $wgContLang->getHtmlCode() );
 
 		// Avoid Internet Explorer "compatibility view" in IE 8-10, so that
 		// jQuery etc. can work correctly.
diff --git a/includes/PageProps.php b/includes/PageProps.php
index ed06935c2c..d09e1fbf9d 100644
--- a/includes/PageProps.php
+++ b/includes/PageProps.php
@@ -19,6 +19,7 @@
  *
  * @file
  */
+use Wikimedia\ScopedCallback;
 
 /**
  * Gives access to properties of a page.
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 98bc885c8b..f6c4147118 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -182,12 +182,20 @@ abstract class PrefixSearch {
 		) ) {
 			return $this->titles( $this->defaultSearchBackend( $namespaces, $search, $limit, $offset ) );
 		}
-		return $this->strings( $this->handleResultFromHook( $srchres, $namespaces, $search, $limit ) );
+		return $this->strings(
+			$this->handleResultFromHook( $srchres, $namespaces, $search, $limit, $offset ) );
 	}
 
-	private function handleResultFromHook( $srchres, $namespaces, $search, $limit ) {
-		$rescorer = new SearchExactMatchRescorer();
-		return $rescorer->rescore( $search, $namespaces, $srchres, $limit );
+	private function handleResultFromHook( $srchres, $namespaces, $search, $limit, $offset ) {
+		if ( $offset === 0 ) {
+			// Only perform exact db match if offset === 0
+			// This is still far from perfect but at least we avoid returning the
+			// same title afain and again when the user is scrolling with a query
+			// that matches a title in the db.
+			$rescorer = new SearchExactMatchRescorer();
+			$srchres = $rescorer->rescore( $search, $namespaces, $srchres, $limit );
+		}
+		return $srchres;
 	}
 
 	/**
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index 8f1fc99fcd..4069658376 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -1015,6 +1015,7 @@ class Sanitizer {
 				| url\s*\(
 				| image\s*\(
 				| image-set\s*\(
+				| attr\s*\([^)]+[\s,]+url
 			!ix', $value ) ) {
 			return '/* insecure input */';
 		}
@@ -1867,7 +1868,7 @@ class Sanitizer {
 			list( /* $whole */, $protocol, $host, $rest ) = $matches;
 
 			// Characters that will be ignored in IDNs.
-			// http://tools.ietf.org/html/3454#section-3.1
+			// https://tools.ietf.org/html/rfc3454#section-3.1
 			// Strip them before further processing so blacklists and such work.
 			$strip = "/
 				\\s|          # general whitespace
diff --git a/includes/ServiceWiring.php b/includes/ServiceWiring.php
index 604491192a..86f457867d 100644
--- a/includes/ServiceWiring.php
+++ b/includes/ServiceWiring.php
@@ -39,17 +39,18 @@
 
 use MediaWiki\Interwiki\ClassicInterwikiLookup;
 use MediaWiki\Linker\LinkRendererFactory;
+use MediaWiki\Logger\LoggerFactory;
 use MediaWiki\MediaWikiServices;
 
 return [
 	'DBLoadBalancerFactory' => function( MediaWikiServices $services ) {
 		$mainConfig = $services->getMainConfig();
 
-		$lbConf = LBFactoryMW::applyDefaultConfig(
+		$lbConf = MWLBFactory::applyDefaultConfig(
 			$mainConfig->get( 'LBFactoryConf' ),
 			$mainConfig
 		);
-		$class = LBFactoryMW::getLBFactoryClass( $lbConf );
+		$class = MWLBFactory::getLBFactoryClass( $lbConf );
 
 		return new $class( $lbConf );
 	},
@@ -158,6 +159,31 @@ return [
 		return new WatchedItemQueryService( $services->getDBLoadBalancer() );
 	},
 
+	'CryptRand' => function( MediaWikiServices $services ) {
+		$secretKey = $services->getMainConfig()->get( 'SecretKey' );
+		return new CryptRand(
+			[
+				// To try vary the system information of the state a bit more
+				// by including the system's hostname into the state
+				'wfHostname',
+				// It's mostly worthless but throw the wiki's id into the data
+				// for a little more variance
+				'wfWikiID',
+				// If we have a secret key set then throw it into the state as well
+				function() use ( $secretKey ) {
+					return $secretKey ?: '';
+				}
+			],
+			// The config file is likely the most often edited file we know should
+			// be around so include its stat info into the state.
+			// The constant with its location will almost always be defined, as
+			// WebStart.php defines MW_CONFIG_FILE to $IP/LocalSettings.php unless
+			// being configured with MW_CONFIG_CALLBACK (e.g. the installer).
+			defined( 'MW_CONFIG_FILE' ) ? [ MW_CONFIG_FILE ] : [],
+			LoggerFactory::getInstance( 'CryptRand' )
+		);
+	},
+
 	'MediaHandlerFactory' => function( MediaWikiServices $services ) {
 		return new MediaHandlerFactory(
 			$services->getMainConfig()->get( 'MediaHandlers' )
diff --git a/includes/WatchedItemQueryService.php b/includes/WatchedItemQueryService.php
index c040fb1c29..4802f72ecb 100644
--- a/includes/WatchedItemQueryService.php
+++ b/includes/WatchedItemQueryService.php
@@ -55,7 +55,7 @@ class WatchedItemQueryService {
 	}
 
 	/**
-	 * @return DatabaseBase
+	 * @return Database
 	 * @throws MWException
 	 */
 	private function getConnection() {
diff --git a/includes/WatchedItemStore.php b/includes/WatchedItemStore.php
index 478cc5fbc2..90d45ce49c 100644
--- a/includes/WatchedItemStore.php
+++ b/includes/WatchedItemStore.php
@@ -192,20 +192,11 @@ class WatchedItemStore implements StatsdAwareInterface {
 	/**
 	 * @param int $dbIndex DB_MASTER or DB_REPLICA
 	 *
-	 * @return DatabaseBase
+	 * @return IDatabase
 	 * @throws MWException
 	 */
-	private function getConnection( $dbIndex ) {
-		return $this->loadBalancer->getConnection( $dbIndex, [ 'watchlist' ] );
-	}
-
-	/**
-	 * @param Database $connection
-	 *
-	 * @throws MWException
-	 */
-	private function reuseConnection( $connection ) {
-		$this->loadBalancer->reuseConnection( $connection );
+	private function getConnectionRef( $dbIndex ) {
+		return $this->loadBalancer->getConnectionRef( $dbIndex, [ 'watchlist' ] );
 	}
 
 	/**
@@ -217,7 +208,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	 * @return int
 	 */
 	public function countWatchedItems( User $user ) {
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 		$return = (int)$dbr->selectField(
 			'watchlist',
 			'COUNT(*)',
@@ -226,7 +217,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			],
 			__METHOD__
 		);
-		$this->reuseConnection( $dbr );
 
 		return $return;
 	}
@@ -237,7 +227,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	 * @return int
 	 */
 	public function countWatchers( LinkTarget $target ) {
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 		$return = (int)$dbr->selectField(
 			'watchlist',
 			'COUNT(*)',
@@ -247,7 +237,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			],
 			__METHOD__
 		);
-		$this->reuseConnection( $dbr );
 
 		return $return;
 	}
@@ -263,7 +252,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	 * @throws MWException
 	 */
 	public function countVisitingWatchers( LinkTarget $target, $threshold ) {
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 		$visitingWatchers = (int)$dbr->selectField(
 			'watchlist',
 			'COUNT(*)',
@@ -276,7 +265,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			],
 			__METHOD__
 		);
-		$this->reuseConnection( $dbr );
 
 		return $visitingWatchers;
 	}
@@ -293,7 +281,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	public function countWatchersMultiple( array $targets, array $options = [] ) {
 		$dbOptions = [ 'GROUP BY' => [ 'wl_namespace', 'wl_title' ] ];
 
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 
 		if ( array_key_exists( 'minimumWatchers', $options ) ) {
 			$dbOptions['HAVING'] = 'COUNT(*) >= ' . (int)$options['minimumWatchers'];
@@ -308,8 +296,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			$dbOptions
 		);
 
-		$this->reuseConnection( $dbr );
-
 		$watchCounts = [];
 		foreach ( $targets as $linkTarget ) {
 			$watchCounts[$linkTarget->getNamespace()][$linkTarget->getDBkey()] = 0;
@@ -341,7 +327,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 		array $targetsWithVisitThresholds,
 		$minimumWatchers = null
 	) {
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 
 		$conds = $this->getVisitingWatchersCondition( $dbr, $targetsWithVisitThresholds );
 
@@ -357,8 +343,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			$dbOptions
 		);
 
-		$this->reuseConnection( $dbr );
-
 		$watcherCounts = [];
 		foreach ( $targetsWithVisitThresholds as list( $target ) ) {
 			/* @var LinkTarget $target */
@@ -452,14 +436,13 @@ class WatchedItemStore implements StatsdAwareInterface {
 			return false;
 		}
 
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 		$row = $dbr->selectRow(
 			'watchlist',
 			'wl_notificationtimestamp',
 			$this->dbCond( $user, $target ),
 			__METHOD__
 		);
-		$this->reuseConnection( $dbr );
 
 		if ( !$row ) {
 			return false;
@@ -499,7 +482,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 				"wl_title {$options['sort']}"
 			];
 		}
-		$db = $this->getConnection( $options['forWrite'] ? DB_MASTER : DB_REPLICA );
+		$db = $this->getConnectionRef( $options['forWrite'] ? DB_MASTER : DB_REPLICA );
 
 		$res = $db->select(
 			'watchlist',
@@ -508,7 +491,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			__METHOD__,
 			$dbOptions
 		);
-		$this->reuseConnection( $db );
 
 		$watchedItems = [];
 		foreach ( $res as $row ) {
@@ -569,7 +551,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 			return $timestamps;
 		}
 
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 
 		$lb = new LinkBatch( $targetsToLoad );
 		$res = $dbr->select(
@@ -581,7 +563,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			],
 			__METHOD__
 		);
-		$this->reuseConnection( $dbr );
 
 		foreach ( $res as $row ) {
 			$timestamps[$row->wl_namespace][$row->wl_title] = $row->wl_notificationtimestamp;
@@ -630,13 +611,12 @@ class WatchedItemStore implements StatsdAwareInterface {
 			$this->uncache( $user, $target );
 		}
 
-		$dbw = $this->getConnection( DB_MASTER );
+		$dbw = $this->getConnectionRef( DB_MASTER );
 		foreach ( array_chunk( $rows, 100 ) as $toInsert ) {
 			// Use INSERT IGNORE to avoid overwriting the notification timestamp
 			// if there's already an entry for this page
 			$dbw->insert( 'watchlist', $toInsert, __METHOD__, 'IGNORE' );
 		}
-		$this->reuseConnection( $dbw );
 
 		return true;
 	}
@@ -660,7 +640,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 
 		$this->uncache( $user, $target );
 
-		$dbw = $this->getConnection( DB_MASTER );
+		$dbw = $this->getConnectionRef( DB_MASTER );
 		$dbw->delete( 'watchlist',
 			[
 				'wl_user' => $user->getId(),
@@ -669,7 +649,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			], __METHOD__
 		);
 		$success = (bool)$dbw->affectedRows();
-		$this->reuseConnection( $dbw );
 
 		return $success;
 	}
@@ -687,7 +666,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 			return false;
 		}
 
-		$dbw = $this->getConnection( DB_MASTER );
+		$dbw = $this->getConnectionRef( DB_MASTER );
 
 		$conds = [ 'wl_user' => $user->getId() ];
 		if ( $targets ) {
@@ -702,8 +681,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			__METHOD__
 		);
 
-		$this->reuseConnection( $dbw );
-
 		$this->uncacheUser( $user );
 
 		return $success;
@@ -718,7 +695,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	 * @return int[] Array of user IDs the timestamp has been updated for
 	 */
 	public function updateNotificationTimestamp( User $editor, LinkTarget $target, $timestamp ) {
-		$dbw = $this->getConnection( DB_MASTER );
+		$dbw = $this->getConnectionRef( DB_MASTER );
 		$uids = $dbw->selectFieldValues(
 			'watchlist',
 			'wl_user',
@@ -730,7 +707,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			],
 			__METHOD__
 		);
-		$this->reuseConnection( $dbw );
 
 		$watchers = array_map( 'intval', $uids );
 		if ( $watchers ) {
@@ -740,7 +716,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 				function () use ( $timestamp, $watchers, $target, $fname ) {
 					global $wgUpdateRowsPerQuery;
 
-					$dbw = $this->getConnection( DB_MASTER );
+					$dbw = $this->getConnectionRef( DB_MASTER );
 					$factory = wfGetLBFactory();
 					$ticket = $factory->getEmptyTransactionTicket( __METHOD__ );
 
@@ -762,8 +738,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 						}
 					}
 					$this->uncacheLinkTarget( $target );
-
-					$this->reuseConnection( $dbw );
 				},
 				DeferredUpdates::POSTSEND,
 				$dbw
@@ -885,7 +859,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 			$queryOptions['LIMIT'] = $unreadLimit;
 		}
 
-		$dbr = $this->getConnection( DB_REPLICA );
+		$dbr = $this->getConnectionRef( DB_REPLICA );
 		$rowCount = $dbr->selectRowCount(
 			'watchlist',
 			'1',
@@ -896,7 +870,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 			__METHOD__,
 			$queryOptions
 		);
-		$this->reuseConnection( $dbr );
 
 		if ( !isset( $unreadLimit ) ) {
 			return $rowCount;
@@ -937,7 +910,7 @@ class WatchedItemStore implements StatsdAwareInterface {
 	 * @param LinkTarget $newTarget
 	 */
 	public function duplicateEntry( LinkTarget $oldTarget, LinkTarget $newTarget ) {
-		$dbw = $this->getConnection( DB_MASTER );
+		$dbw = $this->getConnectionRef( DB_MASTER );
 
 		$result = $dbw->select(
 			'watchlist',
@@ -975,8 +948,6 @@ class WatchedItemStore implements StatsdAwareInterface {
 				__METHOD__
 			);
 		}
-
-		$this->reuseConnection( $dbw );
 	}
 
 }
diff --git a/includes/Xml.php b/includes/Xml.php
index 43f72177a9..b1bd098327 100644
--- a/includes/Xml.php
+++ b/includes/Xml.php
@@ -452,7 +452,7 @@ class Xml {
 
 	/**
 	 * Convenience function to build an HTML submit button
-	 * When $wgUseMediaWikiUIEverywhere is true it will default to a constructive button
+	 * When $wgUseMediaWikiUIEverywhere is true it will default to a progressive button
 	 * @param string $value Label text for the button
 	 * @param array $attribs Optional custom attributes
 	 * @return string HTML
@@ -467,7 +467,7 @@ class Xml {
 		// some submit forms
 		// might need to be mw-ui-destructive (e.g. delete a page)
 		if ( $wgUseMediaWikiUIEverywhere ) {
-			$baseAttrs['class'] = 'mw-ui-button mw-ui-constructive';
+			$baseAttrs['class'] = 'mw-ui-button mw-ui-progressive';
 		}
 		// Any custom attributes will take precendence of anything in baseAttrs e.g. override the class
 		$attribs = $attribs + $baseAttrs;
diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index f3ef3b3cb6..1e1bb39aec 100644
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -139,6 +139,10 @@ class HistoryAction extends FormlessAction {
 
 		// Fail nicely if article doesn't exist.
 		if ( !$this->page->exists() ) {
+			global $wgSend404Code;
+			if ( $wgSend404Code ) {
+				$out->setStatusCode( 404 );
+			}
 			$out->addWikiMsg( 'nohistory' );
 			# show deletion/move log if there is an entry
 			LogEventsList::showLogExtract(
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 809d5676b7..4feaac0009 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -600,7 +600,7 @@ abstract class ApiBase extends ContextSource {
 
 	/**
 	 * Gets a default replica DB connection object
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getDB() {
 		if ( !isset( $this->mSlaveDB ) ) {
diff --git a/includes/api/ApiClearHasMsg.php b/includes/api/ApiClearHasMsg.php
index 4ddbd040ca..13b35772be 100644
--- a/includes/api/ApiClearHasMsg.php
+++ b/includes/api/ApiClearHasMsg.php
@@ -30,7 +30,13 @@
 class ApiClearHasMsg extends ApiBase {
 	public function execute() {
 		$user = $this->getUser();
-		$user->setNewtalk( false );
+		if ( $this->getRequest()->wasPosted() ) {
+			$user->setNewtalk( false );
+		} else {
+			DeferredUpdates::addCallableUpdate( function () use ( $user ) {
+				$user->setNewtalk( false );
+			} );
+		}
 		$this->getResult()->addValue( null, $this->getModuleName(), 'success' );
 	}
 
diff --git a/includes/api/ApiContinuationManager.php b/includes/api/ApiContinuationManager.php
index 6601fb7463..19e2453944 100644
--- a/includes/api/ApiContinuationManager.php
+++ b/includes/api/ApiContinuationManager.php
@@ -31,6 +31,7 @@ class ApiContinuationManager {
 
 	private $continuationData = [];
 	private $generatorContinuationData = [];
+	private $generatorNonContinuationData = [];
 
 	private $generatorParams = [];
 	private $generatorDone = false;
@@ -142,6 +143,26 @@ class ApiContinuationManager {
 		$this->continuationData[$name][$paramName] = $paramValue;
 	}
 
+	/**
+	 * Set the non-continuation parameter for the generator module
+	 *
+	 * In case the generator isn't going to be continued, this sets the fields
+	 * to return.
+	 *
+	 * @since 1.28
+	 * @param ApiBase $module
+	 * @param string $paramName
+	 * @param string|array $paramValue
+	 */
+	public function addGeneratorNonContinueParam( ApiBase $module, $paramName, $paramValue ) {
+		$name = $module->getModuleName();
+		$paramName = $module->encodeParamName( $paramName );
+		if ( is_array( $paramValue ) ) {
+			$paramValue = implode( '|', $paramValue );
+		}
+		$this->generatorNonContinuationData[$name][$paramName] = $paramValue;
+	}
+
 	/**
 	 * Set the continuation parameter for the generator module
 	 * @param ApiBase $module
@@ -165,6 +186,15 @@ class ApiContinuationManager {
 		return array_merge_recursive( $this->continuationData, $this->generatorContinuationData );
 	}
 
+	/**
+	 * Fetch raw non-continuation data
+	 * @since 1.28
+	 * @return array
+	 */
+	public function getRawNonContinuation() {
+		return $this->generatorNonContinuationData;
+	}
+
 	/**
 	 * Fetch continuation result data
 	 * @return array [ (array)$data, (bool)$batchcomplete ]
@@ -192,8 +222,13 @@ class ApiContinuationManager {
 			foreach ( $continuationData as $module => $kvp ) {
 				$data += $kvp;
 			}
-			$data += $this->generatorParams;
-			$generatorKeys = implode( '|', array_keys( $this->generatorParams ) );
+			$generatorParams = [];
+			foreach ( $this->generatorNonContinuationData as $kvp ) {
+				$generatorParams += $kvp;
+			}
+			$generatorParams += $this->generatorParams;
+			$data += $generatorParams;
+			$generatorKeys = implode( '|', array_keys( $generatorParams ) );
 		} elseif ( $this->generatorContinuationData ) {
 			// All the generator-using modules are complete, but the
 			// generator isn't. Continue the generator and restart the
diff --git a/includes/api/ApiPageSet.php b/includes/api/ApiPageSet.php
index ed229cb9f4..34c17c1ef3 100644
--- a/includes/api/ApiPageSet.php
+++ b/includes/api/ApiPageSet.php
@@ -1330,7 +1330,7 @@ class ApiPageSet extends ApiBase {
 
 	/**
 	 * Get the database connection (read-only)
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getDB() {
 		return $this->mDbSource->getDB();
diff --git a/includes/api/ApiQuery.php b/includes/api/ApiQuery.php
index 5e3c7090cd..2f532097ee 100644
--- a/includes/api/ApiQuery.php
+++ b/includes/api/ApiQuery.php
@@ -168,7 +168,7 @@ class ApiQuery extends ApiBase {
 	 * @param string $name Name to assign to the database connection
 	 * @param int $db One of the DB_* constants
 	 * @param array $groups Query groups
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	public function getNamedDB( $name, $db, $groups ) {
 		if ( !array_key_exists( $name, $this->mNamedDB ) ) {
@@ -258,6 +258,11 @@ class ApiQuery extends ApiBase {
 		// Write the continuation data into the result
 		$this->setContinuationManager( null );
 		if ( $this->mParams['rawcontinue'] ) {
+			$data = $continuationManager->getRawNonContinuation();
+			if ( $data ) {
+				$this->getResult()->addValue( null, 'query-noncontinue', $data,
+					ApiResult::ADD_ON_TOP | ApiResult::NO_SIZE_CHECK );
+			}
 			$data = $continuationManager->getRawContinuation();
 			if ( $data ) {
 				$this->getResult()->addValue( null, 'query-continue', $data,
diff --git a/includes/api/ApiQueryAllImages.php b/includes/api/ApiQueryAllImages.php
index 6aeee683d0..553995c781 100644
--- a/includes/api/ApiQueryAllImages.php
+++ b/includes/api/ApiQueryAllImages.php
@@ -44,7 +44,7 @@ class ApiQueryAllImages extends ApiQueryGeneratorBase {
 	 * which may not necessarily be the same as the local DB.
 	 *
 	 * TODO: allow querying non-local repos.
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getDB() {
 		return $this->mRepo->getSlaveDB();
diff --git a/includes/api/ApiQueryAllRevisions.php b/includes/api/ApiQueryAllRevisions.php
index 060e3e10dc..d548c46ce0 100644
--- a/includes/api/ApiQueryAllRevisions.php
+++ b/includes/api/ApiQueryAllRevisions.php
@@ -172,6 +172,13 @@ class ApiQueryAllRevisions extends ApiQueryRevisionsBase {
 		$nextIndex = 0;
 		$generated = [];
 		foreach ( $res as $row ) {
+			if ( $count === 0 && $resultPageSet !== null ) {
+				// Set the non-continue since the list of all revisions is
+				// prone to having entries added at the start frequently.
+				$this->getContinuationManager()->addGeneratorNonContinueParam(
+					$this, 'continue', "$row->rev_timestamp|$row->rev_id"
+				);
+			}
 			if ( ++$count > $this->limit ) {
 				// We've had enough
 				$this->setContinueEnumParameter( 'continue', "$row->rev_timestamp|$row->rev_id" );
diff --git a/includes/api/ApiQueryBase.php b/includes/api/ApiQueryBase.php
index b35eec2c39..36ad3a4be7 100644
--- a/includes/api/ApiQueryBase.php
+++ b/includes/api/ApiQueryBase.php
@@ -103,7 +103,7 @@ abstract class ApiQueryBase extends ApiBase {
 
 	/**
 	 * Get the Query database connection (read-only)
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getDB() {
 		if ( is_null( $this->mDb ) ) {
@@ -119,7 +119,7 @@ abstract class ApiQueryBase extends ApiBase {
 	 * @param string $name Name to assign to the database connection
 	 * @param int $db One of the DB_* constants
 	 * @param array $groups Query groups
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	public function selectNamedDB( $name, $db, $groups ) {
 		$this->mDb = $this->getQuery()->getNamedDB( $name, $db, $groups );
diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php
index cc3ca60f3d..c4c8afbdbf 100644
--- a/includes/api/ApiQueryRecentChanges.php
+++ b/includes/api/ApiQueryRecentChanges.php
@@ -372,6 +372,13 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase {
 
 		/* Iterate through the rows, adding data extracted from them to our query result. */
 		foreach ( $res as $row ) {
+			if ( $count === 0 && $resultPageSet !== null ) {
+				// Set the non-continue since the list of recentchanges is
+				// prone to having entries added at the start frequently.
+				$this->getContinuationManager()->addGeneratorNonContinueParam(
+					$this, 'continue', "$row->rc_timestamp|$row->rc_id"
+				);
+			}
 			if ( ++$count > $params['limit'] ) {
 				// We've reached the one extra which shows that there are
 				// additional pages to be had. Stop here...
diff --git a/includes/api/ApiQuerySearch.php b/includes/api/ApiQuerySearch.php
index ba60da95bb..6be51986a6 100644
--- a/includes/api/ApiQuerySearch.php
+++ b/includes/api/ApiQuerySearch.php
@@ -75,6 +75,7 @@ class ApiQuerySearch extends ApiQueryGeneratorBase {
 		// Create search engine instance and set options
 		$search = $this->buildSearchEngine( $params );
 		$search->setFeatureData( 'rewrite', (bool)$params['enablerewrites'] );
+		$search->setFeatureData( 'interwiki', (bool)$interwiki );
 
 		$query = $search->transformSearchTerm( $query );
 		$query = $search->replacePrefixes( $query );
diff --git a/includes/api/i18n/bn.json b/includes/api/i18n/bn.json
index c93d8bae4a..a53371057e 100644
--- a/includes/api/i18n/bn.json
+++ b/includes/api/i18n/bn.json
@@ -2,13 +2,23 @@
 	"@metadata": {
 		"authors": [
 			"Aftabuzzaman",
-			"Bodhisattwa"
+			"Bodhisattwa",
+			"আজিজ"
 		]
 	},
+	"apihelp-main-param-format": "আউটপুটের বিন্যাস",
+	"apihelp-main-param-requestid": "এখানে প্রদত্ত যেকোন মান প্রতিক্রিয়ায় অন্তর্ভুক্ত করা হবে। অনুরোধের পার্থক্য করতে ব্যবহার করা যেতে পারে।",
 	"apihelp-block-description": "ব্যবহারকারীকে বাধা দিন।",
+	"apihelp-block-param-reason": "বাধার দানের কারণ।",
+	"apihelp-createaccount-description": "নতুন ব্যবহারকারীর অ্যাকাউন্ট তৈরি করুন",
 	"apihelp-createaccount-param-name": "ব্যবহারকারী নাম।",
 	"apihelp-delete-description": "একটি পাতা মুছে ফেলুন।",
 	"apihelp-delete-example-simple": "<kbd>প্রধান পাতা</kbd> মুছে ফেলুন।",
+	"apihelp-edit-param-text": "পাতার বিষয়বস্তু।",
 	"apihelp-edit-param-minor": "অনুল্লেখ্য সম্পাদনা।",
+	"apihelp-edit-param-createonly": "পাতাটি আগেই বিদ্যমান থাকলে সম্পদনা করবেন না।",
+	"apihelp-edit-param-contentmodel": "নতুন বিষয়বস্তুর, বিষয়বস্তু-মডেল।",
+	"apihelp-edit-example-edit": "একটি পাতা সম্পাদনা করুন",
+	"apihelp-edit-example-prepend": "একটি পৃষ্ঠার পূর্বে <kbd>_&#95;NOTOC_&#95;</kbd> লিখুন।",
 	"apihelp-login-example-login": "প্রবেশ"
 }
diff --git a/includes/api/i18n/diq.json b/includes/api/i18n/diq.json
index 31bb5fa423..b5179bbed0 100644
--- a/includes/api/i18n/diq.json
+++ b/includes/api/i18n/diq.json
@@ -3,7 +3,8 @@
 		"authors": [
 			"Gorizon",
 			"Mirzali",
-			"Kumkumuk"
+			"Kumkumuk",
+			"Asmen"
 		]
 	},
 	"apihelp-main-param-action": "Performansa kamci aksiyon",
@@ -20,7 +21,7 @@
 	"apihelp-disabled-description": "Eno modul aktiv niyo.",
 	"apihelp-edit-description": "Vıraze û pelan bıvurne.",
 	"apihelp-edit-param-text": "Zerreki pele",
-	"apihelp-edit-param-minor": "Vurnayışo qıckek.",
+	"apihelp-edit-param-minor": "Vurriyayışê werdiy",
 	"apihelp-edit-param-notminor": "Vurnayışo qıckek niyo.",
 	"apihelp-edit-param-bot": "Nê vurnayışi zey boti nişan ke.",
 	"apihelp-edit-example-edit": "Şeker bıvurne",
diff --git a/includes/auth/AuthManager.php b/includes/auth/AuthManager.php
index 51efe5696a..e223e16e69 100644
--- a/includes/auth/AuthManager.php
+++ b/includes/auth/AuthManager.php
@@ -1694,9 +1694,9 @@ class AuthManager implements LoggerAwareInterface {
 					$status = Status::newGood();
 					$status->warning( 'userexists' );
 				} else {
-					$this->logger->error( __METHOD__ . ': {username} failed with message {message}', [
+					$this->logger->error( __METHOD__ . ': {username} failed with message {msg}', [
 						'username' => $username,
-						'message' => $status->getWikiText( null, null, 'en' )
+						'msg' => $status->getWikiText( null, null, 'en' )
 					] );
 					$user->setId( 0 );
 					$user->loadFromId();
diff --git a/includes/cache/BacklinkCache.php b/includes/cache/BacklinkCache.php
index 9dfabfd089..9e6cf1ef4c 100644
--- a/includes/cache/BacklinkCache.php
+++ b/includes/cache/BacklinkCache.php
@@ -139,7 +139,7 @@ class BacklinkCache {
 	/**
 	 * Get the replica DB connection to the database
 	 * When non existing, will initialize the connection.
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getDB() {
 		if ( !isset( $this->db ) ) {
diff --git a/includes/cache/HTMLFileCache.php b/includes/cache/HTMLFileCache.php
index a85639faf4..ae8efa9c82 100644
--- a/includes/cache/HTMLFileCache.php
+++ b/includes/cache/HTMLFileCache.php
@@ -157,6 +157,7 @@ class HTMLFileCache extends FileCacheBase {
 	 * @return void
 	 */
 	public function loadFromFileCache( IContextSource $context, $mode = self::MODE_NORMAL ) {
+		global $wgContLang;
 		$config = MediaWikiServices::getInstance()->getMainConfig();
 
 		wfDebug( __METHOD__ . "()\n" );
@@ -169,7 +170,7 @@ class HTMLFileCache extends FileCacheBase {
 
 		$context->getOutput()->sendCacheControl();
 		header( "Content-Type: {$config->get( 'MimeType' )}; charset=UTF-8" );
-		header( "Content-Language: {$config->get( 'LanguageCode' )}" );
+		header( "Content-Language: {$wgContLang->getHtmlCode()}" );
 		if ( $this->useGzip() ) {
 			if ( wfClientAcceptsGzip() ) {
 				header( 'Content-Encoding: gzip' );
diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 794865e439..1262f2cf3a 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -90,6 +90,11 @@ class RecentChange {
 	 */
 	public $counter = -1;
 
+	/**
+	 * @var array List of tags to apply
+	 */
+	private $tags = [];
+
 	/**
 	 * @var array Array of change types
 	 */
@@ -326,6 +331,11 @@ class RecentChange {
 		# Notify extensions
 		Hooks::run( 'RecentChange_save', [ &$this ] );
 
+		if ( count( $this->tags ) ) {
+			ChangeTags::addTags( $this->tags, $this->mAttribs['rc_id'],
+				$this->mAttribs['rc_this_oldid'], $this->mAttribs['rc_logid'], null, $this );
+		}
+
 		# Notify external application via UDP
 		if ( !$noudp ) {
 			$this->notifyRCFeeds();
@@ -610,14 +620,11 @@ class RecentChange {
 
 		DeferredUpdates::addCallableUpdate(
 			function () use ( $rc, $tags ) {
+				$rc->addTags( $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 )
@@ -686,14 +693,11 @@ class RecentChange {
 
 		DeferredUpdates::addCallableUpdate(
 			function () use ( $rc, $tags ) {
+				$rc->addTags( $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 )
@@ -1026,4 +1030,20 @@ class RecentChange {
 
 		return $unserializedParams;
 	}
+
+	/**
+	 * Tags to append to the recent change,
+	 * and associated revision/log
+	 *
+	 * @since 1.28
+	 *
+	 * @param string|array $tags
+	 */
+	public function addTags( $tags ) {
+		if ( is_string( $tags ) ) {
+			$this->tags[] = $tags;
+		} else {
+			$this->tags = array_merge( $tags, $this->tags );
+		}
+	}
 }
diff --git a/includes/changetags/ChangeTags.php b/includes/changetags/ChangeTags.php
index 955e9725b6..76dd754deb 100644
--- a/includes/changetags/ChangeTags.php
+++ b/includes/changetags/ChangeTags.php
@@ -124,14 +124,16 @@ class ChangeTags {
 	 * @param int|null $rev_id The rev_id of the change to add the tags to
 	 * @param int|null $log_id The log_id of the change to add the tags to
 	 * @param string $params Params to put in the ct_params field of table 'change_tag'
+	 * @param RecentChange|null $rc Recent change, in case the tagging accompanies the action
+	 * (this should normally be the case)
 	 *
 	 * @throws MWException
 	 * @return bool False if no changes are made, otherwise true
 	 */
 	public static function addTags( $tags, $rc_id = null, $rev_id = null,
-		$log_id = null, $params = null
+		$log_id = null, $params = null, RecentChange $rc = null
 	) {
-		$result = self::updateTags( $tags, null, $rc_id, $rev_id, $log_id, $params );
+		$result = self::updateTags( $tags, null, $rc_id, $rev_id, $log_id, $params, $rc );
 		return (bool)$result[0];
 	}
 
@@ -154,6 +156,9 @@ class ChangeTags {
 	 * Pass a variable whose value is null if the log_id is not relevant or unknown.
 	 * @param string $params Params to put in the ct_params field of table
 	 * 'change_tag' when adding tags
+	 * @param RecentChange|null $rc Recent change being tagged, in case the tagging accompanies
+	 * the action
+	 * @param User|null $user Tagging user, in case the tagging is subsequent to the tagged action
 	 *
 	 * @throws MWException When $rc_id, $rev_id and $log_id are all null
 	 * @return array Index 0 is an array of tags actually added, index 1 is an
@@ -162,9 +167,9 @@ class ChangeTags {
 	 *
 	 * @since 1.25
 	 */
-	public static function updateTags(
-		$tagsToAdd, $tagsToRemove,
-		&$rc_id = null, &$rev_id = null, &$log_id = null, $params = null
+	public static function updateTags( $tagsToAdd, $tagsToRemove, &$rc_id = null,
+		&$rev_id = null, &$log_id = null, $params = null, RecentChange $rc = null,
+		User $user = null
 	) {
 
 		$tagsToAdd = array_filter( (array)$tagsToAdd ); // Make sure we're submitting all tags...
@@ -284,6 +289,10 @@ class ChangeTags {
 		}
 
 		self::purgeTagUsageCache();
+
+		Hooks::run( 'ChangeTagsAfterUpdateTags', [ $tagsToAdd, $tagsToRemove, $prevTags,
+			$rc_id, $rev_id, $log_id, $params, $rc, $user ] );
+
 		return [ $tagsToAdd, $tagsToRemove, $prevTags ];
 	}
 
@@ -546,7 +555,7 @@ class ChangeTags {
 
 		// do it!
 		list( $tagsAdded, $tagsRemoved, $initialTags ) = self::updateTags( $tagsToAdd,
-			$tagsToRemove, $rc_id, $rev_id, $log_id, $params );
+			$tagsToRemove, $rc_id, $rev_id, $log_id, $params, null, $user );
 		if ( !$tagsAdded && !$tagsRemoved ) {
 			// no-op, don't log it
 			return Status::newGood( (object)[
@@ -656,21 +665,15 @@ class ChangeTags {
 	 * Build a text box to select a change tag
 	 *
 	 * @param string $selected Tag to select by default
-	 * @param bool $fullForm Affects return value, see below
-	 * @param Title $title Title object to send the form to. Used only if $fullForm is true.
 	 * @param bool $ooui Use an OOUI TextInputWidget as selector instead of a non-OOUI input field
 	 *        You need to call OutputPage::enableOOUI() yourself.
-	 * @return string|array
-	 *        - if $fullForm is false: an array of (label, selector).
-	 *        - if $fullForm is true: HTML of entire form built around the selector.
+	 * @return array an array of (label, selector)
 	 */
-	public static function buildTagFilterSelector( $selected = '',
-		$fullForm = false, Title $title = null, $ooui = false
-	) {
+	public static function buildTagFilterSelector( $selected = '', $ooui = false ) {
 		global $wgUseTagFilter;
 
 		if ( !$wgUseTagFilter || !count( self::listDefinedTags() ) ) {
-			return $fullForm ? '' : [];
+			return [];
 		}
 
 		$data = [
@@ -697,24 +700,7 @@ class ChangeTags {
 			);
 		}
 
-		if ( !$fullForm ) {
-			return $data;
-		}
-
-		$html = implode( '&#160;', $data );
-		$html .= "\n" .
-			Xml::element(
-				'input',
-				[ 'type' => 'submit', 'value' => wfMessage( 'tag-filter-submit' )->text() ]
-			);
-		$html .= "\n" . Html::hidden( 'title', $title->getPrefixedText() );
-		$html = Xml::tags(
-			'form',
-			[ 'action' => $title->getLocalURL(), 'class' => 'mw-tagfilter-form', 'method' => 'get' ],
-			$html
-		);
-
-		return $html;
+		return $data;
 	}
 
 	/**
diff --git a/includes/compat/ScopedCallback.php b/includes/compat/ScopedCallback.php
new file mode 100644
index 0000000000..4fd4bc7989
--- /dev/null
+++ b/includes/compat/ScopedCallback.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Compatibility class for pre-namespace, pre-library class name
+ *
+ * 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
+ */
+
+/**
+ * @deprecated since 1.28 use Wikimedia\ScopedCallback
+ *
+ * @since 1.21
+ */
+class ScopedCallback extends Wikimedia\ScopedCallback {
+}
diff --git a/includes/content/ContentHandler.php b/includes/content/ContentHandler.php
index 4e50c8ee79..d709c5c931 100644
--- a/includes/content/ContentHandler.php
+++ b/includes/content/ContentHandler.php
@@ -706,7 +706,7 @@ abstract class ContentHandler {
 		if ( $title->getNamespace() == NS_MEDIAWIKI ) {
 			// Parse mediawiki messages with correct target language
 			list( /* $unused */, $lang ) = MessageCache::singleton()->figureMessage( $title->getText() );
-			$pageLang = wfGetLangObj( $lang );
+			$pageLang = Language::factory( $lang );
 		}
 
 		Hooks::run( 'PageContentLanguage', [ $title, &$pageLang, $wgLang ] );
diff --git a/includes/content/FileContentHandler.php b/includes/content/FileContentHandler.php
new file mode 100644
index 0000000000..26f119065d
--- /dev/null
+++ b/includes/content/FileContentHandler.php
@@ -0,0 +1,62 @@
+<?php
+
+/**
+ * Content handler for File: files
+ * TODO: this handler s not used directly now,
+ * but instead manually called by WikitextHandler.
+ * This should be fixed in the future.
+ */
+class FileContentHandler extends WikitextContentHandler  {
+
+	public function getFieldsForSearchIndex( SearchEngine $engine ) {
+		$fields['file_media_type'] =
+			$engine->makeSearchFieldMapping( 'file_media_type', SearchIndexField::INDEX_TYPE_KEYWORD );
+		$fields['file_media_type']->setFlag( SearchIndexField::FLAG_CASEFOLD );
+		$fields['file_mime'] =
+			$engine->makeSearchFieldMapping( 'file_mime', SearchIndexField::INDEX_TYPE_SHORT_TEXT );
+		$fields['file_mime']->setFlag( SearchIndexField::FLAG_CASEFOLD );
+		$fields['file_size'] =
+			$engine->makeSearchFieldMapping( 'file_size', SearchIndexField::INDEX_TYPE_INTEGER );
+		$fields['file_width'] =
+			$engine->makeSearchFieldMapping( 'file_width', SearchIndexField::INDEX_TYPE_INTEGER );
+		$fields['file_height'] =
+			$engine->makeSearchFieldMapping( 'file_height', SearchIndexField::INDEX_TYPE_INTEGER );
+		$fields['file_bits'] =
+			$engine->makeSearchFieldMapping( 'file_bits', SearchIndexField::INDEX_TYPE_INTEGER );
+		$fields['file_resolution'] =
+			$engine->makeSearchFieldMapping( 'file_resolution', SearchIndexField::INDEX_TYPE_INTEGER );
+		$fields['file_text'] =
+			$engine->makeSearchFieldMapping( 'file_text', SearchIndexField::INDEX_TYPE_TEXT );
+		return $fields;
+	}
+
+	public function getDataForSearchIndex( WikiPage $page, ParserOutput $parserOutput,
+	                                       SearchEngine $engine ) {
+		$fields = [];
+
+		$title = $page->getTitle();
+		if ( NS_FILE != $title->getNamespace() ) {
+			return [];
+		}
+		$file = wfLocalFile( $title );
+		if ( !$file || !$file->exists() ) {
+			return [];
+		}
+
+		$handler = $file->getHandler();
+		if ( $handler ) {
+			$fields['file_text'] = $handler->getEntireText( $file );
+		}
+		$fields['file_media_type'] = $file->getMediaType();
+		$fields['file_mime'] = $file->getMimeType();
+		$fields['file_size'] = $file->getSize();
+		$fields['file_width'] = $file->getWidth();
+		$fields['file_height'] = $file->getHeight();
+		$fields['file_bits'] = $file->getBitDepth();
+		$fields['file_resolution'] =
+			(int)floor( sqrt( $fields['file_width'] * $fields['file_height'] ) );
+
+		return $fields;
+	}
+
+}
diff --git a/includes/content/WikitextContentHandler.php b/includes/content/WikitextContentHandler.php
index 978ac44003..74b2f1aede 100644
--- a/includes/content/WikitextContentHandler.php
+++ b/includes/content/WikitextContentHandler.php
@@ -108,6 +108,14 @@ class WikitextContentHandler extends TextContentHandler {
 		return true;
 	}
 
+	/**
+	 * Get file handler
+	 * @return FileContentHandler
+	 */
+	protected function getFileHandler() {
+		return new FileContentHandler();
+	}
+
 	public function getFieldsForSearchIndex( SearchEngine $engine ) {
 		$fields = parent::getFieldsForSearchIndex( $engine );
 
@@ -122,34 +130,12 @@ class WikitextContentHandler extends TextContentHandler {
 			$engine->makeSearchFieldMapping( 'opening_text', SearchIndexField::INDEX_TYPE_TEXT );
 		$fields['opening_text']->setFlag( SearchIndexField::FLAG_SCORING |
 		                                  SearchIndexField::FLAG_NO_HIGHLIGHT );
-
-		// FIXME: this really belongs in separate file handler but files
-		// do not have separate handler. Sadness.
-		$fields['file_text'] =
-			$engine->makeSearchFieldMapping( 'file_text', SearchIndexField::INDEX_TYPE_TEXT );
+		// Until we have full first-class content handler for files, we invoke it explicitly here
+		$fields = array_merge( $fields, $this->getFileHandler()->getFieldsForSearchIndex( $engine ) );
 
 		return $fields;
 	}
 
-	/**
-	 * Extract text of the file
-	 * TODO: probably should go to file handler?
-	 * @param Title $title
-	 * @return string|null
-	 */
-	protected function getFileText( Title $title ) {
-		$file = wfLocalFile( $title );
-		if ( $file && $file->exists() ) {
-			$handler = $file->getHandler();
-			if ( !$handler ) {
-				return null;
-			}
-			return $handler->getEntireText( $file );
-		}
-
-		return null;
-	}
-
 	public function getDataForSearchIndex( WikiPage $page, ParserOutput $parserOutput,
 	                                       SearchEngine $engine ) {
 		$fields = parent::getDataForSearchIndex( $page, $parserOutput, $engine );
@@ -162,12 +148,10 @@ class WikitextContentHandler extends TextContentHandler {
 		$fields['auxiliary_text'] = $structure->getAuxiliaryText();
 		$fields['defaultsort'] = $structure->getDefaultSort();
 
-		$title = $page->getTitle();
-		if ( NS_FILE == $title->getNamespace() ) {
-			$fileText = $this->getFileText( $title );
-			if ( $fileText ) {
-				$fields['file_text'] = $fileText;
-			}
+		// Until we have full first-class content handler for files, we invoke it explicitly here
+		if ( NS_FILE == $page->getTitle()->getNamespace() ) {
+			$fields = array_merge( $fields,
+					$this->getFileHandler()->getDataForSearchIndex( $page, $parserOutput, $engine ) );
 		}
 		return $fields;
 	}
diff --git a/includes/context/RequestContext.php b/includes/context/RequestContext.php
index c87798eab0..a8cad9f3bc 100644
--- a/includes/context/RequestContext.php
+++ b/includes/context/RequestContext.php
@@ -160,7 +160,7 @@ class RequestContext implements IContextSource, MutableContext {
 	/**
 	 * Set the Title object
 	 *
-	 * @param Title $title
+	 * @param Title|null $title
 	 */
 	public function setTitle( Title $title = null ) {
 		$this->title = $title;
diff --git a/includes/dao/DBAccessBase.php b/includes/dao/DBAccessBase.php
index ed617fe061..6a1bbd6e31 100644
--- a/includes/dao/DBAccessBase.php
+++ b/includes/dao/DBAccessBase.php
@@ -53,7 +53,7 @@ abstract class DBAccessBase implements IDBAccessObject {
 	 * @param int $id Which connection to use
 	 * @param array $groups Query groups
 	 *
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	protected function getConnection( $id, $groups = [] ) {
 		$loadBalancer = wfGetLB( $this->wiki );
diff --git a/includes/db/MWLBFactory.php b/includes/db/MWLBFactory.php
new file mode 100644
index 0000000000..96c6e9f8d3
--- /dev/null
+++ b/includes/db/MWLBFactory.php
@@ -0,0 +1,158 @@
+<?php
+/**
+ * Generator of database load balancing objects.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Database
+ */
+
+use MediaWiki\Logger\LoggerFactory;
+
+/**
+ * MediaWiki-specific class for generating database load balancers
+ * @ingroup Database
+ */
+abstract class MWLBFactory {
+	/**
+	 * @param array $lbConf Config for LBFactory::__construct()
+	 * @param Config $mainConfig Main config object from MediaWikiServices
+	 * @return array
+	 */
+	public static function applyDefaultConfig( array $lbConf, Config $mainConfig ) {
+		global $wgCommandLineMode;
+
+		$lbConf += [
+			'localDomain' => new DatabaseDomain(
+				$mainConfig->get( 'DBname' ),
+				null,
+				$mainConfig->get( 'DBprefix' )
+			),
+			'profiler' => Profiler::instance(),
+			'trxProfiler' => Profiler::instance()->getTransactionProfiler(),
+			'replLogger' => LoggerFactory::getInstance( 'DBReplication' ),
+			'queryLogger' => LoggerFactory::getInstance( 'DBQuery' ),
+			'connLogger' => LoggerFactory::getInstance( 'DBConnection' ),
+			'perfLogger' => LoggerFactory::getInstance( 'DBPerformance' ),
+			'errorLogger' => [ MWExceptionHandler::class, 'logException' ],
+			'cliMode' => $wgCommandLineMode,
+			'hostname' => wfHostname(),
+			// TODO: replace the global wfConfiguredReadOnlyReason() with a service.
+			'readOnlyReason' => wfConfiguredReadOnlyReason(),
+		];
+
+		if ( $lbConf['class'] === 'LBFactorySimple' ) {
+			if ( isset( $lbConf['servers'] ) ) {
+				// Server array is already explicitly configured; leave alone
+			} elseif ( is_array( $mainConfig->get( 'DBservers' ) ) ) {
+				foreach ( $mainConfig->get( 'DBservers' ) as $i => $server ) {
+					if ( $server['type'] === 'sqlite' ) {
+						$server += [ 'dbDirectory' => $mainConfig->get( 'SQLiteDataDir' ) ];
+					} elseif ( $server['type'] === 'postgres' ) {
+						$server += [ 'port' => $mainConfig->get( 'DBport' ) ];
+					}
+					$lbConf['servers'][$i] = $server + [
+						'schema' => $mainConfig->get( 'DBmwschema' ),
+						'tablePrefix' => $mainConfig->get( 'DBprefix' ),
+						'flags' => DBO_DEFAULT,
+						'sqlMode' => $mainConfig->get( 'SQLMode' ),
+						'utf8Mode' => $mainConfig->get( 'DBmysql5' )
+					];
+				}
+			} else {
+				$flags = DBO_DEFAULT;
+				$flags |= $mainConfig->get( 'DebugDumpSql' ) ? DBO_DEBUG : 0;
+				$flags |= $mainConfig->get( 'DBssl' ) ? DBO_SSL : 0;
+				$flags |= $mainConfig->get( 'DBcompress' ) ? DBO_COMPRESS : 0;
+				$server = [
+					'host' => $mainConfig->get( 'DBserver' ),
+					'user' => $mainConfig->get( 'DBuser' ),
+					'password' => $mainConfig->get( 'DBpassword' ),
+					'dbname' => $mainConfig->get( 'DBname' ),
+					'schema' => $mainConfig->get( 'DBmwschema' ),
+					'tablePrefix' => $mainConfig->get( 'DBprefix' ),
+					'type' => $mainConfig->get( 'DBtype' ),
+					'load' => 1,
+					'flags' => $flags,
+					'sqlMode' => $mainConfig->get( 'SQLMode' ),
+					'utf8Mode' => $mainConfig->get( 'DBmysql5' )
+				];
+				if ( $server['type'] === 'sqlite' ) {
+					$server[ 'dbDirectory'] = $mainConfig->get( 'SQLiteDataDir' );
+				} elseif ( $server['type'] === 'postgres' ) {
+					$server['port'] = $mainConfig->get( 'DBport' );
+				}
+				$lbConf['servers'] = [ $server ];
+			}
+			if ( !isset( $lbConf['externalClusters'] ) ) {
+				$lbConf['externalClusters'] = $mainConfig->get( 'ExternalServers' );
+			}
+		} elseif ( $lbConf['class'] === 'LBFactoryMulti' ) {
+			if ( isset( $lbConf['serverTemplate'] ) ) {
+				$lbConf['serverTemplate']['schema'] = $mainConfig->get( 'DBmwschema' );
+				$lbConf['serverTemplate']['sqlMode'] = $mainConfig->get( 'SQLMode' );
+				$lbConf['serverTemplate']['utf8Mode'] = $mainConfig->get( 'DBmysql5' );
+			}
+		}
+
+		// Use APC/memcached style caching, but avoids loops with CACHE_DB (T141804)
+		$sCache = ObjectCache::getLocalServerInstance();
+		if ( $sCache->getQoS( $sCache::ATTR_EMULATION ) > $sCache::QOS_EMULATION_SQL ) {
+			$lbConf['srvCache'] = $sCache;
+		}
+		$cCache = ObjectCache::getLocalClusterInstance();
+		if ( $cCache->getQoS( $cCache::ATTR_EMULATION ) > $cCache::QOS_EMULATION_SQL ) {
+			$lbConf['memCache'] = $cCache;
+		}
+		$wCache = ObjectCache::getMainWANInstance();
+		if ( $wCache->getQoS( $wCache::ATTR_EMULATION ) > $wCache::QOS_EMULATION_SQL ) {
+			$lbConf['wanCache'] = $wCache;
+		}
+
+		return $lbConf;
+	}
+
+	/**
+	 * Returns the LBFactory class to use and the load balancer configuration.
+	 *
+	 * @todo instead of this, use a ServiceContainer for managing the different implementations.
+	 *
+	 * @param array $config (e.g. $wgLBFactoryConf)
+	 * @return string Class name
+	 */
+	public static function getLBFactoryClass( array $config ) {
+		// For configuration backward compatibility after removing
+		// underscores from class names in MediaWiki 1.23.
+		$bcClasses = [
+			'LBFactory_Simple' => 'LBFactorySimple',
+			'LBFactory_Single' => 'LBFactorySingle',
+			'LBFactory_Multi' => 'LBFactoryMulti'
+		];
+
+		$class = $config['class'];
+
+		if ( isset( $bcClasses[$class] ) ) {
+			$class = $bcClasses[$class];
+			wfDeprecated(
+				'$wgLBFactoryConf must be updated. See RELEASE-NOTES for details',
+				'1.23'
+			);
+		}
+
+		return $class;
+	}
+}
diff --git a/includes/db/loadbalancer/LBFactoryMW.php b/includes/db/loadbalancer/LBFactoryMW.php
deleted file mode 100644
index 9821da1139..0000000000
--- a/includes/db/loadbalancer/LBFactoryMW.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php
-/**
- * Generator of database load balancing objects.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Database
- */
-
-use MediaWiki\Logger\LoggerFactory;
-
-/**
- * Legacy MediaWiki-specific class for generating database load balancers
- * @ingroup Database
- */
-abstract class LBFactoryMW {
-	/**
-	 * @param array $lbConf Config for LBFactory::__construct()
-	 * @param Config $mainConfig Main config object from MediaWikiServices
-	 * @return array
-	 */
-	public static function applyDefaultConfig( array $lbConf, Config $mainConfig ) {
-		global $wgCommandLineMode;
-
-		$lbConf += [
-			'localDomain' => new DatabaseDomain(
-				$mainConfig->get( 'DBname' ),
-				null,
-				$mainConfig->get( 'DBprefix' )
-			),
-			'profiler' => Profiler::instance(),
-			'trxProfiler' => Profiler::instance()->getTransactionProfiler(),
-			'replLogger' => LoggerFactory::getInstance( 'DBReplication' ),
-			'queryLogger' => LoggerFactory::getInstance( 'DBQuery' ),
-			'connLogger' => LoggerFactory::getInstance( 'DBConnection' ),
-			'perfLogger' => LoggerFactory::getInstance( 'DBPerformance' ),
-			'errorLogger' => [ MWExceptionHandler::class, 'logException' ],
-			'cliMode' => $wgCommandLineMode,
-			'hostname' => wfHostname(),
-			// TODO: replace the global wfConfiguredReadOnlyReason() with a service.
-			'readOnlyReason' => wfConfiguredReadOnlyReason(),
-		];
-
-		if ( $lbConf['class'] === 'LBFactorySimple' ) {
-			if ( isset( $lbConf['servers'] ) ) {
-				// Server array is already explicitly configured; leave alone
-			} elseif ( is_array( $mainConfig->get( 'DBservers' ) ) ) {
-				foreach ( $mainConfig->get( 'DBservers' ) as $i => $server ) {
-					if ( $server['type'] === 'sqlite' ) {
-						$server += [ 'dbDirectory' => $mainConfig->get( 'SQLiteDataDir' ) ];
-					} elseif ( $server['type'] === 'postgres' ) {
-						$server += [ 'port' => $mainConfig->get( 'DBport' ) ];
-					}
-					$lbConf['servers'][$i] = $server + [
-						'schema' => $mainConfig->get( 'DBmwschema' ),
-						'tablePrefix' => $mainConfig->get( 'DBprefix' ),
-						'flags' => DBO_DEFAULT,
-						'sqlMode' => $mainConfig->get( 'SQLMode' ),
-						'utf8Mode' => $mainConfig->get( 'DBmysql5' )
-					];
-				}
-			} else {
-				$flags = DBO_DEFAULT;
-				$flags |= $mainConfig->get( 'DebugDumpSql' ) ? DBO_DEBUG : 0;
-				$flags |= $mainConfig->get( 'DBssl' ) ? DBO_SSL : 0;
-				$flags |= $mainConfig->get( 'DBcompress' ) ? DBO_COMPRESS : 0;
-				$server = [
-					'host' => $mainConfig->get( 'DBserver' ),
-					'user' => $mainConfig->get( 'DBuser' ),
-					'password' => $mainConfig->get( 'DBpassword' ),
-					'dbname' => $mainConfig->get( 'DBname' ),
-					'schema' => $mainConfig->get( 'DBmwschema' ),
-					'tablePrefix' => $mainConfig->get( 'DBprefix' ),
-					'type' => $mainConfig->get( 'DBtype' ),
-					'load' => 1,
-					'flags' => $flags,
-					'sqlMode' => $mainConfig->get( 'SQLMode' ),
-					'utf8Mode' => $mainConfig->get( 'DBmysql5' )
-				];
-				if ( $server['type'] === 'sqlite' ) {
-					$server[ 'dbDirectory'] = $mainConfig->get( 'SQLiteDataDir' );
-				} elseif ( $server['type'] === 'postgres' ) {
-					$server['port'] = $mainConfig->get( 'DBport' );
-				}
-				$lbConf['servers'] = [ $server ];
-			}
-			if ( !isset( $lbConf['externalClusters'] ) ) {
-				$lbConf['externalClusters'] = $mainConfig->get( 'ExternalServers' );
-			}
-		} elseif ( $lbConf['class'] === 'LBFactoryMulti' ) {
-			if ( isset( $lbConf['serverTemplate'] ) ) {
-				$lbConf['serverTemplate']['schema'] = $mainConfig->get( 'DBmwschema' );
-				$lbConf['serverTemplate']['sqlMode'] = $mainConfig->get( 'SQLMode' );
-				$lbConf['serverTemplate']['utf8Mode'] = $mainConfig->get( 'DBmysql5' );
-			}
-		}
-
-		// Use APC/memcached style caching, but avoids loops with CACHE_DB (T141804)
-		$sCache = ObjectCache::getLocalServerInstance();
-		if ( $sCache->getQoS( $sCache::ATTR_EMULATION ) > $sCache::QOS_EMULATION_SQL ) {
-			$lbConf['srvCache'] = $sCache;
-		}
-		$cCache = ObjectCache::getLocalClusterInstance();
-		if ( $cCache->getQoS( $cCache::ATTR_EMULATION ) > $cCache::QOS_EMULATION_SQL ) {
-			$lbConf['memCache'] = $cCache;
-		}
-		$wCache = ObjectCache::getMainWANInstance();
-		if ( $wCache->getQoS( $wCache::ATTR_EMULATION ) > $wCache::QOS_EMULATION_SQL ) {
-			$lbConf['wanCache'] = $wCache;
-		}
-
-		return $lbConf;
-	}
-
-	/**
-	 * Returns the LBFactory class to use and the load balancer configuration.
-	 *
-	 * @todo instead of this, use a ServiceContainer for managing the different implementations.
-	 *
-	 * @param array $config (e.g. $wgLBFactoryConf)
-	 * @return string Class name
-	 */
-	public static function getLBFactoryClass( array $config ) {
-		// For configuration backward compatibility after removing
-		// underscores from class names in MediaWiki 1.23.
-		$bcClasses = [
-			'LBFactory_Simple' => 'LBFactorySimple',
-			'LBFactory_Single' => 'LBFactorySingle',
-			'LBFactory_Multi' => 'LBFactoryMulti'
-		];
-
-		$class = $config['class'];
-
-		if ( isset( $bcClasses[$class] ) ) {
-			$class = $bcClasses[$class];
-			wfDeprecated(
-				'$wgLBFactoryConf must be updated. See RELEASE-NOTES for details',
-				'1.23'
-			);
-		}
-
-		return $class;
-	}
-}
diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php
index 3318ceb037..4d7c84d5c6 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -94,6 +94,9 @@ class LegacyLogger extends AbstractLogger {
 	 * @return null
 	 */
 	public function log( $level, $message, array $context = [] ) {
+		if ( is_string( $level ) ) {
+			$level = self::$levelMapping[$level];
+		}
 		if ( $this->channel === 'DBQuery' && isset( $context['method'] )
 			&& isset( $context['master'] ) && isset( $context['runtime'] )
 		) {
@@ -102,8 +105,7 @@ class LegacyLogger extends AbstractLogger {
 		}
 
 		if ( isset( self::$dbChannels[$this->channel] )
-			&& isset( self::$levelMapping[$level] )
-			&& self::$levelMapping[$level] >= LogLevel::ERROR
+			&& $level >= self::$levelMapping[LogLevel::ERROR]
 		) {
 			// Format and write DB errors to the legacy locations
 			$effectiveChannel = 'wfLogDBError';
@@ -127,7 +129,7 @@ class LegacyLogger extends AbstractLogger {
 	 *
 	 * @param string $channel
 	 * @param string $message
-	 * @param string|int $level \Psr\Log\LogEvent constant or Monlog level int
+	 * @param string|int $level \Psr\Log\LogEvent constant or Monolog level int
 	 * @param array $context
 	 * @return bool True if message should be sent to disk/network, false
 	 * otherwise
@@ -135,6 +137,10 @@ class LegacyLogger extends AbstractLogger {
 	public static function shouldEmit( $channel, $message, $level, $context ) {
 		global $wgDebugLogFile, $wgDBerrorLog, $wgDebugLogGroups;
 
+		if ( is_string( $level ) ) {
+			$level = self::$levelMapping[$level];
+		}
+
 		if ( $channel === 'wfLogDBError' ) {
 			// wfLogDBError messages are emitted if a database log location is
 			// specfied.
@@ -162,9 +168,6 @@ class LegacyLogger extends AbstractLogger {
 				}
 
 				if ( isset( $logConfig['level'] ) ) {
-					if ( is_string( $level ) ) {
-						$level = self::$levelMapping[$level];
-					}
 					$shouldEmit = $level >= self::$levelMapping[$logConfig['level']];
 				}
 			} else {
diff --git a/includes/exception/MWException.php b/includes/exception/MWException.php
index 5496cb63d0..e958c9449f 100644
--- a/includes/exception/MWException.php
+++ b/includes/exception/MWException.php
@@ -199,7 +199,26 @@ class MWException extends Exception {
 	 * It will be either HTML or plain text based on isCommandLine().
 	 */
 	public function report() {
-		MWExceptionRenderer::output( $this, MWExceptionRenderer::AS_PRETTY );
+		global $wgMimeType;
+
+		if ( defined( 'MW_API' ) ) {
+			// Unhandled API exception, we can't be sure that format printer is alive
+			self::header( 'MediaWiki-API-Error: internal_api_error_' . get_class( $this ) );
+			wfHttpError( 500, 'Internal Server Error', $this->getText() );
+		} elseif ( self::isCommandLine() ) {
+			$message = $this->getText();
+			// T17602: STDERR may not be available
+			if ( defined( 'STDERR' ) ) {
+				fwrite( STDERR, $message );
+			} else {
+				echo $message;
+			}
+		} else {
+			self::statusHeader( 500 );
+			self::header( "Content-Type: $wgMimeType; charset=utf-8" );
+
+			$this->reportHTML();
+		}
 	}
 
 	/**
diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index 8359846a42..4a1f190c75 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -62,12 +62,19 @@ class MWExceptionHandler {
 	protected static function report( $e ) {
 		try {
 			// Try and show the exception prettily, with the normal skin infrastructure
-			MWExceptionRenderer::output( $e, MWExceptionRenderer::AS_PRETTY );
+			if ( $e instanceof MWException ) {
+				// Delegate to MWException until all subclasses are handled by
+				// MWExceptionRenderer and MWException::report() has been
+				// removed.
+				$e->report();
+			} else {
+				MWExceptionRenderer::output( $e, MWExceptionRenderer::AS_PRETTY );
+			}
 		} catch ( Exception $e2 ) {
 			// Exception occurred from within exception handler
 			// Show a simpler message for the original exception,
 			// don't try to invoke report()
-			MWExceptionRenderer::output( $e, MWExceptionRenderer::AS_PRETTY, $e2 );
+			MWExceptionRenderer::output( $e, MWExceptionRenderer::AS_RAW, $e2 );
 		}
 	}
 
diff --git a/includes/exception/MWExceptionRenderer.php b/includes/exception/MWExceptionRenderer.php
index aba131d1ee..8fdc417c1e 100644
--- a/includes/exception/MWExceptionRenderer.php
+++ b/includes/exception/MWExceptionRenderer.php
@@ -35,11 +35,6 @@ class MWExceptionRenderer {
 	public static function output( $e, $mode, $eNew = null ) {
 		global $wgMimeType;
 
-		if ( $e instanceof DBConnectionError ) {
-			self::reportOutageHTML( $e );
-			return;
-		}
-
 		if ( defined( 'MW_API' ) ) {
 			// Unhandled API exception, we can't be sure that format printer is alive
 			self::header( 'MediaWiki-API-Error: internal_api_error_' . get_class( $e ) );
@@ -47,9 +42,13 @@ class MWExceptionRenderer {
 		} elseif ( self::isCommandLine() ) {
 			self::printError( self::getText( $e ) );
 		} elseif ( $mode === self::AS_PRETTY ) {
-			self::statusHeader( 500 );
-			self::header( "Content-Type: $wgMimeType; charset=utf-8" );
-			self::reportHTML( $e );
+			if ( $e instanceof DBConnectionError ) {
+				self::reportOutageHTML( $e );
+			} else {
+				self::statusHeader( 500 );
+				self::header( "Content-Type: $wgMimeType; charset=utf-8" );
+				self::reportHTML( $e );
+			}
 		} else {
 			if ( $eNew ) {
 				$message = "MediaWiki internal error.\n\n";
diff --git a/includes/filebackend/FileBackendGroup.php b/includes/filebackend/FileBackendGroup.php
index ede73aa2fb..87d9441c3b 100644
--- a/includes/filebackend/FileBackendGroup.php
+++ b/includes/filebackend/FileBackendGroup.php
@@ -149,30 +149,11 @@ class FileBackendGroup {
 	 * @throws InvalidArgumentException
 	 */
 	public function get( $name ) {
-		if ( !isset( $this->backends[$name] ) ) {
-			throw new InvalidArgumentException( "No backend defined with the name `$name`." );
-		}
 		// Lazy-load the actual backend instance
 		if ( !isset( $this->backends[$name]['instance'] ) ) {
-			$class = $this->backends[$name]['class'];
-			$config = $this->backends[$name]['config'];
-			$config += [
-				'wikiId' => wfWikiID(), // e.g. "my_wiki-en_"
-				'mimeCallback' => [ $this, 'guessMimeInternal' ],
-				'obResetFunc' => 'wfResetOutputBuffers',
-				'streamMimeFunc' => [ 'StreamFile', 'contentTypeFromPath' ]
-			];
-			$config['lockManager'] =
-				LockManagerGroup::singleton( $config['wikiId'] )->get( $config['lockManager'] );
-			$config['fileJournal'] = isset( $config['fileJournal'] )
-				? FileJournal::factory( $config['fileJournal'], $name )
-				: FileJournal::factory( [ 'class' => 'NullFileJournal' ], $name );
-			$config['wanCache'] = ObjectCache::getMainWANInstance();
-			$config['srvCache'] = ObjectCache::getLocalServerInstance( 'hash' );
-			$config['statusWrapper'] = [ 'Status', 'wrap' ];
-			$config['tmpDirectory'] = wfTempDir();
-			$config['logger'] = LoggerFactory::getInstance( 'FileOperation' );
-			$config['profiler'] = Profiler::instance();
+			$config = $this->config( $name );
+
+			$class = $config['class'];
 			if ( $class === 'FileBackendMultiWrite' ) {
 				foreach ( $config['backends'] as $index => $beConfig ) {
 					if ( isset( $beConfig['template'] ) ) {
@@ -193,7 +174,7 @@ class FileBackendGroup {
 	 * Get the config array for a backend object with a given name
 	 *
 	 * @param string $name
-	 * @return array
+	 * @return array Parameters to FileBackend::__construct()
 	 * @throws InvalidArgumentException
 	 */
 	public function config( $name ) {
@@ -202,7 +183,27 @@ class FileBackendGroup {
 		}
 		$class = $this->backends[$name]['class'];
 
-		return [ 'class' => $class ] + $this->backends[$name]['config'];
+		$config = $this->backends[$name]['config'];
+		$config['class'] = $class;
+		$config += [ // set defaults
+			'wikiId' => wfWikiID(), // e.g. "my_wiki-en_"
+			'mimeCallback' => [ $this, 'guessMimeInternal' ],
+			'obResetFunc' => 'wfResetOutputBuffers',
+			'streamMimeFunc' => [ 'StreamFile', 'contentTypeFromPath' ],
+			'tmpDirectory' => wfTempDir(),
+			'statusWrapper' => [ 'Status', 'wrap' ],
+			'wanCache' => ObjectCache::getMainWANInstance(),
+			'srvCache' => ObjectCache::getLocalServerInstance( 'hash' ),
+			'logger' => LoggerFactory::getInstance( 'FileOperation' ),
+			'profiler' => Profiler::instance()
+		];
+		$config['lockManager'] =
+			LockManagerGroup::singleton( $config['wikiId'] )->get( $config['lockManager'] );
+		$config['fileJournal'] = isset( $config['fileJournal'] )
+			? FileJournal::factory( $config['fileJournal'], $name )
+			: FileJournal::factory( [ 'class' => 'NullFileJournal' ], $name );
+
+		return $config;
 	}
 
 	/**
diff --git a/includes/filebackend/lockmanager/MemcLockManager.php b/includes/filebackend/lockmanager/MemcLockManager.php
deleted file mode 100644
index 81ce424b50..0000000000
--- a/includes/filebackend/lockmanager/MemcLockManager.php
+++ /dev/null
@@ -1,386 +0,0 @@
-<?php
-/**
- * Version of LockManager based on using memcached servers.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup LockManager
- */
-
-/**
- * Manage locks using memcached servers.
- *
- * Version of LockManager based on using memcached servers.
- * This is meant for multi-wiki systems that may share files.
- * All locks are non-blocking, which avoids deadlocks.
- *
- * All lock requests for a resource, identified by a hash string, will map to one
- * bucket. Each bucket maps to one or several peer servers, each running memcached.
- * A majority of peers must agree for a lock to be acquired.
- *
- * @ingroup LockManager
- * @since 1.20
- */
-class MemcLockManager extends QuorumLockManager {
-	/** @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
-	];
-
-	/** @var array Map server names to MemcachedBagOStuff objects */
-	protected $bagOStuffs = [];
-
-	/** @var array (server name => bool) */
-	protected $serversUp = [];
-
-	/** @var string Random UUID */
-	protected $session = '';
-
-	/**
-	 * Construct a new instance from configuration.
-	 *
-	 * @param array $config Parameters include:
-	 *   - lockServers  : Associative array of server names to "<IP>:<port>" strings.
-	 *   - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
-	 *                    each having an odd-numbered list of server names (peers) as values.
-	 *   - memcConfig   : Configuration array for ObjectCache::newFromParams. [optional]
-	 *                    If set, this must use one of the memcached classes.
-	 * @throws Exception
-	 */
-	public function __construct( array $config ) {
-		parent::__construct( $config );
-
-		// Sanitize srvsByBucket config to prevent PHP errors
-		$this->srvsByBucket = array_filter( $config['srvsByBucket'], 'is_array' );
-		$this->srvsByBucket = array_values( $this->srvsByBucket ); // consecutive
-
-		$memcConfig = isset( $config['memcConfig'] )
-			? $config['memcConfig']
-			: [ 'class' => 'MemcachedPhpBagOStuff' ];
-
-		foreach ( $config['lockServers'] as $name => $address ) {
-			$params = [ 'servers' => [ $address ] ] + $memcConfig;
-			$cache = ObjectCache::newFromParams( $params );
-			if ( $cache instanceof MemcachedBagOStuff ) {
-				$this->bagOStuffs[$name] = $cache;
-			} else {
-				throw new Exception(
-					'Only MemcachedBagOStuff classes are supported by MemcLockManager.' );
-			}
-		}
-
-		$this->session = wfRandomString( 32 );
-	}
-
-	// @todo Change this code to work in one batch
-	protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
-		$status = StatusValue::newGood();
-
-		$lockedPaths = [];
-		foreach ( $pathsByType as $type => $paths ) {
-			$status->merge( $this->doGetLocksOnServer( $lockSrv, $paths, $type ) );
-			if ( $status->isOK() ) {
-				$lockedPaths[$type] = isset( $lockedPaths[$type] )
-					? array_merge( $lockedPaths[$type], $paths )
-					: $paths;
-			} else {
-				foreach ( $lockedPaths as $lType => $lPaths ) {
-					$status->merge( $this->doFreeLocksOnServer( $lockSrv, $lPaths, $lType ) );
-				}
-				break;
-			}
-		}
-
-		return $status;
-	}
-
-	// @todo Change this code to work in one batch
-	protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
-		$status = StatusValue::newGood();
-
-		foreach ( $pathsByType as $type => $paths ) {
-			$status->merge( $this->doFreeLocksOnServer( $lockSrv, $paths, $type ) );
-		}
-
-		return $status;
-	}
-
-	/**
-	 * @see QuorumLockManager::getLocksOnServer()
-	 * @param string $lockSrv
-	 * @param array $paths
-	 * @param string $type
-	 * @return StatusValue
-	 */
-	protected function doGetLocksOnServer( $lockSrv, array $paths, $type ) {
-		$status = StatusValue::newGood();
-
-		$memc = $this->getCache( $lockSrv );
-		$keys = array_map( [ $this, 'recordKeyForPath' ], $paths ); // lock records
-
-		// Lock all of the active lock record keys...
-		if ( !$this->acquireMutexes( $memc, $keys ) ) {
-			foreach ( $paths as $path ) {
-				$status->fatal( 'lockmanager-fail-acquirelock', $path );
-			}
-
-			return $status;
-		}
-
-		// Fetch all the existing lock records...
-		$lockRecords = $memc->getMulti( $keys );
-
-		$now = time();
-		// Check if the requested locks conflict with existing ones...
-		foreach ( $paths as $path ) {
-			$locksKey = $this->recordKeyForPath( $path );
-			$locksHeld = isset( $lockRecords[$locksKey] )
-				? self::sanitizeLockArray( $lockRecords[$locksKey] )
-				: self::newLockArray(); // init
-			foreach ( $locksHeld[self::LOCK_EX] as $session => $expiry ) {
-				if ( $expiry < $now ) { // stale?
-					unset( $locksHeld[self::LOCK_EX][$session] );
-				} elseif ( $session !== $this->session ) {
-					$status->fatal( 'lockmanager-fail-acquirelock', $path );
-				}
-			}
-			if ( $type === self::LOCK_EX ) {
-				foreach ( $locksHeld[self::LOCK_SH] as $session => $expiry ) {
-					if ( $expiry < $now ) { // stale?
-						unset( $locksHeld[self::LOCK_SH][$session] );
-					} elseif ( $session !== $this->session ) {
-						$status->fatal( 'lockmanager-fail-acquirelock', $path );
-					}
-				}
-			}
-			if ( $status->isOK() ) {
-				// Register the session in the lock record array
-				$locksHeld[$type][$this->session] = $now + $this->lockTTL;
-				// We will update this record if none of the other locks conflict
-				$lockRecords[$locksKey] = $locksHeld;
-			}
-		}
-
-		// If there were no lock conflicts, update all the lock records...
-		if ( $status->isOK() ) {
-			foreach ( $paths as $path ) {
-				$locksKey = $this->recordKeyForPath( $path );
-				$locksHeld = $lockRecords[$locksKey];
-				$ok = $memc->set( $locksKey, $locksHeld, 7 * 86400 );
-				if ( !$ok ) {
-					$status->fatal( 'lockmanager-fail-acquirelock', $path );
-				} else {
-					wfDebug( __METHOD__ . ": acquired lock on key $locksKey.\n" );
-				}
-			}
-		}
-
-		// Unlock all of the active lock record keys...
-		$this->releaseMutexes( $memc, $keys );
-
-		return $status;
-	}
-
-	/**
-	 * @see QuorumLockManager::freeLocksOnServer()
-	 * @param string $lockSrv
-	 * @param array $paths
-	 * @param string $type
-	 * @return StatusValue
-	 */
-	protected function doFreeLocksOnServer( $lockSrv, array $paths, $type ) {
-		$status = StatusValue::newGood();
-
-		$memc = $this->getCache( $lockSrv );
-		$keys = array_map( [ $this, 'recordKeyForPath' ], $paths ); // lock records
-
-		// Lock all of the active lock record keys...
-		if ( !$this->acquireMutexes( $memc, $keys ) ) {
-			foreach ( $paths as $path ) {
-				$status->fatal( 'lockmanager-fail-releaselock', $path );
-			}
-
-			return $status;
-		}
-
-		// Fetch all the existing lock records...
-		$lockRecords = $memc->getMulti( $keys );
-
-		// Remove the requested locks from all records...
-		foreach ( $paths as $path ) {
-			$locksKey = $this->recordKeyForPath( $path ); // lock record
-			if ( !isset( $lockRecords[$locksKey] ) ) {
-				$status->warning( 'lockmanager-fail-releaselock', $path );
-				continue; // nothing to do
-			}
-			$locksHeld = self::sanitizeLockArray( $lockRecords[$locksKey] );
-			if ( isset( $locksHeld[$type][$this->session] ) ) {
-				unset( $locksHeld[$type][$this->session] ); // unregister this session
-				if ( $locksHeld === self::newLockArray() ) {
-					$ok = $memc->delete( $locksKey );
-				} else {
-					$ok = $memc->set( $locksKey, $locksHeld );
-				}
-				if ( !$ok ) {
-					$status->fatal( 'lockmanager-fail-releaselock', $path );
-				}
-			} else {
-				$status->warning( 'lockmanager-fail-releaselock', $path );
-			}
-			wfDebug( __METHOD__ . ": released lock on key $locksKey.\n" );
-		}
-
-		// Unlock all of the active lock record keys...
-		$this->releaseMutexes( $memc, $keys );
-
-		return $status;
-	}
-
-	/**
-	 * @see QuorumLockManager::releaseAllLocks()
-	 * @return StatusValue
-	 */
-	protected function releaseAllLocks() {
-		return StatusValue::newGood(); // not supported
-	}
-
-	/**
-	 * @see QuorumLockManager::isServerUp()
-	 * @param string $lockSrv
-	 * @return bool
-	 */
-	protected function isServerUp( $lockSrv ) {
-		return (bool)$this->getCache( $lockSrv );
-	}
-
-	/**
-	 * Get the MemcachedBagOStuff object for a $lockSrv
-	 *
-	 * @param string $lockSrv Server name
-	 * @return MemcachedBagOStuff|null
-	 */
-	protected function getCache( $lockSrv ) {
-		/** @var BagOStuff $memc */
-		$memc = null;
-		if ( isset( $this->bagOStuffs[$lockSrv] ) ) {
-			$memc = $this->bagOStuffs[$lockSrv];
-			if ( !isset( $this->serversUp[$lockSrv] ) ) {
-				$this->serversUp[$lockSrv] = $memc->set( __CLASS__ . ':ping', 1, 1 );
-				if ( !$this->serversUp[$lockSrv] ) {
-					trigger_error( __METHOD__ . ": Could not contact $lockSrv.", E_USER_WARNING );
-				}
-			}
-			if ( !$this->serversUp[$lockSrv] ) {
-				return null; // server appears to be down
-			}
-		}
-
-		return $memc;
-	}
-
-	/**
-	 * @param string $path
-	 * @return string
-	 */
-	protected function recordKeyForPath( $path ) {
-		return implode( ':', [ __CLASS__, 'locks', $this->sha1Base36Absolute( $path ) ] );
-	}
-
-	/**
-	 * @return array An empty lock structure for a key
-	 */
-	protected static function newLockArray() {
-		return [ self::LOCK_SH => [], self::LOCK_EX => [] ];
-	}
-
-	/**
-	 * @param array $a
-	 * @return array An empty lock structure for a key
-	 */
-	protected static function sanitizeLockArray( $a ) {
-		if ( is_array( $a ) && isset( $a[self::LOCK_EX] ) && isset( $a[self::LOCK_SH] ) ) {
-			return $a;
-		} else {
-			trigger_error( __METHOD__ . ": reset invalid lock array.", E_USER_WARNING );
-
-			return self::newLockArray();
-		}
-	}
-
-	/**
-	 * @param MemcachedBagOStuff $memc
-	 * @param array $keys List of keys to acquire
-	 * @return bool
-	 */
-	protected function acquireMutexes( MemcachedBagOStuff $memc, array $keys ) {
-		$lockedKeys = [];
-
-		// Acquire the keys in lexicographical order, to avoid deadlock problems.
-		// If P1 is waiting to acquire a key P2 has, P2 can't also be waiting for a key P1 has.
-		sort( $keys );
-
-		// Try to quickly loop to acquire the keys, but back off after a few rounds.
-		// This reduces memcached spam, especially in the rare case where a server acquires
-		// some lock keys and dies without releasing them. Lock keys expire after a few minutes.
-		$loop = new WaitConditionLoop(
-			function () use ( $memc, $keys, &$lockedKeys ) {
-				foreach ( array_diff( $keys, $lockedKeys ) as $key ) {
-					if ( $memc->add( "$key:mutex", 1, 180 ) ) { // lock record
-						$lockedKeys[] = $key;
-					}
-				}
-
-				return array_diff( $keys, $lockedKeys )
-					? WaitConditionLoop::CONDITION_CONTINUE
-					: true;
-			},
-			3.0 // timeout
-		);
-		$loop->invoke();
-
-		if ( count( $lockedKeys ) != count( $keys ) ) {
-			$this->releaseMutexes( $memc, $lockedKeys ); // failed; release what was locked
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @param MemcachedBagOStuff $memc
-	 * @param array $keys List of acquired keys
-	 */
-	protected function releaseMutexes( MemcachedBagOStuff $memc, array $keys ) {
-		foreach ( $keys as $key ) {
-			$memc->delete( "$key:mutex" );
-		}
-	}
-
-	/**
-	 * Make sure remaining locks get cleared for sanity
-	 */
-	function __destruct() {
-		while ( count( $this->locksHeld ) ) {
-			foreach ( $this->locksHeld as $path => $locks ) {
-				$this->doUnlock( [ $path ], self::LOCK_EX );
-				$this->doUnlock( [ $path ], self::LOCK_SH );
-			}
-		}
-	}
-}
diff --git a/includes/filerepo/LocalRepo.php b/includes/filerepo/LocalRepo.php
index 7b40a7ba81..21492a52be 100644
--- a/includes/filerepo/LocalRepo.php
+++ b/includes/filerepo/LocalRepo.php
@@ -454,7 +454,7 @@ class LocalRepo extends FileRepo {
 
 	/**
 	 * Get a connection to the replica DB
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	function getSlaveDB() {
 		return wfGetDB( DB_REPLICA );
@@ -462,7 +462,7 @@ class LocalRepo extends FileRepo {
 
 	/**
 	 * Get a connection to the master DB
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	function getMasterDB() {
 		return wfGetDB( DB_MASTER );
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index c65d97f0ff..1f4d99ef66 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -176,7 +176,7 @@ class HTMLForm extends ContextSource {
 	protected $mFieldTree;
 	protected $mShowReset = false;
 	protected $mShowSubmit = true;
-	protected $mSubmitFlags = [ 'constructive', 'primary' ];
+	protected $mSubmitFlags = [ 'primary', 'progressive' ];
 	protected $mShowCancel = false;
 	protected $mCancelTarget;
 
diff --git a/includes/htmlform/fields/HTMLSubmitField.php b/includes/htmlform/fields/HTMLSubmitField.php
index cb98549efe..0c33ad94e0 100644
--- a/includes/htmlform/fields/HTMLSubmitField.php
+++ b/includes/htmlform/fields/HTMLSubmitField.php
@@ -7,7 +7,7 @@
 class HTMLSubmitField extends HTMLButtonField {
 	protected $buttonType = 'submit';
 
-	protected $mFlags = [ 'primary', 'constructive' ];
+	protected $mFlags = [ 'primary', 'progressive' ];
 
 	public function skipLoadData( $request ) {
 		return !$request->getCheck( $this->mName );
diff --git a/includes/http/CurlHttpRequest.php b/includes/http/CurlHttpRequest.php
new file mode 100644
index 0000000000..f58c3a9a5b
--- /dev/null
+++ b/includes/http/CurlHttpRequest.php
@@ -0,0 +1,165 @@
+<?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
+ */
+
+/**
+ * MWHttpRequest implemented using internal curl compiled into PHP
+ */
+class CurlHttpRequest extends MWHttpRequest {
+	const SUPPORTS_FILE_POSTS = true;
+
+	protected $curlOptions = [];
+	protected $headerText = "";
+
+	/**
+	 * @param resource $fh
+	 * @param string $content
+	 * @return int
+	 */
+	protected function readHeader( $fh, $content ) {
+		$this->headerText .= $content;
+		return strlen( $content );
+	}
+
+	public function execute() {
+
+		parent::execute();
+
+		if ( !$this->status->isOK() ) {
+			return $this->status;
+		}
+
+		$this->curlOptions[CURLOPT_PROXY] = $this->proxy;
+		$this->curlOptions[CURLOPT_TIMEOUT] = $this->timeout;
+
+		// Only supported in curl >= 7.16.2
+		if ( defined( 'CURLOPT_CONNECTTIMEOUT_MS' ) ) {
+			$this->curlOptions[CURLOPT_CONNECTTIMEOUT_MS] = $this->connectTimeout * 1000;
+		}
+
+		$this->curlOptions[CURLOPT_HTTP_VERSION] = CURL_HTTP_VERSION_1_0;
+		$this->curlOptions[CURLOPT_WRITEFUNCTION] = $this->callback;
+		$this->curlOptions[CURLOPT_HEADERFUNCTION] = [ $this, "readHeader" ];
+		$this->curlOptions[CURLOPT_MAXREDIRS] = $this->maxRedirects;
+		$this->curlOptions[CURLOPT_ENCODING] = ""; # Enable compression
+
+		$this->curlOptions[CURLOPT_USERAGENT] = $this->reqHeaders['User-Agent'];
+
+		$this->curlOptions[CURLOPT_SSL_VERIFYHOST] = $this->sslVerifyHost ? 2 : 0;
+		$this->curlOptions[CURLOPT_SSL_VERIFYPEER] = $this->sslVerifyCert;
+
+		if ( $this->caInfo ) {
+			$this->curlOptions[CURLOPT_CAINFO] = $this->caInfo;
+		}
+
+		if ( $this->headersOnly ) {
+			$this->curlOptions[CURLOPT_NOBODY] = true;
+			$this->curlOptions[CURLOPT_HEADER] = true;
+		} elseif ( $this->method == 'POST' ) {
+			$this->curlOptions[CURLOPT_POST] = true;
+			$postData = $this->postData;
+			// Don't interpret POST parameters starting with '@' as file uploads, because this
+			// makes it impossible to POST plain values starting with '@' (and causes security
+			// issues potentially exposing the contents of local files).
+			// The PHP manual says this option was introduced in PHP 5.5 defaults to true in PHP 5.6,
+			// but we support lower versions, and the option doesn't exist in HHVM 5.6.99.
+			if ( defined( 'CURLOPT_SAFE_UPLOAD' ) ) {
+				$this->curlOptions[CURLOPT_SAFE_UPLOAD] = true;
+			} elseif ( is_array( $postData ) ) {
+				// In PHP 5.2 and later, '@' is interpreted as a file upload if POSTFIELDS
+				// is an array, but not if it's a string. So convert $req['body'] to a string
+				// for safety.
+				$postData = wfArrayToCgi( $postData );
+			}
+			$this->curlOptions[CURLOPT_POSTFIELDS] = $postData;
+
+			// Suppress 'Expect: 100-continue' header, as some servers
+			// will reject it with a 417 and Curl won't auto retry
+			// with HTTP 1.0 fallback
+			$this->reqHeaders['Expect'] = '';
+		} else {
+			$this->curlOptions[CURLOPT_CUSTOMREQUEST] = $this->method;
+		}
+
+		$this->curlOptions[CURLOPT_HTTPHEADER] = $this->getHeaderList();
+
+		$curlHandle = curl_init( $this->url );
+
+		if ( !curl_setopt_array( $curlHandle, $this->curlOptions ) ) {
+			throw new MWException( "Error setting curl options." );
+		}
+
+		if ( $this->followRedirects && $this->canFollowRedirects() ) {
+			MediaWiki\suppressWarnings();
+			if ( !curl_setopt( $curlHandle, CURLOPT_FOLLOWLOCATION, true ) ) {
+				$this->logger->debug( __METHOD__ . ": Couldn't set CURLOPT_FOLLOWLOCATION. " .
+					"Probably open_basedir is set.\n" );
+				// Continue the processing. If it were in curl_setopt_array,
+				// processing would have halted on its entry
+			}
+			MediaWiki\restoreWarnings();
+		}
+
+		if ( $this->profiler ) {
+			$profileSection = $this->profiler->scopedProfileIn(
+				__METHOD__ . '-' . $this->profileName
+			);
+		}
+
+		$curlRes = curl_exec( $curlHandle );
+		if ( curl_errno( $curlHandle ) == CURLE_OPERATION_TIMEOUTED ) {
+			$this->status->fatal( 'http-timed-out', $this->url );
+		} elseif ( $curlRes === false ) {
+			$this->status->fatal( 'http-curl-error', curl_error( $curlHandle ) );
+		} else {
+			$this->headerList = explode( "\r\n", $this->headerText );
+		}
+
+		curl_close( $curlHandle );
+
+		if ( $this->profiler ) {
+			$this->profiler->scopedProfileOut( $profileSection );
+		}
+
+		$this->parseHeader();
+		$this->setStatus();
+
+		return $this->status;
+	}
+
+	/**
+	 * @return bool
+	 */
+	public function canFollowRedirects() {
+		$curlVersionInfo = curl_version();
+		if ( $curlVersionInfo['version_number'] < 0x071304 ) {
+			$this->logger->debug( "Cannot follow redirects with libcurl < 7.19.4 due to CVE-2009-0037\n" );
+			return false;
+		}
+
+		if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+			if ( strval( ini_get( 'open_basedir' ) ) !== '' ) {
+				$this->logger->debug( "Cannot follow redirects when open_basedir is set\n" );
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
diff --git a/includes/http/Http.php b/includes/http/Http.php
new file mode 100644
index 0000000000..43ae2d0e8f
--- /dev/null
+++ b/includes/http/Http.php
@@ -0,0 +1,163 @@
+<?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
+ */
+
+use MediaWiki\Logger\LoggerFactory;
+
+/**
+ * Various HTTP related functions
+ * @ingroup HTTP
+ */
+class Http {
+	static public $httpEngine = false;
+
+	/**
+	 * Perform an HTTP request
+	 *
+	 * @param string $method HTTP method. Usually GET/POST
+	 * @param string $url Full URL to act on. If protocol-relative, will be expanded to an http:// URL
+	 * @param array $options Options to pass to MWHttpRequest object.
+	 *	Possible keys for the array:
+	 *    - timeout             Timeout length in seconds
+	 *    - connectTimeout      Timeout for connection, in seconds (curl only)
+	 *    - postData            An array of key-value pairs or a url-encoded form data
+	 *    - proxy               The proxy to use.
+	 *                          Otherwise it will use $wgHTTPProxy (if set)
+	 *                          Otherwise it will use the environment variable "http_proxy" (if set)
+	 *    - noProxy             Don't use any proxy at all. Takes precedence over proxy value(s).
+	 *    - sslVerifyHost       Verify hostname against certificate
+	 *    - sslVerifyCert       Verify SSL certificate
+	 *    - caInfo              Provide CA information
+	 *    - maxRedirects        Maximum number of redirects to follow (defaults to 5)
+	 *    - followRedirects     Whether to follow redirects (defaults to false).
+	 *		                    Note: this should only be used when the target URL is trusted,
+	 *		                    to avoid attacks on intranet services accessible by HTTP.
+	 *    - userAgent           A user agent, if you want to override the default
+	 *                          MediaWiki/$wgVersion
+	 *    - logger              A \Psr\Logger\LoggerInterface instance for debug logging
+	 * @param string $caller The method making this request, for profiling
+	 * @return string|bool (bool)false on failure or a string on success
+	 */
+	public static function request( $method, $url, $options = [], $caller = __METHOD__ ) {
+		wfDebug( "HTTP: $method: $url\n" );
+
+		$options['method'] = strtoupper( $method );
+
+		if ( !isset( $options['timeout'] ) ) {
+			$options['timeout'] = 'default';
+		}
+		if ( !isset( $options['connectTimeout'] ) ) {
+			$options['connectTimeout'] = 'default';
+		}
+
+		$req = MWHttpRequest::factory( $url, $options, $caller );
+		$status = $req->execute();
+
+		if ( $status->isOK() ) {
+			return $req->getContent();
+		} else {
+			$errors = $status->getErrorsByType( 'error' );
+			$logger = LoggerFactory::getInstance( 'http' );
+			$logger->warning( $status->getWikiText( false, false, 'en' ),
+				[ 'error' => $errors, 'caller' => $caller, 'content' => $req->getContent() ] );
+			return false;
+		}
+	}
+
+	/**
+	 * Simple wrapper for Http::request( 'GET' )
+	 * @see Http::request()
+	 * @since 1.25 Second parameter $timeout removed. Second parameter
+	 * is now $options which can be given a 'timeout'
+	 *
+	 * @param string $url
+	 * @param array $options
+	 * @param string $caller The method making this request, for profiling
+	 * @return string|bool false on error
+	 */
+	public static function get( $url, $options = [], $caller = __METHOD__ ) {
+		$args = func_get_args();
+		if ( isset( $args[1] ) && ( is_string( $args[1] ) || is_numeric( $args[1] ) ) ) {
+			// Second was used to be the timeout
+			// And third parameter used to be $options
+			wfWarn( "Second parameter should not be a timeout.", 2 );
+			$options = isset( $args[2] ) && is_array( $args[2] ) ?
+				$args[2] : [];
+			$options['timeout'] = $args[1];
+			$caller = __METHOD__;
+		}
+		return Http::request( 'GET', $url, $options, $caller );
+	}
+
+	/**
+	 * Simple wrapper for Http::request( 'POST' )
+	 * @see Http::request()
+	 *
+	 * @param string $url
+	 * @param array $options
+	 * @param string $caller The method making this request, for profiling
+	 * @return string|bool false on error
+	 */
+	public static function post( $url, $options = [], $caller = __METHOD__ ) {
+		return Http::request( 'POST', $url, $options, $caller );
+	}
+
+	/**
+	 * A standard user-agent we can use for external requests.
+	 * @return string
+	 */
+	public static function userAgent() {
+		global $wgVersion;
+		return "MediaWiki/$wgVersion";
+	}
+
+	/**
+	 * Checks that the given URI is a valid one. Hardcoding the
+	 * protocols, because we only want protocols that both cURL
+	 * and php support.
+	 *
+	 * file:// should not be allowed here for security purpose (r67684)
+	 *
+	 * @todo FIXME this is wildly inaccurate and fails to actually check most stuff
+	 *
+	 * @param string $uri URI to check for validity
+	 * @return bool
+	 */
+	public static function isValidURI( $uri ) {
+		return preg_match(
+			'/^https?:\/\/[^\/\s]\S*$/D',
+			$uri
+		);
+	}
+
+	/**
+	 * Gets the relevant proxy from $wgHTTPProxy
+	 *
+	 * @return mixed The proxy address or an empty string if not set.
+	 */
+	public static function getProxy() {
+		global $wgHTTPProxy;
+
+		if ( $wgHTTPProxy ) {
+			return $wgHTTPProxy;
+		}
+
+		return "";
+	}
+}
diff --git a/includes/http/MWHttpRequest.php b/includes/http/MWHttpRequest.php
new file mode 100644
index 0000000000..458854ab2d
--- /dev/null
+++ b/includes/http/MWHttpRequest.php
@@ -0,0 +1,618 @@
+<?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
+ */
+
+use MediaWiki\Logger\LoggerFactory;
+use Psr\Log\LoggerInterface;
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\NullLogger;
+
+/**
+ * This wrapper class will call out to curl (if available) or fallback
+ * to regular PHP if necessary for handling internal HTTP requests.
+ *
+ * Renamed from HttpRequest to MWHttpRequest to avoid conflict with
+ * PHP's HTTP extension.
+ */
+class MWHttpRequest implements LoggerAwareInterface {
+	const SUPPORTS_FILE_POSTS = false;
+
+	protected $content;
+	protected $timeout = 'default';
+	protected $headersOnly = null;
+	protected $postData = null;
+	protected $proxy = null;
+	protected $noProxy = false;
+	protected $sslVerifyHost = true;
+	protected $sslVerifyCert = true;
+	protected $caInfo = null;
+	protected $method = "GET";
+	protected $reqHeaders = [];
+	protected $url;
+	protected $parsedUrl;
+	protected $callback;
+	protected $maxRedirects = 5;
+	protected $followRedirects = false;
+
+	/**
+	 * @var CookieJar
+	 */
+	protected $cookieJar;
+
+	protected $headerList = [];
+	protected $respVersion = "0.9";
+	protected $respStatus = "200 Ok";
+	protected $respHeaders = [];
+
+	public $status;
+
+	/**
+	 * @var Profiler
+	 */
+	protected $profiler;
+
+	/**
+	 * @var string
+	 */
+	protected $profileName;
+
+	/**
+	 * @var LoggerInterface;
+	 */
+	protected $logger;
+
+	/**
+	 * @param string $url Url to use. If protocol-relative, will be expanded to an http:// URL
+	 * @param array $options (optional) extra params to pass (see Http::request())
+	 * @param string $caller The method making this request, for profiling
+	 * @param Profiler $profiler An instance of the profiler for profiling, or null
+	 */
+	protected function __construct(
+		$url, $options = [], $caller = __METHOD__, $profiler = null
+	) {
+		global $wgHTTPTimeout, $wgHTTPConnectTimeout;
+
+		$this->url = wfExpandUrl( $url, PROTO_HTTP );
+		$this->parsedUrl = wfParseUrl( $this->url );
+
+		if ( isset( $options['logger'] ) ) {
+			$this->logger = $options['logger'];
+		} else {
+			$this->logger = new NullLogger();
+		}
+
+		if ( !$this->parsedUrl || !Http::isValidURI( $this->url ) ) {
+			$this->status = Status::newFatal( 'http-invalid-url', $url );
+		} else {
+			$this->status = Status::newGood( 100 ); // continue
+		}
+
+		if ( isset( $options['timeout'] ) && $options['timeout'] != 'default' ) {
+			$this->timeout = $options['timeout'];
+		} else {
+			$this->timeout = $wgHTTPTimeout;
+		}
+		if ( isset( $options['connectTimeout'] ) && $options['connectTimeout'] != 'default' ) {
+			$this->connectTimeout = $options['connectTimeout'];
+		} else {
+			$this->connectTimeout = $wgHTTPConnectTimeout;
+		}
+		if ( isset( $options['userAgent'] ) ) {
+			$this->setUserAgent( $options['userAgent'] );
+		}
+
+		$members = [ "postData", "proxy", "noProxy", "sslVerifyHost", "caInfo",
+				"method", "followRedirects", "maxRedirects", "sslVerifyCert", "callback" ];
+
+		foreach ( $members as $o ) {
+			if ( isset( $options[$o] ) ) {
+				// ensure that MWHttpRequest::method is always
+				// uppercased. Bug 36137
+				if ( $o == 'method' ) {
+					$options[$o] = strtoupper( $options[$o] );
+				}
+				$this->$o = $options[$o];
+			}
+		}
+
+		if ( $this->noProxy ) {
+			$this->proxy = ''; // noProxy takes precedence
+		}
+
+		// Profile based on what's calling us
+		$this->profiler = $profiler;
+		$this->profileName = $caller;
+	}
+
+	/**
+	 * @param LoggerInterface $logger
+	 */
+	public function setLogger( LoggerInterface $logger ) {
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Simple function to test if we can make any sort of requests at all, using
+	 * cURL or fopen()
+	 * @return bool
+	 */
+	public static function canMakeRequests() {
+		return function_exists( 'curl_init' ) || wfIniGetBool( 'allow_url_fopen' );
+	}
+
+	/**
+	 * Generate a new request object
+	 * @param string $url Url to use
+	 * @param array $options (optional) extra params to pass (see Http::request())
+	 * @param string $caller The method making this request, for profiling
+	 * @throws MWException
+	 * @return CurlHttpRequest|PhpHttpRequest
+	 * @see MWHttpRequest::__construct
+	 */
+	public static function factory( $url, $options = null, $caller = __METHOD__ ) {
+		if ( !Http::$httpEngine ) {
+			Http::$httpEngine = function_exists( 'curl_init' ) ? 'curl' : 'php';
+		} elseif ( Http::$httpEngine == 'curl' && !function_exists( 'curl_init' ) ) {
+			throw new MWException( __METHOD__ . ': curl (http://php.net/curl) is not installed, but' .
+				' Http::$httpEngine is set to "curl"' );
+		}
+
+		if ( !is_array( $options ) ) {
+			$options = [];
+		}
+
+		if ( !isset( $options['logger'] ) ) {
+			$options['logger'] = LoggerFactory::getInstance( 'http' );
+		}
+
+		switch ( Http::$httpEngine ) {
+			case 'curl':
+				return new CurlHttpRequest( $url, $options, $caller, Profiler::instance() );
+			case 'php':
+				if ( !wfIniGetBool( 'allow_url_fopen' ) ) {
+					throw new MWException( __METHOD__ . ': allow_url_fopen ' .
+						'needs to be enabled for pure PHP http requests to ' .
+						'work. If possible, curl should be used instead. See ' .
+						'http://php.net/curl.'
+					);
+				}
+				return new PhpHttpRequest( $url, $options, $caller, Profiler::instance() );
+			default:
+				throw new MWException( __METHOD__ . ': The setting of Http::$httpEngine is not valid.' );
+		}
+	}
+
+	/**
+	 * Get the body, or content, of the response to the request
+	 *
+	 * @return string
+	 */
+	public function getContent() {
+		return $this->content;
+	}
+
+	/**
+	 * Set the parameters of the request
+	 *
+	 * @param array $args
+	 * @todo overload the args param
+	 */
+	public function setData( $args ) {
+		$this->postData = $args;
+	}
+
+	/**
+	 * Take care of setting up the proxy (do nothing if "noProxy" is set)
+	 *
+	 * @return void
+	 */
+	public function proxySetup() {
+		// If there is an explicit proxy set and proxies are not disabled, then use it
+		if ( $this->proxy && !$this->noProxy ) {
+			return;
+		}
+
+		// Otherwise, fallback to $wgHTTPProxy if this is not a machine
+		// local URL and proxies are not disabled
+		if ( self::isLocalURL( $this->url ) || $this->noProxy ) {
+			$this->proxy = '';
+		} else {
+			$this->proxy = Http::getProxy();
+		}
+	}
+
+	/**
+	 * Check if the URL can be served by localhost
+	 *
+	 * @param string $url Full url to check
+	 * @return bool
+	 */
+	private static function isLocalURL( $url ) {
+		global $wgCommandLineMode, $wgLocalVirtualHosts;
+
+		if ( $wgCommandLineMode ) {
+			return false;
+		}
+
+		// Extract host part
+		$matches = [];
+		if ( preg_match( '!^https?://([\w.-]+)[/:].*$!', $url, $matches ) ) {
+			$host = $matches[1];
+			// Split up dotwise
+			$domainParts = explode( '.', $host );
+			// Check if this domain or any superdomain is listed as a local virtual host
+			$domainParts = array_reverse( $domainParts );
+
+			$domain = '';
+			$countParts = count( $domainParts );
+			for ( $i = 0; $i < $countParts; $i++ ) {
+				$domainPart = $domainParts[$i];
+				if ( $i == 0 ) {
+					$domain = $domainPart;
+				} else {
+					$domain = $domainPart . '.' . $domain;
+				}
+
+				if ( in_array( $domain, $wgLocalVirtualHosts ) ) {
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Set the user agent
+	 * @param string $UA
+	 */
+	public function setUserAgent( $UA ) {
+		$this->setHeader( 'User-Agent', $UA );
+	}
+
+	/**
+	 * Set an arbitrary header
+	 * @param string $name
+	 * @param string $value
+	 */
+	public function setHeader( $name, $value ) {
+		// I feel like I should normalize the case here...
+		$this->reqHeaders[$name] = $value;
+	}
+
+	/**
+	 * Get an array of the headers
+	 * @return array
+	 */
+	public function getHeaderList() {
+		$list = [];
+
+		if ( $this->cookieJar ) {
+			$this->reqHeaders['Cookie'] =
+				$this->cookieJar->serializeToHttpRequest(
+					$this->parsedUrl['path'],
+					$this->parsedUrl['host']
+				);
+		}
+
+		foreach ( $this->reqHeaders as $name => $value ) {
+			$list[] = "$name: $value";
+		}
+
+		return $list;
+	}
+
+	/**
+	 * Set a read callback to accept data read from the HTTP request.
+	 * By default, data is appended to an internal buffer which can be
+	 * retrieved through $req->getContent().
+	 *
+	 * To handle data as it comes in -- especially for large files that
+	 * would not fit in memory -- you can instead set your own callback,
+	 * in the form function($resource, $buffer) where the first parameter
+	 * is the low-level resource being read (implementation specific),
+	 * and the second parameter is the data buffer.
+	 *
+	 * You MUST return the number of bytes handled in the buffer; if fewer
+	 * bytes are reported handled than were passed to you, the HTTP fetch
+	 * will be aborted.
+	 *
+	 * @param callable $callback
+	 * @throws MWException
+	 */
+	public function setCallback( $callback ) {
+		if ( !is_callable( $callback ) ) {
+			throw new MWException( 'Invalid MwHttpRequest callback' );
+		}
+		$this->callback = $callback;
+	}
+
+	/**
+	 * A generic callback to read the body of the response from a remote
+	 * server.
+	 *
+	 * @param resource $fh
+	 * @param string $content
+	 * @return int
+	 */
+	public function read( $fh, $content ) {
+		$this->content .= $content;
+		return strlen( $content );
+	}
+
+	/**
+	 * Take care of whatever is necessary to perform the URI request.
+	 *
+	 * @return Status
+	 */
+	public function execute() {
+
+		$this->content = "";
+
+		if ( strtoupper( $this->method ) == "HEAD" ) {
+			$this->headersOnly = true;
+		}
+
+		$this->proxySetup(); // set up any proxy as needed
+
+		if ( !$this->callback ) {
+			$this->setCallback( [ $this, 'read' ] );
+		}
+
+		if ( !isset( $this->reqHeaders['User-Agent'] ) ) {
+			$this->setUserAgent( Http::userAgent() );
+		}
+
+	}
+
+	/**
+	 * Parses the headers, including the HTTP status code and any
+	 * Set-Cookie headers.  This function expects the headers to be
+	 * found in an array in the member variable headerList.
+	 */
+	protected function parseHeader() {
+
+		$lastname = "";
+
+		foreach ( $this->headerList as $header ) {
+			if ( preg_match( "#^HTTP/([0-9.]+) (.*)#", $header, $match ) ) {
+				$this->respVersion = $match[1];
+				$this->respStatus = $match[2];
+			} elseif ( preg_match( "#^[ \t]#", $header ) ) {
+				$last = count( $this->respHeaders[$lastname] ) - 1;
+				$this->respHeaders[$lastname][$last] .= "\r\n$header";
+			} elseif ( preg_match( "#^([^:]*):[\t ]*(.*)#", $header, $match ) ) {
+				$this->respHeaders[strtolower( $match[1] )][] = $match[2];
+				$lastname = strtolower( $match[1] );
+			}
+		}
+
+		$this->parseCookies();
+
+	}
+
+	/**
+	 * Sets HTTPRequest status member to a fatal value with the error
+	 * message if the returned integer value of the status code was
+	 * not successful (< 300) or a redirect (>=300 and < 400).  (see
+	 * RFC2616, section 10,
+	 * http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html for a
+	 * list of status codes.)
+	 */
+	protected function setStatus() {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		if ( (int)$this->respStatus > 399 ) {
+			list( $code, $message ) = explode( " ", $this->respStatus, 2 );
+			$this->status->fatal( "http-bad-status", $code, $message );
+		}
+	}
+
+	/**
+	 * Get the integer value of the HTTP status code (e.g. 200 for "200 Ok")
+	 * (see RFC2616, section 10, http://www.w3.org/Protocols/rfc2616/rfc2616-sec10.html
+	 * for a list of status codes.)
+	 *
+	 * @return int
+	 */
+	public function getStatus() {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		return (int)$this->respStatus;
+	}
+
+	/**
+	 * Returns true if the last status code was a redirect.
+	 *
+	 * @return bool
+	 */
+	public function isRedirect() {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		$status = (int)$this->respStatus;
+
+		if ( $status >= 300 && $status <= 303 ) {
+			return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns an associative array of response headers after the
+	 * request has been executed.  Because some headers
+	 * (e.g. Set-Cookie) can appear more than once the, each value of
+	 * the associative array is an array of the values given.
+	 *
+	 * @return array
+	 */
+	public function getResponseHeaders() {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		return $this->respHeaders;
+	}
+
+	/**
+	 * Returns the value of the given response header.
+	 *
+	 * @param string $header
+	 * @return string|null
+	 */
+	public function getResponseHeader( $header ) {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		if ( isset( $this->respHeaders[strtolower( $header )] ) ) {
+			$v = $this->respHeaders[strtolower( $header )];
+			return $v[count( $v ) - 1];
+		}
+
+		return null;
+	}
+
+	/**
+	 * Tells the MWHttpRequest object to use this pre-loaded CookieJar.
+	 *
+	 * @param CookieJar $jar
+	 */
+	public function setCookieJar( $jar ) {
+		$this->cookieJar = $jar;
+	}
+
+	/**
+	 * Returns the cookie jar in use.
+	 *
+	 * @return CookieJar
+	 */
+	public function getCookieJar() {
+		if ( !$this->respHeaders ) {
+			$this->parseHeader();
+		}
+
+		return $this->cookieJar;
+	}
+
+	/**
+	 * Sets a cookie. Used before a request to set up any individual
+	 * cookies. Used internally after a request to parse the
+	 * Set-Cookie headers.
+	 * @see Cookie::set
+	 * @param string $name
+	 * @param mixed $value
+	 * @param array $attr
+	 */
+	public function setCookie( $name, $value = null, $attr = null ) {
+		if ( !$this->cookieJar ) {
+			$this->cookieJar = new CookieJar;
+		}
+
+		$this->cookieJar->setCookie( $name, $value, $attr );
+	}
+
+	/**
+	 * Parse the cookies in the response headers and store them in the cookie jar.
+	 */
+	protected function parseCookies() {
+
+		if ( !$this->cookieJar ) {
+			$this->cookieJar = new CookieJar;
+		}
+
+		if ( isset( $this->respHeaders['set-cookie'] ) ) {
+			$url = parse_url( $this->getFinalUrl() );
+			foreach ( $this->respHeaders['set-cookie'] as $cookie ) {
+				$this->cookieJar->parseCookieResponseHeader( $cookie, $url['host'] );
+			}
+		}
+
+	}
+
+	/**
+	 * Returns the final URL after all redirections.
+	 *
+	 * Relative values of the "Location" header are incorrect as
+	 * stated in RFC, however they do happen and modern browsers
+	 * support them.  This function loops backwards through all
+	 * locations in order to build the proper absolute URI - Marooned
+	 * at wikia-inc.com
+	 *
+	 * Note that the multiple Location: headers are an artifact of
+	 * CURL -- they shouldn't actually get returned this way. Rewrite
+	 * this when bug 29232 is taken care of (high-level redirect
+	 * handling rewrite).
+	 *
+	 * @return string
+	 */
+	public function getFinalUrl() {
+		$headers = $this->getResponseHeaders();
+
+		// return full url (fix for incorrect but handled relative location)
+		if ( isset( $headers['location'] ) ) {
+			$locations = $headers['location'];
+			$domain = '';
+			$foundRelativeURI = false;
+			$countLocations = count( $locations );
+
+			for ( $i = $countLocations - 1; $i >= 0; $i-- ) {
+				$url = parse_url( $locations[$i] );
+
+				if ( isset( $url['host'] ) ) {
+					$domain = $url['scheme'] . '://' . $url['host'];
+					break; // found correct URI (with host)
+				} else {
+					$foundRelativeURI = true;
+				}
+			}
+
+			if ( $foundRelativeURI ) {
+				if ( $domain ) {
+					return $domain . $locations[$countLocations - 1];
+				} else {
+					$url = parse_url( $this->url );
+					if ( isset( $url['host'] ) ) {
+						return $url['scheme'] . '://' . $url['host'] .
+							$locations[$countLocations - 1];
+					}
+				}
+			} else {
+				return $locations[$countLocations - 1];
+			}
+		}
+
+		return $this->url;
+	}
+
+	/**
+	 * Returns true if the backend can follow redirects. Overridden by the
+	 * child classes.
+	 * @return bool
+	 */
+	public function canFollowRedirects() {
+		return true;
+	}
+}
diff --git a/includes/http/PhpHttpRequest.php b/includes/http/PhpHttpRequest.php
new file mode 100644
index 0000000000..2af000fac0
--- /dev/null
+++ b/includes/http/PhpHttpRequest.php
@@ -0,0 +1,258 @@
+<?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
+ */
+
+class PhpHttpRequest extends MWHttpRequest {
+
+	private $fopenErrors = [];
+
+	/**
+	 * @param string $url
+	 * @return string
+	 */
+	protected function urlToTcp( $url ) {
+		$parsedUrl = parse_url( $url );
+
+		return 'tcp://' . $parsedUrl['host'] . ':' . $parsedUrl['port'];
+	}
+
+	/**
+	 * Returns an array with a 'capath' or 'cafile' key
+	 * that is suitable to be merged into the 'ssl' sub-array of
+	 * a stream context options array.
+	 * Uses the 'caInfo' option of the class if it is provided, otherwise uses the system
+	 * default CA bundle if PHP supports that, or searches a few standard locations.
+	 * @return array
+	 * @throws DomainException
+	 */
+	protected function getCertOptions() {
+		$certOptions = [];
+		$certLocations = [];
+		if ( $this->caInfo ) {
+			$certLocations = [ 'manual' => $this->caInfo ];
+		} elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+			// @codingStandardsIgnoreStart Generic.Files.LineLength
+			// Default locations, based on
+			// https://www.happyassassin.net/2015/01/12/a-note-about-ssltls-trusted-certificate-stores-and-platforms/
+			// PHP 5.5 and older doesn't have any defaults, so we try to guess ourselves.
+			// PHP 5.6+ gets the CA location from OpenSSL as long as it is not set manually,
+			// so we should leave capath/cafile empty there.
+			// @codingStandardsIgnoreEnd
+			$certLocations = array_filter( [
+				getenv( 'SSL_CERT_DIR' ),
+				getenv( 'SSL_CERT_PATH' ),
+				'/etc/pki/tls/certs/ca-bundle.crt', # Fedora et al
+				'/etc/ssl/certs',  # Debian et al
+				'/etc/pki/tls/certs/ca-bundle.trust.crt',
+				'/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem',
+				'/System/Library/OpenSSL', # OSX
+			] );
+		}
+
+		foreach ( $certLocations as $key => $cert ) {
+			if ( is_dir( $cert ) ) {
+				$certOptions['capath'] = $cert;
+				break;
+			} elseif ( is_file( $cert ) ) {
+				$certOptions['cafile'] = $cert;
+				break;
+			} elseif ( $key === 'manual' ) {
+				// fail more loudly if a cert path was manually configured and it is not valid
+				throw new DomainException( "Invalid CA info passed: $cert" );
+			}
+		}
+
+		return $certOptions;
+	}
+
+	/**
+	 * Custom error handler for dealing with fopen() errors.
+	 * fopen() tends to fire multiple errors in succession, and the last one
+	 * is completely useless (something like "fopen: failed to open stream")
+	 * so normal methods of handling errors programmatically
+	 * like get_last_error() don't work.
+	 */
+	public function errorHandler( $errno, $errstr ) {
+		$n = count( $this->fopenErrors ) + 1;
+		$this->fopenErrors += [ "errno$n" => $errno, "errstr$n" => $errstr ];
+	}
+
+	public function execute() {
+
+		parent::execute();
+
+		if ( is_array( $this->postData ) ) {
+			$this->postData = wfArrayToCgi( $this->postData );
+		}
+
+		if ( $this->parsedUrl['scheme'] != 'http'
+			&& $this->parsedUrl['scheme'] != 'https' ) {
+			$this->status->fatal( 'http-invalid-scheme', $this->parsedUrl['scheme'] );
+		}
+
+		$this->reqHeaders['Accept'] = "*/*";
+		$this->reqHeaders['Connection'] = 'Close';
+		if ( $this->method == 'POST' ) {
+			// Required for HTTP 1.0 POSTs
+			$this->reqHeaders['Content-Length'] = strlen( $this->postData );
+			if ( !isset( $this->reqHeaders['Content-Type'] ) ) {
+				$this->reqHeaders['Content-Type'] = "application/x-www-form-urlencoded";
+			}
+		}
+
+		// Set up PHP stream context
+		$options = [
+			'http' => [
+				'method' => $this->method,
+				'header' => implode( "\r\n", $this->getHeaderList() ),
+				'protocol_version' => '1.1',
+				'max_redirects' => $this->followRedirects ? $this->maxRedirects : 0,
+				'ignore_errors' => true,
+				'timeout' => $this->timeout,
+				// Curl options in case curlwrappers are installed
+				'curl_verify_ssl_host' => $this->sslVerifyHost ? 2 : 0,
+				'curl_verify_ssl_peer' => $this->sslVerifyCert,
+			],
+			'ssl' => [
+				'verify_peer' => $this->sslVerifyCert,
+				'SNI_enabled' => true,
+				'ciphers' => 'HIGH:!SSLv2:!SSLv3:-ADH:-kDH:-kECDH:-DSS',
+				'disable_compression' => true,
+			],
+		];
+
+		if ( $this->proxy ) {
+			$options['http']['proxy'] = $this->urlToTcp( $this->proxy );
+			$options['http']['request_fulluri'] = true;
+		}
+
+		if ( $this->postData ) {
+			$options['http']['content'] = $this->postData;
+		}
+
+		if ( $this->sslVerifyHost ) {
+			// PHP 5.6.0 deprecates CN_match, in favour of peer_name which
+			// actually checks SubjectAltName properly.
+			if ( version_compare( PHP_VERSION, '5.6.0', '>=' ) ) {
+				$options['ssl']['peer_name'] = $this->parsedUrl['host'];
+			} else {
+				$options['ssl']['CN_match'] = $this->parsedUrl['host'];
+			}
+		}
+
+		$options['ssl'] += $this->getCertOptions();
+
+		$context = stream_context_create( $options );
+
+		$this->headerList = [];
+		$reqCount = 0;
+		$url = $this->url;
+
+		$result = [];
+
+		if ( $this->profiler ) {
+			$profileSection = $this->profiler->scopedProfileIn(
+				__METHOD__ . '-' . $this->profileName
+			);
+		}
+		do {
+			$reqCount++;
+			$this->fopenErrors = [];
+			set_error_handler( [ $this, 'errorHandler' ] );
+			$fh = fopen( $url, "r", false, $context );
+			restore_error_handler();
+
+			if ( !$fh ) {
+				// HACK for instant commons.
+				// If we are contacting (commons|upload).wikimedia.org
+				// try again with CN_match for en.wikipedia.org
+				// as php does not handle SubjectAltName properly
+				// prior to "peer_name" option in php 5.6
+				if ( isset( $options['ssl']['CN_match'] )
+					&& ( $options['ssl']['CN_match'] === 'commons.wikimedia.org'
+						|| $options['ssl']['CN_match'] === 'upload.wikimedia.org' )
+				) {
+					$options['ssl']['CN_match'] = 'en.wikipedia.org';
+					$context = stream_context_create( $options );
+					continue;
+				}
+				break;
+			}
+
+			$result = stream_get_meta_data( $fh );
+			$this->headerList = $result['wrapper_data'];
+			$this->parseHeader();
+
+			if ( !$this->followRedirects ) {
+				break;
+			}
+
+			# Handle manual redirection
+			if ( !$this->isRedirect() || $reqCount > $this->maxRedirects ) {
+				break;
+			}
+			# Check security of URL
+			$url = $this->getResponseHeader( "Location" );
+
+			if ( !Http::isValidURI( $url ) ) {
+				$this->logger->debug( __METHOD__ . ": insecure redirection\n" );
+				break;
+			}
+		} while ( true );
+		if ( $this->profiler ) {
+			$this->profiler->scopedProfileOut( $profileSection );
+		}
+
+		$this->setStatus();
+
+		if ( $fh === false ) {
+			if ( $this->fopenErrors ) {
+				$this->logger->warning( __CLASS__
+					. ': error opening connection: {errstr1}', $this->fopenErrors );
+			}
+			$this->status->fatal( 'http-request-error' );
+			return $this->status;
+		}
+
+		if ( $result['timed_out'] ) {
+			$this->status->fatal( 'http-timed-out', $this->url );
+			return $this->status;
+		}
+
+		// If everything went OK, or we received some error code
+		// get the response body content.
+		if ( $this->status->isOK() || (int)$this->respStatus >= 300 ) {
+			while ( !feof( $fh ) ) {
+				$buf = fread( $fh, 8192 );
+
+				if ( $buf === false ) {
+					$this->status->fatal( 'http-read-error' );
+					break;
+				}
+
+				if ( strlen( $buf ) ) {
+					call_user_func( $this->callback, $fh, $buf );
+				}
+			}
+		}
+		fclose( $fh );
+
+		return $this->status;
+	}
+}
diff --git a/includes/installer/DatabaseInstaller.php b/includes/installer/DatabaseInstaller.php
index 2b84144a3f..331d1a1bd5 100644
--- a/includes/installer/DatabaseInstaller.php
+++ b/includes/installer/DatabaseInstaller.php
@@ -41,7 +41,7 @@ abstract class DatabaseInstaller {
 	/**
 	 * The database connection.
 	 *
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	public $db = null;
 
diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php
index fbdc9342ad..aece3170f0 100644
--- a/includes/installer/DatabaseUpdater.php
+++ b/includes/installer/DatabaseUpdater.php
@@ -57,7 +57,7 @@ abstract class DatabaseUpdater {
 	/**
 	 * Handle to the database subclass
 	 *
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	protected $db;
 
@@ -192,7 +192,7 @@ abstract class DatabaseUpdater {
 	/**
 	 * Get a database connection to run updates
 	 *
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	public function getDB() {
 		return $this->db;
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index eafb9d4939..03f997471b 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -244,6 +244,7 @@ abstract class Installer {
 	protected $objectCaches = [
 		'xcache' => 'xcache_get',
 		'apc' => 'apc_fetch',
+		'apcu' => 'apcu_fetch',
 		'wincache' => 'wincache_ucache_get'
 	];
 
diff --git a/includes/installer/MssqlInstaller.php b/includes/installer/MssqlInstaller.php
index 739be820c0..c5ec72b03f 100644
--- a/includes/installer/MssqlInstaller.php
+++ b/includes/installer/MssqlInstaller.php
@@ -182,7 +182,7 @@ class MssqlInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
@@ -240,7 +240,7 @@ class MssqlInstaller extends DatabaseInstaller {
 			return;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 		$conn->selectDB( $this->getVar( 'wgDBname' ) );
diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
index 770d3bfa77..1175e9e7bd 100644
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -92,6 +92,8 @@ class MssqlUpdater extends DatabaseUpdater {
 			// 1.28
 			[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
 				'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+			[ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+			[ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
 		];
 	}
 
diff --git a/includes/installer/MysqlInstaller.php b/includes/installer/MysqlInstaller.php
index 812742c6d0..5ff47e94f0 100644
--- a/includes/installer/MysqlInstaller.php
+++ b/includes/installer/MysqlInstaller.php
@@ -124,7 +124,7 @@ class MysqlInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
@@ -168,7 +168,7 @@ class MysqlInstaller extends DatabaseInstaller {
 			return;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 		$conn->selectDB( $this->getVar( 'wgDBname' ) );
@@ -226,7 +226,7 @@ class MysqlInstaller extends DatabaseInstaller {
 		$status = $this->getConnection();
 
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index 693b6ff538..497f27350e 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -288,6 +288,8 @@ class MysqlUpdater extends DatabaseUpdater {
 				'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
 			[ 'doRevisionPageRevIndexNonUnique' ],
 			[ 'doNonUniquePlTlIl' ],
+			[ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+			[ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
 		];
 	}
 
diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 8610834349..b8fc4e75d5 100644
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -150,7 +150,7 @@ class OracleInstaller extends DatabaseInstaller {
 		}
 
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php
index 8075aace43..e1e0d0f82d 100644
--- a/includes/installer/OracleUpdater.php
+++ b/includes/installer/OracleUpdater.php
@@ -116,6 +116,8 @@ class OracleUpdater extends DatabaseUpdater {
 			// 1.28
 			[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
 				'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+			[ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+			[ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
 
 			// KEEP THIS AT THE BOTTOM!!
 			[ 'doRebuildDuplicateFunction' ],
diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php
index 7a2794d0a4..33e1a1f89d 100644
--- a/includes/installer/PostgresInstaller.php
+++ b/includes/installer/PostgresInstaller.php
@@ -114,7 +114,7 @@ class PostgresInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
@@ -181,7 +181,7 @@ class PostgresInstaller extends DatabaseInstaller {
 
 		if ( $status->isOK() ) {
 			/**
-			 * @var $conn DatabaseBase
+			 * @var $conn Database
 			 */
 			$conn = $status->value;
 			$conn->clearFlag( DBO_TRX );
@@ -233,7 +233,7 @@ class PostgresInstaller extends DatabaseInstaller {
 				$status = $this->openPgConnection( 'create-schema' );
 				if ( $status->isOK() ) {
 					/**
-					 * @var $conn DatabaseBase
+					 * @var $conn Database
 					 */
 					$conn = $status->value;
 					$safeRole = $conn->addIdentifierQuotes( $this->getVar( 'wgDBuser' ) );
@@ -287,7 +287,7 @@ class PostgresInstaller extends DatabaseInstaller {
 			return false;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 		$superuser = $this->getVar( '_InstallUser' );
@@ -588,7 +588,7 @@ class PostgresInstaller extends DatabaseInstaller {
 		}
 
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
@@ -638,7 +638,7 @@ class PostgresInstaller extends DatabaseInstaller {
 			return $status;
 		}
 		/**
-		 * @var $conn DatabaseBase
+		 * @var $conn Database
 		 */
 		$conn = $status->value;
 
diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index be94d91711..f3d2860144 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -68,6 +68,8 @@ class PostgresUpdater extends DatabaseUpdater {
 			[ 'addSequence', 'archive', false, 'archive_ar_id_seq' ],
 			[ 'addSequence', 'externallinks', false, 'externallinks_el_id_seq' ],
 			[ 'addSequence', 'watchlist', false, 'watchlist_wl_id_seq' ],
+			[ 'addSequence', 'change_tag', false, 'change_tag_ct_id_seq' ],
+			[ 'addSequence', 'tag_summary', false, 'tag_summary_ts_id_seq' ],
 
 			# new tables
 			[ 'addTable', 'category', 'patch-category.sql' ],
@@ -437,6 +439,10 @@ class PostgresUpdater extends DatabaseUpdater {
 			// 1.28
 			[ 'addPgIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
 				'( rc_namespace, rc_type, rc_patrolled, rc_timestamp )' ],
+			[ 'addPgField', 'change_tag', 'ct_id',
+				"INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('change_tag_ct_id_seq')" ],
+			[ 'addPgField', 'tag_summary', 'ts_id',
+				"INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('tag_summary_ts_id_seq')" ],
 		];
 	}
 
diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 1c6e6eb9a8..388c0346ce 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -156,6 +156,8 @@ class SqliteUpdater extends DatabaseUpdater {
 			// 1.28
 			[ 'addIndex', 'recentchanges', 'rc_name_type_patrolled_timestamp',
 				'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
+			[ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ],
+			[ 'addField', 'tag_summary', 'ts_id', 'patch-tag_summary-ts_id.sql' ],
 		];
 	}
 
diff --git a/includes/installer/i18n/bg.json b/includes/installer/i18n/bg.json
index 69891eacc6..8b1ca188c2 100644
--- a/includes/installer/i18n/bg.json
+++ b/includes/installer/i18n/bg.json
@@ -182,7 +182,7 @@
 	"config-admin-help": "Въвежда се предпочитаното потребителско име, например \"Иванчо Иванчев\".\nТова ще е потребителското име, което администраторът ще използва за влизане в уикито.",
 	"config-admin-name-blank": "Необходимо е да бъде въведено потребителско име на администратора.",
 	"config-admin-name-invalid": "Посоченото потребителско име \"<nowiki>$1</nowiki>\" е невалидно.\nНеобходимо е да се посочи друго.",
-	"config-admin-password-blank": "Неовходимо е да се въведе парола за администраторската сметка.",
+	"config-admin-password-blank": "Въведете парола за администраторската сметка.",
 	"config-admin-password-mismatch": "Двете въведени пароли не съвпадат.",
 	"config-admin-email": "Адрес за електронна поща:",
 	"config-admin-email-help": "Въвеждането на адрес за е-поща позволява получаване на е-писма от другите потребители на уикито, възстановяване на изгубена или забравена парола, оповестяване при промени в страниците от списъка за наблюдение. Това поле може да бъде оставено празно.",
diff --git a/includes/installer/i18n/bn.json b/includes/installer/i18n/bn.json
index fb23d019f7..69266501f2 100644
--- a/includes/installer/i18n/bn.json
+++ b/includes/installer/i18n/bn.json
@@ -6,7 +6,8 @@
 			"Aftab1995",
 			"Tauhid16",
 			"Aftabuzzaman",
-			"Hasive"
+			"Hasive",
+			"আজিজ"
 		]
 	},
 	"config-desc": "মিডিয়াউইকির জন্য ইন্সটলার",
@@ -94,7 +95,9 @@
 	"config-admin-name": "আপনার ব্যবহারকারী নাম:",
 	"config-admin-password": "পাসওয়ার্ড:",
 	"config-admin-password-confirm": "পাসওয়ার্ড আবারও প্রবেশ করান:",
+	"config-admin-help": "এখানে আপনার পছন্দের ব্যবহারকারী নাম লিখুন, উদাহরণস্বরূপ \"আজিজ\"। এই নামটি উইকিতে প্রবেশের সময় ব্যবহার করতে হবে।",
 	"config-admin-name-blank": "একটি প্রশাসক ব্যবহারকারী নাম প্রবেশ করান",
+	"config-admin-name-invalid": "উল্লেখিত ব্যবহারকারী নাম \"<nowiki>$1</nowiki>\" অবৈধ। একটি ভিন্ন নাম উল্লেখ করুন।",
 	"config-admin-password-blank": "প্রশাসক অ্যাকাউন্টের জন্য পাসওয়ার্ড প্রবেশ করান।",
 	"config-admin-password-mismatch": "আপনি যে দুটি পাসওয়ার্ড দিয়েছেন তারা পরস্পর মেলেনি।",
 	"config-admin-email": "ইমেইল ঠিকানা:",
diff --git a/includes/installer/i18n/cs.json b/includes/installer/i18n/cs.json
index 68497c5b43..c696650689 100644
--- a/includes/installer/i18n/cs.json
+++ b/includes/installer/i18n/cs.json
@@ -66,6 +66,7 @@
 	"config-memory-bad": "<strong>Upozornění:</strong> <code>memory_limit</code> je v PHP nastaven na $1.\nTo je pravděpodobně příliš málo.\nInstalace může selhat!",
 	"config-xcache": "Je nainstalována [http://xcache.lighttpd.net/ XCache]",
 	"config-apc": "Je nainstalováno [http://www.php.net/apc APC]",
+	"config-apcu": "Je nainstalováno [http://www.php.net/apcu APCu]",
 	"config-wincache": "Je nainstalována [http://www.iis.net/download/WinCacheForPhp WinCache]",
 	"config-no-cache-apcu": "<strong>Upozornění:</strong> Nebylo nalezeno [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache], ani [http://www.iis.net/download/WinCacheForPhp WinCache].\nKešování objektů bude vypnuto.",
 	"config-mod-security": "<strong>Upozornění:</strong> váš webový server má zapnuto [http://modsecurity.org/ mod_security]/mod_security2. Mnoho běžných konfigurací bude způsobovat potíže MediaWiki a dalším programům, které umožňují ukládat libovolný obsah.\nPokud je to možné, mělo by se to vypnout. Jinak se v případě, že narazíte na náhodné chyby, podívejte do [http://modsecurity.org/documentation/ dokumentace mod_security] nebo kontaktujte technickou podporu vašeho poskytovatele.",
@@ -255,7 +256,7 @@
 	"config-cache-options": "Nastavení cachování objektů:",
 	"config-cache-help": "Cachování objektů se používá pro vylepšení rychlosti MediaWiki tím, že se cachují často používaná data.\nStředním až velkým serverům se jeho zapnutí důrazně doporučuje, i menší servery pocítí jeho výhody.",
 	"config-cache-none": "Bez cachování (o žádnou funkcionalitu nepřijdete, na větších wiki však může dojít ke zhoršení rychlosti)",
-	"config-cache-accel": "Cachování PHP objektů (APC, XCache nebo WinCache)",
+	"config-cache-accel": "Cachování PHP objektů (APC, APCu, XCache nebo WinCache)",
 	"config-cache-memcached": "Použít Memcached (vyžaduje další nastavení a konfiguraci)",
 	"config-memcached-servers": "Servery Memcached:",
 	"config-memcached-help": "Seznam IP adres, které se mají používat pro Memcached.\nUveďte jednu na řádek spolu s portem. Například:\n 127.0.0.1:11211\n 192.168.1.25:1234",
diff --git a/includes/installer/i18n/de.json b/includes/installer/i18n/de.json
index e704141db2..2783bca5ef 100644
--- a/includes/installer/i18n/de.json
+++ b/includes/installer/i18n/de.json
@@ -74,6 +74,7 @@
 	"config-memory-bad": "'''Warnung:''' Der PHP-Parameter <code>memory_limit</code> beträgt $1.\nDieser Wert ist wahrscheinlich zu niedrig.\nDer Installationsvorgang könnte eventuell scheitern!",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] ist installiert",
 	"config-apc": "[http://www.php.net/apc APC] ist installiert",
+	"config-apcu": "[http://www.php.net/apcu APCu] ist installiert",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] ist installiert",
 	"config-no-cache-apcu": "<strong>Warnung:</strong> [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] oder [http://www.iis.net/download/WinCacheForPhp WinCache] konnten nicht gefunden werden.\nDer Objektcache ist nicht aktiviert.",
 	"config-mod-security": "'''Warnung:''' Auf dem Webserver wurde [http://modsecurity.org/ ModSecurity] aktiviert. Sofern falsch konfiguriert, kann dies zu Problemen mit MediaWiki sowie anderer Software auf dem Server führen und es Benutzern ermöglichen, beliebige Inhalte im Wiki einzustellen.\nFür weitere Informationen empfehlen wir die [http://modsecurity.org/documentation/ Dokumentation zu ModSecurity] oder den Kontakt zum Hoster, sofern Fehler auftreten.",
@@ -263,7 +264,7 @@
 	"config-cache-options": "Einstellungen für die Zwischenspeicherung von Objekten:",
 	"config-cache-help": "Das Objektcaching wird dazu genutzt, die Geschwindigkeit von MediaWiki zu verbessern, indem häufig genutzte Daten zwischengespeichert werden.\nEs wird sehr empfohlen, es für mittelgroße bis große Wikis zu nutzen, aber auch für kleine Wikis ergeben sich erkennbare Geschwindigkeitsverbesserungen.",
 	"config-cache-none": "Kein Objektcaching (es wird keine Funktion entfernt, allerdings kann dies die Leistungsfähigkeit größerer Wikis negativ beeinflussen)",
-	"config-cache-accel": "Objektcaching von PHP (APC, XCache oder WinCache)",
+	"config-cache-accel": "Objektcaching von PHP (APC, APCu, XCache oder WinCache)",
 	"config-cache-memcached": "Memcached Cacheserver (erfordert einen zusätzlichen Installationsvorgang mitsamt Konfiguration)",
 	"config-memcached-servers": "Memcached Cacheserver",
 	"config-memcached-help": "Liste der für Memcached nutzbaren IP-Adressen.\nEs sollte eine je Zeile mitsamt des vorgesehenen Ports angegeben werden. Beispiele:\n127.0.0.1:11211 oder\n192.168.1.25:1234 usw.",
diff --git a/includes/installer/i18n/diq.json b/includes/installer/i18n/diq.json
index 2890e3c1de..c80d54e0ac 100644
--- a/includes/installer/i18n/diq.json
+++ b/includes/installer/i18n/diq.json
@@ -27,8 +27,10 @@
 	"config-page-complete": "Temamyayo",
 	"config-page-restart": "Barkerdışi fına ser kı",
 	"config-page-readme": "Mı bıwane",
+	"config-page-releasenotes": "Notë versiyoni",
 	"config-page-copying": "Kopyayeno",
 	"config-page-upgradedoc": "Berzkerdış",
+	"config-page-existingwiki": "Mewcud wiki",
 	"config-restart": "E, fına dest pekê",
 	"config-sidebar": "* [https://www.mediawiki.org MediaWiki keye]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Şınasiya Karberi]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Şınasiya İdarekaran]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Peşti]\n----\n* <doclink href=Readme>Mı buwanê</doclink>\n* <doclink href=ReleaseNotes>Notê elaqeyıni</doclink>\n* <doclink href=Copying>Kopyakerdış</doclink>\n* <doclink href=UpgradeDoc>Zêdekerdış</doclink>",
 	"config-env-php": "PHP $1 i biyo saz.",
@@ -36,16 +38,30 @@
 	"config-db-type": "Database tipe:",
 	"config-db-host": "Database host:",
 	"config-db-host-oracle": "Database TNS:",
+	"config-db-wiki-settings": "Ena wikiyer akernë",
 	"config-db-name": "Database name:",
+	"config-db-name-oracle": "Şemaya hardata:",
 	"config-db-username": "Database nameykarberi:",
 	"config-db-password": "Database parola :",
 	"config-db-port": "Portê database:",
+	"config-oracle-def-ts": "Hesıbyaye caytabloy:",
+	"config-oracle-temp-ts": "Ä°dareten caytabloy:",
+	"config-type-mysql": "MySQL (yana hewlın)",
 	"config-type-mssql": "Microsoft SQL Server",
 	"config-header-mysql": "Eyarê MySQL",
+	"config-header-sqlite": "SQLite sazi",
+	"config-header-oracle": "Orqcle sazi",
+	"config-header-mssql": "Sazë Microsoft SQL Serveri",
+	"config-missing-db-name": "\"{{int:config-db-name}}\"nrë jew erc dekerdış gerek keno.",
+	"config-missing-db-host": "\"{{int:config-db-host}}\" rë jew erc gerek keno",
+	"config-missing-db-server-oracle": "\"{{int:config-db-host-oracle}}\" rë jew erc gerek keno",
+	"config-mysql-engine": "Motorë depok kerdışi",
 	"config-mysql-innodb": "InnoDB",
 	"config-mysql-myisam": "MyISAM",
 	"config-mysql-binary": "Dılet",
 	"config-mysql-utf8": "UTF-8",
+	"config-mssql-sqlauth": "SQL Server araştnayış",
+	"config-mssql-windowsauth": "Windows kamiye araştnayış",
 	"config-site-name": "Namey wiki:",
 	"config-site-name-blank": "Yew nameyê sita cıkewe.",
 	"config-project-namespace": "Wareyê nameyê proceyi:",
diff --git a/includes/installer/i18n/en.json b/includes/installer/i18n/en.json
index 3f3032b0cf..6a6c0ff28f 100644
--- a/includes/installer/i18n/en.json
+++ b/includes/installer/i18n/en.json
@@ -57,6 +57,7 @@
 	"config-memory-bad": "<strong>Warning:</strong> PHP's <code>memory_limit</code> is $1.\nThis is probably too low.\nThe installation may fail!",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] is installed",
 	"config-apc": "[http://www.php.net/apc APC] is installed",
+	"config-apcu": "[http://www.php.net/apcu APCu] is installed",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] is installed",
 	"config-no-cache-apcu": "<strong>Warning:</strong> Could not find [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] or [http://www.iis.net/download/WinCacheForPhp WinCache].\nObject caching is not enabled.",
 	"config-mod-security": "<strong>Warning:</strong> Your web server has [http://modsecurity.org/ mod_security]/mod_security2 enabled. Many common configurations of this will cause problems for MediaWiki and other software that allows users to post arbitrary content.\nIf possible, this should be disabled. Otherwise, refer to [http://modsecurity.org/documentation/ mod_security documentation] or contact your host's support if you encounter random errors.",
@@ -246,7 +247,7 @@
 	"config-cache-options": "Settings for object caching:",
 	"config-cache-help": "Object caching is used to improve the speed of MediaWiki by caching frequently used data.\nMedium to large sites are highly encouraged to enable this, and small sites will see benefits as well.",
 	"config-cache-none": "No caching (no functionality is removed, but speed may be impacted on larger wiki sites)",
-	"config-cache-accel": "PHP object caching (APC, XCache or WinCache)",
+	"config-cache-accel": "PHP object caching (APC, APCu, XCache or WinCache)",
 	"config-cache-memcached": "Use Memcached (requires additional setup and configuration)",
 	"config-memcached-servers": "Memcached servers:",
 	"config-memcached-help": "List of IP addresses to use for Memcached.\nShould specify one per line and specify the port to be used. For example:\n 127.0.0.1:11211\n 192.168.1.25:1234",
diff --git a/includes/installer/i18n/fr.json b/includes/installer/i18n/fr.json
index 3e7f8f345a..95224e9a35 100644
--- a/includes/installer/i18n/fr.json
+++ b/includes/installer/i18n/fr.json
@@ -85,6 +85,7 @@
 	"config-memory-bad": "'''Attention :''' Le paramètre <code>memory_limit</code> de PHP est à $1.\nCette valeur est probablement trop faible.\nIl est possible que l’installation échoue !",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] est installé",
 	"config-apc": "[http://www.php.net/apc APC] est installé",
+	"config-apcu": "[http://www.php.net/apcu APCu] est installé",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] est installé",
 	"config-no-cache-apcu": "'''Attention :''' Impossible de trouver [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] ou [http://www.iis.net/download/WinCacheForPhp WinCache].\nLa mise en cache d'objets n'est pas activée.",
 	"config-mod-security": "'''Attention''': Votre serveur web a [http://modsecurity.org/ mod_security] activé. S'il est mal configuré, cela peut poser des problèmes à MediaWiki ou à d'autres applications qui permettent aux utilisateurs de publier un contenu quelconque.\nReportez-vous à [http://modsecurity.org/documentation/ la documentation de mod_security] ou contactez le support de votre hébergeur si vous rencontrez des erreurs aléatoires.",
@@ -274,7 +275,7 @@
 	"config-cache-options": "Paramètres pour la mise en cache des objets:",
 	"config-cache-help": "La mise en cache des objets améliore la vitesse de MediaWiki en mettant en cache les données fréquemment utilisées.\nLes sites de taille moyenne à grande sont fortement encouragés à l'activer. Les petits sites y verront également des avantages.",
 	"config-cache-none": "Pas de mise en cache (aucune fonctionnalité n'a été supprimée, mais la vitesse peut changer sur les wikis importants)",
-	"config-cache-accel": "Mise en cache des objets PHP (APC, XCache ou WinCache)",
+	"config-cache-accel": "Mise en cache des objets PHP (APC, APCu, XCache ou WinCache)",
 	"config-cache-memcached": "Utiliser Memcached (nécessite une installation et une configuration supplémentaires)",
 	"config-memcached-servers": "serveurs pour Memcached :",
 	"config-memcached-help": "Liste des adresses IP à utiliser pour Memcached.\nUne par ligne, en indiquant le port à utiliser. Par exemple :\n  127.0.0.1:11211\n  192.168.1.25:1234",
diff --git a/includes/installer/i18n/it.json b/includes/installer/i18n/it.json
index dc24830277..0c3b2b47dd 100644
--- a/includes/installer/i18n/it.json
+++ b/includes/installer/i18n/it.json
@@ -19,7 +19,8 @@
 			"Macofe",
 			"Matteocng",
 			"Einreiher",
-			"Tosky"
+			"Tosky",
+			"Selven"
 		]
 	},
 	"config-desc": "Programma di installazione per MediaWiki",
@@ -77,6 +78,7 @@
 	"config-memory-bad": "''Attenzione:''' Il valore di <code>memory_limit</code> di PHP è $1.\nProbabilmente è troppo basso.\nL'installazione potrebbe non riuscire!",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] è installato",
 	"config-apc": "[http://www.php.net/apc APC] è installato",
+	"config-apcu": "[http://www.php.net/apc APC] è installato",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] è installato",
 	"config-no-cache-apcu": "'''Attenzione:''' [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] o [http://www.iis.net/download/WinCacheForPhp WinCache] non sono stati trovati.\nLa caching degli oggetti non è attivata.",
 	"config-mod-security": "<strong>Attenzione:</strong> Il tuo server web ha il [http://modsecurity.org/ mod_security] abilitato. Se non correttamente configurato, può creare problemi a MediaWiki o ad altro software che permette agli utenti di pubblicare contenuto.\nFai riferimento alla [http://modsecurity.org/documentation/ documentazione sul mod_security] o contatta il supporto tecnico del tuo provider di hosting se si verificano errori.",
@@ -214,6 +216,7 @@
 	"config-subscribe-help": "Si tratta di una mailing list a basso traffico dedicata agli annunci di nuove versioni, compresi importanti segnalazioni riguardanti la sicurezza.\nÈ consigliato iscriversi e aggiornare la propria installazione di MediaWiki quando una nuova versione viene resa pubblica.",
 	"config-subscribe-noemail": "Hai provato ad iscriverti alla mailing list dedicata agli annunci delle nuove versioni senza fornire un indirizzo email.\nInserire un indirizzo email se si desidera effettuare l'iscrizione alla mailing list.",
 	"config-pingback": "Condividi i dati su questa installazione con gli sviluppatori di MediaWiki.",
+	"config-pingback-help": "Se si seleziona questa opzione, MediaWiki contatterà periodicamente https://www.mediawiki.org con i dati base su questa istanza MediaWiki. In questa categoria di dati rientrano, per esempio, il tipo di sistema, la versione di PHP e database di backend scelto. La Wikimedia Foundation condivide questi dati con gli sviluppatori Mediawiki per aiutarla a guidare i futuri sforzi di sviluppo. Per il tuo sistema saranno inviati i seguenti dati:\n<pre>$1</pre>",
 	"config-almost-done": "Hai quasi finito!\nAdesso puoi saltare la rimanente parte della configurazione e semplicemente installare il wiki.",
 	"config-optional-continue": "Fammi altre domande.",
 	"config-optional-skip": "Sono già stanco, installa solo il wiki.",
@@ -262,7 +265,7 @@
 	"config-cache-options": "Impostazioni per la cache di oggetti:",
 	"config-cache-help": "La memorizzazione di oggetti nella cache è utilizzata per migliorare la velocità di MediaWiki attraverso l'allocazione nella cache dei dati utilizzati di frequente.\nPer siti di dimensioni medie e grandi, è caldamente consigliato attivare la cache, ma anche per piccoli siti se ne vedranno i benefici.",
 	"config-cache-none": "Nessuna memorizzazione in cache (nessuna funzionalità viene impedita, ma sui siti wiki più grandi la velocità potrebbe risentirne)",
-	"config-cache-accel": "Mettere in cache oggetti PHP (APC, XCache o WinCache)",
+	"config-cache-accel": "Mettere in cache oggetti PHP (APC, APCu, XCache o WinCache)",
 	"config-cache-memcached": "Usa Memcached (richiede ulteriori attività di installazione e configurazione)",
 	"config-memcached-servers": "Server di memcached:",
 	"config-memcached-help": "Elenco di indirizzi IP da utilizzare per Memcached.\nDovresti specificarne uno per riga e indicare la porta da utilizzare. Per esempio:\n 127.0.0.1:11211\n 192.168.1.25:1234",
@@ -316,6 +319,7 @@
 	"config-install-extension-tables": "Creazione delle tabelle per le estensioni attivate",
 	"config-install-mainpage-failed": "Impossibile inserire la pagina principale: $1",
 	"config-install-done": "<strong>Complimenti!</strong>\nHai installato MediaWiki.\n\nIl programma di installazione ha generato un file <code>LocalSettings.php</code> che contiene tutte le impostazioni.\n\nDevi scaricarlo ed inserirlo nella directory base del tuo wiki (la stessa dove è presente index.php). Il download dovrebbe partire automaticamente.\n\nSe il download non si avvia, o se è stato annullato, puoi riavviarlo cliccando sul collegamento di seguito:\n\n$3\n\n<strong>Nota:</strong> se esci ora dall'installazione senza scaricare il file di configurazione che è stato generato, questo poi non sarà più disponibile in seguito.\n\nQuando hai fatto, puoi <strong>[$2 entrare nel tuo wiki]</strong>.",
+	"config-install-done-path": "<strong>Complimenti!</strong>\nHai installato MediaWiki.\n\nIl programma di installazione ha generato un file <code>LocalSettings.php</code> che contiene tutte le impostazioni.\n\nDevi scaricarlo ed inserirlo in <code>$4</code>. Il download dovrebbe partire automaticamente.\n\nSe il download non si avvia, o se è stato annullato, puoi riavviarlo cliccando sul collegamento seguente:\n\n$3\n\n<strong>Nota:</strong> se esci ora dall'installazione senza scaricare il file di configurazione che è stato generato, questo poi non sarà più disponibile in seguito.\n\nQuando hai fatto, puoi <strong>[$2 entrare nel tuo wiki]</strong>.",
 	"config-download-localsettings": "Scarica <code>LocalSettings.php</code>",
 	"config-help": "aiuto",
 	"config-help-tooltip": "fai clic per espandere",
diff --git a/includes/installer/i18n/lv.json b/includes/installer/i18n/lv.json
index 7fe3a64c15..23f3de1397 100644
--- a/includes/installer/i18n/lv.json
+++ b/includes/installer/i18n/lv.json
@@ -26,6 +26,8 @@
 	"config-page-copying": "Kopē",
 	"config-restart": "Jā, restartēt",
 	"config-env-php": "PHP $1 ir uzstādīts.",
+	"config-env-hhvm": "HHVM $1 ir uzstādīts.",
+	"config-apcu": "[http://www.php.net/apcu APCu] ir uzstādīts",
 	"config-diff3-bad": "GNU diff3 nav atrasts.",
 	"config-db-name": "Datubāzes nosaukums:",
 	"config-db-username": "Datubāzes lietotājvārds:",
@@ -56,8 +58,10 @@
 	"config-email-settings": "E-pasta iestatījumi",
 	"config-logo": "Logo URL:",
 	"config-cc-again": "Izvēlies vēlreiz...",
+	"config-memcached-servers": "Memcached serveri:",
 	"config-extensions": "Paplašinājumi",
 	"config-install-step-done": "Gatavs",
+	"config-install-user": "Veido datu bāzes lietotāju",
 	"config-help": "palīdzība",
 	"config-help-tooltip": "uzspiediet, lai izvērstu",
 	"mainpagetext": "<strong>MediaWiki veiksmīgi instalēts.</strong>",
diff --git a/includes/installer/i18n/mai.json b/includes/installer/i18n/mai.json
index 8b8e0fbf98..5e3fc0d33c 100644
--- a/includes/installer/i18n/mai.json
+++ b/includes/installer/i18n/mai.json
@@ -21,9 +21,9 @@
 	"config-page-dbsettings": "डाटाबेस कुंजी",
 	"config-page-name": "नाम",
 	"config-page-options": "विकल्प",
-	"config-page-install": "स्थापित करु",
+	"config-page-install": "स्थापित करी",
 	"config-page-complete": "पूर्ण!",
-	"config-page-restart": "स्थापनाके पुनारम्भ करु",
+	"config-page-restart": "स्थापनाक पुनारम्भ करी",
 	"config-page-readme": "पढू",
 	"config-page-releasenotes": "रिलीज नोट्स",
 	"config-page-copying": "अनुकरण",
diff --git a/includes/installer/i18n/nl.json b/includes/installer/i18n/nl.json
index 78649ce571..0a772327f0 100644
--- a/includes/installer/i18n/nl.json
+++ b/includes/installer/i18n/nl.json
@@ -57,7 +57,7 @@
 	"config-restart": "Ja, opnieuw starten",
 	"config-welcome": "=== Controle omgeving ===\nEr worden een aantal basiscontroles uitgevoerd met als doel vast te stellen of deze omgeving geschikt is voor een installatie van MediaWiki.\nLever deze gegevens aan als u ondersteuning vraagt bij de installatie.",
 	"config-copyright": "=== Auteursrechten en voorwaarden ===\n\n$1\n\nDit programma is vrije software. U mag het verder verspreiden en/of aanpassen in overeenstemming met de voorwaarden van de GNU General Public License zoals uitgegeven door de Free Software Foundation; ofwel versie 2 van de Licentie of - naar uw keuze - enige latere versie.\n\nDit programma wordt verspreid in de hoop dat het nuttig is, maar '''zonder enige garantie''', zelfs zonder de impliciete garantie van '''verkoopbaarheid''' of '''geschiktheid voor een bepaald doel'''.\nZie de GNU General Public License voor meer informatie.\n\nSamen met dit programma hoort u een <doclink href=Copying>exemplaar van de GNU General Public License</doclink> ontvangen te hebben; zo niet, schrijf dan aan de Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, Verenigde Staten. Of [http://www.gnu.org/copyleft/gpl.html lees de licentie online].",
-	"config-sidebar": "* [https://www.mediawiki.org MediaWiki thuispagina]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Gebruikershandleiding] (Engelstalig)\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Beheerdershandleiding] (Engelstalig)\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde vragen] (Engelstalig)\n----\n* <doclink href=Readme>Leesmij</doclink> (Engelstalig)\n* <doclink href=ReleaseNotes>Release notes</doclink> (Engelstalig)\n* <doclink href=Copying>Kopiëren</doclink> (Engelstalig)\n* <doclink href=UpgradeDoc>Versie bijwerken</doclink> (Engelstalig)",
+	"config-sidebar": "* [https://www.mediawiki.org MediaWiki-thuispagina]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Help:Contents Gebruikershandleiding] (Engelstalig)\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Contents Beheerdershandleiding] (Engelstalig)\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ Veelgestelde vragen] (Engelstalig)\n----\n* <doclink href=Readme>Leesmij</doclink> (Engelstalig)\n* <doclink href=ReleaseNotes>Release notes</doclink> (Engelstalig)\n* <doclink href=Copying>Kopiëren</doclink> (Engelstalig)\n* <doclink href=UpgradeDoc>Versie bijwerken</doclink> (Engelstalig)",
 	"config-env-good": "De omgeving is gecontroleerd.\nU kunt MediaWiki installeren.",
 	"config-env-bad": "De omgeving is gecontroleerd.\nU kunt MediaWiki niet installeren.",
 	"config-env-php": "PHP $1 is op dit moment geïnstalleerd.",
@@ -193,7 +193,7 @@
 	"config-ns-site-name": "Zelfde als de wiki: $1",
 	"config-ns-other": "Andere (geef aan welke)",
 	"config-ns-other-default": "MijnWiki",
-	"config-project-namespace-help": "In het kielzog van Wikipedia beheren veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een \"'''projectnaamruimte'''\".\nAlle paginanamen in deze naamruimte beginnen met een bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten als \"#\" of \":\".",
+	"config-project-namespace-help": "In het kielzog van Wikipedia beheren veel wiki's hun beleidspagina's apart van hun inhoudelijke pagina's in een '''projectnaamruimte'''.\nAlle paginanamen in deze naamruimte beginnen met een bepaald voorvoegsel dat u hier kunt opgeven.\nDit voorvoegsel wordt meestal afgeleid van de naam van de wiki, maar het kan geen bijzondere tekens bevatten als \"#\" of \":\".",
 	"config-ns-invalid": "De opgegeven naamruimte \"<nowiki>$1</nowiki>\" is ongeldig.\nGeef een andere naamruimte op.",
 	"config-ns-conflict": "De opgegeven naamruimte \"<nowiki>$1</nowiki>\" conflicteert met een standaard naamruimte in MediaWiki.\nGeef een andere naam op voor de projectnaamruimte.",
 	"config-admin-box": "Beheerdersgebruiker",
@@ -213,6 +213,7 @@
 	"config-subscribe": "Abonneren op de [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce mailinglijst releaseaankondigen].",
 	"config-subscribe-help": "Dit is een mailinglijst met een laag volume voor aankondigingen van nieuwe versies, inclusief belangrijke aankondigingen met betrekking tot beveiliging.\nAbonneer uzelf erop en werk uw MediaWiki-installatie bij als er nieuwe versies uitkomen.",
 	"config-subscribe-noemail": "U hebt geprobeerd zich te abonneren op de mailinglijst voor release-aankondigingen zonder een e-mailadres op te geven.\nGeef een e-mailadres op als u zich wilt abonneren op de mailinglijst.",
+	"config-pingback": "Gegevens over deze installatie delen met MediaWiki-ontwikkelaars.",
 	"config-almost-done": "U bent bijna klaar!\nAls u wilt kunt u de overige instellingen overslaan en de wiki nu installeren.",
 	"config-optional-continue": "Stel me meer vragen.",
 	"config-optional-skip": "Laat maar zitten, installeer gewoon de wiki.",
@@ -253,7 +254,7 @@
 	"config-logo": "URL voor logo:",
 	"config-logo-help": "Het standaarduiterlijk van MediaWiki bevat ruimte voor een logo van 135x160 pixels boven het menu.\nUpload een afbeelding met de juiste afmetingen en voer de URL hier in.\n\nU kunt <code>$wgStylePath</code> of <code>$wgScriptPath</code> gebruiken als uw logo relatief is aan een van deze paden.\n\nAls u geen logo wilt gebruiken, kunt u dit veld leeg laten.",
 	"config-instantcommons": "Instant Commons inschakelen",
-	"config-instantcommons-help": "[https://www.mediawiki.org/wiki/InstantCommons Instant Commons] is functie die het mogelijk maakt om afbeeldingen, geluidsbestanden en andere mediabestanden te gebruiken van de website [https://commons.wikimedia.org/ Wikimedia Commons].\nHiervoor heeft MediaWiki toegang nodig tot Internet.\n\nMeer informatie over deze functie en hoe deze in te stellen voor andere wiki's dan Wikimedia Commons is te vinden in de [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgForeignFileRepos handleiding].",
+	"config-instantcommons-help": "[https://www.mediawiki.org/wiki/InstantCommons Instant Commons] is functie die het mogelijk maakt om afbeeldingen, geluidsbestanden en andere mediabestanden te gebruiken van de website [https://commons.wikimedia.org/ Wikimedia Commons].\nHiervoor heeft MediaWiki toegang nodig tot internet.\n\nMeer informatie over deze functie en hoe deze in te stellen voor andere wiki's dan Wikimedia Commons is te vinden in de [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgForeignFileRepos handleiding].",
 	"config-cc-error": "De licentiekiezer van Creative Commons heeft geen resultaat opgeleverd.\nVoer de licentie handmatig in.",
 	"config-cc-again": "Opnieuw kiezen...",
 	"config-cc-not-chosen": "Kies de Creative Commonslicentie die u wilt gebruiken en klik op \"proceed\".",
diff --git a/includes/installer/i18n/pl.json b/includes/installer/i18n/pl.json
index 8d54c98939..fd8bb1769d 100644
--- a/includes/installer/i18n/pl.json
+++ b/includes/installer/i18n/pl.json
@@ -71,7 +71,7 @@
 	"config-unicode-using-intl": "Korzystanie z [http://pecl.php.net/intl rozszerzenia intl PECL] do normalizacji Unicode.",
 	"config-unicode-pure-php-warning": "<strong>Uwaga:<strong> [http://pecl.php.net/intl Rozszerzenie intl PECL] do obsługi normalizacji Unicode nie jest dostępne. Użyta zostanie mało wydajna zwykła implementacja w PHP.\nJeśli prowadzisz stronę o dużym natężeniu ruchu, powinieneś zapoznać się z informacjami o [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations normalizacji Unicode].",
 	"config-unicode-update-warning": "<strong>Uwaga:</strong> zainstalowana wersja normalizacji Unicode korzysta z nieaktualnej biblioteki [http://site.icu-project.org/ projektu ICU].\nPowinieneś [https://www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations wykonać aktualizację], jeśli chcesz korzystać w pełni z Unicode.",
-	"config-no-db": "Nie można odnaleźć właściwego sterownika bazy danych! Musisz zainstalować sterownik bazy danych dla PHP.\nMożna użyć {{PLURAL:$2|następującego typu bazy|następujących typów baz} danych: $1.\n\nJeśli skompilowałeś PHP samodzielnie, skonfiguruj je ponownie z włączonym klientem bazy danych, na przykład za pomocą polecenia <code>./configure --with-mysqli</code>.\nJeśli zainstalowałeś PHP jako pakiet Debiana lub Ubuntu, musisz również zainstalować np. moduł <code>php5-mysql</code>.",
+	"config-no-db": "Nie można odnaleźć właściwego sterownika bazy danych! Musisz zainstalować sterownik bazy danych dla PHP.\nMożna użyć {{PLURAL:$2|następującego typu bazy|następujących typów baz}} danych: $1.\n\nJeśli skompilowałeś PHP samodzielnie, skonfiguruj go ponownie z włączonym klientem bazy danych, na przykład za pomocą polecenia <code>./configure --with-mysqli</code>.\nJeśli zainstalowałeś PHP jako pakiet Debiana lub Ubuntu, musisz również zainstalować np. moduł <code>php5-mysql</code>.",
 	"config-outdated-sqlite": "'''Ostrzeżenie''': masz SQLite  $1, która jest niższa od minimalnej wymaganej wersji  $2 . SQLite będzie niedostępne.",
 	"config-no-fts3": "'''Uwaga''' – SQLite został skompilowany bez [//sqlite.org/fts3.html modułu FTS3] – funkcje wyszukiwania nie będą dostępne.",
 	"config-pcre-old": "<strong>Błąd krytyczny:</strong> Wymagany jest PCRE w wersji $1 lub nowszej.\nTwój plik wykonywalny PHP jest powiązany z wersją PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Więcej informacji].",
@@ -264,7 +264,7 @@
 	"config-cc-not-chosen": "Wybierz, którą chcesz licencję Creative Commons i kliknij „proceed”.",
 	"config-advanced-settings": "Konfiguracja zaawansowana",
 	"config-cache-options": "Ustawienia buforowania obiektów:",
-	"config-cache-help": "Buforowanie obiekto jest używane aby przyspieszyć MediaWiki przez trzymanie w pamięci podręcznej często używanych danych.\nŚrednie oraz duże witryny są wysoce zachęcane by je włączyć, a małe witryny także dostrzegą korzyści.",
+	"config-cache-help": "Buforowanie obiektów jest używane do przyspieszenia MediaWiki przez trzymanie w pamięci podręcznej często używanych danych.\nŚrednie oraz duże witryny są wysoce zachęcane by je włączyć, ale małe witryny również dostrzegą korzyści.",
 	"config-cache-none": "Brak buforowania (wszystkie funkcje będą działać, ale mogą wystąpić kłopoty z wydajnością na dużych witrynach wiki)",
 	"config-cache-accel": "Buforowania obiektów PHP (APC, XCache lub WinCache)",
 	"config-cache-memcached": "Użyj Memcached (wymaga dodatkowej instalacji i konfiguracji)",
@@ -286,7 +286,7 @@
 	"config-install-begin": "Po naciśnięciu \"{{int:config-continue}}\", rozpocznie się instalacja MediaWiki.\nJeśli nadal chcesz dokonać zmian, naciśnij \"{{int:config-back}}\".",
 	"config-install-step-done": "gotowe",
 	"config-install-step-failed": "nieudane",
-	"config-install-extensions": "Włącznie z rozszerzeniami",
+	"config-install-extensions": "Dołączanie rozszerzeń",
 	"config-install-database": "Konfigurowanie bazy danych",
 	"config-install-schema": "Tworzenie schematu",
 	"config-install-pg-schema-not-exist": "Schemat PostgreSQL nie istnieje.",
@@ -325,7 +325,7 @@
 	"config-help": "pomoc",
 	"config-help-tooltip": "kliknij, aby rozwinąć",
 	"config-nofile": "Nie udało się odnaleźć pliku \"$1\". Czy nie został usunięty?",
-	"config-extension-link": "Czy wiesz, że twoja wiki obsługuje [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions/pl rozszerzenia]?\n\nMożesz przejrzeć [https://www.mediawiki.org/wiki/Special:MyLanguage/Category:Extensions_by_category rozszerzenia według kategorii] lub [https://www.mediawiki.org/wiki/Extension_Matrix Extension Matrix] aby zobaczyć pełną listę rozszerzeń.",
+	"config-extension-link": "Czy wiesz, że twoja wiki obsługuje [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Extensions rozszerzenia]?\n\nMożesz przejrzeć [https://www.mediawiki.org/wiki/Category:Extensions_by_category rozszerzenia według kategorii] lub [https://www.mediawiki.org/wiki/Extension_Matrix Extension Matrix], aby zobaczyć pełną listę rozszerzeń.",
 	"mainpagetext": "<strong>Instalacja MediaWiki powiodła się.</strong>",
-	"mainpagedocfooter": "Zobacz [https://meta.wikimedia.org/wiki/Help:Contents przewodnik użytkownika], aby uzyskać informacje o działaniu oprogramowania wiki.\n\n== Na początek ==\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings/pl Lista ustawień konfiguracyjnych]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ/pl MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Komunikaty o nowych wersjach MediaWiki]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Przetłumacz MediaWiki na swój język]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam \nDowiedz się, jak walczyć ze spamem na swojej wiki]"
+	"mainpagedocfooter": "Zobacz [https://meta.wikimedia.org/wiki/Help:Contents/pl przewodnik użytkownika], aby uzyskać informacje o działaniu oprogramowania wiki.\n\n== Na początek ==\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Configuration_settings Lista ustawień konfiguracyjnych]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:FAQ MediaWiki FAQ]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Komunikaty o nowych wersjach MediaWiki (lista dyskusyjna)]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation#Translation_resources Przetłumacz MediaWiki na swój język]\n* [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Combating_spam Dowiedz się, jak walczyć ze spamem na swojej wiki]"
 }
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index 833e7d612a..d7e86bed96 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -75,6 +75,7 @@
 	"config-memory-bad": "Parameters:\n* $1 is the configured <code>memory_limit</code>.",
 	"config-xcache": "Message indicates if this program is available",
 	"config-apc": "Message indicates if this program is available",
+	"config-apcu": "Message indicates if this program is available",
 	"config-wincache": "Message indicates if this program is available",
 	"config-no-cache-apcu": "Status message in the MediaWiki installer environment checks.",
 	"config-mod-security": "Status message in the MediaWiki installer environment checks.",
diff --git a/includes/installer/i18n/ru.json b/includes/installer/i18n/ru.json
index 53b4c9e70b..bead2f1bdf 100644
--- a/includes/installer/i18n/ru.json
+++ b/includes/installer/i18n/ru.json
@@ -79,6 +79,7 @@
 	"config-memory-bad": "'''Внимание:''' размер PHP <code>memory_limit</code> составляет $1.\nВероятно, этого слишком мало.\nУстановка может потерпеть неудачу!",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] установлен",
 	"config-apc": "[http://www.php.net/apc APC] установлен",
+	"config-apcu": "[http://www.php.net/apcu APCu] установлен",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] установлен",
 	"config-no-cache-apcu": "'''Внимание:''' Не найдены [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] или [http://www.iis.net/download/WinCacheForPhp WinCache].\nКэширование объектов будет отключено.",
 	"config-mod-security": "<strong>Внимание</strong>: На вашем веб-сервере включен [http://modsecurity.org/ mod_security]/mod_security2. Многие его стандартные настройки могут вызывать проблемы для MediaWiki или другого ПО, позволяющего пользователям отправлять на сервер произвольный контент.\nОбратитесь к [http://modsecurity.org/documentation/ документации mod_security] или в службу поддержки вашего хостинг-провайдера, если вы сталкиваетесь со случайными ошибками.",
@@ -268,7 +269,7 @@
 	"config-cache-options": "Параметры кэширования объектов:",
 	"config-cache-help": "Кэширование объектов используется для повышения скорости MediaWiki путем кэширования часто используемых данных.\nДля средних и больших сайтов кеширование настоятельно рекомендуется включать, а для небольших сайтов кеширование может показать преимущество.",
 	"config-cache-none": "Без кэширования (никакой функционал не теряется, но крупные вики-сайты могут работать медленнее)",
-	"config-cache-accel": "PHP кэширование объектов (APC, XCache или WinCache)",
+	"config-cache-accel": "Кэширование PHP-объектов (APC, APCu, XCache или WinCache)",
 	"config-cache-memcached": "Использовать Memcached (требует дополнительной настройки)",
 	"config-memcached-servers": "Сервера Memcached:",
 	"config-memcached-help": "Список IP-адресов, используемых Memcached.\nПеречислите по одному адресу на строку с указанием портов. Например:\n 127.0.0.1:11211\n 192.168.1.25:1234",
diff --git a/includes/installer/i18n/sd.json b/includes/installer/i18n/sd.json
index 33fa590c08..21a329734c 100644
--- a/includes/installer/i18n/sd.json
+++ b/includes/installer/i18n/sd.json
@@ -2,11 +2,12 @@
 	"@metadata": {
 		"authors": [
 			"Sindhu",
-			"Aursani"
+			"Aursani",
+			"Mehtab ahmed"
 		]
 	},
 	"config-information": "معلومات",
-	"config-localsettings-badkey": "توهان جي ڏنل ڪنجي غيردرست آهي.",
+	"config-localsettings-badkey": "توهان جي سنواري ڏنل ڪنجي غيردرست آهي.",
 	"config-your-language": "توهان جي ٻولي:",
 	"config-wiki-language": "وڪِي ٻولي:",
 	"config-back": "پوئتي ←",
@@ -26,6 +27,5 @@
 	"config-page-existingwiki": "موجوده وڪِي",
 	"config-restart": "ها، وري کان شروع ڪريو",
 	"config-env-php": "PHP $1 تنصيب ٿي چڪو",
-	"config-env-hhvm": "HHVM $1 تنصيب ٿي چڪو.",
-	"config-xml-bad": "PHP جو XML ماڊيول کٽل آهي. ذريعات‌وڪيءَ کي ان ماڊيول ۾  فنڪشنس گھربل آهن ۽ اها موجوده ترتيب يا ڪنفيگيوريشن ۾ ڪم نہ ڪندي. \nتوهان کي گھرجي تہ php-xml RPM پيڪيج تنصيب ڪريو."
+	"config-env-hhvm": "HHVM $1 تنصيب ٿي چڪو."
 }
diff --git a/includes/installer/i18n/sv.json b/includes/installer/i18n/sv.json
index 20ebf9b588..45c5a7d1e2 100644
--- a/includes/installer/i18n/sv.json
+++ b/includes/installer/i18n/sv.json
@@ -67,6 +67,7 @@
 	"config-memory-bad": "''' Varning:''' PHP:s <code>memory_limit</code> är $1.\nDetta är förmodligen för lågt.\nInstallationen kan misslyckas!",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] är installerat",
 	"config-apc": "[http://www.php.net/apc APC] är installerat",
+	"config-apcu": "[http://www.php.net/apcu APCu] är installerat",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] är installerat",
 	"config-no-cache-apcu": "'''Varning:''' Kunde inte hitta [http://www.php.net/apcu APCu], [http://xcache.lighttpd.net/ XCache] eller [http://www.iis.net/download/WinCacheForPhp WinCache].\nCachelagring av objekt är inte aktiverat.",
 	"config-mod-security": "'''Varning:''' Din webbserver har [http://modsecurity.org/ mod_security] aktiverat. Om felaktigt konfigurerat kan den skapa problem för MediaWiki eller annan programvara som tillåter användaren att posta godtyckligt innehåll.\nTitta på [http://modsecurity.org/documentation/ mod_security-dokumentationen] eller kontakta din värd om du påträffar slumpmässiga fel.",
@@ -253,7 +254,7 @@
 	"config-cache-options": "Inställningar för cachelagring av objekt:",
 	"config-cache-help": "Cachelagring av objekt används för att förbättra hastigheten på MediaWiki genom att cachelagra data som används ofta.\nMedelstora till stora webbplatser är starkt uppmuntrade att aktivera detta, och små webbplatser kommer även att se fördelar.",
 	"config-cache-none": "Ingen cachelagring (ingen funktionalitet tas bort, men hastighet kan påverkas på större wiki-webbplatser)",
-	"config-cache-accel": "Cachelagring av PHP-objekt (APC, XCache eller WinCache)",
+	"config-cache-accel": "Cachelagring av PHP-objekt (APC, APCu, XCache eller WinCache)",
 	"config-cache-memcached": "Använda Memcached (kräver ytterligare inställningar och konfiguration)",
 	"config-memcached-servers": "Memcached-servrar:",
 	"config-memcached-help": "Lista över IP-adresser som ska användas för Memcached.\nBör ange en per rad och specificera den port som ska användas. Till exempel:\n 127.0.0.1:11211\n 192.168.1.25:1234",
diff --git a/includes/installer/i18n/zh-hans.json b/includes/installer/i18n/zh-hans.json
index d541696dc0..1410ae745f 100644
--- a/includes/installer/i18n/zh-hans.json
+++ b/includes/installer/i18n/zh-hans.json
@@ -80,6 +80,7 @@
 	"config-memory-bad": "<strong>警告：</strong>PHP的内存使用上限<code>memory_limit</code>为$1。\n该设定可能过低，并导致安装失败！",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache]已安装",
 	"config-apc": "[http://www.php.net/apc APC]已安装",
+	"config-apcu": "[http://www.php.net/apcu APCu]已安装",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache]已安装",
 	"config-no-cache-apcu": "<strong>警告：</strong>找不到[http://www.php.net/apcu APCu]、[http://xcache.lighttpd.net/ XCache]或[http://www.iis.net/download/WinCacheForPhp WinCache]。\n对象缓存未启用。",
 	"config-mod-security": "<strong>警告：</strong>您的web服务器已启用[http://modsecurity.org/ mod_security]/mod_security2。它的很多常见配置可能导致MediaWiki及其他软件允许用户发布任意内容的问题。如果可能，这应当被禁用。否则，当您遭遇随机错误时，请参考[http://modsecurity.org/documentation/ mod_security 文档]或联络您的主机支持。",
@@ -266,7 +267,7 @@
 	"config-cache-options": "对象缓存设置：",
 	"config-cache-help": "对象缓存可通过缓存频繁使用的数据来提高MediaWiki的速度。高度推荐中到大型的网站启用该功能，小型网站亦能从其中受益。",
 	"config-cache-none": "无缓存（不影响功能，但对较大型的wiki网站会有速度影响）",
-	"config-cache-accel": "PHP对象缓存（APC、XCache或WinCache）",
+	"config-cache-accel": "PHP对象缓存（APC、APCu、XCache或WinCache）",
 	"config-cache-memcached": "使用Memcached（需要另外安装并配置）",
 	"config-memcached-servers": "Memcached服务器：",
 	"config-memcached-help": "用于Memcached的IP地址列表。请保持每行一条，并指定要使用的端口。例如：\n127.0.0.1:11211\n192.168.1.25:1234",
diff --git a/includes/installer/i18n/zh-hant.json b/includes/installer/i18n/zh-hant.json
index ab21779c34..2f2e934792 100644
--- a/includes/installer/i18n/zh-hant.json
+++ b/includes/installer/i18n/zh-hant.json
@@ -257,7 +257,7 @@
 	"config-cache-options": "物件快取設定：",
 	"config-cache-help": "物件快取是用來增進 MediaWiki 速度的一項功能，透過快取經常使用的資料。\n中型到大型的網站我們會建議開啟這個選項，對小型的網站也有一定程度的效果。",
 	"config-cache-none": "不快取 (不會影響功能，但在大型 Wiki 網站可能會有處理速度的問題)",
-	"config-cache-accel": "使用 PHP 物件快取 (APC、XCache 或 WinCache)",
+	"config-cache-accel": "使用 PHP 物件快取 (APC、APCu、XCache 或 WinCache)",
 	"config-cache-memcached": "使用 Memcached (需要額外安裝與設定)",
 	"config-memcached-servers": "Memcached 伺服器：",
 	"config-memcached-help": "請列出 Memcached 伺服器的 IP 位址。\n每一行只指定一個位置並且要註明使用的埠號，例如：\n 127.0.0.1:11211\n 192.168.1.25:1234",
diff --git a/includes/libs/CryptRand.php b/includes/libs/CryptRand.php
new file mode 100644
index 0000000000..6d18c81ed6
--- /dev/null
+++ b/includes/libs/CryptRand.php
@@ -0,0 +1,389 @@
+<?php
+/**
+ * A cryptographic random generator class used for generating secret keys
+ *
+ * This is based in part on Drupal code as well as what we used in our own code
+ * prior to introduction of this class.
+ *
+ * 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
+ *
+ * @author Daniel Friesen
+ * @file
+ */
+use Psr\Log\LoggerInterface;
+
+class CryptRand {
+	/**
+	 * Minimum number of iterations we want to make in our drift calculations.
+	 */
+	const MIN_ITERATIONS = 1000;
+
+	/**
+	 * Number of milliseconds we want to spend generating each separate byte
+	 * of the final generated bytes.
+	 * This is used in combination with the hash length to determine the duration
+	 * we should spend doing drift calculations.
+	 */
+	const MSEC_PER_BYTE = 0.5;
+
+	/**
+	 * A boolean indicating whether the previous random generation was done using
+	 * cryptographically strong random number generator or not.
+	 */
+	protected $strong = null;
+
+	/**
+	 * List of functions to call to generate some random state
+	 *
+	 * @var callable[]
+	 */
+	protected $randomFuncs = [];
+
+	/**
+	 * List of files to generate some random state from
+	 *
+	 * @var string[]
+	 */
+	protected $randomFiles = [];
+
+	/**
+	 * @var LoggerInterface
+	 */
+	protected $logger;
+
+	public function __construct( array $randomFuncs, array $randomFiles, LoggerInterface $logger ) {
+		$this->randomFuncs = $randomFuncs;
+		$this->randomFiles = $randomFiles;
+		$this->logger = $logger;
+	}
+
+	/**
+	 * Initialize an initial random state based off of whatever we can find
+	 * @return string
+	 */
+	protected function initialRandomState() {
+		// $_SERVER contains a variety of unstable user and system specific information
+		// It'll vary a little with each page, and vary even more with separate users
+		// It'll also vary slightly across different machines
+		$state = serialize( $_SERVER );
+
+		// Try to gather a little entropy from the different php rand sources
+		$state .= rand() . uniqid( mt_rand(), true );
+
+		// Include some information about the filesystem's current state in the random state
+		$files = $this->randomFiles;
+
+		// We know this file is here so grab some info about ourselves
+		$files[] = __FILE__;
+
+		// We must also have a parent folder, and with the usual file structure, a grandparent
+		$files[] = __DIR__;
+		$files[] = dirname( __DIR__ );
+
+		foreach ( $files as $file ) {
+			MediaWiki\suppressWarnings();
+			$stat = stat( $file );
+			MediaWiki\restoreWarnings();
+			if ( $stat ) {
+				// stat() duplicates data into numeric and string keys so kill off all the numeric ones
+				foreach ( $stat as $k => $v ) {
+					if ( is_numeric( $k ) ) {
+						unset( $k );
+					}
+				}
+				// The absolute filename itself will differ from install to install so don't leave it out
+				$path = realpath( $file );
+				if ( $path !== false ) {
+					$state .= $path;
+				} else {
+					$state .= $file;
+				}
+				$state .= implode( '', $stat );
+			} else {
+				// The fact that the file isn't there is worth at least a
+				// minuscule amount of entropy.
+				$state .= '0';
+			}
+		}
+
+		// Try and make this a little more unstable by including the varying process
+		// id of the php process we are running inside of if we are able to access it
+		if ( function_exists( 'getmypid' ) ) {
+			$state .= getmypid();
+		}
+
+		// If available try to increase the instability of the data by throwing in
+		// the precise amount of memory that we happen to be using at the moment.
+		if ( function_exists( 'memory_get_usage' ) ) {
+			$state .= memory_get_usage( true );
+		}
+
+		foreach ( $this->randomFuncs as $randomFunc ) {
+			$state .= call_user_func( $randomFunc );
+		}
+
+		return $state;
+	}
+
+	/**
+	 * Randomly hash data while mixing in clock drift data for randomness
+	 *
+	 * @param string $data The data to randomly hash.
+	 * @return string The hashed bytes
+	 * @author Tim Starling
+	 */
+	protected function driftHash( $data ) {
+		// Minimum number of iterations (to avoid slow operations causing the
+		// loop to gather little entropy)
+		$minIterations = self::MIN_ITERATIONS;
+		// Duration of time to spend doing calculations (in seconds)
+		$duration = ( self::MSEC_PER_BYTE / 1000 ) * MWCryptHash::hashLength();
+		// Create a buffer to use to trigger memory operations
+		$bufLength = 10000000;
+		$buffer = str_repeat( ' ', $bufLength );
+		$bufPos = 0;
+
+		// Iterate for $duration seconds or at least $minIterations number of iterations
+		$iterations = 0;
+		$startTime = microtime( true );
+		$currentTime = $startTime;
+		while ( $iterations < $minIterations || $currentTime - $startTime < $duration ) {
+			// Trigger some memory writing to trigger some bus activity
+			// This may create variance in the time between iterations
+			$bufPos = ( $bufPos + 13 ) % $bufLength;
+			$buffer[$bufPos] = ' ';
+			// Add the drift between this iteration and the last in as entropy
+			$nextTime = microtime( true );
+			$delta = (int)( ( $nextTime - $currentTime ) * 1000000 );
+			$data .= $delta;
+			// Every 100 iterations hash the data and entropy
+			if ( $iterations % 100 === 0 ) {
+				$data = sha1( $data );
+			}
+			$currentTime = $nextTime;
+			$iterations++;
+		}
+		$timeTaken = $currentTime - $startTime;
+		$data = MWCryptHash::hash( $data );
+
+		$this->logger->debug( "Clock drift calculation " .
+			"(time-taken=" . ( $timeTaken * 1000 ) . "ms, " .
+			"iterations=$iterations, " .
+			"time-per-iteration=" . ( $timeTaken / $iterations * 1e6 ) . "us)\n" );
+
+		return $data;
+	}
+
+	/**
+	 * Return a rolling random state initially build using data from unstable sources
+	 * @return string A new weak random state
+	 */
+	protected function randomState() {
+		static $state = null;
+		if ( is_null( $state ) ) {
+			// Initialize the state with whatever unstable data we can find
+			// It's important that this data is hashed right afterwards to prevent
+			// it from being leaked into the output stream
+			$state = MWCryptHash::hash( $this->initialRandomState() );
+		}
+		// Generate a new random state based on the initial random state or previous
+		// random state by combining it with clock drift
+		$state = $this->driftHash( $state );
+
+		return $state;
+	}
+
+	/**
+	 * Return a boolean indicating whether or not the source used for cryptographic
+	 * random bytes generation in the previously run generate* call
+	 * was cryptographically strong.
+	 *
+	 * @return bool Returns true if the source was strong, false if not.
+	 */
+	public function wasStrong() {
+		if ( is_null( $this->strong ) ) {
+			throw new RuntimeException( __METHOD__ . ' called before generation of random data' );
+		}
+
+		return $this->strong;
+	}
+
+	/**
+	 * Generate a run of (ideally) cryptographically random data and return
+	 * it in raw binary form.
+	 * You can use CryptRand::wasStrong() if you wish to know if the source used
+	 * was cryptographically strong.
+	 *
+	 * @param int $bytes The number of bytes of random data to generate
+	 * @param bool $forceStrong Pass true if you want generate to prefer cryptographically
+	 *                          strong sources of entropy even if reading from them may steal
+	 *                          more entropy from the system than optimal.
+	 * @return string Raw binary random data
+	 */
+	public function generate( $bytes, $forceStrong = false ) {
+
+		$this->logger->debug( "Generating cryptographic random bytes for\n" );
+
+		$bytes = floor( $bytes );
+		static $buffer = '';
+		if ( is_null( $this->strong ) ) {
+			// Set strength to false initially until we know what source data is coming from
+			$this->strong = true;
+		}
+
+		if ( strlen( $buffer ) < $bytes ) {
+			// If available make use of mcrypt_create_iv URANDOM source to generate randomness
+			// On unix-like systems this reads from /dev/urandom but does it without any buffering
+			// and bypasses openbasedir restrictions, so it's preferable to reading directly
+			// On Windows starting in PHP 5.3.0 Windows' native CryptGenRandom is used to generate
+			// entropy so this is also preferable to just trying to read urandom because it may work
+			// on Windows systems as well.
+			if ( function_exists( 'mcrypt_create_iv' ) ) {
+				$rem = $bytes - strlen( $buffer );
+				$iv = mcrypt_create_iv( $rem, MCRYPT_DEV_URANDOM );
+				if ( $iv === false ) {
+					$this->logger->debug( "mcrypt_create_iv returned false.\n" );
+				} else {
+					$buffer .= $iv;
+					$this->logger->debug( "mcrypt_create_iv generated " . strlen( $iv ) .
+						" bytes of randomness.\n" );
+				}
+			}
+		}
+
+		if ( strlen( $buffer ) < $bytes ) {
+			if ( function_exists( 'openssl_random_pseudo_bytes' ) ) {
+				$rem = $bytes - strlen( $buffer );
+				$openssl_bytes = openssl_random_pseudo_bytes( $rem, $openssl_strong );
+				if ( $openssl_bytes === false ) {
+					$this->logger->debug( "openssl_random_pseudo_bytes returned false.\n" );
+				} else {
+					$buffer .= $openssl_bytes;
+					$this->logger->debug( "openssl_random_pseudo_bytes generated " .
+						strlen( $openssl_bytes ) . " bytes of " .
+						( $openssl_strong ? "strong" : "weak" ) . " randomness.\n" );
+				}
+				if ( strlen( $buffer ) >= $bytes ) {
+					// openssl tells us if the random source was strong, if some of our data was generated
+					// using it use it's say on whether the randomness is strong
+					$this->strong = !!$openssl_strong;
+				}
+			}
+		}
+
+		// Only read from urandom if we can control the buffer size or were passed forceStrong
+		if ( strlen( $buffer ) < $bytes &&
+			( function_exists( 'stream_set_read_buffer' ) || $forceStrong )
+		) {
+			$rem = $bytes - strlen( $buffer );
+			if ( !function_exists( 'stream_set_read_buffer' ) && $forceStrong ) {
+				$this->logger->debug( "Was forced to read from /dev/urandom " .
+					"without control over the buffer size.\n" );
+			}
+			// /dev/urandom is generally considered the best possible commonly
+			// available random source, and is available on most *nix systems.
+			MediaWiki\suppressWarnings();
+			$urandom = fopen( "/dev/urandom", "rb" );
+			MediaWiki\restoreWarnings();
+
+			// Attempt to read all our random data from urandom
+			// php's fread always does buffered reads based on the stream's chunk_size
+			// so in reality it will usually read more than the amount of data we're
+			// asked for and not storing that risks depleting the system's random pool.
+			// If stream_set_read_buffer is available set the chunk_size to the amount
+			// of data we need. Otherwise read 8k, php's default chunk_size.
+			if ( $urandom ) {
+				// php's default chunk_size is 8k
+				$chunk_size = 1024 * 8;
+				if ( function_exists( 'stream_set_read_buffer' ) ) {
+					// If possible set the chunk_size to the amount of data we need
+					stream_set_read_buffer( $urandom, $rem );
+					$chunk_size = $rem;
+				}
+				$random_bytes = fread( $urandom, max( $chunk_size, $rem ) );
+				$buffer .= $random_bytes;
+				fclose( $urandom );
+				$this->logger->debug( "/dev/urandom generated " . strlen( $random_bytes ) .
+					" bytes of randomness.\n" );
+
+				if ( strlen( $buffer ) >= $bytes ) {
+					// urandom is always strong, set to true if all our data was generated using it
+					$this->strong = true;
+				}
+			} else {
+				$this->logger->debug( "/dev/urandom could not be opened.\n" );
+			}
+		}
+
+		// If we cannot use or generate enough data from a secure source
+		// use this loop to generate a good set of pseudo random data.
+		// This works by initializing a random state using a pile of unstable data
+		// and continually shoving it through a hash along with a variable salt.
+		// We hash the random state with more salt to avoid the state from leaking
+		// out and being used to predict the /randomness/ that follows.
+		if ( strlen( $buffer ) < $bytes ) {
+			$this->logger->debug( __METHOD__ .
+				": Falling back to using a pseudo random state to generate randomness.\n" );
+		}
+		while ( strlen( $buffer ) < $bytes ) {
+			$buffer .= MWCryptHash::hmac( $this->randomState(), strval( mt_rand() ) );
+			// This code is never really cryptographically strong, if we use it
+			// at all, then set strong to false.
+			$this->strong = false;
+		}
+
+		// Once the buffer has been filled up with enough random data to fulfill
+		// the request shift off enough data to handle the request and leave the
+		// unused portion left inside the buffer for the next request for random data
+		$generated = substr( $buffer, 0, $bytes );
+		$buffer = substr( $buffer, $bytes );
+
+		$this->logger->debug( strlen( $buffer ) .
+			" bytes of randomness leftover in the buffer.\n" );
+
+		return $generated;
+	}
+
+	/**
+	 * Generate a run of (ideally) cryptographically random data and return
+	 * it in hexadecimal string format.
+	 * You can use CryptRand::wasStrong() if you wish to know if the source used
+	 * was cryptographically strong.
+	 *
+	 * @param int $chars The number of hex chars of random data to generate
+	 * @param bool $forceStrong Pass true if you want generate to prefer cryptographically
+	 *                          strong sources of entropy even if reading from them may steal
+	 *                          more entropy from the system than optimal.
+	 * @return string Hexadecimal random data
+	 */
+	public function generateHex( $chars, $forceStrong = false ) {
+		// hex strings are 2x the length of raw binary so we divide the length in half
+		// odd numbers will result in a .5 that leads the generate() being 1 character
+		// short, so we use ceil() to ensure that we always have enough bytes
+		$bytes = ceil( $chars / 2 );
+		// Generate the data and then convert it to a hex string
+		$hex = bin2hex( $this->generate( $bytes, $forceStrong ) );
+
+		// A bit of paranoia here, the caller asked for a specific length of string
+		// here, and it's possible (eg when given an odd number) that we may actually
+		// have at least 1 char more than they asked for. Just in case they made this
+		// call intending to insert it into a database that does truncation we don't
+		// want to give them too much and end up with their database and their live
+		// code having two different values because part of what we gave them is truncated
+		// hence, we strip out any run of characters longer than what we were asked for.
+		return substr( $hex, 0, $chars );
+	}
+}
diff --git a/includes/libs/MWCryptHash.php b/includes/libs/MWCryptHash.php
new file mode 100644
index 0000000000..f9b71729af
--- /dev/null
+++ b/includes/libs/MWCryptHash.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * Utility functions for generating hashes
+ *
+ * This is based in part on Drupal code as well as what we used in our own code
+ * prior to introduction of this class, by way of MWCryptRand.
+ *
+ * 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 MWCryptHash {
+	/**
+	 * The hash algorithm being used
+	 */
+	protected static $algo = null;
+
+	/**
+	 * The number of bytes outputted by the hash algorithm
+	 */
+	protected static $hashLength = [
+		true => null,
+		false => null,
+	];
+
+	/**
+	 * Decide on the best acceptable hash algorithm we have available for hash()
+	 * @return string A hash algorithm
+	 */
+	public static function hashAlgo() {
+		if ( !is_null( self::$algo ) ) {
+			return self::$algo;
+		}
+
+		$algos = hash_algos();
+		$preference = [ 'whirlpool', 'sha256', 'sha1', 'md5' ];
+
+		foreach ( $preference as $algorithm ) {
+			if ( in_array( $algorithm, $algos ) ) {
+				self::$algo = $algorithm;
+
+				return self::$algo;
+			}
+		}
+
+		// We only reach here if no acceptable hash is found in the list, this should
+		// be a technical impossibility since most of php's hash list is fixed and
+		// some of the ones we list are available as their own native functions
+		// But since we already require at least 5.2 and hash() was default in
+		// 5.1.2 we don't bother falling back to methods like sha1 and md5.
+		throw new DomainException( "Could not find an acceptable hashing function in hash_algos()" );
+	}
+
+	/**
+	 * Return the byte-length output of the hash algorithm we are
+	 * using in self::hash and self::hmac.
+	 *
+	 * @param bool $raw True to return the length for binary data, false to
+	 *   return for hex-encoded
+	 * @return int Number of bytes the hash outputs
+	 */
+	public static function hashLength( $raw = true ) {
+		$raw = (bool)$raw;
+		if ( is_null( self::$hashLength[$raw] ) ) {
+			self::$hashLength[$raw] = strlen( self::hash( '', $raw ) );
+		}
+
+		return self::$hashLength[$raw];
+	}
+
+	/**
+	 * Generate an acceptably unstable one-way-hash of some text
+	 * making use of the best hash algorithm that we have available.
+	 *
+	 * @param string $data
+	 * @param bool $raw True to return binary data, false to return it hex-encoded
+	 * @return string A hash of the data
+	 */
+	public static function hash( $data, $raw = true ) {
+		return hash( self::hashAlgo(), $data, $raw );
+	}
+
+	/**
+	 * Generate an acceptably unstable one-way-hmac of some text
+	 * making use of the best hash algorithm that we have available.
+	 *
+	 * @param string $data
+	 * @param string $key
+	 * @param bool $raw True to return binary data, false to return it hex-encoded
+	 * @return string An hmac hash of the data + key
+	 */
+	public static function hmac( $data, $key, $raw = true ) {
+		if ( !is_string( $key ) ) {
+			// a fatal error in HHVM; an exception will at least give us a stack trace
+			throw new InvalidArgumentException( 'Invalid key type: ' . gettype( $key ) );
+		}
+		return hash_hmac( self::hashAlgo(), $data, $key, $raw );
+	}
+
+}
diff --git a/includes/libs/MemoizedCallable.php b/includes/libs/MemoizedCallable.php
index 50e9732b80..12a5cadb99 100644
--- a/includes/libs/MemoizedCallable.php
+++ b/includes/libs/MemoizedCallable.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * APC-backed function memoization
+ * APC-backed and APCu-backed function memoization
  *
  * This class provides memoization for pure functions. A function is pure
  * if its result value depends on nothing other than its input parameters
@@ -8,7 +8,7 @@
  *
  * The first invocation of the memoized callable with a particular set of
  * arguments will be delegated to the underlying callable. Repeat invocations
- * with the same input parameters will be served from APC.
+ * with the same input parameters will be served from APC or APCu.
  *
  * @par Example:
  * @code
@@ -70,7 +70,7 @@ class MemoizedCallable {
 	}
 
 	/**
-	 * Fetch the result of a previous invocation from APC.
+	 * Fetch the result of a previous invocation from APC or APCu.
 	 *
 	 * @param string $key
 	 * @param bool &$success
@@ -79,12 +79,14 @@ class MemoizedCallable {
 		$success = false;
 		if ( function_exists( 'apc_fetch' ) ) {
 			return apc_fetch( $key, $success );
+		} elseif ( function_exists( 'apcu_fetch' ) ) {
+			return apcu_fetch( $key, $success );
 		}
 		return false;
 	}
 
 	/**
-	 * Store the result of an invocation in APC.
+	 * Store the result of an invocation in APC or APCu.
 	 *
 	 * @param string $key
 	 * @param mixed $result
@@ -92,6 +94,8 @@ class MemoizedCallable {
 	protected function storeResult( $key, $result ) {
 		if ( function_exists( 'apc_store' ) ) {
 			apc_store( $key, $result, $this->ttl );
+		} elseif ( function_exists( 'apcu_store' ) ) {
+			apcu_store( $key, $result, $this->ttl );
 		}
 	}
 
diff --git a/includes/libs/MultiHttpClient.php b/includes/libs/MultiHttpClient.php
index fdcbf4904b..a870204963 100644
--- a/includes/libs/MultiHttpClient.php
+++ b/includes/libs/MultiHttpClient.php
@@ -184,14 +184,12 @@ class MultiHttpClient {
 		unset( $req ); // don't assign over this by accident
 
 		$indexes = array_keys( $reqs );
-		if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
-			if ( isset( $opts['usePipelining'] ) ) {
-				curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$opts['usePipelining'] );
-			}
-			if ( isset( $opts['maxConnsPerHost'] ) ) {
-				// Keep these sockets around as they may be needed later in the request
-				curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$opts['maxConnsPerHost'] );
-			}
+		if ( isset( $opts['usePipelining'] ) ) {
+			curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$opts['usePipelining'] );
+		}
+		if ( isset( $opts['maxConnsPerHost'] ) ) {
+			// Keep these sockets around as they may be needed later in the request
+			curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$opts['maxConnsPerHost'] );
 		}
 
 		// @TODO: use a per-host rolling handle window (e.g. CURLMOPT_MAX_HOST_CONNECTIONS)
@@ -258,10 +256,8 @@ class MultiHttpClient {
 		unset( $req ); // don't assign over this by accident
 
 		// Restore the default settings
-		if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
-			curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$this->usePipelining );
-			curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
-		}
+		curl_multi_setopt( $chm, CURLMOPT_PIPELINING, (int)$this->usePipelining );
+		curl_multi_setopt( $chm, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
 
 		return $reqs;
 	}
@@ -292,12 +288,7 @@ class MultiHttpClient {
 		curl_setopt( $ch, CURLOPT_RETURNTRANSFER, 1 );
 
 		$url = $req['url'];
-		// PHP_QUERY_RFC3986 is PHP 5.4+ only
-		$query = str_replace(
-			[ '+', '%7E' ],
-			[ '%20', '~' ],
-			http_build_query( $req['query'], '', '&' )
-		);
+		$query = http_build_query( $req['query'], '', '&', PHP_QUERY_RFC3986 );
 		if ( $query != '' ) {
 			$url .= strpos( $req['url'], '?' ) === false ? "?$query" : "&$query";
 		}
@@ -422,10 +413,8 @@ class MultiHttpClient {
 	protected function getCurlMulti() {
 		if ( !$this->multiHandle ) {
 			$cmh = curl_multi_init();
-			if ( function_exists( 'curl_multi_setopt' ) ) { // PHP 5.5
-				curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, (int)$this->usePipelining );
-				curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
-			}
+			curl_multi_setopt( $cmh, CURLMOPT_PIPELINING, (int)$this->usePipelining );
+			curl_multi_setopt( $cmh, CURLMOPT_MAXCONNECTS, (int)$this->maxConnsPerHost );
 			$this->multiHandle = $cmh;
 		}
 		return $this->multiHandle;
diff --git a/includes/libs/ScopedCallback.php b/includes/libs/ScopedCallback.php
deleted file mode 100644
index 2fd60ea312..0000000000
--- a/includes/libs/ScopedCallback.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-/**
- * This file deals with RAII style scoped callbacks.
- *
- * 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 for asserting that a callback happens when a dummy object leaves scope
- *
- * @since 1.21
- */
-class ScopedCallback {
-	/** @var callable */
-	protected $callback;
-	/** @var array */
-	protected $params;
-
-	/**
-	 * @param callable|null $callback
-	 * @param array $params Callback arguments (since 1.25)
-	 * @throws Exception
-	 */
-	public function __construct( $callback, array $params = [] ) {
-		if ( $callback !== null && !is_callable( $callback ) ) {
-			throw new InvalidArgumentException( "Provided callback is not valid." );
-		}
-		$this->callback = $callback;
-		$this->params = $params;
-	}
-
-	/**
-	 * Trigger a scoped callback and destroy it.
-	 * This is the same is just setting it to null.
-	 *
-	 * @param ScopedCallback $sc
-	 */
-	public static function consume( ScopedCallback &$sc = null ) {
-		$sc = null;
-	}
-
-	/**
-	 * Destroy a scoped callback without triggering it
-	 *
-	 * @param ScopedCallback $sc
-	 */
-	public static function cancel( ScopedCallback &$sc = null ) {
-		if ( $sc ) {
-			$sc->callback = null;
-		}
-		$sc = null;
-	}
-
-	/**
-	 * Trigger the callback when this leaves scope
-	 */
-	function __destruct() {
-		if ( $this->callback !== null ) {
-			call_user_func_array( $this->callback, $this->params );
-		}
-	}
-}
diff --git a/includes/libs/WaitConditionLoop.php b/includes/libs/WaitConditionLoop.php
deleted file mode 100644
index 969e86e89c..0000000000
--- a/includes/libs/WaitConditionLoop.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * Wait loop that reaches a condition or times out.
- *
- * 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
- * @author Aaron Schulz
- */
-
-/**
- * Wait loop that reaches a condition or times out
- * @since 1.28
- */
-class WaitConditionLoop {
-	/** @var callable */
-	private $condition;
-	/** @var callable[] */
-	private $busyCallbacks = [];
-	/** @var float Seconds */
-	private $timeout;
-	/** @var float Seconds */
-	private $lastWaitTime;
-	/** @var integer|null */
-	private $rusageMode;
-
-	const CONDITION_REACHED = 1;
-	const CONDITION_CONTINUE = 0; // evaluates as falsey
-	const CONDITION_FAILED = -1;
-	const CONDITION_TIMED_OUT = -2;
-	const CONDITION_ABORTED = -3;
-
-	/**
-	 * @param callable $condition Callback that returns a WaitConditionLoop::CONDITION_ constant
-	 * @param float $timeout Timeout in seconds
-	 * @param array &$busyCallbacks List of callbacks to do useful work (by reference)
-	 */
-	public function __construct( callable $condition, $timeout = 5.0, &$busyCallbacks = [] ) {
-		$this->condition = $condition;
-		$this->timeout = $timeout;
-		$this->busyCallbacks =& $busyCallbacks;
-
-		if ( defined( 'HHVM_VERSION' ) && PHP_OS === 'Linux' ) {
-			$this->rusageMode = 2; // RUSAGE_THREAD
-		} elseif ( function_exists( 'getrusage' ) ) {
-			$this->rusageMode = 0; // RUSAGE_SELF
-		}
-	}
-
-	/**
-	 * Invoke the loop and continue until either:
-	 *   - a) The condition callback returns neither CONDITION_CONTINUE nor false
-	 *   - b) The timeout is reached
-	 * This a condition callback can return true (stop) or false (continue) for convenience.
-	 * In such cases, the halting result of "true" will be converted to CONDITION_REACHED.
-	 *
-	 * If $timeout is 0, then only the condition callback will be called (no busy callbacks),
-	 * and this will immediately return CONDITION_FAILED if the condition was not met.
-	 *
-	 * Exceptions in callbacks will be caught and the callback will be swapped with
-	 * one that simply rethrows that exception back to the caller when invoked.
-	 *
-	 * @return integer WaitConditionLoop::CONDITION_* constant
-	 * @throws Exception Any error from the condition callback
-	 */
-	public function invoke() {
-		$elapsed = 0.0; // seconds
-		$sleepUs = 0; // microseconds to sleep each time
-		$lastCheck = false;
-		$finalResult = self::CONDITION_TIMED_OUT;
-		do {
-			$checkStartTime = $this->getWallTime();
-			// Check if the condition is met yet
-			$realStart = $this->getWallTime();
-			$cpuStart = $this->getCpuTime();
-			$checkResult = call_user_func( $this->condition );
-			$cpu = $this->getCpuTime() - $cpuStart;
-			$real = $this->getWallTime() - $realStart;
-			// Exit if the condition is reached, and error occurs, or this is non-blocking
-			if ( $this->timeout <= 0 ) {
-				$finalResult = $checkResult ? self::CONDITION_REACHED : self::CONDITION_FAILED;
-				break;
-			} elseif ( (int)$checkResult !== self::CONDITION_CONTINUE ) {
-				if ( is_int( $checkResult ) ) {
-					$finalResult = $checkResult;
-				} else {
-					$finalResult = self::CONDITION_REACHED;
-				}
-				break;
-			} elseif ( $lastCheck ) {
-				break; // timeout reached
-			}
-			// Detect if condition callback seems to block or if justs burns CPU
-			$conditionUsesInterrupts = ( $real > 0.100 && $cpu <= $real * .03 );
-			if ( !$this->popAndRunBusyCallback() && !$conditionUsesInterrupts ) {
-				// 10 queries = 10(10+100)/2 ms = 550ms, 14 queries = 1050ms
-				$sleepUs = min( $sleepUs + 10 * 1e3, 1e6 ); // stop incrementing at ~1s
-				$this->usleep( $sleepUs );
-			}
-			$checkEndTime = $this->getWallTime();
-			// The max() protects against the clock getting set back
-			$elapsed += max( $checkEndTime - $checkStartTime, 0.010 );
-			// Do not let slow callbacks timeout without checking the condition one more time
-			$lastCheck = ( $elapsed >= $this->timeout );
-		} while ( true );
-
-		$this->lastWaitTime = $elapsed;
-
-		return $finalResult;
-	}
-
-	/**
-	 * @return float Seconds
-	 */
-	public function getLastWaitTime() {
-		return $this->lastWaitTime;
-	}
-
-	/**
-	 * @param integer $microseconds
-	 */
-	protected function usleep( $microseconds ) {
-		usleep( $microseconds );
-	}
-
-	/**
-	 * @return float
-	 */
-	protected function getWallTime() {
-		return microtime( true );
-	}
-
-	/**
-	 * @return float Returns 0.0 if not supported (Windows on PHP < 7)
-	 */
-	protected function getCpuTime() {
-		if ( $this->rusageMode === null ) {
-			return microtime( true ); // assume worst case (all time is CPU)
-		}
-
-		$ru = getrusage( $this->rusageMode );
-		$time = $ru['ru_utime.tv_sec'] + $ru['ru_utime.tv_usec'] / 1e6;
-		$time += $ru['ru_stime.tv_sec'] + $ru['ru_stime.tv_usec'] / 1e6;
-
-		return $time;
-	}
-
-	/**
-	 * Run one of the callbacks that does work ahead of time for another caller
-	 *
-	 * @return bool Whether a callback was executed
-	 */
-	private function popAndRunBusyCallback() {
-		if ( $this->busyCallbacks ) {
-			reset( $this->busyCallbacks );
-			$key = key( $this->busyCallbacks );
-			/** @var callable $workCallback */
-			$workCallback =& $this->busyCallbacks[$key];
-			try {
-				$workCallback();
-			} catch ( Exception $e ) {
-				$workCallback = function () use ( $e ) {
-					throw $e;
-				};
-			}
-			unset( $this->busyCallbacks[$key] ); // consume
-
-			return true;
-		}
-
-		return false;
-	}
-}
diff --git a/includes/libs/filebackend/FileBackend.php b/includes/libs/filebackend/FileBackend.php
index 0ef9f63a60..f33f52265b 100644
--- a/includes/libs/filebackend/FileBackend.php
+++ b/includes/libs/filebackend/FileBackend.php
@@ -185,15 +185,15 @@ abstract class FileBackend implements LoggerAwareInterface {
 		$this->concurrency = isset( $config['concurrency'] )
 			? (int)$config['concurrency']
 			: 50;
-		$this->obResetFunc = isset( $params['obResetFunc'] )
-			? $params['obResetFunc']
+		$this->obResetFunc = isset( $config['obResetFunc'] )
+			? $config['obResetFunc']
 			: [ $this, 'resetOutputBuffer' ];
-		$this->streamMimeFunc = isset( $params['streamMimeFunc'] )
-			? $params['streamMimeFunc']
+		$this->streamMimeFunc = isset( $config['streamMimeFunc'] )
+			? $config['streamMimeFunc']
 			: null;
 		$this->statusWrapper = isset( $config['statusWrapper'] ) ? $config['statusWrapper'] : null;
 
-		$this->profiler = isset( $params['profiler'] ) ? $params['profiler'] : null;
+		$this->profiler = isset( $config['profiler'] ) ? $config['profiler'] : null;
 		$this->logger = isset( $config['logger'] ) ? $config['logger'] : new \Psr\Log\NullLogger();
 		$this->statusWrapper = isset( $config['statusWrapper'] ) ? $config['statusWrapper'] : null;
 		$this->tmpDirectory = isset( $config['tmpDirectory'] ) ? $config['tmpDirectory'] : null;
@@ -1620,7 +1620,7 @@ abstract class FileBackend implements LoggerAwareInterface {
 	protected function scopedProfileSection( $section ) {
 		if ( $this->profiler ) {
 			call_user_func( [ $this->profiler, 'profileIn' ], $section );
-			return new ScopedCallback( [ $this->profiler, 'profileOut' ] );
+			return new ScopedCallback( [ $this->profiler, 'profileOut' ], [ $section ] );
 		}
 
 		return null;
diff --git a/includes/libs/filebackend/FileBackendMultiWrite.php b/includes/libs/filebackend/FileBackendMultiWrite.php
index 7c32d02e86..212e84f026 100644
--- a/includes/libs/filebackend/FileBackendMultiWrite.php
+++ b/includes/libs/filebackend/FileBackendMultiWrite.php
@@ -575,11 +575,14 @@ class FileBackendMultiWrite extends FileBackend {
 	}
 
 	public function concatenate( array $params ) {
+		$status = $this->newStatus();
 		// We are writing to an FS file, so we don't need to do this per-backend
 		$index = $this->getReadIndexFromParams( $params );
 		$realParams = $this->substOpPaths( $params, $this->backends[$index] );
 
-		return $this->backends[$index]->concatenate( $realParams );
+		$status->merge( $this->backends[$index]->concatenate( $realParams ) );
+
+		return $status;
 	}
 
 	public function fileExists( array $params ) {
diff --git a/includes/libs/lockmanager/DBLockManager.php b/includes/libs/lockmanager/DBLockManager.php
index 64a2916721..b17b1a0b0d 100644
--- a/includes/libs/lockmanager/DBLockManager.php
+++ b/includes/libs/lockmanager/DBLockManager.php
@@ -58,7 +58,7 @@ abstract class DBLockManager extends QuorumLockManager {
 	 *                     - user        : DB user
 	 *                     - password    : DB user password
 	 *                     - tablePrefix : DB table prefix
-	 *                     - flags       : DB flags (see DatabaseBase)
+	 *                     - flags       : DB flags; bitfield of IDatabase::DBO_* constants
 	 *   - dbsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
 	 *                   each having an odd-numbered list of DB names (peers) as values.
 	 *   - lockExpiry  : Lock timeout (seconds) for dropped connections. [optional]
diff --git a/includes/libs/lockmanager/LockManager.php b/includes/libs/lockmanager/LockManager.php
index 42391a0986..bee34dcf30 100644
--- a/includes/libs/lockmanager/LockManager.php
+++ b/includes/libs/lockmanager/LockManager.php
@@ -4,6 +4,7 @@
  * @ingroup FileBackend
  */
 use Psr\Log\LoggerInterface;
+use Wikimedia\WaitConditionLoop;
 
 /**
  * Resource locking handling.
@@ -68,6 +69,9 @@ abstract class LockManager {
 	const LOCK_UW = 2; // shared lock (for reads used to write elsewhere)
 	const LOCK_EX = 3; // exclusive lock (for writes)
 
+	/** @var int Max expected lock expiry in any context */
+	const MAX_LOCK_TTL = 7200; // 2 hours
+
 	/**
 	 * Construct a new instance from configuration
 	 *
@@ -87,6 +91,11 @@ abstract class LockManager {
 			$this->lockTTL = max( 5 * 60, 2 * (int)$met );
 		}
 
+		// Upper bound on how long to keep lock structures around. This is useful when setting
+		// TTLs, as the "lockTTL" value may vary based on CLI mode and app server group. This is
+		// a "safe" value that can be used to avoid clobbering other locks that use high TTLs.
+		$this->lockTTL = min( $this->lockTTL, self::MAX_LOCK_TTL );
+
 		$random = [];
 		for ( $i = 1; $i <= 5; ++$i ) {
 			$random[] = mt_rand( 0, 0xFFFFFFF );
diff --git a/includes/libs/lockmanager/MemcLockManager.php b/includes/libs/lockmanager/MemcLockManager.php
new file mode 100644
index 0000000000..aecdf60cda
--- /dev/null
+++ b/includes/libs/lockmanager/MemcLockManager.php
@@ -0,0 +1,356 @@
+<?php
+/**
+ * Version of LockManager based on using memcached servers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup LockManager
+ */
+use Wikimedia\WaitConditionLoop;
+
+/**
+ * Manage locks using memcached servers.
+ *
+ * Version of LockManager based on using memcached servers.
+ * This is meant for multi-wiki systems that may share files.
+ * All locks are non-blocking, which avoids deadlocks.
+ *
+ * All lock requests for a resource, identified by a hash string, will map to one
+ * bucket. Each bucket maps to one or several peer servers, each running memcached.
+ * A majority of peers must agree for a lock to be acquired.
+ *
+ * @ingroup LockManager
+ * @since 1.20
+ */
+class MemcLockManager extends QuorumLockManager {
+	/** @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
+	];
+
+	/** @var MemcachedBagOStuff[] Map of (server name => MemcachedBagOStuff) */
+	protected $cacheServers = [];
+	/** @var HashBagOStuff Server status cache */
+	protected $statusCache;
+
+	/**
+	 * Construct a new instance from configuration.
+	 *
+	 * @param array $config Parameters include:
+	 *   - lockServers  : Associative array of server names to "<IP>:<port>" strings.
+	 *   - srvsByBucket : Array of 1-16 consecutive integer keys, starting from 0,
+	 *                    each having an odd-numbered list of server names (peers) as values.
+	 *   - memcConfig   : Configuration array for MemcachedBagOStuff::construct() with an
+	 *                    additional 'class' parameter specifying which MemcachedBagOStuff
+	 *                    subclass to use. The server names will be injected. [optional]
+	 * @throws Exception
+	 */
+	public function __construct( array $config ) {
+		parent::__construct( $config );
+
+		// Sanitize srvsByBucket config to prevent PHP errors
+		$this->srvsByBucket = array_filter( $config['srvsByBucket'], 'is_array' );
+		$this->srvsByBucket = array_values( $this->srvsByBucket ); // consecutive
+
+		$memcConfig = isset( $config['memcConfig'] ) ? $config['memcConfig'] : [];
+		$memcConfig += [ 'class' => 'MemcachedPhpBagOStuff' ]; // default
+
+		$class = $memcConfig['class'];
+		if ( !is_subclass_of( $class, 'MemcachedBagOStuff' ) ) {
+			throw new InvalidArgumentException( "$class is not of type MemcachedBagOStuff." );
+		}
+
+		foreach ( $config['lockServers'] as $name => $address ) {
+			$params = [ 'servers' => [ $address ] ] + $memcConfig;
+			$this->cacheServers[$name] = new $class( $params );
+		}
+
+		$this->statusCache = new HashBagOStuff();
+	}
+
+	protected function getLocksOnServer( $lockSrv, array $pathsByType ) {
+		$status = StatusValue::newGood();
+
+		$memc = $this->getCache( $lockSrv );
+		// List of affected paths
+		$paths = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+		$paths = array_unique( $paths );
+		// List of affected lock record keys
+		$keys = array_map( [ $this, 'recordKeyForPath' ], $paths );
+
+		// Lock all of the active lock record keys...
+		if ( !$this->acquireMutexes( $memc, $keys ) ) {
+			foreach ( $paths as $path ) {
+				$status->fatal( 'lockmanager-fail-acquirelock', $path );
+			}
+
+			return $status;
+		}
+
+		// Fetch all the existing lock records...
+		$lockRecords = $memc->getMulti( $keys );
+
+		$now = time();
+		// Check if the requested locks conflict with existing ones...
+		foreach ( $pathsByType as $type => $paths ) {
+			foreach ( $paths as $path ) {
+				$locksKey = $this->recordKeyForPath( $path );
+				$locksHeld = isset( $lockRecords[$locksKey] )
+					? self::sanitizeLockArray( $lockRecords[$locksKey] )
+					: self::newLockArray(); // init
+				foreach ( $locksHeld[self::LOCK_EX] as $session => $expiry ) {
+					if ( $expiry < $now ) { // stale?
+						unset( $locksHeld[self::LOCK_EX][$session] );
+					} elseif ( $session !== $this->session ) {
+						$status->fatal( 'lockmanager-fail-acquirelock', $path );
+					}
+				}
+				if ( $type === self::LOCK_EX ) {
+					foreach ( $locksHeld[self::LOCK_SH] as $session => $expiry ) {
+						if ( $expiry < $now ) { // stale?
+							unset( $locksHeld[self::LOCK_SH][$session] );
+						} elseif ( $session !== $this->session ) {
+							$status->fatal( 'lockmanager-fail-acquirelock', $path );
+						}
+					}
+				}
+				if ( $status->isOK() ) {
+					// Register the session in the lock record array
+					$locksHeld[$type][$this->session] = $now + $this->lockTTL;
+					// We will update this record if none of the other locks conflict
+					$lockRecords[$locksKey] = $locksHeld;
+				}
+			}
+		}
+
+		// If there were no lock conflicts, update all the lock records...
+		if ( $status->isOK() ) {
+			foreach ( $paths as $path ) {
+				$locksKey = $this->recordKeyForPath( $path );
+				$locksHeld = $lockRecords[$locksKey];
+				$ok = $memc->set( $locksKey, $locksHeld, self::MAX_LOCK_TTL );
+				if ( !$ok ) {
+					$status->fatal( 'lockmanager-fail-acquirelock', $path );
+				} else {
+					$this->logger->debug( __METHOD__ . ": acquired lock on key $locksKey.\n" );
+				}
+			}
+		}
+
+		// Unlock all of the active lock record keys...
+		$this->releaseMutexes( $memc, $keys );
+
+		return $status;
+	}
+
+	protected function freeLocksOnServer( $lockSrv, array $pathsByType ) {
+		$status = StatusValue::newGood();
+
+		$memc = $this->getCache( $lockSrv );
+		// List of affected paths
+		$paths = call_user_func_array( 'array_merge', array_values( $pathsByType ) );
+		$paths = array_unique( $paths );
+		// List of affected lock record keys
+		$keys = array_map( [ $this, 'recordKeyForPath' ], $paths );
+
+		// Lock all of the active lock record keys...
+		if ( !$this->acquireMutexes( $memc, $keys ) ) {
+			foreach ( $paths as $path ) {
+				$status->fatal( 'lockmanager-fail-releaselock', $path );
+			}
+
+			return $status;
+		}
+
+		// Fetch all the existing lock records...
+		$lockRecords = $memc->getMulti( $keys );
+
+		// Remove the requested locks from all records...
+		foreach ( $pathsByType as $type => $paths ) {
+			foreach ( $paths as $path ) {
+				$locksKey = $this->recordKeyForPath( $path ); // lock record
+				if ( !isset( $lockRecords[$locksKey] ) ) {
+					$status->warning( 'lockmanager-fail-releaselock', $path );
+					continue; // nothing to do
+				}
+				$locksHeld = $this->sanitizeLockArray( $lockRecords[$locksKey] );
+				if ( isset( $locksHeld[$type][$this->session] ) ) {
+					unset( $locksHeld[$type][$this->session] ); // unregister this session
+					$lockRecords[$locksKey] = $locksHeld;
+				} else {
+					$status->warning( 'lockmanager-fail-releaselock', $path );
+				}
+			}
+		}
+
+		// Persist the new lock record values...
+		foreach ( $paths as $path ) {
+			$locksKey = $this->recordKeyForPath( $path );
+			if ( !isset( $lockRecords[$locksKey] ) ) {
+				continue; // nothing to do
+			}
+			$locksHeld = $lockRecords[$locksKey];
+			if ( $locksHeld === $this->newLockArray() ) {
+				$ok = $memc->delete( $locksKey );
+			} else {
+				$ok = $memc->set( $locksKey, $locksHeld, self::MAX_LOCK_TTL );
+			}
+			if ( $ok ) {
+				$this->logger->debug( __METHOD__ . ": released lock on key $locksKey.\n" );
+			} else {
+				$status->fatal( 'lockmanager-fail-releaselock', $path );
+			}
+		}
+
+		// Unlock all of the active lock record keys...
+		$this->releaseMutexes( $memc, $keys );
+
+		return $status;
+	}
+
+	/**
+	 * @see QuorumLockManager::releaseAllLocks()
+	 * @return StatusValue
+	 */
+	protected function releaseAllLocks() {
+		return StatusValue::newGood(); // not supported
+	}
+
+	/**
+	 * @see QuorumLockManager::isServerUp()
+	 * @param string $lockSrv
+	 * @return bool
+	 */
+	protected function isServerUp( $lockSrv ) {
+		return (bool)$this->getCache( $lockSrv );
+	}
+
+	/**
+	 * Get the MemcachedBagOStuff object for a $lockSrv
+	 *
+	 * @param string $lockSrv Server name
+	 * @return MemcachedBagOStuff|null
+	 */
+	protected function getCache( $lockSrv ) {
+		if ( !isset( $this->cacheServers[$lockSrv] ) ) {
+			throw new InvalidArgumentException( "Invalid cache server '$lockSrv'." );
+		}
+
+		$online = $this->statusCache->get( "online:$lockSrv" );
+		if ( $online === false ) {
+			$online = $this->cacheServers[$lockSrv]->set( __CLASS__ . ':ping', 1, 1 );
+			if ( !$online ) { // server down?
+				$this->logger->warning( __METHOD__ . ": Could not contact $lockSrv." );
+			}
+			$this->statusCache->set( "online:$lockSrv", (int)$online, 30 );
+		}
+
+		return $online ? $this->cacheServers[$lockSrv] : null;
+	}
+
+	/**
+	 * @param string $path
+	 * @return string
+	 */
+	protected function recordKeyForPath( $path ) {
+		return implode( ':', [ __CLASS__, 'locks', $this->sha1Base36Absolute( $path ) ] );
+	}
+
+	/**
+	 * @return array An empty lock structure for a key
+	 */
+	protected function newLockArray() {
+		return [ self::LOCK_SH => [], self::LOCK_EX => [] ];
+	}
+
+	/**
+	 * @param array $a
+	 * @return array An empty lock structure for a key
+	 */
+	protected function sanitizeLockArray( $a ) {
+		if ( is_array( $a ) && isset( $a[self::LOCK_EX] ) && isset( $a[self::LOCK_SH] ) ) {
+			return $a;
+		}
+
+		$this->logger->error( __METHOD__ . ": reset invalid lock array." );
+
+		return $this->newLockArray();
+	}
+
+	/**
+	 * @param MemcachedBagOStuff $memc
+	 * @param array $keys List of keys to acquire
+	 * @return bool
+	 */
+	protected function acquireMutexes( MemcachedBagOStuff $memc, array $keys ) {
+		$lockedKeys = [];
+
+		// Acquire the keys in lexicographical order, to avoid deadlock problems.
+		// If P1 is waiting to acquire a key P2 has, P2 can't also be waiting for a key P1 has.
+		sort( $keys );
+
+		// Try to quickly loop to acquire the keys, but back off after a few rounds.
+		// This reduces memcached spam, especially in the rare case where a server acquires
+		// some lock keys and dies without releasing them. Lock keys expire after a few minutes.
+		$loop = new WaitConditionLoop(
+			function () use ( $memc, $keys, &$lockedKeys ) {
+				foreach ( array_diff( $keys, $lockedKeys ) as $key ) {
+					if ( $memc->add( "$key:mutex", 1, 180 ) ) { // lock record
+						$lockedKeys[] = $key;
+					}
+				}
+
+				return array_diff( $keys, $lockedKeys )
+					? WaitConditionLoop::CONDITION_CONTINUE
+					: true;
+			},
+			3.0 // timeout
+		);
+		$loop->invoke();
+
+		if ( count( $lockedKeys ) != count( $keys ) ) {
+			$this->releaseMutexes( $memc, $lockedKeys ); // failed; release what was locked
+			return false;
+		}
+
+		return true;
+	}
+
+	/**
+	 * @param MemcachedBagOStuff $memc
+	 * @param array $keys List of acquired keys
+	 */
+	protected function releaseMutexes( MemcachedBagOStuff $memc, array $keys ) {
+		foreach ( $keys as $key ) {
+			$memc->delete( "$key:mutex" );
+		}
+	}
+
+	/**
+	 * Make sure remaining locks get cleared for sanity
+	 */
+	function __destruct() {
+		while ( count( $this->locksHeld ) ) {
+			foreach ( $this->locksHeld as $path => $locks ) {
+				$this->doUnlock( [ $path ], self::LOCK_EX );
+				$this->doUnlock( [ $path ], self::LOCK_SH );
+			}
+		}
+	}
+}
diff --git a/includes/libs/lockmanager/QuorumLockManager.php b/includes/libs/lockmanager/QuorumLockManager.php
index 8b5e7fd076..a89d864ac2 100644
--- a/includes/libs/lockmanager/QuorumLockManager.php
+++ b/includes/libs/lockmanager/QuorumLockManager.php
@@ -33,7 +33,7 @@ abstract class QuorumLockManager extends LockManager {
 	protected $srvsByBucket = []; // (bucket index => (lsrv1, lsrv2, ...))
 
 	/** @var array Map of degraded buckets */
-	protected $degradedBuckets = []; // (buckey index => UNIX timestamp)
+	protected $degradedBuckets = []; // (bucket index => UNIX timestamp)
 
 	final protected function doLock( array $paths, $type ) {
 		return $this->doLockByType( [ $type => $paths ] );
diff --git a/includes/libs/lockmanager/RedisLockManager.php b/includes/libs/lockmanager/RedisLockManager.php
index 6001705ff8..ea9dde7f2a 100644
--- a/includes/libs/lockmanager/RedisLockManager.php
+++ b/includes/libs/lockmanager/RedisLockManager.php
@@ -102,7 +102,7 @@ class RedisLockManager extends QuorumLockManager {
 <<<LUA
 			local failed = {}
 			-- Load input params (e.g. session, ttl, time of request)
-			local rSession, rTTL, rTime = unpack(ARGV)
+			local rSession, rTTL, rMaxTTL, rTime = unpack(ARGV)
 			-- Check that all the locks can be acquired
 			for i,requestKey in ipairs(KEYS) do
 				local _, _, rType, resourceKey = string.find(requestKey,"(%w+):(%w+)$")
@@ -133,7 +133,7 @@ class RedisLockManager extends QuorumLockManager {
 					local _, _, rType, resourceKey = string.find(requestKey,"(%w+):(%w+)$")
 					redis.call('hSet',resourceKey,rType .. ':' .. rSession,rTime + rTTL)
 					-- In addition to invalidation logic, be sure to garbage collect
-					redis.call('expire',resourceKey,rTTL)
+					redis.call('expire',resourceKey,rMaxTTL)
 				end
 			end
 			return failed
@@ -144,7 +144,8 @@ LUA;
 					[
 						$this->session, // ARGV[1]
 						$this->lockTTL, // ARGV[2]
-						time() // ARGV[3]
+						self::MAX_LOCK_TTL, // ARGV[3]
+						time() // ARGV[4]
 					]
 				),
 				count( $pathsByKey ) # number of first argument(s) that are keys
diff --git a/includes/libs/objectcache/APCBagOStuff.php b/includes/libs/objectcache/APCBagOStuff.php
index 8f70fc7a77..9bfcee798a 100644
--- a/includes/libs/objectcache/APCBagOStuff.php
+++ b/includes/libs/objectcache/APCBagOStuff.php
@@ -75,25 +75,35 @@ class APCBagOStuff extends BagOStuff {
 	}
 
 	protected function doGet( $key, $flags = 0 ) {
-		$val = apc_fetch( $key . self::KEY_SUFFIX );
+		return $this->getUnserialize(
+			apc_fetch( $key . self::KEY_SUFFIX )
+		);
+	}
 
-		if ( is_string( $val ) && !$this->nativeSerialize ) {
-			$val = $this->isInteger( $val )
-				? intval( $val )
-				: unserialize( $val );
+	protected function getUnserialize( $value ) {
+		if ( is_string( $value ) && !$this->nativeSerialize ) {
+			$value = $this->isInteger( $value )
+				? intval( $value )
+				: unserialize( $value );
 		}
-
-		return $val;
+		return $value;
 	}
 
 	public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+		apc_store(
+			$key . self::KEY_SUFFIX,
+			$this->setSerialize( $value ),
+			$exptime
+		);
+
+		return true;
+	}
+
+	protected function setSerialize( $value ) {
 		if ( !$this->nativeSerialize && !$this->isInteger( $value ) ) {
 			$value = serialize( $value );
 		}
-
-		apc_store( $key . self::KEY_SUFFIX, $value, $exptime );
-
-		return true;
+		return $value;
 	}
 
 	public function delete( $key ) {
diff --git a/includes/libs/objectcache/APCUBagOStuff.php b/includes/libs/objectcache/APCUBagOStuff.php
new file mode 100644
index 0000000000..02b3c928ed
--- /dev/null
+++ b/includes/libs/objectcache/APCUBagOStuff.php
@@ -0,0 +1,91 @@
+<?php
+/**
+ * Object caching using PHP's APCU accelerator.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Cache
+ */
+
+/**
+ * This is a wrapper for APCU's shared memory functions
+ *
+ * @ingroup Cache
+ */
+class APCUBagOStuff extends APCBagOStuff {
+	/**
+	 * Constructor
+	 *
+	 * Available parameters are:
+	 *   - nativeSerialize:     If true, pass objects to apcu_store(), and trust it
+	 *                          to serialize them correctly. If false, serialize
+	 *                          all values in PHP.
+	 *
+	 * @param array $params
+	 */
+	public function __construct( array $params = [] ) {
+		parent::__construct( $params );
+	}
+
+	protected function doGet( $key, $flags = 0 ) {
+		return $this->getUnserialize(
+			apcu_fetch( $key . self::KEY_SUFFIX )
+		);
+	}
+
+	public function set( $key, $value, $exptime = 0, $flags = 0 ) {
+		apcu_store(
+			$key . self::KEY_SUFFIX,
+			$this->setSerialize( $value ),
+			$exptime
+		);
+
+		return true;
+	}
+
+	public function delete( $key ) {
+		apcu_delete( $key . self::KEY_SUFFIX );
+
+		return true;
+	}
+
+	public function incr( $key, $value = 1 ) {
+		/**
+		 * @todo When we only support php 7 or higher remove this hack
+		 *
+		 * https://github.com/krakjoe/apcu/issues/166
+		 */
+		if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
+			return apcu_inc( $key . self::KEY_SUFFIX, $value );
+		} else {
+			return apcu_set( $key . self::KEY_SUFFIX, $value );
+		}
+	}
+
+	public function decr( $key, $value = 1 ) {
+		/**
+		 * @todo When we only support php 7 or higher remove this hack
+		 *
+		 * https://github.com/krakjoe/apcu/issues/166
+		 */
+		if ( apcu_exists( $key . self::KEY_SUFFIX ) ) {
+			return apcu_dec( $key . self::KEY_SUFFIX, $value );
+		} else {
+			return apcu_set( $key . self::KEY_SUFFIX, -$value );
+		}
+	}
+}
diff --git a/includes/libs/objectcache/BagOStuff.php b/includes/libs/objectcache/BagOStuff.php
index cd79b67136..d3deefb6fd 100644
--- a/includes/libs/objectcache/BagOStuff.php
+++ b/includes/libs/objectcache/BagOStuff.php
@@ -29,6 +29,7 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerInterface;
 use Psr\Log\NullLogger;
+use Wikimedia\WaitConditionLoop;
 
 /**
  * interface is intended to be more or less compatible with
diff --git a/includes/libs/objectcache/MemcachedBagOStuff.php b/includes/libs/objectcache/MemcachedBagOStuff.php
index 6973392a84..5128d824b2 100644
--- a/includes/libs/objectcache/MemcachedBagOStuff.php
+++ b/includes/libs/objectcache/MemcachedBagOStuff.php
@@ -43,13 +43,11 @@ class MemcachedBagOStuff extends BagOStuff {
 	 * @return array
 	 */
 	protected function applyDefaultParams( $params ) {
-		if ( !isset( $params['compress_threshold'] ) ) {
-			$params['compress_threshold'] = 1500;
-		}
-		if ( !isset( $params['connect_timeout'] ) ) {
-			$params['connect_timeout'] = 0.5;
-		}
-		return $params;
+		return $params + [
+			'compress_threshold' => 1500,
+			'connect_timeout' => .5,
+			'debug' => false
+		];
 	}
 
 	protected function doGet( $key, $flags = 0 ) {
diff --git a/includes/libs/rdbms/ChronologyProtector.php b/includes/libs/rdbms/ChronologyProtector.php
new file mode 100644
index 0000000000..88af1dbdf8
--- /dev/null
+++ b/includes/libs/rdbms/ChronologyProtector.php
@@ -0,0 +1,326 @@
+<?php
+/**
+ * Generator of database load balancing objects.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * http://www.gnu.org/copyleft/gpl.html
+ *
+ * @file
+ * @ingroup Database
+ */
+use Psr\Log\LoggerAwareInterface;
+use Psr\Log\LoggerInterface;
+use Wikimedia\WaitConditionLoop;
+
+/**
+ * Class for ensuring a consistent ordering of events as seen by the user, despite replication.
+ * Kind of like Hawking's [[Chronology Protection Agency]].
+ */
+class ChronologyProtector implements LoggerAwareInterface {
+	/** @var BagOStuff */
+	protected $store;
+	/** @var LoggerInterface */
+	protected $logger;
+
+	/** @var string Storage key name */
+	protected $key;
+	/** @var string Hash of client parameters */
+	protected $clientId;
+	/** @var float|null Minimum UNIX timestamp of 1+ expected startup positions */
+	protected $waitForPosTime;
+	/** @var int Max seconds to wait on positions to appear */
+	protected $waitForPosTimeout = self::POS_WAIT_TIMEOUT;
+	/** @var bool Whether to no-op all method calls */
+	protected $enabled = true;
+	/** @var bool Whether to check and wait on positions */
+	protected $wait = true;
+
+	/** @var bool Whether the client data was loaded */
+	protected $initialized = false;
+	/** @var DBMasterPos[] Map of (DB master name => position) */
+	protected $startupPositions = [];
+	/** @var DBMasterPos[] Map of (DB master name => position) */
+	protected $shutdownPositions = [];
+	/** @var float[] Map of (DB master name => 1) */
+	protected $shutdownTouchDBs = [];
+
+	/** @var integer Seconds to store positions */
+	const POSITION_TTL = 60;
+	/** @var integer Max time to wait for positions to appear */
+	const POS_WAIT_TIMEOUT = 5;
+
+	/**
+	 * @param BagOStuff $store
+	 * @param array $client Map of (ip: <IP>, agent: <user-agent>)
+	 * @param float $posTime UNIX timestamp
+	 * @since 1.27
+	 */
+	public function __construct( BagOStuff $store, array $client, $posTime = null ) {
+		$this->store = $store;
+		$this->clientId = md5( $client['ip'] . "\n" . $client['agent'] );
+		$this->key = $store->makeGlobalKey( __CLASS__, $this->clientId );
+		$this->waitForPosTime = $posTime;
+		$this->logger = new \Psr\Log\NullLogger();
+	}
+
+	public function setLogger( LoggerInterface $logger ) {
+		$this->logger = $logger;
+	}
+
+	/**
+	 * @param bool $enabled Whether to no-op all method calls
+	 * @since 1.27
+	 */
+	public function setEnabled( $enabled ) {
+		$this->enabled = $enabled;
+	}
+
+	/**
+	 * @param bool $enabled Whether to check and wait on positions
+	 * @since 1.27
+	 */
+	public function setWaitEnabled( $enabled ) {
+		$this->wait = $enabled;
+	}
+
+	/**
+	 * Initialise a ILoadBalancer to give it appropriate chronology protection.
+	 *
+	 * If the stash has a previous master position recorded, this will try to
+	 * make sure that the next query to a replica DB of that master will see changes up
+	 * to that position by delaying execution. The delay may timeout and allow stale
+	 * data if no non-lagged replica DBs are available.
+	 *
+	 * @param ILoadBalancer $lb
+	 * @return void
+	 */
+	public function initLB( ILoadBalancer $lb ) {
+		if ( !$this->enabled || $lb->getServerCount() <= 1 ) {
+			return; // non-replicated setup or disabled
+		}
+
+		$this->initPositions();
+
+		$masterName = $lb->getServerName( $lb->getWriterIndex() );
+		if ( !empty( $this->startupPositions[$masterName] ) ) {
+			$pos = $this->startupPositions[$masterName];
+			$this->logger->info( __METHOD__ . ": LB for '$masterName' set to pos $pos\n" );
+			$lb->waitFor( $pos );
+		}
+	}
+
+	/**
+	 * Notify the ChronologyProtector that the ILoadBalancer is about to shut
+	 * down. Saves replication positions.
+	 *
+	 * @param ILoadBalancer $lb
+	 * @return void
+	 */
+	public function shutdownLB( ILoadBalancer $lb ) {
+		if ( !$this->enabled ) {
+			return; // not enabled
+		} elseif ( !$lb->hasOrMadeRecentMasterChanges( INF ) ) {
+			// Only save the position if writes have been done on the connection
+			return;
+		}
+
+		$masterName = $lb->getServerName( $lb->getWriterIndex() );
+		if ( $lb->getServerCount() > 1 ) {
+			$pos = $lb->getMasterPos();
+			$this->logger->info( __METHOD__ . ": LB for '$masterName' has pos $pos\n" );
+			$this->shutdownPositions[$masterName] = $pos;
+		} else {
+			$this->logger->info( __METHOD__ . ": DB '$masterName' touched\n" );
+		}
+		$this->shutdownTouchDBs[$masterName] = 1;
+	}
+
+	/**
+	 * Notify the ChronologyProtector that the LBFactory is done calling shutdownLB() for now.
+	 * May commit chronology data to persistent storage.
+	 *
+	 * @param callable|null $workCallback Work to do instead of waiting on syncing positions
+	 * @param string $mode One of (sync, async); whether to wait on remote datacenters
+	 * @return DBMasterPos[] Empty on success; returns the (db name => position) map on failure
+	 */
+	public function shutdown( callable $workCallback = null, $mode = 'sync' ) {
+		if ( !$this->enabled ) {
+			return [];
+		}
+
+		$store = $this->store;
+		// Some callers might want to know if a user recently touched a DB.
+		// These writes do not need to block on all datacenters receiving them.
+		foreach ( $this->shutdownTouchDBs as $dbName => $unused ) {
+			$store->set(
+				$this->getTouchedKey( $this->store, $dbName ),
+				microtime( true ),
+				$store::TTL_DAY
+			);
+		}
+
+		if ( !count( $this->shutdownPositions ) ) {
+			return []; // nothing to save
+		}
+
+		$this->logger->info( __METHOD__ . ": saving master pos for " .
+			implode( ', ', array_keys( $this->shutdownPositions ) ) . "\n"
+		);
+
+		// CP-protected writes should overwhemingly go to the master datacenter, so get DC-local
+		// lock to merge the values. Use a DC-local get() and a synchronous all-DC set(). This
+		// makes it possible for the BagOStuff class to write in parallel to all DCs with one RTT.
+		if ( $store->lock( $this->key, 3 ) ) {
+			if ( $workCallback ) {
+				// Let the store run the work before blocking on a replication sync barrier. By the
+				// time it's done with the work, the barrier should be fast if replication caught up.
+				$store->addBusyCallback( $workCallback );
+			}
+			$ok = $store->set(
+				$this->key,
+				self::mergePositions( $store->get( $this->key ), $this->shutdownPositions ),
+				self::POSITION_TTL,
+				( $mode === 'sync' ) ? $store::WRITE_SYNC : 0
+			);
+			$store->unlock( $this->key );
+		} else {
+			$ok = false;
+		}
+
+		if ( !$ok ) {
+			$bouncedPositions = $this->shutdownPositions;
+			// Raced out too many times or stash is down
+			$this->logger->warning( __METHOD__ . ": failed to save master pos for " .
+				implode( ', ', array_keys( $this->shutdownPositions ) ) . "\n"
+			);
+		} elseif ( $mode === 'sync' &&
+			$store->getQoS( $store::ATTR_SYNCWRITES ) < $store::QOS_SYNCWRITES_BE
+		) {
+			// Positions may not be in all datacenters, force LBFactory to play it safe
+			$this->logger->info( __METHOD__ . ": store may not support synchronous writes." );
+			$bouncedPositions = $this->shutdownPositions;
+		} else {
+			$bouncedPositions = [];
+		}
+
+		return $bouncedPositions;
+	}
+
+	/**
+	 * @param string $dbName DB master name (e.g. "db1052")
+	 * @return float|bool UNIX timestamp when client last touched the DB; false if not on record
+	 * @since 1.28
+	 */
+	public function getTouched( $dbName ) {
+		return $this->store->get( $this->getTouchedKey( $this->store, $dbName ) );
+	}
+
+	/**
+	 * @param BagOStuff $store
+	 * @param string $dbName
+	 * @return string
+	 */
+	private function getTouchedKey( BagOStuff $store, $dbName ) {
+		return $store->makeGlobalKey( __CLASS__, 'mtime', $this->clientId, $dbName );
+	}
+
+	/**
+	 * Load in previous master positions for the client
+	 */
+	protected function initPositions() {
+		if ( $this->initialized ) {
+			return;
+		}
+
+		$this->initialized = true;
+		if ( $this->wait ) {
+			// If there is an expectation to see master positions with a certain min
+			// timestamp, then block until they appear, or until a timeout is reached.
+			if ( $this->waitForPosTime > 0.0 ) {
+				$data = null;
+				$loop = new WaitConditionLoop(
+					function () use ( &$data ) {
+						$data = $this->store->get( $this->key );
+
+						return ( self::minPosTime( $data ) >= $this->waitForPosTime )
+							? WaitConditionLoop::CONDITION_REACHED
+							: WaitConditionLoop::CONDITION_CONTINUE;
+					},
+					$this->waitForPosTimeout
+				);
+				$result = $loop->invoke();
+				$waitedMs = $loop->getLastWaitTime() * 1e3;
+
+				if ( $result == $loop::CONDITION_REACHED ) {
+					$msg = "expected and found pos time {$this->waitForPosTime} ({$waitedMs}ms)";
+					$this->logger->debug( $msg );
+				} else {
+					$msg = "expected but missed pos time {$this->waitForPosTime} ({$waitedMs}ms)";
+					$this->logger->info( $msg );
+				}
+			} else {
+				$data = $this->store->get( $this->key );
+			}
+
+			$this->startupPositions = $data ? $data['positions'] : [];
+			$this->logger->info( __METHOD__ . ": key is {$this->key} (read)\n" );
+		} else {
+			$this->startupPositions = [];
+			$this->logger->info( __METHOD__ . ": key is {$this->key} (unread)\n" );
+		}
+	}
+
+	/**
+	 * @param array|bool $data
+	 * @return float|null
+	 */
+	private static function minPosTime( $data ) {
+		if ( !isset( $data['positions'] ) ) {
+			return null;
+		}
+
+		$min = null;
+		foreach ( $data['positions'] as $pos ) {
+			/** @var DBMasterPos $pos */
+			$min = $min ? min( $pos->asOfTime(), $min ) : $pos->asOfTime();
+		}
+
+		return $min;
+	}
+
+	/**
+	 * @param array|bool $curValue
+	 * @param DBMasterPos[] $shutdownPositions
+	 * @return array
+	 */
+	private static function mergePositions( $curValue, array $shutdownPositions ) {
+		/** @var $curPositions DBMasterPos[] */
+		if ( $curValue === false ) {
+			$curPositions = $shutdownPositions;
+		} else {
+			$curPositions = $curValue['positions'];
+			// Use the newest positions for each DB master
+			foreach ( $shutdownPositions as $db => $pos ) {
+				if ( !isset( $curPositions[$db] )
+					|| $pos->asOfTime() > $curPositions[$db]->asOfTime()
+				) {
+					$curPositions[$db] = $pos;
+				}
+			}
+		}
+
+		return [ 'positions' => $curPositions ];
+	}
+}
diff --git a/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php b/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php
deleted file mode 100644
index 94a3b6ce1e..0000000000
--- a/includes/libs/rdbms/chronologyprotector/ChronologyProtector.php
+++ /dev/null
@@ -1,325 +0,0 @@
-<?php
-/**
- * Generator of database load balancing objects.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Database
- */
-use Psr\Log\LoggerAwareInterface;
-use Psr\Log\LoggerInterface;
-
-/**
- * Class for ensuring a consistent ordering of events as seen by the user, despite replication.
- * Kind of like Hawking's [[Chronology Protection Agency]].
- */
-class ChronologyProtector implements LoggerAwareInterface{
-	/** @var BagOStuff */
-	protected $store;
-	/** @var LoggerInterface */
-	protected $logger;
-
-	/** @var string Storage key name */
-	protected $key;
-	/** @var string Hash of client parameters */
-	protected $clientId;
-	/** @var float|null Minimum UNIX timestamp of 1+ expected startup positions */
-	protected $waitForPosTime;
-	/** @var int Max seconds to wait on positions to appear */
-	protected $waitForPosTimeout = self::POS_WAIT_TIMEOUT;
-	/** @var bool Whether to no-op all method calls */
-	protected $enabled = true;
-	/** @var bool Whether to check and wait on positions */
-	protected $wait = true;
-
-	/** @var bool Whether the client data was loaded */
-	protected $initialized = false;
-	/** @var DBMasterPos[] Map of (DB master name => position) */
-	protected $startupPositions = [];
-	/** @var DBMasterPos[] Map of (DB master name => position) */
-	protected $shutdownPositions = [];
-	/** @var float[] Map of (DB master name => 1) */
-	protected $shutdownTouchDBs = [];
-
-	/** @var integer Seconds to store positions */
-	const POSITION_TTL = 60;
-	/** @var integer Max time to wait for positions to appear */
-	const POS_WAIT_TIMEOUT = 5;
-
-	/**
-	 * @param BagOStuff $store
-	 * @param array $client Map of (ip: <IP>, agent: <user-agent>)
-	 * @param float $posTime UNIX timestamp
-	 * @since 1.27
-	 */
-	public function __construct( BagOStuff $store, array $client, $posTime = null ) {
-		$this->store = $store;
-		$this->clientId = md5( $client['ip'] . "\n" . $client['agent'] );
-		$this->key = $store->makeGlobalKey( __CLASS__, $this->clientId );
-		$this->waitForPosTime = $posTime;
-		$this->logger = new \Psr\Log\NullLogger();
-	}
-
-	public function setLogger( LoggerInterface $logger ) {
-		$this->logger = $logger;
-	}
-
-	/**
-	 * @param bool $enabled Whether to no-op all method calls
-	 * @since 1.27
-	 */
-	public function setEnabled( $enabled ) {
-		$this->enabled = $enabled;
-	}
-
-	/**
-	 * @param bool $enabled Whether to check and wait on positions
-	 * @since 1.27
-	 */
-	public function setWaitEnabled( $enabled ) {
-		$this->wait = $enabled;
-	}
-
-	/**
-	 * Initialise a ILoadBalancer to give it appropriate chronology protection.
-	 *
-	 * If the stash has a previous master position recorded, this will try to
-	 * make sure that the next query to a replica DB of that master will see changes up
-	 * to that position by delaying execution. The delay may timeout and allow stale
-	 * data if no non-lagged replica DBs are available.
-	 *
-	 * @param ILoadBalancer $lb
-	 * @return void
-	 */
-	public function initLB( ILoadBalancer $lb ) {
-		if ( !$this->enabled || $lb->getServerCount() <= 1 ) {
-			return; // non-replicated setup or disabled
-		}
-
-		$this->initPositions();
-
-		$masterName = $lb->getServerName( $lb->getWriterIndex() );
-		if ( !empty( $this->startupPositions[$masterName] ) ) {
-			$pos = $this->startupPositions[$masterName];
-			$this->logger->info( __METHOD__ . ": LB for '$masterName' set to pos $pos\n" );
-			$lb->waitFor( $pos );
-		}
-	}
-
-	/**
-	 * Notify the ChronologyProtector that the ILoadBalancer is about to shut
-	 * down. Saves replication positions.
-	 *
-	 * @param ILoadBalancer $lb
-	 * @return void
-	 */
-	public function shutdownLB( ILoadBalancer $lb ) {
-		if ( !$this->enabled ) {
-			return; // not enabled
-		} elseif ( !$lb->hasOrMadeRecentMasterChanges( INF ) ) {
-			// Only save the position if writes have been done on the connection
-			return;
-		}
-
-		$masterName = $lb->getServerName( $lb->getWriterIndex() );
-		if ( $lb->getServerCount() > 1 ) {
-			$pos = $lb->getMasterPos();
-			$this->logger->info( __METHOD__ . ": LB for '$masterName' has pos $pos\n" );
-			$this->shutdownPositions[$masterName] = $pos;
-		} else {
-			$this->logger->info( __METHOD__ . ": DB '$masterName' touched\n" );
-		}
-		$this->shutdownTouchDBs[$masterName] = 1;
-	}
-
-	/**
-	 * Notify the ChronologyProtector that the LBFactory is done calling shutdownLB() for now.
-	 * May commit chronology data to persistent storage.
-	 *
-	 * @param callable|null $workCallback Work to do instead of waiting on syncing positions
-	 * @param string $mode One of (sync, async); whether to wait on remote datacenters
-	 * @return DBMasterPos[] Empty on success; returns the (db name => position) map on failure
-	 */
-	public function shutdown( callable $workCallback = null, $mode = 'sync' ) {
-		if ( !$this->enabled ) {
-			return [];
-		}
-
-		$store = $this->store;
-		// Some callers might want to know if a user recently touched a DB.
-		// These writes do not need to block on all datacenters receiving them.
-		foreach ( $this->shutdownTouchDBs as $dbName => $unused ) {
-			$store->set(
-				$this->getTouchedKey( $this->store, $dbName ),
-				microtime( true ),
-				$store::TTL_DAY
-			);
-		}
-
-		if ( !count( $this->shutdownPositions ) ) {
-			return []; // nothing to save
-		}
-
-		$this->logger->info( __METHOD__ . ": saving master pos for " .
-			implode( ', ', array_keys( $this->shutdownPositions ) ) . "\n"
-		);
-
-		// CP-protected writes should overwhemingly go to the master datacenter, so get DC-local
-		// lock to merge the values. Use a DC-local get() and a synchronous all-DC set(). This
-		// makes it possible for the BagOStuff class to write in parallel to all DCs with one RTT.
-		if ( $store->lock( $this->key, 3 ) ) {
-			if ( $workCallback ) {
-				// Let the store run the work before blocking on a replication sync barrier. By the
-				// time it's done with the work, the barrier should be fast if replication caught up.
-				$store->addBusyCallback( $workCallback );
-			}
-			$ok = $store->set(
-				$this->key,
-				self::mergePositions( $store->get( $this->key ), $this->shutdownPositions ),
-				self::POSITION_TTL,
-				( $mode === 'sync' ) ? $store::WRITE_SYNC : 0
-			);
-			$store->unlock( $this->key );
-		} else {
-			$ok = false;
-		}
-
-		if ( !$ok ) {
-			$bouncedPositions = $this->shutdownPositions;
-			// Raced out too many times or stash is down
-			$this->logger->warning( __METHOD__ . ": failed to save master pos for " .
-				implode( ', ', array_keys( $this->shutdownPositions ) ) . "\n"
-			);
-		} elseif ( $mode === 'sync' &&
-			$store->getQoS( $store::ATTR_SYNCWRITES ) < $store::QOS_SYNCWRITES_BE
-		) {
-			// Positions may not be in all datacenters, force LBFactory to play it safe
-			$this->logger->info( __METHOD__ . ": store may not support synchronous writes." );
-			$bouncedPositions = $this->shutdownPositions;
-		} else {
-			$bouncedPositions = [];
-		}
-
-		return $bouncedPositions;
-	}
-
-	/**
-	 * @param string $dbName DB master name (e.g. "db1052")
-	 * @return float|bool UNIX timestamp when client last touched the DB; false if not on record
-	 * @since 1.28
-	 */
-	public function getTouched( $dbName ) {
-		return $this->store->get( $this->getTouchedKey( $this->store, $dbName ) );
-	}
-
-	/**
-	 * @param BagOStuff $store
-	 * @param string $dbName
-	 * @return string
-	 */
-	private function getTouchedKey( BagOStuff $store, $dbName ) {
-		return $store->makeGlobalKey( __CLASS__, 'mtime', $this->clientId, $dbName );
-	}
-
-	/**
-	 * Load in previous master positions for the client
-	 */
-	protected function initPositions() {
-		if ( $this->initialized ) {
-			return;
-		}
-
-		$this->initialized = true;
-		if ( $this->wait ) {
-			// If there is an expectation to see master positions with a certain min
-			// timestamp, then block until they appear, or until a timeout is reached.
-			if ( $this->waitForPosTime > 0.0 ) {
-				$data = null;
-				$loop = new WaitConditionLoop(
-					function () use ( &$data ) {
-						$data = $this->store->get( $this->key );
-
-						return ( self::minPosTime( $data ) >= $this->waitForPosTime )
-							? WaitConditionLoop::CONDITION_REACHED
-							: WaitConditionLoop::CONDITION_CONTINUE;
-					},
-					$this->waitForPosTimeout
-				);
-				$result = $loop->invoke();
-				$waitedMs = $loop->getLastWaitTime() * 1e3;
-
-				if ( $result == $loop::CONDITION_REACHED ) {
-					$msg = "expected and found pos time {$this->waitForPosTime} ({$waitedMs}ms)";
-					$this->logger->debug( $msg );
-				} else {
-					$msg = "expected but missed pos time {$this->waitForPosTime} ({$waitedMs}ms)";
-					$this->logger->info( $msg );
-				}
-			} else {
-				$data = $this->store->get( $this->key );
-			}
-
-			$this->startupPositions = $data ? $data['positions'] : [];
-			$this->logger->info( __METHOD__ . ": key is {$this->key} (read)\n" );
-		} else {
-			$this->startupPositions = [];
-			$this->logger->info( __METHOD__ . ": key is {$this->key} (unread)\n" );
-		}
-	}
-
-	/**
-	 * @param array|bool $data
-	 * @return float|null
-	 */
-	private static function minPosTime( $data ) {
-		if ( !isset( $data['positions'] ) ) {
-			return null;
-		}
-
-		$min = null;
-		foreach ( $data['positions'] as $pos ) {
-			/** @var DBMasterPos $pos */
-			$min = $min ? min( $pos->asOfTime(), $min ) : $pos->asOfTime();
-		}
-
-		return $min;
-	}
-
-	/**
-	 * @param array|bool $curValue
-	 * @param DBMasterPos[] $shutdownPositions
-	 * @return array
-	 */
-	private static function mergePositions( $curValue, array $shutdownPositions ) {
-		/** @var $curPositions DBMasterPos[] */
-		if ( $curValue === false ) {
-			$curPositions = $shutdownPositions;
-		} else {
-			$curPositions = $curValue['positions'];
-			// Use the newest positions for each DB master
-			foreach ( $shutdownPositions as $db => $pos ) {
-				if ( !isset( $curPositions[$db] )
-					|| $pos->asOfTime() > $curPositions[$db]->asOfTime()
-				) {
-					$curPositions[$db] = $pos;
-				}
-			}
-		}
-
-		return [ 'positions' => $curPositions ];
-	}
-}
diff --git a/includes/libs/rdbms/database/Database.php b/includes/libs/rdbms/database/Database.php
index 2b058e991d..9f1f228a37 100644
--- a/includes/libs/rdbms/database/Database.php
+++ b/includes/libs/rdbms/database/Database.php
@@ -352,7 +352,7 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		} else {
 			$driver = $dbType;
 		}
-		if ( $driver === false ) {
+		if ( $driver === false || $driver === '' ) {
 			throw new InvalidArgumentException( __METHOD__ .
 				" no viable database extension found for type '$dbType'" );
 		}
@@ -3037,10 +3037,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 	public function sourceFile(
 		$filename,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = false,
-		$inputCallback = false
+		callable $inputCallback = null
 	) {
 		MediaWiki\suppressWarnings();
 		$fp = fopen( $filename, 'r' );
@@ -3073,10 +3073,10 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 
 	public function sourceStream(
 		$fp,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = __METHOD__,
-		$inputCallback = false
+		callable $inputCallback = null
 	) {
 		$cmd = '';
 
@@ -3426,3 +3426,5 @@ abstract class Database implements IDatabase, IMaintainableDatabase, LoggerAware
 		}
 	}
 }
+
+class_alias( 'Database', 'DatabaseBase' );
diff --git a/includes/libs/rdbms/database/DatabaseBase.php b/includes/libs/rdbms/database/DatabaseBase.php
deleted file mode 100644
index e008705048..0000000000
--- a/includes/libs/rdbms/database/DatabaseBase.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * @defgroup Database Database
- *
- * This file deals with database interface functions
- * and query specifics/optimisations.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Database
- */
-
-/**
- * Database abstraction object
- * @ingroup Database
- */
-abstract class DatabaseBase extends Database {
-	/**
-	 * Get search engine class. All subclasses of this need to implement this
-	 * if they wish to use searching.
-	 *
-	 * @return string
-	 * @deprecated since 1.27; use SearchEngineFactory::getSearchEngineClass()
-	 */
-	public function getSearchEngine() {
-		return 'SearchEngineDummy';
-	}
-}
diff --git a/includes/libs/rdbms/database/DatabaseDomain.php b/includes/libs/rdbms/database/DatabaseDomain.php
index 01b6b21f04..a3ae6f10a1 100644
--- a/includes/libs/rdbms/database/DatabaseDomain.php
+++ b/includes/libs/rdbms/database/DatabaseDomain.php
@@ -51,7 +51,6 @@ class DatabaseDomain {
 			throw new InvalidArgumentException( "Prefix must be a string." );
 		}
 		$this->prefix = $prefix;
-		$this->equivalentString = $this->convertToString();
 	}
 
 	/**
@@ -105,7 +104,7 @@ class DatabaseDomain {
 			);
 		}
 
-		return ( $this->equivalentString === $other );
+		return ( $this->getId() === $other );
 	}
 
 	/**
@@ -133,6 +132,10 @@ class DatabaseDomain {
 	 * @return string
 	 */
 	public function getId() {
+		if ( $this->equivalentString === null ) {
+			$this->equivalentString = $this->convertToString();
+		}
+
 		return $this->equivalentString;
 	}
 
diff --git a/includes/libs/rdbms/database/DatabaseMysqlBase.php b/includes/libs/rdbms/database/DatabaseMysqlBase.php
index c31b9f9ed2..d654429317 100644
--- a/includes/libs/rdbms/database/DatabaseMysqlBase.php
+++ b/includes/libs/rdbms/database/DatabaseMysqlBase.php
@@ -29,7 +29,7 @@
  * @since 1.22
  * @see Database
  */
-abstract class DatabaseMysqlBase extends DatabaseBase {
+abstract class DatabaseMysqlBase extends Database {
 	/** @var MysqlMasterPos */
 	protected $lastKnownReplicaPos;
 	/** @var string Method to detect replica DB lag */
diff --git a/includes/libs/rdbms/database/DatabasePostgres.php b/includes/libs/rdbms/database/DatabasePostgres.php
index a69a5fac6c..f82d76d4d8 100644
--- a/includes/libs/rdbms/database/DatabasePostgres.php
+++ b/includes/libs/rdbms/database/DatabasePostgres.php
@@ -20,11 +20,12 @@
  * @file
  * @ingroup Database
  */
+use Wikimedia\WaitConditionLoop;
 
 /**
  * @ingroup Database
  */
-class DatabasePostgres extends DatabaseBase {
+class DatabasePostgres extends Database {
 	/** @var int|bool */
 	protected $port;
 
diff --git a/includes/libs/rdbms/database/DatabaseSqlite.php b/includes/libs/rdbms/database/DatabaseSqlite.php
index 156e5252b3..3ccf3f002a 100644
--- a/includes/libs/rdbms/database/DatabaseSqlite.php
+++ b/includes/libs/rdbms/database/DatabaseSqlite.php
@@ -25,7 +25,7 @@
 /**
  * @ingroup Database
  */
-class DatabaseSqlite extends DatabaseBase {
+class DatabaseSqlite extends Database {
 	/** @var bool Whether full text is enabled */
 	private static $fulltextEnabled = null;
 
diff --git a/includes/libs/rdbms/database/IMaintainableDatabase.php b/includes/libs/rdbms/database/IMaintainableDatabase.php
index f65e0dd31f..83953596f1 100644
--- a/includes/libs/rdbms/database/IMaintainableDatabase.php
+++ b/includes/libs/rdbms/database/IMaintainableDatabase.php
@@ -96,21 +96,21 @@ interface IMaintainableDatabase extends IDatabase {
 	 * on object's error ignore settings).
 	 *
 	 * @param string $filename File name to open
-	 * @param bool|callable $lineCallback Optional function called before reading each line
-	 * @param bool|callable $resultCallback Optional function called for each MySQL result
+	 * @param callable|null $lineCallback Optional function called before reading each line
+	 * @param callable|null $resultCallback Optional function called for each MySQL result
 	 * @param bool|string $fname Calling function name or false if name should be
 	 *   generated dynamically using $filename
-	 * @param bool|callable $inputCallback Optional function called for each
+	 * @param callable|null $inputCallback Optional function called for each
 	 *   complete line sent
 	 * @return bool|string
 	 * @throws Exception
 	 */
 	public function sourceFile(
 		$filename,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = false,
-		$inputCallback = false
+		callable $inputCallback = null
 	);
 
 	/**
@@ -120,18 +120,18 @@ interface IMaintainableDatabase extends IDatabase {
 	 * on object's error ignore settings).
 	 *
 	 * @param resource $fp File handle
-	 * @param bool|callable $lineCallback Optional function called before reading each query
-	 * @param bool|callable $resultCallback Optional function called for each MySQL result
+	 * @param callable|null $lineCallback Optional function called before reading each query
+	 * @param callable|null $resultCallback Optional function called for each MySQL result
 	 * @param string $fname Calling function name
-	 * @param bool|callable $inputCallback Optional function called for each complete query sent
+	 * @param callable|null $inputCallback Optional function called for each complete query sent
 	 * @return bool|string
 	 */
 	public function sourceStream(
 		$fp,
-		$lineCallback = false,
-		$resultCallback = false,
+		callable $lineCallback = null,
+		callable $resultCallback = null,
 		$fname = __METHOD__,
-		$inputCallback = false
+		callable $inputCallback = null
 	);
 
 	/**
diff --git a/includes/libs/rdbms/lbfactory/ILBFactory.php b/includes/libs/rdbms/lbfactory/ILBFactory.php
index d7ca7cd1a9..9c9f18d2b0 100644
--- a/includes/libs/rdbms/lbfactory/ILBFactory.php
+++ b/includes/libs/rdbms/lbfactory/ILBFactory.php
@@ -136,9 +136,9 @@ interface ILBFactory {
 	public function flushReplicaSnapshots( $fname = __METHOD__ );
 
 	/**
-	 * Commit on all connections. Done for two reasons:
-	 * 1. To commit changes to the masters.
-	 * 2. To release the snapshot on all connections, master and replica DB.
+	 * Commit open transactions on all connections. This is useful for two main cases:
+	 *   - a) To commit changes to the masters.
+	 *   - b) To release the snapshot on all connections, master and replica DBs.
 	 * @param string $fname Caller name
 	 * @param array $options Options map:
 	 *   - maxWriteDuration: abort if more than this much time was spent in write queries
diff --git a/includes/libs/rdbms/lbfactory/LBFactory.php b/includes/libs/rdbms/lbfactory/LBFactory.php
index 85194bc009..f5d57c4c0d 100644
--- a/includes/libs/rdbms/lbfactory/LBFactory.php
+++ b/includes/libs/rdbms/lbfactory/LBFactory.php
@@ -135,6 +135,36 @@ abstract class LBFactory implements ILBFactory {
 		$this->commitMasterChanges( __METHOD__ ); // sanity
 	}
 
+	/**
+	 * @see ILBFactory::newMainLB()
+	 * @param bool $domain
+	 * @return LoadBalancer
+	 */
+	abstract public function newMainLB( $domain = false );
+
+	/**
+	 * @see ILBFactory::getMainLB()
+	 * @param bool $domain
+	 * @return mixed
+	 */
+	abstract public function getMainLB( $domain = false );
+
+	/**
+	 * @see ILBFactory::newExternalLB()
+	 * @param string $cluster
+	 * @param bool $domain
+	 * @return LoadBalancer
+	 */
+	abstract public function newExternalLB( $cluster, $domain = false );
+
+	/**
+	 * @see ILBFactory::getExternalLB()
+	 * @param string $cluster
+	 * @param bool $domain
+	 * @return mixed
+	 */
+	abstract public function getExternalLB( $cluster, $domain = false );
+
 	/**
 	 * Call a method of each tracked load balancer
 	 *
@@ -178,6 +208,8 @@ abstract class LBFactory implements ILBFactory {
 				"$fname: transaction round '{$this->trxRoundId}' still running."
 			);
 		}
+		/** @noinspection PhpUnusedLocalVariableInspection */
+		$scope = $this->getScopedPHPBehaviorForCommit(); // try to ignore client aborts
 		// Run pre-commit callbacks and suppress post-commit callbacks, aborting on failure
 		$this->forEachLBCallMethod( 'finalizeMasterChanges' );
 		$this->trxRoundId = false;
@@ -516,6 +548,23 @@ abstract class LBFactory implements ILBFactory {
 		$this->requestInfo = $info + $this->requestInfo;
 	}
 
+	/**
+	 * Make PHP ignore user aborts/disconnects until the returned
+	 * value leaves scope. This returns null and does nothing in CLI mode.
+	 *
+	 * @return ScopedCallback|null
+	 */
+	final protected function getScopedPHPBehaviorForCommit() {
+		if ( PHP_SAPI != 'cli' ) { // http://bugs.php.net/bug.php?id=47540
+			$old = ignore_user_abort( true ); // avoid half-finished operations
+			return new ScopedCallback( function () use ( $old ) {
+				ignore_user_abort( $old );
+			} );
+		}
+
+		return null;
+	}
+
 	function __destruct() {
 		$this->destroy();
 	}
diff --git a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
index 2fb8c4ba43..83ca65076a 100644
--- a/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
+++ b/includes/libs/rdbms/lbfactory/LBFactoryMulti.php
@@ -95,7 +95,7 @@ class LBFactoryMulti extends LBFactory {
 	private $extLBs = [];
 
 	/** @var string */
-	private $loadMonitorClass;
+	private $loadMonitorClass = 'LoadMonitor';
 
 	/** @var string */
 	private $lastDomain;
@@ -309,7 +309,7 @@ class LBFactoryMulti extends LBFactory {
 			$this->baseLoadBalancerParams(),
 			[
 				'servers' => $this->makeServerArray( $template, $loads, $groupLoads ),
-				'loadMonitor' => $this->loadMonitorClass,
+				'loadMonitor' => [ 'class' => $this->loadMonitorClass ],
 				'readOnlyReason' => $readOnlyReason
 			]
 		) );
diff --git a/includes/libs/rdbms/lbfactory/LBFactorySimple.php b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
index 610052f50c..674bafd991 100644
--- a/includes/libs/rdbms/lbfactory/LBFactorySimple.php
+++ b/includes/libs/rdbms/lbfactory/LBFactorySimple.php
@@ -67,7 +67,7 @@ class LBFactorySimple extends LBFactory {
 			: [];
 		$this->loadMonitorClass = isset( $conf['loadMonitorClass'] )
 			? $conf['loadMonitorClass']
-			: null;
+			: 'LoadMonitor';
 	}
 
 	/**
@@ -124,7 +124,7 @@ class LBFactorySimple extends LBFactory {
 			$this->baseLoadBalancerParams(),
 			[
 				'servers' => $servers,
-				'loadMonitor' => $this->loadMonitorClass,
+				'loadMonitor' => [ 'class' => $this->loadMonitorClass ],
 			]
 		) );
 		$this->initLoadBalancer( $lb );
diff --git a/includes/libs/rdbms/loadbalancer/LoadBalancer.php b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
index a60e741cee..31c022c7f9 100644
--- a/includes/libs/rdbms/loadbalancer/LoadBalancer.php
+++ b/includes/libs/rdbms/loadbalancer/LoadBalancer.php
@@ -32,7 +32,7 @@ class LoadBalancer implements ILoadBalancer {
 	private $mServers;
 	/** @var array[] Map of (local/foreignUsed/foreignFree => server index => IDatabase array) */
 	private $mConns;
-	/** @var array Map of (server index => weight) */
+	/** @var float[] Map of (server index => weight) */
 	private $mLoads;
 	/** @var array[] Map of (group => server index => weight) */
 	private $mGroupLoads;
@@ -40,13 +40,13 @@ class LoadBalancer implements ILoadBalancer {
 	private $mAllowLagged;
 	/** @var integer Seconds to spend waiting on replica DB lag to resolve */
 	private $mWaitTimeout;
-	/** @var string The LoadMonitor subclass name */
-	private $mLoadMonitorClass;
+	/** @var array The LoadMonitor configuration */
+	private $loadMonitorConfig;
 	/** @var array[] $aliases Map of (table => (dbname, schema, prefix) map) */
 	private $tableAliases = [];
 
 	/** @var ILoadMonitor */
-	private $mLoadMonitor;
+	private $loadMonitor;
 	/** @var BagOStuff */
 	private $srvCache;
 	/** @var BagOStuff */
@@ -150,14 +150,9 @@ class LoadBalancer implements ILoadBalancer {
 		}
 
 		if ( isset( $params['loadMonitor'] ) ) {
-			$this->mLoadMonitorClass = $params['loadMonitor'];
+			$this->loadMonitorConfig = $params['loadMonitor'];
 		} else {
-			$master = reset( $params['servers'] );
-			if ( isset( $master['type'] ) && $master['type'] === 'mysql' ) {
-				$this->mLoadMonitorClass = 'LoadMonitorMySQL';
-			} else {
-				$this->mLoadMonitorClass = 'LoadMonitorNull';
-			}
+			$this->loadMonitorConfig = [ 'class' => 'LoadMonitorNull' ];
 		}
 
 		foreach ( $params['servers'] as $i => $server ) {
@@ -217,13 +212,14 @@ class LoadBalancer implements ILoadBalancer {
 	 * @return ILoadMonitor
 	 */
 	private function getLoadMonitor() {
-		if ( !isset( $this->mLoadMonitor ) ) {
-			$class = $this->mLoadMonitorClass;
-			$this->mLoadMonitor = new $class( $this, $this->srvCache, $this->memCache );
-			$this->mLoadMonitor->setLogger( $this->replLogger );
+		if ( !isset( $this->loadMonitor ) ) {
+			$class = $this->loadMonitorConfig['class'];
+			$this->loadMonitor = new $class(
+				$this, $this->srvCache, $this->memCache, $this->loadMonitorConfig );
+			$this->loadMonitor->setLogger( $this->replLogger );
 		}
 
-		return $this->mLoadMonitor;
+		return $this->loadMonitor;
 	}
 
 	/**
@@ -1101,6 +1097,9 @@ class LoadBalancer implements ILoadBalancer {
 	public function commitMasterChanges( $fname = __METHOD__ ) {
 		$failures = [];
 
+		/** @noinspection PhpUnusedLocalVariableInspection */
+		$scope = $this->getScopedPHPBehaviorForCommit(); // try to ignore client aborts
+
 		$restore = ( $this->trxRoundId !== false );
 		$this->trxRoundId = false;
 		$this->forEachOpenMasterConnection(
@@ -1516,6 +1515,23 @@ class LoadBalancer implements ILoadBalancer {
 		} );
 	}
 
+	/**
+	 * Make PHP ignore user aborts/disconnects until the returned
+	 * value leaves scope. This returns null and does nothing in CLI mode.
+	 *
+	 * @return ScopedCallback|null
+	 */
+	final protected function getScopedPHPBehaviorForCommit() {
+		if ( PHP_SAPI != 'cli' ) { // http://bugs.php.net/bug.php?id=47540
+			$old = ignore_user_abort( true ); // avoid half-finished operations
+			return new ScopedCallback( function () use ( $old ) {
+				ignore_user_abort( $old );
+			} );
+		}
+
+		return null;
+	}
+
 	function __destruct() {
 		// Avoid connection leaks for sanity
 		$this->closeAll();
diff --git a/includes/libs/rdbms/loadmonitor/ILoadMonitor.php b/includes/libs/rdbms/loadmonitor/ILoadMonitor.php
index e355c0363c..72a8785901 100644
--- a/includes/libs/rdbms/loadmonitor/ILoadMonitor.php
+++ b/includes/libs/rdbms/loadmonitor/ILoadMonitor.php
@@ -34,16 +34,19 @@ interface ILoadMonitor extends LoggerAwareInterface {
 	 * @param ILoadBalancer $lb LoadBalancer this instance serves
 	 * @param BagOStuff $sCache Local server memory cache
 	 * @param BagOStuff $cCache Local cluster memory cache
+	 * @param array $options Options map
 	 */
-	public function __construct( ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache );
+	public function __construct(
+		ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
+	);
 
 	/**
 	 * Perform pre-connection load ratio adjustment.
-	 * @param int[] &$loads
+	 * @param int[] &$weightByServer Map of (server index => integer weight)
 	 * @param string|bool $group The selected query group. Default: false
 	 * @param string|bool $domain Default: false
 	 */
-	public function scaleLoads( &$loads, $group = false, $domain = false );
+	public function scaleLoads( array &$weightByServer, $group = false, $domain = false );
 
 	/**
 	 * Get an estimate of replication lag (in seconds) for each server
@@ -55,7 +58,7 @@ interface ILoadMonitor extends LoggerAwareInterface {
 	 *
 	 * @return array Map of (server index => float|int|bool)
 	 */
-	public function getLagTimes( $serverIndexes, $domain );
+	public function getLagTimes( array $serverIndexes, $domain );
 
 	/**
 	 * Clear any process and persistent cache of lag times
diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitor.php b/includes/libs/rdbms/loadmonitor/LoadMonitor.php
index 1da8f4e51f..60400e3de2 100644
--- a/includes/libs/rdbms/loadmonitor/LoadMonitor.php
+++ b/includes/libs/rdbms/loadmonitor/LoadMonitor.php
@@ -37,27 +37,53 @@ class LoadMonitor implements ILoadMonitor {
 	/** @var LoggerInterface */
 	protected $replLogger;
 
-	public function __construct( ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache ) {
+	/** @var float Moving average ratio (e.g. 0.1 for 10% weight to new weight) */
+	private $movingAveRatio;
+
+	const VERSION = 1;
+
+	public function __construct(
+		ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache, array $options = []
+	) {
 		$this->parent = $lb;
 		$this->srvCache = $srvCache;
 		$this->mainCache = $cache;
 		$this->replLogger = new \Psr\Log\NullLogger();
+
+		$this->movingAveRatio = isset( $options['movingAveRatio'] )
+			? $options['movingAveRatio']
+			: 0.1;
 	}
 
 	public function setLogger( LoggerInterface $logger ) {
 		$this->replLogger = $logger;
 	}
 
-	public function scaleLoads( &$loads, $group = false, $domain = false ) {
+	public function scaleLoads( array &$weightByServer, $group = false, $domain = false ) {
+		$serverIndexes = array_keys( $weightByServer );
+		$states = $this->getServerStates( $serverIndexes, $domain );
+		$coefficientsByServer = $states['weightScales'];
+		foreach ( $weightByServer as $i => $weight ) {
+			$weightByServer[$i] = $weight * $coefficientsByServer[$i];
+		}
 	}
 
-	public function getLagTimes( $serverIndexes, $domain ) {
+	public function getLagTimes( array $serverIndexes, $domain ) {
+		$states = $this->getServerStates( $serverIndexes, $domain );
+
+		return $states['lagTimes'];
+	}
+
+	protected function getServerStates( array $serverIndexes, $domain ) {
 		if ( count( $serverIndexes ) == 1 && reset( $serverIndexes ) == 0 ) {
 			# Single server only, just return zero without caching
-			return [ 0 => 0 ];
+			return [
+				'lagTimes' => [ $this->parent->getWriterIndex() => 0 ],
+				'weightScales' => [ $this->parent->getWriterIndex() => 1 ]
+			];
 		}
 
-		$key = $this->getLagTimeCacheKey();
+		$key = $this->getCacheKey();
 		# Randomize TTLs to reduce stampedes (4.0 - 5.0 sec)
 		$ttl = mt_rand( 4e6, 5e6 ) / 1e6;
 		# Keep keys around longer as fallbacks
@@ -67,7 +93,7 @@ class LoadMonitor implements ILoadMonitor {
 		$value = $this->srvCache->get( $key );
 		if ( $value && $value['timestamp'] > ( microtime( true ) - $ttl ) ) {
 			$this->replLogger->debug( __METHOD__ . ": got lag times ($key) from local cache" );
-			return $value['lagTimes']; // cache hit
+			return $value; // cache hit
 		}
 		$staleValue = $value ?: false;
 
@@ -77,7 +103,7 @@ class LoadMonitor implements ILoadMonitor {
 			$this->srvCache->set( $key, $value, $staleTTL );
 			$this->replLogger->debug( __METHOD__ . ": got lag times ($key) from main cache" );
 
-			return $value['lagTimes']; // cache hit
+			return $value; // cache hit
 		}
 		$staleValue = $value ?: $staleValue;
 
@@ -91,13 +117,16 @@ class LoadMonitor implements ILoadMonitor {
 			} );
 		} elseif ( $staleValue ) {
 			# Could not acquire lock but an old cache exists, so use it
-			return $staleValue['lagTimes'];
+			return $staleValue;
 		}
 
 		$lagTimes = [];
+		$weightScales = [];
+		$movAveRatio = $this->movingAveRatio;
 		foreach ( $serverIndexes as $i ) {
 			if ( $i == $this->parent->getWriterIndex() ) {
 				$lagTimes[$i] = 0; // master always has no lag
+				$weightScales[$i] = 1.0; // nominal weight
 				continue;
 			}
 
@@ -109,17 +138,26 @@ class LoadMonitor implements ILoadMonitor {
 				$close = true; // new connection
 			}
 
+			$lastWeight = isset( $staleValue['weightScales'][$i] )
+				? $staleValue['weightScales'][$i]
+				: 1.0;
+			$coefficient = $this->getWeightScale( $i, $conn ?: null );
+			$newWeight = $movAveRatio * $coefficient + ( 1 - $movAveRatio ) * $lastWeight;
+
+			// Scale from 10% to 100% of nominal weight
+			$weightScales[$i] = max( $newWeight, .10 );
+
 			if ( !$conn ) {
 				$lagTimes[$i] = false;
 				$host = $this->parent->getServerName( $i );
-				$this->replLogger->error( __METHOD__ . ": host $host (#$i) is unreachable" );
+				$this->replLogger->error( __METHOD__ . ": host $host is unreachable" );
 				continue;
 			}
 
 			$lagTimes[$i] = $conn->getLag();
 			if ( $lagTimes[$i] === false ) {
 				$host = $this->parent->getServerName( $i );
-				$this->replLogger->error( __METHOD__ . ": host $host (#$i) is not replicating?" );
+				$this->replLogger->error( __METHOD__ . ": host $host is not replicating?" );
 			}
 
 			if ( $close ) {
@@ -132,26 +170,39 @@ class LoadMonitor implements ILoadMonitor {
 		}
 
 		# Add a timestamp key so we know when it was cached
-		$value = [ 'lagTimes' => $lagTimes, 'timestamp' => microtime( true ) ];
+		$value = [
+			'lagTimes' => $lagTimes,
+			'weightScales' => $weightScales,
+			'timestamp' => microtime( true )
+		];
 		$this->mainCache->set( $key, $value, $staleTTL );
 		$this->srvCache->set( $key, $value, $staleTTL );
 		$this->replLogger->info( __METHOD__ . ": re-calculated lag times ($key)" );
 
-		return $value['lagTimes'];
+		return $value;
+	}
+
+	/**
+	 * @param integer $index Server index
+	 * @param IDatabase|null $conn Connection handle or null on connection failure
+	 * @return float
+	 */
+	protected function getWeightScale( $index, IDatabase $conn = null ) {
+		return $conn ? 1.0 : 0.0;
 	}
 
 	public function clearCaches() {
-		$key = $this->getLagTimeCacheKey();
+		$key = $this->getCacheKey();
 		$this->srvCache->delete( $key );
 		$this->mainCache->delete( $key );
 	}
 
-	private function getLagTimeCacheKey() {
-		$writerIndex = $this->parent->getWriterIndex();
+	private function getCacheKey() {
 		// Lag is per-server, not per-DB, so key on the master DB name
 		return $this->srvCache->makeGlobalKey(
 			'lag-times',
-			$this->parent->getServerName( $writerIndex )
+			self::VERSION,
+			$this->parent->getServerName( $this->parent->getWriterIndex() )
 		);
 	}
 }
diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php b/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
index 7286417096..babd6091b7 100644
--- a/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
+++ b/includes/libs/rdbms/loadmonitor/LoadMonitorMySQL.php
@@ -26,8 +26,45 @@
  * @ingroup Database
  */
 class LoadMonitorMySQL extends LoadMonitor {
-	public function scaleLoads( &$loads, $group = false, $domain = false ) {
-		// @TODO: maybe use Threads_running/Threads_created ratio to guess load
-		// and Queries/Uptime to guess if a server is warming up the buffer pool
+	/** @var float What buffer pool use ratio counts as "warm" (e.g. 0.5 for 50% usage) */
+	private $warmCacheRatio;
+
+	public function __construct(
+		ILoadBalancer $lb, BagOStuff $srvCache, BagOStuff $cache, array $options = []
+	) {
+		parent::__construct( $lb, $srvCache, $cache, $options );
+
+		$this->warmCacheRatio = isset( $options['warmCacheRatio'] )
+			? $options['warmCacheRatio']
+			: 0.0;
+	}
+
+	protected function getWeightScale( $index, IDatabase $conn = null ) {
+		if ( !$conn ) {
+			return 0.0;
+		}
+
+		$weight = 1.0;
+		if ( $this->warmCacheRatio > 0 ) {
+			$res = $conn->query( 'SHOW STATUS', false );
+			$s = $res ? $conn->fetchObject( $res ) : false;
+			if ( $s === false ) {
+				$host = $this->parent->getServerName( $index );
+				$this->replLogger->error( __METHOD__ . ": could not get status for $host" );
+			} else {
+				// http://dev.mysql.com/doc/refman/5.7/en/server-status-variables.html
+				if ( $s->Innodb_buffer_pool_pages_total > 0 ) {
+					$ratio = $s->Innodb_buffer_pool_pages_data / $s->Innodb_buffer_pool_pages_total;
+				} elseif ( $s->Qcache_total_blocks > 0 ) {
+					$ratio = 1.0 - $s->Qcache_free_blocks / $s->Qcache_total_blocks;
+				} else {
+					$ratio = 1.0;
+				}
+				// Stop caring once $ratio >= $this->warmCacheRatio
+				$weight *= min( $ratio / $this->warmCacheRatio, 1.0 );
+			}
+		}
+
+		return $weight;
 	}
 }
diff --git a/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php b/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
index 8062001eae..67bac2bb35 100644
--- a/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
+++ b/includes/libs/rdbms/loadmonitor/LoadMonitorNull.php
@@ -21,18 +21,20 @@
 use Psr\Log\LoggerInterface;
 
 class LoadMonitorNull implements ILoadMonitor {
-	public function __construct( ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache ) {
+	public function __construct(
+		ILoadBalancer $lb, BagOStuff $sCache, BagOStuff $cCache, array $options = []
+	) {
 
 	}
 
 	public function setLogger( LoggerInterface $logger ) {
 	}
 
-	public function scaleLoads( &$loads, $group = false, $domain = false ) {
+	public function scaleLoads( array &$loads, $group = false, $domain = false ) {
 
 	}
 
-	public function getLagTimes( $serverIndexes, $domain ) {
+	public function getLagTimes( array $serverIndexes, $domain ) {
 		return array_fill_keys( $serverIndexes, 0 );
 	}
 
diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 7746d99bcb..21864eefbf 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -714,6 +714,12 @@ class ManualLogEntry extends LogEntryBase {
 					$rc = $this->getRecentChange( $newId );
 
 					if ( $to === 'rc' || $to === 'rcandudp' ) {
+						// save RC, passing tags so they are applied there
+						$tags = $this->getTags();
+						if ( is_null( $tags ) ) {
+							$tags = [];
+						}
+						$rc->addTags( $tags );
 						$rc->save( 'pleasedontudp' );
 					}
 
@@ -727,14 +733,6 @@ class ManualLogEntry extends LogEntryBase {
 					) {
 						PatrolLog::record( $rc, true, $this->getPerformer() );
 					}
-
-					// Add change tags to the log entry and (if applicable) the associated revision
-					$tags = $this->getTags();
-					if ( !is_null( $tags ) ) {
-						$rcId = $rc->getAttribute( 'rc_id' );
-						$revId = $this->getAssociatedRevId(); // Use null if $revId is 0
-						ChangeTags::addTags( $tags, $rcId, $revId > 0 ? $revId : null, $newId );
-					}
 				}
 			},
 			DeferredUpdates::POSTSEND,
diff --git a/includes/media/JpegMetadataExtractor.php b/includes/media/JpegMetadataExtractor.php
index 81722c6d62..9ad40977bc 100644
--- a/includes/media/JpegMetadataExtractor.php
+++ b/includes/media/JpegMetadataExtractor.php
@@ -155,7 +155,7 @@ class JpegMetadataExtractor {
 			} else {
 				// segment we don't care about, so skip
 				$size = wfUnpack( "nint", fread( $fh, 2 ), 2 );
-				if ( $size['int'] <= 2 ) {
+				if ( $size['int'] < 2 ) {
 					throw new MWException( "invalid marker size in jpeg" );
 				}
 				fseek( $fh, $size['int'] - 2, SEEK_CUR );
@@ -173,9 +173,13 @@ class JpegMetadataExtractor {
 	 */
 	private static function jpegExtractMarker( &$fh ) {
 		$size = wfUnpack( "nint", fread( $fh, 2 ), 2 );
-		if ( $size['int'] <= 2 ) {
+		if ( $size['int'] < 2 ) {
 			throw new MWException( "invalid marker size in jpeg" );
 		}
+		if ( $size['int'] === 2 ) {
+			// fread( ..., 0 ) generates a warning
+			return '';
+		}
 		$segment = fread( $fh, $size['int'] - 2 );
 		if ( strlen( $segment ) !== $size['int'] - 2 ) {
 			throw new MWException( "Segment shorter than expected" );
diff --git a/includes/objectcache/ObjectCache.php b/includes/objectcache/ObjectCache.php
index d81f9e13cb..87a62727fe 100644
--- a/includes/objectcache/ObjectCache.php
+++ b/includes/objectcache/ObjectCache.php
@@ -50,7 +50,7 @@ use MediaWiki\MediaWikiServices;
  *
  * - ObjectCache::getLocalServerInstance( $fallbackType )
  *   Purpose: Memory cache for very hot keys.
- *   Stored only on the individual web server (typically APC for web requests,
+ *   Stored only on the individual web server (typically APC or APCu for web requests,
  *   and EmptyBagOStuff in CLI mode).
  *   Not replicated to the other servers.
  *
@@ -265,7 +265,7 @@ class ObjectCache {
 	/**
 	 * Factory function for CACHE_ACCEL (referenced from DefaultSettings.php)
 	 *
-	 * This will look for any APC style server-local cache.
+	 * This will look for any APC or APCu style server-local cache.
 	 * A fallback cache can be specified if none is found.
 	 *
 	 *     // Direct calls
@@ -282,6 +282,8 @@ class ObjectCache {
 	public static function getLocalServerInstance( $fallback = CACHE_NONE ) {
 		if ( function_exists( 'apc_fetch' ) ) {
 			$id = 'apc';
+		} elseif ( function_exists( 'apcu_fetch' ) ) {
+			$id = 'apcu';
 		} elseif ( function_exists( 'xcache_get' ) && wfIniGetBool( 'xcache.var_size' ) ) {
 			$id = 'xcache';
 		} elseif ( function_exists( 'wincache_ucache_get' ) ) {
diff --git a/includes/page/Article.php b/includes/page/Article.php
index 770ae31af6..338b1aeb89 100644
--- a/includes/page/Article.php
+++ b/includes/page/Article.php
@@ -2114,7 +2114,7 @@ class Article implements Page {
 	 * @deprecated since 1.21: use doEditContent() instead.
 	 */
 	public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
-		ContentHandler::deprecated( __METHOD__, '1.21' );
+		wfDeprecated( __METHOD__, '1.21' );
 		return $this->mPage->doEdit( $text, $summary, $flags, $baseRevId, $user );
 	}
 
@@ -2154,18 +2154,6 @@ class Article implements Page {
 		return $this->mPage->getLastPurgeTimestamp();
 	}
 
-	/**
-	 * Call to WikiPage function for backwards compatibility.
-	 * @see WikiPage::doQuickEditContent
-	 */
-	public function doQuickEditContent(
-		Content $content, User $user, $comment = '', $minor = false, $serialFormat = null
-	) {
-		return $this->mPage->doQuickEditContent(
-			$content, $user, $comment, $minor, $serialFormat
-		);
-	}
-
 	/**
 	 * Call to WikiPage function for backwards compatibility.
 	 * @see WikiPage::doViewUpdates
diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php
index 41e9e4f705..98428dd0e8 100644
--- a/includes/page/WikiPage.php
+++ b/includes/page/WikiPage.php
@@ -693,7 +693,7 @@ class WikiPage implements Page, IDBAccessObject {
 	 * @deprecated since 1.21, getContent() should be used instead.
 	 */
 	public function getText( $audience = Revision::FOR_PUBLIC, User $user = null ) {
-		ContentHandler::deprecated( __METHOD__, '1.21' );
+		wfDeprecated( __METHOD__, '1.21' );
 
 		$this->loadLastEdit();
 		if ( $this->mLastRevision ) {
@@ -1577,7 +1577,7 @@ class WikiPage implements Page, IDBAccessObject {
 	 * @deprecated since 1.21: use doEditContent() instead.
 	 */
 	public function doEdit( $text, $summary, $flags = 0, $baseRevId = false, $user = null ) {
-		ContentHandler::deprecated( __METHOD__, '1.21' );
+		wfDeprecated( __METHOD__, '1.21' );
 
 		$content = ContentHandler::makeContent( $text, $this->getTitle() );
 
@@ -2396,41 +2396,6 @@ class WikiPage implements Page, IDBAccessObject {
 		}
 	}
 
-	/**
-	 * Edit an article without doing all that other stuff
-	 * The article must already exist; link tables etc
-	 * are not updated, caches are not flushed.
-	 *
-	 * @param Content $content Content submitted
-	 * @param User $user The relevant user
-	 * @param string $comment Comment submitted
-	 * @param bool $minor Whereas it's a minor modification
-	 * @param string $serialFormat Format for storing the content in the database
-	 */
-	public function doQuickEditContent(
-		Content $content, User $user, $comment = '', $minor = false, $serialFormat = null
-	) {
-
-		$serialized = $content->serialize( $serialFormat );
-
-		$dbw = wfGetDB( DB_MASTER );
-		$revision = new Revision( [
-			'title'      => $this->getTitle(), // for determining the default content model
-			'page'       => $this->getId(),
-			'user_text'  => $user->getName(),
-			'user'       => $user->getId(),
-			'text'       => $serialized,
-			'length'     => $content->getSize(),
-			'comment'    => $comment,
-			'minor_edit' => $minor ? 1 : 0,
-		] ); // XXX: set the content object?
-		$revision->insertOn( $dbw );
-		$this->updateRevisionOn( $dbw, $revision );
-
-		Hooks::run( 'NewRevisionFromEditComplete', [ $this, $revision, false, $user ] );
-
-	}
-
 	/**
 	 * Update the article's restriction field, and leave a log entry.
 	 * This works for protection both existing and non-existing pages.
@@ -3553,7 +3518,7 @@ class WikiPage implements Page, IDBAccessObject {
 		// NOTE: stub for backwards-compatibility. assumes the given text is
 		// wikitext. will break horribly if it isn't.
 
-		ContentHandler::deprecated( __METHOD__, '1.21' );
+		wfDeprecated( __METHOD__, '1.21' );
 
 		$handler = ContentHandler::getForModelID( CONTENT_MODEL_WIKITEXT );
 		$oldContent = is_null( $oldtext ) ? null : $handler->unserializeContent( $oldtext );
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 590d51e609..a32acc2d36 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4138,12 +4138,13 @@ class Parser {
 			# * <b> (r105284)
 			# * <bdi> (bug 72884)
 			# * <span dir="rtl"> and <span dir="ltr"> (bug 35167)
+			# * <s> and <strike> (T35715)
 			# We strip any parameter from accepted tags (second regex), except dir="rtl|ltr" from <span>,
 			# to allow setting directionality in toc items.
 			$tocline = preg_replace(
 				[
-					'#<(?!/?(span|sup|sub|bdi|i|b)(?: [^>]*)?>).*?>#',
-					'#<(/?(?:span(?: dir="(?:rtl|ltr)")?|sup|sub|bdi|i|b))(?: .*?)?>#'
+					'#<(?!/?(span|sup|sub|bdi|i|b|s|strike)(?: [^>]*)?>).*?>#',
+					'#<(/?(?:span(?: dir="(?:rtl|ltr)")?|sup|sub|bdi|i|b|s|strike))(?: .*?)?>#'
 				],
 				[ '', '<$1>' ],
 				$safeHeadline
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 297dcb20a1..db9c95b195 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -162,9 +162,9 @@ abstract class Profiler {
 	abstract public function scopedProfileIn( $section );
 
 	/**
-	 * @param ScopedCallback $section
+	 * @param SectionProfileCallback $section
 	 */
-	public function scopedProfileOut( ScopedCallback &$section = null ) {
+	public function scopedProfileOut( SectionProfileCallback &$section = null ) {
 		$section = null;
 	}
 
diff --git a/includes/profiler/SectionProfiler.php b/includes/profiler/SectionProfiler.php
index 65ac6e6141..7e3c398bb0 100644
--- a/includes/profiler/SectionProfiler.php
+++ b/includes/profiler/SectionProfiler.php
@@ -21,6 +21,7 @@
  * @ingroup Profiler
  * @author Aaron Schulz
  */
+use Wikimedia\ScopedCallback;
 
 /**
  * Custom PHP profiler for parser/DB type section names that xhprof/xdebug can't handle
@@ -57,7 +58,7 @@ class SectionProfiler {
 
 	/**
 	 * @param string $section
-	 * @return ScopedCallback
+	 * @return SectionProfileCallback
 	 */
 	public function scopedProfileIn( $section ) {
 		$this->profileInInternal( $section );
diff --git a/includes/resourceloader/ResourceLoaderContext.php b/includes/resourceloader/ResourceLoaderContext.php
index 4a2f759d5e..b17200f1cc 100644
--- a/includes/resourceloader/ResourceLoaderContext.php
+++ b/includes/resourceloader/ResourceLoaderContext.php
@@ -26,7 +26,7 @@ use MediaWiki\Logger\LoggerFactory;
 
 /**
  * Object passed around to modules which contains information about the state
- * of a specific loader request
+ * of a specific loader request.
  */
 class ResourceLoaderContext {
 	protected $resourceLoader;
@@ -62,26 +62,33 @@ class ResourceLoaderContext {
 		$this->request = $request;
 		$this->logger = $resourceLoader->getLogger();
 
+		// Future developers: Avoid use of getVal() in this class, which performs
+		// expensive UTF normalisation by default. Use getRawVal() instead.
+		// Values here are either one of a finite number of internal IDs,
+		// or previously-stored user input (e.g. titles, user names) that were passed
+		// to this endpoint by ResourceLoader itself from the canonical value.
+		// Values do not come directly from user input and need not match.
+
 		// List of modules
-		$modules = $request->getVal( 'modules' );
+		$modules = $request->getRawVal( 'modules' );
 		$this->modules = $modules ? self::expandModuleNames( $modules ) : [];
 
 		// Various parameters
-		$this->user = $request->getVal( 'user' );
+		$this->user = $request->getRawVal( 'user' );
 		$this->debug = $request->getFuzzyBool(
 			'debug',
 			$resourceLoader->getConfig()->get( 'ResourceLoaderDebug' )
 		);
-		$this->only = $request->getVal( 'only', null );
-		$this->version = $request->getVal( 'version', null );
+		$this->only = $request->getRawVal( 'only', null );
+		$this->version = $request->getRawVal( 'version', null );
 		$this->raw = $request->getFuzzyBool( 'raw' );
 
 		// Image requests
-		$this->image = $request->getVal( 'image' );
-		$this->variant = $request->getVal( 'variant' );
-		$this->format = $request->getVal( 'format' );
+		$this->image = $request->getRawVal( 'image' );
+		$this->variant = $request->getRawVal( 'variant' );
+		$this->format = $request->getRawVal( 'format' );
 
-		$this->skin = $request->getVal( 'skin' );
+		$this->skin = $request->getRawVal( 'skin' );
 		$skinnames = Skin::getSkinNames();
 		// If no skin is specified, or we don't recognize the skin, use the default skin
 		if ( !$this->skin || !isset( $skinnames[$this->skin] ) ) {
@@ -171,7 +178,7 @@ class ResourceLoaderContext {
 		if ( $this->language === null ) {
 			// Must be a valid language code after this point (T64849)
 			// Only support uselang values that follow built-in conventions (T102058)
-			$lang = $this->getRequest()->getVal( 'lang', '' );
+			$lang = $this->getRequest()->getRawVal( 'lang', '' );
 			// Stricter version of RequestContext::sanitizeLangCode()
 			if ( !Language::isValidBuiltInCode( $lang ) ) {
 				wfDebug( "Invalid user language code\n" );
@@ -187,7 +194,7 @@ class ResourceLoaderContext {
 	 */
 	public function getDirection() {
 		if ( $this->direction === null ) {
-			$this->direction = $this->getRequest()->getVal( 'dir' );
+			$this->direction = $this->getRequest()->getRawVal( 'dir' );
 			if ( !$this->direction ) {
 				// Determine directionality based on user language (bug 6100)
 				$this->direction = Language::factory( $this->getLanguage() )->getDir();
diff --git a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
index 4d0bff7949..aef1c74452 100644
--- a/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
+++ b/includes/resourceloader/ResourceLoaderUserCSSPrefsModule.php
@@ -55,12 +55,6 @@ class ResourceLoaderUserCSSPrefsModule extends ResourceLoaderModule {
 			$rules[] = "a { text-decoration: " .
 				( $options['underline'] ? 'underline' : 'none' ) . "; }";
 		}
-		if ( $options['editfont'] !== 'default' ) {
-			// Double-check that $options['editfont'] consists of safe characters only
-			if ( preg_match( '/^[a-zA-Z0-9_, -]+$/', $options['editfont'] ) ) {
-				$rules[] = "textarea { font-family: {$options['editfont']}; }\n";
-			}
-		}
 		$style = implode( "\n", $rules );
 		if ( $this->getFlip( $context ) ) {
 			$style = CSSJanus::transform( $style, true, false );
diff --git a/includes/resourceloader/ResourceLoaderWikiModule.php b/includes/resourceloader/ResourceLoaderWikiModule.php
index 4fdd86eaca..7cbec706e4 100644
--- a/includes/resourceloader/ResourceLoaderWikiModule.php
+++ b/includes/resourceloader/ResourceLoaderWikiModule.php
@@ -305,7 +305,11 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 		$titleInfo = [];
 		$batch = new LinkBatch;
 		foreach ( $pages as $titleText ) {
-			$batch->addObj( Title::newFromText( $titleText ) );
+			$title = Title::newFromText( $titleText );
+			if ( $title ) {
+				// Page name may be invalid if user-provided (e.g. gadgets)
+				$batch->addObj( $title );
+			}
 		}
 		if ( !$batch->isEmpty() ) {
 			$res = $db->select( 'page',
@@ -359,8 +363,16 @@ class ResourceLoaderWikiModule extends ResourceLoaderModule {
 			// Before we intersect, map the names to canonical form (T145673).
 			$intersect = [];
 			foreach ( $pages as $page => $unused ) {
-				$title = Title::newFromText( $page )->getPrefixedText();
-				$intersect[$title] = 1;
+				$title = Title::newFromText( $page );
+				if ( $title ) {
+					$intersect[ $title->getPrefixedText() ] = 1;
+				} else {
+					// Page name may be invalid if user-provided (e.g. gadgets)
+					$rl->getLogger()->info(
+						'Invalid wiki page title "{title}" in ' . __METHOD__,
+						[ 'title' => $page ]
+					);
+				}
 			}
 			$info = array_intersect_key( $allInfo, $intersect );
 
diff --git a/includes/search/SearchEngine.php b/includes/search/SearchEngine.php
index 696facba44..90bfebd213 100644
--- a/includes/search/SearchEngine.php
+++ b/includes/search/SearchEngine.php
@@ -547,13 +547,20 @@ abstract class SearchEngine {
 			return $sugg->getSuggestedTitle()->getPrefixedText();
 		} );
 
-		// Rescore results with an exact title match
-		// NOTE: in some cases like cross-namespace redirects
-		// (frequently used as shortcuts e.g. WP:WP on huwiki) some
-		// backends like Cirrus will return no results. We should still
-		// try an exact title match to workaround this limitation
-		$rescorer = new SearchExactMatchRescorer();
-		$rescoredResults = $rescorer->rescore( $search, $this->namespaces, $results, $this->limit );
+		if ( $this->offset === 0 ) {
+			// Rescore results with an exact title match
+			// NOTE: in some cases like cross-namespace redirects
+			// (frequently used as shortcuts e.g. WP:WP on huwiki) some
+			// backends like Cirrus will return no results. We should still
+			// try an exact title match to workaround this limitation
+			$rescorer = new SearchExactMatchRescorer();
+			$rescoredResults = $rescorer->rescore( $search, $this->namespaces, $results, $this->limit );
+		} else {
+			// No need to rescore if offset is not 0
+			// The exact match must have been returned at position 0
+			// if it existed.
+			$rescoredResults = $results;
+		}
 
 		if ( count( $rescoredResults ) > 0 ) {
 			$found = array_search( $rescoredResults[0], $results );
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index ed7c6dfd39..3efbd3bfaa 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -180,6 +180,7 @@ class SkinTemplate extends Skin {
 					'text' => $ilLangName,
 					'title' => $ilTitle,
 					'class' => $class,
+					'link-class' => 'interlanguage-link-target',
 					'lang' => $ilInterwikiCodeBCP47,
 					'hreflang' => $ilInterwikiCodeBCP47,
 				];
diff --git a/includes/specials/SpecialBotPasswords.php b/includes/specials/SpecialBotPasswords.php
index ed3cd5e7e9..1dd78d7cfc 100644
--- a/includes/specials/SpecialBotPasswords.php
+++ b/includes/specials/SpecialBotPasswords.php
@@ -224,7 +224,7 @@ class SpecialBotPasswords extends FormSpecialPage {
 					'name' => 'op',
 					'value' => 'create',
 					'label-message' => 'botpasswords-label-create',
-					'flags' => [ 'primary', 'constructive' ],
+					'flags' => [ 'primary', 'progressive' ],
 				] );
 			}
 
diff --git a/includes/specials/SpecialEditWatchlist.php b/includes/specials/SpecialEditWatchlist.php
index a5a45d5927..0defcd1baf 100644
--- a/includes/specials/SpecialEditWatchlist.php
+++ b/includes/specials/SpecialEditWatchlist.php
@@ -68,8 +68,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 	 */
 	private function initServices() {
 		if ( !$this->titleParser ) {
-			$lang = $this->getContext()->getLanguage();
-			$this->titleParser = new MediaWikiTitleCodec( $lang, GenderCache::singleton() );
+			$this->titleParser = MediaWikiServices::getInstance()->getTitleParser();
 		}
 	}
 
@@ -205,7 +204,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 			}
 		}
 
-		GenderCache::singleton()->doTitlesArray( $titles );
+		MediaWikiServices::getInstance()->getGenderCache()->doTitlesArray( $titles );
 
 		$list = [];
 		/** @var Title $title */
@@ -355,7 +354,7 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 				}
 			}
 
-			GenderCache::singleton()->doTitlesArray( $titles );
+			MediaWikiServices::getInstance()->getGenderCache()->doTitlesArray( $titles );
 
 			foreach ( $titles as $title ) {
 				$list[] = $title->getPrefixedText();
@@ -431,20 +430,22 @@ class SpecialEditWatchlist extends UnlistedSpecialPage {
 		}
 
 		$user = $this->getUser();
-		$store = MediaWikiServices::getInstance()->getWatchedItemStore();
-
-		foreach ( $this->badItems as $row ) {
-			list( $title, $namespace, $dbKey ) = $row;
-			$action = $title ? 'cleaning up' : 'deleting';
-			wfDebug( "User {$user->getName()} has broken watchlist item ns($namespace):$dbKey, $action.\n" );
-
-			$store->removeWatch( $user, new TitleValue( (int)$namespace, $dbKey ) );
-
-			// Can't just do an UPDATE instead of DELETE/INSERT due to unique index
-			if ( $title ) {
-				$user->addWatch( $title );
+		$badItems = $this->badItems;
+		DeferredUpdates::addCallableUpdate( function () use ( $user, $badItems ) {
+			$store = MediaWikiServices::getInstance()->getWatchedItemStore();
+			foreach ( $badItems as $row ) {
+				list( $title, $namespace, $dbKey ) = $row;
+				$action = $title ? 'cleaning up' : 'deleting';
+				wfDebug( "User {$user->getName()} has broken watchlist item " .
+					"ns($namespace):$dbKey, $action.\n" );
+
+				$store->removeWatch( $user, new TitleValue( (int)$namespace, $dbKey ) );
+				// Can't just do an UPDATE instead of DELETE/INSERT due to unique index
+				if ( $title ) {
+					$user->addWatch( $title );
+				}
 			}
-		}
+		} );
 	}
 
 	/**
diff --git a/includes/specials/SpecialImport.php b/includes/specials/SpecialImport.php
index fe1dd985d7..c58af603d2 100644
--- a/includes/specials/SpecialImport.php
+++ b/includes/specials/SpecialImport.php
@@ -594,9 +594,13 @@ class ImportReporter extends ContextSource {
 		$this->mPageCount++;
 
 		if ( $successCount > 0 ) {
+			// <bdi> prevents jumbling of the versions count
+			// in RTL wikis in case the page title is LTR
 			$this->getOutput()->addHTML(
 				"<li>" . Linker::linkKnown( $title ) . " " .
+					"<bdi>" .
 					$this->msg( 'import-revision-count' )->numParams( $successCount )->escaped() .
+					"</bdi>" .
 					"</li>\n"
 			);
 
diff --git a/includes/specials/SpecialMovepage.php b/includes/specials/SpecialMovepage.php
index 3a12cf3ce3..7b7661d037 100644
--- a/includes/specials/SpecialMovepage.php
+++ b/includes/specials/SpecialMovepage.php
@@ -462,7 +462,7 @@ class MovePageForm extends UnlistedSpecialPage {
 				'name' => 'wpMove',
 				'value' => $this->msg( 'movepagebtn' )->text(),
 				'label' => $this->msg( 'movepagebtn' )->text(),
-				'flags' => [ 'constructive', 'primary' ],
+				'flags' => [ 'primary', 'progressive' ],
 				'type' => 'submit',
 			] ),
 			[
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
old mode 100644
new mode 100755
index 718a6dc794..d719e53bdd
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -376,7 +376,11 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 		if ( !$title->equals( $oldTitle ) ) {
 			$oldTitleText = $oldTitle->getPrefixedText();
-			$oldTitleText = $this->msg( 'rc-old-title' )->params( $oldTitleText )->escaped();
+			$oldTitleText = Html::rawElement(
+				'span',
+				[ 'class' => 'mw-newpages-oldtitle' ],
+				$this->msg( 'rc-old-title' )->params( $oldTitleText )->escaped()
+			);
 		}
 
 		return "<li{$css}>{$time} {$dm}{$plink} {$hist} {$dm}{$length} "
diff --git a/includes/user/BotPassword.php b/includes/user/BotPassword.php
index eae57f40dc..57610fc9e4 100644
--- a/includes/user/BotPassword.php
+++ b/includes/user/BotPassword.php
@@ -68,7 +68,7 @@ class BotPassword implements IDBAccessObject {
 	/**
 	 * Get a database connection for the bot passwords database
 	 * @param int $db Index of the connection to get, e.g. DB_MASTER or DB_REPLICA.
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	public static function getDB( $db ) {
 		global $wgBotPasswordsCluster, $wgBotPasswordsDatabase;
diff --git a/includes/user/User.php b/includes/user/User.php
index 6083db97e3..00fc9be4c3 100644
--- a/includes/user/User.php
+++ b/includes/user/User.php
@@ -1802,12 +1802,16 @@ class User implements IDBAccessObject {
 			return false;
 		}
 
+		$limits = array_merge(
+			[ '&can-bypass' => true ],
+			$wgRateLimits[$action]
+		);
+
 		// Some groups shouldn't trigger the ping limiter, ever
-		if ( !$this->isPingLimitable() ) {
+		if ( $limits['&can-bypass'] && !$this->isPingLimitable() ) {
 			return false;
 		}
 
-		$limits = $wgRateLimits[$action];
 		$keys = [];
 		$id = $this->getId();
 		$userLimit = false;
diff --git a/includes/utils/AutoloadGenerator.php b/includes/utils/AutoloadGenerator.php
index 395ce379f8..319b5d4854 100644
--- a/includes/utils/AutoloadGenerator.php
+++ b/includes/utils/AutoloadGenerator.php
@@ -160,6 +160,7 @@ class AutoloadGenerator {
 	 *
 	 * @param {string} $commandName Command name to include in comment
 	 * @param {string} $filename of PHP file to put autoload information in.
+	 * @return string
 	 */
 	protected function generatePHPAutoload( $commandName, $filename ) {
 		// No existing JSON file found; update/generate PHP file
@@ -290,6 +291,10 @@ EOD;
 		foreach ( glob( $this->basepath . '/*.php' ) as $file ) {
 			$this->readFile( $file );
 		}
+
+		// Legacy aliases
+		$this->forceClassPath( 'DatabaseBase',
+			$this->basepath . '/includes/libs/rdbms/database/Database.php' );
 	}
 }
 
diff --git a/includes/utils/MWCryptHash.php b/includes/utils/MWCryptHash.php
deleted file mode 100644
index 11173573e7..0000000000
--- a/includes/utils/MWCryptHash.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?php
-/**
- * Utility functions for generating hashes
- *
- * This is based in part on Drupal code as well as what we used in our own code
- * prior to introduction of this class, by way of MWCryptRand.
- *
- * 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 MWCryptHash {
-	/**
-	 * The hash algorithm being used
-	 */
-	protected static $algo = null;
-
-	/**
-	 * The number of bytes outputted by the hash algorithm
-	 */
-	protected static $hashLength = [
-		true => null,
-		false => null,
-	];
-
-	/**
-	 * Decide on the best acceptable hash algorithm we have available for hash()
-	 * @return string A hash algorithm
-	 */
-	public static function hashAlgo() {
-		if ( !is_null( self::$algo ) ) {
-			return self::$algo;
-		}
-
-		$algos = hash_algos();
-		$preference = [ 'whirlpool', 'sha256', 'sha1', 'md5' ];
-
-		foreach ( $preference as $algorithm ) {
-			if ( in_array( $algorithm, $algos ) ) {
-				self::$algo = $algorithm;
-				wfDebug( __METHOD__ . ': Using the ' . self::$algo . " hash algorithm.\n" );
-
-				return self::$algo;
-			}
-		}
-
-		// We only reach here if no acceptable hash is found in the list, this should
-		// be a technical impossibility since most of php's hash list is fixed and
-		// some of the ones we list are available as their own native functions
-		// But since we already require at least 5.2 and hash() was default in
-		// 5.1.2 we don't bother falling back to methods like sha1 and md5.
-		throw new DomainException( "Could not find an acceptable hashing function in hash_algos()" );
-	}
-
-	/**
-	 * Return the byte-length output of the hash algorithm we are
-	 * using in self::hash and self::hmac.
-	 *
-	 * @param bool $raw True to return the length for binary data, false to
-	 *   return for hex-encoded
-	 * @return int Number of bytes the hash outputs
-	 */
-	public static function hashLength( $raw = true ) {
-		$raw = (bool)$raw;
-		if ( is_null( self::$hashLength[$raw] ) ) {
-			self::$hashLength[$raw] = strlen( self::hash( '', $raw ) );
-		}
-
-		return self::$hashLength[$raw];
-	}
-
-	/**
-	 * Generate an acceptably unstable one-way-hash of some text
-	 * making use of the best hash algorithm that we have available.
-	 *
-	 * @param string $data
-	 * @param bool $raw True to return binary data, false to return it hex-encoded
-	 * @return string A hash of the data
-	 */
-	public static function hash( $data, $raw = true ) {
-		return hash( self::hashAlgo(), $data, $raw );
-	}
-
-	/**
-	 * Generate an acceptably unstable one-way-hmac of some text
-	 * making use of the best hash algorithm that we have available.
-	 *
-	 * @param string $data
-	 * @param string $key
-	 * @param bool $raw True to return binary data, false to return it hex-encoded
-	 * @return string An hmac hash of the data + key
-	 */
-	public static function hmac( $data, $key, $raw = true ) {
-		if ( !is_string( $key ) ) {
-			// a fatal error in HHVM; an exception will at least give us a stack trace
-			throw new InvalidArgumentException( 'Invalid key type: ' . gettype( $key ) );
-		}
-		return hash_hmac( self::hashAlgo(), $data, $key, $raw );
-	}
-
-}
diff --git a/includes/utils/MWCryptRand.php b/includes/utils/MWCryptRand.php
index dd3ea1b87e..581895807c 100644
--- a/includes/utils/MWCryptRand.php
+++ b/includes/utils/MWCryptRand.php
@@ -24,357 +24,14 @@
  * @file
  */
 
-class MWCryptRand {
-	/**
-	 * Minimum number of iterations we want to make in our drift calculations.
-	 */
-	const MIN_ITERATIONS = 1000;
-
-	/**
-	 * Number of milliseconds we want to spend generating each separate byte
-	 * of the final generated bytes.
-	 * This is used in combination with the hash length to determine the duration
-	 * we should spend doing drift calculations.
-	 */
-	const MSEC_PER_BYTE = 0.5;
-
-	/**
-	 * Singleton instance for public use
-	 */
-	protected static $singleton = null;
-
-	/**
-	 * A boolean indicating whether the previous random generation was done using
-	 * cryptographically strong random number generator or not.
-	 */
-	protected $strong = null;
-
-	/**
-	 * Initialize an initial random state based off of whatever we can find
-	 * @return string
-	 */
-	protected function initialRandomState() {
-		// $_SERVER contains a variety of unstable user and system specific information
-		// It'll vary a little with each page, and vary even more with separate users
-		// It'll also vary slightly across different machines
-		$state = serialize( $_SERVER );
-
-		// To try vary the system information of the state a bit more
-		// by including the system's hostname into the state
-		$state .= wfHostname();
-
-		// Try to gather a little entropy from the different php rand sources
-		$state .= rand() . uniqid( mt_rand(), true );
-
-		// Include some information about the filesystem's current state in the random state
-		$files = [];
-
-		// We know this file is here so grab some info about ourselves
-		$files[] = __FILE__;
-
-		// We must also have a parent folder, and with the usual file structure, a grandparent
-		$files[] = __DIR__;
-		$files[] = dirname( __DIR__ );
-
-		// The config file is likely the most often edited file we know should
-		// be around so include its stat info into the state.
-		// The constant with its location will almost always be defined, as
-		// WebStart.php defines MW_CONFIG_FILE to $IP/LocalSettings.php unless
-		// being configured with MW_CONFIG_CALLBACK (e.g. the installer).
-		if ( defined( 'MW_CONFIG_FILE' ) ) {
-			$files[] = MW_CONFIG_FILE;
-		}
-
-		foreach ( $files as $file ) {
-			MediaWiki\suppressWarnings();
-			$stat = stat( $file );
-			MediaWiki\restoreWarnings();
-			if ( $stat ) {
-				// stat() duplicates data into numeric and string keys so kill off all the numeric ones
-				foreach ( $stat as $k => $v ) {
-					if ( is_numeric( $k ) ) {
-						unset( $k );
-					}
-				}
-				// The absolute filename itself will differ from install to install so don't leave it out
-				$path = realpath( $file );
-				if ( $path !== false ) {
-					$state .= $path;
-				} else {
-					$state .= $file;
-				}
-				$state .= implode( '', $stat );
-			} else {
-				// The fact that the file isn't there is worth at least a
-				// minuscule amount of entropy.
-				$state .= '0';
-			}
-		}
-
-		// Try and make this a little more unstable by including the varying process
-		// id of the php process we are running inside of if we are able to access it
-		if ( function_exists( 'getmypid' ) ) {
-			$state .= getmypid();
-		}
-
-		// If available try to increase the instability of the data by throwing in
-		// the precise amount of memory that we happen to be using at the moment.
-		if ( function_exists( 'memory_get_usage' ) ) {
-			$state .= memory_get_usage( true );
-		}
-
-		// It's mostly worthless but throw the wiki's id into the data for a little more variance
-		$state .= wfWikiID();
-
-		// If we have a secret key set then throw it into the state as well
-		global $wgSecretKey;
-		if ( $wgSecretKey ) {
-			$state .= $wgSecretKey;
-		}
-
-		return $state;
-	}
-
-	/**
-	 * Randomly hash data while mixing in clock drift data for randomness
-	 *
-	 * @param string $data The data to randomly hash.
-	 * @return string The hashed bytes
-	 * @author Tim Starling
-	 */
-	protected function driftHash( $data ) {
-		// Minimum number of iterations (to avoid slow operations causing the
-		// loop to gather little entropy)
-		$minIterations = self::MIN_ITERATIONS;
-		// Duration of time to spend doing calculations (in seconds)
-		$duration = ( self::MSEC_PER_BYTE / 1000 ) * MWCryptHash::hashLength();
-		// Create a buffer to use to trigger memory operations
-		$bufLength = 10000000;
-		$buffer = str_repeat( ' ', $bufLength );
-		$bufPos = 0;
-
-		// Iterate for $duration seconds or at least $minIterations number of iterations
-		$iterations = 0;
-		$startTime = microtime( true );
-		$currentTime = $startTime;
-		while ( $iterations < $minIterations || $currentTime - $startTime < $duration ) {
-			// Trigger some memory writing to trigger some bus activity
-			// This may create variance in the time between iterations
-			$bufPos = ( $bufPos + 13 ) % $bufLength;
-			$buffer[$bufPos] = ' ';
-			// Add the drift between this iteration and the last in as entropy
-			$nextTime = microtime( true );
-			$delta = (int)( ( $nextTime - $currentTime ) * 1000000 );
-			$data .= $delta;
-			// Every 100 iterations hash the data and entropy
-			if ( $iterations % 100 === 0 ) {
-				$data = sha1( $data );
-			}
-			$currentTime = $nextTime;
-			$iterations++;
-		}
-		$timeTaken = $currentTime - $startTime;
-		$data = MWCryptHash::hash( $data );
-
-		wfDebug( __METHOD__ . ": Clock drift calculation " .
-			"(time-taken=" . ( $timeTaken * 1000 ) . "ms, " .
-			"iterations=$iterations, " .
-			"time-per-iteration=" . ( $timeTaken / $iterations * 1e6 ) . "us)\n" );
-
-		return $data;
-	}
-
-	/**
-	 * Return a rolling random state initially build using data from unstable sources
-	 * @return string A new weak random state
-	 */
-	protected function randomState() {
-		static $state = null;
-		if ( is_null( $state ) ) {
-			// Initialize the state with whatever unstable data we can find
-			// It's important that this data is hashed right afterwards to prevent
-			// it from being leaked into the output stream
-			$state = MWCryptHash::hash( $this->initialRandomState() );
-		}
-		// Generate a new random state based on the initial random state or previous
-		// random state by combining it with clock drift
-		$state = $this->driftHash( $state );
-
-		return $state;
-	}
-
-	/**
-	 * @see self::wasStrong()
-	 */
-	public function realWasStrong() {
-		if ( is_null( $this->strong ) ) {
-			throw new MWException( __METHOD__ . ' called before generation of random data' );
-		}
-
-		return $this->strong;
-	}
-
-	/**
-	 * @see self::generate()
-	 */
-	public function realGenerate( $bytes, $forceStrong = false ) {
-
-		wfDebug( __METHOD__ . ": Generating cryptographic random bytes for " .
-			wfGetAllCallers( 5 ) . "\n" );
-
-		$bytes = floor( $bytes );
-		static $buffer = '';
-		if ( is_null( $this->strong ) ) {
-			// Set strength to false initially until we know what source data is coming from
-			$this->strong = true;
-		}
-
-		if ( strlen( $buffer ) < $bytes ) {
-			// If available make use of mcrypt_create_iv URANDOM source to generate randomness
-			// On unix-like systems this reads from /dev/urandom but does it without any buffering
-			// and bypasses openbasedir restrictions, so it's preferable to reading directly
-			// On Windows starting in PHP 5.3.0 Windows' native CryptGenRandom is used to generate
-			// entropy so this is also preferable to just trying to read urandom because it may work
-			// on Windows systems as well.
-			if ( function_exists( 'mcrypt_create_iv' ) ) {
-				$rem = $bytes - strlen( $buffer );
-				$iv = mcrypt_create_iv( $rem, MCRYPT_DEV_URANDOM );
-				if ( $iv === false ) {
-					wfDebug( __METHOD__ . ": mcrypt_create_iv returned false.\n" );
-				} else {
-					$buffer .= $iv;
-					wfDebug( __METHOD__ . ": mcrypt_create_iv generated " . strlen( $iv ) .
-						" bytes of randomness.\n" );
-				}
-			}
-		}
-
-		if ( strlen( $buffer ) < $bytes ) {
-			if ( function_exists( 'openssl_random_pseudo_bytes' ) ) {
-				$rem = $bytes - strlen( $buffer );
-				$openssl_bytes = openssl_random_pseudo_bytes( $rem, $openssl_strong );
-				if ( $openssl_bytes === false ) {
-					wfDebug( __METHOD__ . ": openssl_random_pseudo_bytes returned false.\n" );
-				} else {
-					$buffer .= $openssl_bytes;
-					wfDebug( __METHOD__ . ": openssl_random_pseudo_bytes generated " .
-						strlen( $openssl_bytes ) . " bytes of " .
-						( $openssl_strong ? "strong" : "weak" ) . " randomness.\n" );
-				}
-				if ( strlen( $buffer ) >= $bytes ) {
-					// openssl tells us if the random source was strong, if some of our data was generated
-					// using it use it's say on whether the randomness is strong
-					$this->strong = !!$openssl_strong;
-				}
-			}
-		}
-
-		// Only read from urandom if we can control the buffer size or were passed forceStrong
-		if ( strlen( $buffer ) < $bytes &&
-			( function_exists( 'stream_set_read_buffer' ) || $forceStrong )
-		) {
-			$rem = $bytes - strlen( $buffer );
-			if ( !function_exists( 'stream_set_read_buffer' ) && $forceStrong ) {
-				wfDebug( __METHOD__ . ": Was forced to read from /dev/urandom " .
-					"without control over the buffer size.\n" );
-			}
-			// /dev/urandom is generally considered the best possible commonly
-			// available random source, and is available on most *nix systems.
-			MediaWiki\suppressWarnings();
-			$urandom = fopen( "/dev/urandom", "rb" );
-			MediaWiki\restoreWarnings();
-
-			// Attempt to read all our random data from urandom
-			// php's fread always does buffered reads based on the stream's chunk_size
-			// so in reality it will usually read more than the amount of data we're
-			// asked for and not storing that risks depleting the system's random pool.
-			// If stream_set_read_buffer is available set the chunk_size to the amount
-			// of data we need. Otherwise read 8k, php's default chunk_size.
-			if ( $urandom ) {
-				// php's default chunk_size is 8k
-				$chunk_size = 1024 * 8;
-				if ( function_exists( 'stream_set_read_buffer' ) ) {
-					// If possible set the chunk_size to the amount of data we need
-					stream_set_read_buffer( $urandom, $rem );
-					$chunk_size = $rem;
-				}
-				$random_bytes = fread( $urandom, max( $chunk_size, $rem ) );
-				$buffer .= $random_bytes;
-				fclose( $urandom );
-				wfDebug( __METHOD__ . ": /dev/urandom generated " . strlen( $random_bytes ) .
-					" bytes of randomness.\n" );
-
-				if ( strlen( $buffer ) >= $bytes ) {
-					// urandom is always strong, set to true if all our data was generated using it
-					$this->strong = true;
-				}
-			} else {
-				wfDebug( __METHOD__ . ": /dev/urandom could not be opened.\n" );
-			}
-		}
-
-		// If we cannot use or generate enough data from a secure source
-		// use this loop to generate a good set of pseudo random data.
-		// This works by initializing a random state using a pile of unstable data
-		// and continually shoving it through a hash along with a variable salt.
-		// We hash the random state with more salt to avoid the state from leaking
-		// out and being used to predict the /randomness/ that follows.
-		if ( strlen( $buffer ) < $bytes ) {
-			wfDebug( __METHOD__ .
-				": Falling back to using a pseudo random state to generate randomness.\n" );
-		}
-		while ( strlen( $buffer ) < $bytes ) {
-			$buffer .= MWCryptHash::hmac( $this->randomState(), strval( mt_rand() ) );
-			// This code is never really cryptographically strong, if we use it
-			// at all, then set strong to false.
-			$this->strong = false;
-		}
-
-		// Once the buffer has been filled up with enough random data to fulfill
-		// the request shift off enough data to handle the request and leave the
-		// unused portion left inside the buffer for the next request for random data
-		$generated = substr( $buffer, 0, $bytes );
-		$buffer = substr( $buffer, $bytes );
-
-		wfDebug( __METHOD__ . ": " . strlen( $buffer ) .
-			" bytes of randomness leftover in the buffer.\n" );
-
-		return $generated;
-	}
-
-	/**
-	 * @see self::generateHex()
-	 */
-	public function realGenerateHex( $chars, $forceStrong = false ) {
-		// hex strings are 2x the length of raw binary so we divide the length in half
-		// odd numbers will result in a .5 that leads the generate() being 1 character
-		// short, so we use ceil() to ensure that we always have enough bytes
-		$bytes = ceil( $chars / 2 );
-		// Generate the data and then convert it to a hex string
-		$hex = bin2hex( $this->generate( $bytes, $forceStrong ) );
-
-		// A bit of paranoia here, the caller asked for a specific length of string
-		// here, and it's possible (eg when given an odd number) that we may actually
-		// have at least 1 char more than they asked for. Just in case they made this
-		// call intending to insert it into a database that does truncation we don't
-		// want to give them too much and end up with their database and their live
-		// code having two different values because part of what we gave them is truncated
-		// hence, we strip out any run of characters longer than what we were asked for.
-		return substr( $hex, 0, $chars );
-	}
-
-	/** Publicly exposed static methods **/
+use MediaWiki\MediaWikiServices;
 
+class MWCryptRand {
 	/**
-	 * Return a singleton instance of MWCryptRand
-	 * @return MWCryptRand
+	 * @return CryptRand
 	 */
 	protected static function singleton() {
-		if ( is_null( self::$singleton ) ) {
-			self::$singleton = new self;
-		}
-
-		return self::$singleton;
+		return MediaWikiServices::getInstance()->getCryptRand();
 	}
 
 	/**
@@ -385,7 +42,7 @@ class MWCryptRand {
 	 * @return bool Returns true if the source was strong, false if not.
 	 */
 	public static function wasStrong() {
-		return self::singleton()->realWasStrong();
+		return self::singleton()->wasStrong();
 	}
 
 	/**
@@ -401,7 +58,7 @@ class MWCryptRand {
 	 * @return string Raw binary random data
 	 */
 	public static function generate( $bytes, $forceStrong = false ) {
-		return self::singleton()->realGenerate( $bytes, $forceStrong );
+		return self::singleton()->generate( $bytes, $forceStrong );
 	}
 
 	/**
@@ -417,6 +74,6 @@ class MWCryptRand {
 	 * @return string Hexadecimal random data
 	 */
 	public static function generateHex( $chars, $forceStrong = false ) {
-		return self::singleton()->realGenerateHex( $chars, $forceStrong );
+		return self::singleton()->generateHex( $chars, $forceStrong );
 	}
 }
diff --git a/languages/i18n/ace.json b/languages/i18n/ace.json
index 88eb4bfc79..5ad5bd372d 100644
--- a/languages/i18n/ace.json
+++ b/languages/i18n/ace.json
@@ -501,7 +501,7 @@
 	"preview": "Eu dilèë",
 	"showpreview": "Peuleumah hasé",
 	"showdiff": "Peuleumah neuubah",
-	"anoneditwarning": "Droëneuh   hana teudapeuta tamong. Alamat IP Droëneuh   teucatat lam tarèh (riwayat away) ôn nyoë.",
+	"anoneditwarning": "<strong>Peuneugah:</strong> Droëneuh hana lom neutamong. Alamat IP-neuh jeuët deuh bak ureuëng la'én meunyö neumeuandam. Meunyö Droëneuh <strong>[$1 neutamong]</strong> atawa <strong>[$2 neudapeuta]</strong>, neuandamneuh jeuët teutuléh ateuëh nan Droëneuh ngön na lom meunapha'at nyang la'én.",
 	"missingcommenttext": "Neupasoë beunalah di yup.",
 	"summary-preview": "Eu dilèë neuringkaih:",
 	"blockedtitle": "Ureueng ngui geutheun",
@@ -1127,7 +1127,7 @@
 	"tooltip-t-recentchangeslinked": "Neuubah barô lam laman nyang meupawôt nibak laman nyoë",
 	"tooltip-feed-rss": "Umpeuën RSS keu laman nyoë",
 	"tooltip-feed-atom": "Umpeuën Atom keu miëng nyoë",
-	"tooltip-t-contributions": "Dapeuta beuneuri ureuëng ngui nyoë",
+	"tooltip-t-contributions": "Dapeuta beuneuri {{GENDER:$1|ureuëng ngui nyoë}}",
 	"tooltip-t-emailuser": "Peu'ét surat-e keu ureuëng ngui nyoë",
 	"tooltip-t-upload": "Peutamong beureukaih",
 	"tooltip-t-specialpages": "Dapeuta ban dum miëng kusuih",
@@ -1174,6 +1174,8 @@
 	"exif-xresolution": "Resolusi linteuëng",
 	"exif-yresolution": "Rèsolusi buju",
 	"exif-datetime": "Uroë buleuën ngön watèë neuubah beureukaih",
+	"exif-make": "Pabrék kamèra",
+	"exif-model": "Moden kamèra",
 	"exif-software": "Software geungui",
 	"exif-exifversion": "Versi Exif",
 	"exif-colorspace": "Ruweuëng wareuna",
@@ -1217,6 +1219,7 @@
 	"tag-filter": "Saréng [[Special:Tags|tag]]:",
 	"tag-filter-submit": "Saréng",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag}}]]: $2)",
+	"logentry-delete-delete": "$1 {{GENDER:$2|geusampôh}} miëng $3",
 	"logentry-newusers-create": "$1 {{GENDER:$2|geupeugöt}} akun ureuëng ngui",
 	"searchsuggest-search": "Mita",
 	"duration-seconds": "{{PLURAL:$1|deutik}}",
diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index 380a9198b7..7b4a68e1e3 100644
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -67,7 +67,8 @@
 			"Hhaboh162002",
 			"بدارين",
 			"باسم",
-			"Moud hosny"
+			"Moud hosny",
+			"ديفيد"
 		]
 	},
 	"tog-underline": "سطر تحت الوصلات:",
@@ -221,7 +222,7 @@
 	"faq": "الأسئلة المتكررة",
 	"faqpage": "Project:أسئلة متكررة",
 	"actions": "أفعال",
-	"namespaces": "فضاءات التسمية",
+	"namespaces": "نطاقات",
 	"variants": "المتغيرات",
 	"navigation-heading": "قائمة التصفح",
 	"errorpagetitle": "خطأ",
@@ -236,7 +237,7 @@
 	"history": "تاريخ الصفحة",
 	"history_short": "تاريخ",
 	"updatedmarker": "عدلت منذ زيارتي الأخيرة",
-	"printableversion": "بتنسق للطباعة",
+	"printableversion": "نسخة للطباعة",
 	"permalink": "رابط دائم",
 	"print": "اطبع",
 	"view": "مطالعة",
@@ -998,7 +999,7 @@
 	"searchprofile-advanced-tooltip": "ابحث في النطاقات المخصصة",
 	"search-result-size": "$1 ({{PLURAL:$2|لا كلمات|كلمة واحدة|كلمتان|$2 كلمات|$2 كلمة}})",
 	"search-result-category-size": "{{PLURAL:$1|لا أعضاء|عضو واحد|عضوان|$1 أعضاء|$1 عضوًا|$1 عضو}} ({{PLURAL:$2|لا تصانيف فرعية|تصنيف فرعي واحد|تصنيفان فرعيان|$2 تصنيفات فرعية|$2 تصنيفًا فرعيًا|$2 تصنيف فرعي}} و{{PLURAL:$3|لا ملفات|ملف واحد|ملفان|$3 ملفات|$3 ملفًا|$3 ملف}})",
-	"search-redirect": "(تحويلة $1)",
+	"search-redirect": "(تحويلة من $1)",
 	"search-section": "(قسم $1)",
 	"search-category": "(التصنيف $1)",
 	"search-file-match": "(يطابق محتوى الملف)",
@@ -1512,6 +1513,7 @@
 	"upload-dialog-disabled": "رفع الملفات باستخدام هذا الحوار معطلة على هذه الويكي.",
 	"upload-dialog-title": "رفع الملف",
 	"upload-dialog-button-cancel": "إلغاء",
+	"upload-dialog-button-back": "رجوع",
 	"upload-dialog-button-done": "تم",
 	"upload-dialog-button-save": "احفظ",
 	"upload-dialog-button-upload": "رفع",
@@ -2458,7 +2460,7 @@
 	"allmessagesname": "الاسم",
 	"allmessagesdefault": "النص الافتراضي",
 	"allmessagescurrent": "النص الحالي",
-	"allmessagestext": "هذه قائمة برسائل النظام المتوفرة في نطاق ميدياويكي.\nيرجى زيارة :\n[https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation MediaWiki Localisation] و [https://translatewiki.net translatewiki.net]\nإازا كنت ترغب في المساهمة بتعريب ميديا ويكي",
+	"allmessagestext": "هذه قائمة برسائل النظام المتوفرة في نطاق ميدياويكي.\nمن فضلك زر [https://www.mediawiki.org/wiki/Special:MyLanguage/Localisation ترجمة ميدياويكي] و [https://translatewiki.net ترانسليت ويكي دوت نت] لو كنت ترغب في المساهمة في ترجمة ميدياويكي الأساسية.",
 	"allmessagesnotsupportedDB": "هذه الصفحة لا يمكن استخدامها لأن '''$wgUseDatabaseMessages''' تم تعطيله.",
 	"allmessages-filter-legend": "المرشح",
 	"allmessages-filter": "رشح حسب حالة التخصيص:",
@@ -3529,6 +3531,18 @@
 	"htmlform-cloner-create": "إضافة المزيد",
 	"htmlform-cloner-delete": "إزالة",
 	"htmlform-cloner-required": "مطلوب قيمة واحدة على الأقل.",
+	"htmlform-date-placeholder": "YYYY-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "YYYY-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "القيمة التي حددتها ليست تاريخا متعرف عليه. جرب استخدام صيغة YYYY-MM-DD.",
+	"htmlform-time-invalid": "القيمة التي حددتها ليست وقتا متعرف عليه. جرب استخدام صيغة HH:MM:SS.",
+	"htmlform-datetime-invalid": "القيمة التي حددتها ليست وقتا وتاريخا متعرف عليه. جرب استخدام صيغة YYYY-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "القيمة التي حددتها هي قبل أول تاريخ مسموح به $1.",
+	"htmlform-date-toohigh": "القيمة التي حددتها هي بعد آخر تاريخ مسموح به $1.",
+	"htmlform-time-toolow": "القيمة التي حددتها هي قبل أول وقت مسموح به $1.",
+	"htmlform-time-toohigh": "القيمة التي حددتها هي بعد آخر وقت مسموح به $1.",
+	"htmlform-datetime-toolow": "القيمة التي حددتها هي قبل أول تاريخ ووقت مسموح بهما $1.",
+	"htmlform-datetime-toohigh": "القيمة التي حددتها هي بعد آخر تاريخ ووقت مسموح بهما $1.",
 	"htmlform-title-badnamespace": "[[:$1]] ليس في نطاق \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" ليس عنوان صفحة يمكن إنشاؤه",
 	"htmlform-title-not-exists": "$1 غير موجود.",
@@ -3612,7 +3626,6 @@
 	"feedback-external-bug-report-button": "أرسل تقرير علة تقنية",
 	"feedback-dialog-title": "أرسل تغذية راجعة",
 	"feedback-dialog-intro": "أنت يمكنك استخدام الاستمارة السهلة بالأسفل لإرسال تعليقك. تعليقك ستتم إضافته للصفحة \"$1\"، مع اسم المستخدم الخاص بك.",
-	"feedback-error-title": "خطأ",
 	"feedback-error1": "خطأ: لا يمكن التعرف عليها من API",
 	"feedback-error2": "خطأ: فشل في تحرير",
 	"feedback-error3": "خطأ : لا توجد استجابة من API",
diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json
index aab16b49c0..4173d4579f 100644
--- a/languages/i18n/ast.json
+++ b/languages/i18n/ast.json
@@ -1460,6 +1460,7 @@
 	"upload-dialog-disabled": "Nesta wiki tán desactivaes les xubíes de ficheros por aciu d'esti diálogu.",
 	"upload-dialog-title": "Xubir ficheru",
 	"upload-dialog-button-cancel": "Encaboxar",
+	"upload-dialog-button-back": "Anterior",
 	"upload-dialog-button-done": "Fecho",
 	"upload-dialog-button-save": "Guardar",
 	"upload-dialog-button-upload": "Xubir",
@@ -3363,6 +3364,18 @@
 	"htmlform-cloner-create": "Amestar más",
 	"htmlform-cloner-delete": "Desaniciar",
 	"htmlform-cloner-required": "Necesítase polo menos un valor.",
+	"htmlform-date-placeholder": "AAAA-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "El valor que disti nun ye una data reconocible. Prueba usando'l formatu AAAA-MM-DD.",
+	"htmlform-time-invalid": "El valor que disti nun ye una hora reconocible. Prueba usando'l formatu HH:MM:SS.",
+	"htmlform-datetime-invalid": "Nun se reconoció la fecha y hora nel formatu proporcionáu. Prueba a usar el formatu AAAA-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "El valor que disti ye anterior a la fecha más antigua permitida, $1.",
+	"htmlform-date-toohigh": "El valor especificáu ye posterior a la mayor data permitida, $1.",
+	"htmlform-time-toolow": "El valor qu'especificasti ye anterior a la hora más antigua permitida, $1.",
+	"htmlform-time-toohigh": "El valor qu'especificasti ye posterior a la hora más nueva permitida, $1.",
+	"htmlform-datetime-toolow": "El valor qu'especificasti ye anterior a la fecha y hora más antigua permitida, $1.",
+	"htmlform-datetime-toohigh": "El valor qu'especificasti ye posterior a la fecha y hora más nueva permitida, $1.",
 	"htmlform-title-badnamespace": "[[:$1]] nun ta nel espaciu de nomes \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "«$1» nun ye un títulu de páxina que pueda crease",
 	"htmlform-title-not-exists": "$1 nun esiste.",
@@ -3446,7 +3459,6 @@
 	"feedback-external-bug-report-button": "Rexistrar una xera técnica",
 	"feedback-dialog-title": "Unviar opinión",
 	"feedback-dialog-intro": "Puedes usar el formulariu fácil de más abaxo pa unviar comentarios. Estos amestaránse a la páxina «$1», xunto col to nome d'usuariu.",
-	"feedback-error-title": "Error",
 	"feedback-error1": "Fallu: Resultáu de la API non reconocíu",
 	"feedback-error2": "Fallu: Falló la edición",
 	"feedback-error3": "Fallu: Ensin respuesta de la API",
@@ -3751,5 +3763,8 @@
 	"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?",
 	"userjsispublic": "Atención: les subpáxines JavaScript nun tendríen de contener datos acutaos porque son visibles pa otros usuarios.",
-	"usercssispublic": "Atención: les subpáxines CSS nun tendríen de contener datos acutaos porque son visibles pa otros usuarios."
+	"usercssispublic": "Atención: les subpáxines CSS nun tendríen de contener datos acutaos porque son visibles pa otros usuarios.",
+	"restrictionsfield-badip": "Direición o rangu IP inválidu: $1",
+	"restrictionsfield-label": "Rangos d'IP permitíos:",
+	"restrictionsfield-help": "Una única direición IP o rangu CIDR per llinia. P'activar toos, utiliza<br><code>0.0.0.0/0</code><br><code>::/0</code>"
 }
diff --git a/languages/i18n/az.json b/languages/i18n/az.json
index add8bea21d..428dafcd69 100644
--- a/languages/i18n/az.json
+++ b/languages/i18n/az.json
@@ -395,7 +395,6 @@
 	"yourpasswordagain": "Parolu təkrar daxil edin:",
 	"createacct-yourpasswordagain": "Parolu təsdiqlə",
 	"createacct-yourpasswordagain-ph": "Parolu təkrar daxil edin",
-	"remembermypassword": "Məni bu kompyuterdə xatırla (maksimum $1 {{PLURAL:$1|gün|gün}})",
 	"userlogin-remembermypassword": "Sistemdə qal",
 	"userlogin-signwithsecure": "Etibarlı bağlantıdan istifadə edin",
 	"yourdomainname": "Sizin domeniniz:",
@@ -1381,6 +1380,7 @@
 	"listgrouprights-addgroup-self-all": "Bütün qrupları öz hesabına əlavə edə bilər",
 	"listgrouprights-removegroup-self-all": "Bütün qrupları öz hesabından çıxara bilər",
 	"listgrouprights-namespaceprotection-namespace": "Adlar fəzası",
+	"restricted-displaytitle-ignored": "İmtina edilmiş görüntü başlıqlarına malik səhifələr",
 	"mailnologin": "Ünvan yoxdur",
 	"emailuser": "İstifadəçiyə e-məktub göndər",
 	"defemailsubject": "\"$1\" adlı istifadəçidən {{SITENAME}} e-məktubu",
@@ -2410,8 +2410,6 @@
 	"htmlform-selectorother-other": "Digər",
 	"htmlform-no": "Xeyr",
 	"htmlform-yes": "Bəli",
-	"sqlite-has-fts": "$1 tam mətn axtarma ilə",
-	"sqlite-no-fts": "$1 tam mətn axtarma olmadan",
 	"logentry-delete-delete": "$1 $3 səhifəsini {{GENDER:$2|sildi}}",
 	"logentry-suppress-delete": "$1 $3 səhifəsini {{GENDER:$2|gizlətdi}}",
 	"revdelete-content-hid": "gizli mətn",
@@ -2434,7 +2432,6 @@
 	"feedback-bugnew": "Mən yoxladım. Yeni xəta barədə xəbər ver",
 	"feedback-cancel": "Ä°mtina",
 	"feedback-close": "Oldu",
-	"feedback-error-title": "Xəta",
 	"feedback-error2": "Xəta: Redaktə qeydə alınmadı",
 	"feedback-message": "Mesaj:",
 	"feedback-subject": "Mövzu:",
diff --git a/languages/i18n/ba.json b/languages/i18n/ba.json
index 7a4ccf1526..c8e697d4d7 100644
--- a/languages/i18n/ba.json
+++ b/languages/i18n/ba.json
@@ -3388,7 +3388,6 @@
 	"feedback-external-bug-report-button": "Техник эш еберергә",
 	"feedback-dialog-title": "Баһалама ебәрергә",
 	"feedback-dialog-intro": "Баһалама ебәреү өсөн түбәндәге форманы файҙаланығыҙ. Һеҙҙең исем менән комментарий «$1» битендә буласаҡ.",
-	"feedback-error-title": "Хата",
 	"feedback-error1": "Хата: API-нан беленмәгән хата",
 	"feedback-error2": "Хата: Мөхәррирләү хатаһы",
 	"feedback-error3": "Хата: API-нан яуап юҡ",
diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json
index 894c727bec..cff26806be 100644
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -652,8 +652,8 @@
 	"subject-preview": "Папярэдні прагляд загалоўку:",
 	"previewerrortext": "Адбылася памылка пры спробе папярэдняга прагляду вашых зьменаў.",
 	"blockedtitle": "Удзельнік заблякаваны",
-	"blockedtext": "'''Ваш рахунак ўдзельніка ці IP-адрас быў заблякаваны.'''\n\nБлякаваньне выканаў $1.\nПрычына гэтага: ''$2''.\n\n* Пачатак блякаваньня: $8\n* Сканчэньне блякаваньня: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне. Заўважце, што Вы ня зможаце ўжыць магчымасьць «даслаць ліст па электроннай пошце», пакуль не пазначыце сапраўдны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах]], і калі гэта Вам не было забаронена.\nВаш IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
-	"autoblockedtext": "Ваш IP-адрас быў аўтаматычна заблякаваны, таму што ён ужываўся іншым удзельнікам, які быў заблякаваны $1.\nПрычына гэтага:\n\n:''$2''\n\n* Блякаваньне пачалося: $8\n* Блякаваньне скончыцца: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці з адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне.\n\nЗаўважце, што Вы ня зможаце ужываць магчымасьць «даслаць ліст праз электронную пошту», пакуль ня будзе пазначаны дзейны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах удзельніка]], і калі гэта Вам не было забаронена.\n\nВаш цяперашні IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
+	"blockedtext": "<strong>Ваш рахунак удзельніка ці IP-адрас быў заблякаваны.</strong>\n\nБлякаваньне выканаў $1.\nПрычына гэтага: <em>$2</em>.\n\n* Пачатак блякаваньня: $8\n* Сканчэньне блякаваньня: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне. Заўважце, што Вы ня зможаце ўжыць магчымасьць «даслаць ліст па электроннай пошце», пакуль не пазначыце сапраўдны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах]], і калі гэта Вам не было забаронена.\nВаш IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
+	"autoblockedtext": "Ваш IP-адрас быў аўтаматычна заблякаваны, таму што ён ужываўся іншым удзельнікам, які быў заблякаваны $1.\nПрычына гэтага:\n\n:<em>$2</em>\n\n* Блякаваньне пачалося: $8\n* Блякаваньне скончыцца: $6\n* Быў заблякаваны: $7\n\nВы можаце скантактавацца з $1 ці з адным зь іншых [[{{MediaWiki:Grouppage-sysop}}|адміністратараў]], каб абмеркаваць блякаваньне.\n\nЗаўважце, што Вы ня зможаце ўжываць магчымасьць «даслаць ліст праз электронную пошту», пакуль ня будзе пазначаны дзейны адрас электроннай пошты ў Вашых [[Special:Preferences|наладах удзельніка]], і калі гэта Вам не было забаронена.\n\nВаш цяперашні IP-адрас — $3, ідэнтыфікатар блякаваньня — #$5.\nКалі ласка, улучайце ўсю вышэйпададзеную інфармацыю ва ўсе запыты, што Вы будзеце рабіць.",
 	"blockednoreason": "прычына не пазначана",
 	"whitelistedittext": "Вам трэба $1, каб рэдагаваць старонкі.",
 	"confirmedittext": "Вы мусіце пацьвердзіць Ваш адрас электроннай пошты перад рэдагаваньнем старонак. Калі ласка, пазначце і пацьвердзіце адрас электроннай пошты праз Вашы [[Special:Preferences|налады]].",
@@ -1458,6 +1458,7 @@
 	"upload-dialog-disabled": "Загрузка файлаў з дапамогай гэтага дыялёгу адключаная ў гэтай вікі.",
 	"upload-dialog-title": "Загрузка файла",
 	"upload-dialog-button-cancel": "Адмяніць",
+	"upload-dialog-button-back": "Назад",
 	"upload-dialog-button-done": "Зроблена",
 	"upload-dialog-button-save": "Захаваць",
 	"upload-dialog-button-upload": "Загрузіць",
@@ -3367,6 +3368,18 @@
 	"htmlform-cloner-create": "Дадаць больш",
 	"htmlform-cloner-delete": "Выдаліць",
 	"htmlform-cloner-required": "Патрабуецца як мінімум яшчэ адно значэньне.",
+	"htmlform-date-placeholder": "ГГГГ-ММ-ДД",
+	"htmlform-time-placeholder": "ГГ:ХХ:СС",
+	"htmlform-datetime-placeholder": "ГГГГ-ММ-ДД ГГ:ХХ:СС",
+	"htmlform-date-invalid": "Уведзенае вамі значэньне не зьяўляецца датай. Паспрабуйце ўжыць фармат ГГГГ-ММ-ДД.",
+	"htmlform-time-invalid": "Уведзенае вамі значэньне не зьяўляецца часам. Паспрабуйце ўжыць фармат ГГ:ХХ:СС.",
+	"htmlform-datetime-invalid": "Уведзенае вамі значэньне не зьяўляецца датай і часам. Паспрабуйце ўжыць фармат ГГГГ-ММ-ДД ГГ:ХХ:СС.",
+	"htmlform-date-toolow": "Уведзенае вамі значэньне меней за самую раньнюю дазволеную дату $1.",
+	"htmlform-date-toohigh": "Значэньне, якое вы выбралі, болей за самую позьнюю дазволеную дату $1.",
+	"htmlform-time-toolow": "Значэньне, якое вы выбралі, меней за самы раньні дазволены час $1.",
+	"htmlform-time-toohigh": "Значэньне, якое вы выбралі, болей за самы позьні дазволены час $1.",
+	"htmlform-datetime-toolow": "Значэньне, якое вы выбралі, меней за самую раньнюю дазволеную дату і час $1.",
+	"htmlform-datetime-toohigh": "Значэньне, якое вы выбралі, болей за найпазьнейшую дазволеную дату і час $1.",
 	"htmlform-title-badnamespace": "[[:$1]] знаходзіцца не ў прасторы назваў «{{ns:$2}}».",
 	"htmlform-title-not-creatable": "«$1» — немагчымы загаловак для старонкі",
 	"htmlform-title-not-exists": "$1 не існуе.",
@@ -3450,7 +3463,6 @@
 	"feedback-external-bug-report-button": "Аформіць тэхнічную задачу",
 	"feedback-dialog-title": "Адаслаць водгук",
 	"feedback-dialog-intro": "Свой водгук Вы можаце адаслаць праз простую форму зьнізу. Ваш камэнтар будзе дададзены на старонку «$1» разам з Вашым іменем.",
-	"feedback-error-title": "Памылка",
 	"feedback-error1": "Памылка: невядомы вынік з API",
 	"feedback-error2": "Памылка рэдагаваньня",
 	"feedback-error3": "Памылка: няма адказу ад API",
diff --git a/languages/i18n/be.json b/languages/i18n/be.json
index 7ce602c4fa..a3019e0d0d 100644
--- a/languages/i18n/be.json
+++ b/languages/i18n/be.json
@@ -228,6 +228,7 @@
 	"views": "Віды",
 	"toolbox": "Прылады",
 	"tool-link-userrights": "Змяніць групы {{GENDER:$1|ўдзельніка|ўдзельніцы}}",
+	"tool-link-emailuser": "Напісаць ліст {{GENDER:$1|удзельніку|удзельніцы}}",
 	"userpage": "Паказаць старонку ўдзельніка",
 	"projectpage": "Паказаць старонку праекта",
 	"imagepage": "Гл. старонку файла",
@@ -1465,6 +1466,7 @@
 	"upload-foreign-cant-upload": "Гэта вікі не настроена для ўкладання файлаў у запытанае старонняе сховішча файлаў.",
 	"upload-dialog-title": "Укласці файл",
 	"upload-dialog-button-cancel": "Нічога",
+	"upload-dialog-button-back": "Назад",
 	"upload-dialog-button-done": "Гатова",
 	"upload-dialog-button-save": "Запісаць",
 	"upload-dialog-button-upload": "Укласці",
@@ -2380,6 +2382,7 @@
 	"export-download": "Прапанаваць запісаць у файл",
 	"export-templates": "Разам з шаблонамі",
 	"export-pagelinks": "Разам са старонкамі, на якія ёсць спасылкі (макс. кольк. крокаў):",
+	"export-manual": "Дадаць старонкі ўручную:",
 	"allmessages": "Сістэмныя паведамленні",
 	"allmessagesname": "Назва",
 	"allmessagesdefault": "Прадвызначаны тэкст",
@@ -2404,6 +2407,7 @@
 	"thumbnail-temp-create": "Не ўдаецца стварыць часовы файл эскіза",
 	"thumbnail-dest-create": "Не ўдаецца захаваць эскіз па месцы прызначэння",
 	"thumbnail_invalid_params": "Няправільныя параметры драбніцы",
+	"thumbnail_toobigimagearea": "Файл з памерамі большымі, чым $1",
 	"thumbnail_dest_directory": "Немагчыма стварыць мэтавую тэчку",
 	"thumbnail_image-type": "Дадзены тып выявы не падтрымліваецца",
 	"thumbnail_gd-library": "Няпоўная канфігурацыя бібліятэкі GD, адсутнічае функцыя $1",
@@ -3204,6 +3208,7 @@
 	"tag-filter": "Фільтр [[Special:Tags|бірак]]:",
 	"tag-filter-submit": "Фільтр",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Тэг|Тэгі}}]]: $2)",
+	"tag-mw-contentmodelchange": "змена мадэлі змесціва",
 	"tags-title": "Біркі",
 	"tags-intro": "Тут пералічаныя біркі, якімі праграмы могуць пазначыць праўку, а таксама іх значэнні.",
 	"tags-tag": "Назва біркі",
@@ -3376,7 +3381,6 @@
 	"feedback-cancel": "Адмена",
 	"feedback-close": "Зроблена.",
 	"feedback-dialog-title": "Даслаць водгук",
-	"feedback-error-title": "Памылка",
 	"feedback-error1": "Памылка. Невядомы вынік з API",
 	"feedback-error2": "Памылка. Збой праўкі",
 	"feedback-error3": "Памылка. Няма адказу ад API",
diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json
index b357deab6d..889061b95b 100644
--- a/languages/i18n/bg.json
+++ b/languages/i18n/bg.json
@@ -3087,7 +3087,6 @@
 	"feedback-bugornote": "Ако сте готови подробно да опишете технически проблем, моля [$1 докладвайте го тук].\nВ противен случай, можете да използвате лесния формуляр по-долу. Коментарът ви ще бъде добавен към страницата \"[$3 $2]\", наред с вашето потребителско име.",
 	"feedback-cancel": "Отказване",
 	"feedback-close": "Готово",
-	"feedback-error-title": "Грешка",
 	"feedback-error1": "Грешка: Неразпознат резултат от API",
 	"feedback-error2": "Грешка: Неуспешна редакция",
 	"feedback-error3": "Грешка: Няма отговор от API",
diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json
index 4ec9f5504f..1a60e1ae25 100644
--- a/languages/i18n/bn.json
+++ b/languages/i18n/bn.json
@@ -565,6 +565,8 @@
 	"botpasswords-deleted-title": "বট পাসওয়ার্ড অপসারণ করা হয়েছে",
 	"botpasswords-deleted-body": "ব্যবহারকারী \"$2\"-এর \"$1\" নামের বটের জন্য বট পাসওয়ার্ড মুছে ফেলা হয়েছিল।",
 	"botpasswords-no-provider": "BotPasswordsSessionProvider উপলব্ধ নয়।",
+	"botpasswords-restriction-failed": "বট পাসওয়ার্ডের সীমাবদ্ধতা এই প্রবেশ প্রতিরোধ করেছে।",
+	"botpasswords-not-exist": "ব্যবহারকারী \"$1\"-এর \"$2\" নামক বট পাসওয়ার্ডটি নেই।",
 	"resetpass_forbidden": "পাসওয়ার্ড পরিবর্তন করা সম্ভব নয়",
 	"resetpass_forbidden-reason": "পাসওয়ার্ড পরিবর্তন করা যাবে না: $1",
 	"resetpass-no-info": "এই পাতাটিতে সরাসরি প্রবেশাধিকার পেতে আপনাকে অবশ্যই প্রবেশ করতে হবে।",
@@ -594,8 +596,11 @@
 	"passwordreset-emailelement": "ব্যবহারকারী নাম: \n$1\n\nঅস্থায়ী পাসওয়ার্ড: \n$2",
 	"passwordreset-emailsentemail": "যদি এই ই-মেইল ঠিকানা আপনার অ্যাকাউন্টের সাথে সংযুক্ত করা থাকে, তাহলে একটি পাসওয়ার্ড বদলের ইমেইল পাঠানো হবে।",
 	"passwordreset-emailsentusername": "যদি এই ব্যবহারকারী নামের সাথে ই-মেইল ঠিকানা সংযুক্ত করা থাকে, তাহলে একটি পাসওয়ার্ড বদলের ইমেইল পাঠানো হবে।",
+	"passwordreset-emailsent-capture2": "পাসওয়ার্ড পুনঃধার্যকরণের {{PLURAL:$1|ইমেইল পাঠানো}} হয়েছে। {{PLURAL:$1|ব্যবহারকারী নাম ও পাসওয়ার্ড|ব্যবহারকারী নাম ও পাসওয়ার্ডের তালিকা}} এখানে দেখা যাবে।",
+	"passwordreset-emailerror-capture2": "{{GENDER:$2|ব্যবহারকারীকে}} ইমেইল পাঠানো যায়নি: $1 {{PLURAL:$3|ব্যবহারকারী নাম ও পাসওয়ার্ড|ব্যবহারকারী নাম ও পাসওয়ার্ডের তালিকা}} এখানে দেখা যাবে।",
 	"passwordreset-nocaller": "একটি আহ্বানকারী প্রদান করা আবশ্যক",
 	"passwordreset-nosuchcaller": "আহ্বানকারীর অস্তিত্ব নেই: $1",
+	"passwordreset-ignored": "পাসওয়ার্ড পুনঃধার্যকরণ করা যায়নি। হয়তো কোন প্রদানকারী কনফিগার করা হয়েনি?",
 	"passwordreset-invalideamil": "ভুল ইমেইল ঠিকানা",
 	"passwordreset-nodata": "একটি ব্যবহারকারীর নাম বা একটি ইমেল ঠিকানা দুটির একটিও সরবরা দেয়া হয়নি",
 	"changeemail": "ই-মেইল ঠিকানা পরিবর্তন বা বাতিল",
@@ -603,6 +608,7 @@
 	"changeemail-no-info": "এই পাতাটিতে সরাসরি প্রবেশাধিকার পেতে আপনাকে অবশ্যই প্রবেশ করতে হবে।",
 	"changeemail-oldemail": "বর্তমান ই-মেইল ঠিকানা:",
 	"changeemail-newemail": "নতুন ই-মেইল ঠিকানা:",
+	"changeemail-newemail-help": "আপনার ইমেইল ঠিকানা অপসরণ করতে চাইলে এই জায়গাটি ফাঁকা ছেড়ে দেওয়া উচিত। ইমেইল ঠিকানা অপসরণ করলে আপনি ভুলে যাওয়া পাসওয়ার্ড পুনঃধার্য করতে পারবেন না এবং এই উইকি থেকে আপনাকে কোন ইমেইল পাঠানো হবে না।",
 	"changeemail-none": "(কিছু নাই)",
 	"changeemail-password": "আপনার {{SITENAME}} পাসওয়ার্ড:",
 	"changeemail-submit": "ই-মেইল পরিবর্তন",
@@ -728,6 +734,7 @@
 	"permissionserrors": "অনুমতি ত্রুটিসমূহ",
 	"permissionserrorstext": "আপনার এটা করার অনুমতি নেই, নিচের {{PLURAL:$1|টি কারণের|টি কারণের}} জন্য:",
 	"permissionserrorstext-withaction": "আপনার $2 অনুমতি নেই, যার {{PLURAL:$1|কারণ|কারণসমূহ}} হল:",
+	"contentmodelediterror": "আপনি এই পুনর্বিবেচনা সম্পাদনা করতে পারবেন না কারণ এর বিষয়বস্তু মডেল <code>$1</code>, যা বর্তমান বিষয়বস্তু মডেল <code>$2</code>-এর থেকে ভিন্ন।",
 	"recreate-moveddeleted-warn": "'''সতর্কীকরণ: আপনি এমন একটি পাতা পুনরায় তৈরি করছেন যা পূর্বে অপসারণ করা হয়েছিল।'''\n\nআপনি পাতাটি সম্পাদনা চালিয়ে যাওয়া ঠিক হবে কিনা, তা বিবেচনা করুন।\nআপনার সুবিধার্থে পাতাটির অপলুপ্তি লগ এখানে দেয়া হলো:",
 	"moveddeleted-notice": "এই পাতাটি অপসারণ করা হয়েছে।\nসূত্র হিসেবে নিচে এ পাতার অবলুপ্তি লগ দেওয়া হলো।",
 	"moveddeleted-notice-recent": "দুঃখিত, এই পাতাটি সাম্প্রতি অপসারিত হয়েছে (সর্বশেষ ২৪ ঘণ্টায়)।\nসূত্র হিসেবে নিচে এই পাতা অপসারণ ও স্থানান্তর লগ দেয়া হয়েছে।",
@@ -746,6 +753,7 @@
 	"content-not-allowed-here": "\"$1\" কন্টেন্টটি [[$2]] পাতায় অনুমোদিত নয়",
 	"editwarning-warning": "এই পাতাটি ত্যাগ করলে আপনার আপনার করা পরিবর্তনগুলো হারিয়ে যেতে পারে।\nআপনি যদি প্রবেশ করা থাকেন, আপনি এই সতর্কীকরণ বার্তাটি আপনার পছন্দের \"সম্পাদনা\" অনুচ্ছেদ থেকে নিস্ক্রিয় করতে পারেন।",
 	"editpage-invalidcontentmodel-title": "বিষয়বস্তু মডেল সমর্থিত নয়",
+	"editpage-invalidcontentmodel-text": "এই \"$1\" বিষয়বস্তু মডেলটি অসমর্থিত।",
 	"editpage-notsupportedcontentformat-title": "উল্লেখিত পদ্ধতি সমর্থনযোগ্য নয়।",
 	"editpage-notsupportedcontentformat-text": "$1 লেখার ফরম্যাট, $2 কন্টেন্ট মডেলের উপযোগী নয়।",
 	"content-model-wikitext": "উইকিটেক্সট",
@@ -894,6 +902,7 @@
 	"mergehistory-fail-bad-timestamp": "সময়তারিখ অবৈধ।",
 	"mergehistory-fail-invalid-source": "উত্স পাতা অবৈধ।",
 	"mergehistory-fail-invalid-dest": "গন্তব্য পাতা অবৈধ।",
+	"mergehistory-fail-no-change": "ইতিহাস একত্রীকরণ কোন পুনর্বিবেচনা একত্রিত করে না। দয়া করে পাতা এবং সময় পরামিতি আবার পরীক্ষা করুন।",
 	"mergehistory-fail-permission": "ইতিহাস একত্রীকরণের জন্য পর্যাপ্ত অনুমতি নেই।",
 	"mergehistory-fail-self-merge": "উৎস এবং গন্তব্য পাতা একই।",
 	"mergehistory-fail-toobig": "ইতিহাস থেকে আগের পাতাগুলো একীকরণ সম্ভব নয়, কারণ এর ফলে সর্বোচ্চ $1 টি {{PLURAL:$1|সংস্করণ}} স্থানান্তরের সীমানা অতিক্রম করবে।",
@@ -946,7 +955,7 @@
 	"searchprofile-advanced-tooltip": "স্বনির্ধারিত নামস্থানে অনুসন্ধান করো",
 	"search-result-size": "$1 ({{PLURAL:$2|১টি শব্দ|$2টি শব্দ}})",
 	"search-result-category-size": "{{PLURAL:$1 |১টি সদস্য |$1টি সদস্য}} ({{PLURAL:$2 |১টি উপবিষয়শ্রেণী|$2টি উপবিষয়শ্রেণী}}, {{PLURAL:$3 |১টি ফাইল |$3টি ফাইল}})",
-	"search-redirect": "(পুনর্নিদেশনা $1)",
+	"search-redirect": "($1 থেকে পুনর্নির্দেশিত)",
 	"search-section": "(অনুচ্ছেদ $1)",
 	"search-category": "(বিষয়শ্রেণী $1)",
 	"search-file-match": "(নথির বিষয়বস্তু মিলে যায়)",
@@ -1197,10 +1206,15 @@
 	"right-changetags": "নির্দিষ্ট সংস্করণ এবং দীর্ঘ সম্পাদনাগুলোতে [[Special:Tags|ট্যাগ]] সংযোজন ও অপসারণ করুন",
 	"right-deletechangetags": "ডাটাবেজ থেকে [[Special:Tags|ট্যাগ]] অপসারণ করা",
 	"grant-group-email": "ইমেইল পাঠান",
+	"grant-group-customization": "অনুকূলকরণ ও পছন্দ",
+	"grant-group-administration": "প্রশাসনিক কাজ সঞ্চালন করুন",
 	"grant-group-private-information": "আপনার সম্পর্কিত ব্যক্তিগত তথ্যে প্রবেশাধিকার পায়",
 	"grant-group-other": "বিবিধ কার্যকলাপ",
+	"grant-blockusers": "বাধা দেওয়া ও মুক্ত ব্যবহারকারীগণ",
 	"grant-createaccount": "অ্যাকাউন্ট তৈরি করুন",
 	"grant-createeditmovepage": "পাতা তৈরি, সম্পাদনা এবং স্থানান্তর করুন",
+	"grant-delete": "পাতা, পুনর্বিবেচনা ও লগ ভুক্তিসমূহ মুছে ফেলুন।",
+	"grant-editinterface": "মিডিয়াউইকি নামস্থান এবং ব্যবহারকারীর সিএসএস/জাভাস্ক্রিপ্ট সম্পাদনা করে",
 	"grant-editmycssjs": "আপনার সিএসএস/জাভাস্ক্রিপ্ট সম্পাদনা করুন",
 	"grant-editmyoptions": "আপনার ব্যবহারকারী পছন্দসমূহ সম্পাদনা করুন",
 	"grant-editmywatchlist": "আপনার নজরতালিকা সম্পাদনা করুন",
@@ -1431,6 +1445,7 @@
 	"upload-dialog-disabled": "এই ডায়ালগ ব্যবহার করে ফাইল আপলোড করা এই উইকিতে নিষ্ক্রিয় করা হয়েছে।",
 	"upload-dialog-title": "ফাইল আপলোড করুন",
 	"upload-dialog-button-cancel": "বাতিল",
+	"upload-dialog-button-back": "পিছনে",
 	"upload-dialog-button-done": "সম্পন্ন",
 	"upload-dialog-button-save": "সংরক্ষণ",
 	"upload-dialog-button-upload": "আপলোড",
@@ -1760,6 +1775,7 @@
 	"apisandbox-dynamic-parameters": "অতিরিক্ত প্যারামিটার",
 	"apisandbox-dynamic-parameters-add-label": "প্যারামিটার যোগ করুন:",
 	"apisandbox-dynamic-parameters-add-placeholder": "প্যারামিটারের নাম",
+	"apisandbox-dynamic-error-exists": "\"$1\" নামক একটি প্যারামিটার আগে থেকেই বিদ্যমান।",
 	"apisandbox-results": "ফলাফল",
 	"apisandbox-sending-request": "API অনুরোধ পাঠানো হচ্ছে...",
 	"apisandbox-loading-results": "API ফলাফল গ্রহণ করা হচ্ছে...",
@@ -3240,6 +3256,7 @@
 	"tags-delete-reason": "কারণ:",
 	"tags-delete-submit": "অপরিবর্তনীয় এই ট্যাগ অপসারন করো",
 	"tags-delete-not-found": "\"$1\" ট্যাগ বিদ্যমান নয়।",
+	"tags-delete-no-permission": "আপনার পরিবর্তন ট্যাগ মুছে ফেলার অনুমতি নেই।",
 	"tags-activate-title": "সক্রিয় ট্যাগ",
 	"tags-activate-question": "আপনি ট্যাগ \"$1\" সক্রিয় করতে চলেছেন।",
 	"tags-activate-reason": "কারণ:",
@@ -3301,6 +3318,9 @@
 	"htmlform-cloner-create": "আরও যোগ করুন",
 	"htmlform-cloner-delete": "অপসারণ",
 	"htmlform-cloner-required": "অন্তত একটি মূল্য আবশ্যক।",
+	"htmlform-date-placeholder": "বববব-মম-দদ",
+	"htmlform-time-placeholder": "ঘঘ:মম:সস",
+	"htmlform-datetime-placeholder": "বববব-মম-দদ ঘঘ:মম:সস",
 	"htmlform-title-badnamespace": "[[:$1]] \"{{ns:$2}}\" নামস্থানে খুঁজে পাওয়া যায়নি।",
 	"htmlform-title-not-creatable": "\"$1\" সৃষ্টিযোগ্য পাতার শিরোনাম নয়",
 	"htmlform-title-not-exists": "$1-এর অস্তিত্ব নেই।",
@@ -3374,7 +3394,6 @@
 	"feedback-external-bug-report-button": "প্রযুক্তিগত কাজ ফাইল করুন",
 	"feedback-dialog-title": "প্রতিক্রিয়া জমা দিন",
 	"feedback-dialog-intro": "আপনি আপনার প্রতিক্রিয়া জানাতে নীচের সহজ ফরম ব্যবহার করতে পারেন। আপনার মন্তব্য আপনার ব্যবহারকারী নামসহ, \"$1\" পাতায় যোগ করা হবে।",
-	"feedback-error-title": "ত্রুটি",
 	"feedback-error1": "ত্রুটি: এপিআই হতে অজানা ফলাফল এসেছে",
 	"feedback-error2": "ত্রুটি: সম্পাদনা ব্যর্থ",
 	"feedback-error3": "ত্রুটি: এপিআই হতে কোন সাড়া নেই",
@@ -3578,16 +3597,23 @@
 	"log-action-filter-upload-upload": "নতুন আপলোড",
 	"log-action-filter-upload-overwrite": "পুনঃআপলোড",
 	"authmanager-authn-no-primary": "সরবরাহকৃত পরিচয়পত্রের অনুমোদন যাচাই করা যায়নি।",
+	"authmanager-authn-autocreate-failed": "একটি স্থানীয় অ্যাকাউন্টের স্বয়ংক্রিয়-সৃষ্টি ব্যর্থ হয়েছে: $1",
 	"authmanager-create-disabled": "অ্যাকাউন্ট সৃষ্টিকরণ নিষ্ক্রিয় করা হয়েছে।",
 	"authmanager-create-from-login": "আপনার একাউন্ট তৈরি করতে, নীচের ক্ষেত্রগুলি পূরণ করুন।",
 	"authmanager-authplugin-setpass-failed-title": "পাসওয়ার্ড পরিবর্তন ব্যর্থ হয়েছে",
 	"authmanager-authplugin-setpass-bad-domain": "অবৈধ ডোমেইন।",
 	"authmanager-autocreate-noperm": "স্বয়ংক্রিয় অ্যাকাউন্ট সৃষ্টি মঞ্জুরিপ্রাপ্ত নয়।",
 	"authmanager-userdoesnotexist": "ব্যবহারকারী অ্যাকাউন্ট \"$1\" অনিবন্ধিত।",
+	"authmanager-username-help": "প্রমাণীকরণের জন্য ব্যবহারকারী নাম।",
+	"authmanager-password-help": "প্রমাণীকরণের জন্য পাসওয়ার্ড।",
+	"authmanager-domain-help": "বহিঃস্থ প্রমাণীকরণের জন্য ডোমেইন।",
+	"authmanager-retype-help": "নিশ্চিত করার জন্য আবার পাসওয়ার্ড লিখুন।",
 	"authmanager-email-label": "ইমেইল",
 	"authmanager-email-help": "ইমেইল ঠিকানা",
 	"authmanager-realname-label": "প্রকৃত নাম",
 	"authmanager-realname-help": "ব্যবহারকারীর প্রকৃত নাম",
+	"authmanager-provider-password": "পাসওয়ার্ড-ভিত্তিক প্রমাণীকরণ।",
+	"authmanager-provider-password-domain": "পাসওয়ার্ড ও ডোমেইন-ভিত্তিক প্রমাণীকরণ।",
 	"authmanager-provider-temporarypassword": "অস্থায়ী পাসওয়ার্ড",
 	"authprovider-confirmlink-success-line": "$1: সংযোগ করা সফল হয়েছে।",
 	"authprovider-resetpass-skip-label": "উপেক্ষা করো",
@@ -3611,9 +3637,14 @@
 	"credentialsform-provider": "পরিচয়পত্রের ধরন:",
 	"credentialsform-account": "অ্যাকাউন্টের নাম:",
 	"linkaccounts": "অ্যাকাউন্ট সংযোগ করুন",
+	"linkaccounts-success-text": "অ্যাকাউন্টটি সংযোগ করা হয়েছে।",
 	"linkaccounts-submit": "অ্যাকাউন্ট সংযুক্ত করুন",
 	"unlinkaccounts": "অ্যাকাউন্ট সংযোগ বিচ্ছিন্ন করুন",
 	"unlinkaccounts-success": "অ্যাকাউন্টের সংযোগ বিচ্ছিন্ন করা হয়েছে।",
+	"authenticationdatachange-ignored": "প্রমাণীকরণ উপাত্তের পরিবর্তন পরিচালনা করা হয়নি। হয়তো কোন প্রদানকারী কনফিগার করা হয়নি?",
 	"userjsispublic": "অনুগ্রহ করে লক্ষ্য করুন: জাভাস্ক্রিপ্টের উপপাতাগুলিতে গোপনীয় তথ্য থাকা উচিত নয় যেহেতু অন্যান্য ব্যবহারকারীও এগুলি দেখতে পান।",
-	"usercssispublic": "অনুগ্রহ করে লক্ষ্য করুন: সিএসএসের উপপাতাগুলিতে গোপনীয় তথ্য থাকা উচিত নয় যেহেতু অন্যান্য ব্যবহারকারীও এগুলি দেখতে পান।"
+	"usercssispublic": "অনুগ্রহ করে লক্ষ্য করুন: সিএসএসের উপপাতাগুলিতে গোপনীয় তথ্য থাকা উচিত নয় যেহেতু অন্যান্য ব্যবহারকারীও এগুলি দেখতে পান।",
+	"restrictionsfield-badip": "আইপি ঠিকানা অথবা পরিসীমা অবৈধ: $1",
+	"restrictionsfield-label": "অনুমোদিত আইপি পরিসীমা:",
+	"restrictionsfield-help": "লাইন প্রতি একটি আইপি ঠিকানা বা CIDR পরিসীমা। সবকিছু সক্রিয় করতে<br><code>0.0.0.0/0</code><br><code>::/0</code><br>ব্যবহার করুন"
 }
diff --git a/languages/i18n/bs.json b/languages/i18n/bs.json
index c2b1d88621..bd7643bdac 100644
--- a/languages/i18n/bs.json
+++ b/languages/i18n/bs.json
@@ -51,7 +51,7 @@
 	"tog-enotifminoredits": "Također mi pošalji e-poštu za male izmjene na stranicama i datotekama",
 	"tog-enotifrevealaddr": "Otkrij adresu moje e-pošte u porukama obavještenja",
 	"tog-shownumberswatching": "Prikaži broj korisnika koji prate",
-	"tog-oldsig": "Postojeći potpis:",
+	"tog-oldsig": "Vaš postojeći potpis:",
 	"tog-fancysig": "Smatraj potpis kao wikitekst (bez automatskog linka)",
 	"tog-uselivepreview": "Koristi pregled uživo",
 	"tog-forceeditsummary": "Opomeni me pri unosu praznog sažetka",
@@ -68,7 +68,7 @@
 	"tog-showhiddencats": "Prikaži skrivene kategorije",
 	"tog-norollbackdiff": "Ne prikazuj razliku nakon izvršenog vraćanja",
 	"tog-useeditwarning": "Upozori me kad napuštam stranicu za izmjene bez sačuvanih promjena",
-	"tog-prefershttps": "Uvijek koristi sigurnu konekciju kada sam prijavljen.",
+	"tog-prefershttps": "Uvijek koristi sigurnu vezu dok sam prijavljen",
 	"underline-always": "Uvijek",
 	"underline-never": "Nikad",
 	"underline-default": "Prema predodređenim postavkama teme ili preglednika",
@@ -139,6 +139,8 @@
 	"october-date": "$1. oktobar",
 	"november-date": "$1. novembar",
 	"december-date": "$1. decembar",
+	"period-am": "AM",
+	"period-pm": "PM",
 	"pagecategories": "{{PLURAL:$1|Kategorija|Kategorije}}",
 	"category_header": "Članci u kategoriji \"$1\"",
 	"subcategories": "Podkategorije",
@@ -161,7 +163,7 @@
 	"newwindow": "(otvara se u novom prozoru)",
 	"cancel": "Odustani",
 	"moredotdotdot": "Više...",
-	"morenotlisted": "Ovaj spisak nije potpun.",
+	"morenotlisted": "Ovaj spisak možda nije potpun.",
 	"mypage": "Stranica",
 	"mytalk": "Razgovor",
 	"anontalk": "Razgovor",
@@ -219,6 +221,8 @@
 	"talk": "Razgovor",
 	"views": "Pregledi",
 	"toolbox": "Alati",
+	"tool-link-userrights": "Promijeni {{GENDER:$1|korisničke}} grupe",
+	"tool-link-emailuser": "Pošalji e-poruku {{GENDER:$1|korisniku|korisnici}}",
 	"userpage": "Pogledaj korisničku stranicu",
 	"projectpage": "Pogledaj stranicu projekta",
 	"imagepage": "Pogledajte stranicu datoteke",
@@ -288,9 +292,9 @@
 	"confirmable-confirm": "Da li {{GENDER:$1|ste}} sigurni?",
 	"confirmable-yes": "Da",
 	"confirmable-no": "Ne",
-	"thisisdeleted": "Pogledati ili vratiti $1?",
+	"thisisdeleted": "Pogledaj ili vrati $1?",
 	"viewdeleted": "Pogledaj $1?",
-	"restorelink": "{{PLURAL:$1|$1 izbrisana izmjena|$1 izbrisanih izmjena}}",
+	"restorelink": "{{PLURAL:$1|jednu obrisanu izmjenu|$1 obrisane izmjene|$1 obrisanih izmjena}}",
 	"feedlinks": "Fid:",
 	"feed-invalid": "Nedozvoljen tip potpisa",
 	"feed-unavailable": "RSS izvori nisu dostupni",
@@ -326,7 +330,7 @@
 	"laggedslavemode": "'''Upozorenje''': Stranica, možda, nije ažurirana.",
 	"readonly": "Baza je zaključana",
 	"enterlockreason": "Unesite razlog za zaključavanje, uključujući procjenu vremena otključavanja",
-	"readonlytext": "Baza je trenutno zaključana za nove unose i ostale izmjene, vjerovatno zbog rutinskog održavanja, posle čega će biti vraćena u uobičajeno stanje.\n\nAdministrator koji ju je zaključao je ponudio ovo objašnjenje: $1",
+	"readonlytext": "Baza podataka trenutno je zaključana za nove unose i druge izmjene, vjerovatno zbog rutinskog održavanja, nakon čega će biti vraćena u uobičajeno stanje.\n\nSistemski administrator koji ju je zaključao naveo je sljedeće objašnjenje: $1",
 	"missing-article": "U bazi podataka nije pronađen tekst stranice tražen pod nazivom \"$1\" $2.\n\nDo ovoga dolazi kad se prati pomjeranje ili historija linka za stranicu koja je pobrisana.\n\n\nU slučaju da se ne radi o gore navedenom moguće je da ste pronašli grešku u programu.\nMolimo Vas da ovo prijavite [[Special:ListUsers/sysop|administratoru]] s navođenjem tačne adrese stranice.",
 	"missingarticle-rev": "(revizija#: $1)",
 	"missingarticle-diff": "(Razlika: $1, $2)",
@@ -428,6 +432,7 @@
 	"userlogin-resetpassword-link": "Zaboravili ste lozinku?",
 	"userlogin-helplink2": "Pomoć pri prijavljivanju",
 	"userlogin-loggedin": "Već ste prijavljeni kao {{GENDER:$1|$1}}.\nKoristite donji obrazac da biste se prijavili kao drugi korisnik.",
+	"userlogin-reauth": "Morate se ponovo prijaviti da bismo potvrdili da ste zaista {{GENDER:$1|$1}}.",
 	"userlogin-createanother": "Napravi još jedan račun",
 	"createacct-emailrequired": "Adresa e-pošte",
 	"createacct-emailoptional": "Adresa e-pošte (opcionalno)",
@@ -456,7 +461,7 @@
 	"noname": "Niste izabrali ispravno korisničko ime.",
 	"loginsuccesstitle": "Prijavljen",
 	"loginsuccess": "'''Sad ste prijavljeni na {{SITENAME}} kao \"$1\".'''",
-	"nosuchuser": "Ne postoji korisnik s imenom \"$1\".\nKorisnička imena razlikuju velika i mala slova.\nProvjerite Vaš unos ili [[Special:CreateAccount|napravite novi korisnički račun]].",
+	"nosuchuser": "Ne postoji korisnik s imenom \"$1\".\nKorisnička imena razlikuju velika i mala slova.\nProvjerite jeste li ga tačno upisali ili [[Special:CreateAccount|otvorite novi račun]].",
 	"nosuchusershort": "Ne postoji korisnik s imenom \"$1\".\nProvjerite jeste li dobro ukucali.",
 	"nouserspecified": "Morate izabrati korisničko ime.",
 	"login-userblocked": "Ovaj korisnik je blokiran. Prijava nije dopuštena.",
@@ -464,6 +469,7 @@
 	"wrongpasswordempty": "Lozinka koju ste unijeli je bila prazna.\nMolimo Vas da pokušate ponovno.",
 	"passwordtooshort": "Lozinka mora imati najmanje {{PLURAL:$1|1 znak|$1 znaka|$1 znakova}}.",
 	"passwordtoolong": "Lozinke ne mogu biti duže od {{PLURAL:$1|jednog znaka|$1 znaka|$1 znakova}}.",
+	"passwordtoopopular": "Ovo je često korištena lozinka i ne može se koristiti. Molimo Vas da izaberete jaču lozinku.",
 	"password-name-match": "Vaša lozinka mora biti različita od Vašeg korisničkog imena.",
 	"password-login-forbidden": "Korištenje ovih korisničkih imena i šifara je zabranjeo.",
 	"mailmypassword": "Poništi lozinku",
@@ -472,7 +478,7 @@
 	"noemail": "Ne postoji adresa e-pošte za korisnika \"$1\".",
 	"noemailcreate": "Morate da navedete validnu e-mail adresu",
 	"passwordsent": "Nova lozinka poslana je na adresu e-pošte korisnika \"$1\".\nMolimo Vas da se prijavite nakon što je primite.",
-	"blocked-mailpassword": "Da bi se spriječila nedozvoljena akcija, Vašoj IP adresi je onemogućeno uređivanje stranica kao i mogućnost zahtijevanje nove lozinke.",
+	"blocked-mailpassword": "Vašoj IP-adresi onemogućeno je uređivanje. Da bi se spriječila zloupotreba, s nje nije moguće zahtijevati novu lozinku.",
 	"eauthentsent": "Na navedenu adresu e-pošte poslana je poruka s potvrdom.\nPrije nego što pošaljemo daljnje poruke, pratite uputstva s e-pošte da biste potvrdili da je račun zaista Vaš.",
 	"throttled-mailpassword": "Već Vam je poslana e-poruka za promjenu lozinke u {{PLURAL:$1|posljednjih sat vremena|posljednja $1 sata|posljednjih $1 sati}}.\nDa bi se spriječila zloupotreba, može se poslati samo jedna e-poruka za promjenu lozinke {{PLURAL:$1|svakih sat vremena|svaka $1 sata|svakih $1 sati}}.",
 	"mailerror": "Greška pri slanju e-pošte: $1",
@@ -537,7 +543,7 @@
 	"passwordreset-emailtext-ip": "Neko (vjerovatno Vi, s IP adrese $1) je zatražio podsjetnik Vaših detalja računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|račun korisnika je|računi korisnika su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše početne šifre, a ne želite je promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
 	"passwordreset-emailtext-user": "Korisnik $1 na {{SITENAME}} je zatražio podsjetnik o detaljima Vašeg računa za {{SITENAME}} ($4). Sljedeći {{PLURAL:$3|korisnički račun je|korisnički računi su}} povezani s ovom e-mail adresom:\n\n$2\n\n{{PLURAL:$3|Ova privremena šifra|Ove privremene šifre}} će isteći za {{PLURAL:$5|jedan dan|$5 dana}}.\nTrebate se prijaviti i odabrati novu šifru. Ako je neko drugi napravio ovaj zahtjev, ili ako ste se sjetili Vaše originalne šifre, a ne želite je više promijeniti, možete zanemariti ovu poruku i nastaviti koristiti staru šifru.",
 	"passwordreset-emailelement": "Korisničko ime: \n$1\n\nPrivremena šifra: \n$2",
-	"passwordreset-emailsentemail": "Ako je ovo adresa e-pošte s kojom ste registrirali ovaj račun, podsjetnik šifre će vam biti poslan na vašu adresu e-pošte.",
+	"passwordreset-emailsentemail": "Ako je ova adresa e-pošte povezana s Vašim računom, podsjetnik o lozinci bit će Vam poslan na adresu e-pošte.",
 	"changeemail": "Promjena ili uklanjanje e-adrese",
 	"changeemail-header": "Ispunite sljedeći formular da biste promijenili adresu e-pošte. Ako želite ukloniti postojeću adresu e-pošte s vašeg korisničkog računa, pri ispunjavanju formulara, polje nove adrese e-pošte ostavite prazno.",
 	"changeemail-no-info": "Morate biti prijavljeni za direktan pristup ovoj stranici.",
@@ -611,7 +617,7 @@
 	"accmailtext": "Nasumično odabrana šifra za [[User talk:$1|$1]] je poslata na adresu $2.\n\nŠifra/lozinka za ovaj novi račun može biti promijenjena na stranici ''[[Special:ChangePassword|izmjene šifre]]'' nakon prijave.",
 	"newarticle": "(Novi)",
 	"newarticletext": "Došli ste na stranicu koja još nema sadržaja.\n*Ako želite unijeti sadržaj, počnite tipkati u prozor ispod ovog teksta.\n*Ako Vam treba pomoć, idite na [$1 stranicu za pomoć].\n*Ako ste ovamo dospjeli slučajno, kliknite na dugme \"Nazad\" (''Back'') u Vašem internetskom pregledniku.",
-	"anontalkpagetext": "----''Ovo je stranica za razgovor za anonimnog korisnika koji još nije napravio nalog ili ga ne koristi.\nZbog toga moramo da koristimo brojčanu IP adresu kako bismo identifikovali njega ili nju.\nTakvu adresu može dijeliti više korisnika.\nAko ste anonimni korisnik i mislite da su vam upućene nebitne primjedbe, molimo Vas da [[Special:CreateAccount|napravite nalog]] ili se [[Special:UserLogin|prijavite]] da biste izbjegli buduću zabunu sa ostalim anonimnim korisnicima.''",
+	"anontalkpagetext": "----\n<em>Ovo je stranica za razgovor s anonimnim korisnikom koji još nije napravio račun ili ga ne koristi.</em>\nZbog toga moramo koristiti brojčanu IP-adresu kako bismo ga prepoznali.\nTakvu adresu može dijeliti više korisnika.\nAko ste anonimni korisnik i smatrate da su Vam upućene nebitne primjedbe, molimo Vas da [[Special:CreateAccount|napravite račun]] ili se [[Special:UserLogin|prijavite]] da biste izbjegli buduću zabunu s ostalim anonimnim korisnicima.",
 	"noarticletext": "Na ovoj stranici trenutno nema teksta.\nMožete [[Special:Search/{{PAGENAME}}|tražiti naslov ove stranice]] na drugim stranicama,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} tražiti u povezanim zapisnicima] ili [{{fullurl:{{FULLPAGENAME}}|action=edit}} napraviti ovu stranicu]</span>.",
 	"noarticletext-nopermission": "Trenutno nema teksta na ovoj stranici.\nMožete [[Special:Search/{{PAGENAME}}|tražiti ovaj naslov stranice]] na drugim stranicama ili <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} pretražiti povezane zapisnike]</span>, ali nemate dozvolu da napravite ovu stranicu.",
 	"missing-revision": "Uređivanje broj $1 na stranici \"{{FULLPAGENAME}}\" ne postoji.\n\nOvo se obično dešava kad pratite zastarjelu vezu na stranicu koja je obrisana.\nViše informacija možete pronaći u [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} protokolu brisanja].",
@@ -631,7 +637,7 @@
 	"previewnote": "<strong>Ne zaboravite da je ovo samo pregled.</strong>\nVaše izmjene još nisu sačuvane!",
 	"continue-editing": "Idi na područje uređivanja",
 	"previewconflict": "Ovaj pregled prikazuje kako će tekst u gornjem polju\nizgledati ako kliknete \"Sačuvaj članak\".",
-	"session_fail_preview": "<strong>Izvinjavamo se! Nismo mogli obraditi vašu izmjenu zbog gubitka podataka o prijavi.\nMolimo pokušajte ponovno.\nAko i dalje ne bude radilo, pokušajte se [[Special:UserLogout|odjaviti]] i ponovno prijaviti.</strong>",
+	"session_fail_preview": "Izvinjavamo se! Nismo mogli obraditi Vašu izmjenu zbog gubitka podataka o prijavi.\n\nMožda ste odjavljeni. <strong>Provjerite jeste li prijavljeni i pokušajte ponovo</strong>.\nAko i dalje ne radi, pokušajte se [[Special:UserLogout|odjaviti]] i ponovo prijaviti i provjerite dozvoljava li Vaš preglednik kolačiće s ovog sajta.",
 	"session_fail_preview_html": "'''Žao nam je! Nismo mogli da obradimo vašu izmjenu zbog gubitka podataka.'''\n\n''Zbog toga što {{SITENAME}} ima omogućen izvorni HTML, predpregled je sakriven kao predostrožnost protiv JavaScript napada.''\n\n'''Ako ste pokušali da napravite pravu izmjenu, molimo pokušajte ponovo. Ako i dalje ne radi, pokušajte da se [[Special:UserLogout|odjavite]] i ponovo prijavite.'''",
 	"token_suffix_mismatch": "'''Vaša izmjena nije prihvaćena jer je Vaš web preglednik ubacio znakove interpunkcije u token uređivanja.\nIzmjena je odbačena da bi se spriječilo uništavanje teksta stranice.\nTo se događa ponekad kad korisite problematični anonimni proxy koji je baziran na web-u.'''",
 	"edit_form_incomplete": "'''Neki dijelovi uređivačkog obrasca nisu došli do servera; dvaput provjerite da su vaše izmjene nepromjenjene i pokušajte ponovno.'''",
@@ -728,7 +734,7 @@
 	"nohistory": "Ne postoji historija izmjena za ovu stranicu.",
 	"currentrev": "Trenutna verzija",
 	"currentrev-asof": "Trenutna verzija na dan $2 u $3",
-	"revisionasof": "Verzija od $1",
+	"revisionasof": "Verzija na dan $2 u $3",
 	"revision-info": "Izmjena od $1 od {{GENDER:$6|$2}}$7",
 	"previousrevision": "← Starija izmjena",
 	"nextrevision": "Novija izmjena →",
@@ -799,7 +805,7 @@
 	"revdelete-submit": "Primijeni na odabrane {{PLURAL:$1|reviziju|revizije}}",
 	"revdelete-success": "'''Vidljivost izmjene je ažurirana.'''",
 	"revdelete-failure": "'''Vidljivost revizije nije mogla biti ažurirana:'''\n$1",
-	"logdelete-success": "'''Vidljivost evidencije uspješno postavljena.'''",
+	"logdelete-success": "Postavljena je vidljivost unosa u zapisniku.",
 	"logdelete-failure": "'''Zapisnik vidljivosti nije mogao biti postavljen:'''\n$1",
 	"revdel-restore": "Promijeni dostupnost",
 	"pagehist": "Historija stranice",
@@ -848,7 +854,7 @@
 	"difference-multipage": "(Razlika između stranica)",
 	"lineno": "Red $1:",
 	"compareselectedversions": "Uporedi označene verzije",
-	"showhideselectedversions": "Pokaži/sakrij odabrane verzije",
+	"showhideselectedversions": "Prikaži/sakrij izabrane izmjene",
 	"editundo": "poništi",
 	"diff-empty": "(Nema razlike)",
 	"diff-multi-sameuser": "({{PLURAL:$1|Nije prikazana jedna međurevizija|Nisu prikazane $1 međurevizije}} istog korisnika)",
@@ -1023,7 +1029,7 @@
 	"editusergroup": "Uredi {{GENDER:$1|korisničke}} grupe",
 	"editinguser": "Mijenjate korisnička prava korisnika <strong>[[User:$1|$1]]</strong> $2",
 	"userrights-editusergroup": "Uredi korisničke grupe",
-	"saveusergroups": "Sačuvaj korisničke grupe",
+	"saveusergroups": "Sačuvaj {{GENDER:$1|korisničke}} grupe",
 	"userrights-groupsmember": "Član:",
 	"userrights-groupsmember-auto": "Uključeni član od:",
 	"userrights-groups-help": "Možete promijeniti grupe kojima ovaj korisnik pripada:\n* Označeni kvadratić znači da je korisnik u toj grupi.\n* Neoznačen kvadratić znači da korisnik nije u toj grupi.\n* Oznaka * (zvjezdica) označava da Vi ne možete izbrisati ovu grupu ako je dodate i obrnutno.",
@@ -1126,7 +1132,7 @@
 	"right-override-export-depth": "Izvoz stranica uključujući povezane stranice do dubine od 5 linkova",
 	"right-sendemail": "Slanje e-maila drugim korisnicima",
 	"right-passwordreset": "Pogledaj e-mailove za obnavljanje Å¡ifre",
-	"right-managechangetags": "Napravi i briši [[Special:Tags|oznake]] iz baze podataka",
+	"right-managechangetags": "Napravi i (de)aktiviraj [[Special:Tags|oznake]]",
 	"right-applychangetags": "Primijeni [[Special:Tags|oznake]] na nečije izmjene",
 	"right-changetags": "Dodavanje ili uklanjanje raznih [[Special:Tags|oznaka]] na pojedinačnim verzijama i unosima zapisnika",
 	"grant-group-page-interaction": "Upravljanje stranicama",
@@ -1431,7 +1437,7 @@
 	"uploadstash-clear": "Očisti sakrivene datoteke",
 	"uploadstash-nofiles": "Nemate sakrivenih datoteka.",
 	"uploadstash-badtoken": "Izvršavanje ove akcije je bilo neuspješno, možda zato što su vaša uređivačka odobrenja istekla. Pokušajte ponovo.",
-	"uploadstash-errclear": "Brisanje sakrivenih datoteka je bilo neuspješno.",
+	"uploadstash-errclear": "Brisanje datoteka nije uspjelo.",
 	"uploadstash-refresh": "Osvježi spisak datoteka",
 	"invalid-chunk-offset": "Neispravna polazna tačka",
 	"img-auth-accessdenied": "Pristup onemogućen",
@@ -1692,6 +1698,10 @@
 	"log-title-wildcard": "Traži naslove koji počinju ovim tekstom",
 	"showhideselectedlogentries": "Pokaži/sakrij izabrane zapise u evidenciji",
 	"log-edit-tags": "Uredi oznake izabranih zapisničkih unosa",
+	"checkbox-select": "Izaberi: $1",
+	"checkbox-all": "Sve",
+	"checkbox-none": "Ništa",
+	"checkbox-invert": "Obrni",
 	"allpages": "Sve stranice",
 	"nextpage": "Sljedeća stranica ($1)",
 	"prevpage": "Prethodna stranica ($1)",
@@ -1850,16 +1860,16 @@
 	"enotif_body": "Poštovani $WATCHINGUSERNAME,\n\n$PAGEINTRO $NEWPAGE\n\nSažetak urednika: $PAGESUMMARY $PAGEMINOREDIT\n\nKontaktirajte urednika:\ne-pošta: $PAGEEDITOR_EMAIL\nwiki: $PAGEEDITOR_WIKI\n\nNeće biti drugih obavještenja u slučaju daljnjih izmjena osim ako prijavljeni ponovno posjetite stranicu. Također možete poništiti oznake obavijesti za sve praćene stranice koje imate na vašem spisku praćenja.\n\nVaš prijateljski {{SITENAME}} sistem obavještavanja\n\n--\nZa promjenu vaših postavki email obavijesti, posjetite\n{{canonicalurl:{{#special:Preferences}}}}\n\nZa promjenu postavki vašeg praćenja, posjetite\n{{canonicalurl:{{#special:EditWatchlist}}}}\n\nDa obrišete stranicu sa vašeg spiska praćenja, posjetite\n$UNWATCHURL\n\nPovratne informacije i daljnja pomoć:\n$HELPPAGE",
 	"created": "napravljena",
 	"changed": "promijenjena",
-	"deletepage": "Obrišite stranicu",
+	"deletepage": "Obriši stranicu",
 	"confirm": "Potvrdite",
 	"excontent": "sadržaj je bio: \"$1\"",
 	"excontentauthor": "sadržaj je bio: \"$1\", a jedini urednik \"[[Special:Contributions/$2|$2]]\" ([[User talk:$2|razgovor]])",
 	"exbeforeblank": "sadržaj prije brisanja je bio: \"$1\"",
 	"delete-confirm": "Brisanje \"$1\"",
 	"delete-legend": "Obriši",
-	"historywarning": "<strong>Upozorenje</strong>: Stranica koju želite da obrišete ima historiju sa otprilike $1 {{PLURAL:$1|revizijom|revizije|revizija}}:",
+	"historywarning": "<strong>Upozorenje:</strong> Stranica koju želite obrisati ima historiju sa $1 {{PLURAL:$1|izmjenom|izmjene|izmjena}}:",
 	"historyaction-submit": "Prikaži",
-	"confirmdeletetext": "Brisanjem ćete obrisati stranicu ili sliku zajedno sa historijom iz baze podataka, ali će se iste moći vratiti kasnije.\nMolim potvrdite svoju namjeru, da razumijete posljedice i da ovo radite u skladu sa [[{{MediaWiki:Policy-url}}|pravilima]].",
+	"confirmdeletetext": "Obrisat ćete stranicu i njenu historiju.\nPotvrdite svoju namjeru, da razumijete posljedice i da ovo radite u skladu s [[{{MediaWiki:Policy-url}}|pravilima]].",
 	"actioncomplete": "Radnja je izvršena",
 	"actionfailed": "Akcija nije uspjela",
 	"deletedtext": "Stranica \"$1\" je obrisana.\nPogledajte $2 za zapisnik nedavnih brisanja.",
@@ -1961,14 +1971,14 @@
 	"restriction-level-all": "svi nivoi",
 	"undelete": "Pregled obrisanih stranica",
 	"undeletepage": "Pregled i vraćanje obrisanih stranica",
-	"undeletepagetitle": "'''Sljedeći sadržaj prikazuje obrisane revizije od [[:$1|$1]]'''.",
+	"undeletepagetitle": "<strong>Sljedeći sadržaj prikazuje obrisane izmjene stranice [[:$1|$1]]<strong>.",
 	"viewdeletedpage": "Pregled obrisanih stranica",
 	"undeletepagetext": "{{PLURAL:$1|Slijedeća $1 stranica je obrisana|Slijedeće $1 stranice su obrisane|Slijedećih $1 je obrisano}} ali su još uvijek u arhivi i mogu biti vraćene.\nArhiva moše biti periodično čišćena.",
-	"undelete-fieldset-title": "Vraćanje revizija",
-	"undeleteextrahelp": "Da biste vratili cijelu historiju stranice, ostavite sve kućice neoznačene i kliknite na <strong><em>{{int:undeletebtn}}</em></strong>.\nDa biste vratili određene stranice, izaberite verzije koje želite vratiti i kliknite na <strong><em>{{int:undeletebtn}}</em></strong>.",
+	"undelete-fieldset-title": "Vraćanje izmjena",
+	"undeleteextrahelp": "Da biste vratili cijelu historiju stranice, ostavite sve kućice neoznačene i kliknite na <strong><em>{{int:undeletebtn}}</em></strong>.\nDa biste vratili određene izmjene, označite ih i kliknite na <strong><em>{{int:undeletebtn}}</em></strong>.",
 	"undeleterevisions": "$1 {{PLURAL:$1|izmjena je obrisana|izmjena je obrisano}}",
-	"undeletehistory": "Ako vratite stranicu, sve će verzije biti vraćene u njenu historiju.\nAko je u međuvremenu napravljena nova verzija s istim nazivom, vraćene verzije će se pojaviti njenoj ranijoj historiji.",
-	"undeleterevdel": "Vraćanje obrisanog se neće izvršiti ako bi rezultiralo da zaglavlje stranice ili revizija datoteke bude djelimično obrisano.\nU takvim slučajevima, morate ukloniti označene ili otkriti sakrivene najskorije obrisane revizije.",
+	"undeletehistory": "Ako vratite stranicu, sve će izmjene biti vraćene u njenu historiju.\nAko je u međuvremenu napravljena nova izmjena s istim nazivom, vraćene izmjene pojavit će se u njenoj ranijoj historiji.",
+	"undeleterevdel": "Vraćanje neće biti izvršeno ako je rezultat toga djelomično brisanje posljednje izmjene.\nU takvim slučajevima morate isključiti ili otkriti najnoviju obrisanu izmjenu.",
 	"undeletehistorynoadmin": "Ova stranica je obrisana.\nRazlog za brisanje se nalazi ispod, zajedno s detaljima o korisniku koji je mijenjao stranicu prije brisanja.\nTekst obrisanih verzija dostupan je samo administratorima.",
 	"undelete-revision": "Obrisana izmjena stranice $1 (dana $4, u $5) koju je {{GENDER:$3|napravio|napravila}} $3:",
 	"undeleterevision-missing": "Nepoznata ili nedostajuća revizija.\nMožda ste unijeli pogrešan link, ili je revizija vraćena ili uklonjena iz arhive.",
@@ -1976,12 +1986,12 @@
 	"undeletebtn": "Vrati",
 	"undeletelink": "pogledaj/vrati",
 	"undeleteviewlink": "pogledaj",
-	"undeleteinvert": "Izmijeni odabir",
+	"undeleteinvert": "Obrni izbor",
 	"undeletecomment": "Razlog:",
 	"undeletedrevisions": "{{PLURAL:$1|vraćena $1 verzija|vraćene $1 verzije|vraćeno $1 verzija}}",
 	"undeletedrevisions-files": "{{PLURAL:$1|1 verzija|$1 verzije|$1 verzija}} i {{PLURAL:$2|1 datoteka|$2 datoteke|$2 datoteka}} vraćeno",
 	"undeletedfiles": "{{PLURAL:$1|1 datoteka vraćena|$1 datoteke vraćene|$1 datoteka vraćeno}}",
-	"cannotundelete": "Vraćanje nije uspjelo:\n$1",
+	"cannotundelete": "Vraćanje jedne ili svih stavki nije uspjelo:\n$1",
 	"undeletedpage": "'''$1 je vraćena'''\n\nProvjerite [[Special:Log/delete|zapis brisanja]] za zapise najskorijih brisanja i vraćanja.",
 	"undelete-header": "Pogledajte [[Special:Log/delete|zapisnik brisanja]] za nedavno obrisane stranice.",
 	"undelete-search-title": "Pretraga obrisanih stranica",
@@ -2019,8 +2029,8 @@
 	"sp-contributions-newbies-sub": "Za nove korisnike",
 	"sp-contributions-newbies-title": "Doprinosi novih korisnika",
 	"sp-contributions-blocklog": "zapisnik blokiranja",
-	"sp-contributions-suppresslog": "obrisani doprinosi korisnika",
-	"sp-contributions-deleted": "obrisani doprinosi korisnika",
+	"sp-contributions-suppresslog": "obrisani {{GENDER:$1|korisnički}} doprinosi",
+	"sp-contributions-deleted": "obrisani {{GENDER:$1|korisnički}} doprinosi",
 	"sp-contributions-uploads": "postavljanja",
 	"sp-contributions-logs": "zapisnici",
 	"sp-contributions-talk": "razgovor",
@@ -2048,7 +2058,7 @@
 	"whatlinkshere-hideredirs": "$1 preusmjerenja",
 	"whatlinkshere-hidetrans": "$1 uključenja",
 	"whatlinkshere-hidelinks": "$1 linkove",
-	"whatlinkshere-hideimages": "Veze do datoteke $1",
+	"whatlinkshere-hideimages": "$1 linkova do datoteke",
 	"whatlinkshere-filters": "Filteri",
 	"autoblockid": "Automatska blokada #$1",
 	"block": "Blokiraj korisnika",
@@ -2174,9 +2184,9 @@
 	"move-page": "Premjesti $1",
 	"move-page-legend": "Premjesti stranicu",
 	"movepagetext": "Korištenjem ovog formulara možete preimenovati stranicu, premještajući cijelu historiju na novo ime.\nČlanak pod starim imenom postat će stranica koja preusmjerava na članak pod novim imenom. \nMožete automatski izmijeniti preusmjerenje do izvornog naslova.\nAko se ne odlučite na to, provjerite [[Special:DoubleRedirects|dvostruka]] ili [[Special:BrokenRedirects|neispravna preusmjeravanja]].\nDužni ste provjeriti da svi linkovi i dalje nastave voditi na prave stranice.\n\nImajte na umu da članak '''neće''' biti premješten ako već postoji članak pod imenom na koje ga namjeravate preusmjeriti osim u slučaju stranice za preusmjeravanje koja nema nikakvih starih izmjena.\nTo znači da možete vratiti stranicu na prethodno mjesto ako pogriješite, ali ne možete zamijeniti postojeću stranicu.\n\n'''Pažnja!'''\nOvo može biti drastična i neočekivana promjena kad su u pitanju popularne stranice.\nMolimo da dobro razmislite prije no što premjestite stranicu.",
-	"movepagetext-noredirectfixer": "Koristeći donji obrazac, preimenovat ćete stranicu i premjestiti cijelu njenu historiju na novi naziv.\nStari naziv postat će preusmjerenje na novi naziv.\nMolimo da provjerite postoje li [[Special:DoubleRedirects|dvostruka]] ili [[Special:BrokenRedirects|nedovršena preusmjerenja]].\nVi ste za to odgovorni te morate provjeriti jesu li linkovi ispravni i vode li tamo kamo bi trebali voditi.\n\nImajte na umu da stranica '''neće''' biti premještena ako već postoji stranica s tim imenom, osim ako je prazna ili je preusmjerenje ili nema ranije historije.\nOvo znači da možete preimenovati stranicu nazad gdje je ranije bila preimenovana ako ste pogriješili, ali ne možete ponovo preimenovati postojeću stranicu.\n\n'''Pažnja!'''\nImajte na umu da premještanje popularnog članka može biti\ndrastična i neočekivana promjena za korisnike; molimo da budete sigurni da ste shvatili posljedice prije no što nastavite.",
+	"movepagetext-noredirectfixer": "Koristeći donji obrazac, preimenovat ćete stranicu i premjestiti cijelu njenu historiju na novi naziv.\nStari naziv postat će preusmjerenje na novi naziv.\nMolimo da provjerite postoje li [[Special:DoubleRedirects|dvostruka]] ili [[Special:BrokenRedirects|nedovršena preusmjerenja]].\nVi ste za to odgovorni te morate provjeriti jesu li linkovi ispravni i vode li tamo kamo bi trebali voditi.\n\nImajte na umu da stranica '''neće''' biti premještena ako već postoji stranica s tim imenom, osim ako je prazna ili je preusmjerenje ili nema ranije historije.\nOvo znači da možete preimenovati stranicu nazad gdje je ranije bila preimenovana ako ste pogriješili, ali ne možete ponovo preimenovati postojeću stranicu.\n\n<strong>Napomena:</strong>\nImajte na umu da premještanje popularnog članka može biti\ndrastična i neočekivana promjena za korisnike; molimo da budete sigurni da ste shvatili posljedice prije no što nastavite.",
 	"movepagetalktext": "Ako označite ovu kutijicu, odgovarajuća stranica za razgovor, ako postoji, automatski će biti premještena na novi naziv, osim ako već postoji sadržaj na odredišnoj stranici za razgovor.\n\nU tom slučaju, morat ćete ručno premjestiti ili prekopirati stranicu ako to želite.",
-	"moveuserpage-warning": "'''Upozorenje:''' Premještate korisničku stranicu. Molimo da zapamtite da će se samo stranica premjestiti a korisnik se ''neće'' preimenovati.",
+	"moveuserpage-warning": "<strong>Upozorenje:</strong> Premještate korisničku stranicu. Imajte u vidu da će samo stranica biti premještena, a sam korisnik <em>neće</em> biti preimenovan.",
 	"movecategorypage-warning": "<strong>Upozorenje:</strong> Premještate stranicu kategorije. Imajte na umu da će samo stranica biti premještena i da sve stranice u staroj kategoriji <em>neće</em> biti ponovo kategorirane u novu kategoriju.",
 	"movenologintext": "Morate biti registrovani korisnik i [[Special:UserLogin|prijavljeni]] da biste premjestili stranicu.",
 	"movenotallowed": "Nemate dopuštenje za premještanje stranica.",
@@ -2186,7 +2196,7 @@
 	"cant-move-category-page": "Nemate dopuštene da premještate stranice kategorija.",
 	"cant-move-to-category-page": "Nemate dopuštenje da premjestite stranicu na stranicu kategorije.",
 	"newtitle": "Novi naslov:",
-	"move-watch": "Prati ovu stranicu",
+	"move-watch": "Prati izvornu i odredišnu stranicu",
 	"movepagebtn": "Premjesti stranicu",
 	"pagemovedsub": "Premještanje uspjelo",
 	"movepage-moved": "'''\"$1\" je premještena na \"$2\"'''",
@@ -2194,7 +2204,7 @@
 	"movepage-moved-noredirect": "Pravljenje preusmjerenja je onemogućeno.",
 	"articleexists": "Stranica pod tim imenom već postoji ili je ime koje ste izabrali neispravno. Molimo Vas da izaberete drugo ime.",
 	"cantmove-titleprotected": "Ne možete premjestiti stranicu na ovu lokaciju jer je novi naslov zaštićen od pravljenja.",
-	"movetalk": "Premjestite i stranicu za razgovor ako je moguće.",
+	"movetalk": "Premjesti i stranicu za razgovor",
 	"move-subpages": "Premjesti sve podstranice (do $1)",
 	"move-talk-subpages": "Premjesti podstranice stranica za razgovor (do $1)",
 	"movepage-page-exists": "Stranica $1 već postoji i ne može biti automatski zamijenjena.",
@@ -2210,7 +2220,7 @@
 	"revertmove": "vrati",
 	"delete_and_move_text": "==Potebno brisanje==\nOdredišna stranica \"[[:$1]]\" već postoji.\nDa li je želite obrisati kako bi ste mogli izvršiti premještanje?",
 	"delete_and_move_confirm": "Da, obriši stranicu",
-	"delete_and_move_reason": "Obrisano da bi se napravio prostor za premještanje iz \"[[$1]]\"",
+	"delete_and_move_reason": "Obrisano da se oslobodi mjesto za premještanje iz \"[[$1]]\"",
 	"selfmove": "Izvorni i ciljani naziv su isti; strana ne može da se premjesti preko same sebe.",
 	"immobile-source-namespace": "Ne mogu premjestiti stranice u imenski prostor \"$1\"",
 	"immobile-target-namespace": "Ne mogu se premjestiti stranice u imenski prostor \"$1\"",
@@ -3129,7 +3139,7 @@
 	"tags-actions-header": "Radnje",
 	"tags-active-yes": "Da",
 	"tags-active-no": "Ne",
-	"tags-source-extension": "Definirano preko proširenja",
+	"tags-source-extension": "Definirano softverom",
 	"tags-source-manual": "Ručno postavili korisnici ili botovi",
 	"tags-source-none": "Više se ne koristi",
 	"tags-edit": "uređivanje",
@@ -3314,7 +3324,6 @@
 	"feedback-external-bug-report-button": "Podnesi tehnički zadatak",
 	"feedback-dialog-title": "Pošalji povratne informacije",
 	"feedback-dialog-intro": "Možete koristiti jednostavni formular ispod kako biste poslali povratne informacije. Vaš komentar će biti dodan stranici \"$1\" zajedno s vašim korisničkim imenom.",
-	"feedback-error-title": "Greška",
 	"feedback-error1": "Greška: Neprepoznati rezultat od API",
 	"feedback-error2": "Greška: Uređivanje nije uspjelo",
 	"feedback-error3": "Greška: Nema odgovora od API",
diff --git a/languages/i18n/cdo.json b/languages/i18n/cdo.json
index 15b39dec7a..fafca4afee 100644
--- a/languages/i18n/cdo.json
+++ b/languages/i18n/cdo.json
@@ -953,10 +953,11 @@
 	"tooltip-pt-preferences": "汝其設定",
 	"tooltip-pt-watchlist": "汝監視其頁面有改過其單單",
 	"tooltip-pt-mycontris": "汝其貢獻其單單",
-	"tooltip-pt-login": "Hĭ-uông nṳ̄ sĕng láuk-diē; bók-guó nàng-gă mò̤ ăng nṳ̄ cūng-kuāng có̤.",
+	"tooltip-pt-login": "Gióng-ngiê nṳ̄ sĕng láuk-diē; bók-guó nàng-gă mò̤ ăng nṳ̄ cūng-kuāng có̤.",
 	"tooltip-pt-logout": "躒出",
+	"tooltip-pt-createaccount": "Gióng-ngiê nṳ̄ sĕng kŭi dióng-hô gái láuk-diē; bók-guó nàng-gă mò̤ ăng nṳ̄ cūng-kuāng có̤.",
 	"tooltip-ca-talk": "Nô̤i-ṳ̀ng gì tō̤-lâung",
-	"tooltip-ca-edit": "汝會使修改茲蜀頁。起動敆保存以前使預覽按鈕",
+	"tooltip-ca-edit": "Siŭ-gāi cī hiĕk",
 	"tooltip-ca-addsection": "Gă sĭng dâung",
 	"tooltip-ca-viewsource": "茲蜀頁乞保護起去。\n汝會使看伊其源代碼。",
 	"tooltip-ca-history": "Ché̤ṳ cī hiĕk gó̤-dā̤ gì bēng-buōng",
@@ -966,13 +967,16 @@
 	"tooltip-ca-watch": "Ciŏng cī siŏh hiĕk gă diē nṳ̄ gì gáng-sê-dăng",
 	"tooltip-ca-unwatch": "共茲頁趁監視單𡅏移開去",
 	"tooltip-search": "Sìng-tō̤ {{SITENAME}} [alt-f]",
+	"tooltip-search-go": "Nâ ô dè̤ng-miàng gì hiĕk còng-câi, cô kó̤ hiā hiĕk",
 	"tooltip-search-fulltext": "Sìng-tō̤ sāi-ê̤ṳng ciā ùng-cê gì hiĕk-miêng",
 	"tooltip-p-logo": "Ché̤ṳ-siŏh-ché̤ṳ tàu-hiĕk",
 	"tooltip-n-mainpage": "Ché̤ṳ-siŏh-ché̤ṳ tàu-hiĕk",
 	"tooltip-n-mainpage-description": "Ché̤ṳ-siŏh-ché̤ṳ tàu-hiĕk",
+	"tooltip-n-portal": "Guăng-ṳ̀ ciā gĕ̤ng-tiàng, nṳ̄ â̤ có̤ gì, kó̤ diē-nē̤ tō̤ nó̤h",
 	"tooltip-n-recentchanges": "Cī-bŏng diŏh wiki ô gāi-biéng gì dăng-dăng",
 	"tooltip-n-randompage": "Sùi-biêng muōng ché̤ṳ",
-	"tooltip-t-whatlinkshere": "鏈遘嚽塊其所有維基頁面其單單\nCuòng-buô lièng-gáu cŭ-uái gì wiki hiĕk-miêng dăng-dăng",
+	"tooltip-n-help": "Sìng-tō̤ bŏng-cô gì sū-câi",
+	"tooltip-t-whatlinkshere": "Cuòng-buô lièng-gáu cŭ-uái gì wiki hiĕk-miêng dăng-dăng",
 	"tooltip-t-recentchangeslinked": "鏈遘茲頁其頁面其最近修改\nCī hiĕk lièng gáu bĕk hiĕk gì cī-bŏng gì gāi-biéng",
 	"tooltip-t-contributions": "茲蜀用戶其貢獻單單",
 	"tooltip-t-emailuser": "向茲蜀隻用戶寄電批",
@@ -992,10 +996,12 @@
 	"tooltip-watch": "共茲蜀頁加遘汝其監視單[alt-w]",
 	"anonymous": "{{SITENAME}}其無名{{PLURAL:$1|用戶}}",
 	"lastmodifiedatby": "茲頁最後是$3著$1$2改變其。",
+	"pageinfo-toolboxlink": "Hiĕk-miêng séng-sék",
 	"deletedrevision": "刪掉舊其版本$1",
 	"previousdiff": "← 舊其修改",
 	"nextdiff": "新其修改 →",
 	"file-nohires": "無更高決斷",
+	"show-big-image-size": "$1 × $2 chiông-só",
 	"ilsubmit": "尋討",
 	"bydate": "按日期",
 	"metadata": "Nguòng-só-gé̤ṳ",
diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json
index c35d64a4d8..decdb5b33a 100644
--- a/languages/i18n/ce.json
+++ b/languages/i18n/ce.json
@@ -1260,6 +1260,7 @@
 	"upload-http-error": "Даьлла гӀалат HTTP: $1",
 	"upload-dialog-title": "Файл чуяккхар",
 	"upload-dialog-button-cancel": "Цаоьшу",
+	"upload-dialog-button-back": "Юха",
 	"upload-dialog-button-done": "Кийчча ю",
 	"upload-dialog-button-save": "Ӏалашъян",
 	"upload-dialog-button-upload": "Чуяккха",
@@ -2750,6 +2751,7 @@
 	"htmlform-chosen-placeholder": "Харжа кеп",
 	"htmlform-cloner-create": "ТӀетоха кхин",
 	"htmlform-cloner-delete": "ДӀаяккха",
+	"htmlform-datetime-placeholder": "ШШШШ-ББ-ДД СС:ММ:СС",
 	"htmlform-title-not-exists": "«$1» яц.",
 	"htmlform-user-not-exists": "<strong>$1</strong> яц.",
 	"htmlform-user-not-valid": "<strong>$1</strong> — декъашхочун магийна йоцу цӀе.",
@@ -2809,7 +2811,6 @@
 	"feedback-bugornote": "Хьайн техникин халонах лаьцна яздан хӀума делахь, дехар до, [$1 хаам бе тхоьга].\nДацахь хьан йиш ю хӀокху атта кепаца «[$3 $2]» агӀонг къамел тӀетоха хьан декъашхочун цӀарца, кхин лелош йолу браузер билгал еш.",
 	"feedback-cancel": "Цаоьшу",
 	"feedback-close": "Кийчча ю",
-	"feedback-error-title": "ГӀалат",
 	"feedback-message": "Хаам:",
 	"feedback-subject": "Къамел:",
 	"feedback-submit": "Дахьийта",
@@ -2910,17 +2911,17 @@
 	"special-characters-group-ipa": "ДАЭ (IPA)",
 	"special-characters-group-symbols": "Символаш",
 	"special-characters-group-greek": "Грекийн",
-	"special-characters-group-greekextended": "Грекийн шординарш",
+	"special-characters-group-greekextended": "Грекийн алсам",
 	"special-characters-group-cyrillic": "Кирилан",
 	"special-characters-group-arabic": "Ӏарбийн",
-	"special-characters-group-arabicextended": "Iаьрбийн шординарш",
+	"special-characters-group-arabicextended": "Ӏаьрбийн алсам",
 	"special-characters-group-persian": "Пхьарсхойн",
 	"special-characters-group-hebrew": "Жуьгтийн",
 	"special-characters-group-bangla": "Бангалойн",
 	"special-characters-group-tamil": "Тамилхойн",
 	"special-characters-group-telugu": "Телугойн",
 	"special-characters-group-sinhala": "Синхалойн",
-	"special-characters-group-gujarati": "Гужаратойн",
+	"special-characters-group-gujarati": "Гуджарати",
 	"special-characters-group-devanagari": "Деванагари",
 	"special-characters-group-thai": "Тайхойн",
 	"special-characters-group-lao": "Лаохойн",
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index d12fe1798c..2f78340ad8 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -1481,6 +1481,7 @@
 	"upload-dialog-disabled": "Načítání souborů pomocí tohoto dialogu je na této wiki vypnuto.",
 	"upload-dialog-title": "Načtení souboru",
 	"upload-dialog-button-cancel": "Storno",
+	"upload-dialog-button-back": "Zpět",
 	"upload-dialog-button-done": "Hotovo",
 	"upload-dialog-button-save": "Uložit",
 	"upload-dialog-button-upload": "Načíst",
@@ -3522,7 +3523,6 @@
 	"feedback-external-bug-report-button": "Založit technický úkol",
 	"feedback-dialog-title": "Odeslat názor",
 	"feedback-dialog-intro": "Pomocí níže zobrazeného jednoduchého formuláře můžete odeslat svůj názor. Váš komentář se spolu s vaším uživatelským jménem přidá na stránku „$1“.",
-	"feedback-error-title": "Chyba",
 	"feedback-error1": "Chyba: Nerozpoznaný výsledek z API",
 	"feedback-error2": "Chyba: Editace se nezdařila",
 	"feedback-error3": "Chyba: API nevrátilo žádnou odpověď",
@@ -3828,5 +3828,8 @@
 	"unlinkaccounts-success": "Propojení účtu bylo zrušeno.",
 	"authenticationdatachange-ignored": "Změna autentizačních údajů nebyla zpracována. Možná není nakonfigurován žádný poskytovatel?",
 	"userjsispublic": "Uvědomte si prosím, že podstránky s JavaScriptem by neměly obsahovat tajné údaje, protože jsou viditelné ostatním uživatelům.",
-	"usercssispublic": "Uvědomte si prosím, že podstránky s CSS by neměly obsahovat tajné údaje, protože jsou viditelné ostatním uživatelům."
+	"usercssispublic": "Uvědomte si prosím, že podstránky s CSS by neměly obsahovat tajné údaje, protože jsou viditelné ostatním uživatelům.",
+	"restrictionsfield-badip": "Neplatná IP adresa nebo rozsah: $1",
+	"restrictionsfield-label": "Povolené rozsahy IP adres:",
+	"restrictionsfield-help": "Jedna IP adresa nebo CIDR rozsah na řádek. Všechno povolíte pomocí<br><code>0.0.0.0/0</code><br><code>::/0</code>"
 }
diff --git a/languages/i18n/de.json b/languages/i18n/de.json
index 4497e13cde..80ac64df2b 100644
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -1539,6 +1539,7 @@
 	"upload-dialog-disabled": "Dateiuploads mit diesem Dialog sind auf diesem Wiki deaktiviert.",
 	"upload-dialog-title": "Datei hochladen",
 	"upload-dialog-button-cancel": "Abbrechen",
+	"upload-dialog-button-back": "Zurück",
 	"upload-dialog-button-done": "Schließen",
 	"upload-dialog-button-save": "Speichern",
 	"upload-dialog-button-upload": "Hochladen",
@@ -3469,7 +3470,18 @@
 	"htmlform-cloner-create": "Weitere hinzufügen",
 	"htmlform-cloner-delete": "Entfernen",
 	"htmlform-cloner-required": "Es ist mindestens ein Wert erforderlich.",
-	"htmlform-date-toolow": "Der angegebene Wert liegt vor dem frühesten erlaubten Datum $1.",
+	"htmlform-date-placeholder": "JJJJ-MM-TT",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "JJJJ-MM-TT HH:MM:SS",
+	"htmlform-date-invalid": "Der eingegebene Wert ist kein erkanntes Datum. Versuche die Verwendung des Formats JJJJ-MM-TT.",
+	"htmlform-time-invalid": "Der eingegebene Wert ist keine erkannte Zeit. Versuche die Verwendung des Formats HH:MM:SS.",
+	"htmlform-datetime-invalid": "Der eingegebene Wert ist kein erkanntes Datum und keine Zeit. Versuche die Verwendung des Formats JJJJ-MM-TT HH:MM:SS.",
+	"htmlform-date-toolow": "Der eingegebene Wert liegt vor dem frühesten erlaubten Datum $1.",
+	"htmlform-date-toohigh": "Der eingegebene Wert liegt nach dem spätesten erlaubten Datum $1.",
+	"htmlform-time-toolow": "Der eingegebene Wert liegt vor der frühesten erlaubten Zeit $1.",
+	"htmlform-time-toohigh": "Der eingegebene Wert liegt nach der spätesten erlaubten Zeit $1.",
+	"htmlform-datetime-toolow": "Der eingegebene Wert liegt vor dem frühesten erlaubten Datum und der Zeit $1.",
+	"htmlform-datetime-toohigh": "Der eingegebene Wert liegt nach dem spätesten erlaubten Datum und der Zeit $1.",
 	"htmlform-title-badnamespace": "[[:$1]] ist nicht im Namensraum „{{ns:$2}}“.",
 	"htmlform-title-not-creatable": "„$1“ ist kein erstellbarer Seitentitel",
 	"htmlform-title-not-exists": "$1 ist nicht vorhanden.",
@@ -3553,7 +3565,6 @@
 	"feedback-external-bug-report-button": "Eine technische Aufgabe einreichen",
 	"feedback-dialog-title": "Rückmeldung senden",
 	"feedback-dialog-intro": "Du kannst das einfache Formular unten verwenden, um deine Rückmeldung einzureichen. Dein Kommentar wird zusammen mit deinem Benutzernamen zur Seite „$1“ hinzugefügt.",
-	"feedback-error-title": "Fehler",
 	"feedback-error1": "Fehler: Unbekanntes Ergebnis der API",
 	"feedback-error2": "Fehler: Bearbeitung gescheitert",
 	"feedback-error3": "Fehler: Keine Antwort von der API",
diff --git a/languages/i18n/diq.json b/languages/i18n/diq.json
index 57b91f9402..9277bf53b8 100644
--- a/languages/i18n/diq.json
+++ b/languages/i18n/diq.json
@@ -162,8 +162,8 @@
 	"categoryviewer-pagedlinks": "($1) ($2)",
 	"about": "Heqa cı de",
 	"article": "Pela zerreki",
-	"newwindow": "(pençereyê newey de beno a)",
-	"cancel": "Bıterkın",
+	"newwindow": "(teqaya newi de abena)",
+	"cancel": "Bıtexelne",
 	"moredotdotdot": "Vêşi...",
 	"morenotlisted": "Na lista qay kemi ya.",
 	"mypage": "Pele",
@@ -217,10 +217,10 @@
 	"newpage": "Pela newiye",
 	"talkpage": "Ena pele sero werêne",
 	"talkpagelinktext": "werênayış",
-	"specialpage": "Perra bağsi",
+	"specialpage": "Pela xısusiye",
 	"personaltools": "Hacetê şexsiy",
 	"articlepage": "Pera zerreki bıvin",
-	"talk": "Vaten",
+	"talk": "Werênayış",
 	"views": "Asayışi",
 	"toolbox": "Haceti",
 	"tool-link-userrights": "Grubanê {{GENDER:$1|karberi}} bıvırnë",
@@ -263,7 +263,7 @@
 	"mainpage": "Pela Seri",
 	"mainpage-description": "Pela seri",
 	"policy-url": "Project:Terzê hereketi",
-	"portal": "Portalë şëlıgi",
+	"portal": "Portalê cemaeti",
 	"portal-url": "Project:Portalë şëlıgi",
 	"privacy": "Politikaya nımıteyiye",
 	"privacypage": "Project:Xısusiyetê nımıtışi",
@@ -322,7 +322,7 @@
 	"nstab-template": "Şablon",
 	"nstab-help": "Pela peşti",
 	"nstab-category": "Kategoriye",
-	"mainpage-nstab": "Pela seri",
+	"mainpage-nstab": "Perra esas",
 	"nosuchaction": "Fealiyeto wınasi çıniyo",
 	"nosuchactiontext": "URL ra kar qebul nêbı.\nŞıma belka URL şaş nuşt, ya zi gıreyi şaş ra ameyi.\nKeyepelê {{SITENAME}} eşkeno xeta eşkera bıkero.",
 	"nosuchspecialpage": "Pela xasa wınasiye çıniya",
@@ -603,7 +603,7 @@
 	"hr_tip": "Xeta verardiye (teserrufın bıgureyne/bıxebetne)",
 	"summary": "Xulasa:",
 	"subject": "Mewzu:",
-	"minoredit": "Vurriyayışo werdiyo",
+	"minoredit": "No yew vurnayışo werdiyo",
 	"watchthis": "Na pele seyr ke",
 	"savearticle": "Qeyd ke",
 	"savechanges": "Vurnayışan qeyd ke",
@@ -931,7 +931,7 @@
 	"prefs-labs": "Xacetê labs",
 	"prefs-user-pages": "Pelê karberi",
 	"prefs-personal": "Pela karberi",
-	"prefs-rc": "Vıryayışë newey",
+	"prefs-rc": "Vurriyayışê peyêni",
 	"prefs-watchlist": "Lista seyrkerdışi",
 	"prefs-editwatchlist": "Lista seyrkerdışi bıvurne",
 	"prefs-editwatchlist-label": "Listey serkerdışanê cıkewtışi timar kerê",
@@ -1233,7 +1233,7 @@
 	"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 yu pera newi vıraziya ya",
-	"recentchanges-label-minor": "Vurriyayışo werdiyo",
+	"recentchanges-label-minor": "No yew vurnayışo werdiyo",
 	"recentchanges-label-bot": "Eno vurnayış terefê yew boti ra vıraziyo",
 	"recentchanges-label-unpatrolled": "Eno vurnayış hewna dewriya nêbiyo",
 	"recentchanges-label-plusminus": "Ebadê pele de bazê bayti de vayeyê cı",
@@ -1243,7 +1243,7 @@
 	"recentchanges-submit": "Bımocne",
 	"rcnotefrom": "Cêr de <strong>$2</strong> ra nata {{PLURAL:$5|vurnayışiyê}} asenê (tewr vêşi <strong>$1</strong> asenê) <strong>$3, $4</strong>",
 	"rclistfrom": "$3 $2 ra tepiya vurnayışanê neweyan bımocne",
-	"rcshowhideminor": "vurriyayışê werdi $1",
+	"rcshowhideminor": "Vurriyayışê werdiy $1",
 	"rcshowhideminor-show": "Bımocne",
 	"rcshowhideminor-hide": "Bınımne",
 	"rcshowhidebots": "botan $1",
@@ -1845,7 +1845,7 @@
 	"watchlist-hide": "Bınımne",
 	"watchlist-submit": "Bımocne",
 	"wlshowtime": "Periyoda zemani asenayışi:",
-	"wlshowhideminor": "vurriyayışê werdi",
+	"wlshowhideminor": "vurriyayışê werdiy",
 	"wlshowhidebots": "boti",
 	"wlshowhideliu": "karberê qeydıni",
 	"wlshowhideanons": "karberê anonimi",
diff --git a/languages/i18n/dty.json b/languages/i18n/dty.json
index 45a79b0d57..545d50a267 100644
--- a/languages/i18n/dty.json
+++ b/languages/i18n/dty.json
@@ -207,7 +207,7 @@
 	"views": "अवलोकन गरऽ",
 	"toolbox": "औजारअन",
 	"tool-link-userrights": "परिवर्तन{{GENDER:$1|प्रयोगकर्ता}}समूहहरू",
-	"tool-link-emailuser": "यो ईमेल{{GENDER:$|प्रयोगकर्ता}}",
+	"tool-link-emailuser": "{{GENDER:$1|प्रयोगकर्ता}}लाई एइ इमेलमी पठाऽ",
 	"userpage": "प्रयोगकर्ता पाना हेर्न्या",
 	"projectpage": "प्रोजेक्ट पानो हेर्न्या",
 	"imagepage": "चित्र पानो हेर",
@@ -312,6 +312,7 @@
 	"databaseerror-query": "अनुरोध: $1",
 	"databaseerror-function": "फङ्सन : $1",
 	"databaseerror-error": "गल्ती: $1",
+	"transaction-duration-limit-exceeded": "To avoid creating high replication lag, this transaction was aborted because the write duration ($1) exceeded the $2 second limit.\nIf you are changing many items at once, try doing multiple smaller operations instead.",
 	"laggedslavemode": "<strong>चेतावनी:</strong> पानामी हालका अद्यतनहरू नहुनस्कदान ।",
 	"readonly": "डेटाबेस बन्द गरिया छ",
 	"enterlockreason": "ताल्चा मार्नुको कारण दिया, साथै ताल्चा हटाउने समयको अवधि अनुमान लगा।",
@@ -345,6 +346,7 @@
 	"title-invalid-interwiki": "अनुरोध गरियाको शिर्षकमी अन्तर विकि लिङ्क छ जइलाई शिर्षकमी प्रयोग गद्द नाइपाइनो ।",
 	"title-invalid-talk-namespace": "निवेदन गरियाको पानाको शिर्षकले उपलब्ध नभएका कुरडी पानालाई सन्दर्भको रूपमी राख्याको छ ।",
 	"title-invalid-characters": "निवेदन गरियाको यै पानाको शिर्षकमी अवैध अक्षर रयाको छः \"$1\" ।",
+	"title-invalid-relative": "शीर्षक एउटा सन्दर्भित मार्ग राख्दछ। सन्दर्भित पृष्ठको शीर्षक (./, ../)अमान्य छ, किनकि त्यो प्राय रूपले पहुँच बाहिर हुन्छ जब त्यसलाई प्रायोगकर्ताको ब्राउजरबाट प्रयोगमी ल्याउने प्रयास गर्ने गरिन्छ।",
 	"title-invalid-magic-tilde": "अनुरोध अरिया: पन्ना: शीर्षकमी अमान्य म्याजिक टिल्ड शृङ्खला छ (<nowiki>~~~</nowiki>)।",
 	"title-invalid-too-long": "अनुरोध अरिया: पन्ना: शीर्षक भौत लामु छ। यो UTF-8 इनकोडिङमी $1 {{PLURAL:$1|byte|bytes}} है लामु हुनु हुनैन।",
 	"title-invalid-leading-colon": "निवेदन गरिया पृष्ठको शिर्षकको शुरूमी अवैध कोलोन रया छ ।",
@@ -354,12 +356,14 @@
 	"viewsource": "स्रोत हेर",
 	"viewsource-title": " $1 को स्रोत हेर",
 	"actionthrottled": "कार्य रोकिईयो",
-	"actionthrottledtext": "स्पामको रोकथामको लागि , तमीलाई यो कार्य नापै समयमी मैथै पटक गद्दाबठे सिमित गरियाको छ, र तमीले आफ्नो सिमा पार गरिसक्याछौ ।\nकृपया केही मिनेट पछि पुन: प्रयास गर  ।",
+	"actionthrottledtext": "स्पाम रोकथाम खिलाइ, तमलाई येइ काम थोक्काइ बगतमी झिक्कै फेर अद्दा बठेइ सीमित अरीरैछ, रे तमले आफुनी सीमा पार अरिसकिराइछऽ।\nकृपया केइ मिनट पछा दोसर्‍याँ प्रयास अर्याऽ।",
 	"protectedpagetext": "यो पृष्ठ सम्पादन हुनबठे बचाउन सम्पादनमी तथा अन्य कार्यमी रोक लगाइया छ।",
 	"viewsourcetext": "तम ये पृष्ठको स्रोत हेद्दु सकुन्छौ और उईको नक्कल उताद्दु सकुन्छौ |",
 	"viewyourtext": "यै पानामी रह्याका '''तमरा सम्पादनहरू''' हेद्द या प्रतिलिपी गद्द सक्द्या हौ :",
+	"protectedinterface": "यो पृष्ठले सफ्टवेयरको लागि अन्तरमोहडा पाठ प्रदान गर्दछ , र यसलाई दुरुपयोग हुनबाट बचाउन सुरक्षा प्रदान गरिएको छ।\nसम्पूर्ण विकिहरूका लागि अनुवादमी परिवर्तन गर्नको लागि [https://translatewiki.net/ translatewiki.net], प्रयोग गर्नुहोस् ,  मिडियाविकि स्थानियकरण परियोजना ।",
 	"editinginterface": "<strong>चेतावनी:</strong> तमी यै पानालाई सम्पादन गद्द लाग्याछौ, जनले सफ्टवेयरको लागि \nइन्टरफेस सामग्रीहरू प्रदान गरन्छ।\nयै पानामी गरियाको परिवर्तनले यै विकिमी अरु प्रयोगकर्तानको इन्टरफेसको प्रदर्शनमी प्रभाव पडन्छ ।",
 	"translateinterface": "सप्पै विकिइनखिलाइ अनुवाद थप्दाइ या बदेल्लाइ, कृपया [https://translatewiki.net/ translatewiki.net]को प्रयोग अर:, मिडियाविकि क्षेत्रीयकरण परियोजना:।",
+	"cascadeprotected": "यो पृष्ठ सम्पादन गर्नबाट सुरक्षित गरिएकोछ किनभनें {{PLURAL:$1|पृष्ठ |पृष्ठहरू}}मा सुरक्षित गर्नुका साथै प्रपात (\"cascading\") विकल्प खुल्ला राखिएको छ:\n$2",
 	"namespaceprotected": "तमलाई '''$1'''  नेमस्पेसमी रह्याका पानाहरू सम्पादन गद्या अनुमति छैन ।",
 	"customcssprotected": "तमलाई यो  पानो सम्पादन गद्दे अनुमति छैन, किनकी यैमी कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
 	"customjsprotected": "तमलाई यो जाभास्कृप्ट पानो सम्पादन गद्दे अनुमति छैन, किनकी यैमी कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
@@ -489,6 +493,8 @@
 	"changepassword-success": "तमरो पासवर्ड सफलतापूर्वक परिवर्तन भयो!",
 	"changepassword-throttled": "तमले अलै भौत फेर प्रवेशका निम्ति प्रयास गरया छौ।\nकृपया $1 थोक्कै जागी मात्र प्रयास गर।",
 	"botpasswords": "बोट पासवर्ड",
+	"botpasswords-createnew": "नौलो बोट पासवर्ड बनाऽ",
+	"botpasswords-editexisting": "भयाऽ बोट पासवर्ड सम्पादन अरऽ",
 	"botpasswords-label-appid": "बोट नाम:",
 	"botpasswords-label-create": "सृजना गर",
 	"botpasswords-label-update": "नयाँ बनाउनु",
@@ -497,7 +503,11 @@
 	"botpasswords-label-resetpassword": "पासवर्ड पूर्वनिर्धारित गर",
 	"botpasswords-label-grants": "अनुदान आवेदन:",
 	"botpasswords-label-grants-column": "प्रदान भयो",
+	"botpasswords-bad-appid": "बोट नाउँ \"$1\" नाइमाणीनो।",
+	"botpasswords-insert-failed": "बोट नाउँ \"$1\" थप्दाइ असफल। कि यो पैली थपीसकीरैछ?",
+	"botpasswords-update-failed": "बोट नाउँ \"$1\" अपडेट अद्दाइ असफल। कि यो मेट्याऽ हो?",
 	"botpasswords-created-title": "बोट को पासवर्ड बन्यो",
+	"botpasswords-created-body": "प्रयोगकर्ता \"$2\" को बोट नाउँ \"$1\" खिलाइ बोट पासवर्ड बनायियो।",
 	"botpasswords-updated-title": "बोट को पासवर्ड अपडेट भयो",
 	"botpasswords-deleted-title": "बोट को पासवर्ड मेटियो",
 	"resetpass_forbidden": "पासवर्ड परिवर्तन गर्न नाइँमिल्लो",
@@ -1146,6 +1156,8 @@
 	"protect-default": "सब्बै प्रयोगकर्तानहरूलाई अनुमति दिन्या",
 	"protect-level-autoconfirmed": "नौला तथा दर्ता भयाका प्रयोगकर्तानलाई मात्र अनुमति दिन्या",
 	"protect-cascade": "यै पानामी संलग्न सुरक्षित पानाहरू (लामबद्द सुरक्षा)",
+	"protect-expiry-options": "२ घण्टाहरू:2 hours,१ दिन :1 day,३ दिनहरू:3 days,१ हप्ता:1 week,२ हप्ताहरू:2 weeks,१ महिना:1 month,३ महिनाहरू:3 months,६ महिनाहरू:6 months,१ वर्ष:1 year,अनगिन्ती:infinite",
+	"restriction-type": "अनुमति:",
 	"pagesize": "(अक्षरहरू)",
 	"undeletepage": "मेट्याका पानाहरू हेद्या र पूर्वरुपमी फर्काउन्या",
 	"undeleterevisions": "$1 {{PLURAL:$1|संशोधन|संशोधनहरू}} संग्रहित",
diff --git a/languages/i18n/egl.json b/languages/i18n/egl.json
index dfe09b4f79..1d12d07fcc 100644
--- a/languages/i18n/egl.json
+++ b/languages/i18n/egl.json
@@ -836,7 +836,7 @@
 	"searchprofile-advanced-tooltip": "Sērca int i spâsi di nòm fât só mzûra.",
 	"search-result-size": "$1 ({{PLURAL:$2|'na parôla|$2 parôli}})",
 	"search-result-category-size": "{{PLURAL:$1|1 utèint|$1 utèint}} ({{PLURAL:$2|1 sotcategoréia|$2 sotcategoréi}},{{PLURAL:$3|1 file|$3 files}})",
-	"search-redirect": "(redirect $1)",
+	"search-redirect": "(redirect from $1)",
 	"search-section": "(sesiòun $1)",
 	"search-category": "(categoréia $1)",
 	"search-file-match": "(relasiòun dèinter al file)",
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index cbe755de47..fc8ba1f54f 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -993,7 +993,7 @@
 	"searchprofile-advanced-tooltip": "Search in custom namespaces",
 	"search-result-size": "$1 ({{PLURAL:$2|1 word|$2 words}})",
 	"search-result-category-size": "{{PLURAL:$1|1 member|$1 members}} ({{PLURAL:$2|1 subcategory|$2 subcategories}}, {{PLURAL:$3|1 file|$3 files}})",
-	"search-redirect": "(redirect $1)",
+	"search-redirect": "(redirect from $1)",
 	"search-section": "(section $1)",
 	"search-category": "(category $1)",
 	"search-file-match": "(matches file content)",
@@ -3907,7 +3907,6 @@
 	"feedback-external-bug-report-button": "File a technical task",
 	"feedback-dialog-title": "Submit feedback",
 	"feedback-dialog-intro": "You can use the easy form below to submit your feedback. Your comment will be added to the page \"$1\", along with your username.",
-	"feedback-error-title": "Error",
 	"feedback-error1": "Error: Unrecognized result from API",
 	"feedback-error2": "Error: Edit failed",
 	"feedback-error3": "Error: No response from API",
diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index a155ea34e0..af8fb9832b 100644
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -1488,6 +1488,7 @@
 	"upload-dialog-disabled": "Alŝutoj de dosiero per ĉi tiun dialogon estas malfunkciigita sur ĉi tiu vikio.",
 	"upload-dialog-title": "Alŝuti dosieron",
 	"upload-dialog-button-cancel": "Nuligi",
+	"upload-dialog-button-back": "Reen",
 	"upload-dialog-button-done": "Farite",
 	"upload-dialog-button-save": "Konservi",
 	"upload-dialog-button-upload": "Alŝuti",
@@ -1991,13 +1992,13 @@
 	"watchlist-hide": "Kaŝi",
 	"watchlist-submit": "Montri",
 	"wlshowtime": "Vidigenda tempodaÅ­ro:",
-	"wlshowhideminor": "Etaj redaktoj",
-	"wlshowhidebots": "robotoj",
-	"wlshowhideliu": "registritaj uzantoj",
-	"wlshowhideanons": "anonimaj uzantoj",
+	"wlshowhideminor": "etajn redaktojn",
+	"wlshowhidebots": "robotojn",
+	"wlshowhideliu": "registritajn uzantojn",
+	"wlshowhideanons": "anonimajn uzantojn",
 	"wlshowhidepatr": "patrolitaj redaktoj",
-	"wlshowhidemine": "miaj redaktoj",
-	"wlshowhidecategorization": "paĝa enkategoriigo.",
+	"wlshowhidemine": "miajn redaktojn",
+	"wlshowhidecategorization": "kategoriigon de paĝoj",
 	"watchlist-options": "Opcioj por atentaro",
 	"watching": "Aldonata al la atentaro...",
 	"unwatching": "Malatentante...",
@@ -3435,6 +3436,9 @@
 	"htmlform-cloner-create": "Aldoni plian",
 	"htmlform-cloner-delete": "Forigi",
 	"htmlform-cloner-required": "AlmenaÅ­ unu valoro estas nepra.",
+	"htmlform-date-placeholder": "JJJJ-MM-TT",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "JJJJ-MM-TT HH:MM:SS",
 	"htmlform-title-badnamespace": "[[:$1]] ne  estas en \"{{ns:$2}}\" nomspaco.",
 	"htmlform-title-not-creatable": "\"$1\" estas nekreebla titolo por paĝo",
 	"htmlform-title-not-exists": "$1 ne ekzistas.",
@@ -3482,7 +3486,7 @@
 	"logentry-newusers-autocreate": "Uzantokonto $1 estis {{GENDER:$2|kreita}} aÅ­tomate",
 	"logentry-protect-move_prot": "$1 {{GENDER:$2|movis}} protektajn agordojn el $4 al $3",
 	"logentry-protect-unprotect": "$1 {{GENDER:$2|forigis}} protekton el $3",
-	"logentry-protect-protect": "$1 {{GENDER:$2|protektis}} $3 $4",
+	"logentry-protect-protect": "$1 {{GENDER:$2|protektis}} la paĝon $3 $4",
 	"logentry-protect-protect-cascade": "$1 {{GENDER:$2|protektis}} $3 $4 [rikure]",
 	"logentry-protect-modify": "$1 {{GENDER:$2|ŝanĝis}} la nivelon de protekto de $3 $4",
 	"logentry-protect-modify-cascade": "$1 {{GENDER:$2|ŝanĝis}} la nivelon de protekto de $3 $4 [rikure]",
@@ -3518,7 +3522,6 @@
 	"feedback-external-bug-report-button": "Krei teĥnikan taskon",
 	"feedback-dialog-title": "Sendi prijuĝajn rimarkojn",
 	"feedback-dialog-intro": "Vi povas uzi suban simplan formularon por sendi viajn prijuĝajn rimarkojn. Via komento estos aldonita al la paĝo \"$1\" kun via uzanto-nomo.",
-	"feedback-error-title": "Eraro",
 	"feedback-error1": "Eraro: Nerekonita rezulto de API",
 	"feedback-error2": "Eraro: La redakto malsukcesis",
 	"feedback-error3": "Eraro: Neniu respondo de API",
diff --git a/languages/i18n/es.json b/languages/i18n/es.json
index 922729f9f7..700f4e0c68 100644
--- a/languages/i18n/es.json
+++ b/languages/i18n/es.json
@@ -1591,6 +1591,7 @@
 	"upload-dialog-disabled": "En este wiki están desactivadas las subidas de archivos mediante este cuadro de diálogo.",
 	"upload-dialog-title": "Subir archivo",
 	"upload-dialog-button-cancel": "Cancelar",
+	"upload-dialog-button-back": "Volver",
 	"upload-dialog-button-done": "Hecho",
 	"upload-dialog-button-save": "Guardar",
 	"upload-dialog-button-upload": "Subir",
@@ -3503,6 +3504,18 @@
 	"htmlform-cloner-create": "Añadir más",
 	"htmlform-cloner-delete": "Eliminar",
 	"htmlform-cloner-required": "Se requiere al menos un valor.",
+	"htmlform-date-placeholder": "AAAA-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "No se reconoció la fecha en el formato proporcionado. Prueba a usar el formato AAAA-MM-DD.",
+	"htmlform-time-invalid": "No se reconoció la hora en el formato proporcionado. Prueba a usar el formato HH:MM:SS.",
+	"htmlform-datetime-invalid": "No se reconoció la fecha y la hora en el formato proporcionado. Prueba a usar el formato AAAA-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "El valor especificado es anterior a la fecha más antigua permitida, $1.",
+	"htmlform-date-toohigh": "El valor especificado es posterior a la fecha límite permitida, $1.",
+	"htmlform-time-toolow": "El valor especificado es anterior a la hora más antigua permitida, $1.",
+	"htmlform-time-toohigh": "El valor especificado es posterior a la hora límite permitida, $1.",
+	"htmlform-datetime-toolow": "El valor especificado es anterior a la fecha y hora más antigua permitidas, $1.",
+	"htmlform-datetime-toohigh": "El valor especificado es posterior a la fecha y hora límite permitidas, $1.",
 	"htmlform-title-badnamespace": "[[:$1]] no está en el espacio de nombres \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" no es un título de página que se pueda crear",
 	"htmlform-title-not-exists": "$1 no existe.",
@@ -3586,7 +3599,6 @@
 	"feedback-external-bug-report-button": "Enviar una tarea técnica",
 	"feedback-dialog-title": "Enviar comentarios",
 	"feedback-dialog-intro": "Puedes usar el formulario sencillo debajo para enviar tus comentarios. Ellos se agregarán a la página \"$1\", junto con tu nombre de usuario.",
-	"feedback-error-title": "Error",
 	"feedback-error1": "Error: No se reconoce resultado de API",
 	"feedback-error2": "Error: Falló la edición",
 	"feedback-error3": "Error: No hay respuesta de la API",
diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json
index 476e3f19ee..a3b56d831c 100644
--- a/languages/i18n/eu.json
+++ b/languages/i18n/eu.json
@@ -222,6 +222,8 @@
 	"talk": "Eztabaida",
 	"views": "Ikustaldiak",
 	"toolbox": "Tresnak",
+	"tool-link-userrights": "Erabiltzaile {{GENDER:$1|taldea}} aldatu",
+	"tool-link-emailuser": "{{GENDER:$1|Erabiltzale}} honi e-posta bidali",
 	"userpage": "Lankide orrialdea ikusi",
 	"projectpage": "Proiektuaren orrialdea ikusi",
 	"imagepage": "Ikusi fitxategiaren orria",
@@ -470,7 +472,7 @@
 	"eauthentsent": "Egiaztapen mezu bat bidali da zehaztutako e-posta helbidera.\nHelbide horretara beste edozein mezu bidali aurretik, bertan azaltzen diren argibideak jarraitu behar dituzu, kontua zurea dela egiaztatzeko.",
 	"throttled-mailpassword": "Pasahitz gogorarazle bat bidali da jada azken {{PLURAL:$1|orduan|$1 orduetan}}.\nBandalismoa sahiesteko pasahitz eskaera bat baino ezin da egin {{PLURAL:$1|orduan|$1 orduan}} behin.",
 	"mailerror": "Errorea mezua bidaltzerakoan: $1",
-	"acct_creation_throttle_hit": "Sentitzen dugu, {{PLURAL:$1|erabiltzaile kontu bat sortu duzu|$1 erabiltzaile kontu sortu dituzu}} dagoeneko.\nOndorioz, ezin duzu kontu gehiago sortu.",
+	"acct_creation_throttle_hit": "Sentitzen dugu, {{PLURAL:$1|erabiltzaile kontu bat sortu duzu|$1 erabiltzaile kontu sortu dituzu}} dagoeneko azken $2(e)tan.\nOndorioz, ezin duzu kontu gehiago sortu.",
 	"emailauthenticated": "Zure e-posta helbidea autentifikatu da $2an $3(e)tan.",
 	"emailnotauthenticated": "Zure posta helbidea egiaztatu gabe dago. \nEz da mezurik bidaliko hurrengo ezaugarrientzako.",
 	"noemailprefs": "Zehaztu e-posta helbide bat ezaugarri hauek erabili ahal izateko.",
@@ -1293,6 +1295,7 @@
 	"upload-copy-upload-invalid-domain": "Domeinu honetan ezin dira igoerak kopiatu.",
 	"upload-dialog-title": "Igo fitxategia",
 	"upload-dialog-button-cancel": "Utzi",
+	"upload-dialog-button-back": "Atzera",
 	"upload-dialog-button-done": "Egina",
 	"upload-dialog-button-save": "Gorde",
 	"upload-dialog-button-upload": "Igo",
@@ -3014,6 +3017,12 @@
 	"htmlform-chosen-placeholder": "Aukeratu",
 	"htmlform-cloner-create": "Gehitu gehiago",
 	"htmlform-cloner-delete": "Kendu",
+	"htmlform-date-placeholder": "UUUU-HH-EE",
+	"htmlform-time-placeholder": "OO:MM:SS",
+	"htmlform-datetime-placeholder": "UUUU-HH-EE OO:MM:SS",
+	"htmlform-date-invalid": "Jarri duzun balioak ez du data ezagunik adierazten. Saiatu UUUU-HH-EE formatua erabiltzen.",
+	"htmlform-time-invalid": "Jarri duzun balioak ez du denbora ezagunik adierazten. Saiatu OO:MM:SS formatua erabiltzen.",
+	"htmlform-datetime-invalid": "Jarri duzun balioak ez da data eta denbora bezala ezagutzen. Saitu UUUU-HH-EE OO:MM:SS formatua erabiltzen.",
 	"htmlform-title-not-creatable": "\"$1\" ez da sor daitekeen orrialde baten izenburua",
 	"htmlform-title-not-exists": "$1 ez da existitzen.",
 	"htmlform-user-not-exists": "<strong>$1</strong> ez da existitzen.",
@@ -3055,7 +3064,6 @@
 	"feedback-cancel": "Utzi",
 	"feedback-close": "Egina",
 	"feedback-dialog-title": "Feedbacka bidali",
-	"feedback-error-title": "Errorea",
 	"feedback-error1": "Akatsa: APIaren emaitza ez ezagunak",
 	"feedback-error2": "Akatsa: Aldaketa ez da egin",
 	"feedback-error3": "Akatsa: APIaren erantzunik gabe",
diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json
index 37a6d519d4..d74dd1e40a 100644
--- a/languages/i18n/fi.json
+++ b/languages/i18n/fi.json
@@ -1481,6 +1481,7 @@
 	"upload-foreign-cant-upload": "Tätä wikiä ei ole konfiguroitu tallentamaan tiedostoja pyydettyyn ulkoiseen tiedostovarastoon.",
 	"upload-dialog-title": "Tiedoston tallennus",
 	"upload-dialog-button-cancel": "Peru",
+	"upload-dialog-button-back": "Takaisin",
 	"upload-dialog-button-done": "Valmis",
 	"upload-dialog-button-save": "Tallenna",
 	"upload-dialog-button-upload": "Tallenna",
@@ -3399,6 +3400,9 @@
 	"htmlform-cloner-create": "Lisää enemmän",
 	"htmlform-cloner-delete": "Poista",
 	"htmlform-cloner-required": "Vähintään yksi arvo on pakollinen.",
+	"htmlform-date-placeholder": "VVVV-KK-PP",
+	"htmlform-time-placeholder": "TT:MM:SS",
+	"htmlform-datetime-placeholder": "VVVV-KK-PP TT:MM:SS",
 	"htmlform-title-badnamespace": "Sivu [[:$1]] ei ole nimiavaruudessa ”{{ns:$2}}”.",
 	"htmlform-title-not-creatable": "”$1” ei kelpaa sivun nimeksi.",
 	"htmlform-title-not-exists": "Sivua $1 ei ole olemassa.",
@@ -3482,7 +3486,6 @@
 	"feedback-external-bug-report-button": "Lähetä tekninen tehtävä",
 	"feedback-dialog-title": "Lähetä palautetta",
 	"feedback-dialog-intro": "Voit käyttää tätä helppoa lomaketta palautteesi lähettämiseen. Kommenttisi lisätään sivulle \"$1\" käyttäjätunnuksesi kera.",
-	"feedback-error-title": "Virhe",
 	"feedback-error1": "Virhe: Ohjelmointirajapinnan vastausta ei tunnistettu",
 	"feedback-error2": "Virhe: Muokkaus epäonnistui",
 	"feedback-error3": "Virhe: Ohjelmointirajapinta ei vastaa",
@@ -3779,5 +3782,7 @@
 	"linkaccounts-submit": "Linkitä tunnuksia",
 	"unlinkaccounts": "Poista tunnusten linkityksiä",
 	"unlinkaccounts-success": "Tunnuksen linkitys poistettiin.",
-	"authenticationdatachange-ignored": "Varmennustietojen muutosta ei käsitelty. Ehkä palveluntarjoajaa ei määritelty?"
+	"authenticationdatachange-ignored": "Varmennustietojen muutosta ei käsitelty. Ehkä palveluntarjoajaa ei määritelty?",
+	"restrictionsfield-badip": "Virheellinen IP-osoite tai alue: $1",
+	"restrictionsfield-label": "Sallitut IP-alueet:"
 }
diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index cb79079cdf..91b98f490f 100644
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -1180,7 +1180,7 @@
 	"prefs-emailconfirm-label": "Confirmation du courriel :",
 	"youremail": "Courriel :",
 	"username": "{{GENDER:$1|Nom d'utilisateur|Nom d'utilisatrice}} :",
-	"prefs-memberingroups": "{{GENDER:$2|Membre}} {{PLURAL:$1|du groupe|des groupes}}:",
+	"prefs-memberingroups": "{{GENDER:$2|Membre}} {{PLURAL:$1|du groupe|des groupes}} :",
 	"prefs-registration": "Date d'inscription :",
 	"yourrealname": "Nom réel :",
 	"yourlanguage": "Langue :",
@@ -1597,6 +1597,7 @@
 	"upload-dialog-disabled": "Les téléversements de fichier utilisant cette boîte de dialogue sont désactivés sur ce wiki.",
 	"upload-dialog-title": "Téléverser un fichier",
 	"upload-dialog-button-cancel": "Annuler",
+	"upload-dialog-button-back": "Retour",
 	"upload-dialog-button-done": "Terminé",
 	"upload-dialog-button-save": "Enregistrer",
 	"upload-dialog-button-upload": "Téléverser",
@@ -3220,7 +3221,7 @@
 	"namespacesall": "Tous",
 	"monthsall": "tous",
 	"confirmemail": "Confirmer l’adresse de courriel",
-	"confirmemail_noemail": "Vous n’avez pas défini une adresse de courriel valide dans vos [[Special:Preferences|préférences]].",
+	"confirmemail_noemail": "Vous n’avez pas défini une adresse de courriel valide dans vos [[Special:Preferences|préférences utilisateur]].",
 	"confirmemail_text": "Ce wiki nécessite la vérification de votre adresse de courriel avant de pouvoir utiliser toute fonction de messagerie.\nUtilisez le bouton ci-dessous pour envoyer un courriel de confirmation à votre adresse.\nLe courriel inclura un lien comportant un code à usage unique et limité dans le temps ;\nchargez ce lien dans votre navigateur pour confirmer que votre adresse de courriel est valide.",
 	"confirmemail_pending": "Un code de confirmation vous a déjà été envoyé par courriel ;\nsi vous venez de créer votre compte, veuillez attendre quelques minutes que le courriel arrive avant de demander un nouveau code.",
 	"confirmemail_send": "Envoyer un code de confirmation",
@@ -3232,7 +3233,7 @@
 	"confirmemail_success": "Votre adresse de courriel a été confirmée.\nVous pouvez maintenant vous [[Special:UserLogin|{{MediaWiki:Loginreqlink}}]] et profiter du wiki.",
 	"confirmemail_loggedin": "Votre adresse de courriel est maintenant confirmée.",
 	"confirmemail_subject": "Confirmation d’adresse de courriel pour {{SITENAME}}",
-	"confirmemail_body": "Quelqu’un, probablement vous, à partir de l’adresse IP $1,\na enregistré un compte « $2 » avec cette adresse de courriel\nsur le site {{SITENAME}}.\n\nPour confirmer que ce compte vous appartient vraiment et afin\nd’activer les fonctions de messagerie sur {{SITENAME}},\nveuillez suivre ce lien dans votre navigateur :\n\n$3\n\nSi vous n’avez *pas* enregistré ce compte, n’ouvrez pas ce lien ;\nvous pouvez suivre l’autre lien ci-dessous pour annuler la\nconfirmation de votre adresse courriel :\n\n$5\n\nCe code de confirmation expirera le $4.",
+	"confirmemail_body": "Quelqu’un, probablement vous, à partir de l’adresse IP $1,\na créé un compte « $2 » avec cette adresse de courriel sur le site {{SITENAME}}.\n\nPour confirmer que ce compte vous appartient vraiment et afin\nd’activer les fonctions de messagerie sur {{SITENAME}},\nveuillez suivre ce lien dans votre navigateur :\n\n$3\n\nSi vous n’avez *pas* créé ce compte, suivez le lien ci-dessous \npour annuler la confirmation de votre adresse courriel :\n\n$5\n\nCe code de confirmation expirera le $4.",
 	"confirmemail_body_changed": "Quelqu’un, probablement vous, à partir de l’adresse IP $1,\na modifié l’adresse de courriel associée au compte « $2 » de {{SITENAME}}\nen cette adresse.\n\nPour confirmer que ce compte vous appartient vraiment et afin\nde réactiver les fonctions de messagerie sur {{SITENAME}},\nveuillez suivre ce lien dans votre navigateur :\n\n$3\n\nSi ce compte ne vous appartient *pas*, n’ouvrez pas ce lien ;\nvous pouvez suivre l’autre lien ci-dessous pour annuler la\nconfirmation de votre adresse courriel :\n\n$5\n\nCe code de confirmation expirera le $4.",
 	"confirmemail_body_set": "Quelqu’un, probablement vous, depuis l’adresse IP $1, a modifié l’adresse de courriel du compte « $2 » en celle-ci sur {{SITENAME}}.\n\nPour confirmer que ce compte vous appartient et réactiver les fonctions de courriel sur {{SITENAME}}, ouvrez ce lien dans votre navigateur Web :\n\n$3\n\nCe code de confirmation expirera le $4.\n\nSi le compte ne vous appartient *pas*, suivez plutôt ce lien pour annuler la confirmation de l’adresse de courriel :\n\n$5",
 	"confirmemail_invalidated": "Confirmation de l’adresse courriel annulée",
@@ -3383,7 +3384,7 @@
 	"hebrew-calendar-m12-gen": "eloul",
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|discussion]])",
 	"timezone-local": "Local",
-	"duplicate-defaultsort": "Attention : la clé de tri par défaut « $2 » écrase la précédente clé « $1 ».",
+	"duplicate-defaultsort": "<strong>Attention :</strong> la clé de tri par défaut « $2 » écrase la précédente clé « $1 ».",
 	"duplicate-displaytitle": "<strong>Attention :</strong> Le titre d'affichage « $2 » remplace l'ancien titre d'affichage « $1 ».",
 	"restricted-displaytitle": "<strong>Avertissement :</strong> le titre d’affichage \"$1\" a été ignoré car il n'est pas équivalent au titre effectif de la page.",
 	"invalid-indicator-name": "<strong>Erreur :</strong> L’attribut <code>name</code> des indicateurs d’état de la page ne doit pas être vide.",
@@ -3415,11 +3416,11 @@
 	"version-license-not-found": "Aucune information détaillée de la licence n'a été trouvée pour cette extension.",
 	"version-credits-title": "Remerciements pour $1",
 	"version-credits-not-found": "Aucune information détaillée des remerciements n'a été trouvée pour cette extension.",
-	"version-poweredby-credits": "Ce wiki fonctionne grâce à '''[https://www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
+	"version-poweredby-credits": "Ce wiki fonctionne grâce à <strong>[https://www.mediawiki.org/ MediaWiki]</strong>, copyright © 2001-$1 $2.",
 	"version-poweredby-others": "autres",
 	"version-poweredby-translators": "traducteurs de translatewiki.net",
 	"version-credits-summary": "Nous tenons à remercier les personnes suivantes pour leur contribution à  [[Special:Version|MediaWiki]].",
-	"version-license-info": "MediaWiki est un logiciel libre, vous pouvez le redistribuer ou le modifier selon les termes de la Licence Publique Générale GNU telle que publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (à votre choix) toute version ultérieure.\n\nMediaWiki est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION À UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.\n\nVous devriez avoir reçu [{{SERVER}}{{SCRIPTPATH}}/COPYING une copie de la Licence Publique Générale GNU] avec ce programme, sinon, écrivez à la Free Software Foundation, Inc., 51, rue Franklin, cinquième étage, Boston, MA 02110-1301, États-Unis ou [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lisez-la en ligne].",
+	"version-license-info": "MediaWiki est un logiciel libre, vous pouvez le redistribuer ou le modifier selon les termes de la Licence Publique Générale GNU telle que publiée par la Free Software Foundation ; soit la version 2 de la Licence, ou (à votre choix) toute version ultérieure.\n\nMediaWiki est distribué dans l'espoir qu'il sera utile, mais SANS AUCUNE GARANTIE, sans même la garantie implicite de COMMERCIALISATION ou D'ADAPTATION À UN USAGE PARTICULIER. Voir la Licence Publique Générale GNU pour plus de détails.\n\nVous devriez avoir reçu [{{SERVER}}{{SCRIPTPATH}}/COPYING une copie de la Licence Publique Générale GNU] avec ce programme, sinon, écrivez à la Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, États-Unis ou [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lisez-la en ligne].",
 	"version-software": "Logiciels installés",
 	"version-software-product": "Produit",
 	"version-software-version": "Version",
@@ -3597,6 +3598,18 @@
 	"htmlform-cloner-create": "Ajouter encore",
 	"htmlform-cloner-delete": "Supprimer",
 	"htmlform-cloner-required": "Une valeur au moins est obligatoire.",
+	"htmlform-date-placeholder": "AAAA-MM-JJ",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-JJ HH:MM:SS",
+	"htmlform-date-invalid": "La valeur que vous avez spécifiée n’est pas une date reconnue. Essayez en utilisant le format AAAA-MM-JJ.",
+	"htmlform-time-invalid": "La valeur que vous avez spécifiée n’est pas une heure reconnue. Essayez en utilisant le format HH:MM:SS.",
+	"htmlform-datetime-invalid": "La valeur que vous avez spécifiée n’est pas un horodatage reconnu. Essayez en utilisant le format AAAA-MM-JJ HH:MM:SS.",
+	"htmlform-date-toolow": "La valeur que vous avez spécifiée est antérieure à la date autorisée la plus ancienne, qui est $1.",
+	"htmlform-date-toohigh": "La valeur que vous avez spécifiée est postérieure à la date autorisée la plus lointaine, qui est $1.",
+	"htmlform-time-toolow": "La valeur que vous avez spécifiée est antérieure à la plus petite heure autorisée, qui est $1.",
+	"htmlform-time-toohigh": "La valeur que vous avez spécifiée est postérieure à la plus grande heure autorisée, qui est $1.",
+	"htmlform-datetime-toolow": "La valeur que vous avez spécifiée est antérieure à l’horodatage autorisé le plus ancien, qui est $1.",
+	"htmlform-datetime-toohigh": "La valeur que vous avez spécifiée est postérieure à l’horodatage autorisé le plus lointain, qui est $1.",
 	"htmlform-title-badnamespace": "[[:$1]] n'est pas dans l’espace de noms « {{ns:$2}} ».",
 	"htmlform-title-not-creatable": "« $1 » n’est pas un titre de page pouvant être créée",
 	"htmlform-title-not-exists": "$1 n’existe pas",
@@ -3680,7 +3693,6 @@
 	"feedback-external-bug-report-button": "Signaler un bogue technique",
 	"feedback-dialog-title": "Soumettre un commentaire",
 	"feedback-dialog-intro": "Vous pouvez utiliser le simple formulaire ci-dessous pour faire parvenir vos commentaires. Votre commentaire sera ajouté à la page « $1 », ainsi que votre nom d’utilisateur.",
-	"feedback-error-title": "Erreur",
 	"feedback-error1": "Erreur : Résultat de l'IPA non reconnu",
 	"feedback-error2": "Erreur : la modification a échoué",
 	"feedback-error3": "Erreur : aucune réponse de l'API",
diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json
index c1dcd52428..4de10f0491 100644
--- a/languages/i18n/gl.json
+++ b/languages/i18n/gl.json
@@ -1358,7 +1358,7 @@
 	"recentchanges-page-removed-from-category-bundled": "[[:$1]] eliminada da categoría [[Special:WhatLinksHere/$1||esta páxina está incluída noutras páxinas]]",
 	"autochange-username": "Cambio automático de MediaWiki",
 	"upload": "Subir un ficheiro",
-	"uploadbtn": "Subir un ficheiro",
+	"uploadbtn": "Subir o ficheiro",
 	"reuploaddesc": "Cancelar a carga e volver ao formulario de carga",
 	"upload-tryagain": "Enviar a descrición do ficheiro modificada",
 	"uploadnologin": "Non accedeu ao sistema",
@@ -1469,6 +1469,7 @@
 	"upload-dialog-disabled": "As cargas de ficheiros usando esta pantalla están desactivadas neste wiki.",
 	"upload-dialog-title": "Subir un ficheiro",
 	"upload-dialog-button-cancel": "Cancelar",
+	"upload-dialog-button-back": "Volver",
 	"upload-dialog-button-done": "Feito",
 	"upload-dialog-button-save": "Gardar",
 	"upload-dialog-button-upload": "Subir",
@@ -1678,7 +1679,7 @@
 	"statistics-edits-average": "Media de edicións por páxina",
 	"statistics-users": "[[Special:ListUsers|Usuarios]] rexistrados",
 	"statistics-users-active": "Usuarios activos",
-	"statistics-users-active-desc": "Usuarios que teñen levado a cabo unha acción {{PLURAL:$1|no último día|nos últimos $1 días}}",
+	"statistics-users-active-desc": "Usuarios que levaron a cabo unha acción {{PLURAL:$1|no último día|nos últimos $1 días}}",
 	"pageswithprop": "Páxinas cunha propiedade de páxina",
 	"pageswithprop-legend": "Páxinas cunha propiedade de páxina",
 	"pageswithprop-text": "Esta páxina lista aquelas páxinas que utilizan unha propiedade de páxina determinada.",
@@ -3374,6 +3375,18 @@
 	"htmlform-cloner-create": "Engadir máis",
 	"htmlform-cloner-delete": "Eliminar",
 	"htmlform-cloner-required": "Necesítase, polo menos, un valor.",
+	"htmlform-date-placeholder": "AAAA-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "O valor especificado non é unha data recoñedica. Probe usando o formato AAAA-MM-DD.",
+	"htmlform-time-invalid": "O valor especificado non é unha hora recoñedica. Probe usando o formato HH:MM:SS.",
+	"htmlform-datetime-invalid": "O valor especificado non é unha data e hora recoñedica. Probe usando o formato AAAA-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "O valor especificado é anterior á data máis antiga permitida: $1",
+	"htmlform-date-toohigh": "O valor especificado é posterior á data máis nova permitida: $1",
+	"htmlform-time-toolow": "O valor especificado é anterior ó tempo máis antigo permitido: $1",
+	"htmlform-time-toohigh": "O valor especificado é posterior ó tempo máis novo permitido: $1",
+	"htmlform-datetime-toolow": "O valor especificado é anterior á data e tampo máis antigo permitido: $1",
+	"htmlform-datetime-toohigh": "O valor especificado é posterior á data e tempo máis novo permitido: $1",
 	"htmlform-title-badnamespace": "\"[[:$1]]\" non está no espazo de nomes \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" non é un título de páxina que se poida crear",
 	"htmlform-title-not-exists": "\"$1\" non existe.",
@@ -3457,7 +3470,6 @@
 	"feedback-external-bug-report-button": "Enviar unha tarefa técnica",
 	"feedback-dialog-title": "Enviar comentarios",
 	"feedback-dialog-intro": "Pode usar o formulario simple de abaixo para enviar os seus comentarios sobre o editor visual. O seu comentario será engadido á páxina \"$1\", xunto co seu nome de usuario.",
-	"feedback-error-title": "Erro",
 	"feedback-error1": "Erro: Resultado da API non recoñecido",
 	"feedback-error2": "Erro: Fallo de edición",
 	"feedback-error3": "Erro: Non hai resposta da API",
diff --git a/languages/i18n/gor.json b/languages/i18n/gor.json
index 432338d71c..2aa61b6d3f 100644
--- a/languages/i18n/gor.json
+++ b/languages/i18n/gor.json
@@ -180,7 +180,7 @@
 	"print": "Cetaki",
 	"view": "Bilohi",
 	"view-foreign": "Bilohi to $1",
-	"edit": "Momoli'o",
+	"edit": "Boli'o",
 	"edit-local": "Ubawa deskripsi lokal",
 	"create": "Mohutu",
 	"create-local": "Duhengi deskripsi lokal",
@@ -220,8 +220,8 @@
 	"lastmodifiedat": "Halaman botiye biloli'o pulitiyo $1, $2.",
 	"viewcount": "Halaman botiye ma hilu'o {{PLURAL:$1|$1 kali}}.<br />",
 	"protectedpage": "Halaman udaha-daha",
-	"jumpto": "Lumanti'a ode",
-	"jumptonavigation": "Navigasi",
+	"jumpto": "Lumanti'a ode:",
+	"jumptonavigation": "navigasi",
 	"jumptosearch": "lolohe",
 	"view-pool-error": "Ma'apu, server onggo sibuk sa'ati boti.\nNgohuntuwa pengguna mocoba momilehe halaman boti.\nWulatipo ngope'e to'u yi'o dipo mocoba momilehe halaman boti pooli.\n\n\n$1",
 	"generic-pool-error": "Ma'apu, server onggo sibuk sa'ati boti.\nNgohuntuwa pengguna mocoba momilohe halaman boti.\nWulatipo ngope'e to'u  yi'u dipo mocoba momilehe halaman boti pooli.",
@@ -260,7 +260,7 @@
 	"newmessageslinkplural": "{{PLURAL:$1|tuwawu tahuli bohu|999=tahuli bohu}}",
 	"newmessagesdifflinkplural": "{{PLURAL:$1|iluba|999=u iluba}} pulitiyo",
 	"youhavenewmessagesmulti": "Yio lootapu tahuli bohu to $1",
-	"editsection": "boli'a",
+	"editsection": "boli'o",
 	"editold": "boli'a",
 	"viewsourceold": "Bilohi bungoliyo",
 	"editlink": "boli'a",
@@ -297,7 +297,7 @@
 	"nstab-template": "Templat",
 	"nstab-help": "Halaman tulungi",
 	"nstab-category": "Kategori",
-	"mainpage-nstab": "Halamani bungaliyo",
+	"mainpage-nstab": "Halaman Bungaliyo",
 	"nosuchaction": "Diya'a huhutu boyito",
 	"nosuchactiontext": "Huhutu u hepohile lo URL ja valid.\nYi'o lotalawa lopomaso lo URL, meyalo lodudu'a pranala u ja banari.\nUtiye olo kira-kira tuwotiyo woluwo bug to pilaakasi u hepomake {{SITENAME}}",
 	"nosuchspecialpage": "Diya'a halaman istimewa boyito",
@@ -378,7 +378,6 @@
 	"yourpasswordagain": "Ulangiya tahe u'unti",
 	"createacct-yourpasswordagain": "Konfirmasi tahe u'unti",
 	"createacct-yourpasswordagain-ph": "Tuwota pooli tahe u'unti",
-	"remembermypassword": "Eelayi tahe u'unti'u to komputer botiye (to delomo $1 {{PLURAL:$1|huyi}})",
 	"userlogin-remembermypassword": "Hulima'o wa'u tuwo-tuwoto",
 	"userlogin-signwithsecure": "Popohunawa server aamani",
 	"cannotloginnow-title": "Ja mowali tumuwoto log sa'ati botiya",
@@ -638,7 +637,7 @@
 	"tooltip-invert": "Centang kotak botiye u mopowanto'o halaman yiloboli'a to delomo huwali lo tanggulo tilulawoto (wawu huwali lo tanggulo a'ayita wanu dicentang)",
 	"namespace_association": "Huwali lo tanggulo a'aayita",
 	"tooltip-namespace_association": "Centang halaman botiye u mopowayito huwali lo tanggulo lo'iyawa meyalo subjek u a'ayita wolo huwali lo tanggulo u tilulawoto.",
-	"blanknamespace": "Bungaliyo",
+	"blanknamespace": "(Bungaliyo)",
 	"contributions": "Kontribusi {{GENDER:$1|Ta ohu'uwo}}",
 	"mycontris": "Kontribusi",
 	"anoncontribs": "Kontribusi",
diff --git a/languages/i18n/got.json b/languages/i18n/got.json
index 0f3e624fbe..6220a07ae0 100644
--- a/languages/i18n/got.json
+++ b/languages/i18n/got.json
@@ -150,10 +150,11 @@
 	"disclaimers": "𐌲𐌰𐍂𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐍂𐌰𐌹𐌷𐍄𐌰𐌹𐍃",
 	"disclaimerpage": "Project:𐌲𐌰𐌼𐌰𐌹𐌽𐌰 𐌲𐌰𐍂𐌰𐌹𐌳𐌴𐌹𐌽𐍃 𐍂𐌰𐌹𐌷𐍄𐌰𐌹𐍃",
 	"edithelp": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌹𐌷𐌹𐌻𐍀𐌰",
+	"helppage-top-gethelp": "𐌷𐌹𐌻𐍀𐌰",
 	"mainpage": "𐌰𐌽𐌰𐍃𐍄𐍉𐌳𐌴𐌹𐌽𐌹𐌻𐌰𐌿𐍆𐍃",
 	"mainpage-description": "𐌰𐌽𐌰𐍃𐍄𐍉𐌳𐌴𐌹𐌽𐌹𐌻𐌰𐌿𐍆𐍃",
-	"portal": "𐌱𐌰𐌿𐍂𐌲𐍃 𐌲𐌰𐍅𐌹",
-	"portal-url": "Project:𐌱𐌰𐌿𐍂𐌲𐍃 𐌲𐌰𐍅𐌹",
+	"portal": "𐌲𐌰𐌵𐌿𐌼𐌸𐍃 𐌲𐌰𐌼𐌰𐌹𐌽𐌳𐌿𐌸𐌰𐌹𐍃",
+	"portal-url": "Project:𐌲𐌰𐌵𐌿𐌼𐌸𐍃 𐌲𐌰𐌼𐌰𐌹𐌽𐌳𐌿𐌸𐌰𐌹𐍃",
 	"privacy": "𐌲𐌰𐍂𐌴𐌳𐌴𐌹𐌽𐍉𐍃 𐍃𐌿𐌽𐌳𐍂𐍉𐍅𐌹𐍃𐌰𐌽𐌰",
 	"privacypage": "Project:𐌲𐌰𐍂𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐍃𐌿𐌽𐌳𐍂𐍉𐍅𐌹𐍃𐌰𐌽𐌰",
 	"retrievedfrom": "𐌲𐌰𐌽𐌿𐌼𐌰𐌽 𐍆𐍂𐌰𐌼 \"$1\"",
@@ -187,9 +188,11 @@
 	"error": "𐌰𐌹𐍂𐌶𐌴𐌹",
 	"databaseerror-error": "𐌰𐌹𐍂𐌶𐌴𐌹: $1",
 	"missing-article": "𐌳𐌰𐍄𐌰𐌱𐌴𐍃 𐌽𐌹 𐌱𐌹𐌲𐌰𐍄 𐌱𐍉𐌺𐍉𐍃 𐌻𐌰𐌿𐌱𐌹𐍃 𐌸𐌹𐌶𐌴𐌹 𐍃𐌺𐌿𐌻𐌳𐌴𐌳𐌹 𐌱𐌹𐌲𐌹𐍄𐌰𐌽, 𐌷𐌰𐌹𐍄𐌰𐌽𐍃 \"$1\" $2. \n\n𐌸𐌰𐍄𐌰 𐌿𐍆𐍄𐌰 𐍅𐌰𐌹𐍂𐌸𐌹𐌸 𐌾𐌰𐌱𐌰𐌹 𐌻𐌰𐌹𐍃𐍄𐌾𐌰𐌳𐌰 𐍆𐌰𐌹𐍂𐌽𐌾𐌰 𐌳𐌹𐍆𐍆 𐌸𐌰𐌿 𐍃𐍀𐌹𐌻𐌻𐌰𐌲𐌰𐍅𐌹𐍃𐍃 𐍃𐌴𐌹 𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌹𐌳𐌰 𐌹𐍃𐍄. 𐌽𐌹𐌱𐌰𐌹 𐌹𐍃𐍄, 𐌼𐌰𐌷𐍄𐍃 𐌹𐍃𐍄 𐌴𐌹 𐌱𐌹𐌲𐌴𐍄𐌴𐌹𐍃 𐌰𐌹𐍂𐌶𐌴𐌹𐌽 𐌹𐌽 𐍃𐌰𐌿𐍆𐍄𐍅𐌰𐌹𐍂𐌰. \n\n𐌱𐌹𐌳𐌾𐌰𐌼 𐌸𐌿𐌺, 𐌼𐌴𐍂𐌴𐌹 𐌸𐌰𐍄𐌰 𐌳𐌿 [[Special:ListUsers/sysop\n|𐍂𐌴𐌹𐌺]] 𐌲𐌹𐍆𐌿𐌷 𐌲𐌰𐍅𐌹𐍃𐍃.",
+	"cannotdelete-title": "𐌽𐌹 𐌼𐌰𐌲 𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌾𐌰𐌽 𐌻𐌰𐌿𐌱𐌰 \"$1\"",
 	"badtitle": "𐌿𐌽𐍂𐌰𐌹𐌷𐍄𐌰𐍄𐌰 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹",
 	"badtitletext": "𐍆𐍂𐌰𐌹𐌷𐌰𐌽𐍃 𐌻𐌰𐌿𐍆𐍃 𐍅𐌰𐍃 𐌿𐌽𐌲𐌰𐌼𐌰𐌲𐌰𐌽𐌳𐍃, 𐌻𐌰𐌿𐍃, 𐌰𐌹𐌸𐌸𐌰𐌿 𐌿𐌽𐍂𐌰𐌹𐌷𐍄𐌰𐌱𐌰 𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐍃 𐌼𐌹𐌸𐍂𐌰𐌶𐌳𐌰 𐌸𐌰𐌿 𐌼𐌹𐌸-𐍅𐌹𐌺𐌹 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹. 𐌼𐌰𐌲𐌹 𐌷𐌰𐌱𐌰𐌽 𐌰𐌹𐌽𐌰 𐌸𐌰𐌿 𐌼𐌰𐌽𐌰𐌲𐌹𐌶𐍉𐍃 𐌱𐍉𐌺𐍉𐍃 𐌱𐍂𐌿𐌺𐌹𐌳𐍉𐍃 𐌹𐌽 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌾𐌰𐌼.",
 	"viewsource": "𐍃𐌰𐌹𐍈 𐌱𐍂𐌿𐌽𐌽𐌰𐌽",
+	"mycustomjsprotected": "𐌽𐌹 𐌷𐌰𐌱𐌰𐌹𐍃 𐌰𐌽𐌳𐌻𐌴𐍄 𐌳𐌿 𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽 𐌸𐌰𐌽𐌰 JavaScript 𐌻𐌰𐌿𐍆.",
 	"yourname": "𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽𐌰𐌼𐍉:",
 	"userlogin-yourname": "𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽𐌰𐌼𐍉",
 	"userlogin-yourname-ph": "𐌼𐌴𐌻𐌴𐌹 𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽𐌰𐌼𐍉 𐌸𐌴𐌹𐌽",
@@ -201,6 +204,7 @@
 	"createacct-yourpasswordagain": "𐌲𐌰𐍃𐌹𐌲𐌻𐌴𐌹 𐌲𐌰𐌼𐍉𐍄𐌰𐍅𐌰𐌿𐍂𐌳",
 	"createacct-yourpasswordagain-ph": "𐌼𐌴𐌻𐌴𐌹 𐌲𐌰𐌼𐍉𐍄𐌰𐍅𐌰𐌿𐍂𐌳 𐌰𐍆𐍄𐍂𐌰",
 	"userlogin-remembermypassword": "𐌲𐌰𐍆𐌰𐍃𐍄 𐌼𐌹𐌺 {{GENDER:𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽𐌰𐌽𐌰|𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽𐌰}}",
+	"cannotloginnow-title": "𐌽𐌿 𐌽𐌹 𐌼𐌰𐌲𐍄 𐌰𐍄𐌲𐌰𐌲𐌲𐌰𐌽",
 	"login": "𐌰𐍄𐌲𐌰𐌲𐌲",
 	"nav-login-createaccount": "𐌰𐍄𐌲𐌰𐌲𐌲 / 𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
 	"userlogin": "𐌰𐍄𐌲𐌰𐌲𐌲 / 𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
@@ -227,6 +231,7 @@
 	"pt-login": "𐌰𐍄𐌲𐌰𐌲𐌲",
 	"pt-login-button": "𐌰𐍄𐌲𐌰𐌲𐌲",
 	"pt-createaccount": "𐍃𐌺𐌰𐍀𐌴𐌹 𐌺𐌰𐍅𐍄𐍃𐌾𐍉𐌽",
+	"pt-userlogout": "𐌰𐍆𐌻𐌴𐌹𐌸",
 	"passwordreset": "𐌰𐍆𐍄𐍂𐌰 𐍃𐌰𐍄𐌴𐌹 𐌲𐌰𐌼𐍉𐍄𐌰𐍅𐌰𐌿𐍂𐌳",
 	"bold_sample": "𐍃𐍅𐌹𐌽𐌸𐍉𐍃 𐌱𐍉𐌺𐍉𐍃",
 	"bold_tip": "𐍃𐍅𐌹𐌽𐌸𐍉𐍃 𐌱𐍉𐌺𐍉𐍃",
@@ -253,14 +258,14 @@
 	"showpreview": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 𐍆𐌰𐌿𐍂𐌰𐍃𐌹𐌿𐌽",
 	"showdiff": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 𐌹𐌽𐌼𐌰𐌹𐌳𐌹𐌽𐌹𐌽𐍃",
 	"loginreqlink": "𐌰𐍄𐌲𐌰𐌲𐌲",
-	"newarticle": "(𐌽𐌹𐌿𐌾𐌰𐍄𐌰)",
+	"newarticle": "(𐌽𐌹𐍅𐌹)",
 	"newarticletext": "𐌻𐌰𐌹𐍃𐍄𐌹𐌳𐌴𐍃 𐌲𐌰𐍅𐌹𐍃 𐌳𐌿 𐌻𐌰𐌿𐌱𐌰 𐍃𐌰𐌴𐌹 𐌽𐌹𐍃𐍄. 𐌳𐌿 𐍃𐌺𐌰𐍀𐌾𐌰𐌽 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆, 𐌰𐌽 𐌰𐍃𐍄𐍉𐌳𐌴𐌹 𐌼𐌴𐌻𐌾𐌰𐌽 𐌹𐌽 𐌰𐍂𐌺𐌰𐌹 𐌿𐍆 (𐍃𐌰𐌹𐍈 [$1 𐌷𐌹𐌻𐍀𐌰𐌻𐌰𐌿𐍆] 𐌼𐌰𐌽𐌰𐌲𐌹𐌶𐌹𐌽 𐌺𐌿𐌽𐌸𐌾𐌰). 𐌾𐌰𐌱𐌰𐌹 𐌹𐍃 𐌷𐌴𐍂 𐌹𐌽 𐌰𐌹𐍂𐌶𐌴𐌹𐌽𐍃, 𐌲𐌰𐌲𐌲 𐌳𐌿 <𐍃𐍄𐍂𐍉𐌽𐌲>𐌹𐌱𐌿𐌺𐌰𐌷𐌰𐌿𐌱𐌹𐌳𐌹𐌻𐍉𐌽.",
 	"noarticletext": "𐌽𐌿 𐌽𐌹 𐍃𐌹𐌽𐌳 𐌱𐍉𐌺𐍉𐍃 𐌹𐌽 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰.\n𐌼𐌰𐌲𐍄 [[Special:Search/{{PAGENAME}}|𐍃𐍉𐌺𐌾𐌰𐌽 𐌸𐌰𐍄𐌰 𐌻𐌰𐌿𐌱𐌰-𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹]] 𐌹𐌽 𐌰𐌽𐌸𐌰𐍂𐌰𐌹𐌼 𐌻𐌰𐌿𐌱𐌰𐌼,  <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 𐍃𐍉𐌺𐌾𐌰𐌽 𐌲𐌰𐌷𐌰𐌷𐌾𐍉 𐌲𐌰𐍆𐌰𐍃𐍄𐍉𐍃], 𐌰𐌹𐌸𐌸𐌰𐌿 [{{fullurl:{{FULLPAGENAME}}|action=edit}} 𐍃𐌺𐌰𐍀𐌾𐌰𐌽 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆.]</ span>",
 	"noarticletext-nopermission": "𐌽𐌿 𐌽𐌹 𐍃𐌹𐌽𐌳 𐌱𐍉𐌺𐍉𐍃 𐌹𐌽 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰.\n𐌼𐌰𐌲𐍄 [[Special:Search/{{PAGENAME}}|𐍃𐍉𐌺𐌾𐌰𐌽 𐌸𐌰𐍄𐌰 𐌻𐌰𐌿𐌱𐌰-𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹]] 𐌹𐌽 𐌰𐌽𐌸𐌰𐍂𐌰𐌹𐌼 𐌻𐌰𐌿𐌱𐌰𐌼, 𐌸𐌰𐌿 <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 𐍃𐍉𐌺𐌾𐌰𐌽 𐌲𐌰𐌷𐌰𐌷𐌾𐍉 𐌲𐌰𐍆𐌰𐍃𐍄𐍉𐍃]</span>, 𐌹𐌸 𐌽𐌹 𐌷𐌰𐌱𐌰𐌹𐍃 𐌰𐌽𐌳𐌻𐌴𐍄 𐍃𐌺𐌰𐍀𐌾𐌰𐌽 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆.",
 	"updated": "(𐌰𐌽𐌰𐌽𐌹𐍅𐌹𐌸)",
 	"previewnote": "<strong>𐌲𐌰𐌼𐌹𐌽𐌸𐌴𐌹 𐌸𐌰𐍄𐌴𐌹 𐌸𐌰𐍄𐌰 𐌹𐍃𐍄 𐌸𐌰𐍄𐌰𐌹𐌽𐌴𐌹 𐍆𐌰𐌿𐍂𐌰𐍃𐌹𐌿𐌽𐍃.</strong>\n𐌸𐌴𐌹𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐌽𐌰𐌿𐌷 𐌽𐌹 𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌽𐍉𐍃 𐍃𐌹𐌽𐌳!",
-	"editing": "{{GENDER:𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐌴𐌹}} $1",
-	"creating": "{{GENDER:𐍃𐌺𐌰𐍀𐌾𐌰𐌽𐌳𐍃|𐍃𐌺𐌰𐍀𐌾𐌰𐌽𐌳𐌴𐌹}} $1",
+	"editing": "{{GENDER:𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐌴𐌹|𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐍃}} $1",
+	"creating": "{{GENDER:𐍃𐌺𐌰𐍀𐌾𐌰𐌽𐌳𐍃|𐍃𐌺𐌰𐍀𐌾𐌰𐌽𐌳𐌴𐌹|𐍃𐌺𐌰𐍀𐌾𐌰𐌽𐌳𐍃\n}} $1",
 	"editingsection": "{{GENDER:𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐌴𐌹}} $1 (𐌳𐌰𐌹𐌻)",
 	"editingcomment": "{{GENDER:𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐍃|𐌹𐌽𐌼𐌰𐌹𐌳𐌾𐌰𐌽𐌳𐌴𐌹}} $1 (𐌽𐌹𐌿𐌾𐌰 𐌳𐌰𐌹𐌻)",
 	"yourdiff": "𐌲𐌰𐍃𐌺𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
@@ -269,6 +274,8 @@
 	"hiddencategories": "𐍃𐌰 𐌻𐌰𐌿𐍆𐍃 𐌹𐍃𐍄 𐌲𐌰𐌳𐌰𐌹𐌻𐌰 {{PLURAL:$1|1 𐌰𐌽𐌰𐌻𐌰𐌿𐌲𐌽𐌹𐍃 𐌺𐌿𐌽𐌾𐌹𐍃|$1 𐌰𐌽𐌰𐌻𐌰𐌿𐌲𐌽𐌰𐌹𐌶𐌴 𐌺𐌿𐌽𐌾𐌴}}:‎",
 	"permissionserrorstext-withaction": "𐌽𐌹 𐌷𐌰𐌱𐌰𐌹𐍃 𐌰𐌽𐌳𐌻𐌴𐍄 𐌳𐌿 $2, 𐌹𐌽 {{PLURAL:$1|𐌹𐍆𐍄𐌿𐌼𐌰𐌹𐌶𐍉𐍃 𐍅𐌰𐌹𐌷𐍄𐌰𐌹𐍃|𐌹𐍆𐍄𐌿𐌼𐌰𐌹𐌶𐍉 𐍅𐌰𐌹𐌷𐍄𐌴}}:",
 	"moveddeleted-notice": "𐍃𐌰 𐌻𐌰𐌿𐍆𐍃 𐌿𐍃𐌽𐌿𐌼𐌰𐌽𐍃 𐌹𐍃𐍄. 𐌿𐍃𐌽𐌿𐌼𐍄𐍃 𐌾𐌰𐌷 𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌹𐌽𐍃 𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹𐌽𐌰𐌹𐍃 𐌿𐍆 𐍃𐌹𐌽𐌳 𐌿𐍃𐍄𐌰𐌹𐌺𐌽𐌴𐌹𐌽𐌰𐌹.",
+	"postedit-confirmation-created": "𐌻𐌰𐌿𐍆𐍃 𐌲𐌰𐍃𐌺𐌰𐍀𐌰𐌽𐍃 𐌹𐍃𐍄.",
+	"edit-already-exists": "𐌽𐌹 𐍅𐌰𐍃 𐌼𐌰𐌷𐍄𐍃 𐍃𐌺𐌰𐍀𐌾𐌰𐌽 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆. \n𐌾𐌿 𐌹𐍃𐍄.",
 	"post-expand-template-inclusion-warning": "'''𐌷𐍅𐍉𐍄𐌾𐌰𐌽𐌳𐍃:''' 𐍆𐌰𐌿𐍂𐌰𐌼𐌴𐌻𐌴𐌹𐌽𐍃 𐍃𐌹𐌽𐌳 𐌿𐍆𐌰𐍂𐌼𐌹𐌺𐌹𐌻𐍃. 𐍃𐌿𐌼𐍃 𐍆𐌰𐌿𐍂𐌴𐌼𐌴𐌻𐌴𐌹𐌽𐍉𐍃 𐌽𐌹 𐌼𐌰𐌲 𐍅𐌹𐍃𐌰𐌽 𐌸𐌰𐍂",
 	"post-expand-template-inclusion-category": "𐍃𐌴𐌹𐌳𐍉𐌽𐍃 𐌸𐌰𐍂 𐍆𐌰𐌿𐍂𐌰𐌼𐌴𐌻𐌴𐌹𐌽𐍃 𐍃𐌹𐌽𐌳 𐌿𐍆𐌰𐍂𐌼𐌹𐌺𐌹𐌻𐍃",
 	"viewpagelogs": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌹𐌽𐌹𐌽𐍃 𐌸𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰",
@@ -289,9 +296,10 @@
 	"history-feed-item-nocomment": "$1 𐌰𐍄 $2",
 	"rev-delundel": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹 𐌰𐌽𐌰𐍃𐌹𐌿𐌽",
 	"revdel-restore": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹 𐌰𐌽𐌰𐍃𐌹𐌿𐌽",
-	"revertmerge": "𐌿𐌽𐌲𐌰𐍄𐌹𐌻𐍉𐍃",
+	"revertmerge": "𐌿𐌽𐌲𐌰𐌱𐌻𐌰𐌽𐌳",
 	"history-title": "𐌰𐍆𐍄𐍂𐌰𐍃𐌹𐌿𐌽𐌹𐍃𐍀𐌹𐌻𐌻 𐌻𐌰𐌿𐌱𐌹𐍃 \"$1\"",
 	"difference-title": "𐌲𐌰𐍃𐌺𐌰𐌹𐌳𐌴𐌹𐌽𐍃 𐌼𐌹𐌸 𐌰𐍆𐍄𐍂𐌰𐍃𐌹𐌿𐌽𐍉𐌼 𐌻𐌰𐌿𐌱𐌹𐍃 \"$1\"",
+	"difference-multipage": "(𐌰𐌽𐌸𐌰𐍂𐌻𐌴𐌹𐌺𐌾𐌰 𐌼𐌹𐌸 𐌻𐌰𐌿𐌱𐌰𐌼)",
 	"lineno": "𐍃𐍄𐍂𐌹𐌺𐍃 $1:",
 	"editundo": "𐍃𐌺𐌰𐍀𐌴𐌹 𐌰𐍆𐍄𐍂𐌰",
 	"diff-multi-sameuser": "({{PLURAL:$1|𐌰𐌹𐌽𐌰 𐌼𐌹𐌳𐌿𐌼𐌰𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍃|$1 𐌼𐌹𐌳𐌿𐌼𐌰 𐌲𐌰𐌱𐍉𐍄𐌴𐌹𐌽𐍉𐍃}} 𐍆𐍂𐌰𐌼 𐍃𐌰𐌼𐌹𐌽 𐌱𐍂𐌿𐌺𐌾𐌹𐌽 𐌽𐌹 𐌰𐍄𐌰𐌿𐌲𐌹𐌳𐌰/𐌰𐍄𐌰𐌿𐌲𐌹𐌳𐍉𐍃)",
@@ -320,8 +328,8 @@
 	"search-showingresults": "{{ZPLURAL:$4|𐍄𐌰𐌿𐌹 <strong>$1 𐍅𐌰𐌹𐌷𐍄𐌰𐌹𐍃 <strong>$3|𐍄𐍉𐌾𐌰 <strong>$1 - $2 𐍅𐌰𐌹𐌷𐍄𐌰𐌹𐍃 <strong>$3}}",
 	"search-nonefound": "𐌽𐌹 𐍄𐌰𐌿𐌹 𐍅𐌰𐍃 𐍃𐌰𐌼𐌰𐌽𐌰 𐍃𐍅𐌰 𐍃𐍉𐌺𐌴𐌹𐌽.",
 	"powersearch-legend": "𐍃𐍉𐌺𐌴𐌹",
-	"preferences": "𐌼𐌴𐌹𐌽𐍉𐍃 𐌱𐍂𐌿𐌺𐌾𐌰𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌴𐌹𐍃",
-	"mypreferences": "𐌲𐌰𐌻𐌴𐌹𐌺𐌰𐌽𐌳𐌴𐌹𐌽𐍃 𐍅𐌰𐌹𐌷𐍄𐍃",
+	"preferences": "𐌼𐌴𐌹𐌽𐍉𐍃 𐍆𐍂𐌹𐌾𐍉𐌽𐍉𐍃 𐍅𐌰𐌹𐌷𐍄𐍃",
+	"mypreferences": "𐌼𐌴𐌹𐌽𐍉𐍃 𐍆𐍂𐌹𐌾𐍉𐌽𐍉𐍃 𐍅𐌰𐌹𐌷𐍄𐍃",
 	"prefs-skin": "𐍆𐌹𐌻𐌻",
 	"skin-preview": "𐍆𐌰𐌿𐍂𐌰𐍃𐌰𐌹𐍈",
 	"saveprefs": "𐌲𐌰𐍆𐌰𐍃𐍄",
@@ -361,11 +369,11 @@
 	"minoreditletter": "l",
 	"newpageletter": "N",
 	"boteditletter": "b",
-	"recentchangeslinked": "𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
-	"recentchangeslinked-feed": "Máideinlieks",
-	"recentchangeslinked-toolbox": "𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
-	"recentchangeslinked-title": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐍉𐍃 𐌼𐌹𐌸 \"$1\"",
-	"recentchangeslinked-summary": "𐍃𐍉 𐌹𐍃𐍄 𐌻𐌴𐌹𐍃𐍄𐌰 𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐌴 𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍃 𐍃𐌺𐍉𐍀 𐌰𐌽𐌰 𐍃𐌴𐌹𐌳𐍉𐌽𐍃 𐌻𐌴𐌹𐌽𐌺𐍉𐌽𐌳 𐌿𐍃 𐌿𐍃𐍃𐌹𐌽𐌳𐌰𐌹 𐍃𐌴𐌹𐌳𐍉𐌽 (𐌰𐌹𐌸𐌸𐌰𐌿 𐌻𐌹𐌸𐌰𐌿𐍃 𐌿𐍃𐍃𐌹𐌽𐌳𐌰𐌹𐌶𐍉𐍃 𐌷𐌰𐌽𐍃𐍉𐍃). 𐍃𐌴𐌹𐌳𐍉𐌽𐍃 [[Special:Watchlist|𐍅𐌹𐍄𐌰𐌽𐌳𐌻𐌴𐌹𐍃𐍄𐍉𐍃 𐌸𐌴𐌹𐌽𐍉𐍃]] 𐍃𐌹𐌽𐌳 '''𐌳𐌹𐌲𐍂𐍃𐍄𐌰𐍆𐍃'''.",
+	"recentchangeslinked": "𐌲𐌰𐌱𐌿𐌽𐌳𐌰𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
+	"recentchangeslinked-feed": "𐌲𐌰𐌱𐌿𐌽𐌳𐌰𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
+	"recentchangeslinked-toolbox": "𐌲𐌰𐌱𐌿𐌽𐌳𐌰𐌽𐍉𐍃 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃",
+	"recentchangeslinked-title": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐌲𐌰𐌱𐌿𐌽𐌳𐌰𐌽𐍉𐍃 𐌼𐌹𐌸 \"$1\"",
+	"recentchangeslinked-summary": "A𐌸𐌰𐍄𐌰 𐌹𐍃𐍄 𐍅𐌹𐌺𐍉 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉 𐌽𐌹𐌿𐌾𐌰𐌱𐌰 𐌲𐌰𐍄𐌰𐍅𐌹𐌳𐍉𐍃 𐌻𐌰𐌿𐌱𐌰𐌼 𐌲𐌰𐌱𐌿𐌽𐌳𐌰𐌹 𐍃𐌿𐌼𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰 (𐌸𐌰𐌿 𐌲𐌰𐌳𐌰𐌹𐌻𐌰𐌼 𐍃𐌿𐌼𐌹𐍃 𐌺𐌿𐌽𐌾𐌹𐍃). <strong>𐌻𐌰𐌿𐌱𐍉𐍃 𐌰𐌽𐌰 [[Special:Watchist|your]] 𐍃𐌹𐌽𐌳 </strong>𐍃𐍅𐌹𐌽𐌸𐌰𐌹.",
 	"recentchangeslinked-page": "𐌻𐌰𐌿𐌱𐌰𐌽𐌰𐌼𐍉:",
 	"recentchangeslinked-to": "𐌰𐍄𐌰𐌿𐌲𐌴𐌹 𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹𐌽𐍉𐍃 𐌻𐌰𐌿𐌱𐌴 𐌸𐌰𐌹𐌴𐌹 𐌲𐌰𐍅𐌹𐌳𐌰𐌽𐌰𐌹 𐌳𐌿 𐌲𐌹𐌱𐌰𐌽𐌰𐌼𐌼𐌰 𐌻𐌰𐌿𐌱𐌰.",
 	"upload": "𐌿𐍃𐌷𐌻𐌰𐌸𐌰𐌽 𐍆𐌴𐌹𐌻𐌰𐌽𐍃",
@@ -397,7 +405,7 @@
 	"brokenredirects-edit": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹",
 	"brokenredirects-delete": "𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌴𐌹",
 	"nbytes": "$1 {{PLURAL:$1|𐌱𐌹𐍄|𐌱𐌰𐍄𐌰}}",
-	"ncategories": "$1 {{PLURAL:$1|𐌺𐌿𐌽𐌾𐌰|𐌺𐌿𐌽𐌾𐍉𐍃}}",
+	"ncategories": "$1 {{PLURAL:$1|𐌺𐌿𐌽𐌹|𐌺𐌿𐌽𐌾𐌰}}",
 	"nlinks": "$1 {{PLURAL:$1|𐌲𐌰𐍅𐌹𐍃𐍃|𐌲𐌰𐍅𐌹𐍃𐍃𐌴𐌹𐍃}}",
 	"nmembers": "$1 {{PLURAL:$1|𐌲𐌰𐌳𐌰𐌹𐌻𐌰|𐌲𐌰𐌳𐌰𐌹𐌻𐌰𐌽𐍃}}",
 	"wantedpages": "𐌲𐌰𐌹𐍂𐌽𐌹𐌳𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
@@ -405,7 +413,7 @@
 	"longpages": "𐌻𐌰𐌲𐌲𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"listusers": "𐍂𐌴𐌲𐌹𐍃𐍄𐍂𐌴𐍂𐌰𐌳𐌴 𐌱𐍂𐌿𐌺𐌾𐌰𐌽𐌳𐍃",
 	"newpages": "𐌽𐌹𐌿𐌾𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
-	"move": "𐌽𐌰𐌼𐌾𐌰𐌽 𐌰𐍆𐍄𐍂𐌰",
+	"move": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹",
 	"movethispage": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹 𐌸𐌰𐌽𐌰 𐌻𐌰𐌿𐍆",
 	"booksources": "𐌱𐍉𐌺𐌰𐌱𐍂𐌿𐌽𐌽𐌰𐌽𐍃",
 	"booksources-search-legend": "𐍃𐍉𐌺𐌴𐌹 𐌱𐍉𐌺𐌰𐌱𐍂𐌿𐌽𐌽𐌰𐌽𐍃",
@@ -415,7 +423,7 @@
 	"log": "𐌻𐍉𐌲𐌱𐍉𐌺𐍉𐍃",
 	"all-logs-page": "𐌰𐌻𐌻𐌰 𐌻𐍉𐌲𐍉𐍃",
 	"allpages": "𐌰𐌻𐌻𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
-	"nextpage": "𐌹𐍆𐍄𐌿𐌼𐌰 𐍃𐌴𐌹𐌳𐍉 ($1)",
+	"nextpage": "𐌹𐍆𐍄𐌿𐌼𐌰 𐌻𐌰𐌿𐍆𐍃 ($1)",
 	"prevpage": "𐌰𐍆𐍄𐌿𐌼𐌹𐍃𐍄𐍃 𐌻𐌰𐌿𐍆𐍃 ($1)",
 	"allarticles": "𐌰𐌻𐌻𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"allpagessubmit": "𐌲𐌰𐌲𐌲",
@@ -429,7 +437,7 @@
 	"unwatch": "𐌽𐌹𐍅𐌰𐍂𐌰𐌽",
 	"watchlist-details": "{{PLURAL:$1|$1 𐌻𐌰𐌿𐍆𐍃|$1 𐌻𐌰𐌿𐌱𐍉𐍃}} 𐌰𐌽𐌰 𐌸𐌴𐌹𐌽𐌰𐌹 𐍅𐌹𐍄𐌰𐍅𐌹𐌺𐍉𐌽, 𐌽𐌹 𐍃𐌿𐌽𐌳𐍂𐍉 𐍂𐌰𐌷𐌽𐌾𐌰𐌽𐌳𐌰 𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰𐌻𐌰𐌿𐌱𐍉𐍃.",
 	"watching": "Wita...",
-	"unwatching": "Niwita...",
+	"unwatching": "𐌿𐌽𐍅𐌹𐍄𐌰𐌽𐌳𐍉...",
 	"created": "𐌲𐌰𐍃𐌺𐌰𐍀𐌾𐌰𐌽",
 	"deletepage": "𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌴𐌹 𐌻𐌰𐌿𐌱𐌰",
 	"delete-legend": "𐍆𐍂𐌰𐌵𐌹𐍃𐍄𐌴𐌹",
@@ -443,9 +451,9 @@
 	"prot_1movedto2": "[[$1]] 𐌼𐌹𐌸𐍃𐌰𐍄𐌹𐌸 𐌳𐌿 [[$2]]",
 	"protect-level-sysop": "𐌰𐌽𐌳𐌻𐌴𐍄𐌹𐌸 𐌸𐌰𐍄𐌰𐌹𐌽𐌴𐌹 𐍂𐌴𐌹𐌺𐍃",
 	"protect-expiring": "𐌿𐍃𐍄𐌹𐌿𐌷𐌹𐌸 $1 (UTC)",
-	"restriction-type": "Freihals:",
+	"restriction-type": "𐌰𐌽𐌳𐌻𐌴𐍄",
 	"restriction-edit": "𐌹𐌽𐌼𐌰𐌹𐌳𐌴𐌹",
-	"restriction-move": "𐍃𐌺𐌹𐌿𐌱𐌰𐌽",
+	"restriction-move": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹",
 	"undeletebtn": "𐌰𐍆𐍄𐍂𐌰 𐌲𐌰𐌱𐍉𐍄𐌾𐌰𐌽",
 	"undeletelink": "𐍃𐌰𐌹𐍈𐌰𐌽/𐌰𐍆𐍄𐍂𐌰𐌲𐌰𐍃𐌰𐍄𐌾𐌰𐌽",
 	"undeleteviewlink": "𐍃𐌰𐌹𐍈𐌹𐍃",
@@ -485,11 +493,12 @@
 	"blocklogentry": "𐌰𐍆𐌳𐍂𐌰𐌿𐍃𐌹𐌸 [[$1]] 𐍆𐌰𐌿𐍂 $2 $3",
 	"newtitle": "𐌽𐌹𐌿𐌾𐌹 𐌿𐍆𐌰𐍂𐌼𐌴𐌻𐌹:",
 	"move-watch": "𐌰𐍄𐍅𐌹𐍄 𐌱𐍂𐌿𐌽𐌽𐌰𐌻𐌰𐌿𐌱𐌰 𐌾𐌰𐌷 𐌼𐌿𐌽𐌳𐍂𐌴𐌹𐌻𐌰𐌿𐌱𐌰",
-	"movepagebtn": "𐍃𐌺𐌹𐌿𐌱𐌰 𐍃𐌴𐌹𐌳𐍉",
+	"movepagebtn": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹 𐌻𐌰𐌿𐍆",
 	"movelogpage": "𐌼𐌹𐌸𐍃𐌰𐍄𐌴𐌹 𐌲𐌰𐍆𐌰𐍃𐍄𐌰𐌹𐌽",
 	"movereason": "𐍆𐌰𐌹𐍂𐌹𐌽𐌰:",
 	"revertmove": "𐍂𐌰𐌹𐌳𐌾𐌰𐌽",
 	"export": "𐌿𐍄𐌱𐌰𐌹𐍂 𐌻𐌰𐌿𐌱𐌰𐌽𐍃",
+	"allmessages-filter-translate": "𐌲𐌰𐍃𐌺𐌴𐌹𐍂𐌴𐌹",
 	"thumbnail-more": "\n𐌼𐌹𐌺𐌹𐌻𐌴𐌹",
 	"tooltip-pt-userpage": "{{GENDER:|Your user}} 𐌻𐌰𐌿𐍆𐍃",
 	"tooltip-pt-mytalk": "{{GENDER:|𐌸𐌴𐌹𐌽𐍃}} 𐌻𐌰𐌿𐍆𐍃 𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌹𐍃",
@@ -557,11 +566,12 @@
 	"table_pager_limit_submit": "Affgaggan",
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|𐌲𐌰𐍅𐌰𐌿𐍂𐌳𐌾𐌰]])",
 	"version-other": "Anþar",
+	"version-poweredby-translators": "translatewiki.net 𐌲𐌰𐍃𐌺𐌴𐌹𐍂𐌾𐌰𐌽𐍃",
 	"specialpages": "𐌿𐍃𐍃𐌹𐌽𐌳𐌰𐌹 𐌻𐌰𐌿𐌱𐍉𐍃",
 	"tag-filter": "[[Special:Tags|𐍄𐌰𐌹𐌺𐌽𐍉𐍃]] 𐍆𐌹𐌻𐌷𐌰",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|𐍃𐍉𐌺𐌴𐌹𐌽𐌹𐍅𐌰𐌿𐍂𐌳|𐍃𐍉𐌺𐌴𐌹𐌽𐌹𐍅𐌰𐌿𐍂𐌳𐌰}}]]: $2)",
 	"tags-source-header": "𐌱𐍂𐌿𐌽𐌽𐌰",
-	"tags-actions-header": "𐌳𐌴𐌳𐌴𐌹𐍃",
+	"tags-actions-header": "𐍄𐍉𐌾𐌰",
 	"tags-source-none": "𐌽𐌹 𐌾𐌿 𐌱𐍂𐌿𐌺𐌾𐌰𐌳𐌰",
 	"tags-delete": "𐌿𐍃𐌽𐌹𐌼",
 	"tags-activate": "𐌲𐌰𐌵𐌹𐌿𐌴𐌹",
diff --git a/languages/i18n/gu.json b/languages/i18n/gu.json
index adaaab4e73..7f08ca1685 100644
--- a/languages/i18n/gu.json
+++ b/languages/i18n/gu.json
@@ -1965,7 +1965,7 @@
 	"articleexists": "આ નામનું પાનું અસ્તિત્વમાં છે, અથવાતો તમે પસંદ કરેલું નામ અસ્વિકાર્ય છો.\nકૃપા કરી અન્ય નામ પસંદ કરો.",
 	"cantmove-titleprotected": "આ સ્થાને તમે પાનું નહીં હટાવી શકો કેમ કે નવું શીર્ષક રચના કરવા પહેલેથી આરક્ષીત છે",
 	"movetalk": "સંલગ્ન ચર્ચાનું પાનું પણ ખસેડો",
-	"move-subpages": "($1 સુધી) ઉપ-પાના હટાવાયા",
+	"move-subpages": "પેટાપાનાં પણ ખસેડો ($1 સુધીના)",
 	"move-talk-subpages": "ઉપપાનને ચર્ચાના પાના પર ખસેડો ( $1 સુધે)",
 	"movepage-page-exists": "પાનું  $1 પહેલેથી અસ્તિત્વમાં છે તેના પર સ્વયં ચલિત રીતે નવું લેખન ન થાય.",
 	"movepage-page-moved": "પાના $1 ને $2 પર ખસેડાયું",
diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index bdfcfb51b9..297a954340 100644
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -219,7 +219,7 @@
 	"deletethispage": "מחיקת דף זה",
 	"undeletethispage": "שחזור דף זה",
 	"undelete_short": "שחזור {{PLURAL:$1|עריכה אחת|$1 עריכות}}",
-	"viewdeleted_short": "הצגת {{PLURAL:$1|גרסה עריכה אחת|$1 עריכה מחוקות}}",
+	"viewdeleted_short": "הצגת {{PLURAL:$1|עריכה מחוקה אחת|$1 עריכה מחוקות}}",
 	"protect": "הגנה",
 	"protect_change": "שינוי",
 	"protectthispage": "הפעלת הגנה על דף זה",
@@ -513,7 +513,7 @@
 	"eauthentsent": "דוא\"ל אימות נשלח לכתובת הדוא\"ל שצוינה.\nלפני שדברי דוא\"ל אחרים יישלחו לחשבון הזה, יהיה עליכם לפעול לפי ההוראות בדוא\"ל, כדי לאשר שהחשבון אכן שייך לכם.",
 	"throttled-mailpassword": "כבר נשלח דוא\"ל לאיפוס הסיסמה ב{{PLURAL:$1|שעה האחרונה|שעתיים האחרונות|־$1 השעות האחרונות}}.\nכדי למנוע ניצול לרעה, יכול להישלח רק דוא\"ל אחד כזה בכל {{PLURAL:$1|שעה|שעתיים|$1 שעות}}.",
 	"mailerror": "שגיאה בשליחת דואר: $1",
-	"acct_creation_throttle_hit": "מבקרים באתר זה דרך כתובת ה־IP שלך כבר יצרו {{PLURAL:$1|חשבון אחד|$1 חשבונות}} ב־$2. זהו המקסימום המותר בתקופה זו.\nלפיכך, כרגע לא ניתן ליצור חשבונות נוספים מכתובת ה־IP הזו.",
+	"acct_creation_throttle_hit": "מבקרים באתר זה דרך כתובת ה־IP שלך כבר יצרו {{PLURAL:$1|חשבון אחד|$1 חשבונות}} במהלך $2. זהו המקסימום המותר בתקופה זו.\nלפיכך, כרגע לא ניתן ליצור חשבונות נוספים מכתובת ה־IP הזו.",
 	"emailauthenticated": "כתובת הדוא\"ל שלך אומתה ב־$2 בשעה $3.",
 	"emailnotauthenticated": "כתובת הדוא\"ל שלכם עדיין לא אומתה.\nלא יישלח אליכם דוא\"ל עבור אף אחת מהתכונות הבאות.",
 	"noemailprefs": "יש לציין כתובת דוא\"ל בהעדפות שלך כדי שתכונות אלה יעבדו.",
@@ -966,7 +966,7 @@
 	"searchprofile-advanced-tooltip": "חיפוש במרחבי שם מותאמים אישית",
 	"search-result-size": "$1 ({{PLURAL:$2|מילה אחת|$2 מילים}})",
 	"search-result-category-size": "{{PLURAL:$1|פריט אחד|$1 פריטים}} ({{PLURAL:$2|קטגוריית משנה אחת|$2 קטגוריות משנה}}, {{PLURAL:$3|קובץ אחד|$3 קבצים}})",
-	"search-redirect": "(הפניה $1)",
+	"search-redirect": "(הפניה מהדף $1)",
 	"search-section": "(פסקה $1)",
 	"search-category": "(קטגוריה $1)",
 	"search-file-match": "(התאמה בתוכן הקובץ)",
@@ -1481,6 +1481,7 @@
 	"upload-dialog-disabled": "אין אפשרות להעלות קבצים באמצעות תיבת הדו־שיח הזאת באתר זה.",
 	"upload-dialog-title": "העלאת קובץ",
 	"upload-dialog-button-cancel": "ביטול",
+	"upload-dialog-button-back": "חזרה",
 	"upload-dialog-button-done": "בוצע",
 	"upload-dialog-button-save": "שמירה",
 	"upload-dialog-button-upload": "העלאה",
@@ -3473,6 +3474,18 @@
 	"htmlform-cloner-create": "הוספה",
 	"htmlform-cloner-delete": "הסרה",
 	"htmlform-cloner-required": "דרוש לפחות ערך אחד.",
+	"htmlform-date-placeholder": "YYYY-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "YYYY-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "הערך שכתבת אינו תאריך מוכר. ניתן להשתמש בפורמט YYYY-MM-DD.",
+	"htmlform-time-invalid": "הערך שכתבת אינו שעה מוכרת. ניתן להשתמש בפורמט HH:MM:SS.",
+	"htmlform-datetime-invalid": "הערך שכתבת אינו תאריך ושעה מוכרים. ניתן להשתמש בפורמט YYYY-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "הערך שכתבת הוא לפני התאריך המוקדם ביותר האפשרי, $1.",
+	"htmlform-date-toohigh": "הערך שכתבת הוא אחרי התאריך המאוחר ביותר האפשרי, $1.",
+	"htmlform-time-toolow": "הערך שכתבת הוא לפני השעה המוקדמת ביותר האפשרית, $1.",
+	"htmlform-time-toohigh": "הערך שכתבת הוא אחרי השעה המאוחרת ביותר האפשרית, $1.",
+	"htmlform-datetime-toolow": "הערך שכתבת הוא לפני התאריך והשעה המוקדמים ביותר האפשריים, $1.",
+	"htmlform-datetime-toohigh": "הערך שכתבת הוא אחרי התאריך והשעה המאוחרים ביותר האפשריים, $1.",
 	"htmlform-title-badnamespace": "[[:$1]] אינו במרחב השם \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" אינו שם של דף שאפשר ליצור",
 	"htmlform-title-not-exists": "$1 אינו קיים.",
@@ -3556,7 +3569,6 @@
 	"feedback-external-bug-report-button": "דיווח על משימה טכנית",
 	"feedback-dialog-title": "שליחת המשוב",
 	"feedback-dialog-intro": "באפשרותך להשתמש בטופס הפשוט שלהלן כדי לשלוח משוב. ההערה שלך תתווסף לדף \"$1\", יחד עם שם המשתמש שלך.",
-	"feedback-error-title": "שגיאה",
 	"feedback-error1": "שגיאה: תוצאה לא מזוהה מה־API",
 	"feedback-error2": "שגיאה: העריכה נכשלה",
 	"feedback-error3": "שגיאה: אין תשובה מה־API",
diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json
index 34e2f51dc6..3335a304b7 100644
--- a/languages/i18n/hr.json
+++ b/languages/i18n/hr.json
@@ -1337,6 +1337,7 @@
 	"upload-copy-upload-invalid-domain": "Kopije postavljenih datoteka nisu dostupne s ove domene.",
 	"upload-dialog-title": "Postavi datoteku",
 	"upload-dialog-button-cancel": "Odustani",
+	"upload-dialog-button-back": "Natrag",
 	"upload-dialog-button-done": "Gotovo",
 	"upload-dialog-button-save": "Spremi",
 	"upload-dialog-button-upload": "Postavi",
@@ -1744,7 +1745,7 @@
 	"emailuserfooter": "Ovu je e-poruku {{GENDER:$1|poslao suradnik|poslala suradnica}} $1 {{GENDER:$2|suradniku $2|suradnici $2}} uporabom mogućnosti \"{{int:emailuser}}\" s projekta {{SITENAME}}.",
 	"usermessage-summary": "Ostavljanje poruke sustava.",
 	"usermessage-editor": "Uređivač sistemskih poruka",
-	"watchlist": "Moj popis praćenja",
+	"watchlist": "Popis praćenja",
 	"mywatchlist": "Popis praćenja",
 	"watchlistfor2": "Za $1 $2",
 	"nowatchlist": "Na Vašem popisu praćenja nema nijednog članka.",
@@ -2173,7 +2174,7 @@
 	"export-download": "Ponudi opciju snimanja u datoteku",
 	"export-templates": "Uključi predloške",
 	"export-pagelinks": "Uključi povezane stranice do dubine od:",
-	"allmessages": "Sve sistemske poruke",
+	"allmessages": "Sve poruke sustava",
 	"allmessagesname": "Ime",
 	"allmessagesdefault": "Prvotni tekst",
 	"allmessagescurrent": "Trenutačni tekst",
@@ -3092,6 +3093,11 @@
 	"htmlform-cloner-create": "Dodaj još",
 	"htmlform-cloner-delete": "Ukloni",
 	"htmlform-cloner-required": "Potrebna je barem jedna vrijednost.",
+	"htmlform-date-placeholder": "GGGG-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "GGGG-MM-DD HH:MM:SS",
+	"htmlform-time-invalid": "Unesena vrijednost nije prepoznati format vremena. Pokušajte koristiti format HH:MM:SS.",
+	"htmlform-datetime-toohigh": "Uneseni datum i vrijeme su veći od $1",
 	"logentry-delete-delete": "$1 je {{GENDER:$2|obrisao|obrisala}} stranicu $3",
 	"logentry-delete-restore": "$1 je {{GENDER:$2|vratio|vratila}} stranicu $3",
 	"logentry-delete-event": "$1 je {{GENDER:$2|promijenio|promijenila}} vidljivost {{PLURAL:$5|zapisa u evidenciji|$5 zapisa u evidenciji}} na $3: $4",
@@ -3147,7 +3153,6 @@
 	"feedback-external-bug-report-button": "Arhiviraj tehnički zadatak",
 	"feedback-dialog-title": "Slanje povratnih informacija",
 	"feedback-dialog-intro": "Da biste poslali povratnu informaciju, rabite jednostavan obrazac. Vaš će komentar biti dodan na stranici \"$1\" s Vašim suradničkim imenom.",
-	"feedback-error-title": "Pogrješka",
 	"feedback-error1": "Pogreška: neprepoznati rezultat API funkcije",
 	"feedback-error2": "Pogreška: uređivanje nije uspjelo",
 	"feedback-error3": "Pogreška: nema odgovora API funkcije",
diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json
index 3fc5dfeddf..f9f9e504af 100644
--- a/languages/i18n/ia.json
+++ b/languages/i18n/ia.json
@@ -43,7 +43,7 @@
 	"tog-enotifminoredits": "Notificar me etiam de modificationes minor de paginas e files",
 	"tog-enotifrevealaddr": "Revelar mi adresse de e-mail in messages de notification",
 	"tog-shownumberswatching": "Monstrar le numero de usatores que observa le pagina",
-	"tog-oldsig": "Signatura existente:",
+	"tog-oldsig": "Tu signatura existente:",
 	"tog-fancysig": "Tractar signatura como wikitexto (sin ligamine automatic)",
 	"tog-uselivepreview": "Usar previsualisation dynamic",
 	"tog-forceeditsummary": "Avisar me si io non entra un summario de modification",
@@ -60,7 +60,7 @@
 	"tog-showhiddencats": "Monstrar categorias celate",
 	"tog-norollbackdiff": "Non monstrar differentias post exequer un revocation",
 	"tog-useeditwarning": "Advertir me quando io quita un pagina de modification sin publicar le cambiamentos",
-	"tog-prefershttps": "Sempre usar un connexion secur in session aperte",
+	"tog-prefershttps": "Sempre usar un connexion secur durante session aperte",
 	"underline-always": "Sempre",
 	"underline-never": "Nunquam",
 	"underline-default": "Como definite per tu navigator o apparentia",
@@ -155,7 +155,7 @@
 	"newwindow": "(se aperi in un nove fenestra)",
 	"cancel": "Cancellar",
 	"moredotdotdot": "Plus...",
-	"morenotlisted": "Iste lista non es complete.",
+	"morenotlisted": "Iste lista pote esser incomplete.",
 	"mypage": "Pagina",
 	"mytalk": "Discussion",
 	"anontalk": "Discussion",
@@ -489,7 +489,7 @@
 	"eauthentsent": "Un message de confirmation ha essite inviate al adresse de e-mail specificate.\nPro permitter que le systema invia altere messages a iste adresse, tu debe sequer le instructiones in iste message pro confirmar que le adresse es realmente tue.",
 	"throttled-mailpassword": "Un message pro le reinitialisation del contrasigno ha jam essite inviate intra le ultime {{PLURAL:$1|hora|$1 horas}}.\nPro prevenir le abuso, solmente un message pro le reinitialisation del contrasigno essera inviate per {{PLURAL:$1|hora|$1 horas}}.",
 	"mailerror": "Error de inviar e-mail: $1",
-	"acct_creation_throttle_hit": "Le visitatores de iste wiki usante tu adresse IP ha create {{PLURAL:$1|1 conto|$1 contos}} durante le ultime die, e isto es le maximo permittite in iste periodo de tempore.\nA causa de isto, le visitatores usante iste adresse IP non pote crear nove contos al momento.",
+	"acct_creation_throttle_hit": "Le visitatores de iste wiki usante tu adresse IP ha create {{PLURAL:$1|1 conto|$1 contos}} durante le ultime $2, e isto es le maximo permittite in iste periodo de tempore.\nA causa de isto, le visitatores usante iste adresse IP non pote crear nove contos al momento.",
 	"emailauthenticated": "Tu adresse de e-mail ha essite confirmate le $2 a $3.",
 	"emailnotauthenticated": "Tu non ha ancora confirmate tu adresse de e-mail.\nNulle e-mail essera inviate pro le sequente functiones.",
 	"noemailprefs": "Es necessari specificar un adresse de e-mail in tu preferentias pro poter executar iste functiones.",
@@ -540,7 +540,6 @@
 	"botpasswords-label-resetpassword": "Reinitialisar le contrasigno",
 	"botpasswords-label-grants": "Concessiones applicabile:",
 	"botpasswords-help-grants": "Cata concession da accesso al derectos de usator listate que un conto de usator jam ha. Vide le [[Special:ListGrants|tabula de concessiones]] pro plus information.",
-	"botpasswords-label-restrictions": "Restrictiones de uso:",
 	"botpasswords-label-grants-column": "Concedite",
 	"botpasswords-bad-appid": "Le nomine del robot \"$1\" non es valide.",
 	"botpasswords-insert-failed": "Le addition del nomine de robot \"$1\" ha fallite. Esque illo ha jam essite addite?",
@@ -585,8 +584,8 @@
 	"passwordreset-emailelement": "Nomine de usator: \n$1\n\nContrasigno temporari: \n$2",
 	"passwordreset-emailsentemail": "Si iste adresse es associate a tu conto, alora un e-mail pro reinitialisar le contrasigno essera inviate.",
 	"passwordreset-emailsentusername": "Si il ha un adresse de e-mail associate a iste conto, alora un e-mail pro reinitialisar le contrasigno essera inviate.",
-	"passwordreset-emailsent-capture2": "Le {{PLURAL:$1|message|messages}} de e-mail pro reinitialisation de contrasigno ha essite inviate. Le {{PLURAL:$1|nomine de usator e contrasigno|lista de nomines de usator e contrasignos}} appare hic infra.",
-	"passwordreset-emailerror-capture2": "Le invio de e-mail al {{GENDER:$2|usator}} ha fallite: $1 Le {{PLURAL:$3|nomine de usator e contrasigno|lista de nomines de usator e contrasignos}} appare hic infra.",
+	"passwordreset-emailsent-capture2": "Le {{PLURAL:$1|message|messages}} de e-mail pro reinitialisation de contrasigno ha essite inviate. Le {{PLURAL:$1|nomine de usator e contrasigno|lista de nomines de usator e contrasignos}} es monstrate hic.",
+	"passwordreset-emailerror-capture2": "Le invio de e-mail al {{GENDER:$2|usator}} ha fallite: $1 Le {{PLURAL:$3|nomine de usator e contrasigno|lista de nomines de usator e contrasignos}} es monstrate hic.",
 	"passwordreset-nocaller": "Un appellator debe esser fornite",
 	"passwordreset-nosuchcaller": "Appellator non existe: $1",
 	"passwordreset-ignored": "Le reinitialisation del contrasigno non ha essite realisate. Es possibile que nulle fornitor ha essite configurate?",
@@ -1460,6 +1459,7 @@
 	"upload-dialog-disabled": "Le incargamento de files con iste dialogo es disactivate in iste wiki.",
 	"upload-dialog-title": "Incargar file",
 	"upload-dialog-button-cancel": "Cancellar",
+	"upload-dialog-button-back": "Retornar",
 	"upload-dialog-button-done": "Facite",
 	"upload-dialog-button-save": "Salveguardar",
 	"upload-dialog-button-upload": "Incargar",
@@ -3351,6 +3351,12 @@
 	"htmlform-cloner-create": "Adder plus",
 	"htmlform-cloner-delete": "Remover",
 	"htmlform-cloner-required": "Al minus un valor es requirite.",
+	"htmlform-date-placeholder": "AAAA-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "Le valor specificate non es recognoscite como data. Tenta usar le formato AAAA-MM-DD.",
+	"htmlform-time-invalid": "Le valor specificate non es recognoscite como hora. Tenta usar le formato HH:MM:SS.",
+	"htmlform-datetime-invalid": "Le valor specificate non es recognoscite como data e hora. Tenta usar le formato AAAA-MM-DD HH:MM:SS.",
 	"htmlform-title-badnamespace": "[[:$1]] non es in le spatio de nomines \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" non es un titulo de pagina creabile",
 	"htmlform-title-not-exists": "$1 non existe.",
@@ -3434,7 +3440,6 @@
 	"feedback-external-bug-report-button": "Signalar un problema technic",
 	"feedback-dialog-title": "Submitter commentario",
 	"feedback-dialog-intro": "Usa le formulario sequente pro submitter tu commentario, le qual apparera in le pagina \"$1\" insimul a tu nomine de usator.",
-	"feedback-error-title": "Error",
 	"feedback-error1": "Error: Resultato del API non recognoscite",
 	"feedback-error2": "Error: Modification fallite",
 	"feedback-error3": "Error: Nulle responsa del API",
diff --git a/languages/i18n/is.json b/languages/i18n/is.json
index fd1d4c40a7..0e3003ac0d 100644
--- a/languages/i18n/is.json
+++ b/languages/i18n/is.json
@@ -1781,6 +1781,7 @@
 	"listgrouprights-namespaceprotection-restrictedto": "Réttindi sem leyfa notanda að breyta",
 	"listgrants-rights": "Réttindi",
 	"trackingcategories-name": "Heiti skilaboða",
+	"restricted-displaytitle-ignored": "Síður með hunsaða sýnda titla",
 	"trackingcategories-nodesc": "Enginn lýsing tiltæk.",
 	"trackingcategories-disabled": "Flokkurinn er óvirkur",
 	"mailnologin": "Ekkert netfang til að senda á",
@@ -3302,8 +3303,6 @@
 	"htmlform-title-not-exists": "$1 er ekki til",
 	"htmlform-user-not-exists": "<strong>$1</strong> er ekki til.",
 	"htmlform-user-not-valid": "<strong>$1</strong> er ekki gilt notandanafn.",
-	"sqlite-has-fts": "$1 með fullum texta leitar stuðningi",
-	"sqlite-no-fts": "$1 án fullum texta leitar stuðningi",
 	"logentry-delete-delete": "$1 {{GENDER:$2|eyddi}} síðunni $3",
 	"logentry-delete-restore": "$1 {{GENDER:$2|endurvakti}} $3",
 	"logentry-delete-event": "$1 {{GENDER:$2|breytti}} sýnileika {{PLURAL:$5|færslu|$5 færslna}} á $3: $4",
@@ -3367,7 +3366,6 @@
 	"feedback-external-bug-report-button": "Senda inn tæknilegar lýsingar/verkefni",
 	"feedback-dialog-title": "Senda umsögn",
 	"feedback-dialog-intro": "Þú getur þú notað einfalt eyðublað hér fyrir neðan til að senda inn umsögn. Athugasemdinni þinni verður bætt við síðuna \"$1\" ásamt notandanafni þínu.",
-	"feedback-error-title": "Villa",
 	"feedback-error1": "Villa: Óþekkt útkoma frá API",
 	"feedback-error2": "Villa: Breytingin mistókst",
 	"feedback-error3": "Villa: Ekkert svar frá API",
diff --git a/languages/i18n/it.json b/languages/i18n/it.json
index a5bdb02c92..eb3066d93d 100644
--- a/languages/i18n/it.json
+++ b/languages/i18n/it.json
@@ -102,7 +102,8 @@
 			"Einreiher",
 			"Anto",
 			"Saracrovetto",
-			"Tosky"
+			"Tosky",
+			"Selven"
 		]
 	},
 	"tog-underline": "Sottolinea i collegamenti:",
@@ -301,6 +302,7 @@
 	"talk": "Discussione",
 	"views": "Visite",
 	"toolbox": "Strumenti",
+	"tool-link-userrights": "Modifica gruppi {{GENDER:$1|utente}}",
 	"tool-link-emailuser": "Invia una email a questo {{GENDER:$1|utente}}",
 	"userpage": "Visualizza la pagina utente",
 	"projectpage": "Visualizza la pagina di servizio",
@@ -494,6 +496,7 @@
 	"createacct-yourpasswordagain-ph": "Inserisci nuovamente la password",
 	"userlogin-remembermypassword": "Mantienimi collegato",
 	"userlogin-signwithsecure": "Usa una connessione sicura",
+	"cannotlogin-title": "Non è possibile effettuare l'accesso",
 	"cannotlogin-text": "L'accesso non è possibile.",
 	"cannotloginnow-title": "Impossibile accedere ora",
 	"cannotloginnow-text": "L'accesso non è possibile quando si sta usando $1.",
@@ -1031,7 +1034,7 @@
 	"searchprofile-advanced-tooltip": "Cerca nei namespace personalizzati",
 	"search-result-size": "$1 ({{PLURAL:$2|una parola|$2 parole}})",
 	"search-result-category-size": "{{PLURAL:$1|1 utente|$1 utenti}} ({{PLURAL:$2|1 sottocategoria|$2 sottocategorie}}, {{PLURAL:$3|1 file|$3 files}})",
-	"search-redirect": "(redirect $1)",
+	"search-redirect": "(reindirizzamento da $1)",
 	"search-section": "(sezione $1)",
 	"search-category": "(categoria $1)",
 	"search-file-match": "(corrispondenza nel contenuto del file)",
@@ -1542,9 +1545,11 @@
 	"upload-http-error": "Si è verificato un errore HTTP: $1",
 	"upload-copy-upload-invalid-domain": "Non è consentito il caricamento di copie da questo dominio.",
 	"upload-foreign-cant-upload": "Questo wiki non è configurato per caricare i file nel repository di file esterno richiesto.",
+	"upload-foreign-cant-load-config": "Impossibile caricare il file di configurazione per caricarlo nel repositorio esterno.",
 	"upload-dialog-disabled": "Il caricamento di file tramite questa finestra di dialogo è disabilitato in questo wiki.",
 	"upload-dialog-title": "Carica file",
 	"upload-dialog-button-cancel": "Annulla",
+	"upload-dialog-button-back": "Indietro",
 	"upload-dialog-button-done": "Fatto",
 	"upload-dialog-button-save": "Salva",
 	"upload-dialog-button-upload": "Carica",
@@ -1613,6 +1618,7 @@
 	"uploadstash-errclear": "La pulizia dei file non è riuscita.",
 	"uploadstash-refresh": "Aggiorna l'elenco dei file",
 	"uploadstash-thumbnail": "vedi miniatura",
+	"uploadstash-exception": "Impossibile memorizzare il caricamento in stash ($1): \"$2\".",
 	"invalid-chunk-offset": "Offset della parte non valido.",
 	"img-auth-accessdenied": "Accesso negato",
 	"img-auth-nopathinfo": "PATH_INFO mancante.\nIl server non è impostato per passare questa informazione.\nPotrebbe essere basato su CGI e non può supportare img_auth.\nVedi https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:Image_Authorization",
@@ -1652,7 +1658,7 @@
 	"listfiles_date": "Data",
 	"listfiles_name": "Nome",
 	"listfiles_user": "Utente",
-	"listfiles_size": "Dimensione in byte",
+	"listfiles_size": "Dimensione",
 	"listfiles_description": "Descrizione",
 	"listfiles_count": "Versioni",
 	"listfiles-show-all": "Includi le vecchie versioni delle immagini",
@@ -3464,6 +3470,18 @@
 	"htmlform-cloner-create": "Aggiungi altro",
 	"htmlform-cloner-delete": "Rimuovi",
 	"htmlform-cloner-required": "È obbligatorio almeno un valore.",
+	"htmlform-date-placeholder": "AAAA-MM-GG",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-GG HH:MM:SS",
+	"htmlform-date-invalid": "Il valore specificato non è riconosciuto come data. Prova a utilizzare il formato AAAA-MM-GG.",
+	"htmlform-time-invalid": "Il valore specificato non è riconosciuto come orario. Prova a utilizzare il formato HH:MM:SS.",
+	"htmlform-datetime-invalid": "Il valore specificato non è riconosciuto come data e ora. Prova a utilizzare il formato AAAA-MM-GG HH:MM:SS.",
+	"htmlform-date-toolow": "Il valore specificato è precedente alla prima data consentita del $1.",
+	"htmlform-date-toohigh": "Il valore specificato è successivo all'ultima data consentita del $1.",
+	"htmlform-time-toolow": "Il valore specificato è precedente al primo orario consentito del $1.",
+	"htmlform-time-toohigh": "Il valore specificato è successivo all'ultimo orario consentito di $1.",
+	"htmlform-datetime-toolow": "Il valore specificato è precedente alla prima data e ora consentita del $1.",
+	"htmlform-datetime-toohigh": "Il valore specificato è successivo all'ultima data e ora consentita del $1.",
 	"htmlform-title-badnamespace": "[[:$1]] non si trova nel namespace \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" è il titolo di una pagina non creabile",
 	"htmlform-title-not-exists": "$1 non esiste.",
@@ -3547,7 +3565,6 @@
 	"feedback-external-bug-report-button": "Documenta un problema tecnico",
 	"feedback-dialog-title": "Invia un feedback",
 	"feedback-dialog-intro": "Usa il modulo sottostante per inviare il tuo feedback. Il tuo commento apparirà nella pagina \"$1\", assieme al tuo nome utente.",
-	"feedback-error-title": "Errore",
 	"feedback-error1": "Errore: Dalla API è arrivato un risultato non riconosciuto",
 	"feedback-error2": "Errore: Non è stato possibile eseguire la modifica",
 	"feedback-error3": "Errore: Nessuna risposta dalla API",
@@ -3850,6 +3867,9 @@
 	"linkaccounts-submit": "Collega utenze",
 	"unlinkaccounts": "Scollega utenze",
 	"unlinkaccounts-success": "L'utenza è stata scollegata.",
+	"authenticationdatachange-ignored": "Il cambiamento dei dati di autenticazione non è stato gestito. Forse non è stato configurato nessun provider?",
+	"userjsispublic": "Ricorda: le sottopagine JavaScript non devono contenere dati riservati poichè sono visualizzabili da altri utenti.",
+	"usercssispublic": "Ricorda: le sottopagine CSS non devono contenere dati riservati poichè sono visualizzabili da altri utenti.",
 	"restrictionsfield-badip": "Indirizzo IP o intervallo non valido: $1",
 	"restrictionsfield-label": "Intervalli IP consentiti:",
 	"restrictionsfield-help": "Un indirizzo IP o intervallo CIDR per linea. Per consentire tutto, utilizza<br><code>0.0.0.0/0</code><br><code>::/0</code>"
diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json
index 168917548d..24f70e6a7b 100644
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -90,7 +90,7 @@
 	"tog-enotifminoredits": "문서나 파일의 사소한 편집도 이메일로 알림",
 	"tog-enotifrevealaddr": "알림 메일에 내 이메일 주소를 밝히기",
 	"tog-shownumberswatching": "주시하는 사용자 수 보이기",
-	"tog-oldsig": "현재 서명:",
+	"tog-oldsig": "당신의 기존 서명:",
 	"tog-fancysig": "서명을 위키텍스트로 취급 (자동으로 링크를 걸지 않음)",
 	"tog-uselivepreview": "실시간 미리 보기 사용하기",
 	"tog-forceeditsummary": "편집 요약을 쓰지 않았을 때 내게 물어보기",
@@ -1450,6 +1450,8 @@
 	"file-thumbnail-no": "파일 이름이 <strong>$1</strong>으로 시작합니다.\n이 파일은 그림의 크기를 줄인 (섬네일) 파일인 것 같습니다.\n더 해상도가 좋은 파일이 있다면 그 파일을 올리거나 아니면 올리려는 파일 이름을 바꾸세요.",
 	"fileexists-forbidden": "같은 이름의 파일이 이미 있고, 덮어쓸 수 없습니다.\n그래도 파일을 올리시려면, 뒤로 돌아가서 다른 이름으로 시도해 주시기 바랍니다.\n[[File:$1|thumb|center|$1]]",
 	"fileexists-shared-forbidden": "같은 이름의 파일이 이미 위키미디어 공용에 있습니다.\n그래도 파일을 올리려면 뒤로 돌아가서 다른 이름으로 시도해 주시기 바랍니다.\n[[File:$1|thumb|center|$1]]",
+	"fileexists-no-change": "업로드한 항목은 <strong>[[:$1]]</strong>의 현재 판과 완전히 중복입니다.",
+	"fileexists-duplicate-version": "업로드한 항목은 <strong>[[:$1]]</strong>의 {{PLURAL:$2|과거의 판}}과 완전히 중복입니다.",
 	"file-exists-duplicate": "현재 올리고 있는 {{PLURAL:$1|파일}}이 아래 파일과 중복됩니다:",
 	"file-deleted-duplicate": "이 파일과 같은 파일 ([[:$1]])이 이전에 삭제된 적이 있습니다. 파일을 다시 올리기 전에 문서의 삭제 기록을 확인해 주시기 바랍니다.",
 	"file-deleted-duplicate-notitle": "이 파일과 같은 파일이 이전에 삭제된 적이 있으며, 제목은 숨겨져 있습니다.\n다시 올리기 전에 상확은 검토하기 위해 숨겨진 파일 데이터를 볼 수 있는 누군가에게 물어봐야 합니다.",
@@ -1504,6 +1506,7 @@
 	"upload-dialog-disabled": "이 대화창을 이용한 파일 올리기는 이 위키에서 비활성화되어 있습니다.",
 	"upload-dialog-title": "파일 올리기",
 	"upload-dialog-button-cancel": "취소",
+	"upload-dialog-button-back": "뒤로",
 	"upload-dialog-button-done": "완료",
 	"upload-dialog-button-save": "저장",
 	"upload-dialog-button-upload": "올리기",
@@ -3426,6 +3429,9 @@
 	"htmlform-cloner-create": "더 추가",
 	"htmlform-cloner-delete": "제거",
 	"htmlform-cloner-required": "적어도 하나의 값이 필요합니다.",
+	"htmlform-date-placeholder": "YYYY-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "YYYY-MM-DD HH:MM:SS",
 	"htmlform-title-badnamespace": "[[:$1]] 문서는 \"{{ns:$2}}\" 이름공간에 없습니다.",
 	"htmlform-title-not-creatable": "\"$1\"은 만들 수 없는 문서 제목입니다.",
 	"htmlform-title-not-exists": "$1 문서는 존재하지 않습니다.",
@@ -3509,7 +3515,6 @@
 	"feedback-external-bug-report-button": "기술적 보고 제기",
 	"feedback-dialog-title": "피드백 제출",
 	"feedback-dialog-intro": "당신의 피드백을 제출하기 위해 아래 쉬운 양식을 사용할 수 있습니다. 당신의 의견은 당신의 사용자 이름과 함께, \"$1\" 문서에 추가됩니다.",
-	"feedback-error-title": "오류",
 	"feedback-error1": "오류: API 실행 결과를 인식할 수 없음",
 	"feedback-error2": "오류: 편집 실패",
 	"feedback-error3": "오류: API가 응답하지 않음",
@@ -3814,5 +3819,6 @@
 	"userjsispublic": "주목해 주십시오: 자바스크립트의 하위 문서들은 다른 사용자들이 볼 수 있기 때문에 기밀 데이터를 포함해서는 안 됩니다.",
 	"usercssispublic": "주목해 주십시오: CSS의 하위 문서들은 다른 사용자들이 볼 수 있기 때문에 기밀 데이터를 포함해서는 안 됩니다.",
 	"restrictionsfield-badip": "유효하지 않은 IP 주소나 대역: $1",
-	"restrictionsfield-label": "허용된 IP 대역:"
+	"restrictionsfield-label": "허용된 IP 대역:",
+	"restrictionsfield-help": "줄 단위의 하나의 IP 주소 또는 CIDR 대역입니다. 모든 곳에 적용하려면, 다음을 사용하세요<br><code>0.0.0.0/0</code><br><code>::/0</code>"
 }
diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json
index a3edcfc5f0..70addda87a 100644
--- a/languages/i18n/lb.json
+++ b/languages/i18n/lb.json
@@ -923,7 +923,7 @@
 	"searchprofile-advanced-tooltip": "Sich an den Nummraim déi an de perséinlichen Astellungen festgeluecht sinn",
 	"search-result-size": "$1 ({{PLURAL:$2|1 Wuert|$2 Wierder}})",
 	"search-result-category-size": "{{PLURAL:$1|1 Säit|$1 Säiten}} ({{PLURAL:$2|1 Ënnerkategorie|$2 Ënnerkategorien}}, {{PLURAL:$3|1 Fichier|$3 Fichieren}})",
-	"search-redirect": "(Viruleedung $1)",
+	"search-redirect": "(Viruleedung vu(n) $1)",
 	"search-section": "(Abschnitt $1)",
 	"search-category": "(Kategorie $1)",
 	"search-file-match": "(Inhalt vum Fichier passt)",
@@ -1402,6 +1402,7 @@
 	"upload-options": "Optioune vum Eroplueden",
 	"watchthisupload": "Dëse Fichier iwwerwaachen",
 	"filewasdeleted": "E Fichier mat dësem Numm gouf schonn eemol eropgelueden an duerno nees geläscht. Kuckt w.e.g op $1 no, ier Dir dee Fichier nach eng Kéier eropluet.",
+	"filename-thumb-name": "Dësen Numm gesäit aus wéi den Numm vun engem Miniaturbild. Luet w.e.g. keng Miniatur-Biller zréck op déi selwecht Wiki. Sollt et sech ëm een anert Bild handelen da sicht w.e.g. e Fichiersnumm dee méi verständlech ass an den net sou ufänkt wéi e Miniaturbild.",
 	"filename-bad-prefix": "Den Numm vum Fichier fänkt mat '''„$1“''' un. Dësen Numm krut en automatesch vun der Kamera a seet näischt iwwer dat aus, wat drop ass. Gitt dem Fichier w.e.g. en Numm, deen den Inhalt besser beschreift, an deen net verwiesselt ka ginn.",
 	"upload-proto-error": "Falsche Protokoll",
 	"upload-proto-error-text": "D'URL muss mat <code>http://</code> oder <code>ftp://</code> ufänken.",
@@ -1416,6 +1417,7 @@
 	"upload-dialog-disabled": "D'Eropluede vu Fichieren mat dësem Dialog ass op dëser Wiki desaktivéiert.",
 	"upload-dialog-title": "Fichier eroplueden",
 	"upload-dialog-button-cancel": "Ofbriechen",
+	"upload-dialog-button-back": "Zréck",
 	"upload-dialog-button-done": "Fäerdeg",
 	"upload-dialog-button-save": "Späicheren",
 	"upload-dialog-button-upload": "Eroplueden",
@@ -3222,6 +3224,17 @@
 	"htmlform-cloner-create": "Méi derbäisetzen",
 	"htmlform-cloner-delete": "Ewechhuelen",
 	"htmlform-cloner-required": "Mindestens ee Wäert ass obligatoresch.",
+	"htmlform-date-placeholder": "JJJJ-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "JJJJ-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "De Wäert deen Dir aginn hutt gouf net als Datum erkannt. Probéiert de Format JJJJ-MM-DD ze benotzen.",
+	"htmlform-time-invalid": "De Wäert deen Dir aginn hutt gouf net als Zäit erkannt. Probéiert de Format HH:MM:SS ze benotzen.",
+	"htmlform-datetime-invalid": "De Wäert deen Dir aginn hutt gouf net als Datum an Zäit erkannt. Probéiert de Format JJJJ-MM-DD HH:MM:SS ze benotzen.",
+	"htmlform-date-toolow": "De Wäert deen Dir aginn hutt ass virun deem éischten erlaabten Datum vum $1.",
+	"htmlform-date-toohigh": "De wäert deen Dir aginn hutt ass nom leschten erlaabten Datum vum $1.",
+	"htmlform-time-toolow": "De Wäert deen Dir aginn hutt ass virun der éischter erlaabter Zäit vu(n) $1.",
+	"htmlform-time-toohigh": "De Wäert deen Dir aginn hutt ass no der leschter erlaabter Zäit vu(n) $1.",
+	"htmlform-datetime-toohigh": "De Wäert deen Dir uginn hutt ass nom leschten erlaabten Datum an der Zäit vu(n) $1.",
 	"htmlform-title-badnamespace": "[[:$1]] ass net am Nummraum \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" ass kee Säitentitel deen ugeluecht ka ginn",
 	"htmlform-title-not-exists": "$1 gëtt et net.",
@@ -3282,7 +3295,6 @@
 	"feedback-close": "Fäerdeg",
 	"feedback-external-bug-report-button": "Eng technesch Aufgab notifizéieren",
 	"feedback-dialog-title": "Feedback schécken",
-	"feedback-error-title": "Feeler",
 	"feedback-error1": "Feeler: Resultat vum API gouf net erkannt",
 	"feedback-error2": "Feeler: D'Ännerung gouf net gespäichert",
 	"feedback-error3": "Feeler: Keng Äntwert vum API",
diff --git a/languages/i18n/li.json b/languages/i18n/li.json
index 779c36cbb1..8cc7e7dbf0 100644
--- a/languages/i18n/li.json
+++ b/languages/i18n/li.json
@@ -45,7 +45,7 @@
 	"tog-enotifminoredits": "Versjik  mich 'ne e-mail bie klein bewirkinge op pagina's en bestenj op mien volglies",
 	"tog-enotifrevealaddr": "Mien e-mailadres tuine in e-mailberichte",
 	"tog-shownumberswatching": "'t Aantal gebroekers tuine die dees pagina volg",
-	"tog-oldsig": "Bestaonde ongerteikening:",
+	"tog-oldsig": "Dien bestaonde ongerteikening:",
 	"tog-fancysig": "Es wikiteks behanjele (zonder autematische verwiezing)",
 	"tog-uselivepreview": "\"live veurbesjouwing\" gebroeke",
 	"tog-forceeditsummary": "'n Melding gaeve bie 'n laeg samevatting",
@@ -150,14 +150,14 @@
 	"category-file-count-limited": "Dees categorie bevat {{PLURAL:$1|'t volgende bestandj|de volgende $1 bestenj}}.",
 	"listingcontinuesabbrev": "wiejer",
 	"index-category": "Geïndexeerde paazjes",
-	"noindex-category": "Óngeïndexeerde paazjes",
+	"noindex-category": "Neet-geïndexeerde pazjena's",
 	"broken-file-category": "Pazjena's mit ónjuuste bestandjsverwiezinge",
 	"about": "Informatie",
 	"article": "Pagina",
 	"newwindow": "(in nuuj venster)",
 	"cancel": "Aafbraeke",
 	"moredotdotdot": "Miè...",
-	"morenotlisted": "Deze lies is neet compleet.",
+	"morenotlisted": "Deze lies is mäögelik neet compleet.",
 	"mypage": "Mien gebroekerspagina",
 	"mytalk": "Euverlèk",
 	"anontalk": "Euverlèk veur dit IP adres",
@@ -363,7 +363,6 @@
 	"yourpassword": "Die wachwaord",
 	"userlogin-yourpassword": "Wachwaord",
 	"yourpasswordagain": "Wachwaord opnuuj intype",
-	"remembermypassword": "Mien wachwaord onthouwe veur later sessies (hoegstens $1 {{PLURAL:$1|daag|daag}})",
 	"yourdomainname": "Die domein",
 	"externaldberror": "d'r Is 'n fout opgetraoje biej 't aanmelje biej de database of doe höbs gén toesjtömming diene externe gebroeker biej te wèrke.",
 	"login": "Aanmèlde",
@@ -2561,8 +2560,6 @@
 	"htmlform-submit": "Slaon óp",
 	"htmlform-reset": "Maak verangeringe óngedaon",
 	"htmlform-selectorother-other": "Anges",
-	"sqlite-has-fts": "Zeuk versie $1 mit óngersteuning veur \"full-text\"",
-	"sqlite-no-fts": "Zeuk versie $1 zónger óngersteuning veur \"fulltext\"",
 	"logentry-delete-delete": "$1 {{GENDER:$1|haet}} de pagina $3 gewösj",
 	"logentry-delete-restore": "$1 haet de pagina $3 trögkgezat",
 	"logentry-delete-event": "$1 haet de zichbaarheid van {{PLURAL:$5|'ne logbookregel|$5 logbookregels}} van $3 gewiezig: $4",
diff --git a/languages/i18n/lt.json b/languages/i18n/lt.json
index 90f5c98fd0..c37713f7aa 100644
--- a/languages/i18n/lt.json
+++ b/languages/i18n/lt.json
@@ -1468,6 +1468,7 @@
 	"upload-foreign-cant-upload": "Šis vikis nėra sukonfigūruotas failų įkėlimui į nurodytą išorinę failų talpyklą.",
 	"upload-dialog-title": "Įkelti failą",
 	"upload-dialog-button-cancel": "Atšaukti",
+	"upload-dialog-button-back": "Atgal",
 	"upload-dialog-button-done": "Atlikta",
 	"upload-dialog-button-save": "IÅ¡saugoti",
 	"upload-dialog-button-upload": "Įkelti",
@@ -3422,7 +3423,6 @@
 	"feedback-external-bug-report-button": "Užpildyti techninę užduotį",
 	"feedback-dialog-title": "Pateikti atsiliepimą",
 	"feedback-dialog-intro": "Galite naudoti lengvą formą esančia žemiau, kad pateiktumėte savo atsiliepimus. Jūsų komentaras bus pridėtas prie puslapio \"$1\", kartu su jūsų vartotojo vardu.",
-	"feedback-error-title": "Klaida",
 	"feedback-error1": "Klaida: Neatpažįstamas rezultatas iš API",
 	"feedback-error2": "Klaida: Redagavimas nepavyko",
 	"feedback-error3": "Klaida: Jokio atsakymo iš API",
diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json
index 82bd5aba38..8baed2ce7d 100644
--- a/languages/i18n/lv.json
+++ b/languages/i18n/lv.json
@@ -1204,6 +1204,7 @@
 	"upload-http-error": "HTTP kļūda: $1",
 	"upload-dialog-title": "Augšupielādēt failu",
 	"upload-dialog-button-cancel": "Atcelt",
+	"upload-dialog-button-back": "Atpakaļ",
 	"upload-dialog-button-done": "Gatavs",
 	"upload-dialog-button-save": "Saglabāt",
 	"upload-dialog-button-upload": "Augšupielādēt",
@@ -1249,7 +1250,7 @@
 	"nolicense": "Neviena licence nav izvēlēta",
 	"license-nopreview": "(Priekšskatījums nav pieejams)",
 	"upload_source_url": "(derīgs, publiski pieejams URL)",
-	"upload_source_file": "(fails datorā)",
+	"upload_source_file": "(tavs izvēlētais fails tavā datorā)",
 	"listfiles-delete": "dzēst",
 	"listfiles-summary": "Šajā īpašajā lapā ir redzami visi augšupielādētie faili.",
 	"listfiles_search_for": "Meklēt failu pēc vārda:",
@@ -1713,12 +1714,12 @@
 	"year": "No gada (un senāki):",
 	"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-blocklog": "bloķēšanas reģistrs",
 	"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",
-	"sp-contributions-userrights": "Lietotāju tiesību pārvaldība",
+	"sp-contributions-userrights": "dalībnieka tiesību pārvaldība",
 	"sp-contributions-blocked-notice": "Šis lietotājs pašlaik ir nobloķēts.\nPēdējais bloķēšanas reģistra ieraksts ir apskatāms zemāk:",
 	"sp-contributions-blocked-notice-anon": "Šī IP adrese pašlaik ir nobloķēta.\nPēdējais bloķēšanas reģistra ieraksts ir apskatāms zemāk:",
 	"sp-contributions-search": "Meklēt lietotāju veiktās izmaiņas",
@@ -1770,7 +1771,7 @@
 	"ipb-unblock-addr": "Atbloķēt $1",
 	"ipb-unblock": "Atbloķēt lietotāju vai IP adresi",
 	"ipb-blocklist": "Apskatīt esošos blokus",
-	"ipb-blocklist-contribs": "$1 devums",
+	"ipb-blocklist-contribs": "{{GENDER:$1|$1}} devums",
 	"unblockip": "Atbloķēt lietotāju",
 	"unblockiptext": "Šeit var atbloķēt iepriekš nobloķētu IP adresi vai lietotāja vārdu (atjaunot viņiem rakstīšanas piekļuvi).",
 	"ipusubmit": "Noņemt šo bloku",
@@ -2111,6 +2112,7 @@
 	"newimages-legend": "Filtrs",
 	"newimages-label": "Faila nosaukums (vai tā daļa):",
 	"newimages-showbots": "Parādīt botu augšupielādētos failus",
+	"newimages-hidepatrolled": "Paslēpt pārbaudītās augšupielādes",
 	"noimages": "Nav nekā ko redzēt.",
 	"ilsubmit": "Meklēt",
 	"bydate": "<b>pēc datuma</b>",
@@ -2531,7 +2533,7 @@
 	"tags-actions-header": "Darbības",
 	"tags-active-yes": "Jā",
 	"tags-active-no": "Nē",
-	"tags-source-extension": "Nosaka paplašinājums",
+	"tags-source-extension": "Nosaka programmatūra",
 	"tags-source-none": "Vairs netiek izmantots",
 	"tags-edit": "labot",
 	"tags-delete": "dzēst",
@@ -2621,7 +2623,6 @@
 	"feedback-cancel": "Atcelt",
 	"feedback-close": "Gatavs",
 	"feedback-dialog-title": "Iesniegt atsauksmes",
-	"feedback-error-title": "Kļūda",
 	"feedback-error1": "Kļūda: API neatpazīts rezultāts",
 	"feedback-error2": "Kļūda: Labojums neizdevās",
 	"feedback-error3": "Kļūda: Nav atbildes no API",
diff --git a/languages/i18n/lzz.json b/languages/i18n/lzz.json
index cd0a50dfae..7834379071 100644
--- a/languages/i18n/lzz.json
+++ b/languages/i18n/lzz.json
@@ -9,7 +9,8 @@
 			"Ibero-kolxi",
 			"Reedy",
 			"The Evil IP address",
-			"아라"
+			"아라",
+			"Velg"
 		]
 	},
 	"tog-underline": "Link'iş tude kogu3’uxaçki:",
@@ -181,6 +182,7 @@
 	"nstab-template": "Şabloni",
 	"nstab-help": "Meşvelaşi but’k’a",
 	"nstab-category": "Kʼatʼegori",
+	"mainpage-nstab": "Dudi But'k'a",
 	"error": "Çilata",
 	"missing-article": "Datʼabeizik, na igoren \"$1\" $2 coxoni butʼkʼaşi tekstʼi var az*iru.\n\nMuşeni? Çunki am butʼkʼa, jileri na ren a butʼkʼaşi golaxteri versiyoni ren.\n\nEger sebebi aya na va renna, pʼrogramis ar çilata z*irit.\nMu iqʼven! Aya, a [[Special:ListUsers/sysop|adminis]], URL-ti çʼareli şekʼilite rapʼortʼi doçʼarit.",
 	"missingarticle-rev": "(revizyoni#: $1)",
@@ -192,7 +194,6 @@
 	"userlogin-yourname": "Skani maxmare-coxo",
 	"yourpassword": "Pʼarola-skani:",
 	"userlogin-yourpassword": "Pʼarola-skani",
-	"remembermypassword": "Parola-skani goişini (for a maximum of $1 {{PLURAL:$1|day|days}})",
 	"yourdomainname": "Skani domaini:",
 	"login": "Sitʼeşa amaxti",
 	"nav-login-createaccount": "Sitʼeşa amaxti / hesabi dokʼidi",
@@ -209,6 +210,8 @@
 	"createacct-reason": "Muşen",
 	"mailmypassword": "Ağne pʼarola-çkimi moncğoni",
 	"loginlanguagelabel": "Nena: $1",
+	"pt-login": "Sitʼeşa amaxti",
+	"pt-createaccount": "Hesabi dokʼidi",
 	"oldpassword": "Mcveşi p'arola:",
 	"newpassword": "Ağani P'arola:",
 	"passwordreset-username": "Skani maxmare-coxo:",
@@ -358,6 +361,7 @@
 	"rc-enhanced-expand": "Detayepe ko3ʼiri (JavaScript-i unon)",
 	"rc-enhanced-hide": "Detayepe doşinaxi",
 	"recentchangeslinked": "Alakʼali na renan oktirobape",
+	"recentchangeslinked-toolbox": "Alakʼali na renan oktirobape",
 	"recentchangeslinked-title": "\"$1\" kʼala alakʼali na renan oktirobape",
 	"recentchangeslinked-summary": "Tude na çʼars listʼe, kʼiti na noğiru butʼkʼaşa (varna kʼiti na noğiru kʼatʼegorişi makʼaturepeşa) kʼontʼaktʼi na ikips butʼkʼapes na ixvenu çodinaşi oktirobapeşi listʼe ren.\n[[Special:Watchlist|Gotxozu na ginon butʼkʼapeşi listʼes]] na renan butʼkʼape '''mçxu''' nçʼaraten niçʼaru.",
 	"recentchangeslinked-page": "Butʼkʼaşi coxo:",
@@ -513,7 +517,7 @@
 	"tooltip-pt-login": "Ginon na sitʼeşa amaxti, mecburi va re",
 	"tooltip-pt-logout": "Siteşen Kogamaxti",
 	"tooltip-ca-talk": "Butʼkʼaş doloxe na içʼaren çʼarape şeni mutxanepe mi3ʼvit",
-	"tooltip-ca-edit": "Am butʼkʼa kodogaktiren. Mu iqʼven! ipti \"Evvelişen i3ʼkʼedi\" tʼuşi ixmari do na çʼari çʼara ikʼontʼroli, ukʼule ikʼayitʼi.",
+	"tooltip-ca-edit": "Butʼkʼa doktiri",
 	"tooltip-ca-addsection": "Ağani burme dokʼidi.",
 	"tooltip-ca-viewsource": "Am butʼkʼa içven. Xvala odudeş kʼodi gaz*iren. Doloxe muşi va gaktirinen.",
 	"tooltip-ca-history": "Am butʼkʼaşi golaxteri versiyonepe",
@@ -577,6 +581,7 @@
 	"watchlisttools-raw": "Kʼobo gotxozu listʼe doktiri",
 	"specialpages": "Doxmeli butʼkʼape",
 	"rightsnone": "(Va ren)",
+	"searchsuggest-search": "Mgori",
 	"special-characters-group-latin": "Lat'ini",
 	"special-characters-group-greek": "Xorumi",
 	"special-characters-group-arabic": "Arabuli"
diff --git a/languages/i18n/mai.json b/languages/i18n/mai.json
index 0d7f4fb633..ed6dde8e76 100644
--- a/languages/i18n/mai.json
+++ b/languages/i18n/mai.json
@@ -712,7 +712,7 @@
 	"permissionserrorstext-withaction": "अहाँक अनुमति नै अछि $2 लेल, एकर लेल {{PLURAL:$1|कारण|कारणसभ}}सँ:",
 	"recreate-moveddeleted-warn": "'''चेतौनी''': अहाँ फेरसँ ओ पन्ना बना रहल छी जे पहिने मेटा देल गेल छै।'''\n\nअहाँ विचारू जे की ई सम्पादन केनाइ उचित अछि।\nऐ पन्नाक मेटाएल बला आ हटाएल वृत्तलेख एतए सुविधा लेल देल जा रहल अछि:",
 	"moveddeleted-notice": "ई पन्ना मेटाएल गेल अछि।\nई पन्ना लेल मेटाएल आ स्थानान्तरणक लग सन्दर्भ लेल नीचाँ देल गेल अछि।",
-	"log-fulllog": "सभटा वृत्तलेख देखी",
+	"log-fulllog": "सम्पूर्ण लौग देखी",
 	"edit-hook-aborted": "सम्पादन नोकसीसँ खतम भेल।\nई कोनो कारण नै देलक।",
 	"edit-gone-missing": "पन्ना अद्यतन नै भऽ सकल।\nलगैए जे ई मेटा देल गेल अछि।",
 	"edit-conflict": "सम्पादन अन्तर्विरोध",
@@ -753,7 +753,7 @@
 	"expansion-depth-exceeded-warning": "पन्ना विस्तार गहिराई पार केनए अछि",
 	"parser-unstrip-loop-warning": "Unstrip लूप पाओल गेल",
 	"parser-unstrip-recursion-limit": "Unstrip पुनरावर्तन सीमा पार कइर गेल($1)",
-	"converter-manual-rule-error": "म्यानुअल भाषा परिवर्तन नियम में त्रुटि",
+	"converter-manual-rule-error": "म्यानुअल भाषा परिवर्तन नियममे त्रुटि",
 	"undo-success": "ई सम्पादन पूर्ववत बदलल जा सकैए।\nकृपा क' नीचाँक तुलनाक जाँच करू ई देखैले जे ई वएह भेल अछि जे अहाँ चाहै छलहुँ, आ तखन सम्पादन ख़तम करबा लेल नीचाँक परिवर्तन सुरक्षित करू ।",
 	"undo-failure": "मध्यवर्ती विरोधी सम्पादनक कारण ऐ सम्पादनकेँ खतम नै कएल जा सकैए।",
 	"undo-norev": "ई सम्पादन खतम नै कएला जा सकैए कारण ई अछि नै वा मेटा देल गेल अछि।",
@@ -814,7 +814,7 @@
 	"revdelete-show-file-submit": "हँ",
 	"revdelete-selected-text": "[[:$2]] {{PLURAL:$1|क|के}} चयनित अवतरण:",
 	"revdelete-selected-file": "[[:$2]] {{PLURAL:$1|क|के}} चयनित फाइल अवतरण:",
-	"logdelete-selected": "{{PLURAL:$1|चुनल वृत्तलेख घटना|चुनल वृत्तलेख घटनासभ}}:",
+	"logdelete-selected": "{{PLURAL:$1|चुनल लौग घटना|चुनल लौग घटनासभ}}:",
 	"revdelete-text-text": "हटाएल गेल अवतरण पृष्ठ इतिहासमें देखाएल जाएत मुदा वोकर सामग्री सार्वजनिक रूपसँ नै देखाएल जा सकएत अछि।",
 	"revdelete-text-file": "हटाएल गेल अवतरण पृष्ठ इतिहासमें देखाएल जाएत मुदा वोकर सामग्री सार्वजनिक रूपसँ नै देखाएल जा सकएत अछि।",
 	"logdelete-text": "हटाए गेल प्रवेश घटनासभ अखैनो भी लॉग में दिखाबल ज्यात, लेकिन ओकर सामग्री के कुछ भाग के सार्वजनीक करबाक के लेल दुर्गम भ्या जेत।",
@@ -853,18 +853,18 @@
 	"revdelete-reasonotherlist": "दोसर कारण",
 	"revdelete-edit-reasonlist": "मेटेबाक कारण बदली",
 	"revdelete-offender": "संशोधन केनिहार:",
-	"suppressionlog": "दबाएलगेल वृत्तलेख",
+	"suppressionlog": "नुकाएल लौग",
 	"suppressionlogtext": "नीचाँ मेटाएल आ प्रतिबन्धक उल्लेख अछि जे संचालकसँ नुकाएल सामिग्री अछि।\nअखन स्थित प्रभावी प्रतिबन्ध आ अवरोध लेल देखू [[Special:BlockList|IP block list]] ।",
-	"mergehistory": "मिज्झर भेल पन्ना सभक इतिहास",
+	"mergehistory": "पृष्ठक इतिहास एकत्रित करी",
 	"mergehistory-header": "ई पन्ना अहाँकेँ एकटा स्रोत पन्नाक एकटा नव पन्नामे संशोधन इतिहासकेँ मिज्झर करबाक अनुमति दैत अछि।\nसुनिश्चित होउ जे ई परिवर्तन ऐतिहासिक पन्ना सांतत्य स्थापित करत।",
-	"mergehistory-box": "दू पन्नाक संशोधन मिज्झर करी।",
+	"mergehistory-box": "दुई पृष्ठसभक इतिहास एकत्रित करी:",
 	"mergehistory-from": "मूल पन्ना:",
 	"mergehistory-into": "लक्ष्य पन्ना:",
-	"mergehistory-list": "मिज्झर योग्य सम्पादन इतिहास",
+	"mergehistory-list": "एकत्रितीकरण सम्पादन इतिहास",
 	"mergehistory-merge": "[[:$1]] एकर संशोधन सभकेँ [[:$2]] मे मिलाएल जा सकैए।\nरेडियो बटन स्तम्भक प्रयोग मात्र संशोधनकेँ निर्धारित समए वा ओइसँ पहिने मिज्झर करबामे प्रयोग करू।\nमोन राखू जे उपर नीचाँक लागिक प्रयोग ऐ स्तम्भकेँ पुनर्स्थापित कऽ देत।",
-	"mergehistory-go": "मिज्झर होइ योग्य सम्पादन सभकेँ देखाउ",
-	"mergehistory-submit": "संशोधन सभके मिज्झर करी",
-	"mergehistory-empty": "कोनो संशोधन मिज्झर नै कएल जा सकैए।",
+	"mergehistory-go": "एकत्रित करैलेल लायक सम्पादन देखाबी",
+	"mergehistory-submit": "संशोधन एकत्रित करी",
+	"mergehistory-empty": "कोनो भी अवतरण एकत्रित नै कएल जा सकल।",
 	"mergehistory-done": "$3 {{PLURAL:$3|संशोधन|संशोधन सभ}} एकर $1 सफलता पूर्वक मिज्झर कएल गेल [[:$2]] मे।",
 	"mergehistory-fail": "इतिहासक मिश्रणकेँ नै कऽ सकल, कृपा कऽ पन्ना आ समए परिमितिकेँ फेरसँ जाँचू।",
 	"mergehistory-fail-bad-timestamp": "समय सङ्ख्या अमान्य।",
@@ -883,7 +883,7 @@
 	"mergehistory-comment": "[[:$1]] केँ [[:$2]] मे मिलाएल गेल: $3",
 	"mergehistory-same-destination": "स्रोत आ लक्ष्य पन्ना सभ एक्के नै भऽ सकैए",
 	"mergehistory-reason": "कारण:",
-	"mergelog": "मिज्झरबला वृत्तलेख",
+	"mergelog": "एकत्रीकरण लौग",
 	"revertmerge": "नै मिज्झर",
 	"mergelogpagetext": "नीचाँ एक पन्ना इतिहासक दोसरमे अद्यतन मिश्रणक सूची अछि।",
 	"history-title": "\"$1\" क संशोधन इतिहास",
@@ -1137,7 +1137,7 @@
 	"right-undelete": "पन्ना फेरसँ आनी",
 	"right-suppressrevision": "संचालकसँ नुकाएल संशोधनकेँ पुनरीक्षित करी आ फेरसँ आनी",
 	"right-viewsuppressed": "कोनो प्रयोक्ताके नुकाएल संसोधन देखु",
-	"right-suppressionlog": "व्यक्तिगत वृत्तलेख देखी",
+	"right-suppressionlog": "निजी लौग देखी",
 	"right-block": "दोसर प्रयोक्ताकेँ सम्पादनसँ रोकी",
 	"right-blockemail": "प्रयोक्ताकेँ ई-पत्र पठेबासँ रोकी",
 	"right-hideuser": "एकटा प्रयोक्तानामकेँ प्रतिबन्धित करू, लोकसँ एकरा नुका कऽ",
@@ -1163,11 +1163,11 @@
 	"right-noratelimit": "दरक सीमासँ प्रभावित नै",
 	"right-import": "दोसर विकीसँ पन्ना लिअ",
 	"right-importupload": "पन्नासभकेँ संचिका उपारोपणसँ आनू",
-	"right-patrol": "दोसराक सम्पादनकेँ संचालित देखाउ",
-	"right-autopatrol": "अपन सम्पादनकेँ स्वचालित रूपेँ संचालित देखाउ",
+	"right-patrol": "अन्य सदस्यसभक सम्पादन परीक्षित चिन्हित करी",
+	"right-autopatrol": "अपन सम्पादन स्वचालित रूपसँ परीक्षित चिन्हित करी",
 	"right-patrolmarks": "हालक परिवर्तनमे संचालन चेन्ह देखू",
 	"right-unwatchedpages": "एहन पृष्ठसभक सूची देखी जे केकरो ध्यानसूचीमे नै अछि",
-	"right-mergehistory": "पन्नाक इतिहास सभकेँ मिज्झर करू",
+	"right-mergehistory": "पन्नाक इतिहास एकत्रित करी",
 	"right-userrights": "सभटा प्रयोक्ता अधिकारकेँ सम्पादित करू",
 	"right-userrights-interwiki": "दोसर विकीपर प्रयोक्ताक प्रयोक्ता अधिकारक सम्पादन करी",
 	"right-siteadmin": "दत्तनिधिकेँ प्रतिबन्धित करू आ फेर प्रतिबन्ध हटाउ",
@@ -1212,7 +1212,7 @@
 	"grant-viewmywatchlist": "अपन साकांक्षसूची देखी",
 	"newuserlogpage": "प्रयोक्ता रचना लग",
 	"newuserlogpagetext": "ई प्रयोक्ता निर्माणक वृत्तलेख अछि।",
-	"rightslog": "प्रयोक्ता अधिकार वृत्तलेख",
+	"rightslog": "प्रयोक्ता अधिकार लौग",
 	"rightslogtext": "ई प्रयोक्ता अधिकार परिवर्तन सभक वृतलेख छी।",
 	"action-read": "ई पन्ना पढी",
 	"action-edit": "ई पन्नाक सम्पादित करी",
@@ -1220,7 +1220,7 @@
 	"action-createtalk": "ई वार्ता पन्ना बनाबी",
 	"action-createaccount": "ई प्रयोक्ता खाता बनाबी",
 	"action-autocreateaccount": "स्वतः बाहरी सदस्य खाता बनाबी",
-	"action-history": "पन्नाक इतिहास मिज्झर करी",
+	"action-history": "ई पृष्ठक इतिहास देखी",
 	"action-minoredit": "ऐ सम्पादनके मामूली कही",
 	"action-move": "ई पृष्ठके स्थानान्तरित करी",
 	"action-move-subpages": "ई पन्ना आ एकर उपपन्नाके स्थानान्तरित करी",
@@ -1244,10 +1244,10 @@
 	"action-rollback": "कृपा कऽ अन्तिम प्रयोक्ताक सम्पादनकेँ प्रत्यावर्तित करू जे एक खास पन्नाकेँ सम्पादित केलन्हि",
 	"action-import": "ऐ पन्नाकेँ दोसर विकीसँ आनू",
 	"action-importupload": "ऐ पन्नाकेँ संचिका उपारोपणसँ आनू",
-	"action-patrol": "दोसराक सम्पादनकेँ संचालित देखाउ",
-	"action-autopatrol": "अपन सम्पादनकेँ संचालित देखाउ",
+	"action-patrol": "अन्य सदस्यसभक सम्पादन परीक्षित करी",
+	"action-autopatrol": "अपन सम्पादन स्वचालित रूपसँ परीक्षित करी",
 	"action-unwatchedpages": "बिना संचालित पन्ना सभक सूचीकेँ देखू",
-	"action-mergehistory": "पन्नाक इतिहासकेँ मिज्झर करू",
+	"action-mergehistory": "ई पृष्ठक इतिहास एकत्रित करी",
 	"action-userrights": "सभटा प्रयोक्ता अधिकारकेँ सम्पादित करू",
 	"action-userrights-interwiki": "दोसर विकीपर प्रयोक्ताक प्रयोक्ता अधिकारक सम्पादन करू",
 	"action-siteadmin": "दत्तनिधिकेँ प्रतिबन्धित करू आ फेर प्रतिबन्ध हटाउ",
@@ -1255,7 +1255,7 @@
 	"action-editmywatchlist": "काँच साकांक्षसूची संपादित करू",
 	"action-viewmywatchlist": "अपन काँच साकांक्षसूची देखु",
 	"action-viewmyprivateinfo": "अपन व्यक्तिगत जानकारी देखु",
-	"action-editmyprivateinfo": "अपन व्यक्तिगत जानकारी सम्पादित करु",
+	"action-editmyprivateinfo": "अपन व्यक्तिगत जानकारी सम्पादित करी",
 	"action-editcontentmodel": "एक पन्ना के सामग्री मॉडल कें सम्पादन।",
 	"action-managechangetags": "ट्याग बनाबी आ सक्षम (असक्षम) करी",
 	"action-applychangetags": "आहाँ के बदलाव के साथ टैग जोडू।",
@@ -1267,13 +1267,13 @@
 	"enhancedrc-history": "इतिहास",
 	"recentchanges": "लगक परिवर्तनसभ",
 	"recentchanges-legend": "नव परिवर्तन सम्बन्धी विकल्प",
-	"recentchanges-summary": "ई पन्नापर विकीमे भेल सभ सँ अद्यतन परिवर्तनपर नजरि राखी।",
+	"recentchanges-summary": "ई विकिमे भेल सन्निकट परिवर्तन ई पृष्ठपर देखल जा सकैत अछि।",
 	"recentchanges-noresult": "इ अवधिके दौरान इ मापदंडके पूर्ण करेत समय कोनो परिवर्तन नै केएल गेल अछि।",
 	"recentchanges-feed-description": "ई सूचना-तंत्रांशमे विकीमे भेल सभसँ लगक परिवर्तन ताकी।",
 	"recentchanges-label-newpage": "ई सम्पादन एकटा नव पन्नाक निर्माण केलक।",
 	"recentchanges-label-minor": "ई एकटा लघु सम्पादन छी",
 	"recentchanges-label-bot": "ई सम्पादन यान्त्रिक छल।",
-	"recentchanges-label-unpatrolled": "ऐ सम्पादनक पुनरीक्षण अखन धरि नै कएल गेल अछि।",
+	"recentchanges-label-unpatrolled": "ई सम्पादन अखन जाँचल नै गेल अछि",
 	"recentchanges-label-plusminus": "पन्ना आकार ई बाइट सङ्ख्या सँ बदलल गेल",
 	"recentchanges-legend-heading": "<strong>कुञ्जी:</strong>",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} ([[Special:NewPages|नव पन्नसभक सूची]] सेहो देखी)",
@@ -1343,7 +1343,7 @@
 	"upload-permitted": "अनुमतित फाइल  {{PLURAL:$2|प्रकार}}: $1।",
 	"upload-preferred": "पसन्दिदा फाइल {{PLURAL:$2|प्रकार|प्रकारसभ}}: $1।",
 	"upload-prohibited": "प्रतिबन्धित सञ्चिका {{PLURAL:$2|प्रकार|प्रकारसभ}}:$1 ।",
-	"uploadlogpage": "उपारोपण वृत्तलेख",
+	"uploadlogpage": "उपारोपण लौग",
 	"uploadlogpagetext": "नीचाँ अद्यतन सञ्चिका उपारोपणक वर्णन अछि।\nदेखी [[Special:NewFiles|नव सञ्चिकाक बखारी]] बेसी स्पष्ट समुच्चा दृश्य लेल।",
 	"filename": "सञ्चिका नाम",
 	"filedesc": "संक्षेप",
@@ -1582,7 +1582,7 @@
 	"mimetype": "माइम प्रकार:",
 	"download": "अवारोपन",
 	"unwatchedpages": "बिन ध्यान देल पन्ना",
-	"listredirects": "रस्ता बदलेनक सूची",
+	"listredirects": "पुनर्निर्देशनसभक सूची",
 	"listduplicatedfiles": "डुप्लिकेट के साथ फाइलसभ के सूची।",
 	"listduplicatedfiles-entry": "[[:File:$1|$1]] राखैत अछि  [[$3|{{PLURAL:$2|एक प्रतिलिपि|$2 duplicates}}]] ।",
 	"unusedtemplates": "बिना प्रयोगक नमूना सभ",
@@ -1590,13 +1590,13 @@
 	"unusedtemplateswlh": "दोसर लागि सभ",
 	"randompage": "अव्यवस्थित पृष्ठ",
 	"randompage-nopages": "ऐमे दोसर पन्ना नै अछि {{PLURAL:$2|namespace|namespaces}}: $1 ।",
-	"randomincategory": "श्रेणी में यादृच्छिक (रैंडम) पन्ना",
+	"randomincategory": "श्रेणीमे यादृच्छिक पृष्ठ",
 	"randomincategory-invalidcategory": "\"$1\" एक मान्य श्रेणी नाम नै अछि।",
 	"randomincategory-nopages": "[[:Category:$1|$1]] श्रेणीमे कोनो पृष्ठ नै अछि।",
 	"randomincategory-category": "श्रेणी:",
 	"randomincategory-legend": "श्रेणीमे यादृच्छिक पृष्ठ",
 	"randomincategory-submit": "जाए",
-	"randomredirect": "मिज्झर बदलेनबला लागि",
+	"randomredirect": "कोनो एक पुनर्निर्देशन पर जाए",
 	"randomredirect-nopages": "नामस्थान \"$1\" मे कोनो बदलेनबला लागि नै अछि।",
 	"statistics": "सांख्यिकी",
 	"statistics-header-pages": "पन्नाक तथ्याङ्क",
@@ -1624,7 +1624,7 @@
 	"double-redirect-fixed-move": "[[$1]] घसकाएल गेल।\nई आब [[$2]] दिस जा रहल अछि।",
 	"double-redirect-fixed-maintenance": "द्वितीयक बदलेन [[$1]] सँ [[$2]] कएल गेल।",
 	"double-redirect-fixer": "बदलेन स्थायित्व",
-	"brokenredirects": "टूटल बदलेन सभ",
+	"brokenredirects": "तुटल पुनर्निर्देशन पृष्ठ",
 	"brokenredirectstext": "ई बदलेन सभ नै अवस्थित पन्ना सभक दिस जाइत अछि।",
 	"brokenredirects-edit": "सम्पादन करी",
 	"brokenredirects-delete": "मेटाबी",
@@ -1666,7 +1666,7 @@
 	"prefixindex": "उपसर्गक संग सभटा पृष्ठ",
 	"prefixindex-namespace": "उपसर्ग भएल सभ पृष्ठ ($1 नामस्थान)",
 	"prefixindex-strip": "सूची में उपसर्ग नुकाउ",
-	"shortpages": "पन्ना सभ छाँटू",
+	"shortpages": "छोट पृष्ठसभ",
 	"longpages": "नमगर पन्ना सभ",
 	"deadendpages": "एकदमसँ अन्त भऽ जाएबला पन्ना सभ",
 	"deadendpagestext": "ई पन्ना सभ {{SITENAME}} क दोसर पन्नासँ लागिमे नै रहत।",
@@ -1725,7 +1725,7 @@
 	"speciallogtitlelabel": "प्रयोजन (शीर्षक अथवा {{ns:user}}:प्रयोगकर्तानाम):",
 	"log": "लौग",
 	"logeventslist-submit": "देखाबी",
-	"all-logs-page": "सभ सार्वजनिक वृत्तलेख",
+	"all-logs-page": "सभ सार्वजनिक लौग",
 	"alllogstext": "{{अन्तर्जाल}} क सभटा उपलब्ध वृत्तलेखक संयुक्त दृश्य।\nअहाँ दृश्यकेँ संकीर्ण करबा लेल वृत्तलेखक एकटा प्रकार चुनि सकै छी, प्रयोक्तानाम (ब्रह्मक्षर-लघ्वक्षर विचारणीय), वा प्रभावित पन्ना (एतौ ब्रह्मक्षर-लघ्वक्षर विचारणीय)।",
 	"logempty": "वृत्तलेखमे कोनो मेल खाइबला बौस्तु नै।",
 	"log-title-wildcard": "खोज शीर्षक सभ ऐ पाठसँ प्रारम्भ",
@@ -1768,7 +1768,7 @@
 	"listusers-submit": "देखाबी",
 	"listusers-noresult": "कोनो प्रयोक्ता नै",
 	"listusers-blocked": "(प्रतिबन्धित)",
-	"activeusers": "सक्रिय प्रयोक्ता सभक सूची",
+	"activeusers": "सक्रिय प्रयोक्तासभक सूची",
 	"activeusers-intro": "ई ओहेन प्रयोक्ता सभक सूची अछि जे पछिला $1 {{PLURAL:$1|दिन|दिन}} मे किछु सक्रियता देखेने छथि।",
 	"activeusers-count": "$1 {{PLURAL:$1|कार्य}} पिछला $3 {{PLURAL:$3|दिन|दिनसभ}}मे",
 	"activeusers-from": "प्रयोक्ता प्रदर्शन प्रारम्भ भेल:",
@@ -1798,7 +1798,7 @@
 	"listgrants-summary": "ई प्रदान केल गेल सूची छी। सदस्य अपन खाताक अनुपयोगक द्वारा उपयोग करि सकैत अछि, मुदा मात्र किछ सीमित अधिकार धरि। ई अधिकार सदस्यद्वारा देल गेल अधिकार धरि सीमित रहैत अछि । एतय [[{{MediaWiki:Listgrouprights-helppage}}|अन्य जानकारी]] सेहो अछि, जे एक अधिकारक बारेमे बताबैत अछि।",
 	"listgrants-grant": "अधिकार",
 	"listgrants-rights": "अधिकार",
-	"trackingcategories": "श्रेणीके ट्रयाक करु",
+	"trackingcategories": "चिह्नित श्रेणीसभ",
 	"trackingcategories-summary": "ई पृष्ठ पर ओ जोडवाला श्रेणीसभक सूची मिलैत अछि जे स्वतः रूप सँ मिडियाविकि सफ्टवेयरद्वारा बनैत अछि। ओ सभक नाम सम्बन्धित प्रणाली सन्देस बदलै सँ {{ns:8}} नामस्थानमे बदलल जा सकैत अछि।",
 	"trackingcategories-msg": "चिह्नित श्रेणी",
 	"trackingcategories-name": "सन्देश नाम",
@@ -1903,9 +1903,9 @@
 	"actioncomplete": "क्रिया पूर्ण",
 	"actionfailed": "कार्य नै भेल",
 	"deletedtext": "\"$1\" केँ मेटा देल गेल अछि।\nदेखू $2 हालक मेटाएल सामिग्रीक अभिलेख लेल।",
-	"dellogpage": "मेटाएल सामिग्रीक वृत्तलेख",
+	"dellogpage": "मेटाएल लौग",
 	"dellogpagetext": "नीचाँ एकदम लगक मेटाएल पन्नाकऽ सूची छी।",
-	"deletionlog": "मेटाएल सामिग्रीक वृत्तलेख",
+	"deletionlog": "मेटाएल लौग",
 	"reverted": "पुरान कोनो संशोधन धरि घुराउ",
 	"deletecomment": "कारण:",
 	"deleteotherreason": "दोसर/ अतिरिक्त कारण:",
@@ -2029,7 +2029,7 @@
 	"undeletedpage": "'''$1 के पुनर्स्थापित करल गेल अछि'''\n\nलग पास में हटाओल गेल आ पुनर्स्थापित कएल गेल पन्ना सभके जानकारी के लेल [[Special:Log/delete|हटाओल गेल लग]] देखु।",
 	"undelete-header": "हालक मेटाएल पन्ना के लेल [[Special:Log/delete|हटाएल लग]] देखू।",
 	"undelete-search-title": "मेटाएल गेल पृष्ठ ताकी",
-	"undelete-search-box": "मेटाएल पन्ना सभकेँ ताकू",
+	"undelete-search-box": "मेटाएल पन्नासभ ताकी",
 	"undelete-search-prefix": "से शुरु भेल पन्ना देखाबू.",
 	"undelete-search-submit": "ताकू",
 	"undelete-no-results": "एहेन पन्ना मेटाएल पेटारमे नै भेटल।",
@@ -2062,11 +2062,11 @@
 	"sp-contributions-newbies": "मात्र नव खाताक योगदान देखाबी",
 	"sp-contributions-newbies-sub": "नब प्रयोक्ताकऽ लेल",
 	"sp-contributions-newbies-title": "नब प्रयोक्ताकऽ योगदान",
-	"sp-contributions-blocklog": "प्रतिबन्धित वृत्तलेख",
+	"sp-contributions-blocklog": "प्रतिबन्धित लौग",
 	"sp-contributions-suppresslog": "{{GENDER:$1|प्रयोगकर्ता}} योगदान दबाबी",
 	"sp-contributions-deleted": "{{GENDER:$1|प्रयोगकर्ता}}क मेटाएल योगदान",
 	"sp-contributions-uploads": "उपारोपण",
-	"sp-contributions-logs": "वृत्तलेख सभ",
+	"sp-contributions-logs": "लौग",
 	"sp-contributions-talk": "वार्त्ता",
 	"sp-contributions-userrights": "प्रयोक्ता अधिकारकऽ प्रबन्धन",
 	"sp-contributions-blocked-notice": "ई प्रयोक्ता अखन प्रतिबन्धित अछि।\nनव प्रतिबन्धित वृत्तलेख लेख सन्दर्भ नीचाँ देल अछि:",
@@ -2166,7 +2166,7 @@
 	"contribslink": "योगदान",
 	"emaillink": "ई-पत्र पठाउ",
 	"autoblocker": "अहाँक अनिकेत \"[[User:$1|$1]]\" द्वारा प्रयोगक कारण स्वचालित रूपेँ प्रतिबन्धित भऽ गेल।\n$1 एकर प्रतिबन्धक कारण अछि : \"$2\"",
-	"blocklogpage": "प्रतिबन्धित वृत्तलेख",
+	"blocklogpage": "प्रतिबन्धित लौग",
 	"blocklog-showlog": "ऐ प्रयोक्ताकेँ पहिनहिये प्रतिबन्धित कऽ देल गेल अछि।\nप्रतिबन्धक वृत्तलेख सन्दर्भ लेल नीचाँ देल जा रहल अछि:",
 	"blocklog-showsuppresslog": "ऐ प्रयोक्ताकेँ पहिनहिये प्रतिबन्धित आ अदृश्य कऽ देल गेल अछि।\nदबाएल वृत्तलेख सन्दर्भ लेल नीचाँ देल जा रहल अछि:",
 	"blocklogentry": "प्रतिबन्धित [[$1]] एकर अन्तिम तिथि अछि $2 $3",
@@ -2245,7 +2245,7 @@
 	"movepage-page-moved": "पन्ना $1 केँ $2 लग घसका देल गेल अछि।",
 	"movepage-page-unmoved": "पन्ना $1 केँ $2 लग नै घसकाएल जा सकैए।",
 	"movepage-max-pages": "बेसी सें बेसी $1 पृष्ठ बदलि के {{PLURAL:$1| क देल गेल अछि|क देल गेल अछि}}, आब आर पृष्ठ अपने आप नहि बदलत.",
-	"movelogpage": "स्थानान्तरण लग",
+	"movelogpage": "स्थानान्तरण लौग",
 	"movelogpagetext": "नाम बदलल गेल लेख कऽ सूचि नीचां देल गेल अछि",
 	"movesubpage": "{{PLURAL:$1|उप पन्ना|उप पन्ना}}",
 	"movesubpagetext": "नीचां $1 {{PLURAL:$1| पन्ना देखाओल गएल अछि, जे अहि पन्नाकऽ उप पन्ना अछि|पन्ना देखावोल गएल अछि, जे अहि पन्नाकऽ उप पन्ना अछि}}।",
@@ -2301,7 +2301,7 @@
 	"allmessages-prefix": "उपसर्गक आधारपर छाँटू:",
 	"allmessages-language": "भाषा:",
 	"allmessages-filter-submit": "चलू",
-	"allmessages-filter-translate": "अनुवाद करु",
+	"allmessages-filter-translate": "अनुवाद करी",
 	"thumbnail-more": "पैग",
 	"filemissing": "संचिका हेराएल",
 	"thumbnail_error": "लघुचित्र निर्माण कालमे भ्रम:$1",
@@ -2515,9 +2515,9 @@
 	"markedaspatrollederror-noautopatrol": "अहाँ अपन कएल संशोधनकेँ संचालित नै कहि सकै छी।",
 	"markedaspatrollednotify": "$1 पृष्ठ में कएल गएल ऐ परिवर्तन जाँचल गेल चिन्हासी कएल गेल।",
 	"markedaspatrollederrornotify": "जाँचल चिन्हासी असफल भेल।",
-	"patrol-log-page": "संचालन वृत्तलेख",
-	"patrol-log-header": "ई संचालित संशोधन सभक वृत्तलेख छी।",
-	"log-show-hide-patrol": "$1 निरीक्षण वृत्तलेख",
+	"patrol-log-page": "परीक्षण लौग",
+	"patrol-log-header": "ई परीक्षित अवतरणसभक लौग छी।",
+	"log-show-hide-patrol": "$1 निरीक्षण लौग",
 	"log-show-hide-tag": "$1 ट्याग लग",
 	"deletedrevision": "पुरान संशोधन $1 हटा देलौं",
 	"filedeleteerror-short": "संचिका मेटेबामे भ्रम : $1",
@@ -2787,7 +2787,7 @@
 	"exif-orientation-1": "सामान्य",
 	"exif-orientation-2": "अनुदैर्घ्य मिज्झर",
 	"exif-orientation-3": "180° पर घुमायल गेल",
-	"exif-orientation-4": "अनुप्रस्थ मिज्झर",
+	"exif-orientation-4": "भर्टिकली फ्लिप करी",
 	"exif-orientation-5": "90° सी.सी.डब्लू. घुमाओल गेल आ अनुप्रस्थ रूपेँ मिज्झर कएल गेल",
 	"exif-orientation-6": "९०° सी.सी.डब्लू. घुमाएल गेल",
 	"exif-orientation-7": "९०° सी.डब्लू. घुमाओल गेल आ अनुप्रस्थ रूपेँ मिज्झर कएल गेल",
@@ -2854,7 +2854,7 @@
 	"exif-customrendered-0": "सामान्य प्रक्रिया",
 	"exif-customrendered-1": "वैकल्पिक प्रक्रिया",
 	"exif-exposuremode-0": "स्वयं देखबैत",
-	"exif-exposuremode-1": "संचालित देखाएब",
+	"exif-exposuremode-1": "मैन्युअल एक्पोजर",
 	"exif-exposuremode-2": "स्वचालित कोष्ठक",
 	"exif-whitebalance-0": "स्वचालित उज्जर सन्तुलन",
 	"exif-whitebalance-1": "संचालित उज्जर सन्तुलन",
@@ -3015,14 +3015,14 @@
 	"watchlistedit-raw-added": "{{PLURAL:$1|1 शीर्षक छल|$1शीर्षक सभ रहए}} जोड़ल गेल:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|1 शीर्षक छल|$1शीर्षक सभ रहए}} हटाएल गेल:",
 	"watchlistedit-clear-title": "ध्यानसूची खाली करी",
-	"watchlistedit-clear-legend": "साकांक्ष-सूची मेटाउ",
+	"watchlistedit-clear-legend": "साकांक्ष-सूची मेटाबी",
 	"watchlistedit-clear-explain": "एही ठाम रहल सभ शिर्षक अहाँक साकांक्ष-सूची से मेटा जाएत",
 	"watchlistedit-clear-titles": "शीर्षक",
 	"watchlistedit-clear-submit": "साकांक्ष-सूची मेटाउ (ई स्थायी छि!)",
 	"watchlistedit-clear-done": "अहाँक साकांक्ष-सूची मेटाओल गेल।",
 	"watchlistedit-clear-removed": "{{PLURAL:$1|1 शीर्षक छल|$1शीर्षक सभ रहए}} हटाएल गेल:",
-	"watchlistedit-too-many": "एतेक बहुत रास पन्ना सभ देखावोल जाएत।",
-	"watchlisttools-clear": "साकांक्ष-सूची मेटाउ",
+	"watchlistedit-too-many": "एतय दर्शावैक लेल अत्यधिक पृष्ठ अछि।",
+	"watchlisttools-clear": "साकांक्ष-सूची मेटाबी",
 	"watchlisttools-view": "सम्बन्धित परिवर्तन सभकेँ देखी",
 	"watchlisttools-edit": "साकांक्षसूची देखी आ सम्पादित करी",
 	"watchlisttools-raw": "काँच साकांक्षसूची सम्पादित करी",
@@ -3102,10 +3102,10 @@
 	"specialpages-group-maintenance": "सुस्थापन प्रतिवेदन",
 	"specialpages-group-other": "दोसर विशेष पन्ना",
 	"specialpages-group-login": "सम्प्रवेश/ सम्प्रवेश आवेदन",
-	"specialpages-group-changes": "हालक परिवर्तन आ वृत्तलेख",
+	"specialpages-group-changes": "सन्निकट परिवर्तन आ लौग",
 	"specialpages-group-media": "मीडिया प्रतिवेदन आ उपारोपण",
 	"specialpages-group-users": "प्रयोक्ता आ अधिकार",
-	"specialpages-group-highuse": "बेसी प्रयोगबला पन्ना सभ",
+	"specialpages-group-highuse": "अत्यधिक उपयोगी पृष्ठ",
 	"specialpages-group-pages": "पन्ना सभक सूची",
 	"specialpages-group-pagetools": "पन्नाक औजार सभ",
 	"specialpages-group-wiki": "विकी दत्तांश आ औजार सभ",
@@ -3123,7 +3123,7 @@
 	"tags-title": "चेन्ह सभ",
 	"tags-intro": "ई पन्ना चेन्ह सभकेँ सूचित करैए जे तंत्रांश सम्पादनसँ चिन्हित करए, आ ओकर अर्थ सेहो।",
 	"tags-tag": "चेन्हक नाम",
-	"tags-display-header": "परिवर्तन सूची सभक रूपरंग",
+	"tags-display-header": "परिवर्तन सूचिसभमे प्रदर्शन",
 	"tags-description-header": "अर्थक पूर्ण विवरण",
 	"tags-source-header": "स्रोत",
 	"tags-active-header": "सक्रिय?",
@@ -3171,7 +3171,7 @@
 	"tags-edit-title": "ट्याग सम्पादन",
 	"tags-edit-manage-link": "ट्याग व्यवस्थापन",
 	"tags-edit-revision-selected": "[[:$2]] {{PLURAL:$1|क|के}} चयनित अवतरण:",
-	"tags-edit-logentry-selected": "{{PLURAL:$1|चुनल वृत्तलेख घटना|चुनल वृत्तलेख घटना सभ}}:",
+	"tags-edit-logentry-selected": "{{PLURAL:$1|चुनल लौग घटना|चुनल लौग घटनासभ}}:",
 	"tags-edit-existing-tags-none": "<em>कोनो नै</em>",
 	"tags-edit-new-tags": "नव ट्याग:",
 	"tags-edit-add": "इ ट्यागसभ जोडी:",
@@ -3218,14 +3218,14 @@
 	"htmlform-cloner-delete": "हटाउ",
 	"logentry-delete-delete": "$1 पृष्ठ $3 {{GENDER:$2|मेटौलक}}",
 	"logentry-delete-restore": "$1 {{GENDER:$2|restored}} page $3",
-	"logentry-delete-event": "$1 {{GENDER:$2|changed}} एकर दृश्य{{PLURAL:$5| एकटा वृत्तलेख|$5 वृत्तलेख}}  $3: $4 केँ",
+	"logentry-delete-event": "$1द्वारा $3 पृष्ठक लौग {{PLURAL:$5|प्रविष्टि|प्रविष्टिसभ}}क दृश्यता {{GENDER:$2|परिवर्तित केलक}}: $4",
 	"logentry-delete-revision": "$1 द्वारा $3 पृष्ठक {{PLURAL:$5|एक अवतरण|$5 अवतरणसभ}}क दृश्यता {{GENDER:$2|परिवर्तित}}: $4",
-	"logentry-delete-event-legacy": "$1 {{GENDER:$2|changed}}  $3 पर वृत्तलेख दृश्य",
-	"logentry-delete-revision-legacy": "$1 {{GENDER:$2|changed}}  $3 पर वृत्तलेख संशोधन",
+	"logentry-delete-event-legacy": "$1द्वारा $3 पृष्ठ पर लौग क्रियासभक दृश्यता {{GENDER:$2|परिवर्तित केलक}}",
+	"logentry-delete-revision-legacy": "$1द्वारा $3 पृष्ठ पर अवतरणसभक दृश्यता {{GENDER:$2|परिवर्तित केलक}}",
 	"logentry-suppress-delete": "$1 {{GENDER:$2|दबाएल}} page $3",
 	"logentry-suppress-event": "$1 चोरिसँ {{GENDER:$2|परिवर्तन कियल गैल}} एकर दृश्य{{PLURAL:$5| एकटा वृत्तलेख|$5 वृत्तलेख}}  $3: $4 पर",
 	"logentry-suppress-revision": "$1 चोरिसँ {{GENDER:$2|changed}} एकर दृश्य{{PLURAL:$5| एकटा संशोधन|$5 संशोधन}}  $3: $4 पर",
-	"logentry-suppress-event-legacy": "$1 नुका क {{GENDER:$2|परिवर्तन}}  $3 पर वृत्तलेख दृश्य",
+	"logentry-suppress-event-legacy": "$1द्वारा गुप्त रूपसँ $3 पृष्ठ पर लौग क्रियासभक दृश्यता {{GENDER:$2|परिवर्तित केलक}}",
 	"logentry-suppress-revision-legacy": "$1 नुका कऽ {{GENDER:$2|changed}}  $3 पर संशोधन दृश्य",
 	"revdelete-content-hid": "सामिग्री नुकाएल",
 	"revdelete-summary-hid": "नुकाएल सारांश सम्पादन",
@@ -3257,9 +3257,8 @@
 	"feedback-back": "पाछां",
 	"feedback-bugcheck": "बहुत निक! जांच करु कि [ $1 known bugs] पहिले स त नै अछि ।",
 	"feedback-bugnew": "हम जाँच केलौ। एक नव बग रिपोर्ट करी",
-	"feedback-cancel": "रद्द करु",
+	"feedback-cancel": "रद्द करी",
 	"feedback-close": "भ गेल",
-	"feedback-error-title": "त्रुटि",
 	"feedback-error1": "त्रुटि: नै पहचानल गेल परिणाम एपीआईसँ",
 	"feedback-error2": "त्रुटि: संपादन विफल भेल",
 	"feedback-error3": "त्रुटि:एपीआईसँग कोनो प्रतिक्रिया नै",
diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json
index de1353cb1c..c65a403f7e 100644
--- a/languages/i18n/mk.json
+++ b/languages/i18n/mk.json
@@ -1473,6 +1473,7 @@
 	"upload-dialog-disabled": "Подигањето на податотеки со помош на овој дијалог е оневозможено на ова вики.",
 	"upload-dialog-title": "Подигни податотека",
 	"upload-dialog-button-cancel": "Откажи",
+	"upload-dialog-button-back": "Назад",
 	"upload-dialog-button-done": "Готово",
 	"upload-dialog-button-save": "Зачувај",
 	"upload-dialog-button-upload": "Подигни",
@@ -3522,6 +3523,18 @@
 	"htmlform-cloner-create": "Додај уште",
 	"htmlform-cloner-delete": "Отстрани",
 	"htmlform-cloner-required": "Се бара барем една вредност.",
+	"htmlform-date-placeholder": "ГГГГ-ММ-ДД",
+	"htmlform-time-placeholder": "ЧЧ:ММ:СС",
+	"htmlform-datetime-placeholder": "ГГГГ-ММ-ДД ЧЧ:ММ:СС",
+	"htmlform-date-invalid": "Не можам да ја препознаам внесената вредност. Користете го форматот ГГГГ-ММ-ДД.",
+	"htmlform-time-invalid": "Не можам да ја препознаам внесената вредност за време. Користете го форматот ЧЧ:ММ:СС.",
+	"htmlform-datetime-invalid": "Не можам да ја препознаам внесената вредност за датум и време. Користете го форматот ГГГГ-ММ-ДД ММ:СС.",
+	"htmlform-date-toolow": "Укажаната вредност е пред најраниот допуштен датум — $1.",
+	"htmlform-date-toohigh": "Укажаната вредност е по најдоцниот допуштен датум — $1.",
+	"htmlform-time-toolow": "Укажаната вредност е пред најраното допуштено време — $1.",
+	"htmlform-time-toohigh": "Укажаната вредност е по најдоцното допуштено време — $1.",
+	"htmlform-datetime-toolow": "Укажаната вредност е пред најраниот допуштен датум и време — $1.",
+	"htmlform-datetime-toohigh": "Укажаната вредност е по најдоцниот допуштен датум и време — $1.",
 	"htmlform-title-badnamespace": "[[:$1]] не се наоѓа во именскиот простор „{{ns:$2}}“.",
 	"htmlform-title-not-creatable": "Насловот „$1“ не може да се создава",
 	"htmlform-title-not-exists": "$1 не постои.",
@@ -3605,7 +3618,6 @@
 	"feedback-external-bug-report-button": "Поднеси техничка задача",
 	"feedback-dialog-title": "Поднеси мислење",
 	"feedback-dialog-intro": "Послужете се со едноставниот образец подолу за да го поднесете вашето мислење. Коментарот ќе ви биде додаден на страницата „$1“, заедно со вашето корисничко име.",
-	"feedback-error-title": "Грешка",
 	"feedback-error1": "Грешка: Непрепознаен резултат од извршникот",
 	"feedback-error2": "Грешка: Уредувањето не успеа",
 	"feedback-error3": "Грешка: Извршникот не одговара",
diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json
index 533ebef035..0d18c0daa9 100644
--- a/languages/i18n/mr.json
+++ b/languages/i18n/mr.json
@@ -77,7 +77,7 @@
 	"tog-enotifminoredits": "मला पानांच्या आणि संचिकांच्या छोट्या बदलांकरीता सुद्धा विरोप पाठवा",
 	"tog-enotifrevealaddr": "सूचना विरोपात माझा विरोपाचा (ई-मेल ) पत्ता दाखवा",
 	"tog-shownumberswatching": "पहारा देणाऱ्या सदस्यांचा आकडा दाखवा",
-	"tog-oldsig": "सध्याची सही:",
+	"tog-oldsig": "आपली सध्याची सही:",
 	"tog-fancysig": "सही विकिसंज्ञा म्हणून वापरा (आपोआप दुव्याशिवाय)",
 	"tog-uselivepreview": "सजीव झलक दाखवा",
 	"tog-forceeditsummary": "जर ’बदलांचा आढावा’ दिला नसेल तर मला सूचित करा",
@@ -94,7 +94,7 @@
 	"tog-showhiddencats": "लपविलेले वर्ग दाखवा",
 	"tog-norollbackdiff": "द्रुतमाघार घेतल्यास बदल वगळा",
 	"tog-useeditwarning": "जर मी संपादित करीत असलेल्या पानावरील माझे संपादिलेले बदल जतन न केल्यास मला इशारा द्या",
-	"tog-prefershttps": "सनोंद प्रवेशतांना प्रत्येक वेळी  सुरक्षित अनुबंध वापरा",
+	"tog-prefershttps": "सनोंद प्रवेशित असतांना प्रत्येक वेळी  सुरक्षित अनुबंध वापरा",
 	"underline-always": "नेहमी",
 	"underline-never": "कधीच नाही",
 	"underline-default": "त्वचा अथवा न्याहाळक अविचल (स्कीन अथवा ब्राऊजर डिफॉल्ट)",
@@ -182,14 +182,14 @@
 	"category-file-count-limited": "खालील {{PLURAL:$1|संचिका|$1 संचिका}} या वर्गात आहेत.",
 	"listingcontinuesabbrev": "पुढे चला",
 	"index-category": "अनुक्रमित पाने",
-	"noindex-category": "अनुक्रम नसलेली पाने",
+	"noindex-category": "विना-अनुक्रमित पाने",
 	"broken-file-category": "तुटलेल्या संचिका दुव्यांसह असलेली पाने",
 	"about": "च्या विषयी",
 	"article": "आशयाचे पान",
 	"newwindow": "(नवीन खिडकीत उघडते.)",
 	"cancel": "रद्द करा",
 	"moredotdotdot": "अजून...",
-	"morenotlisted": "ही यादी पूर्ण नाही.",
+	"morenotlisted": "ही यादी अपूर्ण असू शकते.",
 	"mypage": "पान",
 	"mytalk": "चर्चा",
 	"anontalk": "चर्चा पान",
@@ -247,6 +247,7 @@
 	"talk": "चर्चा",
 	"views": "दृष्ये",
 	"toolbox": "साधने",
+	"tool-link-emailuser": "{{GENDER:$1|सदस्याला}} विपत्र पाठवा",
 	"userpage": "सदस्य पृष्ठ",
 	"projectpage": "प्रकल्प पान पहा",
 	"imagepage": "संचिका पृष्ठ पहा",
@@ -439,6 +440,7 @@
 	"createacct-yourpasswordagain-ph": "पुन्हा परवलीचा शब्द टाका",
 	"userlogin-remembermypassword": "मला नोंदीकृतच(लॉग्ड-ईन) ठेवा",
 	"userlogin-signwithsecure": "सुरक्षित अनुबंध(सेक्युअर कनेक्शन) वापरा",
+	"cannotlogin-title": "सनोंद प्रवेश करु शकत नाही",
 	"cannotloginnow-title": "आता सनोंद प्रवेश घेऊ शकत नाही",
 	"cannotloginnow-text": "$1 वापरत असतांना सनोंद प्रवेश करणे शक्य नाही.",
 	"yourdomainname": "तुमचे क्षेत्र (डोमेन) :",
@@ -511,7 +513,7 @@
 	"eauthentsent": "नमूद केलेल्या ई-मेल पत्त्यावर एक निश्चितता स्वीकारक ई-मेल पाठविला गेला आहे.\nखात्यावर कोणताही इतर ई-मेल पाठविण्यापूर्वी - तो ई-मेल पत्ता तुमचाच आहे, हे सुनिश्चित करण्यासाठी - तुम्हाला त्या ई-मेल मधील सूचनांचे पालन करावे लागेल.",
 	"throttled-mailpassword": "मागील {{PLURAL:$1|तासात|$1 तासांत}} परवलीचा शब्द बदलण्यासाठीची सूचना विपत्राद्वारे पाठविलेली आहे. दुरुपयोग टाळण्यासाठी, {{PLURAL:$1|एका तासामध्ये|$1 तासांमध्ये}} फक्त एकदाच सूचना दिली जाईल.",
 	"mailerror": "विपत्र पाठवण्यात त्रुटी: $1",
-	"acct_creation_throttle_hit": "आपला अंकपत्ता वापरुन या विकिस भेट देणाऱ्यांनी काल {{PLURAL:$1|१ खाते|$1 खाती}} उघडली आहेत ती या कालावधीतील महत्तम आहेत.\n\nत्याचा परिपाक म्हणून सध्या हा अंकपत्ता वापरुन भेट देणाऱ्यास अधिक खाते उघडता येणार नाहीत.",
+	"acct_creation_throttle_hit": "आपला अंकपत्ता वापरुन या विकिस भेट देणाऱ्यांनी मागील $2 मध्ये {{PLURAL:$1|१ खाते|$1 खाती}} उघडली आहेत ती या कालावधीतील महत्तम आहेत.\n\nत्याचा परिपाक म्हणून सध्या हा अंकपत्ता वापरुन भेट देणाऱ्याला अधिक खाते उघडता येणार नाहीत.",
 	"emailauthenticated": "तुमचा विपत्रपत्ता $2 ला $3 यावेळी तपासण्यात आला आहे.",
 	"emailnotauthenticated": "तुमच्या ई-मेल पत्त्याची अद्याप निश्चिती झालेली नाही. खालील कोणत्याही फिचर्ससाठी ई-मेल पाठविला जाणार नाही.",
 	"noemailprefs": "खालील सुविधा कार्यान्वित करण्यासाठी,पसंतीक्रमात ई-मेल पत्ता नमूद करा.",
@@ -561,7 +563,6 @@
 	"botpasswords-label-resetpassword": "परवलीच्या शब्दाची पुनर्स्थापना करा",
 	"botpasswords-label-grants": "लागू अनुदाने:",
 	"botpasswords-help-grants": "प्रत्येक अनुदान हे सदस्य खात्यास आधीच असलेल्या यादीकृत सदस्य अधिकारास पोहोच देते.अधिक माहितीसाठी [[Special:ListGrants|अनुदानांचा तक्ता]] हे बघा.",
-	"botpasswords-label-restrictions": "वापराचे प्रतिबंध:",
 	"botpasswords-label-grants-column": "मंजूर",
 	"botpasswords-bad-appid": "\"$1\" हे सांगकाम्याचे नाव वैध नाही.",
 	"botpasswords-insert-failed": "\"$1\" हे सांगकाम्याचे नाव जोडण्यात अयशस्वी. ते पूर्वीच जोडले होते काय?",
@@ -942,7 +943,7 @@
 	"searchprofile-advanced-tooltip": "पारंपरित(कस्टम) नामविश्वांमध्ये शोधा",
 	"search-result-size": "$1 ({{PLURAL:$2|१ शब्द|$2 शब्द}})",
 	"search-result-category-size": "{{PLURAL:$1|१ सदस्य|$1 सदस्य}} ({{PLURAL:$2|१ उपवर्ग|$2 उपवर्ग}}, {{PLURAL:$3|1 संचिका|$3 संचिका}})",
-	"search-redirect": "(पुनर्निर्देशन $1)",
+	"search-redirect": "($1 पासून पुनर्निर्देशन)",
 	"search-section": "(विभाग $1)",
 	"search-category": "(वर्ग $1)",
 	"search-file-match": "(संचिका आशयाशी अनुरुपते)",
@@ -1427,6 +1428,7 @@
 	"upload-dialog-disabled": "हा डायलॉग वापरून  या विकिवर संचिका अपभारण अक्षम केले आहे.",
 	"upload-dialog-title": "संचिकेचे अपभारण करा",
 	"upload-dialog-button-cancel": "रद्द करा",
+	"upload-dialog-button-back": "परत जा",
 	"upload-dialog-button-done": "झाले",
 	"upload-dialog-button-save": "जतन करा",
 	"upload-dialog-button-upload": "अपभारण करा",
@@ -2463,6 +2465,7 @@
 	"pageinfo-article-id": "पृष्ठ-परिचय",
 	"pageinfo-language": "पानाच्या मजकूराची भाषा",
 	"pageinfo-content-model": "पान आशय नमूना",
+	"pageinfo-content-model-change": "बदला",
 	"pageinfo-robot-policy": "यंत्रमानवाद्वारे अनुक्रमन",
 	"pageinfo-robot-index": "अनुमती दिली",
 	"pageinfo-robot-noindex": "अनुमती दिल्या जात नाही",
@@ -3097,8 +3100,8 @@
 	"tag-filter": "[[Special:Tags|खूणपताका]] गाळक:",
 	"tag-filter-submit": "गाळक",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|खूणपताका}}]]: $2)",
-	"tags-title": "खुणा",
-	"tags-intro": "प्रणालीतून विशिष्ट संपादनांच्या अर्थासहित  खुणांची  यादी नमूद करणारे पान",
+	"tags-title": "खुणपताका",
+	"tags-intro": "प्रणालीतून, विशिष्ट संपादनांच्या अर्थासहित  खुणपताकांची  यादी नमूद करणारे पान",
 	"tags-tag": "खूण नाव",
 	"tags-display-header": "बदल सुचीवर कसे दिसेल",
 	"tags-description-header": "अर्थाची पूर्ण माहिती",
@@ -3116,6 +3119,7 @@
 	"tags-hitcount": "$1 {{PLURAL:$1|बदल|बदल}}",
 	"tags-manage-blocked": "आपण प्रतिबंधित असतांना बदल खूणपताकांचे व्यवस्थापन करु शकत नाही.",
 	"tags-create-heading": "नवीन बिल्ला तयार करा",
+	"tags-create-explanation": "अविचलरित्या, नविन तयार केलेल्या खुणपताका सदस्यांना व सांगकाम्यांना वापरासाठी उपलब्ध होतील.",
 	"tags-create-tag-name": "खूणपताकेचे नाव:",
 	"tags-create-reason": "कारण:",
 	"tags-create-submit": "निर्मित करा",
@@ -3171,13 +3175,19 @@
 	"htmlform-cloner-create": "अधिक जोडा",
 	"htmlform-cloner-delete": "हटवा",
 	"htmlform-cloner-required": "किमान एक किंमत हवी",
+	"htmlform-date-placeholder": "वववव-मम-दिदि",
+	"htmlform-time-placeholder": "ताता:मिमि:सेसे",
+	"htmlform-datetime-placeholder": "वववव-मम-दिदि ताता:मिमि:सेसे",
+	"htmlform-date-invalid": "आपण नमूद केलेली किंमत ही अनोळखी दिनांक आहे. वववव-मम-दिदि प्रारुपणाचा वापर करण्याबाबत विचार करा.",
+	"htmlform-time-invalid": "आपण नमूद केलेली किंमत ही अनोळखी आहे. ताता:मिमि:सेसे प्रारुपणाचा वापर करण्याबाबत विचार करा.",
+	"htmlform-datetime-invalid": "आपण नमूद केलेली किंमत ही अनोळखी दिनांक व वेळ आहे. वववव-मम-दिदि ताता:मिमि:सेसे प्रारुपणाचा वापर करण्याबाबत विचार करा.",
+	"htmlform-time-toohigh": "आपण नमूद केलेली किंमत ही $1च्या परवानगी असलेल्या वेळ मर्यादेबाहेर आहे.",
+	"htmlform-datetime-toohigh": "आपण नमूद केलेली किंमत ही $1च्या परवानगी असलेल्या दिनांक व वेळ मर्यादेबाहेर आहे.",
 	"htmlform-title-badnamespace": "[[:$1]] हे \"{{ns:$2}}\" नामविश्वात नाही.",
 	"htmlform-title-not-creatable": "\"$1\" हे पान तयार करण्यासाठीचे शीर्षक नाही",
 	"htmlform-title-not-exists": "$1 अस्तीत्वात नाही.",
 	"htmlform-user-not-exists": "<strong>$1</strong> अस्तीत्वात नाही.",
 	"htmlform-user-not-valid": "<strong>$1</strong> हे वैध सदस्यनाम नाही.",
-	"sqlite-has-fts": "पूर्ण-मजकूर शोध समर्थनासहित $1",
-	"sqlite-no-fts": "पूर्ण-मजकूर शोध समर्थनाविरहित $1",
 	"logentry-delete-delete": "$1 {{GENDER:$2|वगळलेले पान}} $3",
 	"logentry-delete-restore": "$1 {{GENDER:$2|पुनर्स्थापित पृष्ठ}} $3",
 	"logentry-delete-event": "$1 ने $3 वर{{PLURAL:$5|नोंद-प्रसंग|$5 नोंद प्रसंगांची}} दृष्यता{{GENDER:$2|बदलली}}:$4",
@@ -3245,7 +3255,6 @@
 	"feedback-cancel": "रद्द करा",
 	"feedback-close": "झाले",
 	"feedback-dialog-title": "प्रतिक्रिया सादर करा",
-	"feedback-error-title": "चूक",
 	"feedback-error1": "चूक: API कडून अनोळखी परिणाम",
 	"feedback-error2": "त्रुटी: संपादन रद्द",
 	"feedback-error3": "त्रुटी:एपीआय तर्फे काहीच प्रत्युत्तर नाही",
diff --git a/languages/i18n/nah.json b/languages/i18n/nah.json
index d60887a4da..6e71765981 100644
--- a/languages/i18n/nah.json
+++ b/languages/i18n/nah.json
@@ -11,7 +11,8 @@
 			"아라",
 			"Fitoschido",
 			"Taresi",
-			"Macofe"
+			"Macofe",
+			"Akapochtli"
 		]
 	},
 	"tog-underline": "Mokìnxòîkuilòtzàswis tzòwilistìn:",
@@ -151,7 +152,7 @@
 	"returnto": "Ximocuepa īhuīc $1.",
 	"tagline": "Īhuīcpa {{SITENAME}}",
 	"help": "Tēpalēhuiliztli",
-	"search": "Mà motèmo",
+	"search": "Nican tictemoz",
 	"searchbutton": "Tictēmōz",
 	"go": "Xiyauh",
 	"searcharticle": "Xiyauh",
@@ -181,7 +182,7 @@
 	"unprotectthispage": "Xicpatla inīn tlaīxtli ītlapiyaliz",
 	"newpage": "Yancuic tlaīxtli",
 	"talkpage": "Xictlahto inīn tlaīxtli ītechcopa",
-	"talkpagelinktext": "Nenônòtzalistli",
+	"talkpagelinktext": "Nenonotzaliztli",
 	"specialpage": "Nònkuâkìskàtlaìxtlapalli",
 	"personaltools": "In tlein nitēquitiltilia",
 	"articlepage": "Xiquitta in tlamantlaīxtli",
@@ -294,7 +295,6 @@
 	"userlogin-yourname": "Tequihuihcātōcāitl",
 	"yourpassword": "Motlahtōlichtacāyo",
 	"yourpasswordagain": "Motlahtōlichtacāyo occeppa",
-	"remembermypassword": "Ticpiyāz motlacalaquiliz inīn chīuhpōhualhuazco (īxquich {{PLURAL:$1|tōnalli}})",
 	"yourdomainname": "Moāxcāyō",
 	"login": "Xicalaqui",
 	"nav-login-createaccount": "Ximocalaqui / ximomachiyōmaca",
diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json
index fe944a7472..4b303df823 100644
--- a/languages/i18n/nb.json
+++ b/languages/i18n/nb.json
@@ -1497,6 +1497,7 @@
 	"upload-dialog-disabled": "Filopplastinger med denne dialogen er slått av for denne wikien.",
 	"upload-dialog-title": "Last opp fil",
 	"upload-dialog-button-cancel": "Avbryt",
+	"upload-dialog-button-back": "Tilbake",
 	"upload-dialog-button-done": "Utført",
 	"upload-dialog-button-save": "Lagre",
 	"upload-dialog-button-upload": "Last opp",
@@ -1792,7 +1793,7 @@
 	"listusers": "Brukerliste",
 	"listusers-editsonly": "Vis bare brukere med redigeringer",
 	"listusers-creationsort": "Sorter etter opprettelsesdato",
-	"listusers-desc": "Sorter i avtakende rekkefølge",
+	"listusers-desc": "Sorter i synkende rekkefølge",
 	"usereditcount": "{{PLURAL:$1|én redigering|$1 redigeringer}}",
 	"usercreated": "{{GENDER:$3|Opprettet}} $2 $1",
 	"newpages": "Nye sider",
@@ -3414,6 +3415,18 @@
 	"htmlform-cloner-create": "Legg til mer",
 	"htmlform-cloner-delete": "Fjern",
 	"htmlform-cloner-required": "Minst én verdi kreves.",
+	"htmlform-date-placeholder": "ÅÅÅÅ-MM-DD",
+	"htmlform-time-placeholder": "TT:MM:SS",
+	"htmlform-datetime-placeholder": "ÅÅÅÅ-MM-DD TT:MM:SS",
+	"htmlform-date-invalid": "Verdien du anga gjenkjennes ikke som en dato. Prøv formatet ÅÅÅÅ-MM-DD.",
+	"htmlform-time-invalid": "Verdien du anga gjenkjennes ikke som et tidspunkt. Prøv formatet TT:MM:SS.",
+	"htmlform-datetime-invalid": "Verdien du anga gjenkjennes ikke som en dato og et tidspunkt. Prøv formatet ÅÅÅÅ-MM-DD TT:MM:SS.",
+	"htmlform-date-toolow": "Verdien du anga er før den tidligste tillatte datoen $1.",
+	"htmlform-date-toohigh": "Verdien du anga er etter den siste tillatte datoen $1.",
+	"htmlform-time-toolow": "Verdien du anga er før det tidligste tillatte tidspunktet $1.",
+	"htmlform-time-toohigh": "Verdien du anga er etter det siste tillatte tidspunktet $1.",
+	"htmlform-datetime-toolow": "Verdien du anga er før den tidligste tillatte datoen og tidspunktet $1.",
+	"htmlform-datetime-toohigh": "Verdien du anga er etter den siste tillatte datoen og tidspunktet $1.",
 	"htmlform-title-badnamespace": "[[:$1]] er ikke i «{{ns:$2}}»-navnerommet",
 	"htmlform-title-not-creatable": "«$1» er ikke en opprettbar sidetittel",
 	"htmlform-title-not-exists": "$1 forefinnes ikke.",
@@ -3497,7 +3510,6 @@
 	"feedback-external-bug-report-button": "Registrer en teknisk sak",
 	"feedback-dialog-title": "Send tilbakemelding",
 	"feedback-dialog-intro": "Bruk det enkle skjemaet under om du vil gi tilbakemelding. Kommentaren din vil bli lagt ut på siden «$1» sammen med brukernavnet ditt.",
-	"feedback-error-title": "Feil",
 	"feedback-error1": "Feil: Ukjent resultat fra API",
 	"feedback-error2": "Feil: Redigering feilet",
 	"feedback-error3": "Feil: Ingen respons fra API",
diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json
index 98397558f2..34419b475c 100644
--- a/languages/i18n/nl.json
+++ b/languages/i18n/nl.json
@@ -278,6 +278,8 @@
 	"talk": "Overleg",
 	"views": "Weergaven",
 	"toolbox": "Hulpmiddelen",
+	"tool-link-userrights": "{{GENDER:$1|Gebruikersgroepen}} wijzigen",
+	"tool-link-emailuser": "Deze {{GENDER:$1|gebruiker}} e-mailen",
 	"userpage": "Gebruikerspagina bekijken",
 	"projectpage": "Projectpagina bekijken",
 	"imagepage": "Bestandspagina bekijken",
@@ -644,6 +646,7 @@
 	"passwordreset-emailelement": "Gebruikersnaam: \n$1\n\nTijdelijk wachtwoord: \n$2",
 	"passwordreset-emailsentemail": "Als dit e-mailadres aan uw account gekoppeld is, dan wordt er een e-mail verzonden om uw wachtwoord opnieuw in te stellen.",
 	"passwordreset-emailsentusername": "Als er een e-mailadres geregistreerd is voor die gebruikersnaam, dan wordt er een e-mail verzonden om uw wachtwoord opnieuw in te stellen.",
+	"passwordreset-emailerror-capture2": "Het e-mailen naar de {{GENDER:$2|gebruiker}} is mislukt: $1 {{PLURAL:$3|De gebruikersnaam en het wachtwoord|De lijst met gebruikersnamen en wachtwoorden}} wordt hieronder weergegeven.",
 	"passwordreset-invalideamil": "Ongeldig e-mailadres",
 	"passwordreset-nodata": "Er is geen gebruikersnaam of e-mailadres opgegeven",
 	"changeemail": "E-mailadres wijzigen of verwijderen",
@@ -996,7 +999,7 @@
 	"searchprofile-advanced-tooltip": "Zoeken in opgegeven naamruimten",
 	"search-result-size": "$1 ({{PLURAL:$2|1 woord|$2 woorden}})",
 	"search-result-category-size": "{{PLURAL:$1|1 categorielid|$1 categorieleden}} ({{PLURAL:$2|1 ondercategorie|$2 ondercategorieën}}, {{PLURAL:$3|1 bestand|$3 bestanden}})",
-	"search-redirect": "(doorverwijzing $1)",
+	"search-redirect": "(doorverwijzing vanaf $1)",
 	"search-section": "(subkop $1)",
 	"search-category": "(categorie $1)",
 	"search-file-match": "(komt overeen met de inhoud van het bestand)",
@@ -1504,6 +1507,7 @@
 	"upload-foreign-cant-upload": "Deze wiki is niet geconfigureerd om bestanden te uploaden naar de bestandsrepository op een andere site.",
 	"upload-dialog-title": "Bestand uploaden",
 	"upload-dialog-button-cancel": "Annuleren",
+	"upload-dialog-button-back": "Terug",
 	"upload-dialog-button-done": "Afgerond",
 	"upload-dialog-button-save": "Opslaan",
 	"upload-dialog-button-upload": "Uploaden",
@@ -2205,7 +2209,7 @@
 	"sp-contributions-newbies-title": "Bijdragen van nieuwe gebruikers",
 	"sp-contributions-blocklog": "blokkeerlogboek",
 	"sp-contributions-suppresslog": "onderdrukte gebruikersbijdragen",
-	"sp-contributions-deleted": "verwijderde bijdragen",
+	"sp-contributions-deleted": "verwijderde {{GENDER:$1|bijdragen}}",
 	"sp-contributions-uploads": "uploads",
 	"sp-contributions-logs": "logboeken",
 	"sp-contributions-talk": "overleg",
@@ -3166,7 +3170,7 @@
 	"watchlistedit-raw-done": "Uw volglijst is bijgewerkt.",
 	"watchlistedit-raw-added": "Er {{PLURAL:$1|is 1 pagina|zijn $1 pagina's}} toegevoegd:",
 	"watchlistedit-raw-removed": "Er {{PLURAL:$1|is 1 pagina|zijn $1 pagina's}} verwijderd:",
-	"watchlistedit-clear-title": "Volglijst gewist",
+	"watchlistedit-clear-title": "Volglijst wissen",
 	"watchlistedit-clear-legend": "Volglijst wissen",
 	"watchlistedit-clear-explain": "Alle pagina's worden van uw volglijst verwijderd",
 	"watchlistedit-clear-titles": "Pagina's:",
@@ -3486,7 +3490,6 @@
 	"feedback-external-bug-report-button": "Een technische taak indienen",
 	"feedback-dialog-title": "Terugkoppeling verzenden",
 	"feedback-dialog-intro": "U kunt het eenvoudige formulier gebruiken om uw terugkoppeling in te sturen. Uw reactie wordt toegevoegd aan de pagina \"$1\" samen met uw gebruikersnaam.",
-	"feedback-error-title": "Fout",
 	"feedback-error1": "Fout: onbekend resultaat uit de API",
 	"feedback-error2": "Fout: de bewerking is mislukt",
 	"feedback-error3": "Fout: geen reactie van de API",
@@ -3503,6 +3506,7 @@
 	"searchsuggest-containing": "bevat...",
 	"api-error-badaccess-groups": "U mag geen bestanden uploaden in deze wiki.",
 	"api-error-badtoken": "Interne fout: het token klopt niet.",
+	"api-error-blocked": "U bent geblokkeerd en kunt niet bewerken.",
 	"api-error-copyuploaddisabled": "Uploaden via URL is uitgeschakeld op deze server.",
 	"api-error-duplicate": "Er {{PLURAL:$1|staat al een bestand|staan al bestanden}} met dezelfde inhoud in de wiki.",
 	"api-error-duplicate-archive": "Er {{PLURAL:$1|was al een ander bestand|waren al $1 andere bestanden}}  op de site met dezelfde inhoud, maar {{PLURAL:$1|dat is|die zijn}} verwijderd.",
@@ -3529,6 +3533,7 @@
 	"api-error-nomodule": "Interne fout: er is geen uploadmodule ingesteld.",
 	"api-error-ok-but-empty": "Interne fout: de server heeft geen gegevens teruggeleverd.",
 	"api-error-overwrite": "Het overschrijven van een bestand bestand is niet toegestaan.",
+	"api-error-ratelimited": "U probeert meer bestanden te uploaden in een korte periode dan deze wiki toelaat.\nProbeer het over een aantal minuten opnieuw.",
 	"api-error-stashfailed": "Interne fout: de server kon het tijdelijke bestand niet opslaan.",
 	"api-error-publishfailed": "Interne fout: de server kon het tijdelijke bestand niet publiceren.",
 	"api-error-stasherror": "Er is een fout opgetreden tijdens het uploaden van het bestand naar de tijdelijke opslagruimte.",
diff --git a/languages/i18n/olo.json b/languages/i18n/olo.json
index 750bc46f3e..ef0bd6826f 100644
--- a/languages/i18n/olo.json
+++ b/languages/i18n/olo.json
@@ -50,7 +50,7 @@
 	"tog-showhiddencats": "Ozuta peitetyt kategouriet",
 	"tog-norollbackdiff": "Älä ozuta eroloi, konzu olet ottanuh järilleh aijemban versien järilleh tuondu -toimindol",
 	"tog-useeditwarning": "Ollen lähtemäs sivulpäi iäre tallendamattah muutoksii, huomaita minuu",
-	"tog-prefershttps": "Käytä ainos suojattuu yhtevytty ku olet kirjutannuhes",
+	"tog-prefershttps": "Käytä ainos suojattuu yhtevytty, ku olet kirjutannuhes",
 	"underline-always": "Ainos",
 	"underline-never": "Nikonzu",
 	"underline-default": "Käytä livaimen piäazetuksii",
@@ -467,6 +467,7 @@
 	"minoredit": "Tämä on pieni kohendus",
 	"watchthis": "Tarkaile tädä sivuu",
 	"savearticle": "Tallenda sivu",
+	"savechanges": "Tallenda muutokset",
 	"preview": "Ezikačo",
 	"showpreview": "Ezikačo",
 	"showdiff": "Luajitut kohendukset",
@@ -516,7 +517,6 @@
 	"content-model-text": "perustekstu",
 	"content-model-javascript": "JavaScript",
 	"content-json-empty-object": "Tyhjy objektu",
-	"cantcreateaccounttitle": "Ei voi luadie tunnustu",
 	"cantcreateaccount-text": "Tunnuksien luadimine täs IP-adressaspäi ('''$1''') on estetty. Estäjänny on [[User:$3|$3]].\n\nKäyttäjän $3 annettu syy on ''$2''",
 	"cantcreateaccount-range-text": "Tunnuksien luadimine IP-adressilois adressualovehel <strong>$1</strong>, kuduah kuuluu sinungi käytetty IP-adressu(<strong>$4</strong>), on estetty. Eston on azetannuh [[User:$3|$3]].\n\nKäyttäjän $3 annettu syy estole on \"$2\".",
 	"viewpagelogs": "Ozuta tämän sivun lougat",
diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index ce00a8136d..f4847c223c 100644
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -1014,7 +1014,7 @@
 	"searchprofile-advanced-tooltip": "Szukanie w wybranych przestrzeniach nazw",
 	"search-result-size": "$1 ({{PLURAL:$2|1 słowo|$2 słowa|$2 słów}})",
 	"search-result-category-size": "{{PLURAL:$1|1 element|$1 elementy|$1 elementów}} ({{PLURAL:$2|1 kategoria|$2 kategorie|$2 kategorii}}, {{PLURAL:$3|1 plik|$3 pliki|$3 plików}})",
-	"search-redirect": "(przekierowanie $1)",
+	"search-redirect": "(przekierowanie z $1)",
 	"search-section": "(sekcja $1)",
 	"search-category": "(kategoria $1)",
 	"search-file-match": "(odpowiada zawartości pliku)",
@@ -1516,6 +1516,7 @@
 	"upload-dialog-disabled": "Przesyłanie plików przy pomocy tego okna jest wyłączone na tej wiki.",
 	"upload-dialog-title": "Prześlij plik",
 	"upload-dialog-button-cancel": "Anuluj",
+	"upload-dialog-button-back": "Wstecz",
 	"upload-dialog-button-done": "Gotowe",
 	"upload-dialog-button-save": "Zapisz",
 	"upload-dialog-button-upload": "Prześlij",
@@ -3319,10 +3320,11 @@
 	"blankpage": "Pusta strona",
 	"intentionallyblankpage": "Tę stronę umyślnie pozostawiono pustą.",
 	"external_image_whitelist": " #Pozostaw tę linię dokładnie tak, jak jest.<pre>\n#Wstaw poniżej fragmenty wyrażeń regularnych (tylko to, co znajduje się między //).\n#Wyrażenia te zostaną dopasowane do adresów URL zewnętrznych (bezpośrednio linkowanych) grafik.\n#Dopasowane adresy URL zostaną wyświetlone jako grafiki, w przeciwnym wypadku będzie pokazany jedynie link do grafiki.\n#Linie zaczynające się od # są traktowane jako komentarze.\n#We wpisach ma znaczenie wielkość znaków.\n\n#Wstaw wszystkie deklaracje wyrażeniami regularnymi poniżej tej linii. Pozostaw tę linię dokładnie tak, jak jest.</pre>",
-	"tags": "Sprawdź zmiany w oparciu o wzorce tekstu",
+	"tags": "Znaczniki zmian",
 	"tag-filter": "Filtr [[Special:Tags|znaczników]]:",
 	"tag-filter-submit": "Filtr",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Znacznik|Znaczniki}}]]: $2)",
+	"tag-mw-contentmodelchange": "zmiana modelu zawartości",
 	"tags-title": "Znaczniki",
 	"tags-intro": "Na tej stronie znajduje się lista znaczników, którymi oprogramowanie może oznaczyć edycje, oraz ich opisy.",
 	"tags-tag": "Nazwa znacznika",
@@ -3442,6 +3444,9 @@
 	"htmlform-cloner-create": "Dodaj więcej",
 	"htmlform-cloner-delete": "Usuń",
 	"htmlform-cloner-required": "Wymagana jest co najmniej jedna wartość.",
+	"htmlform-date-placeholder": "RRRR-MM-DD",
+	"htmlform-time-placeholder": "GG:MM:SS",
+	"htmlform-datetime-placeholder": "RRRR-MM-DD GG:MM:SS",
 	"htmlform-title-badnamespace": "[[:$1]] nie znajduje się w przestrzeni nazw „{{ns:$2}}”.",
 	"htmlform-title-not-creatable": "Nie można użyć „$1” do utworzenia tytułu strony",
 	"htmlform-title-not-exists": "$1 nie istnieje.",
@@ -3525,7 +3530,6 @@
 	"feedback-external-bug-report-button": "Zgłoś problem techniczny",
 	"feedback-dialog-title": "Prześlij opinię",
 	"feedback-dialog-intro": "Możesz użyć tego prostego formularza w celu zgłoszenia swojej opinii. Twój komentarz, wraz z Twoją nazwą użytkownika (albo numerem IP) pojawi się na stronie $1.",
-	"feedback-error-title": "Błąd",
 	"feedback-error1": "Błąd – nierozpoznana odpowiedź API",
 	"feedback-error2": "Błąd – edycja nieudana",
 	"feedback-error3": "Błąd – brak odpowiedzi API",
@@ -3799,5 +3803,7 @@
 	"linkaccounts-success-text": "Konto zostało połączone.",
 	"linkaccounts-submit": "Połącz konta",
 	"unlinkaccounts": "Odłącz konta",
-	"unlinkaccounts-success": "Konta zostały odłączone."
+	"unlinkaccounts-success": "Konta zostały odłączone.",
+	"restrictionsfield-badip": "Nieprawidłowy adres IP lub zakres adresów: $1",
+	"restrictionsfield-label": "Dozwolone zakresy adresów IP:"
 }
diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json
index bdb05bfc4c..b13dd55b09 100644
--- a/languages/i18n/pt.json
+++ b/languages/i18n/pt.json
@@ -90,7 +90,7 @@
 	"tog-watchdefault": "Adicionar as páginas e ficheiros que eu editar às minhas páginas vigiadas",
 	"tog-watchmoves": "Adicionar as páginas e ficheiros que eu mover às minhas páginas vigiadas",
 	"tog-watchdeletion": "Adicionar as páginas e ficheiros que eu eliminar às minhas páginas vigiadas",
-	"tog-watchuploads": "Adicionar novos ficheiros carregados por mim à minha lista de artigos vigiados",
+	"tog-watchuploads": "Adicionar novos ficheiros carregados por mim à minha lista de páginas vigiadas",
 	"tog-watchrollback": "Adicionar páginas onde fiz uma reversão às minhas páginas vigiadas",
 	"tog-minordefault": "Por omissão, marcar todas as edições como menores",
 	"tog-previewontop": "Mostrar a antevisão antes da caixa de edição",
@@ -194,7 +194,7 @@
 	"category_header": "Páginas na categoria \"$1\"",
 	"subcategories": "Subcategorias",
 	"category-media-header": "Multimédia na categoria \"$1\"",
-	"category-empty": "''Esta categoria não contém atualmente nenhuma página ou ficheiro multimédia.''",
+	"category-empty": "<em>Esta categoria não contém atualmente nenhuma página ou ficheiro multimédia.</em>",
 	"hidden-categories": "{{PLURAL:$1|Categoria oculta|Categorias ocultas}}",
 	"hidden-category-category": "Categorias ocultas",
 	"category-subcat-count": "{{PLURAL:$2|Esta categoria só contém a seguinte subcategoria.|Esta categoria contém {{PLURAL:$1|a seguinte subcategoria|as seguintes $1 subcategorias}} (de um total de $2).}}",
@@ -271,6 +271,8 @@
 	"talk": "Discussão",
 	"views": "Vistas",
 	"toolbox": "Ferramentas",
+	"tool-link-userrights": "Alterar grupos {{GENDER:$1|do utilizador|da utilizadora}}",
+	"tool-link-emailuser": "Enviar correio eletrónico a {{GENDER:$1|este utilizador|esta utilizadora|este(a) utilizador(a)}}",
 	"userpage": "Ver página de utilizador",
 	"projectpage": "Ver página de projeto",
 	"imagepage": "Ver página de ficheiro",
@@ -384,6 +386,7 @@
 	"missingarticle-rev": "(revisão#: $1)",
 	"missingarticle-diff": "(Dif.: $1, $2)",
 	"readonly_lag": "A base de dados foi automaticamente bloqueada enquanto os servidores secundários se sincronizam com o primário",
+	"nonwrite-api-promise-error": "O cabeçalho HTTP 'Promise-Non-Write-API-Action' foi enviado, mas o pedido está a ser feito a um módulo de escrita da API.",
 	"internalerror": "Erro interno",
 	"internalerror_info": "Erro interno: $1",
 	"internalerror-fatal-exception": "Exceção fatal do tipo \"$1\"",
@@ -467,6 +470,7 @@
 	"cannotloginnow-title": "Não é possível iniciar sessão agora",
 	"cannotloginnow-text": "Não pode iniciar a sessão quando utilizar $1.",
 	"cannotcreateaccount-title": "Não é possível criar contas",
+	"cannotcreateaccount-text": "A criação direta de contas não está activada nesta wiki.",
 	"yourdomainname": "O seu domínio:",
 	"password-change-forbidden": "Não pode alterar palavras-passe nesta wiki.",
 	"externaldberror": "Ocorreu um erro externo à base de dados durante a autenticação ou não lhe é permitido atualizar a sua conta externa.",
@@ -581,7 +585,7 @@
 	"changepassword-success": "A sua palavra-passe foi alterada!",
 	"changepassword-throttled": "Realizou demasiadas tentativas de início de sessão com esta conta.\nAguarde $1 antes de tentar novamente, por favor.",
 	"botpasswords": "Palavras-passe de robô",
-	"botpasswords-summary": "As <em>palavras-passe de robô</em> permitem o acesso a uma conta de utilizador através da API sem utilizar as principais credenciais de login da conta. Os direitos de um utilizador, ao iniciar sessão com uma palavra-passe de robô, podem estar limitados.\n\nSe não sabe o que o leva a fazer isso, provavelmente não deveria fazê-lo. Ninguém deve solicitar que gere uma destas palavras-passe e a entregue.",
+	"botpasswords-summary": "As <em>palavras-passe de robô</em> permitem o acesso a uma conta de utilizador através da API, sem utilizar as credenciais principais de autenticação dessa conta. Os direitos de um utilizador, ao iniciar uma sessão com a palavra-passe de robô, podem estar limitados.\n\nSe não sabe para que necessita desta palavra-passe provavelmente não deveria criá-la. Nunca lhe deve ser solicitado que gere e entregue uma destas palavras-passe.",
 	"botpasswords-disabled": "As palavras-passe de robô estão desactivadas.",
 	"botpasswords-no-central-id": "Para utilizar palavras-passe de robô, deve iniciar sessão com uma conta centralizada.",
 	"botpasswords-existing": "Palavras-passe de robô existentes",
@@ -604,7 +608,7 @@
 	"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",
 	"botpasswords-deleted-body": "O robô palavra-passe para o nome do robô \"$1\"do utilizador \"$2\" foi eliminado.",
-	"botpasswords-newpassword": "A nova palavra-passe para iniciar sessão com <strong>$1</strong> é <strong>$2</strong>. Por favor, recorde-se dela para futura referência.</em>",
+	"botpasswords-newpassword": "A nova palavra-passe para iniciar sessão com <strong>$1</strong> é <strong>$2</strong>. <em>Anote-a para referência futura, por favor.</em> <br> (Para robôs antigos cujo nome de acesso tenha de ser igual ao eventual nome de utilizador, também pode usar o nome de utilizador <strong>$3</strong> e a palavra-passe <strong>$4</strong>.)",
 	"botpasswords-no-provider": "BotPasswordsSessionProvider não está disponível.",
 	"botpasswords-restriction-failed": "Restrições de palavra-passe de robô evitam esta autenticação.",
 	"botpasswords-invalid-name": "O nome de utilizador especificado não contém o separador de palavra-passe de robô (\"$1\").",
@@ -638,8 +642,8 @@
 	"passwordreset-emailelement": "{{GENDER:$1|Utilizador|Utilizadora}}: \n$1\n\nPalavra-passe temporária: \n$2",
 	"passwordreset-emailsentemail": "Se este é o endereço de correio eletrónico associado a esta conta, ser-lhe-á enviada uma palavra-passe de reposição.",
 	"passwordreset-emailsentusername": "Se houver um endereço de correio eletrónico associado a esta conta, ser-lhe-á enviada uma mensagem para redefinir a sua palavra-passe.",
-	"passwordreset-emailsent-capture2": "A redefinição da palavra-passe {{PLURAL:$1|do e-mail|dos e-mails}} foi enviada. {{PLURAL:$1|O nome de utilizador e palavra-passe|A lista de nomes de utilizador e palavras-passe}} encontram-se a seguir.",
-	"passwordreset-emailerror-capture2": "O envio do correio {{GENDER:$2|ao utilizador|à utilizadora|a(o) utilizador(a)}} falhou: $1 {{PLURAL:$3|O nome de utilizador e palavra-passe são mostradas abaixo|A lista de nomes de utilizadores e palavras-passe é mostrada abaixo}}.",
+	"passwordreset-emailsent-capture2": "{{PLURAL:$1|A mensagem|As mensagens}} de redefinição da palavra-passe {{PLURAL:$1|foi enviada|foram enviadas}} para o seu correio eletrónico. {{PLURAL:$1|O nome de utilizador e palavra-passe são mostrados aqui|A lista de nomes de utilizador e palavras-passe é mostrada aqui}}.",
+	"passwordreset-emailerror-capture2": "O envio do correio {{GENDER:$2|ao utilizador|à utilizadora|a(o) utilizador(a)}} falhou: $1 {{PLURAL:$3|O nome de utilizador e palavra-passe são mostrados aqui|A lista de nomes de utilizador e palavras-passe é mostrada aqui}}.",
 	"passwordreset-nocaller": "Um interlocutor deve ser fornecido",
 	"passwordreset-nosuchcaller": "A pessoa que chama não existe: $1",
 	"passwordreset-ignored": "A reposição de palavra-passe não foi realizada. Talvez não tenha sido configurado o provedor?",
@@ -805,6 +809,7 @@
 	"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",
+	"deprecated-self-close-category-desc": "Esta página contém tags HTML auto-fechadas, que são inválidas, tais como <code>&lt;b/></code> ou <code>&lt;span/></code>.  O comportamento destas tags será alterado em breve, para ser consistente com a especificação HTML5, pelo que o seu uso na notação wiki foi descontinuado.",
 	"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>.",
@@ -890,7 +895,7 @@
 	"revdelete-text-text": "Revisões eliminadas ainda aparecerão no histórico da página, mas parte do seu conteúdo estará inacessível para o público.",
 	"revdelete-text-file": "Versões eliminadas do ficheiro ainda aparecerão no histórico da página, mas parte do seu conteúdo estará inacessível para o público.",
 	"logdelete-text": "Os eventos eliminados ainda aparecerão no histórico da página, mas pare de seu conteúdo será inacessível ao público.",
-	"revdelete-text-others": "Outros administradores serão ainda capazes de aceder ao conteúdo oculto e torná-lo visível novamente, a menos que sejam definidas restrições adicionais.",
+	"revdelete-text-others": "Os outros administradores ainda podem aceder ao conteúdo oculto e torná-lo visível novamente, a menos que sejam definidas restrições adicionais.",
 	"revdelete-confirm": "Por favor, confirme que pretende executar esta operação, que compreende as suas consequências e que o faz em concordância com as [[{{MediaWiki:Policy-url}}|políticas e recomendações]].",
 	"revdelete-suppress-text": "A supressão '''só''' deverá ser usada nos seguintes casos:\n* Informação potencialmente caluniosa, difamatória ou injuriosa\n* Informação pessoal imprópria\n*: ''endereços de domicílio e números de telefone, números de identificação nacional, etc''",
 	"revdelete-legend": "Definir restrições de visibilidade",
@@ -1150,7 +1155,7 @@
 	"userrights-changeable-col": "Grupos que pode alterar",
 	"userrights-unchangeable-col": "Grupos que não pode alterar",
 	"userrights-conflict": "Conflito entre alterações de privilégios de utilizador! Por favor, reveja e confirme as suas mudanças.",
-	"userrights-removed-self": "Removeu os seus privilégios. Como resultado disto, já não consegue aceder a esta página.",
+	"userrights-removed-self": "Removeu os seus privilégios. Em resultado, já não pode aceder a esta página.",
 	"group": "Grupo:",
 	"group-user": "Utilizadores",
 	"group-autoconfirmed": "Utilizadores autoconfirmados",
@@ -1269,6 +1274,7 @@
 	"grant-highvolume": "Alta quantidade de edições",
 	"grant-oversight": "Ocultar utilizadores e edições suprimidas",
 	"grant-patrol": "Patrulhar alterações a páginas",
+	"grant-privateinfo": "Aceder a informação privada",
 	"grant-protect": "Proteger e desproteger páginas",
 	"grant-rollback": "Reverter alterações a páginas",
 	"grant-sendemail": "Enviar correio electrónico a outros utilizadores",
@@ -1469,6 +1475,8 @@
 	"uploaded-script-svg": "Encontrou um elemento scriptable no ficheiro \"$1\" SVG carregado.",
 	"uploaded-hostile-svg": "Encontrou-se um código CSS não seguro no elemento de estilo do arquivo SVG carregado.",
 	"uploaded-event-handler-on-svg": "Não está permitido configurar atributos controladores de eventos <code>$1=\"$2\"</code> nos arquivos SVG.",
+	"uploaded-setting-href-svg": "O uso da tag \"set\" para adicionar o atributo \"href\" ao elemento mãe está bloqueado.",
+	"uploaded-wrong-setting-svg": "O uso da tag \"set\" para adicionar um destino remoto/de dados/<i>script</i> a qualquer atributo está bloqueado. No ficheiro SVG enviado foi encontrado <code>&lt;set to=\"$1\"&gt;</code>.",
 	"uploaded-image-filter-svg": "Foi encontrado um filtro de imagem com a URL: <code>&lt;$1 $2=\"$3\"&gt;</code> no ficheiro SVG carregado.",
 	"uploadscriptednamespace": "Este ficheiro SVG contém um domínio que não é permitido \"$1\".",
 	"uploadinvalidxml": "Erro detectado na análise do XML do ficheiro carregado.",
@@ -1498,11 +1506,13 @@
 	"upload-foreign-cant-upload": "Esta wiki não está configurada para carregar ficheiros para o repositório externo solicitado.",
 	"upload-dialog-title": "Carregar ficheiro",
 	"upload-dialog-button-cancel": "Cancelar",
+	"upload-dialog-button-back": "Voltar",
 	"upload-dialog-button-done": "Feito",
 	"upload-dialog-button-save": "Gravar",
 	"upload-dialog-button-upload": "Carregar",
 	"upload-form-label-infoform-title": "Detalhes",
 	"upload-form-label-infoform-name": "Nome",
+	"upload-form-label-infoform-name-tooltip": "Um título descritivo e único para ser usado como nome do ficheiro. Pode usar linguagem normal e espaços. Não inclua a extensão do ficheiro.",
 	"upload-form-label-infoform-description": "Descrição",
 	"upload-form-label-usage-title": "Uso",
 	"upload-form-label-usage-filename": "Nome do ficheiro",
@@ -1924,13 +1934,13 @@
 	"listgrants-grant": "Atribuição",
 	"listgrants-rights": "Direitos",
 	"trackingcategories": "Categorias de monitorização",
-	"trackingcategories-summary": "Esta página lista as categorias monitoradas que foram geradas automaticamente pelo software MediaWiki. Os seus nomes podem ser alterados ao editar sua mensagem correspondente no domínio {{ns:8}}.",
+	"trackingcategories-summary": "Esta página lista as categorias de monitorização geradas automaticamente pelo software MediaWiki. Os nomes das categorias podem ser alterados modificando as mensagens de sistema relevantes no domínio {{ns:8}}.",
 	"trackingcategories-msg": "Categoria monitorada",
 	"trackingcategories-name": "Nome da mensagem",
 	"trackingcategories-desc": "Critérios de inclusão",
 	"restricted-displaytitle-ignored": "Páginas com títulos de exibição ignorados",
 	"restricted-displaytitle-ignored-desc": "Esta página tem um <code><nowiki>{{DISPLAYTITLE}}</nowiki></code> ignorado porque não é equivalente ao título verdadeiro da página.",
-	"noindex-category-desc": "A página não é indexada por robôs porque contém a palavra mágica <code><nowiki>__NOINDEX__</nowiki></code> e está num domínio onde o estatuto é permitido.",
+	"noindex-category-desc": "A página não é indexada por robôs porque contém a palavra mágica <code><nowiki>__NOINDEX__</nowiki></code> e está num domínio onde esta palavra mágica é permitida.",
 	"index-category-desc": "A página contém a palavra mágica <code><nowiki>__INDEX__</nowiki></code> (e está num domínio em que essa marca é permitida) e, portanto, será indexada pelos robôs mesmo quando normalmente não o seria.",
 	"post-expand-template-inclusion-category-desc": "O tamanho da página é superior a <code>$wgMaxArticleSize</code>, após a expansão de todas as predefinições, pelo que algumas predefinições não foram expandidas.",
 	"post-expand-template-argument-category-desc": "O tamanho da página é superior a <code>$wgMaxArticleSize</code>, após a expansão de um argumento de predefinição (algo em chavetas triplas, como <code>{{{Foo}}}</code>).",
@@ -3376,6 +3386,9 @@
 	"htmlform-cloner-create": "Adicionar mais",
 	"htmlform-cloner-delete": "Remover",
 	"htmlform-cloner-required": "Pelo menos um valor é necessário.",
+	"htmlform-date-placeholder": "AAAA-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "AAAA-MM-DD HH:MM:SS",
 	"htmlform-title-badnamespace": "[[:$1]] não se encontra no domínio \"{{ns:$2}}\".",
 	"htmlform-title-not-creatable": "\"$1\" não é um título que possa ser atribuído a uma página",
 	"htmlform-title-not-exists": "$1 não existe.",
@@ -3457,7 +3470,6 @@
 	"feedback-external-bug-report-button": "Assinalar erro técnico",
 	"feedback-dialog-title": "Enviar opinião",
 	"feedback-dialog-intro": "Pode usar o fácil formulário abaixo para enviar os seus comentários. A sua opinião será adicionada à página \"$1\", juntamente com o seu nome de utilizador(a).",
-	"feedback-error-title": "Erro",
 	"feedback-error1": "Erro: O resultado da API não foi reconhecido",
 	"feedback-error2": "Erro: A edição falhou",
 	"feedback-error3": "Erro: A API não responde",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index e2b82922b6..5d72887c80 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -334,7 +334,7 @@
 	"navigation": "This is shown as a section header in the sidebar of most skins.\n\n{{Identical|Navigation}}",
 	"and": "The translation for \"and\" appears in the [[Special:Version]] page, between the last two items of a list. If a comma is needed, add it at the beginning without a gap between it and the \"&\". &amp;#32; is a blank space, one character long. Please leave it as it is.\n\nThis can also appear in the credits page if the credits feature is enabled,for example [{{canonicalurl:Support|action=credits}} the credits of the support page]. (To view any credits page type <nowiki>&action=credits</nowiki> at the end of any URL in the address bar.)\n{{Identical|And}}",
 	"qbfind": "Alternative for \"search\" as used in Cologne Blue skin.\n{{Identical|Find}}",
-	"qbbrowse": "Heading in sidebar menu in CologneBlue skin as seen in http://i.imgur.com/I08Y3jW.png\n{{Identical|Browse}}",
+	"qbbrowse": "Heading in sidebar menu in CologneBlue skin as seen in [[File:CologneBlue sidebar qqx.png]]\n{{Identical|Browse}}",
 	"qbedit": "Heading in sidebar menu in CologneBlue skin as seen in http://i.imgur.com/I08Y3jW.png\n{{Identical|Edit}}",
 	"qbpageoptions": "Heading in sidebar menu in CologneBlue skin as seen in http://i.imgur.com/I08Y3jW.png\n{{Identical|This page}}",
 	"qbmyoptions": "Heading in the Cologne Blue skin user menu containing links to user (talk) page, preferences, watchlist, etc.\n{{Identical|My pages}}",
@@ -1348,7 +1348,7 @@
 	"group-bot": "{{doc-group|bot}}\n{{Identical|Bot}}",
 	"group-sysop": "{{doc-group|sysop}}\n{{Identical|Administrator}}",
 	"group-bureaucrat": "{{doc-group|bureaucrat}}",
-	"group-suppress": "{{doc-group|suppress}}\nThis is an optional (disabled by default) user group, meant for the [[mw:RevisionDelete|RevisionDelete]] feature, to change the visibility of revisions through [[Special:RevisionDelete]].\n\n{{Identical|Suppress}}",
+	"group-suppress": "{{doc-group|suppress}}\nThis is an optional (disabled by default) user group, meant for the suppression feature in [[mw:Flow|Flow]]. It is not to be confused with the Oversighters group, which also has access to the [[mw:RevisionDelete|RevisionDelete]] feature, to change the visibility of revisions through [[Special:RevisionDelete]].\n\n{{Identical|Suppress}}",
 	"group-all": "The name of the user group that contains all users, including anonymous users\n\n{{Identical|All}}",
 	"group-user-member": "{{doc-group|user|member}}\n{{Identical|User}}",
 	"group-autoconfirmed-member": "{{doc-group|autoconfirmed|member}}",
@@ -4091,7 +4091,6 @@
 	"feedback-external-bug-report-button": "A button for submitting an external technical bug report.",
 	"feedback-dialog-title": "Title of the feedback dialog",
 	"feedback-dialog-intro": "An introduction at the top of the feedback dialog. $1 - Feedback page link",
-	"feedback-error-title": "{{Identical|Error}}",
 	"feedback-error1": "Error message, appears when an unknown error occurs submitting feedback",
 	"feedback-error2": "Error message, appears when we could not add feedback",
 	"feedback-error3": "Error message, appears when we lose our connection to the wiki",
diff --git a/languages/i18n/ro.json b/languages/i18n/ro.json
index c2c42c2952..98f7e647c0 100644
--- a/languages/i18n/ro.json
+++ b/languages/i18n/ro.json
@@ -751,7 +751,7 @@
 	"expensive-parserfunction-warning": "Atenție: Această pagină conține prea multe apelări costisitoare ale funcțiilor parser.\n\nAr trebui să existe mai puțin de $2 {{PLURAL:$2|apelare|apelări}}, acolo există {{PLURAL:$1|$1 apelare|$1 apelări}}.",
 	"expensive-parserfunction-category": "Pagini cu prea multe apelări costisitoare de funcții parser",
 	"post-expand-template-inclusion-warning": "Atenție: Formatele incluse sunt prea mari.\nUnele formate nu vor fi incluse.",
-	"post-expand-template-inclusion-category": "Paginile în care este inclus formatul are o dimensiune prea mare",
+	"post-expand-template-inclusion-category": "Pagini în care formatele incluse au o dimensiune prea mare",
 	"post-expand-template-argument-warning": "Atenție: Această pagină conține cel puțin un argument al unui format care are o mărime prea mare atunci când este expandat.\nAcsete argumente au fost omise.",
 	"post-expand-template-argument-category": "Pagini care conțin formate cu argumente omise",
 	"parser-template-loop-warning": "Buclă de formate detectată: [[$1]]",
@@ -3371,7 +3371,6 @@
 	"feedback-external-bug-report-button": "Semnalare problemă tehnică",
 	"feedback-dialog-title": "Trimitere păreri",
 	"feedback-dialog-intro": "Puteți folosi formularul simplificat de mai jos pentru a vă trimite părerile. Comentariul dumneavoastră va fi adăugat în pagina „$1”, alături de numele dumneavoastră de utilizator.",
-	"feedback-error-title": "Eroare",
 	"feedback-error1": "Eroare: Rezultat necunoscut de la API",
 	"feedback-error2": "Eroare: editarea nu a reușit",
 	"feedback-error3": "Eroare: Niciun răspuns de la API",
diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json
index 6dd8846073..d4e4a5dd00 100644
--- a/languages/i18n/ru.json
+++ b/languages/i18n/ru.json
@@ -1541,6 +1541,7 @@
 	"upload-dialog-disabled": "На этом вики-сайте отключена возможность загрузки файлов с помощью этого диалогового окна.",
 	"upload-dialog-title": "Загрузить файл",
 	"upload-dialog-button-cancel": "Отменить",
+	"upload-dialog-button-back": "Назад",
 	"upload-dialog-button-done": "Готово",
 	"upload-dialog-button-save": "Сохранить",
 	"upload-dialog-button-upload": "Загрузить",
@@ -3527,6 +3528,18 @@
 	"htmlform-cloner-create": "Добавить ещё",
 	"htmlform-cloner-delete": "Удалить",
 	"htmlform-cloner-required": "Требуется по крайней мере одно значение.",
+	"htmlform-date-placeholder": "ГГГГ-ММ-ДД",
+	"htmlform-time-placeholder": "ЧЧ:ММ:СС",
+	"htmlform-datetime-placeholder": "ГГГГ-ММ-ДД ЧЧ:ММ:СС",
+	"htmlform-date-invalid": "Указанное вами значение не похоже на дату. Попробуйте использовать формат ГГГГ-ММ-ДД.",
+	"htmlform-time-invalid": "Указанное вами значение не похоже на время. Попробуйте использовать формат ЧЧ-ММ-СС.",
+	"htmlform-datetime-invalid": "Указанное вами значение не похоже на дату и время. Попробуйте использовать формат ГГГГ-ММ-ДД ЧЧ-ММ-СС.",
+	"htmlform-date-toolow": "Указанное вами значение меньше самой ранней разрешённой даты — $1.",
+	"htmlform-date-toohigh": "Указанное вами значение больше самой поздней разрешённой даты — $1.",
+	"htmlform-time-toolow": "Указанное вами значение меньше самого раннего разрешённого времени — $1.",
+	"htmlform-time-toohigh": "Указанное вами значение больше самого позднего разрешённого времени — $1.",
+	"htmlform-datetime-toolow": "Указанное вами значение меньше самым ранних разрешённых даты и времени — $1.",
+	"htmlform-datetime-toohigh": "Указанное вами значение больше самых поздних разрешённых даты и времени — $1.",
 	"htmlform-title-badnamespace": "[[:$1]] находится не в пространстве имён «{{ns:$2}}».",
 	"htmlform-title-not-creatable": "«$1» — заголовок страницы, которая не может быть создана",
 	"htmlform-title-not-exists": "$1 не существует.",
@@ -3610,7 +3623,6 @@
 	"feedback-external-bug-report-button": "Отправить техническое задание",
 	"feedback-dialog-title": "Отправить отзыв",
 	"feedback-dialog-intro": "Вы можете воспользоваться простой формой ниже, чтобы оставить свой отзыв. Комментарий с вашим именем участника будет добавлен на страницу «$1».",
-	"feedback-error-title": "Ошибка",
 	"feedback-error1": "Ошибка. Неизвестный результат из API",
 	"feedback-error2": "Ошибка. Сбой редактирования",
 	"feedback-error3": "Ошибка. Нет ответа от API",
diff --git a/languages/i18n/sd.json b/languages/i18n/sd.json
index 15d45cf1ec..bf9746d63b 100644
--- a/languages/i18n/sd.json
+++ b/languages/i18n/sd.json
@@ -31,7 +31,7 @@
 	"tog-enotifminoredits": "صفحن ۾ معمولي ترميمن جي صورت ۾ بہ مون کي برق ٽپال ڪريو",
 	"tog-enotifrevealaddr": "پڌراين ۾ منهنجو برق ٽپال پتو ظاهر ڪريو.",
 	"tog-shownumberswatching": "ڏسندڙ يوزرس جو انگ ڏيکاريو",
-	"tog-oldsig": "موجوده دستخط",
+	"tog-oldsig": "توھان جو موجوده دستخط:",
 	"tog-uselivepreview": "سڌي سنئين پيش نگاھہ استعمال ڪريو",
 	"tog-watchlisthideown": "زير نظر فهرست مان منهنجون ڪيل ترميمون لڪايو",
 	"tog-watchlisthidebots": "ٽيٽ فهرست تان بوٽ جون ترميمون لڪايو",
@@ -43,7 +43,7 @@
 	"tog-diffonly": "تفاوت هيٺان صفحي جو مواد نہ ڏيکاريو",
 	"tog-showhiddencats": "لڪل زمرا ڏيکاريو",
 	"tog-useeditwarning": "مونکي خبردار ڪريو جڏهن مان هڪ ترميم وارو صفحو بغير تبديلين سانڍڻ جي ڇڏيان",
-	"tog-prefershttps": "هميشه محفوظ ڪنيڪشن استعمال ڪريو جڏهن لاگ اِن ٿيل هجو",
+	"tog-prefershttps": "هميشہ محفوظ ڪنيڪشن استعمال ڪريو جڏهن داخل ٿيل هجو",
 	"underline-always": "هميشہ",
 	"underline-never": "ڪڏهن بہ نہ",
 	"editfont-style": "ايراضي جو فونٽ اسٽائيل سنواريو:",
@@ -127,14 +127,14 @@
 	"category-file-count-limited": "هيٺيون يا هيٺيان {{PLURAL:$1|فائيل آهي|$1 فائيل آهن}} هن تازي زمري ۾.",
 	"listingcontinuesabbrev": "جاري..",
 	"index-category": "ڏسڻيل صفحا",
-	"noindex-category": "غيرڏسڻيل صفحا",
+	"noindex-category": "غير-ڏسڻيل صفحا",
 	"broken-file-category": "فائيل جي ٽٽل ڳنڍڻن وارا صفحا",
 	"about": "بابت",
 	"article": "موادي صفحو",
 	"newwindow": "(نئين دريءَ ۾ کلندو)",
 	"cancel": "رد",
 	"moredotdotdot": "اڃا...",
-	"morenotlisted": "فهرست مڪمل ڪانهي.",
+	"morenotlisted": "ھي فھرست نامڪمل بہ ٿي سگھي ٿي.",
 	"mypage": "منهنجو صفحو",
 	"mytalk": "ڳالهہ ٻول",
 	"anontalk": "ڳالھ ٻولھ",
@@ -332,7 +332,6 @@
 	"yourpasswordagain": "يُوزرنان ٻيهر ٽائيپ ڪريو:",
 	"createacct-yourpasswordagain": "ڳجھي لفظ جي خاطري ڪريو",
 	"createacct-yourpasswordagain-ph": "ٻيهر ڳجھو لفظ داخل ڪريو",
-	"remembermypassword": "هن برائوزر تي منهنجي لاگ ان کي (وڌ ۾ وڌ $1 {{PLURAL:$1|ڏينهن}} لاءِ) ياد رکو",
 	"userlogin-remembermypassword": "مون کي لاگ اِن رکو",
 	"userlogin-signwithsecure": "محفوظ ڳانڍاپو استعمال ڪريو",
 	"cannotloginnow-title": "ھاڻي لاگ ان نٿو ڪري سگھجي",
@@ -411,7 +410,7 @@
 	"accountcreatedtext": "يوزر کاتو [[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|talk]]) جي لاءِ تخليق ٿي چڪو آهي.",
 	"createaccount-title": "{{SITENAME}} تي کاتو کولڻ",
 	"login-throttled": "توهان تازو ئي لاگ اِن ٿيڻ جون هيڪانديون گھڻيون ڪوششون ڪيون آهن. مهرباني ڪري $1 لاءِ ترسي پوءِ وري ڪوشش ڪريو.",
-	"login-abort-generic": "توهان جو لاگ اِن ناڪام ويو.",
+	"login-abort-generic": "توهان جو داخل ٿيڻ ناڪام ويو - بند ڪيل",
 	"login-migrated-generic": "توهان جو کاتو لڏي چڪو آهي، ۽ هن وڪيءَ تي توهان جو يُوزنانءُ هاڻي وجود نہ ٿو رکي.",
 	"loginlanguagelabel": "ٻولي: $1",
 	"createacct-another-realname-tip": "اصل نالو ڄاڻائڻ اختياري آهي. جيڪڏهن توهان اصل نالو ڄاڻايو ٿا، تہ اهو توهان کي توهان جي ڪم جي مڃتا ڏيڻ لاءِ ڪم آندو ويندو.",
@@ -457,7 +456,6 @@
 	"passwordreset-emailtitle": "{{SITENAME}} واري کاتي جا تفصيل",
 	"passwordreset-emailelement": "يُوزر نانءُ: \n$1\n\nعارضي ڳجھو لفظ:\n$2",
 	"changeemail": "برق ٽپال پتو مِٽايو يا بدلايو",
-	"changeemail-passwordrequired": "توهانکي هن تبديلي جي تصديق ڪرڻ جي لاءِ پنهنجو ڳجھو لفظ داخل ڪرڻ جي ضرورت پوندي.",
 	"changeemail-oldemail": "هاڻوڪو برق ٽپال پتو:",
 	"changeemail-newemail": "نئون برق ٽپال پتو:",
 	"changeemail-none": "(ڪو بہ نہ)",
@@ -560,7 +558,6 @@
 	"content-json-empty-array": "خالي اري",
 	"duplicate-args-warning": "چتاءُ: [[:$2]] کي [[:$1]] ڪال ڪري رهيو آهي، جنهن منجھہ ’$3‘ نيم‌پيما لاءِ هڪ کان وڌيڪ قدر ڄاڻايل آهن. فقط آخري ڄاڻايل قدر استعمال ڪيو ويندو.",
 	"parser-template-loop-warning": "سانچو چڪر لڌو ويو: [[$1]]",
-	"cantcreateaccounttitle": "کاتو کولي نہ ٿو سگھجي",
 	"cantcreateaccount-text": "هن آءِ پي پتي تان کاتي جي تخليق تي يُوز (<strong>$1</strong>)  [[User:$3|$3]] روڪ لڳائي آهي.\n\n$3 جو ڄاڻايل سبب آهي <em>$2</em> آهي.",
 	"cantcreateaccount-range-text": "آءِپي پتن جي حد <strong>$1</strong> ۾ [[User:$3|$3]] کاتو کولڻ تي روڪ لڳائي وئي آهي،$4 جنهن ۾ توهان جو آءِپي پتو بہ (<strong>$4</strong>)،  پڻ شامل آهي. \n\n$3 ان روڪَ جو سبب \"$2\" ڄاڻايو آهي.",
 	"viewpagelogs": "هن صفحي جا لاگس ڏسو",
@@ -1314,7 +1311,7 @@
 	"sp-contributions-newbies-sub": "نون کاتن لاءِ",
 	"sp-contributions-newbies-title": "نون کاتن جي لاءِ يوزر جون ڀاڱيداريون",
 	"sp-contributions-blocklog": "بنسش لاگ",
-	"sp-contributions-deleted": "يُوزر جون ڊاٺل ڀاڱيداريون",
+	"sp-contributions-deleted": "ڊاٿل {{GENDER:$1|يوزر}} ڀاڱيداريون",
 	"sp-contributions-uploads": "چاڙھَ",
 	"sp-contributions-logs": "لاگس",
 	"sp-contributions-talk": "ڳالھہ",
@@ -1715,7 +1712,6 @@
 	"feedback-back": "پوئتي",
 	"feedback-cancel": "رد",
 	"feedback-close": "ٿي ويو",
-	"feedback-error-title": "چُڪَ",
 	"feedback-message": "نياپو:",
 	"feedback-subject": "موضوع:",
 	"feedback-submit": "جمع ڪرايو",
diff --git a/languages/i18n/shn.json b/languages/i18n/shn.json
index 9d36abbf5d..acdd4eb044 100644
--- a/languages/i18n/shn.json
+++ b/languages/i18n/shn.json
@@ -140,14 +140,14 @@
 	"category-file-count-limited": "ဢၼ်ပဵၼ် {{PLURAL:$1|ၾၢႆႇၼႆႉ|$1 ၾၢႆႇၸိူဝ်းၼႆႉ}} မီးဝႆႉတီႈၼႂ်း တွၼ်ႈၵၼ်ၼႆ့။",
 	"listingcontinuesabbrev": "သိုပ်ႇ",
 	"index-category": "ၼႃႈလိၵ်ႈ ၸိူဝ်းၸီ့ဝႆ့",
-	"noindex-category": "ၼႃႈလိၵ်ႈ ၸိူဝ်းၸီ့ဝႆ့",
+	"noindex-category": "ၼႃႈလိၵ်ႈ ၸိူဝ်းၸီႉဝႆႉ",
 	"broken-file-category": "ၼႃႈလိၵ်ႈၸိူဝ်းမီးဝႆႉ ႁဵင်းၵွင်ႉၾၢႆႇဢၼ်လူ့လႅဝ်",
 	"about": "လွင်ႈတၢင်း",
 	"article": "ၼမ်းၼႂ်း",
 	"newwindow": "(ပိုတ်ႇၼင်ႇဝိၼ်းတူဝ်း ဢၼ်မႂ်ႇ)",
 	"cancel": "ဢမ်ႇႁဵတ်း",
 	"moredotdotdot": "ထႅင်ႈ...",
-	"morenotlisted": "သဵၼ်ႈမၢႆဢၼ်ၼႆႉ ဢမ်ႇတဵမ်ထူၼ်ႈ။",
+	"morenotlisted": "သဵၼ်ႈမၢႆဢၼ်ၼႆႉ ဢမ်ႇဢၢပ်ႈတဵမ်ထူၼ်ႈ။",
 	"mypage": "ၼႃႈလိၵ်ႈ",
 	"mytalk": "တွၼ်ႈဢုပ်ႇ",
 	"anontalk": "တွၼ်ႈဢုပ်ႇ",
@@ -205,6 +205,8 @@
 	"talk": "တႃႇဢုပ်ႇ",
 	"views": "လူတူၺ်း",
 	"toolbox": "ၶိူင်ႈၵမ်ႉၵႅမ်",
+	"tool-link-userrights": "လႅၵ်ႈလၢႆႈ {{GENDER:$1|ၽူႈၸႂ်ႉတိုဝ်း}} ၸုမ်း",
+	"tool-link-emailuser": "သူင်ႇဢီးမေးလ်ဢၼ်ၼႆႉ {{GENDER:$1|ၽူႈၸႂ်ႉတိုဝ်း}}",
 	"userpage": "တူၺ်းၼႃႈလိၵ်ႈၽူႈၸႂ်ႉတိုဝ်း",
 	"projectpage": "တူၺ်းၼႃႈလိၵ်ႈ ပရေႃးၵျႅၵ်ႉ",
 	"imagepage": "တူၺ်းၼႃႈလိၵ်ႈၾၢႆႇ",
@@ -380,13 +382,17 @@
 	"yourpasswordagain": "ၶိုၼ်းပေႃႉပၼ် ၶေႃႈလပ်ႉ :",
 	"createacct-yourpasswordagain": "ၼႄႉၼွၼ်းပၼ် ၶေႃႈလပ်ႉ",
 	"createacct-yourpasswordagain-ph": "ပေႃႉသႂ်ႇၶေႃႈလပ်ႉထႅင်ႈၵမ်းၼိုင်ႈ",
-	"remembermypassword": "တွင်းဝႆႉပၼ် လွၵ်ႉဢိၼ်ႇၵဝ်ၶႃႈ တီႈၼႂ်း ၶိူင်ႈပိုတ်ႇဝႆႉၼႆႉ  (တီႈႁိုင်ႁိုင်မၼ်း $1 {{PLURAL:$1|ၼိုင်ႈဝၼ်း|ဝၼ်း}})",
 	"userlogin-remembermypassword": "သိုပ်ႇဢဝ်ၵဝ်ၶႃႈ လွၵ်ႉဢိၼ်ႇဝႆႉလႄႈ",
 	"userlogin-signwithsecure": "ၸႂ်ႉၵွင်ႉသၢၼ် ႁူမ်ႇလူမ်ႈ",
+	"cannotlogin-title": "ဢမ်ႇၸၢင်ႈၶဝ်ႈ လွၵ်ႉဢိၼ်ႇ",
+	"cannotlogin-text": "လွင်ႈၶဝ်ႈလွၵ်ႉဢိၼ်ႇ ဢမ်ႇပႆႇပဵၼ်လႆႈ",
 	"cannotloginnow-title": "ဢမ်ႇၸၢင်ႈၶဝ်ႈ လွၵ်ႉဢိၼ်ႇ ယၢမ်းလဵဝ်",
 	"cannotloginnow-text": "တေဢမ်ႇၸၢင်ႈ လွၵ်ႉၶဝ်ႈ ၽွင်းမိူဝ်ႈၸႂ်ႉ $1",
+	"cannotcreateaccount-title": "ဢမ်ႇၸၢင်ႈၵေႃႇတင်ႈ ဢၶွင်ႉ",
+	"cannotcreateaccount-text": "​လွင်ႈၵေႃႇတင်ႈဢၶွင်ႉၵမ်းသိုဝ်ႈၼၼ်ႉ ဢမ်ႇလႆႈပိုတ်ႇဝႆႉပၼ်ၵႃႈတီႈ ဝီႇၶီႇၼႆႉ။",
 	"yourdomainname": "တူဝ်ႇမဵင်း ၸဝ်ႈၵဝ်ႇ :",
 	"password-change-forbidden": "ၸဝ်ႈၵဝ်ႇတေဢမ်ႇၸၢင်ႈ ​လႅၵ်ႈလၢႆႈ ၶေႃႈလပ်ႉ ၵႃႈတီႈၼိူဝ် ဝီႇၶီႇၼႆႉ",
+	"externaldberror": "ၼႆႉမၼ်းလႆႈပဵၼ် ယွၼ်ႉ လွင်ႈၽိတ်းပိူင်ႈ ၵၢၼ်လူတ်းပွႆႇ ယွင်ၶေႃႈမုၼ်း ဢမ်ႇၼၼ် ယွၼ်ႉပိူဝ်ႈ ၸဝ်ႈၵဝ်ႇၼႆႉ ဢမ်ႇထုၵ်ႇၶႂၢင်းပၼ် တႃႇတေႁဵတ်း ဢၢပ်ႉတိတ်ႉ ဢၶွင်ႉၽၢႆႇၼွၵ်ႈ။",
 	"login": "လွၵ်ႉဢိၼ်ႇ",
 	"login-security": "ၼႄႉၼွၼ်း မၢႆၽၢင်ၸဝ်ႈၵဝ်ႇ",
 	"nav-login-createaccount": "လွၵ်ႉဢိၼ်ႇ / သၢင်ႈဢၶွင်ႉ",
@@ -413,6 +419,7 @@
 	"createacct-email-ph": "ပေႃႉသႂ်ႇပၼ် ႁဵင်းလိၵ်ႈ ဢီးမေးၸဝ်ႈၵဝ်ႇ",
 	"createacct-another-email-ph": "ပေႃႉသႂ်ႇပၼ် ႁဵင်းလိၵ်ႈ ဢီးမေးလ်",
 	"createaccountmail": "ၸႂ်ႉပၼ် ၶေႃႈလပ်ႉၸူဝ်ႈၵႅပ်ႉ သူင်ႇၼၼ်ႉၵႂႃႇၸူး ႁဵင်းလိၵ်ႈဢီးမေးလ် ဢၼ်မၵ်းမၼ်ႈဝႆႉ ပၼ်ၼၼ်ႉ။",
+	"createaccountmail-help": "ပေႃးဢမ်ႇမီး လွင်ႈလဵပ်ႈႁဵၼ်း ၶေႃႈလပ်ႉၼႆ တေဢမ်ႇၸၢင်ႈဢဝ်ၸႂ်ႉ တႃႇတေၵေႃႇတင်ႈ ဢၶွင်ႉတွၼ်ႈတႃႇ ၵူၼ်းတၢင်ႇၵေႃႉ။",
 	"createacct-realname": "ၸိုဝ်ႈတႄႉတႄႉ (ဢဝ်ၸႂ်ဝႃႈ)",
 	"createaccountreason": "လွင်ႈတၢင်း :",
 	"createacct-reason": "လွင်ႈတၢင်း :",
@@ -432,9 +439,14 @@
 	"loginerror": "လွၵ်ႉဢိၼ်ႇ ၽိတ်းပိူင်ႈ",
 	"createacct-error": "ၵၢၼ်ၵေႃႇသၢင်ႈ ဢၶွင်ႉ ၽိတ်းပိူင်ႈ",
 	"createaccounterror": "ဢမ်ႇၸၢင်ႈၵေႃႇသၢင်ႈ ဢၶွင်ႉ : $1",
+	"nocookiesnew": "ဢၶွင်ႉ ၽူႈၸႂ်ႉတိုဝ်းၼႆႉ ထုၵ်ႇၵေႃႇသၢင်ႈယဝ်ႉယဝ်ႈ၊ ၵူၺ်းၵႃႈ ၸဝ်ႈၵဝ်ႇဢမ်ႇပႆႇလႆႈၶဝ်ႈ လွၵ်ႉဢိၼ်ႇဝႆႉ။ {{SITENAME}} ၸႂ်ႉ ၶုၵ်ႉၵီး တႃႇတေၶဝ်ႈလွၵ်ႉဢိၼ်ႇ ၽူႈၸႂ်ႉတိုဝ်း။\nၸဝ်ႈၵဝ်ႇလႆႈဢိုတ်းဝႆႉ ၶုၵ်ႉၵီး။\nၶႅၼ်ႈတေႃႈ ပိုတ်ႇပၼ်ၸိူဝ်းၼၼ်ႉသေ ၶဝ်ႈလွၵ်ႉဢိၼ်ႇပၼ်တင်း ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း ၸဝ်ႈၵဝ်ႇ ဢၼ်မႂ်ႇလႄႈတင်း ၶေႃႈလပ်ႉၼၼ်ႉလႄႈ။",
+	"nocookieslogin": "{{SITENAME}} ၸႂ်ႉ ၶုၵ်ႉၵီး တႃႇတေၶဝ်ႈလွၵ်ႉဢိၼ်ႇ ၽူႈၸႂ်ႉတိုဝ်း။\nၸဝ်ႈၵဝ်ႇလႆႈဢိုတ်းဝႆႉ ၶုၵ်ႉၵီး။\nၶႅၼ်ႈတေႃႈ ပိုတ်ႇပၼ်ၸိူဝ်းၼၼ်ႉသေ ၶတ်းၸႂ်တူၺ်းထႅမ်ႈလႄႈ။",
+	"nocookiesfornew": "ဢၶွင်ႉၽူႈၸႂ်ႉတိုဝ်းၼႆႉ ဢမ်ႇထုၵ်ႇၵေႃႇသၢင်ႈ ယွၼ်ႉပိူဝ်ႈႁဝ်းၶႃႈ ဢမ်ႇၸၢင်ႈၼႄႉၼွၼ်း ငဝ်ႈငႃႇမၼ်း။\nၶႅၼ်းတေႃႈ ပိုတ်ႇပၼ် ၶုၵ်ႉၵီးၸဝ်ႈၵဝ်ႇယဝ်ႉသေ ၶိုၼ်းတူင်ႉပိုတ်ႇၼႃႈလိၵ်ႈၼႆႉသေ ၶတ်းၸႂ်တူၺ်းထႅင်ႈၶႃႈလႄႈ။",
+	"createacct-loginerror": "ဢၶွင်ႉ ၵေႃႇတင်ႈၶႅမ်ႉလႅပ်ႈၵႂႃႇသေတႃႉ ၸဝ်ႈၵဝ်ႇ တေဢမ်ႇပႆႇၸၢင်ႈၶဝ်ႈ လွၵ်ႉဢိၼ်ႇ ႁင်းၶေႃႈ။ ၶႅၼ်းတေႃႈ ႁဵတ်းတႃႇ  [[Special:UserLogin|manual login]].",
 	"noname": "ၸဝ်ႈၵဝ်ႇ ဢမ်ႇလႆႈ မၵ်းမၼ်ႈဝႆႉပၼ် ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ၸႂ်ႉလႆႈ။",
 	"loginsuccesstitle": "လွၵ်ႉဢိၼ်ႇဝႆႉယဝ်ႉ",
 	"loginsuccess": "<strong>ၸဝ်ႈၵဝ်ႇ လွၵ်ႉဢိၼ်ႇၶဝ်ႈၸူး  {{SITENAME}} ၼင်ႇ \"$1\".</strong> ယဝ်ႉဢေႃႈ ယၢမ်းလဵဝ်",
+	"nosuchuser": "ၸိုဝ်ႈ တွၼ်ႈတႃႇတႃႇၽူႈၸႂ်ႉတိုဝ်း \"$1\" ဢၼ်ၼႆႉ မၼ်းဢမ်ႇမီးဝႆႉ။\nၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်းၼႆႉ မၼ်းမီးလိူင်ႈတူဝ်လဵၵ်ႉတူဝ်ယႂ်ႇ။\nၵူတ်ႇထတ်းတူၺ်း တူဝ်လေႃးမၼ်း ဢမ်ႇၼၼ် [[Special:CreateAccount|create a new account]].",
 	"nosuchusershort": "ဢၼ်ပဵၼ်ၸိုဝ်ႈ ၽူႈၸႂ်ႉတိုဝ်း \"$1\" ဢၼ်ၼႆႉ မၼ်းဢမ်ႇမီး။\nမႄးၵူတ်ႇတူၺ်း တူဝ်လိၵ်ႈမၼ်းလီလီလႄႈ။",
 	"nouserspecified": "ၸဝ်ႈၵဝ်ႇ ထုၵ်ႇလီမၵ်းမၼ်ႈ ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း",
 	"login-userblocked": "ၽူႈၸႂ်ႉတိုဝ်းၵေႃႉၼႆႉ ထုၵ်ႇႁႄႉတတ်းဝႆႉ။ ဢမ်ႇမီးသုၼ်ႇတႃႇ လွၵ်ႉဢိၼ်ႇ",
@@ -531,7 +543,6 @@
 	"passwordreset-emailelement": "ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း:\n$1\n\nၶေႃႈလပ်ႉ ၸူဝ်ႈၵႅပ်ႉ:\n$2",
 	"passwordreset-emailsentemail": "ႁဵင်းလိၵ်ႈ ဢီးမေးလ်ဢၼ်ၼႆႉၼႆႉ မၼ်းၵပ်းၵၢႆႇၵၼ်တင်း ဢၶွင်ႉၸဝ်ႈၵဝ်ႇ၊ ဢၼ်ပဵၼ် ဢီးမေးလ် တႃႇတင်ႈၶိုၼ်းမၢႆလပ်ႉၼၼ်ႉ တေထုၵ်ႇသူင်ႇၸူးယူႇ.",
 	"passwordreset-emailsentusername": "ႁဵင်းလိၵ်ႈ ဢီးမေးလ်ဢၼ်ၼႆႉၼႆႉ မၼ်းၵပ်းၵၢႆႇၵၼ်တင်း ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်း ဢၼ်ၼႆႉ၊ ဢၼ်ပဵၼ် ဢီးမေးလ် တႃႇတင်ႈၶိုၼ်းမၢႆလပ်ႉၼၼ်ႉ တေထုၵ်ႇသူင်ႇၸူးယူႇ.",
-	"passwordreset-emailsent-capture": "ဢီးမေးလ် ၵၢၼ်တင်ႈၶိုၼ်း ​မၢႆလပ်ႉၼၼ်ႉ ထုၵ်ႇသူင်ႇၵႂႃႇၸူး ဢၼ်ၼႄဝႆႉၼင်ႇ ၽၢႆႇတႂ်ႈၼႆႉ။",
 	"passwordreset-invalideamil": "ႁဵင်းလိၵ်ႈ ဢီႈမေးလ် ၽိတ်းဝႆႉ။",
 	"passwordreset-nodata": "ၸိုဝ်ႈၽူႈၸႂ်ႉတိုဝ်းလႄႈ ႁဵင်းလိၵ်ႈဢီးမေးလ် ဢမ်ႇလႆႈၵမ်ႉထႅမ်ဝႆႉ သေဢၼ်။",
 	"changeemail": "လႅၵ်ႈလၢႆႈ ဢမ်ႇၼၼ် ထွၼ်ပႅတ်ႈ ႁဵင်းလိၵ်ႈ ဢီးမေးလ်",
@@ -646,7 +657,6 @@
 	"content-json-empty-object": "ၵၢၼ်ပဝ်ႇ",
 	"content-json-empty-array": "ထႅဝ်ပဝ်ႇ",
 	"post-expand-template-inclusion-warning": "<strong>ၶေႃႈၽၢင်ႉ</strong> - ပိူင်ဢဝ်မႃးႁူမ်ႈၼၼ်ႉယႂ်ႇပူၼ်ႉၼႃႇ။\nပိူင်မၢင်ၼႃႈတေဢမ်ႇႁူမ်ႈပႃးၸွမ်း။",
-	"cantcreateaccounttitle": "ဢမ်ႇၸၢင်ႈၵေႃႇသၢင်ႈ ဢၶွင်ႉ",
 	"viewpagelogs": "တူၺ်းသၢႆမၢႆ တွၼ်ႈတႃႇၼႃႈလိၵ်ႈၼႆႉ",
 	"nohistory": "တီႈၼႆႈ ဢမ်ႇမီး ပိုၼ်းထတ်းသၢင်ႈ တွၼ်ႈတႃႇၼႃႈလိၵ်ႈၼႆႉ",
 	"currentrev": "ၵၢၼ်ၶူၼ်ႉလူ ၵမ်းလိုၼ်းသုတ်း",
@@ -1193,25 +1203,59 @@
 	"upload-form-label-own-work": "ဢၼ်ၼႆႉပဵၼ် ၼႃႈၵၢၼ်တူဝ်ၶႃႈ။",
 	"upload-form-label-infoform-categories": "လိူင်ႈ",
 	"upload-form-label-infoform-date": "ဝၼ်းထီႉ",
+	"backend-fail-stream": "ဢမ်ႇၸၢင်ႈပိုတ်ႇလႆၾၢႆႇ \"$1\" ဢၼ်ၼႆႉ။",
+	"backend-fail-backup": "ဢမ်ႇၸၢင်ႈႁဵတ်း ၵႅမ်လင်ၾၢႆႇ \"$1\" ၼႆႉ။",
+	"backend-fail-notexists": "ၾၢႆႇ $1 ၼႆႉ မၼ်းဢမ်ႇလႆႈမီးဝႆႉ။",
+	"backend-fail-hashes": "ဢမ်ႇၸၢင်ႈဢဝ် ၾၢႆႇဢၼ်ယွႆႈ တွၼ်ႈတႃႇတေမႃး ၶဵင်ႇထတ်းၵၼ်။",
+	"backend-fail-notsame": "ၾၢႆႇဢၼ်ဢမ်ႇပႆႇလႆႈ ထတ်းသၢင်ႈၼၼ်ႉ မီးဝႆႉလူင်ႈၼႃႈ ၵႃႈတီႈ \"$1\" ။",
+	"backend-fail-invalidpath": "\"$1\" ၼႆႉ သၢႆတၢင်းတႃႇတေသိမ်းမၼ်း ၽိတ်းဝႆႉ။",
+	"backend-fail-delete": "ဢမ်ႇၸၢင်ႈမွတ်ႇပႅတ်ႈ ၾၢႆႇ \"$1\".",
+	"backend-fail-describe": "ဢမ်ႇၸၢင်ႈလႅၵ်ႈလၢႆႈ ၶေႃႈမုၼ်းၽၢႆႇလင် တွၼ်ႈတႃႇၾၢႆႇ \"$1\" ။",
+	"backend-fail-alreadyexists": "ၾၢႆႇ \"$1\" မီးဝႆႉထႃႈယဝ်ႉ။",
+	"backend-fail-store": "ဢမ်ႇၸၢင်ႈသိမ်းၾၢႆႇ \"$1\" ၵႃႈတီႈ \"$2\" ။",
+	"backend-fail-copy": "ဢမ်ႇၸၢင်ႈထုတ်ႇဢဝ် ၾၢႆႇ \"$1\" ၸူး \"$2\".",
+	"backend-fail-move": "ဢမ်ႇၸၢင်ႈၶၢႆႉၾၢႆႇ \"$1\" ၸူး \"$2\" ။",
+	"backend-fail-opentemp": "ဢမ်ႇၸၢင်ႈပိုတ်ႇၾၢႆႇတိုဝ်းၸူဝ်ႈၵႅပ်ႉ။",
+	"backend-fail-writetemp": "ဢမ်ႇၸၢင်ႈတႅမ်ႈသႂ်ႇၸူး ၾၢႆႇတိုဝ်းၸူဝ်ႈၵႅပ်ႉ။",
+	"backend-fail-closetemp": "ဢမ်ႇၸၢင်ႈဢိုတ်း ၾၢႆႇတိုဝ်းၸူဝ်ႈၵႅပ်ႉ။",
+	"backend-fail-read": "ဢမ်ႇၸၢင်ႈလူၾၢႆႇ \"$1\" ။",
+	"backend-fail-create": "ဢမ်ႇၸၢင်ႈတႅမ်ႈၾၢႆႇ \"$1\" ။",
+	"backend-fail-maxsize": "ဢမ်ႇၸၢင်ႈတႅမ်ႈၾၢႆႇ \"$1\" ယွၼ်ႉပိူဝ်ႈဝႃႈ မၼ်းၼႆႉ ယႂ်ႇလိူဝ်သေ {{PLURAL:$2|ၼိုင်ႈပၢႆႉ|$2 ပၢႆႉ}}",
+	"backend-fail-readonly": "တီႈသိမ်းသုတ်းလင် \"$1\" ၼႆႉ ယၢမ်းလဵဝ် မၼ်းတေၸၢင်ႈလူလႆႈၵူၺ်း။ လွင်ႈတၢင်း ဢၼ်လႆႈပၼ်ဝႆႉတႄႉ ပဵၼ် <em>$2</em>",
+	"backend-fail-synced": "ၾၢႆႇ \"$1\" ၼႆႉ မၼ်းပဵၼ်သၢႆႇငၢႆ ဢၼ်ဢမ်ႇမႃးငမ်ႇမႅၼ်ႈၵၼ် တီႈၼႂ်း ဢွင်ႈသိမ်းသုတ်းလင် ၽၢႆႇၼႂ်း။",
+	"backend-fail-connect": "ဢမ်ႇၸၢင်ႈၵွင်ႉသိုပ်ႇၸူး ဢွင်ႈသိမ်းသုတ်းလင် \"$1\" ။",
+	"backend-fail-internal": "လွင်ႈၽိတ်းပိူင်ႈ ဢၼ်ဢမ်ႇႁူႉလွင်ႈမၼ်း လႆႈပဵၼ်ဝႆႉ ၵႃႈတီႈၼႂ်း ဢွင်ႈသိမ်းသုတ်းလင် \"$1\" ။",
+	"backend-fail-contenttype": "ဢမ်ႇၸၢင်ႈတႅပ်းတတ်းလိူင်ႈၾၢႆႇ ဢၼ်တႃႇတေသိမ်းၵႃႈတီႈ \"$1\" ။",
+	"backend-fail-batchsize": "ဢွင်ႈတီႈသိမ်းသုတ်းလင် ထုၵ်ႇပၼ်ဝႆႉ ၸုမ်းၾၢႆႇ $1 ၾၢႆႇ\n{{PLURAL:$1|ၵၢၼ်ႁဵတ်း|ၵၢၼ်ႁဵတ်း}}; တီႈမၵ်းၶၢၼ်းမၼ်းပဵၼ် $2\n{{PLURAL:$2|ၵၢၼ်ႁဵတ်း|ၵၢၼ်ႁဵတ်း}}.",
+	"backend-fail-usable": "ဢမ်ႇၸၢင်ႈလူ ဢမ်ႇၼၼ် ဢမ်ႇၸၢင်ႈတႅမ်ႈ ၾၢႆႇ \"$1\" ယွၼ်ႉပိူဝ်ႈဝႃႈ ၵၢၼ်လူတ်းပွႆႇ ဢမ်ႇတဵမ်ထူၼ်ႈ ဢမ်ႇၼၼ် ႁၢမ်းဝႆႉ ဢွင်ႈတီႈသိမ်း။",
+	"filejournal-fail-dbconnect": "ဢမ်ႇၸၢင်ႈၵွင်ႉသိုပ်ႇၸူး ယေးၶေႃႈမုၼ်း ၵျႃႇၼႄႇ တွၼ်ႈတႃႇ ဢွင်ႈတီႈသိမ်းသုတ်းလင် \"$1\" ။",
+	"filejournal-fail-dbquery": "ဢမ်ႇၸၢင်ႈဢၢပ်ႉတိတ်ႉ ယေးၶေႃႈမုၼ်း ၵျႃႇၼႄႇ တွၼ်ႈတႃႇ ဢွင်ႈတီႈသိမ်းသုတ်းလင် \"$1\" ။",
 	"lockmanager-notlocked": "ဢမ်ႇၸၢင်ႈ ပိုတ်ႇသေႃး \"$1\"; ၼၼ်ႉမၼ်းဢမ်ႇလႆႈ ၶတ်းဝႆႉ။",
 	"lockmanager-fail-closelock": "ဢမ်ႇၸၢင်ႈဢိုတ်း ၾၢႆႇဢၼ်ၶတ်းဝႆႉ တွၼ်ႈတႃႇ \"$1\" ။",
 	"lockmanager-fail-deletelock": "ဢမ်ႇၸၢင်ႈမွတ်ႇပႅတ်ႈ ၾၢႆႇဢၼ်ၶတ်းဝႆႉ တွၼ်ႈတႃႈ \"$1\".",
 	"lockmanager-fail-acquirelock": "ဢမ်ႇၸၢင်ႈဢဝ် ၶတ်းတွၼ်ႈတႃႇ \"$1\" ။",
 	"lockmanager-fail-openlock": "ဢမ်ႇၸၢင်ႈဢိုတ်း ၾၢႆႇဢၼ်ၶတ်းဝႆႉ တွၼ်ႈတႃႇ \"$1\" ။",
 	"lockmanager-fail-releaselock": "ဢမ်ႇၸၢင်ႈပွႆႇပၼ် ဢၼ်ၶတ်း တွၼ်ႈတႃႈ \"$1\" ။",
+	"lockmanager-fail-db-bucket": "ဢမ်ႇၸၢင်ႈၵပ်းသိုပ်ႇလႆႈ ယေးၶေႃႈမုၼ်းဢၼ်ၶတ်းဝႆႉ ၵႃႈတီႈၼႂ်း ပုင်း $1 ၼၼ်ႉ။",
 	"lockmanager-fail-db-release": "ဢမ်ႇၸၢင်ႈပွႆႇပၼ်ၵၢၼ်ၶတ်း ၵႃႈတီႈ ယွင်ၶေႃႈမုၼ်း $1 ။",
 	"lockmanager-fail-svr-acquire": "ဢမ်ႇၸၢင်ႈဢဝ်လႆႈ ၵၢၼ်ၶတ်း ၵႃႈတီႈၼိူဝ် သႃႇပိူဝ်ႇ $1 ။",
 	"lockmanager-fail-svr-release": "ဢမ်ႇၸၢင်ႈပွႆႇပၼ် ၵၢၼ်ၶတ်း ၵႃႈတီႈၼိူဝ် သႃႇပိူဝ်ႇ $1 ။",
+	"zip-file-open-error": "ၽွင်းမိူဝ်ႈပိုတ်ႇၽၢႆႇ တွၼ်ႈတႃႇ ၵူတ်ႇထတ်း ZIP ၼၼ်ႉ လႆႈထူပ်းၺႃး လွင်ႈၽိတ်းပိူင်ႈ။",
 	"zip-wrong-format": "ၾၢႆႇဢၼ်မၵ်းမၼ်ႈဝႆႉပၼ်ၼၼ်ႉ မၼ်းဢမ်ႇၸႂ်ႈ ၾၢႆႇ ZIP ။",
 	"zip-bad": "ၾၢႆႇၼႆႉ မၼ်းၵွႆဝႆႉ ဢမ်ႇၼၼ် မၼ်းပဵၼ် ၾၢႆႇ ZIP ဢၼ်ဢမ်ႇလူႇလႆႈ။\nမၼ်းဢမ်ႇၸၢင်ႈ ၵူတ်ႇတူၺ်း တွၼ်ႈတႃႇ ပၢႆးႁူမ်ႇလူမ်ႈ လႆႈလီလီ။",
 	"zip-unsupported": "ၾၢႆႇၼႆႉပဵၼ် ZIP ၾၢႆႇ ဢၼ်ၸႂ်ႉဝႆႉ ၽၢင်ႁၢင်ႈၵၢၼ် ZIP ဢၼ် သိူဝ်ႇၶၢဝ်ႇဝီႇၶီႇ ဢမ်ႇၵမ်ႉထႅမ်ဝႆႉ။  မၼ်းဢမ်ႇၸၢင်ႈ ၵူတ်ႇတူၺ်း တွၼ်ႈတႃႇ ပၢႆးႁူမ်ႇလူမ်ႈ လႆႈလီလီ။",
 	"uploadstash": "လူတ်ႇၶိုၼ်ႈ ၵၢၼ်သိူင်ႇ",
+	"uploadstash-summary": "ၼႃႈလိၵ်ႈၼႆႉ ၵမ်ႉထႅမ်ပၼ် တႃႇၶဝ်ႈၸႂ်ႉ ၾၢႆႇဢၼ်လူတ်ႇၶိုၼ်ႈဝႆႉ ဢမ်ႇၼၼ် ဢၼ်တိုၵ်ႉမီးၼႂ်းၵၢၼ်လူတ်ႇၶိုၼ်ႈၼၼ်ႉ၊ ၵူၺ်းၵႃႈ တေပဵၼ်ၸိူဝ်းဢၼ်ဢမ်ႇပႆႇလႆႈ ​ပိုတ်ႇၽႄ ၸူးၵႃႈတီႈ ဝီႇၶီႇ။ ၾၢႆႇၸိူဝ်းၼႆႉၼႆႉ ၵူၼ်းတၢင်ႇၸိူဝ်းတေဢမ်ႇလႆႈႁၼ်၊ ၵူၺ်းၵႃႈဝႃႈ ၵူၼ်းၸိူဝ်းလူတ်ႇၶိုၼ်ႈၶဝ်ႈတႄႉ တေၸၢင်ႈႁၼ်လႆႈယူႇ။",
 	"uploadstash-clear": "ၽဵဝ်ႈလၢင်ႈ ၾၢႆႇၸိူဝ်းသိူင်ႇသိမ်းဝႆႉ",
 	"uploadstash-nofiles": "တီႈၸဝ်ႈၵဝ်ႇ ဢမ်ႇမီးၾၢႆႇသိူင်ႇသိမ်းသင်။",
+	"uploadstash-badtoken": "ႁဵတ်းသၢင်ႈ ၸိူဝ်းလွင်ႈႁဵတ်းဢၼ်လႆႈ တူၵ်းသုမ်းၵႂႃႇၼၼ်ႉ၊ မၢင်ၽဝ်ႇတေပဵၼ်ယွၼ်ႉလူၺ်ႈ ၶေႃႈၵမ်ႉတူဝ် ၵၢၼ်မႄးထတ်းၸဝ်ႈၵဝ်ႇၼၼ်ႉ ဢႃႇယုသုတ်းၵႂႃႇလႄႈႁိုဝ်။ ၶိုၼ်းမႄး ၶတ်းၸႂ်တူၺ်းထႅင်ႈၵမ်းၼိုင်ႈလႄႈ။",
 	"uploadstash-errclear": "လွင်ႈၽဵဝ်ႈလၢင်ႉၾၢႆႇဢမ်ႇၶႅမ်ႉလႅပ်ႈ။",
 	"uploadstash-refresh": "သၢႆႇၶိုၼ်း သဵၼ်ႈမၢႆၾၢႆႇ",
 	"uploadstash-thumbnail": "တူၺ်းၼင်ႇ ႁၢင်ႈလဵၵ်ႉ",
+	"uploadstash-exception": "ဢမ်ႇၸၢင်ႈသိမ်း ၵၢၼ်လူတ်ႇၶိုၼ်ႈ ၵႃႈတီႈၼႂ်း တီႈသိူင်ႇ($1): \"$2\" ။",
+	"invalid-chunk-offset": "ပွတ်းတူဝ်ၵၢမ်း ၽိတ်းပိူင်ႈ",
 	"img-auth-accessdenied": "ၵၢၼ်ၸႂ်ႉတိုဝ်း ထုၵ်ႇထဵင်ၶိုၼ်း။",
+	"img-auth-notindir": " သၢႆတၢင်းဢၼ်တုၵ်းယွၼ်းမႃးၼၼ်ႉ မၼ်းဢမ်ႇမီးၵႃႈတီႈၼႂ်း သၢႆတၢင်းလူတ်ႇၶိုၼ်ႈ ဢၼ်မႄးၵုမ်းဝႆႉ။",
 	"img-auth-nologinnWL": "ၸဝ်ႈၵဝ်ႇ ဢမ်ႇလႆႈၶဝ်ႈ လွၵ်ႉဢိၼ်ဝႆႉသေ \"$1\" ၼႆႉ မၼ်းဢမ်ႇမီးဝႆႉ တီႈၼႂ်း သဵၼ်ႈမၢႆၶၢဝ်။",
 	"img-auth-nofile": "ၾၢႆႇ \"$1\" ၼႆႉ မၼ်းဢမ်ႇမီးဝႆႉ။",
 	"img-auth-isdir": "ၸဝ်ႈၵဝ်ႇ တိုၵ်ႉၶတ်းၸႂ်ႉ ၶဝ်ႈၸႂ်ႉ ၾူဝ်ႇတိူဝ်ႇ \"$1\" ယူႇ။\nၶႂၢင်းဝႆႉပၼ် ၵၢၼ်ၸႂ်ႉတိုဝ်းၾၢႆႇၵူၺ်း။",
@@ -1432,9 +1476,18 @@
 	"booksources-search-legend": "ၶူၼ်ႉႁႃတႃႇ ငဝ်ႇငႃႇပပ်ႉ",
 	"booksources-search": "ၶူၼ်ႉႁႃ",
 	"log": "သၢႆမၢႆ",
+	"checkbox-all": "တင်းမူတ်း",
+	"checkbox-none": "ဢမ်ႇမီးသင်",
+	"checkbox-invert": "ပိၼ်ႈၽိုၼ်",
 	"allpages": "ၼႃႈ​လိၵ်ႈ​တင်း​သဵင်ႈ",
+	"nextpage": "ၼႃးလိၵ်ႈ တေမႃး ($1)",
+	"prevpage": "ၼႃးလိၵ်ႈ ပူၼ်ႉမႃး ($1)",
+	"allpagesfrom": "ၼႃႈလိၵ်ႈဢၼ်ၼႄ တႄႇတီႈ :",
+	"allpagesto": "ၼႃႈလိၵ်ႈဢၼ်ၼႄ သုတ်းတီႈ :",
 	"allarticles": "ၼႃႈ​လိၵ်ႈ​တင်း​သဵင်ႈ",
+	"allinnamespace": "ၼႃႈလိၵ်ႈတင်းမူတ်း ($1 ဢွင်ႈၸိုဝ်ႈ)",
 	"allpagessubmit": "ၶူၼ်ႉႁႃ",
+	"allpagesprefix": "ၼႃးလိၵ်ႈဢၼ်ၼႄ ဢိၵ်ႇတင်း ၶေႃႈလူင်ႈၼႃႈ",
 	"categories": "လိူင်ႈ",
 	"mywatchlist": "သဵၼ်ႈမၢႆပႂ်ႉတူၺ်း",
 	"watch": "ပႂ်ႉတူၺ်း",
diff --git a/languages/i18n/sk.json b/languages/i18n/sk.json
index c541349d76..863a8229d1 100644
--- a/languages/i18n/sk.json
+++ b/languages/i18n/sk.json
@@ -231,6 +231,8 @@
 	"talk": "Diskusia",
 	"views": "Zobrazenia",
 	"toolbox": "Nástroje",
+	"tool-link-userrights": "Zmeniť používateľské skupiny {{GENDER:$1|tohoto použivateľa|tejto používateľky}}",
+	"tool-link-emailuser": "Poslať e-mail {{GENDER:$1|tomuto používateľovi|tejto používateľke}}",
 	"userpage": "Zobraziť stránku používateľa",
 	"projectpage": "Zobraziť projektovú stránku",
 	"imagepage": "Zobraziť stránku súboru",
@@ -755,6 +757,8 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Prázdny objekt",
 	"content-json-empty-array": "Prázdne pole",
+	"deprecated-self-close-category": "Stránky s neplatnými samouzavrenými HTML značkami",
+	"deprecated-self-close-category-desc": "Stránka obsahuje neplatné samouzatvárajúce HTML značky, napr. <code>&lt;b/></code> alebo <code>&lt;span/></code>. Ich správanie sa v záujme konzistencie so špecifikáciou HTML5 čoskoro zmení a použitie je preto vo wikitexte zastarané.",
 	"duplicate-args-warning": "<strong>Upozornenie:</strong> Stránka [[:$1]] volá [[:$2]] s viacerými hodnotami parametra „$3“. Použitá bude len posledná odovzdaná hodnota.",
 	"duplicate-args-category": "Stránky s duplicitnými parametrami pri volaniach šablón",
 	"duplicate-args-category-desc": "Stránka obsahuje volania šablóny používajúce duplicitné parametere, ako napríklad <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> alebo <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
@@ -943,6 +947,7 @@
 	"search-redirect": "(presmerovanie $1)",
 	"search-section": "(sekcia $1)",
 	"search-category": "($1 kategória)",
+	"search-file-match": "(výskyt v obsahu súboru)",
 	"search-suggest": "Mali ste na mysli „$1“?",
 	"search-rewritten": "Zobrazujú sa výsledky pre $1. Vyhľadať namiesto toho $2.",
 	"search-interwiki-caption": "Sesterské projekty",
@@ -1032,7 +1037,7 @@
 	"prefs-files": "Súbory",
 	"prefs-custom-css": "Vlastný CSS",
 	"prefs-custom-js": "Vlastný JS",
-	"prefs-common-css-js": "Spoločné CSS/JS pre všetky témy vzhľadu:",
+	"prefs-common-css-js": "Spoločné CSS/JS pre všetky témy:",
 	"prefs-reset-intro": "Túto stránku môžete použiť na vrátenie predvolených hodnôt vašich nastavení.\nTúto operáciu nemožno vrátiť.",
 	"prefs-emailconfirm-label": "Overenie e-emailu:",
 	"youremail": "Váš e-mail²",
@@ -1119,7 +1124,8 @@
 	"right-edit": "Upravovať stránky (ktoré nie sú diskusné stránky)",
 	"right-createpage": "Vytvárať stránky (ktoré nie sú diskusné stránky)",
 	"right-createtalk": "Vytvárať diskusné stránky",
-	"right-createaccount": "Vytvárať nové používateľské účty",
+	"right-createaccount": "Vytvárať nové používateľské kontá",
+	"right-autocreateaccount": "Automatické prihlásenie s externým používateľským kontom",
 	"right-minoredit": "Označovať úpravy ako drobné",
 	"right-move": "Presúvať stránky",
 	"right-move-subpages": "Presunúť stránky aj s podstránkami",
@@ -1293,10 +1299,10 @@
 	"rcshowhidebots": "$1 botov",
 	"rcshowhidebots-show": "Zobraziť",
 	"rcshowhidebots-hide": "Skryť",
-	"rcshowhideliu": "$1 registrovaných používateľov",
+	"rcshowhideliu": "$1 registrovaných",
 	"rcshowhideliu-show": "Zobraziť",
 	"rcshowhideliu-hide": "Skryť",
-	"rcshowhideanons": "$1 anonymných používateľov",
+	"rcshowhideanons": "$1 anonymov",
 	"rcshowhideanons-show": "Zobraziť",
 	"rcshowhideanons-hide": "Skryť",
 	"rcshowhidepatr": "$1 úpravy strážených stránok",
@@ -1305,7 +1311,7 @@
 	"rcshowhidemine": "$1 moje úpravy",
 	"rcshowhidemine-show": "Zobraziť",
 	"rcshowhidemine-hide": "Skryť",
-	"rcshowhidecategorization": "$1 kategorizáciu stránok",
+	"rcshowhidecategorization": "$1 kategorizáciu",
 	"rcshowhidecategorization-show": "Zobraziť",
 	"rcshowhidecategorization-hide": "Skryť",
 	"rclinks": "Zobraziť posledných $1 úprav za posledných $2 dní<br />$3",
@@ -1435,6 +1441,7 @@
 	"upload-copy-upload-invalid-domain": "Kopírovanie nahraných súborov nie je dostupné z tejto domény.",
 	"upload-dialog-title": "Nahrať súbor",
 	"upload-dialog-button-cancel": "Zrušiť",
+	"upload-dialog-button-back": "Späť",
 	"upload-dialog-button-done": "Hotovo",
 	"upload-dialog-button-save": "Uložiť",
 	"upload-dialog-button-upload": "Nahrať",
@@ -1891,9 +1898,11 @@
 	"watchnologin": "Nie ste prihlásený/á",
 	"addwatch": "Pridať do zoznamu sledovaných stránok",
 	"addedwatchtext": "Stránka „[[:$1]]“ a jej diskusná stránka boli pridané do vášho zoznamu [[Special:Watchlist|sledovaných stránok]].",
+	"addedwatchtext-talk": "„[[:$1]]“ a súvisiaca stránka boli pridané do vášho zoznamu [[Special:Watchlist|sledovaných stránok]].",
 	"addedwatchtext-short": "Stránka „$1“ bola pridaná do vášho zoznamu sledovaných.",
 	"removewatch": "Odstrániť zo zoznamu sledovaných",
 	"removedwatchtext": "Stránka „[[:$1]]“ a jej diskusná stránka boli odstránené z vášho [[Special:Watchlist|zoznamu sledovaných stránok]].",
+	"removedwatchtext-talk": "„[[:$1]]“ a súvisiaca stránka boli odstránené z vášho [[Special:Watchlist|zoznamu sledovaných stránok]].",
 	"removedwatchtext-short": "Stránka „$1“ bola odstránená z vášho zoznamu sledovaných.",
 	"watch": "Sledovať",
 	"watchthispage": "Sledovať túto stránku",
@@ -1975,6 +1984,7 @@
 	"revertpage": "Posledné úpravy používateľa [[Special:Contributions/$2|$2]] ([[User talk:$2|diskusia]]) vrátené; bola obnovená posledná úprava $1",
 	"revertpage-nouser": "Vrátené úpravy od skrytého používateľa na poslednú revíziu od {{GENDER:$1|[[User:$1|$1]]}}",
 	"rollback-success": "Úpravy $1 vrátené; obnovená posledná verzia od $2.",
+	"rollback-success-notify": "Úpravy používateľa $1 boli vrátené;\nobnovená posledná revízia od používateľa $2. [$3 Zobraziť zmeny]",
 	"sessionfailure-title": "Chyba relácie",
 	"sessionfailure": "Zdá sa, že je problém s vašou prihlasovacou reláciou;\ntáto akcia bola zrušená ako prevencia proti zneužitiu relácie (session).\nProsím, stlačte \"naspäť\", obnovte stránku, z ktorej ste sa sem dostali, a skúste to znova.",
 	"changecontentmodel": "Zmeniť model obsahu stránky",
@@ -3188,6 +3198,7 @@
 	"tags-active-yes": "Áno",
 	"tags-active-no": "Nie",
 	"tags-source-extension": "Definované softvérom",
+	"tags-source-manual": "Pridané manuálne používateľmi a botmi",
 	"tags-source-none": "Už sa nepoužíva",
 	"tags-edit": "upraviť",
 	"tags-delete": "zmazať",
@@ -3306,21 +3317,26 @@
 	"feedback-bugornote": "Ak ste pripravený podrobne popísať technický problém, prosím pošlite [$1 hlásenie o chybe]. \nV opačnom prípade môžete použiť zjednodušený formulár nižšie. Váš komentár sa pridá na stránku „[$3 $2]“ spolu s vašim používateľským meno a prehliadačom, ktorý používate.",
 	"feedback-cancel": "Zrušiť",
 	"feedback-close": "Hotovo",
+	"feedback-external-bug-report-button": "Založiť technickú úlohu",
 	"feedback-dialog-title": "Odoslať názor",
-	"feedback-error-title": "Chyba",
+	"feedback-dialog-intro": "Pomocou formulára nižšie môžete odoslať svoj názor. Váš komentár sa spolu s vašim použivateľským menom pridá na stránku „$1“.",
 	"feedback-error1": "Chyba: Nerozpoznaný výsledok z API",
 	"feedback-error2": "Chyba: Úprava sa nepodarila",
 	"feedback-error3": "Chyba: Žiadna odpoveď z API",
 	"feedback-message": "Správa:",
 	"feedback-subject": "Predmet:",
 	"feedback-submit": "Odoslať",
+	"feedback-terms": "Beriem na vedomie, že informácie o mojom prehliadači zahŕňajú jeho presnú verziu spolu s verziou operačného systému a budú zverejnené pri mojom komentári.",
+	"feedback-termsofuse": "Súhlasím s tým, že budem poskytovať spätnú väzbu v súlade s Podmienkami použitia.",
 	"feedback-thanks": "Ďakujeme. Váš komentár bol odoslaný na stránku „[$2 $1]“.",
 	"feedback-thanks-title": "Ďakujeme",
 	"feedback-useragent": "Prehliadač:",
 	"searchsuggest-search": "Hľadať",
 	"searchsuggest-containing": "obsahuje...",
+	"api-error-autoblocked": "Vaše IP adresa bola automaticky zablokovaná, pretože ju používal zablokovaný používateľ.",
 	"api-error-badaccess-groups": "Nemáte oprávnenie nahrávať súbory na tejto wiki.",
 	"api-error-badtoken": "Vnútorná chyba: Zlý token.",
+	"api-error-blocked": "Možnosť editovať vám bola zablokovaná.",
 	"api-error-copyuploaddisabled": "Nahrávanie z URL je na tomto serveri zakázané.",
 	"api-error-duplicate": "{{PLURAL:$1|ďalší súbor|ďalšie súbory}} s rovnakým obsahom už na tejto wiki existujú",
 	"api-error-duplicate-archive": "{{PLURAL:$1|ďalší súbor|ďalšie súbory}} s rovnakým obsahom už na tejto wiki existoval, ale {{PLURAL:$1|bol zmazaný|boli zmazané}}.",
@@ -3398,6 +3414,7 @@
 	"pagelang-language": "Jazyk",
 	"pagelang-use-default": "Použiť predvolený jazyk",
 	"pagelang-select-lang": "Vybrať jazyk",
+	"pagelang-submit": "Odoslať",
 	"right-pagelang": "Zmeniť jazyk stránky",
 	"action-pagelang": "meniť jazyk stránky",
 	"default-skin-not-found": "Uups! Základná tapeta pre Vašu wiki, popísanú v <code dir=\"ltr\">$wgDefaultSkin</code> ako <code>$1</code>, nie je dostupná. \n\nVaša inštalácia pravdepodobne obsahuje nasledovné tapety. Pozri [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] pre viac informácii o ich aktivácii a zvoľte základnú.\n\n$2\n\n; Ak ste MediaWiki len teraz nainštalovali\n; Zrejme ste to nainštalovali z gitu alebo priamo zo zdrojového kódu inou metódou. Je to očakávané. Skúste nainštalovať nejaké tapety z [https://www.mediawiki.org/wiki/Category:All_skins mediawiki.org's skin directory];\n:*Stiahnutím [https://www.mediawiki.org/wiki/Download tarball installer], ktorý ponúka viacero tapiet a rozšírení. Skopírovať a nalepiť možno priamo z <code>skins/</code>.\n:*Klonovanie jednej zo <code>mediawiki/skins/*</code> schránok cez git do <code dir=\"ltr\">skins/</code> priečinku Vašej Media Wiki inštalácie.\n: S existujúcou git schránkou, ak ste vývojár MediaWiki, by nemal byť konflikt.\n\n: Ak ste upgradeovali MediaWiki\n: MediaWiki 1.24 a novšie už tapety automaticky neaktivujú. (see [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manual: Skin autodiscovery]). Nasledovný kód môžete skopírovať do <code>LocalSettings.php</code> pre aktivovanie všetkých dostupných tapiet.\n\n<pre dir=\"ltr\">$3</pre>\n\n; Ak ste upravili <code>LocalSettings.php</code>:\n: Skontrolujte chyby.",
@@ -3419,6 +3436,7 @@
 	"mediastatistics-header-text": "Text",
 	"mediastatistics-header-executable": "Spustiteľné súbory",
 	"mediastatistics-header-archive": "Komprimované formáty",
+	"mediastatistics-header-total": "Všetky súbory",
 	"json-warn-trailing-comma": "Z JSONu {{PLURAL:$1|bola odstránená 1 koncová čiarka|boli odstránené $1 koncové čiarky|bolo odstránených $1 koncových čiarok}}",
 	"json-error-unknown": "Došlo k problému s JSONom. Chyba: $1",
 	"json-error-depth": "Maximálna hĺbka zásobníka bola prekročená",
@@ -3430,6 +3448,7 @@
 	"special-characters-group-ipa": "IPA",
 	"special-characters-group-symbols": "Symboly",
 	"special-characters-group-greek": "Grécke",
+	"special-characters-group-greekextended": "Grécke rozšírené",
 	"special-characters-group-cyrillic": "Azbuka",
 	"special-characters-group-arabic": "Arabské",
 	"special-characters-group-arabicextended": "Arabské rozšírené",
@@ -3452,5 +3471,7 @@
 	"mw-widgets-dateinput-placeholder-month": "RRRR-MM",
 	"mw-widgets-titleinput-description-new-page": "stránka zatiaľ neexistuje",
 	"mw-widgets-titleinput-description-redirect": "presmerovanie na $1",
-	"randomrootpage": "Náhodná koreňová stránka"
+	"randomrootpage": "Náhodná koreňová stránka",
+	"changecredentials": "Zmena prihlasovacích údajov",
+	"removecredentials": "Odstránenie prihlasovacích údajov"
 }
diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json
index 71cc9ad9e2..49aa2b574f 100644
--- a/languages/i18n/sl.json
+++ b/languages/i18n/sl.json
@@ -944,7 +944,7 @@
 	"searchprofile-advanced-tooltip": "Iskanje v imenskih prostorih po meri",
 	"search-result-size": "$1 ({{PLURAL:$2|1 beseda|2 besedi|$2 besede|$2 besed|$2 besed}})",
 	"search-result-category-size": "$1 {{PLURAL:$1|član|člana|člani|članov}} ($1 {{PLURAL:$2|podkategorija|podkategoriji|podkategorije|podkategorij}}, $1 {{PLURAL:$3|datoteka|datoteki|datoteke|datotek}})",
-	"search-redirect": "(preusmeritev $1)",
+	"search-redirect": "(preusmeritev s strani $1)",
 	"search-section": "(razdelek $1)",
 	"search-category": "(kategorija $1)",
 	"search-file-match": "(ujema se z vsebino datoteke)",
@@ -1459,6 +1459,7 @@
 	"upload-dialog-disabled": "Nalaganj datotek z uporabo tega obrazca je na wikiju onemogočeno.",
 	"upload-dialog-title": "Naloži datoteko",
 	"upload-dialog-button-cancel": "Prekliči",
+	"upload-dialog-button-back": "Nazaj",
 	"upload-dialog-button-done": "Končano",
 	"upload-dialog-button-save": "Shrani",
 	"upload-dialog-button-upload": "Naloži",
@@ -3358,6 +3359,18 @@
 	"htmlform-cloner-create": "Dodaj več",
 	"htmlform-cloner-delete": "Odstrani",
 	"htmlform-cloner-required": "Zahtevana je vsaj ena vrednost.",
+	"htmlform-date-placeholder": "LLLL-MM-DD",
+	"htmlform-time-placeholder": "UU:MM:SS",
+	"htmlform-datetime-placeholder": "LLLL-MM-DD UU:MM:SS",
+	"htmlform-date-invalid": "Navedena vrednost ni prepoznan datum. Poskusite uporabiti obliko LLLL-MM-DD.",
+	"htmlform-time-invalid": "Navedena vrednost ni prepoznan čas. Poskusite uporabiti obliko UU:MM:SS.",
+	"htmlform-datetime-invalid": "Navedena vrednost ni prepoznan datum in čas. Poskusite uporabiti obliko LLLL-MM-DD UU:MM:SS.",
+	"htmlform-date-toolow": "Navedena vrednost je časovno pred najzgodnejšim dovoljenim datumom $1.",
+	"htmlform-date-toohigh": "Navedena vrednost je časovno po najpoznejšim dovoljenim datumom $1.",
+	"htmlform-time-toolow": "Navedena vrednost je časovno pred najzgodnejšim dovoljenim časom $1.",
+	"htmlform-time-toohigh": "Navedena vrednost je časovno po najpoznejšim dovoljenim časom $1.",
+	"htmlform-datetime-toolow": "Navedena vrednost je časovno pred najzgodnejšim dovoljenim datumom in časom $1.",
+	"htmlform-datetime-toohigh": "Navedena vrednost je časovno po najpoznejšim dovoljenim datumom in časom $1.",
 	"htmlform-title-badnamespace": "[[:$1]] ni v imenskem prostoru »{{ns:$2}}«.",
 	"htmlform-title-not-creatable": "»$1« je naslov strani, ki ga ni mogoče ustvariti",
 	"htmlform-title-not-exists": "$1 ne obstaja.",
@@ -3441,7 +3454,6 @@
 	"feedback-external-bug-report-button": "Vloži tehnično opravilo",
 	"feedback-dialog-title": "Pošljite povratne informacije",
 	"feedback-dialog-intro": "Spodnji enostavni obrazec lahko uporabite za pošiljanje povratnih informacij. Vašo pripombo bomo dodali na stran »$1« skupaj z vašim uporabniškim imenom.",
-	"feedback-error-title": "Napaka",
 	"feedback-error1": "Napaka: Neznan rezultat iz API",
 	"feedback-error2": "Napaka: Urejanje je spodletelo",
 	"feedback-error3": "Napaka: Ni odgovora od API",
diff --git a/languages/i18n/so.json b/languages/i18n/so.json
index fce591613b..2485d1c8cc 100644
--- a/languages/i18n/so.json
+++ b/languages/i18n/so.json
@@ -315,7 +315,6 @@
 	"yourpasswordagain": "Markale qor ereysirka:",
 	"createacct-yourpasswordagain": "Hubi erey sirta",
 	"createacct-yourpasswordagain-ph": "Mar kale gali erey sirta",
-	"remembermypassword": "Kumbuyuutarkaan ku xasuusnaaw magaceyga gudagalka (ilaa  $1 {{PLURAL:$1|maalin|maalmood}})",
 	"userlogin-remembermypassword": "Ka dhig mid diyaar ah mar waliba",
 	"userlogin-signwithsecure": "Adeegso khad la hubo",
 	"yourdomainname": "Magacaga shabakada",
@@ -625,7 +624,7 @@
 	"gender-female": "Dhedig",
 	"prefs-help-gender": "Ahaysiinta xulashaan waa mid dooqasha ah.\nBarnaamijkaan adeegsigiisa waxay qiima u yeelaysaa wadahadalkaada iyo kuwa kale iyadoo bedelaysa habka qofka sida lab ama dheddig.\nMacluumadkaan waa mid la wada arkayo.",
 	"email": "E-mail",
-	"prefs-help-realname": "Optional: if you choose to provide it this will be used for giving you attribution for your work.",
+	"prefs-help-realname": "Magaca runta ah waa dooqasho.\nHaddii aad doorato in aan keento, waxaa loo adeegsan karaa mid tilmaama howshaada.",
 	"prefs-help-email": "E-mail waa wax aad xor u leedahay. laakiin waa loo baahanyahay hadii aad eraysirka badaleesid, hadii aad ilaawdo eraygaaga sirta ah",
 	"prefs-help-email-others": "Waxaa kale oo aad u isticmaali kartaa in ee dadka kale kugula soo xiriiraan e-mail ayaga oo isticmaalaayo linki isticmaalahaada ama bogga wadahadalka.\nE-mailkaada mala sheegaayo markii ee dadka kale kula soo xiriirayaan.",
 	"prefs-help-email-required": "Waxaa loo baahanyahay e-mail.",
diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json
index 868012a729..c7f0086190 100644
--- a/languages/i18n/sv.json
+++ b/languages/i18n/sv.json
@@ -550,7 +550,7 @@
 	"eauthentsent": "Ett e-postmeddelande för bekräftelse har skickats till den angivna e-postadressen.\nInnan någon annan e-post kan skickas till kontot, måste du följa instruktionerna i e-postmeddelandet för att bekräfta att kontot verkligen är ditt.",
 	"throttled-mailpassword": "En lösenordsåterställning har redan skickats för mindre än {{PLURAL:$1|en timme|$1 timmar}} sedan.\nFör att förhindra missbruk skickas bara en lösenordsåterställning per {{PLURAL:$1|timme|$1-timmarsperiod}}.",
 	"mailerror": "Fel vid skickande av e-post: $1",
-	"acct_creation_throttle_hit": "Besökare till den här wikin som har använt din IP-adress har skapat {{PLURAL:$1|ett användarkonto|$1 användarkonton}} under det senaste dygnet, vilket är det maximalt tillåtna inom den tidsperioden.\nSom ett resultat kan besökare som använder den här IP-adressen inte skapa några fler användarkonton just nu.",
+	"acct_creation_throttle_hit": "Besökare till den här wikin som har använt din IP-adress har skapat {{PLURAL:$1|ett användarkonto|$1 användarkonton}} under det senaste $2, vilket är det maximalt tillåtna inom den tidsperioden.\nSom ett resultat kan besökare som använder den här IP-adressen inte skapa några fler användarkonton just nu.",
 	"emailauthenticated": "Din e-postadress bekräftades den $2 kl. $3.",
 	"emailnotauthenticated": "Din e-postadress är ännu inte bekräftad. Ingen e-post kommer att skickas vad gäller det följande funktionerna.",
 	"noemailprefs": "Uppge en e-postadress i dina inställningar för att få dessa funktioner att fungera.",
@@ -1006,7 +1006,7 @@
 	"searchprofile-advanced-tooltip": "Sök i vissa namnrymder",
 	"search-result-size": "$1 ({{PLURAL:$2|1 ord|$2 ord}})",
 	"search-result-category-size": "{{PLURAL:$1|1 medlem|$1 medlemmar}} ({{PLURAL:$2|1 underkategori|$2 underkategorier}}, {{PLURAL:$3|1 fil|$3 filer}})",
-	"search-redirect": "(omdirigering $1)",
+	"search-redirect": "(omdirigering från $1)",
 	"search-section": "(avsnitt $1)",
 	"search-category": "(kategorin $1)",
 	"search-file-match": "(överensstämmer filens innehåll)",
@@ -1521,6 +1521,7 @@
 	"upload-dialog-disabled": "Filuppladdningar med denna dialogruta har inaktiverats på denna wiki.",
 	"upload-dialog-title": "Ladda upp fil",
 	"upload-dialog-button-cancel": "Avbryt",
+	"upload-dialog-button-back": "Tillbaka",
 	"upload-dialog-button-done": "Klar",
 	"upload-dialog-button-save": "Spara",
 	"upload-dialog-button-upload": "Ladda upp",
@@ -3430,6 +3431,18 @@
 	"htmlform-cloner-create": "Lägg till mer",
 	"htmlform-cloner-delete": "Ta bort",
 	"htmlform-cloner-required": "Det krävs minst ett värde.",
+	"htmlform-date-placeholder": "ÅÅÅÅ-MM-DD",
+	"htmlform-time-placeholder": "TT:MM:SS",
+	"htmlform-datetime-placeholder": "ÅÅÅÅ-MM-DD TT:MM:SS",
+	"htmlform-date-invalid": "Värdet du angav är inte ett igenkänt datum. Prova att använda formatet ÅÅÅÅ-MM-DD.",
+	"htmlform-time-invalid": "Värdet du angav är inte en igenkänd tid. Prova att använda formatet HH:MM:SS.",
+	"htmlform-datetime-invalid": "Värdet du angav är inte ett igenkänt datum och tid. Prova att använda formatet ÅÅÅÅ-MM-DD HH:MM:SS.",
+	"htmlform-date-toolow": "Värdet du angav är innan det tidigaste tillåtna datumet för $1.",
+	"htmlform-date-toohigh": "Värdet du angav är efter det senaste tillåtna datumet $1.",
+	"htmlform-time-toolow": "Värdet du angav är innan den tidigaste tillåtna tiden för $1.",
+	"htmlform-time-toohigh": "Värdet du angav är efter den senaste tillåtna tiden $1.",
+	"htmlform-datetime-toolow": "Värdet du angav är innan det tidigaste tillåtna datumet och tiden för $1.",
+	"htmlform-datetime-toohigh": "Värdet du angav är efter det senaste tillåtna datumet och tiden $1.",
 	"htmlform-title-badnamespace": "[[:$1]] är inte i \"{{ns:$2}}\"-namnrymden.",
 	"htmlform-title-not-creatable": "\"$1\" är inte en sidtitel som kan skapas",
 	"htmlform-title-not-exists": "$1 finns inte.",
@@ -3513,7 +3526,6 @@
 	"feedback-external-bug-report-button": "Registrera en teknisk uppgift",
 	"feedback-dialog-title": "Skicka återkoppling",
 	"feedback-dialog-intro": "Du kan använda det enkla formuläret nedan för att skicka in din återkoppling. Din kommentar kommer att läggas till på sidan \"$1\" tillsammans med ditt användarnamn.",
-	"feedback-error-title": "Fel",
 	"feedback-error1": "Fel: Okänt resultat från API",
 	"feedback-error2": "Fel: Redigeringen misslyckades",
 	"feedback-error3": "Fel: Inget svar från API",
@@ -3818,5 +3830,8 @@
 	"unlinkaccounts-success": "Kontot avlänkades.",
 	"authenticationdatachange-ignored": "Ändringen av autentiseringsdata hanterades inte. Kanske ingen tillhandahållare har konfigurerats?",
 	"userjsispublic": "Observera: JavaScript-undersidor bör inte innehålla konfidentiella uppgifter eftersom de kan ses av andra användare.",
-	"usercssispublic": "Observera: CSS-undersidor bör inte innehålla konfidentiella uppgifter eftersom de kan ses av andra användare."
+	"usercssispublic": "Observera: CSS-undersidor bör inte innehålla konfidentiella uppgifter eftersom de kan ses av andra användare.",
+	"restrictionsfield-badip": "Ogiltig IP-adress eller intervall: $1",
+	"restrictionsfield-label": "Tillåtna IP-intervall:",
+	"restrictionsfield-help": "En IP-adress eller CIDR-intervall per rad. För att aktivera allting, använd<br><code>0.0.0.0/0</code><br><code>::/0</code>"
 }
diff --git a/languages/i18n/tt-cyrl.json b/languages/i18n/tt-cyrl.json
index 5009a53eaa..b7cadee0c1 100644
--- a/languages/i18n/tt-cyrl.json
+++ b/languages/i18n/tt-cyrl.json
@@ -398,6 +398,7 @@
 	"password-change-forbidden": "Сез бу викидә серсүзне үзгәртә алмыйсыз.",
 	"externaldberror": "Тышкы мәгълүмат базасы ярдәмендә аутентификация үткәндә хата чыкты, яисә тышкы хисап язмагызга үзгәрешләр кертү хокукыгыз юк.",
 	"login": "Керү",
+	"login-security": "Шәхесегезне раслагыз",
 	"nav-login-createaccount": "Керү / теркәлү",
 	"userlogin": "Керү / теркәлү",
 	"userloginnocreate": "Керү",
@@ -554,6 +555,9 @@
 	"minoredit": "Бу кече үзгәртү",
 	"watchthis": "Бу битне күзәтү",
 	"savearticle": "Битне саклау",
+	"savechanges": "Үзгәртүләрне саклау",
+	"publishpage": "Бит ясау",
+	"publishchanges": "Битне бастыру",
 	"preview": "Алдан карау",
 	"showpreview": "Алдан карау",
 	"showdiff": "Кертелгән үзгәртүләр",
@@ -1901,7 +1905,7 @@
 	"exif-copyrighted": "Автор хокуклары халәте:",
 	"exif-copyrightowner": "Автор хокуклары иясе",
 	"exif-usageterms": "Куллану шартлары",
-	"exif-orientation-1": "Нормаль",
+	"exif-orientation-1": "Гадәти",
 	"exif-orientation-3": "180° ка борылган",
 	"exif-componentsconfiguration-0": "юк",
 	"exif-exposureprogram-0": "Билгесез",
@@ -2100,7 +2104,6 @@
 	"feedback-bugornote": "Әгәр дә сез техник проблеманы җентекләп тасвирларга әзер икәнсез, зинһар өчен, [$1 хата турында хәбәр итегез].\nБашка очракта сез түбәндәге гади форманы куллана аласыз. Сезнең шәрехләмә \"[$3 $2]\" сәхифәсенә сезнең кулланучы исеме һәм сез кулланган браузер исеме белән бергә өстәләчәк.",
 	"feedback-cancel": "Баш тарту",
 	"feedback-close": "Әзер",
-	"feedback-error-title": "Хата",
 	"feedback-error1": "Хата. APIдан билгесез нәтиҗә",
 	"feedback-error2": "Хата: төзәтү уңышсыз килеп чыкты",
 	"feedback-error3": "Хата: APIдан җавап юк.",
diff --git a/languages/i18n/ur.json b/languages/i18n/ur.json
index 7c0b6c296b..a5e2198fa3 100644
--- a/languages/i18n/ur.json
+++ b/languages/i18n/ur.json
@@ -241,7 +241,7 @@
 	"viewtalkpage": "تبادلۂ خیال دیکھیں",
 	"otherlanguages": "دیگر زبانوں میں",
 	"redirectedfrom": "($1 سے رجوع مکرر)",
-	"redirectpagesub": "لوٹایا گیا صفحہ",
+	"redirectpagesub": "رجوع مکرر",
 	"redirectto": "رجوعِ مکرر از:",
 	"lastmodifiedat": "اس صفحہ میں آخری بار مورخہ $1ء کو $2 بجے ترمیم کی گئی۔",
 	"viewcount": "اِس صفحہ تک {{PLURAL:$1|ایک‌بار|$1 مرتبہ}} رسائی کی گئی",
@@ -294,7 +294,7 @@
 	"editlink": "ترمیم",
 	"viewsourcelink": "ماخذ دیکھیں",
 	"editsectionhint": "ترمیم قطعہ: $1",
-	"toc": "مندرجات",
+	"toc": "فہرست",
 	"showtoc": "دکھائیں",
 	"hidetoc": "چھپائیں",
 	"collapsible-collapse": "خاتمے",
@@ -587,7 +587,7 @@
 	"resetpass-expired": "آپ کے پاس ورد کی مدت ختم ہو چکی ہے۔ داخل ہونے کے لیے براہ کرم نیا پاس ورڈ بنائیں۔",
 	"resetpass-expired-soft": "آپ کے پاس ورڈ کی مدت ختم ہو چکی ہے، لہذا اسے دوبارہ بنانے کی ضرورت ہے۔\nبراہ کرم نیا پاس ورڈ بنائیں، تاہم اگر مستقبل میں اس کی ترتیب نو مقصود ہو تو «{{int:authprovider-resetpass-skip-label}}» پر کلک کریں۔",
 	"resetpass-validity-soft": "آپ کا پاس ورڈ درست نہیں: $1\n\nبراہ کرم نیا پاس ورڈ بنائیں، تاہم اگر مستقبل میں اس کی ترتیب نو مقصود ہو تو «{{int:authprovider-resetpass-skip-label}}» پر کلک کریں۔",
-	"passwordreset": "پارلفظ کی بازتعینی",
+	"passwordreset": "پاس ورڈ کی ترتیب نو",
 	"passwordreset-text-one": "برقی خط کے ذریعہ عارضی پاس ورڈ حاصل کرنے کے لیے اس فارم کو پُر کریں۔",
 	"passwordreset-text-many": "{{PLURAL:$1|برقی خط کے ذریعہ عارضی پاس ورڈ حاصل کرنے کے لیے کسی ایک خانے کو پُر کریں۔}}",
 	"passwordreset-disabled": "اس ویکی پر پاس ورڈ کی ترتیب نو کی سہولت فعال نہیں ہے۔",
@@ -608,7 +608,7 @@
 	"passwordreset-ignored": "پاس ورڈ کی ترتیب نو مکمل نہیں ہو سکی۔ شاید کوئی پرووائڈر فراہم نہیں کیا گیا؟",
 	"passwordreset-invalideamil": "نادرست برقی ڈاک پتا",
 	"passwordreset-nodata": "کوئی صارف نام اور نہ کوئی برقی ڈاک پتا فراہم کیا گیا",
-	"changeemail": "برقی ڈاک پتا تبدیل یا حذف کریں",
+	"changeemail": "برقی ڈاک پتے میں تبدیلی یا حذف شدگی",
 	"changeemail-header": "اپنے برقی ڈاک پتے کو تبدیل کرنے کے لیے اس فارم کو پُر کریں۔ اگر آپ اپنے کھاتے سے منسلک کسی برقی ڈاک پتے کو ختم کرنا چاہتے ہیں تو فارم پُر کرنے کے دوران میں نئے برقی ڈاک پتے کا خانہ خالی چھوڑ دیں۔",
 	"changeemail-no-info": "اِس صفحہ تک براہِ راست رسائی کیلئے آپ کو داخل ہونا پڑے گا۔",
 	"changeemail-oldemail": "حالیہ برقی ڈاک پتہ:",
@@ -619,7 +619,7 @@
 	"changeemail-submit": "برقی ڈاک تبدیل کریں",
 	"changeemail-throttled": "آپ نے متعدد مرتبہ داخل ہونے کی کوشش کی ہے۔\nدوبارہ کوشش کرنے سے پہلے $1 انتظار فرمائیں۔",
 	"changeemail-nochange": "براہ کرم کوئی دوسرا برقی ڈاک پتہ درج کریں۔",
-	"resettokens": "ٹوکنوں کو دوبارہ ترتیب دیں",
+	"resettokens": "ٹوکنوں کی ترتیب نو",
 	"resettokens-no-tokens": "ترتیب نو کے لیے کوئی ٹوکن موجود نہیں۔",
 	"resettokens-tokens": "ٹوکن:",
 	"resettokens-token-label": "$1 (موجودہ قدر: $2)",
@@ -645,7 +645,7 @@
 	"summary": "خلاصہ:",
 	"subject": "عنوان:",
 	"minoredit": "معمولی ترمیم",
-	"watchthis": "اس صفحہ کو زیر نظر کیحیے",
+	"watchthis": "اس صفحہ کو زیر نظر کریں",
 	"savearticle": "محفوظ",
 	"savechanges": "تبدیلیاں محفوظ کریں",
 	"publishpage": "شائع کریں",
@@ -685,7 +685,7 @@
 	"blocked-notice-logextract": "یہ صارف معطل ہے۔\nحوالہ کے لیے نوشتہ پابندی کا تازہ ترین اندراج ذیل میں دستیاب ہے:",
 	"clearyourcache": "<strong>یاددہانی:</strong> محفوظ کرنے کے بعد ان تبدیلیوں کو دیکھنے کے لیے آپ کو اپنے براؤزر کا کیشے صاف کرنا ہوگا۔\n* '''فائرفاکس/ سفاری:''' جب ''Reload'' پر کلک کریں تو ''Shift'' دباکر رکھیں، یا ''Ctrl-F5'' یا ''Ctrl-R'' دبائیں (Mac پر ''R-⌘'')\n* '''گوگل کروم:''' ''Ctrl-Shift-R'' دبائیں (Mac پر ''Shift-R-⌘'')\n* '''انٹرنیٹ ایکسپلورر:''' جب ''Refresh'' پر کلک کریں تو ''Ctrl'' یا ''Ctrl-F5'' دبائیں\n* '''اوپیرا:'''  ''Tools → Preferences'' میں جائیں اور کیشے (cache) صاف کریں",
 	"usercssyoucanpreview": "<strong>نکتہ:</strong> اپنی نئی سی ایس ایس کو جانچنے کے لیے اسے محفوظ کرنے سے قبل «{{int:showpreview}}» کی بٹن استعمال کریں۔",
-	"userjsyoucanpreview": "<strong>نکتہ:</strong> اپنی نئی جاوا اسکرپٹ کو جانچنے کے لیے اسے محفوظ کرنے سے قبل «{{int:showpreview}}» کی بٹن استعمال کریں۔",
+	"userjsyoucanpreview": "<strong>نکتہ:</strong>اپنی نئی جاوا اسکرپٹ کو  محفوظ کرنے سے قبل «{{int:showpreview}}» کی بٹن پر کلک کرکے جانچ لیں۔",
 	"usercsspreview": "<strong>یاد رہے کہ اس وقت آپ اپنی سی ایس کی محض نمائش دیکھ رہے ہیں، یہ اب تک محفوظ نہیں ہوئی ہے!</strong>",
 	"userjspreview": "<strong>یاد رہے کہ اس وقت آپ اپنی جاوا اسکرپٹ کی محض نمائش دیکھ/جانچ رہے ہیں، یہ اب تک محفوظ نہیں ہوئی ہے!</strong>",
 	"sitecsspreview": "<strong>یاد رہے کہ اس وقت آپ اس سی ایس کی محض نمائش دیکھ رہے ہیں، یہ اب تک محفوظ نہیں ہوئی ہے!</strong>",
@@ -1372,7 +1372,7 @@
 	"filestatus": "کاپی رائٹ کی صورت حال:",
 	"filesource": "ذرائع",
 	"ignorewarning": "انتباہ نظر انداز کرتے ہوئے فائل کو بہرصورت محفوظ کر لیا جائے",
-	"ignorewarnings": "ہر انتباہ نظرانداز کردیا جاۓ۔",
+	"ignorewarnings": "تمام انتباہات کو نظر انداز کریں",
 	"minlength1": "فائل کے ناموں میں کم از کم ایک حرف ہونا ضروری ہے۔",
 	"illegalfilename": "اس فائل کے نام \"$1\" میں ایسے حروف موجود ہیں جو صفحہ کے عنوانات میں ممنوع ہیں۔\nبراہ کرم فائل کا نام تبدیل کرکے دوبارہ اپلوڈ کرنے کی کوشش کریں۔",
 	"filename-toolong": "فائل کے نام 240 بائٹ سے زیادہ طویل نہ ہوں۔",
@@ -1430,7 +1430,7 @@
 	"upload-maxfilesize": "فائل کا زیادہ سے زیادہ حجم: $1",
 	"upload-description": "فائل کی وضاحت",
 	"upload-options": "اپلوڈ کے اختیارات",
-	"watchthisupload": "یہ صفحہ زیر نظر کریں",
+	"watchthisupload": "اس فائل کو زیر نظر کریں",
 	"upload-proto-error": "غلط پروٹوکول",
 	"upload-file-error": "داخلی نقص",
 	"upload-misc-error": "اپلوڈ کے دوران میں نامعلوم نقص",
@@ -1440,6 +1440,7 @@
 	"upload-dialog-disabled": "اس ویکی پر اس ڈائیلاگ سے فائل اپ لوڈز غیر فعال ہیںَ",
 	"upload-dialog-title": "فائل اپلوڈ کریں",
 	"upload-dialog-button-cancel": "منسوخ",
+	"upload-dialog-button-back": "پیچھے جائیں",
 	"upload-dialog-button-done": "مکمل",
 	"upload-dialog-button-save": "محفوظ",
 	"upload-dialog-button-upload": "اپلوڈ",
@@ -1519,7 +1520,7 @@
 	"upload-curl-error6-text": "فراہم کردہ یوآرایل قابل رسائی نہیں ہے۔\nبراہ کرم اس یوآرایل کو دوبارہ جانچ لیں کہ آیا وہ درست ہے اور متعلقہ سائٹ فعال ہے یا نہیں۔",
 	"upload-curl-error28": "اپلوڈ کی مہلت ختم",
 	"upload-curl-error28-text": "یہ سائٹ جواب دینے میں بہت زیادہ وقت لے رہی ہے۔\nبراہ کرم اس سائٹ کو جانچ لیں کہ آیا وہ فعال ہے یا نہیں، اور کچھ دیر انتظار کرنے کے بعد دوبارہ کوشش کریں۔\nشاید آپ اسے کم مصروف وقت میں آزمانا چاہیں۔",
-	"license": "اجازہ:",
+	"license": "اجازت نامہ:",
 	"license-header": "اجازہ کاری",
 	"nolicense": "غیر منتخب",
 	"licenses-edit": "اجازت نامہ کے اختیارات میں ترمیم کریں",
@@ -1610,7 +1611,7 @@
 	"listduplicatedfiles": "مکررات کے ساتھ فائلوں کی فہرست",
 	"listduplicatedfiles-summary": "اس صفحہ میں ان فائلوں کی فہرست موجود ہے جن کا حالیہ نسخہ کسی دوسری فائل کے تازہ ترین نسخہ کی نقل ہے۔ اس فہرست میں محض مقامی فائلیں درج کی گئی ہیں۔",
 	"listduplicatedfiles-entry": "[[:File:$1|$1]] [[$3|{{PLURAL:$2|کی ایک نقل ہے|$2 نقلیں ہیں}}]]۔",
-	"unusedtemplates": "غیر استعمال شدہ سانچے",
+	"unusedtemplates": "غیر مستعمل سانچے",
 	"unusedtemplatestext": "اس صفحہ میں {{ns:template}} نام فضا کے ان تمام صفحات کی فہرست درج ہے جو کسی دوسرے صفحہ میں شامل نہیں ہیں۔\nانہیں حذف کرنے سے قبل سانچوں سے مربوط دیگر صفحات کو جانچنا نہ بھولیں۔",
 	"unusedtemplateswlh": "دیگر روابط",
 	"randompage": "جستہ جستہ مطالعہ",
@@ -1657,7 +1658,7 @@
 	"withoutinterwiki-summary": "درج ذیل صفحات دوسری زبان کے صفحات سے مربوط نہیں ہیں۔",
 	"withoutinterwiki-legend": "سابقہ",
 	"withoutinterwiki-submit": "دکھائیں",
-	"fewestrevisions": "کم نظرِ ثانی شدہ مضامین",
+	"fewestrevisions": "کم ترامیم کے حامل صفحات",
 	"nbytes": "$1 {{PLURAL:$1|بائٹ}}",
 	"ncategories": "{{PLURAL:$1|زمرہ|زمرہ جات}} $1",
 	"ninterwikis": "$1 {{PLURAL:$1|بین الویکی ربط|بین الویکی روابط}}",
@@ -1674,10 +1675,10 @@
 	"uncategorizedcategories": "بے زمرہ زمرہ جات",
 	"uncategorizedimages": "بے زمرہ تصاویر",
 	"uncategorizedtemplates": "غیر زمرہ بند سانچہ جات",
-	"unusedcategories": "غیر استعمال شدہ زمرہ جات",
-	"unusedimages": "غیر استعمال شدہ فائلیں",
+	"unusedcategories": "غیر مستعمل زمرہ جات",
+	"unusedimages": "غیر مستعمل فائلیں",
 	"wantedcategories": "مطلوبہ زمرہ جات",
-	"wantedpages": "درخواست شدہ مضامین",
+	"wantedpages": "مطلوبہ مضامین",
 	"wantedpages-summary": "ذیل میں ان غیر موجود صفحات کی فہرست ہے جن سے بہت سارے روابط مربوط ہیں، البتہ ان میں وہ صفحات شامل نہیں جن میں محض ان سے مربوط رجوع مکررات موجود ہیں۔ ان صفحوں کو دیکھنے کے لیے [[{{#special:BrokenRedirects}}|شکستہ روابط کی فہرست]] ملاحظہ فرمائیں۔",
 	"wantedpages-badtitle": "نتائج میں نادرست عنوان: $1",
 	"wantedfiles": "مطلوب تصاویر",
@@ -1825,11 +1826,11 @@
 	"listusers-noresult": "یہ صارف نہیں ملا",
 	"listusers-blocked": "(مسدود)",
 	"activeusers": "متحرک صارفین کی فہرست",
-	"activeusers-intro": "ذیل میں ان صارفین کی فہرست ہے جو گزشتہ $1 {{PLURAL:$1|دن|دنوں}} میں کسی وقت فعال رہے ہوں۔",
+	"activeusers-intro": "ذیل میں ان صارفین کی فہرست ہے جو گزشتہ $1 {{PLURAL:$1|دن|دنوں}} میں کسی بھی قسم کی سرگرمی میں شریک رہے ہوں۔",
 	"activeusers-count": "گزشتہ {{PLURAL:$3|دن|$3 دنوں}} میں $1 {{PLURAL:$1|اقدام|اقدامات}}",
 	"activeusers-from": "اس حرف سے شروع ہونے والے صارفین کے نام دکھائیں:",
-	"activeusers-hidebots": "پوشیدہ خود کار صارف",
-	"activeusers-hidesysops": "پوشیدہ منتظمین",
+	"activeusers-hidebots": "خودکار صارفین کو چھپائیں",
+	"activeusers-hidesysops": "منتظمین کو چھپائیں",
 	"activeusers-noresult": "یہ صارف نہیں مل سکا",
 	"activeusers-submit": "فعال صارفین دکھائیں",
 	"listgrouprights": "صارف گروہوں کے اختیارات",
@@ -2113,10 +2114,10 @@
 	"contributions-title": "صارف $1 کی شراکتیں",
 	"mycontris": "شراکتیں",
 	"anoncontribs": "شراکتیں",
-	"contribsub2": "برائے {{GENDER:$3|$1}} ($2)",
+	"contribsub2": "{{GENDER:$3|$1}} ($2)",
 	"contributions-userdoesnotexist": "«$1» کے نام سے صارف کھاتہ مندرج نہیں ہے۔",
 	"nocontribs": "اس معیار کے مطابق کوئی ترمیم دستیاب نہیں ہوئی۔",
-	"uctop": "(موجودہ)",
+	"uctop": "(موجودہ نسخہ)",
 	"month": "مہینہ (اور اُس سے قبل):",
 	"year": "سال (اور اُس سے قبل):",
 	"sp-contributions-newbies": "محض جدید صارفین کی شراکتیں دکھائیں",
@@ -2138,7 +2139,7 @@
 	"sp-contributions-hideminor": "معمولی ترامیم چھپائیں",
 	"sp-contributions-submit": "تلاش",
 	"whatlinkshere": "مربوط صفحات",
-	"whatlinkshere-title": "\"$1\" سے مربوط صفحات",
+	"whatlinkshere-title": "«$1» سے مربوط صفحات",
 	"whatlinkshere-page": "صفحہ:",
 	"linkshere": "<strong>[[:$1]]</strong> سے درج ذیل صفحات مربوط ہیں:",
 	"nolinkshere": "<strong>[[:$1]]</strong> سے کوئی صفحہ مربوط نہیں ہے۔",
@@ -2150,7 +2151,7 @@
 	"whatlinkshere-next": "{{PLURAL:$1|اگلا|اگلے $1}}",
 	"whatlinkshere-links": "→ روابط",
 	"whatlinkshere-hideredirs": "رجوع مکررات $1",
-	"whatlinkshere-hidetrans": "$1 استعمالات",
+	"whatlinkshere-hidetrans": "استعمالات $1",
 	"whatlinkshere-hidelinks": "روابط $1",
 	"whatlinkshere-hideimages": "تصویر کے روابط $1",
 	"whatlinkshere-filters": "مقطارات",
@@ -3047,7 +3048,7 @@
 	"autosumm-blank": "تمام مندرجات حذف",
 	"autosumm-replace": "\"$1\" سے مواد کی تبدیلی",
 	"autoredircomment": "[[$1]] سے رجوع مکرر",
-	"autosumm-new": "نے «$1» مواد پر مشتمل نیا صفحہ بنایا",
+	"autosumm-new": "«$1» مواد پر مشتمل نیا صفحہ بنایا",
 	"autosumm-newblank": "خالی صفحہ بنایا",
 	"size-bytes": "$1 بائٹ",
 	"size-kilobytes": "$1 کلوبائٹ",
@@ -3190,7 +3191,7 @@
 	"blankpage": "خالی صفحہ",
 	"intentionallyblankpage": "اس صفحہ کو دانستہ خالی چھوڑا گیا ہے۔",
 	"external_image_whitelist": "#اس سطر کو ہو بہو ایسا ہی رہنے دیں<pre>\n#ذیل میں ریجیکس کی عبارتیں درج کریں (محض // کے درمیان)\n#ان عبارتوں کی بیرونی تصویروں کے روابط سے مطابقت کی جائے گی\n#جو مطابق ہو جائیں وہ تصویر کے طور پر نظر آئیں گے ورنہ محض تصویر کا ربط ظاہر ہوگا\n# علامت # سے شرع ہونے والی سطروں کو تبصرہ سمجھا جائے گا\n#چھوٹے بڑے حروف کو نظر انداز کیا جائے گا\n\nریجیکس کی تمام عبارتوں کو اس سطر کے اوپر رکھیں۔ اس سطر کو ہو بہو ایسا ہی رہنے دیں</pre>",
-	"tags": "تبدیلی کے درست ٹیگ",
+	"tags": "درست تبدیلی کے ٹیگ",
 	"tag-filter": "مقطار [[Special:Tags|ٹیگ]]:",
 	"tag-filter-submit": "مقطار",
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|ٹیگ}}]]: $2)",
@@ -3315,6 +3316,12 @@
 	"htmlform-cloner-create": "مزید اضافہ کریں",
 	"htmlform-cloner-delete": "حذف",
 	"htmlform-cloner-required": "کم ازکم ایک قدر درکار ہے۔",
+	"htmlform-date-placeholder": "YYYY-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "YYYY-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "آپ کی درج کردہ قدر تسلیم شدہ تاریخ نہیں ہے۔ براہ کرم YYYY-MM-DD فارمیٹ استعمال کرنے کی کوشش کریں۔",
+	"htmlform-time-invalid": "آپ کی درج کردہ قدر تسلیم شدہ وقت نہیں ہے۔ براہ کرم HH:MM:SS فارمیٹ استعمال کرنے کی کوشش کریں۔",
+	"htmlform-datetime-invalid": "آپ کی درج کردہ قدر تسلیم شدہ تاریخ اور وقت نہیں ہے۔ براہ کرم YYYY-MM-DD HH:MM:SS فارمیٹ استعمال کرنے کی کوشش کریں۔",
 	"htmlform-title-badnamespace": "[[:$1]] صفحہ \"{{ns:$2}}\" نام فضا میں موجود نہیں۔",
 	"htmlform-title-not-creatable": "«$1» عنوان قابل تخلیق نہیں",
 	"htmlform-title-not-exists": "$1 موجود نہیں ہے۔",
@@ -3398,7 +3405,6 @@
 	"feedback-external-bug-report-button": "تکنیکی خامی کی اطلاع دیں",
 	"feedback-dialog-title": "تبصرہ روانہ کریں",
 	"feedback-dialog-intro": "اپنا تبصرہ شائع کرنے کے لیے ذیل میں موجود فارم کو استعمال کر سکتے ہیں۔ آپ کا تبصرہ آپ کے صارف نام کے ساتھ صفحہ «$1» میں شامل کر دیا جائے گا۔",
-	"feedback-error-title": "نقص",
 	"feedback-error1": "نقص: اے پی آئی کی جانب سے غیر معروف نتیجہ",
 	"feedback-error2": "نقص: ترمیم ناکام ہو گئی",
 	"feedback-error3": "نقص: اے پی آئی سے کوئی جواب نہیں",
@@ -3486,7 +3492,7 @@
 	"limitreport-templateargumentsize-value": "$1/$2 {{PLURAL:$2|بائٹ}}",
 	"limitreport-expansiondepth": "توسیع کی بلند ترین گہرائی",
 	"limitreport-expensivefunctioncount": "کثیر الاستعمال پارسر فنکشنوں کی تعداد",
-	"expandtemplates": "سانچے کو وسیع کریں",
+	"expandtemplates": "سانچوں کی توسیع",
 	"expand_templates_intro": "اس خصوصی صفحہ میں ویکی کی عبارتوں کو اخذ کرکے ان میں موجود تمام مستعمل سانچوں کو کھولا جاتا ہے۔\nنیز اس صفحہ میں <code><nowiki>{{</nowiki>#language:…}}</code> جیسے پارسر فنکشنوں اور <code><nowiki>{{</nowiki>CURRENTDAY}}</code> جیسے متغیرات کی معاونت بھی رکھی گئی ہے۔\nدرحقیقت یہاں ہر چیز کو دوہرے محرابی قوسین میں کھول دیا جاتا ہے۔",
 	"expand_templates_title": "اس عبارت کا عنوان، مثلاً {{FULLPAGENAME}} وغیرہ کے لیے:",
 	"expand_templates_input": "ان پٹ متن:",
diff --git a/languages/i18n/uz.json b/languages/i18n/uz.json
index 71b389fbdb..25b3d3d904 100644
--- a/languages/i18n/uz.json
+++ b/languages/i18n/uz.json
@@ -12,10 +12,11 @@
 			"Arystanbek",
 			"6ahodir",
 			"Таржимон",
-			"Ximik1991"
+			"Ximik1991",
+			"Bmansurov"
 		]
 	},
-	"tog-underline": "Havolalarning tagiga chizish:",
+	"tog-underline": "Havolaning tagiga chizish:",
 	"tog-hideminor": "Yangi oʻzgarishlar roʻyxatida kichik tahrirlarni yashirish",
 	"tog-hidepatrolled": "Yangi oʻzgarishlar roʻyxatida tekshirilgan tahrirlarni yashirish",
 	"tog-newpageshidepatrolled": "Yangi sahifalar roʻyxatidan tekshirilgan sahifalarni yashirish",
@@ -51,13 +52,13 @@
 	"tog-diffonly": "Versiyalar taqqoslanayotganda, pastda sahifa matni koʻrsatilmasin",
 	"tog-showhiddencats": "Yashirin turkumlarni koʻrsatish",
 	"tog-norollbackdiff": "Tahrir qaytarilganda, versiyalar taqqosi koʻrsatilmasin",
-	"tog-useeditwarning": "Oʻzgarishlarni saqlamay sahifadan chiqib ketayotganim haqida ogohlantirish",
+	"tog-useeditwarning": "Oʻzgarishlarni saqlamay sahifadan chiqib ketayotganim haqida ogohlantir",
 	"tog-prefershttps": "Doim himoyalangan holda kirish",
 	"underline-always": "Har doim",
 	"underline-never": "Hech qachon",
-	"underline-default": "Brauzer moslamari boʻyicha",
+	"underline-default": "Bezak mavzusi yoki brauzer andozasi boʻyicha",
 	"editfont-style": "Tahrirlash maydonidagi shrift turi:",
-	"editfont-default": "Brauzer moslamari boʻyicha",
+	"editfont-default": "Brauzer andozasi boʻyicha",
 	"editfont-monospace": "Teng enli shrift (Monospaced)",
 	"editfont-sansserif": "Kertiksiz shrift (Sans-serif)",
 	"editfont-serif": "Kertikli shrift (Serif)",
@@ -111,13 +112,13 @@
 	"oct": "Okt",
 	"nov": "Noy",
 	"dec": "Dek",
-	"january-date": "Yanvar $1",
-	"february-date": "Fevral $1",
-	"march-date": "Mart $1",
-	"april-date": "Aprel $1",
-	"may-date": "$1-may",
-	"june-date": "Iyun $1",
-	"july-date": "Iyul $1",
+	"january-date": "$1 yanvar",
+	"february-date": "$1 fevral",
+	"march-date": "$1 mart",
+	"april-date": "$1 aprel",
+	"may-date": "$1 may",
+	"june-date": "$1 iyun",
+	"july-date": "$1 iyul",
 	"august-date": "Avgust $1",
 	"september-date": "Sentabr $1",
 	"october-date": "Oktabr $1",
@@ -348,7 +349,6 @@
 	"yourpasswordagain": "Maxfiy so‘zni qayta kiriting:",
 	"createacct-yourpasswordagain": "Maxfiy soʻzni tasdiqlang",
 	"createacct-yourpasswordagain-ph": "Maxfiy soʻzni yana bir bor kiriting",
-	"remembermypassword": "Hisob ma’lumotlarim ushbu brauzerda eslab qolinsin (ko‘pi bilan $1 {{PLURAL:$1|kunga|kunga}})",
 	"userlogin-remembermypassword": "Kirgan deb esda saqla",
 	"userlogin-signwithsecure": "Himoyalangan holda kirish",
 	"yourdomainname": "Sizning domeningiz:",
diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json
index 31b213fb98..1a15bf2255 100644
--- a/languages/i18n/vi.json
+++ b/languages/i18n/vi.json
@@ -62,7 +62,7 @@
 	"tog-enotifminoredits": "Gửi thư cho tôi cả những thay đổi nhỏ trong trang và tập tin",
 	"tog-enotifrevealaddr": "Hiện địa chỉ thư điện tử của tôi trong thư thông báo",
 	"tog-shownumberswatching": "Hiển thị số người đang xem",
-	"tog-oldsig": "Chữ ký hiện tại:",
+	"tog-oldsig": "Chữ ký hiện tại của bạn:",
 	"tog-fancysig": "Xem chữ ký là mã wiki (không có liên kết tự động)",
 	"tog-uselivepreview": "Xem trước trực tiếp",
 	"tog-forceeditsummary": "Nhắc tôi khi tôi quên tóm lược sửa đổi",
@@ -79,7 +79,7 @@
 	"tog-showhiddencats": "Hiển thị thể loại ẩn",
 	"tog-norollbackdiff": "Bỏ qua bản so sánh sau khi lùi sửa",
 	"tog-useeditwarning": "Cảnh báo khi tôi thoát trang sửa đổi mà chưa lưu trang",
-	"tog-prefershttps": "Luôn kết nối an toàn khi đăng nhập",
+	"tog-prefershttps": "Luôn kết nối an toàn khi đã đăng nhập",
 	"underline-always": "Luôn luôn",
 	"underline-never": "Không bao giờ",
 	"underline-default": "Mặc định của giao diện hoặc trình duyệt",
@@ -174,7 +174,7 @@
 	"newwindow": "(mở cửa sổ mới)",
 	"cancel": "Hủy bỏ",
 	"moredotdotdot": "Thêm nữa…",
-	"morenotlisted": "Danh sách này không có đầy đủ.",
+	"morenotlisted": "Danh sách này có thể không đầy đủ.",
 	"mypage": "Trang cá nhân",
 	"mytalk": "Tin nhắn",
 	"anontalk": "Thảo luận",
@@ -505,7 +505,7 @@
 	"eauthentsent": "Thư xác nhận đã được gửi cho địa chỉ thư điện tử được chỉ định. Trước khi bạn có thể nhận thư, bạn cần thực hiện hướng dẫn trong thư để xác nhận tài khoản thuộc về bạn.",
 	"throttled-mailpassword": "Mật khẩu đã được gửi đến cho bạn trong vòng {{PLURAL:$1|$1 giờ|$1 giờ}} đồng hồ trở lại. Để tránh lạm dụng, chỉ có thể gửi mật khẩu $1 giờ đồng hồ một lần.",
 	"mailerror": "Lỗi gửi thư : $1",
-	"acct_creation_throttle_hit": "Ai đó cùng [[địa chỉ IP]] với bạn đã mở {{PLURAL:$1|một tài khoản|$1 tài khoản}} ở đây trong vòng 24 giờ. Vì quy định hạn chế số tài khoản mở trên một địa chỉ IP nên bạn hiện không thể mở thêm được nữa dùng địa chỉ IP này.",
+	"acct_creation_throttle_hit": "Ai đó cùng địa chỉ IP với bạn đã mở {{PLURAL:$1|một tài khoản|$1 tài khoản}} ở đây vào $2 qua. Vì quy định hạn chế số tài khoản mở trên một địa chỉ IP nên bạn hiện không thể mở thêm được nữa dùng địa chỉ IP này.",
 	"emailauthenticated": "Địa chỉ thư điện tử của bạn được xác nhận vào lúc $3 $2.",
 	"emailnotauthenticated": "Địa chỉ thư điện tử của bạn chưa được xác nhận. Các chức năng sau sẽ không gửi thư điện tử.",
 	"noemailprefs": "Hãy ghi một địa chỉ thư điện tử trong tùy chọn cá nhân để có thể sử dụng tính năng này.",
@@ -556,7 +556,6 @@
 	"botpasswords-label-resetpassword": "Đặt lại mật khẩu",
 	"botpasswords-label-grants": "Các quyền có liên quan:",
 	"botpasswords-help-grants": "Các lượt cấp phép cho phép truy cập các quyền người dùng mà một tài khoản đã có sẵn. Xem thêm thông tin trong [[Special:ListGrants|bảng cấp phép]].",
-	"botpasswords-label-restrictions": "Hạn chế sử dụng:",
 	"botpasswords-label-grants-column": "Cấp quyền",
 	"botpasswords-bad-appid": "Bot có tên \"$1\" không hợp lệ.",
 	"botpasswords-insert-failed": "Không thể thêm tên bot \"$1\". Nó đã được thêm vào chưa?",
@@ -567,7 +566,7 @@
 	"botpasswords-updated-body": "Đã cập nhật mật khẩu cho bot “$1” của người dùng “$2”.",
 	"botpasswords-deleted-title": "Bot mật khẩu đã bị xóa",
 	"botpasswords-deleted-body": "Đã xóa mật khẩu cho bot “$1” của người dùng “$2”.",
-	"botpasswords-newpassword": "Mật khẩu mới để đăng nhập như <strong>$1</strong> là <strong>$2</strong>. <em>Xin hãy ghi lại mật khẩu này để mai mốt tham khảo.</em>",
+	"botpasswords-newpassword": "Mật khẩu mới để đăng nhập như <strong>$1</strong> là <strong>$2</strong>. <em>Xin hãy ghi lại mật khẩu này để mai mốt tham khảo.</em> <br> (Các bot cũ cần tên đăng nhập khớp với tên người dùng cuối cùng có thể sử  dụng tên người dùng <strong>$3</strong> và mật khẩu <strong>$4</strong>.)",
 	"botpasswords-no-provider": "BotPasswordsSessionProvider không có sẵn.",
 	"botpasswords-restriction-failed": "Mật khẩu bot giới hạn ngăn chặn đăng nhập này.",
 	"botpasswords-invalid-name": "Tên người dùng đã chỉ định không chứa dấu tách mật khẩu bot (\"$1\").",
@@ -1121,20 +1120,20 @@
 	"group-bot": "Bot",
 	"group-sysop": "Bảo quản viên",
 	"group-bureaucrat": "Hành chính viên",
-	"group-suppress": "Giám sát viên",
+	"group-suppress": "Người xóa hẳn Flow",
 	"group-all": "(tất cả)",
 	"group-user-member": "{{GENDER:$1}}thành viên",
 	"group-autoconfirmed-member": "{{GENDER:$1}}thành viên tự động xác nhận",
 	"group-bot-member": "{{GENDER:$1}}bot",
 	"group-sysop-member": "{{GENDER:$1}}bảo quản viên",
 	"group-bureaucrat-member": "{{GENDER:$1}}hành chính viên",
-	"group-suppress-member": "{{GENDER:$1}}giám sát viên",
+	"group-suppress-member": "{{GENDER:$1}}người xóa hẳn Flow",
 	"grouppage-user": "{{ns:project}}:Thành viên",
 	"grouppage-autoconfirmed": "{{ns:project}}:Thành viên tự xác nhận",
 	"grouppage-bot": "{{ns:project}}:Bot",
 	"grouppage-sysop": "{{ns:project}}:Bảo quản viên",
 	"grouppage-bureaucrat": "{{ns:project}}:Hành chính viên",
-	"grouppage-suppress": "{{ns:project}}:Đàn áp viên",
+	"grouppage-suppress": "{{ns:project}}:Người xóa hẳn Flow",
 	"right-read": "Đọc trang",
 	"right-edit": "Sá»­a trang",
 	"right-createpage": "Tạo trang (không phải trang thảo luận)",
@@ -3364,7 +3363,7 @@
 	"tags-actions-header": "Tác vụ",
 	"tags-active-yes": "Kích hoạt",
 	"tags-active-no": "Vô hiệu",
-	"tags-source-extension": "Xác định bởi một mở rộng",
+	"tags-source-extension": "Xác định bởi phần mềm",
 	"tags-source-manual": "Áp dụng thủ công bởi người dùng và bot",
 	"tags-source-none": "Không còn sử dụng",
 	"tags-edit": "sá»­a",
@@ -3477,8 +3476,6 @@
 	"htmlform-title-not-exists": "$1 không tồn tại.",
 	"htmlform-user-not-exists": "<strong>$1</strong> không tồn tại.",
 	"htmlform-user-not-valid": "<strong>$1</strong> không phải là tên người dùng.",
-	"sqlite-has-fts": "$1 với sự hỗ trợ tìm kiếm toàn văn",
-	"sqlite-no-fts": "$1 không có hỗ trợ tìm kiếm toàn văn",
 	"logentry-delete-delete": "$1 {{GENDER:$2}}đã xóa trang “$3”",
 	"logentry-delete-restore": "$1 {{GENDER:$2}}đã phục hồi trang “$3”",
 	"logentry-delete-event": "$1 {{GENDER:$2}}đã thay đổi mức hiển thị của {{PLURAL:$5|một mục nhật trình|$5 mục nhật trình}} về $3: $4",
@@ -3557,7 +3554,6 @@
 	"feedback-external-bug-report-button": "Tạo một công việc kỹ thuật",
 	"feedback-dialog-title": "Gửi phản hồi",
 	"feedback-dialog-intro": "Bạn có thể gửi phản hồi dễ dàng qua biểu mẫu bên dưới. Thông tin phản hồi của bạn sẽ được bổ sung vào trang “$1” cùng với tên người dùng của bạn.",
-	"feedback-error-title": "Lỗi",
 	"feedback-error1": "Hủy bỏ",
 	"feedback-error2": "Lỗi: Sửa đổi thất bại",
 	"feedback-error3": "Lỗi: API không có phản ứng",
diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json
index 3798d91739..70940ec260 100644
--- a/languages/i18n/zh-hans.json
+++ b/languages/i18n/zh-hans.json
@@ -519,7 +519,7 @@
 	"userlogin-createanother": "创建另一个账户",
 	"createacct-emailrequired": "电子邮件地址",
 	"createacct-emailoptional": "电子邮件地址（可选）",
-	"createacct-email-ph": "请输入你的电子邮件地址",
+	"createacct-email-ph": "请输入您的电子邮件地址",
 	"createacct-another-email-ph": "输入电子邮件地址",
 	"createaccountmail": "使用一个临时的随机密码并将其发送到指定的电子邮件地址中",
 	"createaccountmail-help": "可被用于为另一个人创建账户而不需要得知密码。",
@@ -646,11 +646,11 @@
 	"resetpass-temp-emailed": "您通过一个暂时电子邮件发送的代码登录。要完成登录，您必须在此设置一个新密码：",
 	"resetpass-temp-password": "临时密码：",
 	"resetpass-abort-generic": "密码更改已经被扩展程序中止。",
-	"resetpass-expired": "你的密码已经到期。请设置新登录密码。",
+	"resetpass-expired": "您的密码已经到期。请设置新登录密码。",
 	"resetpass-expired-soft": "您的密码已经到期，需要重置。请现在更换新密码，或单击“{{int:authprovider-resetpass-skip-label}}”以稍后重置。",
 	"resetpass-validity-soft": "您的密码无效：$1\n\n请选择一个新密码，或单击“{{int:authprovider-resetpass-skip-label}}”以稍后重置。",
 	"passwordreset": "重置密码",
-	"passwordreset-text-one": "请输入你要重置的用户名。",
+	"passwordreset-text-one": "请完成此表单来通过电子邮件接收临时密码。",
 	"passwordreset-text-many": "{{PLURAL:$1|在此键入您希望接收临时密码的邮件地址。}}",
 	"passwordreset-disabled": "此Wiki已经禁用密码重置。",
 	"passwordreset-emaildisabled": "此Wiki上无法使用邮件功能。",
@@ -1025,7 +1025,7 @@
 	"searchprofile-advanced-tooltip": "在自定义名字空间中搜索",
 	"search-result-size": "$1（$2个字）",
 	"search-result-category-size": "$1个成员（$2个子分类，$3个文件）",
-	"search-redirect": "（重定向自“$1”）",
+	"search-redirect": "（重定向自$1）",
 	"search-section": "（“$1”章节）",
 	"search-category": "（分类$1）",
 	"search-file-match": "（匹配文件内容）",
@@ -1540,6 +1540,7 @@
 	"upload-dialog-disabled": "使用此对话框的文件上传在此wiki已禁用。",
 	"upload-dialog-title": "上传文件",
 	"upload-dialog-button-cancel": "取消",
+	"upload-dialog-button-back": "返回",
 	"upload-dialog-button-done": "完成",
 	"upload-dialog-button-save": "保存",
 	"upload-dialog-button-upload": "上传",
@@ -1604,7 +1605,7 @@
 	"uploadstash-summary": "这个页面提供已经上传（或者上传中）但未发布到wiki之文件存取。这些文件除了上传的用户之外不会被其他人可见。",
 	"uploadstash-clear": "清除贮藏文件",
 	"uploadstash-nofiles": "您没有被隐藏的文件。",
-	"uploadstash-badtoken": "执行对应操作失败。可能是因为您的编辑凭证已过期。请重试。",
+	"uploadstash-badtoken": "执行对应操作失败，可能是因为您的编辑凭据已过期。请重试。",
 	"uploadstash-errclear": "清除文件失败。",
 	"uploadstash-refresh": "更新文件列表",
 	"uploadstash-thumbnail": "显示缩略图",
@@ -3471,6 +3472,18 @@
 	"htmlform-cloner-create": "添加更多",
 	"htmlform-cloner-delete": "移除",
 	"htmlform-cloner-required": "至少一个值是必需的。",
+	"htmlform-date-placeholder": "YYYY-MM-DD",
+	"htmlform-time-placeholder": "HH:MM:SS",
+	"htmlform-datetime-placeholder": "YYYY-MM-DD HH:MM:SS",
+	"htmlform-date-invalid": "您指定的值不是可识别的日期。尝试使用YYYY-MM-DD格式。",
+	"htmlform-time-invalid": "您指定的值不是可识别的时间。尝试使用HH:MM:SS格式。",
+	"htmlform-datetime-invalid": "您指定的值不是可识别的日期和时间。尝试使用YYYY-MM-DD HH:MM:SS格式。",
+	"htmlform-date-toolow": "您指定的值在$1的最早允许日期之前。",
+	"htmlform-date-toohigh": "您指定的值在$1的最晚允许日期之后。",
+	"htmlform-time-toolow": "您指定的值在$1的最早允许时间之前。",
+	"htmlform-time-toohigh": "您指定的值在$1的最晚允许时间之后。",
+	"htmlform-datetime-toolow": "您指定的值在$1的最早允许日期和时间之前。",
+	"htmlform-datetime-toohigh": "您指定的值在$1的最晚允许日期和时间之后。",
 	"htmlform-title-badnamespace": "[[:$1]]不在“{{ns:$2}}”名字空间中。",
 	"htmlform-title-not-creatable": "“$1”不是一个可创建的页面标题",
 	"htmlform-title-not-exists": "$1不存在",
@@ -3554,7 +3567,6 @@
 	"feedback-external-bug-report-button": "提交技术报告",
 	"feedback-dialog-title": "发送反馈",
 	"feedback-dialog-intro": "您可以使用下面的简便表格提交您的反馈。您的评论将连同您的用户名一起加入至页面“$1”。",
-	"feedback-error-title": "错误",
 	"feedback-error1": "错误：从API返回无法识别的结果",
 	"feedback-error2": "错误：编辑失败",
 	"feedback-error3": "错误：API没有响应",
@@ -3787,13 +3799,13 @@
 	"authmanager-authn-not-in-progress": "身份验证尚未进行，或会话数据丢失。请从头重新开始。",
 	"authmanager-authn-no-primary": "提供的凭据不能被认证。",
 	"authmanager-authn-no-local-user": "提供的证书没有与该wiki上的任何用户相关联。",
-	"authmanager-authn-no-local-user-link": "提供的证书有效，但没有与该wiki上的任何用户相关联。请通过不同方式登录，或创建一个新用户，然后您将拥有一个把您之前的证书链接到对应账户的选项。",
+	"authmanager-authn-no-local-user-link": "提供的凭据有效，但没有与该wiki上的任何用户相关联。请通过不同方式登录，或创建一个新用户，然后您将拥有一个把您之前的凭据链接到对应账户的选项。",
 	"authmanager-authn-autocreate-failed": "所有账户的自动创建失败：$1",
-	"authmanager-change-not-supported": "提供的证书不能被更改，因为没有东西会使用它们。",
+	"authmanager-change-not-supported": "提供的凭据不能被更改，因为没有东西会使用它们。",
 	"authmanager-create-disabled": "账户创建已停用。",
 	"authmanager-create-from-login": "要创建您的账户，请填写下方的字段。",
 	"authmanager-create-not-in-progress": "账户创建尚未进行，或会话数据丢失。请从头重新开始。",
-	"authmanager-create-no-primary": "提供的证书不能用于账户创建。",
+	"authmanager-create-no-primary": "提供的凭据不能用于账户创建。",
 	"authmanager-link-no-primary": "提供的证书不能用于账户链接。",
 	"authmanager-link-not-in-progress": "账户链接尚未进行，或会话数据丢失。请从头重新开始。",
 	"authmanager-authplugin-setpass-failed-title": "密码更改失败",
@@ -3838,15 +3850,15 @@
 	"authpage-cannot-link-continue": "无法继续账户链接。您的会话大概已超时。",
 	"cannotauth-not-allowed-title": "权限被拒绝",
 	"cannotauth-not-allowed": "您不被允许使用此页面",
-	"changecredentials": "更改证书",
-	"changecredentials-submit": "更改证书",
-	"changecredentials-invalidsubpage": "$1不是有效的证书类型。",
+	"changecredentials": "更改凭据",
+	"changecredentials-submit": "更改凭据",
+	"changecredentials-invalidsubpage": "$1不是有效的凭据类型。",
 	"changecredentials-success": "您的证书已被更改。",
-	"removecredentials": "移除证书",
+	"removecredentials": "移除凭据",
 	"removecredentials-submit": "移除证书",
-	"removecredentials-invalidsubpage": "$1不是有效的证书类型。",
+	"removecredentials-invalidsubpage": "$1不是有效的凭据类型。",
 	"removecredentials-success": "您的证书已被移除。",
-	"credentialsform-provider": "证书类型：",
+	"credentialsform-provider": "凭据类型：",
 	"credentialsform-account": "帐户名称：",
 	"cannotlink-no-provider-title": "没有可链接账户",
 	"cannotlink-no-provider": "没有可链接账户。",
diff --git a/languages/messages/MessagesOlo.php b/languages/messages/MessagesOlo.php
index ba3d364b54..14f5b6f771 100644
--- a/languages/messages/MessagesOlo.php
+++ b/languages/messages/MessagesOlo.php
@@ -10,5 +10,24 @@
 
 $fallback = 'ru';
 
+$namespaceNames = [
+	NS_MEDIA            => 'Medii',
+	NS_SPECIAL          => 'Erikoine',
+	NS_TALK             => 'Pagin',
+	NS_USER             => 'Käyttäi',
+	NS_USER_TALK        => 'Käyttäi_pagin',
+	NS_PROJECT_TALK     => '$1_pagin',
+	NS_FILE             => 'Failu',
+	NS_FILE_TALK        => 'Failu_pagin',
+	NS_MEDIAWIKI        => 'MediiWiki',
+	NS_MEDIAWIKI_TALK   => 'MediiWiki_pagin',
+	NS_TEMPLATE         => 'Å ablonu',
+	NS_TEMPLATE_TALK    => 'Å ablonu_pagin',
+	NS_HELP             => 'Abu',
+	NS_HELP_TALK        => 'Abu_pagin',
+	NS_CATEGORY         => 'Kategourii',
+	NS_CATEGORY_TALK    => 'Kategourii_pagin',
+];
+
 $linkTrail = '/^([a-zčČšŠžŽäÄöÖ]+)(.*)$/sDu';
 
diff --git a/load.php b/load.php
index c832237059..974771f978 100644
--- a/load.php
+++ b/load.php
@@ -23,6 +23,7 @@
  */
 
 use MediaWiki\Logger\LoggerFactory;
+use MediaWiki\MediaWikiServices;
 
 // This endpoint is supposed to be independent of request cookies and other
 // details of the session. Enforce this constraint with respect to session use.
@@ -35,6 +36,12 @@ if ( !$wgRequest->checkUrlExtension() ) {
 	return;
 }
 
+// Don't initialise ChronologyProtector from object cache, and
+// don't wait for unrelated MediaWiki writes when querying ResourceLoader.
+MediaWikiServices::getInstance()->getDBLoadBalancerFactory()->setRequestInfo( [
+	'ChronologyProtection' => 'false',
+] );
+
 // Set up ResourceLoader
 $resourceLoader = new ResourceLoader(
 	ConfigFactory::getDefaultInstance()->makeConfig( 'main' ),
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index e1a4dc6e3e..1cb5eefe87 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -1316,7 +1316,7 @@ abstract class Maintenance {
 
 	/**
 	 * Lock the search index
-	 * @param DatabaseBase &$db
+	 * @param Database &$db
 	 */
 	private function lockSearchindex( $db ) {
 		$write = [ 'searchindex' ];
@@ -1334,7 +1334,7 @@ abstract class Maintenance {
 
 	/**
 	 * Unlock the tables
-	 * @param DatabaseBase &$db
+	 * @param Database &$db
 	 */
 	private function unlockSearchindex( $db ) {
 		$db->unlockTables( __CLASS__ . '::' . __METHOD__ );
@@ -1343,7 +1343,7 @@ abstract class Maintenance {
 	/**
 	 * Unlock and lock again
 	 * Since the lock is low-priority, queued reads will be able to complete
-	 * @param DatabaseBase &$db
+	 * @param Database &$db
 	 */
 	private function relockSearchindex( $db ) {
 		$this->unlockSearchindex( $db );
@@ -1354,7 +1354,7 @@ abstract class Maintenance {
 	 * Perform a search index update with locking
 	 * @param int $maxLockTime The maximum time to keep the search index locked.
 	 * @param string $callback The function that will update the function.
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @param array $results
 	 */
 	public function updateSearchIndex( $maxLockTime, $callback, $dbw, $results ) {
@@ -1390,7 +1390,7 @@ abstract class Maintenance {
 
 	/**
 	 * Update the searchindex table for a given pageid
-	 * @param DatabaseBase $dbw A database write handle
+	 * @param Database $dbw A database write handle
 	 * @param int $pageId The page ID to update.
 	 * @return null|string
 	 */
diff --git a/maintenance/archives/patch-change_tag-ct_id.sql b/maintenance/archives/patch-change_tag-ct_id.sql
new file mode 100644
index 0000000000..7b986d6781
--- /dev/null
+++ b/maintenance/archives/patch-change_tag-ct_id.sql
@@ -0,0 +1,5 @@
+-- Primary key in change_tag table
+
+ALTER TABLE /*$wgDBprefix*/change_tag
+	ADD COLUMN ct_id INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+	ADD PRIMARY KEY (ct_id);
diff --git a/maintenance/archives/patch-tag_summary-ts_id.sql b/maintenance/archives/patch-tag_summary-ts_id.sql
new file mode 100644
index 0000000000..66fa72e15a
--- /dev/null
+++ b/maintenance/archives/patch-tag_summary-ts_id.sql
@@ -0,0 +1,5 @@
+-- Primary key in tag_summary table
+
+ALTER TABLE /*$wgDBprefix*/tag_summary
+	ADD COLUMN ts_id INT UNSIGNED NOT NULL AUTO_INCREMENT FIRST,
+	ADD PRIMARY KEY (ts_id);
diff --git a/maintenance/archives/upgradeLogging.php b/maintenance/archives/upgradeLogging.php
index cf5a19ca13..0beff7caec 100644
--- a/maintenance/archives/upgradeLogging.php
+++ b/maintenance/archives/upgradeLogging.php
@@ -32,7 +32,7 @@ require __DIR__ . '/../commandLine.inc';
 class UpdateLogging {
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	public $dbw;
 	public $batchSize = 1000;
diff --git a/maintenance/benchmarks/bench_delete_truncate.php b/maintenance/benchmarks/bench_delete_truncate.php
index e9cdb5891d..2a8d79a944 100644
--- a/maintenance/benchmarks/bench_delete_truncate.php
+++ b/maintenance/benchmarks/bench_delete_truncate.php
@@ -69,7 +69,7 @@ class BenchmarkDeleteTruncate extends Benchmarker {
 	}
 
 	/**
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return void
 	 */
 	private function insertData( $dbw ) {
@@ -82,7 +82,7 @@ class BenchmarkDeleteTruncate extends Benchmarker {
 	}
 
 	/**
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return void
 	 */
 	private function delete( $dbw ) {
@@ -90,7 +90,7 @@ class BenchmarkDeleteTruncate extends Benchmarker {
 	}
 
 	/**
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return void
 	 */
 	private function truncate( $dbw ) {
diff --git a/maintenance/convertUserOptions.php b/maintenance/convertUserOptions.php
index 14557f42f9..b8001a4d21 100644
--- a/maintenance/convertUserOptions.php
+++ b/maintenance/convertUserOptions.php
@@ -74,7 +74,7 @@ class ConvertUserOptions extends Maintenance {
 
 	/**
 	 * @param ResultWrapper $res
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return null|int
 	 */
 	function convertOptionBatch( $res, $dbw ) {
diff --git a/maintenance/deleteOrphanedRevisions.php b/maintenance/deleteOrphanedRevisions.php
index 507a494304..df496d435b 100644
--- a/maintenance/deleteOrphanedRevisions.php
+++ b/maintenance/deleteOrphanedRevisions.php
@@ -83,7 +83,7 @@ class DeleteOrphanedRevisions extends Maintenance {
 	 * Do this inside a transaction
 	 *
 	 * @param array $id Array of revision id values
-	 * @param DatabaseBase $dbw DatabaseBase class (needs to be a master)
+	 * @param Database $dbw Database class (needs to be a master)
 	 */
 	private function deleteRevs( $id, &$dbw ) {
 		if ( !is_array( $id ) ) {
diff --git a/maintenance/dumpIterator.php b/maintenance/dumpIterator.php
index 31272bcaa6..9f983c1a04 100644
--- a/maintenance/dumpIterator.php
+++ b/maintenance/dumpIterator.php
@@ -117,7 +117,7 @@ abstract class DumpIterator extends Maintenance {
 	/**
 	 * Callback function for each revision, child classes should override
 	 * processRevision instead.
-	 * @param DatabaseBase $rev
+	 * @param Database $rev
 	 */
 	public function handleRevision( $rev ) {
 		$title = $rev->getTitle();
diff --git a/maintenance/dumpTextPass.php b/maintenance/dumpTextPass.php
index d0bda4ed3a..d8661c1a3b 100644
--- a/maintenance/dumpTextPass.php
+++ b/maintenance/dumpTextPass.php
@@ -86,7 +86,7 @@ class TextPassDumper extends BackupDumper {
 	protected $checkpointFiles = [];
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	protected $db;
 
diff --git a/maintenance/fetchText.php b/maintenance/fetchText.php
index 2ed1efaed5..9dee6e530d 100644
--- a/maintenance/fetchText.php
+++ b/maintenance/fetchText.php
@@ -71,7 +71,7 @@ class FetchText extends Maintenance {
 
 	/**
 	 * May throw a database error if, say, the server dies during query.
-	 * @param DatabaseBase $db
+	 * @param Database $db
 	 * @param int $id The old_id
 	 * @return string
 	 */
diff --git a/maintenance/interwiki.list b/maintenance/interwiki.list
index b1e0fa4cad..3cc009e744 100644
--- a/maintenance/interwiki.list
+++ b/maintenance/interwiki.list
@@ -7,7 +7,6 @@ c2find|http://c2.com/cgi/wiki?FindPage&value=$1|0|
 cache|http://www.google.com/search?q=cache:$1|0|
 commons|https://commons.wikimedia.org/wiki/$1|0|https://commons.wikimedia.org/w/api.php
 dictionary|http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1|0|
-docbook|http://wiki.docbook.org/$1|0|
 doi|http://dx.doi.org/$1|0|
 drumcorpswiki|http://www.drumcorpswiki.com/$1|0|http://drumcorpswiki.com/api.php
 dwjwiki|http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1|0|
@@ -16,22 +15,18 @@ emacswiki|http://www.emacswiki.org/cgi-bin/wiki.pl?$1|0|
 foldoc|http://foldoc.org/?$1|0|
 foxwiki|http://fox.wikis.com/wc.dll?Wiki~$1|0|
 freebsdman|http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1|0|
-gej|http://www.esperanto.de/dej.malnova/aktivikio.pl?$1|0|
 gentoo-wiki|http://gentoo-wiki.com/$1|0|
 google|http://www.google.com/search?q=$1|0|
 googlegroups|http://groups.google.com/groups?q=$1|0|
 hammondwiki|http://www.dairiki.org/HammondWiki/$1|0|
 hrwiki|http://www.hrwiki.org/wiki/$1|0|http://www.hrwiki.org/w/api.php
 imdb|http://www.imdb.com/find?q=$1&tt=on|0|
-jargonfile|http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1|0|
 kmwiki|http://kmwiki.wikispaces.com/$1|0|
 linuxwiki|http://linuxwiki.de/$1|0|
 lojban|http://mw.lojban.org/papri/$1|0|
 lqwiki|http://wiki.linuxquestions.org/wiki/$1|0|
-lugkr|http://www.lug-kr.de/wiki/$1|0|
 meatball|http://www.usemod.com/cgi-bin/mb.pl?$1|0|
 mediawikiwiki|https://www.mediawiki.org/wiki/$1|0|https://www.mediawiki.org/w/api.php
-mediazilla|https://bugzilla.wikimedia.org/$1|0|
 memoryalpha|http://en.memory-alpha.org/wiki/$1|0|http://en.memory-alpha.org/api.php
 metawiki|http://sunir.org/apps/meta.pl?$1|0|
 metawikimedia|https://meta.wikimedia.org/wiki/$1|0|https://meta.wikimedia.org/w/api.php
@@ -39,25 +34,20 @@ mozillawiki|http://wiki.mozilla.org/$1|0|https://wiki.mozilla.org/api.php
 mw|https://www.mediawiki.org/wiki/$1|0|https://www.mediawiki.org/w/api.php
 oeis|http://oeis.org/$1|0|
 openwiki|http://openwiki.com/ow.asp?$1|0|
-ppr|http://c2.com/cgi/wiki?$1|0|
 pythoninfo|http://wiki.python.org/moin/$1|0|
 rfc|http://www.rfc-editor.org/rfc/rfc$1.txt|0|
 s23wiki|http://s23.org/wiki/$1|0|http://s23.org/w/api.php
 seattlewireless|http://seattlewireless.net/$1|0|
 senseislibrary|http://senseis.xmp.net/?$1|0|
 shoutwiki|http://www.shoutwiki.com/wiki/$1|0|http://www.shoutwiki.com/w/api.php
-sourcewatch|http://www.sourcewatch.org/index.php?title=$1|0|http://www.sourcewatch.org/api.php
 squeak|http://wiki.squeak.org/squeak/$1|0|
-tejo|http://www.tejo.org/vikio/$1|0|
 tmbw|http://www.tmbw.net/wiki/$1|0|http://tmbw.net/wiki/api.php
 tmnet|http://www.technomanifestos.net/?$1|0|
 theopedia|http://www.theopedia.com/$1|0|
 twiki|http://twiki.org/cgi-bin/view/$1|0|
-uea|http://uea.org/vikio/index.php/$1|0|http://uea.org/vikio/api.php
 uncyclopedia|http://en.uncyclopedia.co/wiki/$1|0|http://en.uncyclopedia.co/w/api.php
 unreal|http://wiki.beyondunreal.com/$1|0|http://wiki.beyondunreal.com/w/api.php
 usemod|http://www.usemod.com/cgi-bin/wiki.pl?$1|0|
-webseitzwiki|http://webseitz.fluxent.com/wiki/$1|0|
 wiki|http://c2.com/cgi/wiki?$1|0|
 wikia|http://www.wikia.com/wiki/$1|0|
 wikibooks|https://en.wikibooks.org/wiki/$1|0|https://en.wikibooks.org/w/api.php
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index b7d1a843e0..0e0bb5c52a 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -9,7 +9,6 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local,iw_api) VALUES
 ('cache','http://www.google.com/search?q=cache:$1',0,''),
 ('commons','https://commons.wikimedia.org/wiki/$1',0,'https://commons.wikimedia.org/w/api.php'),
 ('dictionary','http://www.dict.org/bin/Dict?Database=*&Form=Dict1&Strategy=*&Query=$1',0,''),
-('docbook','http://wiki.docbook.org/$1',0,''),
 ('doi','http://dx.doi.org/$1',0,''),
 ('drumcorpswiki','http://www.drumcorpswiki.com/$1',0,'http://drumcorpswiki.com/api.php'),
 ('dwjwiki','http://www.suberic.net/cgi-bin/dwj/wiki.cgi?$1',0,''),
@@ -18,22 +17,18 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local,iw_api) VALUES
 ('foldoc','http://foldoc.org/?$1',0,''),
 ('foxwiki','http://fox.wikis.com/wc.dll?Wiki~$1',0,''),
 ('freebsdman','http://www.FreeBSD.org/cgi/man.cgi?apropos=1&query=$1',0,''),
-('gej','http://www.esperanto.de/dej.malnova/aktivikio.pl?$1',0,''),
 ('gentoo-wiki','http://gentoo-wiki.com/$1',0,''),
 ('google','http://www.google.com/search?q=$1',0,''),
 ('googlegroups','http://groups.google.com/groups?q=$1',0,''),
 ('hammondwiki','http://www.dairiki.org/HammondWiki/$1',0,''),
 ('hrwiki','http://www.hrwiki.org/wiki/$1',0,'http://www.hrwiki.org/w/api.php'),
 ('imdb','http://www.imdb.com/find?q=$1&tt=on',0,''),
-('jargonfile','http://sunir.org/apps/meta.pl?wiki=JargonFile&redirect=$1',0,''),
 ('kmwiki','http://kmwiki.wikispaces.com/$1',0,''),
 ('linuxwiki','http://linuxwiki.de/$1',0,''),
 ('lojban','http://www.lojban.org/tiki/tiki-index.php?page=$1',0,''),
 ('lqwiki','http://wiki.linuxquestions.org/wiki/$1',0,''),
-('lugkr','http://www.lug-kr.de/wiki/$1',0,''),
 ('meatball','http://www.usemod.com/cgi-bin/mb.pl?$1',0,''),
 ('mediawikiwiki','https://www.mediawiki.org/wiki/$1',0,'https://www.mediawiki.org/w/api.php'),
-('mediazilla','https://bugzilla.wikimedia.org/$1',0,''),
 ('memoryalpha','http://en.memory-alpha.org/wiki/$1',0,'http://en.memory-alpha.org/api.php'),
 ('metawiki','http://sunir.org/apps/meta.pl?$1',0,''),
 ('metawikimedia','https://meta.wikimedia.org/wiki/$1',0,'https://meta.wikimedia.org/w/api.php'),
@@ -41,25 +36,20 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local,iw_api) VALUES
 ('mw','https://www.mediawiki.org/wiki/$1',0,'https://www.mediawiki.org/w/api.php'),
 ('oeis','http://oeis.org/$1',0,''),
 ('openwiki','http://openwiki.com/ow.asp?$1',0,''),
-('ppr','http://c2.com/cgi/wiki?$1',0,''),
 ('pythoninfo','http://wiki.python.org/moin/$1',0,''),
 ('rfc','http://www.rfc-editor.org/rfc/rfc$1.txt',0,''),
 ('s23wiki','http://s23.org/wiki/$1',0,'http://s23.org/w/api.php'),
 ('seattlewireless','http://seattlewireless.net/$1',0,''),
 ('senseislibrary','http://senseis.xmp.net/?$1',0,''),
 ('shoutwiki','http://www.shoutwiki.com/wiki/$1',0,'http://www.shoutwiki.com/w/api.php'),
-('sourcewatch','http://www.sourcewatch.org/index.php?title=$1',0,'http://www.sourcewatch.org/api.php'),
 ('squeak','http://wiki.squeak.org/squeak/$1',0,''),
-('tejo','http://www.tejo.org/vikio/$1',0,''),
 ('tmbw','http://www.tmbw.net/wiki/$1',0,'http://tmbw.net/wiki/api.php'),
 ('tmnet','http://www.technomanifestos.net/?$1',0,''),
 ('theopedia','http://www.theopedia.com/$1',0,''),
 ('twiki','http://twiki.org/cgi-bin/view/$1',0,''),
-('uea','http://uea.org/vikio/index.php/$1',0,'http://uea.org/vikio/api.php'),
 ('uncyclopedia','http://en.uncyclopedia.co/wiki/$1',0,'http://en.uncyclopedia.co/w/api.php'),
 ('unreal','http://wiki.beyondunreal.com/$1',0,'http://wiki.beyondunreal.com/w/api.php'),
 ('usemod','http://www.usemod.com/cgi-bin/wiki.pl?$1',0,''),
-('webseitzwiki','http://webseitz.fluxent.com/wiki/$1',0,''),
 ('wiki','http://c2.com/cgi/wiki?$1',0,''),
 ('wikia','http://www.wikia.com/wiki/$1',0,''),
 ('wikibooks','https://en.wikibooks.org/wiki/$1',0,'https://en.wikibooks.org/w/api.php'),
diff --git a/maintenance/mssql/archives/patch-change_tag-ct_id.sql b/maintenance/mssql/archives/patch-change_tag-ct_id.sql
new file mode 100644
index 0000000000..94cb9d1496
--- /dev/null
+++ b/maintenance/mssql/archives/patch-change_tag-ct_id.sql
@@ -0,0 +1,4 @@
+-- Primary key in change_tag table
+
+ALTER TABLE /*_*/change_tag ADD ct_id INT IDENTITY;
+ALTER TABLE /*_*/change_tag ADD CONSTRAINT pk_change_tag PRIMARY KEY(ct_id)
diff --git a/maintenance/mssql/archives/patch-tag_summary-ts_id.sql b/maintenance/mssql/archives/patch-tag_summary-ts_id.sql
new file mode 100644
index 0000000000..d62bd35779
--- /dev/null
+++ b/maintenance/mssql/archives/patch-tag_summary-ts_id.sql
@@ -0,0 +1,4 @@
+-- Primary key in tag_summary table
+
+ALTER TABLE /*_*/tag_summary ADD ts_id INT IDENTITY;
+ALTER TABLE /*_*/tag_summary ADD CONSTRAINT pk_tag_summary PRIMARY KEY(ts_id)
diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql
index ea087a6012..beb972731c 100644
--- a/maintenance/mssql/tables.sql
+++ b/maintenance/mssql/tables.sql
@@ -1193,6 +1193,7 @@ CREATE TABLE /*_*/updatelog (
 
 -- A table to track tags for revisions, logs and recent changes.
 CREATE TABLE /*_*/change_tag (
+  ct_id int NOT NULL PRIMARY KEY IDENTITY,
   -- RCID for the change
   ct_rc_id int NULL REFERENCES /*_*/recentchanges(rc_id),
   -- LOGID for the change
@@ -1215,6 +1216,7 @@ CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_i
 -- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT
 -- that only works on MySQL 4.1+
 CREATE TABLE /*_*/tag_summary (
+  ts_id int NOT NULL PRIMARY KEY IDENTITY,
   -- RCID for the change
   ts_rc_id int NULL REFERENCES /*_*/recentchanges(rc_id),
   -- LOGID for the change
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 506bc9c2b9..b705500945 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -37,7 +37,7 @@ require_once __DIR__ . '/Maintenance.php';
 class NamespaceConflictChecker extends Maintenance {
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	protected $db;
 
diff --git a/maintenance/oracle/archives/patch-change_tag-ct_id.sql b/maintenance/oracle/archives/patch-change_tag-ct_id.sql
new file mode 100644
index 0000000000..6672872fea
--- /dev/null
+++ b/maintenance/oracle/archives/patch-change_tag-ct_id.sql
@@ -0,0 +1,6 @@
+define mw_prefix='{$wgDBprefix}';
+
+ALTER TABLE &mw_prefix.change_tag ADD (
+ct_id NUMBER NOT NULL,
+);
+ALTER TABLE &mw_prefix.change_tag ADD CONSTRAINT &mw_prefix.change_tag_pk PRIMARY KEY (ct_id);
diff --git a/maintenance/oracle/archives/patch-tag_summary-ts_id.sql b/maintenance/oracle/archives/patch-tag_summary-ts_id.sql
new file mode 100644
index 0000000000..91c3338318
--- /dev/null
+++ b/maintenance/oracle/archives/patch-tag_summary-ts_id.sql
@@ -0,0 +1,6 @@
+define mw_prefix='{$wgDBprefix}';
+
+ALTER TABLE &mw_prefix.tag_summary ADD (
+ts_id NUMBER NOT NULL,
+);
+ALTER TABLE &mw_prefix.tag_summary ADD CONSTRAINT &mw_prefix.tag_summary_pk PRIMARY KEY (ts_id);
diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql
index d9369c92cd..616b401a26 100644
--- a/maintenance/oracle/tables.sql
+++ b/maintenance/oracle/tables.sql
@@ -616,23 +616,27 @@ CREATE TABLE &mw_prefix.updatelog (
 ALTER TABLE &mw_prefix.updatelog ADD CONSTRAINT &mw_prefix.updatelog_pk PRIMARY KEY (ul_key);
 
 CREATE TABLE &mw_prefix.change_tag (
+  ct_id NUMBER NOT NULL,
   ct_rc_id NUMBER NULL,
   ct_log_id NUMBER NULL,
   ct_rev_id NUMBER NULL,
   ct_tag VARCHAR2(255) NOT NULL,
   ct_params BLOB NULL
 );
+ALTER TABLE &mw_prefix.change_tag ADD CONSTRAINT &mw_prefix.change_tag_pk PRIMARY KEY (ct_id);
 CREATE UNIQUE INDEX &mw_prefix.change_tag_u01 ON &mw_prefix.change_tag (ct_rc_id,ct_tag);
 CREATE UNIQUE INDEX &mw_prefix.change_tag_u02 ON &mw_prefix.change_tag (ct_log_id,ct_tag);
 CREATE UNIQUE INDEX &mw_prefix.change_tag_u03 ON &mw_prefix.change_tag (ct_rev_id,ct_tag);
 CREATE INDEX &mw_prefix.change_tag_i01 ON &mw_prefix.change_tag (ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
 
 CREATE TABLE &mw_prefix.tag_summary (
+  ts_id NUMBER NOT NULL,
   ts_rc_id NUMBER NULL,
   ts_log_id NUMBER NULL,
   ts_rev_id NUMBER NULL,
   ts_tags BLOB NOT NULL
 );
+ALTER TABLE &mw_prefix.tag_summary ADD CONSTRAINT &mw_prefix.tag_summary_pk PRIMARY KEY (ts_id);
 CREATE UNIQUE INDEX &mw_prefix.tag_summary_u01 ON &mw_prefix.tag_summary (ts_rc_id);
 CREATE UNIQUE INDEX &mw_prefix.tag_summary_u02 ON &mw_prefix.tag_summary (ts_log_id);
 CREATE UNIQUE INDEX &mw_prefix.tag_summary_u03 ON &mw_prefix.tag_summary (ts_rev_id);
diff --git a/maintenance/orphans.php b/maintenance/orphans.php
index 7b8f2cd96a..e4f3e91354 100644
--- a/maintenance/orphans.php
+++ b/maintenance/orphans.php
@@ -56,7 +56,7 @@ class Orphans extends Maintenance {
 
 	/**
 	 * Lock the appropriate tables for the script
-	 * @param DatabaseBase $db
+	 * @param Database $db
 	 * @param string $extraTable The name of any extra tables to lock (eg: text)
 	 */
 	private function lockTables( $db, $extraTable = [] ) {
diff --git a/maintenance/populateContentModel.php b/maintenance/populateContentModel.php
index 401ef12a2a..c6bd794e23 100644
--- a/maintenance/populateContentModel.php
+++ b/maintenance/populateContentModel.php
@@ -57,7 +57,7 @@ class PopulateContentModel extends Maintenance {
 		}
 	}
 
-	private function updatePageRows( DatabaseBase $dbw, $pageIds, $model ) {
+	private function updatePageRows( Database $dbw, $pageIds, $model ) {
 		$count = count( $pageIds );
 		$this->output( "Setting $count rows to $model..." );
 		$dbw->update(
@@ -70,7 +70,7 @@ class PopulateContentModel extends Maintenance {
 		$this->output( "done.\n" );
 	}
 
-	protected function populatePage( DatabaseBase $dbw, $ns ) {
+	protected function populatePage( Database $dbw, $ns ) {
 		$toSave = [];
 		$lastId = 0;
 		$nsCondition = $ns === 'all' ? [] : [ 'page_namespace' => $ns ];
@@ -102,7 +102,7 @@ class PopulateContentModel extends Maintenance {
 		}
 	}
 
-	private function updateRevisionOrArchiveRows( DatabaseBase $dbw, $ids, $model, $table ) {
+	private function updateRevisionOrArchiveRows( Database $dbw, $ids, $model, $table ) {
 		$prefix = $table === 'archive' ? 'ar' : 'rev';
 		$model_column = "{$prefix}_content_model";
 		$format_column = "{$prefix}_content_format";
@@ -120,7 +120,7 @@ class PopulateContentModel extends Maintenance {
 		$this->output( "done.\n" );
 	}
 
-	protected function populateRevisionOrArchive( DatabaseBase $dbw, $table, $ns ) {
+	protected function populateRevisionOrArchive( Database $dbw, $table, $ns ) {
 		$prefix = $table === 'archive' ? 'ar' : 'rev';
 		$model_column = "{$prefix}_content_model";
 		$format_column = "{$prefix}_content_format";
diff --git a/maintenance/populateRecentChangesSource.php b/maintenance/populateRecentChangesSource.php
index 05098ac0a9..ac87cf3ecb 100644
--- a/maintenance/populateRecentChangesSource.php
+++ b/maintenance/populateRecentChangesSource.php
@@ -83,7 +83,7 @@ class PopulateRecentChangesSource extends LoggedUpdateMaintenance {
 		return __CLASS__;
 	}
 
-	protected function buildUpdateCondition( DatabaseBase $dbw ) {
+	protected function buildUpdateCondition( Database $dbw ) {
 		$rcNew = $dbw->addQuotes( RC_NEW );
 		$rcSrcNew = $dbw->addQuotes( RecentChange::SRC_NEW );
 		$rcEdit = $dbw->addQuotes( RC_EDIT );
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 95c87c0cd1..227376187f 100644
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -25,6 +25,8 @@ DROP SEQUENCE IF EXISTS category_cat_id_seq CASCADE;
 DROP SEQUENCE IF EXISTS archive_ar_id_seq CASCADE;
 DROP SEQUENCE IF EXISTS externallinks_el_id_seq CASCADE;
 DROP SEQUENCE IF EXISTS sites_site_id_seq CASCADE;
+DROP SEQUENCE IF EXISTS change_tag_ct_id_seq CASCADE;
+DROP SEQUENCE IF EXISTS tag_summary_ts_id_seq CASCADE;
 DROP FUNCTION IF EXISTS page_deleted() CASCADE;
 DROP FUNCTION IF EXISTS ts2_page_title() CASCADE;
 DROP FUNCTION IF EXISTS ts2_page_text() CASCADE;
@@ -653,7 +655,9 @@ CREATE TABLE category (
 CREATE UNIQUE INDEX category_title ON category(cat_title);
 CREATE INDEX category_pages ON category(cat_pages);
 
+CREATE SEQUENCE change_tag_ct_id_seq;
 CREATE TABLE change_tag (
+  ct_id      INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('change_tag_ct_id_seq'),
   ct_rc_id   INTEGER      NULL,
   ct_log_id  INTEGER      NULL,
   ct_rev_id  INTEGER      NULL,
@@ -665,11 +669,13 @@ CREATE UNIQUE INDEX change_tag_log_tag ON change_tag(ct_log_id,ct_tag);
 CREATE UNIQUE INDEX change_tag_rev_tag ON change_tag(ct_rev_id,ct_tag);
 CREATE INDEX change_tag_tag_id ON change_tag(ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
 
+CREATE SEQUENCE tag_summary_ts_id_seq;
 CREATE TABLE tag_summary (
-  ts_rc_id   INTEGER     NULL,
-  ts_log_id  INTEGER     NULL,
-  ts_rev_id  INTEGER     NULL,
-  ts_tags    TEXT    NOT NULL
+  ts_id      INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('tag_summary_ts_id_seq'),
+  ts_rc_id   INTEGER      NULL,
+  ts_log_id  INTEGER      NULL,
+  ts_rev_id  INTEGER      NULL,
+  ts_tags    TEXT     NOT NULL
 );
 CREATE UNIQUE INDEX tag_summary_rc_id ON tag_summary(ts_rc_id);
 CREATE UNIQUE INDEX tag_summary_log_id ON tag_summary(ts_log_id);
diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 31571866c7..6aa1f37a8c 100644
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -40,7 +40,7 @@ require_once __DIR__ . '/Maintenance.php';
 class ImageBuilder extends Maintenance {
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	protected $dbw;
 
diff --git a/maintenance/rebuildtextindex.php b/maintenance/rebuildtextindex.php
index ec99d84a4c..37636c85a8 100644
--- a/maintenance/rebuildtextindex.php
+++ b/maintenance/rebuildtextindex.php
@@ -36,7 +36,7 @@ class RebuildTextIndex extends Maintenance {
 	const RTI_CHUNK_SIZE = 500;
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	private $db;
 
diff --git a/maintenance/refreshImageMetadata.php b/maintenance/refreshImageMetadata.php
index aea966ffb2..df4ce56330 100644
--- a/maintenance/refreshImageMetadata.php
+++ b/maintenance/refreshImageMetadata.php
@@ -37,7 +37,7 @@ require_once __DIR__ . '/Maintenance.php';
 class RefreshImageMetadata extends Maintenance {
 
 	/**
-	 * @var DatabaseBase
+	 * @var Database
 	 */
 	protected $dbw;
 
@@ -197,7 +197,7 @@ class RefreshImageMetadata extends Maintenance {
 	}
 
 	/**
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return array
 	 */
 	function getConditions( $dbw ) {
diff --git a/maintenance/sql.php b/maintenance/sql.php
index a9a982ce50..cc976ed97f 100644
--- a/maintenance/sql.php
+++ b/maintenance/sql.php
@@ -91,7 +91,7 @@ class MwSql extends Maintenance {
 				$this->error( "Unable to open input file", true );
 			}
 
-			$error = $db->sourceStream( $file, false, [ $this, 'sqlPrintResult' ] );
+			$error = $db->sourceStream( $file, null, [ $this, 'sqlPrintResult' ] );
 			if ( $error !== true ) {
 				$this->error( $error, true );
 			} else {
diff --git a/maintenance/sqlite/archives/patch-change_tag-ct_id.sql b/maintenance/sqlite/archives/patch-change_tag-ct_id.sql
new file mode 100644
index 0000000000..1c0109433b
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-change_tag-ct_id.sql
@@ -0,0 +1,25 @@
+DROP TABLE IF EXISTS /*_*/change_tag_tmp;
+
+CREATE TABLE /*$wgDBprefix*/change_tag_tmp (
+  ct_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  ct_rc_id int NULL,
+  ct_log_id int NULL,
+  ct_rev_id int NULL,
+  ct_tag varchar(255) NOT NULL,
+  ct_params blob NULL
+);
+
+INSERT OR IGNORE INTO /*_*/change_tag_tmp (
+    ct_rc_id, ct_log_id, ct_rev_id, ct_tag, ct_params )
+    SELECT
+    ct_rc_id, ct_log_id, ct_rev_id, ct_tag, ct_params
+    FROM /*_*/change_tag;
+
+DROP TABLE /*_*/change_tag;
+
+ALTER TABLE /*_*/change_tag_tmp RENAME TO /*_*/change_tag;
+
+CREATE UNIQUE INDEX /*i*/change_tag_rc_tag ON /*_*/change_tag (ct_rc_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_log_tag ON /*_*/change_tag (ct_log_id,ct_tag);
+CREATE UNIQUE INDEX /*i*/change_tag_rev_tag ON /*_*/change_tag (ct_rev_id,ct_tag);
+CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_id,ct_log_id);
diff --git a/maintenance/sqlite/archives/patch-tag_summary-ts_id.sql b/maintenance/sqlite/archives/patch-tag_summary-ts_id.sql
new file mode 100644
index 0000000000..b6a1202846
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-tag_summary-ts_id.sql
@@ -0,0 +1,23 @@
+DROP TABLE IF EXISTS /*_*/tag_summary_tmp;
+
+CREATE TABLE /*$wgDBprefix*/tag_summary_tmp (
+  ts_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+  ts_rc_id int NULL,
+  ts_log_id int NULL,
+  ts_rev_id int NULL,
+  ts_tags blob NOT NULL
+);
+
+INSERT OR IGNORE INTO /*_*/tag_summary_tmp (
+    ts_rc_id, ts_log_id, ts_rev_id, ts_tags )
+    SELECT
+    ts_rc_id, ts_log_id, ts_rev_id, ts_tags
+    FROM /*_*/tag_summary;
+
+DROP TABLE /*_*/tag_summary;
+
+ALTER TABLE /*_*/tag_summary_tmp RENAME TO /*_*/tag_summary;
+
+CREATE UNIQUE INDEX /*i*/tag_summary_rc_id ON /*_*/tag_summary (ts_rc_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_log_id ON /*_*/tag_summary (ts_log_id);
+CREATE UNIQUE INDEX /*i*/tag_summary_rev_id ON /*_*/tag_summary (ts_rev_id);
diff --git a/maintenance/storage/recompressTracked.php b/maintenance/storage/recompressTracked.php
index a0efcb8f66..c5dd53b111 100644
--- a/maintenance/storage/recompressTracked.php
+++ b/maintenance/storage/recompressTracked.php
@@ -640,7 +640,7 @@ class RecompressTracked {
 	/**
 	 * Gets a DB master connection for the given external cluster name
 	 * @param string $cluster
-	 * @return DatabaseBase
+	 * @return Database
 	 */
 	function getExtDB( $cluster ) {
 		$lb = wfGetLBFactory()->getExternalLB( $cluster );
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index b5c14e30f4..03ce508275 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -1472,6 +1472,7 @@ CREATE TABLE /*_*/updatelog (
 
 -- A table to track tags for revisions, logs and recent changes.
 CREATE TABLE /*_*/change_tag (
+  ct_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
   -- RCID for the change
   ct_rc_id int NULL,
   -- LOGID for the change
@@ -1494,6 +1495,7 @@ CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_i
 -- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT
 -- that only works on MySQL 4.1+
 CREATE TABLE /*_*/tag_summary (
+  ts_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
   -- RCID for the change
   ts_rc_id int NULL,
   -- LOGID for the change
diff --git a/maintenance/updateCollation.php b/maintenance/updateCollation.php
index e754e3c3ab..e70a176909 100644
--- a/maintenance/updateCollation.php
+++ b/maintenance/updateCollation.php
@@ -242,7 +242,7 @@ TEXT
 	 * Return an SQL expression selecting rows which sort above the given row,
 	 * assuming an ordering of cl_collation, cl_to, cl_type, cl_from
 	 * @param stdClass $row
-	 * @param DatabaseBase $dbw
+	 * @param Database $dbw
 	 * @return string
 	 */
 	function getBatchCondition( $row, $dbw ) {
diff --git a/maintenance/validateRegistrationFile.php b/maintenance/validateRegistrationFile.php
index bd34a50eab..7dd0907f64 100644
--- a/maintenance/validateRegistrationFile.php
+++ b/maintenance/validateRegistrationFile.php
@@ -2,14 +2,21 @@
 
 require_once __DIR__ . '/Maintenance.php';
 
+use Composer\Spdx\SpdxLicenses;
+use JsonSchema\Validator;
+
 class ValidateRegistrationFile extends Maintenance {
 	public function __construct() {
 		parent::__construct();
 		$this->addArg( 'path', 'Path to extension.json/skin.json file.', true );
 	}
 	public function execute() {
-		if ( !class_exists( 'JsonSchema\Validato' ) ) {
+		if ( !class_exists( Validator::class ) ) {
 			$this->error( 'The JsonSchema library cannot be found, please install it through composer.', 1 );
+		} elseif ( !class_exists( SpdxLicenses::class ) ) {
+			$this->error(
+				'The spdx-licenses library cannot be found, please install it through composer.', 1
+			);
 		}
 
 		$path = $this->getArg( 0 );
@@ -38,14 +45,29 @@ class ValidateRegistrationFile extends Maintenance {
 			$this->output( "Warning: $path is using a deprecated schema, and should be updated to "
 				. ExtensionRegistry::MANIFEST_VERSION . "\n" );
 		}
-		$validator = new JsonSchema\Validator;
+
+		$licenseError = false;
+		// Check if it's a string, if not, schema validation will display an error
+		if ( isset( $data->{'license-name'} ) && is_string( $data->{'license-name'} ) ) {
+			$licenses = new SpdxLicenses();
+			$valid = $licenses->validate( $data->{'license-name'} );
+			if ( !$valid ) {
+				$licenseError = '[license-name] Invalid SPDX license identifier, '
+					. 'see <https://spdx.org/licenses/>';
+			}
+		}
+
+		$validator = new Validator;
 		$validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] );
-		if ( $validator->isValid() ) {
+		if ( $validator->isValid() && !$licenseError ) {
 			$this->output( "$path validates against the version $version schema!\n" );
 		} else {
 			foreach ( $validator->getErrors() as $error ) {
 				$this->output( "[{$error['property']}] {$error['message']}\n" );
 			}
+			if ( $licenseError ) {
+				$this->output( "$licenseError\n" );
+			}
 			$this->error( "$path does not validate.", 1 );
 		}
 	}
diff --git a/resources/Resources.php b/resources/Resources.php
index b81fbde4bb..32a754fd5d 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1020,7 +1020,6 @@ return [
 			'feedback-cancel',
 			'feedback-close',
 			'feedback-dialog-title',
-			'feedback-error-title',
 			'feedback-error1',
 			'feedback-error2',
 			'feedback-error3',
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js
index 594cea2074..d72957dafb 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( 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 6437ca8108..2f811da0fd 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-element-hidden {
 	display: none !important;
@@ -406,6 +406,10 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout {
 	max-width: 100%;
 	padding: 0;
 	white-space: normal;
+	float: left;
+}
+.oo-ui-fieldsetLayout-group {
+	clear: both;
 }
 .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
 	float: right;
diff --git a/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-core-mediawiki.css
index 08d91b4c3b..9a3d7eb5eb 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-element-hidden {
 	display: none !important;
@@ -529,6 +529,10 @@ body:not( :-moz-handler-blocked ) .oo-ui-fieldsetLayout {
 	max-width: 100%;
 	padding: 0;
 	white-space: normal;
+	float: left;
+}
+.oo-ui-fieldsetLayout-group {
+	clear: both;
 }
 .oo-ui-fieldsetLayout > .oo-ui-fieldsetLayout-help {
 	float: right;
diff --git a/resources/lib/oojs-ui/oojs-ui-core.js b/resources/lib/oojs-ui/oojs-ui-core.js
index c982010abc..109645b48d 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
@@ -10121,6 +10121,7 @@ OO.ui.FieldsetLayout = function OoUiFieldsetLayout( config ) {
 	}
 
 	// Initialization
+	this.$group.addClass( 'oo-ui-fieldsetLayout-group' );
 	this.$element
 		.addClass( 'oo-ui-fieldsetLayout' )
 		.prepend( this.$label, this.$help, this.$icon, this.$group );
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index 343508c0a9..616f78eec7 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css b/resources/lib/oojs-ui/oojs-ui-toolbars-apex.css
index 9c9954eff0..d6ed767b95 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .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 a413005c84..411c6bbab3 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-tool.oo-ui-widget-enabled {
 	-webkit-transition: background-color 100ms;
diff --git a/resources/lib/oojs-ui/oojs-ui-toolbars.js b/resources/lib/oojs-ui/oojs-ui-toolbars.js
index ba959cfc87..822b2d92bb 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( 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 bd8034de76..2d2b200562 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-draggableElement-handle,
 .oo-ui-draggableElement-handle.oo-ui-widget {
diff --git a/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-widgets-mediawiki.css
index 126b59100f..d1b4225111 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-draggableElement-handle,
 .oo-ui-draggableElement-handle.oo-ui-widget {
diff --git a/resources/lib/oojs-ui/oojs-ui-widgets.js b/resources/lib/oojs-ui/oojs-ui-widgets.js
index 62195df960..636e3f58b7 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
diff --git a/resources/lib/oojs-ui/oojs-ui-windows-apex.css b/resources/lib/oojs-ui/oojs-ui-windows-apex.css
index 3cff8f743f..1cceac5c5f 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-actionWidget.oo-ui-pendingElement-pending {
 	background-image: /* @embed */ url(themes/apex/images/textures/pending.gif);
diff --git a/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css b/resources/lib/oojs-ui/oojs-ui-windows-mediawiki.css
index 2c115f9fa8..38e40b96a2 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:06Z
+ * Date: 2016-10-03T18:59:06Z
  */
 .oo-ui-window {
 	background: transparent;
diff --git a/resources/lib/oojs-ui/oojs-ui-windows.js b/resources/lib/oojs-ui/oojs-ui-windows.js
index 8ef5ea5422..0a29b8b159 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.9
+ * OOjs UI v0.17.10
  * 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-09-13T18:30:02Z
+ * Date: 2016-10-03T18:59:01Z
  */
 ( function ( OO ) {
 
diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index cb4919ff39..1522de1e75 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -105,6 +105,25 @@ span.comment {
 	clear: both;
 }
 
+/* Edit font preference */
+/* TODO: for 'default' on non-textareas we could compute the default font of textarea in the client */
+.mw-editfont-default:not( textarea ) {
+	font-family: monospace;
+}
+
+/* Keep this rule separate from the :not rule above so it still works in older browsers */
+.mw-editfont-monospace {
+	font-family: monospace;
+}
+
+.mw-editfont-sans-serif {
+	font-family: sans-serif;
+}
+
+.mw-editfont-serif {
+	font-family: serif;
+}
+
 /**
  * rev_deleted stuff
  */
diff --git a/resources/src/mediawiki.less/mediawiki.ui/mixins.less b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
index 780b372b18..1bfa3a3582 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/mixins.less
@@ -33,74 +33,91 @@
 // ----------------------------------------------------------------------------
 
 .button-colors( @bgColor, @highlightColor, @activeColor ) {
-	background: @bgColor;
+	background-color: @bgColor;
+	color: @colorButtonText;
+	border: 1px solid @colorFieldBorder;
+
+	// Make sure that `color` isn't inheriting from user-agent styles
+	&:visited {
+		color: @colorButtonText;
+	}
 
 	&:hover {
 		background-color: @highlightColor;
+		color: @colorGray4;
+		border-color: @colorGray10;
 	}
 
 	&:focus {
-		border-color: @colorWhite;
-		box-shadow: inset 0 0 0 1px @bgColor, inset 0 0 0 2px @colorWhite;
-		outline-width: 0;
-
-		// Remove the inner border and padding in Firefox.
-		&::-moz-focus-inner {
-			border-color: transparent;
-			padding: 0;
-		}
+		background-color: @highlightColor;
+		// Make sure that `color` isn't inheriting from user-agent styles
+		color: @colorButtonText;
+		border-color: @colorProgressive;
+		box-shadow: inset 0 0 0 1px @colorProgressive, inset 0 0 0 2px #fff;
 	}
 
 	&:active,
 	&.is-on,
 	&.mw-ui-checked {
 		background-color: @activeColor;
+		color: @colorGray1;
+		border-color: @colorGray7;
 		box-shadow: none;
 	}
-}
-
-.button-colors( @bgColor, @highlightColor, @activeColor ) when ( lightness( @bgColor ) >= 70% ) {
-	color: @colorButtonText;
-	border: 1px solid @colorFieldBorder;
-
-	&:hover,
-	&:active,
-	&:visited {
-		// make sure that is isn't inheriting from a general rule
-		color: @colorButtonText;
-	}
-
-	&:focus {
-		background-color: @highlightColor;
-	}
 
 	&:disabled {
-		color: @colorDisabledText;
+		background-color: @colorGray12;
+		color: #fff;
+		border-color: @colorGray12;
 
-		// make sure disabled buttons don't have hover and active states
+		// Make sure disabled buttons don't have hover and active states
 		&:hover,
 		&:active {
-			background: @bgColor;
+			background-color: @colorGray12;
+			color: #fff;
 			box-shadow: none;
+			border-color: @colorGray12;
 		}
 	}
 }
 
-.button-colors( @bgColor, @highlightColor, @activeColor ) when ( lightness( @bgColor ) < 70% ) {
+.button-colors-primary( @bgColor, @highlightColor, @activeColor ) {
+	background-color: @bgColor;
 	color: #fff;
 	// border of the same color as background so that light background and
 	// dark background buttons are the same height and width
 	border: 1px solid @bgColor;
-	text-shadow: 0 1px rgba(0, 0, 0, .1);
+	text-shadow: 0 1px rgba( 0, 0, 0, 0.1 );
+
+	&:hover {
+		background-color: @highlightColor;
+		border-color: @highlightColor;
+	}
+
+	&:focus {
+		box-shadow: inset 0 0 0 1px @bgColor, inset 0 0 0 2px #fff;
+	}
+
+	&:active,
+	&.is-on,
+	&.mw-ui-checked {
+		background-color: @activeColor;
+		border-color: @activeColor;
+		box-shadow: none;
+	}
 
 	&:disabled {
-		background-color: @colorGray13;
-		border-color: @colorGray13;
+		background-color: @colorGray12;
+		color: #fff;
+		border-color: @colorGray12;
 
-		// make sure disabled buttons don't have hover and active states
+		// Make sure disabled buttons don't have hover and active states
 		&:hover,
 		&:active,
 		&.mw-ui-checked {
+			background-color: @colorGray12;
+			color: #fff;
+			border-color: @colorGray12;
 			box-shadow: none;
 		}
 	}
@@ -108,7 +125,7 @@
 
 .button-colors-quiet( @textColor, @highlightColor, @activeColor ) {
 	// Quiet buttons all start gray, and reveal
-	// constructive/progressive/destructive color on hover and active.
+	// progressive/destructive color on hover and active.
 	color: @colorButtonText;
 
 	&:hover {
diff --git a/resources/src/mediawiki.less/mediawiki.ui/variables.less b/resources/src/mediawiki.less/mediawiki.ui/variables.less
index 77e80b0d09..28ad10ae56 100644
--- a/resources/src/mediawiki.less/mediawiki.ui/variables.less
+++ b/resources/src/mediawiki.less/mediawiki.ui/variables.less
@@ -6,16 +6,16 @@
 @colorGray2: #222;
 @colorGray3: #333;
 @colorGray4: #444;
-@colorGray5: #555;
+@colorGray5: #54595d;
 @colorGray6: #666;
 @colorGray7: #72777d;
 @colorGray8: #888;
 @colorGray9: #999;
-@colorGray10: #aaa;
+@colorGray10: #a2a9b1;
 @colorGray11: #bbb;
-@colorGray12: #ccc;
+@colorGray12: #c8ccd1;
 @colorGray13: #ddd;
-@colorGray14: #eee;
+@colorGray14: #eaecf0;
 @colorGray15: #f8f9fa; // lightest
 
 // Semantic background colors
diff --git a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
index 5c3715db02..e58a6cfe3c 100644
--- a/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
+++ b/resources/src/mediawiki.special/mediawiki.special.apisandbox.js
@@ -599,7 +599,7 @@
 					fullscreenButton.$element,
 					new OO.ui.ButtonWidget( {
 						label: mw.message( 'apisandbox-submit' ).text(),
-						flags: [ 'primary', 'constructive' ]
+						flags: [ 'primary', 'progressive' ]
 					} ).on( 'click', ApiSandbox.sendRequest ).$element,
 					new OO.ui.ButtonWidget( {
 						label: mw.message( 'apisandbox-reset' ).text(),
@@ -1421,7 +1421,7 @@
 							dynamicParamNameWidget,
 							new OO.ui.ButtonWidget( {
 								icon: 'add',
-								flags: 'constructive'
+								flags: 'progressive'
 							} ).on( 'click', addDynamicParamWidget ),
 							{
 								label: mw.message( 'apisandbox-dynamic-parameters-add-label' ).text(),
diff --git a/resources/src/mediawiki.ui/components/buttons.less b/resources/src/mediawiki.ui/components/buttons.less
index 5931efbec3..a281e67158 100644
--- a/resources/src/mediawiki.ui/components/buttons.less
+++ b/resources/src/mediawiki.ui/components/buttons.less
@@ -14,7 +14,7 @@
 
 // Neutral button styling
 //
-// These are the main actions on the page/workflow. The page should have only one of progressive, constructive and desctructive buttons, the rest being quiet.
+// These are the main actions on the page/workflow. The page should have only one of progressive and destructive buttons, the rest being quiet.
 //
 // Markup:
 // <div>
@@ -50,13 +50,28 @@
 	vertical-align: middle;
 
 	// Content styling
-	.button-colors( #fff, @colorGray12, @colorGray7 );
+	.button-colors( @colorGray15, #fff, #d9d9d9 );
 	text-align: center;
 	font-weight: bold;
 
 	// Interaction styling
 	cursor: pointer;
 
+	&:focus {
+		outline-width: 0;
+
+		// Remove the inner border and padding in Firefox.
+		&::-moz-focus-inner {
+			border-color: transparent;
+			padding: 0;
+		}
+	}
+
+	// `:not()` is used exclusively for `transition`s as both are not supported by IE < 9
+	&:not( :disabled ) {
+		.transition( ~'background-color 100ms, color 100ms, border-color 100ms, box-shadow 100ms' );
+	}
+
 	&:disabled {
 		text-shadow: none;
 		cursor: default;
@@ -78,9 +93,6 @@
 	//   <button class="mw-ui-button mw-ui-progressive mw-ui-big">.mw-ui-progressive</button>
 	// </div>
 	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive mw-ui-big">.mw-ui-constructive</button>
-	// </div>
-	// <div>
 	//   <button class="mw-ui-button mw-ui-destructive mw-ui-big">.mw-ui-destructive</button>
 	// </div>
 	//
@@ -101,9 +113,6 @@
 	//   <button class="mw-ui-button mw-ui-progressive mw-ui-block">.mw-ui-progressive</button>
 	// </div>
 	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive mw-ui-block">.mw-ui-constructive</button>
-	// </div>
-	// <div>
 	//   <button class="mw-ui-button mw-ui-destructive mw-ui-block">.mw-ui-destructive</button>
 	// </div>
 	//
@@ -118,6 +127,7 @@
 	// Progressive buttons
 	//
 	// Use progressive buttons for actions which lead to a next step in the process.
+	// .mw-ui-constructive is deprecated; consolidated with `progressive`, see T110555
 	// .mw-ui-primary is deprecated, kept for compatibility.
 	//
 	// Markup:
@@ -130,31 +140,9 @@
 	//
 	// Styleguide 2.1.1.
 	&.mw-ui-progressive,
+	&.mw-ui-constructive,
 	&.mw-ui-primary {
-		.button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
-
-		&.mw-ui-quiet {
-			.button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
-		}
-	}
-
-	// Constructive buttons (deprecated, consolidated with `progressive` – see T110555)
-	//
-	// Use constructive buttons for actions which result in a final action in the process that results
-	// in a change of state.
-	// e.g. save changes button
-	//
-	// Markup:
-	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive">.mw-ui-constructive</button>
-	// </div>
-	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive" disabled>.mw-ui-constructive</button>
-	// </div>
-	//
-	// Styleguide 2.1.2.
-	&.mw-ui-constructive {
-		.button-colors( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
+		.button-colors-primary( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
 
 		&.mw-ui-quiet {
 			.button-colors-quiet( @colorProgressive, @colorProgressiveHighlight, @colorProgressiveActive );
@@ -174,9 +162,9 @@
 	//   <button class="mw-ui-button mw-ui-destructive" disabled>.mw-ui-destructive</button>
 	// </div>
 	//
-	// Styleguide 2.1.3.
+	// Styleguide 2.1.2.
 	&.mw-ui-destructive {
-		.button-colors( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive );
+		.button-colors-primary( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive );
 
 		&.mw-ui-quiet {
 			.button-colors-quiet( @colorDestructive, @colorDestructiveHighlight, @colorDestructiveActive );
@@ -185,7 +173,7 @@
 
 	// Quiet buttons
 	//
-	// Use quiet buttons when they are less important and alongside other constructive, progressive or destructive buttons. It should be used for an action that exits the user from the current view/workflow.
+	// Use quiet buttons when they are less important and alongside other progressive or destructive buttons. It should be used for an action that exits the user from the current view/workflow.
 	// Its use is  not recommended on mobile/tablet due to lack of hover state.
 	//
 	// Markup:
@@ -193,12 +181,6 @@
 	//   <button class="mw-ui-button mw-ui-quiet">.mw-ui-button</button>
 	// </div>
 	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive mw-ui-quiet">.mw-ui-constructive</button>
-	// </div>
-	// <div>
-	//   <button class="mw-ui-button mw-ui-constructive mw-ui-quiet" disabled>.mw-ui-constructive</button>
-	// </div>
-	// <div>
 	//   <button class="mw-ui-button mw-ui-destructive mw-ui-quiet">.mw-ui-destructive</button>
 	// </div>
 	// <div>
@@ -211,7 +193,7 @@
 	//   <button class="mw-ui-button mw-ui-progressive mw-ui-quiet" disabled>.mw-ui-progressive</button>
 	// </div>
 	//
-	// Styleguide 2.1.4.
+	// Styleguide 2.1.3.
 	&.mw-ui-quiet {
 		background: transparent;
 		border: 0;
diff --git a/resources/src/mediawiki.ui/components/forms.less b/resources/src/mediawiki.ui/components/forms.less
index aedec5b9e9..2327efc73b 100644
--- a/resources/src/mediawiki.ui/components/forms.less
+++ b/resources/src/mediawiki.ui/components/forms.less
@@ -30,7 +30,7 @@
 //     <input class="mw-ui-input" value="input">
 //   </div>
 //   <div class="mw-ui-vform-field">
-//     <button class="mw-ui-button mw-ui-constructive">Button in vform</button>
+//     <button class="mw-ui-button mw-ui-progressive">Button in vform</button>
 //   </div>
 // </form>
 //
diff --git a/resources/src/mediawiki.ui/components/inputs.less b/resources/src/mediawiki.ui/components/inputs.less
index 76fee23e21..90e769e349 100644
--- a/resources/src/mediawiki.ui/components/inputs.less
+++ b/resources/src/mediawiki.ui/components/inputs.less
@@ -99,7 +99,7 @@ textarea.mw-ui-input {
 //
 // Markup:
 // <input class="mw-ui-input mw-ui-input-inline">
-// <button class="mw-ui-button mw-ui-constructive">Submit</button>
+// <button class="mw-ui-button mw-ui-progressive">Submit</button>
 //
 // Styleguide 1.2.
 input[type="number"],
diff --git a/resources/src/mediawiki.ui/components/text.less b/resources/src/mediawiki.ui/components/text.less
index cc27e9e357..555174559f 100644
--- a/resources/src/mediawiki.ui/components/text.less
+++ b/resources/src/mediawiki.ui/components/text.less
@@ -16,10 +16,10 @@ Text
 Context classes may be used on elements with only plain-text content with the mw-ui-text base. When the context classes
 are used on interactive and block-level elements, the appropriate alternative base type classes should also be used. For
 example, mw-ui-anchor with A, or mw-ui-button with buttons.
+'Constructive' is deprecated and merged with 'Progressive'.
 
 Markup:
 <span class="mw-ui-text mw-ui-progressive">Progressive</span>
-<span class="mw-ui-text mw-ui-constructive">Constructive</span>
 <span class="mw-ui-text mw-ui-destructive">Destructive</span>
 
 Styleguide 6.1.
@@ -28,11 +28,9 @@ Styleguide 6.1.
 .mw-ui-text {
 	// The selector order is like this on purpose; IE 6 ignores the second selector,
 	// so we don't want to accidentally apply this color on all mw-ui-CONTEXT classes
-	.mw-ui-progressive& {
-		color: @colorProgressive;
-	}
+	.mw-ui-progressive&,
 	.mw-ui-constructive& {
-		color: @colorConstructive;
+		color: @colorProgressive;
 	}
 	.mw-ui-destructive& {
 		color: @colorDestructive;
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
index 0f61d975f1..844d74cc39 100644
--- a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.BookletLayout.js
@@ -309,6 +309,50 @@
 		} );
 	};
 
+	/**
+	 * @param {mw.Title} filename
+	 * @return {jQuery.Promise} Resolves (on success) or rejects with OO.ui.Error
+	 */
+	mw.ForeignStructuredUpload.BookletLayout.prototype.validateFilename = function ( filename ) {
+		return ( new mw.Api() ).get( {
+			action: 'query',
+			prop: 'info',
+			titles: filename.getPrefixedDb(),
+			formatversion: 2
+		} ).then(
+			function ( result ) {
+				// if the file already exists, reject right away, before
+				// ever firing finishStashUpload()
+				if ( !result.query.pages[ 0 ].missing ) {
+					return $.Deferred().reject( new OO.ui.Error(
+						$( '<p>' ).msg( 'fileexists', filename.getPrefixedDb() ),
+						{ recoverable: false }
+					) );
+				}
+			},
+			function () {
+				// API call failed - this could be a connection hiccup...
+				// Let's just ignore this validation step and turn this
+				// failure into a successful resolve ;)
+				return $.Deferred().resolve();
+			}
+		);
+	};
+
+	/**
+	 * @inheritdoc
+	 */
+	mw.ForeignStructuredUpload.BookletLayout.prototype.saveFile = function () {
+		var title = mw.Title.newFromText(
+				this.getFilename(),
+				mw.config.get( 'wgNamespaceIds' ).file
+			);
+
+		return this.uploadPromise
+			.then( this.validateFilename.bind( this, title ) )
+			.then( mw.ForeignStructuredUpload.BookletLayout.parent.prototype.saveFile.bind( this ) );
+	};
+
 	/* Getters */
 
 	/**
diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index 1ea7e042ad..a719ffe0b6 100644
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -84,7 +84,7 @@
 			modes: 'insert'
 		},
 		{
-			flags: [ 'primary', 'constructive' ],
+			flags: [ 'primary', 'progressive' ],
 			label: mw.msg( 'upload-dialog-button-save' ),
 			action: 'save',
 			modes: 'info'
diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index 170e1240c8..0b3ea043e8 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -116,22 +116,6 @@
 					]
 				};
 				break;
-			case 'error1':
-			case 'error2':
-			case 'error3':
-			case 'error4':
-				dialogConfig = {
-					title: mw.msg( 'feedback-error-title' ),
-					message: mw.msg( 'feedback-' + status ),
-					actions: [
-						{
-							action: 'accept',
-							label: mw.msg( 'feedback-close' ),
-							flags: 'primary'
-						}
-					]
-				};
-				break;
 		}
 
 		// Show the message dialog
@@ -216,12 +200,12 @@
 		{
 			action: 'submit',
 			label: mw.msg( 'feedback-submit' ),
-			flags: [ 'primary', 'constructive' ]
+			flags: [ 'primary', 'progressive' ]
 		},
 		{
 			action: 'external',
 			label: mw.msg( 'feedback-external-bug-report-button' ),
-			flags: 'constructive'
+			flags: 'progressive'
 		},
 		{
 			action: 'cancel',
@@ -422,8 +406,10 @@
 				}, function () {
 					fb.status = 'error4';
 					mw.log.warn( 'Feedback report failed because MessagePoster could not be fetched' );
-				} ).always( function () {
+				} ).then( function () {
 					fb.close();
+				}, function () {
+					return fb.getErrorMessage();
 				} );
 			}, this );
 		}
@@ -431,6 +417,24 @@
 		return mw.Feedback.Dialog.parent.prototype.getActionProcess.call( this, action );
 	};
 
+	/**
+	 * Returns an error message for the current status.
+	 *
+	 * @private
+	 *
+	 * @return {OO.ui.Error}
+	 */
+	mw.Feedback.Dialog.prototype.getErrorMessage = function () {
+		switch ( this.status ) {
+			case 'error1':
+			case 'error2':
+			case 'error3':
+			case 'error4':
+				// Messages: feedback-error1, feedback-error2, feedback-error3, feedback-error4
+				return new OO.ui.Error( mw.msg( 'feedback-' + this.status ) );
+		}
+	};
+
 	/**
 	 * Posts the message
 	 *
diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js
index 294b5de179..866f213bd9 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -387,7 +387,7 @@
 			// - atext   : defined in RFC 5322 section 3.2.3
 			// - ldh-str : defined in RFC 1034 section 3.5
 			//
-			// (see STD 68 / RFC 5234 http://tools.ietf.org/html/std68)
+			// (see STD 68 / RFC 5234 https://tools.ietf.org/html/std68)
 			// First, define the RFC 5322 'atext' which is pretty easy:
 			// atext = ALPHA / DIGIT / ; Printable US-ASCII
 			//     "!" / "#" /    ; characters not including
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 374bd0e408..a0d6b22cce 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -1508,7 +1508,7 @@ class ParserTestRunner {
 		}
 
 		// The RepoGroup cache is invalidated by the creation of file redirects
-		if ( $title->getNamespace() === NS_IMAGE ) {
+		if ( $title->inNamespace( NS_FILE ) ) {
 			RepoGroup::singleton()->clearCache( $title );
 		}
 	}
diff --git a/tests/parser/TestFileReader.php b/tests/parser/TestFileReader.php
index a1a8d1968c..6279d68fd8 100644
--- a/tests/parser/TestFileReader.php
+++ b/tests/parser/TestFileReader.php
@@ -25,6 +25,7 @@ class TestFileReader {
 	private $section = null;
 	/** String|null: current test section being analyzed */
 	private $sectionData = [];
+	private $sectionLineNum = [];
 	private $lineNum = 0;
 	private $runDisabled;
 	private $runParsoid;
@@ -77,44 +78,83 @@ class TestFileReader {
 		// "input" and "result" are old section names allowed
 		// for backwards-compatibility.
 		$input = $this->checkSection( [ 'wikitext', 'input' ], false );
-		$result = $this->checkSection( [ 'html/php', 'html/*', 'html', 'result' ], false );
+		$nonTidySection = $this->checkSection(
+			[ 'html/php', 'html/*', 'html', 'result' ], false );
 		// Some tests have "with tidy" and "without tidy" variants
-		$tidy = $this->checkSection( [ 'html/php+tidy', 'html+tidy' ], false );
+		$tidySection = $this->checkSection( [ 'html/php+tidy', 'html+tidy' ], false );
 
-		if ( !isset( $this->sectionData['options'] ) ) {
-			$this->sectionData['options'] = '';
+		// Remove trailing newline
+		$data = array_map( 'ParserTestRunner::chomp', $this->sectionData );
+
+		// Apply defaults
+		$data += [
+			'options' => '',
+			'config' => ''
+		];
+
+		if ( $input === false ) {
+			throw new MWException( "Test at {$this->file}:{$this->sectionLineNum['test']} " .
+				"lacks input section" );
+		}
+
+		if ( preg_match( '/\\bdisabled\\b/i', $data['options'] ) &&	!$this->runDisabled ) {
+			// Disabled
+			return;
 		}
 
-		if ( !isset( $this->sectionData['config'] ) ) {
-			$this->sectionData['config'] = '';
+		if ( $tidySection === false && $nonTidySection === false ) {
+			if ( isset( $data['html/parsoid'] ) || isset( $data['wikitext/edited'] ) ) {
+				// Parsoid only
+				return;
+			} else {
+				throw new MWException( "Test at {$this->file}:{$this->sectionLineNum['test']} " .
+					"lacks result section" );
+			}
+		}
+
+		if ( preg_match( '/\\bparsoid\\b/i', $data['options'] ) && $nonTidySection === 'html'
+			&& !$this->runParsoid
+		) {
+			// A test which normally runs on Parsoid but can optionally be run with MW
+			return;
 		}
 
-		$isDisabled = preg_match( '/\\bdisabled\\b/i', $this->sectionData['options'] ) &&
-			!$this->runDisabled;
-		$isParsoidOnly = preg_match( '/\\bparsoid\\b/i', $this->sectionData['options'] ) &&
-			$result == 'html' &&
-			!$this->runParsoid;
-		$isFiltered = !preg_match( $this->regex, $this->sectionData['test'] );
-		if ( $input == false || $result == false || $isDisabled || $isParsoidOnly || $isFiltered ) {
-			// Disabled test
+		if ( !preg_match( $this->regex, $data['test'] ) ) {
+			// Filtered test
 			return;
 		}
 
-		$test = [
-			'test' => ParserTestRunner::chomp( $this->sectionData['test'] ),
-			'input' => ParserTestRunner::chomp( $this->sectionData[$input] ),
-			'result' => ParserTestRunner::chomp( $this->sectionData[$result] ),
-			'options' => ParserTestRunner::chomp( $this->sectionData['options'] ),
-			'config' => ParserTestRunner::chomp( $this->sectionData['config'] ),
+		$commonInfo = [
+			'test' => $data['test'],
+			'desc' => $data['test'],
+			'input' => $data[$input],
+			'options' => $data['options'],
+			'config' => $data['config'],
 		];
-		$test['desc'] = $test['test'];
-		$this->tests[] = $test;
-
-		if ( $tidy !== false ) {
-			$test['options'] .= " tidy";
-			$test['desc'] .= ' (with tidy)';
-			$test['result'] = ParserTestRunner::chomp( $this->sectionData[$tidy] );
-			$this->tests[] = $test;
+
+		if ( $nonTidySection !== false ) {
+			// Add non-tidy test
+			$this->tests[] = [
+				'result' => $data[$nonTidySection],
+			] + $commonInfo;
+
+			if ( $tidySection !== false ) {
+				// Add tidy subtest
+				$this->tests[] = [
+					'desc' => $data['test'] . ' (with tidy)',
+					'result' => $data[$tidySection],
+					'options' => $data['options'] . ' tidy',
+				] + $commonInfo;
+			}
+		} elseif ( $tidySection !== false ) {
+			// No need to override desc when there is no subtest
+			$this->tests[] = [
+				'result' => $data[$tidySection],
+				'options' => $data['options'] . ' tidy'
+			] + $commonInfo;
+		} else {
+			throw new MWException( "Test at {$this->file}:{$this->sectionLineNum['test']} " .
+				"lacks result section" );
 		}
 	}
 
@@ -199,6 +239,7 @@ class TestFileReader {
 						. "at line {$this->lineNum} of $this->file\n" );
 				}
 
+				$this->sectionLineNum[$this->section] = $this->lineNum;
 				$this->sectionData[$this->section] = '';
 
 				continue;
@@ -214,6 +255,7 @@ class TestFileReader {
 	 * Clear section name and its data
 	 */
 	private function clearSection() {
+		$this->sectionLineNum = [];
 		$this->sectionData = [];
 		$this->section = null;
 
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 1e511f67f5..2d7fc3d8fc 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -3681,6 +3681,10 @@ Nested definition lists using html syntax
 <dl><dt>x</dt>
 <dd>a</dd>
 <dd>b</dd></dl>
+!! html
+<dl><dt>x</dt>
+<dd>a</dd>
+<dd>b</dd></dl>
 
 !! end
 
@@ -16707,11 +16711,11 @@ Expansion of multi-line templates in attribute values (bug 6255 sanity check 2)
 !! end
 
 !! test
-evil <math>-wiki-tags without Extension:Math enabled
+Tags which are hidden from Tidy cannot pass through the Sanitizer
 !! wikitext
-<math><img src="some evil external link"><script>some_evil_javascript();</script></math>
+<mw:toc><script>alert();</script></mw:toc>
 !! html+tidy
-<p>&lt;math&gt;&lt;img src="some evil external link"&gt;&lt;script&gt;some_evil_javascript();&lt;/script&gt;&lt;/math&gt;</p>
+<p>&lt;mw:toc&gt;&lt;script&gt;alert();&lt;/script&gt;&lt;/mw:toc&gt;</p>
 !! end
 
 ###
@@ -21651,6 +21655,22 @@ __TOC__
 
 !! end
 
+!! test
+T35715: s/strike element in ToC
+!! wikitext
+__TOC__
+== <s>test</s> test <strike>test</strike> ==
+!! html
+<div id="toc" class="toc"><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#test_test_test"><span class="tocnumber">1</span> <span class="toctext"><s>test</s> test <strike>test</strike></span></a></li>
+</ul>
+</div>
+
+<h2><span class="mw-headline" id="test_test_test"><s>test</s> test <strike>test</strike></span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: test test test">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+
+!! end
+
 # Note that the html output does not have the <p></p>, but the
 # html+tidy output *does*.  This is because the empty <p></p> is
 # removed by the sanitizer, but only when tidy is *not* enabled (!).
diff --git a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
index c76666d36d..8fbca6cfe3 100644
--- a/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
+++ b/tests/phpunit/includes/GlobalFunctions/wfBCP47Test.php
@@ -11,7 +11,7 @@ class WfBCP47Test extends MediaWikiTestCase {
 	 * This test is used to verify our formatting against all lower and
 	 * all upper cases language code.
 	 *
-	 * @see http://tools.ietf.org/html/bcp47
+	 * @see https://tools.ietf.org/html/bcp47
 	 * @dataProvider provideLanguageCodes()
 	 */
 	public function testBCP47( $code, $expected ) {
diff --git a/tests/phpunit/includes/MediaWikiServicesTest.php b/tests/phpunit/includes/MediaWikiServicesTest.php
index a05e39d974..ebe00ffb37 100644
--- a/tests/phpunit/includes/MediaWikiServicesTest.php
+++ b/tests/phpunit/includes/MediaWikiServicesTest.php
@@ -312,6 +312,7 @@ class MediaWikiServicesTest extends MediaWikiTestCase {
 			'DBLoadBalancer' => [ 'DBLoadBalancer', 'LoadBalancer' ],
 			'WatchedItemStore' => [ 'WatchedItemStore', WatchedItemStore::class ],
 			'WatchedItemQueryService' => [ 'WatchedItemQueryService', WatchedItemQueryService::class ],
+			'CryptRand' => [ 'CryptRand', CryptRand::class ],
 			'MediaHandlerFactory' => [ 'MediaHandlerFactory', MediaHandlerFactory::class ],
 			'GenderCache' => [ 'GenderCache', GenderCache::class ],
 			'LinkCache' => [ 'LinkCache', LinkCache::class ],
diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php
index 26529e871c..c915b70e1d 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -314,6 +314,8 @@ class SanitizerTest extends MediaWikiTestCase {
 				'/* insecure input */',
 				'background-image: -moz-image-set("asdf.png" 1x, "asdf.png" 2x);'
 			],
+			[ '/* insecure input */', 'foo: attr( title, url );' ],
+			[ '/* insecure input */', 'foo: attr( title url );' ],
 		];
 	}
 
diff --git a/tests/phpunit/includes/WatchedItemStoreUnitTest.php b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
index 030d9d59db..c51d496dfc 100644
--- a/tests/phpunit/includes/WatchedItemStoreUnitTest.php
+++ b/tests/phpunit/includes/WatchedItemStoreUnitTest.php
@@ -28,12 +28,12 @@ class WatchedItemStoreUnitTest extends MediaWikiTestCase {
 			->getMock();
 		if ( $expectedConnectionType !== null ) {
 			$mock->expects( $this->any() )
-				->method( 'getConnection' )
+				->method( 'getConnectionRef' )
 				->with( $expectedConnectionType )
 				->will( $this->returnValue( $mockDb ) );
 		} else {
 			$mock->expects( $this->any() )
-				->method( 'getConnection' )
+				->method( 'getConnectionRef' )
 				->will( $this->returnValue( $mockDb ) );
 		}
 		$mock->expects( $this->any() )
diff --git a/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php b/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php
index 582c0769a2..d6f315d5b3 100644
--- a/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php
+++ b/tests/phpunit/includes/api/ApiQueryWatchlistRawIntegrationTest.php
@@ -477,6 +477,7 @@ class ApiQueryWatchlistRawIntegrationTest extends ApiTestCase {
 			new TitleValue( 1, 'ApiQueryWatchlistRawIntegrationTestPage1' ),
 		] );
 
+		ObjectCache::getMainWANInstance()->clearProcessCache();
 		$result = $this->doListWatchlistRawRequest( [
 			'wrowner' => $otherUser->getName(),
 			'wrtoken' => '1234567890',
diff --git a/tests/phpunit/includes/auth/AuthManagerTest.php b/tests/phpunit/includes/auth/AuthManagerTest.php
index f679f63345..dc6fc62c3d 100644
--- a/tests/phpunit/includes/auth/AuthManagerTest.php
+++ b/tests/phpunit/includes/auth/AuthManagerTest.php
@@ -2674,7 +2674,7 @@ class AuthManagerTest extends \MediaWikiTestCase {
 		$this->assertEquals( 0, $session->getUser()->getId() );
 		$this->assertSame( [
 			[ LogLevel::INFO, 'creating new user ({username}) - from: {from}' ],
-			[ LogLevel::ERROR, '{username} failed with message {message}' ],
+			[ LogLevel::ERROR, '{username} failed with message {msg}' ],
 		], $logger->getBuffer() );
 		$logger->clearBuffer();
 		$this->assertSame( null, $session->get( 'AuthManager::AutoCreateBlacklist' ) );
diff --git a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
index 515a5b311e..8161ed4206 100644
--- a/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
+++ b/tests/phpunit/includes/auth/TemporaryPasswordPrimaryAuthenticationProviderTest.php
@@ -122,6 +122,8 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 	}
 
 	public function testTestUserCanAuthenticate() {
+		$user = self::getMutableTestUser()->getUser();
+
 		$dbw = wfGetDB( DB_MASTER );
 
 		$passwordFactory = new \PasswordFactory();
@@ -142,9 +144,9 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 				'user_newpassword' => \PasswordFactory::newInvalidPassword()->toString(),
 				'user_newpass_time' => null,
 			],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
-		$this->assertFalse( $provider->testUserCanAuthenticate( 'UTSysop' ) );
+		$this->assertFalse( $provider->testUserCanAuthenticate( $user->getName() ) );
 
 		$dbw->update(
 			'user',
@@ -152,10 +154,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 				'user_newpassword' => $pwhash,
 				'user_newpass_time' => null,
 			],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
-		$this->assertTrue( $provider->testUserCanAuthenticate( 'UTSysop' ) );
-		$this->assertTrue( $provider->testUserCanAuthenticate( 'uTSysop' ) );
+		$this->assertTrue( $provider->testUserCanAuthenticate( $user->getName() ) );
+		$this->assertTrue( $provider->testUserCanAuthenticate( lcfirst( $user->getName() ) ) );
 
 		$dbw->update(
 			'user',
@@ -163,12 +165,12 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 				'user_newpassword' => $pwhash,
 				'user_newpass_time' => $dbw->timestamp( time() - 10 ),
 			],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
 		$providerPriv->newPasswordExpiry = 100;
-		$this->assertTrue( $provider->testUserCanAuthenticate( 'UTSysop' ) );
+		$this->assertTrue( $provider->testUserCanAuthenticate( $user->getName() ) );
 		$providerPriv->newPasswordExpiry = 1;
-		$this->assertFalse( $provider->testUserCanAuthenticate( 'UTSysop' ) );
+		$this->assertFalse( $provider->testUserCanAuthenticate( $user->getName() ) );
 
 		$dbw->update(
 			'user',
@@ -176,7 +178,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 				'user_newpassword' => \PasswordFactory::newInvalidPassword()->toString(),
 				'user_newpass_time' => null,
 			],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
 	}
 
@@ -229,13 +231,15 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 	}
 
 	public function testAuthentication() {
+		$user = self::getMutableTestUser()->getUser();
+
 		$password = 'TemporaryPassword';
 		$hash = ':A:' . md5( $password );
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->update(
 			'user',
 			[ 'user_newpassword' => $hash, 'user_newpass_time' => $dbw->timestamp( time() - 10 ) ],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
 
 		$req = new PasswordAuthenticationRequest();
@@ -284,7 +288,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		);
 
 		// Validation failure
-		$req->username = 'UTSysop';
+		$req->username = $user->getName();
 		$req->password = $password;
 		$this->validity = \Status::newFatal( 'arbitrary-failure' );
 		$ret = $provider->beginPrimaryAuthentication( $reqs );
@@ -301,20 +305,20 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$this->manager->removeAuthenticationSessionData( null );
 		$this->validity = \Status::newGood();
 		$this->assertEquals(
-			AuthenticationResponse::newPass( 'UTSysop' ),
+			AuthenticationResponse::newPass( $user->getName() ),
 			$provider->beginPrimaryAuthentication( $reqs )
 		);
 		$this->assertNotNull( $this->manager->getAuthenticationSessionData( 'reset-pass' ) );
 
 		$this->manager->removeAuthenticationSessionData( null );
 		$this->validity = \Status::newGood();
-		$req->username = 'uTSysop';
+		$req->username = lcfirst( $user->getName() );
 		$this->assertEquals(
-			AuthenticationResponse::newPass( 'UTSysop' ),
+			AuthenticationResponse::newPass( $user->getName() ),
 			$provider->beginPrimaryAuthentication( $reqs )
 		);
 		$this->assertNotNull( $this->manager->getAuthenticationSessionData( 'reset-pass' ) );
-		$req->username = 'UTSysop';
+		$req->username = $user->getName();
 
 		// Expired password
 		$providerPriv->newPasswordExpiry = 1;
@@ -408,20 +412,19 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$oldpass = 'OldTempPassword';
 		$newpass = 'NewTempPassword';
 
-		$hash = ':A:' . md5( $oldpass );
-		$dbw = wfGetDB( DB_MASTER );
-		$dbw->update(
-			'user',
-			[ 'user_newpassword' => $hash, 'user_newpass_time' => $dbw->timestamp( time() + 10 ) ],
-			[ 'user_name' => 'UTSysop' ]
-		);
-
 		$dbw = wfGetDB( DB_MASTER );
 		$oldHash = $dbw->selectField( 'user', 'user_newpassword', [ 'user_name' => $cuser ] );
 		$cb = new \ScopedCallback( function () use ( $dbw, $cuser, $oldHash ) {
 			$dbw->update( 'user', [ 'user_newpassword' => $oldHash ], [ 'user_name' => $cuser ] );
 		} );
 
+		$hash = ':A:' . md5( $oldpass );
+		$dbw->update(
+			'user',
+			[ 'user_newpassword' => $hash, 'user_newpass_time' => $dbw->timestamp( time() + 10 ) ],
+			[ 'user_name' => $cuser ]
+		);
+
 		$provider = $this->getProvider();
 
 		// Sanity check
@@ -500,22 +503,15 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 	}
 
 	public function testProviderChangeAuthenticationDataEmail() {
+		$user = self::getMutableTestUser()->getUser();
+
 		$dbw = wfGetDB( DB_MASTER );
 		$dbw->update(
 			'user',
 			[ 'user_newpass_time' => $dbw->timestamp( time() - 5 * 3600 ) ],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
 
-		$user = \User::newFromName( 'UTSysop' );
-		$reset = new \ScopedCallback( function ( $email ) use ( $user ) {
-			$user->setEmail( $email );
-			$user->saveSettings();
-		}, [ $user->getEmail() ] );
-
-		$user->setEmail( 'test@localhost.localdomain' );
-		$user->saveSettings();
-
 		$req = TemporaryPasswordAuthenticationRequest::newRandom();
 		$req->username = $user->getName();
 		$req->mailpassword = true;
@@ -539,7 +535,7 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$dbw->update(
 			'user',
 			[ 'user_newpass_time' => $dbw->timestamp( time() + 5 * 3600 ) ],
-			[ 'user_name' => 'UTSysop' ]
+			[ 'user_id' => $user->getId() ]
 		);
 		$provider = $this->getProvider( [ 'passwordReminderResendTime' => 0 ] );
 		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
@@ -563,16 +559,16 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
 		$this->assertEquals( \StatusValue::newGood(), $status );
 
-		$req->caller = 'UTSysop';
+		$req->caller = $user->getName();
 		$status = $provider->providerAllowsAuthenticationDataChange( $req, true );
 		$this->assertEquals( \StatusValue::newGood(), $status );
 
 		$mailed = false;
 		$resetMailer = $this->hookMailer( function ( $headers, $to, $from, $subject, $body )
-			use ( &$mailed, $req )
+			use ( &$mailed, $req, $user )
 		{
 			$mailed = true;
-			$this->assertSame( 'test@localhost.localdomain', $to[0]->address );
+			$this->assertSame( $user->getEmail(), $to[0]->address );
 			$this->assertContains( $req->password, $body );
 			return false;
 		} );
@@ -658,12 +654,10 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 		$this->assertEquals( $expect, $provider->beginPrimaryAccountCreation( $user, $user, $reqs ) );
 		$this->assertNull( $this->manager->getAuthenticationSessionData( 'no-email' ) );
 
-		// We have to cheat a bit to avoid having to add a new user to
-		// the database to test the actual setting of the password works right
-		$user = \User::newFromName( 'UTSysop' );
+		$user = self::getMutableTestUser()->getUser();
 		$req->username = $authreq->username = $user->getName();
 		$req->password = $authreq->password = 'NewPassword';
-		$expect = AuthenticationResponse::newPass( 'UTSysop' );
+		$expect = AuthenticationResponse::newPass( $user->getName() );
 		$expect->createRequest = $req;
 
 		$res2 = $provider->beginPrimaryAccountCreation( $user, $user, $reqs );
@@ -680,12 +674,8 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 
 	public function testAccountCreationEmail() {
 		$creator = \User::newFromName( 'Foo' );
-		$user = \User::newFromName( 'UTSysop' );
-		$reset = new \ScopedCallback( function ( $email ) use ( $user ) {
-			$user->setEmail( $email );
-			$user->saveSettings();
-		}, [ $user->getEmail() ] );
 
+		$user = self::getMutableTestUser()->getUser();
 		$user->setEmail( null );
 
 		$req = TemporaryPasswordAuthenticationRequest::newRandom();
@@ -722,9 +712,9 @@ class TemporaryPasswordPrimaryAuthenticationProviderTest extends \MediaWikiTestC
 			return false;
 		} );
 
-		$expect = AuthenticationResponse::newPass( 'UTSysop' );
+		$expect = AuthenticationResponse::newPass( $user->getName() );
 		$expect->createRequest = clone( $req );
-		$expect->createRequest->username = 'UTSysop';
+		$expect->createRequest->username = $user->getName();
 		$res = $provider->beginPrimaryAccountCreation( $user, $creator, [ $req ] );
 		$this->assertEquals( $expect, $res );
 		$this->assertTrue( $this->manager->getAuthenticationSessionData( 'no-email' ) );
diff --git a/tests/phpunit/includes/content/FileContentHandlerTest.php b/tests/phpunit/includes/content/FileContentHandlerTest.php
new file mode 100644
index 0000000000..276a86ee5e
--- /dev/null
+++ b/tests/phpunit/includes/content/FileContentHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+/**
+ * @group ContentHandler
+ */
+class FileContentHandlerTest extends MediaWikiLangTestCase {
+	/**
+	 * @var FileContentHandler
+	 */
+	private $handler;
+
+	protected function setUp() {
+		parent::setUp();
+
+		$this->handler = new FileContentHandler();
+	}
+
+	public function testIndexMapping() {
+		$mockEngine = $this->getMock( 'SearchEngine' );
+
+		$mockEngine->expects( $this->atLeastOnce() )
+			->method( 'makeSearchFieldMapping' )
+			->willReturnCallback( function ( $name, $type ) {
+				$mockField =
+					$this->getMockBuilder( 'SearchIndexFieldDefinition' )
+						->setMethods( [ 'getMapping' ] )
+						->setConstructorArgs( [ $name, $type ] )
+						->getMock();
+				return $mockField;
+			} );
+
+		$map = $this->handler->getFieldsForSearchIndex( $mockEngine );
+		$expect = [
+			'file_media_type' => 1,
+			'file_mime' => 1,
+			'file_size' => 1,
+			'file_width' => 1,
+			'file_height' => 1,
+			'file_bits' => 1,
+			'file_resolution' => 1,
+			'file_text' => 1,
+		];
+		foreach ( $map as $name => $field ) {
+			$this->assertInstanceOf( 'SearchIndexField', $field );
+			$this->assertEquals( $name, $field->getName() );
+			unset( $expect[$name] );
+		}
+		$this->assertEmpty( $expect );
+	}
+}
diff --git a/tests/phpunit/includes/content/WikitextContentHandlerTest.php b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
index 9d4abe857d..ec97d76371 100644
--- a/tests/phpunit/includes/content/WikitextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/WikitextContentHandlerTest.php
@@ -249,11 +249,20 @@ class WikitextContentHandlerTest extends MediaWikiLangTestCase {
 		$title = Title::newFromText( 'Somefile.jpg', NS_FILE );
 		$page = new WikiPage( $title );
 
+		$fileHandler = $this->getMockBuilder( FileContentHandler::class )
+			->disableOriginalConstructor()
+			->setMethods( [ 'getDataForSearchIndex' ] )
+			->getMock();
+
 		$handler = $this->getMockBuilder( WikitextContentHandler::class )
 			->disableOriginalConstructor()
-			->setMethods( [ 'getFileText' ] )
+			->setMethods( [ 'getFileHandler' ] )
 			->getMock();
-		$handler->method( 'getFileText' )->will( $this->returnValue( 'This is file content' ) );
+
+		$handler->method( 'getFileHandler' )->will( $this->returnValue( $fileHandler ) );
+		$fileHandler->expects( $this->once() )
+			->method( 'getDataForSearchIndex' )
+			->will( $this->returnValue( [ 'file_text' => 'This is file content' ] ) );
 
 		$data = $handler->getDataForSearchIndex( $page, new ParserOutput(), $mockEngine );
 		$this->assertArrayHasKey( 'file_text', $data );
diff --git a/tests/phpunit/includes/db/LBFactoryTest.php b/tests/phpunit/includes/db/LBFactoryTest.php
index 0f4484e7b6..aed2d83a7d 100644
--- a/tests/phpunit/includes/db/LBFactoryTest.php
+++ b/tests/phpunit/includes/db/LBFactoryTest.php
@@ -43,7 +43,7 @@ class LBFactoryTest extends MediaWikiTestCase {
 		];
 
 		$this->hideDeprecated( '$wgLBFactoryConf must be updated. See RELEASE-NOTES for details' );
-		$result = LBFactoryMW::getLBFactoryClass( $config );
+		$result = MWLBFactory::getLBFactoryClass( $config );
 
 		$this->assertEquals( $expected, $result );
 	}
diff --git a/tests/phpunit/includes/libs/MemoizedCallableTest.php b/tests/phpunit/includes/libs/MemoizedCallableTest.php
index 6eb96b157e..881f5e1167 100644
--- a/tests/phpunit/includes/libs/MemoizedCallableTest.php
+++ b/tests/phpunit/includes/libs/MemoizedCallableTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * A MemoizedCallable subclass that stores function return values
- * in an instance property rather than APC.
+ * in an instance property rather than APC or APCu.
  */
 class ArrayBackedMemoizedCallable extends MemoizedCallable {
 	private $cache = [];
@@ -44,7 +44,7 @@ class MemoizedCallableTest extends PHPUnit_Framework_TestCase {
 	 * Consecutive calls to the memoized callable with the same arguments
 	 * should result in just one invocation of the underlying callable.
 	 *
-	 * @requires function apc_store
+	 * @requires function apc_store/apcu_store
 	 */
 	public function testCallableMemoized() {
 		$observer = $this->getMock( 'stdClass', [ 'computeSomething' ] );
diff --git a/tests/phpunit/includes/libs/WaitConditionLoopTest.php b/tests/phpunit/includes/libs/WaitConditionLoopTest.php
deleted file mode 100644
index 9ce93d6291..0000000000
--- a/tests/phpunit/includes/libs/WaitConditionLoopTest.php
+++ /dev/null
@@ -1,179 +0,0 @@
-<?php
-
-class WaitConditionLoopFakeTime extends WaitConditionLoop {
-	protected $wallClock = 1;
-
-	function __construct( callable $condition, $timeout, array $busyCallbacks ) {
-		parent::__construct( $condition, $timeout, $busyCallbacks );
-	}
-
-	function usleep( $microseconds ) {
-		$this->wallClock += $microseconds / 1e6;
-	}
-
-	function getCpuTime() {
-		return 0.0;
-	}
-
-	function getWallTime() {
-		return $this->wallClock;
-	}
-
-	public function setWallClock( &$timestamp ) {
-		$this->wallClock =& $timestamp;
-	}
-}
-
-class WaitConditionLoopTest extends PHPUnit_Framework_TestCase {
-	public function testCallbackReached() {
-		$wallClock = microtime( true );
-
-		$count = 0;
-		$status = new StatusValue();
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, $status ) {
-				++$count;
-				$status->value = 'cookie';
-
-				return WaitConditionLoop::CONDITION_REACHED;
-			},
-			10.0,
-			$this->newBusyWork( $x, $y, $z )
-		);
-		$this->assertEquals( $loop::CONDITION_REACHED, $loop->invoke() );
-		$this->assertEquals( 1, $count );
-		$this->assertEquals( 'cookie', $status->value );
-		$this->assertEquals( [ 0, 0, 0 ], [ $x, $y, $z ], "No busy work done" );
-
-		$count = 0;
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, &$wallClock ) {
-				$wallClock += 1;
-				++$count;
-
-				return $count >= 2 ? WaitConditionLoop::CONDITION_REACHED : false;
-			},
-			7.0,
-			$this->newBusyWork( $x, $y, $z, $wallClock )
-		);
-		$this->assertEquals( $loop::CONDITION_REACHED, $loop->invoke(),
-			"Busy work did not cause timeout" );
-		$this->assertEquals( [ 1, 0, 0 ], [ $x, $y, $z ] );
-
-		$count = 0;
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, &$wallClock ) {
-				$wallClock += .1;
-				++$count;
-
-				return $count > 80 ? true : false;
-			},
-			50.0,
-			$this->newBusyWork( $x, $y, $z, $wallClock, $dontCallMe, $badCalls )
-		);
-		$this->assertEquals( 0, $badCalls, "Callback exception not yet called" );
-		$this->assertEquals( $loop::CONDITION_REACHED, $loop->invoke() );
-		$this->assertEquals( [ 1, 1, 1 ], [ $x, $y, $z ], "Busy work done" );
-		$this->assertEquals( 1, $badCalls, "Bad callback ran and was exception caught" );
-
-		try {
-			$e = null;
-			$dontCallMe();
-		} catch ( Exception $e ) {
-		}
-
-		$this->assertInstanceOf( 'RunTimeException', $e );
-		$this->assertEquals( 1, $badCalls, "Callback exception cached" );
-	}
-
-	public function testCallbackTimeout() {
-		$count = 0;
-		$wallClock = microtime( true );
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, &$wallClock ) {
-				$wallClock += 3;
-				++$count;
-
-				return $count > 300 ? true : false;
-			},
-			50.0,
-			$this->newBusyWork( $x, $y, $z, $wallClock )
-		);
-		$loop->setWallClock( $wallClock );
-		$this->assertEquals( $loop::CONDITION_TIMED_OUT, $loop->invoke() );
-		$this->assertEquals( [ 1, 1, 1 ], [ $x, $y, $z ], "Busy work done" );
-
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, &$wallClock ) {
-				$wallClock += 3;
-				++$count;
-
-				return true;
-			},
-			0.0,
-			$this->newBusyWork( $x, $y, $z, $wallClock )
-		);
-		$this->assertEquals( $loop::CONDITION_REACHED, $loop->invoke() );
-
-		$count = 0;
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$count, &$wallClock ) {
-				$wallClock += 3;
-				++$count;
-
-				return $count > 10 ? true : false;
-			},
-			0,
-			$this->newBusyWork( $x, $y, $z, $wallClock )
-		);
-		$this->assertEquals( $loop::CONDITION_FAILED, $loop->invoke() );
-	}
-
-	public function testCallbackAborted() {
-		$x = 0;
-		$wallClock = microtime( true );
-		$loop = new WaitConditionLoopFakeTime(
-			function () use ( &$x, &$wallClock ) {
-				$wallClock += 2;
-				++$x;
-
-				return $x > 2 ? WaitConditionLoop::CONDITION_ABORTED : false;
-			},
-			10.0,
-			$this->newBusyWork( $x, $y, $z, $wallClock )
-		);
-		$loop->setWallClock( $wallClock );
-		$this->assertEquals( $loop::CONDITION_ABORTED, $loop->invoke() );
-	}
-
-	private function newBusyWork(
-		&$x, &$y, &$z, &$wallClock = 1, &$dontCallMe = null, &$badCalls = 0
-	) {
-		$x = $y = $z = 0;
-		$badCalls = 0;
-
-		$list = [];
-		$list[] = function () use ( &$x, &$wallClock ) {
-			$wallClock += 1;
-
-			return ++$x;
-		};
-		$dontCallMe = function () use ( &$badCalls ) {
-			++$badCalls;
-			throw new RuntimeException( "TrollyMcTrollFace" );
-		};
-		$list[] =& $dontCallMe;
-		$list[] = function () use ( &$y, &$wallClock ) {
-			$wallClock += 15;
-
-			return ++$y;
-		};
-		$list[] = function () use ( &$z, &$wallClock ) {
-			$wallClock += 0.1;
-
-			return ++$z;
-		};
-
-		return $list;
-	}
-}
diff --git a/tests/phpunit/includes/libs/composer/ComposerJsonTest.php b/tests/phpunit/includes/libs/composer/ComposerJsonTest.php
index 2072752d67..3cde3e2344 100644
--- a/tests/phpunit/includes/libs/composer/ComposerJsonTest.php
+++ b/tests/phpunit/includes/libs/composer/ComposerJsonTest.php
@@ -28,6 +28,7 @@ class ComposerJsonTest extends MediaWikiTestCase {
 	}
 
 	/**
+	 * @covers ComposerJson::__construct
 	 * @covers ComposerJson::getRequiredDependencies
 	 */
 	public function testGetRequiredDependencies() {
diff --git a/tests/phpunit/includes/libs/composer/ComposerLockTest.php b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
index 75eb62caa8..3d5e8d346e 100644
--- a/tests/phpunit/includes/libs/composer/ComposerLockTest.php
+++ b/tests/phpunit/includes/libs/composer/ComposerLockTest.php
@@ -19,6 +19,7 @@ class ComposerLockTest extends MediaWikiTestCase {
 	}
 
 	/**
+	 * @covers ComposerLock::__construct
 	 * @covers ComposerLock::getInstalledDependencies
 	 */
 	public function testGetInstalledDependencies() {
diff --git a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
index 92fb95418c..a1afa77726 100644
--- a/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/libs/objectcache/BagOStuffTest.php
@@ -1,4 +1,7 @@
 <?php
+
+use Wikimedia\ScopedCallback;
+
 /**
  * @author Matthias Mullie <mmullie@wikimedia.org>
  * @group BagOStuff
@@ -251,20 +254,20 @@ class BagOStuffTest extends MediaWikiTestCase {
 		$value1 = $this->cache->getScopedLock( $key, 0 );
 		$value2 = $this->cache->getScopedLock( $key, 0 );
 
-		$this->assertType( 'ScopedCallback', $value1, 'First call returned lock' );
+		$this->assertType( ScopedCallback::class, $value1, 'First call returned lock' );
 		$this->assertNull( $value2, 'Duplicate call returned no lock' );
 
 		unset( $value1 );
 
 		$value3 = $this->cache->getScopedLock( $key, 0 );
-		$this->assertType( 'ScopedCallback', $value3, 'Lock returned callback after release' );
+		$this->assertType( ScopedCallback::class, $value3, 'Lock returned callback after release' );
 		unset( $value3 );
 
 		$value1 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
 		$value2 = $this->cache->getScopedLock( $key, 0, 5, 'reentry' );
 
-		$this->assertType( 'ScopedCallback', $value1, 'First reentrant call returned lock' );
-		$this->assertType( 'ScopedCallback', $value1, 'Second reentrant call returned lock' );
+		$this->assertType( ScopedCallback::class, $value1, 'First reentrant call returned lock' );
+		$this->assertType( ScopedCallback::class, $value1, 'Second reentrant call returned lock' );
 	}
 
 	/**
diff --git a/tests/phpunit/includes/page/WikiPageTest.php b/tests/phpunit/includes/page/WikiPageTest.php
index e55efeea45..4b7ebd3ab3 100644
--- a/tests/phpunit/includes/page/WikiPageTest.php
+++ b/tests/phpunit/includes/page/WikiPageTest.php
@@ -92,6 +92,9 @@ class WikiPageTest extends MediaWikiLangTestCase {
 
 	/**
 	 * @covers WikiPage::doEditContent
+	 * @covers WikiPage::doModify
+	 * @covers WikiPage::doCreate
+	 * @covers WikiPage::doEditUpdates
 	 */
 	public function testDoEditContent() {
 		$page = $this->newPage( "WikiPageTest_testDoEditContent" );
@@ -213,30 +216,6 @@ class WikiPageTest extends MediaWikiLangTestCase {
 		$this->assertEquals( 2, $n, 'pagelinks should contain two links from the page' );
 	}
 
-	/**
-	 * @covers WikiPage::doQuickEditContent
-	 */
-	public function testDoQuickEditContent() {
-		global $wgUser;
-
-		$page = $this->createPage(
-			"WikiPageTest_testDoQuickEditContent",
-			"original text",
-			CONTENT_MODEL_WIKITEXT
-		);
-
-		$content = ContentHandler::makeContent(
-			"quick text",
-			$page->getTitle(),
-			CONTENT_MODEL_WIKITEXT
-		);
-		$page->doQuickEditContent( $content, $wgUser, "testing q" );
-
-		# ---------------------
-		$page = new WikiPage( $page->getTitle() );
-		$this->assertTrue( $content->equals( $page->getContent() ) );
-	}
-
 	/**
 	 * @covers WikiPage::doDeleteArticle
 	 */
diff --git a/tests/phpunit/includes/session/TestUtils.php b/tests/phpunit/includes/session/TestUtils.php
index f1dc9e994b..0cc8ebf134 100644
--- a/tests/phpunit/includes/session/TestUtils.php
+++ b/tests/phpunit/includes/session/TestUtils.php
@@ -12,7 +12,7 @@ class TestUtils {
 	/**
 	 * Override the singleton for unit testing
 	 * @param SessionManager|null $manager
-	 * @return \\ScopedCallback|null
+	 * @return \\Wikimedia\ScopedCallback|null
 	 */
 	public static function setSessionManagerSingleton( SessionManager $manager = null ) {
 		session_write_close();
diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
index fafd4fa18e..760d41e86c 100644
--- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
@@ -37,7 +37,7 @@ class MWCryptHKDFTest extends MediaWikiTestCase {
 	}
 
 	/**
-	 * Test vectors from Appendix A on http://tools.ietf.org/html/rfc5869
+	 * Test vectors from Appendix A on https://tools.ietf.org/html/rfc5869
 	 */
 	public static function providerRfc5869() {
 
diff --git a/tests/phpunit/structure/ExtensionJsonValidationTest.php b/tests/phpunit/structure/ExtensionJsonValidationTest.php
index 711eab647e..ad61284120 100644
--- a/tests/phpunit/structure/ExtensionJsonValidationTest.php
+++ b/tests/phpunit/structure/ExtensionJsonValidationTest.php
@@ -16,6 +16,9 @@
  * http://www.gnu.org/copyleft/gpl.html
  */
 
+use Composer\Spdx\SpdxLicenses;
+use JsonSchema\Validator;
+
 /**
  * Validates all loaded extensions and skins using the ExtensionRegistry
  * against the extension.json schema in the docs/ folder.
@@ -24,7 +27,7 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		if ( !class_exists( 'JsonSchema\Uri\UriRetriever' ) ) {
+		if ( !class_exists( Validator::class ) ) {
 			$this->markTestSkipped(
 				'The JsonSchema library cannot be found,' .
 				' please install it through composer to run extension.json validation tests.'
@@ -75,9 +78,22 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase {
 			"$path is using a non-supported schema version"
 		);
 
-		$validator = new JsonSchema\Validator;
+		$licenseError = false;
+		if ( class_exists( SpdxLicenses::class ) && isset( $data->{'license-name'} )
+			// Check if it's a string, if not, schema validation will display an error
+			&& is_string( $data->{'license-name'} )
+		) {
+			$licenses = new SpdxLicenses();
+			$valid = $licenses->validate( $data->{'license-name'} );
+			if ( !$valid ) {
+				$licenseError = '[license-name] Invalid SPDX license identifier, '
+					. 'see <https://spdx.org/licenses/>';
+			}
+		}
+
+		$validator = new Validator;
 		$validator->check( $data, (object) [ '$ref' => 'file://' . $schemaPath ] );
-		if ( $validator->isValid() ) {
+		if ( $validator->isValid() && !$licenseError ) {
 			// All good.
 			$this->assertTrue( true );
 		} else {
@@ -85,6 +101,9 @@ class ExtensionJsonValidationTest extends PHPUnit_Framework_TestCase {
 			foreach ( $validator->getErrors() as $error ) {
 				$out .= "[{$error['property']}] {$error['message']}\n";
 			}
+			if ( $licenseError ) {
+				$out .= "$licenseError\n";
+			}
 			$this->assertTrue( false, $out );
 		}
 	}