From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 15 Sep 2015 22:40:01 +0000 (+0000)
Subject: Merge "SpecialMovepage: Convert form to use OOUI controls"
X-Git-Tag: 1.31.0-rc.0~10015
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=f8659ae6ea90d7bc8ce28bfc1caa56153878836f;hp=5befb9b74790a99aec5514ad8f8784a4fb085288

Merge "SpecialMovepage: Convert form to use OOUI controls"
---

diff --git a/.jscsrc b/.jscsrc
index 6a3c56408b..aaa876c3e2 100644
--- a/.jscsrc
+++ b/.jscsrc
@@ -1,9 +1,16 @@
 {
 	"preset": "wikimedia",
+	"es3": true,
 
-	"disallowQuotedKeysInObjects": null,
-	"requireSpacesInsideParentheses": null,
-	"requireSpacesInsideArrayBrackets": null,
+	"requireVarDeclFirst": null,
+
+	"disallowQuotedKeysInObjects": "allButReserved",
+	"requireDotNotation": { "allExcept": [ "keywords" ] },
+	"jsDoc": {
+		"requireNewlineAfterDescription": true,
+		"requireParamTypes": true,
+		"requireReturnTypes": true
+	},
 
 	"excludeFiles": [
 		"docs/**",
diff --git a/.jshintrc b/.jshintrc
index b84d276621..b776e8f21a 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -22,7 +22,7 @@
 		"mediaWiki": true,
 		"JSON": true,
 		"OO": true,
-		"performance": true,
+		"mwPerformance": true,
 		"jQuery": false,
 		"QUnit": false,
 		"sinon": false
diff --git a/.travis.yml b/.travis.yml
index 512d735fc4..8ba46b5455 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,19 +8,17 @@
 #
 language: php
 
-php:
-  - hhvm-nightly
-  - 5.3
-
-env:
-  - dbtype=mysql
-  - dbtype=postgres
-
-# TODO: Travis CI's hhvm does not support PostgreSQL at the moment.
 matrix:
-  exclude:
-    - php: hhvm-nightly
-      env: dbtype=postgres
+  fast_finish: true
+  include:
+    - env: dbtype=mysql
+      php: 5.3
+    - env: dbtype=postgres
+      php: 5.3
+    - env: dbtype=mysql
+      php: hhvm
+    - env: dbtype=mysql
+      php: 7
 
 services:
   - mysql
diff --git a/Gruntfile.js b/Gruntfile.js
index e1e5e4ab01..8dbeb6bfc0 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,7 +12,7 @@ module.exports = function ( grunt ) {
 		wgScriptPath = process.env.MW_SCRIPT_PATH,
 		karmaProxy = {};
 
-	karmaProxy[wgScriptPath] = wgServer + wgScriptPath;
+	karmaProxy[ wgScriptPath ] = wgServer + wgScriptPath;
 
 	grunt.initConfig( {
 		jshint: {
@@ -32,6 +32,11 @@ module.exports = function ( grunt ) {
 			]
 		},
 		banana: {
+			options: {
+				disallowBlankTranslations: false,
+				disallowDuplicateTranslations: false,
+				disallowUnusedTranslations: false
+			},
 			core: 'languages/i18n/',
 			api: 'includes/api/i18n/',
 			installer: 'includes/installer/i18n/'
@@ -87,14 +92,14 @@ module.exports = function ( grunt ) {
 		}
 		if ( !process.env.MW_SCRIPT_PATH ) {
 			grunt.log.error( 'Environment variable MW_SCRIPT_PATH must be set.\n' +
-				'Set this like $wgScriptPath, e.g. "/w"');
+				'Set this like $wgScriptPath, e.g. "/w"' );
 		}
 		return !!( process.env.MW_SERVER && process.env.MW_SCRIPT_PATH );
 	} );
 
-	grunt.registerTask( 'lint', ['jshint', 'jscs', 'jsonlint', 'banana'] );
+	grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'jsonlint', 'banana' ] );
 	grunt.registerTask( 'qunit', [ 'assert-mw-env', 'karma:main' ] );
 
-	grunt.registerTask( 'test', ['lint'] );
+	grunt.registerTask( 'test', [ 'lint' ] );
 	grunt.registerTask( 'default', 'test' );
 };
diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 5b85bbcc7e..4463c7823e 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -27,6 +27,9 @@ production.
   MediaWiki 1.26, in where ResourceLoader became fully asynchronous.
 * $wgMasterWaitTimeout was removed (deprecated in 1.24).
 * Fields in ParserOptions are now private. Use the accessors instead.
+* Custom LESS functions (defined via $wgResourceLoaderLESSFunctions)
+  have been removed, after being deprecated in 1.24.
+* $wgAlwaysUseTidy has been removed.
 
 === New features in 1.26 ===
 * (T51506) Now action=info gives estimates of actual watchers for a page.
@@ -66,6 +69,10 @@ production.
   for potentially slow POST requests that need to be as atomic as possible.
 * ResourceLoader now loads all scripts asynchronously. The top-queue and
   startup modules are no longer synchronously loaded.
+* 'mediawiki.ui.button' styles are no longer unconditionally loaded on every
+  page. During the deprecation period, the styles will only be loaded on pages
+  which contain 'mw-ui-button' in their HTML. Starting in 1.28, the styles will
+  only be loaded if explicitly required.
 
 ==== External libraries ====
 * Update es5-shim from v4.0.0 to v4.1.5.
@@ -79,6 +86,8 @@ production.
 * (T53283) load.php sometimes sends 304 response without full headers
 * (T65198) Talk page tabs now have a "rel=discussion" attribute
 * (T98841) {{msgnw:}} now preserves comments even when subst: is not used.
+* (T104142) $wgEmergencyContact and $wgPasswordSender now use their default
+  value if set to an empty string.
 
 === Action API changes in 1.26 ===
 * New-style continuation is now the default for action=continue. Clients may
@@ -97,10 +106,22 @@ production.
   sometimes being numerically-indexed objects with formatversion=2.
 * When errors about users being blocked are returned, they now include
   information about the relevant block.
+* (T99926) list=random has higher limits, in line with other API modules.
+* list=random's rnredirect parameter is deprecated in favor of a new
+  rnfilterredir parameter that also allows for listing both redirects and
+  non-redirects.
+* list=random now supports continuation.
+* API responses to GET requests may now include ETag and Last-Modified headers,
+  and will honor corresponding If-None-Match and If-Modified-Since on such
+  requests.
 
 === Action API internal changes in 1.26 ===
 * New metadata item ApiResult::META_KVP_MERGE to allow for merging the KVP key
   into the value when the value is an assoc.
+* API action modules may now provide values for the RFC 7232 ETag and
+  Last-Modified headers. The API will check these against If-None-Match and
+  If-Modified-Since request headers on GET requests and avoid executing the
+  module when appropriate.
 
 === Languages updated in 1.26 ===
 
@@ -118,6 +139,7 @@ changes to languages because of Phabricator reports.
 * ChangeTags::tagDescription() will return false if the interface message
   for the tag is disabled.
 * Added PageHistoryPager::doBatchLookups hook.
+* Added $wikiId parameter to FormatAutocomments hook.
 * Added ParserCacheSaveComplete to ParserCache
 * supportsDirectEditing and supportsDirectApiEditing methods added to
   ContentHandler, to provide a way for ApiEditPage and EditPage to check
@@ -162,6 +184,9 @@ changes to languages because of Phabricator reports.
   a lengthy deprecation period.
 * The ScopedPHPTimeout class was removed.
 * Removed maintenance script fixSlaveDesync.php.
+* Watchlist tokens, SpecialResetTokens, and User::getTokenFromOption()
+  are deprecated. Applications using those can work via the OAuth
+  extension instead. New tokens types should not be added.
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index d91b7042d1..5adfbe5104 100644
--- a/autoload.php
+++ b/autoload.php
@@ -724,7 +724,6 @@ $wgAutoloadLocalClasses = array(
 	'MWOldPassword' => __DIR__ . '/includes/password/MWOldPassword.php',
 	'MWSaltedPassword' => __DIR__ . '/includes/password/MWSaltedPassword.php',
 	'MWTidy' => __DIR__ . '/includes/parser/MWTidy.php',
-	'MWTidyWrapper' => __DIR__ . '/includes/parser/MWTidy.php',
 	'MWTimestamp' => __DIR__ . '/includes/MWTimestamp.php',
 	'MachineReadableRCFeedFormatter' => __DIR__ . '/includes/rcfeed/MachineReadableRCFeedFormatter.php',
 	'MagicWord' => __DIR__ . '/includes/MagicWord.php',
@@ -761,6 +760,13 @@ $wgAutoloadLocalClasses = array(
 	'MediaWiki\\Logger\\Monolog\\WikiProcessor' => __DIR__ . '/includes/debug/logger/monolog/WikiProcessor.php',
 	'MediaWiki\\Logger\\NullSpi' => __DIR__ . '/includes/debug/logger/NullSpi.php',
 	'MediaWiki\\Logger\\Spi' => __DIR__ . '/includes/debug/logger/Spi.php',
+	'MediaWiki\\Tidy\\Html5Depurate' => __DIR__ . '/includes/tidy/Html5Depurate.php',
+	'MediaWiki\\Tidy\\RaggettBase' => __DIR__ . '/includes/tidy/RaggettBase.php',
+	'MediaWiki\\Tidy\\RaggettExternal' => __DIR__ . '/includes/tidy/RaggettExternal.php',
+	'MediaWiki\\Tidy\\RaggettInternalHHVM' => __DIR__ . '/includes/tidy/RaggettInternalHHVM.php',
+	'MediaWiki\\Tidy\\RaggettInternalPHP' => __DIR__ . '/includes/tidy/RaggettInternalPHP.php',
+	'MediaWiki\\Tidy\\RaggettWrapper' => __DIR__ . '/includes/tidy/RaggettWrapper.php',
+	'MediaWiki\\Tidy\\TidyDriverBase' => __DIR__ . '/includes/tidy/TidyDriverBase.php',
 	'MediaWiki\\Widget\\ComplexNamespaceInputWidget' => __DIR__ . '/includes/widget/ComplexNamespaceInputWidget.php',
 	'MediaWiki\\Widget\\ComplexTitleInputWidget' => __DIR__ . '/includes/widget/ComplexTitleInputWidget.php',
 	'MediaWiki\\Widget\\NamespaceInputWidget' => __DIR__ . '/includes/widget/NamespaceInputWidget.php',
diff --git a/composer.json b/composer.json
index 852f2d2247..1fe1e5068d 100644
--- a/composer.json
+++ b/composer.json
@@ -21,14 +21,14 @@
 		"leafo/lessphp": "0.5.0",
 		"liuggio/statsd-php-client": "1.0.16",
 		"mediawiki/at-ease": "1.0.0",
-		"oojs/oojs-ui": "0.12.6",
+		"oojs/oojs-ui": "0.12.8",
 		"php": ">=5.3.3",
 		"psr/log": "1.0.0",
 		"wikimedia/assert": "0.2.2",
-		"wikimedia/cdb": "1.0.1",
+		"wikimedia/cdb": "1.3.0",
 		"wikimedia/composer-merge-plugin": "1.2.1",
 		"wikimedia/ip-set": "1.0.1",
-		"wikimedia/utfnormal": "1.0.2",
+		"wikimedia/utfnormal": "1.0.3",
 		"wikimedia/wrappedstring": "2.0.0",
 		"zordius/lightncandy": "0.21"
 	},
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index 1d78eccfc9..d11635d020 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -429,10 +429,6 @@
 			"type": "object",
 			"description": "ResourceLoader LESS variables"
 		},
-		"ResourceLoaderLESSFunctions": {
-			"type": "object",
-			"description": "ResourceLoader LESS functions"
-		},
 		"ResourceLoaderLESSImportPaths": {
 			"type": "object",
 			"description": "ResourceLoader import paths"
@@ -639,6 +635,13 @@
 		"config": {
 			"type": "object",
 			"description": "Configuration options for this extension",
+			"properties": {
+				"_prefix": {
+					"type": "string",
+					"default": "wg",
+					"description": "Prefix to put in front of configuration settings when exporting them to $GLOBALS"
+				}
+			},
 			"patternProperties": {
 				"^[a-zA-Z_\u007f-\u00ff][a-zA-Z0-9_\u007f-\u00ff]*$": {
 					"type": ["object", "array", "string", "integer", "null", "boolean"],
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 5e2269abb7..54ab46c171 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -1376,6 +1376,9 @@ $auto: The extracted part of the parsed comment before the call to the hook.
 $post: Boolean, true if there is text after this autocomment
 $title: An optional title object used to links to sections. Can be null.
 $local: Boolean indicating whether section links should refer to local page.
+$wikiId: String containing the ID (as used by WikiMap) of the wiki from which the
+  autocomment originated; null for the local wiki. Added in 1.26, should default
+  to null in handler functions, for backwards compatibility.
 
 'GalleryGetModes': Get list of classes that can render different modes of a
 gallery.
diff --git a/docs/uidesign/design.html b/docs/uidesign/design.html
index 51c1b55204..6ab57d7d4f 100644
--- a/docs/uidesign/design.html
+++ b/docs/uidesign/design.html
@@ -2,6 +2,7 @@
 <html lang="en" dir="ltr">
 <head>
 	<link rel="stylesheet" href="../../resources/src/mediawiki.legacy/shared.css">
+	<link rel="stylesheet" href="../../resources/src/mediawiki/mediawiki.feedlink.css">
 </head>
 <body style="font-size: small;">
 
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index c0aad5df04..37429b924b 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -211,7 +211,7 @@ $wgLoadScript = false;
 
 /**
  * The URL path of the skins directory.
- * Defaults to "{$wgScriptPath}/skins".
+ * Defaults to "{$wgResourceBasePath}/skins".
  * @since 1.3
  */
 $wgStylePath = false;
@@ -226,7 +226,7 @@ $wgLocalStylePath = false;
 
 /**
  * The URL path of the extensions directory.
- * Defaults to "{$wgScriptPath}/extensions".
+ * Defaults to "{$wgResourceBasePath}/extensions".
  * @since 1.16
  */
 $wgExtensionAssetsPath = false;
@@ -3473,8 +3473,8 @@ $wgResourceModuleSkinStyles = array();
 $wgResourceLoaderSources = array();
 
 /**
- * Default 'remoteBasePath' value for instances of ResourceLoaderFileModule.
- * If not set, then $wgScriptPath will be used as a fallback.
+ * The default 'remoteBasePath' value for instances of ResourceLoaderFileModule.
+ * Defaults to $wgScriptPath.
  */
 $wgResourceBasePath = null;
 
@@ -3636,18 +3636,6 @@ $wgResourceLoaderValidateStaticJS = false;
  */
 $wgResourceLoaderLESSVars = array();
 
-/**
- * Custom LESS functions. An associative array mapping function name to PHP
- * callable.
- *
- * Changes to LESS functions do not trigger cache invalidation.
- *
- * @since 1.22
- * @deprecated since 1.24 Questionable usefulness and problematic to support,
- *     will be removed in the future.
- */
-$wgResourceLoaderLESSFunctions = array();
-
 /**
  * Default import paths for LESS modules. LESS files referenced in @import
  * statements will be looked up here first, and relative to the importing file
@@ -4116,44 +4104,55 @@ $wgEnableImageWhitelist = true;
 $wgAllowImageTag = false;
 
 /**
- * $wgUseTidy: use tidy to make sure HTML output is sane.
- * Tidy is a free tool that fixes broken HTML.
- * See http://www.w3.org/People/Raggett/tidy/
+ * Configuration for HTML postprocessing tool. Set this to a configuration
+ * array to enable an external tool. Dave Raggett's "HTML Tidy" is typically
+ * used. See http://www.w3.org/People/Raggett/tidy/
  *
- * - $wgTidyBin should be set to the path of the binary and
- * - $wgTidyConf to the path of the configuration file.
- * - $wgTidyOpts can include any number of parameters.
- * - $wgTidyInternal controls the use of the PECL extension or the
- *   libtidy (PHP >= 5) extension to use an in-process tidy library instead
- *   of spawning a separate program.
- *   Normally you shouldn't need to override the setting except for
- *   debugging. To install, use 'pear install tidy' and add a line
- *   'extension=tidy.so' to php.ini.
+ * If this is null and $wgUseTidy is true, the deprecated configuration
+ * parameters will be used instead.
+ *
+ * If this is null and $wgUseTidy is false, a pure PHP fallback will be used.
+ *
+ * Keys are:
+ *  - driver: May be:
+ *    - RaggettInternalHHVM: Use the limited-functionality HHVM extension
+ *    - RaggettInternalPHP: Use the PECL extension
+ *    - RaggettExternal: Shell out to an external binary (tidyBin)
+ *
+ *  - tidyConfigFile: Path to configuration file for any of the Raggett drivers
+ *  - debugComment: True to add a comment to the output with warning messages
+ *  - tidyBin: For RaggettExternal, the path to the tidy binary.
+ *  - tidyCommandLine: For RaggettExternal, additional command line options.
  */
-$wgUseTidy = false;
+$wgTidyConfig = null;
 
 /**
- * @see $wgUseTidy
+ * Set this to true to use the deprecated tidy configuration parameters.
+ * @deprecated use $wgTidyConfig
  */
-$wgAlwaysUseTidy = false;
+$wgUseTidy = false;
 
 /**
- * @see $wgUseTidy
+ * The path to the tidy binary.
+ * @deprecated Use $wgTidyConfig['tidyBin']
  */
 $wgTidyBin = 'tidy';
 
 /**
- * @see $wgUseTidy
+ * The path to the tidy config file
+ * @deprecated Use $wgTidyConfig['tidyConfigFile']
  */
-$wgTidyConf = $IP . '/includes/tidy.conf';
+$wgTidyConf = $IP . '/includes/tidy/tidy.conf';
 
 /**
- * @see $wgUseTidy
+ * The command line options to the tidy binary
+ * @deprecated Use $wgTidyConfig['tidyCommandLine']
  */
 $wgTidyOpts = '';
 
 /**
- * @see $wgUseTidy
+ * Set this to true to use the tidy extension
+ * @deprecated Use $wgTidyConfig['driver']
  */
 $wgTidyInternal = extension_loaded( 'tidy' );
 
@@ -7237,12 +7236,6 @@ $wgAPIPropModules = array();
  */
 $wgAPIListModules = array();
 
-/**
- * This variable is ignored. To add your module to the API, please add it to $wgAPI*Modules
- * @deprecated since 1.21
- */
-$wgAPIGeneratorModules = array();
-
 /**
  * Maximum amount of rows to scan in a DB query in the API
  * The default value is generally fine
diff --git a/includes/EditPage.php b/includes/EditPage.php
index 85a30147f3..05e0ac0ee9 100644
--- a/includes/EditPage.php
+++ b/includes/EditPage.php
@@ -655,6 +655,9 @@ class EditPage {
 			$this->getContextTitle()->getPrefixedText()
 		) );
 		$wgOut->addBacklinkSubtitle( $this->getContextTitle() );
+		$wgOut->addHTML( $this->editFormPageTop );
+		$wgOut->addHTML( $this->editFormTextTop );
+
 		$wgOut->addWikiText( $wgOut->formatPermissionsErrorMessage( $permErrors, 'edit' ) );
 		$wgOut->addHTML( "<hr />\n" );
 
@@ -668,13 +671,16 @@ class EditPage {
 			$wgOut->addWikiMsg( 'viewsourcetext' );
 		}
 
+		$wgOut->addHTML( $this->editFormTextBeforeContent );
 		$this->showTextbox( $text, 'wpTextbox1', array( 'readonly' ) );
+		$wgOut->addHTML( $this->editFormTextAfterContent );
 
 		$wgOut->addHTML( Html::rawElement( 'div', array( 'class' => 'templatesUsed' ),
 			Linker::formatTemplates( $this->getTemplates() ) ) );
 
 		$wgOut->addModules( 'mediawiki.action.edit.collapsibleFooter' );
 
+		$wgOut->addHTML( $this->editFormTextBottom );
 		if ( $this->mTitle->exists() ) {
 			$wgOut->returnToMain( null, $this->mTitle );
 		}
diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 9d89633494..28525610d5 100644
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -2179,14 +2179,24 @@ function wfResetOutputBuffers( $resetGzipEncoding = true ) {
 		$wgDisableOutputCompression = true;
 	}
 	while ( $status = ob_get_status() ) {
-		if ( $status['type'] == 0 /* PHP_OUTPUT_HANDLER_INTERNAL */ ) {
-			// Probably from zlib.output_compression or other
-			// PHP-internal setting which can't be removed.
-			//
+		if ( isset( $status['flags'] ) ) {
+			$flags = PHP_OUTPUT_HANDLER_CLEANABLE | PHP_OUTPUT_HANDLER_REMOVABLE;
+			$deleteable = ( $status['flags'] & $flags ) === $flags;
+		} elseif ( isset( $status['del'] ) ) {
+			$deleteable = $status['del'];
+		} else {
+			// Guess that any PHP-internal setting can't be removed.
+			$deleteable = $status['type'] !== 0; /* PHP_OUTPUT_HANDLER_INTERNAL */
+		}
+		if ( !$deleteable ) {
 			// Give up, and hope the result doesn't break
 			// output behavior.
 			break;
 		}
+		if ( $status['name'] === 'MediaWikiTestCase::wfResetOutputBuffersBarrier' ) {
+			// Unit testing barrier to prevent this function from breaking PHPUnit.
+			break;
+		}
 		if ( !ob_end_clean() ) {
 			// Could not remove output buffer handler; abort now
 			// to avoid getting in some kind of infinite loop.
@@ -4273,3 +4283,28 @@ function wfThumbIsStandard( File $file, array $params ) {
 
 	return true;
 }
+
+/**
+ * Merges two (possibly) 2 dimensional arrays into the target array ($baseArray).
+ *
+ * Values that exist in both values will be combined with += (all values of the array
+ * of $newValues will be added to the values of the array of $baseArray, while values,
+ * that exists in both, the value of $baseArray will be used).
+ *
+ * @param array $baseArray The array where you want to add the values of $newValues to
+ * @param array $newValues An array with new values
+ * @return array The combined array
+ * @since 1.26
+ */
+function wfArrayPlus2d( array $baseArray, array $newValues ) {
+	// First merge items that are in both arrays
+	foreach ( $baseArray as $name => &$groupVal ) {
+		if ( isset( $newValues[$name] ) ) {
+			$groupVal += $newValues[$name];
+		}
+	}
+	// Now add items that didn't exist yet
+	$baseArray += $newValues;
+
+	return $baseArray;
+}
diff --git a/includes/Hooks.php b/includes/Hooks.php
index 036d65c71e..a414562436 100644
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -231,22 +231,25 @@ class Hooks {
 	}
 
 	/**
-	 * Handle PHP errors issued inside a hook. Catch errors that have to do with
-	 * a function expecting a reference, and let all others pass through.
-	 *
-	 * This REALLY should be protected... but it's public for compatibility
+	 * Handle PHP errors issued inside a hook. Catch errors that have to do
+	 * with a function expecting a reference, and pass all others through to
+	 * MWExceptionHandler::handleError() for default processing.
 	 *
 	 * @since 1.18
 	 *
 	 * @param int $errno Error number (unused)
 	 * @param string $errstr Error message
 	 * @throws MWHookException If the error has to do with the function signature
-	 * @return bool Always returns false
+	 * @return bool
 	 */
 	public static function hookErrorHandler( $errno, $errstr ) {
 		if ( strpos( $errstr, 'expected to be a reference, value given' ) !== false ) {
 			throw new MWHookException( $errstr, $errno );
 		}
-		return false;
+
+		// Delegate unhandled errors to the default MW handler
+		return call_user_func_array(
+			'MWExceptionHandler::handleError', func_get_args()
+		);
 	}
 }
diff --git a/includes/HtmlFormatter.php b/includes/HtmlFormatter.php
index b2926d17bc..221cefbb3a 100644
--- a/includes/HtmlFormatter.php
+++ b/includes/HtmlFormatter.php
@@ -63,7 +63,15 @@ class HtmlFormatter {
 	 */
 	public function getDoc() {
 		if ( !$this->doc ) {
-			$html = mb_convert_encoding( $this->html, 'HTML-ENTITIES', 'UTF-8' );
+			// DOMDocument::loadHTML apparently isn't very good with encodings, so
+			// convert input to ASCII by encoding everything above 128 as entities.
+			if ( function_exists( 'mb_convert_encoding' ) ) {
+				$html = mb_convert_encoding( $this->html, 'HTML-ENTITIES', 'UTF-8' );
+			} else {
+				$html = preg_replace_callback( '/[\x{80}-\x{10ffff}]/u', function ( $m ) {
+					return '&#' . UtfNormal\Utils::utf8ToCodepoint( $m[0] ) . ';';
+				}, $this->html );
+			}
 
 			// Workaround for bug that caused spaces before references
 			// to disappear during processing:
@@ -244,7 +252,14 @@ class HtmlFormatter {
 			) );
 		}
 		$html = $replacements->replace( $html );
-		$html = mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
+
+		if ( function_exists( 'mb_convert_encoding' ) ) {
+			// Just in case the conversion in getDoc() above used named
+			// entities that aren't known to html_entity_decode().
+			$html = mb_convert_encoding( $html, 'UTF-8', 'HTML-ENTITIES' );
+		} else {
+			$html = html_entity_decode( $html, ENT_COMPAT, 'utf-8' );
+		}
 		return $html;
 	}
 
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 1c794853a0..bc5a9570e2 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -855,6 +855,8 @@ class CurlHttpRequest extends MWHttpRequest {
 
 class PhpHttpRequest extends MWHttpRequest {
 
+	private $fopenErrors = array();
+
 	/**
 	 * @param string $url
 	 * @return string
@@ -865,6 +867,60 @@ class PhpHttpRequest extends MWHttpRequest {
 		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 = array();
+		$certLocations = array();
+		if ( $this->caInfo ) {
+			$certLocations = array( 'manual' => $this->caInfo );
+		} elseif ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
+			// 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.
+			$certLocations = array_filter( array(
+				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 += array( "errno$n" => $errno, "errstr$n" => $errstr );
+	}
+
 	public function execute() {
 
 		parent::execute();
@@ -926,13 +982,7 @@ class PhpHttpRequest extends MWHttpRequest {
 			}
 		}
 
-		if ( is_dir( $this->caInfo ) ) {
-			$options['ssl']['capath'] = $this->caInfo;
-		} elseif ( is_file( $this->caInfo ) ) {
-			$options['ssl']['cafile'] = $this->caInfo;
-		} elseif ( $this->caInfo ) {
-			throw new MWException( "Invalid CA info passed: {$this->caInfo}" );
-		}
+		$options['ssl'] += $this->getCertOptions();
 
 		$context = stream_context_create( $options );
 
@@ -949,9 +999,10 @@ class PhpHttpRequest extends MWHttpRequest {
 		}
 		do {
 			$reqCount++;
-			MediaWiki\suppressWarnings();
+			$this->fopenErrors = array();
+			set_error_handler( array( $this, 'errorHandler' ) );
 			$fh = fopen( $url, "r", false, $context );
-			MediaWiki\restoreWarnings();
+			restore_error_handler();
 
 			if ( !$fh ) {
 				// HACK for instant commons.
@@ -997,6 +1048,10 @@ class PhpHttpRequest extends MWHttpRequest {
 		$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;
 		}
diff --git a/includes/Linker.php b/includes/Linker.php
index d6a4056f02..9b5ff27b3d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1276,9 +1276,11 @@ class Linker {
 	 * @param string $comment
 	 * @param Title|null $title Title object (to generate link to the section in autocomment) or null
 	 * @param bool $local Whether section links should refer to local page
+	 * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to. For use with external changes.
+	 *
 	 * @return mixed|string
 	 */
-	public static function formatComment( $comment, $title = null, $local = false ) {
+	public static function formatComment( $comment, $title = null, $local = false, $wikiId = null ) {
 
 		# Sanitize text a bit:
 		$comment = str_replace( "\n", " ", $comment );
@@ -1286,8 +1288,8 @@ class Linker {
 		$comment = Sanitizer::escapeHtmlAllowEntities( $comment );
 
 		# Render autocomments and make links:
-		$comment = self::formatAutocomments( $comment, $title, $local );
-		$comment = self::formatLinksInComment( $comment, $title, $local );
+		$comment = self::formatAutocomments( $comment, $title, $local, $wikiId );
+		$comment = self::formatLinksInComment( $comment, $title, $local, $wikiId );
 
 		return $comment;
 	}
@@ -1304,9 +1306,11 @@ class Linker {
 	 * @param string $comment Comment text
 	 * @param Title|null $title An optional title object used to links to sections
 	 * @param bool $local Whether section links should refer to local page
-	 * @return string Formatted comment
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), as used by WikiMap.
+	 *
+	 * @return string Formatted comment (wikitext)
 	 */
-	private static function formatAutocomments( $comment, $title = null, $local = false ) {
+	private static function formatAutocomments( $comment, $title = null, $local = false, $wikiId = null ) {
 		// @todo $append here is something of a hack to preserve the status
 		// quo. Someone who knows more about bidi and such should decide
 		// (1) what sane rendering even *is* for an LTR edit summary on an RTL
@@ -1320,7 +1324,7 @@ class Linker {
 			// zero-width assertions optional, so wrap them in a non-capturing
 			// group.
 			'!(?:(?<=(.)))?/\*\s*(.*?)\s*\*/(?:(?=(.)))?!',
-			function ( $match ) use ( $title, $local, &$append ) {
+			function ( $match ) use ( $title, $local, $wikiId, &$append ) {
 				global $wgLang;
 
 				// Ensure all match positions are defined
@@ -1330,7 +1334,7 @@ class Linker {
 				$auto = $match[2];
 				$post = $match[3] !== '';
 				$comment = null;
-				Hooks::run( 'FormatAutocomments', array( &$comment, $pre, $auto, $post, $title, $local ) );
+				Hooks::run( 'FormatAutocomments', array( &$comment, $pre, $auto, $post, $title, $local, $wikiId ) );
 				if ( $comment === null ) {
 					$link = '';
 					if ( $title ) {
@@ -1349,9 +1353,7 @@ class Linker {
 								$title->getDBkey(), $section );
 						}
 						if ( $sectionTitle ) {
-							$link = Linker::link( $sectionTitle,
-								$wgLang->getArrow(), array(), array(),
-								'noclasses' );
+							$link = Linker::makeCommentLink( $sectionTitle, $wgLang->getArrow(), $wikiId, 'noclasses' );
 						} else {
 							$link = '';
 						}
@@ -1384,7 +1386,7 @@ class Linker {
 	 * @param string $comment Text to format links in
 	 * @param Title|null $title An optional title object used to links to sections
 	 * @param bool $local Whether section links should refer to local page
-	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), as used by WikiMap
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), as used by WikiMap.
 	 *
 	 * @return string
 	 */
@@ -1459,22 +1461,9 @@ class Linker {
 							$newTarget = clone ( $title );
 							$newTarget->setFragment( '#' . $target->getFragment() );
 							$target = $newTarget;
-
-						}
-
-						if ( $wikiId !== null ) {
-							$thelink = Linker::makeExternalLink(
-								WikiMap::getForeignURL( $wikiId, $target->getFullText() ),
-								$linkText . $inside,
-								/* escape = */ false // Already escaped
-							) . $trail;
-						} else {
-							$thelink = Linker::link(
-								$target,
-								$linkText . $inside
-							) . $trail;
 						}
 
+						$thelink = Linker::makeCommentLink( $target, $linkText . $inside, $wikiId ) . $trail;
 					}
 				}
 				if ( $thelink ) {
@@ -1493,6 +1482,32 @@ class Linker {
 		);
 	}
 
+	/**
+	 * Generates a link to the given Title
+	 *
+	 * @note This is only public for technical reasons. It's not intended for use outside Linker.
+	 *
+	 * @param Title $title
+	 * @param string $text
+	 * @param string|null $wikiId Id of the wiki to link to (if not the local wiki), as used by WikiMap.
+	 * @param string|string[] $options See the $options parameter in Linker::link.
+	 *
+	 * @return string HTML link
+	 */
+	public static function makeCommentLink( Title $title, $text, $wikiId = null, $options = array() ) {
+		if ( $wikiId !== null && !$title->isExternal() ) {
+			$link = Linker::makeExternalLink(
+					WikiMap::getForeignURL( $wikiId, $title->getPrefixedText(), $title->getFragment() ),
+					$text,
+					/* escape = */ false // Already escaped
+				);
+		} else {
+			$link = Linker::link( $title, $text, array(), array(), $options );
+		}
+
+		return $link;
+	}
+
 	/**
 	 * @param Title $contextTitle
 	 * @param string $target
@@ -1579,17 +1594,18 @@ class Linker {
 	 * @param string $comment
 	 * @param Title|null $title Title object (to generate link to section in autocomment) or null
 	 * @param bool $local Whether section links should refer to local page
+	 * @param string|null $wikiId Id (as used by WikiMap) of the wiki to generate links to. For use with external changes.
 	 *
 	 * @return string
 	 */
-	public static function commentBlock( $comment, $title = null, $local = false ) {
+	public static function commentBlock( $comment, $title = null, $local = false, $wikiId = null ) {
 		// '*' used to be the comment inserted by the software way back
 		// in antiquity in case none was provided, here for backwards
 		// compatibility, acc. to brion -ævar
 		if ( $comment == '' || $comment == '*' ) {
 			return '';
 		} else {
-			$formatted = self::formatComment( $comment, $title, $local );
+			$formatted = self::formatComment( $comment, $title, $local, $wikiId );
 			$formatted = wfMessage( 'parentheses' )->rawParams( $formatted )->escaped();
 			return " <span class=\"comment\">$formatted</span>";
 		}
@@ -2382,6 +2398,7 @@ class Linker {
 			'title' => $tooltip
 		) );
 	}
+
 }
 
 /**
diff --git a/includes/MagicWord.php b/includes/MagicWord.php
index 186821de39..833f852715 100644
--- a/includes/MagicWord.php
+++ b/includes/MagicWord.php
@@ -718,9 +718,6 @@ class MagicWordArray {
 
 	private $regex;
 
-	/** @todo Unused? */
-	private $matches;
-
 	/**
 	 * @param array $names
 	 */
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 073762a035..552e181553 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -142,9 +142,6 @@ class OutputPage extends ContextSource {
 	/** @var string Inline CSS styles. Use addInlineStyle() sparingly */
 	protected $mInlineStyles = '';
 
-	/** @todo Unused? */
-	private $mLinkColours;
-
 	/**
 	 * @var string Used by skin template.
 	 * Example: $tpl->set( 'displaytitle', $out->mPageLinkTitle );
@@ -2012,21 +2009,20 @@ class OutputPage extends ContextSource {
 	 * Add an HTTP header that will influence on the cache
 	 *
 	 * @param string $header Header name
-	 * @param array|null $option
-	 * @todo FIXME: Document the $option parameter; it appears to be for
-	 *        X-Vary-Options but what format is acceptable?
+	 * @param string[]|null $option Options for X-Vary-Options. Possible options are:
+	 *  - "string-contains=$XXX" varies on whether the header value as a string
+	 *    contains $XXX as a substring.
+	 *  - "list-contains=$XXX" varies on whether the header value as a
+	 *    comma-separated list contains $XXX as one of the list items.
 	 */
-	public function addVaryHeader( $header, $option = null ) {
+	public function addVaryHeader( $header, array $option = null ) {
 		if ( !array_key_exists( $header, $this->mVaryHeader ) ) {
-			$this->mVaryHeader[$header] = (array)$option;
-		} elseif ( is_array( $option ) ) {
-			if ( is_array( $this->mVaryHeader[$header] ) ) {
-				$this->mVaryHeader[$header] = array_merge( $this->mVaryHeader[$header], $option );
-			} else {
-				$this->mVaryHeader[$header] = $option;
-			}
+			$this->mVaryHeader[$header] = array();
+		}
+		if ( !is_array( $option ) ) {
+			$option = array();
 		}
-		$this->mVaryHeader[$header] = array_unique( (array)$this->mVaryHeader[$header] );
+		$this->mVaryHeader[$header] = array_unique( array_merge( $this->mVaryHeader[$header], $option ) );
 	}
 
 	/**
@@ -2909,8 +2905,7 @@ class OutputPage extends ContextSource {
 
 				// Automatically select style/script elements
 				if ( $only === ResourceLoaderModule::TYPE_STYLES ) {
-					$media = $group === 'print' ? 'print' : 'all';
-					$link = Html::linkedStyle( $url, $media );
+					$link = Html::linkedStyle( $url );
 				} else {
 					if ( $context->getRaw() || $isRaw ) {
 						// Startup module can't load itself, needs to use <script> instead of mw.loader.load
diff --git a/includes/Preferences.php b/includes/Preferences.php
index cd675c6fc8..248b308d4d 100644
--- a/includes/Preferences.php
+++ b/includes/Preferences.php
@@ -751,7 +751,11 @@ class Preferences {
 			'type' => 'select',
 			'section' => 'rendering/advancedrendering',
 			'options' => $stubThresholdOptions,
-			'label-raw' => $context->msg( 'stub-threshold' )->text(), // Raw HTML message. Yay?
+			// This is not a raw HTML message; label-raw is needed for the manual <a></a>
+			'label-raw' => $context->msg( 'stub-threshold' )->rawParams(
+				'<a href="#" class="stub">' .
+				$context->msg( 'stub-threshold-sample-link' )->parse() .
+				'</a>' )->parse(),
 		);
 
 		$defaultPreferences['showhiddencats'] = array(
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 55a4f49b34..430b4b8972 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -362,7 +362,11 @@ abstract class PrefixSearch {
 			$ns = NS_MAIN; // if searching on many always default to main
 		}
 
-		$t = Title::newFromText( $search, $ns );
+		$t = null;
+		if ( is_string( $search ) ) {
+			$t = Title::newFromText( $search, $ns );
+		}
+
 		$prefix = $t ? $t->getDBkey() : '';
 		$dbr = wfGetDB( DB_SLAVE );
 		$res = $dbr->select( 'page',
diff --git a/includes/Sanitizer.php b/includes/Sanitizer.php
index c02bdc996f..de63af7979 100644
--- a/includes/Sanitizer.php
+++ b/includes/Sanitizer.php
@@ -346,8 +346,8 @@ class Sanitizer {
 				  ($space*=$space*
 					(?:
 					 # The attribute value: quoted or alone
-					  \"([^<\"]*)\"
-					 | '([^<']*)'
+					  \"([^<\"]*)(?:\"|\$)
+					 | '([^<']*)(?:'|\$)
 					 |  ([a-zA-Z0-9!#$%&()*,\\-.\\/:;<>?@[\\]^_`{|}~]+)
 					)
 				)?(?=$space|\$)/sx";
@@ -454,15 +454,13 @@ class Sanitizer {
 	public static function removeHTMLtags( $text, $processCallback = null,
 		$args = array(), $extratags = array(), $removetags = array()
 	) {
-		global $wgUseTidy;
-
 		extract( self::getRecognizedTagData( $extratags, $removetags ) );
 
 		# Remove HTML comments
 		$text = Sanitizer::removeHTMLcomments( $text );
 		$bits = explode( '<', $text );
 		$text = str_replace( '>', '&gt;', array_shift( $bits ) );
-		if ( !$wgUseTidy ) {
+		if ( !MWTidy::isEnabled() ) {
 			$tagstack = $tablestack = array();
 			foreach ( $bits as $x ) {
 				$regs = array();
diff --git a/includes/Setup.php b/includes/Setup.php
index 86df4b8667..479ce8c32a 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -68,17 +68,18 @@ if ( !empty( $wgActionPaths ) && !isset( $wgActionPaths['view'] ) ) {
 	$wgActionPaths['view'] = $wgArticlePath;
 }
 
+if ( $wgResourceBasePath === null ) {
+	$wgResourceBasePath = $wgScriptPath;
+}
 if ( $wgStylePath === false ) {
-	$wgStylePath = "$wgScriptPath/skins";
+	$wgStylePath = "$wgResourceBasePath/skins";
 }
 if ( $wgLocalStylePath === false ) {
+	// Avoid wgResourceBasePath here since that may point to a different domain (e.g. CDN)
 	$wgLocalStylePath = "$wgScriptPath/skins";
 }
 if ( $wgExtensionAssetsPath === false ) {
-	$wgExtensionAssetsPath = "$wgScriptPath/extensions";
-}
-if ( $wgResourceBasePath === null ) {
-	$wgResourceBasePath = $wgScriptPath;
+	$wgExtensionAssetsPath = "$wgResourceBasePath/extensions";
 }
 
 if ( $wgLogo === false ) {
@@ -521,11 +522,11 @@ unset( $serverParts );
 
 // Set defaults for configuration variables
 // that are derived from the server name by default
-if ( $wgEmergencyContact === false ) {
+// Note: $wgEmergencyContact and $wgPasswordSender may be false or empty string (T104142)
+if ( !$wgEmergencyContact ) {
 	$wgEmergencyContact = 'wikiadmin@' . $wgServerName;
 }
-
-if ( $wgPasswordSender === false ) {
+if ( !$wgPasswordSender ) {
 	$wgPasswordSender = 'apache@' . $wgServerName;
 }
 
diff --git a/includes/StubObject.php b/includes/StubObject.php
index 2dfcdc2f49..49155d6d99 100644
--- a/includes/StubObject.php
+++ b/includes/StubObject.php
@@ -194,7 +194,7 @@ class StubUserLang extends StubObject {
 	public function findVariantLink( &$link, &$nt, $ignoreOtherCond = false ) {
 		global $wgLang;
 		$this->_unstub( 'findVariantLink', 3 );
-		return $wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
+		$wgLang->findVariantLink( $link, $nt, $ignoreOtherCond );
 	}
 
 	/**
diff --git a/includes/Title.php b/includes/Title.php
index 8a15b541d7..b347edbb6a 100644
--- a/includes/Title.php
+++ b/includes/Title.php
@@ -1939,7 +1939,6 @@ class Title {
 	 *   - quick  : does cheap permission checks from slaves (usable for GUI creation)
 	 *   - full   : does cheap and expensive checks possibly from a slave
 	 *   - secure : does cheap and expensive checks, using the master as needed
-	 * @param bool $short Set this to true to stop after the first permission error.
 	 * @param array $ignoreErrors Array of Strings Set this to a list of message keys
 	 *   whose corresponding errors may be ignored.
 	 * @return array Array of arguments to wfMessage to explain permissions problems.
diff --git a/includes/User.php b/includes/User.php
index 9b958f42dd..dbcbe31fce 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -2438,6 +2438,7 @@ class User implements IDBAccessObject {
 	 */
 	public function setInternalPassword( $str ) {
 		$this->setToken();
+		$this->setOption( 'watchlisttoken', false );
 
 		$passwordFactory = self::getPasswordFactory();
 		$this->mPassword = $passwordFactory->newFromPlaintext( $str );
@@ -2715,20 +2716,24 @@ class User implements IDBAccessObject {
 	 * @return string|bool User's current value for the option, or false if this option is disabled.
 	 * @see resetTokenFromOption()
 	 * @see getOption()
+	 * @deprecated 1.26 Applications should use the OAuth extension
 	 */
 	public function getTokenFromOption( $oname ) {
 		global $wgHiddenPrefs;
-		if ( in_array( $oname, $wgHiddenPrefs ) ) {
+
+		$id = $this->getId();
+		if ( !$id || in_array( $oname, $wgHiddenPrefs ) ) {
 			return false;
 		}
 
 		$token = $this->getOption( $oname );
 		if ( !$token ) {
-			$token = $this->resetTokenFromOption( $oname );
-			if ( !wfReadOnly() ) {
-				$this->saveSettings();
-			}
+			// Default to a value based on the user token to avoid space
+			// wasted on storing tokens for all users. When this option
+			// is set manually by the user, only then is it stored.
+			$token = hash_hmac( 'sha1', "$oname:$id", $this->getToken() );
 		}
+
 		return $token;
 	}
 
@@ -3208,10 +3213,10 @@ class User implements IDBAccessObject {
 	/**
 	 * Check if user is allowed to access a feature / make an action
 	 *
-	 * @param string $permissions,... Permissions to test
+	 * @param string ... Permissions to test
 	 * @return bool True if user is allowed to perform *any* of the given actions
 	 */
-	public function isAllowedAny( /*...*/ ) {
+	public function isAllowedAny() {
 		$permissions = func_get_args();
 		foreach ( $permissions as $permission ) {
 			if ( $this->isAllowed( $permission ) ) {
@@ -3223,10 +3228,10 @@ class User implements IDBAccessObject {
 
 	/**
 	 *
-	 * @param string $permissions,... Permissions to test
+	 * @param string ... Permissions to test
 	 * @return bool True if the user is allowed to perform *all* of the given actions
 	 */
-	public function isAllowedAll( /*...*/ ) {
+	public function isAllowedAll() {
 		$permissions = func_get_args();
 		foreach ( $permissions as $permission ) {
 			if ( !$this->isAllowed( $permission ) ) {
@@ -3704,14 +3709,6 @@ class User implements IDBAccessObject {
 		Hooks::run( 'UserSaveSettings', array( $this ) );
 		$this->clearSharedCache();
 		$this->getUserPage()->invalidateCache();
-
-		// T95839: clear the cache again post-commit to reduce race conditions
-		// where stale values are written back to the cache by other threads.
-		// Note: this *still* doesn't deal with REPEATABLE-READ snapshot lag...
-		$that = $this;
-		$dbw->onTransactionIdle( function() use ( $that ) {
-			$that->clearSharedCache();
-		} );
 	}
 
 	/**
diff --git a/includes/WebRequest.php b/includes/WebRequest.php
index 03410ccc9f..850f10103f 100644
--- a/includes/WebRequest.php
+++ b/includes/WebRequest.php
@@ -1324,14 +1324,6 @@ class FauxRequest extends WebRequest {
 		$this->protocol = $protocol;
 	}
 
-	/**
-	 * @param string $method
-	 * @throws MWException
-	 */
-	private function notImplemented( $method ) {
-		throw new MWException( "{$method}() not implemented" );
-	}
-
 	/**
 	 * @param string $name
 	 * @param string $default
@@ -1425,10 +1417,6 @@ class FauxRequest extends WebRequest {
 		return $this->protocol;
 	}
 
-	private function initHeaders() {
-		return;
-	}
-
 	/**
 	 * @param string $name
 	 * @param string $val
diff --git a/includes/WikiMap.php b/includes/WikiMap.php
index f16f5aa767..027ff72f9f 100644
--- a/includes/WikiMap.php
+++ b/includes/WikiMap.php
@@ -108,13 +108,15 @@ class WikiMap {
 	 *
 	 * @param string $wikiID Wiki'd id (generally database name)
 	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @param string|null $fragmentId
+	 *
 	 * @return string|bool URL or false if the wiki was not found
 	 */
-	public static function getForeignURL( $wikiID, $page ) {
+	public static function getForeignURL( $wikiID, $page, $fragmentId = null ) {
 		$wiki = WikiMap::getWiki( $wikiID );
 
 		if ( $wiki ) {
-			return $wiki->getFullUrl( $page );
+			return $wiki->getFullUrl( $page, $fragmentId );
 		}
 
 		return false;
@@ -146,20 +148,6 @@ class WikiReference {
 		$this->mServer = $server === null ? $canonicalServer : $server;
 	}
 
-	/**
-	 * @return string
-	 * @throws MWException
-	 */
-	public function getHostname() {
-		$prefixes = array( 'http://', 'https://' );
-		foreach ( $prefixes as $prefix ) {
-			if ( substr( $this->mCanonicalServer, 0, strlen( $prefix ) ) ) {
-				return substr( $this->mCanonicalServer, strlen( $prefix ) );
-			}
-		}
-		throw new MWException( "Invalid hostname for wiki {$this->mMinor}.{$this->mMajor}" );
-	}
-
 	/**
 	 * Get the URL in a way to be displayed to the user
 	 * More or less Wikimedia specific
@@ -167,13 +155,12 @@ class WikiReference {
 	 * @return string
 	 */
 	public function getDisplayName() {
-		$url = $this->getUrl( '' );
-		$parsed = wfParseUrl( $url );
+		$parsed = wfParseUrl( $this->mCanonicalServer );
 		if ( $parsed ) {
 			return $parsed['host'];
 		} else {
-			// Invalid URL. There's no sane thing to do here, so just return it
-			return $url;
+			// Invalid server spec. There's no sane thing to do here, so just return the canonical server name in full
+			return $this->mCanonicalServer;
 		}
 	}
 
@@ -181,21 +168,32 @@ class WikiReference {
 	 * Helper function for getUrl()
 	 *
 	 * @todo FIXME: This may be generalized...
-	 * @param string $page Page name (must be normalised before calling this function!)
-	 * @return string Url fragment
+	 *
+	 * @param string $page Page name (must be normalised before calling this function! May contain a section part.)
+	 * @param string|null $fragmentId
+	 *
+	 * @return string relative URL, without the server part.
 	 */
-	private function getLocalUrl( $page ) {
-		return str_replace( '$1', wfUrlEncode( str_replace( ' ', '_', $page ) ), $this->mPath );
+	private function getLocalUrl( $page, $fragmentId = null ) {
+		$page = wfUrlEncode( str_replace( ' ', '_', $page ) );
+
+		if ( is_string( $fragmentId ) && $fragmentId !== '' ) {
+			$page .= '#' . wfUrlEncode( $fragmentId );
+		}
+
+		return str_replace( '$1', $page, $this->mPath );
 	}
 
 	/**
 	 * Get a canonical (i.e. based on $wgCanonicalServer) URL to a page on this foreign wiki
 	 *
 	 * @param string $page Page name (must be normalised before calling this function!)
+	 * @param string|null $fragmentId
+	 *
 	 * @return string Url
 	 */
-	public function getCanonicalUrl( $page ) {
-		return $this->mCanonicalServer . $this->getLocalUrl( $page );
+	public function getCanonicalUrl( $page, $fragmentId = null ) {
+		return $this->mCanonicalServer . $this->getLocalUrl( $page, $fragmentId );
 	}
 
 	/**
@@ -209,10 +207,12 @@ class WikiReference {
 	/**
 	 * Alias for getCanonicalUrl(), for backwards compatibility.
 	 * @param string $page
+	 * @param string|null $fragmentId
+	 *
 	 * @return string
 	 */
-	public function getUrl( $page ) {
-		return $this->getCanonicalUrl( $page );
+	public function getUrl( $page, $fragmentId = null ) {
+		return $this->getCanonicalUrl( $page, $fragmentId );
 	}
 
 	/**
@@ -220,10 +220,12 @@ class WikiReference {
 	 * when called locally on the wiki.
 	 *
 	 * @param string $page Page name (must be normalized before calling this function!)
+	 * @param string|null $fragmentId
+	 *
 	 * @return string URL
 	 */
-	public function getFullUrl( $page ) {
+	public function getFullUrl( $page, $fragmentId = null ) {
 		return $this->mServer .
-			$this->getLocalUrl( $page );
+			$this->getLocalUrl( $page, $fragmentId );
 	}
 }
diff --git a/includes/XmlSelect.php b/includes/XmlSelect.php
index e765eedbc3..78f476452f 100644
--- a/includes/XmlSelect.php
+++ b/includes/XmlSelect.php
@@ -43,7 +43,7 @@ class XmlSelect {
 	}
 
 	/**
-	 * @param string $default
+	 * @param string|array $default
 	 */
 	public function setDefault( $default ) {
 		$this->default = $default;
@@ -95,7 +95,7 @@ class XmlSelect {
 	 * label => ( label => value, label => value )
 	 *
 	 * @param array $options
-	 * @param string $default
+	 * @param string|array $default
 	 * @return string
 	 */
 	static function formatOptions( $options, $default = false ) {
@@ -106,7 +106,11 @@ class XmlSelect {
 				$contents = self::formatOptions( $value, $default );
 				$data .= Html::rawElement( 'optgroup', array( 'label' => $label ), $contents ) . "\n";
 			} else {
-				$data .= Xml::option( $label, $value, $value === $default ) . "\n";
+				// If $default is an array, then the <select> probably has the multiple attribute,
+				// so we should check if each $value is in $default, rather than checking if
+				// $value is equal to $default.
+				$selected = is_array( $default ) ? in_array( $value, $default ) : $value === $default;
+				$data .= Xml::option( $label, $value, $selected ) . "\n";
 			}
 		}
 
diff --git a/includes/ZhConversion.php b/includes/ZhConversion.php
index 31806b73d0..893ae04058 100644
--- a/includes/ZhConversion.php
+++ b/includes/ZhConversion.php
@@ -3074,7 +3074,7 @@ $zh2Hant = array(
 '9只' => '9隻',
 '9余' => '9餘',
 '·范' => '·范',
-'’s ' => '’s',
+'’s' => '’s',
 '、面点' => '、麵點',
 '。个中' => '。箇中',
 '〇周后' => '〇周後',
@@ -3201,21 +3201,6 @@ $zh2Hant = array(
 '不好干预' => '不好干預',
 '不嫌母丑' => '不嫌母醜',
 '不寒而栗' => '不寒而慄',
-'不干事' => '不干事',
-'不干他' => '不干他',
-'不干休' => '不干休',
-'不干你' => '不干你',
-'不干她' => '不干她',
-'不干它' => '不干它',
-'不干我' => '不干我',
-'不干扰' => '不干擾',
-'不干擾' => '不干擾',
-'不干涉' => '不干涉',
-'不干牠' => '不干牠',
-'不干犯' => '不干犯',
-'不干預' => '不干預',
-'不干预' => '不干預',
-'不干' => '不幹',
 '不吊' => '不弔',
 '不卷' => '不捲',
 '不采' => '不採',
@@ -3795,7 +3780,6 @@ $zh2Hant = array(
 '佛罗棱萨' => '佛羅稜薩',
 '佛钟' => '佛鐘',
 '作品里' => '作品裡',
-'作奸犯科' => '作姦犯科',
 '作准' => '作準',
 '你夸' => '你誇',
 '佣金' => '佣金',
@@ -4219,6 +4203,7 @@ $zh2Hant = array(
 '千钧一发' => '千鈞一髮',
 '千只' => '千隻',
 '千余' => '千餘',
+'升高后' => '升高後',
 '半制品' => '半制品',
 '半只可' => '半只可',
 '半只够' => '半只夠',
@@ -4422,6 +4407,7 @@ $zh2Hant = array(
 '呼吁' => '呼籲',
 '命中注定' => '命中注定',
 '和奸' => '和姦',
+'和制汉' => '和製漢',
 '咎征' => '咎徵',
 '咕咕钟' => '咕咕鐘',
 '咪表' => '咪錶',
@@ -4591,9 +4577,12 @@ $zh2Hant = array(
 '墓志' => '墓誌',
 '增辟' => '增闢',
 '墨子里' => '墨子里',
+'墨斗' => '墨斗',
 '墨沈沈' => '墨沈沈',
 '墨沈' => '墨瀋',
 '垦辟' => '墾闢',
+'压制出' => '壓製出',
+'压制机' => '壓製機',
 '壮游' => '壯遊',
 '壮面' => '壯麵',
 '壹郁' => '壹鬱',
@@ -5720,6 +5709,7 @@ $zh2Hant = array(
 '采薇' => '採薇',
 '采薪' => '採薪',
 '采药' => '採藥',
+'采血' => '採血',
 '采行' => '採行',
 '采补' => '採補',
 '采访' => '採訪',
@@ -5746,6 +5736,7 @@ $zh2Hant = array(
 '提子干' => '提子乾',
 '提心吊胆' => '提心弔膽',
 '提摩太后书' => '提摩太後書',
+'提高后' => '提高後',
 '插于' => '插於',
 '换签' => '換籤',
 '换只' => '換隻',
@@ -5944,7 +5935,7 @@ $zh2Hant = array(
 '历始' => '曆始',
 '历室' => '曆室',
 '历尾' => '曆尾',
-'历数' => '曆數',
+'历数书' => '曆數書',
 '历日' => '曆日',
 '历书' => '曆書',
 '历本' => '曆本',
@@ -6005,6 +5996,7 @@ $zh2Hant = array(
 '望后石' => '望后石',
 '朝乾夕惕' => '朝乾夕惕',
 '朝钟' => '朝鐘',
+'朝鲜于' => '朝鮮於',
 '朦胧' => '朦朧',
 '蒙胧' => '朦朧',
 '木偶戏扎' => '木偶戲紮',
@@ -6305,6 +6297,8 @@ $zh2Hant = array(
 '洗发' => '洗髮',
 '洛钟东应' => '洛鐘東應',
 '洞里' => '洞裡',
+'洞里萨' => '洞里薩',
+'洞里薩' => '洞里薩',
 '泄欲' => '洩慾',
 '洪范' => '洪範',
 '洪谷子' => '洪谷子',
@@ -6376,7 +6370,6 @@ $zh2Hant = array(
 '渠冲' => '渠衝',
 '测不准' => '測不準',
 '港制' => '港製',
-'游牧民族' => '游牧民族',
 '游离' => '游離',
 '浑朴' => '渾樸',
 '浑个' => '渾箇',
@@ -6716,7 +6709,6 @@ $zh2Hant = array(
 '癸丑' => '癸丑',
 '发干' => '發乾',
 '发呆' => '發獃',
-'发蒙' => '發矇',
 '发签' => '發籤',
 '发松' => '發鬆',
 '发面' => '發麵',
@@ -6956,7 +6948,6 @@ $zh2Hant = array(
 '谷草' => '穀草',
 '谷贵饿农' => '穀貴餓農',
 '谷贱伤农' => '穀賤傷農',
-'谷道' => '穀道',
 '谷雨' => '穀雨',
 '谷类' => '穀類',
 '谷食' => '穀食',
@@ -7310,6 +7301,7 @@ $zh2Hant = array(
 '胜肽' => '胜肽',
 '胜键' => '胜鍵',
 '胡云' => '胡云',
+'胡子婴' => '胡子嬰',
 '胡子昂' => '胡子昂',
 '胡杰' => '胡杰',
 '胡朴安' => '胡樸安',
@@ -8959,6 +8951,7 @@ $zh2Hant = array(
 '体范' => '體範',
 '体系' => '體系',
 '高几' => '高几',
+'高后' => '高后',
 '高干扰' => '高干擾',
 '高干预' => '高干預',
 '高干' => '高幹',
@@ -9201,8 +9194,8 @@ $zh2Hant = array(
 '魔表' => '魔錶',
 '鱼干' => '魚乾',
 '鱼松' => '魚鬆',
-'鮮于樞' => '鮮于樞',
-'鲜于枢' => '鮮于樞',
+'鮮于' => '鮮于',
+'鲜于' => '鮮于',
 '鲸须' => '鯨鬚',
 '鳥栖' => '鳥栖',
 '鸟栖市' => '鳥栖市',
@@ -9299,6 +9292,7 @@ $zh2Hant = array(
 '黃杰' => '黃杰',
 '黄杰' => '黃杰',
 '黄历史' => '黃歷史',
+'黄白术' => '黃白術',
 '黃詩杰' => '黃詩杰',
 '黄诗杰' => '黃詩杰',
 '黄金表' => '黃金表',
@@ -13846,8 +13840,6 @@ $zh2TW = array(
 '掌上壓' => '伏地挺身',
 '伯明翰' => '伯明罕',
 '服务器' => '伺服器',
-'字節' => '位元組',
-'字节' => '位元組',
 '佛罗伦萨' => '佛羅倫斯',
 '操作系统' => '作業系統',
 '系数' => '係數',
@@ -14062,6 +14054,7 @@ $zh2TW = array(
 '戒烟' => '戒菸',
 '戒煙' => '戒菸',
 '戴克里先' => '戴克里先',
+'打印度' => '打印度',
 '抽烟' => '抽菸',
 '抽煙' => '抽菸',
 '拉普兰' => '拉布蘭',
@@ -14078,7 +14071,7 @@ $zh2TW = array(
 '搜索引擎' => '搜尋引擎',
 '摩根士丹利' => '摩根史坦利',
 '台球' => '撞球',
-'攻打印' => '攻打印',
+'攻打' => '攻打',
 '数字技术' => '數位技術',
 '數碼技術' => '數位技術',
 '数字照相机' => '數位照相機',
@@ -14129,6 +14122,7 @@ $zh2TW = array(
 '撒切尔' => '柴契爾',
 '格林納達' => '格瑞那達',
 '格林纳达' => '格瑞那達',
+'台式电脑' => '桌上型電腦',
 '乒乓' => '桌球',
 '乒乓球' => '桌球',
 '杆弟' => '桿弟',
@@ -14264,6 +14258,8 @@ $zh2TW = array(
 '弗吉尼亚' => '維吉尼亞',
 '佛得角' => '維德角',
 '维特根斯坦' => '維根斯坦',
+'網絡遊戲' => '網路遊戲',
+'网络游戏' => '網路遊戲',
 '互联网' => '網際網路',
 '互联网络' => '網際網路',
 '互聯網' => '網際網路',
@@ -14455,7 +14451,6 @@ $zh2TW = array(
 '链接' => '連結',
 '連結他' => '連結他',
 '进制' => '進位',
-'算子' => '運算元',
 '达·芬奇' => '達·文西',
 '达芬奇' => '達文西',
 '溫納圖萬' => '那杜',
@@ -15651,6 +15646,7 @@ $zh2HK = array(
 '扛著錄' => '扛著錄',
 '找不著' => '找不着',
 '找得著' => '找得着',
+'承宣布政' => '承宣布政',
 '抓著' => '抓着',
 '抓著作' => '抓著作',
 '抓著名' => '抓著名',
@@ -16001,6 +15997,7 @@ $zh2HK = array(
 '葛萊美獎' => '格林美獎',
 '格鲁吉亚' => '格魯吉亞',
 '框里' => '框裏',
+'台式电脑' => '桌上型電腦',
 '台球' => '桌球',
 '撞球' => '桌球',
 '梅鐸' => '梅鐸',
@@ -17174,6 +17171,8 @@ $zh2HK = array(
 '遇著述' => '遇著述',
 '遇著錄' => '遇著錄',
 '遍布' => '遍佈',
+'遍佈著' => '遍佈着',
+'遍布著' => '遍佈着',
 '過著' => '過着',
 '达·芬奇' => '達·文西',
 '达芬奇' => '達文西',
@@ -18023,6 +18022,7 @@ $zh2CN = array(
 '叫著稱' => '叫著称',
 '叫著者' => '叫著者',
 '叫著述' => '叫著述',
+'桌上型電腦' => '台式电脑',
 '撞球' => '台球',
 '台帳' => '台账',
 '叱吒' => '叱咤',
@@ -19937,6 +19937,8 @@ $zh2CN = array(
 '遇著稱' => '遇著称',
 '遇著者' => '遇著者',
 '遇著述' => '遇著述',
+'遍佈著' => '遍布着',
+'遍布著' => '遍布着',
 '部份' => '部分',
 '配合著' => '配合着',
 '配合著名' => '配合著名',
@@ -19982,6 +19984,7 @@ $zh2CN = array(
 '鋪著稱' => '铺著称',
 '鋪著者' => '铺著者',
 '鋪著述' => '铺著述',
+'鏈結' => '链接',
 '銷帳' => '销账',
 '鉲' => '锎',
 '鎝' => '锝',
diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index 7b71e6c5a2..d53797bc51 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -345,6 +345,22 @@ abstract class ApiBase extends ContextSource {
 		return null;
 	}
 
+	/**
+	 * Returns data for HTTP conditional request mechanisms.
+	 *
+	 * @since 1.26
+	 * @param string $condition Condition being queried:
+	 *  - last-modified: Return a timestamp representing the maximum of the
+	 *    last-modified dates for all resources involved in the request. See
+	 *    RFC 7232 § 2.2 for semantics.
+	 *  - etag: Return an entity-tag representing the state of all resources involved
+	 *    in the request. Quotes must be included. See RFC 7232 § 2.3 for semantics.
+	 * @return string|boolean|null As described above, or null if no value is available.
+	 */
+	public function getConditionalRequestData( $condition ) {
+		return null;
+	}
+
 	/**@}*/
 
 	/************************************************************************//**
diff --git a/includes/api/ApiFormatRaw.php b/includes/api/ApiFormatRaw.php
index 7bb2453d2c..9dbd4a553f 100644
--- a/includes/api/ApiFormatRaw.php
+++ b/includes/api/ApiFormatRaw.php
@@ -31,14 +31,20 @@
 class ApiFormatRaw extends ApiFormatBase {
 
 	private $errorFallback;
+	private $mFailWithHTTPError = false;
+
 
 	/**
 	 * @param ApiMain $main
-	 * @param ApiFormatBase $errorFallback Object to fall back on for errors
+	 * @param ApiFormatBase |null $errorFallback Object to fall back on for errors
 	 */
-	public function __construct( ApiMain $main, ApiFormatBase $errorFallback ) {
+	public function __construct( ApiMain $main, ApiFormatBase $errorFallback = null ) {
 		parent::__construct( $main, 'raw' );
-		$this->errorFallback = $errorFallback;
+		if ( $errorFallback === null ) {
+			$this->errorFallback = $main->createPrinterByName( $main->getParameter( 'format' ) );
+		} else {
+			$this->errorFallback = $errorFallback;
+		}
 	}
 
 	public function getMimeType() {
@@ -59,6 +65,9 @@ class ApiFormatRaw extends ApiFormatBase {
 		$data = $this->getResult()->getResultData();
 		if ( isset( $data['error'] ) ) {
 			$this->errorFallback->initPrinter( $unused );
+			if ( $this->mFailWithHTTPError ) {
+				$this->getMain()->getRequest()->response()->statusHeader( 400 );
+			}
 		} else {
 			parent::initPrinter( $unused );
 		}
@@ -85,4 +94,17 @@ class ApiFormatRaw extends ApiFormatBase {
 		}
 		$this->printText( $data['text'] );
 	}
+
+	/**
+	 * Output HTTP error code 400 when if an error is encountered
+	 *
+	 * The purpose is for output formats where the user-agent will
+	 * not be able to interpret the validity of the content in any
+	 * other way. For example subtitle files read by browser video players.
+	 *
+	 * @param bool $fail
+	 */
+	public function setFailWithHTTPError( $fail ) {
+		$this->mFailWithHTTPError = $fail;
+	}
 }
diff --git a/includes/api/ApiLogin.php b/includes/api/ApiLogin.php
index 8c65310e6b..c66e215634 100644
--- a/includes/api/ApiLogin.php
+++ b/includes/api/ApiLogin.php
@@ -145,10 +145,10 @@ class ApiLogin extends ApiBase {
 			case LoginForm::CREATE_BLOCKED:
 				$result['result'] = 'CreateBlocked';
 				$result['details'] = 'Your IP address is blocked from account creation';
-				$result = array_merge(
-					$result,
-					ApiQueryUserInfo::getBlockInfo( $context->getUser()->getBlock() )
-				);
+				$block = $context->getUser()->getBlock();
+				if ( $block ) {
+					$result = array_merge( $result, ApiQueryUserInfo::getBlockInfo( $block ) );
+				}
 				break;
 
 			case LoginForm::THROTTLED:
@@ -159,10 +159,10 @@ class ApiLogin extends ApiBase {
 
 			case LoginForm::USER_BLOCKED:
 				$result['result'] = 'Blocked';
-				$result = array_merge(
-					$result,
-					ApiQueryUserInfo::getBlockInfo( User::newFromName( $params['name'] )->getBlock() )
-				);
+				$block = User::newFromName( $params['name'] )->getBlock();
+				if ( $block ) {
+					$result = array_merge( $result, ApiQueryUserInfo::getBlockInfo( $block ) );
+				}
 				break;
 
 			case LoginForm::ABORTED:
diff --git a/includes/api/ApiMain.php b/includes/api/ApiMain.php
index f2059d759e..c558c2b455 100644
--- a/includes/api/ApiMain.php
+++ b/includes/api/ApiMain.php
@@ -425,13 +425,16 @@ class ApiMain extends ApiBase {
 
 		// In case an error occurs during data output,
 		// clear the output buffer and print just the error information
+		$obLevel = ob_get_level();
 		ob_start();
 
 		$t = microtime( true );
 		try {
 			$this->executeAction();
+			$isError = false;
 		} catch ( Exception $e ) {
 			$this->handleException( $e );
+			$isError = true;
 		}
 
 		// Log the request whether or not there was an error
@@ -439,9 +442,13 @@ class ApiMain extends ApiBase {
 
 		// Send cache headers after any code which might generate an error, to
 		// avoid sending public cache headers for errors.
-		$this->sendCacheHeaders();
+		$this->sendCacheHeaders( $isError );
 
-		ob_end_flush();
+		// Executing the action might have already messed with the output
+		// buffers.
+		while ( ob_get_level() > $obLevel ) {
+			ob_end_flush();
+		}
 	}
 
 	/**
@@ -532,7 +539,7 @@ class ApiMain extends ApiBase {
 
 		// Log the request and reset cache headers
 		$main->logRequest( 0 );
-		$main->sendCacheHeaders();
+		$main->sendCacheHeaders( true );
 
 		ob_end_flush();
 	}
@@ -701,7 +708,12 @@ class ApiMain extends ApiBase {
 		return "/^https?:\/\/$wildcard$/";
 	}
 
-	protected function sendCacheHeaders() {
+	/**
+	 * Send caching headers
+	 * @param boolean $isError Whether an error response is being output
+	 * @since 1.26 added $isError parameter
+	 */
+	protected function sendCacheHeaders( $isError ) {
 		$response = $this->getRequest()->response();
 		$out = $this->getOutput();
 
@@ -711,6 +723,19 @@ class ApiMain extends ApiBase {
 			$out->addVaryHeader( 'X-Forwarded-Proto' );
 		}
 
+		if ( !$isError && $this->mModule &&
+			( $this->getRequest()->getMethod() === 'GET' || $this->getRequest()->getMethod() === 'HEAD' )
+		) {
+			$etag = $this->mModule->getConditionalRequestData( 'etag' );
+			if ( $etag !== null ) {
+				$response->header( "ETag: $etag" );
+			}
+			$lastMod = $this->mModule->getConditionalRequestData( 'last-modified' );
+			if ( $lastMod !== null ) {
+				$response->header( 'Last-Modified: ' . wfTimestamp( TS_RFC2822, $lastMod ) );
+			}
+		}
+
 		// The logic should be:
 		// $this->mCacheControl['max-age'] is set?
 		//    Use it, the module knows better than our guess.
@@ -993,6 +1018,121 @@ class ApiMain extends ApiBase {
 		return true;
 	}
 
+	/**
+	 * Check selected RFC 7232 precondition headers
+	 *
+	 * RFC 7232 envisions a particular model where you send your request to "a
+	 * resource", and for write requests that you can read "the resource" by
+	 * changing the method to GET. When the API receives a GET request, it
+	 * works out even though "the resource" from RFC 7232's perspective might
+	 * be many resources from MediaWiki's perspective. But it totally fails for
+	 * a POST, since what HTTP sees as "the resource" is probably just
+	 * "/api.php" with all the interesting bits in the body.
+	 *
+	 * Therefore, we only support RFC 7232 precondition headers for GET (and
+	 * HEAD). That means we don't need to bother with If-Match and
+	 * If-Unmodified-Since since they only apply to modification requests.
+	 *
+	 * And since we don't support Range, If-Range is ignored too.
+	 *
+	 * @since 1.26
+	 * @param ApiBase $module Api module being used
+	 * @return bool True on success, false should exit immediately
+	 */
+	protected function checkConditionalRequestHeaders( $module ) {
+		if ( $this->mInternalMode ) {
+			// No headers to check in internal mode
+			return true;
+		}
+
+		if ( $this->getRequest()->getMethod() !== 'GET' && $this->getRequest()->getMethod() !== 'HEAD' ) {
+			// Don't check POSTs
+			return true;
+		}
+
+		$return304 = false;
+
+		$ifNoneMatch = array_diff(
+			$this->getRequest()->getHeader( 'If-None-Match', WebRequest::GETHEADER_LIST ) ?: array(),
+			array( '' )
+		);
+		if ( $ifNoneMatch ) {
+			if ( $ifNoneMatch === array( '*' ) ) {
+				// API responses always "exist"
+				$etag = '*';
+			} else {
+				$etag = $module->getConditionalRequestData( 'etag' );
+			}
+		}
+		if ( $ifNoneMatch && $etag !== null ) {
+			$test = substr( $etag, 0, 2 ) === 'W/' ? substr( $etag, 2 ) : $etag;
+			$match = array_map( function ( $s ) {
+				return substr( $s, 0, 2 ) === 'W/' ? substr( $s, 2 ) : $s;
+			}, $ifNoneMatch );
+			$return304 = in_array( $test, $match, true );
+		} else {
+			$value = trim( $this->getRequest()->getHeader( 'If-Modified-Since' ) );
+
+			// Some old browsers sends sizes after the date, like this:
+			//  Wed, 20 Aug 2003 06:51:19 GMT; length=5202
+			// Ignore that.
+			$i = strpos( $value, ';' );
+			if ( $i !== false ) {
+				$value = trim( substr( $value, 0, $i ) );
+			}
+
+			if ( $value !== '' ) {
+				try {
+					$ts = new MWTimestamp( $value );
+					if (
+						// RFC 7231 IMF-fixdate
+						$ts->getTimestamp( TS_RFC2822 ) === $value ||
+						// RFC 850
+						$ts->format( 'l, d-M-y H:i:s' ) . ' GMT' === $value ||
+						// asctime (with and without space-padded day)
+						$ts->format( 'D M j H:i:s Y' ) === $value ||
+						$ts->format( 'D M  j H:i:s Y' ) === $value
+					) {
+						$lastMod = $module->getConditionalRequestData( 'last-modified' );
+						if ( $lastMod !== null ) {
+							// Mix in some MediaWiki modification times
+							$modifiedTimes = array(
+								'page' => $lastMod,
+								'user' => $this->getUser()->getTouched(),
+								'epoch' => $this->getConfig()->get( 'CacheEpoch' ),
+							);
+							if ( $this->getConfig()->get( 'UseSquid' ) ) {
+								// T46570: the core page itself may not change, but resources might
+								$modifiedTimes['sepoch'] = wfTimestamp(
+									TS_MW, time() - $this->getConfig()->get( 'SquidMaxage' )
+								);
+							}
+							Hooks::run( 'OutputPageCheckLastModified', array( &$modifiedTimes ) );
+							$lastMod = max( $modifiedTimes );
+							$return304 = wfTimestamp( TS_MW, $lastMod ) <= $ts->getTimestamp( TS_MW );
+						}
+					}
+				} catch ( TimestampException $e ) {
+					// Invalid timestamp, ignore it
+				}
+			}
+		}
+
+		if ( $return304 ) {
+			$this->getRequest()->response()->statusHeader( 304 );
+
+			// Avoid outputting the compressed representation of a zero-length body
+			MediaWiki\suppressWarnings();
+			ini_set( 'zlib.output_compression', 0 );
+			MediaWiki\restoreWarnings();
+			wfClearOutputBuffers();
+
+			return false;
+		}
+
+		return true;
+	}
+
 	/**
 	 * Check for sufficient permissions to execute
 	 * @param ApiBase $module An Api module
@@ -1083,6 +1223,10 @@ class ApiMain extends ApiBase {
 			return;
 		}
 
+		if ( !$this->checkConditionalRequestHeaders( $module ) ) {
+			return;
+		}
+
 		if ( !$this->mInternalMode ) {
 			$this->setupExternalResponse( $module, $params );
 		}
diff --git a/includes/api/ApiQueryAllDeletedRevisions.php b/includes/api/ApiQueryAllDeletedRevisions.php
index 4e4d2af73d..172ee99989 100644
--- a/includes/api/ApiQueryAllDeletedRevisions.php
+++ b/includes/api/ApiQueryAllDeletedRevisions.php
@@ -55,7 +55,6 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 
 		$result = $this->getResult();
 		$pageSet = $this->getPageSet();
-		$titles = $pageSet->getTitles();
 
 		// This module operates in two modes:
 		// 'user': List deleted revs by a certain user
@@ -83,6 +82,21 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 			}
 		}
 
+		// If we're generating titles only, we can use DISTINCT for a better
+		// query. But we can't do that in 'user' mode (wrong index), and we can
+		// only do it when sorting ASC (because MySQL apparently can't use an
+		// index backwards for grouping even though it can for ORDER BY, WTF?)
+		$dir = $params['dir'];
+		$optimizeGenerateTitles = false;
+		if ( $mode === 'all' && $params['generatetitles'] && $resultPageSet !== null ) {
+			if ( $dir === 'newer' ) {
+				$optimizeGenerateTitles = true;
+			} else {
+				$p = $this->getModulePrefix();
+				$this->setWarning( "For better performance when generating titles, set {$p}dir=newer" );
+			}
+		}
+
 		$this->addTables( 'archive' );
 		if ( $resultPageSet === null ) {
 			$this->parseParameters( $params );
@@ -90,7 +104,12 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 			$this->addFields( array( 'ar_title', 'ar_namespace' ) );
 		} else {
 			$this->limit = $this->getParameter( 'limit' ) ?: 10;
-			$this->addFields( array( 'ar_title', 'ar_namespace', 'ar_timestamp', 'ar_rev_id', 'ar_id' ) );
+			$this->addFields( array( 'ar_title', 'ar_namespace' ) );
+			if ( $optimizeGenerateTitles ) {
+				$this->addOption( 'DISTINCT' );
+			} else {
+				$this->addFields( array( 'ar_timestamp', 'ar_rev_id', 'ar_id' ) );
+			}
 		}
 
 		if ( $this->fld_tags ) {
@@ -130,7 +149,6 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 			}
 		}
 
-		$dir = $params['dir'];
 		$miser_ns = null;
 
 		if ( $mode == 'all' ) {
@@ -229,7 +247,14 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 		if ( !is_null( $params['continue'] ) ) {
 			$cont = explode( '|', $params['continue'] );
 			$op = ( $dir == 'newer' ? '>' : '<' );
-			if ( $mode == 'all' ) {
+			if ( $optimizeGenerateTitles ) {
+				$this->dieContinueUsageIf( count( $cont ) != 2 );
+				$ns = intval( $cont[0] );
+				$this->dieContinueUsageIf( strval( $ns ) !== $cont[0] );
+				$title = $db->addQuotes( $cont[1] );
+				$this->addWhere( "ar_namespace $op $ns OR " .
+					"(ar_namespace = $ns AND ar_title $op= $title)" );
+			} elseif ( $mode == 'all' ) {
 				$this->dieContinueUsageIf( count( $cont ) != 4 );
 				$ns = intval( $cont[0] );
 				$this->dieContinueUsageIf( strval( $ns ) !== $cont[0] );
@@ -259,7 +284,13 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 
 		$sort = ( $dir == 'newer' ? '' : ' DESC' );
 		$orderby = array();
-		if ( $mode == 'all' ) {
+		if ( $optimizeGenerateTitles ) {
+			// Targeting index name_title_timestamp
+			if ( $params['namespace'] === null || count( array_unique( $params['namespace'] ) ) > 1 ) {
+				$orderby[] = "ar_namespace $sort";
+			}
+			$orderby[] = "ar_title $sort";
+		} elseif ( $mode == 'all' ) {
 			// Targeting index name_title_timestamp
 			if ( $params['namespace'] === null || count( array_unique( $params['namespace'] ) ) > 1 ) {
 				$orderby[] = "ar_namespace $sort";
@@ -283,7 +314,9 @@ class ApiQueryAllDeletedRevisions extends ApiQueryRevisionsBase {
 		foreach ( $res as $row ) {
 			if ( ++$count > $this->limit ) {
 				// We've had enough
-				if ( $mode == 'all' ) {
+				if ( $optimizeGenerateTitles ) {
+					$this->setContinueEnumParameter( 'continue', "$row->ar_namespace|$row->ar_title" );
+				} elseif ( $mode == 'all' ) {
 					$this->setContinueEnumParameter( 'continue',
 						"$row->ar_namespace|$row->ar_title|$row->ar_timestamp|$row->ar_id"
 					);
diff --git a/includes/api/ApiQueryRandom.php b/includes/api/ApiQueryRandom.php
index a2c2844399..8e7031c079 100644
--- a/includes/api/ApiQueryRandom.php
+++ b/includes/api/ApiQueryRandom.php
@@ -31,8 +31,6 @@
  * @ingroup API
  */
 class ApiQueryRandom extends ApiQueryGeneratorBase {
-	private $pageIDs;
-
 	public function __construct( ApiQuery $query, $moduleName ) {
 		parent::__construct( $query, $moduleName, 'rn' );
 	}
@@ -46,102 +44,131 @@ class ApiQueryRandom extends ApiQueryGeneratorBase {
 	}
 
 	/**
-	 * @param string $randstr
-	 * @param int $limit
-	 * @param int $namespace
-	 * @param ApiPageSet $resultPageSet
-	 * @param bool $redirect
-	 * @return void
+	 * Actually perform the query and add pages to the result.
+	 * @param ApiPageSet|null $resultPageSet
+	 * @param int $limit Number of pages to fetch
+	 * @param string|null $start Starting page_random
+	 * @param int|null $startId Starting page_id
+	 * @param string|null $end Ending page_random
+	 * @return array (int, string|null) Number of pages left to query and continuation string
 	 */
-	protected function prepareQuery( $randstr, $limit, $namespace, &$resultPageSet, $redirect ) {
+	protected function runQuery( $resultPageSet, $limit, $start, $startId, $end ) {
+		$params = $this->extractRequestParams();
+
 		$this->resetQueryParams();
 		$this->addTables( 'page' );
-		$this->addOption( 'LIMIT', $limit );
-		$this->addWhereFld( 'page_namespace', $namespace );
-		$this->addWhereRange( 'page_random', 'newer', $randstr, null );
-		$this->addWhereFld( 'page_is_redirect', $redirect );
+		$this->addFields( array( 'page_id', 'page_random' ) );
 		if ( is_null( $resultPageSet ) ) {
-			$this->addFields( array( 'page_id', 'page_title', 'page_namespace' ) );
+			$this->addFields( array( 'page_title', 'page_namespace' ) );
 		} else {
 			$this->addFields( $resultPageSet->getPageTableFields() );
 		}
-	}
+		$this->addWhereFld( 'page_namespace', $params['namespace'] );
+		if ( $params['redirect'] || $params['filterredir'] === 'redirects' ) {
+			$this->addWhereFld( 'page_is_redirect', 1 );
+		} elseif ( $params['filterredir'] === 'nonredirects' ) {
+			$this->addWhereFld( 'page_is_redirect', 0 );
+		} elseif ( is_null( $resultPageSet ) ) {
+			$this->addFields( array( 'page_is_redirect' ) );
+		}
+		$this->addOption( 'LIMIT', $limit + 1 );
+
+		if ( $start !== null ) {
+			$start = $this->getDB()->addQuotes( $start );
+			if ( $startId !== null ) {
+				$startId = (int)$startId;
+				$this->addWhere( "page_random = $start AND page_id >= $startId OR page_random > $start" );
+			} else {
+				$this->addWhere( "page_random >= $start" );
+			}
+		}
+		if ( $end !== null ) {
+			$this->addWhere( 'page_random < ' . $this->getDB()->addQuotes( $end ) );
+		}
+		$this->addOption( 'ORDER BY', array( 'page_random', 'page_id' ) );
+
+		$result = $this->getResult();
+		$path = array( 'query', $this->getModuleName() );
 
-	/**
-	 * @param ApiPageSet $resultPageSet
-	 * @return int
-	 */
-	protected function runQuery( $resultPageSet = null ) {
 		$res = $this->select( __METHOD__ );
 		$count = 0;
 		foreach ( $res as $row ) {
-			$count++;
+			if ( $count++ >= $limit ) {
+				return array( 0, "{$row->page_random}|{$row->page_id}" );
+			}
 			if ( is_null( $resultPageSet ) ) {
-				// Prevent duplicates
-				if ( !in_array( $row->page_id, $this->pageIDs ) ) {
-					$fit = $this->getResult()->addValue(
-						array( 'query', $this->getModuleName() ),
-						null, $this->extractRowInfo( $row ) );
-					if ( !$fit ) {
-						// We can't really query-continue a random list.
-						// Return an insanely high value so
-						// $count < $limit is false
-						return 1E9;
-					}
-					$this->pageIDs[] = $row->page_id;
+				$title = Title::makeTitle( $row->page_namespace, $row->page_title );
+				$page = array(
+					'id' => (int)$row->page_id,
+				);
+				ApiQueryBase::addTitleInfo( $page, $title );
+				if ( isset( $row->page_is_redirect ) ) {
+					$page['redirect'] = (bool)$row->page_is_redirect;
+				}
+				$fit = $result->addValue( $path, null, $page );
+				if ( !$fit ) {
+					return array( 0, "{$row->page_random}|{$row->page_id}" );
 				}
 			} else {
 				$resultPageSet->processDbRow( $row );
 			}
 		}
 
-		return $count;
+		return array( $limit - $count, null );
 	}
 
 	/**
-	 * @param ApiPageSet $resultPageSet
-	 * @return void
+	 * @param ApiPageSet|null $resultPageSet
 	 */
 	public function run( $resultPageSet = null ) {
 		$params = $this->extractRequestParams();
-		$result = $this->getResult();
-		$this->pageIDs = array();
-
-		$this->prepareQuery(
-			wfRandom(),
-			$params['limit'],
-			$params['namespace'],
-			$resultPageSet,
-			$params['redirect']
-		);
-		$count = $this->runQuery( $resultPageSet );
-		if ( $count < $params['limit'] ) {
-			/* We got too few pages, we probably picked a high value
-			 * for page_random. We'll just take the lowest ones, see
-			 * also the comment in Title::getRandomTitle()
-			 */
-			$this->prepareQuery(
-				0,
-				$params['limit'] - $count,
-				$params['namespace'],
-				$resultPageSet,
-				$params['redirect']
-			);
-			$this->runQuery( $resultPageSet );
+
+		// Since 'filterredir" will always be set in $params, we have to dig
+		// into the WebRequest to see if it was actually passed.
+		$request = $this->getMain()->getRequest();
+		if ( $request->getCheck( $this->encodeParamName( 'filterredir' ) ) ) {
+			$this->requireMaxOneParameter( $params, 'filterredir', 'redirect' );
 		}
 
-		if ( is_null( $resultPageSet ) ) {
-			$result->addIndexedTagName( array( 'query', $this->getModuleName() ), 'page' );
+		if ( $params['redirect'] ) {
+			$this->logFeatureUsage( "list=random&rnredirect=" );
+		}
+
+		if ( isset( $params['continue'] ) ) {
+			$cont = explode( '|', $params['continue'] );
+			$this->dieContinueUsageIf( count( $cont ) != 4 );
+			$rand = $cont[0];
+			$start = $cont[1];
+			$startId = (int)$cont[2];
+			$end = $cont[3] ? $rand : null;
+			$this->dieContinueUsageIf( !preg_match( '/^0\.\d+$/', $rand ) );
+			$this->dieContinueUsageIf( !preg_match( '/^0\.\d+$/', $start ) );
+			$this->dieContinueUsageIf( $cont[2] !== (string)$startId );
+			$this->dieContinueUsageIf( $cont[3] !== '0' && $cont[3] !== '1' );
+		} else {
+			$rand = wfRandom();
+			$start = $rand;
+			$startId = null;
+			$end = null;
 		}
-	}
 
-	private function extractRowInfo( $row ) {
-		$title = Title::makeTitle( $row->page_namespace, $row->page_title );
-		$vals = array();
-		$vals['id'] = intval( $row->page_id );
-		ApiQueryBase::addTitleInfo( $vals, $title );
+		list( $left, $continue ) = $this->runQuery( $resultPageSet, $params['limit'], $start, $startId, $end );
+		if ( $end === null && $continue === null ) {
+			// Wrap around. We do this even if $left === 0 for continuation
+			// (saving a DB query in this rare case probably isn't worth the
+			// added code complexity it would require).
+			$end = $rand;
+			list( $left, $continue ) = $this->runQuery( $resultPageSet, $left, null, null, $end );
+		}
+
+		if ( $continue !== null ) {
+			$endFlag = $end === null ? 0 : 1;
+			$this->setContinueEnumParameter( 'continue', "$rand|$continue|$endFlag" );
+		}
 
-		return $vals;
+		if ( is_null( $resultPageSet ) ) {
+			$this->getResult()->addIndexedTagName( array( 'query', $this->getModuleName() ), 'page' );
+		}
 	}
 
 	public function getCacheMode( $params ) {
@@ -154,14 +181,24 @@ class ApiQueryRandom extends ApiQueryGeneratorBase {
 				ApiBase::PARAM_TYPE => 'namespace',
 				ApiBase::PARAM_ISMULTI => true
 			),
+			'filterredir' => array(
+				ApiBase::PARAM_TYPE => array( 'all', 'redirects', 'nonredirects' ),
+				ApiBase::PARAM_DFLT => 'nonredirects', // for BC
+			),
+			'redirect' => array(
+				ApiBase::PARAM_DEPRECATED => true,
+				ApiBase::PARAM_DFLT => false,
+			),
 			'limit' => array(
 				ApiBase::PARAM_TYPE => 'limit',
 				ApiBase::PARAM_DFLT => 1,
 				ApiBase::PARAM_MIN => 1,
-				ApiBase::PARAM_MAX => 10,
-				ApiBase::PARAM_MAX2 => 20
+				ApiBase::PARAM_MAX => ApiBase::LIMIT_BIG1,
+				ApiBase::PARAM_MAX2 => ApiBase::LIMIT_BIG2
+			),
+			'continue' => array(
+				ApiBase::PARAM_HELP_MSG => 'api-help-param-continue'
 			),
-			'redirect' => false,
 		);
 	}
 
diff --git a/includes/api/ApiQueryUserInfo.php b/includes/api/ApiQueryUserInfo.php
index 75a0adb6e2..251c42bc5d 100644
--- a/includes/api/ApiQueryUserInfo.php
+++ b/includes/api/ApiQueryUserInfo.php
@@ -78,7 +78,6 @@ class ApiQueryUserInfo extends ApiQueryBase {
 
 	protected function getCurrentUserInfo() {
 		$user = $this->getUser();
-		$result = $this->getResult();
 		$vals = array();
 		$vals['id'] = intval( $user->getId() );
 		$vals['name'] = $user->getName();
diff --git a/includes/api/ApiResult.php b/includes/api/ApiResult.php
index 014ca85bee..142a780221 100644
--- a/includes/api/ApiResult.php
+++ b/includes/api/ApiResult.php
@@ -288,7 +288,7 @@ class ApiResult implements ApiSerializable {
 	 * @param int $flags Zero or more OR-ed flags like OVERRIDE | ADD_ON_TOP.
 	 */
 	public static function setValue( array &$arr, $name, $value, $flags = 0 ) {
-		if ( !( $flags & ApiResult::NO_VALIDATE ) ) {
+		if ( ( $flags & ApiResult::NO_VALIDATE ) !== ApiResult::NO_VALIDATE ) {
 			$value = self::validateValue( $value );
 		}
 
@@ -402,6 +402,11 @@ class ApiResult implements ApiSerializable {
 		$arr = &$this->path( $path, ( $flags & ApiResult::ADD_ON_TOP ) ? 'prepend' : 'append' );
 
 		if ( $this->checkingSize && !( $flags & ApiResult::NO_SIZE_CHECK ) ) {
+			// self::valueSize needs the validated value. Then flag
+			// to not re-validate later.
+			$value = self::validateValue( $value );
+			$flags |= ApiResult::NO_VALIDATE;
+
 			$newsize = $this->size + self::valueSize( $value );
 			if ( $this->maxSize !== false && $newsize > $this->maxSize ) {
 				/// @todo Add i18n message when replacing calls to ->setWarning()
@@ -1079,14 +1084,12 @@ class ApiResult implements ApiSerializable {
 	 * or the sum of the strlen()s of the elements if the item is an array.
 	 * @note Once the deprecated public self::size is removed, we can rename
 	 *       this back to a less awkward name.
-	 * @param mixed $value
+	 * @param mixed $value Validated value (see self::validateValue())
 	 * @return int
 	 */
 	private static function valueSize( $value ) {
 		$s = 0;
-		if ( is_array( $value ) ||
-			is_object( $value ) && !is_callable( array( $value, '__toString' ) )
-		) {
+		if ( is_array( $value ) ) {
 			foreach ( $value as $k => $v ) {
 				if ( !self::isMetadataKey( $s ) ) {
 					$s += self::valueSize( $v );
@@ -1274,7 +1277,7 @@ class ApiResult implements ApiSerializable {
 	 */
 	public static function setElement( &$arr, $name, $value, $flags = 0 ) {
 		wfDeprecated( __METHOD__, '1.25' );
-		return self::setValue( $arr, $name, $value, $flags );
+		self::setValue( $arr, $name, $value, $flags );
 	}
 
 	/**
@@ -1488,7 +1491,7 @@ class ApiResult implements ApiSerializable {
 	 */
 	public static function size( $value ) {
 		wfDeprecated( __METHOD__, '1.25' );
-		return self::valueSize( $value );
+		return self::valueSize( self::validateValue( $value ) );
 	}
 
 	/**
diff --git a/includes/api/i18n/ar.json b/includes/api/i18n/ar.json
index aa456f0002..7bdf29abb9 100644
--- a/includes/api/i18n/ar.json
+++ b/includes/api/i18n/ar.json
@@ -4,7 +4,8 @@
 			"Meno25",
 			"أحمد المحمودي",
 			"Khaled",
-			"Fatz"
+			"Fatz",
+			"Hiba Alshawi"
 		]
 	},
 	"apihelp-main-param-format": "صيغة الخرج.",
@@ -24,5 +25,6 @@
 	"apihelp-edit-param-watch": "أضف الصفحة إلى لائحة مراقبة المستعمل الحالي",
 	"apihelp-emailuser-description": "مراسلة المستخدم",
 	"apihelp-patrol-example-rcid": "ابحث عن تغيير جديد",
+	"apihelp-query+imageinfo-paramvalue-prop-userid": "إضافة هوية المستخدم الذي قام بتحميل كل إصدار ملف.",
 	"apihelp-query+prefixsearch-param-offset": "عدد النتائج المراد تخطيها."
 }
diff --git a/includes/api/i18n/de.json b/includes/api/i18n/de.json
index 01f07ff5fb..7c4ddcb234 100644
--- a/includes/api/i18n/de.json
+++ b/includes/api/i18n/de.json
@@ -12,7 +12,8 @@
 			"Purodha",
 			"Andreasburmeister",
 			"Anomie",
-			"Duder"
+			"Duder",
+			"Ljonka"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page/de|Dokumentation]]\n* [[mw:API:FAQ/de|Häufig gestellte Fragen]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailingliste]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce API-Ankündigungen]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Fehlerberichte und Anfragen]\n</div>\n<strong>Status:</strong> Alle auf dieser Seite gezeigten Funktionen sollten funktionieren, allerdings ist die API in aktiver Entwicklung und kann sich zu jeder Zeit ändern. Abonniere die [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ MediaWiki-API-Ankündigungs-Mailingliste], um über Aktualisierungen informiert zu werden.\n\n<strong>Fehlerhafte Anfragen:</strong> Wenn fehlerhafte Anfragen an die API gesendet werden, wird ein HTTP-Header mit dem Schlüssel „MediaWiki-API-Error“ gesendet. Der Wert des Headers und der Fehlercode werden auf den gleichen Wert gesetzt. Für weitere Informationen siehe [[mw:API:Errors_and_warnings|API: Fehler und Warnungen]].",
@@ -312,6 +313,7 @@
 	"apihelp-query+alldeletedrevisions-param-namespace": "Nur Seiten in diesem Namensraum auflisten.",
 	"apihelp-query+allfileusages-param-from": "Titel der Datei, bei der die Aufzählung beginnen soll.",
 	"apihelp-query+allfileusages-param-to": "Titel der Datei, bei der die Aufzählung enden soll.",
+	"apihelp-query+allfileusages-param-prop": "Informationsteile zum Einbinden:",
 	"apihelp-query+allfileusages-param-limit": "Wie viele Gesamtobjekte zurückgegeben werden sollen.",
 	"apihelp-query+allfileusages-param-dir": "Aufzählungsrichtung.",
 	"apihelp-query+allfileusages-example-unique": "Einheitliche Dateititel auflisten",
@@ -384,6 +386,7 @@
 	"apihelp-query+filearchive-param-from": "Der Bildertitel, bei dem die Auflistung beginnen soll.",
 	"apihelp-query+filearchive-param-to": "Der Bildertitel, bei dem die Auflistung enden soll.",
 	"apihelp-query+filearchive-param-limit": "Wie viele Bilder insgesamt zurückgegeben werden sollen.",
+	"apihelp-query+filearchive-paramvalue-prop-sha1": "Ergänzt die SHA-1-Prüfsumme für das Bild.",
 	"apihelp-query+filearchive-example-simple": "Eine Liste aller gelöschten Dateien auflisten",
 	"apihelp-query+imageinfo-param-limit": "Wie viele Dateiversionen pro Datei zurückgegeben werden sollen.",
 	"apihelp-query+imageinfo-param-start": "Zeitstempel, von dem die Liste beginnen soll.",
@@ -396,13 +399,17 @@
 	"apihelp-query+links-example-simple": "Links von der <kbd>Hauptseite</kbd> abrufen",
 	"apihelp-query+linkshere-description": "Alle Seiten finden, die auf die angegebenen Seiten verlinken.",
 	"apihelp-query+logevents-description": "Ereignisse von den Logbüchern abrufen.",
+	"apihelp-query+pageswithprop-paramvalue-prop-ids": "Fügt die Seitenkennung hinzu.",
 	"apihelp-query+prefixsearch-param-search": "Such-Zeichenfolge.",
+	"apihelp-query+search-param-prop": "Eigenschaften zur Rückgabe:",
 	"apihelp-query+search-example-simple": "Nach <kbd>meaning</kbd> suchen.",
 	"apihelp-query+search-example-text": "Texte nach <kbd>meaning</kbd> durchsuchen.",
 	"apihelp-query+siteinfo-example-simple": "Websiteinformationen abrufen",
 	"apihelp-query+tags-description": "Änderungs-Tags auflisten.",
 	"apihelp-query+tags-example-simple": "Verfügbare Tags auflisten",
 	"apihelp-query+usercontribs-description": "Alle Bearbeitungen von einem Benutzer abrufen.",
+	"apihelp-query+usercontribs-paramvalue-prop-ids": "Ergänzt die Seiten- und Versionskennung.",
+	"apihelp-query+userinfo-paramvalue-prop-realname": "Fügt den bürgerlichen Namen des Benutzers hinzu.",
 	"apihelp-query+userinfo-example-simple": "Informationen über den aktuellen Benutzer abrufen",
 	"apihelp-query+users-description": "Informationen über eine Liste von Benutzern abrufen.",
 	"apihelp-rsd-description": "Ein RSD-Schema (Really Simple Discovery) exportieren.",
@@ -465,7 +472,7 @@
 	"api-help-param-deprecated": "Veraltet.",
 	"api-help-param-required": "Dieser Parameter ist erforderlich.",
 	"api-help-datatypes-header": "Datentypen",
-	"api-help-param-list": "{{PLURAL:$1|1=Ein Wert|2=Werte (mit <kbd>{{!}}</kbd> trennen)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=Einer der folgenden Werte|2=Werte (mit <kbd>{{!}}</kbd> trennen)}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Muss leer sein|Kann leer sein oder $2}}",
 	"api-help-param-limit": "Nicht mehr als $1 erlaubt.",
 	"api-help-param-limit2": "Nicht mehr als $1 ($2 für Bots) erlaubt.",
diff --git a/includes/api/i18n/en.json b/includes/api/i18n/en.json
index 396f5dac71..2cb0e371bd 100644
--- a/includes/api/i18n/en.json
+++ b/includes/api/i18n/en.json
@@ -725,7 +725,7 @@
 	"apihelp-query+imageinfo-param-prop": "Which file information to get:",
 	"apihelp-query+imageinfo-paramvalue-prop-timestamp": "Adds timestamp for the uploaded version.",
 	"apihelp-query+imageinfo-paramvalue-prop-user": "Adds the user who uploaded each file version.",
-	"apihelp-query+imageinfo-paramvalue-prop-userid": "Add the user ID that uploaded each file version.",
+	"apihelp-query+imageinfo-paramvalue-prop-userid": "Add the ID of the user that uploaded each file version.",
 	"apihelp-query+imageinfo-paramvalue-prop-comment": "Comment on the version.",
 	"apihelp-query+imageinfo-paramvalue-prop-parsedcomment": "Parse the comment on the version.",
 	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Adds the canonical title of the file.",
@@ -869,7 +869,7 @@
 	"apihelp-query+logevents-paramvalue-prop-details": "Lists additional details about the log event.",
 	"apihelp-query+logevents-paramvalue-prop-tags": "Lists tags for the log event.",
 	"apihelp-query+logevents-param-type": "Filter log entries to only this type.",
-	"apihelp-query+logevents-param-action": "Filter log actions to only this action. Overrides <var>$1type</var>. Wildcard actions like <kbd>action/*</kbd> allows to specify any string for the asterisk.",
+	"apihelp-query+logevents-param-action": "Filter log actions to only this action. Overrides <var>$1type</var>. In the list of possible values, values with the asterisk wildcard such as <kbd>action/*</kbd> can have different strings after the slash (/).",
 	"apihelp-query+logevents-param-start": "The timestamp to start enumerating from.",
 	"apihelp-query+logevents-param-end": "The timestamp to end enumerating.",
 	"apihelp-query+logevents-param-user": "Filter entries to those made by the given user.",
@@ -928,10 +928,11 @@
 	"apihelp-query+querypage-param-limit": "Number of results to return.",
 	"apihelp-query+querypage-example-ancientpages": "Return results from [[Special:Ancientpages]].",
 
-	"apihelp-query+random-description": "Get a set of random pages.\n\nPages are listed in a fixed sequence, only the starting point is random. This means that if, for example, <samp>Main Page</samp> is the first random page in the list, <samp>List of fictional monkeys</samp> will <em>always</em> be second, <samp>List of people on stamps of Vanuatu</samp> third, etc.\n\nIf the number of pages in the namespace is lower than <var>$1limit</var>, fewer pages will be returned. The same page will not be returned twice.",
+	"apihelp-query+random-description": "Get a set of random pages.\n\nPages are listed in a fixed sequence, only the starting point is random. This means that if, for example, <samp>Main Page</samp> is the first random page in the list, <samp>List of fictional monkeys</samp> will <em>always</em> be second, <samp>List of people on stamps of Vanuatu</samp> third, etc.",
 	"apihelp-query+random-param-namespace": "Return pages in these namespaces only.",
 	"apihelp-query+random-param-limit": "Limit how many random pages will be returned.",
-	"apihelp-query+random-param-redirect": "Load a random redirect instead of a random page.",
+	"apihelp-query+random-param-redirect": "Use <kbd>$1filterredir=redirects</kbd> instead.",
+	"apihelp-query+random-param-filterredir": "How to filter for redirects.",
 	"apihelp-query+random-example-simple": "Return two random pages from the main namespace.",
 	"apihelp-query+random-example-generator": "Return page info about two random pages from the main namespace.",
 
@@ -1392,7 +1393,7 @@
 	"api-help-param-type-password": "",
 	"api-help-param-type-timestamp": "Type: {{PLURAL:$1|1=timestamp|2=list of timestamps}} ([[Special:ApiHelp/main#main/datatypes|allowed formats]])",
 	"api-help-param-type-user": "Type: {{PLURAL:$1|1=user name|2=list of user names}}",
-	"api-help-param-list": "{{PLURAL:$1|1=One value|2=Values (separate with <kbd>{{!}}</kbd>)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=One of the following values|2=Values (separate with <kbd>{{!}}</kbd>)}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Must be empty|Can be empty, or $2}}",
 	"api-help-param-limit": "No more than $1 allowed.",
 	"api-help-param-limit2": "No more than $1 ($2 for bots) allowed.",
diff --git a/includes/api/i18n/es.json b/includes/api/i18n/es.json
index 1d04304fa0..06478f68a8 100644
--- a/includes/api/i18n/es.json
+++ b/includes/api/i18n/es.json
@@ -141,7 +141,7 @@
 	"apihelp-feedrecentchanges-param-hidebots": "Ocultar los cambios realizados por bots.",
 	"apihelp-feedrecentchanges-param-hideanons": "Ocultar los cambios realizados por usuarios anónimos.",
 	"apihelp-feedrecentchanges-param-hideliu": "Ocultar los cambios realizados por usuarios registrados.",
-	"apihelp-feedrecentchanges-param-hidepatrolled": "Ocultar los cambios patrullados.",
+	"apihelp-feedrecentchanges-param-hidepatrolled": "Ocultar los cambios verificados.",
 	"apihelp-feedrecentchanges-param-hidemyself": "Ocultar los cambios realizados por el usuario actual.",
 	"apihelp-feedrecentchanges-param-tagfilter": "Filtrar por etiquetas.",
 	"apihelp-feedrecentchanges-param-target": "Mostrar solo los cambios en las páginas enlazadas en esta.",
@@ -274,9 +274,10 @@
 	"apihelp-parse-example-text": "Analizar wikitexto.",
 	"apihelp-parse-example-texttitle": "Analizar wikitexto, especificando el título de la página.",
 	"apihelp-parse-example-summary": "Analizar un resumen.",
-	"apihelp-patrol-description": "Patrullar una página o revisión.",
-	"apihelp-patrol-example-rcid": "Patrullar un cambio reciente",
-	"apihelp-patrol-example-revid": "Patrullar una revisión",
+	"apihelp-patrol-description": "Verificar una página o revisión.",
+	"apihelp-patrol-param-rcid": "Identificador de cambios recientes que verificar.",
+	"apihelp-patrol-example-rcid": "Verificar un cambio reciente.",
+	"apihelp-patrol-example-revid": "Verificar una revisión.",
 	"apihelp-protect-description": "Cambiar el nivel de protección de una página.",
 	"apihelp-protect-param-title": "Título de la página a (des)proteger. No se puede utilizar con $1pageid.",
 	"apihelp-protect-param-pageid": "ID de la página a (des)proteger. No se puede utilizar con $1title.",
@@ -413,6 +414,7 @@
 	"apihelp-query+categoryinfo-description": "Devuelve información acerca de las categorías dadas.",
 	"apihelp-query+categoryinfo-example-simple": "Obtener información acerca de <kbd>Category:Foo</kbd> y <kbd>Category:Bar</kbd>",
 	"apihelp-query+categorymembers-param-prop": "Qué piezas de información incluir:",
+	"apihelp-query+categorymembers-paramvalue-prop-ids": "Añade el identificador de página.",
 	"apihelp-query+categorymembers-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
 	"apihelp-query+categorymembers-param-startsortkey": "Utilizar $1starthexsortkey en su lugar.",
 	"apihelp-query+categorymembers-param-endsortkey": "Utilizar $1endhexsortkey en su lugar.",
@@ -552,7 +554,7 @@
 	"apihelp-query+recentchanges-param-prop": "Incluir piezas adicionales de información:",
 	"apihelp-query+recentchanges-paramvalue-prop-parsedcomment": "Añade el comentario analizado para la edición.",
 	"apihelp-query+recentchanges-paramvalue-prop-flags": "Añade marcas para la edición.",
-	"apihelp-query+recentchanges-paramvalue-prop-patrolled": "Etiqueta ediciones patrullables como patrulladas o no patrulladas.",
+	"apihelp-query+recentchanges-paramvalue-prop-patrolled": "Etiqueta ediciones verificables como verificadas o no verificadas.",
 	"apihelp-query+recentchanges-param-token": "Usa <kbd>[[Special:ApiHelp/query+tokens|action=query&meta=tokens]]</kbd> en su lugar.",
 	"apihelp-query+recentchanges-param-limit": "Cuántos cambios en total se devolverán.",
 	"apihelp-query+recentchanges-param-type": "Cuántos tipos de cambios se mostrarán.",
@@ -630,8 +632,11 @@
 	"apihelp-query+usercontribs-param-prop": "Incluir piezas adicionales de información:",
 	"apihelp-query+usercontribs-paramvalue-prop-ids": "Añade el identificador de página y el de revisión.",
 	"apihelp-query+usercontribs-paramvalue-prop-title": "Agrega el título y el identificador del espacio de nombres de la página.",
+	"apihelp-query+usercontribs-paramvalue-prop-timestamp": "Añade fecha y hora de la edición.",
 	"apihelp-query+usercontribs-paramvalue-prop-comment": "Añade el comentario de la edición.",
+	"apihelp-query+usercontribs-paramvalue-prop-patrolled": "Etiqueta ediciones verificadas.",
 	"apihelp-query+usercontribs-paramvalue-prop-tags": "Lista las etiquetas para la edición.",
+	"apihelp-query+usercontribs-param-show": "Mostrar solo los elementos que coinciden con estos criterios. Por ejemplo, solo ediciones no menores: <kbd>$2show=!minor</kbd>.\n\nSi se establece <kbd>$2show=patrolled</kbd> o <kbd>$2show=!patrolled</kbd>, las revisiones más antiguas que <var>[[mw:Manual:$wgRCMaxAge|$wgRCMaxAge]]</var> ($1 {{PLURAL:$1|segundo|segundos}}) no se mostrarán.",
 	"apihelp-query+usercontribs-example-user": "Mostrar contribuciones del usuario <kbd>Ejemplo</kbd>.",
 	"apihelp-query+usercontribs-example-ipprefix": "Mostrar las contribuciones de todas las direcciones IP con el prefijo <kbd>192.0.2.</kbd>.",
 	"apihelp-query+userinfo-description": "Obtener información sobre el usuario actual.",
@@ -663,7 +668,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-userid": "Añade el identificador de usuario de quien hizo la edición.",
 	"apihelp-query+watchlist-paramvalue-prop-comment": "Añade el comentario de la edición.",
 	"apihelp-query+watchlist-paramvalue-prop-timestamp": "Añade fecha y hora de la edición.",
-	"apihelp-query+watchlist-paramvalue-prop-patrol": "Etiqueta las ediciones que están patrulladas.",
+	"apihelp-query+watchlist-paramvalue-prop-patrol": "Etiqueta las ediciones que están verificadas.",
 	"apihelp-query+watchlist-paramvalue-prop-sizes": "Añade la longitud vieja y la nueva de la página.",
 	"apihelp-query+watchlist-paramvalue-prop-notificationtimestamp": "Añade fecha y hora de cuando el usuario fue notificado por última vez acerca de la edición.",
 	"apihelp-query+watchlist-paramvalue-prop-loginfo": "Añade información del registro cuando corresponda.",
@@ -720,7 +725,7 @@
 	"api-help-param-type-boolean": "Tipo: booleano/lógico ([[Special:ApiHelp/main#main/datatypes|detalles]])",
 	"api-help-param-type-timestamp": "Tipo: {{PLURAL:$1|1=timestamp|2=lista de timestamps}} ([[Special:ApiHelp/main#main/datatypes|formatos permitidos]])",
 	"api-help-param-type-user": "Tipo: {{PLURAL:$1|1=nombre de usuario|2=lista de nombres de usuarios}}",
-	"api-help-param-list": "{{PLURAL:$1|1=Un valor|2=Valores (separados por <kbd>{{!}}</kbd>)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=Uno de los siguientes valores|2=Valores (separados por <kbd>{{!}}</kbd>)}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Debe estar vacío|Puede estar vacío, o $2}}",
 	"api-help-param-limit": "No se permite más de $1.",
 	"api-help-param-limit2": "No se permite más de $1 ($2 para los bots).",
diff --git a/includes/api/i18n/fi.json b/includes/api/i18n/fi.json
index 829be6d815..ac46637582 100644
--- a/includes/api/i18n/fi.json
+++ b/includes/api/i18n/fi.json
@@ -3,9 +3,12 @@
 		"authors": [
 			"Nike",
 			"MrTapsa",
-			"Pitke"
+			"Pitke",
+			"Stryn"
 		]
 	},
+	"apihelp-block-description": "Estä käyttäjä.",
+	"apihelp-block-param-reason": "Eston syy.",
 	"apihelp-emailuser-example-email": "Lähetä käyttäjälle <kbd>WikiSysop</kbd> sähköposti, jossa lukee <kbd>Content</kbd>.",
 	"apihelp-query+linkshere-param-show": "Näytä vain kohteet, jotka täyttävät nämä kriteerit:\n;redirect:Näytä vain uudelleenohjaukset.\n;!redirect:Näytä vain ei-uudelleenohjaukset",
 	"apihelp-tag-example-rev": "Lisää tunniste <kbd>vandalism</kbd> versioon 123 antamatta perustelua.",
diff --git a/includes/api/i18n/fr.json b/includes/api/i18n/fr.json
index 9d1efe6c85..5aec2c6ebf 100644
--- a/includes/api/i18n/fr.json
+++ b/includes/api/i18n/fr.json
@@ -862,7 +862,7 @@
 	"apihelp-query+protectedtitles-paramvalue-prop-timestamp": "Ajoute l’horodatage de l’ajout de la protection.",
 	"apihelp-query+protectedtitles-paramvalue-prop-user": "Ajoute l’utilisateur ayant ajouté la protection.",
 	"apihelp-query+protectedtitles-paramvalue-prop-userid": "Ajoute l’ID de l’utilisateur ayant ajouté la protection.",
-	"apihelp-query+protectedtitles-paramvalue-prop-comment": "Ajoute le commentaire de la protection.",
+	"apihelp-query+protectedtitles-paramvalue-prop-comment": "Ajoute le commentaire pour la protection.",
 	"apihelp-query+protectedtitles-paramvalue-prop-parsedcomment": "Ajoute le commentaire analysé de la protection.",
 	"apihelp-query+protectedtitles-paramvalue-prop-expiry": "Ajoute l’horodatage de levée de la protection.",
 	"apihelp-query+protectedtitles-paramvalue-prop-level": "Ajoute le niveau de protection.",
@@ -1081,7 +1081,7 @@
 	"apihelp-query+userinfo-paramvalue-prop-rights": "Liste tous les droits qu’a l’utilisateur actuel.",
 	"apihelp-query+userinfo-paramvalue-prop-changeablegroups": "Liste les groupes pour lesquels l’utilisateur actuel peut ajouter ou supprimer.",
 	"apihelp-query+userinfo-paramvalue-prop-options": "Liste toutes les préférences qu’a défini l’utilisateur actuel.",
-	"apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Obsolete.</span> Obtient un jeton pour modifier les préférences de l’utilisateur actuel.",
+	"apihelp-query+userinfo-paramvalue-prop-preferencestoken": "<span class=\"apihelp-deprecated\">Obsolete.</span> Obtenir un jeton pour modifier les préférences de l’utilisateur actuel.",
 	"apihelp-query+userinfo-paramvalue-prop-editcount": "Ajoute le compteur de modifications de l’utilisateur actuel.",
 	"apihelp-query+userinfo-paramvalue-prop-ratelimits": "Liste toutes les limites de débit s’appliquant à l’utilisateur actuel.",
 	"apihelp-query+userinfo-paramvalue-prop-realname": "Ajoute le vrai nom de l’utilisateur actuel.",
diff --git a/includes/api/i18n/gl.json b/includes/api/i18n/gl.json
index fc0b267749..6b6345d004 100644
--- a/includes/api/i18n/gl.json
+++ b/includes/api/i18n/gl.json
@@ -291,8 +291,10 @@
 	"apihelp-parse-param-effectivelanglinks": "Inclúe ligazóns de idioma proporcionadas polas extensións (para usar con <kbd>$1prop=langlinks</kbd>).",
 	"apihelp-parse-param-section": "Recuperar unicamente o contido deste número de sección ou cando <kbd>new</kbd> xera unha nova sección.\n\nA sección <kbd>new</kbd> só é atendida cando se especifica <var>text</var>.",
 	"apihelp-parse-param-sectiontitle": "Novo título de sección cando <var>section</var> é <kbd>new</kbd>.\n\nA diferenza da edición de páxinas, non se oculta no <var>summary</var> cando se omite ou está baleiro.",
-	"apihelp-parse-param-disablelimitreport": "Omitir o informe de preprocesador (\"Informe de límite NewPP\") da saída do analizador.",
+	"apihelp-parse-param-disablelimitreport": "Omitir o informe de límite (\"Informe de límite NewPP\") da saída do analizador.",
+	"apihelp-parse-param-disablepp": "Use <var>$1disablelimitreport</var> no seu lugar.",
 	"apihelp-parse-param-disableeditsection": "Omitir as ligazóns de edición de sección da saída do analizador.",
+	"apihelp-parse-param-disabletidy": "Non executar limpeza de HTML no retorno da análise.",
 	"apihelp-parse-param-generatexml": "Xenerar unha árbore de análise XML (necesita o modelo de contido <code>$1</code>; substituído por <kbd>$2prop=parsetree</kbd>).",
 	"apihelp-parse-param-preview": "Analizar en modo vista previa.",
 	"apihelp-parse-param-sectionpreview": "Analizar en modo vista previa de sección (activa tamén o modo de vista previa).",
@@ -807,7 +809,7 @@
 	"apihelp-query+logevents-paramvalue-prop-details": "Lista detalles adicionais do evento.",
 	"apihelp-query+logevents-paramvalue-prop-tags": "Lista as etiquetas do evento.",
 	"apihelp-query+logevents-param-type": "Filtrar as entradas do rexistro para mostrar só as deste tipo.",
-	"apihelp-query+logevents-param-action": "Filtrar accións no rexistro para mostrar só esta acción. Ignora <var>$1type</var>. Accións comodín como  <kbd>action/*</kbd> permiten especificar calquera cadea para o asterisco.",
+	"apihelp-query+logevents-param-action": "Filtrar accións no rexistro para mostrar só esta acción. Ignora <var>$1type</var>. Na lista de posibles valores, valores coa máscara asterisco como <kbd>action/*</kbd> poden ter diferentes cadeas despois da barra (/).",
 	"apihelp-query+logevents-param-start": "Selo de tempo no que comezar a enumeración.",
 	"apihelp-query+logevents-param-end": "Selo de tempo para rematar a enumeración.",
 	"apihelp-query+logevents-param-user": "Filtrar entradas ás feitas polo usuario indicado.",
@@ -859,10 +861,11 @@
 	"apihelp-query+querypage-param-page": "Nome da páxina especial. Teña en conta que diferencia entre maiúsculas e minúsculas.",
 	"apihelp-query+querypage-param-limit": "Número de resultados a visualizar.",
 	"apihelp-query+querypage-example-ancientpages": "Resultados devoltos de [[Special:Ancientpages]].",
-	"apihelp-query+random-description": "Obter un conxunto de páxinas aleatorias.\n\nAs páxinas están listadas nunha secuencia fixa, só o punto de comezo é aleatorio. Isto significa que se, por exemplo, a <samp>Main Page</samp> é a primeira páxina aleatoria da lista, a <samp>Lista de monos ficticios</samp> será <em>sempre</em> a segunda, <samp>Lista de xente en selos de Vanuatu</samp> será a terceira, etc.\n\nSe o númeor de páxinas do espazo de nomes é menor que <var>$1limit</var>, devolveranse menos páxinas. Non se devolverá dúas veces a mesma páxina.",
+	"apihelp-query+random-description": "Obter un conxunto de páxinas aleatorias.\n\nAs páxinas están listadas nunha secuencia fixa, só o punto de comezo é aleatorio. Isto significa que se, por exemplo, a <samp>Main Page</samp> é a primeira páxina aleatoria da lista, a <samp>Lista de monos ficticios</samp> será <em>sempre</em> a segunda, <samp>Lista de xente en selos de Vanuatu</samp> será a terceira, etc.",
 	"apihelp-query+random-param-namespace": "Devolver páxinas só neste espazo de nomes.",
 	"apihelp-query+random-param-limit": "Limitar cantas páxinas aleatorias se van devolver.",
-	"apihelp-query+random-param-redirect": "Cargar unha redirección aleatoria no canto dunha páxina aleatoria.",
+	"apihelp-query+random-param-redirect": "No canto use <kbd>$1filterredir=redirects</kbd>.",
+	"apihelp-query+random-param-filterredir": "Como filtrar para redireccións.",
 	"apihelp-query+random-example-simple": "Obter dúas páxinas aleatorias do espazo de nomes principal.",
 	"apihelp-query+random-example-generator": "Obter a información da páxina de dúas páxinas aleatorias do espazo de nomes principal.",
 	"apihelp-query+recentchanges-description": "Enumerar cambios recentes.",
@@ -1285,7 +1288,7 @@
 	"api-help-param-type-boolean": "Tipo: booleano ([[Special:ApiHelp/main#main/datatypes|detalles]])",
 	"api-help-param-type-timestamp": "Tipo: {{PLURAL:$1|1=selo de tempo|2=lista de selos de tempo}} ([[Special:ApiHelp/main#main/datatypes|formatos permitidos]])",
 	"api-help-param-type-user": "Tipo: {{PLURAL:$1|1=nome de usuario|2=lista de nomes de usuarios}}",
-	"api-help-param-list": "{{PLURAL:$1|1=Un valor|2=Valores (separados con <kbd>{{!}}</kbd>)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=Un valor dos seguintes valores|2=Valores (separados con <kbd>{{!}}</kbd>)}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Debe ser baleiro|Pode ser baleiro, ou $2}}",
 	"api-help-param-limit": "Non se permiten máis de $1.",
 	"api-help-param-limit2": "Non se permiten máis de $1 ($2 para bots).",
diff --git a/includes/api/i18n/he.json b/includes/api/i18n/he.json
index de8e83d81e..54815f89b6 100644
--- a/includes/api/i18n/he.json
+++ b/includes/api/i18n/he.json
@@ -809,7 +809,7 @@
 	"apihelp-query+logevents-paramvalue-prop-details": "הוספת פרטים נוספים על האירוע.",
 	"apihelp-query+logevents-paramvalue-prop-tags": "רשימת התגים של האירוע.",
 	"apihelp-query+logevents-param-type": "סינון עיולי יומן רק לסוג הזה.",
-	"apihelp-query+logevents-param-action": "סינון פעולות יומן רק לפעולה הזאת. דורס את <var>$1type</var>. פעולות עם תו־כולים כגון <kbd>action/*</kbd> מאפשרות לתת כל מחרוזת במקום הכוכבית.",
+	"apihelp-query+logevents-param-action": "סינון פעולות יומן רק לפעולה הזאת. דורס את <var>$1type</var>. ברשימת הערכים האפשריים, ערכים עם תו־כל כוכבית כגון <kbd>action/*</kbd> יכולים להיות מחרוזות שונות אחרי הקו הנטוי (/).",
 	"apihelp-query+logevents-param-start": "מאיזה חותם־זמן להתחיל למנות.",
 	"apihelp-query+logevents-param-end": "באיזה חותם זמן להפסיק לרשום.",
 	"apihelp-query+logevents-param-user": "לסנן את העיולים שעשה המשתמש הנתון.",
@@ -861,10 +861,11 @@
 	"apihelp-query+querypage-param-page": "שם הדף המיוחד. לתשומת לבך, זה תלוי־רישיות.",
 	"apihelp-query+querypage-param-limit": "מספר תוצאות להחזרה.",
 	"apihelp-query+querypage-example-ancientpages": "מחזיר תוצאות מ־[[Special:Ancientpages]].",
-	"apihelp-query+random-description": "קבלת ערכת דפים אקראיים.\n\nהדפים רשומים בסדר קבוע, ורק נקודת ההתחלה אקראית. זה אומר שאם, למשל, <samp>Main Page</samp> הוא הדף האקראי הראשון הרשימה, <samp>List of fictional monkeys</samp> יהיה <em>תמיד</em> השני, <samp>List of people on stamps of Vanuatu</samp> שלישי, וכו'.\n\nאם מספר הדפים במרחב השם נמוך מ־<var>$1limit</var>, יוחזרו פחות דפים. אותו הדף לא יוחזר פעמיים.",
+	"apihelp-query+random-description": "קבלת ערכת דפים אקראיים.\n\nהדפים רשומים בסדר קבוע, ורק נקודת ההתחלה אקראית. זה אומר שאם, למשל, <samp>Main Page</samp> הוא הדף האקראי הראשון הרשימה, <samp>List of fictional monkeys</samp> יהיה <em>תמיד</em> השני, <samp>List of people on stamps of Vanuatu</samp> שלישי, וכו'.",
 	"apihelp-query+random-param-namespace": "מחזיר דפים רק במרחבי השם האלה.",
 	"apihelp-query+random-param-limit": "להגביל את מספר הדפים האקראיים שיוחזרו.",
-	"apihelp-query+random-param-redirect": "לטעון הניה אקראית במקום דף אקראי.",
+	"apihelp-query+random-param-redirect": "נא להשתמש ב־<kbd>$1filterredir=redirects</kbd> במקום.",
+	"apihelp-query+random-param-filterredir": "איך לסנן הפניות.",
 	"apihelp-query+random-example-simple": "להחזיר שני דפים אקראיים מהמרחב הראשי.",
 	"apihelp-query+random-example-generator": "החזרת מידע על הדף על שני דפים אקראיים מהמרחב הראשי.",
 	"apihelp-query+recentchanges-description": "למנות שינויים אחרונים.",
@@ -961,10 +962,10 @@
 	"apihelp-query+search-paramvalue-prop-sectiontitle": "הוספת שם הפסקה התואמת.",
 	"apihelp-query+search-paramvalue-prop-categorysnippet": "הוספת קטע קצר מפוענח של הקטגוריה התואמת.",
 	"apihelp-query+search-paramvalue-prop-isfilematch": "הוספת בוליאני שמציין אם החיפוש תאם לתוכן של קובץ.",
-	"apihelp-query+search-paramvalue-prop-score": "<span class=\"apihelp-deprecated\">מיושן וחסר־תוקן.</span>",
-	"apihelp-query+search-paramvalue-prop-hasrelated": "<span class=\"apihelp-deprecated\">מיושן וחסר־תוקן.</span>",
+	"apihelp-query+search-paramvalue-prop-score": "<span class=\"apihelp-deprecated\">מיושן וחסר־השפעה.</span>",
+	"apihelp-query+search-paramvalue-prop-hasrelated": "<span class=\"apihelp-deprecated\">מיושן וחסר־השפעה.</span>",
 	"apihelp-query+search-param-limit": "כמה דפים להחזיר בסך הכול.",
-	"apihelp-query+search-param-interwiki": "לכלול תוצאות בינוויקי בחיפוש ם זמין.",
+	"apihelp-query+search-param-interwiki": "לכלול תוצאות בינוויקי בחיפוש, אם זמין.",
 	"apihelp-query+search-param-backend": "באיזה שרת חיפוש להשתמש אם לא בבררת המחדל.",
 	"apihelp-query+search-example-simple": "חיפוש <kbd>meaning</kbd>.",
 	"apihelp-query+search-example-text": "חיפוש טקסטים עבור <kbd>meaning</kbd>.",
@@ -1287,7 +1288,7 @@
 	"api-help-param-type-boolean": "סוג: בוליאני ([[Special:ApiHelp/main#main/datatypes|פרטים]])",
 	"api-help-param-type-timestamp": "סוג: {{PLURAL:$1|חותם־זמן|רשימת חותמי־זמן}} ([[Special:ApiHelp/main#main/datatypes|תסדירים מורשים]])",
 	"api-help-param-type-user": "סוג: {{PLURAL:$1|1=שם משתמש|2=רשימת שמות משתמשים}}",
-	"api-help-param-list": "{{PLURAL:$1|1=ערך אחד|2=ערכים (מופרדים באמצעות \"<kbd>{{!}}</kbd>\")}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=אחד מהערכים הבאים|2=ערכים (מופרדים באמצעות \"<kbd>{{!}}</kbd>\")}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=חייב להיות ריק|יכול להיות ריק או $2}}",
 	"api-help-param-limit": "מספר הפרמטרים לא יכול להיות גדול מ־$1.",
 	"api-help-param-limit2": "המספר המרבי המותר הוא $1 (עבור בוטים – $2).",
@@ -1311,5 +1312,5 @@
 	"api-help-permissions-granted-to": "{{PLURAL:$1|הוענק ל|הוענקו ל}}: $2",
 	"api-help-right-apihighlimits": "להשתמש במגבלות גבוהות יותר בשאילתות API (שאילתות אטיות: $1; שאילתות מהירות: $2). המגבלות לשאילתות אטיות חלות גם על פרמטרים מרובי־ערכים.",
 	"api-credits-header": "קרדיטים",
-	"api-credits": "מפתחי ה־API:\n* רואן קטאו (מפתח מוביל 2007–2009)\n* ויקטור וסילייב\n* בריאן טונג מין\n* סאם ריד\n* יורי אסטרחן (יוצר, מפתח מוביל מספטמבר 2006 עד ספטמבר 2007)\n* בראד יורש (מפתח מוביל מאז 2013)\n\nאנא שלחו הערות, הצעות ושאלות לכתובת mediawiki-api@lists.wikimedia.org או כתבו דיווח באג באתר https://bugzilla.wikimedia.org."
+	"api-credits": "מפתחי ה־API:\n* רואן קטאו (מפתח מוביל 2007–2009)\n* ויקטור וסילייב\n* בריאן טונג מין\n* סאם ריד\n* יורי אסטרחן (יוצר, מפתח מוביל מספטמבר 2006 עד ספטמבר 2007)\n* בראד יורש (מפתח מוביל מאז 2013)\n\nאנא שלחו הערות, הצעות ושאלות לכתובת mediawiki-api@lists.wikimedia.org או כתבו דיווח באג באתר https://phabricator.wikimedia.org."
 }
diff --git a/includes/api/i18n/it.json b/includes/api/i18n/it.json
index 190de54a2e..5c4c55e5fb 100644
--- a/includes/api/i18n/it.json
+++ b/includes/api/i18n/it.json
@@ -6,7 +6,8 @@
 			"Toadino2",
 			"Gianfranco",
 			"Alexmar983",
-			"Ricordisamoa"
+			"Ricordisamoa",
+			"Valepert"
 		]
 	},
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Documentazione (in inglese)]]\n* [[mw:API:FAQ|FAQ (in inglese)]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Mailing list]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Annunci sull'API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Bug & richieste]\n</div>\n<strong>Stato:</strong> Tutte le funzioni e caratteristiche mostrate su questa pagina dovrebbero funzionare, ma l'API è ancora in fase d'attivo sviluppo, e potrebbe cambiare in qualsiasi momenento. Iscriviti alla [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ the mediawiki-api-announce mailing list] per essere informato sugli aggiornamenti.\n\n<strong>Istruzioni sbagliate:</strong> quando vengono impartite all'API delle istruzioni sbagliate, un'intestazione HTTP verrà inviata col messaggio \"MediaWiki-API-Error\" e sia al valore dell'intestazione sia al codice d'errore verrà impostato lo stesso valore. Per maggiori informazioni leggi [[mw:API:Errors_and_warnings|API:Errori ed avvertimenti (in inglese)]].",
@@ -14,6 +15,7 @@
 	"apihelp-main-param-format": "Formato dell'output.",
 	"apihelp-main-param-assert": "Verifica che l'utente sia loggato se si è impostato <kbd>utente</kbd>, o che abbia i permessi di bot se si è impostato <kbd>bot</kbd>.",
 	"apihelp-main-param-requestid": "Tutti i valori forniti saranno implementati nella risposta. Potrebbero venir utilizzati per distinguere le richieste.",
+	"apihelp-main-param-servedby": "Includi nei risultati il nome dell'host che ha servito la richiesta.",
 	"apihelp-main-param-curtimestamp": "Includere il timestamp corrente nel risultato.",
 	"apihelp-block-description": "Blocca  un utente.",
 	"apihelp-block-param-user": "Nome utente, indirizzo IP o range di IP da bloccare.",
@@ -82,7 +84,20 @@
 	"apihelp-expandtemplates-param-prop": "Quale informazione ottenere.\n\nNota che se non è selezionato alcun valore, il risultato conterrà il codice wiki, ma l'output sarà in un formato obsoleto.",
 	"apihelp-expandtemplates-paramvalue-prop-wikitext": "Il wikitext espanso.",
 	"apihelp-expandtemplates-paramvalue-prop-volatile": "Se l'output sia volatile e non debba essere riutilizzato altrove all'interno della pagina.",
+	"apihelp-feedcontributions-param-year": "Dall'anno (e precedenti).",
+	"apihelp-feedcontributions-param-month": "Dal mese (e precedenti).",
+	"apihelp-feedcontributions-param-deletedonly": "Mostra solo i contribuiti cancellati.",
+	"apihelp-feedcontributions-param-toponly": "Mostra solo i contributi che sono le ultime versioni per la pagina.",
+	"apihelp-feedcontributions-param-newonly": "Visualizza solo le modifiche che sono creazioni di pagina.",
+	"apihelp-feedrecentchanges-param-hideminor": "Nascondi le modifiche minori.",
+	"apihelp-feedrecentchanges-param-hidebots": "Nascondi le modifiche apportate da bot.",
+	"apihelp-feedrecentchanges-param-hideanons": "Nascondi le modifiche fatte da utenti anonimi.",
+	"apihelp-feedrecentchanges-param-hideliu": "Nascondi le modifiche apportate dagli utenti registrati.",
+	"apihelp-feedrecentchanges-param-showlinkedto": "Mostra solo le modifiche alle pagine collegate a quella specificata.",
+	"apihelp-login-param-name": "Nome utente.",
+	"apihelp-login-param-password": "Password.",
 	"apihelp-move-description": "Sposta una pagina.",
+	"apihelp-move-param-ignorewarnings": "Ignora i messaggi di avvertimento del sistema.",
 	"apihelp-options-example-reset": "Reimposta tutte le preferenze.",
 	"apihelp-query+blocks-example-simple": "Elenca i blocchi.",
 	"apihelp-query+recentchanges-example-simple": "Elenco modifiche recenti.",
diff --git a/includes/api/i18n/ja.json b/includes/api/i18n/ja.json
index 267f1d64c5..bb403c6f6b 100644
--- a/includes/api/i18n/ja.json
+++ b/includes/api/i18n/ja.json
@@ -85,6 +85,7 @@
 	"apihelp-edit-param-appendtext": "このテキストをページの末尾に追加する。$1textを上書きします。\n\n新しい節を追加するにはこのパラメータではなく $1section=newを使用してください。",
 	"apihelp-edit-param-undo": "この版を取り消します。$1text, $1prependtext および $1appendtext をオーバーライドします。",
 	"apihelp-edit-param-undoafter": "$1undo からこの版までのすべての版を取り消します。設定しない場合、ひとつの版のみ取り消されます。",
+	"apihelp-edit-param-redirect": "自動的にリダイレクトを解決します。",
 	"apihelp-edit-param-token": "このトークンは常に最後のパラメーターとして、または少なくとも $1text パラメーターより後に送信されるべきです。",
 	"apihelp-edit-example-edit": "ページを編集",
 	"apihelp-edit-example-prepend": "<kbd>_&#95;NOTOC_&#95;</kbd> をページの先頭に挿入する。",
@@ -194,6 +195,7 @@
 	"apihelp-paraminfo-description": "API モジュールに関する情報を取得します。",
 	"apihelp-paraminfo-param-modules": "モジュールの名前のリスト (<var>action</var> および <var>format</var> パラメーターの値, または <kbd>main</kbd>). <kbd>+</kbd> を使用して下位モジュールを指定できます。",
 	"apihelp-paraminfo-example-1": "<kbd>[[Special:ApiHelp/parse|action=parse]]</kbd>, <kbd>[[Special:ApiHelp/jsonfm|format=jsonfm]]</kbd>, <kbd>[[Special:ApiHelp/query+allpages|action=query&list=allpages]]</kbd>, and <kbd>[[Special:ApiHelp/query+siteinfo|action=query&meta=siteinfo]]</kbd> に関する情報を表示する。",
+	"apihelp-parse-param-disablepp": "<var>$1disablelimitreport</var> を代わりに使用してください。",
 	"apihelp-parse-param-preview": "プレビューモードでのパース",
 	"apihelp-parse-example-page": "ページをパース",
 	"apihelp-parse-example-text": "ウィキテキストをパース",
@@ -226,7 +228,7 @@
 	"apihelp-query+alldeletedrevisions-param-user": "この利用者による版のみを一覧表示する。",
 	"apihelp-query+alldeletedrevisions-param-excludeuser": "この利用者による版を一覧表示しない。",
 	"apihelp-query+alldeletedrevisions-param-namespace": "この名前空間に含まれるページのみを一覧表示します。",
-	"apihelp-query+alldeletedrevisions-param-generatetitles": "ジェネレーターとして使用する場合、版IDではなくタイトルを生成します。",
+	"apihelp-query+alldeletedrevisions-param-generatetitles": "ジェネレーターとして使用する場合、版IDではなくページ名を生成します。",
 	"apihelp-query+alldeletedrevisions-example-user": "利用者 <kbd>Example</kbd> による削除された直近の50版を一覧表示する。",
 	"apihelp-query+alldeletedrevisions-example-ns-main": "標準名前空間にある削除された最初の50版を一覧表示する。",
 	"apihelp-query+allfileusages-param-from": "列挙を開始するファイルのタイトル。",
@@ -246,7 +248,7 @@
 	"apihelp-query+allimages-example-generator": "<kbd>T</kbd> で始まる4つのファイルに関する情報を表示する。",
 	"apihelp-query+alllinks-description": "与えられた名前空間へのすべてのリンクを一覧表示します。",
 	"apihelp-query+alllinks-param-from": "列挙を開始するリンクのタイトル。",
-	"apihelp-query+alllinks-param-to": "列挙を終了するリンクのタイトル。",
+	"apihelp-query+alllinks-param-to": "列挙を終了するリンクのページ名。",
 	"apihelp-query+alllinks-param-prefix": "この値で始まるすべてのリンクされたページを検索する。",
 	"apihelp-query+alllinks-example-B": "<kbd>B</kbd> で始まるリンクされたページ (存在しないページも含む)を、リンク元のページIDとともに表示する。",
 	"apihelp-query+allmessages-param-args": "メッセージ中に展開される引数。",
@@ -264,8 +266,8 @@
 	"apihelp-query+allpages-example-B": "<kbd>B</kbd> で始まるページの一覧を表示する。",
 	"apihelp-query+allpages-example-generator": "<kbd>T</kbd> で始まる4つのページに関する情報を表示する。",
 	"apihelp-query+allpages-example-generator-revisions": "<kbd>Re</kbd> で始まる最初の非リダイレクトの2ページの内容を表示する。",
-	"apihelp-query+allredirects-param-from": "列挙を開始するリダイレクトのタイトル。",
-	"apihelp-query+allredirects-param-to": "列挙を終了するリダイレクトのタイトル。",
+	"apihelp-query+allredirects-param-from": "列挙を開始するリダイレクトのページ名。",
+	"apihelp-query+allredirects-param-to": "列挙を終了するリダイレクトのページ名。",
 	"apihelp-query+alltransclusions-param-prefix": "この値で始まるすべてのトランスクルードされているページを検索する。",
 	"apihelp-query+allusers-description": "すべての登録利用者を一覧表示します。",
 	"apihelp-query+allusers-param-from": "列挙を開始する利用者名。",
@@ -529,7 +531,7 @@
 	"api-help-parameters": "{{PLURAL:$1|パラメーター}}:",
 	"api-help-param-deprecated": "廃止予定です。",
 	"api-help-param-required": "このパラメーターは必須です。",
-	"api-help-param-list": "{{PLURAL:$1|1=値 (いずれか1つ)|2=値 (<kbd>{{!}}</kbd>で区切る)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=値 (次の値のいずれか1つ)|2=値 (<kbd>{{!}}</kbd>で区切る)}}: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=空欄にしてください|空欄にするか、または $2}}",
 	"api-help-param-integer-min": "{{PLURAL:$1|値}}は $2 以上にしてください。",
 	"api-help-param-integer-max": "{{PLURAL:$1|値}}は $3 以下にしてください。",
diff --git a/includes/api/i18n/ksh.json b/includes/api/i18n/ksh.json
index cf54d29b4f..46ef96829d 100644
--- a/includes/api/i18n/ksh.json
+++ b/includes/api/i18n/ksh.json
@@ -380,6 +380,7 @@
 	"apihelp-query+allredirects-param-to": "De Övverschreff vun dä Sigg, woh et Zälle ophühre sull.",
 	"apihelp-query+allredirects-param-prefix": "Söhk not Sigge, di esu aanfange.",
 	"apihelp-query+allredirects-param-unique": "Zeijsch blohß de ongerscheidlijje Zihl_Sigg. Kam_mer nit zesamme met „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1prop=ids|fragment|interwiki</code>“ bruche. Wam_mer et als ene  Jenerahtor bruche deiht, kritt mer Zihlsiggge anschtatt vun Quällesigge.",
+	"apihelp-query+allredirects-paramvalue-prop-title": "Deiht dä Ömleijdong ehr Övverschreff derbei.",
 	"apihelp-query+allredirects-param-namespace": "Dat Appachtemang zom opzälle.",
 	"apihelp-query+allredirects-param-limit": "Wi vill sulle överhoup aanjezeisch wääde?",
 	"apihelp-query+allredirects-param-dir": "En wälsche Reijefollsch?",
@@ -408,6 +409,9 @@
 	"apihelp-query+allusers-param-dir": "De Reijefollsch zum Zotehre.",
 	"apihelp-query+allusers-param-group": "Donn blohß Metmaacher uß dä aanjejovve Jroppe enschlehße.",
 	"apihelp-query+allusers-param-excludegroup": "Donn keine Metmaacher uß dä aanjejovve Jroppe enschlehße.",
+	"apihelp-query+allusers-param-prop": "Wat för en Aanjahbe med enzschlehße:",
+	"apihelp-query+allusers-paramvalue-prop-rights": "De Rääschde vn däm Memaacher.",
+	"apihelp-query+allusers-paramvalue-prop-editcount": "Donn de Aanzahl Änderonge derbei, di dä Metmaacher em Wikki jemaat hät.",
 	"apihelp-query+allusers-param-limit": "Wi vill Nahme Metmaacher sulle mer krijje?",
 	"apihelp-query+allusers-param-witheditsonly": "Blohß Metmahcher, di och ens jät verändert han.",
 	"apihelp-query+allusers-param-activeusers": "Donn blohß Metmaacher opleßte, di  {{PLURAL:$1|der läzde Daach|en de läzde $1 Dääsch|keine läzde Daach}} aktihf wohre.",
@@ -418,6 +422,7 @@
 	"apihelp-query+backlinks-param-namespace": "Dat Appachtemang zom opzälle.",
 	"apihelp-query+backlinks-param-dir": "En wälsche Reijefollsch?",
 	"apihelp-query+backlinks-param-limit": "Wi vill Sigge ensjesamp ußjävve. Wann „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1redirect</var>“ ennjeschalld es, weed di Beschrängkong op jehden Nivoh äxtra aanjwandt, wat bedügg, dat bes op 2 * „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1limit</var> ußjejovve wähde künne.",
+	"apihelp-query+backlinks-param-redirect": "Wann de Sigg met dämm Lengk dren en Ömleijdong änthält, fengk derzoh och alle Sigge, di doh drop lengke. De Bovverjränz för de Aanzahl Sigge för opzeleßte weed hallbehrt.",
 	"apihelp-query+backlinks-example-simple": "Zeijsch Lengks op de Sigg <kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Main page<kbd>.",
 	"apihelp-query+backlinks-example-generator": "Holl Ennfommazjuhne övver Sigge, di op de Sigg „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Main Page</code>“ lengke donn.",
 	"apihelp-query+blocks-description": "Donn alle jeschpächte Metmaacher un <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Internet Protocol\">IP</i>-Adräße opleßte.",
@@ -456,9 +461,14 @@
 	"apihelp-query+categorymembers-description": "Donn alle Sigge en ener aanjejove saachjrobb opleste.",
 	"apihelp-query+categorymembers-param-title": "Wat för en Sachjropp opzälle. Moß aanjejovve sin. Moß der Vörsaz „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">{{ns:category}}:</kbd>“ änthallde. Kam_mer nit zesamme met „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1pageid</var>“ bruche.",
 	"apihelp-query+categorymembers-param-pageid": "De Kännong vun dä Sigg zom opzälle. Kam_mer nit zersamme met „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1title</var>“ bruche.",
+	"apihelp-query+categorymembers-param-prop": "Wat för en Aanjahbe med enzschlehße:",
+	"apihelp-query+categorymembers-paramvalue-prop-ids": "Deiht de Kännong vun de Sigge derbei.",
+	"apihelp-query+categorymembers-paramvalue-prop-title": "Donn de Övverschrevv un de Kännong för et Appachtemang derbei.",
+	"apihelp-query+categorymembers-paramvalue-prop-timestamp": "Deihd et Dattum un de Uhrzigg derbei, wann di Sigg opjenumme wohd.",
 	"apihelp-query+categorymembers-param-limit": "De jrüüßte Zahl Sigge för ußzejävve.",
 	"apihelp-query+categorymembers-param-sort": "De Eijeschavv öm dernoh ze zottehre.",
 	"apihelp-query+categorymembers-param-dir": "En wälsche Reihjefollsch opleßte.",
+	"apihelp-query+categorymembers-param-starthexsortkey": "Der Zoteerschlößel för de Leß opzehühre, wi mer en met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1prop=sortkey</kbd>“ kritt. Kann blohß met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1sort=sortkey</kbd>“ jebruch wähde.",
 	"apihelp-query+categorymembers-param-endhexsortkey": "Der Zoteerschlößel för de Leß opzehühre, wi mer en met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1prop=sortkey</kbd>“ kritt. Kann blohß met „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1sort=sortkey</kbd>“ jebruch wähde.",
 	"apihelp-query+categorymembers-param-endsortkeyprefix": "Der Aanfang vun däm Zoteerschlößel för de Leß opzehühre. Opühre deiht se <strong>för</strong>, un nit <strong>met</strong> däm. Wann dä Wäät opdouch, weed hä nit med ußjejovve. Kann blohß met „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1sort=sortkey</code>“ jebruch wähde un överjeihd „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1endhexsortkey</code>“.",
 	"apihelp-query+categorymembers-param-startsortkey": "Söhk „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1starthexsortkey</code>“ schtatt dämm.",
@@ -468,6 +478,8 @@
 	"apihelp-query+contributors-description": "Holl de Leß met de ennjelogg Schrihver un de Aanzahl nahmelohse Metschrihver aan ene Sigg.",
 	"apihelp-query+contributors-param-limit": "Wi vill Metschrihver ze livvere?",
 	"apihelp-query+contributors-example-simple": "Donn de Metschrihver aan dä Sigg „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">KMain PageBD</kbd>“ aanzeije.",
+	"apihelp-query+deletedrevisions-param-start": "Et Dattom un de Uhrzigg, von woh aan opzälle. Weed nit jebruch, wam_mer en Leß met Kännonge vun Väsjohne aam beärbeijde sin.",
+	"apihelp-query+deletedrevisions-param-end": "Et Dattom un de Uhrzigg, bes woh hen opzälle. Weed nit jebruch, wam_mer en Leß met Kännonge vun Väsjohne aam beärbeijde sin.",
 	"apihelp-query+deletedrevisions-param-tag": "Donn blohß Väsjohne met heh dä Makkehrong opleßte.",
 	"apihelp-query+deletedrevisions-param-user": "Donn blohß Väsjohne vun heh däm Metmaacher opleßte.",
 	"apihelp-query+deletedrevisions-param-excludeuser": "Donn kein Väsjohne vun heh däm Metmaacher opleßte.",
@@ -505,6 +517,9 @@
 	"apihelp-query+extlinks-example-simple": "Holl en Leß met Lengks noh ußerhallef vum Wikki uß dä Sigg „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Main Page</kbd>“.",
 	"apihelp-query+exturlusage-description": "Donn alle Sigge upzälle med däm aanjejovve<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Uniform Ressource Locator\">URL</i> dren.",
 	"apihelp-query+exturlusage-param-prop": "Wat för en Aanjahbe med enzschlehße:",
+	"apihelp-query+exturlusage-paramvalue-prop-ids": "Donn dä Sigg ier Kännong derbei.",
+	"apihelp-query+exturlusage-paramvalue-prop-title": "Donn de Övverschrevv un de Kännong för et Appachtemang derbei.",
+	"apihelp-query+exturlusage-paramvalue-prop-url": "Donn dä <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Uniform Ressource Locator\">URL</i> derbei, dä en dä Sigg jebruch weed.",
 	"apihelp-query+exturlusage-param-protocol": "Dat Schehma uß däm <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Uniform Ressource Locator\">URL</i>. Wann et läddesch jelohße es un „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1query</var>“ aanjejogge es, es dat Schehma „<kbd lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"HyperText Transfer Protocol\">http</kbd>“. Lohß beeds dat un „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">1query</var>“ läddesch, öm alle Lengks noh ußerhallef opzeleßte.",
 	"apihelp-query+exturlusage-param-namespace": "Dat appachtemang met dä Sigge zom opzälle.",
 	"apihelp-query+exturlusage-param-limit": "Wi vill Sigge zem ußjävve?",
@@ -532,6 +547,10 @@
 	"apihelp-query+filearchive-example-simple": "Zeijsch en leß met alle fottjeschmeße Datteije.",
 	"apihelp-query+filerepoinfo-example-simple": "Holl ennfommazjuhne övver de Reppossetohreje met Datteije.",
 	"apihelp-query+fileusage-description": "Fengk alle Sigge, di de aanjejovve Datteije bruche.",
+	"apihelp-query+fileusage-param-prop": "Wat för en Eijeschaffte holle:",
+	"apihelp-query+fileusage-paramvalue-prop-pageid": "De Kännong för jehde Sigg.",
+	"apihelp-query+fileusage-paramvalue-prop-title": "De Övverschreff för jehde Sigg.",
+	"apihelp-query+fileusage-paramvalue-prop-redirect": "Zeijsch aan, wann di Sigge en Ömleijdong es.",
 	"apihelp-query+fileusage-param-namespace": "Donn blohß Sigge en heh dä Appachtemangs metnämme.",
 	"apihelp-query+fileusage-param-limit": "Wi vill holle?",
 	"apihelp-query+fileusage-example-simple": "Holl Aanjahbe övver Sigge, di de Dattei „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">[[:File:Example.jpg]].</code>“ bruche.",
@@ -540,10 +559,10 @@
 	"apihelp-query+imageinfo-param-prop": "Wat för en Schtöker aan Ennfommazjuhne holle:",
 	"apihelp-query+imageinfo-paramvalue-prop-timestamp": "Deihd en dattom un en Zigg aan de huhjelahde Väsjohn.",
 	"apihelp-query+imageinfo-paramvalue-prop-user": "Deiht dä Metmaacher derbei, dä jehde Väsjohn vun dä Dattei huhjelahde hät.",
-	"apihelp-query+imageinfo-paramvalue-prop-userid": "Deiht de Kännong vun däm Metmaacher derbei, dä jehde Väsohn vun dä Dattei.",
+	"apihelp-query+imageinfo-paramvalue-prop-userid": "Deiht de Kännong vun jehdem Metmaacher derbei, dä en Väsohn vun dä Dattei huh jelaahde hät.",
 	"apihelp-query+imageinfo-paramvalue-prop-comment": "Aanmärkonge bei dä Väsjohn.",
 	"apihelp-query+imageinfo-paramvalue-prop-parsedcomment": "Donn di Aanmärkonge bei dä Väsjohn paase.",
-	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Deiht de kannohnesche Överschreff vun dä Dattei derbei.",
+	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "Deiht de kannohnesche, schtandattmähßejje, Överschreff vun dä Dattei derbei.",
 	"apihelp-query+imageinfo-paramvalue-prop-url": "Jitt dä <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Uniform Ressource Locator\">URL</i> för di Dattei un de Sigg met däh iere Äkliehrong uß.",
 	"apihelp-query+imageinfo-paramvalue-prop-size": "Deiht de Jrühße vun dä Dattei en \n<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Bytes</i>, de Hühde, de Breide, un, woh et se jitt, de Aanzahl Sigge derbei.",
 	"apihelp-query+imageinfo-paramvalue-prop-dimensions": "Et sällve, wi de Jrühße.",
@@ -553,6 +572,8 @@
 	"apihelp-query+imageinfo-paramvalue-prop-mediatype": "Deiht de Mehdijje_Zoot vun dä Dattei derbei.",
 	"apihelp-query+imageinfo-paramvalue-prop-metadata": "Deiht de <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Exchangeable image file format\">EXIF</i>-Mettadahte för di Väsjohn vun dä Dattei oplesßte.",
 	"apihelp-query+imageinfo-paramvalue-prop-commonmetadata": "Deiht de Mettadahte för heh di Väsjohn vun dä Dattei oplesßte, di alld schtandattmähßesch en däm Datteifommaht änthallde sin.",
+	"apihelp-query+imageinfo-paramvalue-prop-archivename": "Deiht dä Nahme vun dä Dattei vun dä Aschihf_Väsjohn för alle Väsjohne, bes op de läzde, derbei.",
+	"apihelp-query+imageinfo-paramvalue-prop-bitdepth": "deiht de bit depth för di Väsjohn derbei.",
 	"apihelp-query+imageinfo-param-limit": "Wi vill Väsjohne för jehde Dattei ußjävve.",
 	"apihelp-query+imageinfo-param-start": "Et Dattom un de Zigg, vun woh aan opleßte.",
 	"apihelp-query+imageinfo-param-end": "Et Dattom un de Zigg, vun woh aan opleßte.",
@@ -571,6 +592,8 @@
 	"apihelp-query+imageusage-param-pageid": "De Känong vun dä Sigg zom noh Söhke. Kam_mer nit zesamme met „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1title</var>“ bruche.",
 	"apihelp-query+imageusage-param-namespace": "Dat Appachtemang zom opzälle.",
 	"apihelp-query+imageusage-param-dir": "En wälsche Reijefollsch opleßte.",
+	"apihelp-query+imageusage-param-limit": "Wi vill Sigge ensjesamp ußjävve. Wann „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1redirect</var>“ ennjeschalld es, weed di Beschrängkong op jehden Nivoh äxtra aanjwandt, wat bedügg, dat bes op 2 * „<var lang=\"en\" xml:lang=\"en\" dir=\"ltr\">$1limit</var> ußjejovve wähde künne.",
+	"apihelp-query+imageusage-param-redirect": "Wann de Sigg met dämm Lengk dren en Ömleijdong änthält, fengk derzoh och alle Sigge, di doh drop lengke. De Bovverjränz för de Aanzahl Sigge för opzeleßte weed hallbehrt.",
 	"apihelp-query+imageusage-example-simple": "Zeijsch Sigge, di di Dattei „<code lang=\"mul\" xml:lang=\"mul\" dir=\"ltr\">[[:File:Albert Einstein Head.jpg]]</code>“ bruche.",
 	"apihelp-query+imageusage-example-generator": "Holl Enformazjuhne övver de Sigge, di di Dattei „<code lang=\"mul\" xml:lang=\"mul\" dir=\"ltr\">[[:File:Albert Einstein Head.jpg]]</code>“ bruche.",
 	"apihelp-query+info-description": "Holl jrondlähje Ennfommazjuhne övver di Sigg.",
@@ -657,7 +680,7 @@
 	"apihelp-query+querypage-example-ancientpages": "Donn de Äjehbneße vun „<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">[[Special:Ancientpages]]</code>“ ußjävve.",
 	"apihelp-query+random-param-namespace": "Jiff blohß sigge en heh dä Appachtemangs uß.",
 	"apihelp-query+random-param-limit": "Wi vill zohfälleje Sigge sulle ußjejovve wähde?",
-	"apihelp-query+random-param-redirect": "Donn en zohfälleje Ömleijdong anschtatt vun ene zohfälleje Sigg lahde.",
+	"apihelp-query+random-param-redirect": "Nemm <kbd>$1filterredir=redirects</kbd> schtatt dämm.",
 	"apihelp-query+random-example-simple": "Donn zwai zohfälleje Sigge vum Houb_Appachtemang ußjävve.",
 	"apihelp-query+random-example-generator": "Donn Ennfommazjuhne övver zwai zohfälleje Sigge vum Houb_Appachtemang ußjävve.",
 	"apihelp-query+recentchanges-description": "Donn de  neußte Änderonge opleßte.",
@@ -783,6 +806,7 @@
 	"apihelp-query+watchlist-paramvalue-prop-user": "Deiht dä Metmaacher derbei, dä di Änderong jemaat hät.",
 	"apihelp-query+watchlist-paramvalue-prop-userid": "Deiht de kännong vn äm Metmaacher derbei, dä di Änderong jemaat hät.",
 	"apihelp-query+watchlist-paramvalue-prop-timestamp": "Deihd et Dattom un de Uhrzigg vun dä Änderong derbei.",
+	"apihelp-query+watchlist-param-type": "Wat för en Änderonge aanzeije:\n;<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">edit</code>:Jewöhnlejje Änderonge aan Sigge.\n;<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">external</code>:Änderonge vun Ußerhallef.\n;<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">new</code>:Neu aanjelahte Sigge.\n;<code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">log</code>:Enndrähsch em Logbohch.",
 	"apihelp-query+watchlistraw-description": "Donn alle Sigge uß dem aktälle Metmaacher sing Oppaßleß holle.",
 	"apihelp-query+watchlistraw-param-namespace": "Donn blohß Sigge en heh däm Appachtemang opleßte.",
 	"apihelp-query+watchlistraw-example-simple": "Donn alle Sigge uß dem aktälle Metmaacher sing Oppaßleß opleßte.",
@@ -866,7 +890,7 @@
 	"api-help-param-type-boolean": "Zoot: Boolsch ([[Special:ApiHelp/main#main/datatypes|Einjzelheijte]])",
 	"api-help-param-type-timestamp": "Zoot: {{PLURAL:$1|1=en Dattomm un en Zigg|2=en Leß met Aanjahbe us Dattom un Zigg}} (de [[Special:ApiHelp/main#main/datatypes|zohjelohße Fommahte]])",
 	"api-help-param-type-user": "Zoot: {{PLURAL:$1|1=ene Metmaacher_Nahme|2=en Leß met Metmaacher_Nahme}}",
-	"api-help-param-list": "{{PLURAL:$1|1=Eijne Wäät|2=Wääte met <kbd>{{!}}</kbd> derzwesche}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=Eijne Wäät|2=Wääte met <kbd>{{!}}</kbd> derzwesche}} vun dänne heh: $2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=Moß läddesch sin|Kann läddesch sin, udder $2}}",
 	"api-help-param-limit": "Nit mih wi $1 sin zohjelohße.",
 	"api-help-param-limit2": "Nit mih wi $1 sin zohjelohße, ävver $2 för de Bots.",
diff --git a/includes/api/i18n/lb.json b/includes/api/i18n/lb.json
index 5b7b2a1606..d9ea21af6b 100644
--- a/includes/api/i18n/lb.json
+++ b/includes/api/i18n/lb.json
@@ -115,9 +115,11 @@
 	"apihelp-query+usercontribs-description": "All Ännerunge vun engem Benotzer kréien.",
 	"apihelp-query+usercontribs-paramvalue-prop-timestamp": "Setzt den Zäitstempel vun derÄnnerung derbäi.",
 	"apihelp-query+usercontribs-paramvalue-prop-comment": "Setzt d'Bemierkung vun der Ännerung derbäi.",
+	"apihelp-query+userinfo-param-prop": "Informatioune fir dranzesetzen:",
 	"apihelp-query+userinfo-paramvalue-prop-options": "Lëscht vun allen Astellungen déi den aktuelle Benotzer gemaach huet.",
 	"apihelp-query+userinfo-paramvalue-prop-editcount": "Setzt d'Gesamtzuel vun den Ännerunge vum aktuelle Benotzer derbäi.",
 	"apihelp-query+userinfo-paramvalue-prop-realname": "Setzt dem Benotzer säi richtegen Numm derbäi.",
+	"apihelp-query+userinfo-paramvalue-prop-registrationdate": "Setzt de Registréierungsdatum vum Benotzer derbäi.",
 	"apihelp-query+users-paramvalue-prop-rights": "Weist all Rechter déi all Benotzer huet.",
 	"apihelp-query+watchlist-param-user": "Nëmmen Ännerunge vun dësem Benotzer opzielen.",
 	"apihelp-query+watchlist-param-excludeuser": "Ännerunge vun dësem Benotzer net opzielen.",
diff --git a/includes/api/i18n/mr.json b/includes/api/i18n/mr.json
new file mode 100644
index 0000000000..30cf75be1b
--- /dev/null
+++ b/includes/api/i18n/mr.json
@@ -0,0 +1,11 @@
+{
+	"@metadata": {
+		"authors": [
+			"Rahuldeshmukh101"
+		]
+	},
+	"apihelp-main-param-action": "कोणति कारवाई करायचि",
+	"apihelp-main-param-curtimestamp": "निकालात आताच्या वेळेचि नोन्द घ्या",
+	"apihelp-block-description": "सदस्यास ब्यान करा",
+	"apihelp-block-param-user": "सदस्याचे नाव, अंक पत्त्ता अथवा अंकपत्यांनचि मालिका प्रतिबांधित करा"
+}
diff --git a/includes/api/i18n/olo.json b/includes/api/i18n/olo.json
new file mode 100644
index 0000000000..99aef3f6e4
--- /dev/null
+++ b/includes/api/i18n/olo.json
@@ -0,0 +1,12 @@
+{
+	"@metadata": {
+		"authors": [
+			"Mashoi7"
+		]
+	},
+	"apihelp-createaccount-param-name": "Käyttäitunnus.",
+	"apihelp-delete-description": "Ota sivu iäre.",
+	"apihelp-login-param-name": "Käyttäitunnus.",
+	"apihelp-login-param-password": "Peittosana.",
+	"apihelp-login-example-login": "Kirjuttai."
+}
diff --git a/includes/api/i18n/pl.json b/includes/api/i18n/pl.json
index e6aab1eed6..d2ebb3ae05 100644
--- a/includes/api/i18n/pl.json
+++ b/includes/api/i18n/pl.json
@@ -10,7 +10,8 @@
 			"Pio387",
 			"Peter Bowman",
 			"Darellur",
-			"The Polish"
+			"The Polish",
+			"Matma Rex"
 		]
 	},
 	"apihelp-main-param-action": "Wybierz akcję do wykonania.",
@@ -326,11 +327,11 @@
 	"api-help-param-type-boolean": "Typ: wartość logiczna ([[Special:ApiHelp/main#main/datatypes|szczegóły]])",
 	"api-help-param-type-timestamp": "Typ: {{PLURAL:$1|1=znacznik czasu|2=lista znaczników czasu}} ([[Special:ApiHelp/main#main/datatypes|dozwolone formaty]])",
 	"api-help-param-type-user": "Typ: {{PLURAL:$1|1=nazwa użytkownika|2=lista nazw uzytkowników}}",
-	"api-help-param-list": "{{PLURAL:$1|1=Jedna wartość|2=Wartości (oddziel za pomocą <kbd>{{!}}</kbd>)}}: $2",
+	"api-help-param-list": "{{PLURAL:$1|1=Jedna z następujących wartość|2=Wartości (oddziel za pomocą <kbd>{{!}}</kbd>)}}: $2",
 	"api-help-param-limit": "Nie więcej niż $1 dozwolone.",
 	"api-help-param-limit2": "Nie więcej niż $1 ($2 dla botów) dozwolone.",
-	"api-help-param-integer-min": "{{PLURAL:$1|1=Wartość|2=Wartości}} musza być mniejsze niż $2.",
-	"api-help-param-integer-max": "{{PLURAL:$1|1=Wartość musi|2=Wartości muszą}} być nie większa niż $3.",
+	"api-help-param-integer-min": "{{PLURAL:$1|1=Wartość musi być nie mniejsza|2=Wartości muszą być nie mniejsze}} niż $2.",
+	"api-help-param-integer-max": "{{PLURAL:$1|1=Wartość musi być nie większa|2=Wartości muszą być nie większe}} niż $3.",
 	"api-help-param-integer-minmax": "{{PLURAL:$1|1=Wartość musi|2=Wartości muszą}} być pomiędzy $2 a $3.",
 	"api-help-param-multi-separate": "Oddziel wartości za pomocą <kbd>|</kbd>.",
 	"api-help-param-multi-max": "Maksymalna liczba wartości to {{PLURAL:$1|$1}} ({{PLURAL:$2|$2}} dla botów).",
diff --git a/includes/api/i18n/ps.json b/includes/api/i18n/ps.json
index 49df26b8e9..9d24281732 100644
--- a/includes/api/i18n/ps.json
+++ b/includes/api/i18n/ps.json
@@ -9,10 +9,19 @@
 	"apihelp-block-param-reason": "د بنديز سبب.",
 	"apihelp-createaccount-param-name": "کارن-نوم.",
 	"apihelp-delete-description": "يو مخ ړنگول.",
+	"apihelp-edit-description": "مخونه جوړول او سمول.",
 	"apihelp-edit-param-text": "مخ مېنځپانگه.",
+	"apihelp-edit-param-minor": "وړوکی سمون.",
 	"apihelp-edit-example-edit": "يو مخ سمول.",
 	"apihelp-emailuser-description": "کارن ته برېښليک لېږل.",
 	"apihelp-expandtemplates-param-title": "د مخ سرليک.",
+	"apihelp-feedrecentchanges-param-hideminor": "وړوکي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-hidebots": "د روباټونو لخوا ترسره شوي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-hideanons": "د ورکنومو کارنانو لخوا ترسره شوي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-hideliu": "د ثبت شويو کارنانو لخوا ترسره شوي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-hidepatrolled": "څارل شوي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-hidemyself": "د اوسني کارن لخوا ترسره شوي بدلونونه پټول.",
+	"apihelp-feedrecentchanges-param-tagfilter": "د نښلن له مخې چاڼول.",
 	"apihelp-login-param-name": "کارن نوم.",
 	"apihelp-login-param-password": "پټنوم.",
 	"apihelp-login-param-domain": "شپول (اختياري).",
@@ -20,11 +29,14 @@
 	"apihelp-move-description": "يو مخ لېږدول.",
 	"apihelp-query+search-example-simple": "د <kbd>مانا</kbd> پلټل.",
 	"apihelp-query+search-example-text": "د <kbd>مانا</kbd> لپاره متنونه پلټل.",
+	"apihelp-query+watchlist-paramvalue-prop-title": "د يو مخ سرليک ورگډوي.",
 	"apihelp-tag-param-reason": "د بدلون سبب.",
+	"apihelp-unblock-param-reason": "د بنديز ليرې کولو سبب.",
 	"apihelp-upload-param-watch": "مخ کتل.",
 	"apihelp-upload-param-file": "د دوتنې مېنځپانگه.",
 	"apihelp-userrights-param-user": "کارن نوم.",
 	"apihelp-userrights-param-userid": "کارن پېژند.",
+	"apihelp-userrights-param-reason": "د بدلون سبب.",
 	"api-help-source": "سرچينه: $1",
 	"api-help-source-unknown": "سرچينه: <span class=\"apihelp-unknown\">ناجوت</span>",
 	"api-help-license": "منښتليک: [[$1|$2]]",
diff --git a/includes/api/i18n/pt-br.json b/includes/api/i18n/pt-br.json
index a476b7aa63..9c1c623c72 100644
--- a/includes/api/i18n/pt-br.json
+++ b/includes/api/i18n/pt-br.json
@@ -2,7 +2,8 @@
 	"@metadata": {
 		"authors": [
 			"Fasouzafreitas",
-			"Dianakc"
+			"Dianakc",
+			"Cainamarques"
 		]
 	},
 	"apihelp-main-param-action": "Qual ação executar.",
@@ -148,7 +149,7 @@
 	"apihelp-parse-paramvalue-prop-sections": "Fornece as seções no wikitexto analisado.",
 	"apihelp-parse-paramvalue-prop-headitems": "Fornece itens para colocar no <code>&lt;head&gt;</code> da página.",
 	"apihelp-parse-paramvalue-prop-headhtml": "Fornece <code>&lt;head&gt;</code> analisado da página.",
-	"apihelp-parse-paramvalue-prop-modules": "Fornece os módulos ResourceLoader usados na página.",
+	"apihelp-parse-paramvalue-prop-modules": "Fornece os módulos do ResourceLoader usados na página. Ou <kbd>jsconfigvars</kbd> ou <kbd>encodedjsconfigvars</kbd> deve ser solicitado conjuntamente com <kbd>modules</kbd>.",
 	"apihelp-parse-paramvalue-prop-jsconfigvars": "Fornece as variáveis de configuração JavaScript específicas da página.",
 	"apihelp-parse-paramvalue-prop-encodedjsconfigvars": "Fornece as variáveis de configuração JavaScript específicas da página como uma string JSON.",
 	"apihelp-parse-paramvalue-prop-indicators": "Fornece o HTML de indicadores de ''status'' de página utilizados na página.",
@@ -262,7 +263,7 @@
 	"apihelp-query+imageusage-param-namespace": "O espaço nominal a se enumerar.",
 	"apihelp-query+info-paramvalue-prop-readable": "Se o usuário pode ler esta página.",
 	"apihelp-query+info-paramvalue-prop-preload": "Fornece o texto retornado por EditFormPreloadText.",
-	"apihelp-query+info-paramvalue-prop-displaytitle": "Fornece a forma como o título da página é exibido atualmente.",
+	"apihelp-query+info-paramvalue-prop-displaytitle": "Fornece o modo como o título da página é exibido.",
 	"apihelp-query+info-param-testactions": "Testa se o usuário atual pode executar determinadas ações na página.",
 	"apihelp-query+info-example-simple": "Obtém informações sobre a página <kbd>Página principal</kbd>.",
 	"apihelp-query+iwbacklinks-description": "Encontra todas as páginas que apontam para o determinado link interwiki.\n\nPode ser usado para encontrar todos os links com um prefixo, ou todos os links para um título (com um determinado prefixo). Usar nenhum parâmetro é efetivamente \"todos os links interwiki\".",
diff --git a/includes/api/i18n/pt.json b/includes/api/i18n/pt.json
index 4325c14457..9df9dc2f5c 100644
--- a/includes/api/i18n/pt.json
+++ b/includes/api/i18n/pt.json
@@ -18,8 +18,8 @@
 	"apihelp-createaccount-param-email": "Endereço de correio eletrónico do utilizador (opcional).",
 	"apihelp-createaccount-param-realname": "Nome verdadeiro do utilizador (opcional).",
 	"apihelp-delete-description": "Eliminar uma página.",
-	"apihelp-delete-param-watch": "Adicionar esta página à lista de vigiadas.",
-	"apihelp-delete-param-unwatch": "Remover esta página da lista de vigiadas.",
+	"apihelp-delete-param-watch": "Adicionar a página à lista de vigiadas do utilizador atual.",
+	"apihelp-delete-param-unwatch": "Remover a página da lista de vigiadas do utilizador atual.",
 	"apihelp-delete-example-simple": "Eliminar <kbd>Página Principal</kbd>.",
 	"apihelp-disabled-description": "O módulo foi desativado.",
 	"apihelp-edit-description": "Criar e editar páginas.",
@@ -41,7 +41,7 @@
 	"apihelp-feedrecentchanges-param-hideminor": "Ocultar edições menores.",
 	"apihelp-feedrecentchanges-param-hidebots": "Ocultar alterações feitas por robôs.",
 	"apihelp-feedrecentchanges-param-hidepatrolled": "Ocultar alterações patrulhadas.",
-	"apihelp-feedrecentchanges-param-hidemyself": "Ocultar alterações feitas por mim.",
+	"apihelp-feedrecentchanges-param-hidemyself": "Ocultar alterações feitas pelo utilizador atual.",
 	"apihelp-feedrecentchanges-param-target": "Mostrar apenas mudanças em páginas afluentes a esta.",
 	"apihelp-feedrecentchanges-example-simple": "Mostrar mudanças recentes",
 	"apihelp-help-example-main": "Ajuda para o módulo principal",
@@ -96,6 +96,7 @@
 	"api-help-param-deprecated": "Obsoleto.",
 	"api-help-param-required": "Este parâmetro é obrigatório.",
 	"api-help-datatypes-header": "Tipo de dados",
+	"api-help-param-list": "{{PLURAL:$1|1=Um dos seguintes valores|2=Valores (separar com <kbd>{{!}}</kbd>)}}: $2",
 	"api-help-param-multi-separate": "Separe os valores com <kbd>|</kbd>.",
 	"api-help-param-default": "Padrão: $1",
 	"api-help-param-default-empty": "Padrão: <span class=\"apihelp-empty\">(vazio)</span>",
diff --git a/includes/api/i18n/qqq.json b/includes/api/i18n/qqq.json
index 921cc581d4..f39f5d0aa4 100644
--- a/includes/api/i18n/qqq.json
+++ b/includes/api/i18n/qqq.json
@@ -10,7 +10,8 @@
 			"Anomie",
 			"Nemo bis",
 			"Amire80",
-			"Siebrand"
+			"Siebrand",
+			"Purodha"
 		]
 	},
 	"apihelp-main-description": "{{doc-apihelp-description|main}}",
@@ -676,10 +677,10 @@
 	"apihelp-query+imageinfo-param-prop": "{{doc-apihelp-param|query+imageinfo|prop|paramvalues=1}}",
 	"apihelp-query+imageinfo-paramvalue-prop-timestamp": "{{doc-apihelp-paramvalue|query+imageinfo|prop|timestamp}}",
 	"apihelp-query+imageinfo-paramvalue-prop-user": "{{doc-apihelp-paramvalue|query+imageinfo|prop|user}}",
-	"apihelp-query+imageinfo-paramvalue-prop-userid": "{{doc-apihelp-paramvalue|query+imageinfo|prop|userid}}",
+	"apihelp-query+imageinfo-paramvalue-prop-userid": "Imageinfo returns information about file revisions (normally the last revision since <code>iilimit</code> defaults to 1). <code>userid</code> includes the ID of the user who made the (re)upload which created that revision. So there will be one user ID per imageinfo item; if you set the limit high enough, you will get all revisions of all files as separate imageinfo items.\n\n{{doc-apihelp-paramvalue|query+imageinfo|prop|userid}}",
 	"apihelp-query+imageinfo-paramvalue-prop-comment": "{{doc-apihelp-paramvalue|query+imageinfo|prop|comment}}",
 	"apihelp-query+imageinfo-paramvalue-prop-parsedcomment": "{{doc-apihelp-paramvalue|query+imageinfo|prop|parsedcomment}}",
-	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "{{doc-apihelp-paramvalue|query+imageinfo|prop|canonicaltitle}}",
+	"apihelp-query+imageinfo-paramvalue-prop-canonicaltitle": "A canonocal title is aa title formatted in the same way you would see it on the top of the page (localized namespace name, first letters capitalized, spaces instead of underscores). \n{{doc-apihelp-paramvalue|query+imageinfo|prop|canonicaltitle}}",
 	"apihelp-query+imageinfo-paramvalue-prop-url": "{{doc-apihelp-paramvalue|query+imageinfo|prop|url}}",
 	"apihelp-query+imageinfo-paramvalue-prop-size": "{{doc-apihelp-paramvalue|query+imageinfo|prop|size}}",
 	"apihelp-query+imageinfo-paramvalue-prop-dimensions": "{{doc-apihelp-paramvalue|query+imageinfo|prop|dimensions}}",
@@ -866,6 +867,7 @@
 	"apihelp-query+random-param-namespace": "{{doc-apihelp-param|query+random|namespace}}",
 	"apihelp-query+random-param-limit": "{{doc-apihelp-param|query+random|limit}}",
 	"apihelp-query+random-param-redirect": "{{doc-apihelp-param|query+random|redirect}}",
+	"apihelp-query+random-param-filterredir": "{{apihelp-param|query+random|filterredir}}",
 	"apihelp-query+random-example-simple": "{{doc-apihelp-example|query+random}}",
 	"apihelp-query+random-example-generator": "{{doc-apihelp-example|query+random}}",
 	"apihelp-query+recentchanges-description": "{{doc-apihelp-description|query+recentchanges}}",
diff --git a/includes/api/i18n/ru.json b/includes/api/i18n/ru.json
index 0b8804b89b..56b3f5b474 100644
--- a/includes/api/i18n/ru.json
+++ b/includes/api/i18n/ru.json
@@ -15,8 +15,8 @@
 	"apihelp-main-description": "<div class=\"hlist plainlinks api-main-links\">\n* [[mw:API:Main_page|Документация]]\n* [[mw:API:FAQ|ЧаВО]]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api Почтовая рассылка]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-api-announce Новости API]\n* [https://phabricator.wikimedia.org/maniphest/query/GebfyV4uCaLd/#R Ошибки и запросы]\n</div>\n<strong>Статус:</strong> Все отображаемые на этой странице функции должны работать, однако API находится в статусе активной разработки, и может измениться в любой момент. Подпишитесь на  [https://lists.wikimedia.org/pipermail/mediawiki-api-announce/ почтовую рассылку mediawiki-api-announce], чтобы быть в курсе обновлений.\n\n<strong>Ошибочные запросы:</strong> Если API получает запрос с ошибкой, вернётся заголовок HTTP с ключом \"MediaWiki-API-Error\", после чего значение заголовка и код ошибки будут отправлены обратно и установлены в то же значение. Более подробную информацию см. [[mw:API:Errors_and_warnings|API: Ошибки и предупреждения]].",
 	"apihelp-main-param-action": "Действие, которое следует выполнить.",
 	"apihelp-main-param-format": "Формат вывода.",
-	"apihelp-main-param-smaxage": "Устанавливает заголовок <code>s-maxage</code> в заданное число секунд. Ошибки никогда не кэшируются.",
-	"apihelp-main-param-maxage": "Устанавливает заголовок <code>max-age</code> в заданное число секунд. Ошибки никогда не кэшируются.",
+	"apihelp-main-param-smaxage": "Устанавливает значение HTTP-заголовка Cache-Control <code>s-maxage</code> в заданное число секунд. Ошибки никогда не кэшируются.",
+	"apihelp-main-param-maxage": "Устанавливает значение HTTP-заголовка Cache-Control <code>s-maxage</code> в заданное число секунд. Ошибки никогда не кэшируются.",
 	"apihelp-main-param-assert": "Удостовериться, что пользователь авторизован, если задано <kbd>user</kbd>, или что имеет права бота, если задано <kbd>bot</kbd>.",
 	"apihelp-main-param-requestid": "Любое заданное здесь значение будет включено в ответ. Может быть использовано для различения запросов.",
 	"apihelp-main-param-servedby": "Включить в результаты имя хоста, обработавшего запрос.",
diff --git a/includes/api/i18n/sq.json b/includes/api/i18n/sq.json
new file mode 100644
index 0000000000..34d55afd73
--- /dev/null
+++ b/includes/api/i18n/sq.json
@@ -0,0 +1,12 @@
+{
+	"@metadata": {
+		"authors": [
+			"Ammartivari"
+		]
+	},
+	"apihelp-block-param-reason": "Arsyeja për bllokim.",
+	"apihelp-move-param-reason": "Arsyeja për riemërtim.",
+	"apihelp-tag-param-reason": "Arsyeja për ndërrimin.",
+	"apihelp-unblock-description": "Zhblloko një përdorues.",
+	"apihelp-userrights-description": "Ndërro anëtarësinë e grupit e një përdoruesit."
+}
diff --git a/includes/api/i18n/zh-hans.json b/includes/api/i18n/zh-hans.json
index 9458fb2e5b..dd3fb8f3ff 100644
--- a/includes/api/i18n/zh-hans.json
+++ b/includes/api/i18n/zh-hans.json
@@ -251,7 +251,7 @@
 	"apihelp-options-example-reset": "重置所有用户设置。",
 	"apihelp-options-example-change": "更改<kbd>skin</kbd>和<kbd>hideminor</kbd>设置。",
 	"apihelp-options-example-complex": "重置所有设置，然后设置<kbd>skin</kbd>和<kbd>nickname</kbd>。",
-	"apihelp-paraminfo-description": "获取关于 API 模块的信息。",
+	"apihelp-paraminfo-description": "获得关于API模块的信息。",
 	"apihelp-paraminfo-param-modules": "模块名称（<var>action</var>和<var>format</var>参数值，或<kbd>main</kbd>）的列表。可通过<kbd>+</kbd>指定子模块。",
 	"apihelp-paraminfo-param-helpformat": "帮助字符串的格式。",
 	"apihelp-paraminfo-param-querymodules": "查询模块名称（<var>prop</var>、<var>meta</var>或<var>list</var>参数值）的列表。使用<kbd>$1modules=query+foo</kbd>而不是<kbd>$1querymodules=foo</kbd>。",
@@ -287,6 +287,7 @@
 	"apihelp-parse-paramvalue-prop-indicators": "提供页面上使用的页面状态指示器的HTML。",
 	"apihelp-parse-paramvalue-prop-iwlinks": "在被解析的wiki文本中提供跨wiki链接。",
 	"apihelp-parse-paramvalue-prop-wikitext": "提供被解析的原始wiki文本。",
+	"apihelp-parse-paramvalue-prop-properties": "提供多种定义在被解析的wiki文本中的属性。",
 	"apihelp-parse-paramvalue-prop-limitreportdata": "以结构化的方式提供限制报告。如果<var>$1disablelimitreport</var>被设定则不提供数据。",
 	"apihelp-parse-paramvalue-prop-limitreporthtml": "提供限制报告的HTML版本。当<var>$1disablelimitreport</var>被设置时不会提供数据。",
 	"apihelp-parse-paramvalue-prop-parsetree": "修订内容的XML解析树（需要内容模型<code>$1</code>）",
@@ -414,6 +415,7 @@
 	"apihelp-query+alllinks-param-namespace": "要列举的名字空间。",
 	"apihelp-query+alllinks-param-limit": "总共要返回多少个项目。",
 	"apihelp-query+alllinks-param-dir": "列出方向。",
+	"apihelp-query+alllinks-example-B": "列出链接的标题，包括丢失的，带它们来自的页面ID，以<kbd>B</kbd>开头。",
 	"apihelp-query+alllinks-example-unique": "列出唯一的链接标题。",
 	"apihelp-query+alllinks-example-unique-generator": "获取所有已链接的标题，标记缺少的。",
 	"apihelp-query+alllinks-example-generator": "获取包含这些链接的页面。",
@@ -450,6 +452,7 @@
 	"apihelp-query+allredirects-param-from": "要列举的起始重定向标题。",
 	"apihelp-query+allredirects-param-to": "要列举的最终重定向标题。",
 	"apihelp-query+allredirects-param-prefix": "搜索所有以此值开头的目标页面。",
+	"apihelp-query+allredirects-param-unique": "只显示明显的目标页面。不能与$1prop=ids|fragment|interwiki一起使用。\n当作为生成器使用时，产生目标页面而不是来源页面。",
 	"apihelp-query+allredirects-param-prop": "要包含的信息束：",
 	"apihelp-query+allredirects-paramvalue-prop-ids": "添加重定向页面的页面ID（不能与<var>$1unique</var>一起使用）。",
 	"apihelp-query+allredirects-paramvalue-prop-title": "添加重定向的标题。",
@@ -465,6 +468,7 @@
 	"apihelp-query+alltransclusions-param-from": "要列举的起始嵌入标题。",
 	"apihelp-query+alltransclusions-param-to": "要列举的最终嵌入标题。",
 	"apihelp-query+alltransclusions-param-prefix": "搜索所有以此值开头的嵌入的标题。",
+	"apihelp-query+alltransclusions-param-unique": "只显示明显的被嵌入标题。不能与$1prop=ids一起使用。\n当作为生成器使用时，产生目标页面而不是来源页面。",
 	"apihelp-query+alltransclusions-param-prop": "要包含的信息束：",
 	"apihelp-query+alltransclusions-paramvalue-prop-ids": "添加嵌入中的页面的页面ID（不能与$1unique一起使用）。",
 	"apihelp-query+alltransclusions-paramvalue-prop-title": "添加嵌入的标题。",
@@ -705,6 +709,7 @@
 	"apihelp-query+info-paramvalue-prop-watchers": "监视人员数，如果允许。",
 	"apihelp-query+info-paramvalue-prop-notificationtimestamp": "每个页面的监视列表通知时间戳。",
 	"apihelp-query+info-paramvalue-prop-subjectid": "每个讨论页的母页面的页面ID。",
+	"apihelp-query+info-paramvalue-prop-url": "为每个页面提供一个完整URL、一个编辑URL和规范URL。",
 	"apihelp-query+info-paramvalue-prop-readable": "用户是否可以阅读此页面。",
 	"apihelp-query+info-paramvalue-prop-preload": "提供由EditFormPreloadText返回的文本。",
 	"apihelp-query+info-paramvalue-prop-displaytitle": "在页面标题实际显示的地方提供方式。",
@@ -782,7 +787,7 @@
 	"apihelp-query+logevents-paramvalue-prop-details": "列举有关日志事件的额外详细信息。",
 	"apihelp-query+logevents-paramvalue-prop-tags": "列举用于日志活动的标签。",
 	"apihelp-query+logevents-param-type": "过滤日志记录至仅限此类型。",
-	"apihelp-query+logevents-param-action": "过滤日志操作为仅限此操作。覆盖<var>$1type</var>。类似<kbd>action/*</kbd>的通配符操作允许指定用于星号的任意字符串。",
+	"apihelp-query+logevents-param-action": "过滤日志操作为仅限此操作。覆盖<var>$1type</var>。在可用值列表中，带星号通配符的值例如<kbd>action/*</kbd>可在斜线（/）后拥有不同字符串。",
 	"apihelp-query+logevents-param-start": "枚举的起始时间戳。",
 	"apihelp-query+logevents-param-end": "枚举的结束时间戳。",
 	"apihelp-query+logevents-param-user": "过滤记录为这些由指定用户做出的。",
@@ -829,10 +834,11 @@
 	"apihelp-query+protectedtitles-example-generator": "找到主命名空间中已保护的标题的链接。",
 	"apihelp-query+querypage-param-limit": "返回的结果数。",
 	"apihelp-query+querypage-example-ancientpages": "返回[[Special:Ancientpages]]的结果。",
-	"apihelp-query+random-description": "获取一组随机页面。\n\n页面列举在一个固定序列中，只有起始点是随机的。这意味着如果<samp>Main Page</samp>是列表中第一个随机页面的话，<samp>List of fictional monkeys</samp>将<em>总是</em>第二个，<samp>List of people on stamps of Vanuatu</samp>是第三个等。\n\n如果名字空间中的页面数低于<var>$1limit</var>，将只会返回少量的页面。同一页面不会返回两次。",
+	"apihelp-query+random-description": "获取一组随机页面。\n\n页面列举在一个固定序列中，只有起始点是随机的。这意味着如果<samp>Main Page</samp>是列表中第一个随机页面的话，<samp>List of fictional monkeys</samp>将<em>总是</em>第二个，<samp>List of people on stamps of Vanuatu</samp>是第三个等。",
 	"apihelp-query+random-param-namespace": "只返回这些名字空间的页面。",
 	"apihelp-query+random-param-limit": "限制返回多少随机页面。",
-	"apihelp-query+random-param-redirect": "加载一个随机重定向而不是一个随机页面。",
+	"apihelp-query+random-param-redirect": "请改用<kbd>$1filterredir=redirects</kbd>。",
+	"apihelp-query+random-param-filterredir": "如何过滤重定向。",
 	"apihelp-query+random-example-simple": "从主名字空间返回两个随机页面。",
 	"apihelp-query+random-example-generator": "返回有关来自主名字空间的两个随机页面的页面信息。",
 	"apihelp-query+recentchanges-description": "枚举最近更改。",
@@ -1124,6 +1130,7 @@
 	"apihelp-undelete-description": "恢复一个被删除页面的修订。\n\n被删除修订的列表（包括时间戳）可通过[[Special:ApiHelp/query+deletedrevs|list=deletedrevs]]检索到，并且被删除的文件ID列表可通过[[Special:ApiHelp/query+filearchive|list=filearchive]]检索到。",
 	"apihelp-undelete-param-title": "要恢复的页面标题。",
 	"apihelp-undelete-param-reason": "恢复的原因。",
+	"apihelp-undelete-param-timestamps": "要回复的修订的时间戳。如果<var>$1timestamps</var>和<var>$1fileids</var>都为空，所有将被恢复。",
 	"apihelp-undelete-param-fileids": "要恢复的文件修订ID。如果<var>$1timestamps</var>和<var>$1fileids</var>都为空，所有将被恢复。",
 	"apihelp-undelete-example-page": "恢复页面<kbd>Main Page</kbd>。",
 	"apihelp-undelete-example-revisions": "恢复<kbd>Main Page</kbd>的两个修订。",
@@ -1152,6 +1159,7 @@
 	"apihelp-userrights-example-userid": "将ID为<kbd>123</kbd>的用户加入至<kbd>机器人</kbd>组，并将其从<kbd>管理员</kbd>和<kbd>行政员</kbd>组移除。",
 	"apihelp-watch-description": "从当前用户的监视列表中添加或移除页面。",
 	"apihelp-watch-param-title": "要（取消）监视的页面。也可使用<var>$1titles</var>。",
+	"apihelp-watch-param-unwatch": "如果设置页面将被取消监视而不是被监视。",
 	"apihelp-watch-example-watch": "监视页面<kbd>Main Page</kbd>。",
 	"apihelp-watch-example-unwatch": "取消监视页面<kbd>Main Page</kbd>。",
 	"apihelp-watch-example-generator": "监视主名字空间中的最少几个页面。",
@@ -1213,7 +1221,7 @@
 	"api-help-param-type-boolean": "类型：布尔值（[[Special:ApiHelp/main#main/datatypes|详细信息]]）",
 	"api-help-param-type-timestamp": "类型：{{PLURAL:$1|1=时间戳|2=时间戳列表}}（[[Special:ApiHelp/main#main/datatypes|允许格式]]）",
 	"api-help-param-type-user": "类型：{{PLURAL:$1|1=用户名|2=用户名列表}}",
-	"api-help-param-list": "{{PLURAL:$1|1=一个值|2=值（以<kbd>{{!}}</kbd>分隔）}}：$2",
+	"api-help-param-list": "{{PLURAL:$1|1=以下值中的一个|2=值（以<kbd>{{!}}</kbd>分隔）}}：$2",
 	"api-help-param-list-can-be-empty": "{{PLURAL:$1|0=必须为空|可以为空，或$2}}",
 	"api-help-param-limit": "不允许超过$1。",
 	"api-help-param-limit2": "不允许超过$1个（对于机器人则是$2个）。",
diff --git a/includes/cache/MessageCache.php b/includes/cache/MessageCache.php
index e69392202c..f22c860afa 100644
--- a/includes/cache/MessageCache.php
+++ b/includes/cache/MessageCache.php
@@ -27,12 +27,6 @@
  */
 define( 'MSG_CACHE_VERSION', 2 );
 
-/**
- * Memcached timeout when loading a key.
- * See MessageCache::load()
- */
-define( 'MSG_LOAD_TIMEOUT', 60 );
-
 /**
  * Message cache
  * Performs various MediaWiki namespace-related functions
@@ -41,9 +35,9 @@ define( 'MSG_LOAD_TIMEOUT', 60 );
 class MessageCache {
 	const FOR_UPDATE = 1; // force message reload
 
-	/** How long memcached locks last */
-	const WAIT_SEC = 30;
 	/** How long to wait for memcached locks */
+	const WAIT_SEC = 15;
+	/** How long memcached locks last */
 	const LOCK_TTL = 30;
 
 	/**
@@ -283,7 +277,7 @@ class MessageCache {
 			# Try the global cache. If it is empty, try to acquire a lock. If
 			# the lock can't be acquired, wait for the other thread to finish
 			# and then try the global cache a second time.
-			for ( $failedAttempts = 0; $failedAttempts < 2; $failedAttempts++ ) {
+			for ( $failedAttempts = 0; $failedAttempts <= 1; $failedAttempts++ ) {
 				if ( $hashVolatile && $staleCache ) {
 					# Do not bother fetching the whole cache blob to avoid I/O.
 					# Instead, just try to get the non-blocking $statusKey lock
@@ -317,8 +311,9 @@ class MessageCache {
 
 				# We need to call loadFromDB. Limit the concurrency to one process.
 				# This prevents the site from going down when the cache expires.
-				# Note that the slam-protection lock here is non-blocking.
-				if ( $this->loadFromDBWithLock( $code, $where ) ) {
+				# Note that the DB slam protection lock here is non-blocking.
+				$loadStatus = $this->loadFromDBWithLock( $code, $where, $mode );
+				if ( $loadStatus === true ) {
 					$success = true;
 					break;
 				} elseif ( $staleCache ) {
@@ -328,23 +323,19 @@ class MessageCache {
 					$success = true;
 					break;
 				} elseif ( $failedAttempts > 0 ) {
-					# Already retried once, still failed, so don't do another lock/unlock cycle
+					# Already blocked once, so avoid another lock/unlock cycle.
 					# This case will typically be hit if memcached is down, or if
-					# loadFromDB() takes longer than MSG_WAIT_TIMEOUT
+					# loadFromDB() takes longer than LOCK_WAIT.
 					$where[] = "could not acquire status key.";
 					break;
+				} elseif ( $loadStatus === 'cantacquire' ) {
+					# Wait for the other thread to finish, then retry. Normally,
+					# the memcached get() will then yeild the other thread's result.
+					$where[] = 'waited for other thread to complete';
+					$this->getReentrantScopedLock( $cacheKey );
 				} else {
-					$statusKey = wfMemcKey( 'messages', $code, 'status' );
-					$status = $this->mMemc->get( $statusKey );
-					if ( $status === 'error' ) {
-						# Disable cache
-						break;
-					} else {
-						# Wait for the other thread to finish, then retry. Normally,
-						# the memcached get() will then yeild the other thread's result.
-						$where[] = 'waited for other thread to complete';
-						$this->getReentrantScopedLock( $cacheKey );
-					}
+					# Disable cache; $loadStatus is 'disabled'
+					break;
 				}
 			}
 		}
@@ -369,47 +360,39 @@ class MessageCache {
 	/**
 	 * @param string $code
 	 * @param array $where List of wfDebug() comments
-	 * @return bool Lock acquired and loadFromDB() called
+	 * @param integer $mode Use MessageCache::FOR_UPDATE to use DB_MASTER
+	 * @return bool|string True on success or one of ("cantacquire", "disabled")
 	 */
-	protected function loadFromDBWithLock( $code, array &$where ) {
+	protected function loadFromDBWithLock( $code, array &$where, $mode = null ) {
 		global $wgUseLocalMessageCache;
 
-		$memCache = $this->mMemc;
-
-		# Get the non-blocking status key lock. This lets the caller quickly know
-		# to use any stale cache lying around. Otherwise, it may do a blocking
-		# lock to try to obtain the messages.
+		# If cache updates on all levels fail, give up on message overrides.
+		# This is to avoid easy site outages; see $saveSuccess comments below.
 		$statusKey = wfMemcKey( 'messages', $code, 'status' );
-		if ( !$memCache->add( $statusKey, 'loading', MSG_LOAD_TIMEOUT ) ) {
-			return false; // could not acquire lock
+		$status = $this->mMemc->get( $statusKey );
+		if ( $status === 'error' ) {
+			$where[] = "could not load; method is still globally disabled";
+			return 'disabled';
 		}
 
-		# Unlock the status key if there is an exception
-		$statusUnlocker = new ScopedCallback( function () use ( $memCache, $statusKey ) {
-			$memCache->delete( $statusKey );
-		} );
-
 		# Now let's regenerate
 		$where[] = 'loading from database';
 
+		# Lock the cache to prevent conflicting writes.
+		# This lock is non-blocking so stale cache can quickly be used.
+		# Note that load() will call a blocking getReentrantScopedLock()
+		# after this if it really need to wait for any current thread.
 		$cacheKey = wfMemcKey( 'messages', $code );
-		# Lock the cache to prevent conflicting writes
-		# If this lock fails, it doesn't really matter, it just means the
-		# write is potentially non-atomic, e.g. the results of a replace()
-		# may be discarded.
-		$mainUnlocker = $this->getReentrantScopedLock( $cacheKey );
-		if ( !$mainUnlocker ) {
+		$scopedLock = $this->getReentrantScopedLock( $cacheKey, 0 );
+		if ( !$scopedLock ) {
 			$where[] = 'could not acquire main lock';
+			return 'cantacquire';
 		}
 
-		$cache = $this->loadFromDB( $code );
+		$cache = $this->loadFromDB( $code, $mode );
 		$this->mCache[$code] = $cache;
 		$saveSuccess = $this->saveToCaches( $cache, 'all', $code );
 
-		# Unlock
-		ScopedCallback::consume( $mainUnlocker );
-		ScopedCallback::consume( $statusUnlocker );
-
 		if ( !$saveSuccess ) {
 			# Cache save has failed.
 			# There are two main scenarios where this could be a problem:
@@ -427,7 +410,7 @@ class MessageCache {
 			# overhead on every request, and thus saves the wiki from
 			# complete downtime under moderate traffic conditions.
 			if ( !$wgUseLocalMessageCache ) {
-				$memCache->set( $statusKey, 'error', 60 * 5 );
+				$this->mMemc->set( $statusKey, 'error', 60 * 5 );
 				$where[] = 'could not save cache, disabled globally for 5 minutes';
 			} else {
 				$where[] = "could not save global cache";
@@ -442,13 +425,15 @@ class MessageCache {
 	 * $wgMaxMsgCacheEntrySize are assigned a special value, and are loaded
 	 * on-demand from the database later.
 	 *
-	 * @param string $code Language code.
-	 * @return array Loaded messages for storing in caches.
+	 * @param string $code Language code
+	 * @param integer $mode Use MessageCache::FOR_UPDATE to skip process cache
+	 * @return array Loaded messages for storing in caches
 	 */
-	function loadFromDB( $code ) {
+	function loadFromDB( $code, $mode = null ) {
 		global $wgMaxMsgCacheEntrySize, $wgLanguageCode, $wgAdaptiveMessageCache;
 
-		$dbr = wfGetDB( DB_SLAVE );
+		$dbr = wfGetDB( ( $mode == self::FOR_UPDATE ) ? DB_MASTER : DB_SLAVE );
+
 		$cache = array();
 
 		# Common conditions
@@ -529,7 +514,7 @@ class MessageCache {
 	/**
 	 * Updates cache as necessary when message page is changed
 	 *
-	 * @param string $title Name of the page changed.
+	 * @param string|bool $title Name of the page changed (false if deleted)
 	 * @param mixed $text New contents of the page.
 	 */
 	public function replace( $title, $text ) {
@@ -541,27 +526,26 @@ class MessageCache {
 
 		list( $msg, $code ) = $this->figureMessage( $title );
 		if ( strpos( $title, '/' ) !== false && $code === $wgLanguageCode ) {
-			# Content language overrides do not use the /<code> suffix
+			// Content language overrides do not use the /<code> suffix
 			return;
 		}
 
-		# Note that if the cache is volatile, load() may trigger a DB fetch.
-		# In that case we reenter/reuse the existing cache key lock to avoid
-		# a self-deadlock. This is safe as no reads happen *directly* in this
-		# method between getReentrantScopedLock() and load() below. There is
-		# no risk of data "changing under our feet" for replace().
+		// Note that if the cache is volatile, load() may trigger a DB fetch.
+		// In that case we reenter/reuse the existing cache key lock to avoid
+		// a self-deadlock. This is safe as no reads happen *directly* in this
+		// method between getReentrantScopedLock() and load() below. There is
+		// no risk of data "changing under our feet" for replace().
 		$cacheKey = wfMemcKey( 'messages', $code );
 		$scopedLock = $this->getReentrantScopedLock( $cacheKey );
 		$this->load( $code, self::FOR_UPDATE );
 
 		$titleKey = wfMemcKey( 'messages', 'individual', $title );
-
 		if ( $text === false ) {
-			# Article was deleted
+			// Article was deleted
 			$this->mCache[$code][$title] = '!NONEXISTENT';
 			$this->wanCache->delete( $titleKey );
 		} elseif ( strlen( $text ) > $wgMaxMsgCacheEntrySize ) {
-			# Check for size
+			// Check for size
 			$this->mCache[$code][$title] = '!TOO BIG';
 			$this->wanCache->set( $titleKey, ' ' . $text, $this->mExpiry );
 		} else {
@@ -569,9 +553,17 @@ class MessageCache {
 			$this->wanCache->delete( $titleKey );
 		}
 
-		# Update caches
-		$this->saveToCaches( $this->mCache[$code], 'all', $code );
+		// Mark this cache as definitely "latest" (non-volatile) so
+		// load() calls do try to refresh the cache with slave data
+		$this->mCache[$code]['LATEST'] = time();
+
+		// Update caches if the lock was acquired
+		if ( $scopedLock ) {
+			$this->saveToCaches( $this->mCache[$code], 'all', $code );
+		}
+
 		ScopedCallback::consume( $scopedLock );
+		// Relay the purge to APC and other DCs
 		$this->wanCache->touchCheckKey( wfMemcKey( 'messages', $code ) );
 
 		// Also delete cached sidebar... just in case it is affected
@@ -623,7 +615,7 @@ class MessageCache {
 	 * @param string|bool $code Language code (default: false)
 	 * @return bool
 	 */
-	protected function saveToCaches( $cache, $dest, $code = false ) {
+	protected function saveToCaches( array $cache, $dest, $code = false ) {
 		if ( $dest === 'all' ) {
 			$cacheKey = wfMemcKey( 'messages', $code );
 			$success = $this->mMemc->set( $cacheKey, $cache );
@@ -631,16 +623,14 @@ class MessageCache {
 			$success = true;
 		}
 
-		$this->setValidationHash( $code, $cache['HASH'] );
-
-		# Save to local cache
+		$this->setValidationHash( $code, $cache );
 		$this->saveToLocalCache( $code, $cache );
 
 		return $success;
 	}
 
 	/**
-	 * Get the md5 used to validate the local disk cache
+	 * Get the md5 used to validate the local APC cache
 	 *
 	 * @param string $code
 	 * @return array (hash or false, bool expiry/volatility status)
@@ -648,35 +638,56 @@ class MessageCache {
 	protected function getValidationHash( $code ) {
 		$curTTL = null;
 		$value = $this->wanCache->get(
-			wfMemcKey( 'messages', $code, 'hash' ),
+			wfMemcKey( 'messages', $code, 'hash', 'v1' ),
 			$curTTL,
 			array( wfMemcKey( 'messages', $code ) )
 		);
-		$expired = ( $curTTL === null || $curTTL < 0 );
 
-		return array( $value, $expired );
+		if ( !$value ) {
+			// No hash found at all; cache must regenerate to be safe
+			$hash = false;
+			$expired = true;
+		} else {
+			$hash = $value['hash'];
+			if ( ( time() - $value['latest'] ) < WANObjectCache::HOLDOFF_TTL ) {
+				// Cache was recently updated via replace() and should be up-to-date
+				$expired = false;
+			} else {
+				// See if the "check" key was bumped after the hash was generated
+				$expired = ( $curTTL < 0 );
+			}
+		}
+
+		return array( $hash, $expired );
 	}
 
 	/**
 	 * Set the md5 used to validate the local disk cache
 	 *
+	 * If $cache has a 'LATEST' UNIX timestamp key, then the hash will not
+	 * be treated as "volatile" by getValidationHash() for the next few seconds
+	 *
 	 * @param string $code
-	 * @param string $hash
+	 * @param array $cache Cached messages with a version
 	 */
-	protected function setValidationHash( $code, $hash ) {
+	protected function setValidationHash( $code, array $cache ) {
 		$this->wanCache->set(
-			wfMemcKey( 'messages', $code, 'hash' ),
-			$hash,
+			wfMemcKey( 'messages', $code, 'hash', 'v1' ),
+			array(
+				'hash' => $cache['HASH'],
+				'latest' => isset( $cache['LATEST'] ) ? $cache['LATEST'] : 0
+			),
 			WANObjectCache::TTL_NONE
 		);
 	}
 
 	/**
 	 * @param string $key A language message cache key that stores blobs
+	 * @param integer $timeout Wait timeout in seconds
 	 * @return null|ScopedCallback
 	 */
-	protected function getReentrantScopedLock( $key ) {
-		return $this->mMemc->getScopedLock( $key, self::WAIT_SEC, self::LOCK_TTL, __METHOD__ );
+	protected function getReentrantScopedLock( $key, $timeout = self::WAIT_SEC ) {
+		return $this->mMemc->getScopedLock( $key, $timeout, self::LOCK_TTL, __METHOD__ );
 	}
 
 	/**
@@ -960,7 +971,7 @@ class MessageCache {
 					wfDebugLog(
 						'MessageCache',
 						__METHOD__ . ": message content doesn't provide wikitext "
-							. "(content model: " . $content->getContentHandler() . ")"
+							. "(content model: " . $content->getModel() . ")"
 					);
 
 					$message = false; // negative caching
diff --git a/includes/changes/EnhancedChangesList.php b/includes/changes/EnhancedChangesList.php
index e5916bd7f2..3f106bdc27 100644
--- a/includes/changes/EnhancedChangesList.php
+++ b/includes/changes/EnhancedChangesList.php
@@ -270,6 +270,17 @@ class EnhancedChangesList extends ChangesList {
 
 		$queryParams['curid'] = $curId;
 
+		# Sub-entries
+		$lines = '';
+		foreach ( $block as $i => $rcObj ) {
+			$line = $this->getLineData( $block, $rcObj, $queryParams );
+			$lines .= $line;
+			if ( !$line ) {
+				// completely ignore this RC entry if we don't want to render it
+				unset( $block[$i] );
+			}
+		}
+
 		$r .= $this->getLogText( $block, $queryParams, $allLogs, $isnew, $namehidden );
 
 		$r .= ' <span class="mw-changeslist-separator">. .</span> ';
@@ -299,116 +310,133 @@ class EnhancedChangesList extends ChangesList {
 		$r .= $this->numberofWatchingusers( $block[0]->numberofWatchingusers );
 		$r .= '</td></tr>';
 
-		# Sub-entries
-		foreach ( $block as $rcObj ) {
-			# Classes to apply -- TODO implement
-			$classes = array();
-			$type = $rcObj->mAttribs['rc_type'];
-			$data = array();
-
-			$trClass = $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched
-				? ' class="mw-enhanced-watched"' : '';
-			$separator = ' <span class="mw-changeslist-separator">. .</span> ';
-
-			$data['recentChangesFlags'] = array(
-				'newpage' => $type == RC_NEW,
-				'minor' => $rcObj->mAttribs['rc_minor'],
-				'unpatrolled' => $rcObj->unpatrolled,
-				'bot' => $rcObj->mAttribs['rc_bot'],
-			);
+		if ( !$lines ) {
+			// if there are no lines to be rendered (all aborted by hook), don't render the block
+			return '';
+		}
 
-			$params = $queryParams;
+		$r .= $lines;
+		$r .= "</table>\n";
 
-			if ( $rcObj->mAttribs['rc_this_oldid'] != 0 ) {
-				$params['oldid'] = $rcObj->mAttribs['rc_this_oldid'];
-			}
+		$this->rcCacheIndex++;
+
+		return $r;
+	}
 
-			# Log timestamp
-			if ( $type == RC_LOG ) {
-				$link = $rcObj->timestamp;
+	/**
+	 * @param RCCacheEntry[] $block
+	 * @param RCCacheEntry $rcObj
+	 * @param array $queryParams
+	 * @return string
+	 * @throws Exception
+	 * @throws FatalError
+	 * @throws MWException
+	 */
+	protected function getLineData( array $block, RCCacheEntry $rcObj, array $queryParams = array() ) {
+		$RCShowChangedSize = $this->getConfig()->get( 'RCShowChangedSize' );
+
+		# Classes to apply -- TODO implement
+		$classes = array();
+		$type = $rcObj->mAttribs['rc_type'];
+		$data = array();
+
+		$trClass = $rcObj->watched && $rcObj->mAttribs['rc_timestamp'] >= $rcObj->watched
+			? ' class="mw-enhanced-watched"' : '';
+		$separator = ' <span class="mw-changeslist-separator">. .</span> ';
+
+		$data['recentChangesFlags'] = array(
+			'newpage' => $type == RC_NEW,
+			'minor' => $rcObj->mAttribs['rc_minor'],
+			'unpatrolled' => $rcObj->unpatrolled,
+			'bot' => $rcObj->mAttribs['rc_bot'],
+		);
+
+		$params = $queryParams;
+
+		if ( $rcObj->mAttribs['rc_this_oldid'] != 0 ) {
+			$params['oldid'] = $rcObj->mAttribs['rc_this_oldid'];
+		}
+
+		# Log timestamp
+		if ( $type == RC_LOG ) {
+			$link = $rcObj->timestamp;
 			# Revision link
-			} elseif ( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() ) ) {
-				$link = '<span class="history-deleted">' . $rcObj->timestamp . '</span> ';
-			} else {
-				$link = Linker::linkKnown(
-					$rcObj->getTitle(),
-					$rcObj->timestamp,
-					array(),
-					$params
-				);
-				if ( $this->isDeleted( $rcObj, Revision::DELETED_TEXT ) ) {
-					$link = '<span class="history-deleted">' . $link . '</span> ';
-				}
+		} elseif ( !ChangesList::userCan( $rcObj, Revision::DELETED_TEXT, $this->getUser() ) ) {
+			$link = '<span class="history-deleted">' . $rcObj->timestamp . '</span> ';
+		} else {
+			$link = Linker::linkKnown(
+				$rcObj->getTitle(),
+				$rcObj->timestamp,
+				array(),
+				$params
+			);
+			if ( $this->isDeleted( $rcObj, Revision::DELETED_TEXT ) ) {
+				$link = '<span class="history-deleted">' . $link . '</span> ';
 			}
-			$data['timestampLink'] = $link;
+		}
+		$data['timestampLink'] = $link;
 
-			$currentAndLastLinks = '';
-			if ( !$type == RC_LOG || $type == RC_NEW ) {
-				$currentAndLastLinks .= ' ' . $this->msg( 'parentheses' )->rawParams(
+		$currentAndLastLinks = '';
+		if ( !$type == RC_LOG || $type == RC_NEW ) {
+			$currentAndLastLinks .= ' ' . $this->msg( 'parentheses' )->rawParams(
 					$rcObj->curlink .
-						$this->message['pipe-separator'] .
-						$rcObj->lastlink
+					$this->message['pipe-separator'] .
+					$rcObj->lastlink
 				)->escaped();
-			}
-			$data['currentAndLastLinks'] = $currentAndLastLinks;
-			$data['separatorAfterCurrentAndLastLinks'] = $separator;
-
-			# Character diff
-			if ( $RCShowChangedSize ) {
-				$cd = $this->formatCharacterDifference( $rcObj );
-				if ( $cd !== '' ) {
-					$data['characterDiff'] = $cd;
-					$data['separatorAfterCharacterDiff'] = $separator;
-				}
-			}
+		}
+		$data['currentAndLastLinks'] = $currentAndLastLinks;
+		$data['separatorAfterCurrentAndLastLinks'] = $separator;
 
-			if ( $rcObj->mAttribs['rc_type'] == RC_LOG ) {
-				$data['logEntry'] = $this->insertLogEntry( $rcObj );
-			} else {
-				# User links
-				$data['userLink'] = $rcObj->userlink;
-				$data['userTalkLink'] = $rcObj->usertalklink;
-				$data['comment'] = $this->insertComment( $rcObj );
+		# Character diff
+		if ( $RCShowChangedSize ) {
+			$cd = $this->formatCharacterDifference( $rcObj );
+			if ( $cd !== '' ) {
+				$data['characterDiff'] = $cd;
+				$data['separatorAfterCharacterDiff'] = $separator;
 			}
+		}
 
-			# Rollback
-			$data['rollback'] = $this->getRollback( $rcObj );
-
-			# Tags
-			$data['tags'] = $this->getTags( $rcObj, $classes );
+		if ( $rcObj->mAttribs['rc_type'] == RC_LOG ) {
+			$data['logEntry'] = $this->insertLogEntry( $rcObj );
+		} else {
+			# User links
+			$data['userLink'] = $rcObj->userlink;
+			$data['userTalkLink'] = $rcObj->usertalklink;
+			$data['comment'] = $this->insertComment( $rcObj );
+		}
 
-			// give the hook a chance to modify the data
-			$success = Hooks::run( 'EnhancedChangesListModifyLineData',
-				array( $this, &$data, $block, $rcObj ) );
-			if ( !$success ) {
-				// skip entry if hook aborted it
-				continue;
-			}
+		# Rollback
+		$data['rollback'] = $this->getRollback( $rcObj );
 
-			$line = '<tr' . $trClass . '><td></td><td class="mw-enhanced-rc">';
-			if ( isset( $data['recentChangesFlags'] ) ) {
-				$line .= $this->recentChangesFlags( $data['recentChangesFlags'] );
-				unset( $data['recentChangesFlags'] );
-			}
-			$line .= '&#160;</td><td class="mw-enhanced-rc-nested">';
-
-			if ( isset( $data['timestampLink'] ) ) {
-				$line .= '<span class="mw-enhanced-rc-time">' . $data['timestampLink'] . '</span>';
-				unset( $data['timestampLink'] );
-			}
+		# Tags
+		$data['tags'] = $this->getTags( $rcObj, $classes );
 
-			// everything else: makes it easier for extensions to add or remove data
-			$line .= implode( '', $data );
+		// give the hook a chance to modify the data
+		$success = Hooks::run( 'EnhancedChangesListModifyLineData',
+			array( $this, &$data, $block, $rcObj ) );
+		if ( !$success ) {
+			// skip entry if hook aborted it
+			return '';
+		}
 
-			$line .= "</td></tr>\n";
+		$line = '<tr' . $trClass . '><td></td><td class="mw-enhanced-rc">';
+		if ( isset( $data['recentChangesFlags'] ) ) {
+			$line .= $this->recentChangesFlags( $data['recentChangesFlags'] );
+			unset( $data['recentChangesFlags'] );
+		}
+		$line .= '&#160;</td><td class="mw-enhanced-rc-nested">';
 
-			$r .= $line;
+		if ( isset( $data['timestampLink'] ) ) {
+			$line .= '<span class="mw-enhanced-rc-time">' . $data['timestampLink'] . '</span>';
+			unset( $data['timestampLink'] );
 		}
-		$r .= "</table>\n";
 
-		$this->rcCacheIndex++;
+		// everything else: makes it easier for extensions to add or remove data
+		$line .= implode( '', $data );
 
-		return $r;
+		$line .= "</td></tr>\n";
+
+		return $line;
 	}
 
 	/**
diff --git a/includes/clientpool/RedisConnectionPool.php b/includes/clientpool/RedisConnectionPool.php
index 117bd2d851..ec0573ef75 100644
--- a/includes/clientpool/RedisConnectionPool.php
+++ b/includes/clientpool/RedisConnectionPool.php
@@ -331,7 +331,7 @@ class RedisConnectionPool implements LoggerAwareInterface {
 	 * @deprecated since 1.23
 	 */
 	public function handleException( $server, RedisConnRef $cref, RedisException $e ) {
-		return $this->handleError( $cref, $e );
+		$this->handleError( $cref, $e );
 	}
 
 	/**
diff --git a/includes/debug/logger/LegacyLogger.php b/includes/debug/logger/LegacyLogger.php
index b6439b8222..0f4c648406 100644
--- a/includes/debug/logger/LegacyLogger.php
+++ b/includes/debug/logger/LegacyLogger.php
@@ -21,6 +21,7 @@
 namespace MediaWiki\Logger;
 
 use DateTimeZone;
+use Exception;
 use MWDebug;
 use MWExceptionHandler;
 use Psr\Log\AbstractLogger;
@@ -217,13 +218,22 @@ class LegacyLogger extends AbstractLogger {
 		}
 
 		// Append stacktrace of exception if available
-		if ( $wgLogExceptionBacktrace &&
-			isset( $context['exception'] ) &&
-			$context['exception'] instanceof Exception
-		) {
-			$text .= MWExceptionHandler::getRedactedTraceAsString(
-				$context['exception']
-			) . "\n";
+		if ( $wgLogExceptionBacktrace && isset( $context['exception'] ) ) {
+			$e = $context['exception'];
+			$backtrace = false;
+
+			if ( $e instanceof Exception ) {
+				$backtrace = MWExceptionHandler::getRedactedTrace( $e );
+
+			} elseif ( is_array( $e ) && isset( $e['trace'] ) ) {
+				// Exception has already been unpacked as structured data
+				$backtrace = $e['trace'];
+			}
+
+			if ( $backtrace ) {
+				$text .= MWExceptionHandler::prettyPrintTrace( $backtrace ) .
+					"\n";
+			}
 		}
 
 		return self::interpolate( $text, $context );
@@ -358,7 +368,7 @@ class LegacyLogger extends AbstractLogger {
 			return $item->format( 'c' );
 		}
 
-		if ( $item instanceof \Exception ) {
+		if ( $item instanceof Exception ) {
 			return '[Exception ' . get_class( $item ) . '( ' .
 				$item->getFile() . ':' . $item->getLine() . ') ' .
 				$item->getMessage() . ']';
diff --git a/includes/debug/logger/monolog/LineFormatter.php b/includes/debug/logger/monolog/LineFormatter.php
index e593d63bc4..2ba7a53cb5 100644
--- a/includes/debug/logger/monolog/LineFormatter.php
+++ b/includes/debug/logger/monolog/LineFormatter.php
@@ -27,10 +27,14 @@ use MWExceptionHandler;
 /**
  * Formats incoming records into a one-line string.
  *
+ * An 'exeception' in the log record's context will be treated specially.
+ * It will be output for an '%exception%' placeholder in the format and
+ * excluded from '%context%' output if the '%exception%' placeholder is
+ * present.
+ *
  * Exceptions that are logged with this formatter will optional have their
- * stack traces appended. If that is done,
- * MWExceptionHandler::getRedactedTraceAsString() will be used to redact the
- * trace information.
+ * stack traces appended. If that is done, MWExceptionHandler::redactedTrace()
+ * will be used to redact the trace information.
  *
  * @since 1.26
  * @author Bryan Davis <bd808@wikimedia.org>
@@ -57,6 +61,40 @@ class LineFormatter extends MonologLineFormatter {
 	}
 
 
+	/**
+	 * {@inheritdoc}
+	 */
+	public function format( array $record ) {
+		// Drop the 'private' flag from the context
+		unset( $record['context']['private'] );
+
+		// Handle exceptions specially: pretty format and remove from context
+		// Will be output for a '%exception%' placeholder in format
+		$prettyException = '';
+		if ( isset( $record['context']['exception'] ) &&
+			strpos( $this->format, '%exception%' ) !== false
+		) {
+			$e = $record['context']['exception'];
+			unset( $record['context']['exception'] );
+
+			if ( $e instanceof Exception ) {
+				$prettyException = $this->normalizeException( $e );
+			} elseif ( is_array( $e ) ) {
+				$prettyException = $this->normalizeExceptionArray( $e );
+			} else {
+				$prettyException = $this->stringify( $e );
+			}
+		}
+
+		$output = parent::format( $record );
+
+		if ( strpos( $output, '%exception%' ) !== false ) {
+			$output = str_replace( '%exception%', $prettyException, $output );
+		}
+		return $output;
+	}
+
+
 	/**
 	 * Convert an Exception to a string.
 	 *
@@ -64,24 +102,76 @@ class LineFormatter extends MonologLineFormatter {
 	 * @return string
 	 */
 	protected function normalizeException( Exception $e ) {
-		$str = '[Exception ' . get_class( $e ) . '] (' .
-			$e->getFile() . ':' . $e->getLine() . ') ' .
-			$e->getMessage();
+		return $this->normalizeExceptionArray( $this->exceptionAsArray( $e ) );
+	}
+
+
+	/**
+	 * Convert an exception to an array of structured data.
+	 *
+	 * @param Exception $e
+	 * @return array
+	 */
+	protected function exceptionAsArray( Exception $e ) {
+		$out = array(
+			'class' => get_class( $e ),
+			'message' => $e->getMessage(),
+			'code' => $e->getCode(),
+			'file' => $e->getFile(),
+			'line' => $e->getLine(),
+			'trace' => MWExceptionHandler::redactTrace( $e->getTrace() ),
+		);
 
 		$prev = $e->getPrevious();
-		while ( $prev ) {
-			$str .= ', [Exception ' . get_class( $prev ) . '] (' .
-				$prev->getFile() . ':' . $prev->getLine() . ') ' .
-				$prev->getMessage();
-			$prev = $prev->getPrevious();
+		if ( $prev ) {
+			$out['previous'] = $this->exceptionAsArray( $prev );
 		}
 
-		if ( $this->includeStacktraces ) {
-			$str .= "\n[stacktrace]\n" .
-				MWExceptionHandler::getRedactedTraceAsString( $e ) .
-				"\n";
+		return $out;
+	}
+
+
+	/**
+	 * Convert an array of Exception data to a string.
+	 *
+	 * @param array $e
+	 * @return string
+	 */
+	protected function normalizeExceptionArray( array $e ) {
+		$defaults = array(
+			'class' => 'Unknown',
+			'file' => 'unknown',
+			'line' => null,
+			'message' => 'unknown',
+			'trace' => array(),
+		);
+		$e = array_merge( $defaults, $e );
+
+		$str = "\n[Exception {$e['class']}] (" .
+			"{$e['file']}:{$e['line']}) {$e['message']}";
+
+		if ( $this->includeStacktraces && $e['trace'] ) {
+			$str .= "\n" .
+				MWExceptionHandler::prettyPrintTrace( $e['trace'], '  ' );
 		}
 
+		if ( isset( $e['previous'] ) ) {
+			$prev = $e['previous'];
+			while ( $prev ) {
+				$prev = array_merge( $defaults, $prev );
+				$str .= "\nCaused by: [Exception {$prev['class']}] (" .
+					"{$prev['file']}:{$prev['line']}) {$prev['message']}";
+
+				if ( $this->includeStacktraces && $prev['trace'] ) {
+					$str .= "\n" .
+						MWExceptionHandler::prettyPrintTrace(
+							$prev['trace'], '  '
+						);
+				}
+
+				$prev = isset( $prev['previous'] ) ? $prev['previous'] : null;
+			}
+		}
 		return $str;
 	}
 }
diff --git a/includes/exception/MWExceptionHandler.php b/includes/exception/MWExceptionHandler.php
index def653fb30..d4a240ff20 100644
--- a/includes/exception/MWExceptionHandler.php
+++ b/includes/exception/MWExceptionHandler.php
@@ -26,24 +26,32 @@ use MediaWiki\Logger\LoggerFactory;
  */
 class MWExceptionHandler {
 
+	/**
+	 * @var string $reservedMemory
+	 */
 	protected static $reservedMemory;
+	/**
+	 * @var array $fatalErrorTypes
+	 */
 	protected static $fatalErrorTypes = array(
 		E_ERROR, E_PARSE, E_CORE_ERROR, E_COMPILE_ERROR, E_USER_ERROR,
 		/* HHVM's FATAL_ERROR level */ 16777217,
 	);
+	/**
+	 * @var bool $handledFatalCallback
+	 */
+	protected static $handledFatalCallback = false;
 
 	/**
 	 * Install handlers with PHP.
 	 */
 	public static function installHandler() {
-		set_exception_handler( array( 'MWExceptionHandler', 'handleException' ) );
-		set_error_handler( array( 'MWExceptionHandler', 'handleError' ) );
+		set_exception_handler( 'MWExceptionHandler::handleException' );
+		set_error_handler( 'MWExceptionHandler::handleError' );
 
 		// Reserve 16k of memory so we can report OOM fatals
 		self::$reservedMemory = str_repeat( ' ', 16384 );
-		register_shutdown_function(
-			array( 'MWExceptionHandler', 'handleFatalError' )
-		);
+		register_shutdown_function( 'MWExceptionHandler::handleFatalError' );
 	}
 
 	/**
@@ -176,24 +184,36 @@ class MWExceptionHandler {
 	}
 
 	/**
+	 * Handler for set_error_handler() callback notifications.
+	 *
+	 * Receive a callback from the interpreter for a raised error, create an
+	 * ErrorException, and log the exception to the 'error' logging
+	 * channel(s). If the raised error is a fatal error type (only under HHVM)
+	 * delegate to handleFatalError() instead.
+	 *
 	 * @since 1.25
+	 *
 	 * @param int $level Error level raised
 	 * @param string $message
 	 * @param string $file
 	 * @param int $line
+	 *
+	 * @see logError()
 	 */
-	public static function handleError( $level, $message, $file = null, $line = null ) {
-		// Map error constant to error name (reverse-engineer PHP error reporting)
-		$channel = 'error';
+	public static function handleError(
+		$level, $message, $file = null, $line = null
+	) {
+		if ( in_array( $level, self::$fatalErrorTypes ) ) {
+			return call_user_func_array(
+				'MWExceptionHandler::handleFatalError', func_get_args()
+			);
+		}
+
+		// Map error constant to error name (reverse-engineer PHP error
+		// reporting)
 		switch ( $level ) {
-			case E_ERROR:
-			case E_CORE_ERROR:
-			case E_COMPILE_ERROR:
-			case E_USER_ERROR:
 			case E_RECOVERABLE_ERROR:
-			case E_PARSE:
 				$levelName = 'Error';
-				$channel = 'fatal';
 				break;
 			case E_WARNING:
 			case E_CORE_WARNING:
@@ -212,17 +232,13 @@ class MWExceptionHandler {
 			case E_USER_DEPRECATED:
 				$levelName = 'Deprecated';
 				break;
-			case /* HHVM's FATAL_ERROR */ 16777217:
-				$levelName = 'Fatal';
-				$channel = 'fatal';
-				break;
 			default:
 				$levelName = 'Unknown error';
 				break;
 		}
 
 		$e = new ErrorException( "PHP $levelName: $message", 0, $level, $file, $line );
-		self::logError( $e, $channel );
+		self::logError( $e, 'error' );
 
 		// This handler is for logging only. Return false will instruct PHP
 		// to continue regular handling.
@@ -231,42 +247,101 @@ class MWExceptionHandler {
 
 
 	/**
-	 * Look for a fatal error as the cause of the request termination and log
-	 * as an exception.
+	 * Dual purpose callback used as both a set_error_handler() callback and
+	 * a registered shutdown function. Receive a callback from the interpreter
+	 * for a raised error or system shutdown, check for a fatal error, and log
+	 * to the 'fatal' logging channel.
 	 *
 	 * Special handling is included for missing class errors as they may
 	 * indicate that the user needs to install 3rd-party libraries via
 	 * Composer or other means.
 	 *
 	 * @since 1.25
+	 *
+	 * @param int $level Error level raised
+	 * @param string $message Error message
+	 * @param string $file File that error was raised in
+	 * @param int $line Line number error was raised at
+	 * @param array $context Active symbol table point of error
+	 * @param array $trace Backtrace at point of error (undocumented HHVM
+	 *     feature)
+	 * @return bool Always returns false
 	 */
-	public static function handleFatalError() {
+	public static function handleFatalError(
+		$level = null, $message = null, $file = null, $line = null,
+		$context = null, $trace = null
+	) {
+		// Free reserved memory so that we have space to process OOM
+		// errors
 		self::$reservedMemory = null;
-		$lastError = error_get_last();
 
-		if ( $lastError &&
-			isset( $lastError['type'] ) &&
-			in_array( $lastError['type'], self::$fatalErrorTypes )
-		) {
-			$msg = "Fatal Error: {$lastError['message']}";
-			// HHVM: Class undefined: foo
-			// PHP5: Class 'foo' not found
-			if ( preg_match( "/Class (undefined: \w+|'\w+' not found)/",
-				$lastError['message']
-			) ) {
-				// @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
-				$msg = <<<TXT
+		if ( $level === null ) {
+			// Called as a shutdown handler, get data from error_get_last()
+			if ( static::$handledFatalCallback ) {
+				// Already called once (probably as an error handler callback
+				// under HHVM) so don't log again.
+				return false;
+			}
+
+			$lastError = error_get_last();
+			if ( $lastError !== null ) {
+				$level = $lastError['type'];
+				$message = $lastError['message'];
+				$file = $lastError['file'];
+				$line = $lastError['line'];
+			} else {
+				$level = 0;
+				$message = '';
+			}
+		}
+
+		if ( !in_array( $level, self::$fatalErrorTypes ) ) {
+			// Only interested in fatal errors, others should have been
+			// handled by MWExceptionHandler::handleError
+			return false;
+		}
+
+		$msg = "[{exception_id}] PHP Fatal Error: {$message}";
+
+		// Look at message to see if this is a class not found failure
+		// HHVM: Class undefined: foo
+		// PHP5: Class 'foo' not found
+		if ( preg_match( "/Class (undefined: \w+|'\w+' not found)/", $msg ) ) {
+			// @codingStandardsIgnoreStart Generic.Files.LineLength.TooLong
+			$msg = <<<TXT
 {$msg}
 
 MediaWiki or an installed extension requires this class but it is not embedded directly in MediaWiki's git repository and must be installed separately by the end user.
 
 Please see <a href="https://www.mediawiki.org/wiki/Download_from_Git#Fetch_external_libraries">mediawiki.org</a> for help on installing the required components.
 TXT;
-				// @codingStandardsIgnoreEnd
-			}
-			$e = new ErrorException( $msg, 0, $lastError['type'] );
-			self::logError( $e, 'fatal' );
+			// @codingStandardsIgnoreEnd
 		}
+
+		// We can't just create an exception and log it as it is likely that
+		// the interpreter has unwound the stack already. If that is true the
+		// stacktrace we would get would be functionally empty. If however we
+		// have been called as an error handler callback *and* HHVM is in use
+		// we will have been provided with a useful stacktrace that we can
+		// log.
+		$trace = $trace ?: debug_backtrace();
+		$logger = LoggerFactory::getInstance( 'fatal' );
+		$logger->error( $msg, array(
+			'exception' => array(
+				'class' => 'ErrorException',
+				'message' => "PHP Fatal Error: {$message}",
+				'code' => $level,
+				'file' => $file,
+				'line' => $line,
+				'trace' => static::redactTrace( $trace ),
+			),
+			'exception_id' => wfRandomString( 8 ),
+		) );
+
+		// Remember call so we don't double process via HHVM's fatal
+		// notifications and the shutdown hook behavior
+		static::$handledFatalCallback = true;
+		return false;
 	}
 
 	/**
@@ -277,32 +352,32 @@ TXT;
 	 *
 	 * @param Exception $e
 	 * @return string
+	 * @see prettyPrintTrace()
 	 */
 	public static function getRedactedTraceAsString( Exception $e ) {
-		return self::prettyPrintRedactedTrace(
-			self::getRedactedTrace( $e )
-		);
+		return self::prettyPrintTrace( self::getRedactedTrace( $e ) );
 	}
 
 	/**
-	 * Generate a string representation of a structured stack trace generated
-	 * by getRedactedTrace().
+	 * Generate a string representation of a stacktrace.
 	 *
 	 * @param array $trace
+	 * @param string $pad Constant padding to add to each line of trace
 	 * @return string
 	 * @since 1.26
 	 */
-	public static function prettyPrintRedactedTrace( array $trace ) {
+	public static function prettyPrintTrace( array $trace, $pad = '' ) {
 		$text = '';
 
 		foreach ( $trace as $level => $frame ) {
 			if ( isset( $frame['file'] ) && isset( $frame['line'] ) ) {
-				$text .= "#{$level} {$frame['file']}({$frame['line']}): ";
+				$text .= "{$pad}#{$level} {$frame['file']}({$frame['line']}): ";
 			} else {
-				// 'file' and 'line' are unset for calls via call_user_func (bug 55634)
-				// This matches behaviour of Exception::getTraceAsString to instead
-				// display "[internal function]".
-				$text .= "#{$level} [internal function]: ";
+				// 'file' and 'line' are unset for calls via call_user_func
+				// (bug 55634) This matches behaviour of
+				// Exception::getTraceAsString to instead display "[internal
+				// function]".
+				$text .= "{$pad}#{$level} [internal function]: ";
 			}
 
 			if ( isset( $frame['class'] ) ) {
@@ -319,7 +394,7 @@ TXT;
 		}
 
 		$level = $level + 1;
-		$text .= "#{$level} {main}";
+		$text .= "{$pad}#{$level} {main}";
 
 		return $text;
 	}
@@ -336,6 +411,20 @@ TXT;
 	 * @return array
 	 */
 	public static function getRedactedTrace( Exception $e ) {
+		return static::redactTrace( $e->getTrace() );
+	}
+
+	/**
+	 * Redact a stacktrace generated by Exception::getTrace(),
+	 * debug_backtrace() or similar means. Replaces each element in each
+	 * frame's argument array with the name of its class (if the element is an
+	 * object) or its type (if the element is a PHP primitive).
+	 *
+	 * @since 1.26
+	 * @param array $trace Stacktrace
+	 * @return array Stacktrace with arugment values converted to data types
+	 */
+	public static function redactTrace( array $trace ) {
 		return array_map( function ( $frame ) {
 			if ( isset( $frame['args'] ) ) {
 				$frame['args'] = array_map( function ( $arg ) {
@@ -343,7 +432,7 @@ TXT;
 				}, $frame['args'] );
 			}
 			return $frame;
-		}, $e->getTrace() );
+		}, $trace );
 	}
 
 	/**
@@ -409,6 +498,7 @@ TXT;
 	public static function getLogContext( Exception $e ) {
 		return array(
 			'exception' => $e,
+			'exception_id' => static::getLogId( $e ),
 		);
 	}
 
@@ -548,7 +638,8 @@ TXT;
 	*/
 	protected static function logError( ErrorException $e, $channel ) {
 		// The set_error_handler callback is independent from error_reporting.
-		// Filter out unwanted errors manually (e.g. when MediaWiki\suppressWarnings is active).
+		// Filter out unwanted errors manually (e.g. when
+		// MediaWiki\suppressWarnings is active).
 		$suppressed = ( error_reporting() & $e->getSeverity() ) === 0;
 		if ( !$suppressed ) {
 			$logger = LoggerFactory::getInstance( $channel );
diff --git a/includes/filebackend/FileBackend.php b/includes/filebackend/FileBackend.php
index fa1c462647..ce0360f902 100644
--- a/includes/filebackend/FileBackend.php
+++ b/includes/filebackend/FileBackend.php
@@ -387,6 +387,8 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::doOperations()
+	 * @param array $ops
+	 * @param array $opts
 	 */
 	abstract protected function doOperationsInternal( array $ops, array $opts );
 
@@ -620,6 +622,7 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::doQuickOperations()
+	 * @param array $ops
 	 * @since 1.20
 	 */
 	abstract protected function doQuickOperationsInternal( array $ops );
@@ -765,6 +768,7 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::prepare()
+	 * @param array $params
 	 */
 	abstract protected function doPrepare( array $params );
 
@@ -795,6 +799,7 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::secure()
+	 * @param array $params
 	 */
 	abstract protected function doSecure( array $params );
 
@@ -827,6 +832,7 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::publish()
+	 * @param array $params
 	 */
 	abstract protected function doPublish( array $params );
 
@@ -852,6 +858,7 @@ abstract class FileBackend {
 
 	/**
 	 * @see FileBackend::clean()
+	 * @param array $params
 	 */
 	abstract protected function doClean( array $params );
 
diff --git a/includes/filerepo/file/File.php b/includes/filerepo/file/File.php
index 3677a14b97..f40d216c58 100644
--- a/includes/filerepo/file/File.php
+++ b/includes/filerepo/file/File.php
@@ -213,14 +213,15 @@ abstract class File implements IDBAccessObject {
 	}
 
 	/**
-	 * Normalize a file extension to the common form, and ensure it's clean.
-	 * Extensions with non-alphanumeric characters will be discarded.
+	 * Normalize a file extension to the common form, making it lowercase and checking some synonyms,
+	 * and ensure it's clean. Extensions with non-alphanumeric characters will be discarded.
+	 * Keep in sync with mw.Title.normalizeExtension() in JS.
 	 *
-	 * @param string $ext (without the .)
-	 * @return string
+	 * @param string $extension File extension (without the leading dot)
+	 * @return string File extension in canonical form
 	 */
-	static function normalizeExtension( $ext ) {
-		$lower = strtolower( $ext );
+	static function normalizeExtension( $extension ) {
+		$lower = strtolower( $extension );
 		$squish = array(
 			'htm' => 'html',
 			'jpeg' => 'jpg',
diff --git a/includes/filerepo/file/LocalFile.php b/includes/filerepo/file/LocalFile.php
index 40705532a7..d2c37e614c 100644
--- a/includes/filerepo/file/LocalFile.php
+++ b/includes/filerepo/file/LocalFile.php
@@ -502,9 +502,17 @@ class LocalFile extends File {
 			$decoded['mime'] = $decoded['major_mime'] . '/' . $decoded['minor_mime'];
 		}
 
-		# Trim zero padding from char/binary field
+		// Trim zero padding from char/binary field
 		$decoded['sha1'] = rtrim( $decoded['sha1'], "\0" );
 
+		// Normalize some fields to integer type, per their database definition.
+		// Use unary + so that overflows will be upgraded to double instead of
+		// being trucated as with intval(). This is important to allow >2GB
+		// files on 32-bit systems.
+		foreach ( array( 'size', 'width', 'height', 'bits' ) as $field ) {
+			$decoded[$field] = +$decoded[$field];
+		}
+
 		return $decoded;
 	}
 
diff --git a/includes/htmlform/HTMLForm.php b/includes/htmlform/HTMLForm.php
index 38729a5ec3..08fa0a91ef 100644
--- a/includes/htmlform/HTMLForm.php
+++ b/includes/htmlform/HTMLForm.php
@@ -898,6 +898,7 @@ class HTMLForm extends ContextSource {
 		# For good measure (it is the default)
 		$this->getOutput()->preventClickjacking();
 		$this->getOutput()->addModules( 'mediawiki.htmlform' );
+		$this->getOutput()->addModuleStyles( 'mediawiki.htmlform.styles' );
 
 		$html = ''
 			. $this->getErrors( $submitResult )
diff --git a/includes/htmlform/HTMLFormField.php b/includes/htmlform/HTMLFormField.php
index 0fab033dce..13756e3d64 100644
--- a/includes/htmlform/HTMLFormField.php
+++ b/includes/htmlform/HTMLFormField.php
@@ -920,7 +920,7 @@ abstract class HTMLFormField {
 	 * @return array Attributes
 	 */
 	public function getAttributes( array $list, array $mappings = null ) {
-		static $boolAttribs = array( 'disabled', 'required', 'multiple', 'readonly' );
+		static $boolAttribs = array( 'disabled', 'required', 'autofocus', 'multiple', 'readonly' );
 
 		$ret = array();
 		foreach ( $list as $key ) {
@@ -928,7 +928,7 @@ abstract class HTMLFormField {
 
 			if ( in_array( $key, $boolAttribs ) ) {
 				if ( !empty( $this->mParams[$key] ) ) {
-					$ret[$mappedKey] = '';
+					$ret[$mappedKey] = $mappedKey;
 				}
 			} elseif ( isset( $this->mParams[$key] ) ) {
 				$ret[$mappedKey] = $this->mParams[$key];
diff --git a/includes/htmlform/HTMLTextField.php b/includes/htmlform/HTMLTextField.php
index 40cff47e42..157116d829 100644
--- a/includes/htmlform/HTMLTextField.php
+++ b/includes/htmlform/HTMLTextField.php
@@ -113,11 +113,6 @@ class HTMLTextField extends HTMLFormField {
 			'tabindex' => 'tabIndex',
 		) );
 
-		if ( isset( $attribs['readOnly'] ) ) {
-			// This needs to be set to a boolean value
-			$attribs['readOnly'] = true;
-		}
-
 		$type = $this->getType( $attribs );
 
 		return $this->getInputWidget( array(
diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 7b1cfdcc19..09b5929efb 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -332,9 +332,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 ## https://www.mediawiki.org/wiki/Manual:Short_URL
 \$wgScriptPath = \"{$this->values['wgScriptPath']}\";
 ${serverSetting}
-## The relative URL path to the skins directory
-\$wgStylePath = \"\$wgScriptPath/skins\";
-\$wgResourceBasePath = \$wgScriptPath;
 
 ## The relative URL path to the logo.  Make sure you change this from the default,
 ## or else you'll overwrite your logo when you upgrade!
diff --git a/includes/installer/i18n/ar.json b/includes/installer/i18n/ar.json
index 201ef7147e..13755e3372 100644
--- a/includes/installer/i18n/ar.json
+++ b/includes/installer/i18n/ar.json
@@ -101,6 +101,7 @@
 	"config-license-cc-by": "المشاع الإبداعي النسبة للمؤلف",
 	"config-license-cc-by-nc-sa": "المشاع الإبداعي النسبة للمؤلف غير تجاري المشاركة بالمثل",
 	"config-license-pd": "ملكية عامة",
+	"config-license-cc-choose": "اختر ترخيص مشاع إبداعي مخصص",
 	"config-email-settings": "إعدادات البريد الإلكتروني",
 	"config-email-usertalk": "فعل إخطارات صفحات نقاش المستخدمين",
 	"config-email-watchlist": "تمكين إشعارات قائمة المراقبة",
diff --git a/includes/installer/i18n/it.json b/includes/installer/i18n/it.json
index cbe64d6aff..aa24362af6 100644
--- a/includes/installer/i18n/it.json
+++ b/includes/installer/i18n/it.json
@@ -13,10 +13,11 @@
 			"Nemo bis",
 			"Ricordisamoa",
 			"Fpugliajno",
-			"The Polish"
+			"The Polish",
+			"Sannita"
 		]
 	},
-	"config-desc": "Il programma di installazione per MediaWiki",
+	"config-desc": "Programma di installazione per MediaWiki",
 	"config-title": "Installazione di MediaWiki $1",
 	"config-information": "Informazioni",
 	"config-localsettings-upgrade": "È stato rilevato un file <code>LocalSettings.php</code>.\nPer aggiornare questa installazione, si prega di inserire il valore di <code>$wgUpgradeKey</code> nella casella qui sotto.\nLo potete trovare in <code>LocalSettings.php</code>.",
diff --git a/includes/installer/i18n/ksh.json b/includes/installer/i18n/ksh.json
index b998e3440d..bffdf057d0 100644
--- a/includes/installer/i18n/ksh.json
+++ b/includes/installer/i18n/ksh.json
@@ -248,7 +248,7 @@
 	"config-email-sender": "De Adräß för de Antwoote op <i lang=\"en\">e-mails</i>:",
 	"config-email-sender-help": "Jiff de Adräß för de <i lang=\"en\">e-mail</i> en, woh Antwoote ob em Wiki singe <i lang=\"en\">e-mails</i> hen jonn sulle.\nDat es och de Adräß, woh de <i lang=\"en\">e-mails</i> met Fählermäldonge hen jon.\nVill ẞöövere för de <i lang=\"en\">e-mail</i> welle winnischßdens ene jöltijje Domain en dä Adräß han.",
 	"config-upload-settings": "Belder un Datteie huh laade",
-	"config-upload-enable": "Belder un Datteie huh laade zohlohße",
+	"config-upload-enable": "Et Belder un Datteie Huhlahde zohlohße",
 	"config-upload-help": "Datteije huh ze laade künnt e Risiko för dem ẞööver singe Sescherheit sin.\nMieh doh drövver kam_mer em [//www.mediawiki.org/wiki/Special:MyLanguage/Manual:Security Kapitel övver de Sescherheit] em Handbooch lässe.\n\nÖm et Huhlaade zohzelohße donn de Rääschde för der Zohjreff op dat Ongerverzeischneß <code lang=\"en\">images</code> em MediaWiki singem Houpverzeischneß esu enshtälle, dat et Webßööverprojramm doh Datteije un Verzeischneße eren schrieve kann.\nDonoh donn heh di Saach zohlohße.",
 	"config-upload-deleted": "Dat Verzeishneß för fottjeschmeße Datteije:",
 	"config-upload-deleted-help": "Söhk e Verzeijschneß uß för de fottjeschmeße Datteije vum Wiki dren afzelääje.\nEt bäß es, wam_mer vum <i lang=\"en\">world wide web</i> doh nit drahn kumme kann.",
@@ -317,7 +317,7 @@
 	"config-install-extension-tables": "Ben Datebangk-Tabälle för de Zohsazprojramme aam ennreschte",
 	"config-install-mainpage-failed": "Kunnt de Houpsigg nit afshpeishere: $1",
 	"config-install-done": "'''Jlöckwonsch!'''\nMediaWiki es jetz enstalleet.\n\nEt Projramm zom Enreeschte hät en Dattei <code lang=\"en\">LocalSettings.php</code> aanjelaat.\nDoh sin de Enstellunge vum Wiki dren.\n\nDo weeß se eronge laade möße un dann en dem Wiki sing Aanfangsverzeishnes donn möße, et sellve Verzeisneß, woh di Dattei <code lang=\"en\">index.php</code> dren litt. Dat Erongerlaade sullt automattesch aanjefange han.\n\nWann domet jet nit jeflupp hät, udder De di Dattei norr_ens han wells, donn op dä Lengk heh dronger klecke:\n\n$3\n\n'''Opjepaß''': Wann De dat jez nit deihß, es alles verschött, wat De bes jöz enjejovve häs, weil di Dattei fott es en däm Momang, woh heh dat Projamm aam Engk es.\n\nWann De mem Ronger- un widder Huhlaade fäädesh bes, kanns De '''[$2 en Ding Wiki jonn]'''.",
-	"config-download-localsettings": "Donn di Dattei <code lang=\"en\">LocalSettings.php</code> eronger laade",
+	"config-download-localsettings": "Donn di Dattei <code lang=\"en\" xml:lang=\"en\" dir=\"ltr\">LocalSettings.php</code> eronger lahde",
 	"config-help": "Hölp",
 	"config-help-tooltip": "Donn Hölp heh aan däm Plaaz enblände.",
 	"config-nofile": "De Dattei „$1“ ham_mer nit jefonge. Es di fottjeschmeße?",
diff --git a/includes/installer/i18n/nap.json b/includes/installer/i18n/nap.json
index f94b70a4af..305813048d 100644
--- a/includes/installer/i18n/nap.json
+++ b/includes/installer/i18n/nap.json
@@ -51,7 +51,7 @@
 	"config-unicode-using-intl": "Aúsa [http://pecl.php.net/intl l'estensione PECL intl] pe' ne fà 'a normalizzazione Unicode.",
 	"config-unicode-pure-php-warning": "<strong>Attenziò:</strong> L' [http://pecl.php.net/intl estensione intl PECL] nun è a disposizione pe' gestire 'a normalizzazione Unicode, accussì se ausasse n'imprementazziona llenta 'n puro PHP.\nSi state a gestire nu pizzo ad alto traffico, avisseve a lieggere cocche considerazione ncopp' 'a [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations normalizzaziona Unicode].",
 	"config-unicode-update-warning": "<strong>Attenziò:</strong> 'A verziona installata 'e normalizzazione Unicode aùsa 'a verziona viecchia d' 'o [http://site.icu-project.org/ pruggetto ICU].\nV'avite 'a [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations agghiurnà] si state a penzà ncopp' 'o fatto d'ausà Unicode.",
-	"config-no-db": "Nun se può truvà nu driver adatto p' 'o database! È necessario installare nu driver p' 'o PHP.\n{{PLURAL:$2|'O furmatto suppurtato|'E furmatte suppurtate}} 'e database ccà annanze: $1.\n\nSi cumpilate PHP autonomamente, riaccunciatevello attivando nu client database, p'esempio ausannoo <code>./configure --with-mysqli</code>.\nQuanno fosse installato PHP pe' bbìa 'e nu pacchetto Debian o Ubuntu, allora avite 'a installà pure 'o pacchetto <code>php5-mysql</code>.",
+	"config-no-db": "Nun se può truvà nu driver adatto p' 'o database! È necessario installare nu driver p' 'o PHP.\n{{PLURAL:$2|'O furmato suppurtato|'E furmate suppurtate}} 'e database ccà annanze: $1.\n\nSi cumpilate PHP autonomamente, riaccunciatevello attivando nu client database, p'esempio ausannoo <code>./configure --with-mysqli</code>.\nQuanno fosse installato PHP pe' bbìa 'e nu pacchetto Debian o Ubuntu, allora avite 'a installà pure 'o pacchetto <code>php5-mysql</code>.",
 	"config-outdated-sqlite": "'''Attenziò''': tenite 'o SQLite $1 pe' tramente ca ce vulesse 'a verziona $2, SQLite nun sarrà a disposizione.",
 	"config-no-fts3": "'''Attenziò''': SQLite è cumpilato senza 'o [//sqlite.org/fts3.html modulo FTS3], 'e funziune 'e p'ascià dinto nun sarranno a disposizione ncopp'a stu backend.",
 	"config-register-globals-error": "<strong>Errore: l'opzione PHP <code>[http://php.net/register_globals register_globals]</code> è apicciata.\nS'avesse 'a stutà pe' cuntinuà c' 'a installazione.</strong>\nVide [https://www.mediawiki.org/wiki/register_globals https://www.mediawiki.org/wiki/register_globals] pe' n'avé n'aiuto ncopp'a comme s'avess'a ffà.",
diff --git a/includes/installer/i18n/olo.json b/includes/installer/i18n/olo.json
new file mode 100644
index 0000000000..9f8743ccc2
--- /dev/null
+++ b/includes/installer/i18n/olo.json
@@ -0,0 +1,59 @@
+{
+	"@metadata": {
+		"authors": [
+			"Mashoi7"
+		]
+	},
+	"config-your-language": "Sinun kieli:",
+	"config-wiki-language": "Wikin kieli:",
+	"config-back": "← Järilleh",
+	"config-continue": "Jatka →",
+	"config-page-language": "Kieli",
+	"config-page-welcome": "Tule terveh MediaWikih!",
+	"config-page-dbconnect": "Yhtistä tiedokandah",
+	"config-page-dbsettings": "Tiedokanduazetukset",
+	"config-page-name": "Nimi",
+	"config-page-options": "Azetukset",
+	"config-page-install": "Azenda",
+	"config-page-complete": "Valmis!",
+	"config-page-readme": "Luve minut",
+	"config-page-copying": "Kopiruitah",
+	"config-page-upgradedoc": "Päivitetäh",
+	"config-page-existingwiki": "Olemasolii wiki",
+	"config-restart": "Muga, käynnistä uvvelleh",
+	"config-env-php": "PHP $1 on azendettu.",
+	"config-env-hhvm": "HHVM $1 on azendettu.",
+	"config-db-name": "Tiedokannan nimi:",
+	"config-db-username": "Tiedokannan käyttäinimi:",
+	"config-db-password": "Tiedokannan peittosana:",
+	"config-type-mssql": "Microsoft SQL Server",
+	"config-header-mysql": "MySQL-azetukset",
+	"config-header-postgres": "PostgreSQL-azetukset",
+	"config-header-sqlite": "SQLite-azetukset",
+	"config-header-oracle": "Oracle-azetukset",
+	"config-header-mssql": "Microsoft SQL Server azetukset",
+	"config-mysql-innodb": "InnoDB",
+	"config-mysql-myisam": "MyISAM",
+	"config-mysql-utf8": "UTF-8",
+	"config-site-name": "Wikin nimi:",
+	"config-site-name-blank": "Kirjuta sivun nimi.",
+	"config-project-namespace": "Projektan nimitila:",
+	"config-ns-generic": "Projektu",
+	"config-ns-other-default": "MinunWiki",
+	"config-admin-name": "Sinun käyttäitunnus:",
+	"config-admin-password": "Peittosana:",
+	"config-admin-password-confirm": "Peittosana myös:",
+	"config-admin-name-blank": "Kirjuta administruattoran käyttäinimi.",
+	"config-admin-password-blank": "Kirjuta administruattorutilin peittosana.",
+	"config-admin-password-mismatch": "Sinun kirjutetut kaksi peittosanua ei oldu yhtenjyttymät.",
+	"config-admin-email": "Sähköpoštuadressu:",
+	"config-optional-continue": "Kyzy minuspäi ližiä kyzymyksii.",
+	"config-optional-skip": "Olen jo terstavunnuh, vaiku azenda wiki.",
+	"config-email-settings": "Sähköpoštuazetukset",
+	"config-logo": "Logon URL:",
+	"config-skins": "Ketut",
+	"config-install-step-done": "ruattu",
+	"config-install-user-alreadyexists": "Käyttäi \"$1\" on jo olemas",
+	"config-help": "abu",
+	"config-nofile": "Failua \"$1\" ei löydynyh. Ongo se otettu iäre?"
+}
diff --git a/includes/installer/i18n/pt-br.json b/includes/installer/i18n/pt-br.json
index 4d9fa38fd4..27dddd39a2 100644
--- a/includes/installer/i18n/pt-br.json
+++ b/includes/installer/i18n/pt-br.json
@@ -16,7 +16,8 @@
 			"Marcos dias de oliveira",
 			"Fasouzafreitas",
 			"TheEduGobi",
-			"Dianakc"
+			"Dianakc",
+			"Walesson"
 		]
 	},
 	"config-desc": "O instalador do MediaWiki",
@@ -65,7 +66,7 @@
 	"config-unicode-using-intl": "Usando a [http://pecl.php.net/intl extensão intl PECL] para a normalização Unicode.",
 	"config-unicode-pure-php-warning": "<strong>Aviso</strong>: A [http://pecl.php.net/intl extensão intl PECL] não está disponível para efetuar a normalização Unicode, abortando e passando para a lenta implementação de PHP puro.\nSe o seu site tem um alto volume de tráfego, informe-se sobre a [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations normalização Unicode].",
 	"config-unicode-update-warning": "<strong>Aviso:</strong> A versão instalada do wrapper de normalização Unicode usa uma versão mais antiga da biblioteca do [//www.site.icu-project.org/projeto ICU].\nVocê deve [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations atualizar] se você tem quaisquer preocupações com o uso do Unicode.",
-	"config-no-db": "Não foi possível encontrar um driver de banco de dados adequado! É necessário instalar um driver de banco de dados para o PHP.\nSão suportados os seguintes tipos de bancos de dados: $1.\n\nSe você mesmo tiver compilado o PHP, reconfigure-o com um cliente de banco de dados ativado usando, por exemplo <code>./configure --with-mysqli</code>.\nSe você instalou o PHP a partir de um pacote do Debian ou do Ubuntu, então será também necessário instalar, por exemplo, o pacote <code>php5-mysql</code>.",
+	"config-no-db": "Não foi possível localizar um driver de banco de dados apropriado! Você precisa instalar um driver de banco de dados para PHP. O banco de dados seguinte {{PLURAL: $ 2 | | tipo é tipos são}} suportado: $ 1. Se você compilou o PHP mesmo, reconfigurá-lo com um cliente de banco de dados ativada, por exemplo, usando <code> ./ configure --with-mysqli </ code>. Se você instalou o PHP a partir de um pacote Debian ou Ubuntu, então você também precisa instalar, por exemplo, o <code> php5-mysql </ code> pacote.",
 	"config-outdated-sqlite": "<strong>Aviso:</strong> você tem o SQLite versão $1, que é menor do que a versão mínima necessária $2. O SQLite não estará disponível.",
 	"config-no-fts3": "<strong>Aviso</strong> O SQLite foi compilado sem o [//sqlite.org/fts3.html módulo FTS3], as funcionalidades de pesquisa não estarão disponíveis nesta instalação.",
 	"config-register-globals-error": "<strong>Erro: a opção <code>[http://php.net/register_globals register_globals]</code> do PHP está ativada.\nA mesma deve ser desativada para continuar a instalação.</strong>\nVeja [https://www.mediawiki.org/wiki/register_globals https://www.mediawiki.org/wiki/register_globals] para obter ajuda com isto.",
@@ -74,7 +75,7 @@
 	"config-magic-quotes-sybase": "<strong>Erro fatal: A opção [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] está ativada!</strong>\nEsta opção corrompe os dados de entrada de forma imprevisível.\nVocê não pode instalar ou utilizar o MediaWiki a menos que esta opção seja desativada.",
 	"config-mbstring": "<strong>Erro fatal: A opção [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] está ativada!</strong>\nEsta opção causa erros e pode corromper os dados de forma imprevisível.\nVocê não pode instalar ou utilizar o MediaWiki a menos que esta opção seja desativada.",
 	"config-safe-mode": "<strong>Aviso:</strong> O [http://www.php.net/features.safe-mode safe mode] do PHP está ativado.\nEste modo pode causar problemas, especialmente no upload de arquivos e no suporte a <code>math</code>.",
-	"config-xml-bad": "O módulo XML do PHP está ausente.\nO MediaWiki necessita de funções deste módulo e não funcionará com esta configuração.\nSe está utilizando o Mandrake, instale o pacote php-xml.",
+	"config-xml-bad": "Módulo XML do PHP está faltando. MediaWiki requer funções deste módulo e não vai funcionar nesta configuração. Pode ser necessário instalar o pacote RPM php-xml.",
 	"config-pcre-old": "<strong>Erro fatal:</strong> É necessário o PCRE $1 ou versão posterior.\nO binário do seu PHP foi vinculado com o PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Mais informações].",
 	"config-pcre-no-utf8": "<strong>Erro fatal:</strong> O módulo PCRE do PHP parece ser compilado sem suporte a PCRE_UTF8.\nO MediaWiki requer suporte a UTF-8 para funcionar corretamente.",
 	"config-memory-raised": "A configuração <code>memory_limit</code> do PHP era $1; foi aumentada para $2.",
@@ -110,8 +111,6 @@
 	"config-db-install-account": "Conta de usuário para instalação",
 	"config-db-username": "Nome de usuário do banco de dados:",
 	"config-db-password": "Senha do banco de dados:",
-	"config-db-password-empty": "Por favor digite uma senha para o novo usuário do banco de dados: $1. Embora seja possível criar usuários sem senha, isto não é seguro.",
-	"config-db-username-empty": "É necessário entrar um valor para \"{{int:config-db-username}}\".",
 	"config-db-install-username": "Digite o nome de usuário que será utilizado para conectar com o banco de dados durante o processo de instalação.\nEste não é a conta de usuário do MediaWiki; este é o nome de usuário para sua base de dados.",
 	"config-db-install-password": "Digite a senha que será utilizada para conectar com o banco de dados durante o processo de instalação.\nEsta não é a senha de usuário da conta do MediaWiki; esta será a senha para seu banco de dados.",
 	"config-db-install-help": "Digite o nome de usuário e a senha que serão utilizados para conectar com o banco de dados durante o processo de instalação.",
diff --git a/includes/installer/i18n/pt.json b/includes/installer/i18n/pt.json
index b63905b8c4..bbf2798228 100644
--- a/includes/installer/i18n/pt.json
+++ b/includes/installer/i18n/pt.json
@@ -60,7 +60,6 @@
 	"config-env-bad": "O ambiente foi verificado.\nNão pode instalar o MediaWiki.",
 	"config-env-php": "O PHP $1 está instalado.",
 	"config-env-hhvm": "HHVM $1 está instalado.",
-	"config-unicode-using-utf8": "A usar o utf8_normalize.so, por Brion Vibber, para a normalização Unicode.",
 	"config-unicode-using-intl": "A usar a [http://pecl.php.net/intl extensão intl PECL] para a normalização Unicode.",
 	"config-unicode-pure-php-warning": "'''Aviso''': A [http://pecl.php.net/intl extensão intl PECL] não está disponível para efetuar a normalização Unicode. Irá recorrer-se à implementação em PHP puro, que é mais lenta.\nSe o seu site tem alto volume de tráfego, devia informar-se um pouco sobre a [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations/pt normalização Unicode].",
 	"config-unicode-update-warning": "'''Aviso''': A versão instalada do wrapper de normalização Unicode usa uma versão mais antiga da biblioteca do [http://site.icu-project.org/ projeto ICU].\nDevia [//www.mediawiki.org/wiki/Special:MyLanguage/Unicode_normalization_considerations atualizá-la] se tem quaisquer preocupações sobre o uso do Unicode.",
@@ -71,12 +70,13 @@
 	"config-magic-quotes-sybase": "'''Erro fatal: A opção [http://www.php.net/manual/en/ref.info.php#ini.magic-quotes-sybase magic_quotes_sybase] está ativa!'''\nEsta opção causa corrupção dos dados de entrada, de uma forma imprevisível.\nNão pode instalar ou usar o MediaWiki a menos que esta opção seja desativada.",
 	"config-mbstring": "'''Erro fatal: A opção [http://www.php.net/manual/en/ref.mbstring.php#mbstring.overload mbstring.func_overload] está ativa!'''\nEsta opção causa erros e pode corromper os dados de uma forma imprevisível.\nNão pode instalar ou usar o MediaWiki a menos que esta opção seja desativada.",
 	"config-safe-mode": "'''Aviso:''' O [http://www.php.net/features.safe-mode safe mode] do PHP está ativo.\nEste modo pode causar problemas, especialmente no upload de ficheiros e no suporte a <code>math</code>.",
-	"config-xml-bad": "Falta o módulo XML do PHP.\nO MediaWiki necessita de funções deste módulo e não funcionará com esta configuração.\nSe está a executar o Mandrake, instale o pacote php-xml.",
+	"config-xml-bad": "Falta o módulo XML do PHP.\nO MediaWiki necessita de funções deste módulo e não funcionará com esta configuração.\nPode precisar de instalar o pacote RPM chamado php-xml.",
 	"config-pcre-old": "<strong>Erro fatal:</strong> É necessário o PCRE $1 ou versão posterior.\nO <i>link</i> do seu binário PHP foi feito com o PCRE $2.\n[https://www.mediawiki.org/wiki/Manual:Errors_and_symptoms/PCRE Mais informações].",
 	"config-pcre-no-utf8": "'''Erro fatal''': O módulo PCRE do PHP parece ter sido compilado sem suporte PCRE_UTF8.\nO MediaWiki necessita do suporte UTF-8 para funcionar corretamente.",
 	"config-memory-raised": "A configuração <code>memory_limit</code> do PHP era $1; foi aumentada para $2.",
 	"config-memory-bad": "'''Aviso:''' A configuração <code>memory_limit</code> do PHP é $1.\nIsto é provavelmente demasiado baixo.\nA instalação poderá falhar!",
 	"config-ctype": "'''Erro fatal''': O PHP tem de ser compilado com suporte para a [http://www.php.net/manual/en/ctype.installation.php extensão Ctype].",
+	"config-iconv": "<strong>Erro fatal:</strong> O PHP deve ser compilado com suporte à [http://www.php.net/manual/en/iconv.installation.php extensão iconv].",
 	"config-json": "<strong>Erro fatal:</strong> O PHP foi compilado sem suporte de JSON.\nTem de instalar a extensão JSON do PHP (incluída no PHP 5.2 ou posterior) ou a extensão [http://pecl.php.net/package/jsonc PECL jsonc] antes de instalar o MediaWiki.\n* A extensão JSON do PHP está incluída nas distribuções 5 e 6 do Red Hat Enterprise Linux (CentOS), mas tem de estar ativa nos ficheiros <code>/etc/php.ini</code> ou <code>/etc/php.d/json.ini</code>.\n* Algumas distribuições do Linux posteriores a maio de 2013 omitem a extensão JSON do PHP e substituem-na pela extensão PECL chamando-lhe <code>php5-json</code> ou <code>php-pecl-jsonc</code>.",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] instalada",
 	"config-apc": "[http://www.php.net/apc APC] instalada",
@@ -110,8 +110,6 @@
 	"config-db-install-account": "Conta do utilizador para a instalação",
 	"config-db-username": "Nome do utilizador da base de dados:",
 	"config-db-password": "Palavra-chave do utilizador da base de dados:",
-	"config-db-password-empty": "Introduza a palavra-chave do novo utilizador da base de dados: $1.\nEmbora seja possível criar utilizadores sem palavra-chave, fazê-lo não é seguro.",
-	"config-db-username-empty": "Tem de introduzir um valor para \"{{int:config-db-username}}\"",
 	"config-db-install-username": "Introduza o nome de utilizador que será usado para aceder à base de dados durante o processo de instalação. Este utilizador não é o do MediaWiki; é o utilizador da base de dados.",
 	"config-db-install-password": "Introduza a palavra-chave do utilizador que será usado para aceder à base de dados durante o processo de instalação. Esta palavra-chave não é a do utilizador do MediaWiki; é a palavra-chave do utilizador da base de dados.",
 	"config-db-install-help": "Introduza o nome de utilizador e a palavra-chave que serão usados para aceder à base de dados durante o processo de instalação.",
diff --git a/includes/installer/i18n/qqq.json b/includes/installer/i18n/qqq.json
index 89f2dd99c2..bb42d88f62 100644
--- a/includes/installer/i18n/qqq.json
+++ b/includes/installer/i18n/qqq.json
@@ -82,7 +82,7 @@
 	"config-memory-bad": "Parameters:\n* $1 is the configured <code>memory_limit</code>.",
 	"config-ctype": "Message if support for [http://www.php.net/manual/en/ctype.installation.php Ctype] is missing from PHP.\n{{Related|Config-fatal}}",
 	"config-iconv": "Message if support for [http://www.php.net/manual/en/iconv.installation.php iconv] is missing from PHP.\n{{Related|Config-fatal}}",
-	"config-json": "Message if support for [[wikipedia:JSON|JSON]] is missing from PHP.\n* \"[[wikipedia:Red Hat Enterprise Linux|Red Hat Enterprise Linux]]\" (RHEL) and \"[[wikipedia:CentOS|CentOS]]\" refer to two almost-identical Linux distributions. \"5 and 6\" refers to version 5 or 6 of either distribution. Because RHEL 7 likely will not include the PHP extension, do not translate as \"5 or newer\".\n* \"The [http://www.php.net/json PHP extension]\" is the JSON extension included with PHP 5.2 and newer.\n* \"The [http://pecl.php.net/package/jsonc PECL extension]\" is based on the PHP extension, though excludes code some distributions have found unacceptable (see [[bugzilla:47431]]).\n{{Related|Config-fatal}}",
+	"config-json": "Message if support for [[wikipedia:JSON|JSON]] is missing from PHP.\n* \"[[wikipedia:Red Hat Enterprise Linux|Red Hat Enterprise Linux]]\" (RHEL) and \"[[wikipedia:CentOS|CentOS]]\" refer to two almost-identical Linux distributions. \"5 and 6\" refers to version 5 or 6 of either distribution. Because RHEL 7 likely will not include the PHP extension, do not translate as \"5 or newer\".\n* \"The [http://www.php.net/json PHP extension]\" is the JSON extension included with PHP 5.2 and newer.\n* \"The [http://pecl.php.net/package/jsonc PECL extension]\" is based on the PHP extension, though excludes code some distributions have found unacceptable (see [[phab:T49431]]).\n{{Related|Config-fatal}}",
 	"config-xcache": "Message indicates if this program is available",
 	"config-apc": "Message indicates if this program is available",
 	"config-wincache": "Message indicates if this program is available",
diff --git a/includes/installer/i18n/sq.json b/includes/installer/i18n/sq.json
index ee688823e8..7f0ad67f51 100644
--- a/includes/installer/i18n/sq.json
+++ b/includes/installer/i18n/sq.json
@@ -4,9 +4,40 @@
 			"Ammartivari"
 		]
 	},
+	"config-desc": "Instaluesi për MediaWiki",
+	"config-title": "Instalimi MediaWiki $1",
+	"config-information": "Të dhëna",
+	"config-your-language": "Gjuha juaj:",
+	"config-your-language-help": "Zgjidhni një gjuhë për ta përdorur gjatë procesit të instalimit.",
+	"config-wiki-language": "Gjuha wiki:",
+	"config-wiki-language-help": "Zgjidhni gjuhën në të cilën wiki do të jetë kryesisht e shkruar.",
+	"config-back": "← Prapa",
+	"config-continue": "Para →",
+	"config-page-language": "Gjuha",
+	"config-page-welcome": "Mirë se vini në MediaWiki!",
+	"config-page-dbconnect": "Lidhuni me bazën e të dhënave",
+	"config-page-dbsettings": "Cilësimet e bazës së të dhënave",
+	"config-page-name": "Emri",
+	"config-page-options": "Opcionet",
+	"config-page-install": "Instalo",
+	"config-page-complete": "Përfundoi!",
+	"config-page-restart": "Rinisni instalimin",
+	"config-page-copying": "Duke kopjuar",
+	"config-restart": "Po, rinisni",
+	"config-xcache": "[http://xcache.lighttpd.net/ XCache] u instalua",
+	"config-apc": "[http://www.php.net/apc APC] u instalua",
+	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] u instalua",
+	"config-diff3-bad": "GNU diff3 nuk u gjet.",
+	"config-db-wiki-settings": "Identifikoni këtë wiki",
+	"config-db-name": "Emri i bazës së të dhënave:",
 	"config-admin-box": "Llogari administruesi",
 	"config-admin-name-blank": "Shkruani nofkën e një administruesi.",
 	"config-admin-password-blank": "Shkruani një fjalëkalim për llogarinë e administruesit.",
+	"config-admin-email": "Email adresa:",
+	"config-license-pd": "Domeni publik",
+	"config-logo": "URL-ja i logos:",
+	"config-install-tables": "Duke krijuar tabela",
+	"config-help": "ndihmë",
 	"mainpagetext": "'''MediaWiki software u instalua me sukses.'''",
 	"mainpagedocfooter": "Për më shumë informata rreth përdorimit të softwerit wiki , ju lutem shikoni [//meta.wikimedia.org/wiki/Help:Contents dokumentacionin përkatës].\n\n== Sa për fillim==\n* [//www.mediawiki.org/wiki/Help:Configuration_settings Parazgjedhjet e MediaWiki-t]\n* [//www.mediawiki.org/wiki/Help:FAQ Pyetjet e shpeshta rreth MediaWiki-t]\n* [https://lists.wikimedia.org/mailman/listinfo/mediawiki-announce Njoftime rreth MediaWiki-t]"
 }
diff --git a/includes/installer/i18n/sr-ec.json b/includes/installer/i18n/sr-ec.json
index c63ac0084b..95dad252a4 100644
--- a/includes/installer/i18n/sr-ec.json
+++ b/includes/installer/i18n/sr-ec.json
@@ -4,7 +4,8 @@
 			"Rancher",
 			"Михајло Анђелковић",
 			"Milicevic01",
-			"Aktron"
+			"Aktron",
+			"Сербијана"
 		]
 	},
 	"config-desc": "Инсталација за Медијавики",
@@ -37,6 +38,7 @@
 	"config-help-restart": "Желите ли да обришете све сачуване податке које сте унели и поново покренете инсталацију?",
 	"config-restart": "Да, покрени поново",
 	"config-env-php": "PHP $1 је инсталиран.",
+	"config-env-hhvm": "HHVM $1 је инсталиран.",
 	"config-xcache": "[http://xcache.lighttpd.net/ XCache] је инсталиран",
 	"config-apc": "[http://www.php.net/apc APC] је инсталиран",
 	"config-wincache": "[http://www.iis.net/download/WinCacheForPhp WinCache] је инсталиран",
@@ -44,7 +46,6 @@
 	"config-db-host": "Хост базе података",
 	"config-db-name": "Назив базе података:",
 	"config-db-password": "Лозинка за базу података:",
-	"config-db-password-empty": "Унесите лозинку за новог корисника базе података: ($1).\n\nМада је могуће отворити налоге без лозинки, то се не препоручује.",
 	"config-type-mysql": "MySQL (или компактибилан)",
 	"config-type-postgres": "PostgreSQL",
 	"config-type-sqlite": "SQLite",
diff --git a/includes/installer/i18n/tokipona.json b/includes/installer/i18n/tokipona.json
new file mode 100644
index 0000000000..348380f7bc
--- /dev/null
+++ b/includes/installer/i18n/tokipona.json
@@ -0,0 +1,8 @@
+{
+	"@metadata": {
+		"authors": [
+			"Robin0van0der0vliet"
+		]
+	},
+	"config-page-language": "toki"
+}
diff --git a/includes/installer/i18n/yi.json b/includes/installer/i18n/yi.json
index 92b2d3b557..e877280347 100644
--- a/includes/installer/i18n/yi.json
+++ b/includes/installer/i18n/yi.json
@@ -46,11 +46,17 @@
 	"config-using-server": "באניצן סארווער־נאמען \"<nowiki>$1</nowiki>\".",
 	"config-using-uri": "באניצן סארווער־אדרעס \"<nowiki>$1$2</nowiki>\".",
 	"config-db-type": "דאטנבאזע טיפ:",
+	"config-db-host": "דאטנבאזע־סארווער:",
 	"config-db-host-oracle": "דאטנבאזע־TNS:",
 	"config-db-wiki-settings": "אידענטיפיצירן די דאזיקע וויקי",
 	"config-db-name": "דאטנבאזע נאָמען:",
+	"config-db-install-account": "באניצער־קאנטע פאר אינסטאלאציע",
 	"config-db-username": "דאטנבאזע באניצער־נאָמען:",
 	"config-db-password": "דאטנבאזע־פאסווארט:",
+	"config-invalid-db-type": "אומגילטיגער דאטנבאזע־טיפ",
+	"config-missing-db-name": "איר דארפט איינגעבן א ווערט פאר \"{{int:config-db-name}}\".",
+	"config-missing-db-host": "איר דארפט איינגעבן א ווערט פאר \"{{int:config-db-host}}\".",
+	"config-missing-db-server-oracle": "איר דארפט איינגעבן א ווערט פאר \"{{int:config-db-host-oracle}}\".",
 	"config-project-namespace": "פראיעקט נאָמענטייל:",
 	"config-ns-generic": "פראיעקט",
 	"config-admin-name": "אײַער באַניצער־נאָמען:",
diff --git a/includes/libs/ReplacementArray.php b/includes/libs/ReplacementArray.php
index 185914ceb0..b6faa3786d 100644
--- a/includes/libs/ReplacementArray.php
+++ b/includes/libs/ReplacementArray.php
@@ -111,7 +111,10 @@ class ReplacementArray {
 	 * @return string
 	 */
 	public function replace( $subject ) {
-		if ( function_exists( 'fss_prep_replace' ) ) {
+		if (
+			function_exists( 'fss_prep_replace' )  &&
+			version_compare( PHP_VERSION, '5.5.0' ) < 0
+		) {
 			if ( $this->fss === false ) {
 				$this->fss = fss_prep_replace( $this->data );
 			}
diff --git a/includes/libs/virtualrest/ParsoidVirtualRESTService.php b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
index 4c96e297f5..43dfab3cf2 100644
--- a/includes/libs/virtualrest/ParsoidVirtualRESTService.php
+++ b/includes/libs/virtualrest/ParsoidVirtualRESTService.php
@@ -54,6 +54,7 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 		}
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
+			'name' => 'parsoid',
 			'url' => 'http://localhost:8000/',
 			'prefix' => 'localhost',
 			'domain' => 'localhost',
@@ -91,7 +92,7 @@ class ParsoidVirtualRESTService extends VirtualRESTService {
 				// $revision (optional)
 			) = $parts;
 
-			if ( $this->params['restbaseCompat'] ) {
+			if ( isset( $this->params['restbaseCompat'] ) && $this->params['restbaseCompat'] ) {
 				if ( $version !== 'v1' ) {
 					throw new Exception( "Only RESTBase v1 API is supported." );
 				}
diff --git a/includes/libs/virtualrest/RestbaseVirtualRESTService.php b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
index bc520aa106..3a7bc5877c 100644
--- a/includes/libs/virtualrest/RestbaseVirtualRESTService.php
+++ b/includes/libs/virtualrest/RestbaseVirtualRESTService.php
@@ -48,6 +48,7 @@ class RestbaseVirtualRESTService extends VirtualRESTService {
 	public function __construct( array $params ) {
 		// set up defaults and merge them with the given params
 		$mparams = array_merge( array(
+			'name' => 'restbase',
 			'url' => 'http://localhost:7231/',
 			'domain' => 'localhost',
 			'timeout' => 100,
diff --git a/includes/libs/virtualrest/SwiftVirtualRESTService.php b/includes/libs/virtualrest/SwiftVirtualRESTService.php
index 011dabe080..88b0e1f14a 100644
--- a/includes/libs/virtualrest/SwiftVirtualRESTService.php
+++ b/includes/libs/virtualrest/SwiftVirtualRESTService.php
@@ -45,7 +45,11 @@ class SwiftVirtualRESTService extends VirtualRESTService {
 	 *   - swiftAuthTTL       : Swift authentication TTL (seconds)
 	 */
 	public function __construct( array $params ) {
-		parent::__construct( $params );
+		// set up defaults and merge them with the given params
+		$mparams = array_merge( array(
+			'name' => 'swift'
+		), $params );
+		parent::__construct( $mparams );
 	}
 
 	/**
diff --git a/includes/libs/virtualrest/VirtualRESTService.php b/includes/libs/virtualrest/VirtualRESTService.php
index 2a0b3f088d..01a4ea6edf 100644
--- a/includes/libs/virtualrest/VirtualRESTService.php
+++ b/includes/libs/virtualrest/VirtualRESTService.php
@@ -44,6 +44,17 @@ abstract class VirtualRESTService {
 		$this->params = $params;
 	}
 
+	/**
+	 * Return the name of this service, in a form suitable for error
+	 * reporting or debugging.
+	 *
+	 * @return string The name of the service behind this VRS object.
+	 */
+	public function getName() {
+		return isset( $this->params['name'] ) ? $this->params['name'] :
+			get_class( $this );
+	}
+
 	/**
 	 * Prepare virtual HTTP(S) requests (for this service) for execution
 	 *
diff --git a/includes/media/Bitmap.php b/includes/media/Bitmap.php
index 4be20b243c..1f00650445 100644
--- a/includes/media/Bitmap.php
+++ b/includes/media/Bitmap.php
@@ -70,8 +70,7 @@ class BitmapHandler extends TransformationalImageHandler {
 	protected function transformImageMagick( $image, $params ) {
 		# use ImageMagick
 		global $wgSharpenReductionThreshold, $wgSharpenParameter, $wgMaxAnimatedGifArea,
-			$wgImageMagickTempDir, $wgImageMagickConvertCommand, $wgResourceBasePath,
-			$wgUseTinyRGBForJPGThumbnails;
+			$wgImageMagickTempDir, $wgImageMagickConvertCommand;
 
 		$quality = array();
 		$sharpen = array();
diff --git a/includes/media/DjVuImage.php b/includes/media/DjVuImage.php
index dbbe991b18..dac76fad17 100644
--- a/includes/media/DjVuImage.php
+++ b/includes/media/DjVuImage.php
@@ -150,7 +150,7 @@ class DjVuImage {
 				wfDebug( __METHOD__ . ": not a DjVu file\n" );
 			} elseif ( $subtype == 'DJVU' ) {
 				// Single-page document
-				$info = $this->getPageInfo( $file, $formLength );
+				$info = $this->getPageInfo( $file );
 			} elseif ( $subtype == 'DJVM' ) {
 				// Multi-page document
 				$info = $this->getMultiPageInfo( $file, $formLength );
@@ -202,7 +202,7 @@ class DjVuImage {
 				if ( $subtype == 'DJVU' ) {
 					wfDebug( __METHOD__ . ": found first subpage\n" );
 
-					return $this->getPageInfo( $file, $length );
+					return $this->getPageInfo( $file );
 				}
 				$this->skipChunk( $file, $length - 4 );
 			} else {
@@ -216,7 +216,7 @@ class DjVuImage {
 		return false;
 	}
 
-	private function getPageInfo( $file, $formLength ) {
+	private function getPageInfo( $file ) {
 		list( $chunk, $length ) = $this->readChunk( $file );
 		if ( $chunk != 'INFO' ) {
 			wfDebug( __METHOD__ . ": expected INFO chunk, got '$chunk'\n" );
diff --git a/includes/media/SVGMetadataExtractor.php b/includes/media/SVGMetadataExtractor.php
index 8afa31b668..1ec2f814d6 100644
--- a/includes/media/SVGMetadataExtractor.php
+++ b/includes/media/SVGMetadataExtractor.php
@@ -319,16 +319,6 @@ class SVGReader {
 		}
 	}
 
-	// @todo FIXME: Unused, remove?
-	private function warn( $data ) {
-		wfDebug( "SVGReader: $data\n" );
-	}
-
-	// @todo FIXME: Unused, remove?
-	private function notice( $data ) {
-		wfDebug( "SVGReader WARN: $data\n" );
-	}
-
 	/**
 	 * Parse the attributes of an SVG element
 	 *
diff --git a/includes/media/XMPInfo.php b/includes/media/XMPInfo.php
index 97aa796d6d..1d8d777199 100644
--- a/includes/media/XMPInfo.php
+++ b/includes/media/XMPInfo.php
@@ -34,8 +34,6 @@ class XMPInfo {
 		return self::$items;
 	}
 
-	static private $ranHooks = false;
-
 	/**
 	 * XMPInfo::$items keeps a list of all the items
 	 * we are interested to extract, as well as
diff --git a/includes/objectcache/MemcachedPeclBagOStuff.php b/includes/objectcache/MemcachedPeclBagOStuff.php
index 7e6a4d7074..1b2c8db62e 100644
--- a/includes/objectcache/MemcachedPeclBagOStuff.php
+++ b/includes/objectcache/MemcachedPeclBagOStuff.php
@@ -236,8 +236,13 @@ class MemcachedPeclBagOStuff extends MemcachedBagOStuff {
 	public function getMulti( array $keys, $flags = 0 ) {
 		$this->debugLog( 'getMulti(' . implode( ', ', $keys ) . ')' );
 		$callback = array( $this, 'encodeKey' );
-		$result = $this->client->getMulti( array_map( $callback, $keys ) );
-		$result = $result ?: array(); // must be an array
+		$encodedResult = $this->client->getMulti( array_map( $callback, $keys ) );
+		$encodedResult = $encodedResult ?: array(); // must be an array
+		$result = array();
+		foreach ( $encodedResult as $key => $value ) {
+			$key = $this->decodeKey( $key );
+			$result[$key] = $value;
+		}
 		return $this->checkResult( false, $result );
 	}
 
diff --git a/includes/objectcache/MemcachedPhpBagOStuff.php b/includes/objectcache/MemcachedPhpBagOStuff.php
index 69792ada56..6f0ba58820 100644
--- a/includes/objectcache/MemcachedPhpBagOStuff.php
+++ b/includes/objectcache/MemcachedPhpBagOStuff.php
@@ -59,7 +59,13 @@ class MemcachedPhpBagOStuff extends MemcachedBagOStuff {
 
 	public function getMulti( array $keys, $flags = 0 ) {
 		$callback = array( $this, 'encodeKey' );
-		return $this->client->get_multi( array_map( $callback, $keys ) );
+		$encodedResult = $this->client->get_multi( array_map( $callback, $keys ) );
+		$result = array();
+		foreach ( $encodedResult as $key => $value ) {
+			$key = $this->decodeKey( $key );
+			$result[$key] = $value;
+		}
+		return $result;
 	}
 
 	/**
diff --git a/includes/page/ImagePage.php b/includes/page/ImagePage.php
index 4ec377adfd..43b12b2145 100644
--- a/includes/page/ImagePage.php
+++ b/includes/page/ImagePage.php
@@ -219,6 +219,9 @@ class ImagePage extends Article {
 		}
 		// always show the local local Filepage.css, bug 29277
 		$out->addModuleStyles( 'filepage' );
+
+		// Add MediaWiki styles for a file page
+		$out->addModuleStyles( 'mediawiki.action.view.filepage' );
 	}
 
 	/**
@@ -706,7 +709,7 @@ EOT
 		$out->addHTML( "<ul>\n" );
 
 		# "Upload a new version of this file" link
-		$canUpload = $this->getTitle()->userCan( 'upload', $this->getContext()->getUser() );
+		$canUpload = $this->getTitle()->quickUserCan( 'upload', $this->getContext()->getUser() );
 		if ( $canUpload && UploadBase::userCanReUpload(
 				$this->getContext()->getUser(),
 				$this->mPage->getFile()->name )
diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index e29ee88f6d..807842b61c 100644
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -21,88 +21,6 @@
  * @ingroup Parser
  */
 
-/**
- * Class used to hide mw:editsection tokens from Tidy so that it doesn't break them
- * or break on them. This is a bit of a hack for now, but hopefully in the future
- * we may create a real postprocessor or something that will replace this.
- * It's called wrapper because for now it basically takes over MWTidy::tidy's task
- * of wrapping the text in a xhtml block
- *
- * This re-uses some of the parser's UNIQ tricks, though some of it is private so it's
- * duplicated. Perhaps we should create an abstract marker hiding class.
- *
- * @ingroup Parser
- */
-class MWTidyWrapper {
-
-	/**
-	 * @var ReplacementArray
-	 */
-	protected $mTokens;
-
-	protected $mMarkerIndex;
-
-	public function __construct() {
-		$this->mTokens = null;
-	}
-
-	/**
-	 * @param string $text
-	 * @return string
-	 */
-	public function getWrapped( $text ) {
-		$this->mTokens = new ReplacementArray;
-		$this->mMarkerIndex = 0;
-
-		// Replace <mw:editsection> elements with placeholders
-		$wrappedtext = preg_replace_callback( ParserOutput::EDITSECTION_REGEX,
-			array( &$this, 'replaceCallback' ), $text );
-		// ...and <mw:toc> markers
-		$wrappedtext = preg_replace_callback( '/\<\\/?mw:toc\>/',
-			array( &$this, 'replaceCallback' ), $wrappedtext );
-		// ... and <math> tags
-		$wrappedtext = preg_replace_callback( '/\<math(.*?)\<\\/math\>/s',
-			array( &$this, 'replaceCallback' ), $wrappedtext );
-		// Modify inline Microdata <link> and <meta> elements so they say <html-link> and <html-meta> so
-		// we can trick Tidy into not stripping them out by including them in tidy's new-empty-tags config
-		$wrappedtext = preg_replace( '!<(link|meta)([^>]*?)(/{0,1}>)!', '<html-$1$2$3', $wrappedtext );
-
-		// Wrap the whole thing in a doctype and body for Tidy.
-		$wrappedtext = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' .
-			' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>' .
-			'<head><title>test</title></head><body>' . $wrappedtext . '</body></html>';
-
-		return $wrappedtext;
-	}
-
-	/**
-	 * @param array $m
-	 *
-	 * @return string
-	 */
-	public function replaceCallback( $m ) {
-		$marker = Parser::MARKER_PREFIX . "-item-{$this->mMarkerIndex}" . Parser::MARKER_SUFFIX;
-		$this->mMarkerIndex++;
-		$this->mTokens->setPair( $marker, $m[0] );
-		return $marker;
-	}
-
-	/**
-	 * @param string $text
-	 * @return string
-	 */
-	public function postprocess( $text ) {
-		// Revert <html-{link,meta}> back to <{link,meta}>
-		$text = preg_replace( '!<html-(link|meta)([^>]*?)(/{0,1}>)!', '<$1$2$3', $text );
-
-		// Restore the contents of placeholder tokens
-		$text = $this->mTokens->replace( $text );
-
-		return $text;
-	}
-
-}
-
 /**
  * Class to interact with HTML tidy
  *
@@ -113,32 +31,24 @@ class MWTidyWrapper {
  * @ingroup Parser
  */
 class MWTidy {
+	private static $instance;
+
 	/**
-	 * Interface with html tidy, used if $wgUseTidy = true.
+	 * Interface with html tidy.
 	 * If tidy isn't able to correct the markup, the original will be
 	 * returned in all its glory with a warning comment appended.
 	 *
-	 * @param string $text Hideous HTML input
+	 * @param string $text HTML input fragment. This should not contain a
+	 *                     <body> or <html> tag.
 	 * @return string Corrected HTML output
 	 */
 	public static function tidy( $text ) {
-		$wrapper = new MWTidyWrapper;
-		$wrappedtext = $wrapper->getWrapped( $text );
-
-		$retVal = null;
-		$correctedtext = self::clean( $wrappedtext, false, $retVal );
-
-		if ( $retVal < 0 ) {
-			wfDebug( "Possible tidy configuration error!\n" );
-			return $text . "\n<!-- Tidy was unable to run -->\n";
-		} elseif ( is_null( $correctedtext ) ) {
-			wfDebug( "Tidy error detected!\n" );
-			return $text . "\n<!-- Tidy found serious XHTML errors -->\n";
+		$driver = self::singleton();
+		if ( !$driver ) {
+			throw new MWException( __METHOD__.
+				': tidy is disabled, caller should have checked MWTidy::isEnabled()' );
 		}
-
-		$correctedtext = $wrapper->postprocess( $correctedtext ); // restore any hidden tokens
-
-		return $correctedtext;
+		return $driver->tidy( $text );
 	}
 
 	/**
@@ -149,170 +59,80 @@ class MWTidy {
 	 * @return bool Whether the HTML is valid
 	 */
 	public static function checkErrors( $text, &$errorStr = null ) {
-		$retval = 0;
-		$errorStr = self::clean( $text, true, $retval );
-		return ( $retval < 0 && $errorStr == '' ) || $retval == 0;
+		$driver = self::singleton();
+		if ( !$driver ) {
+			throw new MWException( __METHOD__.
+				': tidy is disabled, caller should have checked MWTidy::isEnabled()' );
+		}
+		if ( $driver->supportsValidate() ) {
+			return $driver->validate( $text, $errorStr );
+		} else {
+			throw new MWException( __METHOD__ . ": error text return from HHVM tidy is not supported" );
+		}
 	}
 
-	/**
-	 * Perform a clean/repair operation
-	 * @param string $text HTML to check
-	 * @param bool $stderr Whether to read result from STDERR rather than STDOUT
-	 * @param int &$retval Exit code (-1 on internal error)
-	 * @return null|string
-	 * @throws MWException
-	 */
-	private static function clean( $text, $stderr = false, &$retval = null ) {
-		global $wgTidyInternal;
+	public static function isEnabled() {
+		return self::singleton() !== false;
+	}
 
-		if ( $wgTidyInternal ) {
-			if ( wfIsHHVM() ) {
-				if ( $stderr ) {
-					throw new MWException( __METHOD__ . ": error text return from HHVM tidy is not supported" );
+	protected static function singleton() {
+		global $wgUseTidy, $wgTidyInternal, $wgTidyConf, $wgDebugTidy, $wgTidyConfig,
+			$wgTidyBin, $wgTidyOpts;
+
+		if ( self::$instance === null ) {
+			if ( $wgTidyConfig !== null ) {
+				$config = $wgTidyConfig;
+			} elseif ( $wgUseTidy ) {
+				// b/c configuration
+				$config = array(
+					'tidyConfigFile' => $wgTidyConf,
+					'debugComment' => $wgDebugTidy,
+					'tidyBin' => $wgTidyBin,
+					'tidyCommandLine' => $wgTidyOpts );
+				if ( $wgTidyInternal ) {
+					if ( wfIsHHVM() ) {
+						$config['driver'] = 'RaggettInternalHHVM';
+					} else {
+						$config['driver'] = 'RaggettInternalPHP';
+					}
+				} else {
+					$config['driver'] = 'RaggettExternal';
 				}
-				return self::hhvmClean( $text, $retval );
 			} else {
-				return self::phpClean( $text, $stderr, $retval );
+				return false;
 			}
-		} else {
-			return self::externalClean( $text, $stderr, $retval );
-		}
-	}
-
-	/**
-	 * Spawn an external HTML tidy process and get corrected markup back from it.
-	 * Also called in OutputHandler.php for full page validation
-	 *
-	 * @param string $text HTML to check
-	 * @param bool $stderr Whether to read result from STDERR rather than STDOUT
-	 * @param int &$retval Exit code (-1 on internal error)
-	 * @return string|null
-	 */
-	private static function externalClean( $text, $stderr = false, &$retval = null ) {
-		global $wgTidyConf, $wgTidyBin, $wgTidyOpts;
-
-		$cleansource = '';
-		$opts = ' -utf8';
-
-		if ( $stderr ) {
-			$descriptorspec = array(
-				0 => array( 'pipe', 'r' ),
-				1 => array( 'file', wfGetNull(), 'a' ),
-				2 => array( 'pipe', 'w' )
-			);
-		} else {
-			$descriptorspec = array(
-				0 => array( 'pipe', 'r' ),
-				1 => array( 'pipe', 'w' ),
-				2 => array( 'file', wfGetNull(), 'a' )
-			);
-		}
-
-		$readpipe = $stderr ? 2 : 1;
-		$pipes = array();
-
-		$process = proc_open(
-			"$wgTidyBin -config $wgTidyConf $wgTidyOpts$opts", $descriptorspec, $pipes );
-
-		//NOTE: At least on linux, the process will be created even if tidy is not installed.
-		//      This means that missing tidy will be treated as a validation failure.
-
-		if ( is_resource( $process ) ) {
-			// Theoretically, this style of communication could cause a deadlock
-			// here. If the stdout buffer fills up, then writes to stdin could
-			// block. This doesn't appear to happen with tidy, because tidy only
-			// writes to stdout after it's finished reading from stdin. Search
-			// for tidyParseStdin and tidySaveStdout in console/tidy.c
-			fwrite( $pipes[0], $text );
-			fclose( $pipes[0] );
-			while ( !feof( $pipes[$readpipe] ) ) {
-				$cleansource .= fgets( $pipes[$readpipe], 1024 );
+			switch ( $config['driver'] ) {
+				case 'RaggettInternalHHVM':
+					self::$instance = new MediaWiki\Tidy\RaggettInternalHHVM( $config );
+					break;
+				case 'RaggettInternalPHP':
+					self::$instance = new MediaWiki\Tidy\RaggettInternalPHP( $config );
+					break;
+				case 'RaggettExternal':
+					self::$instance = new MediaWiki\Tidy\RaggettExternal( $config );
+					break;
+				case 'Html5Depurate':
+					self::$instance = new MediaWiki\Tidy\Html5Depurate( $config );
+					break;
+				default:
+					throw new MWException( "Invalid tidy driver: \"{$config['driver']}\"" );
 			}
-			fclose( $pipes[$readpipe] );
-			$retval = proc_close( $process );
-		} else {
-			wfWarn( "Unable to start external tidy process" );
-			$retval = -1;
 		}
-
-		if ( !$stderr && $cleansource == '' && $text != '' ) {
-			// Some kind of error happened, so we couldn't get the corrected text.
-			// Just give up; we'll use the source text and append a warning.
-			$cleansource = null;
-		}
-
-		return $cleansource;
+		return self::$instance;
 	}
 
 	/**
-	 * Use the HTML tidy extension to use the tidy library in-process,
-	 * saving the overhead of spawning a new process.
-	 *
-	 * @param string $text HTML to check
-	 * @param bool $stderr Whether to read result from error status instead of output
-	 * @param int &$retval Exit code (-1 on internal error)
-	 * @return string|null
+	 * Set the driver to be used. This is for testing.
+	 * @param TidyDriverBase|false|null $instance
 	 */
-	private static function phpClean( $text, $stderr = false, &$retval = null ) {
-		global $wgTidyConf, $wgDebugTidy;
-
-		if ( ( !wfIsHHVM() && !class_exists( 'tidy' ) ) ||
-			( wfIsHHVM() && !function_exists( 'tidy_repair_string' ) )
-		) {
-			wfWarn( "Unable to load internal tidy class." );
-			$retval = -1;
-
-			return null;
-		}
-
-		$tidy = new tidy;
-		$tidy->parseString( $text, $wgTidyConf, 'utf8' );
-
-		if ( $stderr ) {
-			$retval = $tidy->getStatus();
-			return $tidy->errorBuffer;
-		}
-
-		$tidy->cleanRepair();
-		$retval = $tidy->getStatus();
-		if ( $retval == 2 ) {
-			// 2 is magic number for fatal error
-			// http://www.php.net/manual/en/function.tidy-get-status.php
-			$cleansource = null;
-		} else {
-			$cleansource = tidy_get_output( $tidy );
-			if ( $wgDebugTidy && $retval > 0 ) {
-				$cleansource .= "<!--\nTidy reports:\n" .
-					str_replace( '-->', '--&gt;', $tidy->errorBuffer ) .
-					"\n-->";
-			}
-		}
-
-		return $cleansource;
+	public static function setInstance( $instance ) {
+		self::$instance = $instance;
 	}
 
 	/**
-	 * Use the tidy extension for HHVM from
-	 * https://github.com/wikimedia/mediawiki-php-tidy
-	 *
-	 * This currently does not support the object-oriented interface, but
-	 * tidy_repair_string() can be used for the most common tasks.
-	 *
-	 * @param string $text HTML to check
-	 * @param int &$retval Exit code (-1 on internal error)
-	 * @return string|null
+	 * Destroy the current singleton instance
 	 */
-	private static function hhvmClean( $text, &$retval ) {
-		global $wgTidyConf;
-
-		$cleansource = tidy_repair_string( $text, $wgTidyConf, 'utf8' );
-		if ( $cleansource === false ) {
-			$cleansource = null;
-			$retval = -1;
-		} else {
-			$retval = 0;
-		}
-
-		return $cleansource;
+	public static function destroySingleton() {
+		self::$instance = null;
 	}
 }
diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index 664f0a4be0..677da63bd7 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -1283,8 +1283,6 @@ class Parser {
 	 * @return string
 	 */
 	private function internalParseHalfParsed( $text, $isMain = true, $linestart = true ) {
-		global $wgUseTidy, $wgAlwaysUseTidy;
-
 		$text = $this->mStripState->unstripGeneral( $text );
 
 		if ( $isMain ) {
@@ -1335,7 +1333,7 @@ class Parser {
 
 		$text = Sanitizer::normalizeCharReferences( $text );
 
-		if ( ( $wgUseTidy && $this->mOptions->getTidy() ) || $wgAlwaysUseTidy ) {
+		if ( MWTidy::isEnabled() && $this->mOptions->getTidy() ) {
 			$text = MWTidy::tidy( $text );
 		} else {
 			# attempt to sanitize at least some nesting problems
@@ -3326,7 +3324,8 @@ class Parser {
 	 */
 	public function replaceVariables( $text, $frame = false, $argsOnly = false ) {
 		# Is there any text? Also, Prevent too big inclusions!
-		if ( strlen( $text ) < 1 || strlen( $text ) > $this->mOptions->getMaxIncludeSize() ) {
+		$textSize = strlen( $text );
+		if ( $textSize < 1 || $textSize > $this->mOptions->getMaxIncludeSize() ) {
 			return $text;
 		}
 
diff --git a/includes/parser/ParserOptions.php b/includes/parser/ParserOptions.php
index 4459047a35..1073aed817 100644
--- a/includes/parser/ParserOptions.php
+++ b/includes/parser/ParserOptions.php
@@ -802,6 +802,10 @@ class ParserOptions {
 
 		$confstr .= $wgRenderHashAppend;
 
+		// @note: as of Feb 2015, core never sets the editsection flag, since it uses
+		// <mw:editsection> tags to inject editsections on the fly. However, extensions
+		// may be using it by calling ParserOption::optionUsed resp. ParserOutput::registerOption
+		// directly. At least Wikibase does at this point in time.
 		if ( !in_array( 'editsection', $forOptions ) ) {
 			$confstr .= '!*';
 		} elseif ( !$this->mEditSection ) {
diff --git a/includes/parser/Preprocessor_Hash.php b/includes/parser/Preprocessor_Hash.php
index 8ddb401f7a..9429e442e7 100644
--- a/includes/parser/Preprocessor_Hash.php
+++ b/includes/parser/Preprocessor_Hash.php
@@ -734,8 +734,12 @@ class Preprocessor_Hash implements Preprocessor {
 		// Cache
 		if ( $cacheable ) {
 			$cacheValue = sprintf( "%08d", self::CACHE_VERSION ) . serialize( $rootNode );
-			$wgMemc->set( $cacheKey, $cacheValue, 86400 );
-			wfDebugLog( "Preprocessor", "Saved preprocessor Hash to memcached (key $cacheKey)" );
+
+			// T111289: Cache values should not exceed 1 Mb, but they do.
+			if ( strlen( $cacheValue ) <= 1e6 ) {
+				$wgMemc->set( $cacheKey, $cacheValue, 86400 );
+				wfDebugLog( "Preprocessor", "Saved preprocessor Hash to memcached (key $cacheKey)" );
+			}
 		}
 
 		return $rootNode;
diff --git a/includes/poolcounter/PoolCounterRedis.php b/includes/poolcounter/PoolCounterRedis.php
index 98797a30a1..d7357cfe8e 100644
--- a/includes/poolcounter/PoolCounterRedis.php
+++ b/includes/poolcounter/PoolCounterRedis.php
@@ -76,7 +76,7 @@ class PoolCounterRedis extends PoolCounter {
 	const AWAKE_ONE = 1; // wake-up if when a slot can be taken from an existing process
 	const AWAKE_ALL = 2; // wake-up if an existing process finishes and wake up such others
 
-	/** @var array List of active PoolCounterRedis objects in this script */
+	/** @var PoolCounterRedis[] List of active PoolCounterRedis objects in this script */
 	protected static $active = null;
 
 	function __construct( $conf, $type, $key ) {
@@ -121,7 +121,6 @@ class PoolCounterRedis extends PoolCounter {
 	}
 
 	function acquireForMe() {
-
 		$status = $this->precheckAcquire();
 		if ( !$status->isGood() ) {
 			return $status;
@@ -131,7 +130,6 @@ class PoolCounterRedis extends PoolCounter {
 	}
 
 	function acquireForAnyone() {
-
 		$status = $this->precheckAcquire();
 		if ( !$status->isGood() ) {
 			return $status;
@@ -141,7 +139,6 @@ class PoolCounterRedis extends PoolCounter {
 	}
 
 	function release() {
-
 		if ( $this->slot === null ) {
 			return Status::newGood( PoolCounter::NOT_LOCKED ); // not locked
 		}
@@ -190,7 +187,7 @@ class PoolCounterRedis extends PoolCounter {
 		return 1
 LUA;
 		try {
-			$res = $conn->luaEval( $script,
+			$conn->luaEval( $script,
 				array(
 					$this->getSlotListKey(),
 					$this->getSlotRTimeSetKey(),
diff --git a/includes/registration/ExtensionProcessor.php b/includes/registration/ExtensionProcessor.php
index dc35347bdb..ca84a513ef 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -305,9 +305,15 @@ class ExtensionProcessor implements Processor {
 	 */
 	protected function extractConfig( array $info ) {
 		if ( isset( $info['config'] ) ) {
+			if ( isset( $info['config']['_prefix'] ) ) {
+				$prefix = $info['config']['_prefix'];
+				unset( $info['config']['_prefix'] );
+			} else {
+				$prefix = 'wg';
+			}
 			foreach ( $info['config'] as $key => $val ) {
 				if ( $key[0] !== '@' ) {
-					$this->globals["wg$key"] = $val;
+					$this->globals["$prefix$key"] = $val;
 				}
 			}
 		}
diff --git a/includes/registration/ExtensionRegistry.php b/includes/registration/ExtensionRegistry.php
index b89518ad28..f838103928 100644
--- a/includes/registration/ExtensionRegistry.php
+++ b/includes/registration/ExtensionRegistry.php
@@ -222,14 +222,7 @@ class ExtensionRegistry {
 					$GLOBALS[$key] = array_merge_recursive( $GLOBALS[$key], $val );
 					break;
 				case 'array_plus_2d':
-					// First merge items that are in both arrays
-					foreach ( $GLOBALS[$key] as $name => &$groupVal ) {
-						if ( isset( $val[$name] ) ) {
-							$groupVal += $val[$name];
-						}
-					}
-					// Now add items that didn't exist yet
-					$GLOBALS[$key] += $val;
+					$GLOBALS[$key] = wfArrayPlus2d( $GLOBALS[$key], $val );
 					break;
 				case 'array_plus':
 					$GLOBALS[$key] = $val + $GLOBALS[$key];
diff --git a/includes/resourceloader/ResourceLoader.php b/includes/resourceloader/ResourceLoader.php
index fd2263bfd2..b8ec63bb29 100644
--- a/includes/resourceloader/ResourceLoader.php
+++ b/includes/resourceloader/ResourceLoader.php
@@ -191,6 +191,7 @@ class ResourceLoader implements LoggerAwareInterface {
 		}
 		// Defaults
 		$options += array( 'cache' => true, 'cacheReport' => false );
+		$stats = RequestContext::getMain()->getStats();
 
 		// Don't filter empty content
 		if ( trim( $data ) === '' ) {
@@ -211,18 +212,16 @@ class ResourceLoader implements LoggerAwareInterface {
 			$cache = wfGetCache( wfIsHHVM() ? CACHE_ACCEL : CACHE_ANYTHING );
 			$cacheEntry = $cache->get( $key );
 			if ( is_string( $cacheEntry ) ) {
-				wfIncrStats( "resourceloader_cache.$filter.hit" );
+				$stats->increment( "resourceloader_cache.$filter.hit" );
 				return $cacheEntry;
 			}
 			$result = '';
 			try {
-				$stats = RequestContext::getMain()->getStats();
 				$statStart = microtime( true );
-
 				$result = self::applyFilter( $filter, $data, $this->config );
-
 				$statTiming = microtime( true ) - $statStart;
-				$stats->timing( "resourceloader_cache.$filter.miss", 1000 * $statTiming );
+				$stats->increment( "resourceloader_cache.$filter.miss" );
+				$stats->timing( "resourceloader_cache.$filter.timing", 1000 * $statTiming );
 				if ( $options['cacheReport'] ) {
 					$result .= "\n/* cache key: $key */";
 				}
@@ -1626,9 +1625,6 @@ MESSAGE;
 		$less->setPreserveComments( true );
 		$less->setVariables( self::getLessVars( $config ) );
 		$less->setImportDir( $config->get( 'ResourceLoaderLESSImportPaths' ) );
-		foreach ( $config->get( 'ResourceLoaderLESSFunctions' ) as $name => $func ) {
-			$less->registerFunction( $name, $func );
-		}
 		return $less;
 	}
 
diff --git a/includes/resourceloader/ResourceLoaderFileModule.php b/includes/resourceloader/ResourceLoaderFileModule.php
index 3224b13523..4a4a828527 100644
--- a/includes/resourceloader/ResourceLoaderFileModule.php
+++ b/includes/resourceloader/ResourceLoaderFileModule.php
@@ -591,10 +591,14 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 
 		$options = array();
 		foreach ( array(
-			// T104950: Do not include localBasePath or remoteBasePath!
-			// Those paths may vary over time and needlessly invalidate cache. If the path changes
-			// in a way that makes relative file paths point to something else, getFileHashes() will
-			// account for that already.
+			// The following properties are omitted because they don't affect the module reponse:
+			// - localBasePath (Per T104950; Changes when absolute directory name changes. If
+			//    this affects 'scripts' and other file paths, getFileHashes accounts for that.)
+			// - remoteBasePath (Per T104950)
+			// - dependencies (provided via startup module)
+			// - targets
+			// - group (provided via startup module)
+			// - position (only used by OutputPage)
 			'scripts',
 			'debugScripts',
 			'loaderScripts',
@@ -602,12 +606,8 @@ class ResourceLoaderFileModule extends ResourceLoaderModule {
 			'languageScripts',
 			'skinScripts',
 			'skinStyles',
-			'dependencies',
 			'messages',
-			'targets',
 			'templates',
-			'group',
-			'position',
 			'skipFunction',
 			'debugRaw',
 			'raw',
diff --git a/includes/skins/SkinTemplate.php b/includes/skins/SkinTemplate.php
index a1844a81b2..baf9d95478 100644
--- a/includes/skins/SkinTemplate.php
+++ b/includes/skins/SkinTemplate.php
@@ -54,12 +54,18 @@ class SkinTemplate extends Skin {
 		$moduleStyles = array(
 			'mediawiki.legacy.shared',
 			'mediawiki.legacy.commonPrint',
-			'mediawiki.ui.button',
 			'mediawiki.sectionAnchor'
 		);
 		if ( $out->isSyndicated() ) {
 			$moduleStyles[] = 'mediawiki.feedlink';
 		}
+
+		// Deprecated since 1.26: Unconditional loading of mediawiki.ui.button
+		// on every page is deprecated. Express a dependency instead.
+		if ( strpos( $out->getHTML(), 'mw-ui-button' ) !== false ) {
+			$moduleStyles[] = 'mediawiki.ui.button';
+		}
+
 		$out->addModuleStyles( $moduleStyles );
 	}
 
diff --git a/includes/specials/SpecialEditTags.php b/includes/specials/SpecialEditTags.php
index f41a1f1ded..54f50d9ed7 100644
--- a/includes/specials/SpecialEditTags.php
+++ b/includes/specials/SpecialEditTags.php
@@ -349,20 +349,18 @@ class SpecialEditTags extends UnlistedSpecialPage {
 	protected function getTagSelect( $selectedTags, $label ) {
 		$result = array();
 		$result[0] = Xml::label( $label, 'mw-edittags-tag-list' );
-		$result[1] = Xml::openElement( 'select', array(
-			'name' => 'wpTagList[]',
-			'id' => 'mw-edittags-tag-list',
-			'multiple' => 'multiple',
-			'size' => '8',
-		) );
+
+		$select = new XmlSelect( 'wpTagList[]', 'mw-edittags-tag-list', $selectedTags );
+		$select->setAttribute( 'multiple', 'multiple' );
+		$select->setAttribute( 'size', '8' );
 
 		$tags = ChangeTags::listExplicitlyDefinedTags();
 		$tags = array_unique( array_merge( $tags, $selectedTags ) );
-		foreach ( $tags as $tag ) {
-			$result[1] .= Xml::option( $tag, $tag, in_array( $tag, $selectedTags ) );
-		}
 
-		$result[1] .= Xml::closeElement( 'select' );
+		// Values of $tags are also used as <option> labels
+		$select->addOptions( array_combine( $tags, $tags ) );
+
+		$result[1] = $select->getHTML();
 		return $result;
 	}
 
diff --git a/includes/specials/SpecialLinkSearch.php b/includes/specials/SpecialLinkSearch.php
index dc882d43a7..f474867445 100644
--- a/includes/specials/SpecialLinkSearch.php
+++ b/includes/specials/SpecialLinkSearch.php
@@ -91,7 +91,7 @@ class LinkSearchPage extends QueryPage {
 
 		$request = $this->getRequest();
 		$target = $request->getVal( 'target', $par );
-		$namespace = $request->getIntOrNull( 'namespace', null );
+		$namespace = $request->getIntOrNull( 'namespace' );
 
 		$protocols_list = array();
 		foreach ( $this->getConfig()->get( 'UrlProtocols' ) as $prot ) {
diff --git a/includes/specials/SpecialListusers.php b/includes/specials/SpecialListusers.php
index 9e7dc00923..31200c84cc 100644
--- a/includes/specials/SpecialListusers.php
+++ b/includes/specials/SpecialListusers.php
@@ -263,6 +263,8 @@ class UsersPager extends AlphabeticPager {
 	function getPageHeader() {
 		list( $self ) = explode( '/', $this->getTitle()->getPrefixedDBkey() );
 
+		$this->getOutput()->addModules( 'mediawiki.userSuggest' );
+
 		# Form tag
 		$out = Xml::openElement(
 			'form',
@@ -271,13 +273,14 @@ class UsersPager extends AlphabeticPager {
 			Xml::fieldset( $this->msg( 'listusers' )->text() ) .
 			Html::hidden( 'title', $self );
 
-		# Username field
+		# Username field (with autocompletion support)
 		$out .= Xml::label( $this->msg( 'listusersfrom' )->text(), 'offset' ) . ' ' .
 			Html::input(
 				'username',
 				$this->requestedUser,
 				'text',
 				array(
+					'class' => 'mw-autocomplete-user',
 					'id' => 'offset',
 					'size' => 20,
 					'autofocus' => $this->requestedUser === ''
diff --git a/includes/specials/SpecialPagesWithProp.php b/includes/specials/SpecialPagesWithProp.php
index 26d0fe8f87..f211ec9b4f 100644
--- a/includes/specials/SpecialPagesWithProp.php
+++ b/includes/specials/SpecialPagesWithProp.php
@@ -113,9 +113,11 @@ class SpecialPagesWithProp extends QueryPage {
 				'pp_value',
 			),
 			'conds' => array(
-				'page_id = pp_page',
 				'pp_propname' => $this->propName,
 			),
+			'join_conds' => array(
+				'page' => array( 'INNER JOIN', 'page_id = pp_page' )
+			),
 			'options' => array()
 		);
 	}
diff --git a/includes/specials/SpecialPreferences.php b/includes/specials/SpecialPreferences.php
index f2a315e2f6..4b75e5f65c 100644
--- a/includes/specials/SpecialPreferences.php
+++ b/includes/specials/SpecialPreferences.php
@@ -50,10 +50,13 @@ class SpecialPreferences extends SpecialPage {
 
 		if ( $this->getRequest()->getCheck( 'success' ) ) {
 			$out->wrapWikiMsg(
-				Xml::tags(
+				Html::rawElement(
 					'div',
-					array( 'class' => 'successbox', 'id' => 'mw-preferences-success' ),
-					'$1'
+					array(
+						'class' => 'mw-preferences-messagebox successbox',
+						'id' => 'mw-preferences-success'
+					),
+					Html::element( 'p', array(), '$1' )
 				),
 				'savedprefs'
 			);
diff --git a/includes/specials/SpecialResetTokens.php b/includes/specials/SpecialResetTokens.php
index 27a3a699ef..cba5a44930 100644
--- a/includes/specials/SpecialResetTokens.php
+++ b/includes/specials/SpecialResetTokens.php
@@ -25,6 +25,7 @@
  * Let users reset tokens like the watchlist token.
  *
  * @ingroup SpecialPage
+ * @deprecated 1.26
  */
 class SpecialResetTokens extends FormSpecialPage {
 	private $tokensList;
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index 44be81c928..10d55b28bc 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -359,7 +359,7 @@ class SpecialUpload extends SpecialPage {
 		$sessionKey = $this->mUpload->stashSession();
 
 		$warningHtml = '<h2>' . $this->msg( 'uploadwarning' )->escaped() . "</h2>\n"
-			. '<ul class="warning">';
+			. '<div class="warningbox"><ul>';
 		foreach ( $warnings as $warning => $args ) {
 			if ( $warning == 'badfilename' ) {
 				$this->mDesiredDestName = Title::makeTitle( NS_FILE, $args )->getText();
@@ -387,7 +387,7 @@ class SpecialUpload extends SpecialPage {
 			}
 			$warningHtml .= $msg;
 		}
-		$warningHtml .= "</ul>\n";
+		$warningHtml .= "</ul></div>\n";
 		$warningHtml .= $this->msg( 'uploadwarning-text' )->parseAsBlock();
 
 		$form = $this->getUploadForm( $warningHtml, $sessionKey, /* $hideIgnoreWarning */ true );
diff --git a/includes/specials/SpecialUserlogin.php b/includes/specials/SpecialUserlogin.php
index 5b6d22bbe4..0410ef01f1 100644
--- a/includes/specials/SpecialUserlogin.php
+++ b/includes/specials/SpecialUserlogin.php
@@ -1367,9 +1367,6 @@ class LoginForm extends SpecialPage {
 			'mediawiki.ui.input',
 			'mediawiki.special.userlogin.common.styles'
 		) );
-		$out->addModules( array(
-			'mediawiki.special.userlogin.common.js'
-		) );
 
 		if ( $this->mType == 'signup' ) {
 			// XXX hack pending RL or JS parse() support for complex content messages
diff --git a/includes/templates/Usercreate.php b/includes/templates/Usercreate.php
index c17d57532d..a39690a72c 100644
--- a/includes/templates/Usercreate.php
+++ b/includes/templates/Usercreate.php
@@ -38,8 +38,6 @@ class UsercreateTemplate extends BaseTemplate {
 	}
 
 	function execute() {
-		global $wgCookieExpiration;
-		$expirationDays = ceil( $wgCookieExpiration / ( 3600 * 24 ) );
 ?>
 <div class="mw-ui-container">
 	<?php if ( $this->haveData( 'languages' ) ) { ?>
diff --git a/includes/tidy.conf b/includes/tidy.conf
deleted file mode 100644
index 4c4daed579..0000000000
--- a/includes/tidy.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# html tidy (http://tidy.sf.net) configuration
-# tidy - validate, correct, and pretty-print HTML files
-# see: man 1 tidy, http://tidy.sourceforge.net/docs/quickref.html
-
-show-body-only: yes
-force-output: yes
-tidy-mark: no
-wrap: 0
-wrap-attributes: no
-literal-attributes: yes
-output-xhtml: yes
-numeric-entities: yes
-enclose-text: yes
-enclose-block-text: yes
-quiet: yes
-quote-nbsp: yes
-fix-backslash: no
-fix-uri: no
-# Don't strip html5 elements we support
-# html-{meta,link} is a hack we use to prevent Tidy from stripping <meta> and <link> used in the body for Microdata
-new-empty-tags: html-meta, html-link, wbr
-new-inline-tags: video, audio, source, track, bdi, data, time, mark
diff --git a/includes/tidy/Html5Depurate.php b/includes/tidy/Html5Depurate.php
new file mode 100644
index 0000000000..23e445fa6b
--- /dev/null
+++ b/includes/tidy/Html5Depurate.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace MediaWiki\Tidy;
+use MWHttpRequest;
+use Exception;
+
+class Html5Depurate extends TidyDriverBase {
+	public function __construct( array $config ) {
+		parent::__construct( $config + array(
+			'url' => 'http://localhost:4339/document',
+			'timeout' => 10,
+			'connectTimeout' => 0.5,
+		) );
+	}
+
+	public function tidy( $text ) {
+		$wrappedtext = '<!DOCTYPE html><html>' .
+			'<body>' . $text . '</body></html>';
+
+		$req = MWHttpRequest::factory( $this->config['url'],
+			array(
+				'method' => 'POST',
+				'timeout' => $this->config['timeout'],
+				'connectTimeout' => $this->config['connectTimeout'],
+				'postData' => array(
+					'text' => $wrappedtext
+				)
+			) );
+		$status = $req->execute();
+		if ( !$status->isOK() ) {
+			throw new Exception( "Error contacting depurate service: " . $status->getWikiText() );
+		} elseif ( $req->getStatus() !== 200 ) {
+			throw new Exception( "Depurate returned error: " . $status->getWikiText() );
+		}
+		$result = $req->getContent();
+		$startBody = strpos( $result, "<body>" );
+		$endBody = strrpos( $result, "</body>" );
+		if ( $startBody !== false && $endBody !== false && $endBody > $startBody ) {
+			$startBody += strlen( "<body>" );
+			return substr( $result, $startBody, $endBody - $startBody );
+		} else {
+			return $text . "\n<!-- Html5Depurate returned an invalid result -->";
+		}
+	}
+}
diff --git a/includes/tidy/RaggettBase.php b/includes/tidy/RaggettBase.php
new file mode 100644
index 0000000000..a3717b2bf0
--- /dev/null
+++ b/includes/tidy/RaggettBase.php
@@ -0,0 +1,47 @@
+<?php
+
+namespace MediaWiki\Tidy;
+
+abstract class RaggettBase extends TidyDriverBase {
+	/**
+	 * Generic interface for wrapping and unwrapping HTML for Dave Raggett's tidy.
+	 *
+	 * @param string $text Hideous HTML input
+	 * @return string Corrected HTML output
+	 */
+	public function tidy( $text ) {
+		$wrapper = new RaggettWrapper;
+		$wrappedtext = $wrapper->getWrapped( $text );
+
+		$retVal = null;
+		$correctedtext = $this->cleanWrapped( $wrappedtext, false, $retVal );
+
+		if ( $retVal < 0 ) {
+			wfDebug( "Possible tidy configuration error!\n" );
+			return $text . "\n<!-- Tidy was unable to run -->\n";
+		} elseif ( is_null( $correctedtext ) ) {
+			wfDebug( "Tidy error detected!\n" );
+			return $text . "\n<!-- Tidy found serious XHTML errors -->\n";
+		}
+
+		$correctedtext = $wrapper->postprocess( $correctedtext ); // restore any hidden tokens
+
+		return $correctedtext;
+	}
+
+	public function validate( $text, &$errorStr ) {
+		$retval = 0;
+		$errorStr = $this->cleanWrapped( $text, true, $retval );
+		return ( $retval < 0 && $errorStr == '' ) || $retval == 0;
+	}
+
+	/**
+	 * Perform a clean/repair operation
+	 * @param string $text HTML to check
+	 * @param bool $stderr Whether to read result from STDERR rather than STDOUT
+	 * @param int &$retval Exit code (-1 on internal error)
+	 * @return null|string
+	 * @throws MWException
+	 */
+	abstract protected function cleanWrapped( $text, $stderr = false, &$retval = null );
+}
diff --git a/includes/tidy/RaggettExternal.php b/includes/tidy/RaggettExternal.php
new file mode 100644
index 0000000000..1193318891
--- /dev/null
+++ b/includes/tidy/RaggettExternal.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace MediaWiki\Tidy;
+
+class RaggettExternal extends RaggettBase {
+	/**
+	 * Spawn an external HTML tidy process and get corrected markup back from it.
+	 * Also called in OutputHandler.php for full page validation
+	 *
+	 * @param string $text HTML to check
+	 * @param bool $stderr Whether to read result from STDERR rather than STDOUT
+	 * @param int &$retval Exit code (-1 on internal error)
+	 * @return string|null
+	 */
+	protected function cleanWrapped( $text, $stderr = false, &$retval = null ) {
+		$cleansource = '';
+		$opts = ' -utf8';
+
+		if ( $stderr ) {
+			$descriptorspec = array(
+				0 => array( 'pipe', 'r' ),
+				1 => array( 'file', wfGetNull(), 'a' ),
+				2 => array( 'pipe', 'w' )
+			);
+		} else {
+			$descriptorspec = array(
+				0 => array( 'pipe', 'r' ),
+				1 => array( 'pipe', 'w' ),
+				2 => array( 'file', wfGetNull(), 'a' )
+			);
+		}
+
+		$readpipe = $stderr ? 2 : 1;
+		$pipes = array();
+
+		$process = proc_open(
+			"{$this->config['tidyBin']} -config {$this->config['tidyConfigFile']} " .
+			$this->config['tidyCommandLine'] . $opts, $descriptorspec, $pipes );
+
+		//NOTE: At least on linux, the process will be created even if tidy is not installed.
+		//      This means that missing tidy will be treated as a validation failure.
+
+		if ( is_resource( $process ) ) {
+			// Theoretically, this style of communication could cause a deadlock
+			// here. If the stdout buffer fills up, then writes to stdin could
+			// block. This doesn't appear to happen with tidy, because tidy only
+			// writes to stdout after it's finished reading from stdin. Search
+			// for tidyParseStdin and tidySaveStdout in console/tidy.c
+			fwrite( $pipes[0], $text );
+			fclose( $pipes[0] );
+			while ( !feof( $pipes[$readpipe] ) ) {
+				$cleansource .= fgets( $pipes[$readpipe], 1024 );
+			}
+			fclose( $pipes[$readpipe] );
+			$retval = proc_close( $process );
+		} else {
+			wfWarn( "Unable to start external tidy process" );
+			$retval = -1;
+		}
+
+		if ( !$stderr && $cleansource == '' && $text != '' ) {
+			// Some kind of error happened, so we couldn't get the corrected text.
+			// Just give up; we'll use the source text and append a warning.
+			$cleansource = null;
+		}
+
+		return $cleansource;
+	}
+
+	public function supportsValidate() {
+		return true;
+	}
+}
diff --git a/includes/tidy/RaggettInternalHHVM.php b/includes/tidy/RaggettInternalHHVM.php
new file mode 100644
index 0000000000..2a3986dfdb
--- /dev/null
+++ b/includes/tidy/RaggettInternalHHVM.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace MediaWiki\Tidy;
+
+class RaggettInternalHHVM extends RaggettBase {
+	/**
+	 * Use the HTML tidy extension to use the tidy library in-process,
+	 * saving the overhead of spawning a new process.
+	 *
+	 * @param string $text HTML to check
+	 * @param bool $stderr Whether to read result from error status instead of output
+	 * @param int &$retval Exit code (-1 on internal error)
+	 * @return string|null
+	 */
+	protected function cleanWrapped( $text, $stderr = false, &$retval = null ) {
+		if ( $stderr ) {
+			throw new Exception( "\$stderr cannot be used with RaggettInternalHHVM" );
+		}
+		$cleansource = tidy_repair_string( $text, $this->config['tidyConfigFile'], 'utf8' );
+		if ( $cleansource === false ) {
+			$cleansource = null;
+			$retval = -1;
+		} else {
+			$retval = 0;
+		}
+
+		return $cleansource;
+	}
+}
diff --git a/includes/tidy/RaggettInternalPHP.php b/includes/tidy/RaggettInternalPHP.php
new file mode 100644
index 0000000000..1ce14b60e1
--- /dev/null
+++ b/includes/tidy/RaggettInternalPHP.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace MediaWiki\Tidy;
+
+class RaggettInternalPHP extends RaggettBase {
+	/**
+	 * Use the HTML tidy extension to use the tidy library in-process,
+	 * saving the overhead of spawning a new process.
+	 *
+	 * @param string $text HTML to check
+	 * @param bool $stderr Whether to read result from error status instead of output
+	 * @param int &$retval Exit code (-1 on internal error)
+	 * @return string|null
+	 */
+	protected function cleanWrapped( $text, $stderr = false, &$retval = null ) {
+		if ( !class_exists( 'tidy' ) ) {
+			wfWarn( "Unable to load internal tidy class." );
+			$retval = -1;
+
+			return null;
+		}
+
+		$tidy = new \tidy;
+		$tidy->parseString( $text, $this->config['tidyConfigFile'], 'utf8' );
+
+		if ( $stderr ) {
+			$retval = $tidy->getStatus();
+			return $tidy->errorBuffer;
+		}
+
+		$tidy->cleanRepair();
+		$retval = $tidy->getStatus();
+		if ( $retval == 2 ) {
+			// 2 is magic number for fatal error
+			// http://www.php.net/manual/en/function.tidy-get-status.php
+			$cleansource = null;
+		} else {
+			$cleansource = tidy_get_output( $tidy );
+			if ( !empty( $this->config['debugComment'] ) && $retval > 0 ) {
+				$cleansource .= "<!--\nTidy reports:\n" .
+					str_replace( '-->', '--&gt;', $tidy->errorBuffer ) .
+					"\n-->";
+			}
+		}
+
+		return $cleansource;
+	}
+
+	public function supportsValidate() {
+		return true;
+	}
+}
diff --git a/includes/tidy/RaggettWrapper.php b/includes/tidy/RaggettWrapper.php
new file mode 100644
index 0000000000..083f40203b
--- /dev/null
+++ b/includes/tidy/RaggettWrapper.php
@@ -0,0 +1,89 @@
+<?php
+namespace MediaWiki\Tidy;
+
+use ReplacementArray;
+use ParserOutput;
+use Parser;
+
+/**
+ * Class used to hide mw:editsection tokens from Tidy so that it doesn't break them
+ * or break on them. This is a bit of a hack for now, but hopefully in the future
+ * we may create a real postprocessor or something that will replace this.
+ * It's called wrapper because for now it basically takes over MWTidy::tidy's task
+ * of wrapping the text in a xhtml block
+ *
+ * This re-uses some of the parser's UNIQ tricks, though some of it is private so it's
+ * duplicated. Perhaps we should create an abstract marker hiding class.
+ *
+ * @ingroup Parser
+ */
+class RaggettWrapper {
+
+	/**
+	 * @var ReplacementArray
+	 */
+	protected $mTokens;
+
+	protected $mMarkerIndex;
+
+	public function __construct() {
+		$this->mTokens = null;
+	}
+
+	/**
+	 * @param string $text
+	 * @return string
+	 */
+	public function getWrapped( $text ) {
+		$this->mTokens = new ReplacementArray;
+		$this->mMarkerIndex = 0;
+
+		// Replace <mw:editsection> elements with placeholders
+		$wrappedtext = preg_replace_callback( ParserOutput::EDITSECTION_REGEX,
+			array( &$this, 'replaceCallback' ), $text );
+		// ...and <mw:toc> markers
+		$wrappedtext = preg_replace_callback( '/\<\\/?mw:toc\>/',
+			array( &$this, 'replaceCallback' ), $wrappedtext );
+		// ... and <math> tags
+		$wrappedtext = preg_replace_callback( '/\<math(.*?)\<\\/math\>/s',
+			array( &$this, 'replaceCallback' ), $wrappedtext );
+		// Modify inline Microdata <link> and <meta> elements so they say <html-link> and <html-meta> so
+		// we can trick Tidy into not stripping them out by including them in tidy's new-empty-tags config
+		$wrappedtext = preg_replace( '!<(link|meta)([^>]*?)(/{0,1}>)!', '<html-$1$2$3', $wrappedtext );
+
+		// Wrap the whole thing in a doctype and body for Tidy.
+		$wrappedtext = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"' .
+			' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html>' .
+			'<head><title>test</title></head><body>' . $wrappedtext . '</body></html>';
+
+		return $wrappedtext;
+	}
+
+	/**
+	 * @param array $m
+	 *
+	 * @return string
+	 */
+	public function replaceCallback( $m ) {
+		$marker = Parser::MARKER_PREFIX . "-item-{$this->mMarkerIndex}" . Parser::MARKER_SUFFIX;
+		$this->mMarkerIndex++;
+		$this->mTokens->setPair( $marker, $m[0] );
+		return $marker;
+	}
+
+	/**
+	 * @param string $text
+	 * @return string
+	 */
+	public function postprocess( $text ) {
+		// Revert <html-{link,meta}> back to <{link,meta}>
+		$text = preg_replace( '!<html-(link|meta)([^>]*?)(/{0,1}>)!', '<$1$2$3', $text );
+
+		// Restore the contents of placeholder tokens
+		$text = $this->mTokens->replace( $text );
+
+		return $text;
+	}
+
+}
+?>
diff --git a/includes/tidy/TidyDriverBase.php b/includes/tidy/TidyDriverBase.php
new file mode 100644
index 0000000000..1d994aa1bd
--- /dev/null
+++ b/includes/tidy/TidyDriverBase.php
@@ -0,0 +1,40 @@
+<?php
+
+namespace MediaWiki\Tidy;
+
+/**
+ * Base class for HTML cleanup utilities
+ */
+abstract class TidyDriverBase {
+	protected $config;
+
+	function __construct( $config ) {
+		$this->config = $config;
+	}
+
+	/**
+	 * Return true if validate() can be used
+	 */
+	public function supportsValidate() {
+		return false;
+	}
+
+	/**
+	 * Check HTML for errors, used if $wgValidateAllHtml = true.
+	 *
+	 * @param string $text
+	 * @param string &$errorStr Return the error string
+	 * @return bool Whether the HTML is valid
+	 */
+	public function validate( $text, &$errorStr ) {
+		throw new MWException( get_class( $this ) . " does not support validate()" );
+	}
+
+	/**
+	 * Clean up HTML
+	 *
+	 * @param string HTML document fragment to clean up
+	 * @param string The corrected HTML output
+	 */
+	public abstract function tidy( $text );
+}
diff --git a/includes/tidy/tidy.conf b/includes/tidy/tidy.conf
new file mode 100644
index 0000000000..4c4daed579
--- /dev/null
+++ b/includes/tidy/tidy.conf
@@ -0,0 +1,22 @@
+# html tidy (http://tidy.sf.net) configuration
+# tidy - validate, correct, and pretty-print HTML files
+# see: man 1 tidy, http://tidy.sourceforge.net/docs/quickref.html
+
+show-body-only: yes
+force-output: yes
+tidy-mark: no
+wrap: 0
+wrap-attributes: no
+literal-attributes: yes
+output-xhtml: yes
+numeric-entities: yes
+enclose-text: yes
+enclose-block-text: yes
+quiet: yes
+quote-nbsp: yes
+fix-backslash: no
+fix-uri: no
+# Don't strip html5 elements we support
+# html-{meta,link} is a hack we use to prevent Tidy from stripping <meta> and <link> used in the body for Microdata
+new-empty-tags: html-meta, html-link, wbr
+new-inline-tags: video, audio, source, track, bdi, data, time, mark
diff --git a/includes/upload/UploadBase.php b/includes/upload/UploadBase.php
index 493df2e29b..b06b91e4a7 100644
--- a/includes/upload/UploadBase.php
+++ b/includes/upload/UploadBase.php
@@ -752,6 +752,12 @@ abstract class UploadBase {
 		if ( $this->mTitle !== false ) {
 			return $this->mTitle;
 		}
+		if ( !is_string( $this->mDesiredDestName ) ) {
+			$this->mTitleError = self::ILLEGAL_FILENAME;
+			$this->mTitle = null;
+
+			return $this->mTitle;
+		}
 		/* Assume that if a user specified File:Something.jpg, this is an error
 		 * and that the namespace prefix needs to be stripped of.
 		 */
diff --git a/includes/utils/iterators/IteratorDecorator.php b/includes/utils/iterators/IteratorDecorator.php
index 288a311320..c1b50207f9 100644
--- a/includes/utils/iterators/IteratorDecorator.php
+++ b/includes/utils/iterators/IteratorDecorator.php
@@ -37,11 +37,11 @@ abstract class IteratorDecorator implements Iterator {
 	}
 
 	public function next() {
-		return $this->iterator->next();
+		$this->iterator->next();
 	}
 
 	public function rewind() {
-		return $this->iterator->rewind();
+		$this->iterator->rewind();
 	}
 
 	public function valid() {
diff --git a/languages/Language.php b/languages/Language.php
index 370e2ed8c8..1613536129 100644
--- a/languages/Language.php
+++ b/languages/Language.php
@@ -167,9 +167,11 @@ class Language {
 	 * Generated by UnicodeJS (see tools/strongDir) from the UCD; see
 	 * https://git.wikimedia.org/summary/unicodejs.git .
 	 */
+	// @codingStandardsIgnoreStart
 	// @codeCoverageIgnoreStart
 	static private $strongDirRegex = '/(?:([\x{41}-\x{5a}\x{61}-\x{7a}\x{aa}\x{b5}\x{ba}\x{c0}-\x{d6}\x{d8}-\x{f6}\x{f8}-\x{2b8}\x{2bb}-\x{2c1}\x{2d0}\x{2d1}\x{2e0}-\x{2e4}\x{2ee}\x{370}-\x{373}\x{376}\x{377}\x{37a}-\x{37d}\x{37f}\x{386}\x{388}-\x{38a}\x{38c}\x{38e}-\x{3a1}\x{3a3}-\x{3f5}\x{3f7}-\x{482}\x{48a}-\x{52f}\x{531}-\x{556}\x{559}-\x{55f}\x{561}-\x{587}\x{589}\x{903}-\x{939}\x{93b}\x{93d}-\x{940}\x{949}-\x{94c}\x{94e}-\x{950}\x{958}-\x{961}\x{964}-\x{980}\x{982}\x{983}\x{985}-\x{98c}\x{98f}\x{990}\x{993}-\x{9a8}\x{9aa}-\x{9b0}\x{9b2}\x{9b6}-\x{9b9}\x{9bd}-\x{9c0}\x{9c7}\x{9c8}\x{9cb}\x{9cc}\x{9ce}\x{9d7}\x{9dc}\x{9dd}\x{9df}-\x{9e1}\x{9e6}-\x{9f1}\x{9f4}-\x{9fa}\x{a03}\x{a05}-\x{a0a}\x{a0f}\x{a10}\x{a13}-\x{a28}\x{a2a}-\x{a30}\x{a32}\x{a33}\x{a35}\x{a36}\x{a38}\x{a39}\x{a3e}-\x{a40}\x{a59}-\x{a5c}\x{a5e}\x{a66}-\x{a6f}\x{a72}-\x{a74}\x{a83}\x{a85}-\x{a8d}\x{a8f}-\x{a91}\x{a93}-\x{aa8}\x{aaa}-\x{ab0}\x{ab2}\x{ab3}\x{ab5}-\x{ab9}\x{abd}-\x{ac0}\x{ac9}\x{acb}\x{acc}\x{ad0}\x{ae0}\x{ae1}\x{ae6}-\x{af0}\x{af9}\x{b02}\x{b03}\x{b05}-\x{b0c}\x{b0f}\x{b10}\x{b13}-\x{b28}\x{b2a}-\x{b30}\x{b32}\x{b33}\x{b35}-\x{b39}\x{b3d}\x{b3e}\x{b40}\x{b47}\x{b48}\x{b4b}\x{b4c}\x{b57}\x{b5c}\x{b5d}\x{b5f}-\x{b61}\x{b66}-\x{b77}\x{b83}\x{b85}-\x{b8a}\x{b8e}-\x{b90}\x{b92}-\x{b95}\x{b99}\x{b9a}\x{b9c}\x{b9e}\x{b9f}\x{ba3}\x{ba4}\x{ba8}-\x{baa}\x{bae}-\x{bb9}\x{bbe}\x{bbf}\x{bc1}\x{bc2}\x{bc6}-\x{bc8}\x{bca}-\x{bcc}\x{bd0}\x{bd7}\x{be6}-\x{bf2}\x{c01}-\x{c03}\x{c05}-\x{c0c}\x{c0e}-\x{c10}\x{c12}-\x{c28}\x{c2a}-\x{c39}\x{c3d}\x{c41}-\x{c44}\x{c58}-\x{c5a}\x{c60}\x{c61}\x{c66}-\x{c6f}\x{c7f}\x{c82}\x{c83}\x{c85}-\x{c8c}\x{c8e}-\x{c90}\x{c92}-\x{ca8}\x{caa}-\x{cb3}\x{cb5}-\x{cb9}\x{cbd}-\x{cc4}\x{cc6}-\x{cc8}\x{cca}\x{ccb}\x{cd5}\x{cd6}\x{cde}\x{ce0}\x{ce1}\x{ce6}-\x{cef}\x{cf1}\x{cf2}\x{d02}\x{d03}\x{d05}-\x{d0c}\x{d0e}-\x{d10}\x{d12}-\x{d3a}\x{d3d}-\x{d40}\x{d46}-\x{d48}\x{d4a}-\x{d4c}\x{d4e}\x{d57}\x{d5f}-\x{d61}\x{d66}-\x{d75}\x{d79}-\x{d7f}\x{d82}\x{d83}\x{d85}-\x{d96}\x{d9a}-\x{db1}\x{db3}-\x{dbb}\x{dbd}\x{dc0}-\x{dc6}\x{dcf}-\x{dd1}\x{dd8}-\x{ddf}\x{de6}-\x{def}\x{df2}-\x{df4}\x{e01}-\x{e30}\x{e32}\x{e33}\x{e40}-\x{e46}\x{e4f}-\x{e5b}\x{e81}\x{e82}\x{e84}\x{e87}\x{e88}\x{e8a}\x{e8d}\x{e94}-\x{e97}\x{e99}-\x{e9f}\x{ea1}-\x{ea3}\x{ea5}\x{ea7}\x{eaa}\x{eab}\x{ead}-\x{eb0}\x{eb2}\x{eb3}\x{ebd}\x{ec0}-\x{ec4}\x{ec6}\x{ed0}-\x{ed9}\x{edc}-\x{edf}\x{f00}-\x{f17}\x{f1a}-\x{f34}\x{f36}\x{f38}\x{f3e}-\x{f47}\x{f49}-\x{f6c}\x{f7f}\x{f85}\x{f88}-\x{f8c}\x{fbe}-\x{fc5}\x{fc7}-\x{fcc}\x{fce}-\x{fda}\x{1000}-\x{102c}\x{1031}\x{1038}\x{103b}\x{103c}\x{103f}-\x{1057}\x{105a}-\x{105d}\x{1061}-\x{1070}\x{1075}-\x{1081}\x{1083}\x{1084}\x{1087}-\x{108c}\x{108e}-\x{109c}\x{109e}-\x{10c5}\x{10c7}\x{10cd}\x{10d0}-\x{1248}\x{124a}-\x{124d}\x{1250}-\x{1256}\x{1258}\x{125a}-\x{125d}\x{1260}-\x{1288}\x{128a}-\x{128d}\x{1290}-\x{12b0}\x{12b2}-\x{12b5}\x{12b8}-\x{12be}\x{12c0}\x{12c2}-\x{12c5}\x{12c8}-\x{12d6}\x{12d8}-\x{1310}\x{1312}-\x{1315}\x{1318}-\x{135a}\x{1360}-\x{137c}\x{1380}-\x{138f}\x{13a0}-\x{13f5}\x{13f8}-\x{13fd}\x{1401}-\x{167f}\x{1681}-\x{169a}\x{16a0}-\x{16f8}\x{1700}-\x{170c}\x{170e}-\x{1711}\x{1720}-\x{1731}\x{1735}\x{1736}\x{1740}-\x{1751}\x{1760}-\x{176c}\x{176e}-\x{1770}\x{1780}-\x{17b3}\x{17b6}\x{17be}-\x{17c5}\x{17c7}\x{17c8}\x{17d4}-\x{17da}\x{17dc}\x{17e0}-\x{17e9}\x{1810}-\x{1819}\x{1820}-\x{1877}\x{1880}-\x{18a8}\x{18aa}\x{18b0}-\x{18f5}\x{1900}-\x{191e}\x{1923}-\x{1926}\x{1929}-\x{192b}\x{1930}\x{1931}\x{1933}-\x{1938}\x{1946}-\x{196d}\x{1970}-\x{1974}\x{1980}-\x{19ab}\x{19b0}-\x{19c9}\x{19d0}-\x{19da}\x{1a00}-\x{1a16}\x{1a19}\x{1a1a}\x{1a1e}-\x{1a55}\x{1a57}\x{1a61}\x{1a63}\x{1a64}\x{1a6d}-\x{1a72}\x{1a80}-\x{1a89}\x{1a90}-\x{1a99}\x{1aa0}-\x{1aad}\x{1b04}-\x{1b33}\x{1b35}\x{1b3b}\x{1b3d}-\x{1b41}\x{1b43}-\x{1b4b}\x{1b50}-\x{1b6a}\x{1b74}-\x{1b7c}\x{1b82}-\x{1ba1}\x{1ba6}\x{1ba7}\x{1baa}\x{1bae}-\x{1be5}\x{1be7}\x{1bea}-\x{1bec}\x{1bee}\x{1bf2}\x{1bf3}\x{1bfc}-\x{1c2b}\x{1c34}\x{1c35}\x{1c3b}-\x{1c49}\x{1c4d}-\x{1c7f}\x{1cc0}-\x{1cc7}\x{1cd3}\x{1ce1}\x{1ce9}-\x{1cec}\x{1cee}-\x{1cf3}\x{1cf5}\x{1cf6}\x{1d00}-\x{1dbf}\x{1e00}-\x{1f15}\x{1f18}-\x{1f1d}\x{1f20}-\x{1f45}\x{1f48}-\x{1f4d}\x{1f50}-\x{1f57}\x{1f59}\x{1f5b}\x{1f5d}\x{1f5f}-\x{1f7d}\x{1f80}-\x{1fb4}\x{1fb6}-\x{1fbc}\x{1fbe}\x{1fc2}-\x{1fc4}\x{1fc6}-\x{1fcc}\x{1fd0}-\x{1fd3}\x{1fd6}-\x{1fdb}\x{1fe0}-\x{1fec}\x{1ff2}-\x{1ff4}\x{1ff6}-\x{1ffc}\x{200e}\x{2071}\x{207f}\x{2090}-\x{209c}\x{2102}\x{2107}\x{210a}-\x{2113}\x{2115}\x{2119}-\x{211d}\x{2124}\x{2126}\x{2128}\x{212a}-\x{212d}\x{212f}-\x{2139}\x{213c}-\x{213f}\x{2145}-\x{2149}\x{214e}\x{214f}\x{2160}-\x{2188}\x{2336}-\x{237a}\x{2395}\x{249c}-\x{24e9}\x{26ac}\x{2800}-\x{28ff}\x{2c00}-\x{2c2e}\x{2c30}-\x{2c5e}\x{2c60}-\x{2ce4}\x{2ceb}-\x{2cee}\x{2cf2}\x{2cf3}\x{2d00}-\x{2d25}\x{2d27}\x{2d2d}\x{2d30}-\x{2d67}\x{2d6f}\x{2d70}\x{2d80}-\x{2d96}\x{2da0}-\x{2da6}\x{2da8}-\x{2dae}\x{2db0}-\x{2db6}\x{2db8}-\x{2dbe}\x{2dc0}-\x{2dc6}\x{2dc8}-\x{2dce}\x{2dd0}-\x{2dd6}\x{2dd8}-\x{2dde}\x{3005}-\x{3007}\x{3021}-\x{3029}\x{302e}\x{302f}\x{3031}-\x{3035}\x{3038}-\x{303c}\x{3041}-\x{3096}\x{309d}-\x{309f}\x{30a1}-\x{30fa}\x{30fc}-\x{30ff}\x{3105}-\x{312d}\x{3131}-\x{318e}\x{3190}-\x{31ba}\x{31f0}-\x{321c}\x{3220}-\x{324f}\x{3260}-\x{327b}\x{327f}-\x{32b0}\x{32c0}-\x{32cb}\x{32d0}-\x{32fe}\x{3300}-\x{3376}\x{337b}-\x{33dd}\x{33e0}-\x{33fe}\x{3400}-\x{4db5}\x{4e00}-\x{9fd5}\x{a000}-\x{a48c}\x{a4d0}-\x{a60c}\x{a610}-\x{a62b}\x{a640}-\x{a66e}\x{a680}-\x{a69d}\x{a6a0}-\x{a6ef}\x{a6f2}-\x{a6f7}\x{a722}-\x{a787}\x{a789}-\x{a7ad}\x{a7b0}-\x{a7b7}\x{a7f7}-\x{a801}\x{a803}-\x{a805}\x{a807}-\x{a80a}\x{a80c}-\x{a824}\x{a827}\x{a830}-\x{a837}\x{a840}-\x{a873}\x{a880}-\x{a8c3}\x{a8ce}-\x{a8d9}\x{a8f2}-\x{a8fd}\x{a900}-\x{a925}\x{a92e}-\x{a946}\x{a952}\x{a953}\x{a95f}-\x{a97c}\x{a983}-\x{a9b2}\x{a9b4}\x{a9b5}\x{a9ba}\x{a9bb}\x{a9bd}-\x{a9cd}\x{a9cf}-\x{a9d9}\x{a9de}-\x{a9e4}\x{a9e6}-\x{a9fe}\x{aa00}-\x{aa28}\x{aa2f}\x{aa30}\x{aa33}\x{aa34}\x{aa40}-\x{aa42}\x{aa44}-\x{aa4b}\x{aa4d}\x{aa50}-\x{aa59}\x{aa5c}-\x{aa7b}\x{aa7d}-\x{aaaf}\x{aab1}\x{aab5}\x{aab6}\x{aab9}-\x{aabd}\x{aac0}\x{aac2}\x{aadb}-\x{aaeb}\x{aaee}-\x{aaf5}\x{ab01}-\x{ab06}\x{ab09}-\x{ab0e}\x{ab11}-\x{ab16}\x{ab20}-\x{ab26}\x{ab28}-\x{ab2e}\x{ab30}-\x{ab65}\x{ab70}-\x{abe4}\x{abe6}\x{abe7}\x{abe9}-\x{abec}\x{abf0}-\x{abf9}\x{ac00}-\x{d7a3}\x{d7b0}-\x{d7c6}\x{d7cb}-\x{d7fb}\x{e000}-\x{fa6d}\x{fa70}-\x{fad9}\x{fb00}-\x{fb06}\x{fb13}-\x{fb17}\x{ff21}-\x{ff3a}\x{ff41}-\x{ff5a}\x{ff66}-\x{ffbe}\x{ffc2}-\x{ffc7}\x{ffca}-\x{ffcf}\x{ffd2}-\x{ffd7}\x{ffda}-\x{ffdc}\x{10000}-\x{1000b}\x{1000d}-\x{10026}\x{10028}-\x{1003a}\x{1003c}\x{1003d}\x{1003f}-\x{1004d}\x{10050}-\x{1005d}\x{10080}-\x{100fa}\x{10100}\x{10102}\x{10107}-\x{10133}\x{10137}-\x{1013f}\x{101d0}-\x{101fc}\x{10280}-\x{1029c}\x{102a0}-\x{102d0}\x{10300}-\x{10323}\x{10330}-\x{1034a}\x{10350}-\x{10375}\x{10380}-\x{1039d}\x{1039f}-\x{103c3}\x{103c8}-\x{103d5}\x{10400}-\x{1049d}\x{104a0}-\x{104a9}\x{10500}-\x{10527}\x{10530}-\x{10563}\x{1056f}\x{10600}-\x{10736}\x{10740}-\x{10755}\x{10760}-\x{10767}\x{11000}\x{11002}-\x{11037}\x{11047}-\x{1104d}\x{11066}-\x{1106f}\x{11082}-\x{110b2}\x{110b7}\x{110b8}\x{110bb}-\x{110c1}\x{110d0}-\x{110e8}\x{110f0}-\x{110f9}\x{11103}-\x{11126}\x{1112c}\x{11136}-\x{11143}\x{11150}-\x{11172}\x{11174}-\x{11176}\x{11182}-\x{111b5}\x{111bf}-\x{111c9}\x{111cd}\x{111d0}-\x{111df}\x{111e1}-\x{111f4}\x{11200}-\x{11211}\x{11213}-\x{1122e}\x{11232}\x{11233}\x{11235}\x{11238}-\x{1123d}\x{11280}-\x{11286}\x{11288}\x{1128a}-\x{1128d}\x{1128f}-\x{1129d}\x{1129f}-\x{112a9}\x{112b0}-\x{112de}\x{112e0}-\x{112e2}\x{112f0}-\x{112f9}\x{11302}\x{11303}\x{11305}-\x{1130c}\x{1130f}\x{11310}\x{11313}-\x{11328}\x{1132a}-\x{11330}\x{11332}\x{11333}\x{11335}-\x{11339}\x{1133d}-\x{1133f}\x{11341}-\x{11344}\x{11347}\x{11348}\x{1134b}-\x{1134d}\x{11350}\x{11357}\x{1135d}-\x{11363}\x{11480}-\x{114b2}\x{114b9}\x{114bb}-\x{114be}\x{114c1}\x{114c4}-\x{114c7}\x{114d0}-\x{114d9}\x{11580}-\x{115b1}\x{115b8}-\x{115bb}\x{115be}\x{115c1}-\x{115db}\x{11600}-\x{11632}\x{1163b}\x{1163c}\x{1163e}\x{11641}-\x{11644}\x{11650}-\x{11659}\x{11680}-\x{116aa}\x{116ac}\x{116ae}\x{116af}\x{116b6}\x{116c0}-\x{116c9}\x{11700}-\x{11719}\x{11720}\x{11721}\x{11726}\x{11730}-\x{1173f}\x{118a0}-\x{118f2}\x{118ff}\x{11ac0}-\x{11af8}\x{12000}-\x{12399}\x{12400}-\x{1246e}\x{12470}-\x{12474}\x{12480}-\x{12543}\x{13000}-\x{1342e}\x{14400}-\x{14646}\x{16800}-\x{16a38}\x{16a40}-\x{16a5e}\x{16a60}-\x{16a69}\x{16a6e}\x{16a6f}\x{16ad0}-\x{16aed}\x{16af5}\x{16b00}-\x{16b2f}\x{16b37}-\x{16b45}\x{16b50}-\x{16b59}\x{16b5b}-\x{16b61}\x{16b63}-\x{16b77}\x{16b7d}-\x{16b8f}\x{16f00}-\x{16f44}\x{16f50}-\x{16f7e}\x{16f93}-\x{16f9f}\x{1b000}\x{1b001}\x{1bc00}-\x{1bc6a}\x{1bc70}-\x{1bc7c}\x{1bc80}-\x{1bc88}\x{1bc90}-\x{1bc99}\x{1bc9c}\x{1bc9f}\x{1d000}-\x{1d0f5}\x{1d100}-\x{1d126}\x{1d129}-\x{1d166}\x{1d16a}-\x{1d172}\x{1d183}\x{1d184}\x{1d18c}-\x{1d1a9}\x{1d1ae}-\x{1d1e8}\x{1d360}-\x{1d371}\x{1d400}-\x{1d454}\x{1d456}-\x{1d49c}\x{1d49e}\x{1d49f}\x{1d4a2}\x{1d4a5}\x{1d4a6}\x{1d4a9}-\x{1d4ac}\x{1d4ae}-\x{1d4b9}\x{1d4bb}\x{1d4bd}-\x{1d4c3}\x{1d4c5}-\x{1d505}\x{1d507}-\x{1d50a}\x{1d50d}-\x{1d514}\x{1d516}-\x{1d51c}\x{1d51e}-\x{1d539}\x{1d53b}-\x{1d53e}\x{1d540}-\x{1d544}\x{1d546}\x{1d54a}-\x{1d550}\x{1d552}-\x{1d6a5}\x{1d6a8}-\x{1d6da}\x{1d6dc}-\x{1d714}\x{1d716}-\x{1d74e}\x{1d750}-\x{1d788}\x{1d78a}-\x{1d7c2}\x{1d7c4}-\x{1d7cb}\x{1d800}-\x{1d9ff}\x{1da37}-\x{1da3a}\x{1da6d}-\x{1da74}\x{1da76}-\x{1da83}\x{1da85}-\x{1da8b}\x{1f110}-\x{1f12e}\x{1f130}-\x{1f169}\x{1f170}-\x{1f19a}\x{1f1e6}-\x{1f202}\x{1f210}-\x{1f23a}\x{1f240}-\x{1f248}\x{1f250}\x{1f251}\x{20000}-\x{2a6d6}\x{2a700}-\x{2b734}\x{2b740}-\x{2b81d}\x{2b820}-\x{2cea1}\x{2f800}-\x{2fa1d}\x{f0000}-\x{ffffd}\x{100000}-\x{10fffd}])|([\x{590}\x{5be}\x{5c0}\x{5c3}\x{5c6}\x{5c8}-\x{5ff}\x{7c0}-\x{7ea}\x{7f4}\x{7f5}\x{7fa}-\x{815}\x{81a}\x{824}\x{828}\x{82e}-\x{858}\x{85c}-\x{89f}\x{200f}\x{fb1d}\x{fb1f}-\x{fb28}\x{fb2a}-\x{fb4f}\x{10800}-\x{1091e}\x{10920}-\x{10a00}\x{10a04}\x{10a07}-\x{10a0b}\x{10a10}-\x{10a37}\x{10a3b}-\x{10a3e}\x{10a40}-\x{10ae4}\x{10ae7}-\x{10b38}\x{10b40}-\x{10e5f}\x{10e7f}-\x{10fff}\x{1e800}-\x{1e8cf}\x{1e8d7}-\x{1edff}\x{1ef00}-\x{1efff}\x{608}\x{60b}\x{60d}\x{61b}-\x{64a}\x{66d}-\x{66f}\x{671}-\x{6d5}\x{6e5}\x{6e6}\x{6ee}\x{6ef}\x{6fa}-\x{710}\x{712}-\x{72f}\x{74b}-\x{7a5}\x{7b1}-\x{7bf}\x{8a0}-\x{8e2}\x{fb50}-\x{fd3d}\x{fd40}-\x{fdcf}\x{fdf0}-\x{fdfc}\x{fdfe}\x{fdff}\x{fe70}-\x{fefe}\x{1ee00}-\x{1eeef}\x{1eef2}-\x{1eeff}]))/u';
 	// @codeCoverageIgnoreEnd
+	// @codingStandardsIgnoreEnd
 
 	/**
 	 * Get a cached or new language object for a given language code
@@ -2270,30 +2272,33 @@ class Language {
 
 	/**
 	 * Get a format string for a given type and preference
-	 * @param string $type May be date, time or both
-	 * @param string $pref The format name as it appears in Messages*.php
+	 * @param string $type May be 'date', 'time', 'both', or 'pretty'.
+	 * @param string $pref The format name as it appears in Messages*.php under
+	 *  $datePreferences.
 	 *
 	 * @since 1.22 New type 'pretty' that provides a more readable timestamp format
 	 *
 	 * @return string
 	 */
 	function getDateFormatString( $type, $pref ) {
+		$wasDefault = false;
+		if ( $pref == 'default' ) {
+			$wasDefault = true;
+			$pref = $this->getDefaultDateFormat();
+		}
+
 		if ( !isset( $this->dateFormatStrings[$type][$pref] ) ) {
-			if ( $pref == 'default' ) {
-				$pref = $this->getDefaultDateFormat();
-				$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
-			} else {
-				$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
+			$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
 
-				if ( $type === 'pretty' && $df === null ) {
-					$df = $this->getDateFormatString( 'date', $pref );
-				}
+			if ( $type === 'pretty' && $df === null ) {
+				$df = $this->getDateFormatString( 'date', $pref );
+			}
 
-				if ( $df === null ) {
-					$pref = $this->getDefaultDateFormat();
-					$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
-				}
+			if ( !$wasDefault && $df === null ) {
+				$pref = $this->getDefaultDateFormat();
+				$df = self::$dataCache->getSubitem( $this->mCode, 'dateFormats', "$pref $type" );
 			}
+
 			$this->dateFormatStrings[$type][$pref] = $df;
 		}
 		return $this->dateFormatStrings[$type][$pref];
diff --git a/languages/i18n/ady-cyrl.json b/languages/i18n/ady-cyrl.json
index 7a647b026c..09b45c57be 100644
--- a/languages/i18n/ady-cyrl.json
+++ b/languages/i18n/ady-cyrl.json
@@ -310,6 +310,7 @@
 	"cannotdelete": "НэкIубгъоу е файлэу \"$1\" тегъэкIын лъэкIыгъэп.\nПэмыкI нэбгырэм тыригъэкIыгъахэн фае.",
 	"cannotdelete-title": "НэкIубгъоу \"$1\" тегъэкIыгъэн лъэкIырэп",
 	"badtitle": "ЦӀэ дэгъуэп",
+	"badtitletext": "УзкIэупчIэрэ нэкIубгъом ыцIэр къуанчэ, е нэкIы, е бзэзэпыщэ е интервики гъэнэфагъэп.\nМыхъущт символ агъэфедагъэнкIи мэхъу.",
 	"viewsource": "Еплъ лъапсэм",
 	"viewsource-title": "Еплъ лъапсэм $1 пае",
 	"protectedpagetext": "ЕIэзэнхэм ыкIи нэмыкI шIэнмэ яягъэ къэмыкIынэу мы нэкIубгъор ухъумагъэу щыт.",
@@ -465,6 +466,7 @@
 	"preview": "Ыпэтеплъ",
 	"showpreview": "Итеплъэ къэгъэлъагъу",
 	"showdiff": "ЗэхъокӀыныгъэхэр къэгъэлъагъу",
+	"anoneditwarning": "<strong>Сакъ:</strong>Системэм ухэхьагъэп. Уи IP-адресыр зэкIэми алъэгъушъущт зыгорэм ухэIазэмэ. <strong>[$1 ухахьэмэ]</strong> е <strong>[$2 аккаунт уублэмэ]</strong>, уи еIэзэнхэр уи нэбгырацIэм пышIэгъэщтых, нэмыкI шIуагъэхэм анэмыкIэу.",
 	"missingcommenttext": "ТегущыIэн горэ кIэтхэжьба ычIэгъ.",
 	"summary-preview": "Къэбарым и ыпэтеплъ:",
 	"previewerrortext": "Уи ыпэтеплъэмэ я къэгъэлъэгъон игъо зы къончагъэ горэ хъугъэ.",
@@ -474,6 +476,9 @@
 	"loginreqlink": "системэм хахь",
 	"accmailtitle": "ШъэфгущыIэр агъэхьыгъ",
 	"newarticle": "(КIэ)",
+	"newarticletext": "ЩымыIэ нэкIубгъом уекIугъ зэпыщэмкIэ.\nНэкIубгъор ебгъэжьэным пае ычIэгъ щыт плIэмыем зыгорэ итх (еплъ [$1 IэпыIэгъу нэкIубгъом] нахьыбэу пшIэным пае).\nУмышIахэу мыщ укъэкIуагъэмэ, уи броузерым и <strong>зэкIакIо</strong> кнопкэм теIункI.",
+	"noarticletext": "Текст пари итыгоп мы нэкIубгъом.\n[[Special:Search/{{PAGENAME}}|Мы нэкIубгъом ыцIэ улъыхъун]] плъэкIыщт нэмыкI нэкIубгъомэ,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ехьылIэгъэ журналхэм къащыбгъотын],\nе [{{fullurl:{{FULLPAGENAME}}|action=edit}} мы нэкIубгъом уеIэзэн]</span>.",
+	"noarticletext-nopermission": "Текст пари итыгоп мы нэкIубгъом.\n[[Special:Search/{{PAGENAME}}|Мы нэкIубгъом ыцIэ улъыхъун]] плъэкIыщт нэмыкI нэкIубгъомэ, е\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} ехьылIэгъэ журналхэм къащыбгъотын]</span>. Ау мы нэкIубгъор уублэнэу фитыныгъэ уиIэп.",
 	"userpage-userdoesnotexist-view": "Аккаунтэу \"$1\" регистрацие ыкIугъэп.",
 	"note": "<strong>Еплъ:</strong>",
 	"previewnote": "<strong>Зыщымыгъэгъупш, мыр ыпэтеплъэ къодый.</strong>\nУи еIэзэнхэр джыри дэгъэпытыхьагъэхэп.",
@@ -566,6 +571,7 @@
 	"compareselectedversions": "Хэгъэщыгъэ версиехэр зэгъапш",
 	"editundo": "зэкӀэгъэкӀожь",
 	"diff-empty": "(зэфэмыдэ яIэп)",
+	"diff-multi-sameuser": "({{PLURAL:$1|Зы гурыт версие горэ|$1 гурыт версиехэр}} зы нэбгырэм иеу къэгъэлъэгъуагъэп)",
 	"searchresults": "Къэгъотынэу хъугъэр",
 	"searchresults-title": "$1-м пае къэгъот",
 	"prevn": "ыпэ {{PLURAL:$1|$1}}",
@@ -575,6 +581,7 @@
 	"nextn-title": "КIэлъыкIорэ $1 {{PLURAL:$1|резултат|резултатхэр}}",
 	"shown-title": "Зы нэкӀубгъом $1{{PLURAL:$1|гъотыгъэ|гъотыгъэхэр}} къыщыгъэлъагъу",
 	"viewprevnext": "Еплъ ($1 {{int:pipe-separator}} $2) ($3)",
+	"searchmenu-new": "<strong>НэкIубгъор щыублэ \"[[:$1]]\" мы вики-проектым!</strong> {{PLURAL:$2|0=|Узщылъыхъугъэм ирезултат-нэкIубгъоми еплъ.|Узщылъыхъугъэм ирезултат-нэкIубгъохэми яплъ.}}",
 	"searchprofile-articles": "НэкӀубгъо шъхьаӀхэр",
 	"searchprofile-images": "Мултимедие",
 	"searchprofile-everything": "ЗэкӀэ",
@@ -593,6 +600,7 @@
 	"search-relatedarticle": "ЕхьылIагъ",
 	"searchrelated": "ехьылIагъ",
 	"searchall": "зэкӀэ",
+	"search-showingresults": "{{PLURAL:$4|Резултат <strong>$1</strong> мыщ щыщэу <strong>$3</strong>|Резултатхэр <strong>$1 - $2</strong> мыщ щыщхэу <strong>$3</strong>}}",
 	"search-nonefound": "Узлъыхъугъэм пари ехьылӀагъэ щыӀэп.",
 	"powersearch-legend": "Зэхэщыгъэ лъыхъун",
 	"powersearch-ns": "ЦIэчIыпIэмэ ащылъыхъу:",
@@ -809,6 +817,7 @@
 	"recentchangeslinked-feed": "ЕхьылӀэгъэ зэхъокӀыныгъэхэр",
 	"recentchangeslinked-toolbox": "ЕхьылӀэгъэ зэблэхъуныгъэхэр",
 	"recentchangeslinked-title": "\"$1\"-м ехьылӀэгъэ зэхъокӀыныгъэхэр",
+	"recentchangeslinked-summary": "НэкIубгъо гъэнэфагъэ горэм зыщэрэ (е категорие гъэнэфагъэм итхэм зыщэрэ) нэкIубгъомэ яеIэзэнмэ ябэмышIэ куп.\n\n[[Special:Watchlist|Уилъыплъэ купым]] хахьэрэ нэкIубгъохэр <strong>хэунэфыкIыгъэх</strong>.",
 	"recentchangeslinked-page": "НэкӀубгъом ыцӀэр:",
 	"recentchangeslinked-to": "Пхэнджэу, зигугъу шIыгъэ нэкIубгъом къэзыщэрэ нэкIубгъомэ язэхъокIыныгъэхэр къэгъэлъагъу",
 	"upload": "Файлыр илъхь",
@@ -1077,6 +1086,7 @@
 	"invert": "Зэшъхьатегъэуцу хэгъэщыгъэр",
 	"tooltip-invert": "Мы плIэмыер гъэнаф, хэхыгъэ цIэчIыпIэм щыщ нэкIубгъомэ яеIэзэнхэр бгъэбылъынэу (ыкIи ехьылIэгъэ цIэчIыпIэр, гъэнэфагъэмэ)",
 	"namespace_association": "ЕхьылӀэгъэ цӀэчӀыпӀэр",
+	"tooltip-namespace_association": "Мы плIэмыер гъэнаф, хэхыгъэ цIэчIыпIэм ехьылIэгъэ тегущыIэн-нэкIубгъор е субъект цIэчIыпIэр пыбгъэхъонэу уфаемэ.",
 	"blanknamespace": "(ШъхьаӀ)",
 	"contributions": "{{GENDER:$1|ХэлэжьакIом}} и лэжьыгъэ Iахь",
 	"contributions-title": "$1 нэбгырэм и лэжьыгъэ",
@@ -1103,6 +1113,7 @@
 	"whatlinkshere-next": "{{PLURAL:$1|кӀэлъыкӀорэр|кӀэлъыкӀорэ $1}}",
 	"whatlinkshere-links": "← зэпыщэхэр",
 	"whatlinkshere-hideredirs": "$1 гъэкӀожьын",
+	"whatlinkshere-hidetrans": "$1 хэлъхьаныгъэ",
 	"whatlinkshere-hidelinks": "$1 зэпыщ",
 	"whatlinkshere-filters": "Филтрэхэр",
 	"ipaddressorusername": "IP-адрес е нэбгырацIэ:",
@@ -1180,7 +1191,7 @@
 	"tooltip-t-permalink": "Мы нэкӀубгъом къакIорэ зэмыхъокӀ зэпыщ",
 	"tooltip-ca-nstab-main": "КӀоцӀытхагъэм еплъ",
 	"tooltip-ca-nstab-user": "ЦӀыфым итхьапэ еплъ",
-	"tooltip-ca-nstab-special": "Мы нэкӀубгъор шъхьафы, зыцэ хэптхэжьынэу щытэп",
+	"tooltip-ca-nstab-special": "Мы нэкӀубгъор шъхьафы, зыцэ хэптхэжьын хъущтэп",
 	"tooltip-ca-nstab-project": "Проектым и нэкӀубгъу",
 	"tooltip-ca-nstab-image": "Тхьапэм и файл еплъ",
 	"tooltip-ca-nstab-mediawiki": "Систем мессаджым еплъ",
@@ -1199,6 +1210,7 @@
 	"previousdiff": "← ЫпэкъэкӀорэ еӀэзэн",
 	"nextdiff": "Нахь еӀэзэныгъакӀ →",
 	"file-info-size": "Пиксел $1 × $2, файлым иинагъэ: $3, MIME-тип: $4",
+	"file-nohires": "Нахь зэхэщыкIэ ин щыIэп.",
 	"svg-long-desc": "SVG файл, номиналэу $1 × $2 пиксел, файлым иинагъэ: $3",
 	"show-big-image": "Оригинал файлыр",
 	"show-big-image-preview": "Мыщ и ыпэтеплъэм иинагъэр: $1.",
@@ -1207,6 +1219,8 @@
 	"ilsubmit": "Лъыхъу",
 	"bad_image_list": "Форматыр зэрщытыр:\n\nГулытэ зиӀэныр тхылъым и тамыгъэхэм (сатыр тамыгъэ * къежьэхэр).\nСатырым и техьэпӀэ япэрем сурэт иплъхьэ мыхъуным и техьэпӀэ иӀэн фай.\nЯужы ит техьэпӀэхэр хэгъэкӀа фэдэу къилъытэну, сурэтыр здиплъэ хъуну тхыгъэхэр.",
 	"metadata": "Метадатэр",
+	"metadata-help": "Мы файлым нэмыкI информацие илъ, диджитал камерэм сканнерым къикIыгъэу, шIыным е и диджитацие пае.\nМы файлыр иублэ щытыкIэ елъытыгъэу еIэзагъэхэмэ, детал горэхэр щыкIэщтхэнкIи мэхъу.",
+	"metadata-fields": "Сурэтым иметадатэ ишъофхэр мы мессаджым къыщыгъэлъэгъуагъэхэр сурэтым инэкIубгъо щыIэщтых, метадатэм инэкIубгъо щыхьагъэу щытэу.\nАдрэхэр гъэбылъыгъэу щытыщтых.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
 	"exif-orientation": "Кадрым и ориентацие",
 	"exif-xresolution": "Шъомбгъуагъ зэхэщыкIэ",
 	"exif-yresolution": "Iатыгъагъ зэхэщыкIэ",
@@ -1222,6 +1236,7 @@
 	"exif-orientation-1": "Тэрэз",
 	"namespacesall": "зэкӀэ",
 	"monthsall": "зэкӀэ",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|тегущыIэныр]])",
 	"fileduplicatesearch-submit": "Лъыхъу",
 	"specialpages": "ЯӀамышӀыкӀ нэкӀубгъохэр",
 	"specialpages-group-login": "Къыхахь / аккаунт къэубл",
diff --git a/languages/i18n/af.json b/languages/i18n/af.json
index 0b373c59a3..f31a36ee89 100644
--- a/languages/i18n/af.json
+++ b/languages/i18n/af.json
@@ -39,6 +39,7 @@
 	"tog-watchdefault": "Voeg bladsye en lêers wat ek wysig by my dophoulys",
 	"tog-watchmoves": "Voeg bladsye en lêers wat ek skuif by my dophoulys",
 	"tog-watchdeletion": "Voeg bladsye en lêers wat ek skrap by my dophoulys",
+	"tog-watchrollback": "Voeg bladsye wat ek teruggerol het by my dophoulys",
 	"tog-minordefault": "Merk alle wysigings automaties as klein by verstek.",
 	"tog-previewontop": "Wys voorskou bo wysigingsboks.",
 	"tog-previewonfirst": "Wys voorskou met eerste wysiging",
@@ -592,7 +593,7 @@
 	"updated": "(Gewysig)",
 	"note": "'''Nota:'''",
 	"previewnote": "'''Onthou dat hierdie slegs 'n voorskou is.'''\nU teks is nog nie gestoor nie!",
-	"continue-editing": "Wysig verder",
+	"continue-editing": "Gaan na redigeerarea",
 	"previewconflict": "Hierdie voorskou vertoon die teks in die boonste teksarea soos dit sou lyk as u die bladsy stoor.",
 	"session_fail_preview": "'''Jammer! Weens verlies aan sessie-inligting is die wysiging nie verwerk nie.\nProbeer asseblief weer. As dit steeds nie werk nie, probeer om [[Special:UserLogout|af te teken]] en dan weer aan te meld.'''",
 	"session_fail_preview_html": "'''Jammer! U wysigings is nie verwerk nie omdat sessie-data verlore gegaan het.'''\n\n''Omrede rou HTML hier by {{SITENAME}} ingevoer kan word, kan die voorskou nie gesien word nie ter beskerming teen aanvalle met JavaScript.''\n\n'''As dit 'n regmatige wysiging is, probeer asseblief weer. As dit daarna nog nie werk nie, [[Special:UserLogout|teken dan af]] en weer aan.'''",
@@ -1057,7 +1058,7 @@
 	"right-override-export-depth": "Eksporteer bladsye insluitend geskakelde bladsye tot 'n diepte van 5",
 	"right-sendemail": "Stuur e-pos aan ander gebruikers",
 	"right-passwordreset": "Wys e-posse vir herstel van wagwoord",
-	"newuserlogpage": "Boekstaaf van nuwe gebruikers",
+	"newuserlogpage": "Logboek van nuwe gebruikers",
 	"newuserlogpagetext": "Dit is 'n logboek van gebruikers wat onlangs ingeteken het.",
 	"rightslog": "Gebruikersregtelogboek",
 	"rightslogtext": "Hier onder is die logboek van gebruikersregte wat verander is.",
@@ -1535,7 +1536,7 @@
 	"booksources-invalid-isbn": "Die ingevoerde ISBN-kode blyk asof dit ongeldig is; maak asseblief seker dat u dit sonder fout oorgekopiëer het vanaf die oorspronklike bron.",
 	"specialloguserlabel": "Uitvoerende gebruiker:",
 	"speciallogtitlelabel": "Teiken (bladsy of gebruiker):",
-	"log": "Boekstawe",
+	"log": "Logboeke",
 	"all-logs-page": "Alle openbare logboeke",
 	"alllogstext": "Vertoon 'n samestelling van alle boekstawings van {{SITENAME}}.\nU kan die resultate vernou deur 'n boekstaaftipe, gebruikersnaam (kas-sensitief) of spesifieke blad (ook kas-sensitief) te kies.",
 	"logempty": "Geen inskrywings in die logboek voldoen aan die kriteria nie.",
@@ -1599,6 +1600,7 @@
 	"listgrouprights-removegroup-self-all": "Alle groepe verwyder van eie gebruiker",
 	"listgrouprights-namespaceprotection-header": "Naamruimtebeperkings",
 	"listgrouprights-namespaceprotection-namespace": "Naamruimte",
+	"trackingcategories": "Volg kategorieë",
 	"trackingcategories-msg": "Volg kategorie",
 	"trackingcategories-name": "Boodskapnaam",
 	"trackingcategories-nodesc": "Geen beskrywing beskikbaar nie.",
@@ -2001,7 +2003,7 @@
 	"movepage-page-moved": "Die bladsy $1 is na $2 geskuif.",
 	"movepage-page-unmoved": "Die bladsy $1 kon nie na $2 geskuif word nie.",
 	"movepage-max-pages": "Die maksimum van $1 {{PLURAL:$1|bladsy|bladsye}} is geskuif. Die oorblywende bladsye na nie outomaties geskuif word nie.",
-	"movelogpage": "Skuif boekstaaf",
+	"movelogpage": "Skuiflogboek",
 	"movelogpagetext": "Hier onder is 'n lys van geskuifde bladsye.",
 	"movesubpage": "{{PLURAL:$1|Subbladsy|Subbladsye}}",
 	"movesubpagetext": "Die {{PLURAL:$1|subbladsy|$1 subbladsye}} van hierdie blad word hieronder gewys.",
@@ -3021,6 +3023,7 @@
 	"log-name-pagelang": "Logboek van taalwysigings",
 	"log-description-pagelang": "Hierdie is 'n logboek van wysigings van die taal van bladsye.",
 	"logentry-pagelang-pagelang": "$1 wysig die taal van bladsy '$3' van $4 na $5.",
+	"mediastatistics": "Mediastatistieke",
 	"mediastatistics-nbytes": "{{PLURAL:$1|$1 greep|$1 grepe}} ($2; $3%)",
 	"mediastatistics-table-mimetype": "MIME-tipe",
 	"mediastatistics-table-extensions": "Moontlike uitbreidings",
diff --git a/languages/i18n/aln.json b/languages/i18n/aln.json
index 4ed68bc258..3b8eee3ea8 100644
--- a/languages/i18n/aln.json
+++ b/languages/i18n/aln.json
@@ -5,7 +5,9 @@
 			"Cradel",
 			"Dardan",
 			"Mdupont",
-			"아라"
+			"아라",
+			"Ammartivari",
+			"Olsi"
 		]
 	},
 	"tog-underline": "Nënvizoji vegzat",
@@ -26,7 +28,7 @@
 	"tog-previewontop": "Vendose parapamjen përpara kutisë redaktuese",
 	"tog-previewonfirst": "Shfaqe parapamjen në redaktimin e parë",
 	"tog-enotifwatchlistpages": "Njoftomë me email, kur ndryshojnë faqet e mbikëqyruna",
-	"tog-enotifusertalkpages": "Njoftomë me email kur ndryshon faqja ime e diskutimit",
+	"tog-enotifusertalkpages": "Njoftomë me email kur ndryshon faqja ime e bisedimit",
 	"tog-enotifminoredits": "Njoftomë me email për redaktime të vogla të faqeve",
 	"tog-enotifrevealaddr": "Shfaqe adresën time në emailat njoftues",
 	"tog-shownumberswatching": "Shfaqe numrin e përdoruesve mbikëqyrës",
@@ -103,6 +105,18 @@
 	"oct": "Tet",
 	"nov": "Nan",
 	"dec": "Dhe",
+	"january-date": "$1 kallnor",
+	"february-date": "$1 fror",
+	"march-date": "$1 mars",
+	"april-date": "$1 prill",
+	"may-date": "$1 maj",
+	"june-date": "$1 qershor",
+	"july-date": "$1 korrik",
+	"august-date": "$1 gusht",
+	"september-date": "$1 shtator",
+	"october-date": "$1 tetor",
+	"november-date": "$1 nândor",
+	"december-date": "$1 dhetor",
 	"pagecategories": "{{PLURAL:$1|Kategoria|Kategoritë}}",
 	"category_header": "Artikuj në kategorinë \"$1\"",
 	"subcategories": "Nënkategori",
@@ -124,9 +138,10 @@
 	"newwindow": "(çelet në nji dritare të re)",
 	"cancel": "Harroje",
 	"moredotdotdot": "Mâ shumë...",
-	"mypage": "Faqja jeme",
-	"mytalk": "Diskutimet e mija",
-	"anontalk": "Diskutimet për këtë IP",
+	"morenotlisted": "Kjo listë nuk âsht e plotë.",
+	"mypage": "Faqja",
+	"mytalk": "Bisedimet",
+	"anontalk": "Bisedimet për këtë adres IP",
 	"navigation": "Lundrimi",
 	"and": "&#32;dhe",
 	"qbfind": "Kërko",
@@ -153,12 +168,15 @@
 	"printableversion": "Version për shtyp",
 	"permalink": "Vegëz e përhershme",
 	"print": "Shtyp",
+	"view": "Shiko",
+	"view-foreign": "Shiko në $1",
 	"edit": "Redakto",
+	"edit-local": "Redakto përshkrimin vendor",
 	"create": "Krijo",
 	"editthispage": "Redaktoje kët faqe",
-	"create-this-page": "Krijo këtë faqe",
-	"delete": "Fshij",
-	"deletethispage": "Fshije këtë faqe",
+	"create-this-page": "Krijo kët faqe",
+	"delete": "Fshije",
+	"deletethispage": "Fshije kët faqe",
 	"undelete_short": "Kthe {{PLURAL:$1|redaktimin e fshimë|$1 redaktime të fshime}}",
 	"protect": "Mbroj",
 	"protect_change": "ndrysho",
@@ -166,12 +184,12 @@
 	"unprotect": "Hiq mbrojtjen",
 	"unprotectthispage": "Hiq mbrojtjen nga kjo faqe",
 	"newpage": "Faqe e re",
-	"talkpage": "Diskuto këtë faqe",
+	"talkpage": "Bisedo këtë faqe",
 	"talkpagelinktext": "Bisedo",
 	"specialpage": "Faqe speciale",
 	"personaltools": "Vegla vetjake",
 	"articlepage": "Shiko artikullin",
-	"talk": "Diskutimi",
+	"talk": "Bisedimi",
 	"views": "Paraqitje",
 	"toolbox": "Veglat",
 	"userpage": "Shiko faqen e përdoruesit",
@@ -181,7 +199,7 @@
 	"templatepage": "Shiko faqen e shabllonit",
 	"viewhelppage": "Shiko faqen për ndihmë",
 	"categorypage": "Shiko faqen e kategorisë",
-	"viewtalkpage": "Shiko diskutimin",
+	"viewtalkpage": "Shiko bisedimin",
 	"otherlanguages": "Në gjuhë tjera",
 	"redirectedfrom": "(Përcjellë nga $1)",
 	"redirectpagesub": "Faqe përcjellëse",
@@ -718,7 +736,7 @@
 	"right-read": "Lexo faqe",
 	"right-edit": "Redakto faqet",
 	"right-createpage": "Hap faqe (që nuk janë faqe diskutimi)",
-	"right-createtalk": "Hap faqe diskutimi",
+	"right-createtalk": "Hap faqe bisedimi",
 	"right-createaccount": "Hap llogari të re",
 	"right-minoredit": "Shëno redaktimet si të vogla",
 	"right-move": "Lëviz faqet",
@@ -757,7 +775,7 @@
 	"action-read": "lexo këtë faqe",
 	"action-edit": "redakto këtë faqe",
 	"action-createpage": "hapë faqe",
-	"action-createtalk": "hap faqe diskutimi",
+	"action-createtalk": "hap faqe bisedimi",
 	"action-createaccount": "hapë këtë llogari",
 	"action-minoredit": "shëno këtë redaktim si të vogël",
 	"action-move": "lëviz këtë faqe",
@@ -912,7 +930,7 @@
 	"year": "Prej vjetit (e mâ herët):",
 	"sp-contributions-newbies": "Trego sall kontributet e përdoruesve të rij",
 	"sp-contributions-blocklog": "regjistri i bllokimeve",
-	"sp-contributions-talk": "Diskuto",
+	"sp-contributions-talk": "Bisedo",
 	"sp-contributions-search": "Kërko te kontributet",
 	"sp-contributions-username": "Adresa IP ose përdoruesi:",
 	"sp-contributions-submit": "Lyp",
@@ -958,13 +976,13 @@
 	"thumbnail-more": "Zmadho",
 	"thumbnail_error": "Gabim gjatë krijimit të figurës përmbledhëse: $1",
 	"tooltip-pt-userpage": "Faqja juej e përdoruesit",
-	"tooltip-pt-mytalk": "Faqja juej e diskutimeve",
+	"tooltip-pt-mytalk": "Faqja juej e bisedimeve",
 	"tooltip-pt-preferences": "Parapëlqimet tuaja",
 	"tooltip-pt-watchlist": "Lista e faqeve nën mbikqyrjen tuej.",
 	"tooltip-pt-mycontris": "Lista e kontributeve tueja",
 	"tooltip-pt-login": "Të këshillojmë me u kyçë; mirëpo, nuk asht e detyrueshme",
 	"tooltip-pt-logout": "Dalje",
-	"tooltip-ca-talk": "Diskuto për përmbajtjen e faqes",
+	"tooltip-ca-talk": "Bisedo për përmbajtjen e faqes",
 	"tooltip-ca-edit": "Mund ta redaktosh kët faqe. Përdore pullën >>Shfaqe parapamjen<< para se t'i krysh ndryshimet.",
 	"tooltip-ca-addsection": "Nis nji sekcion të ri.",
 	"tooltip-ca-viewsource": "Kjo faqe asht e mbrojtun. Mundesh veç me pa burimin e tekstit.",
@@ -1056,5 +1074,17 @@
 	"rightsnone": "(asgjë)",
 	"revdelete-summary": "përmbledhja redaktimit",
 	"searchsuggest-search": "Kërkim",
-	"searchsuggest-containing": "përmban ..."
+	"searchsuggest-containing": "përmban ...",
+	"special-characters-group-latin": "Latinisht",
+	"special-characters-group-latinextended": "Latine zgjeruar",
+	"special-characters-group-ipa": "IPA",
+	"special-characters-group-symbols": "Simbolet",
+	"special-characters-group-greek": "Grek",
+	"special-characters-group-cyrillic": "I sllavishtes së vjetër",
+	"special-characters-group-arabic": "Arabisht",
+	"special-characters-group-hebrew": "Hebraisht",
+	"special-characters-group-bangla": "Shqip",
+	"special-characters-group-telugu": "Telugu",
+	"special-characters-group-sinhala": "Sinhala",
+	"special-characters-group-gujarati": "Guxharati"
 }
diff --git a/languages/i18n/an.json b/languages/i18n/an.json
index a3d10dc452..31a601662a 100644
--- a/languages/i18n/an.json
+++ b/languages/i18n/an.json
@@ -12,7 +12,8 @@
 			"לערי ריינהארט",
 			"아라",
 			"Macofe",
-			"Carlos Cristia"
+			"Carlos Cristia",
+			"MarcoAurelio"
 		]
 	},
 	"tog-underline": "Subrayar os vinclos:",
@@ -789,7 +790,7 @@
 	"prefs-reset-intro": "Puet emplegar ista pachina ta restaurar as suyas preferencias a las valuras por defecto d'o sitio.\nNo se podrá desfer iste cambio.",
 	"prefs-emailconfirm-label": "Confirmación de correu electronico:",
 	"youremail": "Adreza de correu electronico:",
-	"username": "Nombre d'usuario:",
+	"username": "{{GENDER:$1|Nombre d'usuario|Nombre d'usuaria|Nombre d'usuario}}:",
 	"prefs-memberingroups": "Miembro {{PLURAL:$1|d'a colla|d'as collas}}:",
 	"prefs-memberingroups-type": "$1",
 	"prefs-registration": "Tiempo de rechistro:",
@@ -1405,7 +1406,6 @@
 	"mailnologin": "No ninviar l'adreza",
 	"mailnologintext": "Ha d'haber [[Special:UserLogin|encetato una sesión]] y tener una adreza conforme de correu-e en as suyas [[Special:Preferences|preferencias]] ta ninviar un correu electronico ta atros usuarios.",
 	"emailuser": "Ninviar un correu electronico ta iste usuario",
-	"emailpage": "Ninviar correu ta l'usuario",
 	"emailpagetext": "Puede fer servir o formulario que bi ye contino ta ninviar un correu electronico a iste usuario.\nL'adreza de correu-e que endicó en as suyas [[Special:Preferences|preferencias d'usuario]] amaneixerá en o campo \"Remitent\" ta que o destinatario pueda responder-le.",
 	"defemailsubject": "Correu de {{SITENAME}} de l'usuario $1",
 	"usermaildisabled": "S'ha desactivau o ninvío de correus electronicos a os usuarios",
diff --git a/languages/i18n/ar.json b/languages/i18n/ar.json
index 94c021ecfb..2332ff63b7 100644
--- a/languages/i18n/ar.json
+++ b/languages/i18n/ar.json
@@ -382,6 +382,7 @@
 	"title-invalid-interwiki": "عنوان الصفحة المطلوب يتضمن وصلة لحلقة لغة وهو ما لا يمكن استخدامه في العناوين.",
 	"title-invalid-talk-namespace": "عنوان الصفحة المطلوبة يشير إلى صفحة نقاش غير موجودة.",
 	"title-invalid-characters": "عنوان الصفحة المطلوب يتضمن محارف غير صالحة: \"$1\"",
+	"title-invalid-leading-colon": "عنوان الصفحة المطلوب يتضمن فاصلة غير صالحة في بدايته.",
 	"perfcached": "البيانات التالية مخبأة و قد لا تكون محدثة. {{PLURAL:$1||نتيجة واحدة|نتيجتان|$1 نتائج|$1 نتيجة}} على الأكثر {{PLURAL:$1||مخبّأة|مخبّأتان|مخبّأة}}.",
 	"perfcachedts": "البيانات التالية مخزنة، وكان آخر تحديث لها في $1. العدد الأقصى للنتائج المخزنة هو {{PLURAL:$4||نتيجة واحدة|نتيجتان|$4 نتائج|$4 نتيجة}}.",
 	"querypage-no-updates": "تحديثات هذه الصفحة معطلة حاليا.\nالبيانات هنا لن يتم تحديثها حاليا.",
@@ -471,6 +472,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|صفحة}}",
 	"createacct-benefit-body3": "آخر {{PLURAL:$1|مساهم|مساهمين}}",
 	"badretype": "كلمات السر التي أدخلتها لا تتطابق.",
+	"usernameinprogress": "إن عملية إنشاء حساب لاسم المستخدم هذا جارية بالفعل. برجاء الانتظار.",
 	"userexists": "اسم المستخدم الذي تم إدخاله مستعمل بالفعل.\nالرجاء اختيار اسم مختلف.",
 	"loginerror": "خطأ في الدخول",
 	"createacct-error": "خطأ في إنشاء حساب",
@@ -956,7 +958,8 @@
 	"rows": "صفوف:",
 	"columns": "أعمدة:",
 	"searchresultshead": "بحث",
-	"stub-threshold": "الحد لتنسيق <a href=\"#\" class=\"stub\">وصلة البذرة</a>:",
+	"stub-threshold": "الحد لتنسيق وصلة البذرة ($1):",
+	"stub-threshold-sample-link": "عينة",
 	"stub-threshold-disabled": "معطل",
 	"recentchangesdays": "عدد الأيام المعروضة في أحدث التغييرات:",
 	"recentchangesdays-max": "الحد الأقصى {{PLURAL:$1|أقل من يوم|يوم واحد|يومان|$1 أيام|$1 يوما|$1 يوم}}",
@@ -1237,8 +1240,8 @@
 	"newpageletter": "ج‌",
 	"boteditletter": "ب",
 	"number_of_watching_users_pageview": "[{{PLURAL:$1|لا مستخدمون يراقبون|مستخدم واحد يراقب|مستخدمان يراقبان|$1 مستخدمين يراقبون|$1 مستخدما يراقب|$1 مستخدم يراقب}}]",
-	"rc_categories": "حصر لتصنيفات (مفرقة برمز \"|\")",
-	"rc_categories_any": "أي",
+	"rc_categories": "حصر لتصنيفات (مفرقة برمز \"|\"):",
+	"rc_categories_any": "أي من المختار",
 	"rc-change-size-new": "$1 {{PLURAL:$1|بايت|بايت}} بعد التغيير",
 	"newsectionsummary": "/* $1 */ قسم جديد",
 	"rc-enhanced-expand": "عرض التفاصيل",
@@ -1348,6 +1351,19 @@
 	"upload-too-many-redirects": "احتوى المسار تحويلات كثيرة جدا",
 	"upload-http-error": "صودف خطأ HTTP: $1",
 	"upload-copy-upload-invalid-domain": "رفع النسخ غير متاح من هذا الموقع",
+	"upload-dialog-title": "رفع الملف",
+	"upload-dialog-error": "حدث خطأ",
+	"upload-dialog-warning": "حدث تنبيه",
+	"upload-dialog-button-cancel": "إلغاء",
+	"upload-dialog-button-done": "تم",
+	"upload-dialog-button-save": "احفظ",
+	"upload-dialog-button-upload": "رفع",
+	"upload-dialog-label-select-file": "اختر ملفا",
+	"upload-dialog-label-infoform-title": "التفاصيل",
+	"upload-dialog-label-infoform-name": "الاسم",
+	"upload-dialog-label-infoform-description": "الوصف",
+	"upload-dialog-label-usage-title": "الاستخدام",
+	"upload-dialog-label-usage-filename": "اسم الملف",
 	"backend-fail-stream": "لا يمكن عرض الملف $1.",
 	"backend-fail-backup": "لا يمكن صنع نسخة أحتياطية للملف $1.",
 	"backend-fail-notexists": "الملف $1 غير موجود.",
@@ -1914,7 +1930,7 @@
 	"undeletepagetext": "حُذفت {{PLURAL:$1||الصفحة التالية|الصفحتان التاليتان|$1 الصفحات التالية|ال$1 صفحة التالية}} ولكنها مازالت في الأرشيف ويمكن استرجاعها.\nقد يمسح الأرشيف دوريا.",
 	"undelete-fieldset-title": "استرجاع المراجعات",
 	"undeleteextrahelp": "لاسترجاع تاريخ الصفحة كاملا، اترك جميع الصناديق فارغة واضغط '''''{{int:undeletebtn}}'''''..\nللاسترجاع بشكل انتقائي، ضع علامة في الصناديق أمام المراجعات التي تريد استرجاعها، واضغط '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "{{PLURAL:$1|لم تؤرشف أي مراجعة|أرشفت مراجعة واحدة|أرشفت مراجعتان|أرشفت $1 مراجعات|أرشفت $1 مراجعة}}",
+	"undeleterevisions": "{{PLURAL:$1|لم تحذف أي مراجعة|حذفت مراجعة واحدة|حذفت مراجعتان|حذفت $1 مراجعات|حذفت $1 مراجعة}}",
 	"undeletehistory": "لو استرجعت الصفحة، كل المراجعات سيتم استرجاعها إلى التاريخ.\nلو كان قد تم إنشاء صفحة جديدة بالاسم نفسه بعد الحذف، المراجعات المسترجعة ستظهر في التاريخ السابق.",
 	"undeleterevdel": "الاسترجاع لن يتم إذا كان سينتج عنه أن تكون المراجعة أعلى الصفحة أو الملف محذوفة جزئيا.\nفي مثل هذه الحالات، يجب عليك إظهار أحدث المراجعات المحذوفة.",
 	"undeletehistorynoadmin": "هذه الصفحة تم حذفها.\nالسبب للحذف معروض في الملخص بالأسفل، إلى جانب تفاصيل المستخدمين الذين قاموا بالتعديل على هذه الصفحة قبل حذفها.\nنص المراجعات المحذوفة هذه متوفر فقط للإداريين.",
@@ -1971,7 +1987,7 @@
 	"sp-contributions-uploads": "مرفوعات",
 	"sp-contributions-logs": "سجلات",
 	"sp-contributions-talk": "نقاش",
-	"sp-contributions-userrights": "صلاحيات المستخدم",
+	"sp-contributions-userrights": "إدارة صلاحيات المستخدم",
 	"sp-contributions-blocked-notice": "هذا المستخدم ممنوع حاليا.\nإن آخر مدخلة في سجل المنع موجودة أدناه كمرجع:",
 	"sp-contributions-blocked-notice-anon": "عنوان الأيبي هذا ممنوع حاليا.\nآخر مدخلة لسجل المنع معروضة هنا كمرجع:",
 	"sp-contributions-search": "بحث عن مساهمات",
@@ -2374,7 +2390,7 @@
 	"spam_reverting": "استرجاع آخر نسخة ليس بها وصلات إلى $1",
 	"spam_blanking": "كل النسخ احتوت على وصلات ل $1، إفراغ",
 	"spam_deleting": "جميع النسخ تحوي رابطا إلى $1، يتم الحذف",
-	"simpleantispam-label": "اختبار ضد السبام.\n'''لا''' تملأ هذا!",
+	"simpleantispam-label": "اختبار ضد السبام.\n<strong>لا</strong> تملأ هذا!",
 	"pageinfo-title": "المعلومات عن «$1»",
 	"pageinfo-not-current": "عذرا، لا يمكن عرض تلك المعلومات للنسخ القديمة.",
 	"pageinfo-header-basic": "المعلومات الأساسية",
diff --git a/languages/i18n/arz.json b/languages/i18n/arz.json
index 6bbfe2ddbd..301dcc836a 100644
--- a/languages/i18n/arz.json
+++ b/languages/i18n/arz.json
@@ -185,7 +185,7 @@
 	"deletethispage": "امسح الصفحه دى",
 	"undeletethispage": "استرجاع الصفحه دى",
 	"undelete_short": "استرجاع {{PLURAL:$1|تعديل واحد|تعديلان|$1 تعديلات|$1 تعديل|$1 تعديلا}}",
-	"viewdeleted_short": "عرض {{PLURAL:$1||تعديل واحد|تعديلين|$1 تعديلات|$1 تعديل|$1 تعديل}}",
+	"viewdeleted_short": "عرض {{PLURAL:$1||تعديل واحد ملغى|تعديلين ملغيين|$1 تعديلات  ملغيه}}",
 	"protect": "حمايه",
 	"protect_change": "غيّر",
 	"protectthispage": "احمى الصفحه دى",
@@ -232,6 +232,7 @@
 	"disclaimers": "تنازل عن مسئوليه",
 	"disclaimerpage": "Project:تنازل عن مسئوليه عمومى",
 	"edithelp": "مساعده فى التعديل",
+	"helppage-top-gethelp": "مساعده",
 	"mainpage": "الصفحه الرئيسيه",
 	"mainpage-description": "الصفحه الرئيسيه",
 	"policy-url": "Project:سياسة",
@@ -263,6 +264,9 @@
 	"hidetoc": "تخبية",
 	"collapsible-collapse": "خبى",
 	"collapsible-expand": "اتوسع",
+	"confirmable-confirm": "انت متأكد{{GENDER:$1||ه}}؟",
+	"confirmable-yes": "ايوه",
+	"confirmable-no": "لا",
 	"thisisdeleted": "عرض او استرجاع $1؟",
 	"viewdeleted": "عرض $1؟",
 	"restorelink": "{{PLURAL:$1|تعديل واحد ملغي|تعديلين ملغيين|$1 تعديلات ملغية|$1 تعديل ملغي|$1 تعديل ملغي}}",
@@ -305,6 +309,7 @@
 	"readonly_lag": "قاعدة البيانات (الـ database) اتقفلت اوتوماتيكى علشان تقدر السيرڤرات الـ slave تلحق السيرڤر الـ master",
 	"internalerror": "غلط جوّانى",
 	"internalerror_info": "غلط جوّانى: $1",
+	"internalerror-fatal-exception": "استثناء مميت من النوع \"$1\"",
 	"filecopyerror": "ما نفع ش  يتنسخ الفايل \"$1\" لـ \"$2\".",
 	"filerenameerror": "ما نفع ش يتغير اسم الفايل \"$1\" لـ \"$2\".",
 	"filedeleteerror": "ما نفع ش يتمسح الفايل \"$1\".",
@@ -325,8 +330,8 @@
 	"protectedpagetext": "الصفحة دى اتحمت من التعديل.",
 	"viewsourcetext": "ممكن تشوف وتنسخ مصدر الصفحه دى",
 	"protectedinterface": "الصفحة دى هى اللى بتوفر نص الواجهة بتاعة البرنامج،وهى مقفولة لمنع التخريب.\nعلشان إضافة أو تغيير الترجمات لجميع مشاريع الويكي،  لو سمحت روح على [//translatewiki.net/ translatewiki.net]، مشروع ترجمة ميدياويكى",
-	"editinginterface": "'''تحذير''': أنت بتعدل صفحة بتستخدم فى الواجهة النصية  بتاعة البرنامج. \nالتغييرات فى الصفحة دى ها تأثر على مظهر واجهة اليوزر لليوزرز التانيين. \nعلشان إضافة أو تغيير الترجمات لجميع مشاريع الويكي،  لو سمحت روح على [//translatewiki.net/ translatewiki.net]، مشروع ترجمة ميدياويكى",
-	"cascadeprotected": "الصفحة دى محمية من التعديل، بسبب انها مدمجة فى {{PLURAL:$1|الصفحة|الصفحات}} دي، اللى مستعمل فيها خاصية \"حماية الصفحات المدمجة\" :\n$2",
+	"editinginterface": "<strong>تحذير</strong> : أنت بتعدل صفحة بتستخدم فى الواجهة النصية  بتاعة البرنامج. \nالتغييرات فى الصفحة دى ها تأثر على مظهر واجهة اليوزر لليوزرز التانيين. \nعلشان إضافة أو تغيير الترجمات لجميع مشاريع الويكي،  لو سمحت روح على [//translatewiki.net/ translatewiki.net]، مشروع ترجمة ميدياويكى",
+	"cascadeprotected": "الصفحة دى محمية من التعديل، بسبب انها مدمجة فى {{PLURAL:$1|الصفحة|الصفحتين|الصفحات}} دي، اللى مستعمل فيها خاصية \"حماية الصفحات المدمجة\" :\n$2",
 	"namespaceprotected": "ما عندكش صلاحية تعديل الصفحات  اللى فى نطاق '''$1'''.",
 	"ns-specialprotected": "الصفحات المخصوصة مش ممكن تعديلها.",
 	"titleprotected": "العنوان دا محمى من الإنشاء بـ[[User:$1|$1]]. السبب هو ''$2''.",
@@ -343,6 +348,7 @@
 	"yourpassword": "الباسوورد:",
 	"userlogin-yourpassword": "الباسورد:",
 	"yourpasswordagain": "اكتب الباسورد تاني:",
+	"createacct-yourpasswordagain": "أكد كلمه السر",
 	"remembermypassword": " (لمدة   $1 {{PLURAL:$1|يوم|يوم}})خليك فاكر دخولى على الكمبيوتر دا",
 	"yourdomainname": "النطاق بتاعك:",
 	"externaldberror": "يا إما فى حاجة غلط فى الدخول على قاعدة البيانات الخارجية أو انت مش مسموح لك تعمل تحديث لحسابك الخارجي.",
@@ -361,9 +367,11 @@
 	"gotaccount": "عندك حساب؟ '''$1'''.",
 	"gotaccountlink": "دخول",
 	"userlogin-resetlink": "نسيت تفاصيل الدخول؟",
+	"userlogin-helplink2": "مساعده ف الدخول",
 	"createacct-email-ph": "أكتب عنوان الإيميل بتاعك",
 	"createaccountmail": "استخدم باسورد مؤقته و إبعتها ع الايميل المحدد ده",
 	"createaccountreason": "السبب:",
+	"createacct-reason": "سبب:",
 	"createacct-submit": "افتح حسابك",
 	"createacct-benefit-body1": "$1 {{PLURAL:$1|تعديل|تعديلات}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|صفحه|صفحات}}",
@@ -411,7 +419,7 @@
 	"pt-createaccount": "افتح حساب",
 	"pt-userlogout": "خروج",
 	"changepassword": "غير الباسورد",
-	"resetpass_announce": "اتسجل دخولك دلوقتى بالكود اللى اتبعتلك فى الايميل. علشان تخلص عملية الدخول ،لازم تعملك باسورد جديدة هنا:",
+	"resetpass_announce": " علشان تخلص عملية  تسجيل الدخول ،لازم تعملك باسورد جديده:",
 	"resetpass_text": "<!-- أضف نصا هنا -->",
 	"resetpass_header": "غيّر الباسورد بتاعة الحساب",
 	"oldpassword": "الباسورد القديمة:",
@@ -419,6 +427,7 @@
 	"retypenew": "اكتب الباسورد الجديده تانى:",
 	"resetpass_submit": "اظبط الباسورد و ادخل",
 	"changepassword-success": "الباسورد بتاعتك اتغيرت بنجاح!",
+	"changepassword-throttled": "انت عملت  محاولات لوجين كتيره  ع الحساب ده.\nمن فضلك استنى $1 قبل المحاولة مرة تانيه.",
 	"resetpass_forbidden": "مش ممكن تغيير الباسورد",
 	"resetpass-no-info": "لازم تسجل دخولك علشان تقدر توصل للصفحة دى على طول.",
 	"resetpass-submit-loggedin": "غير الباسورد",
@@ -1788,7 +1797,7 @@
 	"tooltip-ca-nstab-main": "اعرض صفحة المحتوى",
 	"tooltip-ca-nstab-user": "اعرض صفحة اليوزر",
 	"tooltip-ca-nstab-media": "اعرض صفحة الميديا",
-	"tooltip-ca-nstab-special": "دى صفحه مخصوصه, ما تقدر ش تعدل الصفحه نفسها",
+	"tooltip-ca-nstab-special": "دى صفحه مخصوصه, ما تقدرش تعدلها",
 	"tooltip-ca-nstab-project": "اعرض صفحة المشروع",
 	"tooltip-ca-nstab-image": "اعرض صفحة الفايل",
 	"tooltip-ca-nstab-mediawiki": "اعرض رسالة النظام",
@@ -1858,6 +1867,7 @@
 	"file-nohires": "مافيش  ريزوليوشن اعلى متوفر.",
 	"svg-long-desc": "ملف SVG، اساسا $1 × $2 بكسل، حجم الملف: $3",
 	"show-big-image": "الصوره الاصليه",
+	"show-big-image-other": "{{PLURAL:$2||البعد التانى|البعدان التانيين|الأبعاد التانيه}}: $1.",
 	"show-big-image-size": "$1 × $2 بكسل",
 	"file-info-gif-looped": "ملفوف",
 	"file-info-gif-frames": "$1 {{PLURAL:$1|برواز|براويز}}",
@@ -2307,8 +2317,10 @@
 	"htmlform-submit": "تقديم",
 	"htmlform-reset": "الرجوع فى التغييرات",
 	"htmlform-selectorother-other": "تانيين",
+	"logentry-delete-delete": "{{GENDER:$2|مسح|مسحت}} $1 صفحة $3",
 	"revdelete-restricted": "طبق التعليمات على السيسوبات",
 	"revdelete-unrestricted": "شيل الضوابط من على السيسوبات",
+	"logentry-newusers-create": "تم فتح حساب {{GENDER:$2|اليوزر|اليوزره}} $1",
 	"logentry-upload-upload": " {{GENDER:$2|رفع|اترفعت}} $1 $3",
 	"rightsnone": "(فاضى)",
 	"revdelete-summary": "ملخص التعديل",
diff --git a/languages/i18n/ast.json b/languages/i18n/ast.json
index 03001daf87..6a50141dd8 100644
--- a/languages/i18n/ast.json
+++ b/languages/i18n/ast.json
@@ -921,7 +921,8 @@
 	"rows": "Fileres:",
 	"columns": "Columnes:",
 	"searchresultshead": "Buscar",
-	"stub-threshold": "Llímite superior pa considerar como <a href=\"#\" class=\"stub\">enllaz a entamu</a> (bytes):",
+	"stub-threshold": "Llende superior pa dar formatu d'entamu a un enllaz ($1):",
+	"stub-threshold-sample-link": "exemplu",
 	"stub-threshold-disabled": "Desactivao",
 	"recentchangesdays": "Díes que s'amuesen nos cambios recientes:",
 	"recentchangesdays-max": "(máximo $1 {{PLURAL:$1|día|díes}})",
diff --git a/languages/i18n/az.json b/languages/i18n/az.json
index 9bc5f9529e..cca3b29edd 100644
--- a/languages/i18n/az.json
+++ b/languages/i18n/az.json
@@ -804,7 +804,7 @@
 	"recentchangesdays-max": "Maksimum $1 {{PLURAL:$1|gün|gün}}",
 	"recentchangescount": "Son dəyişikliklərdə başlıq sayı:",
 	"prefs-help-recentchangescount": "Buraya yeni dəyişikliklər, səhifələrin və jurnalların tarixçəsi daxildir.",
-	"savedprefs": "Seçiminiz qeyd edildi.",
+	"savedprefs": "Seçiminiz qəbul edildi.",
 	"timezonelegend": "Vaxt zonası:",
 	"localtime": "Yerli vaxt:",
 	"timezoneuseserverdefault": "Susmaya görə serverdən istifadə ($1)",
diff --git a/languages/i18n/azb.json b/languages/i18n/azb.json
index cf9d6dd4fb..a5b4d78706 100644
--- a/languages/i18n/azb.json
+++ b/languages/i18n/azb.json
@@ -16,7 +16,8 @@
 			"Baloch Afghanistan",
 			"Macofe",
 			"Sadiqr",
-			"Mjbmr"
+			"Mjbmr",
+			"Alp Er Tunqa"
 		]
 	},
 	"tog-underline": "باغلانتی‌لارین آلتینی خطله:",
@@ -88,7 +89,7 @@
 	"june": "ژوئن",
 	"july": "ژولای",
 	"august": "آقوست",
-	"september": "سئپتامبر",
+	"september": "سپتامبر",
 	"october": "اوْکتوبر",
 	"november": "نوْوامبر",
 	"december": "دئسامبر",
@@ -100,7 +101,7 @@
 	"june-gen": "ژوئن",
 	"july-gen": "جولای",
 	"august-gen": "آقوست",
-	"september-gen": "سئپتامبر",
+	"september-gen": "سپتامبر",
 	"october-gen": "اوکتوبر",
 	"november-gen": "نووامبر",
 	"december-gen": "دئسامبر",
@@ -112,7 +113,7 @@
 	"jun": "ژوئن",
 	"jul": "ژولای",
 	"aug": "آقوست",
-	"sep": "سئپتامبر",
+	"sep": "سپتامبر",
 	"oct": "اوْکتوبر",
 	"nov": "نوْوامبر",
 	"dec": "دئسامبر",
@@ -379,15 +380,15 @@
 	"welcomecreation-msg": "حسابینیز آچیلدی.\n[[Special:Preferences|{{SITENAME}}ترجیحلر]] دییشدیرمیی اونوتمایین.",
 	"yourname": "ایستیفاده‌چی آدی:",
 	"userlogin-yourname": "ایشلدن آدی",
-	"userlogin-yourname-ph": "ایستیفاده‌چی آدینیزی دَییشدیرین",
-	"createacct-another-username-ph": "ایستیفاده‌چی آدینیزی داخیل ائدین",
+	"userlogin-yourname-ph": "ایشلدن آدینیزی دَییشدیرین",
+	"createacct-another-username-ph": "ایشلدن آدینیزی گیردیرین",
 	"yourpassword": "رمز:",
 	"userlogin-yourpassword": "رمز",
-	"userlogin-yourpassword-ph": "رمزینیزی داخیل ائدین",
-	"createacct-yourpassword-ph": "بیر رمز داخیل ائدین",
+	"userlogin-yourpassword-ph": "رمزینیزی گیردیرن",
+	"createacct-yourpassword-ph": "بیر رمز گیردیرین",
 	"yourpasswordagain": "رمزی یئنی‌دن یازین:",
 	"createacct-yourpasswordagain": "رمزی دوغرولایین",
-	"createacct-yourpasswordagain-ph": "رمزی یئنی‌دن داخیل ائدین",
+	"createacct-yourpasswordagain-ph": "رمزی یئنی‌دن گیردیرن",
 	"remembermypassword": "بو بیلگی‌سایاردا منیم گیریشیمی (چوخو $1 {{PLURAL:$1|گون}}ه قدر) یاددا ساخلا",
 	"userlogin-remembermypassword": "منی ایچری‌ده ساخلا",
 	"userlogin-signwithsecure": "آرخایین باغلانتی ایشلدین",
@@ -410,25 +411,25 @@
 	"gotaccountlink": "گیریش",
 	"userlogin-resetlink": "گیریش بیلگیلرینیزی اونوتموسونوز؟",
 	"userlogin-resetpassword-link": "رمزینیزی اونوتموسوز مو؟",
-	"userlogin-helplink2": "یاردیم ایله گیریش",
+	"userlogin-helplink2": "کؤمک ایله گیریش",
 	"userlogin-loggedin": "سیر حال حاضیردا {{GENDER:$1|$1}} عونوانیندا گیریش ائدیب سیز.\nآشاغیداکی فورمودان بیر آیری ایشلدن عونوانیندا گیریش اوچون ایشلدین.",
 	"userlogin-createanother": "بیر باشقا حساب یارات",
 	"createacct-emailrequired": "ایمیل آدرسی",
 	"createacct-emailoptional": "ایمیل آدرسی (ایستگه باغلی)",
-	"createacct-email-ph": "ایمیل آدرسینیزی داخیل ائدین",
-	"createacct-another-email-ph": "ایمیل آدرسینیزی داخیل ائدین",
+	"createacct-email-ph": "ایمیل آدرسینیزی گیردیرن",
+	"createacct-another-email-ph": "ایمیل آدرسینیزی گیردیرن",
 	"createaccountmail": "بیر گئچیجی راست‌گله رمز ایشلت و اونو آشاغیدا بللندیرن ایمیل آدرسینه گؤندر",
 	"createacct-realname": "دوغرو آد (ایستگه باغلی)",
 	"createaccountreason": "نَدَن‌لیک:",
 	"createacct-reason": "سبب",
 	"createacct-reason-ph": "ندن سیز باشقا حساب یارادیرسینیز",
 	"createacct-captcha": "امنیت یوخلاماسی",
-	"createacct-imgcaptcha-ph": "اوست‌ده‌کی گؤردوگونوز یازی‌نی داخیل ائدین",
+	"createacct-imgcaptcha-ph": "اوست‌ده‌کی گؤردوگونوز یازی‌نی گیردیرن",
 	"createacct-submit": "حسابینیزی یارادین",
 	"createacct-another-submit": "بیر باشقا حساب یارات",
 	"createacct-benefit-heading": "{{SITENAME}} سیزین کیمی آدام‌لارین الی ایله یارانیب‌دیر.",
 	"createacct-benefit-body1": "{{PLURAL:$1|دَییشیکلیک}}",
-	"createacct-benefit-body2": "{{PLURAL:$1|صحیفه}}",
+	"createacct-benefit-body2": "{{PLURAL:$1|صفحه}}",
 	"createacct-benefit-body3": "سون {{PLURAL:$1|قاتیلان|قاتیلانلار}}",
 	"badretype": "یازدیغینیز رمزلر بیر دئییل‌لر.",
 	"userexists": "یازدیغینیز آد، اؤنجه‌دن ایشده‌دیر.\nلوطفاً باشقا بیر آد سئچین.",
@@ -977,8 +978,8 @@
 	"prefs-advancedrendering": "گلیشمیش سئچَنکلر",
 	"prefs-advancedsearchoptions": "گلیشمیش سئچَنکلر",
 	"prefs-advancedwatchlist": "گلیشمیش سئچَنکلر",
-	"prefs-displayrc": "گؤرونتو سئچَنکلری",
-	"prefs-displaywatchlist": "گؤرونتو سئچَنکلری",
+	"prefs-displayrc": "عکس سئچَنکلری",
+	"prefs-displaywatchlist": "عکس سئچَنکلری",
 	"prefs-tokenwatchlist": "آدرس",
 	"prefs-diffs": "فرق‌لر",
 	"prefs-help-prefershttps": "سیزین بو ترجیحینیزین اثری سیزین سونراکی گیریشینیز دن سونرا اولاجاق.",
@@ -1154,9 +1155,9 @@
 	"recentchanges-label-minor": "بو بیر کیچیک دَییشدیرمه‌دیر",
 	"recentchanges-label-bot": "بو دییشیک بیر بوت طرفیندن ائدیلیب‌دیر",
 	"recentchanges-label-unpatrolled": "بو دییشیکلیک هله گؤزدن گئچیریلمه‌ییب‌دیر",
-	"recentchanges-label-plusminus": "صحیفه‌نین اؤلچوسو بایت میقداری ایله تعیین ائدیلیر",
-	"recentchanges-legend-heading": "'''ایختیصارلار:'''",
-	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (هم‌ده [[Special:NewPages|یئنی صحیفه‌لرین لیستینه]] باخین)",
+	"recentchanges-label-plusminus": "صفحه‌نین اؤلچوسو بایت میقداری ایله تعیین ائدیلیر",
+	"recentchanges-legend-heading": "'''قیسالتمالار:'''",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (بیرده [[Special:NewPages|یئنی صفحه‌لرین لیستینه]] باخین)",
 	"rcnotefrom": "آشاغی داکی دَییشیک لرده <strong>$3, $4</strong> (دن <strong>$1</strong> {{PLURAL:$5|چان گوستریلیب|چان گوستریلیب دیر}}).",
 	"rclistfrom": "$3 $2 واختیندان باشلایاراق یئنی دییشیکلری گؤستر",
 	"rcshowhideminor": "کیچیک دَییشیکلری $1",
@@ -1165,10 +1166,10 @@
 	"rcshowhidebots": "بوتلاری $1",
 	"rcshowhidebots-show": "گؤستر",
 	"rcshowhidebots-hide": "گیزلت",
-	"rcshowhideliu": "یازیلمیش ایستفاده‌چیلری $1",
+	"rcshowhideliu": "یازیلمیش ایشلدن‌لری $1",
 	"rcshowhideliu-show": "گؤستر",
 	"rcshowhideliu-hide": "گیزلت",
-	"rcshowhideanons": "تانینمامیش ایستیفاده‌چیلری $1",
+	"rcshowhideanons": "تانینمامیش ایشلدن‌لری $1",
 	"rcshowhideanons-show": "گؤستر",
 	"rcshowhideanons-hide": "گیزلت",
 	"rcshowhidepatr": "نظارت ائدیلن دَییشیکلیکلری $1",
@@ -1636,7 +1637,7 @@
 	"activeusers-intro": "بوردا سون {{PLURAL:$1|بیر|$1}} گون‌ده بیر ایشلر گؤرن ایستیفاده‌چیلرین لیستی گؤستریلیر.",
 	"activeusers-count": "سون {{PLURAL:$3|گون|$3 گون}}‌ده، {{PLURAL:$1|$1}} چالیشما",
 	"activeusers-from": "بوندان باشلایاراق ایستیفاده‌چیلری گؤستر:",
-	"activeusers-hidebots": "بوتلاری گیزلت",
+	"activeusers-hidebots": "روْبات‌لاری گیزلت",
 	"activeusers-hidesysops": "ایداره‌چیلری گیزلت",
 	"activeusers-noresult": "هئچ ایشلدن تاپیلمادی.",
 	"listgrouprights": "ایستیفاده‌چی قروپ حاقلاری",
@@ -1716,14 +1717,14 @@
 	"notvisiblerev": "باشقا ایستیفادی‌چی‌نین سون دییشیک‌لیگی سیلینیب",
 	"watchlist-details": "دانیشیق صفحه‌لرینی آیری سایمایاراق، {{PLURAL:$1|$1 صفحه‌نی}} ایزله‌ییرسینیز.",
 	"wlheader-enotif": "ایمیل ایله بیلدیریش آچیلیب‌دیر.",
-	"wlheader-showupdated": "سون گؤروشونوزدن سونرا ائدیلن دییشیکلیکلر '''قالین''' گؤستریلیبدیلر.",
+	"wlheader-showupdated": "سون گؤروشونوزدن سوْنرا ائدیلن دییشیکلیکلر '''قالین''' گؤرسدیلیب‌دیر.",
 	"wlnote": "آشاغیداکی {{PLURAL:$1|بیر ديَیشیک‌لیک|<strong>$1</strong> ديَیشیک‌لیک}}  سون {{PLURAL:$2|ساعتدا|<strong>$2</strong> ساعتدا}} ائدیلمیشدیر. $3، $4",
 	"wlshowlast": "سون $1 ساعات $2 گون گؤستر",
 	"watchlist-options": "ایزله‌دیکلر سئچمه‌لری",
 	"watching": "ایزله‌نیلیر...",
 	"unwatching": "ایزله‌مه...",
 	"watcherrortext": "ایزلئمئ سیاهی‌سی ترجیحلرینیزی \"$1\" اوچون دییشدیررکن بیر خطا میدانا گلدی.",
-	"enotif_reset": "باخیلمیش بوتون صحیفه‌لری ایشاره‌له.",
+	"enotif_reset": "باخیلمیش بۆتون صفحه‌لری علامت‌له.",
 	"enotif_impersonal_salutation": "{{SITENAME}} ایستیفاده‌چی‌سی",
 	"enotif_subject_deleted": "{{SITENAME}} $1 صحیفه‌سی، {{gender:$2|$2}} ایله سیلینیب‌دیر",
 	"enotif_subject_created": "{{SITENAME}} $1 صحیفه‌سی، {{gender:$2|$2}} ایله یارانیب‌دیر",
@@ -1880,7 +1881,7 @@
 	"invert": "سئچیلنی دؤندر",
 	"tooltip-invert": "بو قوتونی علامتله یین تا انتخاب اولان آد فضا سینین ایچری صحیفه لری دییشیک لیک لری(و اوبیری علامتلنمیش فضالار) گیزله نه آدی",
 	"tooltip-whatlinkshere-invert": "سئچیلمیش آدفضاسیندان اولان باغلانتیلاری گیزلتمک اوچون بو قوتویا نیشان قویون.",
-	"namespace_association": "ایلگیلی آدفضاسی",
+	"namespace_association": "باغلی آدفضاسی",
 	"tooltip-namespace_association": "بو قوتونو علامت له ین یالنیز آد بحث فضاسی یا مرتبط اولان آد فضاسی ایله انتخاب اولا",
 	"blanknamespace": "(آنا)",
 	"contributions": "{{GENDER:$1|ایشلدن}} چالیشمالاری",
@@ -2350,7 +2351,7 @@
 	"previousdiff": "اسکی دَییشدیرمه",
 	"nextdiff": "یئنی دَییشدیرمه",
 	"mediawarning": "'''خبردارلیق: بو ​​فایل نوعو پیس نیت‌لی کودلار اولا بیلر.\nبونو ایشلتمک، سیستئمینیزی تهلوکه‌یه آتا بیلر.",
-	"imagemaxsize": "گؤرونتو ماکسیمال توتومو:<br />(فایلین تصویری صفحه‌لری اۆچون)'",
+	"imagemaxsize": "عکس ماکسیمال توتومو:<br />(فایلین تصویری صفحه‌لری اۆچون)'",
 	"thumbsize": "کیچیک اؤلچو:",
 	"widthheightpage": "$1 × $2، $3 {{PLURAL:$3|صحیف|صحیفه‌لر}}",
 	"file-info": "فایلین اؤلچوسو: $1، MIME تیپی: $2",
@@ -2942,7 +2943,7 @@
 	"tags-edit-nooldid-title": "گئچرسیز هدف نوسخه",
 	"comparepages": "صحیفه‌لری قارشی‌لاش‌دیر",
 	"compare-page1": "صفحه 1",
-	"compare-page2": "صحیفه 2",
+	"compare-page2": "صفحه ۲",
 	"compare-rev1": "نوسخه ۱",
 	"compare-rev2": "نوسخه ۲",
 	"compare-submit": "قارشی‌لاش‌دیر",
diff --git a/languages/i18n/bcl.json b/languages/i18n/bcl.json
index 1b0e2ed8b9..308e1d7cb1 100644
--- a/languages/i18n/bcl.json
+++ b/languages/i18n/bcl.json
@@ -545,7 +545,7 @@
 	"preview": "Tànawón",
 	"showpreview": "Ipahiling an patanaw",
 	"showdiff": "Ipahiling an mga kaliwatan",
-	"anoneditwarning": "'''Patanid:''' Ika dae nakapaglaog. An saimong estada kan IP maisusurat sa laog kan historiya nin pagliliwat sa pahinang ini.",
+	"anoneditwarning": "<strong>Patanid:</strong> Ika dae nakalaog. An saimong estada kan IP mahihiling kan publiko kun ika makahimo nin arinman na mga pagliliwat. Kun ika <strong>[$1 naglaog]</strong> o <strong>[$2 magmukna nin panindog]</strong>, an saimong mga pagliliwat ipagpapanungod sa saimong ngaran-paragamit, kaiba an iba pang mga benepisyo.",
 	"anonpreviewwarning": "Dae ka tabi nakalaog. An pagtatagama matala kan saimong IP address sa historya nin pagliwat sa pahinang ini.",
 	"missingsummary": "<strong>Pagiromdom:</strong>Ika dae pa nakapagtao nin sumaryo sa pagliwat. Kun i-klik mo an \"{{int:savearticle}}\" giraray, an saimong pagliwat ipagtatagama na mayo kaiyan.",
 	"missingcommenttext": "Pakikaag nin sarong komento sa ibaba.",
@@ -1578,7 +1578,6 @@
 	"emailuser": "E-suratan ining paragamit",
 	"emailuser-title-target": "E-surat kaining {{GENDER:$1|paragamit}}",
 	"emailuser-title-notarget": "E-surat na paragamit",
-	"emailpage": "E-suratan an parágamit",
 	"emailpagetext": "Ika makakagamit kan porma na yaon sa ibaba sa pagpadara nin mensahe na e-surat sa {{GENDER:$1|paragamit}}.\nAn e-surat na estada sa saimong pinaglaog sa [[Special:Preferences|saimong paragamit na mga kamuyahan]] ipapahiling bilang iyo an \"Gikan sa\" estada kan e-surat, kaya an resipiyente makakapagsimbag direkta mismo saimo.",
 	"defemailsubject": "{{SITENAME}} e-surat gikan sa paragamit \"$1\"",
 	"usermaildisabled": "Paragamit na e-surat pinagpundo",
@@ -2099,7 +2098,7 @@
 	"tooltip-pt-login": "Ika inaagyat na maglaog; alagad, bako tabi ining piriritan",
 	"tooltip-pt-logout": "Magluwas",
 	"tooltip-ca-talk": "Orolayan dapit sa laog kan pahina",
-	"tooltip-ca-edit": "Ika makakaliwat kaining pahina. Tabi man gamiton an pindutan nin patanaw bago itatagama",
+	"tooltip-ca-edit": "Liwata ining pahina",
 	"tooltip-ca-addsection": "Magpoon nin sarong baguhon na seksyon",
 	"tooltip-ca-viewsource": "Ining pahina protektado.\nIka makakatanaw kan pinaggikanan",
 	"tooltip-ca-history": "Mga nakaaging rebisyon kaining pahina",
@@ -2175,7 +2174,7 @@
 	"spam_reverting": "Mabalik sa huring bersion na mayong takod sa $1",
 	"spam_blanking": "An gabos na mga pahirá na may takod sa $1, pigblablanko",
 	"spam_deleting": "An gabos na mga rebisyon na igwang mga kasugpunan sa $1, pinupura",
-	"simpleantispam-label": "Rikisa nin Kontra-Ispam.\nGiboha na '''DAE''' paglaogan digde!",
+	"simpleantispam-label": "Rikisa nin Kontra-Ispam.\nGiboha na <strong>dae</strong> paglaogan ini!",
 	"pageinfo-title": "Impormasyon para sa \"$1\"",
 	"pageinfo-not-current": "Sori, imposible baya na maitao ining impormasyon para sa lumaon nang mga rebisyon.",
 	"pageinfo-header-basic": "Panuntungang impormasyon",
diff --git a/languages/i18n/be-tarask.json b/languages/i18n/be-tarask.json
index 10e175b25a..b776403aaa 100644
--- a/languages/i18n/be-tarask.json
+++ b/languages/i18n/be-tarask.json
@@ -860,7 +860,7 @@
 	"searchprofile-advanced": "Пашыраны",
 	"searchprofile-articles-tooltip": "Пошук у $1",
 	"searchprofile-images-tooltip": "Пошук файлаў",
-	"searchprofile-everything-tooltip": "Шукаць усюды (уключна са старонкамі абмеркаваньня)",
+	"searchprofile-everything-tooltip": "Шукаць усюды (у тым ліку на старонках абмеркаваньня)",
 	"searchprofile-advanced-tooltip": "Шукаць у дадатковых прасторах назваў",
 	"search-result-size": "$1 ($2 {{PLURAL:$2|слова|словы|словаў}})",
 	"search-result-category-size": "$1 {{PLURAL:$1|элемэнт|элемэнты|элемэнтаў}} ($2 {{PLURAL:$2|падкатэгорыя|падкатэгорыі|падкатэгорыяў}}, $3 {{PLURAL:|файл|файлы|файлаў}})",
@@ -923,7 +923,8 @@
 	"rows": "Радкоў:",
 	"columns": "Слупкоў:",
 	"searchresultshead": "Пошук",
-	"stub-threshold": "Максымальны памер старонкі для паказу спасылак <a href=\"#\" class=\"stub\">як на накід</a> (у байтах):",
+	"stub-threshold": "Максымальны памер старонкі для паказу спасылак як на накід ($1):",
+	"stub-threshold-sample-link": "прыклад",
 	"stub-threshold-disabled": "Выключаны",
 	"recentchangesdays": "Колькасьць дзён для паказу ў апошніх зьменах:",
 	"recentchangesdays-max": "(максымальна $1 {{PLURAL:$1|дзень|дні|дзён}})",
@@ -1047,7 +1048,7 @@
 	"right-minoredit": "пазначэньне рэдагаваньняў як дробныя",
 	"right-move": "перанос старонак",
 	"right-move-subpages": "перанос старонак разам зь іх падстаронкамі",
-	"right-move-rootuserpages": "Перанос карэнных старонак удзельнікаў",
+	"right-move-rootuserpages": "перанос карэнных старонак удзельнікаў",
 	"right-move-categorypages": "перанос старонак катэгорыяў",
 	"right-movefile": "перайменаваньне файлаў",
 	"right-suppressredirect": "не ствараць перанакіраваньне са старой назвы пасьля пераносу старонкі",
@@ -1061,7 +1062,7 @@
 	"right-bot": "лічыцца аўтаматычным працэсам",
 	"right-nominornewtalk": "не паведамляць удзельнікам пра новыя паведамленьні на іх старонках гутарак, калі зробленыя там праўкі былі дробнымі",
 	"right-apihighlimits": "менш абмежаваньняў на выкананьне API-запытаў",
-	"right-writeapi": "выкарыстаньне API для запісаў",
+	"right-writeapi": "выкарыстаньне API для запісу",
 	"right-delete": "выдаленьне старонак",
 	"right-bigdelete": "Выдаленьне старонак зь вялікімі гісторыямі",
 	"right-deletelogentry": "выдаленьне і аднаўленьне асобных запісаў журналу",
@@ -1217,7 +1218,7 @@
 	"recentchangeslinked-feed": "Зьвязаныя праўкі",
 	"recentchangeslinked-toolbox": "Зьвязаныя праўкі",
 	"recentchangeslinked-title": "Зьвязаныя праўкі для «$1»",
-	"recentchangeslinked-summary": "Гэта сьпіс апошніх зьменаў старонак, на якія спасылаецца азначаная старонка (ці ўсіх старонак, якія належаць азначанай катэгорыі).\nСтаронкі з [[Special:Watchlist|Вашага сьпісу назіраньня]] пазначаныя '''тлустым шрыфтам'''.",
+	"recentchangeslinked-summary": "Гэта сьпіс апошніх зьменаў старонак, на якія спасылаецца азначаная старонка (ці ўсіх старонак, якія належаць азначанай катэгорыі).\nСтаронкі з [[Special:Watchlist|Вашага сьпісу назіраньня]] пазначаныя <strong>тоўстым шрыфтам</strong>.",
 	"recentchangeslinked-page": "Назва старонкі:",
 	"recentchangeslinked-to": "Замест гэтага паказваць зьмены на старонках, што спасылаюцца на гэтую старонку",
 	"upload": "Загрузіць файл",
@@ -1340,6 +1341,8 @@
 	"upload-dialog-label-infoform-title": "Падрабязнасьці",
 	"upload-dialog-label-infoform-name": "Назва",
 	"upload-dialog-label-infoform-description": "Апісаньне",
+	"upload-dialog-label-usage-title": "Выкарыстаньне",
+	"upload-dialog-label-usage-filename": "Назва файлу",
 	"backend-fail-stream": "Немагчыма накіраваць файл $1.",
 	"backend-fail-backup": "Немагчыма зрабіць рэзэрвовую копію файла $1.",
 	"backend-fail-notexists": "Файл $1 не існуе.",
@@ -1638,7 +1641,7 @@
 	"booksources-text": "Ніжэй знаходзіцца сьпіс спасылак на іншыя сайты, якія прадаюць новыя і патрыманыя кнігі, і могуць таксама мець інфармацыю пра кнігі, якія Вы шукаеце:",
 	"booksources-invalid-isbn": "Пададзены няслушны ISBN; праверце, магчыма ўзьніклі памылкі пры пераносе нумару з арыгінальнай крыніцы.",
 	"specialloguserlabel": "Выканаўца:",
-	"speciallogtitlelabel": "Мэта (назва ці удзельнік):",
+	"speciallogtitlelabel": "Мэта (назва ці {{ns:user}}:імя_ўдзельніка для ўдзельніка):",
 	"log": "Журналы падзеяў",
 	"all-logs-page": "Усе публічныя журналы падзеяў",
 	"alllogstext": "Сумесны паказ усіх журналаў падзеяў {{GRAMMAR:родны|{{SITENAME}}}}.\nВы можаце адфільтраваць вынікі па тыпе журналу, удзельніку ці старонцы.",
@@ -2316,7 +2319,7 @@
 	"tooltip-ca-nstab-main": "Паказаць зьмест старонкі",
 	"tooltip-ca-nstab-user": "Паказаць старонку ўдзельніка",
 	"tooltip-ca-nstab-media": "Паказаць старонку мэдыяфайла",
-	"tooltip-ca-nstab-special": "Гэта спэцыяльная старонка, і Вы ня можаце яе рэдагаваць",
+	"tooltip-ca-nstab-special": "Гэта спэцыяльная старонка і яе нельга рэдагаваць",
 	"tooltip-ca-nstab-project": "Паказаць старонку праекту",
 	"tooltip-ca-nstab-image": "Паказаць старонку файла",
 	"tooltip-ca-nstab-mediawiki": "Паказаць сыстэмнае паведамленьне",
@@ -3018,13 +3021,13 @@
 	"blankpage": "Пустая старонка",
 	"intentionallyblankpage": "Гэтая старонка наўмысна пакінутая пустой",
 	"external_image_whitelist": " #Пакіньце гэты радок такім, які ён ёсьць<pre>\n#Зьмясьціце часткі рэгулярных выразаў (толькі частку якая знаходзіцца паміж //) ніжэй\n#Яны будуць суаднесеныя з URL-адрасамі вонкавых выяваў\n#Тыя, якія будуць пасаваць будуць паказвацца як выявы, астатнія толькі як спасылкі\n#Радкі, пазначаныя #, лічыцца камэнтарамі\n#Рэгістар сымбаляў ня ўлічваецца\n\n#Зьмясьціце ўсе часткі рэгулярных выразаў над гэтым радком. Сам радок пакіньце ў такім жа выглядзе</pre>",
-	"tags": "Слушныя тэгі зьменаў",
-	"tag-filter": "Фільтар [[Special:Tags|тэгаў]]:",
+	"tags": "Дзейныя меткі зьменаў",
+	"tag-filter": "Фільтар [[Special:Tags|метак]]:",
 	"tag-filter-submit": "Фільтар",
-	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|1=Тэг|Тэгі}}]]: $2)",
-	"tags-title": "Тэгі",
-	"tags-intro": "На гэтай старонцы знаходзіцца сьпіс тэгаў, якімі праграмнае забесьпячэньне можа пазначыць рэдагаваньне, і іх значэньне.",
-	"tags-tag": "Назва тэга",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|1=Метка|Меткі}}]]: $2)",
+	"tags-title": "Меткі",
+	"tags-intro": "На гэтай старонцы знаходзіцца сьпіс метак, якімі праграмнае забесьпячэньне можа пазначыць рэдагаваньне, і іх значэньне.",
+	"tags-tag": "Назва меткі",
 	"tags-display-header": "Новыя запісы ў сьпісе зьменаў",
 	"tags-description-header": "Поўнае апісаньне значэньня",
 	"tags-source-header": "Крыніца",
@@ -3077,6 +3080,12 @@
 	"tags-deactivate-submit": "Адключыць",
 	"tags-apply-no-permission": "Вы ня маеце права прымяняць меткі да вашых рэдагаваньняў.",
 	"tags-apply-not-allowed-one": "Метка «$1» ня можа быць прызначаная ўручную.",
+	"tags-apply-not-allowed-multi": "{{PLURAL:$2|Наступную метку|Наступныя меткі}} нельга дадаваць уручную: $1",
+	"tags-update-no-permission": "Вы ня маеце права на дадаваньне ці выдаленьне метак зьменаў для асобных вэрсіяў ці запісаў журналаў.",
+	"tags-update-add-not-allowed-one": "Метка «$1» ня можа быць дададзеная ўручную.",
+	"tags-update-add-not-allowed-multi": "{{PLURAL:$2|1=Наступную метку|Наступныя меткі}} нельга дадаваць уручную: $1",
+	"tags-update-remove-not-allowed-one": "Метка «$1» ня можа быць выдаленая.",
+	"tags-update-remove-not-allowed-multi": "{{PLURAL:$2|1=Наступная метка на можа быць выдаленая|Наступныя меткі ня могуць быць выдаленыя}} ўручную: $1",
 	"tags-edit-title": "Рэдагаваньне метак",
 	"tags-edit-manage-link": "Кіраваньне меткамі",
 	"tags-edit-revision-selected": "{{PLURAL:$1|1=Абраная вэрсія|Абраныя вэрсіі}} [[:$2]]:",
@@ -3090,6 +3099,7 @@
 	"tags-edit-remove": "Выдаліць гэтыя меткі:",
 	"tags-edit-remove-all-tags": "(выдаліць усе меткі)",
 	"tags-edit-chosen-placeholder": "Абярыце меткі",
+	"tags-edit-chosen-no-results": "Адпаведныя меткі ня знойдзеныя",
 	"comparepages": "Параўнаньне старонак",
 	"compare-page1": "Старонка 1",
 	"compare-page2": "Старонка 2",
diff --git a/languages/i18n/bg.json b/languages/i18n/bg.json
index 5f71422fad..45d6601773 100644
--- a/languages/i18n/bg.json
+++ b/languages/i18n/bg.json
@@ -27,7 +27,8 @@
 			"Vodnokon4e",
 			"ShadeOfGrey",
 			"PetaRZ",
-			"Macofe"
+			"Macofe",
+			"V111P"
 		]
 	},
 	"tog-underline": "Подчертаване на препратките:",
@@ -451,7 +452,7 @@
 	"nouserspecified": "Необходимо е да се посочи потребителско име.",
 	"login-userblocked": "Този потребител е блокиран. Влизането в системата не е позволено.",
 	"wrongpassword": "Въведената парола е невалидна. Опитайте отново.",
-	"wrongpasswordempty": "Въведената парола е празна. Опитайте отново.",
+	"wrongpasswordempty": "Не е въведена парола. Опитайте отново.",
 	"passwordtooshort": "Необходимо е паролата да съдържа поне {{PLURAL:$1|1 знак|$1 знака}}.",
 	"password-name-match": "Паролата ви трябва да се различава от потребителското ви име.",
 	"password-login-forbidden": "Използването на това потребителско име и парола е забранено.",
@@ -747,7 +748,7 @@
 	"revdelete-show-file-confirm": "Необходимо е потвърждение, че желаете да прегледате изтритата версия на файла „<nowiki>$1</nowiki>“ от $2 $3.",
 	"revdelete-show-file-submit": "Да",
 	"logdelete-selected": "{{PLURAL:$1|Избрано събитие|Избрани събития}}:",
-	"revdelete-confirm": "Необходимо е да потвърдите, че велаете да извършите действието, разбирате последствията и го правите според [[{{MediaWiki:Policy-url}}|политиката]].",
+	"revdelete-confirm": "Необходимо е да потвърдите, че желаете да извършите действието, разбирате последствията и го правите според [[{{MediaWiki:Policy-url}}|политиката]].",
 	"revdelete-suppress-text": "Премахването трябва да се използва '''само''' при следните случаи:\n*Неподходяща или неприемлива лична информация\n*: ''домашни адреси и телефонни номера, номера за социално осигуряване и др.''",
 	"revdelete-legend": "Задаване на ограничения:",
 	"revdelete-hide-text": "Текст на версията",
@@ -1604,7 +1605,6 @@
 	"emailuser": "Писмо до потребителя",
 	"emailuser-title-target": "Изпращане на е-писмо на този {{GENDER:$1|потребител}}",
 	"emailuser-title-notarget": "Изпращане на е-писмо на потребител",
-	"emailpage": "Пращане писмо на потребител",
 	"emailpagetext": "Можете да използвате формуляра по-долу, за да изпратите електронно писмо на {{GENDER:$1|този потребител}}.\nАдресът, който се въвели в [[Special:Preferences|настройките си]], ще се появи в полето „От“ на писмото, така че получателят ще е в състояние да ви отговори директно.",
 	"defemailsubject": "Писмо от потребител $1 в {{SITENAME}}",
 	"usermaildisabled": "Потребителят не е разрешил да получава електронна поща",
@@ -1767,7 +1767,7 @@
 	"viewdeletedpage": "Преглед на изтрити страници",
 	"undeletepagetext": "{{PLURAL:$1|Следната страница беше изтрита, но все още се намира в архива и може да бъде възстановена|Следните $1 страници бяха изтрити, но все още се намират в архива и могат да бъдат възстановени}}. Архивът може да се почиства от време на време.",
 	"undelete-fieldset-title": "Възстановяване на версии",
-	"undeleteextrahelp": "За възстановяване на пълната история на страницата не се слагат отметки и се натиска '''''{{int:undeletebtn}}'''''.\nЗа частично възстановяване се поставят отметки тези версии на страницата, които трябва да бъдат въстановени, след което се натиска ''''{{int:undeletebtn}}'''''.",
+	"undeleteextrahelp": "За възстановяване на пълната история на страницата не се слагат отметки и се натиска '''''{{int:undeletebtn}}'''''.\nЗа частично възстановяване се поставят отметки на тези версии на страницата, които трябва да бъдат възстановени, след което се натиска '''''{{int:undeletebtn}}'''''.",
 	"undeleterevisions": "{{PLURAL:$1|Една версия беше архивирана|$1 версии бяха архивирани}}",
 	"undeletehistory": "Ако възстановите страницата, всички версии ще бъдат върнати в историята.\nАко след изтриването е създадена страница със същото име, възстановените версии ще се появят като по-ранна история, а текущата версия на страницата няма да бъде заменена автоматично. Също така обърнете внимание, че ограниченията, приложени върху версиите, ще се загубят след възстановяването.",
 	"undeleterevdel": "Възстановяването няма да бъде изпълнено, ако би довело до частично изтриване на актуалната версия. В такъв случай актуалната версия не трябва да бъде избирана или пък състоянието й трябва да бъде променено на нормална (нескрита) версия. Версиите на файлове, които нямате право да преглеждате, няма да бъдат възстановени.",
diff --git a/languages/i18n/bho.json b/languages/i18n/bho.json
index b0a7ed131a..acfd01c0cc 100644
--- a/languages/i18n/bho.json
+++ b/languages/i18n/bho.json
@@ -8,48 +8,48 @@
 			"SatyamMishra"
 		]
 	},
-	"tog-underline": "लिंक के नीचे रेखा",
-	"tog-hideminor": "हाल के परिवर्तन में मामूली संपादन छुपाईं",
-	"tog-hidepatrolled": "हाल के परिवर्तन में मामूली संपादन छुपाईं",
-	"tog-newpageshidepatrolled": "नयका पृष्ठ के सूची में से जाँचल पृष्क के छुपाँई",
-	"tog-extendwatchlist": "मात्र हाल के परिवर्तन ही नाही,बल्कि सब परिवर्तन के देखावे खातिर ध्यान सूची के विस्तारित करीं",
-	"tog-usenewrc": "तुरंत भइल परिवर्तन में आ ध्यानसूची में भइल परिवर्तनन के पन्ना अनुसार समूह में बांटी",
-	"tog-numberheadings": "स्वयं-सांख्यिकी शिर्षक",
-	"tog-showtoolbar": "सम्पादन औजारपट्टी के दिखावल जाव",
-	"tog-editondblclick": "दुई क्लिक पर पन्ना संपादन करीं",
-	"tog-editsectiononrightclick": "अनुभाग शीर्षक पर दायाँ क्लिक कर अनुभाग सम्पादित करीं",
-	"tog-watchcreations": "हमरा द्वारा निर्मित पृष्ठ आ हमरा द्वारा लादल फ़ाइलन के हमार ध्यानसूची में जोड़ी",
-	"tog-watchdefault": "हमरा द्वारा निर्मित पृष्ठ आ हमरा द्वारा लादल फ़ाइलन के हमार ध्यानसूची में जोड़ी",
-	"tog-watchmoves": "हमरा द्वारा स्थानांतरित पृष्ठ आ लादल फाईल के हमरा ध्यानसूची में जोड़ी",
-	"tog-watchdeletion": "हमरा द्वारा मिटावल पृष्ठ फ़ाइलन के हमार ध्यानसूची में जोड़ी",
-	"tog-watchrollback": "हमरा द्वारा प्रत्यापन्न (रोलबैक) करल गइल पन्नन के हमार ध्यानसूची में जोड़ीं।",
-	"tog-minordefault": "सारा सम्पादन के छोट सम्पादन के रुप में चिन्हित करीं",
-	"tog-previewontop": "सम्पादन बक्सा से पहिले पुर्वदर्शन दिखाईं।",
-	"tog-previewonfirst": "पहिलका सम्पादन पर पूर्वावलोकन देखीं",
-	"tog-enotifwatchlistpages": "हमार ध्यानसूची में दर्ज कौनो भी पन्ना या फाईल में परिवर्तन होखला पर हमके ई-मेल करल जाव",
-	"tog-enotifusertalkpages": "यदि हमार वार्तालाप पन्ना पर कौनो परिवर्तन होखे त हमके ई मेल करल जाव",
-	"tog-enotifminoredits": "पन्ना आ फाईल पर छोटो परिवर्तन होखे त हमके ई मेल करल जाव",
-	"tog-enotifrevealaddr": "अधिसूचना ई-मेल में हमार ई मेल पता दिखावल जाव",
-	"tog-shownumberswatching": "ध्यान रखे वालन सदस्यन के देखावल जाव",
+	"tog-underline": "कड़ी अंडरलाइन कइल:",
+	"tog-hideminor": "हाल के बदलाव में से छोट संपादन छिपाईं",
+	"tog-hidepatrolled": "हाल के बदलाव में से जाँचल संपादन छिपाईं",
+	"tog-newpageshidepatrolled": "नया पन्ना के सूची में से जाँचल पन्ना सभ के छिपाईं",
+	"tog-extendwatchlist": "खाली हाले के बदलाव ना बालुक, सगरी बदलाव के देखावे खातिर धियानसूची के बिस्तारित करीं",
+	"tog-usenewrc": "तुरंत भइल बदलाव में आ धियानसूची में भइल बदलाव सभ के पन्ना अनुसार झुंड में बांटी",
+	"tog-numberheadings": "हेडिंग के ऑटो-नंबरिंग",
+	"tog-showtoolbar": "सम्पादन औजारपट्टी के देखावल जाव",
+	"tog-editondblclick": "दुइ क्लिक पर पन्ना सभ के संपादन करीं",
+	"tog-editsectiononrightclick": "खंड की हेडिंग पर दायाँ क्लिक कइ के खंड के सम्पादित करीं",
+	"tog-watchcreations": "हमार बनावल पन्ना आ हमार अपलोड कइल फाइल सभ के हमरी धियानसूची में जोड़ दिहल जाव",
+	"tog-watchdefault": "हम जौना पन्ना आ फाइलन के संपादित करीं उनहन के हमरी धियानसूची में जोड़ दिहल जाव",
+	"tog-watchmoves": "हमरा द्वारा स्थानांतरित पन्ना आ फाइलन के हमरा धियानसूची में जोड़ दिहल जाव",
+	"tog-watchdeletion": "हमरा द्वारा हटावल पन्ना आ फाइल सभ के हमार धियानसूची में जोड़ दिहल जाव",
+	"tog-watchrollback": "हमरा द्वारा रोलबैक कइल गइल पन्ना सभ के हमार धियानसूची में जोड़ दिहल जाव",
+	"tog-minordefault": "डिफाल्ट रूप से सगरी संपादन कुल के छोट संपादन की रुप में चिन्हित कइल जाव",
+	"tog-previewontop": "नमूना (preview) संपादन बक्सा से पहिले देखावल जाय",
+	"tog-previewonfirst": "पहिला संपादन पर नमूना देखावल जाय",
+	"tog-enotifwatchlistpages": "हमार धियानसूची में दर्ज कौनो भी पन्ना या फाइल में बदलाव होखला पर हमके ई-मेल करल जाव",
+	"tog-enotifusertalkpages": "यदि हमार वार्तालाप पन्ना पर कौनो परिवर्तन होखे त हमके ई-मेल करल जाव",
+	"tog-enotifminoredits": "पन्ना आ फाइल पर छोटो परिवर्तन होखे त हमके ई-मेल करल जाव",
+	"tog-enotifrevealaddr": "अधिसूचना ई-मेल में हमार ई-मेल पता देखावल जाव",
+	"tog-shownumberswatching": "धियान रखे वालन सदस्यन के देखावल जाव",
 	"tog-oldsig": "वर्तमान दसखत",
-	"tog-fancysig": "दसखत के विकी पाठ के रुप में उपयोग करीं (बिना स्वचालित कड़ी के)",
-	"tog-uselivepreview": "लाइव पुर्वालोकन के प्रयोग करीं",
-	"tog-forceeditsummary": "यदि संपादन सारांश ना दिहल होखे त हमके सूचित करब",
+	"tog-fancysig": "दसखत के विकी पाठ के रुप में उपयोग करीं (बिना ऑटोमेटिक कड़ी के)",
+	"tog-uselivepreview": "लगातार चालू नमूना देखावल (preview) के प्रयोग करीं",
+	"tog-forceeditsummary": "यदि संपादन सारांश ना दिहल होखे त हमके सूचित कइल जाय",
 	"tog-watchlisthideown": "हमरी धियानसूची से हमार खुद के संपादन छिपाईं",
-	"tog-watchlisthidebots": "हमार धियानसूची से बोट द्वारा करल गइल परिवर्तन के छिपाईं",
-	"tog-watchlisthideminor": "हमार ध्यान सूची से छोट परिवर्तन के छुपाईं",
-	"tog-watchlisthideliu": "हमार धियानसूची में लॉग-इन भइल सदस्यन के संपादन मत देखाईं",
-	"tog-watchlisthideanons": "आइ॰पी॰ सदस्यन द्वारा करल गइल सम्पादन के हमार धियानसूची में न दिखाईं",
-	"tog-watchlisthidepatrolled": "जाँचल गइल सम्पादन के हमार ध्यानसूची में न दिखाईं",
-	"tog-ccmeonemails": "हमरा द्वारा अन्य सदस्यन के भेजल गइल ईमेल के कॉपी हमरो के भेजीं",
-	"tog-diffonly": "अवतरण कुल में अन्तर देखावत समय पुरान अवतरण न दिखाईं",
-	"tog-showhiddencats": "छुपल श्रेणियन के भी दिखाईं",
-	"tog-norollbackdiff": "संपादन वापस लेला के बाद अन्तर न दिखाईं",
-	"tog-useeditwarning": "यदि कउनो पन्ना पर संपादन करत घरी परिवर्तन के बिना सुरक्षित कइले छोड़ दिं त हमके खबर कइल जाय",
-	"tog-prefershttps": "जब खाता में प्रवेश करीं त हमेशा सुरक्षित कनेक्शन के प्रयोग कइल जाय",
+	"tog-watchlisthidebots": "हमार धियानसूची से बॉट द्वारा करल गइल बदलाव के छिपाईं",
+	"tog-watchlisthideminor": "हमार धियानसूची से छोट बदलाव के छिपावल जाव",
+	"tog-watchlisthideliu": "हमार धियानसूची में लॉग-इन भइल सदस्यन के संपादन छिपावल जाय",
+	"tog-watchlisthideanons": "आइ॰पी॰ सदस्यन द्वारा करल गइल सम्पादन के हमार धियानसूची में से छिपावल जाय",
+	"tog-watchlisthidepatrolled": "जाँचल गइल सम्पादन के हमार ध्यानसूची में से छिपावल जाय",
+	"tog-ccmeonemails": "हमरा द्वारा अन्य सदस्यन के भेजल गइल ईमेल के कॉपी हमरो के भेजल जाय",
+	"tog-diffonly": "अन्तर देखावत समय अंतर की नीचे पन्ना के सामग्री मत देखावल जाव।",
+	"tog-showhiddencats": "छिपल श्रेणियन के भी देखावल जाय",
+	"tog-norollbackdiff": "संपादन रोलबैक कइला के बाद अन्तर मत देखावल जाव",
+	"tog-useeditwarning": "जो हम कौनों पन्ना पर संपादन करत घरी परिवर्तन के बिना सहेजले छोड़ देईं त हमके खबर कइल जाव",
+	"tog-prefershttps": "जब खाता में लॉगिन करीं त हमेशा सुरक्षित कनेक्शन के प्रयोग कइल जाय",
 	"underline-always": "हमेशा",
 	"underline-never": "कभी ना",
-	"underline-default": "जिल्द या ब्राउजर डिफॉल्ट",
+	"underline-default": "जिल्द (स्किन) या ब्राउसर डिफॉल्ट",
 	"editfont-style": "सम्पादन क्षेत्र के फॉन्ट स्टाइल:",
 	"editfont-default": "ब्राउजर डिफाल्ट",
 	"editfont-monospace": "मोनोस्पेस्ड फोंट",
@@ -123,7 +123,7 @@
 	"category-media-header": "\"$1\" श्रेणी में मीडिया",
 	"category-empty": "''इ श्रेणी में इ समय कउनो पन्ना या मीडिया नइखे।''",
 	"hidden-categories": "{{PLURAL:$1|छिपावल गइल श्रेणी|छिपावल गइल श्रेणी सब}}",
-	"hidden-category-category": "छुपावल गइल श्रेणी",
+	"hidden-category-category": "छिपावल गइल श्रेणी",
 	"category-subcat-count": "{{PLURAL:$2|ए श्रेणी में खाली निम्नलिखित श्रेणी बा|ए श्रेणी में कुल $2 में से {{PLURAL:$1|उपश्रेणी|$1 उपश्रेणी सब}} बा।}}",
 	"category-subcat-count-limited": "ए श्रेणी में निम्नलिखित {{PLURAL:$1|उपश्रेणी बा|$1 उपश्रेणी बाड़ीं।}}",
 	"category-article-count": "{{PLURAL:$2|ए श्रेणी में मात्र निम्नलिखित पन्न बा।|इ श्रेणी में निम्नलिखित {{PLURAL:$1|पन्ना बा|$1 पन्ना बाड़े}}, कुल पन्ना $2}}",
@@ -131,9 +131,9 @@
 	"category-file-count": "{{PLURAL:$2|ए श्रेणी में खाली निम्नलिखित फइल बा।|ए श्रेणी में निम्नलिखित कुल फ़ाइलं $2 {{PLURAL:$1|फाइल|$1फाइलं}} बाड़े}}",
 	"category-file-count-limited": "वर्तमान में निम्नलिखित {{PLURAL:$1|पन्ना|$1 पन्नां}} इ श्रेणीं में बाड़े।",
 	"listingcontinuesabbrev": "जारी...",
-	"index-category": "सूचीबद्ध पृष्ठ",
+	"index-category": "सूचीबद्ध पन्ना",
 	"noindex-category": "बिना सूचीबद्ध पन्ना",
-	"broken-file-category": "टूटल फ़ाइल कड़ियन वाला पन्ना",
+	"broken-file-category": "टूटल फाइल कड़ियन वाला पन्ना",
 	"about": "बारे में",
 	"article": "सामग्री पन्ना",
 	"newwindow": "(नया विंडो में खोलीं)",
@@ -151,13 +151,13 @@
 	"qbpageoptions": "ई पन्ना",
 	"qbmyoptions": "हमार पन्ना",
 	"faq": "साधारण सवाल",
-	"faqpage": "Project:साधारण सवाल",
-	"actions": "क्रिया",
-	"namespaces": "नामस्थान",
+	"faqpage": "Project:अक्सर पूछल जाए वाला सवाल",
+	"actions": "कार्यवाही",
+	"namespaces": "नाँवस्थान",
 	"variants": "अउरी प्रकार",
 	"navigation-heading": "नेविगेशन मेनु",
-	"errorpagetitle": "त्रुटी",
-	"returnto": "जाईं $1 पर।",
+	"errorpagetitle": "खराबी",
+	"returnto": "$1 पर लौट जाईं।",
 	"tagline": "भोजपुरी {{SITENAME}} से",
 	"help": "मदद",
 	"search": "खोज",
@@ -195,19 +195,19 @@
 	"personaltools": "व्यक्तिगत औजार",
 	"articlepage": "सामग्री पन्ना देखीं",
 	"talk": "बात-चीत",
-	"views": "राय",
+	"views": "कइसन लउकी?",
 	"toolbox": "औजार",
 	"userpage": "प्रयोगकर्ता पन्ना देखीं",
 	"projectpage": "परियोजना पन्ना देखीं",
 	"imagepage": "फाइल पन्ना देखीं",
 	"mediawikipage": "सन्देश पन्ना देखीं",
-	"templatepage": "खाँचा पन्ना देखीं",
+	"templatepage": "टेम्पलेट पन्ना देखीं",
 	"viewhelppage": "मदद पन्ना देखीं",
 	"categorypage": "श्रेणी पन्ना देखीं",
 	"viewtalkpage": "बात-चीत देखीं",
 	"otherlanguages": "दुसरी भाषा में",
-	"redirectedfrom": "($1 द्वारा अनुप्रेषित)",
-	"redirectpagesub": "पुन: निर्देशित पन्ना",
+	"redirectedfrom": "($1 से अनुप्रेषित)",
+	"redirectpagesub": "अनुप्रेषण पन्ना",
 	"redirectto": "अनुप्रेषित:",
 	"lastmodifiedat": "$1 के $2 पर ए पन्ना पर अन्तिम बेर बदलाव भइल।",
 	"viewcount": "ई पन्ना {{PLURAL:$1|एक|$1}} बार देखल गईल बा।",
@@ -277,11 +277,11 @@
 	"page-rss-feed": "\"$1\" आर एस एस फिड",
 	"page-atom-feed": "\"$1\" एटम फीड",
 	"red-link-title": "$1 (पन्ना मौजूद नइखे)।",
-	"sort-descending": "अवरोही क्रम में",
-	"sort-ascending": "आरोही क्रम में",
+	"sort-descending": "उतरत क्रम में",
+	"sort-ascending": "चढ़त क्रम में",
 	"nstab-main": "पन्ना",
 	"nstab-user": "सदस्य पन्ना",
-	"nstab-media": "मिडीया पन्ना",
+	"nstab-media": "मीडिया पन्ना",
 	"nstab-special": "विशेष पन्ना",
 	"nstab-project": "प्रोजेक्ट पन्ना",
 	"nstab-image": "फाइल",
@@ -327,6 +327,15 @@
 	"no-null-revision": "पन्ना \"$1\" खातिर नया अशक्त संशोधन ना बन सकल",
 	"badtitle": "खराब टाइटिल",
 	"badtitletext": "रउआ द्वारा अनुरोधित शीर्षक अयोग्य, ख़ाली या गलत जुड़ल अंतर-भाषीय या अंतर-विकि शीर्षक बा।\nए में एक या एक से ढेर अइसन कॅरेक्टर हो सकत बा जवन शीर्षक में प्रयोग नइखे कइल जा सकत।",
+	"title-invalid-empty": "माँगल जा रहल पन्ना टाइटिल या त खाली बा या फिर खाली कौनों नाँवस्थान के नाँव भर दिहल गइल बाटे।",
+	"title-invalid-utf8": "माँगल जा रहल पन्ना टाइटिल में अइसन UTF-8 सीक्वेंस बा जेवन मान्य नइखे।",
+	"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|बाइट|बाइट्स}} से ढेर ना होखे के चाहीं।",
+	"title-invalid-leading-colon": "माँगल जा रहल पन्ना टाइटिल में सुरुआते में अमान्य कोलन (:) बाटे।",
 	"perfcached": "नीचे दिहल गइल डेटा कैशे मेमोरी से लिहल गइल बा, अतः हो सकता बा कि इ के पूर्ण अद्यतन ना भइल होखे। कैशे मेमोरी में अधिकतम {{PLURAL:$1|एक  नतीजा|$1 नतीजं}} उपलब्ध बाड़े।",
 	"perfcachedts": "नीचे दिहल गइल डेटा कैशे मेमोरी से बा, आ एकर अंतिम अपडेट $1 के भइल रहल। कैश मेमोरी में अधिकतम {{PLURAL:$4|एक  नतीजा|$4 नतीजां}} उपलब्ध बा।",
 	"querypage-no-updates": "इ पृष्ठ के अपडेट करल अयोग्य बा। अभी अहिजा के डाटा के ताज़ा नइखे करल जा सकत।",
@@ -335,12 +344,12 @@
 	"actionthrottled": "कार्य समाप्त कर दिहल गइल बा",
 	"actionthrottledtext": "स्पैम के रोकथाम खातिर, इ क्रिया एतना कम समय में एक सीमा से अधिक बार करे के मना बा, आ रउआ इ सीमा के पार कर चुकल बानी।\nकृपया कुछ समय बाद पुन: यत्न करीं।",
 	"protectedpagetext": "इ पन्ना संपादन आ अन्य कार्यं से बचाव खातिर सुरक्षित कर दिहल गइल बा।",
-	"viewsourcetext": "रउआ एह पन्ना के स्रोत देख सकत बानी आ एकर नकल उतार सकत बानी:",
-	"viewyourtext": "रउआ इ पन्ना में ''आपन सम्पादन'' के स्रोत देख सकत बानी आ ओकर नकल उतार सकत बानी:",
+	"viewsourcetext": "रउआँ एह पन्ना के स्रोत देख सकत बानी आ एकर नकल उतार सकत बानी:",
+	"viewyourtext": "एह पन्ना पर <strong>राउर आपन संपादन सब</strong>के स्रोत देख सकत बानी आ ओकर नकल ले सकत बानी।",
 	"protectedinterface": "इ पन्ना इ विकी के सॉफ़्टवेयर के इंटरफ़ेस पाठ्य के देवेला, आ इ के गलत प्रयोग से बचावे खातिर सुरक्षित कर दिहल गइल बा।\nसभन विकियन खातिर अनुवाद जोड़े या बदले खातिर कृपया मीडियाविकि के क्षेत्रीयकरण प्रकल्प [//translatewiki.net/ translatewiki.net] के प्रयोग करीं।",
 	"editinginterface": "<strong>चेतावनी:</strong> आप एगो अइसन पन्ना के बदल बदल रहल बानी जवन सॉफ़्टवेयर के इंटरफ़ेस पाठ प्रदान करेला। इ पृष्ठ के बदले से अन्य सदस्यवन के प्रदर्शित इंटरफ़ेस के शक्लोसूरत में बदलाव आई।",
 	"translateinterface": "सभन विकियन खातिर अनुवाद जोड़े या बदले खातिर मीडियाविकि क्षेत्रीयकरण परियोजना [//translatewiki.net/ translatewiki.net] के प्रयोग करीं।",
-	"cascadeprotected": "इ पन्ना पर सम्पादन करे के अधिकार खत्म कर दिहल गइल बा काहे कि इ निम्न में शामिल बा {{PLURAL:$1|पन्ना, जउन|पन्नां, जउन}} \"व्यापक\" विकल्प के चालू कइला के साथ सुरक्षित कर दिहल गइल बा:\n$2",
+	"cascadeprotected": "ए पन्ना के संपादन कइल सुरक्षित क दिहल गइल बा काहें कि ई {{PLURAL:$1|पन्ना में, जौना के|पन्ना सब में, जिन्हन के}} \"कैस्केडिंग\" (बिस्तारित) सुरक्षा चालू क के सुरक्षित कइल गइल बा, में समाइल बाटे:\n$2",
 	"namespaceprotected": "रउआ के '''$1''' नामस्थान के पन्नं में सम्पादन करे के अधिकार नइखे दिहल गइल।",
 	"customcssprotected": "रउआ के इ CSS पन्ना के संपादित करे के अनुमति नइखे, काहे कि इ में अन्य सदस्यं के व्यक्तिगत सेटिंग्स समाविष्ट बा।",
 	"customjsprotected": "रउआ इ जावास्क्रिप्ट पन्ना के संपादित करे के अनुमति नइखे, काहे कि इ में अन्य सदस्यं के व्यक्तिगत सेटिंग्स समाविष्ट बा।",
@@ -416,6 +425,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|पन्ना}}",
 	"createacct-benefit-body3": "हाल के {{PLURAL:$1|योगदानकर्ता}}",
 	"badretype": "रउआ जौन गुप्त शब्द डालत बानी उ नईखे मेल खात।",
+	"usernameinprogress": "एही सदस्यनाँव खातिर खाता खोले के काम पहिलहीं चालू बा।\nइंतजार करीं।",
 	"userexists": "लिखल गईल सदस्य नाम पहिले से प्रयोग में बा। कृपया कौनो दोसर नाम चुनीं।",
 	"loginerror": "खाता प्रवेश में त्रुटि",
 	"createacct-error": "खाता निर्माण त्रुटि",
@@ -550,8 +560,8 @@
 	"watchthis": "धियानसूची में डालीं",
 	"savearticle": "पन्ना सहेजीं",
 	"preview": "पूर्वावलोकन",
-	"showpreview": "नमूना देखाईं",
-	"showdiff": "परिवर्तन देखाईं",
+	"showpreview": "झलक देखीं",
+	"showdiff": "बदलाव देखीं",
 	"blankarticle": "<strong>चेतावनी:</strong> आप एगो खाली पन्ना के बनावे जा रहल बानी।\nयदि आप \"{{int:savearticle}}\" के फेर से दबायेब त पन्ना बिना कउनो सामग्री के बन जाई।",
 	"anoneditwarning": "<strong>चेतावनी:</strong> रउआ आपन खाता में प्रवेश नइखीं कइले। अगर रउआ कौनों बदलाव करत बानी त राउर आईपी पता दर्ज होई। अगर रउआ <strong>[$1 लॉग इन]</strong> या <strong>[$2 नया खाता बनाइब]</strong> त, अउरी सुबिधा सब की संघे राउर संपादन के श्रेय भी राउर सदस्य-नाँव से जुड़ जाई!",
 	"anonpreviewwarning": "''रउआ खाता में प्रवेश नईखीं भईल। सुरक्षित करेब त ई पन्ना के सम्पादन इतिहास पर राउर आई पी पता दर्ज हो जाई।\"",
@@ -585,45 +595,109 @@
 	"userpage-userdoesnotexist-view": "सदस्य खाता \"$1\" पंजीकृत नईखे भईल।",
 	"blocked-notice-logextract": "ई प्रयोगकर्ता के ई समय निष्क्रीय कर दिहल गईल बा।\nनविनतम नष्ट लौग प्रविष्टी उद्धरण खातिर निचे दिहल बा:",
 	"clearyourcache": "'''ध्यान दिं:'''  पन्ना सुरक्षित कइला के बाद बदलाव देखे खातिर आपके आपन ब्राउज़र के कैश खाली करे के पड़ सकत बा।\n* '''फ़ायरफ़ॉक्स / सफ़ारी:''' ''Reload'' (रीलोड) दबाते समय ''Shift'' (शिफ़्ट) दबा के रखीं, या फिर ''Ctrl-F5'' (कंट्रोल-F5) या ''Ctrl-R'' (कंट्रोल-R) दबाईं (मैक पर ''⌘-R'')\n* '''गूगल क्रोम:''' ''Ctrl-Shift-R'' (कंट्रोल-शिफ़्ट-R) दबाईं (मैक पर ''⌘-Shift-R'')\n* '''इन्टर्नेट एक्सप्लोरर:''' ''Ctrl'' (कंट्रोल) दबाके ''Refresh'' (रिफ़्रेश) करीं या ''Ctrl-F5'' (कंट्रोल-F5) दबाईं\n* '''ऑपेरा:''' ''Tools → Preferences'' (उपकरण → पसन्द) में कैश साफ़ करीं",
+	"usercssyoucanpreview": "<strong>टिप:</strong> आपन नया CSS के टेस्ट करे खातिर सहेजे से पहिले \"{{int:showpreview}}\" बटन के प्रयोग करीं।",
+	"userjsyoucanpreview": "<strong>टिप:</strong> आपन नया जावास्क्रिप्ट के टेस्ट करे खातिर सहेजे से पहिले \"{{int:showpreview}}\" बटन के प्रयोग करीं।",
+	"usercsspreview": "<strong>याद रहे की आप अपनी सदस्य CSS के खाली नमूना भर देखत बानी।\nई अबहिन ले सहेजल ना गइल बाटे।</strong>",
+	"userjspreview": "<strong>याद रहे की आप अपनी सदस्य जावास्क्रिप्ट के खाली टेस्ट करत बानी/नमूना देखत बानी।\nई अबहिन सहेजल ना गइल बाटे।</strong>",
+	"sitecsspreview": "<strong>याद रहे की आप ए CSS क खाली नमूना देखत बानी।\nई अबहिन ले सहेजल ना गइल बा!</strong>",
+	"sitejspreview": "<strong>याद रहे की आप ए जावास्क्रिप्ट कोड क खाली नमूना देखत बानी।\nई अबहिन ले सहेजल ना गइल बा!</strong>",
+	"userinvalidcssjstitle": "<strong>चेतावनी:</strong> कौनों skin \"$1\"नइखे।\nCustom .css आ .js पन्ना सभ छोटका अक्षर में टाइटिल इस्तेमाल करे लें जइसे की, {{ns:user}}:Foo/vector.css ना की {{ns:user}}:Foo/Vector.css।",
 	"updated": "(अपडेट करल गईल)",
 	"note": "'''सूचना:'''",
 	"previewnote": "'''याद रखीं, इ एगो झलक मात्र हो।'''\nराउर बदलाव अभी तक सुरक्षित नईखे करल गईल!",
 	"continue-editing": "संपादन क्षेत्र में जाईं",
+	"previewconflict": "ई नमूना ई देखावत बा की अगर रउआँ ए संपादन बक्सा में मौजूद पाठ के सहेजब त ऊ कइसन देखाई पड़ी।",
+	"session_fail_preview": "<strong>माफ करीं! एह सत्र के आँकड़ा के गायब हो गइला की कारण आपके संपादन के प्रॉसेस करे में हमनी के असमर्थ बाणी।</strong>\nदोबारा से कोसिस करीं।\nअगर तबो काम ना होखे तब [[Special:UserLogout|लॉग आउट करीं]] आ दोबारा लॉग इन कइ के कोसिस करी।",
+	"session_fail_preview_html": "<strong>माफ करीं! सत्र आँकड़ा के गायब होखला की कारन आपके संपादन सहेजल नइखे जा सकत।</strong>\n\n<em>चूँकि, {{SITENAME}} में मूल HTML सक्षम कइल बाटे, जावास्क्रिप्ट हमला से बचाव की खातिर नमूना देखावे के छिपावल गइल बा।</em>\n\n<strong>अगर ई एगो वैध संपादन बाटे तब एक बेर फिर से कोसिस करीं।</strong>\nअगर तबो पर काम नइखे हो पावत त [[Special:UserLogout|लॉग आउट करीं]] आ दुबारा लॉगिन क के कोसिस करीं।",
+	"token_suffix_mismatch": "<strong>राउर संपादन रिजेक्ट कइल जात बा काहें से की राउर क्लायंट संपादन टोकन में विराम चीन्हा सब से गड़बड़ क दिहले बा।</strong>\nपन्ना के पाठ के तहस-नहस होखे से बचावे खाती ई संपादन रिजेक्ट कइल गइल बा।\nकबो-कबो अइसन एहू दसा में हो सकेला जब आप खराबी-युक्त वेबआधारित बेनाम प्रॉक्सी सर्वर के इस्तेमाल करत होखीं।",
+	"edit_form_incomplete": "<strong>संपादन के कुछ हिस्सा सर्वर ले ना पहुँच पावल ह; दोहरा के चेक करीं की राउर संपादन बदलल न होखे आ एक बेर फिर से सहेजे के कोसिस करीं।</strong>",
 	"editing": "$1 संपादन",
 	"creating": "$1 बनावे जा रहल बानी",
 	"editingsection": "$1 संपादन (खंड)",
 	"editingcomment": "$1 सम्पादन (नया अनुभाग)",
 	"editconflict": "संपादन अंतर्विरोध: $1",
+	"explainconflict": "आपकी संपादन शुरू कइला की बाद से केहू अउरी ए पन्ना में बदलाव क चुकल बाटे।\nऊपर के पाठ हिस्सा में लेख की पाठ के वर्तमान स्थिति देखावल जात बा।\nराउर संपादन नीचे की पाठ हिस्सा में देखावल गइल बा।\nरउआँ के आपन बदलाव एह पहिले से मौजूद पाठ में मिलावे के परी।\n<strong>खाली</strong> ऊपर की पाठ हिस्सा में लउकत पाठ सहेजल जाई अगर आप \"{{int:savearticle}}\" बटन दबाइब।",
 	"yourtext": "राउर पाठ्य",
 	"storedversion": "सुरक्षित करल गईल संशोधन",
+	"nonunicodebrowser": "<strong>चेतावनी: राउर ब्राउसर युनिकोड समर्थ नइखे।</strong>\nपन्ना सभ के सुरक्षित संपादित करे के एगो तरीका सुझावल जात बा: गैर-ASCII अक्षर सभ संपादन बॉक्स में हेक्साडेसिमल कोड की रूप में देखावल जाई।",
+	"editingold": "<strong>चेतावनी: रउआँ ए पन्ना क एगो पुरान अवतरण के संपादन करत बानी।</strong>\nअगर आप एकरा के सहेज देइब, त एकरी बाद के सगरी बदलाव गायब हो जाई।",
 	"yourdiff": "अंतर",
+	"copyrightwarning": "ई नोट कर लीं की {{SITENAME}} पर राउर सगरी योगदान $2 की तहत रिलीज कइल मानल जाई (ढेर जानकारी खातिर $1 देखल जाय)।\nअगर रउआँ ई नइखीं चाहत की राउर लिखल चीज के केहू दूसर बेकति बे मोह-छोह के संपादित क दे या कहीं भी बाँट दे तब अइसन चीज इहाँ मत डालीं।<br />\nरउआँ इहो सकारत बानी आ वादा करत बानी की ई चीज रउआँ खुद लिखले बानी, या फिर पब्लिक पहुँच में मौजूद या कौनों अइसने फ्री स्रोत से नकल कइले बानी।\n<strong>कौनों भी कॉपीराइट वाली चीज बिना परमीशन के इहाँ कब्बो मत डालीं!</strong>",
+	"copyrightwarning2": "ई नोट कर लीं कि {{SITENAME}} पर सगरी योगदान के दुसरा योगदानकर्ता लोगन द्वारा संपादित कइल जा सकेला, बदलल या हटावल जा सकेला।\nअगर आप ई नइखीं चाहत की राउर लिखल चीज के केहू भी बे-मोहछोह के संपादित क दे, तब ए के इहाँ मत डालीं।<br />\nरउआँ इहो वादा करत बानी की आप ई खुद लिखले बानी या फिर पब्लिक पहुँच में मौजूद या अइसने कौनों फ्री स्रोत से नकल कइले बानी (ढेर जानकारी खातिर $1 देखीं)।\n<strong>बिना परमीशन के कॉपीराइट वाली चीज इहाँ कब्बो मत डालीं!</strong>",
+	"editpage-cannot-use-custom-model": "ए पन्ना के सामग्री के मॉडल के ना बदलल जा सकत बा।",
+	"longpageerror": "<strong>खराबी: आप जवन पाठ लिख के दिहले बानी ऊ {{PLURAL:$1|एक किलोबाइट|$1 किलोबाइट्स}} के बाटे, जेवन अधिकतम सीमा {{PLURAL:$2|एक किलोबाइट|$2 किलोबाइट्स}} से ढेर बा।</strong>\nई सहेजल ना जा सकेला।",
+	"readonlywarning": "<strong>चेतावनी: डेटाबेस ए समय मरम्मत खातिर लॉक कइल गइल बा, आ एही कारण आप तुरंते एही समय आपन सम्पादन ना सहेज पाइब।</strong>\nरउआँ अपनी पाठ (text) के कौनों पाठ फाइल (text file) में बाद खातिर सहेज के रख लीं।\n\nजे एडमिनिस्ट्रेटर एकरा के लॉक कइले बा ऊ नीचे लिखल कारण दिहले बा: $1",
+	"protectedpagewarning": "<strong>चेतावनी: ई पन्ना सुरक्षित कइल गइल बा जेवना से कि एकरा के खाली प्रबंधक (Admin) विशेषाधिकार वाला सदस्य लोग संपादित क सकत बा।</strong>\nप्रसंग बूझे खातिर सबसे नया लॉग एंट्री नीचे दिहल जात बा:",
+	"semiprotectedpagewarning": "<strong>नोट:</strong> ई पन्ना सुरक्षित कइल गइल बा कि एकरा के खाली रजिस्टर्ड सदस्य लोग संपादित क सकत बा।\nसभसे नया लॉग एंट्री नीचे प्रसंग बतावे खातिर दिहल जात बा:",
+	"cascadeprotectedwarning": "<strong>चेतावनी:</strong> ई पन्ना सुरक्षित क दिहल गइल बा कि एकरा के खाली प्रबंधक (Admin) विशेषाधिकार वाला सदस्य लोग संपादित क सकेला काहें से की ई नीचे दिहल बिस्तारित(कैस्केडिंग)-सुरक्षा वाला {{PLURAL:$1|पन्ना|पन्नवन}} में समाइल बाटे:",
+	"titleprotectedwarning": "<strong>चेतावनी: ई पन्ना सुरक्षित कइल गइल बा की एकरा के बनावे खातिर [[Special:ListGroupRights|विशेष अधिकार]] होखल जरूरी बा।</strong>\nसंदर्भ खातिर नीचे सबसे नया लॉग एंट्री दिहल जात बा:",
 	"templatesused": "ए पन्ना पर इस्तेमाल {{PLURAL:$1|टेम्पलेट|टेम्पलेट कुल}}:",
 	"templatesusedpreview": "इ पुर्वावलोकन में प्रयुक्त {{PLURAL:$1|टेम्पलेट|टेम्पलेट कुल}}:",
 	"templatesusedsection": "एह खण्ड में इस्तेमाल {{PLURAL:$1|टेम्पलेट|कुल}}:",
 	"template-protected": "(सुरक्षित)",
 	"template-semiprotected": "(कुछ-सुरक्षित)",
 	"hiddencategories": "ई पन्ना {{PLURAL:$1|1 छिपल श्रेणी|$1 छिपल श्रेणीसभ}} के सदस्य बा:",
+	"nocreatetext": "{{SITENAME}} नया पन्ना बनावे पर रोक लगवले बा।\nपीछे जाईं आ पहिले से बनल पन्ना संपादित करीं या फिर [[Special:UserLogin|लॉगिन करीं या नया खाता बनाईं]]।",
 	"nocreate-loggedin": "नया पन्ना बनावे रउआ अधिकार नइखे।",
 	"sectioneditnotsupported-title": "अनुभाग सम्पादन समर्थित नइखे",
 	"sectioneditnotsupported-text": "इ पन्ना पर अनुभाग सम्पादन समर्थित नइखे",
 	"permissionserrors": "अनुमति त्रुटी",
 	"permissionserrorstext": "निम्नलिखित {{PLURAL:$1|कारण|कारणन}} के चलते आपके अइसन करे के अनुमति नइखे:",
 	"permissionserrorstext-withaction": "नीचे दिहल {{PLURAL:$1|कारण|कारणन}} से रउआँ के $2 के परमीशन नइखे:",
+	"recreate-moveddeleted-warn": "<strong>चेतावनी: रउआँ एगो अइसन पन्ना दुबारा बनावे जा रहल बानी जेवन पहिले हटावल जा चुकल बा</strong>\n\nआपके ई बिचार क लेवे के चाहीं की आगे संपादन कइल ठीक बा की ना।\n\nसुविधा खातिर, ए पन्ना के हटवले आ स्थानांतरण के लॉग नीचे दिहल जात बा:",
 	"moveddeleted-notice": "ई पन्ना हटा दिहल गइल बा।\nसंदर्भ खातिर हटावे आ स्थानांतरण के लॉग नीचे दिहल जात बाटे।",
 	"log-fulllog": "पूरा लॉग देखीं",
+	"edit-hook-aborted": "संपादन के हुक निरस्त क दिहलस।\nई कौनों कारन ना बतवलस।",
+	"edit-gone-missing": "पन्ना अपडेट ना हो पावल।\nबुझात बा कि ई हटा दिहल गइल बा।",
 	"edit-conflict": "संपादन अंतर्विरोध",
+	"edit-no-change": "आपके सम्पादन पर धियान ना दिहल गइल काहें से की पाठ में कौनों बदलाव ना कइल गइल रहल।",
 	"postedit-confirmation-created": "पन्ना बना दिहल गईल।",
+	"postedit-confirmation-restored": "पन्ना के दुबारा अस्थापित कइल गइल।",
 	"postedit-confirmation-saved": "राउर सम्पादन सुरक्षित कर दिहल गईल।",
+	"edit-already-exists": "नया पन्ना ना बनावल जा सकत बा।\nई पहिलहीं से मौजूद बाटे।",
 	"defaultmessagetext": "संदेश के डिफ़ॉल्ट पाठ्य",
+	"content-failed-to-parse": "$2 के सामग्री, $1 मॉडल खातिर पार्स (parse) ना हो पावल: $3",
 	"invalid-content-data": "अवैध डाटा सामग्री",
+	"content-not-allowed-here": "\"$1\" सामग्री, पन्ना [[$2]] पर ना डालल जा सकेला।",
+	"editwarning-warning": "ए पन्ना के छोड़ के हटला पर आपके कइल बदलाव गायब हो जाई।\nअगर आप लॉगिन कइले बानी तब ए चेतावनी के अपनी सेटिंग में \"{{int:prefs-editing}}\" खंड में जा के बन्द क सकत बानीं।",
+	"editpage-notsupportedcontentformat-title": "सामग्री के फॉरमैट सपोर्टेड नइखे।",
+	"editpage-notsupportedcontentformat-text": "सामग्री फॉरमैट $1 के सामग्री मॉडल $2 सपोर्ट नइखे करत।",
 	"content-model-wikitext": "विकीपाठ्य",
 	"content-model-text": "सामान्य पाठ",
 	"content-model-javascript": "जावास्क्रिप्ट",
 	"content-model-css": "सी॰एस॰एस",
+	"content-json-empty-object": "खाली चीज (Empty object)",
+	"content-json-empty-array": "खाली अरे (Empty array)",
+	"duplicate-args-warning": "<strong>चेतावनी:</strong> [[:$1]], [[:$2]] के \"$3\" पैरामीटर खातिर एक से अधिका वैल्यू की संघे काल करत बाटे। दिहल गइल वैल्यू में से खाली सबसे आखिरी वैल्यू के प्रयोग कइल जाई।",
 	"duplicate-args-category": "टेम्पलेट कॉल में डुप्लिकेट तर्क के उपयोग करते हुए पन्नासभ",
+	"duplicate-args-category-desc": "पन्ना पर अइसन टेम्पलेट काल मौजूद बा जेवन डुप्लीकेट (दोहरा) आर्गुमेंट इस्तेमाल करत बाटे, जइसे की <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> या <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
+	"expensive-parserfunction-warning": "<strong>चेतावनी:</strong> ई पन्ना बहुत ढेर सारा  खर्चीला पार्सर फंक्शन काल के इस्तेमाल करत बा।\n\nए पन्ना पर $2 {{PLURAL:$2|काल|काल कुल}} से कम संख्या में काल होखे के चाहीं, बाकी इहाँ ए समय {{PLURAL:$1|$1 काल बा|$1 काल कुल बाड़ी}}।",
+	"expensive-parserfunction-category": "बहुत ढेर खर्चीला पार्सर फंक्शन काल वाला पन्ना सभ",
 	"post-expand-template-inclusion-warning": "'''चेतावनी:''' खाँचा जोड़े के सीमा पार हो चुकल बा।\nकुछ खाँचा ना जोड़ल जाई।",
 	"post-expand-template-inclusion-category": "अइसन पृष्ठ जे पर साँचा जोडे के सीमा पार हो गइल बा",
+	"post-expand-template-argument-warning": "<strong>चेतावनी:</strong> ए पन्ना पर कम से कम एक ठो अइसन टेम्पलेट आर्गुमेंट बा जेवन बहुत बड़ खर्चीला साइज के बा।\nअइसन आर्गुमेंट के लोप कइ दिहल गइल बा।",
+	"post-expand-template-argument-category": "पन्ना जिनहन में लोप कइल गइल टेम्पलेट आर्गुमेंट बा",
+	"parser-template-loop-warning": "टेम्पलेट लूप पकड़ में आइल बा:[[$1]]",
+	"parser-template-recursion-depth-warning": "टेम्पलेट रिकरसन (recursion) के गहिराइ सीमा पार ($1)",
+	"language-converter-depth-warning": "भाषा बदलावक (language converter) के गहिराइ सीमा पार ($1)",
+	"node-count-exceeded-category": "पन्ना जहाँ नोड गिनती पार हो गइल बा",
+	"node-count-exceeded-category-desc": "पन्ना अधिकतम नोड गिनती (node count) के पार क गइल बा।",
+	"node-count-exceeded-warning": "पन्ना नोड गिनती (node count) के पार क गइल",
+	"expansion-depth-exceeded-category": "पन्ना जहाँ बिस्तार के गहिराई पार हो गइल बा",
+	"expansion-depth-exceeded-category-desc": "पन्ना अधिकतम बिस्तार गहिराई के पार क गइल बा।",
+	"expansion-depth-exceeded-warning": "पन्ना अधिकतम बिस्तार गहिराई के पार क गइल",
+	"parser-unstrip-loop-warning": "अनस्ट्रिप लूप पकड़ में आइल बा",
+	"parser-unstrip-recursion-limit": "अनस्ट्रिप रिकर्शन सीमा पार हो गइल ($1)",
+	"converter-manual-rule-error": "मैनुअल भाषा परिवर्तन नियम मब खराबी पकड़ल गइल",
+	"undo-success": "संपादन वापस कइल जा सकत बा।\nनीचे दिहल तुलना के चेक करीं आ पुष्टी करीं की आप इहे कइल चाहत बाड़ीं, ओकरा बाद बदलाव सहेज के संपादन वापसी के पूरा करीं।",
+	"undo-failure": "बीच में अउरी संपादन होखला की कारण ई संपादन वापस नइखे लिहल जा सकत।",
+	"undo-norev": "संपादन वापस नइखे लिहल जा सकत, काहें से की या त ई हइये नइखे या हटा दिहल गइल बाटे।",
+	"undo-nochange": "लागत बा की ई संपादन पहिलहीं वापस लिहल जा चुकल बाटे।",
+	"undo-summary": "[[Special:Contributions/$2|$2]] ([[User talk:$2|वार्ता]]) के द्वारा कइल $1 बदलाव के वापस कइल गइल",
+	"undo-summary-username-hidden": "एगो छिपल सदस्य द्वारा कइल बदलाव $1 वापस कइल गइल",
 	"cantcreateaccounttitle": "खाता खुल नईखे सकत",
+	"cantcreateaccount-text": "एह आइपी पता (IP address)(<strong>$1</strong>) द्वारा नया खाता बनावे पर  [[User:$3|$3]] द्वारा रोक लगावल गइल बा।\n\nएकरा खातिर $3 के दिहल कारण:<em>$2</em>",
+	"cantcreateaccount-range-text": "आइपी पता बिस्तार (IP address range) '''$1''' पर, जेवना में आपके आइपी ('''$4''') भी बा, नया खाता बनावे पर [[User:$3|$3]] द्वारा रोक लगावल गइल बा।\n\nएकरा खातिर $3 के दिहल कारण बा:''$2''",
 	"viewpagelogs": "ए पन्ना खातिर लॉग कुल देखीं",
 	"nohistory": "ए पन्ना के कौनों संपादन इतिहास नइखे",
 	"currentrev": "सबसे नया बदलाव",
@@ -649,26 +723,66 @@
 	"history-feed-description": "विकि पर इ पन्ना के संशोधन के इतिहास",
 	"history-feed-item-nocomment": "$1 $2 पर",
 	"history-feed-empty": "अनुरोध करल गईल पन्ना उपलब्ध नईखे। हो सकत बा उ के विकि पर से मिटा दिहल गईल होखे, आ चाहे उ के नाम बदल देवल गईल होखे।\nप्रासंगिक पन्ना के [[Special:Search|विकि पर खोजे के]] कोशिश करत रहीं।",
+	"history-edit-tags": "सेलेक्ट कइल बदलाव खातिर संपादन टैग",
 	"rev-deleted-comment": "(सम्पादन सारांश हटावल गईल)",
 	"rev-deleted-user": "(प्रयोगकर्ता के नाम मिटा दिहल गईल बा)",
 	"rev-deleted-event": "(लॉग विवरण हटा दिहल गईल बा)",
 	"rev-deleted-user-contribs": "[प्रयोगकर्ता नाम आ चाहे आइ पी पता हटा दिहल गईल बा - योगदान से सम्पादन छुप गईल बा]",
 	"rev-deleted-text-permission": "ई पन्ना के संशोधन '''मिटा'''' दिहल गईल बा।\nमेटावल जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} डिलेशन लॉग] में मिली।",
 	"rev-suppressed-text-permission": "ए पन्ना के बदलाव<strong>दबा दिहल गइल बा</strong>।\nबिस्तृत जानकारी [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} दबावल चीज के लॉग] पर मिल जाई।",
+	"rev-deleted-text-unhide": "पन्ना पर क ई बदलाव <strong>हटा दिहल गइल बा</strong>।\nएकर डिटेल जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटवले के लॉग] में मिल सकेला।\nअभी भी आप [$1 ई बदलाव देख सकत बानी]  अगर आप आगे देखल चाहत होखीं।",
+	"rev-suppressed-text-unhide": "पन्ना पर के ई बदलाव <strong>ढाँप दिहल गइल बा</strong>।\nडिटेल में जानकारी [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  ढाँपले के लॉग] पर मिल सकत बा।\nआप अभी भी [$1 ई बदलाव देख सकत बानी] अगर आप आगे बढ़ल चाहीं।",
+	"rev-deleted-text-view": "पन्ना पर के ई बदलाव <strong>हटा दिहल गइल बा</strong>।\nआप एकरा के देख सकत बानी; डिटेल जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटवले के लॉग] पर मिल सकत बा।",
+	"rev-suppressed-text-view": "पन्ना पर के ई बदलाव <strong>ढाँप दिहल गइल बा</strong>।\nआप एकरा के देख सकत बानी;  डिटेल जानकारी [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} ढाँपले के लॉग] पर मिल सकत बा।",
+	"rev-deleted-no-diff": "रउआँ ई अंतर नइखीं देख सकत काहें से की ए बदलाव कुल में से कौनों बदलाव <strong>हटा दिहल गइल</strong> बा।\nडिटेल जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटवले के लॉग] पर मिल सकत बा।",
+	"rev-suppressed-no-diff": "रउआँ ई अंतर नइखीं देख सकत काहें से की कौनों एगो बदलाव के <strong>हटा दिहल गइल बा</strong>।",
+	"rev-deleted-unhide-diff": "ए अंतर के कौनों एगो बदलाव One of the revisions of this diff has been <strong>हटा दिहल गइल</strong> बा।\nडिटेल जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटवले के लॉग] पर बा।\nरउआँ [$1 ई अंतर देख सकत बानी] अगर आगे बढ़ल चाहीं।",
+	"rev-suppressed-unhide-diff": "ए अंतर में के कौनों बदलाव के <strong>ढाँप दिहल गइल</strong> बा।\nडिटेल जानकारी [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} ढाँपले के लॉग] पर बा।\nअभी भी आप ई अंतर [$1 देख सकत बानी] अगर आप आगे बढ़ल चाहीं।",
+	"rev-deleted-diff-view": "ए अंतर क कौनो एगो बदलाव <strong>हटा दिहल गइल</strong> बा।\nआप ई अंतर देख सकत बानी; डिटेल में जानकारी [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} हटवले के लॉग] पर मिल सकत बा।",
+	"rev-suppressed-diff-view": "ए अंतर के कौनो एगो बदलाव <strong>ढाँप दिहल गइल</strong> बा।\nआप ई अंतर देख सकत बानी; डिटेल में जानकारी [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}}  ढाँपले की लॉग] पर बा।",
 	"rev-delundel": "देखाईं/छिपाईं",
 	"rev-showdeleted": "देखाईं",
+	"revisiondelete": "रिवीजन हटाईं/हटावल लौटाईं",
+	"revdelete-nooldid-title": "अमान्य टारगेट रिवीजन",
+	"revdelete-nooldid-text": "आप या त ए फंक्शन के लागू करे खातिर कौनो निश्चित टारगेट बदलाव नइखीं दिहले, या राउर बतावल बदलाव मौजूद नइखे, या फिर आप वर्तमान बदलाव के छिपावे के कोसिस करत बानी।",
+	"revdelete-no-file": "बतावल गइल फाइल मौजूद नइखे।",
+	"revdelete-show-file-confirm": "का सही में रउआँ फाइल \"<nowiki>$1</nowiki>\" के $2 के $3 बनल आ बाद में हटावल बदलाव देखल चाहत बानी?",
 	"revdelete-show-file-submit": "जी",
+	"revdelete-selected-text": "[[:$2]] के {{PLURAL:$1|चुनल गइल बदलाव| चुनल गइल बदलाव सभ}}:",
+	"revdelete-selected-file": "[[:$2]] के {{PLURAL:$1|चुनल गइल फाइल वर्शन|चुनल गइल फाइल वर्शन सभ}}:",
+	"logdelete-selected": "{{PLURAL:$1|चुनल गइल लॉग घटना|चुनल गइल लॉग घटना सब}}:",
+	"revdelete-text-text": "हटावल गइल बदलाव पन्ना की इतिहास में जरूर लउकी बाकी ओकर सामग्री जनता खातिर पहुँच से बाहर रही।",
+	"revdelete-text-file": "हटावल फाइल वर्शन फाइल की इतिहास में जरूर लउकी बाकी ओकर सामग्री जनता की पहुँच से बाहर रही।",
+	"logdelete-text": "हटावल लॉग घटना सब लॉग की इतिहास में जरूर लउकी बाकी उन्हन के सामग्री जनता खातिर पहुँच से बाहर रही।",
+	"revdelete-text-others": "अगर अउरी अधिका प्रतिबंध ना सेट कइल जाव, त बाकी प्रबंधक लोग छिपावल सामग्री के देखे आ वापस ले आवे में सक्षम रही।",
+	"revdelete-confirm": "निश्चित रूप से बताईं की आप ई कइल चाहत बानी, आप एकर परिणाम बूझत बानी, आ आप ई उचित [[{{MediaWiki:Policy-url}}|नीति की अनुसार]] करत बानी।",
+	"revdelete-suppress-text": "ढाँपल (Suppression) <strong>खाली भर</strong> नीचे बतावल स्थिति में इस्तेमाल होखे के चाहीं:\n* potentially libelous information\n* inappropriate personal information\n*: <em>home addresses and telephone numbers, national identification numbers, etc.</em>",
+	"revdelete-legend": "देखाई दिहला पर प्रतिबन्ध सेट करीं",
 	"revdelete-hide-text": "संशोधन पाठ्य",
 	"revdelete-hide-image": "फाइल के सामग्री छुपाँईं",
+	"revdelete-hide-name": "टारगेट आ पैरामीटर छिपाईं",
 	"revdelete-hide-comment": "सारांश सम्पादन",
 	"revdelete-hide-user": "सम्पादक के सदस्यनाम/आइ॰पी पता",
+	"revdelete-hide-restricted": "डेटा के अउरी सदस्य सभ की साथै साथ प्रबंधक लोगन खातिर भी ढाँप दीं",
 	"revdelete-radio-same": "(मत बदलीं)",
 	"revdelete-radio-set": "छुपल",
 	"revdelete-radio-unset": "दृश्यमान",
+	"revdelete-suppress": "डेटा के अउरी सदस्य आ प्रबंधक लोगन खातिर भी ढाँप दीं",
+	"revdelete-unsuppress": "दुबारा स्थापित बदलाव पर से प्रतिबन्ध हटाईं",
 	"revdelete-log": "कारण:",
+	"revdelete-submit": "चुनल गइल {{PLURAL:$1|बदलाव|बदलाव कुल}} पर लागू करीं",
+	"revdelete-success": "बदलाव के देखाई पड़ले के सेटिंग अपडेट हो गइल",
+	"revdelete-failure": "बदलाव के देखाई पड़ले के सेटिंग अपडेट ना हो पावल:$1",
+	"logdelete-success": "लॉग के देखाई पड़ले के सेटिंग पूरा भइल।",
+	"logdelete-failure": "लॉग के देखाई पड़ले के सेटिंग पूरा ना भइल:$1",
 	"revdel-restore": "दूश्यता बदलीं",
 	"pagehist": "पन्ना के इतिहास",
 	"deletedhist": "मिटावल इतिहास",
+	"revdelete-hide-current": "तारीख $2 के $1 बजे के बदलाव छिपावे में खराबी बा।\nई सबसे ताजा बदलाव बा। एकरा के ना छिपावल जा सकत बाटे।",
+	"revdelete-show-no-access": "तारीख $2, के $1 बजे के बदलाव देखावे में खराबी: ए चीज के \"प्रतिबंधित\" चिन्हित कइल गइल बा। आपकी लगे इहाँ ले के पहुँच नइखे।",
+	"revdelete-modify-no-access": "तारीख $2, समय $1, के चीज में बदलाव करे में खराबी बा: ई चीज \"प्रतिबंधित\" चिन्हित कइल गइल बा।\nआप की लगे इहाँ ले पहुँच नइखे।",
+	"revdelete-modify-missing": "आइटम ID $1 के बदलाव करे में खराबी: ई डेटाबेस से गायब बा!",
+	"revdelete-no-change": "<strong>चेतावनी:</strong> तारीख $2 के $1 बजे के ई आइटम पहिलहीं से ओही देखावे के सेटिंग वाला बाटे जवन माँगल जाता।",
 	"revdelete-otherreason": "अन्य/अतिरिक्त कारण:",
 	"revdelete-reasonotherlist": "अन्य कारण",
 	"revdelete-edit-reasonlist": "हटावे के कारण बदलीं",
@@ -973,6 +1087,27 @@
 	"upload-proto-error": "गलत प्रोटोकाल",
 	"upload-file-error": "इंटरनल खराबी",
 	"upload-misc-error": "नामालूम अपलोड खराबी",
+	"upload-dialog-title": "फाइल अपलोड",
+	"upload-dialog-error": "कौनो खराबी आ गइल",
+	"upload-dialog-warning": "कौनो चेतावनी बा",
+	"upload-dialog-button-cancel": "कैंसिल",
+	"upload-dialog-button-done": "पूरा भइल",
+	"upload-dialog-button-save": "सहेजीं",
+	"upload-dialog-button-upload": "अपलोड",
+	"upload-dialog-label-select-file": "फाइल चुनीं",
+	"upload-dialog-label-infoform-title": "डिटेल जानकारी",
+	"upload-dialog-label-infoform-name": "नाँव",
+	"upload-dialog-label-infoform-description": "विवरण",
+	"upload-dialog-label-usage-title": "इस्तेमाल",
+	"upload-dialog-label-usage-filename": "फाइल नाँव",
+	"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 पर कॉपी ना कइल जा सकल।",
@@ -980,6 +1115,8 @@
 	"backend-fail-opentemp": "टेम्परेरी फाइल के ना खोलल जा सकल।",
 	"backend-fail-writetemp": "टेम्परेरी फाइल में ना राइट कइल जा सकल।",
 	"backend-fail-closetemp": "टेम्परेरी फाइल के बंद ना कइल जा सकल।",
+	"backend-fail-read": "\"$1\" के पढ़ल ना जा सकल।",
+	"backend-fail-create": "फाइल \"$1\" लिखल (राइट) ना जा सकल।",
 	"license": "लाइसेंस जानकारी:",
 	"license-header": "लाइसेंसिंग",
 	"nolicense": "कौनों नइखे",
@@ -1228,7 +1365,28 @@
 	"export": "पन्ना निर्यात करीं",
 	"thumbnail-more": "बढ़ाईं",
 	"filemissing": "फाईल गायब",
+	"import": "पन्ना आयात करीं",
+	"importinterwiki": "दुसरा विकि से आयात करीं",
+	"import-interwiki-text": "आयात करे खातिर एगो विकि आ पन्ना टाइटिल चुनल जाय।\nअवतरण के तारीख आ सम्पादक लोगन के नांव सुरक्षित रखल जाई।\nदुसरा विकि कुल से सगरी आयात कुल के लॉग [[Special:Log/import|आयात लॉग]] पर मौजूद बा।",
+	"import-interwiki-sourcewiki": "विकि, जहाँ से आयात होखी:",
+	"import-interwiki-sourcepage": "पन्ना जौन आयत होखी:",
+	"import-interwiki-history": "सगरी इतिहास के सब अवतरण कॉपी करीं",
+	"import-interwiki-templates": "सगरी टेम्पलेट कुल भी शामिल करीं",
+	"import-interwiki-submit": "आयात",
+	"import-mapping-default": "डिफाल्ट स्थान पर आयात करीं",
+	"import-mapping-namespace": "एगो नाँवस्थान पर आयात करीं:",
+	"import-mapping-subpage": "ए पन्ना की उप-पन्ना की रूप में आयात करीं:",
+	"import-upload-filename": "फाइलनाँव:",
+	"import-comment": "टिप्पणी:",
+	"importstart": "पन्ना आयात कइल जाता...",
+	"import-revision-count": "$1 {{PLURAL:$1|रिवीजन|रिवीजन कुल}}",
+	"importnopages": "आयत करे खातिर कौनों पन्ना नइखे।",
 	"imported-log-entries": "लावल गइल $1 {{PLURAL:$1|लॉग प्रविष्टि|लॉग प्रविष्टिसभ}}",
+	"importfailed": "आयात फेल हो गइल: <nowiki>$1</nowiki>",
+	"importunknownsource": "नामालूम आयात स्रोत प्रकार",
+	"importcantopen": "आयात फाइल के खोले में असमर्थ",
+	"importbadinterwiki": "खराब इंटरविकि कड़ी",
+	"importsuccess": "आयात पूरा भइल!",
 	"import-logentry-upload-detail": "$1 {{PLURAL:$1|संशोधन|संशोधनसभ}} लावल गइल",
 	"tooltip-pt-userpage": "हमार सदस्य पन्ना",
 	"tooltip-pt-mytalk": "हमार बातचीत पन्ना",
diff --git a/languages/i18n/bn.json b/languages/i18n/bn.json
index 76816600a4..e04beca42c 100644
--- a/languages/i18n/bn.json
+++ b/languages/i18n/bn.json
@@ -658,6 +658,7 @@
 	"template-protected": "(সুরক্ষিত)",
 	"template-semiprotected": "(অর্ধ-সুরক্ষিত)",
 	"hiddencategories": "এই পাতাটি {{PLURAL:$1|১টি লুকায়িত বিষয়শ্রেণীর|$1টি লুকায়িত বিষয়শ্রেণীর}} সদস্য:",
+	"edittools": "<!-- সম্পাদনা এবং আপলোড ফরমের নীচে এখানের লেখা দেখানো হবে। -->",
 	"edittools-upload": "-",
 	"nocreatetext": "{{SITENAME}}-এ নতুন পাতা সৃষ্টি করার ক্ষমতা সীমাবদ্ধ করা হয়েছে।\nআপনি ফিরে গিয়ে ইতিমধ্যে বিদ্যমান কোন পাতা সম্পাদনা করতে পারেন, অথবা [[Special:UserLogin|অ্যাকাউন্টে প্রবেশ কিংবা অ্যাকাউন্ট সৃষ্টি করতে পারেন]]।",
 	"nocreate-loggedin": "নতুন পাতা তৈরিতে আপনাকে অনুমোতি দেওয়া হয়নি।",
@@ -2868,10 +2869,11 @@
 	"autoredircomment": "[[$1]]-এ পুনর্নির্দেশ করা হল",
 	"autosumm-new": "\"$1\" দিয়ে পাতা তৈরি",
 	"autosumm-newblank": "খালি পাতা তৈরি হয়েছে",
-	"size-bytes": "$1 বাইট",
+	"size-bytes": "$1 {{PLURAL:$1|বাইট}}",
 	"size-kilobytes": "$1 কিলোবাইট",
 	"size-megabytes": "$1 মেগাবাইট",
 	"size-gigabytes": "$1 গিগাবাইট",
+	"size-pixel": "$1 {{PLURAL:$1|পিক্সেল}}",
 	"bitrate-kilobits": "$1 কেবিপিএস",
 	"bitrate-megabits": "$1 এমবিপিএস",
 	"bitrate-gigabits": "$1 জিবিপিএস",
@@ -2976,6 +2978,7 @@
 	"version-entrypoints": "শুরুর ইউআরএল",
 	"version-entrypoints-header-entrypoint": "শুরু",
 	"version-entrypoints-header-url": "ইউআরএল",
+	"version-entrypoints-articlepath": "[https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgArticlePath নিবন্ধের পথ]",
 	"version-libraries": "ইনস্টল লাইব্রেরি",
 	"version-libraries-library": "লাইব্রেরী",
 	"version-libraries-version": "সংস্করণ",
diff --git a/languages/i18n/br.json b/languages/i18n/br.json
index 50a8f7f70c..e7d76cfaed 100644
--- a/languages/i18n/br.json
+++ b/languages/i18n/br.json
@@ -1629,7 +1629,6 @@
 	"emailuser": "Kas ur postel d'an implijer-mañ",
 	"emailuser-title-target": "Kas ur postel d'an {{PLURAL:$1|an implijer-mañ|an implijerez-mañ}}",
 	"emailuser-title-notarget": "Kas ur postel d'un implijer",
-	"emailpage": "Postel implijer",
 	"emailpagetext": "Gallout a rit ober gant ar furmskrid a-is a-benn kas ur postel d'an {{GENDER:$1|implijer|implijerez}}-mañ.\nE maezienn \"Kaser\" ho postel e vo merket ar chomlec'h postel resisaet ganeoc'h-c'hwi en ho [[Special:Preferences|Penndibaboù]], d'ar resever da c'hallout respont deoc'h war-eeun ma kar.",
 	"defemailsubject": "Postel kaset eus {{SITENAME}} gant an implijer \"$1\"",
 	"usermaildisabled": "Diweredekaet eo ar c'has posteloù etre an implijerien.",
@@ -2158,7 +2157,7 @@
 	"tooltip-pt-logout": "Digevreañ",
 	"tooltip-pt-createaccount": "Erbedet eo deoc'h krouiñ ur gont ha kevreañ ; n'eo ket ret koulskoude.",
 	"tooltip-ca-talk": "Kaozeadennoù diwar-benn ar pennad",
-	"tooltip-ca-edit": "Gallout a rit kemmañ ar bajenn-mañ. Implijit ar stokell Rakwelet a-raok enrollañ, mar plij.",
+	"tooltip-ca-edit": "Kemmañ ar bajenn-mañ.",
 	"tooltip-ca-addsection": "Kregiñ gant ur rann nevez.",
 	"tooltip-ca-viewsource": "Gwarezet eo ar bajenn-mañ. Gallout a rit gwelet an danvez anezhañ memes tra.",
 	"tooltip-ca-history": "Stummoù kozh ar bajenn-mañ gant an aozerien anezhi.",
@@ -2193,7 +2192,7 @@
 	"tooltip-ca-nstab-main": "Gwelet ar pennad",
 	"tooltip-ca-nstab-user": "Gwelet ar bajenn implijer",
 	"tooltip-ca-nstab-media": "Gwelet pajenn ar media",
-	"tooltip-ca-nstab-special": "Ur bajenn dibar eo homañ, n'oc'h ket evit kemmañ anezhi.",
+	"tooltip-ca-nstab-special": "Ur bajenn dibar eo homañ ha ne c'haller kemmañ anezhi.",
 	"tooltip-ca-nstab-project": "Gwelet pajenn ar raktres",
 	"tooltip-ca-nstab-image": "Gwelet pajenn deskrivañ ar bajenn-mañ",
 	"tooltip-ca-nstab-mediawiki": "Gwelet kemenn ar reizhiad",
@@ -2239,7 +2238,7 @@
 	"spam_reverting": "Distreiñ d'ar stumm diwezhañ hep liamm davet $1",
 	"spam_blanking": "Diverkañ an holl stummoù enno liammoù davet $1",
 	"spam_deleting": "An holl stummoù enno liammoù war-zu $1, o tiverkañ",
-	"simpleantispam-label": "Taol gwiriañ eneb-strob.\n'''Arabat''' merkañ tra pe dra amañ !",
+	"simpleantispam-label": "Taol gwiriañ eneb-strob.\n<trong>Arabat<strong> merkañ tra pe dra amañ !",
 	"pageinfo-title": "Titouroù evit \"$1\"",
 	"pageinfo-not-current": "Hon digarezit, ne c'haller ket reiñ an titouroù-mañ evit an adweloù kozh.",
 	"pageinfo-header-basic": "Titouroù diazez",
diff --git a/languages/i18n/bs.json b/languages/i18n/bs.json
index 9fd5248188..f54fe35298 100644
--- a/languages/i18n/bs.json
+++ b/languages/i18n/bs.json
@@ -804,7 +804,7 @@
 	"revdelete-concurrent-change": "Greška pri mijenjanju stavke od $2, $1: njen status je izmijenjen od strane nekog drugog dok ste je pokušavali mijenjati.\nMolimo provjerite zapise.",
 	"revdelete-only-restricted": "Greška pri sakrivanju stavke od dana $2, $1: ne možete ukloniti stavke od pregledavanja administratora bez da odaberete neku od drugih opcija za uklanjanje.",
 	"revdelete-reason-dropdown": "*Uobičajeni razlozi brisanja\n** Kršenje autorskih prava\n** Neprikladan komentar ili lični podac\n** Neprikladno korisničko ime\n** Uvredljivi podaci",
-	"revdelete-otherreason": "Ostali/dodatni razlog:",
+	"revdelete-otherreason": "Drugi/dodatni razlog:",
 	"revdelete-reasonotherlist": "Ostali razlozi",
 	"revdelete-edit-reasonlist": "Uredi razloge brisanja",
 	"revdelete-offender": "Autor revizije:",
@@ -1482,7 +1482,7 @@
 	"filedelete-success-old": "Verzija datoteke '''[[Media:$1|$1]]''' od $3, $2 je obrisana.",
 	"filedelete-nofile": "'''$1''' ne postoji.",
 	"filedelete-nofile-old": "Ne postoji arhivirana verzija '''$1''' sa navedenim atributima.",
-	"filedelete-otherreason": "Ostali/dodatni razlozi:",
+	"filedelete-otherreason": "Drugi/dodatni razlog:",
 	"filedelete-reason-otherlist": "Ostali razlozi",
 	"filedelete-reason-dropdown": "*Uobičajeni razlozi brisanja\n** Kršenje autorskih prava\n** Datoteka dvojnik",
 	"filedelete-edit-reasonlist": "Uredi razloge brisanja",
@@ -1805,7 +1805,7 @@
 	"deletionlog": "zapisnik brisanja",
 	"reverted": "Vraćeno na raniju verziju",
 	"deletecomment": "Razlog:",
-	"deleteotherreason": "Ostali/dodatni razlozi:",
+	"deleteotherreason": "Drugi/dodatni razlog:",
 	"deletereasonotherlist": "Ostali razlozi",
 	"deletereason-dropdown": "*Uobičajeni razlozi brisanja\n** Spam\n** Vandalizam\n** Kršenje autorskih prava\n** Zahtjev autora\n** Pokvareno preusmjerenje",
 	"delete-edit-reasonlist": "Uredi razloge brisanja",
@@ -1846,20 +1846,20 @@
 	"modifiedarticleprotection": "{{GENDER:|promijenio|promijenila}} je stepen zaštite stranice \"[[$1]]\"",
 	"unprotectedarticle": "uklonjena zaštita sa stranice \"[[$1]]\"",
 	"movedarticleprotection": "podešavanja zaštite premještena sa \"[[$2]]\" na \"[[$1]]\"",
-	"protect-title": "Zaštićuje se \"$1\"",
+	"protect-title": "Mijenjate nivo zašite za \"$1\"",
 	"protect-title-notallowed": "Pregled stepena zaštite za \"$1\"",
 	"prot_1movedto2": "članak [[$1]] premješten na [[$2]]",
 	"protect-badnamespace-title": "Nezaštitljiv imenski prostor",
 	"protect-badnamespace-text": "Stranice u ovom imenskom prostoru ne mogu se zaštititi.",
 	"protect-norestrictiontypes-text": "Ova stranica se ne može zaštititi jer nema dostupnih oblika ograničenja.",
 	"protect-norestrictiontypes-title": "Nezaštitljiva strana",
-	"protect-legend": "Potvrdite zaštitu",
+	"protect-legend": "Potvrda zaštite",
 	"protectcomment": "Razlog:",
 	"protectexpiry": "Ističe:",
 	"protect_expiry_invalid": "Upisani vremenski rok nije valjan.",
 	"protect_expiry_old": "Upisani vremenski rok je u prošlosti.",
 	"protect-unchain-permissions": "Otključaj daljnje opcije zaštite",
-	"protect-text": "Ovdje možete gledati i izmjeniti level zaštite za stranicu '''$1'''.",
+	"protect-text": "Ovdje možete pregledati i promijeniti nivo zaštite za stranicu <strong>$1</strong>.",
 	"protect-locked-blocked": "Ne možete promijeniti nivo zaštite dok ste blokirani.\nOvo su trenutne postavke za stranicu '''$1''':",
 	"protect-locked-dblock": "Nivoi zaštite ne mogu se mijenjati jer je aktivna baza podataka zaključana.\nTrenutna postavka za stranicu '''$1''' jest:",
 	"protect-locked-access": "Nemate ovlasti za mijenjanje stepena zaštite.\nSlijede trenutne postavke stranice '''$1''':",
@@ -1872,16 +1872,16 @@
 	"protect-expiring": "ističe $1 (UTC)",
 	"protect-expiring-local": "ističe $1",
 	"protect-expiry-indefinite": "neograničeno",
-	"protect-cascade": "Prenosiva zaštita - zaštiti sve stranice koje su uključene u ovu.",
+	"protect-cascade": "Zaštiti sve stranice koje su uključene u ovu (prenosiva zaštita)",
 	"protect-cantedit": "Ne možete mijenjati nivo zaštite ove stranice, jer nemate prava da je uređujete.",
-	"protect-othertime": "Ostali period:",
-	"protect-othertime-op": "ostali period",
+	"protect-othertime": "Drugo vrijeme:",
+	"protect-othertime-op": "drugo vrijeme",
 	"protect-existing-expiry": "Postojeće vrijeme isticanja: $3, $2",
 	"protect-existing-expiry-infinity": "Postojeće vrijeme isteka: trajno",
-	"protect-otherreason": "Ostali/dodatni razlozi:",
+	"protect-otherreason": "Drugi/dodatni razlog:",
 	"protect-otherreason-op": "Ostali razlozi",
 	"protect-dropdown": "*Uobičajeni razlozi zaštite\n** Prekomjerni vandalizam\n** Prekomjerno spamovanje\n** Ne produktivni rat izmjena\n** Stranica velikog prometa",
-	"protect-edit-reasonlist": "Uredi razloge zaštićavanja",
+	"protect-edit-reasonlist": "Uredi razloge zaštićivanja",
 	"protect-expiry-options": "1 sat:1 hour,1 dan:1 day,1 sedmica:1 week,2 sedmice:2 weeks,1 mjesec:1 month,3 mjeseca:3 months,6 mjeseci:6 months,1 godine:1 year,beskonačno:infinite",
 	"restriction-type": "Dopuštenje:",
 	"restriction-level": "Stepen ograničenja:",
@@ -1998,8 +1998,8 @@
 	"ipbcreateaccount": "Spriječi pravljenje računa",
 	"ipbemailban": "Onemogući korisnika da šalje e-mail",
 	"ipbenableautoblock": "Automatski blokiraj posljednju IP-adresu koju je koristio ovaj korisnik i sve druge IP-adrese s kojih je pokušao uređivati",
-	"ipbsubmit": "Blokirajte ovog korisnika",
-	"ipbother": "Ostali period:",
+	"ipbsubmit": "Blokiraj ovog korisnika",
+	"ipbother": "Drugo vrijeme:",
 	"ipboptions": "2 sata:2 hours,1 dan:1 day,3 dana:3 days,1 sedmica:1 week,2 sedmice:2 weeks,1 mjesec:1 month,3 mjeseca:3 months,6 mjeseci:6 months,1 godine:1 year,beskonačno:infinite",
 	"ipbhidename": "Sakrij korisničko ime iz uređivanja i spiskova",
 	"ipbwatchuser": "Prati korisničku stranicu i stranicu za razgovor ovog korisnika",
@@ -2049,7 +2049,7 @@
 	"blocklist-nousertalk": "ne može uređivati vlastitu stranicu za razgovor",
 	"ipblocklist-empty": "Spisak blokiranja je prazan.",
 	"ipblocklist-no-results": "Tražena IP adresa ili korisničko ime nisu blokirani.",
-	"blocklink": "blokirajte",
+	"blocklink": "blokiraj",
 	"unblocklink": "deblokiraj",
 	"change-blocklink": "promijeni blokadu",
 	"contribslink": "doprinosi",
diff --git a/languages/i18n/ca.json b/languages/i18n/ca.json
index 375af4d644..87c29a5abd 100644
--- a/languages/i18n/ca.json
+++ b/languages/i18n/ca.json
@@ -395,7 +395,7 @@
 	"actionthrottled": "Acció limitada",
 	"actionthrottledtext": "Com a mesura per a prevenir la propaganda indiscriminada (spam), no podeu fer aquesta acció tantes vegades en un període de temps tan curt. Torneu-ho a intentar d'ací uns minuts.",
 	"protectedpagetext": "S'ha protegit la pàgina per evitar-hi modificacions.",
-	"viewsourcetext": "Podeu visualitzar i copiar el codi font d’aquesta pàgina:",
+	"viewsourcetext": "Podeu veure i copiar el codi font d’aquesta pàgina.",
 	"viewyourtext": "Vostè pot veure i copiar la font de <strong>les teves modificacions</strong> d'aquesta pàgina.",
 	"protectedinterface": "Aquesta pàgina proporciona el text de la interfície del software d'aquest wiki i està protegida per evitar els abusos.\nPer afegir o canviar les traduccions per a tots els wikis, feu servir [//translatewiki.net/ translatewiki.net], el projecte de localització de MediaWiki.",
 	"editinginterface": "'''Avís:''' esteu editant una pàgina que s'utilitza per proporcionar text d'interfície per al programari. Els canvis que es facin a la pàgina afectaran l'aparença de la interfície d'altres usuaris del wiki.",
@@ -476,6 +476,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pàgina|pàgines}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|col·laborador recent|col·laboradors recents}}",
 	"badretype": "Les contrasenyes que heu introduït no coincideixen.",
+	"usernameinprogress": "La creació d'un compte per a aquest usuari ja està en curs. Espereu.",
 	"userexists": "El nom que heu entrat ja és en ús.\nEscolliu-ne un de diferent.",
 	"loginerror": "Error d'inici de sessió",
 	"createacct-error": "Error de creació de compte",
@@ -968,6 +969,7 @@
 	"columns": "Columnes",
 	"searchresultshead": "Preferències de la cerca",
 	"stub-threshold": "Límit per a formatar l'enllaç com <a href=\"#\" class=\"stub\">esborrany</a> (en octets):",
+	"stub-threshold-sample-link": "mostra",
 	"stub-threshold-disabled": "Inhabilitat",
 	"recentchangesdays": "Dies a mostrar en els canvis recents:",
 	"recentchangesdays-max": "(màxim $1 {{PLURAL:$1|dia|dies}})",
@@ -1884,6 +1886,7 @@
 	"changecontentmodel-nodirectediting": "El model de contingut $1 no permet l'edició directa",
 	"log-name-contentmodel": "Registre de canvis del model de contingut",
 	"log-description-contentmodel": "Esdeveniments relacionats amb els models de contingut d'una pàgina",
+	"logentry-contentmodel-change": "$1 {{GENDER:$2|ha canviat}} el model de contingut de la pàgina $3 de «$4» a «$5»",
 	"logentry-contentmodel-change-revertlink": "reverteix",
 	"logentry-contentmodel-change-revert": "reverteix",
 	"protectlogpage": "Registre de protecció",
@@ -1946,10 +1949,10 @@
 	"undeletepage": "Mostra i restaura pàgines esborrades",
 	"undeletepagetitle": "'''A continuació teniu revisions eliminades de [[:$1]]'''.",
 	"viewdeletedpage": "Visualitza les pàgines eliminades",
-	"undeletepagetext": "S'ha eliminat {{PLURAL:|la pàgina $1, però encara és a l'arxiu i pot ser restaurada|les pàgines $1, però encara són a l'arxiu i poden ser restaurades}}. Es Pot netejar l'arxiu periòdicament.",
+	"undeletepagetext": "{{PLURAL:|S'ha eliminat la pàgina següent, però encara és a l'arxiu i pot ser restaurada|S'han eliminat les $1 pàgines següents, però encara són a l'arxiu i poden ser restaurades}}.\nL'arxiu pot ser netejat periòdicament.",
 	"undelete-fieldset-title": "Restaura revisions",
 	"undeleteextrahelp": "Per a restaurar l'historial sencer de la pàgina, deixeu totes les caselles sense seleccionar i feu clic a '''''{{int:undeletebtn}}'''''.\nPer a realitzar una restauració selectiva, marqueu les caselles que corresponguin a les revisions que voleu recuperar, i feu clic a '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "{{PLURAL:$1|Una revisió arxivada|$1 revisions arxivades}}",
+	"undeleterevisions": "{{PLURAL:$1|Una revisió suprimida|$1 revisions suprimides}}",
 	"undeletehistory": "Si restaureu la pàgina, totes les revisions seran restaurades a l'historial.\n\nSi s'hagués creat una nova pàgina amb el mateix nom d'ençà que la vàreu esborrar, les versions restaurades apareixeran abans a l'historial.",
 	"undeleterevdel": "No es revertirà l'eliminació si això provoca la supressió parcial de la pàgina superior.\n\nEn aqueixos casos, heu de desmarcar o mostrar les revisions eliminades més noves.",
 	"undeletehistorynoadmin": "S'ha eliminat la pàgina. El motiu es mostra\nal resum a continuació, juntament amb detalls dels usuaris que l'havien editat abans de la seua eliminació. El text de les revisions eliminades només és accessible als administradors.",
@@ -2012,7 +2015,7 @@
 	"sp-contributions-blocked-notice-anon": "En aquests moments, aquesta adreça IP es troba blocada.\nPer més detalls, la última entrada del registre es mostra a continuació:",
 	"sp-contributions-search": "Cerca les contribucions",
 	"sp-contributions-username": "Adreça IP o nom d'usuari:",
-	"sp-contributions-toponly": "Mostra només revisions superiors",
+	"sp-contributions-toponly": "Mostra només les darreres revisions",
 	"sp-contributions-newonly": "Mostra només modificacions que són creacions de pàgina",
 	"sp-contributions-submit": "Cerca",
 	"whatlinkshere": "Què hi enllaça",
@@ -2359,7 +2362,7 @@
 	"tooltip-ca-nstab-main": "Vegeu el contingut de la pàgina",
 	"tooltip-ca-nstab-user": "Vegeu la pàgina d'usuari",
 	"tooltip-ca-nstab-media": "Vegeu la pàgina de l'element multimèdia",
-	"tooltip-ca-nstab-special": "Aquesta és una pàgina especial, no podeu modificar-la",
+	"tooltip-ca-nstab-special": "Aquesta és una pàgina especial i no pot modificar-se",
 	"tooltip-ca-nstab-project": "Vegeu la pàgina del projecte",
 	"tooltip-ca-nstab-image": "Visualitza la pàgina del fitxer",
 	"tooltip-ca-nstab-mediawiki": "Vegeu el missatge de sistema",
diff --git a/languages/i18n/ce.json b/languages/i18n/ce.json
index 217863fe2a..1a3749368d 100644
--- a/languages/i18n/ce.json
+++ b/languages/i18n/ce.json
@@ -193,7 +193,7 @@
 	"unprotect": "ГӀароллех къаста",
 	"unprotectthispage": "ГӀароллех къаста",
 	"newpage": "Керла агӀонаш",
-	"talkpage": "Дийцаре йила хӀара агӀо",
+	"talkpage": "Дийцаре йилла хӀара агӀо",
 	"talkpagelinktext": "Дийцаре",
 	"specialpage": "Белхан агӀо",
 	"personaltools": "Долахь болу гӀирсаш",
@@ -256,7 +256,7 @@
 	"youhavenewmessagesfromusers": "Хьуна кхачанна $1 {{PLURAL:$3|1=$3 декъашхочунгара|$3 декъашхошкара}} ($2).",
 	"youhavenewmessagesmanyusers": "Хьона еъна $1 дукху декъашхошкар ($2).",
 	"newmessageslinkplural": "{{PLURAL:$1|керла хаам|999=керла хаамаш}}",
-	"newmessagesdifflinkplural": "{{PLURAL:$1|тӀаьхьара бина хийцам|999=тӀаьхьара бина хийцамаш}}",
+	"newmessagesdifflinkplural": "{{PLURAL:$1|тӀаьххьара бина хийцам|999=тӀаьххьара бина хийцамаш}}",
 	"youhavenewmessagesmulti": "Хьуна кхаьчна керла хаам оцу $1",
 	"editsection": "нисъе",
 	"editold": "нисъе",
@@ -341,7 +341,7 @@
 	"viewsource-title": "Агӏона $1 дуьххьарлера йозане хьажар",
 	"actionthrottled": "Сиххалин доза тохар",
 	"actionthrottledtext": "Спам цахилийта хӀара дешдерг кӀезиг хенахь дукху ца дайта дихкина ду. Дехар до массийта минот яьлча гӀорта.",
-	"protectedpagetext": "ХӀара агӀо дӀакъоьвлина ю тадарш ца дайта.",
+	"protectedpagetext": "ХӀара агӀо ларйина ю хийцамаш ца байта.",
 	"viewsourcetext": "Хьоьга далундерг хьажар а дезахь хlокху агlон чура йоза хьаэцар:",
 	"viewyourtext": "Хьан йиш ю '''хьой нисдинчу''' дӀадолалун йозе хьажа а, цуна копи ян а:",
 	"protectedinterface": "ХӀокху агӀона чохь интерфейсан программа латторан хаам бу. Зулам ца дайта цуна хийцам бан куьйгалхошна бен цало.\nХӀокху хааман гоч тӀетоха я хийца лелае локализацин сайт MediaWiki [//translatewiki.net/ translatewiki.net]",
@@ -630,7 +630,7 @@
 	"permissionserrorstext": "Хьан бакъо яц кхочуш хилийта хийцам оцу {{PLURAL:$1|1=шолгlа бахьанца|шолгlа бахьанашца}}:",
 	"permissionserrorstext-withaction": "Хьан бакъо яц хlумда «'''$2'''» оцу {{PLURAL:$1|1=шолгlа бахьанца|шолгlа бахьанашца}}:",
 	"recreate-moveddeleted-warn": "'''Тидам бе. Ахьа кхуллуш ю, хьалхо дӀаяьккхина йолу агӀо.'''\n\nХьажа, билгалла оьши хьуна хӀара агӀо юха кхолла.\nЛахахь далина ду дӀаяхарш тӀяхь долу тептарш а хӀокх агӀона цӀе хийцарш а.",
-	"moveddeleted-notice": "Иза агӀо дӀаяьккхина яра.\nХаийтарна лахахьа гойту, цуьнца долу дӀаяздарш кху тептар чура дӀаяхарш а цӀе хийцарш а.",
+	"moveddeleted-notice": "ХӀара агӀо дӀаяьккхина яра.\nЛахахьа гойту хӀара дӀаккхарш а, цӀе хийцарш а.",
 	"log-fulllog": "Хьажа деригге тептаре",
 	"edit-hook-aborted": "Нисдар юхадаьккхина тӀехьожучо.\nХӀу бахьана ду билгал дина дац.",
 	"edit-gone-missing": "АгӀо карлаяккха цатарло.\nИза дӀаяьккхина хила мега.",
@@ -1089,7 +1089,7 @@
 	"enhancedrc-history": "истори",
 	"recentchanges": "Керла нисдарш",
 	"recentchanges-legend": "Керлачу хийцамийн нисдарш",
-	"recentchanges-summary": "Лахахь гайтина хене хьаьжжина Википедин агӀонашкахь тӀаьхьара бина хийцамаш",
+	"recentchanges-summary": "Лахахь гайтина хене хьаьжжина Википедин агӀонашкахь тӀаьххьара бина хийцамаш",
 	"recentchanges-noresult": "Билгал йинчу хенахь цхьа хийцамаш бина бац.",
 	"recentchanges-feed-description": "Тергам бе тӀаьххьара вики хийцаман хӀокху ларца.",
 	"recentchanges-label-newpage": "Оцу нисдарца кхоьллина керла агӀо.",
@@ -1637,8 +1637,8 @@
 	"protectlogpage": "Ларяран тептар",
 	"protectlogtext": "Лахахь гойту агӀо лаъръяран хийцамаш чохь болу тептар.\nХьа кхин йиш ю [[Special:ProtectedPages|хӀинца ларйина йолу агӀонийн могӀаме хьажа]].",
 	"protectedarticle": "Ларйина агӀо «[[$1]]»",
-	"modifiedarticleprotection": "агӀонан ларяран локхалла хийцина «[[$1]]»",
-	"unprotectedarticle": "ГӀоролла дӀадаьстина «[[$1]]»",
+	"modifiedarticleprotection": "«[[$1]]» агӀонан ларяран локхалла хийцина",
+	"unprotectedarticle": "«[[$1]]» ларъяр дӀадаьстина",
 	"movedarticleprotection": "«[[$2]]» агӀона тӀера ларъяр «[[$1]]» агӀона тӀе даьккхина",
 	"protect-title": "Ларъяр: «$1»",
 	"protect-title-notallowed": "ГӀораллин бараме хьажар «$1»",
@@ -2654,7 +2654,7 @@
 	"logentry-merge-merge": "$1 {{GENDER:$2|вовшахтоьхна}} $3 $4 чохь ($5 кхаччалц версеш)",
 	"logentry-move-move": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4",
 	"logentry-move-move-noredirect": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажорг цаюьтуш",
-	"logentry-move-move_redir": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажоран тӀохул",
+	"logentry-move-move_redir": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажоран тӀехул",
 	"logentry-move-move_redir-noredirect": "$1 {{GENDER:$2|цӀе хийцина}} $3 → $4 дӀасахьажорган тӀехул а, дӀасахьажорг цаюьтуш а",
 	"logentry-patrol-patrol": "$1 {{GENDER:$2|хьаьжина}}  агӀона $3 $4 версега",
 	"logentry-patrol-patrol-auto": "$1 автоматически {{GENDER:$2|хьаьжина}} $3 агӀона версега $4",
diff --git a/languages/i18n/ckb.json b/languages/i18n/ckb.json
index 2fba2bdb66..f467f8fa62 100644
--- a/languages/i18n/ckb.json
+++ b/languages/i18n/ckb.json
@@ -237,6 +237,7 @@
 	"disclaimers": "نابەرپرسییەکان",
 	"disclaimerpage": "Project:بەرپرسنەبوون",
 	"edithelp": "ڕێنوێنیی دەستکاریکردن",
+	"helppage-top-gethelp": "یارمەتی",
 	"mainpage": "دەستپێک",
 	"mainpage-description": "دەستپێک",
 	"policy-url": "Project: سیاسەت",
@@ -1098,7 +1099,7 @@
 	"hide": "بشارەوە",
 	"show": "نیشان بدە",
 	"minoreditletter": "ب",
-	"newpageletter": "نوێ",
+	"newpageletter": "ن",
 	"boteditletter": "بۆت",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|بەکارھێنەر}}ی چاودێر]",
 	"rc_categories": "بەرتەسک‌کردنەوە بە هاوپۆلەکان (به «|» جیای بکەوە‌)",
@@ -1694,7 +1695,7 @@
 	"sp-contributions-toponly": "تەنیا ئەو دەستکارییانە نیشان بدە کە دوایین پێداچوونەوەن",
 	"sp-contributions-newonly": "تەنیا ئەو دەستکارییانە نیشان بدە کە دروستکردنی پەڕەن",
 	"sp-contributions-submit": "بگەڕێ",
-	"whatlinkshere": "پەیوەندیدار بە ئێرەوە",
+	"whatlinkshere": "بەستەرەکان بە ئێرەوە",
 	"whatlinkshere-title": "ئەو پەڕانەی بەستەریان ھەیە بۆ «$1»",
 	"whatlinkshere-page": "پەڕە:",
 	"linkshere": "پەڕەکانی ژێرەوە بەستەر دراون بۆ <strong>[[:$1]]</strong>:",
diff --git a/languages/i18n/cs.json b/languages/i18n/cs.json
index 51c05711b4..9c1c3a4ab6 100644
--- a/languages/i18n/cs.json
+++ b/languages/i18n/cs.json
@@ -938,7 +938,8 @@
 	"rows": "Řádky",
 	"columns": "Sloupce",
 	"searchresultshead": "Vyhledávání",
-	"stub-threshold": "Limit pro formátování odkazu jako <a href=\"#\" class=\"stub\">pahýl</a> (v bajtech):",
+	"stub-threshold": "Limit pro formátování odkazu jako pahýl ($1):",
+	"stub-threshold-sample-link": "příklad",
 	"stub-threshold-disabled": "Vypnuto",
 	"recentchangesdays": "Počet dní zobrazených v posledních změnách:",
 	"recentchangesdays-max": "Maximálně $1 {{PLURAL:$1|den|dny|dní}}",
@@ -1650,7 +1651,7 @@
 	"booksources-text": "Níže je seznam odkazů na servery prodávající knihy, nebo které mohou mít další informace o knihách, které hledáte.",
 	"booksources-invalid-isbn": "Zadané ISBN se zdá být neplatné. Zkontrolujte jej s originálním zdrojem.",
 	"specialloguserlabel": "Původce:",
-	"speciallogtitlelabel": "Cíl (název nebo uživatel):",
+	"speciallogtitlelabel": "Cíl (název nebo {{ns:user}}:Jméno pro uživatele):",
 	"log": "Protokolovací záznamy",
 	"all-logs-page": "Všechny veřejné záznamy",
 	"alllogstext": "Společné zobrazení všech dostupných protokolovacích záznamů pro {{grammar:4sg|{{SITENAME}}}}.\nZobrazení můžete zúžit výběrem typu záznamu, uživatelského jména (záleží na velikosti písmen) nebo dotčené stránky (také záleží na velikosti písmen).",
diff --git a/languages/i18n/cv.json b/languages/i18n/cv.json
index 47bd2c8237..dba2662716 100644
--- a/languages/i18n/cv.json
+++ b/languages/i18n/cv.json
@@ -948,7 +948,7 @@
 	"table_pager_limit": "Страница çинче $1 кăтарт",
 	"table_pager_limit_submit": "Ту",
 	"table_pager_empty": "Тупăнмарĕ",
-	"autosumm-blank": "Статьяна тĕппипех кăларса пăрахнă",
+	"autosumm-blank": "Статьяна йăлтах пушатрĕ",
 	"autosumm-replace": "Страницăн ăшлăхне «$1» çине улăштарнă",
 	"autoredircomment": "[[$1]] çине куçарни",
 	"autosumm-new": "Çĕнĕ страница \"$1\"",
diff --git a/languages/i18n/de-formal.json b/languages/i18n/de-formal.json
index 6314a70024..8dc362c370 100644
--- a/languages/i18n/de-formal.json
+++ b/languages/i18n/de-formal.json
@@ -175,7 +175,6 @@
 	"prefs-help-watchlist-token2": "Dies ist der geheime Schlüssel zum Webfeed Ihrer Beobachtungsliste.\nJeder, der ihn kennt, kann Ihre Beobachtungsliste lesen. Teilen Sie ihn deshalb nicht Anderen mit.\nSofern notwendig, [[Special:ResetTokens|können Sie ihn zurücksetzen]].",
 	"savedprefs": "Ihre Einstellungen wurden gespeichert.",
 	"prefs-reset-intro": "Sie können diese Seite verwenden, um die Einstellungen auf die Standards zurückzusetzen.\nDies kann nicht mehr rückgängig gemacht werden.",
-	"yourgender": "Welches Geschlecht haben Sie?",
 	"prefs-help-gender": "Dies ist eine freiwillige Angabe.\nDie Software nutzt sie, um Sie anzureden sowie als Hinweis für andere durch Verwendung des zutreffenden grammatikalischen Geschlechts.\nDiese Information ist öffentlich.",
 	"prefs-help-realname": "Dies ist eine freiwillige Angabe. Damit kann Ihr bürgerlicher Name Ihren Beiträgen zugeordnet werden.",
 	"prefs-help-email": "Die Angabe einer E-Mail-Adresse ist optional, ermöglicht aber die Zusendung eines Ersatzpasswortes, sofern Sie Ihr Passwort vergessen haben.",
diff --git a/languages/i18n/de.json b/languages/i18n/de.json
index b5a4438fa8..c61e5f47b0 100644
--- a/languages/i18n/de.json
+++ b/languages/i18n/de.json
@@ -80,7 +80,8 @@
 			"Andreasburmeister",
 			"Tiin",
 			"Freddy2001",
-			"Luke081515"
+			"Luke081515",
+			"J. 'mach' wust"
 		]
 	},
 	"tog-underline": "Links unterstreichen:",
@@ -495,7 +496,7 @@
 	"createacct-captcha": "Sicherheitsprüfung",
 	"createacct-imgcaptcha-ph": "Gib den Text ein, den du oben siehst.",
 	"createacct-submit": "Benutzerkonto erstellen",
-	"createacct-another-submit": "Anderes Benutzerkonto erstellen",
+	"createacct-another-submit": "Benutzerkonto erstellen",
 	"createacct-benefit-heading": "{{SITENAME}} wird von Menschen wie dir geschaffen.",
 	"createacct-benefit-body1": "{{PLURAL:$1|Bearbeitung|Bearbeitungen}}",
 	"createacct-benefit-body2": "{{PLURAL:$1|Seite|Seiten}}",
@@ -515,7 +516,7 @@
 	"nosuchuser": "Der Benutzername „$1“ existiert nicht.\nÜberprüfe die Schreibweise (Groß-/Kleinschreibung beachten) oder [[Special:UserLogin/signup|lege ein neues Benutzerkonto an]].",
 	"nosuchusershort": "Der Benutzername „$1“ ist nicht vorhanden. Bitte überprüfe die Schreibweise.",
 	"nouserspecified": "Bitte gib einen Benutzernamen an.",
-	"login-userblocked": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} ist gesperrt. Die Anmeldung ist nicht erlaubt.",
+	"login-userblocked": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin}} ist gesperrt. Die Anmeldung ist nicht erlaubt.",
 	"wrongpassword": "Das Passwort ist falsch. Bitte versuche es erneut.",
 	"wrongpasswordempty": "Es wurde kein Passwort eingegeben. Bitte versuche es erneut.",
 	"passwordtooshort": "Passwörter müssen mindestens {{PLURAL:$1|1 Zeichen|$1 Zeichen}} lang sein.",
@@ -525,7 +526,7 @@
 	"mailmypassword": "Passwort zurücksetzen",
 	"passwordremindertitle": "Neues temporäres Passwort für dein {{SITENAME}}-Benutzerkonto",
 	"passwordremindertext": "Jemand mit der IP-Adresse $1, wahrscheinlich du selbst, hat ein neues Passwort für die Anmeldung bei {{SITENAME}} ($4) angefordert.\n\nDas automatisch generierte Passwort für Benutzer „$2“ lautet nun: $3\n\nFalls du dies wirklich gewünscht hast, solltest du dich jetzt anmelden und das Passwort ändern.\nDas neue Passwort ist {{PLURAL:$5|1 Tag|$5 Tage}} gültig.\n\nBitte ignoriere diese E-Mail, falls du sie nicht selbst angefordert hast. Das alte Passwort bleibt weiterhin gültig.",
-	"noemail": "{{GENDER:$1|Benutzer|Benutzerin|Benutzer}} „$1“ hat keine E-Mail-Adresse angegeben.",
+	"noemail": "{{GENDER:$1|Benutzer|Benutzerin}} „$1“ hat keine E-Mail-Adresse angegeben.",
 	"noemailcreate": "Du musst eine gültige E-Mail-Adresse angeben.",
 	"passwordsent": "Ein neues, temporäres Passwort wurde an die E-Mail-Adresse von Benutzer „$1“ gesandt.\nBitte melde dich damit an, sobald du es erhalten hast. Das alte Passwort bleibt weiterhin gültig.",
 	"blocked-mailpassword": "Die von dir verwendete IP-Adresse ist für das Ändern von Seiten gesperrt. Um einen Missbrauch zu verhindern, wurde die Möglichkeit zur Anforderung eines neuen Passwortes ebenfalls gesperrt.",
@@ -670,7 +671,7 @@
 	"missing-revision": "Die Version $1 der Seite namens „{{FULLPAGENAME}}“ ist nicht vorhanden.\n\nDieser Fehler wird normalerweise von einem veralteten Link zur Versionsgeschichte einer Seite verursacht, die zwischenzeitlich gelöscht wurde.\nEinzelheiten sind im [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} Lösch-Logbuch] einsehbar.",
 	"userpage-userdoesnotexist": "Das Benutzerkonto „<nowiki>$1</nowiki>“ ist nicht vorhanden. Bitte prüfe, ob du diese Seite wirklich erstellen/bearbeiten willst.",
 	"userpage-userdoesnotexist-view": "Das Benutzerkonto „$1“ ist nicht vorhanden.",
-	"blocked-notice-logextract": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} ist zurzeit gesperrt.\nZur Information folgt ein aktueller Auszug aus dem Benutzersperr-Logbuch:",
+	"blocked-notice-logextract": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin}} ist zurzeit gesperrt.\nZur Information folgt ein aktueller Auszug aus dem Benutzersperr-Logbuch:",
 	"clearyourcache": "'''Hinweis:''' Leere nach dem Speichern den Browser-Cache, um die Änderungen sehen zu können.\n* '''Firefox/Safari:''' ''Umschalttaste'' drücken und gleichzeitig ''Aktualisieren'' anklicken oder entweder ''Strg+F5'' oder ''Strg+R'' (''⌘+R'' auf dem Mac) drücken\n* '''Google Chrome:''' ''Umschalttaste+Strg+R'' (''⌘+Umschalttaste+R'' auf dem Mac) drücken\n* '''Internet Explorer:''' ''Strg+F5'' drücken oder ''Strg'' drücken und gleichzeitig ''Aktualisieren'' anklicken\n* '''Opera:''' ''Extras → Internetspuren löschen … → Individuelle Auswahl → Den kompletten Cache löschen''",
 	"usercssyoucanpreview": "'''Tipp:''' Benutze den „{{int:showpreview}}“-Button, um dein neues CSS vor dem Speichern zu testen.",
 	"userjsyoucanpreview": "'''Tipp:''' Benutze den „{{int:showpreview}}“-Button, um dein neues JavaScript vor dem Speichern zu testen.",
@@ -991,7 +992,8 @@
 	"rows": "Zeilen:",
 	"columns": "Spalten:",
 	"searchresultshead": "Suche",
-	"stub-threshold": "Linkformatierung <a href=\"#\" class=\"stub\">kleiner Seiten</a> (in Bytes):",
+	"stub-threshold": "Linkformatierung kleiner Seiten ($1):",
+	"stub-threshold-sample-link": "Beispiel",
 	"stub-threshold-disabled": "Deaktiviert",
 	"recentchangesdays": "Anzahl der standardmäßig einbezogenen Tage:",
 	"recentchangesdays-max": "Maximal $1 {{PLURAL:$1|Tag|Tage}}",
@@ -1039,11 +1041,11 @@
 	"prefs-help-signature": "Beiträge auf Diskussionsseiten sollten mit „<nowiki>~~~~</nowiki>“ signiert werden, was dann in die Signatur mit Zeitstempel umgewandelt wird.",
 	"badsig": "Die Syntax der Signatur ist ungültig; bitte HTML überprüfen.",
 	"badsiglength": "Die Signatur darf maximal $1 {{PLURAL:$1|Zeichen}} lang sein.",
-	"yourgender": "Welches Geschlecht hast du?",
-	"gender-unknown": "Ich möchte hierzu keine Angabe machen – geschlechtsneutrale Anrede.",
-	"gender-male": "Ich bin männlich",
-	"gender-female": "Ich bin weiblich",
-	"prefs-help-gender": "Dies ist eine freiwillige Angabe.\nDie Software nutzt sie, um dich anzureden sowie als Hinweis für andere durch Verwendung des zutreffenden grammatikalischen Geschlechts.\nDiese Information ist öffentlich zugänglich.",
+	"yourgender": "Form der Anrede",
+	"gender-unknown": "„Der Benutzer“, „seine Diskussion“, „er bearbeitet“ usw.",
+	"gender-male": "„Der Benutzer“, „seine Diskussion“, „er bearbeitet“ usw. (männlich)",
+	"gender-female": "„Die Benutzerin“, „ihre Diskussion“, „sie bearbeitet“ usw. (weiblich)",
+	"prefs-help-gender": "Dies ist eine freiwillige Angabe.\nDie Software nutzt sie, um dich mit dem zutreffenden grammatikalischen Geschlecht anzureden oder gegenüber anderen zu erwähnen.\nDiese Information ist öffentlich zugänglich.",
 	"email": "E-Mail",
 	"prefs-help-realname": "Der bürgerliche Name ist optional.\nFalls angegeben, kann er verwendet werden, um dir eine Zuordnung für deine Beiträge zu geben.",
 	"prefs-help-email": "Die Angabe einer E-Mail-Adresse ist optional, ermöglicht aber die Zusendung eines Ersatzpasswortes, sofern du dein Passwort vergessen hast.",
@@ -1713,7 +1715,7 @@
 	"booksources-text": "Dies ist eine Liste mit Links zu Internetseiten, die neue und gebrauchte Bücher verkaufen. Dort kann es auch weitere Informationen über die Bücher geben. {{SITENAME}} ist mit keinem dieser Anbieter geschäftlich verbunden.",
 	"booksources-invalid-isbn": "Vermutlich ist die ISBN ungültig.\nBitte prüfe, ob sie korrekt von der Quelle übertragen wurde.",
 	"specialloguserlabel": "Ausführender Benutzer:",
-	"speciallogtitlelabel": "Ziel (Titel oder Benutzer):",
+	"speciallogtitlelabel": "Ziel (Titel oder {{ns:user}}:Benutzername für einen Benutzer):",
 	"log": "Logbücher",
 	"all-logs-page": "Alle öffentlichen Logbücher",
 	"alllogstext": "Dies ist die kombinierte Anzeige aller in {{SITENAME}} geführten Logbücher.\nDie Ausgabe kann durch die Auswahl des Logbuchtyps, des Benutzers oder des Seitentitels eingeschränkt werden (Groß-/Kleinschreibung muss beachtet werden).",
@@ -1781,12 +1783,12 @@
 	"listgrouprights-namespaceprotection-namespace": "Namensraum",
 	"listgrouprights-namespaceprotection-restrictedto": "Rechte, die dem Benutzer die Bearbeitung erlauben",
 	"trackingcategories": "Tracking-Kategorien",
-	"trackingcategories-summary": "Diese Seite listet Tracking-Kategorien auf, die von der MediaWiki-Software automatisch eingepflegt werden. Ihre Namen können durch Änderung der entsprechenden Systemnachrichten im {{ns:8}}-Namensraum angepasst werden.",
+	"trackingcategories-summary": "Diese Seite listet Tracking-Kategorien auf, die von der MediaWiki-Software automatisch gefüllt werden. Ihre Namen können durch Änderung der entsprechenden Systemnachrichten im {{ns:8}}-Namensraum angepasst werden.",
 	"trackingcategories-msg": "Tracking-Kategorie",
 	"trackingcategories-name": "Name der Nachricht",
 	"trackingcategories-desc": "Kategorieeinbindungskriterien",
 	"noindex-category-desc": "Die Seite wird nicht von Bots indexiert, da sie das magische Wort <code><nowiki>__NOINDEX__</nowiki></code> enthält und sich in einem Namensraum befindet, wo dieses Flag erlaubt ist.",
-	"index-category-desc": "Die Seite enthält ein <code><nowiki>__INDEX__</nowiki></code> und befindet sich in einem Namensraum, in dem dieses Flag nicht erlaubt ist und wird daher von Bots ausnahmsweise indexiert.",
+	"index-category-desc": "Die Seite enthält ein <code><nowiki>__INDEX__</nowiki></code> und befindet sich in einem Namensraum, in dem dieses Flag erlaubt ist. Daher wird sie ausnahmsweise von Bots indiziert.",
 	"post-expand-template-inclusion-category-desc": "Die Seitengröße ist nach dem Expandieren aller Vorlagen größer als <code>$wgMaxArticleSize</code>, so dass einige Vorlagen nicht expandiert wurden.",
 	"post-expand-template-argument-category-desc": "Die Seite ist nach dem Expandieren eines Vorlagenargumentes größer als <code>$wgMaxArticleSize</code> (etwas in dreifachen Klammern, wie <code>{{{Foo}}}</code>).",
 	"expensive-parserfunction-category-desc": "Die Seite verwendet zu viele aufwändige Parserfunktionen (wie <code>#ifexist</code>). Siehe das [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Benutzerhandbuch].",
@@ -2041,7 +2043,7 @@
 	"sp-contributions-logs": "Logbücher",
 	"sp-contributions-talk": "Diskussion",
 	"sp-contributions-userrights": "Benutzerrechte­verwaltung",
-	"sp-contributions-blocked-notice": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} ist derzeit gesperrt. Es folgt der aktuelle Eintrag aus dem Benutzersperr-Logbuch:",
+	"sp-contributions-blocked-notice": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin}} ist derzeit gesperrt. Es folgt der aktuelle Eintrag aus dem Benutzersperr-Logbuch:",
 	"sp-contributions-blocked-notice-anon": "Diese IP-Adresse ist zurzeit gesperrt.\nZur Information folgt der aktuelle Auszug aus dem Sperr-Logbuch:",
 	"sp-contributions-search": "Suche nach Benutzerbeiträgen",
 	"sp-contributions-username": "IP-Adresse oder Benutzername:",
@@ -2137,8 +2139,8 @@
 	"emaillink": "E-Mail senden",
 	"autoblocker": "Automatische Sperre, da du eine gemeinsame IP-Adresse mit [[User:$1|$1]] benutzt.\nGrund der Benutzersperre: „$2“",
 	"blocklogpage": "Benutzersperr-Logbuch",
-	"blocklog-showlog": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} wurde schon früher gesperrt. Es folgt der Eintrag aus dem Benutzersperr-Logbuch:",
-	"blocklog-showsuppresslog": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin|Dieser Benutzer}} wurde schon früher gesperrt und versteckt.\nEs folgt der Eintrag aus dem Unterdrückungs-Logbuch:",
+	"blocklog-showlog": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin}} wurde schon früher gesperrt. Es folgt der Eintrag aus dem Benutzersperr-Logbuch:",
+	"blocklog-showsuppresslog": "{{GENDER:$1|Dieser Benutzer|Diese Benutzerin}} wurde schon früher gesperrt und versteckt.\nEs folgt der Eintrag aus dem Unterdrückungs-Logbuch:",
 	"blocklogentry": "sperrte „[[$1]]“ für den Zeitraum: $2 $3",
 	"reblock-logentry": "änderte die Sperre von „[[$1]]“ für den Zeitraum: $2 $3",
 	"blocklogtext": "Dies ist das Logbuch über Sperrungen und Entsperrungen von Benutzern und IP-Adressen.\nAutomatisch gesperrte IP-Adressen werden nicht erfasst.\nSiehe die [[Special:BlockList|Liste der gesperrten IP-Adressen und Benutzernamen]] für alle aktiven Sperren.",
@@ -2392,7 +2394,7 @@
 	"tooltip-ca-nstab-main": "Seiteninhalt anzeigen",
 	"tooltip-ca-nstab-user": "Benutzerseite anzeigen",
 	"tooltip-ca-nstab-media": "Mediendateienseite anzeigen",
-	"tooltip-ca-nstab-special": "Dies ist eine Spezialseite. Sie kann nicht bearbeitet werden.",
+	"tooltip-ca-nstab-special": "Dies ist eine Spezialseite und kann nicht bearbeitet werden.",
 	"tooltip-ca-nstab-project": "Portalseite anzeigen",
 	"tooltip-ca-nstab-image": "Dateiseite anzeigen",
 	"tooltip-ca-nstab-mediawiki": "MediaWiki-Systemtext anzeigen",
@@ -2430,7 +2432,7 @@
 	"group-sysop.js": "/* Das folgende JavaScript wird nur für Administratoren geladen. */",
 	"group-bureaucrat.js": "/* Das folgende JavaScript wird nur für Bürokraten geladen. */",
 	"anonymous": "{{PLURAL:$1|Unangemeldeter Benutzer|Unangemeldete Benutzer}} auf {{SITENAME}}",
-	"siteuser": "{{SITENAME}}-{{GENDER:$2|Benutzer|Benutzerin|Benutzer}} $1",
+	"siteuser": "{{SITENAME}}-{{GENDER:$2|Benutzer|Benutzerin}} $1",
 	"anonuser": "Anonymer {{SITENAME}}-Benutzer $1",
 	"lastmodifiedatby": "Diese Seite wurde zuletzt am $1 um $2 Uhr von $3 geändert.",
 	"othercontribs": "Basierend auf der Arbeit von $1.",
diff --git a/languages/i18n/dty.json b/languages/i18n/dty.json
index 6eedb8cb1f..df6515dfc9 100644
--- a/languages/i18n/dty.json
+++ b/languages/i18n/dty.json
@@ -338,6 +338,11 @@
 	"viewyourtext": "यै पानामी रह्याका '''तमरा सम्पादनहरू''' हेद्द या प्रतिलिपी गद्द सक्द्या हौ :",
 	"editinginterface": "<strong>चेतावनी:</strong> तमी यै पानालाई सम्पादन गद्द लाग्याछौ, जनले सफ्टवेयरको लागि \nइन्टरफेस सामग्रीहरू प्रदान गरन्छ।\nयै पानामी गरियाको परिवर्तनले यै विकिमी अरु प्रयोगकर्तानको इन्टरफेसको प्रदर्शनमी प्रभाव पडन्छ ।",
 	"namespaceprotected": "तमलाई '''$1'''  नेमस्पेसमी रह्याका पानाहरू सम्पादन गद्या अनुमति छैन ।",
+	"customcssprotected": "तमलाई यो  पानो सम्पादन गद्दे अनुमति छैन, किनकी यैमी कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
+	"customjsprotected": "तमलाई यो जाभास्कृप्ट पानो सम्पादन गद्दे अनुमति छैन, किनकी यैमी कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
+	"ns-specialprotected": "विशेष पृष्ठहरू सम्पादन अद्दु नाइँ सकिनो।",
+	"titleprotected": "[[User:$1|$1]]द्वारा ये शीर्षक निर्माणहुनबठे जोगाइया छ।\nकारण \"<em>$2</em>\" हो ।",
+	"filereadonlyerror": "फाइल \"$1\" लाई परिवर्तन अद्दु नाइँ सकिनो क्याईकि फाइल भण्डार  \"$2\" केवल पढ्ने स्थिति (read-only mode)मी छ।\n\nयेलाई सुरक्षित गर्ने प्रवन्धकले  यो कारण दियाकाछन् : ''$3''।",
 	"exception-nologin": "प्रवेश (लग ईन) नगरिएको",
 	"virus-scanfailed": "जँचाई असफल(कोड $1)",
 	"virus-unknownscanner": "थानभया एन्टीभाइरस:",
@@ -507,7 +512,7 @@
 	"loginreqpagetext": "अरु पाना हेद्द तमले $1 गद्दु पडन्छ ।",
 	"accmailtitle": "पासवर्ड पठाइयो",
 	"newarticle": "(नयाँ)",
-	"newarticletext": "तमले ऐलसम्म नभयाका पानाको लिंङ्क पहिल्याउनु भयाको छ।\nयो पानो बनौनाखी तल्तिरको कोष्ठमा टाइप गरिदिय ।(और जाण्णाखीलेखा [$1 help page] हेरिदिय )।\nताखाइ सुधिसार आइपुग्या हौ भण्या, ब्राउजरको  '''back''' बटन थिचिहाल ।",
+	"newarticletext": "तमले अहिलसम्म नभयाका पानाको लिंङ्क पहिल्यायाका छौ ।\nयो पानो बनौनाखी तल्तिरको कोष्ठमी टाइप गरि । (और जाण्णाखीलेखा [$1 help page] हेर )।\nताखाइ सुधिसार आइपुग्या हौ भण्या, ब्राउजरको  '''back''' बटन थिचिहाल ।",
 	"anontalkpagetext": "----''यो कुरडी पानो अज्ञात प्रयोगकर्ताको हो जनले अहिलसम्म खाता बनायाकै छैन, अथवा जनले यै पानाको उपयोग गर्दैन।\nयस कारण हामीले उनलाई उनरो आइ पी (IP) ठेगानाले चिन्न सकन्छौ। \nयस्तो आइ पी (IP) ठेगाना धेरै प्रयोगकर्तानको साझा हुनसकन्छ ।\nयदि तमी अज्ञात प्रयोगकर्ता हौ र तमलाई अचाहिँदो टिप्पणी भयाको अनुभव गद्दा छौ भण्या भविष्यमी अन्य अज्ञात प्रयोगकर्तासँगको भ्रमबाट बाँच्न कृपया [[Special:UserLogin/signup|खाता खोल]] अथवा [[Special:UserLogin|प्रवेश गर]] ''",
 	"noarticletext": "यै लेखमी अहिल क्यै पन पाठ नाइथी  ।\nतमले और पृष्ठमी\n[[Special:Search/{{PAGENAME}}|यस पृष्ठको शीर्षककी लेखा खोज]] गद्द सकन्छौ ।\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} पाना सम्बन्धित ढड्डामी खोज],\nवा [{{fullurl:{{FULLPAGENAME}}|action=edit}}  यै पानालाई सम्पादन गद्या]</span>.",
 	"noarticletext-nopermission": "यै लेखमी अहिल केइ पन पाठ नाइथी  ।\nतमले और पानामी\n[[Special:Search/{{PAGENAME}}|यै पानाको शीर्षककी लेखा खोज]] गद्द सकन्छौ ।\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} पाना सम्बन्धित ढड्डामी खोज्न],\nवा [{{fullurl:{{FULLPAGENAME}}|action=edit}}  यै पानालाई सम्पादन गद्द] सकन्छौ</span>.",
@@ -701,6 +706,7 @@
 	"powersearch-togglelabel": "जाँच्ने :",
 	"powersearch-toggleall": "सबै",
 	"powersearch-togglenone": "कोइ लै होइनन",
+	"powersearch-remember": "चयन गर्याकोलाई भविष्यमी गरिन्या खोजहरूमी सम्झन्या",
 	"search-external": "भाइरका खोज",
 	"searchdisabled": "{{SITENAME}} खोज निस्क्रिय पारियाको छ ।\nअहिल तमी गूगलद्वारा खोज्न सकन्छौ ।\nयाद गर्या उनीहरूको {{SITENAME}}को सूची सामग्री पुरानो भयाको हुनसकन्छ ।",
 	"preferences": "मेरी रोजाई",
@@ -748,6 +754,7 @@
 	"timezoneregion-australia": "अष्ट्रेलिया",
 	"timezoneregion-indian": "हिन्द महासागर",
 	"prefs-files": "फाइलहरू",
+	"prefs-help-signature": "कुरडी पानाका टिप्पणीहरू \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपडन्छ ,त्यो पछि तमरो दस्तखत र समयरेखामी रुपान्तरित हुनेछ ।",
 	"badsiglength": "तमरो दस्तखत मैथै लामो छ।\nयो $1 {{PLURAL:$1|अक्षर|अक्षरहरू}} भन्दा लामो हुनु हुँदैन ।",
 	"prefs-help-realname": "वास्तविक नाम ऐच्छिक हो ।\nतमीले खुलायौ भण्या तमरो कामको श्रेय दिनको लेखा यैको प्रयोग गरिन्या छ ।",
 	"prefs-help-prefershttps": "यो रोजाई तमरो अर्को  लग इन बठे लागु हुन्याछ ।",
@@ -1005,6 +1012,8 @@
 	"movenologintext": "पानाको नाम बदल्नको लागि तमी दर्ता गरियाको र [[Special:UserLogin|लगइन गर्याको]] प्रयोगकर्ता हुनुपडन्छ ।",
 	"cant-move-user-page": "तमसँग प्रयोगकर्ता पानाहरू साद्या अनुमती नाइथिन् (सहपानाहरू बाहेक)",
 	"cant-move-to-user-page": "तमसँग पानाहरूलाई प्रयोगकर्ता पानामी साद्या अनुमती नाइथिन् (प्रयोगकर्ता सहपृष्ठहरूमी बाहेक)",
+	"cant-move-category-page": "तमलाईं श्रेणीको पानाहरू साद्य अनुमति छैन ।",
+	"cant-move-to-category-page": "कुनै श्रेणी पानामी साद्दको लागी तमलाई अनुमति छैन ।",
 	"cantmove-titleprotected": "तमी यै ठौरमी पानो साद्द सक्दाइनौ, किनकी यो नौलो शिर्षकलाई सिर्जना हुनबठे जगाइयाको छ",
 	"move-subpages": "उप पानाहरू सार्न्या($1 सम्मको)",
 	"move-talk-subpages": "कुरडी पानाको सह-पानाहरू साद्य($1 सम्मको )",
@@ -1020,6 +1029,8 @@
 	"thumbnail-more": "ठूलो बनौन्या",
 	"import-interwiki-history": "यै पामैकोलागि सबै इतिहास संशोधनहरू प्रतिलिपि गद्या",
 	"import-noarticle": "आयात गद्दाकी लाई पानाहरू नाइथिन्",
+	"import-error-edit": "तमलाई सम्पादन गद्या अनुमति नभयाको पानो \"$1\" आयात गरिएन ।",
+	"import-error-create": "तमलाई नयाँ बनाउने अनुमति नभयाको पानो \"$1\" आयात गरिएन ।",
 	"import-logentry-upload-detail": "$1 {{PLURAL:$1|संशोधन|संशोधनहरू}} आयात भयो",
 	"tooltip-pt-userpage": "तमरो प्रयोगकर्ता पानो",
 	"tooltip-pt-anonuserpage": "तमी जो IP ठेगानाको रुपमी सम्पादन गद्दै छौ , त्यैको प्रयोगकर्ता पानो निम्न छ :",
@@ -1059,7 +1070,7 @@
 	"tooltip-t-permalink": "पृष्ठको यो पुनरावलोकनकि लेखा स्थाई लिङ्क",
 	"tooltip-ca-nstab-main": "सामाग्री पानो हेरिदिय",
 	"tooltip-ca-nstab-user": "प्रयोगकर्ता पानो हेरिदिय",
-	"tooltip-ca-nstab-special": "यो खास पानो हो , तमलाईँ आफै सम्पादन गद्द सकन्छौ",
+	"tooltip-ca-nstab-special": "यो खास पानो हो ,तमी यैलाई आफै सम्पादन गद्द सक्दाइन",
 	"tooltip-ca-nstab-project": "आयोजना पानो हेरिदिय",
 	"tooltip-ca-nstab-image": "चित्र पानो हेर",
 	"tooltip-ca-nstab-template": "टेम्प्लेट(नमूना) हेरिदिय",
@@ -1130,7 +1141,7 @@
 	"watchlistedit-clear-explain": "तमरा ध्यान सूचीबठे सम्पूर्ण पाना हटाइया",
 	"watchlistedit-clear-done": "तमरो ध्यान सूची खाली गरीयाको छ।",
 	"watchlisttools-view": "आधारित फेरबदलीहरू हेर",
-	"signature": "[[{{ns:प्रयोगकर्ता}}:$1|$2]][[{{ns:प्रयोगकर्ता_कुरडी}}:$1|कुरडी]]",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|कुरडी]])",
 	"specialpages": "खास पानो",
 	"specialpages-note": "* साधारण खास पानाहरू।\n* <span class=\"mw-specialpagerestricted\">निषेधित खास पानाहरू।</span>",
 	"specialpages-group-changes": "अल्लैका परिवर्तन लगहरू",
diff --git a/languages/i18n/egl.json b/languages/i18n/egl.json
index 9b109f5730..6c2ff8acb5 100644
--- a/languages/i18n/egl.json
+++ b/languages/i18n/egl.json
@@ -337,7 +337,7 @@
 	"actionthrottledtext": "Cme mişûra 'd sicurèsa cûnt'r al spam soquânti operasiòun a vînen limitêdi a 'n nómer mâsim ed vôlti in un precîş peréiod ed tèimp, in cól chêş ché a s'é bèle andê d'ed là 'd cól lémit. A se dmânda ed turnêr a pruvêr tra soquânt minût.",
 	"protectedpagetext": "Cla pàgina ché l'é stêda prutèta per impidîr la mudéfica o êtri operasiòun.",
 	"viewsourcetext": "L'é pusébil vèder e cupiêr al côdis surzéia ed cla pàgina ché.",
-	"viewyourtext": "L'é pusébil vèder e cupiêr al côdis surzéia dal \"tō mudéfichi\" ed cla pàgina ché:",
+	"viewyourtext": "L'é pusébil vèder e cupiêr al côdis surzéia dal <strong>tō mudéfichi</strong> ed cla pàgina ché.",
 	"protectedinterface": "Cla pàgina ché la gh'à 'n elemèint ch' al fa pêrt dal colegamèint tra utèint e al progrâma 'd cól sît ché e l'é prutèta per schivşêr pusébil abûş. Per zuntêr o mudufichêr tradusiòun per tót i sistēma wiki druvêr [//translatewiki.net/ translatewiki.net], al prugèt 'd adatamèint a ògni léngva 'd MediaWiki.",
 	"editinginterface": "<strong>Atèinti:</strong> Al tèst ed cla pàgina ché 'l fa pêrt dal colegamèint tra utèint e 'l prugrâma dal sît.  Tót' al modéfichi fâti a cla pàgina ché a se spècen in sém a i mesâg vést per tót j utèint ed cól wiki ché.",
 	"translateinterface": "Per zuntêr o mudifichêr al tradusiòun vâlidi in sém a tót i wiki, drōva [//translatewiki.net/ translatewiki.net], al prugèt Media Wiki p'r al léngui di divêrs pôst.",
diff --git a/languages/i18n/el.json b/languages/i18n/el.json
index f4fdf48ea9..2f58c02f92 100644
--- a/languages/i18n/el.json
+++ b/languages/i18n/el.json
@@ -278,7 +278,7 @@
 	"privacypage": "Project:Πολιτική ιδιωτικού απορρήτου",
 	"badaccess": "Σφάλμα άδειας",
 	"badaccess-group0": "Δεν επιτρέπεται να εκτελέσετε την ενέργεια που ζητήσατε.",
-	"badaccess-groups": "Η ενέργεια που ζητήσατε είναι περιορισμένη σε χρήστες που ανήκουν {{PLURAL:$2|στην ομάδα|σε μία από τις ομάδες}}: $1.",
+	"badaccess-groups": "Η ενέργεια που ζητήσατε περιορίζεται σε χρήστες που ανήκουν {{PLURAL:$2|στην ομάδα|σε μία από τις ομάδες}}: $1.",
 	"versionrequired": "Απαιτείται η έκδοση $1 του MediaWiki.",
 	"versionrequiredtext": "Για να χρησιμοποιήσετε αυτή τη σελίδα απαιτείται η έκδοση $1 του MediaWiki. Βλ. [[Special:Version|σελίδα έκδοσης]]",
 	"ok": "Εντάξει",
@@ -682,7 +682,7 @@
 	"sectioneditnotsupported-text": "Δεν υποστηρίζετε η επεξεργασία τομέα σε αυτήν τη σελίδα.",
 	"permissionserrors": "Σφάλμα  άδειας",
 	"permissionserrorstext": "Δεν έχετε άδεια να το κάνετε αυτό, για {{PLURAL:$1|τον εξής λόγο|τους εξής λόγους}}:",
-	"permissionserrorstext-withaction": "Δεν έχετε άδεια να $2, για {{PLURAL:$1|τον ακόλουθο λόγο|τους ακόλουθους λόγους}}:",
+	"permissionserrorstext-withaction": "Δεν έχετε την άδεια να $2, για {{PLURAL:$1|τον ακόλουθο λόγο|τους ακόλουθους λόγους}}:",
 	"recreate-moveddeleted-warn": "'''Προειδοποίηση: Ξαναδημιουργείτε μια σελίδα που είχε προηγουμένως διαγραφεί.'''\n\nΘα πρέπει να σκεφτείτε σοβαρά αν είναι σωστό να συνεχίσετε να επεξεργάζεστε αυτή τη σελίδα.\nΟι καταγραφές διαγραφών και μετακινήσεων παρέχονται εδώ για διευκόλυνση:",
 	"moveddeleted-notice": "Αυτή η σελίδα έχει διαγραφεί.\nΤο αρχείο καταγραφών διαγραφών και μετακινήσεων της σελίδας παρέχεται παρακάτω για αναφορά.",
 	"log-fulllog": "Εμφάνιση πλήρους αρχείου",
@@ -952,7 +952,8 @@
 	"rows": "Σειρές",
 	"columns": "Στήλες",
 	"searchresultshead": "Αποτελέσματα αναζήτησης/Ρυθμίσεις",
-	"stub-threshold": "Κατώφλι για μορφοποίηση <span class=\"mw-stub-example\">συνδέσμου επεκτάσιμου</span>:",
+	"stub-threshold": "Κατώφλι για μορφοποίηση ως επεκτάσιμου ($1):",
+	"stub-threshold-sample-link": "δείγμα",
 	"stub-threshold-disabled": "Απενεργοποιημένο",
 	"recentchangesdays": "Ημέρες προς εμφάνιση στις πρόσφατες αλλαγές:",
 	"recentchangesdays-max": "($1 {{PLURAL:$1|ημέρα|ημέρες}} το μέγιστο)",
@@ -1408,6 +1409,7 @@
 	"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! Δεν μπορεί να ελεγχθεί  δεόντως ως προς την ασφάλεια.",
@@ -1563,6 +1565,8 @@
 	"pageswithprop-text": "Αυτή η σελίδα ταξινομεί σελίδες που χρησιμοποιούν μια συγκεκριμένη ιδιότητα σελίδας.",
 	"pageswithprop-prop": "Όνομα ιδιότητας:",
 	"pageswithprop-submit": "Μετάβαση",
+	"pageswithprop-prophidden-long": "τιμή ιδιότητας μακρού κειμένου κρυμμένη ($1)",
+	"pageswithprop-prophidden-binary": "τιμή ιδιότητας δυαδικών δεδομένων κρυμμένη ($1)",
 	"doubleredirects": "Διπλές ανακατευθύνσεις",
 	"doubleredirectstext": "Αυτή η σελίδα καταγράφει σελίδες οι οποίες ανακατευθύνουν σε άλλες σελίδες ανακατεύθυνσης. \nΚάθε σειρά περιέχει συνδέσμους προς την πρώτη και τη δεύτερη ανακατεύθυνση, όπως επίσης και προς τον προορισμό της δεύτερης ανακατεύθυνσης, η οποία και είναι συνήθως η «πραγματική» σελίδα προορισμού στην οποία πρέπει να δείχνει η πρώτη ανακατεύθυνση. \nΤα <del>διαγεγραμμένα</del> λήμματα έχουν επιλυθεί.",
 	"double-redirect-fixed-move": "Η [[$1]] έχει μετακινηθεί.\nΕνημερώθηκε αυτόματα και τώρα είναι ανακατεύθυνση στην [[$2]].",
@@ -1666,7 +1670,7 @@
 	"booksources-text": "Παρακάτω είναι μια λίστα συνδέσμων σε άλλους ιστοτόπους οι οποίοι πωλούν νέα και μεταχειρισμένα βιβλία, και μπορεί επίσης να έχουν περισσότερες πληροφορίες για βιβλία για τα οποία ψάχνετε:",
 	"booksources-invalid-isbn": "Το δοσμένο ISBN δεν φαίνεται να είναι έγκυρο· ελέγξτε για λάθη κατά την αντιγραφή από την αρχική πηγή.",
 	"specialloguserlabel": "",
-	"speciallogtitlelabel": "Στόχος (τίτλος ή χρήστης):",
+	"speciallogtitlelabel": "Στόχος (τίτλος ή {{ns:user}}:χρήστης για χρήστη):",
 	"log": "Αρχεία καταγραφών",
 	"all-logs-page": "Όλες οι δημόσιες καταγραφές γεγονότων",
 	"alllogstext": "Εποπτική εμφάνιση όλων των ενεργειών φόρτωσης αρχείων, διαγραφής, προστασίας, φραγής και όλων των καταγραφών των διαχειριστών στο αρχείο γεγονότων του {{SITENAME}}. Μπορείτε να περιορίσετε τα αποτελέσματα που εμφανίζονται επιλέγοντας συγκεκριμένο είδος γεγονότων, όνομα χρήστη ή τη σελίδα που επηρεάστηκε.",
@@ -1860,9 +1864,14 @@
 	"rollback-success": "Ανεστραμμένες εκδόσεις από $1, αλλάχθηκαν στην προηγούμενη έκδοση από $2.",
 	"sessionfailure-title": "Η συνεδρία απέτυχε",
 	"sessionfailure": "Υπάρχει πρόβλημα με τη σύνδεσή σας -η ενέργεια αυτή ακυρώθηκε προληπτικά για την αντιμετώπιση τυχόν πειρατείας συνόδου (session hijacking). Παρακαλoύμε πατήστε \"Επιστροφή\", ξαναφορτώστε τη σελίδα από την οποία φθάσατε εδώ και προσπαθήστε ξανά.",
+	"changecontentmodel": "Αλλαγή μοντέλου περιεχομένου της σελίδας",
+	"changecontentmodel-legend": "Μοντέλο περιεχομένου σελίδας",
 	"changecontentmodel-title-label": "Τίτλος σελίδας",
+	"changecontentmodel-model-label": "Νέο μοντέλο περιεχομένου",
 	"changecontentmodel-reason-label": "Αιτία:",
 	"logentry-contentmodel-change": "{{GENDER:$2|Ο|Η}} $1 άλλαξε το πρότυπο περιεχομένου της σελίδας $3 από «$4» σε «$5»",
+	"logentry-contentmodel-change-revertlink": "αναστροφή",
+	"logentry-contentmodel-change-revert": "αναστροφή",
 	"protectlogpage": "Αρχείο καταγραφών προστασίας",
 	"protectlogtext": "Παρακάτω είναι μια λίστα αλλαγών που έγιναν στις ρυθμίσεις προστασίας.\nΡίξτε μια ματιά στη [[Special:ProtectedPages|λίστα προστατευμένων σελίδων]] για ένα κατάλογο των τρεχουσών ρυθμίσεων προστασίας σελίδων.",
 	"protectedarticle": "προστάτευσε τη σελίδα «[[$1]]»",
@@ -1925,7 +1934,7 @@
 	"undeletepagetext": "{{PLURAL:$1|Η σελίδα που ακολουθεί έχει|$1 Οι σελίδες που ακολουθούν έχουν}} διαγραφεί αλλά {{PLURAL:βρίσκεται|βρίσκονται}} ακόμα {{PLURAL:αποθηκευμένη|αποθηκευμένες}} στο αρχείο και {{PLURAL:μπορεί να αποκατασταθεί|μπορούν να αποκατασταθούν}}. Κατά καιρούς γίνεται εκκαθάριση του αρχείου.",
 	"undelete-fieldset-title": "Αποκατάσταση αναθεωρήσεων",
 	"undeleteextrahelp": "Για να επαναφέρετε ολόκληρο το ιστορικό της σελίδας, μην επιλέγετε κανένα πλαίσιο ελέγχου και κάντε κλικ στο '''''{{int:undeletebtn}}'''''.\nΓια να κάνετε μια προσαρμοσμένη επαναφορά, επιλέξτε τα πλαίσια που αντιστοιχούν στις αναθεωρήσεις που πρόκειται να επαναφερθούν και κάντε κλικ στο '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "$1 {{PLURAL:$1|τροποποίηση|τροποποιήσεις}} αρχειοθετήθηκαν.",
+	"undeleterevisions": "$1 {{PLURAL:$1|τροποποίηση αρχειοθετήθηκε|τροποποιήσεις αρχειοθετήθηκαν}}.",
 	"undeletehistory": "Αν επαναφέρετε την σελίδα, όλες οι εκδόσεις θα επαναφερθούν στο ιστορικό.\n\nΑν μια νέα σελίδα με το ίδιο όνομα δημιουργήθηκε μετά την διαγραφή, οι επαναφερμένες εκδόσεις θα εμφανιστούν στο πρότερο ιστορικό.",
 	"undeleterevdel": "Η επαναφορά δεν θα εκτελεστεί αν θα έχει ως αποτέλεσμα η πιο πρόσφατη έκδοση της σελίδας ή αρχείου να είναι διαγεγραμμένη μερικώς. Σε τέτοιες περιπτώσεις, πρέπει να αποεπιλέξετε ή να εμφανίσετε την νεότερη διαγεγραμμένη έκδοση.",
 	"undeletehistorynoadmin": "Αυτό το άρθρο έχει διαγραφεί. Ο λόγος για τη διαγραφή φαίνεται\nστη σύνοψη παρακάτω, μαζί με λεπτομέρειες των χρηστών που επεξεργάστηκαν τη σελίδα\nπριν τη διαγραφή. Το αρχικό κείμενο αυτών των διεγραμμένων αναθεωρήσεων είναι διαθέσιμο μόνο στους διαχειριστές.",
@@ -2108,6 +2117,7 @@
 	"proxyblockreason": "Η διεύθυνση IP σας έχει υποστεί φραγή γιατί είναι open proxy. Παρακαλούμε επικοινωνείστε με τον παροχέα υπηρεσιών Διαδικτύου που χρησιμοποιείτε ή με την τεχνική υποστήριξη, για να θέσετε υπ΄ όψη τους αυτό το σοβαρό θέμα ασφάλειας.",
 	"sorbsreason": "Η διεύθυνση IP σας έχει χαρακτηρισθεί ως open proxy στο DNSBL.",
 	"sorbs_create_account_reason": "Η διεύθυνση IP σας έχει χαρακτηρισθεί open proxy στο DNSBL. Δεν μπορείτε να δημιουργήσετε λογαριασμό χρήστη.",
+	"xffblockreason": "Μια διεύθυνση IP που υπάρχει στο X-Forwarded-For header, είτε τη δική σας ή του διακομιστή μεσολάβησης που χρησιμοποιείτε, έχει φραγεί. Ο αρχικός λόγος φραγής ήταν: $1",
 	"cant-see-hidden-user": "Ο χρήστης που προσπαθείτε να αποκλείσετε έχει ήδη αποκλειστεί και αποκρυφτεί.\nΔεδομένου ότι δεν έχετε το δικαίωμα hideuser, δεν μπορείτε να δείτε ή να επεξεργαστείτε την φραγή του χρήστη.",
 	"ipbblocked": "Δεν μπορείτε να βάλετε ή να αναιρέσετε φραγή σε άλλους χρήστες, επειδή είστε εσείς υπό φραγή",
 	"ipbnounblockself": "Δεν έχετε το δικαίωμα να βγάλετε την φραγή από τον εαυτό σας",
@@ -2331,7 +2341,7 @@
 	"tooltip-ca-nstab-main": "Προβολή σελίδας περιεχομένου",
 	"tooltip-ca-nstab-user": "Προβολή της σελίδας χρήστη",
 	"tooltip-ca-nstab-media": "Δείτε τη σελίδα πολυμέσων",
-	"tooltip-ca-nstab-special": "Αυτή είναι ειδική σελίδα, δεν μπορείτε να επεξεργαστείτε την ίδια τη σελίδα",
+	"tooltip-ca-nstab-special": "Αυτή είναι μια ειδική σελίδα, και δεν μπορεί να επεξεργαστεί",
 	"tooltip-ca-nstab-project": "Προβολή της σελίδας εγχειρήματος",
 	"tooltip-ca-nstab-image": "Προβολή της σελίδας αρχείου",
 	"tooltip-ca-nstab-mediawiki": "Δείτε το μήνυμα του συστήματος",
@@ -2373,7 +2383,7 @@
 	"spam_blanking": "Όλες οι αναθεωρήσεις περιείχαν συνδέσμους προς το $1, εξάλειψη",
 	"spam_deleting": "Διαγραφή όλων των αναθεωρήσεων που περιείχαν συνδέσμους προς το $1",
 	"simpleantispam-label": "Έλεγχος για spam.\n<strong>Μην</strong> το συμπληρώσετε αυτό!",
-	"pageinfo-title": "Πληροφορίες για \"$1\"",
+	"pageinfo-title": "Πληροφορίες για «$1»",
 	"pageinfo-not-current": "Μας συγχωρείτε, είναι αδύνατο να παράσχουμε αυτή την πληροφορία για παλιές αναθεωρήσεις.",
 	"pageinfo-header-basic": "Βασικές πληροφορίες",
 	"pageinfo-header-edits": "Ιστορικό επεξεργασίας",
@@ -2389,7 +2399,9 @@
 	"pageinfo-robot-index": "Επιτρεπτό",
 	"pageinfo-robot-noindex": "Μη επιτρεπτό",
 	"pageinfo-watchers": "Αριθμός παρατηρητών σελίδας",
+	"pageinfo-visiting-watchers": "Αριθμός παρατηρητών σελίδας που επισκέφθηκαν τις πρόσφατες αλλαγές",
 	"pageinfo-few-watchers": "Λιγότεροι από $1 {{PLURAL:$1| ακόλουθος|ακόλουθοι}}",
+	"pageinfo-few-visiting-watchers": "Μπορεί να υπάρχουν ή να μην υπάρχει χρήστης που παρακολουθεί και επισκέπτεται τις πρόσφατες αλλαγές",
 	"pageinfo-redirects-name": "Αριθμός ανακατευθύνσεων σε αυτήν τη σελίδα",
 	"pageinfo-redirects-value": "$1",
 	"pageinfo-subpages-name": "Υποσελίδες αυτής της σελίδας",
@@ -2404,12 +2416,12 @@
 	"pageinfo-recent-authors": "Πρόσφατος αριθμός μοναδικών συντακτών",
 	"pageinfo-magic-words": "{{PLURAL:$1|Μαγική λέξη|Μαγικές λέξεις}} ($1)",
 	"pageinfo-hidden-categories": "{{PLURAL:$1|Κρυφή κατηγορία|Κρυφές κατηγορίες}} ($1)",
-	"pageinfo-templates": "Ενσωματωμένα {{PLURAL:$1|πρότυπο|πρότυπα}} ($1)",
-	"pageinfo-transclusions": "{{PLURAL:$1|Η σελίδα ενσωματώνεται|Οι σελίδες ενσωματώνονται}} σε ($1)",
+	"pageinfo-templates": "{{PLURAL:$1|Ενσωματωμένο πρότυπο|Ενσωματωμένα πρότυπα}} ($1)",
+	"pageinfo-transclusions": "{{PLURAL:$1|Σελίδα στην οποία|Σελίδες στις οποίες}} ενσωματώνεται ($1)",
 	"pageinfo-toolboxlink": "Πληροφορίες σελίδας",
-	"pageinfo-redirectsto": "Ανακατευθύνσεις σε",
+	"pageinfo-redirectsto": "Ανακατευθύνει σε",
 	"pageinfo-redirectsto-info": "πληροφορίες",
-	"pageinfo-contentpage": "Υπολογίζονται ως σελίδες περιεχομένου",
+	"pageinfo-contentpage": "Καταμετράται ως σελίδα περιεχομένου",
 	"pageinfo-contentpage-yes": "Ναι",
 	"pageinfo-protect-cascading": "Οι προστασίες ξεκινούν τη διαδοχή τους από εδώ",
 	"pageinfo-protect-cascading-yes": "Ναι",
@@ -2433,6 +2445,7 @@
 	"patrol-log-page": "Αρχείο καταγραφής περιπολιών",
 	"patrol-log-header": "Αυτός είναι ένας κατάλογος περιπολούμενων αναθεωρήσεων.",
 	"log-show-hide-patrol": "$1 καταγραφή επιτήρησης",
+	"log-show-hide-tag": "$1 ετικέττα καταγραφής",
 	"deletedrevision": "Η παλιά έκδοση της $1 διαγράφτηκε",
 	"filedeleteerror-short": "Σφάλμα κατά τη διαγραφή του αρχείου: $1",
 	"filedeleteerror-long": "Αντιμετωπίστηκαν προβλήματα κατά τη διαγραφή του αρχείου:\n\n$1",
@@ -2971,6 +2984,7 @@
 	"version-libraries-version": "Έκδοση",
 	"version-libraries-license": "Άδεια χρήσης",
 	"version-libraries-description": "Περιγραφή",
+	"version-libraries-authors": "Δημιουργοί",
 	"redirect": "Ανακατεύθυνση κατά αρχείο, χρήστη, σελίδα ή αναγνωριστικό αναθεώρησης",
 	"redirect-legend": "Ανακατεύθυνση σε ένα αρχείο ή μια σελίδα",
 	"redirect-submit": "Μετάβαση",
@@ -3199,6 +3213,7 @@
 	"feedback-termsofuse": "Συμφωνώ να παρέχω παρατηρήσεις σύμφωνα με τους Όρους Χρήσης.",
 	"feedback-thanks": "Ευχαριστούμε! Τα σχόλιά σας έχουν καταχωρηθεί στη σελίδα \"[$2 $1]\".",
 	"feedback-thanks-title": "Σας ευχαριστούμε!",
+	"feedback-useragent": "User agent:",
 	"searchsuggest-search": "Αναζήτηση",
 	"searchsuggest-containing": "περιέχει...",
 	"api-error-badaccess-groups": "Δεν επιτρέπεται να ανεβάσετε αρχεία σε αυτό το wiki.",
@@ -3338,7 +3353,9 @@
 	"special-characters-title-endash": "παύλα",
 	"special-characters-title-emdash": "διπλή παύλα",
 	"special-characters-title-minus": "σύμβολο πλην",
+	"mw-widgets-dateinput-no-date": "Καμία ημερομηνία δεν επιλέχθηκε",
 	"mw-widgets-dateinput-placeholder-day": "ΕΕΕΕ-ΜΜ-ΗΗ",
 	"mw-widgets-dateinput-placeholder-month": "ΕΕΕΕ-ΜΜ",
+	"mw-widgets-titleinput-description-new-page": "η σελίδα που δεν υπάρχει ακόμα",
 	"mw-widgets-titleinput-description-redirect": "ανακατεύθυνση στο $1"
 }
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index 6c9c8afdd7..58593658b7 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -973,7 +973,8 @@
 	"rows": "Rows:",
 	"columns": "Columns:",
 	"searchresultshead": "Search",
-	"stub-threshold": "Threshold for <a href=\"#\" class=\"stub\">stub link</a> formatting (bytes):",
+	"stub-threshold": "Threshold for stub link formatting ($1):",
+	"stub-threshold-sample-link": "sample",
 	"stub-threshold-disabled": "Disabled",
 	"recentchangesdays": "Days to show in recent changes:",
 	"recentchangesdays-max": "Maximum $1 {{PLURAL:$1|day|days}}",
@@ -1754,7 +1755,7 @@
 	"rfcurl": "//tools.ietf.org/html/rfc$1",
 	"pubmedurl": "//www.ncbi.nlm.nih.gov/pubmed/$1?dopt=Abstract",
 	"specialloguserlabel": "Performer:",
-	"speciallogtitlelabel": "Target (title or user):",
+	"speciallogtitlelabel": "Target (title or {{ns:user}}:username for user):",
 	"log": "Logs",
 	"all-logs-page": "All public logs",
 	"alllogstext": "Combined display of all available logs of {{SITENAME}}.\nYou can narrow down the view by selecting a log type, the username (case-sensitive), or the affected page (also case-sensitive).",
@@ -2534,7 +2535,7 @@
 	"tooltip-ca-nstab-main": "View the content page",
 	"tooltip-ca-nstab-user": "View the user page",
 	"tooltip-ca-nstab-media": "View the media page",
-	"tooltip-ca-nstab-special": "This is a special page, you cannot edit the page itself",
+	"tooltip-ca-nstab-special": "This is a special page, and it cannot be edited",
 	"tooltip-ca-nstab-project": "View the project page",
 	"tooltip-ca-nstab-image": "View the file page",
 	"tooltip-ca-nstab-mediawiki": "View the system message",
diff --git a/languages/i18n/eo.json b/languages/i18n/eo.json
index 6cd6f66f21..e89a289663 100644
--- a/languages/i18n/eo.json
+++ b/languages/i18n/eo.json
@@ -560,7 +560,7 @@
 	"changeemail-oldemail": "Aktuala retpoŝtadreso:",
 	"changeemail-newemail": "Nova retpoŝtadreso:",
 	"changeemail-none": "(nenio)",
-	"changeemail-password": "Via {{SITENAME}}-ensalutado:",
+	"changeemail-password": "Via pasvorto por {{SITENAME}}:",
 	"changeemail-submit": "Ŝanĝi retpoŝtadreson",
 	"changeemail-throttled": "Vi tro ofte provis alsaluti.\nBonvolu atendi $1, antaÅ­ ol vi provos denove.",
 	"resettokens": "Renovigi ŝlosilojn",
@@ -1036,7 +1036,7 @@
 	"userrights-reason": "Kialo:",
 	"userrights-no-interwiki": "Vi ne rajtas redakti uzanto-rajtojn en aliaj vikioj.",
 	"userrights-nodatabase": "Datumbazo $1 ne ekzistas aÅ­ ne estas loka.",
-	"userrights-nologin": "Vi nepre [[Special:UserLogin|ensalutu]] kun administranto-konto doni uzanto-rajtojn.",
+	"userrights-nologin": "Vi devas [[Special:UserLogin|ensaluti]] per administranto-konto por doni uzanto-rajtojn.",
 	"userrights-notallowed": "Via konto ne rajtas doni aÅ­ forigi uzanto-rajtojn.",
 	"userrights-changeable-col": "Grupoj kiujn vi povas ŝanĝi",
 	"userrights-unchangeable-col": "Grupoj kiujn vi ne povas ŝanĝi",
diff --git a/languages/i18n/es.json b/languages/i18n/es.json
index 5456bc5014..47248b6510 100644
--- a/languages/i18n/es.json
+++ b/languages/i18n/es.json
@@ -128,9 +128,9 @@
 		]
 	},
 	"tog-underline": "Subrayar los enlaces:",
-	"tog-hideminor": "Ocultar las ediciones menores en los cambios recientes",
-	"tog-hidepatrolled": "Ocultar las ediciones patrulladas en los cambios recientes",
-	"tog-newpageshidepatrolled": "Ocultar las páginas patrulladas en la lista de páginas nuevas",
+	"tog-hideminor": "Ocultar las ediciones menores de los cambios recientes",
+	"tog-hidepatrolled": "Ocultar las ediciones verificadas de los cambios recientes",
+	"tog-newpageshidepatrolled": "Ocultar las páginas verificadas de la lista de páginas nuevas",
 	"tog-extendwatchlist": "Mostrar todos los cambios en la lista de seguimiento, no solo los más recientes",
 	"tog-usenewrc": "Agrupar los cambios por página en los cambios recientes y en la lista de seguimiento",
 	"tog-numberheadings": "Numerar automáticamente los encabezados",
@@ -154,12 +154,12 @@
 	"tog-fancysig": "Tratar la firma como wikitexto (sin un enlace automático)",
 	"tog-uselivepreview": "Usar previsualización dinámica",
 	"tog-forceeditsummary": "Avisarme cuando grabe la página sin escribir un resumen de edición",
-	"tog-watchlisthideown": "Ocultar mis ediciones en la lista de seguimiento",
-	"tog-watchlisthidebots": "Ocultar las ediciones de bots en la lista de seguimiento",
-	"tog-watchlisthideminor": "Ocultar las ediciones menores en la lista de seguimiento",
-	"tog-watchlisthideliu": "Ocultar las ediciones de los usuarios registrados en la lista de seguimiento",
-	"tog-watchlisthideanons": "Ocultar las ediciones de los usuarios anónimos en la lista de seguimiento",
-	"tog-watchlisthidepatrolled": "Ocultar las ediciones patrulladas en la lista de seguimiento",
+	"tog-watchlisthideown": "Ocultar mis ediciones de la lista de seguimiento",
+	"tog-watchlisthidebots": "Ocultar las ediciones de bots de la lista de seguimiento",
+	"tog-watchlisthideminor": "Ocultar las ediciones menores de la lista de seguimiento",
+	"tog-watchlisthideliu": "Ocultar las ediciones de los usuarios registrados de la lista de seguimiento",
+	"tog-watchlisthideanons": "Ocultar las ediciones de los usuarios anónimos de la lista de seguimiento",
+	"tog-watchlisthidepatrolled": "Ocultar las ediciones verificadas de la lista de seguimiento",
 	"tog-ccmeonemails": "Recibir copias de los correos electrónicos que envíe a otros usuarios",
 	"tog-diffonly": "No mostrar el contenido de la página debajo de la lista de diferencias",
 	"tog-showhiddencats": "Mostrar categorías ocultas",
@@ -881,7 +881,7 @@
 	"revdelete-legend": "Establecer restricciones de visibilidad",
 	"revdelete-hide-text": "Texto de la revisión",
 	"revdelete-hide-image": "Ocultar el contenido del archivo",
-	"revdelete-hide-name": "Ocultar la selección y sus parámetros.",
+	"revdelete-hide-name": "Ocultar la selección y sus parámetros",
 	"revdelete-hide-comment": "Resumen de edición",
 	"revdelete-hide-user": "Nombre/IP del editor",
 	"revdelete-hide-restricted": "Suprimir para todos los usuarios, incluidos administradores",
@@ -1034,7 +1034,8 @@
 	"rows": "Filas:",
 	"columns": "Columnas:",
 	"searchresultshead": "Búsquedas",
-	"stub-threshold": "Límite para cambiar a formato de <a href=\"#\" class=\"stub\">enlace a esbozo</a> (en bytes):",
+	"stub-threshold": "Límite para cambiar a formato de enlace a esbozo ($1):",
+	"stub-threshold-sample-link": "muestra",
 	"stub-threshold-disabled": "Desactivado",
 	"recentchangesdays": "Días que mostrar en los cambios recientes:",
 	"recentchangesdays-max": "Máximo {{PLURAL:$1|un día|$1 días}}",
@@ -1211,7 +1212,7 @@
 	"right-import": "Importar páginas desde otras wikis",
 	"right-importupload": "Importar páginas desde un archivo",
 	"right-patrol": "Marcar ediciones de otros como verificadas",
-	"right-autopatrol": "Tener automáticamente marcadas como verificadas las ediciones propias",
+	"right-autopatrol": "Marcar sus ediciones automáticamente como verificadas",
 	"right-patrolmarks": "Ver las marcas de verificación de cambios recientes",
 	"right-unwatchedpages": "Ver una lista de páginas no vigiladas",
 	"right-mergehistory": "Fusionar historiales de páginas",
@@ -1284,7 +1285,7 @@
 	"recentchanges-label-newpage": "Esta edición creó una página",
 	"recentchanges-label-minor": "Esta es una edición menor",
 	"recentchanges-label-bot": "Esta edición fue realizada por un robot",
-	"recentchanges-label-unpatrolled": "Esta edición todavía no se ha patrullado",
+	"recentchanges-label-unpatrolled": "Esta edición aún no ha sido verificada",
 	"recentchanges-label-plusminus": "El tamaño de la página cambió esta cantidad de bytes",
 	"recentchanges-legend-heading": "'''Leyenda:'''",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (véase también la [[Special:NewPages|lista de páginas nuevas]])",
@@ -1302,7 +1303,7 @@
 	"rcshowhideanons": "$1 usuarios anónimos",
 	"rcshowhideanons-show": "Mostrar",
 	"rcshowhideanons-hide": "Ocultar",
-	"rcshowhidepatr": "$1 ediciones patrulladas",
+	"rcshowhidepatr": "$1 ediciones verificadas",
 	"rcshowhidepatr-show": "Mostrar",
 	"rcshowhidepatr-hide": "Ocultar",
 	"rcshowhidemine": "$1 mis ediciones",
@@ -1751,7 +1752,7 @@
 	"booksources-text": "Abajo hay una lista de enlaces a otros sitios que venden libros nuevos y usados, puede que contengan más información sobre los libros que estás buscando.",
 	"booksources-invalid-isbn": "El número de ISBN no parece ser válido; comprueba los errores copiándolo de la fuente original.",
 	"specialloguserlabel": "Usuario:",
-	"speciallogtitlelabel": "Objetivo (título o usuario):",
+	"speciallogtitlelabel": "Objetivo (título o {{ns:user}}:nombre de usuario):",
 	"log": "Registros",
 	"all-logs-page": "Todos los registros públicos",
 	"alllogstext": "Vista combinada de todos los registros de {{SITENAME}}.\nPuedes filtrar la vista seleccionando un tipo de registro, el nombre del usuario o la página afectada. Se distinguen mayúsculas de minúsculas.",
@@ -2429,7 +2430,7 @@
 	"tooltip-ca-nstab-main": "Ver la página de contenido",
 	"tooltip-ca-nstab-user": "Ver la página del usuario",
 	"tooltip-ca-nstab-media": "Ver la página de multimedia",
-	"tooltip-ca-nstab-special": "Esta es una página especial, no se puede editar la página en sí",
+	"tooltip-ca-nstab-special": "Esta es una página especial, y no puede editarse",
 	"tooltip-ca-nstab-project": "Ver la página del proyecto",
 	"tooltip-ca-nstab-image": "Ver la página del archivo",
 	"tooltip-ca-nstab-mediawiki": "Ver el mensaje de sistema",
@@ -2531,19 +2532,19 @@
 	"pageinfo-category-pages": "Número de páginas",
 	"pageinfo-category-subcats": "Número de subcategorías",
 	"pageinfo-category-files": "Número de archivos",
-	"markaspatrolleddiff": "Marcar como revisado",
-	"markaspatrolledtext": "Marcar este artículo como revisado",
+	"markaspatrolleddiff": "Marcar como verificada",
+	"markaspatrolledtext": "Marcar esta página como verificada",
 	"markedaspatrolled": "Marcado como revisado",
-	"markedaspatrolledtext": "La revisión seleccionada de [[:$1|$1]] ha sido marcada como revisada.",
+	"markedaspatrolledtext": "La revisión seleccionada de [[:$1|$1]] ha sido marcada como verificada.",
 	"rcpatroldisabled": "Se ha desactivado la supervisión de cambios recientes",
-	"rcpatroldisabledtext": "La capacidad de revisar los Cambios Recientes está deshabilitada en este momento.",
-	"markedaspatrollederror": "No se puede marcar como patrullada",
-	"markedaspatrollederrortext": "Debes especificar una revisión para marcarla como patrullada.",
-	"markedaspatrollederror-noautopatrol": "No tienes permisos para marcar tus propios cambios como revisados.",
-	"markedaspatrollednotify": "Este cambio realizado en $1 se ha marcado como revisado.",
-	"markedaspatrollederrornotify": "Error al marcar como revisado.",
+	"rcpatroldisabledtext": "La capacidad de verificar los cambios recientes está deshabilitada en este momento.",
+	"markedaspatrollederror": "No se puede marcar como verificada",
+	"markedaspatrollederrortext": "Debes especificar una revisión para marcarla como verificada.",
+	"markedaspatrollederror-noautopatrol": "No tienes permisos para marcar tus propios cambios como verificados.",
+	"markedaspatrollednotify": "Este cambio realizado en $1 se ha marcado como verificado.",
+	"markedaspatrollederrornotify": "Error al marcar como verificado.",
 	"patrol-log-page": "Registro de revisiones",
-	"patrol-log-header": "Este es un registro de revisiones patrulladas.",
+	"patrol-log-header": "Este es un registro de revisiones verificadas.",
 	"log-show-hide-patrol": "$1 registro de patrullaje",
 	"log-show-hide-tag": "$1 registro de etiquetas",
 	"deletedrevision": "Borrada revisión antigua $1",
@@ -3292,8 +3293,8 @@
 	"logentry-move-move-noredirect": "$1 {{GENDER:$2|trasladó}} la página $3 a $4 sin dejar una redirección",
 	"logentry-move-move_redir": "$1 {{GENDER:$2|trasladó}} la página $3 a $4 sobre una redirección",
 	"logentry-move-move_redir-noredirect": "$1 {{GENDER:$2|trasladó}} la página $3 a $4 sobre una redirección y sin dejar una redirección",
-	"logentry-patrol-patrol": "$1 {{GENDER:$2|marcó}} como patrullada la edición $4 de la página $3",
-	"logentry-patrol-patrol-auto": "$1 {{GENDER:$2|marcó}} automáticamente la edición $4 de la página $3 como patrullada",
+	"logentry-patrol-patrol": "$1 {{GENDER:$2|marcó}} la revisión $4 de la página $3 como verificada",
+	"logentry-patrol-patrol-auto": "$1 {{GENDER:$2|marcó}} automáticamente la revisión $4 de la página $3 como verificada",
 	"logentry-newusers-newusers": "La cuenta de usuario $1 ha sido {{GENDER:$2|creada}}",
 	"logentry-newusers-create": "Se ha {{GENDER:$2|creado}} la cuenta de usuario $1",
 	"logentry-newusers-create2": "La cuenta de usuario $3 ha sido {{GENDER:$2|creada}} por $1",
diff --git a/languages/i18n/et.json b/languages/i18n/et.json
index e8cb1889fb..15ebac8e23 100644
--- a/languages/i18n/et.json
+++ b/languages/i18n/et.json
@@ -936,7 +936,8 @@
 	"rows": "Ridu:",
 	"columns": "Veerge:",
 	"searchresultshead": "Otsingutulemite sätted",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">Nii</a> lingitud lehekülje suuruse ülempiir (baitides):",
+	"stub-threshold": "Nupukese suurus lingivormistusel ($1):",
+	"stub-threshold-sample-link": "näide",
 	"stub-threshold-disabled": "Välja lülitatud",
 	"recentchangesdays": "Mitu päeva näidata viimastes muudatustes:",
 	"recentchangesdays-max": "Ülemmäär $1 {{PLURAL:$1|päev|päeva}}",
@@ -1653,7 +1654,7 @@
 	"booksources-text": "Allpool on linke teistele lehekülgedele, kus müüakse uusi ja kasutatud raamatuid. Lehekülgedel võib olla ka lisainfot raamatute kohta:",
 	"booksources-invalid-isbn": "Antud ISBN-number ei ole korrektne; kontrolli algallikast kopeerides vigu.",
 	"specialloguserlabel": "Täitja:",
-	"speciallogtitlelabel": "Objekt (pealkiri või kasutaja):",
+	"speciallogtitlelabel": "Objekt (pealkiri või {{ns:user}}:kasutajanimi):",
 	"log": "Logid",
 	"all-logs-page": "Kõik avalikud logid",
 	"alllogstext": "See on {{GRAMMAR:genitive|{{SITENAME}}}} kõigi olemasolevate logide ühendkuva.\nValiku kitsendamiseks vali logitüüp, sisesta kasutajanimi (tõstutundlik) või huvipakkuva lehekülje pealkiri (samuti tõstutundlik).",
@@ -1673,7 +1674,7 @@
 	"allpagesbadtitle": "Lehekülje pealkiri oli vigane või sisaldas teise viki või keele eesliidet.\nSee võib sisaldada üht või enamat märki, mida ei saa pealkirjades kasutada.",
 	"allpages-bad-ns": "{{GRAMMAR:inessive|{{SITENAME}}}} ei ole nimeruumi \"$1\".",
 	"allpages-hide-redirects": "Peida ümbersuunamised",
-	"cachedspecial-viewing-cached-ttl": "Vaata vahemälus olevat lehekülje versiooni, mis võib olla kuni $1 vanune.",
+	"cachedspecial-viewing-cached-ttl": "Vaata vahemälus olevat lehekülje versiooni, mis võib olla kuni $1 vana.",
 	"cachedspecial-viewing-cached-ts": "Vaatad vahemälus olevat lehekülje versiooni, mis ei pruugi olla täiesti ajakohane.",
 	"cachedspecial-refresh-now": "Vaata uusimat versiooni.",
 	"categories": "Kategooriad",
@@ -2212,7 +2213,7 @@
 	"allmessages-prefix": "Eesliitefilter:",
 	"allmessages-language": "Keel:",
 	"allmessages-filter-submit": "Mine",
-	"allmessages-filter-translate": "Tõlgi",
+	"allmessages-filter-translate": "tõlgi",
 	"thumbnail-more": "Suurenda",
 	"filemissing": "Fail puudub",
 	"thumbnail_error": "Viga pisipildi loomisel: $1",
@@ -2331,7 +2332,7 @@
 	"tooltip-ca-nstab-main": "Vaata sisulehekülge",
 	"tooltip-ca-nstab-user": "Näita kasutaja lehte",
 	"tooltip-ca-nstab-media": "Näita pildi lehte",
-	"tooltip-ca-nstab-special": "See on erilehekülg, sa ei saa seda lehekülge ennast redigeerida.",
+	"tooltip-ca-nstab-special": "See on erilehekülg ja seda ei saa redigeerida.",
 	"tooltip-ca-nstab-project": "Näita projekti lehte",
 	"tooltip-ca-nstab-image": "Näita pildi lehte",
 	"tooltip-ca-nstab-mediawiki": "Näita süsteemi sõnumit",
@@ -2489,13 +2490,13 @@
 	"sp-newimages-showfrom": "Näita uusi faile alates kuupäevast $2, kell $1",
 	"hours-abbrev": "$1 t",
 	"days-abbrev": "$1 p",
-	"seconds": "{{PLURAL:$1|üks sekund|$1 sekundit}}",
-	"minutes": "{{PLURAL:$1|üks minut|$1 minutit}}",
-	"hours": "{{PLURAL:$1|üks tund|$1 tundi}}",
-	"days": "{{PLURAL:$1|üks päev|$1 päeva}}",
+	"seconds": "{{PLURAL:$1|$1 sekund|$1 sekundit}}",
+	"minutes": "{{PLURAL:$1|$1 minut|$1 minutit}}",
+	"hours": "{{PLURAL:$1|$1 tund|$1 tundi}}",
+	"days": "{{PLURAL:$1|$1 päev|$1 päeva}}",
 	"weeks": "{{PLURAL:$1|$1 nädal|$1 nädalat}}",
-	"months": "{{PLURAL:$1|Üks kuu|$1 kuud}}",
-	"years": "{{PLURAL:$1|Üks aasta|$1 aastat}}",
+	"months": "{{PLURAL:$1|1 kuu|$1 kuud}}",
+	"years": "{{PLURAL:$1|1 aasta|$1 aastat}}",
 	"ago": "$1 tagasi",
 	"just-now": "just nüüd",
 	"hours-ago": "$1 {{PLURAL:$1|tund|tundi}} tagasi",
diff --git a/languages/i18n/eu.json b/languages/i18n/eu.json
index eb2e66048a..0ced0ec51b 100644
--- a/languages/i18n/eu.json
+++ b/languages/i18n/eu.json
@@ -806,7 +806,7 @@
 	"shown-title": "Erakutsi {{PLURAL:$1|emaitza $1|$1 emaitza}} orrialdeko",
 	"viewprevnext": "Ikusi ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "'''«[[:$1]]» izena duen orri bat bada wiki honetan.''' {{PLURAL:$2|0=|Ikus, gainera, aurkitutako beste bilaketa emaitzak.}}",
-	"searchmenu-new": "'''Sortu «[[:$1]]» orria wiki honetan!''' {{PLURAL:$2|0=|Ikus, gainera, zure bilaketarekin aurkitutako orria.|Ikus, gainera, bilaketaren emaitzak.}}",
+	"searchmenu-new": "<strong>Sortu «[[:$1]]» orria wiki honetan!<strong> {{PLURAL:$2|0=|Ikus, gainera, zure bilaketarekin aurkitutako orria.|Ikus, gainera, bilaketaren emaitzak.}}",
 	"searchprofile-articles": "Eduki-orriak",
 	"searchprofile-images": "Multimedia",
 	"searchprofile-everything": "Guztia",
@@ -1204,9 +1204,9 @@
 	"largefileserver": "Fitxategi hau zerbitzariak baimentzen duena baino handiagoa da.",
 	"emptyfile": "Badirudi igotzen ari zaren fitxategia hutsik dagoela. Mesedez, egiaztatu fitxategi hori dela igo nahi duzuna.",
 	"windows-nonascii-filename": "Wiki honek ez du baimentzen letra bereziak dituzten fitxategi izenak.",
-	"fileexists": "Badago izen hori daukan fitxategi bat; mesedez, ikusi existitzen den <strong>[[:$1]]</strong> fitxategia aldatu nahi duzun egiaztatzeko.\n[[$1|thumb]]",
+	"fileexists": "Badago izen hori daukan fitxategi bat; mesedez, ikusi existitzen den <strong>[[:$1]]</strong> ziur {{GENDER:|ez bazaude}} eta fitxategia aldatu nahi duzun egiaztatzeko.\n[[$1|thumb]]",
 	"filepageexists": "Fitxategi honen deskribapen orria dagoeneko sortuta dago <strong>[[:$1]]</strong>-en, baina, ez da existitzen izen hori duen fitxategirik.\nIdazten duzun laburpena ez da deskribapen orrian agertuko.\nZure laburpena agertzeko, eskuz aldatu beharko duzu.\n[[$1|thumb]]",
-	"fileexists-extension": "Badago antzeko izena duen fitxategi bat: [[$2|thumb]]\n* Igotako fitxategiaren izena: <strong>[[:$1]]</strong>\n* Aurretik dagoen fitxategiaren izena: <strong>[[:$2]]</strong>\nHautatu beste izen bat.",
+	"fileexists-extension": "Badago antzeko izena duen fitxategi bat: [[$2|thumb]]\n* Igotako fitxategiaren izena: <strong>[[:$1]]</strong>\n* Aurretik dagoen fitxategiaren izena: <strong>[[:$2]]</strong>\nAgian izen esanguratsuago bat erabili nahi duzu?",
 	"fileexists-thumbnail-yes": "Badirudi neurri txikiko irudia dela ''(irudi txikia)''. [[$1|thumb]]\nEgiaztatu <strong>[[:$1]]</strong> fitxategia.\nEgiaztatutako fitxategia eta jatorrizkoa berdinak badira ez dago irudi txikia igo beharrik.",
 	"file-thumbnail-no": "Fitxategiaren izena <strong>$1</strong>-(r)ekin hasten da.\nBadirudi tamaina txikiko irudia ''(thumbnail)'' dela.\nIrudi hau bereizmen handiagoan izango bazenu igo ezazu, bestela, fitxategiaren izena aldatu mesedez.",
 	"fileexists-forbidden": "Badago izen hori daukan fitxategia, eta ezin da gainidatzi.\nOraindik fitxategia igo nahi baduzu, mesedez atzera itzuli eta igo fitxategia izen ezberdin batekin. [[File:$1|thumb|center|$1]]",
@@ -2748,7 +2748,7 @@
 	"duplicate-defaultsort": "Adi: Berezko \"$2\" antolatzeak aurreko berezko \"$1\" antolatzea gainditzen du.",
 	"version": "Bertsioa",
 	"version-extensions": "Instalatutako luzapenak",
-	"version-skins": "Itxurak",
+	"version-skins": "Instalatutako itxurak",
 	"version-specialpages": "Aparteko orrialdeak",
 	"version-parserhooks": "Parser estentsioak",
 	"version-variables": "Aldagaiak",
@@ -2854,6 +2854,7 @@
 	"tags-activate-submit": "Aktibatu",
 	"tags-deactivate-reason": "Arrazoia:",
 	"tags-deactivate-submit": "Desaktibatu",
+	"tags-edit-existing-tags": "Existitzen diren etiketak:",
 	"tags-edit-new-tags": "Etiketa berriak:",
 	"tags-edit-add": "Gehitu etiketa hauek:",
 	"tags-edit-remove": "Kendu etiketa hauek:",
@@ -2891,6 +2892,7 @@
 	"htmlform-chosen-placeholder": "Aukeratu",
 	"htmlform-cloner-create": "Gehitu gehiago",
 	"htmlform-cloner-delete": "Kendu",
+	"htmlform-title-not-exists": "[[:$1]] ez da existitzen.",
 	"sqlite-has-fts": "$1 testu osoan bilatzeko laguntzarekin",
 	"sqlite-no-fts": "$1 testu osoan bilatzeko laguntzarik gabe",
 	"logentry-delete-delete": "$1 {{GENDER:$2|wikilariak}} «$3» orria ezabatu du",
diff --git a/languages/i18n/ext.json b/languages/i18n/ext.json
index c498ae3c92..3529566e6f 100644
--- a/languages/i18n/ext.json
+++ b/languages/i18n/ext.json
@@ -8,7 +8,8 @@
 			"Xuacu",
 			"아라",
 			"Babanwalia",
-			"Henares"
+			"Henares",
+			"MarcoAurelio"
 		]
 	},
 	"tog-underline": "Surrayal atihus:",
@@ -620,7 +621,7 @@
 	"prefs-custom-css": "CSS pressonalizau",
 	"prefs-custom-js": "JS pressonalizau",
 	"youremail": "Email:",
-	"username": "Nombri d'usuáriu:",
+	"username": "{{GENDER:$1|Nombri d'usuáriu|Nombri d'usuária}}:",
 	"prefs-memberingroups": "Miembru de {{PLURAL:$1|grupu|groupus}}:",
 	"yourrealname": "Nombri verdaeru:",
 	"yourlanguage": "Palra:",
@@ -905,7 +906,6 @@
 	"nlinks": "$1 {{PLURAL:$1|atihu|atihus}}",
 	"nmembers": "$1 {{PLURAL:$1|miembru|miembrus}}",
 	"nrevisions": "$1 {{PLURAL:$1|revisión|revisionis}}",
-	"nviews": "$1 {{PLURAL:$1|vesita|vesitas}}",
 	"specialpage-empty": "Esta páhina está vacia.",
 	"lonelypages": "Páhinas güérfanas",
 	"lonelypagestext": "Las siguientis páginas nu están atijás (dendi otras páginas) ena {{SITENAME}}.",
@@ -989,7 +989,6 @@
 	"mailnologin": "Nu envial direción",
 	"mailnologintext": "Ebis estal [[Special:UserLogin|rutrau]]\ni tenel una direción d´email correta enas tus [[Special:Preferences|preferéncias]]\npa envial correus a otrus usuárius.",
 	"emailuser": "Envial un email a esti usuáriu",
-	"emailpage": "E-mail el usuáriu",
 	"emailpagetext": "Si esti usuáriu á escrebiu una direción email enas sus preferéncias, con el hormulariu d'embahu se l'enviará un mensahi.\nLa direción email qu'aigas escrebiu enas tus preferéncias apaicirá cumu remitenti el mensahi, d'esta horma, el destinatariu pudrá contestalti.",
 	"defemailsubject": "E-mail de {{SITENAME}}",
 	"noemailtitle": "Nu ai direción d´e-mail",
diff --git a/languages/i18n/fa.json b/languages/i18n/fa.json
index 8c5c936000..ccbbf75806 100644
--- a/languages/i18n/fa.json
+++ b/languages/i18n/fa.json
@@ -960,7 +960,8 @@
 	"rows": "تعداد سطرها:",
 	"columns": "تعداد ستون‌ها:",
 	"searchresultshead": "جستجو",
-	"stub-threshold": "آستانهٔ ویرایش پیوندهای <a href=\"#\" class=\"stub\">ناقص</a> (بایت):",
+	"stub-threshold": "آستانهٔ ویرایش پیوندهای ناقص ($1):",
+	"stub-threshold-sample-link": "نمونه",
 	"stub-threshold-disabled": "غیرفعال",
 	"recentchangesdays": "تعداد روزهای نمایش داده‌شده در تغییرات اخیر:",
 	"recentchangesdays-max": "حداکثر $1 {{PLURAL:$1|روز}}",
@@ -1678,7 +1679,7 @@
 	"booksources-text": "در زیر فهرستی از پیوندها به وبگاه‌های دیگر آمده‌است که کتاب‌های نو و دست دوم می‌فروشند، و همچنین ممکن است اطلاعات بیشتری راجع به کتاب مورد نظر شما داشته باشند:",
 	"booksources-invalid-isbn": "شابک داده شده مجاز به نظر نمی‌رسد؛ از جهت اشکالات هنگام کپی کردن از منبع اصلی بررسی کنید.",
 	"specialloguserlabel": "مجری:",
-	"speciallogtitlelabel": "هدف (عنوان یا کاربر):",
+	"speciallogtitlelabel": "هدف (عنوان یا {{ns:user}}:نام کاربر برای کاربر):",
 	"log": "سیاهه‌ها",
 	"all-logs-page": "تمام سیاهه‌های عمومی",
 	"alllogstext": "نمایش یک‌جای تمام سیاهه‌های موجود در {{SITENAME}}.\nمی‌توانید با انتخاب نوع سیاهه، نام کاربری (حساس به کوچکی و بزرگی حروف) و صفحه‌های تغییریافته (حساس به بزرگی و کوچکی حروف)، نمایش را محدودتر سازید.",
@@ -2356,7 +2357,7 @@
 	"tooltip-ca-nstab-main": "دیدن صفحهٔ محتویات",
 	"tooltip-ca-nstab-user": "نمایش صفحهٔ کاربر",
 	"tooltip-ca-nstab-media": "دیدن صفحهٔ مدیا",
-	"tooltip-ca-nstab-special": "این یک صفحهٔ ویژه است، نمی‌توانید خود صفحه را ویرایش کنید",
+	"tooltip-ca-nstab-special": "این یک صفحهٔ ویژه است و قابل ویرایش نیست",
 	"tooltip-ca-nstab-project": "نمایش صفحهٔ پروژه",
 	"tooltip-ca-nstab-image": "دیدن صفحهٔ پرونده",
 	"tooltip-ca-nstab-mediawiki": "نمایش پیغام سامانه",
diff --git a/languages/i18n/fi.json b/languages/i18n/fi.json
index 6b8189198e..b6c51a9084 100644
--- a/languages/i18n/fi.json
+++ b/languages/i18n/fi.json
@@ -466,6 +466,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|sivu|sivua}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|viimeikainen muokkaaja|viimeaikaista muokkaajaa}}",
 	"badretype": "Syöttämäsi salasanat ovat keskenään erilaiset.",
+	"usernameinprogress": "Tunnuksen luominen tälle käyttäjänimelle on parhaillaan käynnissä.\nOle hyvä ja odota.",
 	"userexists": "Pyytämäsi käyttäjänimi on jo käytössä. Valitse toinen käyttäjänimi.",
 	"loginerror": "Sisäänkirjautumisvirhe",
 	"createacct-error": "Virhe tunnuksen luomisessa",
@@ -955,7 +956,8 @@
 	"rows": "Rivejä",
 	"columns": "Sarakkeita",
 	"searchresultshead": "Haku",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">Tynkäsivun</a> osoituskynnys",
+	"stub-threshold": "Tynkälinkkien muotoilun kynnysarvo ($1):",
+	"stub-threshold-sample-link": "näyte",
 	"stub-threshold-disabled": "Ei käytössä",
 	"recentchangesdays": "Näytettävien päivien määrä tuoreissa&nbsp;muutoksissa",
 	"recentchangesdays-max": "Enintään $1 {{PLURAL:$1|päivä|päivää}}",
@@ -1369,10 +1371,12 @@
 	"upload-dialog-button-cancel": "Peru",
 	"upload-dialog-button-done": "Valmis",
 	"upload-dialog-button-save": "Tallenna",
+	"upload-dialog-button-upload": "Tallenna",
 	"upload-dialog-label-select-file": "Valitse tiedosto",
 	"upload-dialog-label-infoform-title": "Yksityiskohdat",
 	"upload-dialog-label-infoform-name": "Nimi",
 	"upload-dialog-label-infoform-description": "Kuvaus",
+	"upload-dialog-label-usage-title": "Käyttö",
 	"upload-dialog-label-usage-filename": "Tiedostonimi",
 	"backend-fail-stream": "Tiedoston $1 virtauttaminen epäonnistui.",
 	"backend-fail-backup": "Tiedostoa $1 ei voitu varmuuskopioida.",
@@ -1671,7 +1675,7 @@
 	"booksources-text": "Alla linkkejä ulkopuolisiin sivustoihin, joilla myydään uusia ja käytettyjä kirjoja. Sivuilla voi myös olla lisätietoa kirjoista.",
 	"booksources-invalid-isbn": "Annettu ISBN-numero ei ole kelvollinen. Tarkista alkuperäisestä lähteestä kirjoitusvirheiden varalta.",
 	"specialloguserlabel": "Suorittaja:",
-	"speciallogtitlelabel": "Kohde (sivu tai käyttäjä):",
+	"speciallogtitlelabel": "Kohde (sivu tai {{ns:user}}:käyttäjänimi):",
 	"log": "Lokit",
 	"all-logs-page": "Kaikki julkiset lokit",
 	"alllogstext": "Tämä on yhdistetty lokien näyttö.\nVoit rajoittaa listaa valitsemalla lokityypin, käyttäjän tai sivun johon muutos on kohdistunut. Jälkimmäiset ovat kirjainkokoherkkiä.",
@@ -2349,7 +2353,7 @@
 	"tooltip-ca-nstab-main": "Näytä sisältösivu",
 	"tooltip-ca-nstab-user": "Näytä käyttäjäsivu",
 	"tooltip-ca-nstab-media": "Näytä mediasivu",
-	"tooltip-ca-nstab-special": "Tämä on toimintosivu",
+	"tooltip-ca-nstab-special": "Tämä on toimintosivu, eikä sitä voi muokata",
 	"tooltip-ca-nstab-project": "Näytä projektisivu",
 	"tooltip-ca-nstab-image": "Näytä tiedostosivu",
 	"tooltip-ca-nstab-mediawiki": "Näytä järjestelmäviesti",
@@ -2401,7 +2405,7 @@
 	"spam_reverting": "Palautettu viimeisimpään versioon, joka ei sisällä linkkejä kohteeseen $1.",
 	"spam_blanking": "Kaikki versiot sisälsivät linkkejä kohteeseen $1. Sivu tyhjennetty.",
 	"spam_deleting": "Kaikki versiot sisälsivät linkkejä kohteeseen $1, poistetaan",
-	"simpleantispam-label": "Mainostenvastainen varmistus.\n'''ÄLÄ''' täytä tätä!",
+	"simpleantispam-label": "Mainosroskan tarkastus.\n<strong>Älä</strong> täytä tätä!",
 	"pageinfo-title": "Tietoja sivusta $1",
 	"pageinfo-not-current": "Valitettavasti ei ole mahdollista antaa tätä tietoa, joka liittyy vanhoihin versioihin.",
 	"pageinfo-header-basic": "Perustiedot",
@@ -3226,6 +3230,7 @@
 	"logentry-newusers-create2": "$1 {{GENDER:$2|loi}} käyttäjätunnuksen $3",
 	"logentry-newusers-byemail": "$1 {{GENDER:$2|loi}} käyttäjätunnuksen $3 ja salasana lähetettiin sähköpostitse",
 	"logentry-newusers-autocreate": "Käyttäjätunnus $1 {{GENDER:$2|luotiin}} automaattisesti",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|siirsi}} suojauksen asetukset sivulta $4 sivulle $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|muutti}} käyttäjän $3 oikeudet ryhmistä $4 ryhmiin $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|muutti}} käyttäjän $3 jäsenyyttä ryhmässä",
 	"logentry-rights-autopromote": "Käyttäjän $1 oikeudet {{GENDER:$2|muuttuivat}} automaattisesti ryhmistä $4 ryhmiin $5",
diff --git a/languages/i18n/fr.json b/languages/i18n/fr.json
index 9dbbee45d2..8114837ecd 100644
--- a/languages/i18n/fr.json
+++ b/languages/i18n/fr.json
@@ -251,7 +251,7 @@
 	"hidden-category-category": "Catégories cachées",
 	"category-subcat-count": "Cette catégorie comprend {{PLURAL:$2|la sous-catégorie|$2 sous-catégories, dont {{PLURAL:$1|celle|les $1}}}} ci-dessous.",
 	"category-subcat-count-limited": "Cette catégorie comprend {{PLURAL:$1|la sous-catégorie|les $1 sous-catégories}} ci-dessous.",
-	"category-article-count": "Cette catégorie contient {{PLURAL:$2|la page suivante|$2 pages, dont {{PLURAL:$1|celle|les $1}} ci-dessous}}.",
+	"category-article-count": "Cette catégorie contient {{PLURAL:$2|seulement la page suivante|$2 pages, dont {{PLURAL:$1|celle|les $1}} ci-dessous}}.",
 	"category-article-count-limited": "{{PLURAL:$1|La page suivante figure|Les $1 pages suivantes figurent}} dans la présente catégorie.",
 	"category-file-count": "Cette catégorie contient {{PLURAL:$2|le fichier suivant|$2 fichiers, dont {{PLURAL:$1|celui|les $1}} ci-dessous}}.",
 	"category-file-count-limited": "{{PLURAL:$1|Le fichier suivant figure|Les $1 fichiers suivants figurent}} dans la présente catégorie.",
@@ -1043,7 +1043,8 @@
 	"rows": "Rangées :",
 	"columns": "Colonnes :",
 	"searchresultshead": "Filtrer avec cette valeur",
-	"stub-threshold": "Limite supérieure pour les <a href=\"#\" class=\"stub\">liens vers les ébauches</a> (octets) :",
+	"stub-threshold": "Seuil pour le formatage des liens bouchons ($1) :",
+	"stub-threshold-sample-link": "exemple",
 	"stub-threshold-disabled": "Désactivé",
 	"recentchangesdays": "Nombre de jours à afficher dans les modifications récentes :",
 	"recentchangesdays-max": "(maximum $1 jour{{PLURAL:$1||s}})",
@@ -1763,7 +1764,7 @@
 	"booksources-text": "Voici une liste indicative de liens vers d’autres sites vendant des livres neufs et d’occasion et sur lesquels vous trouverez peut-être des informations sur les ouvrages que vous cherchez :",
 	"booksources-invalid-isbn": "L’ISBN donné ne semble pas être correct ; vérifiez si vous avez fait une erreur en copiant la source originale.",
 	"specialloguserlabel": "Auteur :",
-	"speciallogtitlelabel": "Cible (titre ou utilisateur):",
+	"speciallogtitlelabel": "Cible (titre ou {{ns:user}}:nom d'utilisateur) :",
 	"log": "Journaux d’opérations",
 	"all-logs-page": "Tous les journaux publics",
 	"alllogstext": "Affichage combiné de tous les journaux disponibles sur {{SITENAME}}.<br />\nVous pouvez personnaliser l'affichage en sélectionnant le type de journal, le nom d'utilisateur ou la page concernée (ces deux derniers étant sensibles à la casse).",
@@ -2442,7 +2443,7 @@
 	"tooltip-ca-nstab-main": "Voir la page de contenu",
 	"tooltip-ca-nstab-user": "Voir la page utilisateur",
 	"tooltip-ca-nstab-media": "Voir la page du média",
-	"tooltip-ca-nstab-special": "Ceci est une page spéciale, vous ne pouvez pas la modifier.",
+	"tooltip-ca-nstab-special": "Ceci est une page spéciale, et elle ne peut pas être modifiée.",
 	"tooltip-ca-nstab-project": "Voir la page du projet",
 	"tooltip-ca-nstab-image": "Voir la page du fichier",
 	"tooltip-ca-nstab-mediawiki": "Voir le message système",
diff --git a/languages/i18n/gl.json b/languages/i18n/gl.json
index 87b9415d82..ae7f1c9496 100644
--- a/languages/i18n/gl.json
+++ b/languages/i18n/gl.json
@@ -931,7 +931,8 @@
 	"rows": "Filas:",
 	"columns": "Columnas:",
 	"searchresultshead": "Procurar",
-	"stub-threshold": "Límite superior para o formato de <a href=\"#\" class=\"stub\">ligazóns de bosquexo</a> (bytes):",
+	"stub-threshold": "Límite superior para o formato de ligazóns de bosquexo($1):",
+	"stub-threshold-sample-link": "exemplo",
 	"stub-threshold-disabled": "Desactivado",
 	"recentchangesdays": "Número de días a mostrar nos cambios recentes:",
 	"recentchangesdays-max": "Máximo: $1 {{PLURAL:$1|día|días}}",
@@ -1649,7 +1650,7 @@
 	"booksources-text": "A continuación aparece unha lista de ligazóns cara a outros sitios web que venden libros novos e usados, neles tamén pode obter máis información sobre as obras que está a buscar:",
 	"booksources-invalid-isbn": "O ISBN inserido parece non ser válido; comprobe que non haxa erros ao copialo da fonte orixinal.",
 	"specialloguserlabel": "Executante:",
-	"speciallogtitlelabel": "Obxectivo (título ou usuario):",
+	"speciallogtitlelabel": "Obxectivo (título ou {{ns:user}}:nome de usuario):",
 	"log": "Rexistros",
 	"all-logs-page": "Todos os rexistros públicos",
 	"alllogstext": "Vista combinada de todos os rexistros dipoñibles en {{SITENAME}}.\nPode precisar máis a vista seleccionando o tipo de rexistro, o nome do usuario ou o título da páxina afectada.",
@@ -2327,7 +2328,7 @@
 	"tooltip-ca-nstab-main": "Ver o contido da páxina",
 	"tooltip-ca-nstab-user": "Ver a páxina {{GENDER:{{BASEPAGENAME}}|do usuario|da usuaria}}",
 	"tooltip-ca-nstab-media": "Ver a páxina con contido multimedia",
-	"tooltip-ca-nstab-special": "Esta é unha páxina especial, polo que non a pode editar",
+	"tooltip-ca-nstab-special": "Esta é unha páxina especial, e non pode editarse",
 	"tooltip-ca-nstab-project": "Ver a páxina do proxecto",
 	"tooltip-ca-nstab-image": "Ver a páxina do ficheiro",
 	"tooltip-ca-nstab-mediawiki": "Ver a mensaxe do sistema",
diff --git a/languages/i18n/gom-deva.json b/languages/i18n/gom-deva.json
index 279fab509d..0d56f4479a 100644
--- a/languages/i18n/gom-deva.json
+++ b/languages/i18n/gom-deva.json
@@ -327,7 +327,7 @@
 	"login-abort-generic": "तुमचें लॉग इन अपेशी थारलां - निश्फलीत",
 	"login-migrated-generic": "तुमचें खातें स्थलांतरीत जालां आनी तुजें वापरप्याचें नांव ह्या विकीचेर उपस्थीत ना.",
 	"loginlanguagelabel": "भास:$1",
-	"pt-login": "सत्रारंभ करात",
+	"pt-login": "सत्रारंभ",
 	"pt-login-button": "सत्रारंभ करात",
 	"pt-createaccount": "खातें रोचात",
 	"pt-userlogout": "सत्र शेवट",
@@ -384,7 +384,7 @@
 	"preview": "पूर्वनियाळ",
 	"showpreview": "पूर्वनियाळ दाखय",
 	"showdiff": "बदल दाखयात",
-	"anoneditwarning": "'''शिटकावणी:''' तूंवें सत्रारंभ करूंक ना.\nतुजो IP पत्तो ह्या पानाच्या संपादन इतिहासांत नोंद जातलो.जर तुमी <strong>[$1 सत्रारंभ]</strong> करता वा <strong>[$2 खातें उगडटा]</strong> जाल्यार हेर सुविधांसयत तुमच्या संपादनाचें श्रेय तुमच्या सदस्य नांवाचेर दितलें.",
+	"anoneditwarning": "'''शिटकावणी:''' तुवें सत्रारंभ करूंक ना.\nतुजो IP पत्तो ह्या पानाच्या संपादन इतिहासांत नोंद जातलो.जर तुमी <strong>[$1 सत्रारंभ]</strong> करता वा <strong>[$2 खातें उगडटा]</strong> जाल्यार हेर सुविधांसयत तुमच्या संपादनाचें श्रेय तुमच्या सदस्य नांवाचेर दितलें.",
 	"missingcommenttext": "उपकार करून तुमच्यो शिरो सकयल घाल.",
 	"blockedtitle": "वापरप्याक बंद केला",
 	"blockednoreason": "कांयच कारण दिवंक ना",
@@ -682,7 +682,7 @@
 	"tooltip-pt-mycontris": "तुमच्या योगदानांची वळेरी",
 	"tooltip-pt-login": "सत्रारंभ करप बरें, पूण तशी सक्ती ना.",
 	"tooltip-pt-logout": "सत्र शेवट",
-	"tooltip-pt-createaccount": "तुमी खातें उगडून सत्रारंभ करचें अशें सुचयतात, पूण तें सक्तीचे ना.",
+	"tooltip-pt-createaccount": "तुमी खातें उगडून सत्रारंभ करचें अशें सुचयतात, पूण तें सक्तीचें ना.",
 	"tooltip-ca-talk": "मजकूराच्या पाना संबंदान भासाभास",
 	"tooltip-ca-edit": "हें पान बदल",
 	"tooltip-ca-addsection": "नवीं विभाग सुरु करात",
@@ -766,7 +766,7 @@
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|कुरवेचीट|कुरवेचीटी}}]]: $2)",
 	"htmlform-title-not-exists": "[[:$1]] अस्तित्वांत ना.",
 	"logentry-delete-delete": "$1 {{GENDER:$2|काडून उडयल्ले पान}} $3",
-	"logentry-move-move": "$1 न $3 पानाचेर $4 {{GENDER:$2|हालयला}}",
+	"logentry-move-move": "$1 हाणें $3 पानाक $4 {{GENDER:$2|हालयला}}",
 	"logentry-newusers-create": "उपयोगकत्याचें $1 {{GENDER:$2|तयार केलें}}",
 	"logentry-upload-upload": "$1 {{GENDER:$2|अपलोड केला}} $3",
 	"searchsuggest-search": "सोद",
diff --git a/languages/i18n/gom-latn.json b/languages/i18n/gom-latn.json
index 3857a53e7e..1c1652d1d9 100644
--- a/languages/i18n/gom-latn.json
+++ b/languages/i18n/gom-latn.json
@@ -330,7 +330,7 @@
 	"login-abort-generic": "Tujem sotrorombh opexi tharlam - Nixfolit",
 	"login-migrated-generic": "Tujem khatem stholontrit zalam ani vapurpeachem nanv hea wikicher anink upostit na.",
 	"loginlanguagelabel": "Bhas: $1",
-	"pt-login": "Sotrorombh kor",
+	"pt-login": "Sotrorombh",
 	"pt-login-button": "Sotrorombh kor",
 	"pt-createaccount": "Khatem roch",
 	"pt-userlogout": "Sotr xevott",
@@ -652,18 +652,18 @@
 	"tooltip-namespace_association": "Vinchlele nanvthollache sombondhit bhasabhas vo vixoiacho nanvthollakui gheupak hem boks khunnai",
 	"blanknamespace": "(Mukhel)",
 	"contributions": "{{GENDER:$1|Vapuddpi}} yogdanam",
-	"contributions-title": "$1 hea vapuddpean kelelim borovpam",
-	"mycontris": "Borovpam",
+	"contributions-title": "$1 hea vapuddpean kelelim yogdanam",
+	"mycontris": "Yogdanam",
 	"contribsub2": "{{GENDER:$3|$1}} hacheo ($2)",
 	"uctop": "(atachem)",
 	"month": "Mhoinea savn (ani adichem):",
 	"year": "Hea vorsa savn (ani adichem):",
-	"sp-contributions-newbies": "Fokot novea khateachim borovpam dakhoi",
+	"sp-contributions-newbies": "Fokot novea khateachim yogdanam dakhoi",
 	"sp-contributions-blocklog": "addavnniache sotr",
 	"sp-contributions-uploads": "upload",
 	"sp-contributions-logs": "sotr",
 	"sp-contributions-talk": "bhasabhas",
-	"sp-contributions-search": "Borovpam sod",
+	"sp-contributions-search": "Yogdanam sod",
 	"sp-contributions-username": "Antorzall namo vo vapuddpeachem nanv:",
 	"sp-contributions-toponly": "Fokot halincheo uzollnneo dakhoi",
 	"sp-contributions-submit": "Sod",
@@ -734,7 +734,7 @@
 	"tooltip-t-whatlinkshere": "Hanga zoddlelea sogllea wiki pananchi volleri",
 	"tooltip-t-recentchangeslinked": "Hea panak-sun zoddlelea panachim halinche bodol",
 	"tooltip-feed-atom": "Hea panak Atom purovnni",
-	"tooltip-t-contributions": "Hea vapuddpeachea borovpanchi suchi",
+	"tooltip-t-contributions": "Hea vapuddpeachea yogdanachi suchi",
 	"tooltip-t-emailuser": "Hea vapuddpeak email patthoi",
 	"tooltip-t-upload": "Faili upload kor",
 	"tooltip-t-specialpages": "Sogllea khaxelim pananchi volleri",
@@ -742,7 +742,7 @@
 	"tooltip-t-permalink": "Hea panache hea uzollnnek togpi zoddni",
 	"tooltip-ca-nstab-main": "Mozkur pan polloi",
 	"tooltip-ca-nstab-user": "Vapuddpeachem pan polloi",
-	"tooltip-ca-nstab-special": "Hem ek kherit pan, tujeam hem pan bodlunk zaina",
+	"tooltip-ca-nstab-special": "Hem ek kherit pan, ani hem bodlunk zaina",
 	"tooltip-ca-nstab-project": "Prokolpachem pan polloi",
 	"tooltip-ca-nstab-image": "Failichem pan polloi",
 	"tooltip-ca-nstab-template": "Saacho polloi",
@@ -753,7 +753,7 @@
 	"tooltip-diff": "Tumi hea mozkurant kelelo bodol dakhoiat",
 	"tooltip-compareselectedversions": "Hea panacheo don nivoddleleo uzollneo modem forok polloi",
 	"tooltip-watch": "Hem pan tujea xadurvollerint zodd",
-	"tooltip-rollback": "\"Kovllop\" hea panachea xevttachea borovpa kodde kea kollant portota.",
+	"tooltip-rollback": "\"Kovllop\" hea panak nimannea yogdan korpean kello (kelle) bodol eka kollant portota.",
 	"tooltip-undo": "\"Rodd' kor\" sudharop portita ani sudharopak Zholok ritin ukodta. Tem saran karon zoddunk dita.",
 	"tooltip-summary": "Mottvo sar ghal",
 	"simpleantispam-label": "Spam-virudh topasni.\nHem bhori <strong>nakai</strong>!",
@@ -796,7 +796,7 @@
 	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Kurvechit|Kurvechiti}}]]: $2)",
 	"htmlform-title-not-exists": "[[:$1]] ostitvant na.",
 	"logentry-delete-delete": "$1-an {{GENDER:$2|kadun udoile}} pan $3",
-	"logentry-move-move": "$1{{GENDER:$2|-an}} $3 panak $4 haloilea",
+	"logentry-move-move": "$1-an $3 panak $4 {{GENDER:$2|haloilea}}",
 	"logentry-newusers-create": "Vapurpeacho kont $1 {{GENDER:$2|rochlam}}",
 	"logentry-upload-upload": "$1-an $3 {{GENDER:$2|upload kela}}",
 	"searchsuggest-search": "Sod",
diff --git a/languages/i18n/gsw.json b/languages/i18n/gsw.json
index c7006d3e89..f583152458 100644
--- a/languages/i18n/gsw.json
+++ b/languages/i18n/gsw.json
@@ -22,10 +22,10 @@
 			"아라"
 		]
 	},
-	"tog-underline": "Links unterstryche",
+	"tog-underline": "Links unterstryche:",
 	"tog-hideminor": "Keini «chlyni Änderige» aazeige",
-	"tog-hidepatrolled": "Vum Fäldhieter aagluegti Änderige in dr „Letschte Änderige“ usblände",
-	"tog-newpageshidepatrolled": "Aagluegti Syten uf dr Lischt „Neiji Syte“ verstecke",
+	"tog-hidepatrolled": "Vu Fäldhieter/inne aagluegti Änderige in dr „Letschte Änderige“ usblände",
+	"tog-newpageshidepatrolled": "Vu Fäldhieter/inne aagluegti Änderige in dr Lischt „Neiji Syte“ usblände",
 	"tog-extendwatchlist": "Beobachtungslischte erwytere go alli Änderige aazeige, nit numme di letschte",
 	"tog-usenewrc": "Änderigen uf „Letschte Änderige“ un dr Beobachtigslischt no Syte gruppiere",
 	"tog-numberheadings": "Überschrifte outomatisch numeriere",
@@ -38,15 +38,15 @@
 	"tog-watchdeletion": "Sälber gleschti Sytene un Dateie automatisch beobachte",
 	"tog-watchrollback": "Syte, wun i zruckgsetzt haa, automatisch beobachte",
 	"tog-minordefault": "Alli dyni Änderigen als «chlyni Änderige» markiere",
-	"tog-previewontop": "Vorschou vor em Editierfänschter aazeige",
-	"tog-previewonfirst": "Vorschou aazeige bim erschten Editiere",
+	"tog-previewontop": "Vorschou oberhalb vom Editierfänschter aazeige",
+	"tog-previewonfirst": "Vorschou scho bim ersten Editieren azeige",
 	"tog-enotifwatchlistpages": "Schick mer e Mail, wänn e Syte oder e Datei gänderet wird, wun i beobachte due",
-	"tog-enotifusertalkpages": "Benachrichtigungsmails bi Änderigen a dyne Benutzersyte",
+	"tog-enotifusertalkpages": "Schick mer es Mail, we öpper myni Benutzerdiskussionssyte het g’änderet",
 	"tog-enotifminoredits": "Au bi chlaine Änderige an Syte oder Dateie ne Mail schicke",
 	"tog-enotifrevealaddr": "Dyni E-Mail-Adrässe wird i Benachrichtigungsmails zeigt",
 	"tog-shownumberswatching": "Aazahl Benutzer aazeige, wo ne Syten am Aaluege sy (i den Artikelsyte, i de «letschten Änderigen» und i der Beobachtigslischte)",
-	"tog-oldsig": "Vorschau vu dr Unterschrift:",
-	"tog-fancysig": "Signatur as Wikitext behandle (ohni automatischi Vergleichig)",
+	"tog-oldsig": "Aktuelli Unterschrift:",
+	"tog-fancysig": "Unterschrift as Wikitext behandle (ohni automatischi Verlinkig)",
 	"tog-uselivepreview": "Vorschau sofort aazeige",
 	"tog-forceeditsummary": "Sag mer s, wänn i s Zämmefassigsfeld läär loss",
 	"tog-watchlisthideown": "Eigeni Änderige uf d Beobachtigslischt usblände",
@@ -576,15 +576,17 @@
 	"savearticle": "Syte spychere",
 	"preview": "Vorschou",
 	"showpreview": "Vorschau aaluege",
-	"showdiff": "Zeig Änderige",
+	"showdiff": "Änderige zeige",
 	"blankarticle": "<strong>Warnig:</strong> D Syte, wu Du aalaisch, isch läär.\nWänn Du nomol uf „{{int:savearticle}}“ klicksch, wird d Syte ohni Inhalt aaglait.",
 	"anoneditwarning": "<strong>Warnig:</strong> Du bisch nit aagmäldet. Dy IP-Adräss wird effetli sichtbar, wänn Du Bearbeitige machsch. Wänn di <strong>[$1 aamälde duesch]</strong> oder <strong>[$2 e Benutzerkonto aalaisch]</strong>, wäre Bearbeitige zämme mit andere Bytreg Dym Nenutzername zuegordnet.",
 	"anonpreviewwarning": "''Du bisch nit aagmäldet. Bim Spychere wird Dyy IP-Adräss yydrait in d Versionsgschicht vu däre Syte.''",
 	"missingsummary": "'''Obacht:''' Du hesch kei Zämefassig aagee. Wenn du nomol uf Spychere drucksch, wird d Änderung ohni gspychert.",
+	"selfredirect": "<strong>Obacht:</strong> Du bisch die Syten uf sech sälber am Wyterleite.\nVilech hesch für d Wyterleitig ds falsche Zil y’gä, oder vilech bisch di falschi Syten am bearbeite.\nWe d’ nomal «{{int:savearticle}}» kliksch, de wird d Wyterleitig einewäg agleit.",
 	"missingcommenttext": "Bitte gib Dyy Kommentar unte yy.",
 	"missingcommentheader": "'''ACHTIG:''' Du hesch kei Iberschrift im Fäld „Betreff:“ yygee. Wänn nomol uf „{{int:savearticle}}“ drucksch, wird Dyyni Bearbeitig ohni Iberschrift gspicheret.",
 	"summary-preview": "Vorschou vor Zämefassig:",
 	"subject-preview": "Vorschau vum Betreff:",
+	"previewerrortext": "Es het e Fähler ’gä bim Versuech, e Vorschou vo dynen Änderige z zeige.",
 	"blockedtitle": "Benutzer isch gsperrt.",
 	"blockedtext": "'''Dyy Benutzername oder Dyyni IP-Adräss isch gsperrt wore.'''\n\nD Sperrig isch vu $1 uusgfiert wore.\nAs Grund isch ''$2'' aagee wore.\n\n* Aafang vu dr Sperrig: $8\n* Ändi vu dr Sperrig: $6\n* Sperrig betrifft: $7\n\nDu chasch $1 oder e andere [[{{MediaWiki:Grouppage-sysop}}|Ammann]] kontaktiere go dischpetiere iber die Sperrig.\nDu chasch d „E-Mail an dää Benutzer“-Funktion nit bruche, solang kei giltigi E-Mail-Adräss in Dyyne [[Special:Preferences|Benutzerkonto-Yystellige]] yydrait isch, oder solang die Funktion fir Di gsperrt isch.\nDyy aktuälli IP-Adräss isch $3, un d Sperr-ID isch #$5.\nBitte fieg in jedi Aafrog, wu du stellsch, alli Information yy.",
 	"autoblockedtext": "Dyyni IP-Adräss isch automatisch gsperrt wore, wel si vu me andere Benutzer brucht woren isch, wu dur $1 gsperrt woren isch.\nAs Grund isch aagee wore:\n\n:''$2''\n\n* Aafang vu dr Sperri: $8\n* Änd vu dr Sperri: $6\n* Sperre betrifft: $7\n\nDu chasch $1 oder ein vu dr andre [[{{MediaWiki:Grouppage-sysop}}|Ammanne]] kontaktiere, zum iber die Sperri z diskutiere.\n\nDu chasch d „E-Mail an dää Benutzer“-Funktion nit nutze, solange kei giltigi E-Mail-Adräss in Dyne  [[Special:Preferences|Benutzerkonto-Yystellige]] yytrait isch oder die Funktion fir di gsperrt woren isch.\n\nDyy aktuäll IP-Adräss isch $3, un d Sperr-ID isch $5.\nBitte fieg alli Informatione jedere Aafrog zue, wu Du stellsch.",
@@ -637,11 +639,12 @@
 	"yourdiff": "Unterschid",
 	"copyrightwarning": "'''Bitte <big>kopier kener Internetsyte</big>, wo nid dyner eigete sy, bruuch <big>kener urhäberrächtlech gschützte Wärch</big> ohni Erloubnis vor Copyright-Inhaberschaft!'''<br />\nHiemit gisch du zue, das du dä Tekscht '''sälber gschribe''' hesch, das der Tekscht Allgmeinguet ('''public domain''') isch, oder das der '''Copyright-Inhaberschaft''' iri '''Zuestimmig''' het 'gä. Falls dä Tekscht scho nöumen anders isch veröffentlecht worde, de schryb das bitte uf d Diskussionssyte.\n<i>Bis dir bewusst, dass alli {{SITENAME}}-Byträg outomatisch under der „$2“ stöh (für Details vgl. $1). We du nid wosch, das anderi dy Bytrag chöu veränderen u wyterverbreite, de drück nid uf „Syte spychere“.</i>",
 	"copyrightwarning2": "Dängge Si dra, dass alli Änderige {{GRAMMAR:dativ {{SITENAME}}}} vo andere Benutzer wider gänderet oder glöscht chönne wärde. Wenn Si nit wänn, dass ander Lüt an Ihrem Tekscht ummedoktere denn schicke Si ihn jetz nit ab.<br />\nSi verspräche uns usserdäm, dass Si des alles selber gschribe oder vo nere Quälle kopiert hen, wo Public Domain odr sunscht frei isch (lueg $1 für Details).\n'''SETZE SI DO OHNI ERLAUBNIS KEINI URHEBERRÄCHTLICH GSCHÜTZTI WÄRK INE!'''",
+	"editpage-cannot-use-custom-model": "Ds Inhaltsmodäll vo dere Syte lat sech nid la ändere.",
 	"longpageerror": "'''Fähler: Dä Täxt, wu Du spychere wit, isch {{PLURAL:$1|ei Kilobyte|$1 Kilobyte}} groß. Des isch greßer wie s erlaubt Maximum vu {{PLURAL:$2|eim Kilobyte|$2 Kilobyte}}.''' S Spychere isch nit megli.",
 	"readonlywarning": "'''Achtig: D Datebank isch fir Wartigsarbete gesperrt. Wäge däm chenne Dyyni Änderige im Momänt nit gspycheret wäre.\nSichere de Täxt bitte lokal uf Dyynem Computer un versuech speter nomol, d Änderige z ibertrage.'''\n\nGrund fir d Sperri: $1",
 	"protectedpagewarning": "'''WARNIG: Die Syten isch gsperrt wore, ass si nume Benutzer mit Administrator-Rächt chenne verändere.'''\nAs Referänz wird do dr letscht Logbuechyytrag aagee:",
 	"semiprotectedpagewarning": "'''Obacht''': Die Syte isch halb gsperrt, ass si nume vu aagmäldete Benutzer cha bearbeitet wäre.\nAs Referänz wird do dr letscht Logbuechyytrag aagee:",
-	"cascadeprotectedwarning": "'''ACHTIG: Die Syte isch gsperrt. Wäg däm cha si nume vu Benutzer mit Ammannerächt bearbeitet wäre. Si isch in die {{PLURAL:$1|Syte|Syte}} yybunde, wu mit ere Kaskadesperroption gschitzt {{PLURAL:$1|isch|sin}}:'''",
+	"cascadeprotectedwarning": "<strong>Obacht:</strong> Die Syten isch gschützt. Nume Lüt mit Administrationsrächt (Ammannen oder -froue) chöü sen ändere. Der Grund derfür isch, das si i di {{PLURAL:$1|folgendi|folgende}} Syten isch y’bunde, wo mit ere Kaskadesperroption gschützt {{PLURAL:$1|isch|sy}}:",
 	"titleprotectedwarning": "'''Obacht: S Aalege vu däre Syte isch gsperrt. Wäg däm bruucht mer [[Special:ListGroupRights|bstimmti Rächt]] go si aalege.'''\nAs Referänz wird do dr letscht Logbuechyytrag aagee:",
 	"templatesused": "{{PLURAL:$1|Vorlag, wu in däm Artikel brucht wird|Vorlage, wu in däm Artikel brucht wäre}}:",
 	"templatesusedpreview": "{{PLURAL:$1|Vorlag, wu in däre Vorschau brucht wird|Vorlage, wu in däre Vorschau brucht wäre}}:",
@@ -679,6 +682,9 @@
 	"content-model-text": "Klartext",
 	"content-model-javascript": "JavaScript",
 	"content-model-css": "CSS",
+	"content-json-empty-object": "Läärs Objekt",
+	"content-json-empty-array": "Läären Array",
+	"duplicate-args-warning": "<strong>Obacht:</strong> D Syte [[:$1]] rüefft [[:$2]] ab. Im Abrueff het der Parameter «$3» meh weder ei Wärt. Nume der letst Wärt chunt zum Zug.",
 	"duplicate-args-category": "Syte, wu doppleti Argumänt in Vorlagenufruef verwände",
 	"duplicate-args-category-desc": "Uf dr Syte het s Vorlagenufruef, wu Duplikat vu Argumänt verwände, wie <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> oder <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "Achtig: In däre Syte het s z vyyl Ufruef vu ufwändige Parserfunktione.\n\nS {{PLURAL:$2|derf nid meh wie ein Ufruef|derfe nid meh wie $1 Ufruef}} gee.",
@@ -724,7 +730,7 @@
 	"page_last": "Ändi",
 	"histlegend": "Du chasch zwei Versionen uswähle und verglyche.<br />\nErklärig: (aktuell) = Underschid zu jetz,\n(vorane) = Underschid zur alte Version, <strong>K</strong> = chlyni Änderig",
 	"history-fieldset-title": "Suech in dr Versionsgschicht",
-	"history-show-deleted": "nume gleschti Versione",
+	"history-show-deleted": "Nume gleschti Versione",
 	"histfirst": "eltischti",
 	"histlast": "neischti",
 	"historysize": "({{PLURAL:$1|1 Byte|$1 Bytes}})",
@@ -733,9 +739,10 @@
 	"history-feed-description": "Versionsgschicht fir die Syte in {{SITENAME}}",
 	"history-feed-item-nocomment": "$1 um $2",
 	"history-feed-empty": "Di aagforderet Syte git s nid. Villicht isch si glescht oder verschobe wore. [[Special:Search|Suech]] {{SITENAME}} fir neji Syte, wu passe.",
+	"history-edit-tags": "Markierige vo usgwählte Versionen ändere",
 	"rev-deleted-comment": "(Zämmefassig uusegnuh)",
 	"rev-deleted-user": "(Benutzername uusegnuh)",
-	"rev-deleted-event": "(Logbuechaktion uusegnuh)",
+	"rev-deleted-event": "(Logbuechdetails uusegnuh)",
 	"rev-deleted-user-contribs": "[Benutzername oder IP-Adräss uusegnuu - Bearbeitig in dr Byytragslischt versteckt]",
 	"rev-deleted-text-permission": "Die Version isch '''glescht''' wore.\nInformation zue dr Leschig un e Begrindig het s im [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} Lesch-Logbuech].",
 	"rev-suppressed-text-permission": "Die Version isch <strong>unterdruckt</strong> wore.\nEinzelheite het s im [{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} Oversight-Logbuech].",
@@ -753,7 +760,7 @@
 	"rev-showdeleted": "zeig",
 	"revisiondelete": "Versione lesche/widerherstelle",
 	"revdelete-nooldid-title": "Kei Version aagee",
-	"revdelete-nooldid-text": "Du hesch entwäder kei Version aagee, wu die Aktion soll usgfiert wäre, die usgwehlt Version git s nid oder Du versuechsch di aktuäll Version z verstecke.",
+	"revdelete-nooldid-text": "Entweder hesch kei Zilversion usgwählt, für die Funktion drann uszfüere, oder di usgwählti Zilversion git’s nid oder du probiersch, di aktuelli Version z verstecke.",
 	"revdelete-no-file": "D Datei, wu Du aagee hesch, git s nit.",
 	"revdelete-show-file-confirm": "Bisch sicher, ass Du di glescht Version vu dr Datei „<nowiki>$1</nowiki>“ vum $2 am $3 witt aaluege?",
 	"revdelete-show-file-submit": "Jo",
@@ -769,7 +776,7 @@
 	"revdelete-legend": "Setze vu dr Sichtbarkeits-Yyschränkige",
 	"revdelete-hide-text": "Täxt vu dr Version versteckle",
 	"revdelete-hide-image": "Bildinhalt versteckle",
-	"revdelete-hide-name": "Logbuech-Aktion versteckle",
+	"revdelete-hide-name": "Zil u Parameter verstecke",
 	"revdelete-hide-comment": "Bearbeitigskommentar versteckle",
 	"revdelete-hide-user": "Benutzername/d IP vum Bearbeiter versteckle",
 	"revdelete-hide-restricted": "Date vu Ammanne glyych unterdrucke wie vu andere",
@@ -813,6 +820,7 @@
 	"mergehistory-empty": "S chenne kei Versione zämegfierd wäre.",
 	"mergehistory-success": "{{PLURAL:$3|1 Version|$3 Versione}} vu „[[:$1]]“ isch no „[[:$2]]“ zämegfierd.",
 	"mergehistory-fail": "Zämefierig vu dr Versione nid megli, bitte prief d Syte un d Zytaagobe.",
+	"mergehistory-fail-toobig": "D Versionsgschichte lö sech nid la zämefüere, wil me meh weder ds Limit {{PLURAL:$1|eire Version|$1 Versione}} müesst verschiebe.",
 	"mergehistory-no-source": "Ursprungssyte „$1“ isch nit vorhande.",
 	"mergehistory-no-destination": "Ziilsyte „$1“ isch nit vorhande.",
 	"mergehistory-invalid-source": "Ursprungssyte muess e giltige Sytename syy.",
@@ -834,6 +842,7 @@
 	"editundo": "rückgängig",
 	"diff-empty": "(kei Unterschid)",
 	"diff-multi-sameuser": "({{PLURAL:$1|E Version vum nämlige Benutzer, wu derzwische lyt, wird|$1 Versione vum nämlige Benutzer, wu derzwische lige, wäre}} nit aazeigt)",
+	"diff-multi-otherusers": "({{PLURAL:$1|Ei Version|$1 Versione}} derzwüsche vo {{PLURAL:$2|öpper anderem|$2 andernen}} isch nid azeigt)",
 	"diff-multi-manyusers": "({{PLURAL:$1|Ei Version|$1 Versione}} vu meh {{PLURAL:$2|eim Benutzer|$2 Benutzer}}, {{PLURAL:$1|wu derzwische lyt un nit aazeigt wird|wu derzwische lige un nit aazeigt wäre}})",
 	"difference-missing-revision": "{{PLURAL:$2|Ei Version|$2 Versione}} vui däre Unterschidsaazeig ($1) {{PLURAL:$2|isch|sin}} nit gfunde wore.\n\nDää Fähler chunnt normalerwyys dur e veraltete Link zue dr Versionsgschicht vun ere Syte, wu in dr Zwischezyt glescht woren isch.\nEinzelheite chasch im [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} Lesch-Logbuech] bschaue.",
 	"searchresults": "Suech-Ergäbnis",
@@ -843,6 +852,8 @@
 	"notextmatches": "Kei Iberyystimmige mit Inhalte",
 	"prevn": "{{PLURAL:$1|vorige|vorigi $1}}",
 	"nextn": "{{PLURAL:$1|nächschte|nächschti $1}}",
+	"prev-page": "vorderi Syte",
+	"next-page": "nächsti Syte",
 	"prevn-title": "{{PLURAL:$1|Vorig Ergebnis|Vorigi $1 Ergebnis}}",
 	"nextn-title": "{{PLURAL:$1|Negscht Ergebnis|Negschti $1 Ergebnis}}",
 	"shown-title": "Zeig $1 {{PLURAL:$1|Ergebnis|Ergebnis}} pro Syte",
@@ -861,14 +872,18 @@
 	"search-result-category-size": "{{PLURAL:$1|1 Kategorii|$1 Kategorie}} ({{PLURAL:$2|1 Unterkategorii|$2 Unterkategorie}}, {{PLURAL:$3|1 Datei|$3 Dateie}})",
 	"search-redirect": "(Wyterleitig $1)",
 	"search-section": "(Abschnitt $1)",
+	"search-category": "(Kategorie $1)",
+	"search-file-match": "(Resultat us em Inhalt vo Dateie)",
 	"search-suggest": "Hesch „$1“ gmeint?",
+	"search-rewritten": "Resultat für $1 sy azeigt. Würklech nach $2 sueche.",
 	"search-interwiki-caption": "Schweschterprojäkt",
-	"search-interwiki-default": "$1 Ergebniss:",
+	"search-interwiki-default": "Ergäbnis us $1:",
 	"search-interwiki-more": "(meh)",
 	"search-relatedarticle": "Verwandti",
 	"searchrelated": "verwandt",
 	"searchall": "alli",
 	"showingresults": "Do {{PLURAL:$1|isch '''1''' Ergebnis|sin '''$1''' Ergebniss}}, s fangt aa mit dr Nummerer '''$2.'''",
+	"showingresultsinrange": "Uf der Liste {{PLURAL:$1|isch <strong>ei</strong> Kategorie|sy <strong>$1</stong> Kategorië}} vo Nummere <strong>$2</strong> bis <strong>$3</strong>.",
 	"search-showingresults": "{{PLURAL:$4|Ergebnis <strong>$1</strong> vu <strong>$3</strong>|Ergebnis <strong>$1 bis $2</strong> vu <strong>$3</strong>}}",
 	"search-nonefound": "Fir Dyyni Suechaafrog sin keini Ergebniss gfunde wore.",
 	"powersearch-legend": "Erwytereti Suech",
@@ -876,12 +891,14 @@
 	"powersearch-togglelabel": "Wehl uus:",
 	"powersearch-toggleall": "Alli",
 	"powersearch-togglenone": "Keini",
+	"powersearch-remember": "Uswahl für zuekünftigi Suechine merke",
 	"search-external": "Externi Suech",
 	"searchdisabled": "D {{SITENAME}}-Suech isch deaktiviert. Du chasch mit Google sueche, s cha aber syy ass dr Suechindex vu Google fir {{SITENAME}} veraltet isch.",
 	"search-error": "Bi dr Suechi het s e Fähler gee: $1",
 	"preferences": "Yystellige",
 	"mypreferences": "Yystellige",
 	"prefs-edits": "Aazahl vu dr Bearbeitige:",
+	"prefsnologintext2": "Bitte mäld di a, für Ystellige z ändere.",
 	"prefs-skin": "Benutzeroberflechi",
 	"skin-preview": "Vorschou",
 	"datedefault": "kei Aagab",
@@ -890,6 +907,11 @@
 	"prefs-personal": "Benutzerdate",
 	"prefs-rc": "Letschti Änderige",
 	"prefs-watchlist": "Beobachtigslischte",
+	"prefs-editwatchlist": "Beobachtigslisten ändere",
+	"prefs-editwatchlist-label": "Yträg uf dyre Beobachtigslisten ändere:",
+	"prefs-editwatchlist-edit": "Normal bearbeite",
+	"prefs-editwatchlist-raw": "Imene groosse Textfäld bearbeite",
+	"prefs-editwatchlist-clear": "Beobachtigsliste lääre",
 	"prefs-watchlist-days": "Aazahl vu dr Täg, wu d Beobchtigslischt standardmässig soll umfasse:",
 	"prefs-watchlist-days-max": "Maximal {{PLURAL:$1|ei Tag|$1 Täg}}",
 	"prefs-watchlist-edits": "Maximali Zahl vu dr Yyträg:",
@@ -907,7 +929,8 @@
 	"rows": "Zylene",
 	"columns": "Spaltene",
 	"searchresultshead": "Suech-Ergäbnis",
-	"stub-threshold": "Gleichformatierig <a href=\"#\" class=\"stub\">vu chleine Syte</a> (in Byte):",
+	"stub-threshold": "Spezielli Darstellig ($1) für Links uf chlyni Syte bis zu’re bestimmte Gröössi (i Bytes):",
+	"stub-threshold-sample-link": "Byspil",
 	"stub-threshold-disabled": "Deaktiviert",
 	"recentchangesdays": "Aazahl vu dr Täg, wu d Lischt vu dr  „Letschte Änderige“ standardmässig soll umfasse:",
 	"recentchangesdays-max": "(Maximal $1 {{PLURAL:$1|Tag|Täg}})",
@@ -953,15 +976,15 @@
 	"prefs-help-signature": "Byyträg uf Diskussionssyte sotte mit „<nowiki>~~~~</nowiki>“ unterschribe wäre, was derno in d Unterschrift mit eme Zytstämpfel umgwandlet wird.",
 	"badsig": "Dr Syntax vu dr Signatur isch nid giltig; bitte d HTML iberpriefe.",
 	"badsiglength": "Dyyni Unterschrift isch z lang. Si derf hegschtens $1 {{PLURAL:$1|Zeiche|Zeiche}} lang syy.",
-	"yourgender": "Wie witt gärn bschribe wäre?",
-	"gender-unknown": "Ich wett doderzue kei Aagab mache",
-	"gender-male": "Är schafft an Syte",
-	"gender-female": "Si schafft an Syte",
-	"prefs-help-gender": "Optional: bruucht fir gschlächtsspezifischi Adrässierig dur d Software. Die Information isch effentlig.\n\nDes isch e frejwilligi Aagab. D Software brucht si go Di aarede un as Hiiwys fir anderi dur d Verwändig vum grammatische Gschlächt. Die Information isch effetli.",
+	"yourgender": "Wie sölle Systemmäldigen über di brichte?",
+	"gender-unknown": "«Der Benutzer», «der {dy Name}», «syni Bearbeitig», «är schrybt» etc.",
+	"gender-male": "«Der Benutzer», «der {dy Name}», «syni Bearbeitig», «är schrybt» etc.",
+	"gender-female": "«D Benutzerin», «d {dy Name}», «iri Bearbeitig», «si schrybt» etc.",
+	"prefs-help-gender": "* Die Agab isch freiwillig. D Software bruucht se, für di mit em korräkte grammatische Genus azrede oder gägenüber anderne z erwähne. Die Information isch öffetlech z gseh.\n\n* By der ersten Option wird ds generische Maskulinum azeigt. Es chunt also uf ds Glychen use, wi we me di dritti Option wählt.",
 	"email": "E-Mail",
-	"prefs-help-realname": "* <strong>Dyy ächte Name</strong> (optional): Wänn du wetsch, ass Dyyni Änderige uf Dii chenne zruckgfierd wäre.",
+	"prefs-help-realname": "Der ächt Namen isch optional.\nWe d’nen agisch, de lö sech dyni Byträg uf di la zrüggfüere.",
 	"prefs-help-email": "D Aagab vun ere E-Mail isch optional, macht aber s Zueschicke vun eme Ersatzpasswort meglig, wänn Du dyy Passwort vergässe hesch.",
-	"prefs-help-email-others": "Mit andere Benutzer chasch au iber d Benutzerdiskussionssyte Kontakt ufneh, ohne dass Du dyy Identitet muesch uffelege.",
+	"prefs-help-email-others": "Ussertdäm chasch es zuela, das anderi dir über’ne Link uf dym Wikipedia-Konto (Benutzersyte) es E-Mail chöü schicke.\nDyni E-Mail-Adrässen überchöme si derby nid z gseh.",
 	"prefs-help-email-required": "S brucht e giltigi E-Mail-Adräss.",
 	"prefs-info": "Basisinformatione",
 	"prefs-i18n": "Internationalisierig",
@@ -969,25 +992,31 @@
 	"prefs-dateformat": "Datumsformat",
 	"prefs-timeoffset": "Zytunterschid",
 	"prefs-advancedediting": "Allgmeini Optione",
+	"prefs-editor": "Bearbeitigsfänster",
+	"prefs-preview": "Vorschou",
 	"prefs-advancedrc": "Erwytereti Optione",
 	"prefs-advancedrendering": "Erwytereti Optione",
 	"prefs-advancedsearchoptions": "Erwytereti Optione",
 	"prefs-advancedwatchlist": "Erwytereti Optione",
 	"prefs-displayrc": "Aazeigoptione",
 	"prefs-displaywatchlist": "Aazeigoptione",
+	"prefs-tokenwatchlist": "Schlüssel für persönleche Webfeed",
 	"prefs-diffs": "Versionsverglych",
+	"prefs-help-prefershttps": "Die Ystellig würkt sech uus, we du di ds nächste Mal amäldisch.",
+	"prefswarning-warning": "Du hesch Ystellige g’änderet wo no nid gspycheret sy.\nWe du die Syte verlasch, ohni uf «$1» z drücke, de gö die Änderige verlore.",
+	"prefs-tabs-navigation-hint": "Tipp: Mit der linggen u der rächte Pfyltaste chasch zwüsche de Tabs wächsle.",
 	"email-address-validity-valid": "Siht giltig uus",
 	"email-address-validity-invalid": "S brucht e giltigi Adräss!",
 	"userrights": "Benutzerrächtsverwaltig",
 	"userrights-lookup-user": "Verwalt d Gruppezuegherigkeit",
 	"userrights-user-editname": "Benutzername:",
 	"editusergroup": "Ändere vo Benutzerrächt",
-	"editinguser": "Am Ändere vu dr Benutzerrächt vu '''[[User:$1|$1]]''' $2",
-	"userrights-editusergroup": "Bearbeit d Gruppezuegherigkeit vum Benutzer",
-	"saveusergroups": "Spychere d Gruppezuegherigkeit",
+	"editinguser": "{{GENDER:$1|Em <strong>[[User:$1|$1]]</strong> $2 syni Rächt|Der <strong>[[User:$1|$1]]</strong> $2 iri Rächt|Rächt vo <strong>[[User:$1|$1]]</strong> $2}} bearbeite",
+	"userrights-editusergroup": "Gruppezuegherigkeit bearbeite",
+	"saveusergroups": "Gruppezuegherigkeit spychere",
 	"userrights-groupsmember": "Mitgliid vu:",
 	"userrights-groupsmember-auto": "Automatisch Mitglid vu:",
-	"userrights-groups-help": "Du chasch d Gruppezuegherigkeit fir dää Benutzer ändere:\n* E markiert Chäschtli bedytet, ass dr Benutzer Mitgliid vu däre Gruppe isch\n* E * bedytet, ass Du s Benutzerrächt nit wider chasch zruckneh, wänn s erteilt isch (oder umgchehrt).",
+	"userrights-groups-help": "Du chasch {{GENDER:$1|däm Benutzer syni|dere Benutzerin iri|dere Person iri}} Gruppezueghörigkeit ändere:\n* Es markierts Chästli bedütet, das {{GENDER:$1|der Benutzer|d Benutzerin|d Person}} zur Gruppe ghört.\n* Es nid markierts Chästli bedütet, das {{GENDER:$1|der Benutzer|d Benutzerin|d Person}} nid zur Gruppe ghört.\n* Es Stärnli «*» nach emne Gruppename zeigt a, das du die Gruppezueghörigkeit zwar chasch ändere, aber das du ein Änderig nümm chasch rückgängig mache.",
 	"userrights-reason": "Grund:",
 	"userrights-no-interwiki": "Du hesch nit d Berächtigung, Benutzerrächt in andere Wiki z ändere.",
 	"userrights-nodatabase": "D Datebank $1 git s nit oder si isch nit lokal.",
@@ -995,6 +1024,8 @@
 	"userrights-notallowed": "Du hesch nit d Berächtigung zum Benutzerrächt vergee oder ewägnee.",
 	"userrights-changeable-col": "Gruppezuegherigkeit, wu Du chasch ändere",
 	"userrights-unchangeable-col": "Gruppezuegherigkeit, wu Du nit chasch ändere",
+	"userrights-conflict": "Di veränderete Rächt göh nid uuf! Bitte lueg d Änderige düren u tue se nomal spychere.",
+	"userrights-removed-self": "Du hesch dir di eigete Rächt erfolgrych furtgnoh. Drum hesch kei Zuegriff meh uf die Syte.",
 	"group": "Grupp:",
 	"group-user": "Benutzer",
 	"group-autoconfirmed": "Bstetigti Benutzer",
@@ -1024,6 +1055,7 @@
 	"right-move": "Syte verschiebe",
 	"right-move-subpages": "Syte verschiebe mitsamt dr Untersyte",
 	"right-move-rootuserpages": "Haupt-Benutzersyte verschiebe",
+	"right-move-categorypages": "Kategoriesyte verschiebe",
 	"right-movefile": "Dateie verschiebe",
 	"right-suppressredirect": "Bim Verschiebe s Aalege vun ere Wyterleitig unterdrucke",
 	"right-upload": "Dateie uffelade",
@@ -1045,7 +1077,8 @@
 	"right-deletedtext": "Gleschti Text un Versionsunterschid zwische gleschte Versionen aaluege",
 	"right-browsearchive": "Gleschti Syte sueche",
 	"right-undelete": "Syte widerherstelle",
-	"right-suppressrevision": "Versione, wu au vor Ammanne verborge sin, aaluege un widerherstelle",
+	"right-suppressrevision": "Bestimmti Versione vor allne Lüt verstecke, wider füre holen oder aluege.",
+	"right-viewsuppressed": "Vor allne Lüt versteckti Versionen aluege",
 	"right-suppressionlog": "Privati Logbiecher aaluege",
 	"right-block": "Benutzer sperre (Schrybrächt)",
 	"right-blockemail": "Benutzer am Verschicke vu E-Mail hindere",
@@ -1054,11 +1087,20 @@
 	"right-proxyunbannable": "Uusnahm vu automatische Proxysperrine",
 	"right-unblockself": "Sich sälber entsperre",
 	"right-protect": "Syteschutzstatus änderen un kaskadegschitzti Syte bearbeite",
-	"right-editprotected": "Gschitzti Syte bearbeite (ohni Kaskadeschutz)",
+	"right-editprotected": "Mit «{{int:protect-level-sysop}}» gschützti Syten ändere",
+	"right-editsemiprotected": "Mit «{{protect-level-autoconfirmed}}» gschützti Syten ändere",
+	"right-editcontentmodel": "Inhaltsmodäll vo’re Syten ändere",
 	"right-editinterface": "Benutzerinterface bearbeite",
 	"right-editusercssjs": "Bearbeite vu CSS- und JS-Dateie vu andere Benutzer",
 	"right-editusercss": "Bearbeite vu CSS-Dateie vu andere Benutzer",
 	"right-edituserjs": "Bearbeite vu JS-Dateie vu andere Benutzer",
+	"right-editmyusercss": "Dyni eigete CSS-Dateien ändere",
+	"right-editmyuserjs": "Eigeti JavaScript-Dateie bearbeite",
+	"right-viewmywatchlist": "Eigeti Beobachtigslisten aluege",
+	"right-editmywatchlist": "Eigeti Beobachtigslisten ändere. Ou ohni das Rächt chöme dür’nes paar Aktione Syten uf d Beobachtigsliste.",
+	"right-viewmyprivateinfo": "Eigeti privati Daten aluege (byspilswys E-Mail-Adrässe, ächte Name)",
+	"right-editmyprivateinfo": "Eigeti privati Daten ändere (byspilswys E-Mail-Adrässe, ächte Name)",
+	"right-editmyoptions": "Eigeti Ystelligen ändere",
 	"right-rollback": "D Bearbeitige vum letschte Benutzer, wu ne einzelni Syte bearbeitet het, schnell zrucksetze",
 	"right-markbotedits": "Schnell zruckgsetzti Bearbeitige as Bot-Bearbeitig markiere",
 	"right-noratelimit": "Kei Bschränkig dur Limit",
@@ -1075,6 +1117,9 @@
 	"right-override-export-depth": "Exportier Syte mitsamt dr vergleichte Syte bis zuen ere Tiefi vu 5",
 	"right-sendemail": "E-Mail an anderi Benutzer schicke",
 	"right-passwordreset": "Passwort vun eme Benutzer zruggsetze",
+	"right-managechangetags": "[[Special:Tags|Markierigen]] ir Datebank schaffen oder lösche",
+	"right-applychangetags": "Zäme mit den eigeten Änderige [[Special:Tags|Markierigen]] abringe",
+	"right-changetags": "Beliebigi [[Special:Tags|Markierige]] by einzelne Versionen oder Logbuechyträg derzuetue oder lösche",
 	"newuserlogpage": "Nejaamäldigs-Logbuech",
 	"newuserlogpagetext": "Des isch e Logbuech fir nej aagleiti Benutzerchonte.",
 	"rightslog": "Benutzerrächt-Logbuech",
@@ -1084,10 +1129,12 @@
 	"action-createpage": "Syten aazlege",
 	"action-createtalk": "Diskussionssyten aazlege",
 	"action-createaccount": "e Benutzerkonto aazlege",
+	"action-history": "d Versionegschicht vo dere Syten azluege",
 	"action-minoredit": "die Bearbeitig as chlei z markiere",
 	"action-move": "die Syte z verschiebe",
 	"action-move-subpages": "die Syte un di zuegherige Untersyte z verschiebe",
 	"action-move-rootuserpages": "Haupt-Benutzersyte z verschiebe",
+	"action-move-categorypages": "Kategoriesyte z verschiebe",
 	"action-movefile": "Die Datei verschiebe",
 	"action-upload": "Dateie uffezlade",
 	"action-reupload": "die vorhandene Datei z iberschryybe",
@@ -1114,11 +1161,21 @@
 	"action-userrights-interwiki": "d Rächt vu Benutzer in andere Wiki z ändere",
 	"action-siteadmin": "d Datebank z sperre oder frejzgee",
 	"action-sendemail": "E-Mail z schicke",
+	"action-editmywatchlist": "dyni Beobachtigsliste z ändere",
+	"action-viewmywatchlist": "dyni Beobachtigslisten azluege",
+	"action-viewmyprivateinfo": "dyni privati Information azluege",
+	"action-editmyprivateinfo": "dyni privati Information z ändere",
+	"action-editcontentmodel": "ds Inhaltsmodäll vo dere Syte z ändere",
+	"action-managechangetags": "Marierigen ir Databank z schaffen oder z lösche",
+	"action-applychangetags": "zäme mit dynen Änderige Markierigen azbringe",
+	"action-changetags": "beliebigi Markierige by einzelne Versionen oder Logbuechyträg derzueztue oder z lösche",
 	"nchanges": "$1 {{PLURAL:$1|Änderig|Änderige}}",
+	"enhancedrc-since-last-visit": "{{PLURAL:$1|$1}} syt em letste Bsuech",
 	"enhancedrc-history": "Versionsgschicht",
 	"recentchanges": "Letschti Änderige",
 	"recentchanges-legend": "Optione vu dr Aazeig",
 	"recentchanges-summary": "Uf däre Syte chasch di letschte Änderige in däm Wiki aaluege.",
+	"recentchanges-noresult": "Im usgwählte Zytruum het’s kener Änderige ’gä.",
 	"recentchanges-feed-description": "Di letschten Änderige vo {{SITENAME}} i däm Feed abonniere.",
 	"recentchanges-label-newpage": "Mit däre Bearbeitig isch e neji Syte aagleit wore",
 	"recentchanges-label-minor": "Des isch e chleini Änderig",
@@ -1127,7 +1184,7 @@
 	"recentchanges-label-plusminus": "Di gänderet Sytegreßi (Aazahl in Byte)",
 	"recentchanges-legend-heading": "'''Legänd:'''",
 	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (lueg au d [[Special:NewPages|Lischt vu neie Syte]])",
-	"rcnotefrom": "Des sin d Ändrige syter <b>$2</b> (bis zem <b>$1</b> zeigt).",
+	"rcnotefrom": "Azeigt {{PLURAL:$5|isch d Änderig|sy maximal <strong>$1</strong> Änderige}} syt <strong>$3, $4</strong>.",
 	"rclistfrom": "Nume Änderige syt $3, $2 Uhr zeige.",
 	"rcshowhideminor": "Chlynigkeite $1",
 	"rcshowhideminor-show": "aazeige",
@@ -1156,8 +1213,8 @@
 	"newpageletter": "N",
 	"boteditletter": "B",
 	"number_of_watching_users_pageview": "[$1 {{PLURAL:$1|Benutzer, wu beobachtet|Benutzer, wu beobachte}}]",
-	"rc_categories": "Nume Syten us dr Kategorie (trennt mit „|“):",
-	"rc_categories_any": "Alli",
+	"rc_categories": "Nume Syten us bestimmte Kategorie (mit «|» trenne):",
+	"rc_categories_any": "Beliebigi vo den usgwählte",
 	"rc-change-size-new": "$1 {{PLURAL:$1|Byte|Byte}} no dr Änderig",
 	"newsectionsummary": "Neje Abschnitt /* $1 */",
 	"rc-enhanced-expand": "Detail aazeige",
@@ -1175,15 +1232,15 @@
 	"reuploaddesc": "Abbrächen un zrugg zue dr Syte \"Uffelade\"",
 	"upload-tryagain": "Gändereti Dateibschryybig abschicke",
 	"uploadnologin": "Nit aagmäldet",
-	"uploadnologintext": "Si mien [[Special:UserLogin|aagmäldet syy]], zum Dateie uffelade z chenne.",
+	"uploadnologintext": "Für Dateien ufezlade, muesch di $1.",
 	"upload_directory_missing": "S Upload-Verzeichnis ($1) fählt un het au dur dr Netzserver nit chenne aagleit wäre.",
 	"upload_directory_read_only": "Dr Netzserver het kei Schryybrächt fir s Upload-Verzeichnis ($1).",
 	"uploaderror": "Fähler bim Uffelade",
 	"upload-recreate-warning": "'''Warnig: E Datei mit däm Name isch scho mol glescht oder verschobe wore.'''\n\nDo het s e Uuszug us em Lesch- un eme Verschiebigslogbuech:",
 	"uploadtext": "Verwänd des Formular unte zum Dateie uffelade.\nZum friejer uffegladeni Dateie aazluege oder z sueche lueg uf dr [[Special:FileList|Lischt vu uffegladene Dateie]],\nWeli Dateie uffeglade sin, sihsch im [[Special:Log/upload|Logbuech vu dr uffegladene Dateie]], weli glescht sin im [[Special:Log/delete|Lesch-Logbuech]]\n\nZum e Datei oder e Bild in ere Syte yyzböue, schryybsch eifach:\n* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.jpg]]</nowiki>''' fir di voll Version vu dr Datei\n* '''<nowiki>[[</nowiki>{{ns:file}}<nowiki>:file.png|al text]]</nowiki>''' fir e 200 Pixel grossi Version im e Chaschte mit 'alt text' as Bschrybig\n* '''<code><nowiki>[[</nowiki>{{ns:media}}<nowiki>:File.ogg]]</nowiki></code>''' fir e diräkt Link zuer dr Datei ohni ass si aazeigt wird",
-	"upload-permitted": "Dateitype, wu erlaubt sin: $1.",
-	"upload-preferred": "Dateitype, wu bevorzugt sin: $1.",
-	"upload-prohibited": "Dateitype, wu nit erlaubt sin: $1.",
+	"upload-permitted": "{{PLURAL:$2|Dateityp, wu erlaubt isch|Dateitype, wu erlaubt sin}}: $1.",
+	"upload-preferred": "{{PLURAL:$2|Dateityp, wu bevorzugt isch|Dateitype, wu bevorzugt sin}}: $1.",
+	"upload-prohibited": "{{PLURAL:$2|Dateityp, wu nit erlaubt isch|Dateitype, wu nit erlaubt sin}}: $1.",
 	"uploadlogpage": "Dateie-Logbuech",
 	"uploadlogpagetext": "Des isch s Logbuech vu dr uffegladene Dateie.\nLueg au d [[Special:NewFiles|Galerii vu neije Dateie]] fir e visuälle Iberblick.",
 	"filename": "Dateiname",
@@ -1219,15 +1276,16 @@
 	"largefileserver": "Die Datei isch gresser wie die vum Server yygstellti Maximalgressi.",
 	"emptyfile": "Di uffeglade Datei isch schyyns läär. Dr Grund cha ne Tippfähler im Dateiname syy. Bitte iberprief, eb du die Datei wirkli wit uffelade.",
 	"windows-nonascii-filename": "Des Wiki unterstitzt kei Dateinäme mit Sonderzeiche.",
-	"fileexists": "S git scho ne Datei mit däm Name.\nWänn Du uf \"Datei spichere\" drucksch, no wird die Datei iberschribe.\nBitte prief <strong>[[:$1]]</strong>, wänn Der nit sicher bisch.\n[[$1|thumb]]",
+	"fileexists": "Es git scho’ne Datei mit däm Name. Bitte prüeff <strong>[[:$1]]</strong>, we d’ nid sicher bisch, öb {{GENDER:|d’}} se wosch ändere.\n[[$1|thumb]]",
 	"filepageexists": "E Bschryybigssyte isch scho as <strong>[[:$1]]</strong> aagleit wore, s git aber kei Datei mit däm Name.\nDie Zämmefassig, wu Du yygee hesch, wird nit uf d Bschryybigssyte ibernuh.\nDu muesch d Bschryybigssyte noch em Uffelade vu dr Datei no manuäll bearbeite.\n[[$1|thumb]]",
-	"fileexists-extension": "S git scho ne Datei mit eme ähnlige Name: [[$2|thumb]]\n* Name vu Datei, wu soll uffeglade were: <strong>[[:$1]]</strong>\n* Name vu dr Datei, wu s scho git: <strong>[[:$2]]</strong>\nBitte wehl e andre Name.",
+	"fileexists-extension": "S git scho ne Datei mit eme ähnlige Name: [[$2|thumb]]\n* Name vu Datei, wu soll uffeglade were: <strong>[[:$1]]</strong>\n* Name vu dr Datei, wu s scho git: <strong>[[:$2]]</strong>\nVilech wosch en eidütigere Name bruuche?",
 	"fileexists-thumbnail-yes": "Die Datei isch schyyns e Bild mit ere verringerte Gressi ''(thumbnail)''. [[$1|thumb]]\nBitte prief d Datei <strong>[[:$1]]</strong>.\nWänn s Bild in dr Originalgressi isch, no isch s nit netig, ass e extra Vorschaubild uffeglade wird.",
 	"file-thumbnail-no": "Dr Dateiname fangt mit <strong>$1</strong> aa. Des wyyst uf e Bild mit ere verringerte Gressi ''(thumbnail)'' hi.\nBitte prief, eb D s Bild in voller Uflesig vorlige hesch un lad derno des unter em Originalname uffe.",
 	"fileexists-forbidden": "S git scho ne Datei mit däm Name. Si cha nit iberschribe wäre. Bitte gang zruck un lad die Datei unter eme andere Name uffe. [[File:$1|thumb|center|$1]]",
 	"fileexists-shared-forbidden": "S git scho ne Datei mit däm Name im Zentrale Mediearchiv.\nWänn Du die Datei einewäg wit uffelade, gang bitte zruck un ändere dr Name.\n[[File:$1|thumb|center|$1]]",
 	"file-exists-duplicate": "Die Datei isch e Duplikat vu {{PLURAL:$1|däre Datei|däne $1 Dateie}}:",
 	"file-deleted-duplicate": "E identischi Version vu däre Datei ([[:$1]]) isch friejer scho mol glescht wore. Iberprief s Leschlogbuech, voreb Du si uffeladesch.",
+	"file-deleted-duplicate-notitle": "En idäntischi Datei isch chürzlech glöscht u der Titel underdrückt worde.\nFür d Situation vor em Wider-Ufelade z prüeffe, söttsch öpper frage, wo di underdrückte Dateidate cha aluege.",
 	"uploadwarning": "Warnig",
 	"uploadwarning-text": "Bitte tue unte d Dateibsschryybig ändere un versuech s nomol.",
 	"savefile": "Datei spychere",
@@ -1236,6 +1294,20 @@
 	"uploaddisabledtext": "S Uffelade vu Dateie isch deaktiviert.",
 	"php-uploaddisabledtext": "S Uffelade vu PHP-Dateie isch deaktiviert wore. Bitte iberprief d file_uploads-Yystellig.",
 	"uploadscripted": "In däre Datei git s HTML- oder Scriptcode, wu fälschligerwyys vun eme Webbrowser usgfiert chennt were.",
+	"upload-scripted-pi-callback": "E Datei mit Verarbeitigsbefählen imnen XML-Stylesheet cha me nid ufelade.",
+	"uploaded-script-svg": "Ir ufegladnigen SVG-Datei het’s ds Skript-Elemänt «$1».",
+	"uploaded-hostile-svg": "Im Style-Elemänt vor ufegladnigen SVG-Datei het’s unsichers CSS.",
+	"uploaded-event-handler-on-svg": "I SVG-Dateien isch ds Event-Handler-Attribut <code>$1=\"$2\"</code> nid erloubt.",
+	"uploaded-href-attribute-svg": "I SVG-Dateien isch ds href-Attribut <code>&lt;$1 $2=\"$3\"&gt;</code> mit emne nid-lokale Zil (byspilswys http://, javascript: etc.) nid erloubt.",
+	"uploaded-href-unsafe-target-svg": "Ir ufegladnige SVG-Datei het’s es href uf ds unsichere Zil <code>&lt;$1 $2=\"$3\"&gt;</code>.",
+	"uploaded-animate-svg": "Ir ufegladnigen SVG-Datei het’s en «animate»-Tag, wo über ds «from»-Attribut <code>&lt;$1 $2=\"$3\"&gt;</code> chönnt href ändere.",
+	"uploaded-setting-event-handler-svg": "Ir ufegladnigen SVG-Datei het’s ds Event-Handler-Attribut <code>&lt;$1 $2=\"$3\"&gt;</code>. Event-Handler-Attribut sy nid erloubt.",
+	"uploaded-setting-href-svg": "Es isch nid erloubt, mit emne «set»-Tag es «href»-Attribut zumenen übergordneten Elemänt derzue z tue.",
+	"uploaded-wrong-setting-svg": "Ir ufegladnigen SVG-Datei git e «set»-Tag emnen Attribut es externs Zil oder es Daten- oder Script-Zil: <code>&lt;set to=\"$1\"&gt;</code>. Das isch nid erloubt.",
+	"uploaded-setting-handler-svg": "Ir ufegladnigen SVG-Datei het’s es «handler»-Attribut mit Externem/Date/Script: <code>$1=\"$2\"</code>. Das isch nid erloubt.",
+	"uploaded-remote-url-svg": "Ir ufegladnigen SVG-Datei het’s es Style-Attribut mit emnen externen URL: <code>$1=\"$2\"</code>. Das isch nid erloubt.",
+	"uploaded-image-filter-svg": "Ir ufegladnigen SVG-Datei het’s e Bildfilter mit emnen URL: <code>&lt;$1 $2=\"$3\"&gt;</code>.",
+	"uploadscriptednamespace": "I deren SVG-Datei het’s der illegal Namensruum «$1».",
 	"uploadinvalidxml": "S XML in dr uffegladene Datei het nit chenne parst wäre.",
 	"uploadvirus": "In däre Datei het s e Virus! Detail: $1",
 	"uploadjava": "Des isch e ZIP-Datei, wu s e CLASS-Datei vu Java din het.\nS Uffelade vu Java-Dateien isch nit gstattet, wel si s Umgoh vu Sicherheitsyyschränkige chennte megli mache.",
@@ -1264,6 +1336,19 @@
 	"upload-too-many-redirects": "In dr URL het s zvyl Wyterleitige",
 	"upload-http-error": "E HTTP-Fähler isch ufträtte: $1",
 	"upload-copy-upload-invalid-domain": "As Kopi uffeladbari Dateie sin iber die Domain nit verfiegbar.",
+	"upload-dialog-title": "Datei ufelade",
+	"upload-dialog-error": "Es het e Fähler ’gä",
+	"upload-dialog-warning": "Es het e Warnig ’gä",
+	"upload-dialog-button-cancel": "Abbräche",
+	"upload-dialog-button-done": "Fertig",
+	"upload-dialog-button-save": "Spychere",
+	"upload-dialog-button-upload": "Ufelade",
+	"upload-dialog-label-select-file": "Datei ussueche",
+	"upload-dialog-label-infoform-title": "Details",
+	"upload-dialog-label-infoform-name": "Name",
+	"upload-dialog-label-infoform-description": "Beschrybig",
+	"upload-dialog-label-usage-title": "Verwändig",
+	"upload-dialog-label-usage-filename": "Dateiname",
 	"backend-fail-stream": "D Datei $1 het nit chenne ibertrait wäre.",
 	"backend-fail-backup": "D Datei $1 het nit chenne gsicheret wäre.",
 	"backend-fail-notexists": "D Datei $1 git s nit.",
@@ -1337,11 +1422,14 @@
 	"license": "Lizänz:",
 	"license-header": "Lizänzierig",
 	"nolicense": "kei Voruswahl",
+	"licenses-edit": "Linzänzoptionen ändere",
 	"license-nopreview": "(s isch kei Vorschau verfiegbar)",
-	"upload_source_url": " (giltige, effentli zuegänglig URL)",
-	"upload_source_file": " (e Datei uf Dyynem Computer)",
+	"upload_source_url": " (usgsuechti Datei vomne gültige, öffetlech zuegänglechen URL)",
+	"upload_source_file": "(dyni usgsuechti Datei vo dym Computer)",
+	"listfiles-delete": "lösche",
 	"listfiles-summary": "Die Spezialsyte lischtet alli uffegladene Dateie uf.",
 	"listfiles_search_for": "Suech noch Datei:",
+	"listfiles-userdoesnotexist": "Ds Konto «$1» isch nid registriert.",
 	"imgfile": "Datei",
 	"listfiles": "Lischte vo Bilder",
 	"listfiles_thumb": "Vorschaubilder",
@@ -1351,6 +1439,10 @@
 	"listfiles_size": "Gressi",
 	"listfiles_description": "Bschryybig",
 	"listfiles_count": "Versione",
+	"listfiles-show-all": "Alti Versione vom Bild yschliesse",
+	"listfiles-latestversion": "Aktuelli Version",
+	"listfiles-latestversion-yes": "Ja",
+	"listfiles-latestversion-no": "Nei",
 	"file-anchor-link": "Bildli",
 	"filehist": "Dateiversione",
 	"filehist-help": "Klick uf e Zytpunkt zu aazeige, wie s dert usgsäh het.",
@@ -1409,16 +1501,24 @@
 	"filedelete-maintenance": "S Leschen un Widerhärstelle vu Dateie isch wäge Wartigsarbete e Zytlang deaktiviert.",
 	"filedelete-maintenance-title": "D Datei cha nit glescht wäre.",
 	"mimesearch": "MIME-Suechi",
-	"mimesearch-summary": "Uf däre Spezialsyte chenne d Dateie noch em MIME-Typ gfilteret wäre. In dr Yygob muess es alliwyl dr Medie- un Subtyp din haa: <code>image/jpeg</code> (lueg Bildbschryybigssyte).",
+	"mimesearch-summary": "Uf däre Spezialsyte chenne d Dateie noch em MIME-Typ gfilteret wäre. In dr Yygob muess es alliwyl dr Medie- un Subtyp din haa, byspilswys <code>image/jpeg</code> oder <code>image/*</code> (lueg Bildbschryybigssyte).",
 	"mimetype": "MIME-Typ:",
 	"download": "Abelade",
 	"unwatchedpages": "Unbeobachteti Sytene",
 	"listredirects": "Lischte vo Wyterleitige (Redirects)",
+	"listduplicatedfiles": "Liste vo Dateie mit Duplikat",
+	"listduplicatedfiles-summary": "Das isch e Liste vo Dateie, wo di aktuelli Version idäntisch isch mit der aktuelle Version von eren andere Datei. Nume lokali Dateie sy berücksichtiget.",
+	"listduplicatedfiles-entry": "[[:File:$1|$1]] het [[$3|{{PLURAL:$2|eis|$2}} Duplikat]]",
 	"unusedtemplates": "Nid bruuchti Vorlage",
 	"unusedtemplatestext": "Die Syte lischtet alli Syten im {{ns:template}}-Namensruum uf, wu nit in andere Syte yybunden sin.\nIberprief anderi Link zue dr Vorlage, voreb Du die leschesch.",
 	"unusedtemplateswlh": "Anderi Link",
 	"randompage": "Zuefalls-Artikel",
 	"randompage-nopages": "S het kei Syte in {{PLURAL:$2|däm Namensruum|däne Namensryym}}:  $1.",
+	"randomincategory": "Zuefälligi Syten us ere Kategorie",
+	"randomincategory-invalidcategory": "«$1» isch ke gültigi Kategoriename.",
+	"randomincategory-nopages": "Ir Kategorie [[:Category:$1|$1]] het’s kener Syte.",
+	"randomincategory-category": "Kategorie:",
+	"randomincategory-legend": "Zuefälligi Syten us ere Kategorie",
 	"randomincategory-submit": "Gang",
 	"randomredirect": "Zuefälligi Wyterleitig",
 	"randomredirect-nopages": "Im Namensruum „$1“ sin kei Wyterleitige vorhande.",
@@ -1441,10 +1541,12 @@
 	"pageswithprop-text": "Die Spezialsyte lischet Syten auf, wu ne bstimmti Syteneigeschaft bruche.",
 	"pageswithprop-prop": "Eigeschaftsname:",
 	"pageswithprop-submit": "Gang ane",
+	"pageswithprop-prophidden-long": "Syteneigeschaften über $1 kB sy nid azeigt",
+	"pageswithprop-prophidden-binary": "Eigeschaftswärte mit Binärdate sy versteckt ($1)",
 	"doubleredirects": "Doppleti Wyterleitige (Redirects)",
 	"doubleredirectstext": "Die Lischt zeigt Wyterleitige, wu uf anderi Wyterleitige verwyyse.\nIn jedere Zyylete het s Link zue dr erschte un dr zwote Wyterleitig un s Ziil vu dr zwote Wyterleitig, wu normalerwys di gwinscht Ziilsyten isch. Do sott eigetli scho di erscht Wyterleitig druf zeige.\n<del>Durgstricheni</del> Yytreg sin scho erledigt wore.",
-	"double-redirect-fixed-move": "doppleti Wyterleitig ufglest: [[$1]] → [[$2]]",
-	"double-redirect-fixed-maintenance": "Di dopplet Wyterleitig vu [[$1]] no [[$2]] isch ufglest wore.",
+	"double-redirect-fixed-move": "D Syte [[$1]] isch verschobe.\nUnder irem Namen isch automatisch e Wyterleitig uf [[$2]] agleit worde.",
+	"double-redirect-fixed-maintenance": "Doppleti Wyterleitig vo [[$1]] uf [[$2]] automatisch in ere Wartigsarbeit gflickt.",
 	"double-redirect-fixer": "DoubleRedirectBot",
 	"brokenredirects": "Kaputti Wyterleitige",
 	"brokenredirectstext": "Die Spezialsyte lischtet Wyterleitige uf, wu zue Artikel fiere, wu s gar nid git:",
@@ -1460,6 +1562,7 @@
 	"ninterwikis": "{{PLURAL:$1|Ei Interwikilink|$1 Interwikilink}}",
 	"nlinks": "$1 {{PLURAL:$1|Link|Links}}",
 	"nmembers": "$1 {{PLURAL:$1|Syte|Sytene}}",
+	"nmemberschanged": "$1 → $2 {{PLURAL:$2|Syte}}",
 	"nrevisions": "$1 {{PLURAL:$1|Revision|Revisione}}",
 	"nimagelinks": "Brucht uf $1 {{PLURAL:$1|Syte|Syte}}",
 	"ntransclusions": "brucht uf $1 {{PLURAL:$1|Syte|Syte}}",
@@ -1474,33 +1577,49 @@
 	"unusedimages": "Verwaiste Bilder",
 	"wantedcategories": "Bruuchti Kategorie, wo s no nid git",
 	"wantedpages": "Artikel, wo fähle",
+	"wantedpages-summary": "Liste vo de meist-verlinkte Syte, wo’s nid git. Nid derby sy Syte, wo nume Wyterleitige druf verlinke. Syte, wo’s nid git u wo Wyterleitige druf verlinke, sy i der [[{{#special:BrokenRedirects}}|Liste vo kabutte Wyterleitige]] z finde.",
 	"wantedpages-badtitle": "Nit giltige Titel im Ergebnis: $1",
 	"wantedfiles": "Dateie, wu fähle",
 	"wantedfiletext-cat": "Die Dateie wäre brucht, s git si aber nit. Dateie us främde Repositorie chenne einewäg do ufglischtet syy un wäre <del>durgstriche</del> dargstellt. Zuesätzli wäre Syte, wu s die nit vorhande Datei dinne het, in d [[:$1]] yygordnet.",
-	"wantedfiletext-nocat": "Die Dateie wäre brucht, s git si aber nit. Vorhandeni Dateie us främde Repositorie chenne dp einewäg ufglischtet syy un wäre <del>durgstriche</del> dargstellt.",
+	"wantedfiletext-cat-noforeign": "Die Dateie sy y’bunde, aber es git se nid. Syte, wo nid vorhandnigi Dateien ybinde, sy under [[:$1]] z finde.",
+	"wantedfiletext-nocat": "Die Dateie wäre brucht, s git si aber nit. Vorhandeni Dateie us främde Repositorie chenne do einewäg ufglischtet syy un wäre <del>durgstriche</del> dargstellt.",
+	"wantedfiletext-nocat-noforeign": "Die Dateie sy y’bunde, aber es git se nid.",
 	"wantedtemplates": "Vorlage, wu fähle",
 	"mostlinked": "Syte, wo am meischte druff verwyyse wird",
 	"mostlinkedcategories": "Am meischte verlinkti Kategorië",
-	"mostlinkedtemplates": "Am meischten yybouti Vorlage",
+	"mostlinkedtemplates": "Meist-y’bundnigi Syte",
 	"mostcategories": "Sytene mit de meischte Kategorië",
 	"mostimages": "Am meischte verlinkti Dateie",
 	"mostinterwikis": "Syte mit de meischte Interwikilink",
 	"mostrevisions": "Syte mit de meischte Bearbeitige",
 	"prefixindex": "Alli Syte (mit Präfix)",
 	"prefixindex-namespace": "Alli Syte mit Präfix (Nameruum $1)",
+	"prefixindex-strip": "Präfix ir Listen abschnyde",
 	"shortpages": "Churzi Artikel",
 	"longpages": "Langi Artikel",
 	"deadendpages": "Artikel ohni Links («Sackgasse»)",
 	"deadendpagestext": "Die Syte verwyyse nit zue anderi Syte in {{SITENAME}}.",
 	"protectedpages": "Gschützti Sytene",
 	"protectedpages-indef": "Nume uubschränkt gschitzti Syte zeige",
+	"protectedpages-summary": "Die Liste zeigt Syte, wo momentan gschützt sy. Under «[[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]]» isch e Liste vo Title, wo’s nid erloubt isch, e Syte dermit azlege.",
 	"protectedpages-cascade": "Nume Syte mit Kaskadeschutz",
+	"protectedpages-noredirect": "Wyterleitigen usblände",
 	"protectedpagesempty": "Aktuäll sin kei Syte mit däne Parameter gschitzt.",
+	"protectedpages-timestamp": "Zytstämpel",
+	"protectedpages-page": "Syte",
+	"protectedpages-expiry": "Gschützt bis",
+	"protectedpages-performer": "Gschützt vo",
+	"protectedpages-params": "Schutzparameter",
+	"protectedpages-reason": "Grund",
+	"protectedpages-unknown-timestamp": "Unbekannt",
+	"protectedpages-unknown-performer": "Unbekannt",
 	"protectedtitles": "Gsperrti Titel",
+	"protectedtitles-summary": "Die Liste zeigt Title, wo’s momentan nid erloubt isch, e Syte dermit azlege. Under «[[{{#special:ProtectedPages}}|{{int:protectedpages}}]]» isch e Liste vo gschützte Syte z finde.",
 	"protectedtitlesempty": "Im Momänt sin kei Syte fir s Nejaalege gsperrt mit däne Parameter.",
 	"listusers": "Lischte vo Benutzer",
 	"listusers-editsonly": "Zeig nume Benutzer mit Byytreg",
 	"listusers-creationsort": "Sortiert noch em Datum",
+	"listusers-desc": "Reihefolg umchehre",
 	"usereditcount": "$1 {{PLURAL:$1|Bearbeitig|Bearbeitige}}",
 	"usercreated": "{{GENDER:$3|Aagleit}} uf $1 am $2",
 	"newpages": "Nöji Artikel",
@@ -1518,19 +1637,22 @@
 	"pager-older-n": "{{PLURAL:$1|vorige|vorige $1}}",
 	"suppress": "Oversight",
 	"querypage-disabled": "Die Spezialsyte isch deaktiviert wore us Leischtigserhaltigs-Grind.",
+	"apihelp": "API-Hilff",
+	"apihelp-no-such-module": "Ds Modul «$1» lat sech nid la finde.",
 	"booksources": "ISBN-Suech",
 	"booksources-search-legend": "Suech no Bezugsquälle fir Biecher",
 	"booksources-search": "Sueche",
 	"booksources-text": "Des isch e Lischt mit Link zue Netzsyte, wu neiji un bruchti Biecher verchaufe. S cha syy, ass es dert au meh Informatione zue dr Biecher git. {{SITENAME}} isch mit keinem vu däne Aabieter gschäftli verbunde.",
 	"booksources-invalid-isbn": "D ISBN isch schyyns falsch. Lueg no Fähler in dr Kopii.",
 	"specialloguserlabel": "Benutzer, wu des gmacht het:",
-	"speciallogtitlelabel": "Ziil (Titel oder Benutzer):",
+	"speciallogtitlelabel": "Zil (Titel oder «{{ns:user}}:Name» für Benutzer/inne):",
 	"log": "Logbiecher",
 	"all-logs-page": "Alli effetligi Logbüecher",
 	"alllogstext": "Kombinierti Aasicht vu alle in {{SITENAME}} gfierte Protokoll.\nD Aazeig cha dur d Uuswahl vun eme Protokoll, eme Benutzername oder eme Sytename yygschränkt wäre (Acht gee uf d Gross- un Chleischrybig).",
 	"logempty": "Kei Yyträg gfunde, wu passe.",
 	"log-title-wildcard": "Titel fangt aa mit",
 	"showhideselectedlogentries": "Uusgwehlti Logbuechyytreg aazeige/verstecke",
+	"log-edit-tags": "Markierige vo den usgwählte Logbuechyträg ändere",
 	"allpages": "alli Sytene",
 	"nextpage": "Nächscht Syte ($1)",
 	"prevpage": "Vorderi Syte ($1)",
@@ -1587,6 +1709,23 @@
 	"listgrouprights-removegroup-self": "Cha {{PLURAL:$2|e Gruppe|Gruppe}} us em eigene Benutzerkonto useneh: $1",
 	"listgrouprights-addgroup-self-all": "Cha alli Gruppe zum eigene Benutzerkonto zuefiege",
 	"listgrouprights-removegroup-self-all": "Cha alli Gruppe us em eigene Benutzerkonto useneh",
+	"listgrouprights-namespaceprotection-header": "Yschränkige nach Namensruum",
+	"listgrouprights-namespaceprotection-namespace": "Namensruum",
+	"listgrouprights-namespaceprotection-restrictedto": "Rächt zum Bearbeite",
+	"trackingcategories": "Tracking-Kategorië",
+	"trackingcategories-summary": "Das isch e Liste vo Tracking-Kategorië, wo d MediaWiki-Software automatisch füllt. Iri Näme cha men ändere, we me di entsprächende Systemmäldigen im {{ns:8}}-Namensruum apasst.",
+	"trackingcategories-msg": "Tracking-Kategorië",
+	"trackingcategories-name": "Name vor Nachricht",
+	"trackingcategories-desc": "Kriterje für d Ybindig vo Kategorië",
+	"noindex-category-desc": "Die Syte wird nid vo Bots indiziert, wil ds magische Wort <code><nowiki>__NOINDEX__</nowiki></code> uf ere steit und wil si zumene Namensruum ghört, wo die Flag erloubt isch.",
+	"index-category-desc": "Uf dere Syte steit <code><nowiki>__INDEX__</nowiki></code> (u si ghört zumene Namensruum wo die Flag erloubt isch). Drum wird si usnahmswys vo Bots indiziert.",
+	"post-expand-template-inclusion-category-desc": "Nach em Expandiere vo allne Vorlagen übertrifft d Sytegröössi <code>$wgMaxArticleSize</code>. Drum sy es paar Vorlage nid expandiert.",
+	"post-expand-template-argument-category-desc": "Nach em Expandiere vomene Vorlagenargumänt (öppis i dreifache gschweiffte Chlammere wie <code>{{{Foo}}}</code>) isch d Syte gröser als <code>$wgMaxArticleSize</code>.",
+	"expensive-parserfunction-category-desc": "Uf dere Syte het’s z vil ufwändigi Parserfunktione (wi <code>#ifexist</code>), vgl. [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
+	"broken-file-category-desc": "Uf der Syte het’s e defäkte Dateilink (e Link zu’neren y’bundnige Datei, wo’s nid git).",
+	"hidden-category-category-desc": "Im Syteninhalt vor Kategorie steit <code><nowiki>__HIDDENCAT__</nowiki></code>. Das verhinderet, das si standardmäässig im Chaste mit de Kategorielinks azeigt wird.",
+	"trackingcategories-nodesc": "Kei Beschrybig verfüegbar.",
+	"trackingcategories-disabled": "Kategorie isch deaktiviert",
 	"mailnologin": "Du bisch nid aagmäldet oder hesch keis Mail aaggä",
 	"mailnologintext": "Du muesch [[Special:UserLogin|aagmäldet syy]] un e bstätigti E-Mail-Adräss in Dyyne [[Special:Preferences|Yystellige]] aagee ha, fir dass epper anderem es E-Mail chasch schicke.",
 	"emailuser": "Es Mail schrybe",
@@ -1613,30 +1752,32 @@
 	"emailccsubject": "Kopii vu Dyynere Nochricht an $1: $2",
 	"emailsent": "E-Mail furtgschickt",
 	"emailsenttext": "Dys E-Mail isch verschickt worde.",
-	"emailuserfooter": "Die E-Mail isch vum {{SITENAME}}-Benutzer „$1“ an „$2“ gschickt wore.",
+	"emailuserfooter": "$1 het das E-mail a $2 gschickt über d Funktion «{{int:emailuser}}» uf {{SITENAME}}.",
 	"usermessage-summary": "Systemnochricht gspycheret.",
 	"usermessage-editor": "System-Messenger",
 	"watchlist": "Beobachtigslischte",
 	"mywatchlist": "Beobachtigslischte",
 	"watchlistfor2": "Fir $1 $2",
 	"nowatchlist": "Du hesch ke Yträg uf dyre Beobachtigslischte.",
-	"watchlistanontext": "Du muesch Di $1 go Dyyni Beobachtungslischt z säh oder go Yytreg uf ere bearbeite.",
+	"watchlistanontext": "Du muesch di amälde, für dyni Beobachtigslisten azluegen oder z bearbeite.",
 	"watchnologin": "Du bisch nit aagmäldet",
 	"addwatch": "zue de Beobachtigslischte derzue tue",
-	"addedwatchtext": "D Syte \"[[:$1]]\" stoht jetz uf Dyyre [[Special:Watchlist|Beobachtigslischt]].\nNeji Änderige an dr Syte oder dr Diskussionssyte drvo chasch jetz dert säh.",
+	"addedwatchtext": "«[[:$1]]» steit itz mitsamt Diskussionssyten uf dyre [[Special:Watchlist|Beobachtigsliste]].",
+	"addedwatchtext-short": "D Syte «$1» steit itz uf dyre Beobachtigsliste.",
 	"removewatch": "Us der Beobachtigsliste usegnuu",
-	"removedwatchtext": "D Syte «[[:$1]]» isch us dyre [[Special:Watchlist|Beobachtigsliste]] glösche worde.",
+	"removedwatchtext": "«[[:$1]]» isch mitsamt Diskussionssyte us dyre [[Special:Watchlist|Beobachtigsliste]] gstriche.",
+	"removedwatchtext-short": "D Syte «$1» isch us dyre Beobachtigsliste gstriche.",
 	"watch": "Beobachte",
 	"watchthispage": "Die Syte beobachte",
 	"unwatch": "nümm beobachte",
 	"unwatchthispage": "Nimmi beobachte",
 	"notanarticle": "Kei Syte",
 	"notvisiblerev": "Version isch glescht wore",
-	"watchlist-details": "{{PLURAL:$1|1 Syte wird|$1 Sytene wärde}} beobachtet (Diskussionssyte nid zelt, aber ou beobachtet).",
-	"wlheader-enotif": "Dr E-Mail-Benochrichtigungsdienscht isch aktiviert.",
-	"wlheader-showupdated": "Syte mit Anderige, wu no nit aagluegt sin, sin '''fett''' dargstellt.",
-	"wlnote": "Do {{PLURAL:$1|chunnt di letscht Änderig|chemme di letschte '''$1''' Änderige}} vu dr letschte {{PLURAL:$2|Stund|'''$2''' Stunde}}. Stand: $3, $4 Uhr.",
-	"wlshowlast": "Zeig di letschte $1 Stunde $2 Tage",
+	"watchlist-details": "{{PLURAL:$1|1 Syte wird|$1 Syte wärde}} beobachtet (Diskussionssyte nid zelt, aber ou beobachtet).",
+	"wlheader-enotif": "E-Mail-Benachrichtigung isch aktiviert.",
+	"wlheader-showupdated": "Syte, wo syt em letste Bsuech hei g’änderet, sy <strong>fett</strong> dargstellt.",
+	"wlnote": "Unde {{PLURAL:$1|steit di letsti Änderig|stöh di letste <strong>$1</strong> Änderigen}} us {{PLURAL:$2|der letste Stund|de letste <strong>$2</strong> Stunde}}. Stand: $3, $4 Uhr.",
+	"wlshowlast": "Zeig di letste $1 Stunden und $2 Täg",
 	"watchlist-options": "Aazeigoptione",
 	"watching": "Am beobachte …",
 	"unwatching": "Nümm am beobachten …",
@@ -1666,7 +1807,7 @@
 	"exbeforeblank": "Inhalt voreb d Syte gläärt woren isch: '$1'",
 	"delete-confirm": "„$1“ lesche",
 	"delete-legend": "Lesche",
-	"historywarning": "'''Warnig:'''  Die Syte, wu Du wit lesche, het e Versionsgschicht mit schetzigswyys $1 {{PLURAL:$1|Version|Versione}}:",
+	"historywarning": "<strong>Warnig:</strong> Die Syte, wu Du wit lesche, het e Versionsgschicht mit $1 {{PLURAL:$1|Version|Versione}}:",
 	"confirmdeletetext": "Du bisch dra, e Artikel oder e Bild mitsamt dr Versionsgschicht fir immer us der Datebank z lesche.\nBitte bi Dir iber d Konsequänze bewusst, un bi sicher, dass Du Di an unsri [[{{MediaWiki:Policy-url}}|Leitlinie]] haltsch.",
 	"actioncomplete": "Uftrag usgfiert.",
 	"actionfailed": "Aktion fählgschlaa",
@@ -1682,6 +1823,8 @@
 	"delete-edit-reasonlist": "Leschgrind bearbeite",
 	"delete-toobig": "Die Syte het e arg langi Versionsgschicht mit meh as $1 {{PLURAL:$1|Version|Versione}}. S Lesche vu sonige Syte isch yygschränkt wore go verhindere, ass dr Server vu {{SITENAME}} us Versäh zytwys iberlaschtet wird.",
 	"delete-warning-toobig": "Die Syte het e arg langi Versionsgschicht mit meh as $1 {{PLURAL:$1|Version|Versione}}. S Lesche cha dr Datebankbetriib vu {{SITENAME}} stere.",
+	"deleteprotected": "Du chasch die Syte nid lösche, wil si isch gschützt worde.",
+	"deleting-backlinks-warning": "'''Obacht:''' D Syte, wo du wosch lösche, isch uf [[Special:WhatLinksHere/{{FULLPAGENAME}}|anderne Syte]] verlinkt oder y’bunde.",
 	"rollback": "Zrucksetze vu dr Änderige",
 	"rollbacklink": "Zrüggsetze",
 	"rollbacklinkcount": "{{PLURAL:$1|Ei Version|$1 Versione}} zrucksetze",
@@ -1695,6 +1838,20 @@
 	"rollback-success": "D Änderige vu $1 sin ruckgängig gmacht wore un di letscht Version vu $2 isch widerhärgstellt wore.",
 	"sessionfailure-title": "Sitzigsfähler",
 	"sessionfailure": "S het e Probläm mit em Ibertrage vu Dyyne Benutzerdate gee.\nDie Aktion isch wäge däm us Sicherheitsgrind abbroche wore go ne falschi Zueornig vu Dyyne Änderige zuen eme andere Benutzer verhindere.\nBitte gang zruck, tue d Syte nej lade un versuech s nomol.",
+	"changecontentmodel": "Inhaltsmodäll von ere Syten ändere",
+	"changecontentmodel-legend": "Inhaltsmodäll ändere",
+	"changecontentmodel-title-label": "Sytetitel",
+	"changecontentmodel-model-label": "Nöüs Inhaltsmodäll",
+	"changecontentmodel-reason-label": "Grund:",
+	"changecontentmodel-success-title": "Ds Inhaltsmodäll het g’änderet",
+	"changecontentmodel-success-text": "Der Inhaltstyp vo [[:$1]] het g’änderet.",
+	"changecontentmodel-cannot-convert": "Der Inhalt vo [[:$1]] lat sech nid zum Typ $2 la konvertiere.",
+	"changecontentmodel-nodirectediting": "Ds Inhaltsmodäll «$1» lat ds diräkte Bearbeite nid zue",
+	"log-name-contentmodel": "Protokoll vo Inhaltsmodälländerige",
+	"log-description-contentmodel": "Ereignis, wo mit em Inhaltsmodäll von ere Syte z tüe hei",
+	"logentry-contentmodel-change": "{{GENDER:$2|Der $1|D $1|$1}} het ds Inhaltsmodäll vor Syte $3 g’änderet vo «$4» uf «$5»",
+	"logentry-contentmodel-change-revertlink": "zrüggsetze",
+	"logentry-contentmodel-change-revert": "zrüggsetze",
 	"protectlogpage": "Syteschutz-Logbuech",
 	"protectlogtext": "Des isch s Syteschutz-Logbuech.\nLueg d [[Special:ProtectedPages|Lischt vu dr gschitzte Syte]] fir alli zurzyt gschitzte Syte.",
 	"protectedarticle": "het „[[$1]]“ gschitzt",
@@ -1718,7 +1875,7 @@
 	"protect-locked-blocked": "Du chasch dr Syteschutz nit ändere, wel Dyy Benutzerkonto gsperrt isch. Do sin di aktuälle Syteschutz-Yystellige fir d Syte '''„$1“:'''",
 	"protect-locked-dblock": "D Datebank isch gsperrt, dr Syteschutz cha wäge däm nit gänderet wäre. Doo sin di aktuälle Syteschutz-Yystellige fir d Syte '''„$1“:'''",
 	"protect-locked-access": "Dys Konto het nid di nötige Rächt, für der Schutzstatus z ändere.\nHie sy di aktuelle Schutzystellige vor Syte '''$1''':",
-	"protect-cascadeon": "Die Syten isch gschützt, wil si {{PLURAL:$1|zur folgende Syte|zu de folgende Syte}} ghört, wo derfür e Kaskadesperrig gilt.\nDer Schutzstatus vo dere Syte lat sech la ändere, aber das het kei Yfluss uf d Kaskadesperrig.",
+	"protect-cascadeon": "Die Syten isch gschützt, wil si i {{PLURAL:$1|der|de}} folgende Syten y’bunden isch, wo derfür e Kaskadesperrig gilt.\nÄnderigen am Schutzstatus vo dere Syte hei kei Yfluss uf d Kaskadesperrig.",
 	"protect-default": "Alle Benutzer",
 	"protect-fallback": "Nume Benutzer mit dr „$1“-Berächtigung erlaube.",
 	"protect-level-autoconfirmed": "Nume automatisch bstetigte Benutzer erlaube",
@@ -1732,9 +1889,10 @@
 	"protect-othertime": "Anderi Sperrduur:",
 	"protect-othertime-op": "anderi Sperrduur",
 	"protect-existing-expiry": "Aktuälls Syteschutzänd: $2, $3 Uhr",
+	"protect-existing-expiry-infinity": "Momentani Ablouffzyt: unbeschränkt",
 	"protect-otherreason": "Andere/zuesätzlige Grund:",
 	"protect-otherreason-op": "Andere Grund",
-	"protect-dropdown": "*Allgmeini Schutzgrind\n** Netzgleich-Spam\n** Editwar\n** Vylmol yybundeni Vorlag\n** Syte mit ere hoche Bsuecherzahl",
+	"protect-dropdown": "*Allgmeini Schutzgrind\n** Link-Spam\n** Editwar\n** Vylmol yybundeni Vorlag\n** Syte mit ere hoche Bsuecherzahl",
 	"protect-edit-reasonlist": "Schutzgrind bearbeite",
 	"protect-expiry-options": "1 Stund:1 hour,1 Tag:1 day,1 Wuche:1 week,2 Wuche:2 weeks,1 Monet:1 month,3 Monet:3 months,6 Monet:6 months,1 Johr:1 year,Fir immer:infinite",
 	"restriction-type": "Schutzstatus",
@@ -1756,7 +1914,7 @@
 	"undeletepagetext": "Die {{PLURAL:$1|Syte isch glescht wore un cha|$1 Syte sin glescht wore un chenne}} vu Ammanne widerhärgstellt wäre:",
 	"undelete-fieldset-title": "Widerhärstelle",
 	"undeleteextrahelp": "* Go d Syte ganz mit allene Versione widerhärzstelle, wehl kei Version us, gib e Begrindig aa un druck uf „{{int:undeletebtn}}“.\n* Mechtsch nume bstimmti Versione widerhärstelle, no wehl die bitte einzeln no dr Markierige us, gib e Begrindig aa un druck derno uf „{{int:undeletebtn}}“..",
-	"undeleterevisions": "{{PLURAL:$1|1 Version|$1 Versione}} archiviert",
+	"undeleterevisions": "$1 {{PLURAL:$1|Version|Versione}} glöscht",
 	"undeletehistory": "Wänn Du die Syte widerhärstellsch, wäre au alli alte Versione widerhärgstellt.\nWänn syt dr Leschig e neiji Syte mit em glyche Name aagleit woren isch, no wäre di widerhärgstellte Versione chronologisch in d Versionsgschicht yygordnet.",
 	"undeleterevdel": "D Widerhärstellig wird nit durgfiert, wänn di neijscht Version versteckt isch oder s versteckti Teil dinne het.\nIn däm Fall darf di neijscht Version nit markiert wäre oder ihre Status muess uf normali Version gänderet wäre.",
 	"undeletehistorynoadmin": "Dä Artikel isch glescht wore. Dr Grund fir d Leschig isch in dr Zämmefassig aagee, derzue au Aagaabe zum letschte Benutzer, wu dä Artikel bearbeitet het vor dr Leschig. Dr aktuäll Täxt vum gleschte Artikel isch nume zuegängli fir Ammanne.",
@@ -1791,6 +1949,7 @@
 	"namespace": "Namensruum:",
 	"invert": "Uswahl umkehre",
 	"tooltip-invert": "Des Chäschtli aaklicke go Änderige im gwehlte Namensruum un, wänn uusgwehlt, im zuegherige Namensruum uusblände",
+	"tooltip-whatlinkshere-invert": "Tue das Chästli abhääggle, für kener Links vo Syten us em usgwählte Namensruum z zeige.",
 	"namespace_association": "Zuegordnete Namensruum",
 	"tooltip-namespace_association": "Des Chäschtli aaklicke go dr Diskussionsnamensruum oder dr Namesnruum zuesätzlig mityybezie, wu zue Dyre Uuswahl derzue ghert.",
 	"blanknamespace": "(Haupt-)",
@@ -1798,6 +1957,7 @@
 	"contributions-title": "Benutzerbyytreg vu „$1“",
 	"mycontris": "Myyni Byyträg",
 	"contribsub2": "Vu {{GENDER:$3|$1}} ($2)",
+	"contributions-userdoesnotexist": "Ds Benutzerkonto «$1» isch nid registriert.",
 	"nocontribs": "S sin keini Benutzerbyytreg mit däne Kriterie gfunde wore.",
 	"uctop": "(aktuell)",
 	"month": "u Monet:",
@@ -1806,6 +1966,7 @@
 	"sp-contributions-newbies-sub": "vo nöji Benützer",
 	"sp-contributions-newbies-title": "Benutzerbyytreg vu neije Benutzer",
 	"sp-contributions-blocklog": "Sperrlogbuech",
+	"sp-contributions-suppresslog": "underdrückti Benutzerbyträg",
 	"sp-contributions-deleted": "gleschti Bytreg",
 	"sp-contributions-uploads": "Uffegladeni Dateie",
 	"sp-contributions-logs": "Logbiecher",
@@ -1815,7 +1976,8 @@
 	"sp-contributions-blocked-notice-anon": "Die IP-Adräss isch zur Zyt gsperrt.\nDo chunnt dr aktuäll Yytrag us em Benutzersperr-Logbuech:",
 	"sp-contributions-search": "Suech no Benutzerbiträg",
 	"sp-contributions-username": "IP-Adress oder Benutzername:",
-	"sp-contributions-toponly": "Nume aktuälli Versione zeige",
+	"sp-contributions-toponly": "Nume Byträg zeige, won en aktuelli Version sy",
+	"sp-contributions-newonly": "Nume Byträg zeige, wo e nöüi Syte hei agleit",
 	"sp-contributions-submit": "Sueche",
 	"whatlinkshere": "Was verwyst do druff?",
 	"whatlinkshere-title": "Sytene, wo uf „$1“ verlinke",
@@ -1837,13 +1999,13 @@
 	"autoblockid": "Automatischi Sperrig #$1",
 	"block": "Benutzer sperre",
 	"unblock": "Benutzer frejgee",
-	"blockip": "Däm Binutzer d Bearbeitigsrächt furtnee",
+	"blockip": "{{GENDER:$1|Benutzer|Benutzerin}} sperre",
 	"blockip-legend": "IP-Adräss/Benutzer sperre",
 	"blockiptext": "Nimm des Formular go ne Benutzer oder e IP-Adräss sperre.\nDes sott numme erfolge go Vandalismus verhindere un in Ibereinstimmig mit in dr [[{{MediaWiki:Policy-url}}|Leitlinie]]. Bitte gib au ne Grund fi d Sperri aa (z. B. indäm du einzel ni Syte zitiersch, wu vandaliert wore sin).",
 	"ipaddressorusername": "IP-Adräss oder Benutzername:",
 	"ipbexpiry": "Sperrduur:",
 	"ipbreason": "Grund:",
-	"ipbreason-dropdown": "* Allgmeini Sperrgrind\n** Lesche vu Syte\n** Aalege vu bledsinnige Syte\n** Vylfachi Verstess gege d Richtlinie fir Netzgleicher\n** Verstoss gege dr Grundsatz „Kei persenligi Aagriff“\n* Benutzerspezifischi Sperrgrind\n** Uugeignete Benutzername\n** Neijaamäldig vun eme uubschränkt gsperrte Benutzer\n* IP-spezifischi Sperrgrind\n** Proxy, wäge Vandalismus vu einzelne Benutzer lengerfrischtig gsperrt",
+	"ipbreason-dropdown": "* Allgmeini Sperrgrind\n** Lesche vu Syte\n** Aalege vu bledsinnige Syte\n** Vylfachi Verstess gege d Richtlinie fir Weblink\n** Verstoss gege dr Grundsatz „Kei persenligi Aagriff“\n* Benutzerspezifischi Sperrgrind\n** Uugeignete Benutzername\n** Neijaamäldig vun eme uubschränkt gsperrte Benutzer\n* IP-spezifischi Sperrgrind\n** Proxy, wäge Vandalismus vu einzelne Benutzer lengerfrischtig gsperrt",
 	"ipb-hardblock": "Aagmäldeti Benutzer dra hindere, Bearbeitige unter däre IP-Adräss vorzneh",
 	"ipbcreateaccount": "Aalege vu Benutzerchonte verhindere",
 	"ipbemailban": "E-Mail-Versand sperre",
@@ -1861,17 +2023,19 @@
 	"blockipsuccesstext": "Dr Benutzer/d IP-Adräss [[Special:Contributions/$1|$1]] isch gsperrt wore.<br />\nGo d Sperri ufhebe lueg d [[Special:BlockList|Lisch vu allene aktive Sperrine]].",
 	"ipb-blockingself": "Du bist grad am Sperre vu Dir sälber! Wettsch des wirkli mache?",
 	"ipb-confirmhideuser": "Du bist grad am Sperre vun eme Benutzer im Modus „Benutzer verstecke“. Des fiert derzue, ass dr Benutzername in allne Lischten un Logbiecher unterdruckt wird. Wettsch des wirkli mache?",
+	"ipb-confirmaction": "We du dir sicher bisch, das d’s würklech wosch mache, de tue bitte unde ds Fäld «{{int:ipb-confirm}}» achrüzle.",
 	"ipb-edit-dropdown": "Sperrgrind bearbeite",
 	"ipb-unblock-addr": "„$1“ frejgee",
 	"ipb-unblock": "IP-Adräss/Benutzer frejgee",
 	"ipb-blocklist": "Alli aktuälle Sperrine aazeige",
-	"ipb-blocklist-contribs": "Benutzerbyytreg fir „$1“",
+	"ipb-blocklist-contribs": "Benutzerbyträg {{GENDER:$1|vom|vor|vo}} $1",
 	"unblockip": "IP-Adräss frejgee",
 	"unblockiptext": "Mit däm Formular chasch e IP-Adräss oder e Benutzer frejgee.",
 	"ipusubmit": "Die Sperri useneh",
 	"unblocked": "[[User:$1|$1]] isch frejgee wore",
 	"unblocked-range": "D Sperri fir $1 isch ufghobe",
 	"unblocked-id": "Sperr-ID $1 isch freijgee wore",
+	"unblocked-ip": "[[Special:Contributions/$1|$1]] isch nümm gsperrt.",
 	"blocklist": "Gsperrti Benutzer",
 	"ipblocklist": "Gsperrti Benutzer",
 	"ipblocklist-legend": "Suech no eme gsperrte Benutzer",
@@ -1902,7 +2066,7 @@
 	"change-blocklink": "Sperri ändere",
 	"contribslink": "Byträg",
 	"emaillink": "E-Mail abschicke",
-	"autoblocker": "Automatischi Sperri, wel Du e gmeinsami IP-Adräss mit [[User:$1|Benutzer:$1]] bruchsch. Grund: „$2“.",
+	"autoblocker": "Automatischi Sperrig, wil dyni IP-Adrässe chürzlech vo [[User:$1|Benutzer:$1]] isch ’bruucht worde. Grund für d Sperrig vo $1: «$2».",
 	"blocklogpage": "Sperrigs-Protokoll",
 	"blocklog-showlog": "Dää Benutzer isch schon emol gsperrt wore. S Sperrine-Logbuech git s do as Referänz:",
 	"blocklog-showsuppresslog": "Dää Benutzer isch schon emol gsperrt wore un syyni Bearbeitige sin uusblädet wore. S Uusbländigs-Logbuech git s do as Referänz:",
@@ -1933,6 +2097,7 @@
 	"proxyblockreason": "Dyni IP-Adrässe isch gsperrt wore, wel si ne ufige Proxy isch. Bitte kontaktier Dyyn Internet-Provider oder Dyni Systemadministratore un informier si iber des Sicherheitsproblem.",
 	"sorbsreason": "D IP-Adräss isch in dr DNSBL vu {{SITENAME}} as uffige PROXY glischtet.",
 	"sorbs_create_account_reason": "D IP-Adräss isch in dr DNSBL vu {{SITENAME}} as uffige PROXY glischtet. S Aalege vu neije Benutzer isch nit megli.",
+	"xffblockreason": "En IP-Adrässen im Header «X-Forwarded-For» isch gsperrt worde, entweder dyni oder die vomene Proxy-Server, wo du bruuchsch. Der ursprünglechi Grund für d Sperrig isch: $1",
 	"cant-see-hidden-user": "Dr Benutzer, wu Du versuechsch z sperre, isch scho gsperrt un versteckt wore. Du chasch d Sperri vu däm Benutzer nit säh oder bearbeite, wel du s „hideuser“-Rächt nit hesch.",
 	"ipbblocked": "Du chasch keini andere Benutzer sperre oder entsperre, wel Du sälber gsperrt bisch",
 	"ipbnounblockself": "Du derfsch di nit sälber entsperre",
@@ -1959,11 +2124,14 @@
 	"movepagetalktext": "D Diskussionssyte wird mitverschobe, '''ussert:'''\n*Du verschiebsch d Syten i nen andere Namensruum, oder\n*es git scho ne Diskussionssyte mit däm Namen oder\n*du wählsch unte d Option, se nid z verschiebe.\n\nI söttigne Fäll müessti d Diskussionssyten allefalls vo Hand kopiert wärde.",
 	"movearticle": "Artikel verschiebe",
 	"moveuserpage-warning": "'''Warnig:''' Du bis am Verschiebe vun ere Benutzersyte. Bitte gib Achtig, ass doderdur nume die Syte verschobe wird, aber dr Benutzer '''nit''' umgnännt wird.",
+	"movecategorypage-warning": "<strong>Obacht:</strong> Du bisch e Kategoriesyten am Verschiebe. Bitte dänk dra, das nume die Syte verschobe wird. D Syte, wo zur alte Kategorie ghöre, wärde <strong>nid</strong> i di nöüi Kategorie verschobe.",
 	"movenologintext": "Du muesch e regischtrierte Benutzer syy un Di [[Special:UserLogin|aamälde]] go die Syte verschiebe.",
 	"movenotallowed": "Du derfsch kei Syte verschiebe.",
 	"movenotallowedfile": "Du derfsch kei Dateie verschiebe.",
 	"cant-move-user-page": "Du derfsch kei Benutzersyte verschiebe (mit Usnaam vo Untersyte).",
 	"cant-move-to-user-page": "Du derfsch kei Syte uf e Benutzersyte verschiebe (mit Usnaam vo Untersyte).",
+	"cant-move-category-page": "Du hesch nid ds Rächt, Kategoriesyte z verschiebe.",
+	"cant-move-to-category-page": "Du hesch nid ds Rächt, e Syte zunere Kategoriesyte z verschiebe.",
 	"newtitle": "Zum nöie Titel",
 	"move-watch": "Die Syte beobachte",
 	"movepagebtn": "Artikel verschiebe",
@@ -2036,24 +2204,33 @@
 	"allmessages-prefix": "Präfixfilter:",
 	"allmessages-language": "Sproch:",
 	"allmessages-filter-submit": "Gang",
+	"allmessages-filter-translate": "Übersetze",
 	"thumbnail-more": "Vergreßere",
 	"filemissing": "D Datei fäält",
 	"thumbnail_error": "Fähler bir Härstellig vo re Vorschou: $1",
+	"thumbnail_error_remote": "Fälermäldig vo $1:\n$2",
 	"djvu_page_error": "DjVu-Syte isch uusserhalb vum Sytebereich",
 	"djvu_no_xml": "XML-Date chönne für d DjVu-Datei nüt abgruefe werde",
 	"thumbnail-temp-create": "D Datei fir di temporär Miniaturaasicht het nit chenne aagleit wäre.",
 	"thumbnail-dest-create": "D Miniaturaasicht het nit chenne an däm Ort gspycheret wäre.",
 	"thumbnail_invalid_params": "Ungültigs Thumbnail-Parameter",
+	"thumbnail_toobigimagearea": "Dateiabmässig überschrytet $1",
 	"thumbnail_dest_directory": "S Ziilverzeichnis cha nüt erstellt werde",
 	"thumbnail_image-type": "Bildtyp wird nit unterstitzt",
 	"thumbnail_gd-library": "Uuvollständigi GD-Library-Konfiguration: Funktion $1 fählt",
 	"thumbnail_image-missing": "Datei fählt schyns: $1",
+	"thumbnail_image-failure-limit": "Ir letsti het’s z vil misslungnigi Versüech ’gä (mindistens $1), das Vorschoubild z rendere. Bitte versuech’s später wider.",
 	"import": "Sytene importiere",
-	"importinterwiki": "Transwiki-Import",
-	"import-interwiki-text": "Wääl e Wiki un e Syte zum Importiere us.\nS Datum vo dr Bearbeitig un dr Benutzername blybe erhalte.\nAlli Transwiki-Import-Aktione werde im [[Special:Log/import|Import-Logbuech]] protokolliert.",
+	"importinterwiki": "Us emnen andere Wiki importiere",
+	"import-interwiki-text": "Wääl e Wiki un e Syte zum Importiere us.\nS Datum vo de Bearbeitige un d Benutzernäme blybe erhalte.\nAlli Import-Aktione us anderne Wiki werde im [[Special:Log/import|Import-Logbuech]] protokolliert.",
+	"import-interwiki-sourcewiki": "Ursprünglechs Wiki:",
+	"import-interwiki-sourcepage": "Ursprünglechi Syte:",
 	"import-interwiki-history": "Alli früeneri Versione vo dere Syte importiere",
 	"import-interwiki-templates": "Mit allene Vorlage",
 	"import-interwiki-submit": "Import",
+	"import-mapping-default": "Zu de Standard-Orten importiere",
+	"import-mapping-namespace": "In e Namensruum importiere:",
+	"import-mapping-subpage": "Als Undersyte vor folgende Syten importiere:",
 	"import-upload-filename": "Dateiname:",
 	"import-comment": "Grund:",
 	"importtext": "Datei iber d Spezialsyte [[Special:Export|Exportfunktion]] us em Quellwiki exportiere.\nDie uf em lokale Rächner spychere un derno do uffelade.",
@@ -2066,14 +2243,14 @@
 	"importcantopen": "D Importdatei het nit chenne ufgmacht wäre.",
 	"importbadinterwiki": "Falscher Interwiki-Link",
 	"importsuccess": "Dr Import isch abgschlosse.",
-	"importnosources": "Für de Transwiki-Import sin kei Quelle definiert worde. Wege dem isch s direkte Ufelade vo Gschichtsversione gsperrt.",
+	"importnosources": "Es isch kes Wiki a’gä worde, wo druus söll importiert wärde, u ds diräkten Ufelade vo Versionsgschichten isch deaktiviert.",
 	"importnofile": "Es isch kei Importdatei ufeglade worde.",
 	"importuploaderrorsize": "S Ufelade vo dr Importdatei isch misslunge. D Datei isch grösser als erlaubt isch.",
 	"importuploaderrorpartial": "S Ufelade vo dr Importdatei isch misslunge. D Datei het numme zum Deil chönne ufeglade werde.",
 	"importuploaderrortemp": "S Ufelade vo dr Importdatei isch misslunge. E temporärs Verzeichnis fäält.",
 	"import-parse-failure": "Fääler bim XML-Import:",
 	"import-noarticle": "Du hesch kei Syte zum importiere aagää!",
-	"import-nonewrevisions": "Es sin scho alli früeneri Versione importiert worde.",
+	"import-nonewrevisions": "Es sy kener Versionen importiert worde (entweder sy si scho alli da gsy oder es het e Fähler ’gä).",
 	"xml-error-string": "$1 Zeile $2, Spalte $3, (Byte $4): $5",
 	"import-upload": "XML-Date ufelade",
 	"import-token-mismatch": "D Sitzigsdate sin verlore gange. Bitte versuech es noo emool.",
@@ -2082,18 +2259,20 @@
 	"import-error-create": "Die Syte „$1“ isch nit importiert worde, wyl du nit dezue berächtigt bisch, si z erstelle.",
 	"import-error-interwiki": "D Syte „$1“ isch nit importiert wore, wel dr Name vun ere fir externi Link (Interwiki) reserviert isch.",
 	"import-error-special": "D Syte „$1“ isch nit importiert wore, wel si zuen eme bsundere Namensruum ghert, wu kei Syte megli sin.",
-	"import-error-invalid": "Syte „$1“ isch nit importiert wore, wel dr Name vun ere nit giltig isch.",
+	"import-error-invalid": "D Syte «$1» isch nid importiert worde, wil der Name, wo si hätt söllen übercho, i däm Wiki nid gültig isch.",
 	"import-error-unserialize": "D Version $2 vu dr Syte „$1“ het nit chenne deserialisiert wäre. D Version isch fir d Verwändig vum Inhaltsmodäll $3 gmäldet wore, wu as $4 serialisiert isch.",
+	"import-error-bad-location": "D Version $2 mit em Inhaltsmodäll $3 lat sech i däm Wiki nid under «$1» la spychere, wil das Inhaltsmodäll uf dere Syte nid understützt isch.",
 	"import-options-wrong": "Falschi {{PLURAL:$2|Option|Optione}}: <nowiki>$1</nowiki>",
 	"import-rootpage-invalid": "Dää Stammsytename isch nit giltig.",
 	"import-rootpage-nosubpage": "Im Namensruum „$1“ vu dr Stammsyte sin kei Untersyte erlaubt.",
 	"importlogpage": "Import-Logbuech",
 	"importlogpagetext": "Adminischtrativer Import vo Sytene mit Versionsgschichte us anderi Wikis.",
-	"import-logentry-upload-detail": "$1 {{PLURAL:$1|Vérsion|Vérsiona}}",
-	"import-logentry-interwiki-detail": "$1 {{PLURAL:$1|Version|Versione}} vo $2",
+	"import-logentry-upload-detail": "$1 {{PLURAL:$1|Version|Versionen}} importiert",
+	"import-logentry-interwiki-detail": "$1 {{PLURAL:$1|Version|Versione}} us $2 importiert",
 	"javascripttest": "JavaScript-Tescht",
 	"javascripttest-pagetext-noframework": "Die Syte isch reserviert fir JavaSkript-Tescht.",
 	"javascripttest-pagetext-unknownframework": "Nit bekannt Framework „$1“.",
+	"javascripttest-pagetext-unknownaction": "Unbekannti Aktion «$1».",
 	"javascripttest-pagetext-frameworks": "Bitte eis vu däne Framework uuswehle: $1",
 	"javascripttest-pagetext-skins": "Wehl e Benutzeroberflechi uus fir d Durfierig vu dr Tescht:",
 	"javascripttest-qunit-intro": "Lueg d [$1 Dokumentation zue Tescht] uf mediawiki.org",
@@ -2136,6 +2315,7 @@
 	"tooltip-feed-atom": "Atom-Feed für selli Syte",
 	"tooltip-t-contributions": "Lischte vo de Byträg vo däm Benutzer",
 	"tooltip-t-emailuser": "Schick däm Benutzer e E-Bost",
+	"tooltip-t-info": "Meh Informationen über die Syte",
 	"tooltip-t-upload": "Dateien ufelade",
 	"tooltip-t-specialpages": "Lischte vo allne Spezialsyte",
 	"tooltip-t-print": "E Version vo dere Syte zum Usdrugge.",
@@ -2193,11 +2373,14 @@
 	"pageinfo-length": "Sytelengi (in Byte)",
 	"pageinfo-article-id": "Syten-ID",
 	"pageinfo-language": "Syteninhaltssproch",
+	"pageinfo-content-model": "Syteninhaltsmodäll",
 	"pageinfo-robot-policy": "Indexierig dur Suechmaschine",
 	"pageinfo-robot-index": "Erlaubt",
 	"pageinfo-robot-noindex": "Nit erlaubt",
 	"pageinfo-watchers": "Aazahl vu Beobachter",
+	"pageinfo-visiting-watchers": "Azahl vo dene, wo d Syte beobachten und di letste Bearbeitige hei agluegt",
 	"pageinfo-few-watchers": "Weniger wie {{PLURAL:$1|ei|$1}} Beobachter",
+	"pageinfo-few-visiting-watchers": "Es chönnt öpper gä oder ou nid, wo beobachtet und di letste Bearbeitigen am aluegen isch",
 	"pageinfo-redirects-name": "Zahl vu dr Wyterleitige zue däre Syte",
 	"pageinfo-subpages-name": "Untersyte vu däre Syte",
 	"pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|Wyterleitig|Wyterleitige}}; $3 {{PLURAL:$3|anderi Syte}})",
@@ -2222,6 +2405,7 @@
 	"pageinfo-protect-cascading-yes": "Jo",
 	"pageinfo-protect-cascading-from": "Syte mit Kaskadeschutz vu",
 	"pageinfo-category-info": "Kategoriinformatione",
+	"pageinfo-category-total": "Gsamti Azahl Mitglider",
 	"pageinfo-category-pages": "Aazahl vu dr Syte",
 	"pageinfo-category-subcats": "Aazahl vu dr Unterkategorie",
 	"pageinfo-category-files": "Aazahl vu dr Dateie",
@@ -2235,9 +2419,11 @@
 	"markedaspatrollederrortext": "Du muesch e Syteänderig uswehle.",
 	"markedaspatrollederror-noautopatrol": "S isch nit erlaubt, eigeni Bearbeitige as kontrolliert z markiere.",
 	"markedaspatrollednotify": "Die Änderig an $1 isch as kontrolliert markiert wore.",
+	"markedaspatrollederrornotify": "D Markierig als kontrolliert isch nid glunge.",
 	"patrol-log-page": "Kontroll-Logbuech",
 	"patrol-log-header": "Des isch s Kontroll-Logbuech.",
 	"log-show-hide-patrol": "Kontroll-Logbuech $1",
+	"log-show-hide-tag": "Markierigs-Logbuech $1",
 	"deletedrevision": "alti Version: $1",
 	"filedeleteerror-short": "Fähler bi dr Datei-Leschig: $1",
 	"filedeleteerror-long": "Bi dr Datei-Leschig sin Fähler feschtgstellt wore:\n\n$1",
@@ -2257,6 +2443,7 @@
 	"file-nohires": "Kei höcheri Uflösig verfüegbar.",
 	"svg-long-desc": "SVG-Datei, Basisgrößi: $1 × $2 Pixel, Dateigrößi: $3",
 	"svg-long-desc-animated": "Animierti SVG-Datei, Basisgreßi $1 × $2 Pixel, Dateigreßi: $3",
+	"svg-long-error": "Ungültigi SVG-Datei: $1",
 	"show-big-image": "Originaldatei",
 	"show-big-image-preview": "Greßi vu däre Vorschau: $1.",
 	"show-big-image-other": "Wyteri {{PLURAL:$2|Ufflösig|Ufflösige}}: $1.",
@@ -2273,6 +2460,7 @@
 	"newimages-summary": "Die Spezialsyte zeigt di zletscht uffegladene Dateie aa.",
 	"newimages-legend": "Filter",
 	"newimages-label": "Dateiname (oder e Teil devu):",
+	"newimages-showbots": "Ufelade vo Bots azeige",
 	"noimages": "Kei Dateie gfunde.",
 	"ilsubmit": "Suech",
 	"bydate": "noch Datum",
@@ -2281,7 +2469,20 @@
 	"minutes": "{{PLURAL:$1|1 Minut|$1 Minute}}",
 	"hours": "{{PLURAL:$1|1 Stund|$1 Stunde}}",
 	"days": "{{PLURAL:$1|1 Tag|$1 Täg}}",
+	"weeks": "{{PLURAL:$1|$1 Wuche}}",
+	"months": "{{PLURAL:$1|$1 Monet|$1 Mönet}}",
+	"years": "{{PLURAL:$1|$1 Jahr}}",
 	"ago": "vor $1",
+	"just-now": "grad ersch",
+	"hours-ago": "vor {{PLURAL:$1|eire Stund|$1 Stund}}",
+	"minutes-ago": "vor {{PLURAL:$1|eire Minute|$1 Minute}}",
+	"seconds-ago": "vor {{PLURAL:$1|eire Sekunde|$1 Sekunde}}",
+	"monday-at": "Mäntig um $1",
+	"tuesday-at": "Zystig um $1",
+	"wednesday-at": "Midwuch um $1",
+	"thursday-at": "Donnstig um $1",
+	"friday-at": "Frytig um $1",
+	"saturday-at": "Samstig um $1",
 	"sunday-at": "Sunntig am $1",
 	"yesterday-at": "Geschtert am $1",
 	"bad_image_list": "Format:\n\nNume Zylene, wo mit emne * afö, wärde berücksichtigt.\nNach em * mues zersch e Link zuren Unerwünschte Datei cho.\nWyteri Links uf der glyche Zyle wärden als Usnahme behandlet, wo die Datei trotzdäm darff vorcho.",
@@ -2663,6 +2864,7 @@
 	"confirm-watch-top": "Tue die Syten uf dyni Beobachtigslischte.",
 	"confirm-unwatch-button": "In Ornig",
 	"confirm-unwatch-top": "Nim die Syte us dyre Beobachtungslischte furt.",
+	"quotation-marks": "«$1»",
 	"imgmultipageprev": "← vorderi Syte",
 	"imgmultipagenext": "nächschti Syte →",
 	"imgmultigo": "Gang!",
@@ -2684,6 +2886,7 @@
 	"autosumm-replace": "Dr Inhalt vo dr Syte isch ersetzt worde: '$1'",
 	"autoredircomment": "E Wyterleitig uf [[$1]] isch erstellt worde",
 	"autosumm-new": "Het Syte aagleit mit '$1'",
+	"autosumm-newblank": "Lääri Syten agleit",
 	"lag-warn-normal": "Bearbeitige in dr letschte {{PLURAL:$1|Sekund|$1 Sekunde}} wäre in däre Lischt nonig aazeigt.",
 	"lag-warn-high": "Wäg ere hoche Datebank-Uslaschtig wäre d Bearbeitige in dr letschte {{PLURAL:$1|Sekund|$1 Sekunde}} in däre Lischt nonig aazeigt.",
 	"watchlistedit-normal-title": "D Beobachtigslischt bearbeite",
@@ -2699,15 +2902,25 @@
 	"watchlistedit-raw-done": "Dyni Beobachtigslischt isch aktualisiert worde.",
 	"watchlistedit-raw-added": "{{PLURAL:$1|ei Ytrag isch|$1 Yträg sin}} dezuedüü worde:",
 	"watchlistedit-raw-removed": "{{PLURAL:$1|ei Ytrag isch|$1 Yträg sin}} usegnoo worde:",
+	"watchlistedit-clear-title": "Beobachtigsliste lääre",
+	"watchlistedit-clear-legend": "Beobachtigsliste lääre",
+	"watchlistedit-clear-explain": "Jeden einzel Ytrag wird us der Beobachtigsliste gstriche",
+	"watchlistedit-clear-titles": "Sytenäme:",
+	"watchlistedit-clear-submit": "Beobachtigsliste lääre (Das lat sech nid la rückgängig mache!)",
+	"watchlistedit-clear-done": "Dyni Beobachtigslisten isch gläärt.",
+	"watchlistedit-clear-removed": "{{PLURAL:$1|$1 Syten isch|$1 Syte sy}} nümm uf der Beobachtigsliste:",
+	"watchlistedit-too-many": "Es het z vil Syte, für se hie azzeige.",
 	"watchlisttools-clear": "Beobachtigsliste lääre",
 	"watchlisttools-view": "Beobachtigsliste: Änderige",
 	"watchlisttools-edit": "normal bearbeite",
 	"watchlisttools-raw": "imene große Textfäld bearbeite",
 	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|Diskussion]])",
 	"duplicate-defaultsort": "Obacht: Dr Sortierigsschlüssel „$2“ iberschrybt dr vorig brucht Schlüssel „$1“.",
+	"duplicate-displaytitle": "<strong>Obacht:</strong> Der Azeigtitel «$2» überschrybt der früecher Azeigtitel «$1».",
+	"invalid-indicator-name": "<strong>Fähler:</strong> Ds Attribut <code>name</code> vom Sytestatusindikator darf nid läär sy.",
 	"version": "Version",
 	"version-extensions": "Installierti Erwyterige",
-	"version-skins": "Benutzeroberflechine",
+	"version-skins": "Installierti Benutzeroberflechine",
 	"version-specialpages": "Spezialsyte",
 	"version-parserhooks": "Parser-Schnittstelle",
 	"version-variables": "Variable",
@@ -2720,9 +2933,12 @@
 	"version-hook-name": "Schnittstellename",
 	"version-hook-subscribedby": "Ufruef vu",
 	"version-version": "($1)",
+	"version-no-ext-name": "[kei Name]",
 	"version-license": "Lizänz",
 	"version-ext-license": "Lizänz",
 	"version-ext-colheader-name": "Erwyterig",
+	"version-skin-colheader-name": "Name",
+	"version-ext-colheader-version": "Version",
 	"version-ext-colheader-license": "Lizänz",
 	"version-ext-colheader-description": "Bschryybig",
 	"version-ext-colheader-credits": "Autore",
@@ -2741,6 +2957,12 @@
 	"version-entrypoints": "Yygangspunkt-URL",
 	"version-entrypoints-header-entrypoint": "Yygangspunkt",
 	"version-entrypoints-header-url": "URL",
+	"version-libraries": "Installierti Bibliotheke",
+	"version-libraries-library": "Bibliothek",
+	"version-libraries-version": "Version",
+	"version-libraries-license": "Lizänz",
+	"version-libraries-description": "Beschrybig",
+	"version-libraries-authors": "Autor/inne",
 	"redirect": "Wyterleitig uf Benutzersyte, Syte, Syteversion oder Datei",
 	"redirect-legend": "Wyterleitig uf e Datei oder e Syte",
 	"redirect-summary": "Die Spezialsyte leitet wyter uf e Benutzersyte (numerischi Benutzerkännig aagee), Syte (Sytekännig aagee), Syteversion (Versionskännig aagee) oder Datei (Dateiname aagee). Benutzig: [[{{#Special:Redirect}}/user/101]], [[{{#Special:Redirect}}/page/64308]], [[{{#Special:Redirect}}/revision/328429]] oder [[{{#Special:Redirect}}/file/Example.jpg]].",
@@ -2789,11 +3011,83 @@
 	"tags-tag": "Markierigsname",
 	"tags-display-header": "Benännig uf dr Änderigslischte",
 	"tags-description-header": "Vollständigi Bschryybig",
+	"tags-active-header": "Aktiv?",
 	"tags-hitcount-header": "Markierti Änderige",
+	"tags-actions-header": "Aktione",
 	"tags-active-yes": "Jo",
 	"tags-active-no": "Nei",
+	"tags-source-extension": "Von eren Erwyterig definiert",
+	"tags-source-manual": "Manuell vo Benutzer/innen oder Bots ygsetzt",
+	"tags-source-none": "Nümm ’bruucht",
 	"tags-edit": "bearbeite",
+	"tags-delete": "lösche",
+	"tags-activate": "aktiviere",
+	"tags-deactivate": "deaktiviere",
 	"tags-hitcount": "$1 {{PLURAL:$1|Änderig|Änderige}}",
+	"tags-manage-no-permission": "Du hesch nid ds Rächt, Änderigsmarkierige z verwalte.",
+	"tags-create-heading": "Nöüi Markierig alege",
+	"tags-create-explanation": "Standardmäässig wärde nöüi Markierige zur Verfüegig gstellt, so das se Benutzer/innen und Bots chöü bruuche.",
+	"tags-create-tag-name": "Markierigsname:",
+	"tags-create-reason": "Grund:",
+	"tags-create-submit": "Alege",
+	"tags-create-no-name": "Du muesch e Markierigsnamen agä.",
+	"tags-create-invalid-chars": "Markierigsnäme dörffe kei Kommas (<code>,</code>) oder Schregstriche (<code>/</code>) ha.",
+	"tags-create-invalid-title-chars": "Markierigsnäme dörffe kei Zeiche ha, wo me nid i Sytenäme cha bruuche.",
+	"tags-create-already-exists": "D Markierig «$1» git’s scho.",
+	"tags-create-warnings-above": "Bim Versuech, d Markierig «$1» azlege, het’s di {{PLURAL:$2|folgendi Warnig|folgende Warnige}} ’gä:",
+	"tags-create-warnings-below": "Möchtsch mit em Alege vor Markierig wytermache?",
+	"tags-delete-title": "Markierig lösche",
+	"tags-delete-explanation-initial": "Du bisch drann, d Markierig «$1» us der Datebank z lösche.",
+	"tags-delete-explanation-in-use": "Si wird vo {{PLURAL:$2|eire Version oder eim Logbuechytrag|allne $2 Versionen oder Logbuechyträg}} furtgnoh, wo momentan dermit markiert sy.",
+	"tags-delete-explanation-warning": "Die Aktion isch <strong>für immer</strong> und <strong>lat sech nid la rückgängig mache</strong>, nid emal vo Datebank-Administrator/inne. Bis dir ganz sicher, das es die Markierig isch, wo du wosch lösche.",
+	"tags-delete-explanation-active": "<strong>D Markierig «$1» isch immer no aktiv und blybt ou zuekünftig im Ysatz.</strong> We du das wosch verhindere, de gang die Markierig dört ga deaktiviere, wo si ygsetzt isch.",
+	"tags-delete-reason": "Grund:",
+	"tags-delete-submit": "Markierig für immer lösche",
+	"tags-delete-not-allowed": "Von eren Erwyterig definierti Markierige lö sech nid la lösche, ussert d Erwyterig erloubt’s usdrücklech.",
+	"tags-delete-not-found": "D Markierig «$1» git’s nid.",
+	"tags-delete-too-many-uses": "D Markierig «$1» isch by meh als {{PLURAL:$2|eire Version|$2 Versionen}} ygsetzt. Drum lat si sech nid la lösche.",
+	"tags-delete-warnings-after-delete": "D Markierig «$1» isch erfolgrych glöscht, aber es het di {{PLURAL:$2|folgendi Warnig|folgende Warnige}} ’gä:",
+	"tags-activate-title": "Markierig aktiviere",
+	"tags-activate-question": "Du bisch drann, d Markierig «$1» z aktiviere.",
+	"tags-activate-reason": "Grund:",
+	"tags-activate-not-allowed": "D Markierig «$1» lat sech nid la aktiviere.",
+	"tags-activate-not-found": "D Markierig «$1» git’s nid.",
+	"tags-activate-submit": "Aktiviere",
+	"tags-deactivate-title": "Markierig deaktiviere",
+	"tags-deactivate-question": "Du bisch drann, d Markierig «$1» z deaktiviere.",
+	"tags-deactivate-reason": "Grund:",
+	"tags-deactivate-not-allowed": "D Markierig «$1» lat sech nid la deaktiviere.",
+	"tags-deactivate-submit": "Deaktiviere",
+	"tags-apply-no-permission": "Du hesch nid ds Rächt, Änderige mit Änderigsmarkierige z mache.",
+	"tags-apply-not-allowed-one": "D Markierig «$1» darf me nid vo Hand ysetze.",
+	"tags-apply-not-allowed-multi": "Di {{PLURAL:$2|folgendi Markierig|folgende Markierige}} darf me nid vo Hand ysetze: $1",
+	"tags-update-no-permission": "Du hesch nid ds Rächt, Änderigsmarkierige by einzelne Versionen oder Logbuechyträg yzsetzen oder furtznäh.",
+	"tags-update-add-not-allowed-one": "D Markierig «$1» darf me nid vo Hand ysetze.",
+	"tags-update-add-not-allowed-multi": "Di {{PLURAL:$2|folgendi Markierig|folgende Markierige}} darf me nid vo Hand derzuetue: $1",
+	"tags-update-remove-not-allowed-one": "D Markierig «$1» darf me nid furtnäh.",
+	"tags-update-remove-not-allowed-multi": "Di {{PLURAL:$2|folgendi Markierig|folgende Markierige}} darf me nid vo Hand furtnäh: $1",
+	"tags-edit-title": "Markierige bearbeite",
+	"tags-edit-manage-link": "Markierige verwalte",
+	"tags-edit-revision-selected": "{{PLURAL:$1|Usgwählti Version|Usgwählti Versione}} vo [[:$2]]:",
+	"tags-edit-logentry-selected": "{{PLURAL:$1|Usgwählte Logbuechytrag|Usgwählti Logbuechyträg}}:",
+	"tags-edit-revision-legend": "Markierige by {{PLURAL:$1|dere Versione|allne $1 Versione}} derzuetue oder furtnäh.",
+	"tags-edit-logentry-legend": "Markierige by {{PLURAL:$1|däm Logbuechytrag|allne $1 Logbuechyträg}} derzuetue oder furtnäh.",
+	"tags-edit-existing-tags": "Ygsetzti Markierige:",
+	"tags-edit-existing-tags-none": "''Keini''",
+	"tags-edit-new-tags": "Nöüi Markierige:",
+	"tags-edit-add": "Die Markierige derzuetue:",
+	"tags-edit-remove": "Die Markierige furtnäh:",
+	"tags-edit-remove-all-tags": "(alli Markierige furtnäh)",
+	"tags-edit-chosen-placeholder": "Markierigen ussueche",
+	"tags-edit-chosen-no-results": "Es git ke Markierige, wo passe",
+	"tags-edit-reason": "Grund:",
+	"tags-edit-revision-submit": "Änderige by {{PLURAL:$1|dere Version|$1 Versionen}} usfüere",
+	"tags-edit-logentry-submit": "Änderige by {{PLURAL:$1|däm Logbuechytrag|$1 Logbuechyträg}} usfüere",
+	"tags-edit-success": "D Änderige sy erfolgrych usgfüert.",
+	"tags-edit-failure": "D Änderige hei sech nid la usfüere: $1",
+	"tags-edit-nooldid-title": "Ungültigi Zilversion",
+	"tags-edit-nooldid-text": "Entweder hesch du kei Zilversion a’gä, für die Funktion dermit uszfüere, oder es git di a’gänigi Zilversion nid.",
+	"tags-edit-none-selected": "Bitte suech mindistens ei Markierig uus zum Derzuetue oder Furtnäh.",
 	"comparepages": "Syte verglyyche",
 	"compare-page1": "Syte 1",
 	"compare-page2": "Syte 2",
@@ -2805,8 +3099,8 @@
 	"compare-revision-not-exists": "Die Version, wu Du aagee hesch, git s nit.",
 	"dberr-problems": "Excusez! Die Seite het im Momänt tächnischi Schwirigkeite.",
 	"dberr-again": "Wart e paar Minute un lad derno nej.",
-	"dberr-info": "(Cha kei Verbindig zum Datebank-Server härstelle: $1)",
-	"dberr-info-hidden": "(Cha kei Verbindig zum Datebank-Server härstelle)",
+	"dberr-info": "(Kei Zuegriff uf d Datebank: $1)",
+	"dberr-info-hidden": "(Kei Zuegriff uf d Datebank)",
 	"dberr-usegoogle": "Du chenntsch in dr Zwischezyt mit Google sueche.",
 	"dberr-outofdate": "Obacht: Dr Suechindex vu unsere Syte chennt veraltet syy.",
 	"dberr-cachederror": "Des isch e Kopii vum Cache vu dr Syte, wu Du aagforderet hesch, un chennt veraltet syy.",
@@ -2823,19 +3117,27 @@
 	"htmlform-no": "Nei",
 	"htmlform-yes": "Jo",
 	"htmlform-chosen-placeholder": "Wehl en Option",
+	"htmlform-cloner-create": "Wyteri derzuetue",
+	"htmlform-cloner-delete": "Furtnäh",
+	"htmlform-cloner-required": "Es bruucht mindistens ei Wärt.",
+	"htmlform-title-badnamespace": "[[:$1]] isch nid im Namensruum «{{ns:$2}}».",
+	"htmlform-title-not-creatable": "«$1» isch kei Sytename, wo sech lat la alege",
+	"htmlform-title-not-exists": "[[:$1]] git’s nid.",
+	"htmlform-user-not-exists": "<strong>$1</strong> git’s nid.",
+	"htmlform-user-not-valid": "<strong>$1</strong> isch ke gültige Name.",
 	"sqlite-has-fts": "$1 mit Unterstitzig vu dr Volltextsuechi",
 	"sqlite-no-fts": "$1 ohni Unterstitzig vu dr Volltextsuechi",
-	"logentry-delete-delete": "{{GENDER:$2|Dr|D|Dr}} $1 het d Syte $3 glöscht",
-	"logentry-delete-restore": "$1 het d Syte $3 wiiderhergstellt",
-	"logentry-delete-event": "$1 het die Sichtbarkeit {{PLURAL:$5|vumene Logbuechyytrag|vo $5 Logbuechyyträg}} uff $3: $4 gänderet",
-	"logentry-delete-revision": "$1 het die Sichtbarkeit {{PLURAL:$5|vunere Version|vo $5 Versione}} uff $3: $4 gänderet",
-	"logentry-delete-event-legacy": "$1 het d Sichtbarkeit vo Logbuechyyträg uff $3 gänderet",
-	"logentry-delete-revision-legacy": "$1 het d Sichtbarkeit vo Versione uff $3 gänderet",
-	"logentry-suppress-delete": "$1 het d Syte $3 unterdrückt",
-	"logentry-suppress-event": "$1 het diskret d Sichtbarkeit {{PLURAL:$5|vumene Logbuechyytrag|vo $5 Logbuechyyträg}} uff $3: $4 gänderet",
-	"logentry-suppress-revision": "$1 het diskret d Sichtbarkeit {{PLURAL:$5|vunere Version|vo $5 Versione}} uff $3: $4 gänderet",
-	"logentry-suppress-event-legacy": "$1 het d Sichtbarkeit vo Logbuechyyträg diskret uff $3 gänderet",
-	"logentry-suppress-revision-legacy": "$1 het diskret d Sichtbarkeit vo Versione uff $3 gänderet",
+	"logentry-delete-delete": "{{GENDER:$2|Dr|D|}} $1 het d Syte $3 glöscht",
+	"logentry-delete-restore": "{{GENDER:$2|Der $1|D $1|$1}} het d Syte $3 wider härgstellt",
+	"logentry-delete-event": "{{GENDER:$2|Der $1|D $1|$1}} het d Sichtbarkeit {{PLURAL:$5|vumene Logbuechyytrag|vo $5 Logbuechyyträg}} gänderet uff $3: $4",
+	"logentry-delete-revision": "{{GENDER:$2|Der $1|D $1|$1}} het d Sichtbarkeit {{PLURAL:$5|vunere Version|vo $5 Versione}} gänderet uff $3: $4",
+	"logentry-delete-event-legacy": "{{GENDER:$2|Der $1|D $1|$1}} het d Sichtbarkeit vo Logbuechyyträg uff $3 gänderet",
+	"logentry-delete-revision-legacy": "{{GENDER:$2|Der $1|D $1|$1}} het d Sichtbarkeit vo Versione uff $3 gänderet",
+	"logentry-suppress-delete": "{{GENDER:$2|Der $1|D $1|$1}} het d Syte $3 unterdrückt",
+	"logentry-suppress-event": "{{GENDER:$2|Der $1|D $1|$1}} het diskret d Sichtbarkeit {{PLURAL:$5|vumene Logbuechyytrag|vo $5 Logbuechyyträg}} gänderet uff $3: $4",
+	"logentry-suppress-revision": "{{GENDER:$2|Der $1|D $1|$1}} het diskret d Sichtbarkeit {{PLURAL:$5|vunere Version|vo $5 Versione}} gänderet uff $3: $4",
+	"logentry-suppress-event-legacy": "{{GENDER:$2|Der $1|D $1|$1}} het d Sichtbarkeit vo Logbuechyyträg diskret uff $3 gänderet",
+	"logentry-suppress-revision-legacy": "{{GENDER:$2|Der $1|D $1|$1}} het diskret d Sichtbarkeit vo Versione uff $3 gänderet",
 	"revdelete-content-hid": "Inhalt versteckt",
 	"revdelete-summary-hid": "Bearbeitigszämmefassig versteckt",
 	"revdelete-uname-hid": "Benutzername versteckt",
@@ -2844,34 +3146,67 @@
 	"revdelete-uname-unhid": "Benutzername freigee",
 	"revdelete-restricted": "Yyschränkige gälte au fir Ammanne",
 	"revdelete-unrestricted": "Yyschränkige fir Ammanne ufghobe",
+	"logentry-block-block": "{{GENDER:$2|Der $1|D $1|$1}} het {{GENDER:$4|der $3|d $3|$3}} bis $5 gsperrt $6",
+	"logentry-block-unblock": "{{GENDER:$2|Der $1|D $1|$1}} het {{GENDER:$4|der $3|d $3|$3}} entsperrt",
+	"logentry-block-reblock": "{{GENDER:$2|Der $1|D $1|$1}} het {{GENDER:$4|der $3|d $3|$3}} bis $5 gsperrt $6",
+	"logentry-suppress-block": "{{GENDER:$2|Der $1|D $1|$1}} het {{GENDER:$4|der $3|d $3|$3}} bis $5 gsperrt $6",
+	"logentry-suppress-reblock": "{{GENDER:$2|Der $1|D $1|$1}} het d Sperrystellige {{GENDER:$4|füre $3|für d $3|für $3}} bis $5 g’änderet $6",
+	"logentry-import-upload": "{{GENDER:$2|Der $1|D $1|$1}} het $3 importiert per Datei-Ufelade",
+	"logentry-import-interwiki": "{{GENDER:$2|Der $1|D $1|$1}} het $3 vomenen andere Wiki importiert",
+	"logentry-merge-merge": "{{GENDER:$2|Der $1|D $1|$1}} het $3 i $4 zämegfüert (Versione bis $5)",
 	"logentry-move-move": "{{GENDER:$2|Dr|D}} $1 het d Seite $3 uf $4 verschobe",
-	"logentry-move-move-noredirect": "$1 het d Syte $3 nooch $4 verschobe ohni e Wyterleitig aazlege",
-	"logentry-move-move_redir": "$1 het d Syte $3 nooch $4 verschobe un het debi e Wyterleitig überschrybe",
-	"logentry-move-move_redir-noredirect": "$1 het d Syte $3 nooch $4 verschobe un het debi e Wyterleitig überschrybe, ohni sälber eini aazlege",
-	"logentry-patrol-patrol": "$1 het Version $4 vo Syte $3 als kontrolliert markiert",
-	"logentry-patrol-patrol-auto": "$1 het Version $4 vo Syte $3 automatisch als kontrolliert markiert",
-	"logentry-newusers-newusers": "Benutzerkonto $1 isch aagleit wore.",
+	"logentry-move-move-noredirect": "{{GENDER:$2|Der $1|D $1|$1}} het d Syte $3 nooch $4 verschobe ohni e Wyterleitig aazlege",
+	"logentry-move-move_redir": "{{GENDER:$2|Der $1|D $1|$1}} het d Syte $3 nooch $4 verschobe un het debi e Wyterleitig überschrybe",
+	"logentry-move-move_redir-noredirect": "{{GENDER:$2|Der $1|D $1|$1}} het d Syte $3 nooch $4 verschobe un het debi e Wyterleitig überschrybe, ohni sälber eini aazlege",
+	"logentry-patrol-patrol": "{{GENDER:$2|Der $1|D $1|$1}} het Version $4 vo Syte $3 als kontrolliert markiert",
+	"logentry-patrol-patrol-auto": "{{GENDER:$2|Der $1|D $1|$1}} het Version $4 vor Syte $3 automatisch als kontrolliert markiert",
+	"logentry-newusers-newusers": "{{GENDER:$2|Benutzerkonto}} $1 isch aagleit wore.",
 	"logentry-newusers-create": "Benutzerkonto $1 {{GENDER:$2|isch aagleit wore}}",
-	"logentry-newusers-create2": "Benutzerkonto $3 isch aalgeit wore vu $1",
-	"logentry-newusers-autocreate": "S Benutzerchonto $1 isch automatisch erstellt worde",
-	"logentry-rights-rights": "$1 het d Gruppezuegherigkeit fir $3 vu $4 uf $5 gänderet",
-	"logentry-rights-rights-legacy": "$1 het d Gruppezuegherigkeit fir $3 gänderet",
-	"logentry-rights-autopromote": "$1 isch automatisch vu $4 zue $5 zuegordnet wore",
+	"logentry-newusers-create2": "{{GENDER:$2|Der $1|D $1|$1}} het ds Benutzerkonto $3 agleit",
+	"logentry-newusers-byemail": "{{GENDER:$2|Der $1|D $1|$1}} het ds Benutzerkonto $3 agleit und ds Passwort isch per E-Mail verschickt worde",
+	"logentry-newusers-autocreate": "Ds {{GENDER:$2|Benutzerkonto}} $1 isch automatisch agleit worde",
+	"logentry-protect-move_prot": "{{GENDER:$2|Der $1|D $1|$1}} het d Schutzystellige vo $4 uf $3 verschobe",
+	"logentry-rights-rights": "{{GENDER:$2|Der $1|D $1|$1}} het d Gruppezuegherigkeit fir $3 vu $4 uf $5 gänderet",
+	"logentry-rights-rights-legacy": "{{GENDER:$2|Der $1|D $1|$1}} het d Gruppezuegherigkeit fir $3 gänderet",
+	"logentry-rights-autopromote": "{{GENDER:$2|Der $1|D $1|$1}} isch automatisch vo $4 uf $5 beförderet worde",
 	"logentry-upload-upload": "{{GENDER:$2|Dr|D}} $1 het $3 uffeglade",
+	"logentry-upload-overwrite": "{{GENDER:$2|Der $1|D $1|$1}} het e nöüi Version vo $3 ufeglade",
+	"logentry-upload-revert": "{{GENDER:$2|Der $1|D $1|$1}} het $3 ufeglade",
+	"log-name-managetags": "Markierigsverwaltigs-Logbuech",
+	"log-description-managetags": "Uf dere Syte het’s Verwaltigsufgabe für [[Special:Tags|Markierige]]. Ds Logbuech zeigt numen Aktione, wo manuell von ere/emen Administrator/in sy usgfüert worde. D Wiki-Software cha Markierigen alegen oder lösche, ohni das es i däm Logbuech verzeichnet wird.",
+	"logentry-managetags-create": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierig «$4» agleit",
+	"logentry-managetags-delete": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierig «$4» glöscht (us {{PLURAL:$5|eire Version oder eim Logbuechytrag|$5 Versionen oder Logbuechyträg}} furtgnoh)",
+	"logentry-managetags-activate": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierig $4 zum Gebruuch vo Benutzer/innen oder Bots aktiviert",
+	"logentry-managetags-deactivate": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierig $4 zum Gebruuch vo Benutzer/innen oder Bots deaktiviert",
+	"log-name-tag": "Markierigs-Logbuech",
+	"log-description-tag": "Die Syte zeigt [[Special:Tags|Markierige]], wo by einzelne Versionen oder Logbuechyträg äxtra sy derzueta oder furtgnoh worde. Markierige als Teil von ere Bearbeitig, Löschig oder ähnlechen Aktion sy nid ufgfüert.",
+	"logentry-tag-update-add-revision": "{{GENDER:$2|Der $1|D $1|$1}} het d {{PLURAL:$7|Markierig|Markierige}} $6 zur Version $4 vor Syte $3 derzueta.",
+	"logentry-tag-update-add-logentry": "{{GENDER:$2|Der $1|D $1|$1}} het d {{PLURAL:$7|Markierig|Markierige}} $6 zum Logbuechytrag $5 vor Syte $3 derzueta.",
+	"logentry-tag-update-remove-revision": "{{GENDER:$2|Der $1|D $1|$1}} het d {{PLURAL:$9|Markierig|Markierige}} $8 vor Version $4 vor Syte $3 furtgnoh.",
+	"logentry-tag-update-remove-logentry": "{{GENDER:$2|Der $1|D $1|$1}} het d {{PLURAL:$9|Markierig|Markierige}} $8 vom Logbuechytrag $5 vor Syte $3 furtgnoh.",
+	"logentry-tag-update-revision": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierige bir Version $4 vor Syte $3 aktualisiert ({{PLURAL:$7|eini|$6}} derzueta, {{PLURAL:$9|eini|$8}} furtgnoh).",
+	"logentry-tag-update-logentry": "{{GENDER:$2|Der $1|D $1|$1}} het d Markierige bim Logbuechytrag $5 vor Syte $3 aktualisiert ({{PLURAL:$7|eini|$6}} derzueta, {{PLURAL:$9|eini|$8}} furtgnoh).",
 	"rightsnone": "(keini)",
 	"revdelete-summary": "Zämmefassig",
 	"feedback-adding": "Ruggmäldig wird zur Syte dezuegfiegt …",
+	"feedback-back": "Zrügg",
 	"feedback-bugcheck": "Schen! Bitte iberprief no, eb s sich doderby nit um e scho [$1 bekannte Fähler] handlet.",
 	"feedback-bugnew": "Ich haa s iberprieft. Dr nej Fähler mälde.",
 	"feedback-bugornote": "Wän Du detailliert e tächnisch Probläm witt bschryybe, no mäld bitte [$1 ne Fähler].\nSunscht chasch au s eifach Formular unte nutze. Dyy Kommentar wird, zämme mit Dyym Benutzername un dr Version vu Dyym Webbrowser un em Betribssyschtem, uf dr Syte „[$3 $2]“ zuegfiegt.",
 	"feedback-cancel": "Abbräche",
 	"feedback-close": "Isch gmacht",
+	"feedback-external-bug-report-button": "E technischi Ufgab yreiche",
+	"feedback-dialog-title": "Rückmäldig gä",
+	"feedback-dialog-intro": "Du chasch ds eifache Formular unde bruuche, für’ne Rückmäldig z gä. Dy Kommentar chunt zäme mit dym Benutzernamen uf d Syte «$1».",
+	"feedback-error-title": "Fähler",
 	"feedback-error1": "Fäälermäldig: Unbekannts Ergebniss vo de API",
 	"feedback-error2": "Fääler: Bearbeitig fehlgschlo",
 	"feedback-error3": "Fäälermäldig: Kei Antwort vo de API",
+	"feedback-error4": "Fähler: Der Fähler het sech nid under em a’gänige Titel la spychere",
 	"feedback-message": "Noochricht:",
 	"feedback-subject": "Beträff:",
 	"feedback-submit": "Ruggmäldig abschigge",
+	"feedback-terms": "I bi mer bewusst, das my User Agent exakti Versionen über my Browser und mys Betribssystem enthaltet und zäme mit der Rückmäldig veröffentlecht wird.",
 	"feedback-thanks": "Dankschen. Dyy Ruckmäldig isch uf dr Syte „[$2 $1]“ gspycheret wore.",
 	"searchsuggest-search": "Suechi",
 	"searchsuggest-containing": "din het s …",
diff --git a/languages/i18n/gu.json b/languages/i18n/gu.json
index f8680a3b90..9d4a797b5d 100644
--- a/languages/i18n/gu.json
+++ b/languages/i18n/gu.json
@@ -1967,7 +1967,7 @@
 	"movepagebtn": "પાનું ખસેડો",
 	"pagemovedsub": "પાનું સફળતા પૂર્વક ખસેડવામાં આવ્યું છે",
 	"movepage-moved": "'''\"$1\" નું નામ બદલીને \"$2\" કરવામાં આવ્યું છે'''",
-	"movepage-moved-redirect": "દિશાનિર્દેશના રચાયું",
+	"movepage-moved-redirect": "દિશાનિર્દેશ રચાયું",
 	"movepage-moved-noredirect": "દિશાનિર્દેશન ટાળવામાં આવ્યું છે",
 	"articleexists": "આ નામનું પાનું અસ્તિત્વમાં છે, અથવાતો તમે પસંદ કરેલું નામ અસ્વિકાર્ય છો.\nકૃપા કરી અન્ય નામ પસંદ કરો.",
 	"cantmove-titleprotected": "આ સ્થાને તમે પાનું નહીં હટાવી શકો કેમ કે નવું શીર્ષક રચના કરવા પહેલેથી આરક્ષીત છે",
@@ -2142,7 +2142,7 @@
 	"tooltip-ca-nstab-main": "સૂચિ વાળું પાનુ જુઓ",
 	"tooltip-ca-nstab-user": "સભ્યનું પાનું જુઓ",
 	"tooltip-ca-nstab-media": "મિડિયાનું પાનું જુઓ",
-	"tooltip-ca-nstab-special": "આ ખાસ પાનું છે, તમે તેમાં ફેરફાર કરી શકશો નહી",
+	"tooltip-ca-nstab-special": "આ ખાસ પાનું છે, અને તેમાં ફેરફાર કરી શકાશે નહી",
 	"tooltip-ca-nstab-project": "પરિયોજનાનું પાનું જુવો",
 	"tooltip-ca-nstab-image": "ફાઇલ વિષેનું પાનું જુઓ",
 	"tooltip-ca-nstab-mediawiki": "તંત્ર સંદેશ જુઓ",
diff --git a/languages/i18n/he.json b/languages/i18n/he.json
index 01809a4df6..4cdb75e216 100644
--- a/languages/i18n/he.json
+++ b/languages/i18n/he.json
@@ -940,7 +940,8 @@
 	"rows": "שורות:",
 	"columns": "עמודות:",
 	"searchresultshead": "חיפוש",
-	"stub-threshold": "סף לעיצוב <a href=\"#\" class=\"stub\">קישורים</a> לקצרמרים (בתים):",
+	"stub-threshold": "סף לעיצוב קישורים לקצרמרים ($1):",
+	"stub-threshold-sample-link": "דוגמה",
 	"stub-threshold-disabled": "מבוטל",
 	"recentchangesdays": "מספר הימים שיוצגו בדף השינויים האחרונים:",
 	"recentchangesdays-max": "לכל היותר {{PLURAL:$1|יום אחד|יומיים|$1 ימים}}",
@@ -1660,7 +1661,7 @@
 	"booksources-text": "להלן רשימת קישורים לאתרים אחרים המוכרים ספרים חדשים ויד־שנייה, ושבהם עשוי להיות מידע נוסף לגבי ספרים שאתם מחפשים:",
 	"booksources-invalid-isbn": "המסת\"ב שניתן כנראה אינו תקין; אנא בדקו אם ביצעתם טעויות בהעתקה מהמידע המקורי.",
 	"specialloguserlabel": "בוצעו על־ידי המשתמש:",
-	"speciallogtitlelabel": "יעד (כותרת או משתמש):",
+	"speciallogtitlelabel": "יעד (כותרת או {{ns:user}}:שם עבור משתמש):",
 	"log": "יומנים",
 	"all-logs-page": "כל היומנים הציבוריים",
 	"alllogstext": "תצוגה משולבת של כל סוגי היומנים הזמינים ב{{grammar:תחילית|{{SITENAME}}}}.\nניתן לצמצם את התצוגה על־ידי בחירת סוג היומן, שם המשתמש (תלוי רישיות) או הדף המושפע (גם כן תלוי רישיות).",
@@ -2338,7 +2339,7 @@
 	"tooltip-ca-nstab-main": "צפייה בדף התוכן",
 	"tooltip-ca-nstab-user": "צפייה בדף המשתמש",
 	"tooltip-ca-nstab-media": "צפייה בפריט המדיה",
-	"tooltip-ca-nstab-special": "זהו דף מיוחד, לא ניתן לערוך אותו",
+	"tooltip-ca-nstab-special": "זהו דף מיוחד, ולא ניתן לערוך אותו",
 	"tooltip-ca-nstab-project": "צפייה בדף המיזם",
 	"tooltip-ca-nstab-image": "צפייה בדף הקובץ",
 	"tooltip-ca-nstab-mediawiki": "צפייה בהודעת המערכת",
diff --git a/languages/i18n/hr.json b/languages/i18n/hr.json
index 104e2f202b..50519e3f89 100644
--- a/languages/i18n/hr.json
+++ b/languages/i18n/hr.json
@@ -900,7 +900,7 @@
 	"rows": "Redova",
 	"columns": "Stupaca",
 	"searchresultshead": "Prikaz rezultata pretrage",
-	"stub-threshold": "Prag za formatiranje poput <a href=\"#\" class=\"stub\">poveznice mrve</a>:",
+	"stub-threshold": "Prag za formatiranje poveznice na mrve ($1):",
 	"stub-threshold-disabled": "Onemogućeno",
 	"recentchangesdays": "Broj dana prikazanih u nedavnim promjenama:",
 	"recentchangesdays-max": "(maksimalno $1 {{PLURAL:$1|dan|dana}})",
@@ -1624,7 +1624,6 @@
 	"emailuser": "Pošalji mu e-poruku",
 	"emailuser-title-target": "Pošalji poruku {{GENDER:$1|suradniku|suradnici|suradniku}}",
 	"emailuser-title-notarget": "Pošalji e-poštu suradniku",
-	"emailpage": "Pošalji e-poštu suradniku",
 	"emailpagetext": "Možete koristiti ovaj obrazac za slanje elektroničke pošte {{GENDER:$1|suradniku|suradnici}}.\nE-mail adresa iz Vaših [[Special:Preferences|postavki]] nalazit će se u \"From\" polju poruke i primatelj će Vam moći izravno odgovoriti.",
 	"defemailsubject": "{{SITENAME}} e-mail od suradnika \"$1\"",
 	"usermaildisabled": "Suradnička e-pošta je onemogućena",
diff --git a/languages/i18n/hu.json b/languages/i18n/hu.json
index 0b9fd87ecd..ab2355338a 100644
--- a/languages/i18n/hu.json
+++ b/languages/i18n/hu.json
@@ -1790,15 +1790,15 @@
 	"enotif_reset": "Az összes lap megjelölése felkeresettként",
 	"enotif_impersonal_salutation": "{{SITENAME}} felhasználó",
 	"enotif_subject_deleted": "$2 törölte a(z) $1 {{SITENAME}}-oldalt",
-	"enotif_subject_created": "$2 létrehozta a(z) $1 {{SITENAME}} oldalt",
-	"enotif_subject_moved": "$2 átmozgatta a $1 {{SITENAME}} oldalt.",
-	"enotif_subject_restored": "$2 visszaállította a $1 {{SITENAME}} oldalt.",
+	"enotif_subject_created": "$2 létrehozta a(z) $1 {{SITENAME}}-oldalt",
+	"enotif_subject_moved": "$2 átmozgatta a(z) $1 {{SITENAME}}-oldalt",
+	"enotif_subject_restored": "$2 visszaállította a(z) $1 {{SITENAME}}-oldalt",
 	"enotif_subject_changed": "$2 megváltoztatta a(z) $1 {{SITENAME}}-oldalt",
-	"enotif_body_intro_deleted": "$2 törölte a $1 {{SITENAME}} oldalt $PAGEEDITDATE-kor, lásd $3.",
-	"enotif_body_intro_created": "$2 létrehozta a $1 {{SITENAME}} oldalt $PAGEEDITDATE-kor, lásd az aktuális verziót itt: $3.",
-	"enotif_body_intro_moved": "$2 átmozgatta a $1 {{SITENAME}} oldalt $PAGEEDITDATE-kor, lásd az aktuális verziót itt: $3.",
-	"enotif_body_intro_restored": "$2 visszaállította a $1 {{SITENAME}} oldalt $PAGEEDITDATE-kor, lásd az aktuális verziót itt: $3.",
-	"enotif_body_intro_changed": "$2 megváltoztatta a $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, az aktuális verziót lásd itt: $3.",
+	"enotif_body_intro_deleted": "$2 törölte a(z) $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, lásd $3.",
+	"enotif_body_intro_created": "$2 létrehozta a(z) $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, lásd az aktuális verziót itt: $3.",
+	"enotif_body_intro_moved": "$2 átmozgatta a(z) $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, lásd az aktuális verziót itt: $3.",
+	"enotif_body_intro_restored": "$2 visszaállította a(z) $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, lásd az aktuális verziót itt: $3.",
+	"enotif_body_intro_changed": "$2 megváltoztatta a(z) $1 {{SITENAME}}-oldalt $PAGEEDITDATE dátumon, az aktuális verziót lásd itt: $3.",
 	"enotif_lastvisited": "Lásd a $1 lapot az utolsó látogatásod óta történt változtatásokért.",
 	"enotif_lastdiff": "Lásd a $1 lapot ezen változtatás megtekintéséhez.",
 	"enotif_anon_editor": "$1 névtelen felhasználó",
diff --git a/languages/i18n/ia.json b/languages/i18n/ia.json
index b6391d83f3..2f933235f9 100644
--- a/languages/i18n/ia.json
+++ b/languages/i18n/ia.json
@@ -434,6 +434,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pagina|paginas}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contributor|contributores}} recente",
 	"badretype": "Le duo contrasignos que tu scribeva non es identic.",
+	"usernameinprogress": "Le creation de un conto con iste nomine de usator es jam in curso.\nPer favor, attende.",
 	"userexists": "Iste nomine de usator es jam in uso.\nSelige un altere nomine.",
 	"loginerror": "Error in le apertura del session",
 	"createacct-error": "Error de creation de conto",
@@ -923,7 +924,8 @@
 	"rows": "Lineas:",
 	"columns": "Columnas:",
 	"searchresultshead": "Recerca",
-	"stub-threshold": "Limite pro formatar le ligamines in <a href=\"#\" class=\"stub\">stilo de peciettas</a> (bytes):",
+	"stub-threshold": "Limite pro formatar ligamines a peciettas ($1):",
+	"stub-threshold-sample-link": "exemplo",
 	"stub-threshold-disabled": "Disactivate",
 	"recentchangesdays": "Numero de dies a monstrar in modificationes recente:",
 	"recentchangesdays-max": "(non plus de $1 {{PLURAL:$1|die|dies}})",
@@ -2318,7 +2320,7 @@
 	"tooltip-ca-nstab-main": "Vider le pagina de contento",
 	"tooltip-ca-nstab-user": "Vider le pagina de usator",
 	"tooltip-ca-nstab-media": "Vider le pagina de media",
-	"tooltip-ca-nstab-special": "Isto es un pagina special, tu non pote modificar le pagina mesme",
+	"tooltip-ca-nstab-special": "Isto es un pagina special e non pote esser modificate",
 	"tooltip-ca-nstab-project": "Vider le pagina de projecto",
 	"tooltip-ca-nstab-image": "Vider le pagina del file",
 	"tooltip-ca-nstab-mediawiki": "Vider le message del systema",
@@ -2720,13 +2722,13 @@
 	"exif-lightsource-19": "Lumine standard C",
 	"exif-lightsource-24": "Tungsten de studio ISO",
 	"exif-lightsource-255": "Altere origine de lumine",
-	"exif-flash-fired-0": "Flash non fulgurava",
-	"exif-flash-fired-1": "Flash fulgurava",
+	"exif-flash-fired-0": "Flash non ha fulgurate",
+	"exif-flash-fired-1": "Flash ha fulgurate",
 	"exif-flash-return-0": "nulle function pro deteger stroboscopio",
 	"exif-flash-return-2": "stroboscopio non detegite",
 	"exif-flash-return-3": "stroboscopio detegite",
-	"exif-flash-mode-1": "fulguration flash compulsori",
-	"exif-flash-mode-2": "suppression del flash compulsori",
+	"exif-flash-mode-1": "activation del flash fortiate",
+	"exif-flash-mode-2": "suppression del flash fortiate",
 	"exif-flash-mode-3": "modo automatic",
 	"exif-flash-function-1": "Nulle function de flash",
 	"exif-flash-redeye-1": "modo de reduction de oculos rubie",
@@ -3167,6 +3169,7 @@
 	"logentry-newusers-create2": "Le conto de usator $3 ha essite {{GENDER:$2|create}} per $1",
 	"logentry-newusers-byemail": "Le conto de usator $3 ha essite {{GENDER:$2|create}} per $1 e le contrasigno ha essite inviate per e-mail",
 	"logentry-newusers-autocreate": "Le conto $1 ha essite {{GENDER:$2|create}} automaticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|displaciava}} le parametros de protection de $4 a $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|cambiava}} le appertinentia a gruppos pro $3 de $4 a $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|cambiava}} le appertinentia a gruppos pro $3",
 	"logentry-rights-autopromote": "$1 ha essite automaticamente {{GENDER:$2|promovite}} de $4 a $5",
diff --git a/languages/i18n/id.json b/languages/i18n/id.json
index 265bb2df10..2c0aa8d11c 100644
--- a/languages/i18n/id.json
+++ b/languages/i18n/id.json
@@ -39,7 +39,8 @@
 			"Ahdan",
 			"Macofe",
 			"Totosunarto",
-			"Mirws"
+			"Mirws",
+			"Ilham"
 		]
 	},
 	"tog-underline": "Garis bawahi pranala:",
@@ -1642,7 +1643,7 @@
 	"booksources-text": "Di bawah ini adalah daftar pranala ke situs lain yang menjual buku baru dan bekas, dan mungkin juga mempunyai informasi lebih lanjut mengenai buku yang sedang Anda cari:",
 	"booksources-invalid-isbn": "ISBN yang diberikan tampaknya tidak valid; periksa kesalahan penyalinan dari sumber asli.",
 	"specialloguserlabel": "Pengguna:",
-	"speciallogtitlelabel": "Target (judul atau pengguna):",
+	"speciallogtitlelabel": "Target (judul atau{{ns:pengguna}}:nama pengguna untuk pengguna)",
 	"log": "Catatan (Log)",
 	"all-logs-page": "Semua log publik",
 	"alllogstext": "Gabungan tampilan semua log yang tersedia di {{SITENAME}}.\nAnda dapat melakukan pembatasan tampilan dengan memilih jenis log, nama pengguna (sensitif kapitalisasi), atau judul halaman (juga sensitif kapitalisasi).",
@@ -2309,7 +2310,7 @@
 	"tooltip-ca-nstab-main": "Lihat halaman isi",
 	"tooltip-ca-nstab-user": "Lihat halaman pengguna",
 	"tooltip-ca-nstab-media": "Lihat halaman media",
-	"tooltip-ca-nstab-special": "Ini adalah halaman istimewa yang tidak dapat disunting.",
+	"tooltip-ca-nstab-special": "Ini adalah halaman istimewa, dan tidak dapat disunting.",
 	"tooltip-ca-nstab-project": "Lihat halaman proyek",
 	"tooltip-ca-nstab-image": "Lihat halaman berkas",
 	"tooltip-ca-nstab-mediawiki": "Lihat pesan sistem",
diff --git a/languages/i18n/it.json b/languages/i18n/it.json
index bc8ce8ffb2..5e2bc07d84 100644
--- a/languages/i18n/it.json
+++ b/languages/i18n/it.json
@@ -89,7 +89,8 @@
 			"Fringio",
 			"Aquatech",
 			"Statix64",
-			"CassiodoroVicinetti"
+			"CassiodoroVicinetti",
+			"Bultro"
 		]
 	},
 	"tog-underline": "Sottolinea i collegamenti:",
@@ -999,7 +1000,8 @@
 	"rows": "Righe:",
 	"columns": "Colonne:",
 	"searchresultshead": "Ricerca",
-	"stub-threshold": "Valore minimo per i <a href=\"#\" class=\"stub\">collegamenti agli abbozzi</a> (in byte):",
+	"stub-threshold": "Soglia per i collegamenti agli abbozzi ($1):",
+	"stub-threshold-sample-link": "esempio",
 	"stub-threshold-disabled": "Disattivato",
 	"recentchangesdays": "Numero di giorni da mostrare nelle ultime modifiche:",
 	"recentchangesdays-max": "(massimo $1 {{PLURAL:$1|giorno|giorni}})",
@@ -1252,7 +1254,7 @@
 	"recentchanges-label-unpatrolled": "Modifica non ancora verificata",
 	"recentchanges-label-plusminus": "Variazione della pagina in numero di byte",
 	"recentchanges-legend-heading": "'''Legenda:'''",
-	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (vedi [[Special:NewPages|le nuove pagine]])",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (vedi le [[Special:NewPages|nuove pagine]])",
 	"recentchanges-legend-plusminus": "(''±123'')",
 	"rcnotefrom": "Di seguito {{PLURAL:$5|è elencata la modifica apportata|sono elencate le modifiche apportate}} a partire da <strong>$3, $4</strong> (mostrate fino a <strong>$1</strong>).",
 	"rclistfrom": "Mostra le modifiche apportate a partire da $3 $2",
@@ -1714,7 +1716,7 @@
 	"booksources-text": "Di seguito sono elencati alcuni collegamenti verso siti esterni che vendono libri nuovi e usati, attraverso i quali è possibile ottenere maggiori informazioni sul testo cercato.",
 	"booksources-invalid-isbn": "L'ISBN inserito sembra non essere valido; verificare che non siano stati commessi errori nel copiarlo dalla fonte originale.",
 	"specialloguserlabel": "Azione effettuata da:",
-	"speciallogtitlelabel": "Azione effettuata su:",
+	"speciallogtitlelabel": "Azione effettuata su (titolo della pagina o {{ns:user}}:Nome utente):",
 	"log": "Registri",
 	"all-logs-page": "Tutti i registri pubblici",
 	"alllogstext": "Presentazione unificata di tutti i registri di {{SITENAME}}.\nÈ possibile restringere i criteri di ricerca selezionando il tipo di registro, l'utente che ha eseguito l'azione, e/o la pagina interessata (entrambi i campi sono sensibili al maiuscolo/minuscolo).",
@@ -2393,7 +2395,7 @@
 	"tooltip-ca-nstab-main": "Vedi la voce",
 	"tooltip-ca-nstab-user": "Vedi la pagina utente",
 	"tooltip-ca-nstab-media": "Vedi la pagina del file multimediale",
-	"tooltip-ca-nstab-special": "Questa è una pagina speciale, non può essere modificata",
+	"tooltip-ca-nstab-special": "Questa è una pagina speciale e non può essere modificata",
 	"tooltip-ca-nstab-project": "Vedi la pagina di servizio",
 	"tooltip-ca-nstab-image": "Vedi la pagina del file",
 	"tooltip-ca-nstab-mediawiki": "Vedi il messaggio di sistema",
@@ -3268,6 +3270,7 @@
 	"logentry-newusers-create2": "L'utenza $3 è stata {{GENDER:$2|creata}} da $1",
 	"logentry-newusers-byemail": "L'utenza $3 è stata {{GENDER:$2|creata}} da $1 e la password è stata inviata via email",
 	"logentry-newusers-autocreate": "L'utenza $1 è stata {{GENDER:$2|creata}} automaticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|ha spostato}} le impostazioni di protezione da $4 a $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|ha modificato}} l'appartenenza di $3 dal gruppo $4 al gruppo $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|ha modificato}} l'appartenenza a gruppi di $3",
 	"logentry-rights-autopromote": "$1 è {{GENDER:$2|stato promosso|stata promossa|stato/a promosso/a}} automaticamente da $4 a $5",
diff --git a/languages/i18n/ja.json b/languages/i18n/ja.json
index acbffe3962..33a46525fa 100644
--- a/languages/i18n/ja.json
+++ b/languages/i18n/ja.json
@@ -71,32 +71,32 @@
 		]
 	},
 	"tog-underline": "リンクの下線:",
-	"tog-hideminor": "最近の更新に細部の編集を表示しない",
-	"tog-hidepatrolled": "最近の更新に巡回済みの編集を表示しない",
-	"tog-newpageshidepatrolled": "新しいページの一覧に巡回済みのページを表示しない",
+	"tog-hideminor": "最近の更新に、細部の編集を表示しない",
+	"tog-hidepatrolled": "最近の更新に、巡回済みの編集を表示しない",
+	"tog-newpageshidepatrolled": "新しいページの一覧に、巡回済みのページを表示しない",
 	"tog-extendwatchlist": "ウォッチリストを拡張し、最新のものだけではなくすべての変更を表示",
-	"tog-usenewrc": "最近の更新とウォッチリストで複数の変更をページごとにまとめる",
+	"tog-usenewrc": "最近の更新とウォッチリストで、複数の変更をページごとにまとめる",
 	"tog-numberheadings": "見出しに番号を自動的に振る",
 	"tog-showtoolbar": "編集用のツールバーを表示",
 	"tog-editondblclick": "ダブルクリックでページを編集",
 	"tog-editsectiononrightclick": "節見出しの右クリックで節を編集できるようにする",
-	"tog-watchcreations": "自分が作成したページやアップロードしたファイルをウォッチリストに追加",
-	"tog-watchdefault": "自分が編集したページやファイルをウォッチリストに追加",
-	"tog-watchmoves": "自分が移動したページやファイルをウォッチリストに追加",
-	"tog-watchdeletion": "自分が削除したページやファイルをウォッチリストに追加",
-	"tog-watchrollback": "ロールバックしたページをウォッチリストに追加",
-	"tog-minordefault": "細部の編集に既定でチェックを入れる",
+	"tog-watchcreations": "自分が作成したページやアップロードしたファイルを、ウォッチリストに追加",
+	"tog-watchdefault": "自分が編集したページやファイルを、ウォッチリストに追加",
+	"tog-watchmoves": "自分が移動したページやファイルを、ウォッチリストに追加",
+	"tog-watchdeletion": "自分が削除したページやファイルを、ウォッチリストに追加",
+	"tog-watchrollback": "ロールバックしたページを、ウォッチリストに追加",
+	"tog-minordefault": "細部の編集すべてに、既定でチェックを入れる",
 	"tog-previewontop": "プレビューを編集ボックスの前に配置",
 	"tog-previewonfirst": "編集開始時にもプレビューを表示",
-	"tog-enotifwatchlistpages": "ウォッチリストにあるページやファイルが更新されたらメールを受け取る",
-	"tog-enotifusertalkpages": "自分のトークページが更新されたらメールを受け取る",
+	"tog-enotifwatchlistpages": "ウォッチリストにあるページやファイルが更新されたら、メールを受け取る",
+	"tog-enotifusertalkpages": "自分のトークページが更新されたら、メールを受け取る",
 	"tog-enotifminoredits": "ページやファイルへの細部の編集でもメールを受け取る",
 	"tog-enotifrevealaddr": "通知メールで自分のメールアドレスを明示",
 	"tog-shownumberswatching": "ページをウォッチしている利用者数を表示",
 	"tog-oldsig": "既存の署名:",
 	"tog-fancysig": "署名をウィキ文として扱う (自動リンクなし)",
 	"tog-uselivepreview": "ライブプレビューを使用",
-	"tog-forceeditsummary": "要約欄が空欄の場合に確認を促す",
+	"tog-forceeditsummary": "要約欄が空欄の場合に確認をうながす",
 	"tog-watchlisthideown": "自分の編集をウォッチリストに表示しない",
 	"tog-watchlisthidebots": "ボットによる編集をウォッチリストに表示しない",
 	"tog-watchlisthideminor": "細部の編集をウォッチリストに表示しない",
@@ -112,7 +112,7 @@
 	"underline-always": "常に付ける",
 	"underline-never": "常に付けない",
 	"underline-default": "外装またはブラウザーの既定値を使用",
-	"editfont-style": "編集エリアのフォント:",
+	"editfont-style": "編集エリアのフォント形式:",
 	"editfont-default": "ブラウザーの設定を使用",
 	"editfont-monospace": "等幅フォント",
 	"editfont-sansserif": "サンセリフ体のフォント",
@@ -199,7 +199,7 @@
 	"about": "解説",
 	"article": "本文",
 	"newwindow": "(新しいウィンドウで開きます)",
-	"cancel": "中止",
+	"cancel": "取り消し",
 	"moredotdotdot": "続き...",
 	"morenotlisted": "この一覧は完全ではありません。",
 	"mypage": "ページ",
@@ -274,7 +274,7 @@
 	"lastmodifiedat": "このページの最終更新日時は $1 $2 です。",
 	"viewcount": "このページは {{PLURAL:$1|$1 回}}アクセスされました。",
 	"protectedpage": "保護されたページ",
-	"jumpto": "移動:",
+	"jumpto": "移動先:",
 	"jumptonavigation": "案内",
 	"jumptosearch": "検索",
 	"view-pool-error": "申し訳ありませんが、現在サーバーに過大な負荷がかかっています。\nこのページを閲覧しようとする利用者が多すぎます。\nしばらく時間を置いてから、もう一度このページにアクセスしてみてください。\n\n$1",
@@ -351,7 +351,7 @@
 	"nstab-image": "ファイル",
 	"nstab-mediawiki": "メッセージ",
 	"nstab-template": "テンプレート",
-	"nstab-help": "ヘルプ",
+	"nstab-help": "ヘルプページ",
 	"nstab-category": "カテゴリ",
 	"nosuchaction": "そのような操作はありません",
 	"nosuchactiontext": "この URL で指定された操作は正しくありません。\nURL を間違って入力したか、正しくないリンクをたどった可能性があります。\n{{SITENAME}}が利用するソフトウェアのバグの可能性もあります。",
@@ -366,7 +366,7 @@
 	"databaseerror-error": "エラー: $1",
 	"laggedslavemode": "<strong>警告:</strong> ページに最新の編集が反映されていない可能性があります。",
 	"readonly": "データベースがロックされています",
-	"enterlockreason": "ロックの理由とロック解除の予定を入力してください",
+	"enterlockreason": "ロックの理由の入力と、ロック解除の予定を、入力してください",
 	"readonlytext": "データベースは現在、新しいページの追加や編集を受け付けない「ロック状態」になっています。これはおそらくデータベースの定期メンテナンスのためで、メンテナンス終了後は正常な状態に復帰します。\n\nデータベースをロックした管理者による説明は以下の通りです: $1",
 	"missing-article": "指定されたページ「$1」$2 の本文がデータベース内で見つかりませんでした。\n\n通常、削除されたページの版への古い差分表示や固定リンクをたどった際に、このようなことが起きます。\n\nそれ以外の操作でこのメッセージが表示された場合、ソフトウェアのバグである可能性があります。\n[[Special:ListUsers/sysop|管理者]]までその URL を添えてお知らせください。",
 	"missingarticle-rev": "(版番号: $1)",
@@ -382,7 +382,7 @@
 	"directoryreadonlyerror": "ディレクトリー「$1」は読み取り専用です。",
 	"directorynotreadableerror": "ディレクトリー「$1」は読み取りできません。",
 	"filenotfound": "ファイル「$1」が見つかりませんでした。",
-	"unexpected": "予期しない値「$1」=「$2」です。",
+	"unexpected": "予期しない値です。:「$1」=「$2」",
 	"formerror": "エラー: フォームを送信できませんでした。",
 	"badarticleerror": "このページでは要求された操作を行えません。",
 	"cannotdelete": "ページまたはファイル「$1」を削除できませんでした。\n他の人が既に削除した可能性があります。",
@@ -391,15 +391,15 @@
 	"no-null-revision": "ページ「$1」に新しい空編集の版を作成できませんでした。",
 	"badtitle": "正しくないページ名",
 	"badtitletext": "無効または空のページ名が指定されたか、言語間/ウィキ間リンクの方法に誤りがあります。\nページ名に使用できない文字が含まれている可能性があります。",
-	"title-invalid-empty": "指定されたページ名は空もしくは名前空間しか含んでいません。",
+	"title-invalid-empty": "指定されたページ名は空であるか、もしくは名前空間しか含んでいません。",
 	"title-invalid-utf8": "指定されたページ名が無効なUTF-8シーケンスを含んでいます。",
-	"title-invalid-interwiki": "指定されたページ名がページ名として使用できないウィキ間リンクを含んでいます。",
+	"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 バイト以下でなければなりません。",
-	"title-invalid-leading-colon": "指定されたページ名の先頭に無効なコロンが含まれています。",
+	"title-invalid-leading-colon": "指定されたページ名の先頭に、無効なコロンが含まれています。",
 	"perfcached": "以下のデータはキャッシュされており、最新ではない可能性があります。最大 $1 {{PLURAL:$1|件の結果}}がキャッシュされます。",
 	"perfcachedts": "以下のデータはキャッシュされており、最終更新日時は $1 です。最大 $4 {{PLURAL:$4|件の結果}}がキャッシュされます。",
 	"querypage-no-updates": "ページの更新は無効になっています。\n以下のデータの更新は現在行われていません。",
@@ -448,10 +448,10 @@
 	"createacct-yourpasswordagain-ph": "パスワードを再入力",
 	"remembermypassword": "このブラウザーにログイン情報を保存 (最長 $1 {{PLURAL:$1|日|日間}})",
 	"userlogin-remembermypassword": "ログイン状態を保持",
-	"userlogin-signwithsecure": "SSL (https) 接続を使用",
-	"yourdomainname": "ドメイン:",
+	"userlogin-signwithsecure": "安全な接続の使用",
+	"yourdomainname": "あなたのドメイン:",
 	"password-change-forbidden": "このウィキではパスワードを変更できません。",
-	"externaldberror": "認証データベースでエラーが発生した、または外部アカウントの更新が許可されていません。",
+	"externaldberror": "認証データベースでエラーが発生したか、または外部アカウントの更新が許可されていません。",
 	"login": "ログイン",
 	"nav-login-createaccount": "ログインまたはアカウント作成",
 	"userlogin": "ログインまたはアカウント作成",
@@ -498,7 +498,7 @@
 	"nocookieslogin": "{{SITENAME}}ではログインに Cookie を使用します。\nCookie を無効にしているようです。\nCookie を有効にしてから、もう一度試してください。",
 	"nocookiesfornew": "発信元を確認できなかったため、アカウントは作成されませんでした。\nCookieを有効にしていることを確認して、このページを再読込してもう一度試してください。",
 	"nocookiesforlogin": "{{int:nocookieslogin}}",
-	"noname": "利用者名を正しく指定していません。",
+	"noname": "有効な利用者名が指定されていません。",
 	"loginsuccesstitle": "ログイン成功",
 	"loginsuccess": "<strong>{{SITENAME}}に「$1」としてログインしました。</strong>",
 	"nosuchuser": "「$1」という名前の利用者は見当たりません。\n利用者名では大文字と小文字を区別します。\n綴りが正しいことを確認するか、[[Special:UserLogin/signup|新たにアカウントを作成]]してください。",
@@ -593,7 +593,7 @@
 	"changeemail-none": "(なし)",
 	"changeemail-password": "{{SITENAME}}のパスワード:",
 	"changeemail-submit": "メールアドレスを変更",
-	"changeemail-throttled": "ログインの試行回数が多すぎます。\n$1待ってから再度試してください。",
+	"changeemail-throttled": "ログインの試行回数が多すぎます。\n$1、待ってから再度試してください。",
 	"resettokens": "トークンの再設定",
 	"resettokens-text": "ここでは、アカウントに関連付けられた特定の非公開データにアクセスするためのトークンを再設定できます。\n\nトークンを誤って他人に教えてしまった場合やあなたのアカウントが侵害された場合は、必ず再設定してください。",
 	"resettokens-no-tokens": "再設定できるトークンはありません。",
@@ -627,7 +627,7 @@
 	"savearticle": "ページを保存",
 	"preview": "プレビュー",
 	"showpreview": "プレビューを表示",
-	"showdiff": "差分を表示",
+	"showdiff": "変更を表示",
 	"blankarticle": "<strong>警告:</strong>作成しようとしているページの内容がありません。{{Int:savearticle}}\"をもう一度クリックすると、中身の無いページが作成されます。",
 	"anoneditwarning": "<strong>警告:</strong> ログインしていません。編集を行うと、あなたの IP アドレスが公開されます。<strong>[$1 ログイン]</strong>または<strong>[$2 アカウントを作成]</strong>すれば、あなたの編集はその利用者名とともに表示されるほか、その他の利点もあります。",
 	"anonpreviewwarning": "<em>ログインしていません。投稿を保存すると、ご使用中のIPアドレスがこのページの履歴に記録されます。</em>",
@@ -637,7 +637,7 @@
 	"missingcommentheader": "<strong>注意:</strong> このコメントに対する題名/見出しが空欄です。\n「{{int:savearticle}}」ボタンをもう一度押すと、空のまま編集が保存されます。",
 	"summary-preview": "要約のプレビュー:",
 	"subject-preview": "題名/見出しのプレビュー:",
-	"previewerrortext": "変更のプレビューを処理中にエラーが発生しました。",
+	"previewerrortext": "変更のプレビューを処理中に、エラーが発生しました。",
 	"blockedtitle": "利用者はブロックされています",
 	"blockedtext": "<strong>この利用者名またはIPアドレスはブロックされています。</strong>\n\nブロックは$1によって実施されました。\nブロックの理由は <em>$2</em> です。\n\n* ブロック開始日時: $8\n* ブロック解除予定: $6\n* ブロック対象: $7\n\nこのブロックについて、$1もしくは他の[[{{MediaWiki:Grouppage-sysop}}|管理者]]に問い合わせることができます。\nただし、[[Special:Preferences|個人設定]]で有効なメールアドレスが登録されていない場合、またはメール送信機能の使用がブロックされている場合、「この利用者にメールを送信」の機能は使えません。\n現在ご使用中のIPアドレスは$3、このブロックIDは#$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 、このブロックIDは#$5です。\nお問い合わせの際は、上記の情報を必ず書いてください。",
@@ -771,8 +771,8 @@
 	"currentrev-asof": "$1時点における最新版",
 	"revisionasof": "$1時点における版",
 	"revision-info": "$1時点における{{GENDER:$6|$2}}による版$7",
-	"previousrevision": "←前の版",
-	"nextrevision": "次の版→",
+	"previousrevision": "← 古い版",
+	"nextrevision": "新しい版 →",
 	"currentrevisionlink": "最新版",
 	"cur": "最新",
 	"next": "次",
@@ -786,14 +786,14 @@
 	"histlast": "最新",
 	"historysize": "({{PLURAL:$1|$1バイト}})",
 	"historyempty": "(空)",
-	"history-feed-title": "変更履歴",
+	"history-feed-title": "版の履歴",
 	"history-feed-description": "このウィキのこのページに関する変更履歴",
 	"history-feed-item-nocomment": "$2に$1による",
 	"history-feed-empty": "要求されたページは存在しません。\nこのウィキから既に削除されたか、名前が変更された可能性があります。\n[[Special:Search|このウィキの検索]]で関連する新しいページを探してみてください。",
 	"history-edit-tags": "選択した版のタグを編集",
 	"rev-deleted-comment": "(要約は除去されています)",
 	"rev-deleted-user": "(利用者名は除去されています)",
-	"rev-deleted-event": "(記録の詳細は除去されています)",
+	"rev-deleted-event": "(ログの詳細は除去されています)",
 	"rev-deleted-user-contribs": "[利用者名またはIPアドレスは除去されました - その編集は投稿記録で非表示にされています]",
 	"rev-deleted-text-permission": "この版は<strong>削除されています</strong>。\n[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 削除記録]に詳細情報があるかもしれません。",
 	"rev-suppressed-text-permission": "この版は<strong>秘匿されています</strong>。[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 秘匿記録]に詳細情報があるかもしれません。",
@@ -807,10 +807,10 @@
 	"rev-suppressed-unhide-diff": "この差分の一方の版は<strong>秘匿されています</strong>。\n[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 秘匿記録]に詳細情報があるかもしれません。\nこのまま[$1 この差分を閲覧]できます。",
 	"rev-deleted-diff-view": "この差分の一方の版は<strong>削除されています</strong>。\nこの差分を閲覧できます。[{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 削除記録]に詳細情報があるかもしれません。",
 	"rev-suppressed-diff-view": "この差分の一方の版は<strong>秘匿されています</strong>。\nこの差分を閲覧できます。[{{fullurl:{{#Special:Log}}/suppress|page={{FULLPAGENAMEE}}}} 秘匿記録]に詳細情報があるかもしれません。",
-	"rev-delundel": "表示/非表示",
+	"rev-delundel": "表示/非表示 の変更",
 	"rev-showdeleted": "表示",
 	"revisiondelete": "版の削除と復元",
-	"revdelete-nooldid-title": "無効な対象版",
+	"revdelete-nooldid-title": "無効な対象の版",
 	"revdelete-nooldid-text": "この操作の対象となる版を指定していないか、指定した版が存在しないか、または最新版を非表示にしようとしています。",
 	"revdelete-no-file": "指定されたファイルは存在しません。",
 	"revdelete-show-file-confirm": "ファイル「<nowiki>$1</nowiki>」の削除された$2$3の版を本当に閲覧しますか?",
@@ -832,7 +832,7 @@
 	"revdelete-hide-user": "投稿者の利用者名/IPアドレス",
 	"revdelete-hide-restricted": "他の利用者と同様に管理者からもデータを隠す",
 	"revdelete-radio-same": "(変更しない)",
-	"revdelete-radio-set": "非公開",
+	"revdelete-radio-set": "隠す",
 	"revdelete-radio-unset": "閲覧可能",
 	"revdelete-suppress": "他の利用者と同様に管理者からもデータを隠す",
 	"revdelete-unsuppress": "復元版に対する制限を除去",
@@ -926,6 +926,7 @@
 	"search-category": "(カテゴリ $1)",
 	"search-file-match": "(ファイルの内容との一致)",
 	"search-suggest": "もしかして: $1",
+	"search-rewritten": "$1 の結果を表示しています。これは $2 の代わりに検索したものです。",
 	"search-interwiki-caption": "姉妹プロジェクト",
 	"search-interwiki-default": "$1からの結果:",
 	"search-interwiki-more": "(続き)",
@@ -979,7 +980,8 @@
 	"rows": "行数:",
 	"columns": "列数:",
 	"searchresultshead": "検索",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">スタブリンク</a>として表示する閾値 (バイト):",
+	"stub-threshold": "スタブリンク形式 ($1)として表示する閾値 :",
+	"stub-threshold-sample-link": "サンプル",
 	"stub-threshold-disabled": "無効",
 	"recentchangesdays": "最近の更新に表示する日数:",
 	"recentchangesdays-max": "(最大 $1 {{PLURAL:$1|日|日間}})",
@@ -988,7 +990,7 @@
 	"prefs-help-watchlist-token2": "これはあなたのウォッチリスト フィードの秘密のコードです。\nこのトークンを知っている人は誰でもあなたのウォッチリストを読めてしまうため、他の人に教えないでください。\n[[Special:ResetTokens|トークンを再設定する必要がある場合はここをクリックしてください]]。",
 	"savedprefs": "個人設定を保存しました。",
 	"timezonelegend": "タイムゾーン:",
-	"localtime": "ローカルの時刻:",
+	"localtime": "地域の時刻:",
 	"timezoneuseserverdefault": "ウィキの既定を使用 ($1)",
 	"timezoneuseoffset": "その他 (時差を指定)",
 	"servertime": "サーバーの時刻:",
@@ -1009,7 +1011,7 @@
 	"default": "既定",
 	"prefs-files": "ファイル",
 	"prefs-custom-css": "カスタムCSS",
-	"prefs-custom-js": "カスタムJS",
+	"prefs-custom-js": "カスタムJavaScript",
 	"prefs-common-css-js": "すべての外装に共通のCSSとJavaScript:",
 	"prefs-reset-intro": "このページを使用すると、自分の個人設定をこのサイトの初期設定に戻せます。\nこの操作は取り消せません。",
 	"prefs-emailconfirm-label": "メールアドレスの確認:",
@@ -1045,10 +1047,10 @@
 	"prefs-advancedediting": "全般オプション",
 	"prefs-editor": "エディター",
 	"prefs-preview": "プレビュー",
-	"prefs-advancedrc": "詳細設定",
-	"prefs-advancedrendering": "詳細設定",
+	"prefs-advancedrc": "詳細の設定",
+	"prefs-advancedrendering": "詳細の設定",
 	"prefs-advancedsearchoptions": "詳細設定",
-	"prefs-advancedwatchlist": "詳細設定",
+	"prefs-advancedwatchlist": "詳細の設定",
 	"prefs-displayrc": "表示の設定",
 	"prefs-displaywatchlist": "表示の設定",
 	"prefs-tokenwatchlist": "トークン",
@@ -1070,7 +1072,7 @@
 	"userrights-groupsmember-type": "$1",
 	"userrights-groups-help": "この利用者が属するグループを変更できます。\n* チェックが入っているボックスは、この利用者がそのグループに属していることを意味します。\n* チェックが入っていないボックスは、この利用者がそのグループに属していないことを意味します。\n* 「*」はグループに一旦追加した場合に除去 (あるいはその逆) ができないことを示しています。",
 	"userrights-reason": "理由:",
-	"userrights-no-interwiki": "他ウィキ上における利用者権限の編集権限はありません。",
+	"userrights-no-interwiki": "他ウィキ上における利用者権限の編集権限は、ありません。",
 	"userrights-nodatabase": "データベース$1は存在しないか、ローカル上にありません。",
 	"userrights-nologin": "利用者権限を付与するには、管理者アカウントで[[Special:UserLogin|ログイン]]する必要があります。",
 	"userrights-notallowed": "あなたには利用者権限を追加/除去する権限がありません。",
@@ -1354,6 +1356,15 @@
 	"uploaded-script-svg": "アップロードされたSVGファイルにスクリプト可能な要素「$1」が見つかりました。",
 	"uploaded-hostile-svg": "アップロードされたSVGファイルのスタイル要素に安全ではないCSSが見つかりました。",
 	"uploaded-event-handler-on-svg": "イベントハンドラをセットする属性 <code>$1=\"$2\"</code> は、SVGファイルを許可されていません。",
+	"uploaded-href-attribute-svg": "ローカル以外のターゲット(http://、javascript: など) と href 属性の <code>&lt;$1 $2=\"$3\"&gt;</code> は、SVGファイルで許可されません。",
+	"uploaded-href-unsafe-target-svg": "アップロードされたSVGファイルに、安全ではないターゲット <code>&lt;$1 $2=\"$3\"&gt;</code> の href が見つかりました。",
+	"uploaded-animate-svg": "アップロードされたSVGファイルに、「from」属性 <code>&lt;$1 $2=\"$3\"&gt;</code> を使用した、href を変更させる可能性がある「animate」タグが見つかりました。",
+	"uploaded-setting-event-handler-svg": "アップロードされたSVGファイルに、ブロックされているイベントハンドラ属性が設定された <code>&lt;$1 $2=\"$3\"&gt;</code> が見つかりました。",
+	"uploaded-setting-href-svg": "親要素に「href」属性を追加する「set」タグの使用がブロックされています。",
+	"uploaded-wrong-setting-svg": "リモート/データ/スクリプトのターゲットを任意の属性に追加する「set」タグの使用がブロックされています。アップロードされたSVGファイルに <code>&lt;set to=\"$1\"&gt;</code> が見つかりました。",
+	"uploaded-setting-handler-svg": "リモート/データ/スクリプトの「handler」属性を設定するSVGがブロックされています。アップロードされたSVGファイルに <code>$1=\"$2\"</code> が見つかりました。",
+	"uploaded-remote-url-svg": "リモート URL の任意のスタイルを設定するSVGがブロックされています。アップロードされたSVGファイルに <code>$1=\"$2\"</code> が見つかりました。",
+	"uploaded-image-filter-svg": "URL に画像フィルターが見つかりました: アップロードされたSVGファイルの <code>&lt;$1 $2=\"$3\"&gt;</code>。",
 	"uploadscriptednamespace": "この SVG ファイルは無効な名前空間「$1」を含んでいます。",
 	"uploadinvalidxml": "アップロードされたファイルに含まれる XML が構文解析できませんでした。",
 	"uploadvirus": "このファイルはウイルスを含んでいます!\n詳細: $1",
@@ -1627,6 +1638,7 @@
 	"unusedimages": "使われていないファイル",
 	"wantedcategories": "カテゴリページが存在しないカテゴリ",
 	"wantedpages": "ページが存在しないリンク",
+	"wantedpages-summary": "そのページのみへのリダイレクトリンクを含むページを除いた、ほとんどリンクが存在しないページの一覧です。そのページへのリダイレクトリンクを含む存在しないページの一覧は、[[{{#special:BrokenRedirects}}|迷子のリダイレクトの一覧]]を参照してください。",
 	"wantedpages-badtitle": "結果が、無効なページ名を含んでいます: $1",
 	"wantedfiles": "ファイル情報ページが存在しないファイル",
 	"wantedfiletext-cat": "以下のファイルは使用されていますが存在しません。外部リポジトリ由来のファイルは、存在していてもここに列挙される場合があります。その場合は<del>取り消し線</del>が付きます。さらに、存在しないファイルを埋め込んでいるページは[[:$1]]に列挙されます。",
@@ -1695,7 +1707,7 @@
 	"booksources-text": "お探しの書籍の新品/中古品を販売している外部サイトへのリンクを以下に列挙します。この書籍についてさらに詳しい情報があるかもしれません:",
 	"booksources-invalid-isbn": "指定した ISBN は有効ではないようです。情報源から写し間違えていないか確認してください。",
 	"specialloguserlabel": "実行者:",
-	"speciallogtitlelabel": "対象 (ページまたは利用者):",
+	"speciallogtitlelabel": "対象 (ページまたは{{ns:user}}:利用者のための利用者名):",
 	"log": "記録",
 	"all-logs-page": "すべての公開記録",
 	"alllogstext": "{{SITENAME}}の取得できる記録をまとめて表示しています。\n記録の種類、実行した利用者 (大文字小文字は区別)、影響を受けたページ (大文字小文字は区別) による絞り込みができます。",
@@ -1892,7 +1904,7 @@
 	"sessionfailure": "ログインのセッションに問題が発生しました。\nセッション乗っ取りを防ぐため、操作を取り消しました。\n前のページへ戻って再度読み込んだ後に、もう一度試してください。",
 	"changecontentmodel": "ページのコンテント・モデルの変更",
 	"changecontentmodel-legend": "コンテンツモデルを変更",
-	"changecontentmodel-title-label": "ページ タイトル",
+	"changecontentmodel-title-label": "ページ名",
 	"changecontentmodel-model-label": "新しい コンテンツ モデル",
 	"changecontentmodel-reason-label": "理由:",
 	"changecontentmodel-success-title": "コンテント・モデルは変更されました",
@@ -2377,7 +2389,7 @@
 	"tooltip-ca-nstab-main": "本文を閲覧",
 	"tooltip-ca-nstab-user": "利用者ページを表示",
 	"tooltip-ca-nstab-media": "メディアページを表示",
-	"tooltip-ca-nstab-special": "これは特別ページです。編集はできません。",
+	"tooltip-ca-nstab-special": "これは特別ページですので、編集はできません。",
 	"tooltip-ca-nstab-project": "プロジェクトページを表示",
 	"tooltip-ca-nstab-image": "ファイルページを表示",
 	"tooltip-ca-nstab-mediawiki": "システムメッセージを表示",
@@ -3267,6 +3279,7 @@
 	"tags-edit-success": "変更が正常に適用されました。",
 	"tags-edit-failure": "変更は適用できませんでした: $1",
 	"tags-edit-nooldid-title": "無効な対象版",
+	"tags-edit-nooldid-text": "この関数を実行しましたが、対象の版が指定されていない、あるいは指定された版が存在しません。",
 	"tags-edit-none-selected": "追加または削除するには、少なくとも1つ以上のタグを選択してください。",
 	"comparepages": "ページの比較",
 	"compare-page1": "ページ 1",
@@ -3345,6 +3358,7 @@
 	"logentry-newusers-create2": "利用者アカウント $3 が $1 により{{GENDER:$2|作成されました}}",
 	"logentry-newusers-byemail": "利用者アカウント $3 が $1 によって{{GENDER:$2|作成され}}、そのパスワードがメールで送信されました",
 	"logentry-newusers-autocreate": "利用者アカウント $1 が自動的に{{GENDER:$2|作成されました}}",
+	"logentry-protect-move_prot": "$1 が保護設定を $4 から $3 に{{GENDER:$2|移動しました}}",
 	"logentry-rights-rights": "$1 が $3 の所属グループを $4 から $5 に{{GENDER:$2|変更しました}}",
 	"logentry-rights-rights-legacy": "$1 が $3 の所属グループを{{GENDER:$2|変更しました}}",
 	"logentry-rights-autopromote": "$1 が $4 から $5 に自動的に{{GENDER:$2|昇格しました}}",
@@ -3358,10 +3372,13 @@
 	"logentry-managetags-activate": "$1 がタグ \"$4\" の利用者およびボットによる使用を{{GENDER:$2|有効化しました}}。",
 	"logentry-managetags-deactivate": "$1 がタグ \"$4\" の利用者およびボットによる使用を{{GENDER:$2|無効化しました}}。",
 	"log-name-tag": "タグ記録",
+	"log-description-tag": "このページには、個々の版またはエントリーの記録から、利用者を追加または削除した[[Special:Tags|タグ]]が表示されます。編集の一部、削除、同様の操作として発生したときの操作はタグ付けされず、記録には表示されません。",
 	"logentry-tag-update-add-revision": "$1 がページ $3 の版 $4 に{{PLURAL:$7|タグ}} $6 を{{GENDER:$2|追加しました}}",
 	"logentry-tag-update-add-logentry": "$1 がページ $3 の記録項目 $5 に{{PLURAL:$7|タグ}} $6 を{{GENDER:$2|追加しました}}",
 	"logentry-tag-update-remove-revision": "$1 がページ $3 の版 $4 から{{PLURAL:$9|タグ}} $8 を{{GENDER:$2|除去しました}}",
 	"logentry-tag-update-remove-logentry": "$1 がページ $3 の記録項目 $5 から{{PLURAL:$9|タグ}} $8 を{{GENDER:$2|除去しました}}",
+	"logentry-tag-update-revision": "$1 がページ「$3」の版 $4 でのタグを{{GENDER:$2|更新しました}} ($6 が{{PLURAL:$7|追加}}、$8 が{{PLURAL:$9|削除}})",
+	"logentry-tag-update-logentry": "$1 がページ「$3」のエントリー $5 での記録のタグを{{GENDER:$2|更新しました}} ($6 が{{PLURAL:$7|追加}}、$8 が{{PLURAL:$9|削除}})",
 	"rightsnone": "(なし)",
 	"revdelete-summary": "編集内容の要約",
 	"feedback-adding": "ページへのフィードバックの追加...",
@@ -3422,8 +3439,13 @@
 	"api-error-stashfailed": "内部エラー: サーバーは一時ファイルを格納できませんでした。",
 	"api-error-publishfailed": "内部エラー: サーバーは一時ファイルを発行できませんでした。",
 	"api-error-stasherror": "ファイルを未公開アップロードする際にエラーが発生しました。",
+	"api-error-stashedfilenotfound": "未公開場所からアップロードしようとしましたが、隠しファイルが見つかりませんでした。",
+	"api-error-stashpathinvalid": "隠しファイルのパスが無効です。",
 	"api-error-stashfilestorage": "未公開ファイルを格納する際にエラーが発生しました。",
+	"api-error-stashzerolength": "長さが0であるため、サーバーはファイルを隠しておくことができませんでした。",
 	"api-error-stashnotloggedin": "未公開ファイルを保存するにはログインが必要です。",
+	"api-error-stashwrongowner": "未公開場所にアクセスしようとしていたファイルは、あなたに属していません。",
+	"api-error-stashnosuchfilekey": "未公開場所にアクセスしようとしていたファイルのキーが存在しません。",
 	"api-error-timeout": "サーバーが決められた時間内に応答しませんでした。",
 	"api-error-unclassified": "不明なエラーが発生しました。",
 	"api-error-unknown-code": "不明なエラー:「$1」",
@@ -3468,6 +3490,8 @@
 	"expand_templates_generate_xml": "XML 構文解析ツリーを表示",
 	"expand_templates_generate_rawhtml": "HTML ソースを表示",
 	"expand_templates_preview": "プレビュー",
+	"expand_templates_preview_fail_html": "<em>{{SITENAME}} ではHTMLソースが有効になっており、セッションデータの損失が生じているので、JavaScript の攻撃に対する予防措置としてプレビューは表示されません。</em>\n\n<strong>これが合法的なプレビューの試みである場合には、もう一度試してください。</strong>\nそれでも動作しない場合は、[[Special:UserLogout|ログアウト]]して再度ログインしてみてください。",
+	"expand_templates_preview_fail_html_anon": "<em>{{SITENAME}} ではHTMLソースが有効になっており、ログインしていないため、JavaScript の攻撃に対する予防措置としてプレビューは表示されません。</em>\n\n<strong>これが合法的なプレビューの試みである場合には、[[Special:UserLogin|ログイン]]してもう一度試してください。</strong>",
 	"pagelanguage": "ページ言語選択",
 	"pagelang-name": "ページ",
 	"pagelang-language": "言語",
diff --git a/languages/i18n/kk-cyrl.json b/languages/i18n/kk-cyrl.json
index 5ab3ec8042..a70f42d585 100644
--- a/languages/i18n/kk-cyrl.json
+++ b/languages/i18n/kk-cyrl.json
@@ -157,7 +157,7 @@
 	"qbedit": "Өңдеу",
 	"qbpageoptions": "Бұл бет",
 	"qbmyoptions": "Беттерім",
-	"faq": "Жиі қойылатын сұрақтар",
+	"faq": "ЖҚС",
 	"faqpage": "Project:Жиі қойылатын сұрақтар",
 	"actions": "Әрекеттер",
 	"namespaces": "Есім кеңістіктері",
@@ -222,7 +222,7 @@
 	"jumpto": "Мұнда ауысу:",
 	"jumptonavigation": "шарлау",
 	"jumptosearch": "іздеу",
-	"view-pool-error": "Кешіріңіз, қазір серверлер шектен тыс жүктелуде.\nОсы бетті қарауға өте көп сұраныс жасалды.\nӨтініш, күте тұрыңыз және осы бетке кіруге қайта әрекет жасаңыз.\n\n$1",
+	"view-pool-error": "Кешіріңіз, қазір серверлер шектен тыс жүктелуде.\nОсы бетті қарауға өте көп сұраныс жасалды.\nКүте тұрып осы бетке қайта қатынауға қайта әрекет жасаңыз.\n\n$1",
 	"generic-pool-error": "Кешіріңіз, қазір серверлер шектен тыс жүктелуде.\nОсы бетті қарауға өте көп сұраныс жасалды.\nӨтініш, күте тұрыңыз және осы бетке кіруге қайта әрекет жасаңыз.",
 	"pool-timeout": "Құлыпталу уақытын күту мерзімі өтті",
 	"pool-queuefull": "Сұранымдар жинақтауышысы толық",
@@ -2410,7 +2410,7 @@
 	"file-info": "файл өлшемі: $1, MIME түрі: $2",
 	"file-info-size": "$1 × $2 нүкте, файл өлшемі: $3, MIME түрі: $4",
 	"file-info-size-pages": "$1 × $2 нүкте (пиксел), Файл өлшемі: $3, MIME түрі: $4, $5 {{PLURAL:$5|бет|бет}}",
-	"file-nohires": "Жоғары кеңейтілімдегі нұсқалары жоқ.",
+	"file-nohires": "Жоғары ажыратылымды нұсқалары жоқ.",
 	"svg-long-desc": "SVG файлы, кесімді $1 × $2 (пиксел) нүкте, файл өлшемі: $3",
 	"svg-long-desc-animated": "SVG қозғалысты файлы, кесімді $1 × $2 нүкте, файл өлшемі: $3",
 	"svg-long-error": "жарамсыз SVG файлы: $1",
diff --git a/languages/i18n/kn.json b/languages/i18n/kn.json
index d4d1ce9ab1..8176256741 100644
--- a/languages/i18n/kn.json
+++ b/languages/i18n/kn.json
@@ -24,7 +24,8 @@
 			"לערי ריינהארט",
 			"아라",
 			"Pavanaja",
-			"Ananth subray"
+			"Ananth subray",
+			"MarcoAurelio"
 		]
 	},
 	"tog-underline": "ಕೊಂಡಿಗಳ ಕೆಳಗೆ ಗೆರೆ ತೋರಿಸಿ",
@@ -807,7 +808,7 @@
 	"prefs-custom-js": "ಕಸ್ಟಮ್ ಜಾವಾಸ್ಕ್ರಿಪ್ಟ್",
 	"prefs-emailconfirm-label": "ಮಿಂಚಂಚೆ ದೃಢೀಕರಣ",
 	"youremail": "ಇ-ಅಂಚೆ:",
-	"username": "{{ಲಿಂಗ:$1|ಸದಸ್ಯತ್ವದ ಹೆಸರು}}:",
+	"username": "{{GENDER:$1|ಸದಸ್ಯತ್ವದ ಹೆಸರು}}:",
 	"prefs-memberingroups": "ಈ {{PLURAL:$1|ಗುಂಪಿನ|ಗುಂಪುಗಳ}} ಸದಸ್ಯ:",
 	"prefs-registration": "ನೋಂದಣಿ ಸಮಯ:",
 	"yourrealname": "ನಿಜ ಹೆಸರು:",
@@ -1280,7 +1281,6 @@
 	"mailnologintext": "ಇತರ ಬಳಕೆದಾರರಿಗೆ ಇ-ಅಂಚೆ ಕಳುಹಿಸಲು ನೀವು [[Special:UserLogin|ಲಾಗ್ ಇನ್]] ಆಗಿರಬೇಕು ಮತ್ತು ನಿಮ್ಮ [[Special:Preferences|ಪ್ರಾಶಸ್ತ್ಯಗಳ ಪುಟದಲ್ಲಿ]] ಒಂದು ಧೃಡೀಕೃತ ಇ-ಅಂಚೆ ವಿಳಾಸ ನೀಡಿರಬೇಕು.",
 	"emailuser": "ಈ ಸದಸ್ಯರಿಗೆ ಇ-ಅಂಚೆ ಕಳಿಸಿ",
 	"emailuser-title-notarget": "ಸದಸ್ಯರಿಗೆ ವಿ-ಅ೦ಚೆ ಕಳಿಸಿ",
-	"emailpage": "ಸದಸ್ಯರಿಗೆ ವಿ-ಅ೦ಚೆ ಕಳಿಸಿ",
 	"defemailsubject": "ವಿಕಿಪೀಡಿಯ ವಿ-ಅ೦ಚೆ",
 	"usermaildisabled": "ಬಳಕೆದಾರರ ಮಿಂಚಂಚೆಯನ್ನು ನಿಷ್ಕ್ತಿಯಗೊಳಿಸಲಾಗಿದೆ",
 	"noemailtitle": "ಯಾವುದೇ ಇ-ಅಂಚೆ ವಿಳಾಸ ಇಲ್ಲ",
diff --git a/languages/i18n/ko.json b/languages/i18n/ko.json
index 50d183af3d..7791798458 100644
--- a/languages/i18n/ko.json
+++ b/languages/i18n/ko.json
@@ -618,7 +618,7 @@
 	"blockedtext": "'''사용자 계정 또는 IP 주소가 차단되었습니다.'''\n\n차단한 사람은 $1입니다.\n차단한 이유는 다음과 같습니다: $2\n\n* 차단이 시작된 시간: $8\n* 차단이 끝나는 시간: $6\n* 차단된 사용자: $7\n\n$1 또는 [[{{MediaWiki:Grouppage-sysop}}|다른 관리자]]에게 차단에 대해 문의할 수 있습니다.\n[[Special:Preferences|계정 환경 설정]]에 올바른 이메일 주소가 있어야만 '이메일 보내기' 기능을 사용할 수 있습니다. 또 이메일 보내기 기능이 차단되어 있으면 이메일을 보낼 수 없습니다.\n현재 당신의 IP 주소는 $3이고, 차단 ID는 #$5입니다.\n문의할 때에 이 정보를 같이 알려주세요.",
 	"autoblockedtext": "당신의 IP 주소는 $1 사용자가 차단한 사용자가 사용했던 IP이기 때문에 자동으로 차단되었습니다.\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이고, 차단 ID는 #$5입니다.\n문의할 때에 이 정보를 같이 알려주세요.",
 	"blockednoreason": "이유를 입력하지 않음",
-	"whitelistedittext": "문서를 편집하려면 $1해야 합니다.",
+	"whitelistedittext": "문서를 편집하기 전에  $1해야 합니다.",
 	"confirmedittext": "문서를 고치려면 이메일 인증 절차가 필요합니다.\n[[Special:Preferences|사용자 환경 설정]]에서 이메일 주소를 입력하고 이메일 주소 인증을 해주시기 바랍니다.",
 	"nosuchsectiontitle": "문단을 찾을 수 없음",
 	"nosuchsectiontext": "존재하지 않는 문단을 편집하려 했습니다.\n이 문서를 보는 동안 문단이 이동되었거나 삭제되었을 수 있습니다.",
@@ -633,7 +633,7 @@
 	"noarticletext": "이 문서가 현재 존재하지 않습니다.\n이 문서와 제목이 비슷한 문서가 있는지 [[Special:Search/{{PAGENAME}}|검색하거나]],\n이 문서에 관련된 <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 기록]을 확인하거나,\n문서를 직접 [{{fullurl:{{FULLPAGENAME}}|action=edit}} 편집]</span>할 수 있습니다.",
 	"noarticletext-nopermission": "이 문서가 현재 존재하지 않습니다.\n이 문서와 제목이 비슷한 문서가 있는지 [[Special:Search/{{PAGENAME}}|검색하거나]], 이 문서에 관련된 <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} 기록]을 확인할 수 있습니다.</span> 그러나 이 문서를 만들 수 있는 권한은 없습니다.",
 	"missing-revision": "\"{{FULLPAGENAME}}\"이라는 문서의 #$1판이 존재하지 않습니다.\n\n이 문제는 주로 삭제된 문서를 가리키는 오래된 문서 역사 링크로 인해 발생합니다.\n자세한 내용은 [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} 삭제 기록]에서 확인할 수 있습니다.",
-	"userpage-userdoesnotexist": "\"$1\" 사용자 계정은 등록되어 있지 않습니다.\n이 문서를 만들거나 편집하려면 계정이 존재하는지 확인해주세요.",
+	"userpage-userdoesnotexist": "\"$1\" 사용자 계정은 등록되어 있지 않습니다.\n이 문서를 만들거나 편집하기 전에 계정이 존재하는지 확인해주세요.",
 	"userpage-userdoesnotexist-view": "\"$1\" 사용자 계정은 등록되어 있지 않습니다.",
 	"blocked-notice-logextract": "이 사용자는 현재 차단되어 있습니다.\n해당 사용자의 최근 차단 기록을 참조하십시오:",
 	"clearyourcache": "<strong>참고:</strong> 설정을 저장한 후에 바뀐 점을 확인하기 위해서는 브라우저의 캐시를 새로 고쳐야 합니다.\n* <strong>Firefox / Safari</strong>: <em>Shift</em> 키를 누르면서 새로 고침을 클릭하거나, <em>Ctrl-F5</em> 또는 <em>Ctrl-R</em> 을 입력 (Mac에서는 <em>⌘-R</em>)\n* <strong>Google Chrome</strong>: <em>Ctrl-Shift-R</em>키를 입력 (Mac에서는 <em>⌘-Shift-R</em>)\n* <strong>Internet Explorer</strong>: <em>Ctrl</em> 키를 누르면서 새로 고침을 클릭하거나, <em>Ctrl-F5</em>를 입력.\n* <strong>Opera</strong>: <em>도구→설정</em>에서 캐시를 비움",
@@ -918,7 +918,7 @@
 	"powersearch-togglenone": "모두 제외",
 	"powersearch-remember": "향후 검색에 선택 기억하기",
 	"search-external": "바깥 검색",
-	"searchdisabled": "{{SITENAME}} 검색이 비활성화되어 있습니다.\n검색이 작동하지 않는 동안에는 Google(구글)을 통해 검색할 수 있습니다.\n검색 엔진의 내용은 최신이 아닐 수 있다는 점을 참고하세요.",
+	"searchdisabled": "{{SITENAME}} 검색이 비활성화되어 있습니다.\n검색이 작동하지 않는 동안에는 Google을 통해 검색할 수 있습니다.\n검색 엔진의 내용은 최신이 아닐 수 있다는 점을 참고하세요.",
 	"search-error": "검색하는 동안 오류가 발생했습니다: $1",
 	"preferences": "사용자 환경 설정",
 	"mypreferences": "환경 설정",
@@ -2181,8 +2181,8 @@
 	"imageinvalidfilename": "새 파일 이름이 잘못되었습니다.",
 	"fix-double-redirects": "원래 제목을 가리키는 넘겨주기를 새로 고침",
 	"move-leave-redirect": "옮긴 뒤 넘겨주기를 남기기",
-	"protectedpagemovewarning": "<strong>경고:</strong> 이 문서는 관리자만이 이동할 수 있도록 잠겨 있습니다.\n최근의 기록을 참조용으로 제공합니다:",
-	"semiprotectedpagemovewarning": "<strong>참고:</strong> 이 문서는 등록된 사용자만이 이동할 수 있도록 잠겨 있습니다.\n최근 기록 내용을 참고용로 제공합니다:",
+	"protectedpagemovewarning": "<strong>경고:</strong> 이 문서는 관리자만이 이동할 수 있도록 잠겨 있습니다.\n최근의 기록을 참조를 위해 아래에 제공합니다:",
+	"semiprotectedpagemovewarning": "<strong>참고:</strong> 이 문서는 등록된 사용자만이 이동할 수 있도록 잠겨 있습니다.\n최근 기록 내용을 참조를 위해 아래에 제공합니다:",
 	"move-over-sharedrepo": "== 파일이 존재함 ==\n[[:$1]] 파일이 공용 저장소에 있습니다. 이 이름으로 파일을 옮기면 공용의 파일을 덮어쓰게 될 것입니다.",
 	"file-exists-sharedrepo": "선택한 파일 이름은 공용 저장소에서 사용 중입니다.\n다른 이름을 선택하세요.",
 	"export": "문서 내보내기",
@@ -2329,7 +2329,7 @@
 	"tooltip-ca-nstab-main": "본문 보기",
 	"tooltip-ca-nstab-user": "사용자 문서 보기",
 	"tooltip-ca-nstab-media": "미디어 문서 보기",
-	"tooltip-ca-nstab-special": "이 문서는 특수 문서로, 문서 자체를 편집할 수 없습니다",
+	"tooltip-ca-nstab-special": "이 문서는 특수 문서로, 편집할 수 없습니다",
 	"tooltip-ca-nstab-project": "프로젝트 문서 보기",
 	"tooltip-ca-nstab-image": "파일 문서 보기",
 	"tooltip-ca-nstab-mediawiki": "시스템 메시지 보기",
diff --git a/languages/i18n/ksh.json b/languages/i18n/ksh.json
index 7977c4793e..63652c3db6 100644
--- a/languages/i18n/ksh.json
+++ b/languages/i18n/ksh.json
@@ -7,7 +7,8 @@
 			"Reedy",
 			"Rentenirer",
 			"לערי ריינהארט",
-			"아라"
+			"아라",
+			"TTO"
 		]
 	},
 	"tog-underline": "Dun de Lengks ongerschtriische:",
@@ -249,6 +250,7 @@
 	"versionrequiredtext": "De Väsjohn $1 vum MehdijaWikki sing Projramme es nühdich, öm di Sigg heh bruche ze künne. Süsch op [[Special:Version|de Väsjohns_Sigg]], wat mer heh för ene Schtand han.",
 	"ok": "Jot!",
 	"pagetitle": "$1 — {{SITENAME}}",
+	"pagetitle-view-mainpage": "{{SITENAME}}",
 	"backlinksubtitle": "←&nbsp;$1",
 	"retrievedfrom": "Di Sigg heh stamp vun „$1“.",
 	"youhavenewmessages": "Do häs $1 ($2).",
@@ -432,6 +434,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|Sigg|Sigge|Sigge }}",
 	"createacct-benefit-body3": "{{PLURAL:$1|aktive Metmaacher}}",
 	"badretype": "Ding zwëij ennjejovve Paßßwööter sinn nit ejaal. Do muss De Dich för ein entscheide.",
+	"usernameinprogress": "En Zohjang för heh dä Nahme för ene Metmaacher es ald ongewähß. Donn noch jät wahde.",
 	"userexists": "Ene Metmaacher met däm Name jidd et ald.\nDo muss Der ene andere Name usdenke.",
 	"loginerror": "Fähler beim Enlogge",
 	"createacct-error": "Fähler beim Zohjang-Aanlääje",
@@ -676,7 +679,7 @@
 	"content-model-json": "<i lang=\"en\" xml:lang=\"en\" title=\"JavaScript Object Notation\">JSON</i>",
 	"content-json-empty-object": "Nix dren",
 	"content-json-empty-array": "Nix dren",
-	"duplicate-args-warning": "<strong>Opjepaß:</strong> [[:$1]] röhf [[:$2]] met mih wi eijnem Wäät för der Parramehter „$3“ op. Blohß der läzde wäät vun dänne weed opjenumme un jebruch.",
+	"duplicate-args-warning": "<strong>Opjepaß:</strong> [[:$1]] röhf [[:$2]] met mih wi eijnem Wäät för der Parramehter „$3“ op. Blohß der läzde Wäät vun dänne weed opjenumme un jebruch.",
 	"duplicate-args-category": "Sigge met dubbelt aanjejovve Parramehtere för Schablohne.",
 	"duplicate-args-category-desc": "Sigge met Oprohve vun Schablohne met dubbelt aanjejovve Parramehtere dren, alsu esu jät wi <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> un <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "<strong>Opjepaß:</strong> Di Sigg heh määt zovill Opwand met Paaser-Funkßjohne.\n\n{{PLURAL:$2|Eine Oproof|Beß $2 Oproofe|Keine Oproof}} es älaup, {{PLURAL:$1|un eine Oproof|ävver $1 Oproofe|un keine Oproof}} määt di Sigg em Momang.",
@@ -921,7 +924,8 @@
 	"rows": "Reihe:",
 	"columns": "Spalte:",
 	"searchresultshead": "Beim Söhke",
-	"stub-threshold": "Lengks zopaß för <a href=\"#\" class=\"stub\">klein Sigge</a> fomatehre av esu vill <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Bytes</i>:",
+	"stub-threshold": "Lengks zopaß för klein Sigge ($1) fomatehre av esu vill <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\">Bytes</i>:",
+	"stub-threshold-sample-link": "Beijschpell_Lengk",
 	"stub-threshold-disabled": "Ußjeschalldt",
 	"recentchangesdays": "de Aanzahl Dähsch en de Leß met de „Neuste Änderonge“ — als Standatt:",
 	"recentchangesdays-max": "(Nit mih wie {{PLURAL:$1|eine Daach|$1 Dääsh|keine Daach}})",
@@ -1309,7 +1313,7 @@
 	"uploadjava": "Dat es en Sammel_Dattei em ZIP-Fommaat, woh en Java-.class-Datei dren shtich.\nJava-Datteie huhlaade es nit zohjelohße, weil mer domet de Enshtellunge ömjonn kann, di der ẞörver schöze un däm sing Sescherheit jarranteere.",
 	"upload-source": "Wo de Daate herkumme",
 	"sourcefilename": "Dattei zem huhlahde:",
-	"sourceurl": "<i lang=\"en\">URL</i> för vun eronger ze laade",
+	"sourceurl": "<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Uniform Ressource Locator\">URL</i>  för vun eronger ze lahde",
 	"destfilename": "Unger däm Datteinahme avschpeijschere:",
 	"upload-maxfilesize": "Der jrühtßte müjjelesche Ömfang för en Dattei es $1.",
 	"upload-description": "Övver di Dattei",
@@ -1335,6 +1339,7 @@
 	"upload-copy-upload-invalid-domain": "Fun dä Domain künne mer nix noh heh huh laade. Di es nit zohjelohße.",
 	"upload-dialog-title": "Dateij huhlahde",
 	"upload-dialog-error": "Ene Fähler es opjetrodde",
+	"upload-dialog-warning": "En Warnong wood ußjejovve.",
 	"upload-dialog-button-cancel": "Ophühre!",
 	"upload-dialog-button-done": "Jedonn",
 	"upload-dialog-button-save": "Faßhalde",
@@ -1342,6 +1347,8 @@
 	"upload-dialog-label-select-file": "De ußjesöhk Dattei",
 	"upload-dialog-label-infoform-title": "Eijnzelheijte",
 	"upload-dialog-label-infoform-name": "Nahme",
+	"upload-dialog-label-infoform-description": "Äkliehrong",
+	"upload-dialog-label-usage-title": "Der Jebruch",
 	"upload-dialog-label-usage-filename": "Dä Dattei iehre Nahme",
 	"backend-fail-stream": "Mer kunnte di Dattei $1 nit övverdraare.",
 	"backend-fail-backup": "Mer kunnte kein Sescherongskopih vun dä Dattei $1 maache.",
@@ -1642,7 +1649,7 @@
 	"booksources-text": "Hee noh küdd_en Leßß met Websigge,\nwo mir {{GRAMMAR:Dative fun|{{SITENAME}}}} nix wigger med ze donn hänn,\nwo mer jät övver Böösher erfaare\nun zom Dëijl och Böösher koufe kann.\nDoför moßß De Desh mannshmool allodengs eetß ennß aanmällde,\nwat Koßte un Jefaare met sesh brenge künndt.\nWo_t jëijdt,\njonn di Lengkß hee tirrägg_op dat Booch,\nwadd_Er am Sööke sidt.",
 	"booksources-invalid-isbn": "De ISBNummer schingk verkeeht ze sin. Loohr ens donoh, woh se häe kütt.",
 	"specialloguserlabel": "Dä Metmaacher, dä et jedonn hät:",
-	"speciallogtitlelabel": "Betroffe wohr: (dä Tittel vun ener Sigg udder enem Metmaacher singe Name)",
+	"speciallogtitlelabel": "Betroffe wohr: (dä Tittel vun ener Sigg udder enem Metmaacher singe Nahme)",
 	"log": "Logböcher ehr Opzeichnunge (all)",
 	"all-logs-page": "All de öffentlich Logböcher",
 	"alllogstext": "Dat heh es en jesampte Less us all dä Logböhscher {{GRAMMAR:en|{{SITENAME}}}}.\nDä Logböhscher ehre Enhald kam_mer all noh de Aat, de Metmaacher,\noder de Sigge ehr Name, un esu, einzel zoteht aanluhre.\nBei dä Name moß mer op Jruß- un Kleinschreff aachjävve.",
@@ -2311,7 +2318,7 @@
 	"tooltip-ca-nstab-main": "Don dä Enhallt vun dä Sigg aanzeije",
 	"tooltip-ca-nstab-user": "Donn di Metmaachersigg aanzeije",
 	"tooltip-ca-nstab-media": "Don de Sigg övver en Mediendatei aanzeije",
-	"tooltip-ca-nstab-special": "Dat is en {{int:nstab-special}}. Do kam'mer nix draan verändere.",
+	"tooltip-ca-nstab-special": "Dat is en {{int:nstab-special}}. Do kam_mer nix draan verändere.",
 	"tooltip-ca-nstab-project": "Donn di Projäksigg aanzeije",
 	"tooltip-ca-nstab-image": "Don di Sigg övver heh di Dattei aanzeije",
 	"tooltip-ca-nstab-mediawiki": "En Täx vum MehdijaWikki-System aanzeije",
@@ -2869,7 +2876,7 @@
 	"confirmemail_success": "Ding E-Mail Adress es jetz bestätich.\nJetz künns De och noch enlogge. Vill Spass!",
 	"confirmemail_loggedin": "Ding Addräß fö de <i lang=\"en\">e-mail</i> es jäz beschtäätesch!",
 	"confirmemail_subject": "Don Ding e-mail-Adräß för {{GRAMMAR:Akkusativ|{{SITENAME}}}} beschtähteje.",
-	"confirmemail_body": "Künnt jod sin, Do wors et selver, vun de IP_Adress $1 hät sich\njedenfalls einer jemeldt, un well dä Metmaacher \"$2\" {{GRAMMAR:vun|{{SITENAME}}}}\nsin, un hät en E-Mail Adress aanjejovve.\n\nÖm jetz klor ze krije, dat di e-mail Adräß un dä neue Metmaacher och\nzosamme jehüre, muss dä Neue en singem Brauser dä Link:\n\n$3\n\nopmaache. Noch för em $6 öm $7 Uhr. Alsu dun dat, wann de et selver bes.\n\nWann nit Do, sondern söns wä Ding e-mail Adräß aanjejovve hät, do bruchs de\njar nix ze don. De e-mail Adräß kann nit jebruch wääde, ih dat se nit\nbestätich es. Do kanns ävver och op he dä Lengk jon:\n\n$5\n\nDomet deiß De tirek sare, dat De di Adräß nit bestätije wells.",
+	"confirmemail_body": "Künnt johd sin, Do wors et selver. Vun dä IP_Adräß $1 hät sich\njedenfalls einer jemäldt, un well dä Metmaacher \"$2\" {{GRAMMAR:vun|{{SITENAME}}}}\nsin, un hät en e-mail-Adräss aanjejovve.\n\nÖm jetz klor ze krije, dat di e-mail Adräß un dä neue Metmaacher och\nzosamme jehüre, muss dä Neue en singem Brauser dä Link:\n\n$3\n\nopmaache. Noch för em $6 öm $7 Uhr. Alsu dun dat, wann De et bes.\n\nWann nit Do, sondern söns wä Ding e-mail-Adräß aanjejovve hät, do bruchs de\njar nix ze don. De e-mail-Adräß kann nit jebruch wähde, ih dat se\nbeschtähtesch es. Do kanns ävver och op heh dä Lengk jon:\n\n$5\n\nDomet deiß De tirek sahre, dat De di Adräß nit beschtähteje wells.",
 	"confirmemail_body_changed": "Künnt jod sin, Do wors et selver. Vun de IP_Adräß $1 hät sich\njedenfalls einer jemeldt, un well dä Metmaacher \"$2\" op {{GRAMMAR:Akk bet|{{SITENAME}}}}\nsin, un hät en neu Adress för sing e-mail aanjejovve.\n\nÖm jetz klor ze krije, dat di neu Adräß un dä Metmaacher och\nzosamme jehüre, un öm de e-mail op {{GRAMMAR:Akk bet|{{SITENAME}}}}\nwidder aanzschallde, moss dä Metmaacher en singem Brauser dä Lengk:\n\n$3\n\nopmaache. Noch för em $6 öm $7 Uhr. Alsu dun dat, wann de et selver bes.\n\nWann nit Do, sondern söns wä Ding E-Mail Adress aanjejovve hät, bruchs\nDe jar nix ze don. Di Adräß weed nit jebruch, wann se nit bestätich es.\nDo kanns ävver och op heh dä Link jon:\n\n$5\n\nDomet deiß De tirek sare, dat De di Adress nit bestätije wells.",
 	"confirmemail_body_set": "Künnt johd sin, Do wors et sällver. Vun dä IP-Adräß $1 hät op\njede Fall einer för dä Metmaacher \"$2\" op {{GRAMMAR:Akk bet|{{SITENAME}}}}\nheh di Adräß för däm sing e-mail aanjejovve.\n\nÖm jäz kloh ze kreje, dat di neu Adräß un dä Metmaacher och\nzosamme jehühre, un öm de e-mail op {{GRAMMAR:Akk bet|{{SITENAME}}}}\naanzschallde, moß dä Metmaacher en singem Brauser dä Lengk:\n\n$3\n\nopmaache. Noch för em $6 öm $7 Uhr. Alsu dun dat, wann dat sing\nReeschteschkeijt hät.\n\nWann nit Doh, sönders söns wä Ding Addräß för de e-Mail aanjejovve hät, bruchs\nDe jar nix ze don. Di Adräß weed nit jebruch, wann se nit beschtähtesch es.\nDo kanns ävver och op heh dä Lengk jon:\n\n$5\n\nDomet deiß De tirek vermällde, dat De di Adräß nit beschtähteje wells.",
 	"confirmemail_invalidated": "Et Beschtähtejje för di <i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"„de eläktrohnesche Poß“\">e-mail</i>-Adräß es afjebroche wohde, un di Adräß es '''nit''' beschtähtesch.",
@@ -2917,7 +2924,7 @@
 	"autoredircomment": "Leit öm op „[[$1]]“",
 	"autosumm-new": "De Sigg wood neu aanjelaat met däm Aanfang: $1",
 	"autosumm-newblank": "En läddijje Sigg wood aanjelaat",
-	"size-bytes": "$1&nbsp;Bytes",
+	"size-bytes": "$1&nbsp;<i lang=\"en\" xml:lang=\"en\" dir=\"ltr\" title=\"Binary Digit\">{{PLURAL:$1|Byte|Bytes|Byte}}</i>",
 	"size-kilobytes": "$1&nbsp;KB",
 	"size-megabytes": "$1&nbsp;MB",
 	"size-gigabytes": "$1&nbsp;GB",
@@ -2926,7 +2933,7 @@
 	"size-exabytes": "$1&nbsp;EB",
 	"size-zetabytes": "$1&nbsp;ZB",
 	"size-yottabytes": "$1&nbsp;YB",
-	"size-pixel": "$1&nbsp;Pixelle",
+	"size-pixel": "$1&nbsp;{{PLURAL:$1|Pixel|Pixelle|Pixel}}",
 	"size-kilopixel": "$1&nbsp;Killopixelle",
 	"size-megapixel": "$1&nbsp;Mejapixelle",
 	"size-gigapixel": "$1&nbsp;Jijapixelle",
@@ -3241,6 +3248,7 @@
 	"logentry-newusers-create2": "{{GENDER:$4|Dä|Dat|Dä Metmaacher|De|Dat}} $3 wood {{GENDER:$2|vum|vum|vumm Metmaacher|vun dä|vum}} $1 aanjelaat.",
 	"logentry-newusers-byemail": "{{GENDER:$4|Dä|Dat|Dä Metmaacher|De|Dat}} $1 wood {{GENDER:$4|als Metmaacher|als Metmaacher||als Metmaacher|als Metmaacher}} aanjelaat un {{GENDER:$4|sing|em sing|däm sing|dä iehr|däm sing}} Paßwoot met der <i lang=\"en>e-mail</i> verscheck.",
 	"logentry-newusers-autocreate": "{{GENDER:$4|Dä|Dat|Dä Metmaacher|De|Dat}} $1 wood automattesch {{GENDER:$4|als Metmaacher|als Metmaacher||als Metmaacher|als Metmaacher}} {{GENDER:$2|vum|vum|vumm Metmaacher|vun dä|vum}} $1 aanjelaat.",
+	"logentry-protect-move_prot": "{{GENDER:$2|Dä|Dat|Dä Metmaacher|De|Dat}} $1 hät de Enschtällong vum schoz vun dä Sigg „$4“ noh dä Sigg „$3“ övvenumme",
 	"logentry-rights-rights": "{{GENDER:$2|Dä|Dat|Dä Metmaacher|De|Dat}} „$1“ hät däm Metmaacher „$3“ sing Jroppe-Räächde vun „$4“ op „$5“ ömjestallt.",
 	"logentry-rights-rights-legacy": "{{GENDER:$1|Dä|Et|Dä Metmaacher|De|Dat}} $1 hät däm Metmaacher $3 sing Räääschte-Jroppe verändert.",
 	"logentry-rights-autopromote": "{{GENDER:$1|Dä|Et|Dä Metmaacher|De|Dat}} $1 wood automattesch vum $4 zom $5 jemaat.",
@@ -3297,7 +3305,7 @@
 	"api-error-duplicate-popup-title": "Di {{PLURAL:$1|Dattei es|Datteie sen|Dattei es}} ald doh.",
 	"api-error-empty-file": "En dä huhjelaade Dattei wohr jaa_nix dren.",
 	"api-error-emptypage": "Neu läddijje Sigge aanzelääje es verbodde.",
-	"api-error-fetchfileerror": "Fähler: Beim eronger Laade hät jät nit jeflupp.",
+	"api-error-fetchfileerror": "Fähler: Beim eronger Lahde hät jät nit jeflupp.",
 	"api-error-fileexists-forbidden": "En Dattei mem Name „$1“ es ald doh un mer künne se nit övverschriive.",
 	"api-error-fileexists-shared-forbidden": "En Dattei mem Name „$1“ es ald en ene jemeinsamme Sammlong, un mer künne se nit övverschriive.",
 	"api-error-file-too-large": "De huhjelaade Dattei wohr ze jruß.",
@@ -3356,6 +3364,7 @@
 	"limitreport-postexpandincludesize-value": "{{PLURAL:$1|ein|$1|kein}} vun {{PLURAL:$2|einem Byte|$2 Bytes|keinem Byte}}",
 	"limitreport-templateargumentsize": "Der Ömvang vun de Parrameeterre vun Schablohne",
 	"limitreport-templateargumentsize-value": "{{PLURAL:$1|ein|$1|kein}} vun {{PLURAL:$2|einem Byte|$2 Bytes|keinem Byte}}",
+	"limitreport-expansiondepth": "Deefste Ußdehnong beim Öplühse",
 	"limitreport-expansiondepth-value": "$1 vun $2",
 	"limitreport-expensivefunctioncount": "Oproofe vun „düüre“ Fonxjuhne em Paaser",
 	"limitreport-expensivefunctioncount-value": "$1 vun $2",
diff --git a/languages/i18n/lad.json b/languages/i18n/lad.json
index a5e8183b0d..12a3699d64 100644
--- a/languages/i18n/lad.json
+++ b/languages/i18n/lad.json
@@ -60,7 +60,7 @@
 	"editfont-monospace": "Tipografía que cuvre lugar fikso",
 	"editfont-sansserif": "Tipografía sans-serif",
 	"editfont-serif": "Tipografía serif",
-	"sunday": "Alḥad",
+	"sunday": "Alhadh",
 	"monday": "Lunes",
 	"tuesday": "Martes",
 	"wednesday": "Miércoles",
@@ -79,7 +79,7 @@
 	"march": "Março",
 	"april": "Abril",
 	"may_long": "Mayo",
-	"june": "Juño",
+	"june": "Junio",
 	"july": "Julio",
 	"august": "Agosto",
 	"september": "Setiembre",
@@ -781,7 +781,6 @@
 	"emailuser": "Embia korreo elektroniko a este usuario",
 	"emailuser-title-target": "Embiar un korreo elektroniko a {{Gender:$1|este usuario|esta usuaria}}",
 	"emailuser-title-notarget": "Embiar un korreo elektroniko a un usuario",
-	"emailpage": "Embiar un korreo elektroniko a un usuario",
 	"defemailsubject": "Korreo elektroniko del usuario \"$1\" de {{SITENAME}}",
 	"emailusername": "Nombre de usuario:",
 	"emailfrom": "De:",
@@ -1064,8 +1063,16 @@
 	"watchlisttools-view": "Ver los trocamientos",
 	"watchlisttools-edit": "Ver i trocar tu lista de escogidas",
 	"watchlisttools-raw": "Troca tu lista de escogidas en crudo",
-	"hebrew-calendar-m1": "Tishre",
-	"hebrew-calendar-m2": "Ḥeshvan",
+	"hebrew-calendar-m1": "Tishri",
+	"hebrew-calendar-m2": "Ḥeshván",
+	"hebrew-calendar-m4": "Teveth",
+	"hebrew-calendar-m6": "Adhar",
+	"hebrew-calendar-m6a": "Adhar I",
+	"hebrew-calendar-m6b": "Adhar II",
+	"hebrew-calendar-m7": "Nissán",
+	"hebrew-calendar-m8": "Iyyar",
+	"hebrew-calendar-m9": "Siván",
+	"hebrew-calendar-m10": "Tammuz",
 	"hebrew-calendar-m1-gen": "Tishre",
 	"hebrew-calendar-m2-gen": "Ḥeshvan",
 	"duplicate-defaultsort": "'''Aviso:''' la klave primaria para ordenamiento \"$2\" anula la primera \"$1\"",
diff --git a/languages/i18n/lb.json b/languages/i18n/lb.json
index be5d0282ba..a2ac898ee9 100644
--- a/languages/i18n/lb.json
+++ b/languages/i18n/lb.json
@@ -914,7 +914,8 @@
 	"rows": "Zeilen",
 	"columns": "Kolonnen",
 	"searchresultshead": "Sichen",
-	"stub-threshold": "Maximum (a Byte) bei deem e Link nach ëmmer am <a href=\"#\" class=\"stub\">Skizze-Format</a> gewise gëtt:",
+	"stub-threshold": "Maximum bei deem e Link nach ëmmer am Skizze-Format ($1) gewise gëtt:",
+	"stub-threshold-sample-link": "Beispill",
 	"stub-threshold-disabled": "Desaktivéiert",
 	"recentchangesdays": "Deeg déi an de Rezenten Ännerungen ugewise ginn:",
 	"recentchangesdays-max": "(Maximal $1 {{PLURAL:$1|Dag|Deeg}})",
@@ -1608,7 +1609,7 @@
 	"booksources-text": "Hei ass eng Lëscht mat Linken op Internetsäiten, déi nei a gebraucht Bicher verkafen. Do kann et sinn datt Dir méi Informatiounen iwwer déi Bicher fannt déi Dir sicht.",
 	"booksources-invalid-isbn": "D'ISBN-Nummer déi Dir uginn hutt schéngt net gëlteg ze sinn. Kuckt w.e.g. no ob beim Kopéiere kee Feeler geschitt ass.",
 	"specialloguserlabel": "Aktive Benotzer:",
-	"speciallogtitlelabel": "Zil (Titel oder Benotzer):",
+	"speciallogtitlelabel": "Zil (Titel oder {{ns:user}}:Benotzernumm fir e Benotzer):",
 	"log": "Logbicher",
 	"all-logs-page": "All ëffentlech Logbicher",
 	"alllogstext": "Dëst ass eng kombinéiert Lëscht vu Logbicher op {{SITENAME}}.\nDir kënnt d'Siche limitéieren wann Dir e Log-Typ, e Benotzernumm (case-senisitive) oder déi gefrote Säit (och case-senisitive) agitt.",
@@ -2273,7 +2274,7 @@
 	"tooltip-ca-nstab-main": "Contenu vun der Säit weisen",
 	"tooltip-ca-nstab-user": "Benotzersäit weisen",
 	"tooltip-ca-nstab-media": "Mediesäit weisen",
-	"tooltip-ca-nstab-special": "Dëst ass eng Spezialsäit. Si kann net geännert ginn.",
+	"tooltip-ca-nstab-special": "Dëst ass eng Spezialsäit a si kann net geännert ginn",
 	"tooltip-ca-nstab-project": "Portalsäit weisen",
 	"tooltip-ca-nstab-image": "Billersäit weisen",
 	"tooltip-ca-nstab-mediawiki": "Systemmessage weisen",
diff --git a/languages/i18n/lrc.json b/languages/i18n/lrc.json
index 88b9970efe..90ccf3febb 100644
--- a/languages/i18n/lrc.json
+++ b/languages/i18n/lrc.json
@@ -616,8 +616,8 @@
 	"previewconflict": "ڤئرگأشت پیش سئیل د نیسئسە د راساگە ڤارو ڤیرایئشت کاری چی شئکل دیار بییئن بوٙەأر شوما  ڤئ نە سی ئمایە کئردئن ئنتئخاڤ بأکیت.",
 	"session_fail_preview": "<strong>د بأخت گأن سی یە کئ رئسینە یا نئشأسجا نە د دأس دأئیمە نئمی توٙنیم کار پأردازئشت ڤیرایئشت کاری شومانە أنجوم بئمینوٙ.</strong>\nلوطف بأکیت یئ گئل ھأنی تئلاش بأکیت.\nأر ھأنی ڤئ دوروس کار نأکئرد،[[Special:UserLogout|ئوٙمائن ڤئ دأر]] نە ئزمایئشت بأکیت و د نۊ بیائیت ڤامین.",
 	"session_fail_preview_html": "<strong>د بأخت گأن سی یە کئ رئسینە یا نئشأسجا نە د دأس دأئیمە نئمی توٙنیم کار پأردازئشت ڤیرایئشت کاری شومانە أنجوم بئمینوٙ.</strong>\n\n\n<em>سی یە کئ {{SITENAME}} یئ گئل رأگ ئچ تی ئم ئل کونئشتکار بییە دارە، پیش سئیل سی یە کئ د دأس چول کاریا جاڤا ئسکئریپت لیز داشتوٙە نئھوٙ بییە..</em>\n\nلوطف بأکیت یئ گئل ھأنی تئلاش بأکیت.\nأر ھأنی ڤئ دوروس کار نأکئرد،[[Special:UserLogout|ئوٙمائن ڤئ دأر]] نە ئزمایئشت بأکیت و د نۊ بیائیت ڤامین.",
-	"token_suffix_mismatch": "<strong>ویرایشتیا شما سی یه که دووارته نئر شما نیسسه یا نقطه نیائن نه د رازینه امنیتی ویرایشت د یک تیچسه.</strong>\nویرایشت سی یه که د خراو بیئن نیسسه بلگه نهاگری با رد بیه.\nای رخ ون د گاتیایی پیش میا که شما د یه گل رسینه جا پروکسی استفاده می کیت.",
-	"edit_form_incomplete": "<strong>پاره ای د ویرایشتا وه رسینه جا نمی رسن، هنی وارسی بکیت سی یه که بوینیت ویرایشتیا شما خوئه و هنی تلاش بکیت .</strong>",
+	"token_suffix_mismatch": "<strong>ڤیرایئشتیا شوما سی یە کئ دوڤارتە نیأر شوما نیسئسە یا نوقطە نیائن نە د رازینە أمینیأتی ڤیرایئشت د یأک تیچئسە رأد میکە.</strong>\nڤیرایئشت سی یە کئ د خئراڤ بییئن نیسئسە بألگە نئھاگئری با رأد بییە.\nئی روخ ڤأن د گاتیایی پیش میا کئ شوما یئ گئل  رئسینە جا پوروکسی نە ڤئ کار بئیریت.",
+	"edit_form_incomplete": "<strong>پارە یی د ڤیرایئشتیا ڤئ رئسینە جا نئمی رئسئن، د نۊ ڤارئسی بأکیت سی یە کئ د خوٙ بییئن ڤیرایئشتیا خوتوٙ ڤارئسیاری بأکیت و د نۊ تئلاش بأکیت.</strong>",
 	"editing": "د حال و بال ڤیرایئشت $1",
 	"creating": "راس کئردئن $1",
 	"editingsection": "د حال و بال ڤیرایئشت $1 (بأرجا$1)",
@@ -631,9 +631,10 @@
 	"yourdiff": "فأرخیا",
 	"copyrightwarning": "لوطف بأکیت د ڤیر داشتوٙئیت کئ ئیچئ فأرض یأنە کئ ھأمە ھومیاریا شوما ڤا{{SITENAME}} د حال و بال «$2» دأرتیچ بوٙە(سی چیا تئر روئیت د $1).\nأر نئمیھایت کئ نیسئسە یا توٙ کئ فئرە ڤیرایئشت کاری بیینە و دئلحا دأرتیچ بان، د ئیچئ کئلئشوٙ نأکیت.<br />\nھأمچئنی شوما داریت ڤئ ئیما قول مئیت کئ خوتوٙ ڤئنوٙنە نیسأنیتە، یا ڤئنە د ڤئنوٙنە د یئ گئل سأرچئشمە آزاد ڤا بأرکئرد ھأمأگوٙنی یا چیایی چی ڤئ گئرتیتە.\n'''آرئنگیایی کئ صئلا دأرتیچئسئن (copyright) ھا دئشوٙ بی صئلا کئل نأکیت!'''",
 	"copyrightwarning2": "لوطف بأکیت د ڤیر داشتوٙئیت کئ ئیچئ فأرض یأنە کئ ھأمە ھومیاریا شوما ڤا{{SITENAME}} د حال و بال «$2» دأرتیچ بوٙە(سی چیا تئر روئیت د $1).\nأر نئمیھایت کئ نیسئسە یا توٙ کئ فئرە ڤیرایئشت کاری بیینە و دئلحا دأرتیچ بان، د ئیچئ کئلئشوٙ نأکیت.<br />\nھأمچئنی شوما داریت ڤئ ئیما قول مئیت کئ خوتوٙ ڤئنوٙنە نیسأنیتە، یا ڤئنە د ڤئنوٙنە د یئ گئل سأرچئشمە آزاد ڤا بأرکئرد ھأمأگوٙنی یا چیایی چی ڤئ گئرتیتە.\n'''آرئنگیایی کئ صئلا دأرتیچئسئن (copyright) ھا دئشوٙ بی صئلا کئل نأکیت!'''",
-	"longpageerror": "<strong>خطا:نیسسه شما  {{PLURAL:$1|یه کلوبایت|$1 کلوبایت}}  درازی نه دئه، که ونو د بیشرونه انازه{{PLURAL:$2|یه کلوبایت|$2 کلوبایت}} گپترن.</strong>\nنبوئه وه اماییه با.",
-	"readonlywarning": "<strong>زئنار:رسینه گا سی واداشت قلف بیه، سی یه نه که شما ایسه نمی تونیت ویرایشتیاتونه اماییه بکیت.</strong>\nشات شما بحایت که نیسسه خوتونه د جانیا نیسسه ای وردار بدیس بکیت و ونه سی نهاتر اماییه بکیت.\n\nدیوونداری که ونه قلف کرده چنی گوته:$1",
-	"protectedpagewarning": "<strong>زئنار:ای بلگه سی یه پر و پیم بیه که کاریاریایی که دسرسی دیوونداری دارن فقط بتونن دش ویرایشت بکن.</strong>\nآخرین سیائه سی سرچشمه یا د هار اماییه کاری بیه:",
+	"editpage-cannot-use-custom-model": "شیڤە مینوٙنە یا ئی بألگە نأتوٙنە آلئشتکاری بوٙە.",
+	"longpageerror": "<strong>خأطا:نیسئسە شوما {{PLURAL:$1|یە کئلوٙبایت|$1 کئلوبایت}} دئرازا نە دأە، کئ ڤئنوٙ د بیشتأروٙنە أنازە {{PLURAL:$2|یە کئلوبایت|$2 کئلوبایت}} گأپتأرئن.</strong>\nنأبوٙە ڤئ ئمایە با.",
+	"readonlywarning": "<strong>د ڤیر داشتوٙئیت:رئسینە گا سی ڤاداشت کاری نئھاگئری بییە، سی یە نە کئ شوما ئیسە نئمی توٙنیت ڤیرایئشت کاریاتوٙنە ئمایە بأکیت.</strong>\nگاسی شوما بئھایت کئ نیسئسە خوتوٙنە د جانیا نیسئسە یی ڤوردار بئدیس بأکیت و ڤئنە سی نئھاتئر ئمایە بأکیت.\n\nدیڤوٙنداری کئ د ڤئ نئھاگئری کئردە چئنی گوتە:$1",
+	"protectedpagewarning": "<strong>د ڤیر داشتوٙئیت:ئی بألگە سی یە پأر و پیم بییە کئ فأقأط کاریاریایی کئ دأسرئسی دیڤوٙنداری دارئن بأتوٙنئن دئش ڤیرایئشت کاری بأکأن..</strong>\nآخئری سیاە سی سأرچئشمە یا د ھار ئمایە کاری بییە:",
 	"semiprotectedpagewarning": "<strong>د ویر داشتویت:</strong> ای بلگه سی یه که فقط کاریاریا ثوت نام کرده تونستون دش ویرایشت بکه ن پر و پیم بیه.\nآخرین پهرستنومه دئه بیه سی سرچشمه هار نها اماییه بیه:",
 	"cascadeprotectedwarning": "<strong>زئنار:</strong> ئی بألگە ڤئ دأس کاریاریایی کئ صئلا سأردیڤوٙنکاری دارن می توٙنە ڤیرایئشت کاری بوٙە سی یە کئ ئی بألگە ڤئ رأڤئشت تاف نئمایی پأر و پیم کاری بییە {{PLURAL:$1|بألگە|بألگە یا}}:",
 	"titleprotectedwarning": "<strong>زئنار:ای بلگه پر و پیم بیه سی یه که[[ویجه:نوم گه حقوق گرو|حقوق ویجه]] باید ونه دروس بکن .</strong>\nآخرین پهرستنومه دئه بیه سی سرچشمه دئن نهااماییه بیه:",
@@ -1164,7 +1165,7 @@
 	"action-changetags": "اضاف کردن یا جا وه جاکاری سردیسیا دل وه حایی د وانئریا و پهرستنومه یا شخصی",
 	"nchanges": "$1 {{PLURAL:$1|آلشت|آلشتیا}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|د آخری دیئن}}",
-	"enhancedrc-history": "ويرگار",
+	"enhancedrc-history": "ڤیرگار",
 	"recentchanges": "آلئشتیا ئیسئنی",
 	"recentchanges-legend": "گزینه یا آلشتیا ایسنی",
 	"recentchanges-summary": "دو بیشتر آلشتیا تازباو نه د ویکی نه د ای بلگه پیگری کو.",
@@ -1522,7 +1523,7 @@
 	"double-redirect-fixer": "تعمیر کننه واگردونی",
 	"brokenredirects": "واگردونیا بی سرانجوم",
 	"brokenredirectstext": "واگردونیا نهاتر د بلگه یایی که وجود نارن هوم پیوند بینه.",
-	"brokenredirects-edit": "ویرایشت",
+	"brokenredirects-edit": "ڤیرایئشت",
 	"brokenredirects-delete": "پاكسا كردن",
 	"withoutinterwiki": "بلگه یایی که هوم پیوند زون نارن",
 	"withoutinterwiki-summary": "بلگه یا هاری وه زون نسقه یا زونا تر هوم پیوند نبیه.",
@@ -1863,7 +1864,7 @@
 	"minimum-size": "انازه کمترونه",
 	"maximum-size": "انازه بیشترونه",
 	"pagesize": "(بایتیا)",
-	"restriction-edit": "ويرايشت",
+	"restriction-edit": "ڤیرایئشت",
 	"restriction-move": "جاوه جا بوئيت",
 	"restriction-create": "راس كردن",
 	"restriction-upload": "سوار کرد",
@@ -2332,7 +2333,7 @@
 	"pageinfo-title": "دونسمنیا سی \"$1\"",
 	"pageinfo-not-current": "د بدبختی،نبوئه که ای دونسمنیا نه سی وانئریا دماتری نهااماییه بکیت.",
 	"pageinfo-header-basic": "دونسمنیا پایه",
-	"pageinfo-header-edits": "ویرایشت ویرگار",
+	"pageinfo-header-edits": "ڤیرایئشت ڤیرگار",
 	"pageinfo-header-restrictions": "پر و پیم کردن بلگه",
 	"pageinfo-header-properties": "چیا بلگه",
 	"pageinfo-display-title": "نشو دئن سرون",
@@ -2875,7 +2876,7 @@
 	"autosumm-newblank": "بلگه حالی دروس بیه",
 	"lag-warn-normal": "شایت آلشتیا تازه تر د $1 {{PLURAL:$1|ثانیه|ثانیه یا}} د ای نومگه دیاری نکن.",
 	"lag-warn-high": "شایت سی واپس رئتن فره رسینه جا، آلشتیا تازه تر د $1 {{PLURAL:$1|ثانیه|ثانیه یا}} د ای نومگه دیاری نکرده بان.",
-	"watchlistedit-normal-title": "ویرایشت سیل برگ",
+	"watchlistedit-normal-title": "ڤیرایئشت سئیل بأرگ",
 	"watchlistedit-normal-legend": "ؤرداشتن سرونیا د سیل برگ",
 	"watchlistedit-normal-explain": "داسونایی که هان د نومگه سیل برگه شما د هار اومائنه.\nسی پاکسا کردن داسون جعوه کناری وه نه نشودار بکیت و دگمه «{{int:Watchlistedit-normal-submit}}» نه بپورنیت.\nشما همچنی می تونیت [[Special:EditWatchlist/raw|نومگه خام نه ویرایشت بکیت]].",
 	"watchlistedit-normal-submit": "ؤرداشتن سرونیا",
diff --git a/languages/i18n/lt.json b/languages/i18n/lt.json
index 4fd8b2b390..b220367f66 100644
--- a/languages/i18n/lt.json
+++ b/languages/i18n/lt.json
@@ -941,7 +941,8 @@
 	"rows": "Eilutės:",
 	"columns": "Stulpeliai:",
 	"searchresultshead": "Paieškos nustatymai",
-	"stub-threshold": "Puslapį žymėti <a href=\"#\" class=\"stub\">nebaigtu</a>, jei mažesnis nei:",
+	"stub-threshold": "Ribinė reikšmė nepilnų puslapių nuorodų formatavimui ($1):",
+	"stub-threshold-sample-link": "pavyzdys",
 	"stub-threshold-disabled": "IÅ¡jungtas",
 	"recentchangesdays": "Rodomos dienos paskutinių keitimų sąraše:",
 	"recentchangesdays-max": "(daugiausiai $1 {{PLURAL:$1|diena|dienos|dienų}})",
@@ -2335,7 +2336,7 @@
 	"tooltip-ca-nstab-main": "Rodyti puslapio turinį",
 	"tooltip-ca-nstab-user": "Rodyti naudotojo puslapį",
 	"tooltip-ca-nstab-media": "Rodyti media puslapį",
-	"tooltip-ca-nstab-special": "Å is puslapis yra specialusis - jo negalima redaguoti",
+	"tooltip-ca-nstab-special": "Å is puslapis yra specialusis ir jo negalima redaguoti",
 	"tooltip-ca-nstab-project": "Rodyti projekto puslapį",
 	"tooltip-ca-nstab-image": "Rodyti rinkmenos puslapį",
 	"tooltip-ca-nstab-mediawiki": "Rodyti sisteminį pranešimą",
diff --git a/languages/i18n/lv.json b/languages/i18n/lv.json
index 33be4384ca..86b5705ce2 100644
--- a/languages/i18n/lv.json
+++ b/languages/i18n/lv.json
@@ -56,10 +56,10 @@
 	"tog-watchlisthideown": "Paslēpt manus labojumus uzraugāmo lapu sarakstā",
 	"tog-watchlisthidebots": "Paslēpt botu labojumus uzraugāmo lapu sarakstā",
 	"tog-watchlisthideminor": "Paslēpt maznozīmīgos labojumus uzraugāmo lapu sarakstā",
-	"tog-watchlisthideliu": "Paslēpt reģistrēto lietotāju labojumus uzraugāmo lapu sarakstā",
-	"tog-watchlisthideanons": "Paslēpt anonīmo lietotāju labojumus uzraugāmo lapu sarakstā",
+	"tog-watchlisthideliu": "Paslēpt reģistrēto dalībnieku labojumus uzraugāmo lapu sarakstā",
+	"tog-watchlisthideanons": "Paslēpt anonīmo dalībnieku labojumus uzraugāmo lapu sarakstā",
 	"tog-watchlisthidepatrolled": "Paslēpt pārbaudītās lapas uzraugāmo lapu sarakstā",
-	"tog-ccmeonemails": "Sūtīt sev citiem lietotājiem nosūtīto epastu kopijas",
+	"tog-ccmeonemails": "Sūtīt sev citiem dalībniekiem nosūtīto epastu kopijas",
 	"tog-diffonly": "Nerādīt lapu saturu zem izmaiņām",
 	"tog-showhiddencats": "Rādīt slēptās kategorijas",
 	"tog-norollbackdiff": "Neņemt vērā atšķirības, veicot atriti",
@@ -210,12 +210,12 @@
 	"talkpage": "Diskusija par Å¡o lapu",
 	"talkpagelinktext": "Diskusija",
 	"specialpage": "Īpašā Lapa",
-	"personaltools": "Lietotāja rīki",
+	"personaltools": "Dalībnieka rīki",
 	"articlepage": "Apskatīt rakstu",
 	"talk": "Diskusija",
 	"views": "Apskates",
 	"toolbox": "RÄ«ki",
-	"userpage": "Skatīt lietotāja lapu",
+	"userpage": "Skatīt dalībnieka lapu",
 	"projectpage": "Skatīt projekta lapu",
 	"imagepage": "Skatīt faila lapu",
 	"mediawikipage": "Skatīt paziņojuma lapu",
@@ -227,7 +227,7 @@
 	"redirectedfrom": "(Pāradresēts no $1)",
 	"redirectpagesub": "Pāradresācijas lapa",
 	"redirectto": "Pāradresēt uz:",
-	"lastmodifiedat": "Šajā lapā pēdējās izmaiņas izdarītas $2, $1.",
+	"lastmodifiedat": "Šajā lapā pēdējo izmaiņu izdarīšanas brīdis: $2, $1.",
 	"viewcount": "Šī lapa ir tikusi apskatīta $1 {{PLURAL:$1|reizes|reizi|reizes}}.",
 	"protectedpage": "Aizsargāta lapa",
 	"jumpto": "Pārlēkt uz:",
@@ -257,14 +257,14 @@
 	"privacypage": "Project:Privātuma politika",
 	"badaccess": "Atļaujas kļūda",
 	"badaccess-group0": "Tev nav atļauts izpildīt darbību, kuru tu pieprasīji.",
-	"badaccess-groups": "Darbības izpilde, ko Tu pieprasīji, ir pieejama tikai $1 {{PLURAL:$2|lietotāju grupām|lietotāju grupai|lietotāju grupām}}.",
+	"badaccess-groups": "Darbības izpilde, ko Tu pieprasīji, ir pieejama tikai $1 {{PLURAL:$2|dalībnieku grupām|dalībnieku grupai|dalībnieku grupām}}.",
 	"versionrequired": "Nepieciešamā ''MediaWiki'' versija: $1.",
 	"versionrequiredtext": "Lai lietotu šo lapu, nepieciešama ''MediaWiki'' versija $1. Sk. [[Special:Version|versija]].",
 	"ok": "Labi",
 	"retrievedfrom": "Saturs iegūts no \"$1\"",
 	"youhavenewmessages": "Tev ir $1 (skatīt $2).",
-	"youhavenewmessagesfromusers": "{{PLURAL:$4|Jums ir}} $1 no {{PLURAL:$3|cita lietotāja|$3 lietotājiem}} ($2).",
-	"youhavenewmessagesmanyusers": "Jums ir $1 no daudziem lietotājiem ($2).",
+	"youhavenewmessagesfromusers": "{{PLURAL:$4|Jums ir}} $1 no {{PLURAL:$3|cita dalībnieka|$3 dalībniekiem}} ($2).",
+	"youhavenewmessagesmanyusers": "Jums ir $1 no daudziem dalībniekiem ($2).",
 	"newmessageslinkplural": "{{PLURAL:$1|999=jauni vēstījumi|jauns vēstījums|999=jauni vēstījumi}}",
 	"newmessagesdifflinkplural": "{{PLURAL:$1|999=pēdējās izmaiņas|pēdējā izmaiņa|999=pēdējās izmaiņas}}",
 	"youhavenewmessagesmulti": "Tev ir jauns ziņojums: $1",
@@ -296,7 +296,7 @@
 	"sort-descending": "Kārtot dilstošā secībā",
 	"sort-ascending": "Kārtot augošā secībā",
 	"nstab-main": "Raksts",
-	"nstab-user": "Lietotāja lapa",
+	"nstab-user": "Dalībnieka lapa",
 	"nstab-media": "Multivides lapa",
 	"nstab-special": "Īpašā lapa",
 	"nstab-project": "Projekta lapa",
@@ -438,7 +438,7 @@
 	"nosuchuser": "Šeit nav lietotāja ar vārdu \"$1\". Lietotājvārdi ir reģistrjutīgi (lielie un mazie burti nav viens un tas pats) Pārbaudi, vai pareizi uzrakstīts, vai arī [[Special:UserLogin/signup|izveido jaunu kontu]].",
 	"nosuchusershort": "Šeit nav lietotāja ar vārdu \"$1\". Pārbaudi, vai nav drukas kļūda.",
 	"nouserspecified": "Tev jānorāda lietotājvārds.",
-	"login-userblocked": "Šis lietotājs ir bloķēts. Pieslēgšanās nav atļauta.",
+	"login-userblocked": "Šis dalībnieks ir bloķēts. Pieslēgšanās nav atļauta.",
 	"wrongpassword": "Tu ievadīji nepareizu paroli. Lūdzu, mēģini vēlreiz.",
 	"wrongpasswordempty": "Parole bija tukša. Lūdzu mēģini vēlreiz.",
 	"passwordtooshort": "Tava parole ir pārāk īsa.\nTajā jābūt vismaz {{PLURAL:$1|$1 zīmēm|1 zīmei|$1 zīmēm}}.",
@@ -464,7 +464,7 @@
 	"emaildisabled": "Šī vietne nevar nosūtīt e-pastus.",
 	"accountcreated": "Konts izveidots",
 	"accountcreatedtext": "Lietotāja konts priekš $1 tika izveidots.",
-	"createaccount-title": "Lietotāja konta izveidošana {{grammar:lokatīvs|{{SITENAME}}}}",
+	"createaccount-title": "Dalībnieka konta izveidošana {{grammar:lokatīvs|{{SITENAME}}}}",
 	"login-throttled": "Jūs esat veicis pārāk daudz pieslēgšanās mēģinājumus.\nLūdzu, uzgaidiet $1 pirms mēģiniet vēlreiz.",
 	"login-abort-generic": "Jūsu pieteikšanās bija neveiksmīga — Darbība pārtraukta",
 	"loginlanguagelabel": "Valoda: $1",
@@ -543,7 +543,7 @@
 	"missingcommentheader": "'''Atgādinājums:''' Tu šim komentāram neesi norādījis virsrakstu/tematu.\nJa tu vēlreiz spiedīsi uz \"{{int:savearticle}}\", tavas izmaiņas tiks saglabātas bez virsraksta.",
 	"summary-preview": "Kopsavilkuma pirmskats:",
 	"subject-preview": "Kopsavilkuma/virsraksta pirmskats:",
-	"blockedtitle": "Lietotājs ir bloķēts.",
+	"blockedtitle": "Dalībnieks ir bloķēts.",
 	"blockedtext": "'''Tavs lietotāja vārds vai IP adrese ir nobloķēta.'''\n\n$1 nobloķēja tavu lietotāja vārdu vai IP adresi.\nBloķējot norādītais iemesls bija: ''$2''.\n\n*Bloka sākums: $8\n*Bloka beigas: $6\n*Bija domāts nobloķēt: $7\n\nTu vari sazināties ar $1 vai kādu citu [[{{MediaWiki:Grouppage-sysop}}|administratoru]] lai apspriestu šo bloku.\n\nPievērs uzmanību, tam, ka ja tu neesi norādījis derīgu e-pasta adresi ''[[Special:Preferences|savās izvēlēs]]'', tev nedarbosies \"sūtīt e-pastu\" iespēja.\n\nTava IP adrese ir $3 un bloka identifikators ir #$5. Lūdzu iekļauj vienu no tiem, vai abus, visos turpmākajos pieprasījumos.",
 	"autoblockedtext": "Tava IP adrese ir tikusi automātiski nobloķēta, tāpēc, ka to (nupat kā) ir lietojis cits lietotājs, kuru nobloķēja $1.\nNorādītais bloķēšanas iemesls bija:\n\n:''$2''\n\n* Bloka sākums: $8\n* Bloka beigas: $6\n* Bija domāts nobloķēt: $7\n\nTu vari sazināties ar $1 vai kādu citu [[{{MediaWiki:Grouppage-sysop}}|adminu]] lai apspriestu šo bloku.\n\nAtceries, ka tu nevari lietot \"sūtīt e-pastu šim lietotājam\" iespēju, ja tu neesi norādījis derīgu e-pasta adresi savās [[Special:Preferences|lietotāja izvelēs]] un bloķējot tev nav aizbloķēta iespēja sūtīt e-pastu.\n\nTava pašreizējā IP adrese ir $3 un  bloka ID ir $5.\nLūdzu iekļauj šos visos ziņojumos, kurus sūti adminiem, apspriežot šo bloku.",
 	"blockednoreason": "iemesls nav norādīts",
@@ -562,12 +562,12 @@
 	"noarticletext": "Šajā lapā šobrīd nav nekāda teksta, tu vari [[Special:Search/{{PAGENAME}}|meklēt citās lapās pēc šīs lapas nosaukuma]], <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} meklēt saistītos reģistru ierakstos] vai arī [{{fullurl:{{FULLPAGENAME}}|action=edit}} sākt rediģēt šo lapu]</span>.",
 	"noarticletext-nopermission": "Šajā lapā pašlaik nav nekāda teksta.\nTu vari [[Special:Search/{{PAGENAME}}|meklēt šīs lapas nosaukumu]] citās lapās,\nvai <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} meklēt saistītus reģistru ierakstus]</span>, bet jums nav atļauja izveidot si lapu.",
 	"userpage-userdoesnotexist": "Lietotājs \"<nowiki>$1</nowiki>\" nav reģistrēts.\nLūdzu, pārliecinies vai vēlies izveidot/izmainīt šo lapu.",
-	"userpage-userdoesnotexist-view": "Lietotājs \"$1\" nav reģistrēts.",
-	"blocked-notice-logextract": "Šis lietotājs pašlaik ir nobloķēts.\n\nPēdējais bloķēšanas reģistra ieraksts ir apskatāms zemāk:",
+	"userpage-userdoesnotexist-view": "Dalībnieks \"$1\" nav reģistrēts.",
+	"blocked-notice-logextract": "Šis dalībnieks pašlaik ir nobloķēts.\n\nPēdējais bloķēšanas reģistra ieraksts ir apskatāms zemāk:",
 	"clearyourcache": "'''Piezīme:''' Lai redzētu izmaiņas, pēc saglabāšanas jums var nākties iztīrīt sava pārlūka kešatmiņu.\n* '''Firefox / Safari:''' Pieturiet ''Shift'' un klikšķiniet uz ''Pārlādēt'' vai nospiediet ''Ctrl-F5'' vai ''Ctrl-R'' (''Command-R'' uz Mac)\n* '''Google Chrome:''' Nospiediet ''Ctrl-Shift-R'' (''Command-Shift-R'' uz Mac)\n* '''Internet Explorer:''' Pieturiet ''Ctrl'' un klikšķiniet uz ''Pārlādēt'' vai nospiediet ''Ctrl-F5''\n* '''Konqueror:''' Klikšķiniet uz ''Pārlādēt'' vai nospiediet ''F5''\n* '''Opera:''' Iztīriet kešatmiņu ''Tools → Preferences''",
 	"usercssyoucanpreview": "'''Ieteikums:''' Lieto pogu \"{{int:showpreview}}\", lai pārbaudītu savu jauno CSS pirms saglabāšanas.",
 	"userjsyoucanpreview": "'''Ieteikums:''' Lieto pogu \"{{int:showpreview}}\", lai pārbaudītu savu jauno JavaScript pirms saglabāšanas.",
-	"usercsspreview": "'''Atceries, ka šis ir tikai tava lietotāja CSS pirmskats, lapa vēl nav saglabāta!'''",
+	"usercsspreview": "'''Atceries, ka šis ir tikai tava dalībnieka CSS pirmskats, lapa vēl nav saglabāta!'''",
 	"userjspreview": "'''Atceries, ka šis ir tikai tava lietotāja JavaScript pirmskats/tests, lapa vēl nav saglabāta!'''",
 	"sitecsspreview": "'''Atcerieties, ka jūs veicat tikai šī CSS priekšapskati.'''\n'''Tas vēl nav saglabāts!'''",
 	"sitejspreview": "'''Atcerieties, ka jūs veicat tikai šī JavaScript koda priekšapskati.'''\n'''Tas vēl nav saglabāts!'''",
@@ -640,7 +640,7 @@
 	"undo-failure": "Šo labojumu nevar atcelt, jo ir veikti nozīmīgi labojumi vēl pēc šī labojuma izdarīšanas.",
 	"undo-norev": "Šo izmaiņu nevar atcelt, jo tādas nav vai tā ir izdzēsta.",
 	"undo-summary": "Atcēlu [[Special:Contributions/$2|$2]] ([[User talk:$2|Diskusija]]) izdarīto izmaiņu $1",
-	"cantcreateaccounttitle": "Nevar izveidot lietotāju",
+	"cantcreateaccounttitle": "Nevar izveidot dalībnieku",
 	"cantcreateaccount-text": "[[Lietotājs:$3|$3]] ir bloķējis lietotāja izveidošanu no šīs IP adreses ('''$1''').\n\n$3 norādītais iemesls ir ''$2''",
 	"viewpagelogs": "Apskatīt ar šo lapu saistītos reģistru ierakstus",
 	"nohistory": "Šai lapai nav pieejama versiju hronoloģija.",
@@ -796,8 +796,8 @@
 	"skin-preview": "Priekšskats",
 	"datedefault": "Vienalga",
 	"prefs-labs": "Laboratorijas funkcijas",
-	"prefs-user-pages": "Lietotāja lapas",
-	"prefs-personal": "Lietotāja dati",
+	"prefs-user-pages": "Dalībnieka lapas",
+	"prefs-personal": "Dalībnieka dati",
 	"prefs-rc": "Pēdējās izmaiņas",
 	"prefs-watchlist": "Uzraugāmie raksti",
 	"prefs-editwatchlist": "Labot uzraugāmo rakstu sarakstu",
@@ -821,6 +821,7 @@
 	"columns": "Simbolu skaits rindiņā:",
 	"searchresultshead": "Meklēšana",
 	"stub-threshold": "Slieksnis <a href=\"#\" class=\"stub\">aizmetņa saites</a> formatēšanai (baiti):",
+	"stub-threshold-sample-link": "piemērs",
 	"stub-threshold-disabled": "Atslēgts",
 	"recentchangesdays": "Dienu skaits, kuru rādīt pēdējās izmaiņās:",
 	"recentchangesdays-max": "Ne vairāk kā $1 {{PLURAL:$1|dienas|diena|dienas}}",
@@ -844,7 +845,7 @@
 	"timezoneregion-europe": "Eiropa",
 	"timezoneregion-indian": "Indijas okeāns",
 	"timezoneregion-pacific": "Klusais okeāns",
-	"allowemail": "Atļaut saņemt e-pastus no citiem lietotājiem",
+	"allowemail": "Atļaut saņemt e-pastus no citiem dalībniekiem",
 	"prefs-searchoptions": "Meklēšana",
 	"prefs-namespaces": "Vārdtelpas",
 	"default": "pēc noklusējuma",
@@ -903,28 +904,28 @@
 	"userrights-groupsmember-auto": "Netiešs dalībnieks:",
 	"userrights-groups-help": "Tu vari izmainīt kādās grupās šis lietotājs ir:\n* Ieķeksēts lauciņš norāda, ka lietotājs ir attiecīgajā grupā.\n* Neieķeksēts lauciņš norāda, ka lietotājs nav attiecīgajā grupā.\n* * norāda, ka šo grupu tu nevarēsi noņemt, pēc tam, kad to būsi pielicis, vai otrādāk (tu nevarēsi atcelt savas izmaiņas).",
 	"userrights-reason": "Iemesls:",
-	"userrights-no-interwiki": "Tev nav atļaujas izmainīt lietotāju tiesības citos wiki.",
+	"userrights-no-interwiki": "Tev nav atļaujas izmainīt dalībnieku tiesības citos wiki.",
 	"userrights-nodatabase": "Datubāze $1 neeksistē vai nav lokāla.",
-	"userrights-nologin": "Tev ir [[Special:UserLogin|jāieiet iekšā]] kā adminam, lai varētu izmainīt lietotāju grupas.",
+	"userrights-nologin": "Tev ir [[Special:UserLogin|jāieiet iekšā]] kā adminam, lai varētu izmainīt dalībnieku grupas.",
 	"userrights-notallowed": "Jūsu lietotāja kontam nav atļaujas pievienot vai noņemt lietotāju tiesības.",
 	"userrights-changeable-col": "Grupas, kuras tu vari izmainīt",
 	"userrights-unchangeable-col": "Grupas, kuras tu nevari izmainīt",
 	"group": "Grupa:",
-	"group-user": "Lietotāji",
-	"group-autoconfirmed": "Automātiski apstiprinātie lietotāji",
+	"group-user": "Dalībnieki",
+	"group-autoconfirmed": "Automātiski apstiprinātie dalībnieki",
 	"group-bot": "Boti",
 	"group-sysop": "Administratori",
 	"group-bureaucrat": "Birokrāti",
 	"group-suppress": "Novērotāji",
 	"group-all": "(visi)",
-	"group-user-member": "{{GENDER:$1|lietotājs}}",
-	"group-autoconfirmed-member": "{{GENDER:$1|automātiski apstiprināts lietotājs|automātiski apstiprināta lietotāja}}",
+	"group-user-member": "{{GENDER:$1|dalībnieks}}",
+	"group-autoconfirmed-member": "{{GENDER:$1|automātiski apstiprināts dalībnieks|automātiski apstiprināta dalībniece}}",
 	"group-bot-member": "{{GENDER:$1|bots}}",
 	"group-sysop-member": "{{GENDER:$1|administrators|administratore}}",
 	"group-bureaucrat-member": "{{GENDER:$1|birokrāts|birokrāte}}",
 	"group-suppress-member": "{{GENDER:$1|novērotājs|novērotāja}}",
-	"grouppage-user": "{{ns:project}}:Lietotāji",
-	"grouppage-autoconfirmed": "{{ns:project}}:Automātiski apstiprināti lietotāji",
+	"grouppage-user": "{{ns:project}}:Dalībnieki",
+	"grouppage-autoconfirmed": "{{ns:project}}:Automātiski apstiprināti dalībnieki",
 	"grouppage-bot": "{{ns:project}}:Boti",
 	"grouppage-sysop": "{{ns:project}}:Administratori",
 	"grouppage-bureaucrat": "{{ns:project}}:Birokrāti",
@@ -933,11 +934,11 @@
 	"right-edit": "Izmainīt lapas",
 	"right-createpage": "Izveidot lapas (kuras nav diskusiju lapas)",
 	"right-createtalk": "Izveidot diskusiju lapas",
-	"right-createaccount": "Izveidot jaunus lietotāja kontus",
+	"right-createaccount": "Izveidot jaunus dalībnieka kontus",
 	"right-minoredit": "Atzīmēt izmaiņas kā maznozīmīgas",
 	"right-move": "Pārvietot lapas",
 	"right-move-subpages": "Pārvietot lapas kopā ar to apakšlapām",
-	"right-move-rootuserpages": "Pārvietot saknes lietotāja lapas",
+	"right-move-rootuserpages": "Pārvietot saknes dalībnieka lapas",
 	"right-move-categorypages": "Pārvietot kategoriju lapas",
 	"right-movefile": "Pārvietot failus",
 	"right-suppressredirect": "Neveidot pāradresāciju no vecā nosaukuma, pārvietojot lapu",
@@ -957,20 +958,20 @@
 	"right-undelete": "Atjaunot lapu",
 	"right-suppressrevision": "Apskatīt un atjaunot versijas, kas paslēptas no adminiem",
 	"right-suppressionlog": "Skatīt personīgos reģistrus",
-	"right-block": "Bloķēt citus lietotājus (lapu izmainīšana)",
-	"right-blockemail": "Bloķēt citus lietotājus (iespēja sūtīt e-pastu)",
-	"right-hideuser": "Bloķēt lietotājvārdu, slēpjot to no citiem lietotājiem",
+	"right-block": "Bloķēt citus dalībniekus (lapu izmainīšana)",
+	"right-blockemail": "Bloķēt citus dalībniekus (iespēja sūtīt e-pastu)",
+	"right-hideuser": "Bloķēt lietotājvārdu, slēpjot to no citiem dalībniekiem",
 	"right-ipblock-exempt": "Apiet IP bloķēšanu, automātisku bloķēšanu un IP apgabalu bloķēšanu",
 	"right-proxyunbannable": "Apiet ''proxy'' automātiskos blokus",
 	"right-unblockself": "Atbloķēt sevi",
 	"right-protect": "Izmainīt aizsargātās lapas un to aizsardzības līmeni",
 	"right-editprotected": "Labot aizsargātās lapas (bez kaskādes aizsardzības)",
-	"right-editinterface": "Izmainīt lietotāja interfeisu",
-	"right-editusercssjs": "Izmainīt citu lietotāju CSS un JS failus",
-	"right-editusercss": "Izmainīt citu lietotāju CSS failus",
-	"right-edituserjs": "Izmainīt citu lietotāju JS failus",
+	"right-editinterface": "Izmainīt dalībnieka interfeisu",
+	"right-editusercssjs": "Izmainīt citu dalībnieku CSS un JS failus",
+	"right-editusercss": "Izmainīt citu dalībnieku CSS failus",
+	"right-edituserjs": "Izmainīt citu dalībnieku JS failus",
 	"right-viewmywatchlist": "Apskatīt savu uzraugāmo rakstu sarakstu",
-	"right-rollback": "Ātri veikt atriti pēdējā lietotāja labojumiem, kas veica izmaiņas kādā konkrētā lapā",
+	"right-rollback": "Ātri veikt atriti pēdējā dalībnieka labojumiem, kas veica izmaiņas kādā konkrētā lapā",
 	"right-markbotedits": "Atzīmēt labojumus, kam veikta atrite, kā bota labojumus",
 	"right-noratelimit": "Būt darbību ātruma ierobežojumu neietekmētiem",
 	"right-import": "Importēt lapas no citiem wiki",
@@ -980,25 +981,25 @@
 	"right-patrolmarks": "Apskatīt pēdējo izmaiņu lapu pārbaužu atzīmes",
 	"right-unwatchedpages": "Apskatīt neuzraudzīto lapu sarakstu",
 	"right-mergehistory": "Apvienot lapu vēsturi",
-	"right-userrights": "Mainīt visu lietotāju tiesības",
-	"right-userrights-interwiki": "Mainīt lietotāju tiesības citās Vikipēdijās",
+	"right-userrights": "Mainīt visu dalībnieku tiesības",
+	"right-userrights-interwiki": "Mainīt dalīnieku tiesības citās Vikipēdijās",
 	"right-siteadmin": "Bloķēt un atbloķēt datubāzi",
-	"right-sendemail": "Sūtīt e-pastu citiem lietotājiem",
+	"right-sendemail": "Sūtīt e-pastu citiem dalībniekiem",
 	"right-passwordreset": "Apskatīt paroles atiestatīšanas e-pasta ziņojumus",
-	"newuserlogpage": "Jauno lietotāju reģistrs",
+	"newuserlogpage": "Jauno dalībnieku reģistrs",
 	"newuserlogpagetext": "Jauno lietotājvārdu reģistrs.",
-	"rightslog": "Lietotāju tiesību reģistrs",
-	"rightslogtext": "Šis ir lietotāju tiesību izmaiņu reģistrs.",
+	"rightslog": "Dalībnieku tiesību reģistrs",
+	"rightslogtext": "Šis ir dalībnieku tiesību izmaiņu reģistrs.",
 	"action-read": "lasīt šo lapu",
 	"action-edit": "labot Å¡o lapu",
 	"action-createpage": "izveidot lapas",
 	"action-createtalk": "izveidot diskusiju lapas",
-	"action-createaccount": "izveidot šo lietotāja kontu",
+	"action-createaccount": "izveidot šo dalībnieka kontu",
 	"action-history": "apskatīt šīs lapas vēsturi",
 	"action-minoredit": "atzīmēt šo labojumu kā maznozīmīgu",
 	"action-move": "pārvietot šo lapu",
 	"action-move-subpages": "pārvietot šo lapu un tās apakšlapas",
-	"action-move-rootuserpages": "pārvietot saknes lietotāja lapas",
+	"action-move-rootuserpages": "pārvietot saknes dalībnieka lapas",
 	"action-move-categorypages": "pārvietot kategoriju lapas",
 	"action-movefile": "pārvietot šo failu",
 	"action-upload": "augšupielādēt šo failu",
@@ -1012,7 +1013,7 @@
 	"action-undelete": "atjaunot Å¡o lapu",
 	"action-suppressrevision": "pārskatīt un atjaunot šo slēpto versiju",
 	"action-suppressionlog": "apskatīt šo privāto reģistru",
-	"action-block": "bloķēt šo lietotāju pret rakstu turpmāku labošanu",
+	"action-block": "bloķēt šo dalībnieku pret rakstu turpmāku labošanu",
 	"action-protect": "izmainīt aizsardzības līmeņus šai lapai",
 	"action-import": "importēt šo lapu no citas viki",
 	"action-importupload": "importēt šo lapu no failu augšupielādes",
@@ -1020,8 +1021,8 @@
 	"action-autopatrol": "iespēja savus labojumus atzīmēt kā pārbaudītus",
 	"action-unwatchedpages": "apskatīt neuzraudzīto lapu sarakstu",
 	"action-mergehistory": "apvienot šīs lapas vēsturi",
-	"action-userrights": "mainīt visu lietotāju tiesības",
-	"action-userrights-interwiki": "mainīt lietotāju tiesības citās Vikipēdijās",
+	"action-userrights": "mainīt visu dalībnieku tiesības",
+	"action-userrights-interwiki": "mainīt dalībnieku tiesības citās Vikipēdijās",
 	"action-siteadmin": "bloķēt vai atbloķēt datubāzi",
 	"action-sendemail": "sūtīt e-pastus",
 	"nchanges": "$1 {{PLURAL:$1|izmaiņas|izmaiņa|izmaiņas}}",
@@ -1046,7 +1047,7 @@
 	"rcshowhidebots": "$1 botus",
 	"rcshowhidebots-show": "Rādīt",
 	"rcshowhidebots-hide": "Slēpt",
-	"rcshowhideliu": "$1 reģistrētos lietotājus",
+	"rcshowhideliu": "$1 reģistrētos dalībniekus",
 	"rcshowhideliu-show": "Rādīt",
 	"rcshowhideliu-hide": "Slēpt",
 	"rcshowhideanons": "$1 anonīmos",
@@ -1066,8 +1067,8 @@
 	"minoreditletter": "m",
 	"newpageletter": "J",
 	"boteditletter": "b",
-	"number_of_watching_users_pageview": "[šo lapu uzrauga $1 {{PLURAL:$1|lietotāji|lietotājs|lietotāji}}]",
-	"rc_categories": "Ierobežot uz kategorijām (atdalīt ar \"|\")",
+	"number_of_watching_users_pageview": "[šo lapu uzrauga $1 {{PLURAL:$1|dalībnieki|dalībnieks|dalībnieki}}]",
+	"rc_categories": "Ierobežot uz kategorijām (atdalīt ar \"|\"):",
 	"rc_categories_any": "Jebkas",
 	"rc-change-size-new": "$1 {{PLURAL:$1|baiti|baits|baiti}} pēc izmaiņām",
 	"newsectionsummary": "/* $1 */ jauna sadaļa",
@@ -1414,8 +1415,8 @@
 	"categoriesfrom": "Parādīt kategorijas sākot ar:",
 	"special-categories-sort-count": "kārtot pēc skaita",
 	"special-categories-sort-abc": "kārtot alfabētiskā secībā",
-	"deletedcontributions": "Izdzēstais lietotāju devums",
-	"deletedcontributions-title": "Izdzēstais lietotāju devums",
+	"deletedcontributions": "Dzēstais dalībnieka devums",
+	"deletedcontributions-title": "Dzēstais dalībnieka devums",
 	"sp-deletedcontributions-contribs": "devums",
 	"linksearch": "Ārējo saišu meklēšana",
 	"linksearch-pat": "Meklēt:",
@@ -1631,8 +1632,8 @@
 	"invert": "Izvēlēties pretēji",
 	"namespace_association": "Saistītā vārdtelpa",
 	"blanknamespace": "(Pamatlapa)",
-	"contributions": "{{GENDER:$1|Lietotāja|Lietotājas|Lietotāja}} devums",
-	"contributions-title": "Lietotāja $1 devums",
+	"contributions": "{{GENDER:$1|Dalībnieka|Dalībnieces|Dalībnieka}} devums",
+	"contributions-title": "Dalībnieka $1 devums",
 	"mycontris": "Devums",
 	"contribsub2": "Lietotājs: $1 ($2)",
 	"nocontribs": "Netika atrastas izmaiņas, kas atbilstu šiem kritērijiem.",
@@ -1642,7 +1643,7 @@
 	"sp-contributions-newbies": "Rādīt jauno lietotāju devumu",
 	"sp-contributions-newbies-sub": "Jaunie lietotāji",
 	"sp-contributions-blocklog": "Bloķēšanas reģistrs",
-	"sp-contributions-deleted": "Izdzēstais lietotāja devums",
+	"sp-contributions-deleted": "dzēstais dalībnieka devums",
 	"sp-contributions-uploads": "augšupielādes",
 	"sp-contributions-logs": "reģistri",
 	"sp-contributions-talk": "diskusija",
diff --git a/languages/i18n/lzh.json b/languages/i18n/lzh.json
index 6d892f1ce0..9f85bf730d 100644
--- a/languages/i18n/lzh.json
+++ b/languages/i18n/lzh.json
@@ -25,15 +25,15 @@
 	"tog-hidepatrolled": "隱近巡",
 	"tog-newpageshidepatrolled": "隱新巡",
 	"tog-extendwatchlist": "展列見變",
-	"tog-usenewrc": "青出近易",
+	"tog-usenewrc": "羣出近易",
 	"tog-numberheadings": "生章數",
 	"tog-showtoolbar": "多寶列見",
-	"tog-editondblclick": "雙擊以纂頁",
-	"tog-editsectiononrightclick": "纂段右擊標",
+	"tog-editondblclick": "雙擊以纂",
+	"tog-editsectiononrightclick": "右擊標以纂段",
 	"tog-watchcreations": "哨己撰",
 	"tog-watchdefault": "哨己纂",
-	"tog-watchmoves": "派哨予吾遷之頁",
-	"tog-watchdeletion": "派哨至吾除之頁",
+	"tog-watchmoves": "派哨於頁吾遷者",
+	"tog-watchdeletion": "派哨於頁吾除者",
 	"tog-minordefault": "慣為校",
 	"tog-previewontop": "頂草覽",
 	"tog-previewonfirst": "覽首修",
@@ -220,12 +220,12 @@
 	"viewcount": "此頁$1閱矣",
 	"protectedpage": "此頁錮矣",
 	"jumpto": "往：",
-	"jumptonavigation": "嚮",
+	"jumptonavigation": "導",
 	"jumptosearch": "尋",
-	"view-pool-error": "歉也，伺服器超負矣。\n多簿查頁。\n欲試候之。\n\n$1",
+	"view-pool-error": "甚歉！伺服器超負矣。\n尋頁之人也眾矣。\n若欲再試請稍候。\n\n$1",
 	"pool-timeout": "待鎖超時",
 	"pool-queuefull": "池隊滿之",
-	"pool-errorunknown": "未明之錯",
+	"pool-errorunknown": "未知之誤",
 	"aboutsite": "è¿°{{SITENAME}}",
 	"aboutpage": "Project:è¿°",
 	"copyright": "文奉$1行。",
@@ -292,14 +292,14 @@
 	"nstab-help": "助",
 	"nstab-category": "類",
 	"nosuchaction": "無可為",
-	"nosuchactiontext": "無此址",
+	"nosuchactiontext": "此址也無",
 	"nosuchspecialpage": "無此特查",
 	"nospecialpagetext": "<strong>無此特查。</strong>\n\n見[[Special:SpecialPages|{{int:specialpages}}]]。",
 	"error": "有誤",
-	"databaseerror": "庫藏誤然",
+	"databaseerror": "庫藏也誤",
 	"databaseerror-query": "尋：$1",
 	"databaseerror-error": "錯：$1",
-	"laggedslavemode": "警示，此頁不新",
+	"laggedslavemode": "警告：此頁不新。",
 	"readonly": "鎖庫藏",
 	"enterlockreason": "何以鎖之？何日啟之？",
 	"readonlytext": "鎖者曰：「$1」，庫藏鎖矣，撰纂謝焉。",
@@ -315,9 +315,9 @@
 	"filenotfound": "\"$1\"未見。",
 	"unexpected": "異數，\"$1\"=\"$2\"。",
 	"formerror": "有誤：表不可呈",
-	"badarticleerror": "此頁莫為之",
+	"badarticleerror": "此頁不可為之",
 	"cannotdelete": "頁或檔\"$1\"刪矣，不復為之。",
-	"cannotdelete-title": "刪「$1」不能也。",
+	"cannotdelete-title": "刪「$1」也不能。",
 	"delete-hook-aborted": "鈎纂消矣。\n無解也。",
 	"badtitle": "無此題",
 	"badtitletext": "或別、或缺、或違、或他山謬鏈，此題不存也。",
@@ -327,14 +327,14 @@
 	"viewsource-title": "查$1之案",
 	"actionthrottled": "無為",
 	"actionthrottledtext": "基反垃圾之量，於短時中限欲，爾之上限已過。數分後再試之。",
-	"protectedpagetext": "該頁被錮無纂也。",
+	"protectedpagetext": "此頁見錮以避纂也。",
 	"viewsourcetext": "爾可視及複之本頁之原始碼。",
 	"protectedinterface": "此頁司版，錮之以遠濫。",
 	"editinginterface": "'''警示：'''此頁司版，一髮牽身，惠慎之。如譯之，可慮[//translatewiki.net/wiki/Main_Page?setlang=zh-hant translatewiki.net]也，為MediaWiki軟件本地化之計劃也。",
 	"cascadeprotected": "此頁\"迭緘\"矣。$1頁牽連如下：\n$2",
 	"namespaceprotected": "子權未逮，莫能纂'''$1'''。",
-	"ns-specialprotected": "奇頁禁纂也。",
-	"titleprotected": "緘焉自[[User:$1|$1]]防建也。因''$2''也。",
+	"ns-specialprotected": "奇頁禁纂。",
+	"titleprotected": "緘焉自[[User:$1|$1]]防建。以''$2''之故也。",
 	"invalidtitle-knownnamespace": "無效卷題，含名域\"$2\"與文本\"$3\"",
 	"exception-nologin": "尚未登簿",
 	"virus-badscanner": "壞設：不明之病掃：''$1''",
@@ -342,24 +342,24 @@
 	"virus-unknownscanner": "不明之反毒：",
 	"logouttext": "'''子去簿矣'''\n\n子可匿名還覽{{SITENAME}}，或<span class='plainlinks'>[$1 復登]</span>同簿、異簿。\n未清謄本，覽器文舊，且慎之。",
 	"welcomeuser": "$1居，惠迎！",
-	"welcomecreation-msg": "子簿建矣。\n\n請更簿註乎[[Special:Preferences|此]]。",
+	"welcomecreation-msg": "汝簿建矣。\n\n請更汝「{{SITENAME}}」[[Special:Preferences|焉]]。",
 	"yourname": "名",
 	"userlogin-yourname": "簿名",
-	"userlogin-yourname-ph": "輸簿名",
-	"createacct-another-username-ph": "輸簿名",
+	"userlogin-yourname-ph": "告簿名",
+	"createacct-another-username-ph": "告簿名",
 	"yourpassword": "符節",
 	"userlogin-yourpassword": "符節",
-	"userlogin-yourpassword-ph": "輸子符節",
-	"createacct-yourpassword-ph": "輸一符節",
+	"userlogin-yourpassword-ph": "告汝符節",
+	"createacct-yourpassword-ph": "告一符節",
 	"yourpasswordagain": "復核節",
 	"createacct-yourpasswordagain": "訂子符節",
-	"createacct-yourpasswordagain-ph": "復輸符節",
+	"createacct-yourpasswordagain-ph": "復告符節",
 	"remembermypassword": "吾之簿通越（達至$1日）",
-	"userlogin-remembermypassword": "記吾",
+	"userlogin-remembermypassword": "保我簿登",
 	"userlogin-signwithsecure": "以安全伺服登簿",
-	"yourdomainname": "子之網域",
+	"yourdomainname": "汝之網域",
 	"password-change-forbidden": "符節不能改乎此維基也。",
-	"externaldberror": "認庫之錯或禁更爾之外簿。",
+	"externaldberror": "認庫之錯，或禁更汝之外簿。",
 	"login": "登簿",
 	"nav-login-createaccount": "登簿、增簿",
 	"userlogin": "登簿、增簿",
@@ -367,74 +367,74 @@
 	"logout": "去簿",
 	"userlogout": "去簿",
 	"notloggedin": "尚未登簿",
-	"userlogin-noaccount": "無簿乎？",
+	"userlogin-noaccount": "尚無簿乎？",
 	"userlogin-joinproject": "入{{SITENAME}}",
-	"nologin": "無簿乎？往$1。",
+	"nologin": "尚無簿乎？惠往$1。",
 	"nologinlink": "增簿",
 	"createaccount": "增簿",
-	"gotaccount": "有簿矣哉？往$1。",
+	"gotaccount": "已有簿矣？惠往$1。",
 	"gotaccountlink": "登簿",
-	"userlogin-resetlink": "君忘登簿所需爾？",
+	"userlogin-resetlink": "汝忘登簿所需？",
 	"userlogin-resetpassword-link": "輸子符節",
-	"userlogin-helplink2": "助登簿",
+	"userlogin-helplink2": "助以登簿",
 	"createacct-emailrequired": "電郵",
-	"createacct-emailoptional": "電郵 （可選）",
+	"createacct-emailoptional": "電郵（可選）",
 	"createaccountmail": "同郵",
-	"createacct-realname": "實名（選）",
+	"createacct-realname": "實名（可選）",
 	"createaccountreason": "因：",
 	"createacct-reason": "因：",
-	"createacct-reason-ph": "何為子另立一簿乎？",
+	"createacct-reason-ph": "汝另立一簿者何哉？",
 	"createacct-captcha": "安檢",
-	"createacct-imgcaptcha-ph": "輸上之文字",
+	"createacct-imgcaptcha-ph": "輸上方文字",
 	"createacct-submit": "增簿",
-	"createacct-another-submit": "再立一簿",
+	"createacct-another-submit": "復立一簿",
 	"createacct-benefit-heading": "吾等立{{SITENAME}}者，或黔首，或專戶。",
 	"createacct-benefit-body1": "纂",
 	"createacct-benefit-body2": "頁",
 	"createacct-benefit-body3": "是月纂者",
 	"badretype": "符節不合也。",
-	"userexists": "簿名存矣，惠更之。",
-	"loginerror": "登簿誤然",
+	"userexists": "簿名見用矣，惠更之。",
+	"loginerror": "登簿生誤",
 	"createacct-error": "建簿未成",
 	"createaccounterror": "無增簿：$1",
-	"nocookiesnew": "{{SITENAME}}簿增而未登，惠准cookies後再登之。",
-	"nocookieslogin": "登簿{{SITENAME}}須cookies，惠准之後登。",
-	"nocookiesfornew": "簿未建，眾乃未定源之。\n爾乃開之，重載再乃一試。",
+	"nocookiesnew": "{{SITENAME}}簿增而未登，惠准存 cookies ，方可登之。",
+	"nocookieslogin": "欲登簿{{SITENAME}}，需允 cookies 之存，惠准後方可登。",
+	"nocookiesfornew": "簿未建，眾乃未定源之。\n汝其啟之，重載，繼而予一試。",
 	"noname": "缺簿名，或不格也。",
 	"loginsuccesstitle": "登簿成矣",
 	"loginsuccess": "'''$1'''登{{SITENAME}}矣",
 	"nosuchuser": "查無此人。惠請更名，查大小寫或立此簿。",
 	"nosuchusershort": "查無\"$1\"，惠核之。",
-	"nouserspecified": "簿名須也",
-	"login-userblocked": "此簿已被封。登無簿也。",
+	"nouserspecified": "簿名必須",
+	"login-userblocked": "此簿見錮矣。是之登未見許可。",
 	"wrongpassword": "符節不合，惠核之。",
 	"wrongpasswordempty": "缺符節，惠補之。",
 	"passwordtooshort": "符節莫逾$1字。",
-	"password-name-match": "符節與簿名異也。",
-	"password-login-forbidden": "此簿與符節之用乃禁之。",
+	"password-name-match": "符節與簿名相異也。",
+	"password-login-forbidden": "此簿共符節之用見禁矣。",
 	"mailmypassword": "遣吾符節",
 	"passwordremindertitle": "新臨符節自{{SITENAME}}",
-	"passwordremindertext": "$1求遣{{SITENAME}}（$4）：\"$2\"之臨符節為\"$3\"。日到有$5。\n\n子若罔須或省更之，如舊即可。",
+	"passwordremindertext": "$1求遣{{SITENAME}}（$4）：\"$2\"之臨符節為\"$3\"。日到有$5。\n\n子若罔須或省更之，如舊則可。",
 	"noemail": "\"$1\"無存郵也。",
-	"noemailcreate": "爾需乙郵也",
+	"noemailcreate": "汝需乙郵",
 	"passwordsent": "新節已遣$1\"，惠鑒復登之。",
-	"blocked-mailpassword": "爾之IP已錮，密復無用之，以之濫也。",
+	"blocked-mailpassword": "汝 IP 已錮，密復無用之，以之濫也。",
 	"eauthentsent": "核文遣矣。惠循核之，簿方活也。",
-	"throttled-mailpassword": "密記已寄之於$1時前。\n防濫，單一密記短至$1時寄之。",
-	"mailerror": "信失遣如下：$1",
+	"throttled-mailpassword": "符節見寄於$1時前矣。\n防濫用故，單一密記短至$1時寄之。",
+	"mailerror": "信失遣。斯文如下：$1",
 	"acct_creation_throttle_hit": "一日之內，於一址但許一人增簿。",
 	"emailauthenticated": "$2 $3郵驛證矣",
 	"emailnotauthenticated": "郵驛未證，下不遺書。",
 	"noemailprefs": "郵驛設而用之。",
 	"emailconfirmlink": "惠考郵驛",
 	"invalidemailaddress": "驛址不格，惠正略之。",
-	"cannotchangeemail": "電郵地址不可改于此wiki",
+	"cannotchangeemail": "郵址不可更於此wiki",
 	"emaildisabled": "是站不可遣函也。",
 	"accountcreated": "簿增矣",
 	"accountcreatedtext": "[[{{ns:User}}:$1|$1]] ([[{{ns:User talk}}:$1|書]])簿增矣。",
 	"createaccount-title": "於{{SITENAME}}增簿",
-	"createaccount-text": "有人於{{SITENAME}}用爾之電郵增名為 \"$2\" 之簿 （$4），符節為 \"$3\" 。汝應登，再改符節也。\n\n如簿誤增，爾可略之。",
-	"login-throttled": "爾嘗登簿甚矣。\n請候 $1 再試之。",
+	"createaccount-text": "有人以汝電郵於{{SITENAME}}增簿。簿名為 \"$2\" （$4）。符節為 \"$3\" 。汝應登而更符節。\n\n如簿誤增，汝可略之。",
+	"login-throttled": "汝嘗登簿甚矣。\n請候 $1 而試之。",
 	"login-abort-generic": "登簿未成——棄",
 	"loginlanguagelabel": "語：$1",
 	"suspicious-userlogout": "爾欲無離也，可由壞瀏覽器或快枝代理呈送之。",
@@ -453,14 +453,14 @@
 	"newpassword": "新符節：",
 	"retypenew": "重察新符節：",
 	"resetpass_submit": "設符再登",
-	"changepassword-success": "爾之符節已改！",
+	"changepassword-success": "汝之符節已改！",
 	"changepassword-throttled": "爾嘗登簿甚矣。\n請候 $1 再試之。",
-	"resetpass_forbidden": "無改符節",
-	"resetpass-no-info": "爾須登簿後方進此頁。",
+	"resetpass_forbidden": "符節之更也不可。",
+	"resetpass-no-info": "欲入此頁，爾須登簿。",
 	"resetpass-submit-loggedin": "改符節",
 	"resetpass-submit-cancel": "消",
 	"resetpass-wrong-oldpass": "無效之臨符或現符。\n爾或改符，或求新臨符。",
-	"resetpass-temp-password": "臨符節:",
+	"resetpass-temp-password": "臨時符節:",
 	"resetpass-abort-generic": "符節不可更",
 	"passwordreset": "重設符節",
 	"passwordreset-text-one": "慾更符節，填此佇列",
@@ -469,10 +469,10 @@
 	"passwordreset-email": "電郵址",
 	"changeemail": "更郵址",
 	"changeemail-oldemail": "當前郵驛：",
-	"changeemail-newemail": "新郵驛：",
+	"changeemail-newemail": "添新郵驛：",
 	"changeemail-none": "（無）",
 	"changeemail-password": "汝 {{SITENAME}} 之符節",
-	"changeemail-throttled": "爾嘗登簿甚矣。\n請候 $1 再試之。",
+	"changeemail-throttled": "汝嘗登簿甚矣。\n請候 $1 而試之。",
 	"bold_sample": "粗體",
 	"bold_tip": "粗體",
 	"italic_sample": "斜體",
@@ -480,7 +480,7 @@
 	"link_sample": "鏈",
 	"link_tip": "鏈內",
 	"extlink_sample": "http://www.example.com 鍵 題",
-	"extlink_tip": "冠http://以鏈外",
+	"extlink_tip": "冠 http:// 以外鏈",
 	"headline_sample": "題",
 	"headline_tip": "二題",
 	"nowiki_sample": "此不排版",
@@ -495,7 +495,7 @@
 	"watchthis": "派哨",
 	"savearticle": "存儲",
 	"preview": "草覽",
-	"showpreview": "草覽",
+	"showpreview": "示覽",
 	"showdiff": "示異",
 	"anoneditwarning": "'''警示：'''子未登簿，IP將誌。",
 	"anonpreviewwarning": "''子未登簿，IP將誌。''",
@@ -504,7 +504,7 @@
 	"missingcommentheader": "'''醒示：'''子未概標之，復「{{int:savearticle}}」則文倍焉。",
 	"summary-preview": "覽概：",
 	"subject-preview": "覽題：",
-	"blockedtitle": "子見禁",
+	"blockedtitle": "汝見禁矣",
 	"blockedtext": "'''子名、IP見禁。'''禁者$1也，因''$2''故。\n\n* 始之時為：$8\n* 終之時為：$6\n* 見禁之人：$7\n\n存惑可詢$1，或[[{{MediaWiki:Grouppage-sysop}}|有秩]]，[[Special:Preferences|簿註]]無驛則信不遣。另，子IP為$3，其禁號為#$5。詢時切附之。",
 	"autoblockedtext": "爾之IP或簿自禁，因簿先用，禁者$1也。因故：:\\'\\'$2\\'\\'\n\n* 始之時為：$8\n* 終之時為：$6\n* 見禁之人：$7\n\n存惑可詢$1，或[[{{MediaWiki:Grouppage-sysop}}|有秩]]，[[Special:Preferences|簿註]]無驛則信不遣。另，子用IP $3，禁號為#$5。詢時切附之。",
 	"blockednoreason": "無由",
@@ -1388,7 +1388,6 @@
 	"mailnologin": "無驛",
 	"mailnologintext": "[[Special:UserLogin|登簿]]置郵，方可捎書。",
 	"emailuser": "捎君",
-	"emailpage": "捎書",
 	"emailpagetext": "表下捎焉，以郵制君。\n署[[Special:Preferences|子簿郵]]以候往返。",
 	"defemailsubject": "{{SITENAME}}來書",
 	"usermaildisabled": "無他人之郵",
diff --git a/languages/i18n/mk.json b/languages/i18n/mk.json
index 5033aced15..6f9da7d287 100644
--- a/languages/i18n/mk.json
+++ b/languages/i18n/mk.json
@@ -932,7 +932,8 @@
 	"rows": "Редови:",
 	"columns": "Колони:",
 	"searchresultshead": "Пребарување",
-	"stub-threshold": "Праг за <a href=\"#\" class=\"stub\">никулци</a> (бајти):",
+	"stub-threshold": "Праг за форматирање на врска за никулци ($1):",
+	"stub-threshold-sample-link": "примерок",
 	"stub-threshold-disabled": "Оневозможено",
 	"recentchangesdays": "Денови за приказ во скорешните промени:",
 	"recentchangesdays-max": "(највеќе {{PLURAL:$1|еден ден|$1 дена}})",
@@ -1654,7 +1655,7 @@
 	"booksources-text": "Ова е список на врски кон други мрежни места кои продаваат нови и користени книги, и тие може\nда имаат повеќе информации за книгите што ги баравте:",
 	"booksources-invalid-isbn": "Наведениот ISBN се чини неправилен. Проверете да не настанала некоја грешка при копирањето од изворот.",
 	"specialloguserlabel": "Изведувач:",
-	"speciallogtitlelabel": "Цел (наслов или корисник):",
+	"speciallogtitlelabel": "Цел (наслов или {{ns:user}}:корисничко име на корисникот):",
 	"log": "Дневници",
 	"all-logs-page": "Сите јавни дневници",
 	"alllogstext": "Комбиниран приказ на сите расположиви дневници на {{SITENAME}}.\nМожете да го ограничите прикажаното избирајќи тип на дневник, корисничко име (разликува големи и мали букви), или страница (разликува големи и мали букви).",
diff --git a/languages/i18n/ml.json b/languages/i18n/ml.json
index 32dd1765c8..68a40843fe 100644
--- a/languages/i18n/ml.json
+++ b/languages/i18n/ml.json
@@ -937,7 +937,8 @@
 	"rows": "വരി:",
 	"columns": "നിര:",
 	"searchresultshead": "തിരയൂ",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">അപൂർണ്ണമായ കണ്ണിയെന്നു</a> സ്ഥാപിക്കാനുള്ള ത്വരകം (ബൈറ്റുകൾ):",
+	"stub-threshold": "അപൂർണ്ണമായ കണ്ണിയെന്നു സ്ഥാപിക്കാനുള്ള ത്വരകം ($1):",
+	"stub-threshold-sample-link": "സാമ്പിൾ",
 	"stub-threshold-disabled": "നിർജ്ജീവമാക്കപ്പെട്ടിരിക്കുന്നു",
 	"recentchangesdays": "പുതിയ മാറ്റങ്ങളിൽ കാണിക്കേണ്ട ദിവസങ്ങളുടെ എണ്ണം:",
 	"recentchangesdays-max": "പരമാവധി {{PLURAL:$1|ഒരു ദിവസം|$1 ദിവസങ്ങൾ}}",
@@ -1652,7 +1653,7 @@
 	"booksources-text": "പുതിയതും ഉപയോഗിച്ചതുമായ പുസ്തകങ്ങൾ വിൽക്കുന്ന സൈറ്റുകളിലേക്കുള്ള ലിങ്കുകളുടെ പട്ടിക ആണ്‌ താഴെ. താങ്കൾ തിരയുന്ന പുസ്തകത്തെ പറ്റിയുള്ള കൂടുതൽ വിവരങ്ങൾ ഈ പട്ടികയിൽ നിന്നു ലഭിച്ചേക്കാം:",
 	"booksources-invalid-isbn": "തന്നിരിക്കുന്ന ഐ.എസ്.ബി.എൻ. സാധുവാണെന്നു തോന്നുന്നില്ല; യഥാർത്ഥ സ്രോതസ്സിൽ നിന്നും പകർത്തിയപ്പോൾ തെറ്റുപറ്റിയോ എന്നു പരിശോധിക്കുക",
 	"specialloguserlabel": "നടപ്പിലാക്കിയയാൾ:",
-	"speciallogtitlelabel": "ലക്ഷ്യം (തലക്കെട്ട് അല്ലെങ്കിൽ ഉപയോക്താവ്) :",
+	"speciallogtitlelabel": "ലക്ഷ്യം (തലക്കെട്ട് അല്ലെങ്കിൽ ഉപയോക്താവിനെ തിരയാനുള്ള {{ns:user}}:ഉപയോക്തൃനാമം) :",
 	"log": "പ്രവർത്തനരേഖകൾ",
 	"all-logs-page": "എല്ലാ പൊതുരേഖകളും",
 	"alllogstext": "{{SITENAME}} സംരംഭത്തിൽ ലഭ്യമായ വിവിധ പ്രവർത്തന രേഖകൾ ഈ താളിൽ ഒരുമിച്ച് കാണാം. താങ്കൾക്ക് രേഖകളുടെ സ്വഭാവം, ഉപയോക്തൃനാമം (കേസ് സെൻസിറ്റീവ്), ബന്ധപ്പെട്ട താൾ (കേസ് സെൻസിറ്റീവ്) മുതലായവ തിരഞ്ഞെടുത്ത് അന്വേഷണം കൂടുതൽ ക്ഌപ്തപ്പെടുത്താവുന്നതാണ്.",
@@ -2323,7 +2324,7 @@
 	"tooltip-ca-nstab-main": "വിവരദായക താൾ കാണുക",
 	"tooltip-ca-nstab-user": "ഉപയോക്താവിന്റെ താൾ കാണുക",
 	"tooltip-ca-nstab-media": "മീഡിയ താൾ കാണുക",
-	"tooltip-ca-nstab-special": "ഇതൊരു '''പ്രത്യേക''' താളാണ്‌. ഇത് തിരുത്തുക സാധ്യമല്ല.",
+	"tooltip-ca-nstab-special": "ഇതൊരു പ്രത്യേക താളാണ്‌. ഇത് തിരുത്തുക സാധ്യമല്ല.",
 	"tooltip-ca-nstab-project": "പദ്ധതി താൾ കാണുക",
 	"tooltip-ca-nstab-image": "പ്രമാണ താൾ കാണുക",
 	"tooltip-ca-nstab-mediawiki": "വ്യവസ്ഥാസന്ദേശം കാണുക",
diff --git a/languages/i18n/mr.json b/languages/i18n/mr.json
index 3dc90893b4..88e10c144d 100644
--- a/languages/i18n/mr.json
+++ b/languages/i18n/mr.json
@@ -259,6 +259,7 @@
 	"pool-timeout": "ताळ्यासाठी वाट पाहण्याची वेळ संपली",
 	"pool-queuefull": "सर्व्हरवर ताण आहे.",
 	"pool-errorunknown": "अपरिचित त्रुटी",
+	"poolcounter-usage-error": "वापर करतांना त्रूटी $1",
 	"aboutsite": "{{SITENAME}}बद्दल",
 	"aboutpage": "Project:माहितीपृष्ठ",
 	"copyright": "येथील मजकूर $1च्या अंतर्गत उपलब्ध आहे जोपर्यंत इतर नोंदी केलेल्या नाहीत.",
@@ -300,6 +301,7 @@
 	"hidetoc": "लपवा",
 	"collapsible-collapse": "निपात करा",
 	"collapsible-expand": "विस्तार",
+	"confirmable-confirm": " {{GENDER:$1|तिम्हाला}} खात्रिआहे का ?",
 	"confirmable-yes": "होय",
 	"confirmable-no": "नाही",
 	"thisisdeleted": "$1चे अवलोकन किंवा पुनर्स्थापन करायचे ?",
@@ -352,6 +354,8 @@
 	"filerenameerror": "\"$1\" संचिकेचे \"$2\" असे नामांतर करता आले नाही.",
 	"filedeleteerror": "\"$1\" संचिका वगळता आली नाही.",
 	"directorycreateerror": "\"$1\" कार्यधारीका (डिरेक्टरी) तयार केली जाऊ शकली नाही.",
+	"directoryreadonlyerror": " \"$1\" हा कोश फक्त वाचण्या साठि आहे.",
+	"directorynotreadableerror": " \"$1\" ह्या कोशाला वाचता आणी लिहिता येते.",
 	"filenotfound": "\"$1\" ही संचिका सापडत नाही.",
 	"unexpected": "अनपेक्षित मूल्य: \"$1\"=\"$2\"",
 	"formerror": "त्रुटी: आवेदन सादर करता आले नाही.",
@@ -362,6 +366,10 @@
 	"no-null-revision": "\"$1\" या पानाची नविन रिक्त आवृत्ती निर्मिता आली नाही.",
 	"badtitle": "खराब शीर्षक",
 	"badtitletext": "आपण विनंती केलेले पानाचे शीर्षक अयोग्य, रिकामे अथवा चुकिने जोडलेले आंतर-भाषिय किंवा आंतर-विकि शीर्षक आहे. त्यात,शीर्षकास अयोग्य अशी एक किंवा अधिक चिन्हे आहेत.",
+	"title-invalid-empty": "आपण विनंति केलेले पान हे रिकामे आहे किंवा त्यास केवळ नामविश्वाचे नाव दिलेले आहे.",
+	"title-invalid-utf8": "आपण विनंति केलेले पानाच्या नवात अवैध यु टि ऐफ अक्षरे आहेत",
+	"title-invalid-interwiki": "आपण विनंति केलेले पाना मध्ये आन्तर विकि दुवे आहेत जे षिर्शकात वपरण्यास मनाइ आहे",
+	"title-invalid-talk-namespace": "आपण विनंति केलेले पान उपलब्ध नसलेल्या चर्च्या पानास संबोधित करते",
 	"perfcached": "खालील माहिती सयीमधील (कॅशे) असल्यामुळे ती अद्ययावत् नाही.जास्तीतजास्त {{PLURAL:$1|एक प्रतिफळ |$1 प्रतिफळे }} सयीमध्ये असतात.",
 	"perfcachedts": "खालील माहिती सयीमधील (कॅशे) आहे व ती  $1 पर्यंत अद्ययावत् आहे. जास्तीतजास्त {{PLURAL:$4|एक प्रतिफळ |$4 प्रतिफळे}} सयीमध्ये असतात.",
 	"querypage-no-updates": "सध्या या पानाकरिता नवी अद्यतने अनुपलब्ध केली आहेत.आत्ताच येथील विदा तरोताजा होणार नाही.",
diff --git a/languages/i18n/mzn.json b/languages/i18n/mzn.json
index e20b385725..432b41634c 100644
--- a/languages/i18n/mzn.json
+++ b/languages/i18n/mzn.json
@@ -609,7 +609,6 @@
 	"listgrouprights-members": "(کارورون لیست)",
 	"mailnologintext": "برای برسنی‌ین پوست الکترونیکی به کارورون دیگه ونه [[Special:UserLogin|بورین سامانه دله]] و نشونی پوست الکترونیکی معتبری تو [[Special:Preferences|ترجیحات]] خادت ره داشته بایی.",
 	"emailuser": "این کارور وسّه ایمیل بَرسِن",
-	"emailpage": "ئـی-مه‌یـل ای کـارور وه‌سه",
 	"watchlist": "مه دمبال‌هاکرده‌‌ئون ِلیست",
 	"mywatchlist": "دمبال‌هاکرده‌ئون فهرست",
 	"watchnologin": "سیستم ره دله نی ئه موئین",
@@ -728,7 +727,7 @@
 	"tooltip-n-portal": "اینجه بتونّی بقیه جه کومک بَیرین یا سؤال هاکنین",
 	"tooltip-n-currentevents": "تازه اخبار ره بخوندِستن",
 	"tooltip-n-recentchanges": "تازه دچی‌یه‌ئون ره لیست",
-	"tooltip-n-randompage": "اتت شانسی صفحه بَدی‌ین",
+	"tooltip-n-randompage": "اتا شانسی صفحه بَدی‌ین",
 	"tooltip-n-help": "أتـا جـا کـه...",
 	"tooltip-t-whatlinkshere": "هأمو ولـگ‌ئونی که ایجه ره لینک هه‌دانه",
 	"tooltip-t-recentchangeslinked": "اِسایی دِگاردسته‌ئون ِصفحه‌ئون که این صفحه جه لینک دارنه",
@@ -743,7 +742,7 @@
 	"tooltip-ca-nstab-main": "بدی‌ین ِصفحه",
 	"tooltip-ca-nstab-user": "کاروری صفحه ره بَدی‌ین",
 	"tooltip-ca-nstab-media": "مدیا صفحه هارشی‌ین",
-	"tooltip-ca-nstab-special": "اینتا اتا شا صفحه هسته که شِما نتوندی وه ره دچینی",
+	"tooltip-ca-nstab-special": "اینتا اتا شا صفحه هسته که شِما نتوندی وه ره دچینین",
 	"tooltip-ca-nstab-project": "پروژه‌ی ِصفحه ره بدی‌ین",
 	"tooltip-ca-nstab-image": "عکس ِصفحه ره بدی‌ین",
 	"tooltip-ca-nstab-template": "شـابـلـون بـأویـنـه‌ن",
@@ -755,7 +754,7 @@
 	"tooltip-undo": "«واچی‌ین» این دچی‌یه ره خنثی کانده و دچی‌ین ِجعبه ره پیش-پیش سِراق هِدائِن ِحالت دله وا کانده تا شه دچی‌یه‌ئون ِدلیل ره اضافه هاکنین.",
 	"tooltip-summary": "خلاصه بنویسین",
 	"siteusers": "$1، {{PLURAL:$2|کارور|کارورون}} {{SITENAME}}",
-	"simpleantispam-label": "!آنتی‌اسپم ِچک‌هاکردن.\nاین قسمت ره پـِر <strong>نکان!</strong>",
+	"simpleantispam-label": "آنتی‌اسپم ره چک‌هاکردن.\nاین قسمت ره پـِر <strong>نکان!</strong>",
 	"pageinfo-toolboxlink": "صفحه‌ی ِاطلاعات",
 	"previousdiff": "کوهنه‌تر دچی‌ین ←",
 	"nextdiff": "ته‌رنه دأچیه‌ن ←",
diff --git a/languages/i18n/nap.json b/languages/i18n/nap.json
index 2dada9d28d..ac4106fbfb 100644
--- a/languages/i18n/nap.json
+++ b/languages/i18n/nap.json
@@ -164,7 +164,7 @@
 	"navigation-heading": "Menu 'e navigazzione",
 	"errorpagetitle": "Sbaglio",
 	"returnto": "Torna a $1.",
-	"tagline": "Dda {{SITENAME}}.",
+	"tagline": "'A {{SITENAME}}.",
 	"help": "Ajùto",
 	"search": "Truova",
 	"searchbutton": "Truova",
@@ -205,7 +205,7 @@
 	"toolbox": "Strumiente",
 	"userpage": "Vere a paggena utente",
 	"projectpage": "Vere a paggena 'e servizio",
-	"imagepage": "Vere a paggena ddo file",
+	"imagepage": "Vere a paggena d' 'o file",
 	"mediawikipage": "Vere 'a mmasciata",
 	"templatepage": "Vere 'o template",
 	"viewhelppage": "Vere 'a paggena 'e ajùto",
@@ -467,7 +467,7 @@
 	"emailnotauthenticated": "'O ndirizzo 'e posta elettronica nun è stat'ancora cunfermato.\nNun se mannarranno mmasciate e-mail p' ' funzione ccà abbascio.",
 	"noemailprefs": "Avite 'a specificà nu ndirizzo e-mail pe ll'attivà sti funzione.",
 	"emailconfirmlink": "Cunferma 'o nderizzo mail d' 'o tujo.",
-	"invalidemailaddress": "'O nderizzo e-mail scritto nun se può accettà pecché nun tene nu furmatto buono.\nScrivite n'ata vota nu nderizzo bbuono o abbacantate 'a casciulella.",
+	"invalidemailaddress": "'O nderizzo e-mail scritto nun se può accettà pecché nun tene nu furmato buono.\nScrivite n'ata vota nu nderizzo bbuono o abbacantate 'a casciulella.",
 	"cannotchangeemail": "'E ccunte mail nun se ponno cagnà dint'a sta wiki.",
 	"emaildisabled": "Chistu sito nun può mannà mmasciate e-mail.",
 	"accountcreated": "Cunto criato",
@@ -546,9 +546,9 @@
 	"bold_tip": "Grassetto",
 	"italic_sample": "Corsivo",
 	"italic_tip": "Corsivo",
-	"link_sample": "Titulo ddo cullegamente",
+	"link_sample": "Titulo d' 'o cullegamento",
 	"link_tip": "Jonte nterne",
-	"extlink_sample": "http://www.example.com titulo ddo cullegamente",
+	"extlink_sample": "http://www.example.com titulo d' 'o cullegamento",
 	"extlink_tip": "Link esterno (arricuordate 'o prefisso http:// )",
 	"headline_sample": "Testate",
 	"headline_tip": "Testate 'e 2° livello",
@@ -559,7 +559,7 @@
 	"media_tip": "Cullegamente a file multimediale",
 	"sig_tip": "Firma cu data e ora",
 	"hr_tip": "Linea orizzontale (ausà cu gedizzio)",
-	"summary": "Énnece",
+	"summary": "Innece",
 	"subject": "Argomiento/titolo:",
 	"minoredit": "Chisto è nu cagnamiénto piccerillo",
 	"watchthis": "Tiene d'uocchio chesta paggena",
@@ -665,8 +665,8 @@
 	"invalid-content-data": "Date cuntenute nun buone",
 	"content-not-allowed-here": "'O cuntenuto \"$1\" nun è permesso dint'a paggena [[$2]]",
 	"editwarning-warning": "Ascenno 'e sta paggena putisse ffà sperdere 'e cagnamiente fatte.\nSi sì trasuto, allora può stutà st'avviso dint'a sezziona \"{{int:prefs-editing}}\" d' 'e preferenze.",
-	"editpage-notsupportedcontentformat-title": "Furmatto d' 'o cuntenuto nun suppurtato",
-	"editpage-notsupportedcontentformat-text": "'O furmatto d' 'o cuntenuto $1 nun è suppurtato d' 'o mudello 'e cuntenuto $2.",
+	"editpage-notsupportedcontentformat-title": "Furmato d' 'o cuntenuto nun suppurtato",
+	"editpage-notsupportedcontentformat-text": "'O furmato d' 'o cuntenuto $1 nun è suppurtato d' 'o mudello 'e cuntenuto $2.",
 	"content-model-wikitext": "wikitesto",
 	"content-model-text": "testo nurmale",
 	"content-model-javascript": "JavaScript",
@@ -918,7 +918,8 @@
 	"rows": "Righe:",
 	"columns": "Culonne:",
 	"searchresultshead": "Truova",
-	"stub-threshold": "Valore minimo p' 'e <a href=\"#\" class=\"stub\">cullegamiente a 'e stub</a>, 'n byte:",
+	"stub-threshold": "Valore lemmeto p' 'o furmato d' 'o cullegamento stub ($1):",
+	"stub-threshold-sample-link": "mostra",
 	"stub-threshold-disabled": "Stutato",
 	"recentchangesdays": "Nummero 'e juorne a mmustà dint'a l'urdeme cagnamiente:",
 	"recentchangesdays-max": "Massimo $1 {{PLURAL:$1|juorno|juorne}}",
@@ -1213,7 +1214,7 @@
 	"recentchangeslinked-toolbox": "Cagnamiénte cullegate",
 	"recentchangeslinked-title": "Cagnamiénte cullegate a \"$1\"",
 	"recentchangeslinked-summary": "Chest'è n'alenco d' 'e cagnamiente fatte mò a 'e paggene cullegate 'a chilla specificata (o pe' cuntenute dint'a na categurìa specificata). 'E paggene cuntenute dint' 'o proprio elenco 'e l'[[Special:Watchlist|Paggene cuntrullate]] songo mmustate 'n '''grassetto'''.",
-	"recentchangeslinked-page": "Nomme dda paggena",
+	"recentchangeslinked-page": "Nomme d' 'a paggena",
 	"recentchangeslinked-to": "Mmusta sulamente 'e cagnamiente a 'e paggene cullegate a chilla specificata",
 	"upload": "Carreca file",
 	"uploadbtn": "Carreca file",
@@ -1633,7 +1634,7 @@
 	"booksources-text": "Ccà abbascio ce sta na lista 'e cullegamiente a l'ati site ca venneno libbre nuove e viecchie, ca putessero pure avé cchiù nfurmaziune ncopp' 'e libbre ca jate ascianno:",
 	"booksources-invalid-isbn": "L'ISBN c'avete miso nun pare bbuono; cuntrolla si ce sta cocch'errore quanno stavate cupianno stu nummero d' 'a fonte origginale.",
 	"specialloguserlabel": "Mplementatore:",
-	"speciallogtitlelabel": "Destinazione (titolo o utente):",
+	"speciallogtitlelabel": "Destinazione (titolo o {{ns:user}}:cunto utente pe' ll'utente):",
 	"log": "Logs",
 	"all-logs-page": "Tutte l'archivie pubbleche",
 	"alllogstext": "Visualizzazione mmescata 'e tutte 'e riggistre a disposizione ncopp'a {{SITENAME}}.\nPutite restringere 'a vista a sicondo 'o tipo 'e riggistro, 'o nomme utente (sensibbele a 'e maiuscole), o 'e paggene coinvolte (pure chiste songo sensibbele a 'e maiuscole).",
@@ -1981,7 +1982,7 @@
 	"whatlinkshere-hideredirs": "$1 redirects",
 	"whatlinkshere-hidetrans": "$1 'nclusione",
 	"whatlinkshere-hidelinks": "$1 jonte",
-	"whatlinkshere-hideimages": "$1 links ddo file",
+	"whatlinkshere-hideimages": "$1 links d' 'o file",
 	"whatlinkshere-filters": "Filtre",
 	"autoblockid": "Autoblocco #$1",
 	"block": "Blocca l'utente",
@@ -2293,7 +2294,7 @@
 	"tooltip-n-mainpage-description": "Visita a paggena prencepale",
 	"tooltip-n-portal": "Descrizione d' 'o prugietto, che po' ffa, addò truvà 'e ccose",
 	"tooltip-n-currentevents": "Ascìa 'e nfurmaziune ncopp' 'e fatte succiesse mò mò",
-	"tooltip-n-recentchanges": "Ennece dde urdeme cagnamiénte ddo sito",
+	"tooltip-n-recentchanges": "Ennece dde urdeme cagnamiénte d' 'o sito",
 	"tooltip-n-randompage": "Na paggena qualsiase",
 	"tooltip-n-help": "Paggena 'e ajùto",
 	"tooltip-t-whatlinkshere": "'Na lista 'e tutte e paggene ca song cullegate a chista",
@@ -2310,7 +2311,7 @@
 	"tooltip-ca-nstab-main": "Vere a paggena e contenuto",
 	"tooltip-ca-nstab-user": "Vere a paggena utente",
 	"tooltip-ca-nstab-media": "Vide 'a pàggena d' 'e media",
-	"tooltip-ca-nstab-special": "Chista è 'na paggena speciale, nun può essere càgnata",
+	"tooltip-ca-nstab-special": "Chista è 'na paggena speciale e nun può essere càgnata",
 	"tooltip-ca-nstab-project": "Vere a paggena 'e servizio",
 	"tooltip-ca-nstab-image": "Vere a paggena ddo file",
 	"tooltip-ca-nstab-mediawiki": "Vide 'a mmasciata d' 'o sistema",
@@ -3298,7 +3299,7 @@
 	"log-description-pagelang": "Chest'è nu riggistro 'e cagnamiente 'e lengua d' 'e paggene.",
 	"logentry-pagelang-pagelang": "$1 {{GENDER:$2|ave cagnato}} 'a lengua d' 'a paggena $3 'a $4 a $5.",
 	"default-skin-not-found": "Oops! 'A skin predefinta ' 'o wiki vuosto, definita 'n <code dir=\"ltr\">$wgDefaultSkin</code> comme <code>$1</code>, nun se tròva.\n\n'A installazione pare ca tenesse {{PLURAL:$4|'a skin|'e skin}} ccà abbascio. Vedite [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manuale: configurazione skin] pe' n'avè cchiù nfurmaziune ncopp' 'a manera {{PLURAL:$4|'e ll'abbià}} o scegliere chilla predefinita.\n\n$2\n\n; Si avite installato MediaWiki mò mò:\n: Probabbilmente l'avite installato 'a git, o direttamente 'a 'o codece sorgente ausanno cocch'atu metodo. Chesto era permesso. Verite 'e installà cocche skin 'a [https://www.mediawiki.org/wiki/Category:All_skins directory ncoppa mediawiki.org], tramite:\n:* Scarrecanno 'o [https://www.mediawiki.org/wiki/Download programma 'e installazione tarball], ca venesse fornito ch' 'e diverze skin ed estenziune. Putite fare copia-azzecca d' 'a directory <code dir=\"ltr\">skins/</code>.\n:* Scarrecanne 'e tarballs individuale 'e skin 'a [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Ausanno Git pe' scarrecà skin].\n: Facenno accussì nun se mmescasse 'o repository git vuosto si site sviluppatore MediaWiki.\n\n; Si avite MediaWiki agghiurnato MediaWiki mò mò:\n: MediaWiki 1.24 e verziune appriesso nun abbìa automatecamente 'e skin installate (vedite [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manuale: rilevamento automateco skin]). Putite copià {{PLURAL:$5|'a linea|'e linee}} ccà abbascio dint' 'o <code>LocalSettings.php</code> pe' putè appiccià {{PLURAL:$5|'o|tutt' 'e}} {{PLURAL:$5|skin}} installate mò mò:\n\n<pre dir=\"ltr\">$3</pre>\n\n; Si avite cagnato mò mò <code>LocalSettings.php</code>:\n: Cuntrullate 'e nomme d' 'e skin n'ata vota pe' ve sparagnà cocch'errore 'e battitura.",
-	"default-skin-not-found-no-skins": "Oops! 'A skin predefinita p' 'o wiki vuosto, definita 'n <code dir=\"ltr\">$wgDefaultSkin</code> comme <code>$1</code>, nun se tròva.\n\nNun avite installato nisciuno skin.\n\n; Si avite installato MediaWiki mò mò:\n: Probabbilmente l'avite installato 'a git, o direttamente 'a 'o codece sorgente ausanno cocch'atu metodo. Chesto era permesso. Verite 'e installà cocche skin 'a [https://www.mediawiki.org/wiki/Category:All_skins directory ncoppa mediawiki.org], tramite:\n:* Scarrecanne 'e tarballs individuale 'e skin 'a [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Using Git to download skins].\n\n: Facenno accussì nun se mmescasse 'o repository git vuosto si site sviluppatore MediaWiki. Vedite [https://www.mediawiki.org/wiki/Manual:Skin_autodiscovery Manuale: rilevamento automateco skin]) pe n'avè nfurmaziune ncopp' 'a maniera d'appiccià e scegliere chella predefinita.",
+	"default-skin-not-found-no-skins": "oops! 'O skin predefinito p' 'a wiki vuosta, definito int'a <code>$wgDefaultSkin</code> comm'a <code>$1</code>, nun è a disposizione.\n\nVuje nun tenite nisciuno skin installato.\n\n; Si avite installato o agghiurnato MediaWiki mo' mo':\n: È possibbele ca l'avite installato 'a git, o direttamente d' 'o codece sorgente ausanno n'atu metodo. Chesto s'aspettava. Mediawiki 1.24 o cchiù nuova nun include nisciuno skin dint' 'o repositorio prencepale. Tentate 'e installà cocche skin 'a [https://www.mediawiki.org/wiki/Category:All_skins sta cartella 'e mediawiki.org], facenno:\n:* Scarreca 'e [https://www.mediawiki.org/wiki/Download tarball installer], ca venesse cu nu cuofeno 'e skin e estensiune. Vuje putite cupià e azzeccà 'a cartella <code>skins/</code> 'a chiste.\n:* Scarrecanno tarball 'e skin individuale 'a [https://www.mediawiki.org/wiki/Special:SkinDistributor mediawiki.org].\n:* [https://www.mediawiki.org/wiki/Download_from_Git#Using_Git_to_download_MediaWiki_skins Using Git to download skins].\n: Doing this should not interfere with your git repository if you're a MediaWiki developer. See [https://www.mediawiki.org/wiki/Manual:Skin_configuration Manual: Skin configuration] for information how to enable skins and choose the default.",
 	"default-skin-not-found-row-enabled": "* <code>$1</code> / $2 (funzione appicciata)",
 	"default-skin-not-found-row-disabled": "* <code>$1</code> / $2 ('''funzione stutata''')",
 	"mediastatistics": "Statistiche d' 'e media",
diff --git a/languages/i18n/nb.json b/languages/i18n/nb.json
index d4048dc6c8..2f6fedc652 100644
--- a/languages/i18n/nb.json
+++ b/languages/i18n/nb.json
@@ -44,7 +44,8 @@
 			"Chameleon222",
 			"Helland",
 			"Macofe",
-			"Kingu"
+			"Kingu",
+			"Tarjeimo"
 		]
 	},
 	"tog-underline": "Strek under lenker:",
@@ -251,7 +252,7 @@
 	"lastmodifiedat": "Denne siden ble sist endret $1 kl. $2.",
 	"viewcount": "Denne siden er vist {{PLURAL:$1|én gang|$1 ganger}}.",
 	"protectedpage": "LÃ¥st side",
-	"jumpto": "GÃ¥ til:",
+	"jumpto": "Hopp til:",
 	"jumptonavigation": "navigasjon",
 	"jumptosearch": "søk",
 	"view-pool-error": "Beklager, serverne er overbelastet for øyeblikket.\nFor mange brukere forsøker å se denne siden.\nVennligst vent en stund før du prøver å besøke denne siden på nytt.\n\n$1",
@@ -383,12 +384,12 @@
 	"actionthrottled": "Handlingsgrense overskredet",
 	"actionthrottledtext": "For å beskytte mot spam, kan du ikke utføre denne handlingen for mange ganger i løpet av et kort tidssrom, og du har overskredet denne grensen. Prøv igjen om noen minutter.",
 	"protectedpagetext": "Denne siden har blitt låst for endringer.",
-	"viewsourcetext": "Du kan se og kopiere kilden til denne siden:",
-	"viewyourtext": "Du kan se og kopiere kilden til '''dine endringer''' på denne siden:",
+	"viewsourcetext": "Du kan se og kopiere kildekoden til denne siden:",
+	"viewyourtext": "Du kan se og kopiere kilden til <strong>dine endringer</strong> på denne siden.",
 	"protectedinterface": "Denne siden kontrollerer brukergrensesnittekst for programvaren, og er låst for å hindre misbruk.",
 	"editinginterface": "<strong>Advarsel:</strong> Du redigerer en side som brukes til å kontrollere grensesnittekst for programvaren.\nEndringer av denne siden vil påvirke hvordan grensesnittet vil se ut for andre brukere på denne wikien.",
 	"translateinterface": "For å legge til eller endre oversettelser for alle wikier bruk [//translatewiki.net/ translatewiki.net], MediaWikis lokaliseringsprosjekt.",
-	"cascadeprotected": "Denne siden er låst for redigering fordi den inkluderes på følgende sider som har dypbeskyttelse slått på:<!--{{PLURAL:$1}}-->\n$2",
+	"cascadeprotected": "Denne siden er låst for redigering fordi den inkluderes på følgende {{PLURAL:$1|side som har|sider som har}} som har dypbeskyttelse slått på:\n$2",
 	"namespaceprotected": "Du har ikke tillatelse til å redigere sider i navnerommet '''$1'''.",
 	"customcssprotected": "Du har ikke tillatelse til å redigere denne CSS-siden fordi den inneholder en annen brukers personlige innstillinger.",
 	"customjsprotected": "Du har ikke tillatelse til å redigere denne JavaScript-siden fordi den inneholder en annen brukers personlige innstillinger.",
@@ -464,6 +465,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|side|sider}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|aktiv bidragsyter|aktive bidragsytere}}",
 	"badretype": "Passordene samsvarte ikke.",
+	"usernameinprogress": "Opprettelsesprosessen for dette brukernavnet er igang.\nVennligst vent.",
 	"userexists": "Brukernavnet er allerede i bruk.\nVelg et annet brukernavn.",
 	"loginerror": "Innloggingsfeil",
 	"createacct-error": "Feil med kontoppretting",
@@ -654,7 +656,7 @@
 	"creating": "Oppretter $1",
 	"editingsection": "Redigerer $1 (avsnitt)",
 	"editingcomment": "Redigerer $1 (ny seksjon)",
-	"editconflict": "Redigeringkonflikt: $1",
+	"editconflict": "Redigeringskollisjon: $1",
 	"explainconflict": "Noen andre har endret teksten siden du begynte å redigere.\nDen øverste boksen inneholder den nåværende teksten.\nDine endringer vises i den nederste boksen.\nDu er nødt til å flette dine endringer sammen med den nåværende teksten.\n'''Kun''' teksten i den øverste tekstboksen blir lagret når du trykker «{{int:savearticle}}».",
 	"yourtext": "Din tekst",
 	"storedversion": "Den lagrede versjonen",
@@ -668,7 +670,7 @@
 	"readonlywarning": "'''ADVARSEL: Databasen er låst på grunn av vedlikehold,\nså du kan ikke lagre dine endringer akkurat nå. Det kan være en god idé å\nkopiere teksten din til en tekstfil, så du kan lagre den til senere.'''\n\nSystemadministratoren som låste databasen oppga følgende årsak: $1",
 	"protectedpagewarning": "'''Advarsel: Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den.'''\nDet siste loggelementet er oppgitt under som referanse:",
 	"semiprotectedpagewarning": "'''Merk:''' Denne siden har blitt låst slik at kun registrerte brukere kan endre den.\nDet siste loggelementet er oppgitt under som referanse:",
-	"cascadeprotectedwarning": "'''Advarsel:''' Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den, fordi den inkluderes på følgende dypbeskyttede {{PLURAL:$1|sider}}:",
+	"cascadeprotectedwarning": "<strong>Advarsel:</strong> Denne siden har blitt låst slik at kun brukere med administratorrettigheter kan redigere den, fordi den inkluderes på følgende dypbeskyttede {{PLURAL:$1|side|sider}}:",
 	"titleprotectedwarning": "'''Advarsel: Denne siden har blitt låst slik at [[Special:ListGroupRights|bestemte rettigheter]] kreves for å opprette den.'''\nTil orientering vises den siste loggoppføringen under:",
 	"templatesused": "{{PLURAL:$1|Mal|Maler}} som brukes på denne siden:",
 	"templatesusedpreview": "{{PLURAL:$1|Mal|Maler}} brukt i denne forhåndsvisningen:",
@@ -689,7 +691,7 @@
 	"log-fulllog": "Vis hele loggen",
 	"edit-hook-aborted": "Redigering avbrutt av en funksjon, uten forklaring.",
 	"edit-gone-missing": "Kunne ikke oppdatere siden fordi den har blitt slettet.",
-	"edit-conflict": "Redigeringskonflikt.",
+	"edit-conflict": "Redigeringskollisjon.",
 	"edit-no-change": "Redigeringen din ble ignorert fordi det ikke var noen endringer.",
 	"postedit-confirmation-created": "Siden har blitt opprettet.",
 	"postedit-confirmation-restored": "Siden har blitt gjenopprettet.",
@@ -709,7 +711,7 @@
 	"content-json-empty-object": "Tomt objekt",
 	"content-json-empty-array": "Tom matrise",
 	"duplicate-args-warning": "<strong>Advarsel:</strong> [[:$1]] kaller [[:$2]] med flere enn en verdi for \"$3\"-parameteren. Bare den sist angitte verdien vil brukes.",
-	"duplicate-args-category": "Sider med like argumenter i malkall",
+	"duplicate-args-category": "Sider med duplikate argumenter i malkall",
 	"duplicate-args-category-desc": "Denne siden inneholder malkall med duplikate parametre, slik som <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> eller <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "Advarsel: Denne siden inneholder for mange prosesskrevende parserfunksjoner.\n\nDet burde være mindre enn {{PLURAL:$2|$2|$2}}, men er nå {{PLURAL:$1|$1|$1}}..",
 	"expensive-parserfunction-category": "Sider med for mange prosesskrevende parserfunksjoner",
@@ -899,6 +901,7 @@
 	"search-category": "(kategori $1)",
 	"search-file-match": "(matcher filinnhold)",
 	"search-suggest": "Mente du: $1",
+	"search-rewritten": "Viser resultatet for $1. Søk i stedet for $2.",
 	"search-interwiki-caption": "Søsterprosjekter",
 	"search-interwiki-default": "Resultater fra $1:",
 	"search-interwiki-more": "(mer)",
@@ -906,7 +909,7 @@
 	"searchrelated": "relatert",
 	"searchall": "alle",
 	"showingresults": "Nedenfor vises opptil {{PLURAL:$1|'''ett''' resultat|'''$1''' resultater}} fra og med nummer <b>$2</b>.",
-	"showingresultsinrange": "Nedenfor vises opptil {{PLURAL:$1|<strong>1</strong> resultat|<strong>$1</strong> resulter}} fra og med nummer <strong>$2</strong> til og med nummer <strong>$3</strong>.",
+	"showingresultsinrange": "Nedenfor vises opptil {{PLURAL:$1|<strong>1</strong> resultat|<strong>$1</strong> resultater}} fra og med nummer <strong>$2</strong> til og med nummer <strong>$3</strong>.",
 	"search-showingresults": "Resultat <strong>{{PLURAL:$4|$1|$1–$2}}</strong> av <strong>$3</strong>",
 	"search-nonefound": "Ingen resultater passet til søket.",
 	"powersearch-legend": "Avansert søk",
@@ -952,7 +955,8 @@
 	"rows": "Rader:",
 	"columns": "Kolonner",
 	"searchresultshead": "Søk",
-	"stub-threshold": "Grense for <span class=\"mw-stub-example\">stubblenkeformatering</span>:",
+	"stub-threshold": "Grense for stubblenkeformatering ($1):",
+	"stub-threshold-sample-link": "eksempel",
 	"stub-threshold-disabled": "Deaktivert",
 	"recentchangesdays": "Antall dager som skal vises i siste endringer:",
 	"recentchangesdays-max": "Maks $1 {{PLURAL:$1|dag|dager}}",
@@ -1600,7 +1604,7 @@
 	"longpages": "Lange sider",
 	"deadendpages": "Blindveisider",
 	"deadendpagestext": "Følgende sider lenker ikke til andre sider på {{SITENAME}}.",
-	"protectedpages": "LÃ¥ste sider",
+	"protectedpages": "Beskyttede sider",
 	"protectedpages-indef": "Kun beskyttelser på ubestemt tid",
 	"protectedpages-summary": "Denne siden viser en liste av eksisterende sider som for tiden er beskyttet. For å se en liste av sider som er beskyttet mot opprettelse, se [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].",
 	"protectedpages-cascade": "Kun dypbeskyttelse",
@@ -2012,8 +2016,8 @@
 	"ipb-confirmhideuser": "Du er i ferd med å blokkere en bruker med «skjul bruker» aktivert. Dette vil skjule brukerens navn i alle lister og loggoppføringer. Er du sikker på at du vil gjøre dette?",
 	"ipb-confirmaction": "Marker feltet \"{{int:ipb-confirm}}\" nederst om du er sikker på at du virkelig vil gjøre det.",
 	"ipb-edit-dropdown": "Rediger blokkeringsgrunner",
-	"ipb-unblock-addr": "Avblokker $1",
-	"ipb-unblock": "Avblokker et brukernavn eller en IP-adresse",
+	"ipb-unblock-addr": "Opphev blokkering av $1",
+	"ipb-unblock": "Opphev blokkering av et brukernavn eller en IP-adresse",
 	"ipb-blocklist": "Vis gjeldende blokkeringer",
 	"ipb-blocklist-contribs": "Bidrag fra {{GENDER:$1|$1}}",
 	"unblockip": "Opphev blokkering",
@@ -2225,11 +2229,11 @@
 	"import-revision-count": "({{PLURAL:$1|Én revisjon|$1 revisjoner}})",
 	"importnopages": "Ingen sider å importere.",
 	"imported-log-entries": "Importerte $1 {{PLURAL:$1|loggoppføring|loggoppføringer}}.",
-	"importfailed": "Importering mislyktes: $1",
+	"importfailed": "Import mislyktes: $1",
 	"importunknownsource": "Ukjent importkildetype",
 	"importcantopen": "Kunne ikke åpne importfil",
 	"importbadinterwiki": "Ugyldig interwikilenke",
-	"importsuccess": "Importering ferdig.",
+	"importsuccess": "Import ferdig!",
 	"importnosources": "Ingen transwikiimportkilder er angitt, og direkte historikkimporteringer er slått av.",
 	"importnofile": "Ingen importfil opplastet.",
 	"importuploaderrorsize": "Importfilopplasting mislyktes. Filen er større enn tillatt opplastingsstørrelse.",
@@ -2254,7 +2258,7 @@
 	"import-rootpage-nosubpage": "Navnerommet \"$1\" til grunnsiden tillater ikke undersider.",
 	"importlogpage": "Importlogg",
 	"importlogpagetext": "Administrativ import av sider med redigeringshistorikk fra andre wikier.",
-	"import-logentry-upload-detail": "{{PLURAL:$1|\\Én revisjon|$1 revisjoner}} er importert",
+	"import-logentry-upload-detail": "{{PLURAL:$1|Én revisjon|$1 revisjoner}} er importert",
 	"import-logentry-interwiki-detail": "{{PLURAL:$1|Én revisjon|$1 revisjoner}} er importert fra $2",
 	"javascripttest": "JavaScript-testing",
 	"javascripttest-pagetext-noframework": "Denne siden er reservert for å kjøre JavaScript-tester.",
@@ -2274,7 +2278,7 @@
 	"tooltip-pt-logout": "Logg ut",
 	"tooltip-pt-createaccount": "Du oppfordres til å opprette en konto og logge inn, men det er ikke obligatorisk.",
 	"tooltip-ca-talk": "Diskusjon om innholdssiden",
-	"tooltip-ca-edit": "Du kan redigere denne siden. Vennligst bruk forhåndsvisningsknappen før du lagrer.",
+	"tooltip-ca-edit": "Rediger denne siden",
 	"tooltip-ca-addsection": "Start et nytt avsnitt",
 	"tooltip-ca-viewsource": "Denne siden er beskyttet.\nDu kan se på kildeteksten",
 	"tooltip-ca-history": "Tidligere revisjoner av denne siden",
@@ -2351,7 +2355,7 @@
 	"spam_reverting": "Tilbakestiller til siste versjon uten lenke til $1",
 	"spam_blanking": "Alle revisjoner inneholdt lenke til $1, tømmer siden",
 	"spam_deleting": "Sletter alle revisjoner med lenker til $1",
-	"simpleantispam-label": "Antispamsjekk.\n'''IKKE''' fyll inn dette feltet!",
+	"simpleantispam-label": "Antispamsjekk.\n<strong>IKKE</strong> fyll inn dette feltet!",
 	"pageinfo-title": "Informasjon om «$1»",
 	"pageinfo-not-current": "Beklager, det er ikke mulig å vise denne informasjonen for gamle revisjoner.",
 	"pageinfo-header-basic": "Grunnleggende informasjon",
@@ -2830,7 +2834,7 @@
 	"confirmemail_sendfailed": "{{SITENAME}} klarte ikke å sende bekreftelseskode.\nSjekk e-postadressen for ugyldige tegn.\n\nE-postsenderen ga følgende melding: $1",
 	"confirmemail_invalid": "Ugyldig bekreftelseskode. Koden kan ha utløpt.",
 	"confirmemail_needlogin": "Du må $1 for å bekrefte e-postadressen din.",
-	"confirmemail_success": "Din e-postadresse er nå bekreftet. Du kan nå logge inn og nyte wikien.",
+	"confirmemail_success": "Din e-postadresse er nå bekreftet. Du kan nå logge inn og bruke wikien.",
 	"confirmemail_loggedin": "E-postadressen din er bekreftet.",
 	"confirmemail_subject": "Bekreftelsesmelding fra {{SITENAME}}",
 	"confirmemail_body": "Noen, antageligvis deg, har registrert kontoen «$2» på {{SITENAME}}, fra IP-adressen $1.\n\nFor å bekrefte at denne kontoen tilhører deg og for å aktivere e-posttjenester på {{SITENAME}}, åpne følgende lenke i nettleseren din:\n\n$3\n\nOm du *ikke* registrerte kontoen, følg denne lenken for å avbryte bekreftelse av e-postadresse:\n\n$5\n\nDenne bekreftelseskoden utgår $4.",
diff --git a/languages/i18n/ne.json b/languages/i18n/ne.json
index dcf2b1c4b1..99e53f3d2d 100644
--- a/languages/i18n/ne.json
+++ b/languages/i18n/ne.json
@@ -219,7 +219,7 @@
 	"viewhelppage": "सहायता पृष्ठ हेर्ने",
 	"categorypage": "श्रेणी पृष्ठ हेर्नुहोस्",
 	"viewtalkpage": "छलफल हेर्नुहोस्",
-	"otherlanguages": "अरु भाषामा",
+	"otherlanguages": "अरू भाषाहरूमा",
 	"redirectedfrom": "($1बाट अनुप्रेषित)",
 	"redirectpagesub": "अनुप्रेषित पृष्ठ",
 	"redirectto": "अनुप्रेषित पृष्ठ:",
@@ -370,8 +370,8 @@
 	"translateinterface": "सबै विकिहरूको लागी अनुवाद जोड्न वा परिवर्तन गर्नका लागि मीडियाविकि क्षेत्रीयकरण परियोजना [//translatewiki.net/ ट्रान्सलेटविकि.नेट]को प्रयोग गर्नुहोस।",
 	"cascadeprotected": "यो पृष्ठ सम्पादन गर्नबाट सुरक्षित गरिएकोछ किनभनें {{PLURAL:$1|पृष्ठ |पृष्ठहरू}}मा सुरक्षित गर्नुका साथै प्रपात (\"cascading\") विकल्प खुल्ला राखिएको छ:\n$2",
 	"namespaceprotected": " '''$1'''  नेमस्पेसमा रहेका पृष्ठहरू सम्पादन गर्ने अनुमति यहाँलाई छैन ।",
-	"customcssprotected": "तपाईलाई यस  पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरु संग्रहित छन् ।",
-	"customjsprotected": "तपाईलाई यस जाभास्कृप्ट पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरु संग्रहित छन् ।",
+	"customcssprotected": "तपाईंलाई यो  पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
+	"customjsprotected": "तपाईंलाई यो जाभास्कृप्ट पृष्ठ सम्पादन गर्ने अनुमति छैन, किनकी यसमा कुनै अर्को प्रयोगकर्ताको व्यक्तिगत अभिरुचीहरू संग्रहित छन् ।",
 	"mycustomcssprotected": "यस CSSपृष्ठ सम्पादन गर्नको लागि लागि तपाईँलाई अनुमति छैन ।",
 	"mycustomjsprotected": "यस JavaScript पृष्ठ सम्पादन गर्नको लागि लागि तपाईँलाई अनुमति छैन ।",
 	"myprivateinfoprotected": "तपाईँसँग तपाईँको निजी जानकारीहरू सम्पादन गर्ने अनुमती छैन",
@@ -799,7 +799,7 @@
 	"deletedhist": "मेटाएका इतिहास",
 	"revdelete-hide-current": "$2, $1: मिति गरिएका वस्तुहरु लुकाउन मिलेन यो नै सबैभन्दा नयाँ संस्करण हो ।\nयसलाई लुकाउन मिल्दैन ।",
 	"revdelete-show-no-access": "  $2समय र $1 मिति भएको वस्तु देखाउन सकिएन: यसलाई \"निषेधित\"भनि चिनो लगाइएको छ।\nयसलाई हेर्न तपाईसँग अनुमती छैन ।",
-	"revdelete-modify-no-access": "  $2समय र $1 मिति भएको वस्तु परिवर्तन गर्न सकिएन यसलाई \"निषेधित\"भनि चिनो लगाइएको छ।\nयसलाई परिवर्तन गर्न तपाईसँग अनुमती छैन ।",
+	"revdelete-modify-no-access": "  $2, $1 भएको वस्तु परिवर्तन गर्न सकिएन यसलाई \"निषेधित\"भनि चिनो लगाइएको छ।\nयसलाई परिवर्तन गर्न तपाईंसँग अनुमती छैन ।",
 	"revdelete-modify-missing": "आइडी  $1 रहेको वस्तु परिवर्तन गर्दा त्रुटी भएको छ: यस वस्तु डेटावेसबाट हराइरहेको छ !",
 	"revdelete-no-change": "'''चेतावनी:''' $2, $1मिति भइको वस्तुको पहिले नै अनुरोध गरे अनुसारको दृश्य सेटिङ्गहरु छन् ।",
 	"revdelete-concurrent-change": " $2, $1 मिति गरिएको वस्तु परिवर्तन गर्न सकिएन: यसको स्थितीले तपाईंले परिवर्तन गर्नलाग्नुहुँदा कोहीअरुले नै परिवर्तन गरेजस्तो देखाउँछ\nकृपया लगहरू हेर्नुहोला ।",
@@ -869,7 +869,7 @@
 	"searchprofile-advanced": "उन्नत",
 	"searchprofile-articles-tooltip": "$1 मा खोज्ने",
 	"searchprofile-images-tooltip": "फाइलहरू खोज्ने",
-	"searchprofile-everything-tooltip": "सबै सामग्री खोज्ने (वार्तालाप समेत )",
+	"searchprofile-everything-tooltip": "सबै सामग्री खोज्ने (वार्तालाप समेत)",
 	"searchprofile-advanced-tooltip": "अनुकुल नेमस्पेसमा खोज्ने",
 	"search-result-size": "$1 ({{PLURAL:$2|1 शब्द|$2 शब्दहरू}})",
 	"search-result-category-size": "{{PLURAL:$1|एक सदस्य|$1 सदस्यहरू}} ({{PLURAL:$2|1 उपश्रेणी|$2  उपश्रेणीहरू}}, {{PLURAL:$3|एउटा फाइल|$3 फाइलहरू}})",
@@ -893,7 +893,7 @@
 	"powersearch-togglelabel": "जाँच्ने :",
 	"powersearch-toggleall": "सबै",
 	"powersearch-togglenone": "कुनै पनि होइन",
-	"powersearch-remember": "चयन गरिएको लाई भविष्यमा गरिने खोजहरूको लागि सम्झिने",
+	"powersearch-remember": "चयन गरिएकोलाई भविष्यमा गरिने खोजहरूको लागि सम्झिने",
 	"search-external": "बाह्य खोज",
 	"searchdisabled": "{{SITENAME}} खोज निस्क्रिय पारिएको छ ।\nहाललाई तपाईं गूगलद्वारा खोज्न सक्नुहुन्छ ।\nयाद गर्नुहोस् उनीहरूको {{SITENAME}}को सूची सामग्री पुरानो भएको हुनसक्छ ।",
 	"search-error": "खोज्ने क्रममा समस्या देखियोः $1",
@@ -976,7 +976,7 @@
 	"yourvariant": "लेखको भाषा संस्करण:",
 	"prefs-help-variant": "तपाईंको मनपरेको संस्करण वा हिज्जे यस विकि भित्र सामग्री पृष्ठहरू प्रदर्शित गर्नका निमित्त।",
 	"yournick": "नयाँ हस्ताक्षर:",
-	"prefs-help-signature": "वार्तालाप पृष्ठका टिप्पणीहरु \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपर्छ ,जुन पछि तपाईँको दस्तखत र समयरेखामा रुपान्तरित हुनेछ ।",
+	"prefs-help-signature": "वार्तालाप पृष्ठका टिप्पणीहरू \"<nowiki>~~~~</nowiki>\" द्वारा दस्तखत गरिनुपर्छ ,जुन पछि तपाईँको दस्तखत र समयरेखामा रुपान्तरित हुनेछ ।",
 	"badsig": "अमान्य कच्चा दस्तखत।\nHTML ट्यागहरु जाँच्नुहोस् ।",
 	"badsiglength": "तपाईंको दस्तखत धेरै लामो छ।\nयो $1 {{PLURAL:$1|अक्षर|अक्षरहरू}} भन्दा लामो हुनु हुँदैन ।",
 	"yourgender": "कसरी वताउन चाहनुहुन्छ ?",
@@ -2100,8 +2100,8 @@
 	"movenotallowedfile": "फाइल हटाउने अनुमति तपाईँलाई  छैन।",
 	"cant-move-user-page": "तपाईसँग प्रयोगकर्ता पृष्ठहरू सार्न अनुमती छैन (सहपृष्ठहरू बाहेक)",
 	"cant-move-to-user-page": "तपाईंलाई पृष्ठहरू प्रयोगकर्ता पृष्ठमा सार्न अनुमती छैन (प्रयोगकर्ता सहपृष्ठहरूमा बाहेक)",
-	"cant-move-category-page": "तपाईलाई श्रेणीको पृष्ठहरू सार्ने अनुमति छैन ।",
-	"cant-move-to-category-page": "कुनै श्रेणी पृष्ठमा सार्नको लागी तपाईलाई अनुमति छैन ।",
+	"cant-move-category-page": "तपाईंलाई श्रेणीको पृष्ठहरू सार्ने अनुमति छैन ।",
+	"cant-move-to-category-page": "कुनै श्रेणी पृष्ठमा सार्नको लागी तपाईंलाई अनुमति छैन ।",
 	"newtitle": "नयाँ शीर्षकमा :",
 	"move-watch": "यो पृष्ठ निगरानीमा राख्नुहोस्",
 	"movepagebtn": "पृष्ठ सार्नुहोस्",
@@ -2225,8 +2225,8 @@
 	"import-upload": "XML डेटा अपलोड गर्ने",
 	"import-token-mismatch": "सत्र जानकारी नष्ट भयो\nकृपया पुन: प्रयास गर्नुहोस्।",
 	"import-invalid-interwiki": "खुलाइएको विकिबाट आयात गर्न सकिएन",
-	"import-error-edit": "तपाईलाई सम्पादन गर्ने अनुमति नभएको पृष्ठ \"$1\" आयात गरिएन ।",
-	"import-error-create": "तपाईलाई नयाँ बनाउने गर्ने अनुमति नभएको पृष्ठ \"$1\" आयात गरिएन ।",
+	"import-error-edit": "तपाईंलाई सम्पादन गर्ने अनुमति नभएको पृष्ठ \"$1\" आयात गरिएन ।",
+	"import-error-create": "तपाईंलाई नयाँ बनाउने अनुमति नभएको पृष्ठ \"$1\" आयात गरिएन ।",
 	"import-error-interwiki": "यसको नाम बाह्य लिङ्क (अन्तरविकि) को लागी जगेडा राखिएको हुँदा  पृष्ठ \"$1\" आयात गरिएन ।",
 	"import-error-special": "पृष्ठ \"$1\" आयात गर्न सकिएन किनभने यो एउटा यस्तो विशेष नामस्थान अन्तर्गत आउँछ जसमा पृष्ठ बनाउन सकिंदैन।",
 	"import-error-invalid": "पृष्ठ \"$1\" आयात गर्न सकिएन किनभने यसको आयात पश्चात जुन नाम हुन्थ्यो त्यो यस विकिमा मान्य छैन।",
@@ -2257,7 +2257,7 @@
 	"tooltip-pt-logout": "निर्गमन (लग आउट) गर्नुहोस्",
 	"tooltip-pt-createaccount": "तपाईंलाई खाता बनाउन र लग इन गर्न हामि प्रोत्साहित गर्छौ; तथापि, यो अनिवार्य भने छैन।",
 	"tooltip-ca-talk": "सामग्री पृष्ठबारेमा छलफल",
-	"tooltip-ca-edit": "तपाईँले यो पृष्ठ सम्पादन गर्न सक्नुहुन्छ । कृपया सङ्ग्रह ‍गर्नु पूर्व पूर्वावलोकन बटन प्रयोग गर्नुहोला ।",
+	"tooltip-ca-edit": "यो पृष्ठ सम्पादन गर्ने",
 	"tooltip-ca-addsection": "नयाँ खण्ड सुरु गर्नुहोस्",
 	"tooltip-ca-viewsource": "यो पृष्ठ सुरक्षित गरिएको छ। यसको श्रोत हेर्न सक्नुहुन्छ।",
 	"tooltip-ca-history": "यस पृष्ठको पहिलेका पुनरावलोकनहरु",
@@ -2274,7 +2274,7 @@
 	"tooltip-p-logo": "मुख्य पृष्ठ",
 	"tooltip-n-mainpage": "मुख्य पृष्ठमा जाने",
 	"tooltip-n-mainpage-description": "मुख्य पृष्ठमा जानुहो्स्",
-	"tooltip-n-portal": "आयोजनाका बारेमा , तपाईँ के गर्न सक्नुहुन्छ , सामग्री कहाँ भेट्टाउने",
+	"tooltip-n-portal": "आयोजनाका बारेमा, तपाईँ के गर्न सक्नुहुन्छ, सामग्री कहाँ भेट्टाउने",
 	"tooltip-n-currentevents": "हालैको घटनाको बारेमा पृष्ठभूमि जानकारी पत्ता लगाउनुहोस्",
 	"tooltip-n-recentchanges": "विकिमा गरिएका हालैका परिवर्तनहरुको सूची",
 	"tooltip-n-randompage": "जुन कुनै पृष्ठ खोल्ने",
@@ -2293,7 +2293,7 @@
 	"tooltip-ca-nstab-main": "सामग्री पृष्ठ हेर्नुहोस",
 	"tooltip-ca-nstab-user": "प्रयोगकर्ता पृष्ठ हेर्नुहोस्",
 	"tooltip-ca-nstab-media": "मिडिया पृष्ठ हेर्नुहोस्",
-	"tooltip-ca-nstab-special": "यो विशेष पृष्ठ हो , तपाईँले आफै सम्पादन गर्न सक्नुहुन्न",
+	"tooltip-ca-nstab-special": "यो विशेष पृष्ठ हो, यो सम्पादन गर्न सकिदैन",
 	"tooltip-ca-nstab-project": "आयोजान पृष्ठ हेर्नुहोस्",
 	"tooltip-ca-nstab-image": "फाइल पृष्ठ हेर्नुहोस्",
 	"tooltip-ca-nstab-mediawiki": "प्रणाली सन्देश हेर्नुहोस्",
@@ -2333,7 +2333,7 @@
 	"spam_reverting": "$1 मा कडीहरू  नभएका पुरानो अवतरणमा पुनर्स्थापित गर्दै",
 	"spam_blanking": "$1 का सबै अवतरणहरूमा कडीहरू  भेटिए, मेटाएर खालि गर्दै",
 	"spam_deleting": "$1 भएको सम्पूर्ण संशोधन कडीहरू मेटाइदै",
-	"simpleantispam-label": "ऐन्टी-स्प्याम जाँच।\nयसलाई <strong>नहीं</strong> भर्ने!",
+	"simpleantispam-label": "ऐन्टी-स्प्याम जाँच।\nयसलाई <strong>न</strong> भर्ने!",
 	"pageinfo-title": " \"$1\"को लागि जाकारी",
 	"pageinfo-not-current": "माफ गर्नुहोस्, यो जानकारी पूरानो संस्करणमा उपलब्ध गराउन असम्भव छ ।",
 	"pageinfo-header-basic": "साधारण जानकारी",
@@ -2967,7 +2967,7 @@
 	"hebrew-calendar-m10-gen": "तामुज",
 	"hebrew-calendar-m11-gen": "अभ्",
 	"hebrew-calendar-m12-gen": "एलल्",
-	"signature": "[[{{ns:user}}:$1|$2]]",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|वार्ता]])",
 	"timezone-utc": "युटिसी(UTC)",
 	"duplicate-defaultsort": "'''चेतावनी:''' पूर्व निर्धारित छोटकरी \"$2\" ले पुरानो पूर्वनिर्धारित छोटकरी\"$1\"लाई विस्थापन गरेको छ ।",
 	"duplicate-displaytitle": "<strong>चेतावनी:</strong> शीर्षक देखाउने \"$2\" पूर्व देखाइएको शीर्षक \"$1\" मा ओभररेड गरिंदै छ।",
diff --git a/languages/i18n/nl.json b/languages/i18n/nl.json
index bdcd6140d0..d0d78a186f 100644
--- a/languages/i18n/nl.json
+++ b/languages/i18n/nl.json
@@ -628,7 +628,7 @@
 	"showpreview": "Bewerking ter controle bekijken",
 	"showdiff": "Wijzigingen bekijken",
 	"blankarticle": "<strong>Waarschuwing:</strong> de pagina die u wilt aanmaken is leeg.\nAls u opnieuw op \"{{int:savearticle}}\" klikt, wordt de pagina aangemaakt zonder enige inhoud.",
-	"anoneditwarning": "<strong>Waarschuwing:</strong> u bent niet aangemeld.\nUw IP-adres wordt opgeslagen als u wijzigingen op deze pagina maakt. Wanneer u <strong>[$1 aanmeldt]</strong> of <strong>[$2 een gebruiker aanmaakt]</strong verschijnen uw bewerkingen onder uw gebruikersnaam, naast andere voordelen.",
+	"anoneditwarning": "<strong>Waarschuwing:</strong> u bent niet aangemeld.\nUw IP-adres wordt opgeslagen als u wijzigingen op deze pagina maakt. Wanneer u <strong>[$1 aanmeldt]</strong> of <strong>[$2 een gebruiker aanmaakt]</strong> verschijnen uw bewerkingen onder uw gebruikersnaam, naast andere voordelen.",
 	"anonpreviewwarning": "''U bent niet aangemeld.''\n''Door uw bewerking op te slaan wordt uw IP-adres opgeslagen in de paginageschiedenis.''",
 	"missingsummary": "'''Let op:''' u hebt geen bewerkingssamenvatting opgegeven.\nAls u nogmaals op \"{{int:savearticle}}\" klikt wordt de bewerking zonder samenvatting opgeslagen.",
 	"selfredirect": "<strong>Waarschuwing:</strong>U heeft een doorverwijzing gemaakt naar dezelfde pagina. Mogelijk heeft u de verkeerde bestemming voor de doorverwijzing gebruikt, of bewerkt u de verkeerde pagina. Door alsnog op \"{{int:savearticle}}\" te klikken word de doorverwijzing alsnog aangemaakt.",
@@ -1387,7 +1387,20 @@
 	"upload-too-many-redirects": "De URL bevatte te veel doorverwijzingen",
 	"upload-http-error": "Er is een HTTP-fout opgetreden: $1",
 	"upload-copy-upload-invalid-domain": "Uploaden per kopie is niet beschikbaar vanuit dit domein.",
-	"backend-fail-stream": "Het was niet mogelijk het bestand $1 te streamen.",
+	"upload-dialog-title": "Bestand uploaden",
+	"upload-dialog-error": "Er is een fout opgetreden",
+	"upload-dialog-warning": "Een waarschuwing is opgetreden",
+	"upload-dialog-button-cancel": "Annuleren",
+	"upload-dialog-button-done": "Afgerond",
+	"upload-dialog-button-save": "Opslaan",
+	"upload-dialog-button-upload": "Upload",
+	"upload-dialog-label-select-file": "Selecteer bestand",
+	"upload-dialog-label-infoform-title": "Details",
+	"upload-dialog-label-infoform-name": "Naam",
+	"upload-dialog-label-infoform-description": "Beschrijving",
+	"upload-dialog-label-usage-title": "Gebruik",
+	"upload-dialog-label-usage-filename": "Bestandsnaam",
+	"backend-fail-stream": "Het was niet mogelijk het bestand \"$1\" te streamen.",
 	"backend-fail-backup": "Het was niet mogelijk een reservekopie van het bestand $1 te maken.",
 	"backend-fail-notexists": "Het bestand $1 bestaat niet.",
 	"backend-fail-hashes": "Het was niet mogelijk de hashes voor het bestand op te halen om ze te vergelijken.",
@@ -1617,7 +1630,7 @@
 	"unusedimages": "Ongebruikte bestanden",
 	"wantedcategories": "Niet-bestaande categorieën met de meeste koppelingen",
 	"wantedpages": "Niet-bestaande pagina's met koppelingen",
-	"wantedpages-summary": "Lijst van niet-bestaande pagina 's met de meeste schakels naar hen, met uitsluiting van pagina' s die slechts omleidingen linken naar hen. Voor een lijst van niet-bestaande pagina ' s die omleidingen linken naar hen, zie [[{{#special:BrokenRedirects}}|de lijst van gebroken redirects]].",
+	"wantedpages-summary": "Lijst van niet-bestaande pagina's met de meeste koppelingen naar hen, met uitsluiting van pagina's waarheen enkel doorverwijzingen linken. Voor een lijst van niet-bestaande pagina's waar doorverwijzingen naar linken, zie [[{{#special:BrokenRedirects}}|de lijst van gebroken doorverwijzingen]].",
 	"wantedpages-badtitle": "Ongeldige paginanaam in resultaat: $1",
 	"wantedfiles": "Niet-bestaande bestanden met koppelingen",
 	"wantedfiletext-cat": "De volgende bestanden worden gebruikt maar bestaan niet. Bestanden van externe repositories kunnen zijn opgenomen in de lijst, ondanks dat ze bestaan. Dergelijke vals positieven worden <del>doorgehaald weergegeven</del>. Pagina's die niet-bestaande bestanden insluiten staan op de pagina [[:$1]].",
diff --git a/languages/i18n/olo.json b/languages/i18n/olo.json
new file mode 100644
index 0000000000..57207b5eec
--- /dev/null
+++ b/languages/i18n/olo.json
@@ -0,0 +1,743 @@
+{
+	"@metadata": {
+		"authors": [
+			"Denö",
+			"Hiloin Natoi",
+			"Ilja.mos",
+			"Mashoi7"
+		]
+	},
+	"tog-watchcreations": "Ližiä minun luajitut sivut da ližätyt failat minun valvonduluvetteloh",
+	"tog-watchdefault": "Ližiä minun kohendetut sivut da failat minun valvonduluvetteloh",
+	"tog-watchmoves": "Ližiä minun siirretyt sivut da failat minun valvonduluvetteloh",
+	"tog-watchdeletion": "Ližiä minun iäreotetut sivut da failat minun valvonduluvetteloh",
+	"tog-oldsig": "Nygöine allekirjutus:",
+	"underline-always": "Ainos",
+	"underline-never": "Nikonzu",
+	"editfont-sansserif": "Sans-serif -fontu",
+	"editfont-serif": "Serif-fontu",
+	"sunday": "Pyhäpäivy",
+	"monday": "Enzimäinargi",
+	"tuesday": "Toinargi",
+	"wednesday": "Kolmaspäivy",
+	"thursday": "Nelläspäivy",
+	"friday": "Piäteniččy",
+	"saturday": "Suovattu",
+	"sun": "Pyh",
+	"mon": "Enzimäinargi",
+	"tue": "Toinargi",
+	"wed": "Kol",
+	"thu": "Nel",
+	"fri": "Piä",
+	"sat": "Suo",
+	"january": "pakkaskuu",
+	"february": "tuhukuu",
+	"march": "kevätkuu",
+	"april": "sulakuu",
+	"may_long": "oraskuu",
+	"june": "kezäkuu",
+	"july": "heinykuu",
+	"august": "elokuu",
+	"september": "syvyskuu",
+	"october": "ligakuu",
+	"november": "kylmykuu",
+	"december": "talvikuu",
+	"january-gen": "pakkaskuudu",
+	"february-gen": "tuhukuudu",
+	"march-gen": "kevätkuudu",
+	"april-gen": "kevätkuudu",
+	"may-gen": "oraskuudu",
+	"june-gen": "kezäkuudu",
+	"july-gen": "heinykuudu",
+	"august-gen": "elokuudu",
+	"september-gen": "syvyskuudu",
+	"october-gen": "ligakuudu",
+	"november-gen": "kylmykuudu",
+	"december-gen": "talvikuudu",
+	"jan": "pakkaskuu",
+	"feb": "tuhu",
+	"mar": "kevätkuu",
+	"apr": "Sula",
+	"may": "Oras",
+	"jun": "Pakkas",
+	"jul": "Heiny",
+	"aug": "Elo",
+	"sep": "Syvys",
+	"oct": "ligakuu",
+	"nov": "kylmykuu",
+	"dec": "talvikuu",
+	"january-date": "$1. pakkaskuudu",
+	"february-date": "$1. tuhukuudu",
+	"march-date": "Kevätkuu $1",
+	"april-date": "Sulakuu $1",
+	"may-date": "Oraskuu $1",
+	"june-date": "Kezäkuu $1",
+	"july-date": "Heinykuu $1",
+	"august-date": "Elokuu $1",
+	"september-date": "Syvyskuu $1",
+	"october-date": "Ligakuu $1",
+	"november-date": "Kylmykuu $1",
+	"december-date": "Talvikuu $1",
+	"pagecategories": "{{PLURAL:$1|Kategourii|Kategouriet}}",
+	"category_header": "Sivut kategouries \"$1\"",
+	"subcategories": "Alikategouriet",
+	"category-media-header": "Medii kategouries \"$1\"",
+	"hidden-categories": "{{PLURAL:$1|Peitetty kategourii|Peitetyt kategouriet}}",
+	"hidden-category-category": "Peitetyt kategouriet",
+	"category-subcat-count": "{{PLURAL:$2|Täs kategouries on vaiku tämä alikategourii.|Täs kategouries on nämmä {{PLURAL:$1|subcategory|$1 alikategouriet}}, kaikkiedah $2.}}",
+	"category-article-count": "{{PLURAL:$2|Täs kategouries on vaiku tämä sivu.|{{PLURAL:$1|Tämä sivu on|$1 Nämmä sivut ollah}} täs kategouries, $2 kaikkiedah.}}",
+	"category-file-count": "{{PLURAL:$2|Täs kategouriis on vaiku tämä failu.| {{PLURAL:$1|Tämä failu on|$1 Nämmä failat ollah}} täs kategouries, $2 kaikkiedah.}}",
+	"listingcontinuesabbrev": "(jatko)",
+	"about": "Tieduo sovellukses",
+	"article": "Yhtevyssivu",
+	"newwindow": "(avata uvves ikkunas)",
+	"cancel": "Hylgiä",
+	"moredotdotdot": "Ližiä...",
+	"mypage": "Sivu",
+	"mytalk": "Pagin",
+	"navigation": "Navigatsii",
+	"and": "&#32;da",
+	"qbfind": "Eči",
+	"qbbrowse": "Livua",
+	"qbedit": "Korjata",
+	"qbpageoptions": "Tämä sivu",
+	"qbmyoptions": "Minun sivut",
+	"faq": "PKK",
+	"faqpage": "Project:PKK",
+	"actions": "Tevot",
+	"namespaces": "Nimitilat",
+	"variants": "Variantat",
+	"navigation-heading": "Navigatsii",
+	"errorpagetitle": "Haireh",
+	"returnto": "Mene järilleh sivule $1.",
+	"tagline": "Lähteh {{SITENAME}}",
+	"help": "Kyzy abuu",
+	"search": "Eči",
+	"searchbutton": "Eči",
+	"go": "Mennä",
+	"searcharticle": "Mene",
+	"history": "Kačo histourii",
+	"history_short": "Histourii",
+	"printableversion": "Tulostettavu versii",
+	"permalink": "Vagituine linki",
+	"print": "Pane bumuagale",
+	"view": "Kačo",
+	"view-foreign": "Kačo saital $1",
+	"edit": "Korjua",
+	"create": "Luaji",
+	"create-local": "Ližiä paikalline kuvavus",
+	"editthispage": "Korjua tädä sivuu",
+	"create-this-page": "Luaji tämä sivu",
+	"delete": "Ota iäre",
+	"deletethispage": "Ota tämä sivu iäre",
+	"undeletethispage": "Tuo sivu järilleh",
+	"protect": "Suojua",
+	"protect_change": "vaihta",
+	"protectthispage": "Suojua tämä sivu",
+	"unprotect": "Vaihta suojavustu",
+	"unprotectthispage": "Vaihta tämän sivun suojavustu",
+	"newpage": "Uuzi sivu",
+	"talkpage": "Pagize täh sivuh näh",
+	"talkpagelinktext": "Pagin",
+	"specialpage": "Erikoine sivu",
+	"personaltools": "Omat instrumentat",
+	"articlepage": "Ozuta syväindösivu",
+	"talk": "Paginat",
+	"views": "Kaččokerrat",
+	"toolbox": "Instrumentat",
+	"userpage": "Ozuta käyttäisivu",
+	"projectpage": "Ozuta projektusivu",
+	"imagepage": "Ozuta failusivu",
+	"mediawikipage": "Ozuta viestisivu",
+	"templatepage": "Ozuta Å¡ablonsivu",
+	"viewhelppage": "Ozuta ohjavosivu",
+	"categorypage": "Ozuta kategouriisivu",
+	"viewtalkpage": "Ozuta paginsivu",
+	"otherlanguages": "Toizil kielil",
+	"redirectedfrom": "(siirretty $1:späi)",
+	"redirectpagesub": "uvvellehohjavussivu",
+	"redirectto": "Uvvellehohjuau sivuh:",
+	"lastmodifiedat": "Tädä sivuu on muutettu jälgimäizen kerran $1, $2 aigah.",
+	"protectedpage": "Suojattu sivu",
+	"jumpto": "Siirry",
+	"jumptonavigation": "navigatsii",
+	"jumptosearch": "eči",
+	"pool-errorunknown": "Tundematoi haireh",
+	"poolcounter-usage-error": "Käyttöhaireh: $1",
+	"aboutsite": "Lähteh {{SITENAME}}",
+	"aboutpage": "Project:Kuvavus",
+	"copyrightpage": "{{ns:project}}:Luadijan oigevukset",
+	"currentevents": "Aijankohtazet tapahtumat",
+	"currentevents-url": "Project:Aijankohtazet tapahtumat",
+	"disclaimers": "Kieldävymine vastuos",
+	"disclaimerpage": "Project:Vastuos kieldävymine",
+	"edithelp": "Abu korjuamizeh",
+	"helppage-top-gethelp": "Kyzyö abuu",
+	"mainpage": "Piäsivu",
+	"mainpage-description": "Piäsivu",
+	"portal": "Yhtevyksen portualu",
+	"portal-url": "Project:Portualu",
+	"privacy": "Luottamuksen periuateh",
+	"privacypage": "Project:Luottamuksen periuateh",
+	"retrievedfrom": "Lähteh - \"$1\"",
+	"youhavenewmessages": "{{PLURAL:$3|Sinule on}} $1 ($2).",
+	"youhavenewmessagesfromusers": "{{PLURAL:$4|Sinule on}} $1 {{PLURAL:$3|toizel käyttäjälpäi|$3 käyttäjältä}} ($2).",
+	"youhavenewmessagesmanyusers": "Sinule on $1 uuzii viestilöi monil käyttäjilpäi ($2).",
+	"newmessageslinkplural": "{{PLURAL:$1|uuzi viesti|999=uuzii viestilöi}}",
+	"newmessagesdifflinkplural": "{{PLURAL:$1|jälgimäine muutos|jälgimästy muutostu}}",
+	"youhavenewmessagesmulti": "Sinul on uuzii viestilöi sivuloil $1",
+	"editsection": "Korjua",
+	"editold": "korjua",
+	"viewsourceold": "Kačo algukoodu",
+	"editlink": "korjua",
+	"viewsourcelink": "Kačo algukoodu",
+	"editsectionhint": "Korjua tädä kohtua: $1",
+	"toc": "Sizäldö",
+	"showtoc": "ozuttua",
+	"hidetoc": "peittiä",
+	"collapsible-expand": "Levitä",
+	"confirmable-yes": "Muga",
+	"confirmable-no": "Ei",
+	"viewdeleted": "Ozuta $1?",
+	"feedlinks": "Syöteh:",
+	"site-rss-feed": "$1 (RSS-syöteh)",
+	"site-atom-feed": "$1 Atom-lentu",
+	"page-rss-feed": "$1 (RsS-syöteh)",
+	"page-atom-feed": "$1 Atom-lentu",
+	"red-link-title": "$1 (sivuu ei lövvy)",
+	"nstab-main": "Sivu",
+	"nstab-user": "Käyttäisivu",
+	"nstab-media": "Mediisivu",
+	"nstab-special": "Erikoine sivu",
+	"nstab-project": "Projektusivu",
+	"nstab-image": "Failu",
+	"nstab-mediawiki": "Viesti",
+	"nstab-template": "Å ablon",
+	"nstab-category": "Kategourii",
+	"error": "Haireh",
+	"databaseerror": "Tiedokanduhaireh",
+	"databaseerror-function": "Funkcii:$1",
+	"databaseerror-error": "Haireh: $1",
+	"readonly": "Tiedokandu lukuttu",
+	"internalerror": "Syväindölline haireh",
+	"internalerror_info": "Syväindölline haireh: $1",
+	"filecopyerror": "Failua \"$1\" ei voitu kopiruija failakse \"$2\".",
+	"filedeleteerror": "Failua \"$1\" ei voitu ottua iäre.",
+	"filenotfound": "Failua \"$1\" ei lövvetty.",
+	"cannotdelete-title": "Ei voi ottua iäre sivuu \"$1\"",
+	"badtitle": "Paha rubriekku",
+	"badtitletext": "Kyzelyn rubriekku oli pädemätöi, tyhjy, libo viärin linkitetty kielienväline libo wikienväline rubriekku. \nSit voibi olla yksi libo enämbi merkii, kudamua ei voi käyttiä rubriekas.",
+	"viewsource": "Kačo",
+	"exception-nologin": "Ei ole kirjutannuhes",
+	"welcomeuser": "Tule terveh, $1!",
+	"yourname": "Käyttäinimi:",
+	"userlogin-yourname": "Käyttäinimi",
+	"userlogin-yourname-ph": "Kirjuta sinun käyttäinimi",
+	"createacct-another-username-ph": "Kirjuta käyttäitunnus",
+	"yourpassword": "Peittosana:",
+	"userlogin-yourpassword": "Peittosana",
+	"userlogin-yourpassword-ph": "Kirjuta sinun peittosana",
+	"createacct-yourpassword-ph": "Kirjuta peittosana",
+	"yourpasswordagain": "Kirjuta peittosana myös:",
+	"createacct-yourpasswordagain": "Lujenda peittosana",
+	"createacct-yourpasswordagain-ph": "Myös kirjuta peittosana",
+	"userlogin-remembermypassword": "Pie minut kirjutannuhuonnu",
+	"yourdomainname": "Sinun domain:",
+	"password-change-forbidden": "Et voi vaihtua peittosanoi täs wikis.",
+	"login": "Kirjuttai",
+	"nav-login-createaccount": "Kirjuttai libo registriiruiččei",
+	"userlogin": "Kirjuttai libo registriiruiččei",
+	"userloginnocreate": "Kirjuttai",
+	"logout": "Kirjuttai ullos",
+	"userlogout": "Kirjuttai ullos",
+	"notloggedin": "Ei kirjutannuhes",
+	"userlogin-noaccount": "Ei ole tilii?",
+	"userlogin-joinproject": "Yhty {{SITENAME}}",
+	"nologin": "Ei ole tilii? $1",
+	"nologinlink": "Luaji tili",
+	"createaccount": "Registriiruiččei",
+	"gotaccount": "Ollou sinul jo tunnus? $1",
+	"gotaccountlink": "Kirjuttai",
+	"userlogin-resetlink": "Unohtitgo sinun käyttäinimen/peittosanan?",
+	"userlogin-resetpassword-link": "Unohtitgo sinun peittosanan?",
+	"userlogin-helplink2": "Abuu ku kirjuttuakseh",
+	"userlogin-loggedin": "Olet jo kirjutannuhes nimel {{GENDER:$1|$1}}.\nKäytä al olijua ankiettua ku kirjuttuakseh eri käyttäjänny.",
+	"userlogin-createanother": "Luaji toine tili",
+	"createacct-emailrequired": "Sähköpoštuadressu",
+	"createacct-emailoptional": "Sähköpoštuadressu (ei vältämätöi)",
+	"createacct-email-ph": "Kirjuta sinun sähköpoštuadressu",
+	"createacct-another-email-ph": "Kirjuta sinun sähköpoštuadressu",
+	"createacct-realname": "Tovelline nimi (omatahtoine tiedo)",
+	"createacct-reason-ph": "Mindäh olet luadimas tostu käyttäitilii",
+	"createacct-captcha": "Turvallizusvarmistus",
+	"createacct-imgcaptcha-ph": "Kirjuta ylähän olii tekstu",
+	"createacct-submit": "Luaji tili",
+	"createacct-another-submit": "Luaji toine tili",
+	"createacct-benefit-heading": "Sivun {{SITENAME}} ollah luajittu sinunjyttymät rahvas.",
+	"createacct-benefit-body1": "{{PLURAL:$1|kohennus|kohendustu}}",
+	"createacct-benefit-body2": "{{PLURAL:$1|sivu|sivuu}}",
+	"createacct-benefit-body3": "{{PLURAL:$1|Jälgimäime käyttäi|Jälgimäzet käyttäjät}}",
+	"badretype": "Sinun kirjutetut peittosanat ei oldu yhtenjyttymät.",
+	"mailmypassword": "Azeta peittosana uvvelleh",
+	"mailerror": "Haireh työndäjes sähköpoštua: $1",
+	"accountcreated": "Tili luajittu",
+	"loginlanguagelabel": "Kieli: $1",
+	"pt-login": "Kirjuttai",
+	"pt-login-button": "Kirjuttai",
+	"pt-createaccount": "Registriiruiččei",
+	"pt-userlogout": "Kirjuttai ullos",
+	"changepassword": "Vaihta peittosana",
+	"resetpass_header": "Vaihta tilin peittosana",
+	"oldpassword": "Vahnu peittosana:",
+	"newpassword": "Uuzi peittosana:",
+	"resetpass-submit-loggedin": "Vaihta peittosana",
+	"resetpass-submit-cancel": "Hyllätä",
+	"resetpass-temp-password": "Väliaigaine peittosana:",
+	"passwordreset": "Azeta peittosana uvvelleh",
+	"passwordreset-username": "Käyttäinimi:",
+	"passwordreset-domain": "Domain:",
+	"passwordreset-email": "Sähköpoštuadressu:",
+	"passwordreset-emailelement": "Käyttäinimi: $1\nVäliaigaine peittosana: $2",
+	"changeemail": "Vaihta sähköpoštuadressu",
+	"changeemail-oldemail": "Nygöine sähköpoštuadressu:",
+	"changeemail-newemail": "Uuzi sähköpoštuadressu:",
+	"changeemail-none": "(niyhty)",
+	"changeemail-submit": "Vaihta sähköpoštu",
+	"resettokens-tokens": "Avaimet:",
+	"bold_sample": "Lihavoitu tekstu",
+	"bold_tip": "Lihavoitu tekstu",
+	"italic_sample": "Kursivoitu tekstu",
+	"italic_tip": "Kursivoitu tekstu",
+	"link_sample": "Linkan nimi",
+	"link_tip": "Sižähine linku",
+	"extlink_sample": "http://www.example.com linkan nimi",
+	"extlink_tip": "Ulgohine linku (musta http:// alguh)",
+	"headline_sample": "Rubriekkutekstu",
+	"headline_tip": "Tazon 2 rubriekku",
+	"nowiki_sample": "Ližiä täh tekstu, kudamua ei pie korjata",
+	"nowiki_tip": "Älä puutu wiki-korjavuksih",
+	"image_tip": "Upotettu failu",
+	"media_tip": "Linki failah",
+	"sig_tip": "Teijän allekirjutus da aigu",
+	"hr_tip": "Horizontualine viivu (älä käytä liijakse)",
+	"summary": "Yhtehvedo:",
+	"subject": "Tiemu/rubriekku:",
+	"minoredit": "Tämä on pieni korjavus",
+	"watchthis": "Tarkaile tädä sivuu",
+	"savearticle": "Tallenda sivu",
+	"preview": "Ezikačo",
+	"showpreview": "Ezikaččo",
+	"showdiff": "Luajitut korjavukset",
+	"anoneditwarning": "<strong>Varaitus:</strong> Et ole kirjutannuhes. Luadinet muutoksii syväindölöih, sinun Ip-adressu tulou nägövih kaikile. Ku <strong>[$1 kirjutannuttos]</strong> libo <strong>[$2 registriiruičettos]</strong>, sinun syväindömuutokset nävytäh sinun käyttäinimel, toizien eduloin ližäkse.",
+	"blockedtitle": "Käyttäi on estetty",
+	"blockednoreason": "ei viärysty annettu",
+	"loginreqlink": "kirjuttai",
+	"accmailtitle": "Peittosana työtty",
+	"newarticle": "(Uuzi)",
+	"newarticletext": "Olet puutunuh sivule, kudamua ei ole vie. Ku luadie sivu, zavodi kirjuttua al olijah juaššiekkah (kačo [$1 help page] ku suaha ližätieduo).\nKu puutuit tänne petties, painalda sinun livaimen <strong>järilleh</strong>-nyblyä.",
+	"noarticletext": "Täl sivul ei ole juuri nygöi tekstua.\nVoit [[Special:Search/{{PAGENAME}}|eččie sivun nimel]] toizis sivuloispäi,\n<span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} eččie sidä koskijua logua],\nlibo [{{fullurl:{{FULLPAGENAME}}|action=edit}} korjata tädä sivuu]</span>.",
+	"noarticletext-nopermission": "Täl sivul ei ole tekstua.\nVoit [[Special:Search/{{PAGENAME}}|eččie sivun nimel]] toizis sivuloispäi, libo <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} eččie sivuu koskijua logua]</span>, ga sinul ei ole oigevuksii luadie tädä sivuu.",
+	"updated": "(Päivitetty)",
+	"editing": "Edituijah sivuu $1",
+	"creating": "Luajitah sivuu \"$1\"",
+	"editingsection": "Korjuandu $1 (alalugu)",
+	"yourtext": "Sinun tekstu",
+	"yourdiff": "Erot",
+	"templatesused": "{{PLURAL:$1|Šablon|Šablonat}} käytetty täl sivul:",
+	"template-protected": "(suojattu)",
+	"template-semiprotected": "(puolekse suojattu)",
+	"hiddencategories": "Tämä sivu kuuluu {{PLURAL:$1|1 peitettyh kategourieh|$1 peitettyh kategourieh}}:",
+	"permissionserrorstext-withaction": "Sinul ei ole lubua toimindoh $2 niškoi, {{PLURAL:$1|tämän syyn periä|nämmien syylöin periä}}:",
+	"moveddeleted-notice": "Tämä sivu on otettu iäre. Sivun iäreotandu- da siirdohistourii ollah annettu al viittavuksennu.",
+	"postedit-confirmation-saved": "Sinun kohendus tallendettih.",
+	"content-model-wikitext": "wikitekstu",
+	"content-model-text": "perustekstu",
+	"content-model-javascript": "JavaScript",
+	"content-json-empty-object": "Tyhjy objektu",
+	"viewpagelogs": "Ozuta tämän sivun logat",
+	"currentrev": "Jälgimäzin versii",
+	"currentrev-asof": "Sivun $1 jälgimäzin versii",
+	"revisionasof": "Versii $1",
+	"revision-info": "Versii $1 {{GENDER:$6|$2}}$7",
+	"previousrevision": "← Edelline",
+	"nextrevision": "Uvvembi versii →",
+	"currentrevisionlink": "Jälgimäine versii",
+	"cur": "nygöine",
+	"next": "tulii",
+	"last": "iel",
+	"page_first": "enzimäine",
+	"page_last": "jälgimäine",
+	"histfirst": "vahnin",
+	"histlast": "uuzin",
+	"historyempty": "(tyhjy)",
+	"rev-delundel": "vaihta nägyvys",
+	"rev-showdeleted": "ozuttua",
+	"revdelete-show-file-submit": "Muga",
+	"revdelete-radio-same": "(älä vaihta)",
+	"revdelete-radio-set": "Peitetty",
+	"revdelete-radio-unset": "Nägövil",
+	"pagehist": "Sivuhistourii",
+	"history-title": "Sivun \"$1\" versiihistourii",
+	"difference-title": "Sivun \"$1\" versielöin eroloi",
+	"lineno": "Rivi $1:",
+	"editundo": "Hylgiä",
+	"diff-multi-sameuser": "({{PLURAL:$1|Yksi keskitazon versii |$1 keskitazon versiedy}} samal käyttäjälpäi ei ozutettu)",
+	"searchresults": "Eččimizen tulokset",
+	"searchresults-title": "Eči \"$1\"",
+	"prevn": "ielline {{PLURAL:$1|$1}}",
+	"nextn": "tulii {{PLURAL:$1|$1}}",
+	"prev-page": "ielline sivu",
+	"next-page": "tulii sivu",
+	"nextn-title": "Tulii $1 {{PLURAL:$1|tulos|tulokset}}",
+	"shown-title": "Ozuttua $1 {{PLURAL:$1|tulos|tulostu}} sivul",
+	"viewprevnext": "Ozuta ($1 {{int:pipe-separator}} $2) ($3)",
+	"searchmenu-new": "<strong>Luaji sivu \"[[:$1]]\" täh wikih!</strong> {{PLURAL:$2|0=|Kačo sežo sinun eččol löytyt sivut.|Kačo sežo löytyt eččon tulokset.}}",
+	"searchprofile-articles": "Yhtevyssivu",
+	"searchprofile-images": "Multimedii",
+	"searchprofile-everything": "Kaikkiel",
+	"searchprofile-advanced": "Eči tarkembah",
+	"searchprofile-articles-tooltip": "Eči kohtas $1",
+	"searchprofile-images-tooltip": "Eči failat",
+	"searchprofile-everything-tooltip": "Eči kaikil sivuloil (dai paginois)",
+	"searchprofile-advanced-tooltip": "Eči nämmien nimitiloin keskes",
+	"search-result-size": "$1 ({{PLURAL:$2|1 sana|$2 sanua}})",
+	"search-redirect": "(siirretty $1)",
+	"search-section": "(alalugu $1)",
+	"search-suggest": "Tarkoititgo: $1",
+	"search-interwiki-more": "(enämbi)",
+	"search-relatedarticle": "Eči yhtenjyttymii sivuloi",
+	"searchrelated": "yhtenjyttymät",
+	"searchall": "kai",
+	"search-showingresults": "{{PLURAL:$4|Tulos <strong>$1</strong> / <strong>$3</strong>|Tulokset <strong>$1 - $2</strong> / <strong>$3</strong>}}",
+	"search-nonefound": "Kyzelyh ei löydynyh tuloksii.",
+	"powersearch-legend": "Levitetty eččo",
+	"powersearch-togglelabel": "Valliče:",
+	"powersearch-toggleall": "Kai",
+	"powersearch-togglenone": "Nimidä",
+	"mypreferences": "Azetukset",
+	"prefs-edits": "Edituičendoi kaikkiedah:",
+	"prefs-skin": "Kettu",
+	"prefs-user-pages": "Käyttäisivut",
+	"prefs-watchlist": "Valvondulistu",
+	"prefs-resetpass": "Vaihta peittosana",
+	"prefs-changeemail": "Vaihta sähköpoštuadressu",
+	"prefs-setemail": "Kirjuta sähköpoštuadressu",
+	"saveprefs": "Tallenda",
+	"rows": "Riädyy:",
+	"searchresultshead": "Eččie",
+	"timezoneregion-africa": "Afrikku",
+	"timezoneregion-america": "Amerikku",
+	"timezoneregion-antarctica": "Antarktikku",
+	"timezoneregion-arctic": "Artikku",
+	"timezoneregion-asia": "Aazii",
+	"timezoneregion-atlantic": "Atlantine valdumeri",
+	"timezoneregion-australia": "Australii",
+	"timezoneregion-europe": "Jevrouppu",
+	"timezoneregion-indian": "Indien meri",
+	"timezoneregion-pacific": "Tyyni valdumeri",
+	"prefs-searchoptions": "Eččie",
+	"prefs-namespaces": "Nimilöin tilat",
+	"youremail": "Sähköpoštu:",
+	"username": "{{GENDER:$1|Käyttäinimi}}:",
+	"yourlanguage": "Kieli:",
+	"yournick": "Uuzi allekirjutus:",
+	"yourgender": "Sugupuoli:",
+	"gender-unknown": "Jätän valličemattah",
+	"gender-male": "Mies",
+	"gender-female": "Naine",
+	"prefs-help-gender": "Tämän azetuksen valliččemine on omatahtostu.\nProgrammu käyttäy annettuu tieduo, ku viitata sinuh oigiel kieliopillizel terminäl. \nTämä tiedo on julgine.",
+	"email": "Sähköpoštu",
+	"prefs-help-realname": "Oigien nimen andamine on omatahtostu.\nOllou annettu, sidä voijah käyttiä luadijan sanelendah.",
+	"prefs-help-email": "Sähköpoštuadresan andamine on omatahtostu, no se pidäy ku kyzyö uuzi peittosana, ku unohtannet sinun peittosanan.",
+	"prefs-help-email-required": "Sähköpoštuadressu vältämättäh pidäy.",
+	"prefs-info": "Perustiijot",
+	"prefs-signature": "Allekirjutus",
+	"prefs-advancedrc": "Ližäazetukset",
+	"prefs-advancedrendering": "Ližäazetukset",
+	"prefs-advancedsearchoptions": "Ližäazetukset",
+	"prefs-advancedwatchlist": "Ližäazetukset",
+	"prefs-tokenwatchlist": "Avain",
+	"userrights-user-editname": "Kirjuta käyttäitunnus:",
+	"userrights-groupsmember": "Yhtynnyönny joukkoloih:",
+	"group-user": "Käyttäjät",
+	"group-all": "(kai)",
+	"right-read": "Lugie sivuloi",
+	"right-edit": "Edituija sivuloi",
+	"right-createpage": "Luadie sivuloi (kudamat ei olla paginsivuloi)",
+	"right-createtalk": "Luadie paginsivuloi",
+	"right-createaccount": "Luadie uuzii käyttäitunnuksii",
+	"right-minoredit": "Merkitä edituičendoi pienikse",
+	"right-move": "Siirrä sivut",
+	"right-move-subpages": "Siirrä sivut alisivuloinke",
+	"right-move-rootuserpages": "Siirdiä käyttäisivuloi",
+	"right-move-categorypages": "Siirdiä kategouriisivuloi",
+	"right-movefile": "Siirdiä failoi",
+	"right-writeapi": "Käytä API:i",
+	"newuserlogpage": "Uuzien käyttäjien luvettelo",
+	"action-read": "luve tämä sivu",
+	"action-move": "siirrä tämä sivu",
+	"action-move-subpages": "siirrä tämä sivu, da sen alisivut",
+	"action-movefile": "siirrä tämä failu",
+	"enhancedrc-history": "histourii",
+	"recentchanges": "Uvvet korjavukset",
+	"recentchanges-legend": "Tuorehien muutoksien azetukset",
+	"recentchanges-summary": "Jällitä kaikkii jälgimäzet muutokset wikih täl sivul.",
+	"recentchanges-label-newpage": "Tämä korjavus on johtanuh uvven sivun luadimizeh",
+	"recentchanges-label-minor": "Tämä on pieni korjavus",
+	"recentchanges-label-bot": "Tämän muutoksen on luadinuh bot",
+	"recentchanges-label-unpatrolled": "Tädä korjuandua vie ei ole tarkistettu",
+	"recentchanges-label-plusminus": "Sivu on kazvanuh [] baital",
+	"recentchanges-legend-heading": "'''Legendu:'''",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (kačo sežo [[Special:NewPages|uuzien sivuloin listu]])",
+	"rclistfrom": "Ozuta jälgimäzet muutokset algajen $2, $3",
+	"rcshowhideminor": "$1 pienet muutokset",
+	"rcshowhideminor-show": "Ozuta",
+	"rcshowhideminor-hide": "Peitä",
+	"rcshowhidebots": "$1 botat",
+	"rcshowhidebots-show": "Ozuta",
+	"rcshowhidebots-hide": "Peitä",
+	"rcshowhideliu": "$1 registruittuu käyttäjiä",
+	"rcshowhideliu-hide": "Peitä",
+	"rcshowhideanons": "$1 anoniimua käyttäjiä",
+	"rcshowhideanons-show": "Ozuta",
+	"rcshowhideanons-hide": "Peitä",
+	"rcshowhidepatr-show": "Ozuttua",
+	"rcshowhidepatr-hide": "Peittiä",
+	"rcshowhidemine": "$1 minun kohendukset",
+	"rcshowhidemine-show": "Ozuta",
+	"rcshowhidemine-hide": "Peitä",
+	"rclinks": "Ozuta jälgimäzet $1 muutostu jälgimäzen $2 päivän aijannu<br />$3",
+	"diff": "erot",
+	"hist": "Histourii",
+	"hide": "Peitä",
+	"show": "Ozuta",
+	"minoreditletter": "p",
+	"newpageletter": "U",
+	"boteditletter": "b",
+	"rc-change-size-new": "Kogo jälles muutoksii: $1 {{PLURAL:$1|baitu|baitua}}",
+	"recentchangeslinked": "Koskijat muutokset",
+	"recentchangeslinked-toolbox": "Toine toizeh liittyjät korjavukset",
+	"recentchangeslinked-title": "Muutokset koskijen sivuu \"$1\"",
+	"recentchangeslinked-summary": "Tämä on nengomien sivuloin korjavuksien luvettelo, kudamih viittuau tämä sivu (libo sih kategourieh kuulujat).Sivut, kudamat kuulutah [[Special:Watchlist|teijän valvonduluvettelo]], ollah  <strong>bold</strong>.",
+	"recentchangeslinked-page": "Sivun nimi:",
+	"recentchangeslinked-to": "Ozuta linkitetyn sivun muutokset annetun sivun sijah",
+	"upload": "Ližiä tiijosto",
+	"filedesc": "Yhtehvedo",
+	"fileuploadsummary": "Yhtehvedo:",
+	"filereuploadsummary": "Muutokset failah:",
+	"filesource": "Lähteh:",
+	"filename-tooshort": "Failunimi on liijan lyhyt.",
+	"watchthisupload": "Valvo tädä failua",
+	"upload-dialog-button-save": "Tallenda",
+	"upload-dialog-label-infoform-title": "Tiijot",
+	"upload-dialog-label-infoform-name": "Nimi",
+	"upload-dialog-label-infoform-description": "Kuvavus",
+	"upload-dialog-label-usage-title": "Käyttö",
+	"upload-dialog-label-usage-filename": "Failunimi",
+	"license-header": "Licenzii",
+	"imgfile": "tiijosto",
+	"listfiles_name": "Nimi",
+	"listfiles_user": "Käyttäi",
+	"listfiles_size": "Kogo",
+	"listfiles_description": "Kuvavus",
+	"listfiles_count": "Versii",
+	"listfiles-latestversion": "Nygöine versii",
+	"listfiles-latestversion-yes": "Muga",
+	"listfiles-latestversion-no": "Ei",
+	"file-anchor-link": "Failu",
+	"filehist": "Kačo histourii",
+	"filehist-help": "Klikkua päivymiäriä/aigua kaččuo, mittuine failu oli silloi",
+	"filehist-current": "Nygöine",
+	"filehist-datetime": "Päivymiäry/aigu",
+	"filehist-thumb": "Kuvahaine",
+	"filehist-thumbtext": "Pieni kogo versieh $1",
+	"filehist-user": "Käyttäi",
+	"filehist-dimensions": "Kogo",
+	"filehist-comment": "Huomahtus",
+	"imagelinks": "Failan käyttö",
+	"linkstoimage": "{{PLURAL:$1|Tämä sivu linkittähes|$1 Nämmä sivut linkittiäkseh}} täh failah:",
+	"nolinkstoimage": "Täh tiijostoh viittuajua sivuu ei ole.",
+	"sharedupload-desc-here": "Tädä failua $1 ymbäristös voibi sežo käyttiä toizis projektois.\nSen kuvavus [$2 sivun kuvavuksen] on alemba.",
+	"upload-disallowed-here": "Et voi kirjuttua tämän failan piäle.",
+	"randompage": "Sattumanvaraine sivu",
+	"statistics": "Statistiekat",
+	"statistics-header-pages": "Sivustatistiekat",
+	"statistics-header-users": "Käyttäistatistiekat",
+	"statistics-header-hooks": "Toizet statistiekat",
+	"statistics-articles": "Syväindösivut",
+	"statistics-pages": "Sivut",
+	"nbytes": "$1 {{PLURAL:$1|baitu|baitua}}",
+	"nmembers": "$1 {{PLURAL:$1|käyttäi|käyttäjiä}}",
+	"newpages": "Uvvet sivut",
+	"newpages-username": "Käyttäinimi:",
+	"ancientpages": "Vahnimat sivut",
+	"move": "Siirrä",
+	"movethispage": "Siirrä tämä sivu",
+	"pager-older-n": "{{PLURAL:$1|vahnembi 1|vahnembi $1}}",
+	"booksources": "Kniigulähtehet",
+	"booksources-search-legend": "Eči kniigulähtehii",
+	"booksources-search": "Eči",
+	"log": "Logat",
+	"allpages": "Kai sivut",
+	"nextpage": "Tulii sivu ($1)",
+	"prevpage": "Ielline sivu ($1)",
+	"allarticles": "Kai sivut",
+	"allpagessubmit": "Mene",
+	"categories": "Kategouriet",
+	"emailusername": "Käyttäinimi:",
+	"emailfrom": "Kespäi:",
+	"emailto": "Kelle:",
+	"emailsubject": "Teema:",
+	"emailmessage": "Viesti:",
+	"emailsend": "Työnnä",
+	"emailccme": "Työnnä minule koupii viestis.",
+	"watchlist": "Valvonduluvettelo",
+	"mywatchlist": "Valvonduluvettelo",
+	"addwatch": "Ližiä valvondulistah",
+	"watch": "Valvo",
+	"watchthispage": "Valvo tädä sivuu",
+	"unwatch": "Lope valvondu",
+	"unwatchthispage": "Lope valvondu",
+	"watching": "Valvotah...",
+	"unwatching": "Ei valvota...",
+	"dellogpage": "Iäreotanduhistourii",
+	"rollbacklink": "Tuo endine versii",
+	"rollbacklinkcount": "mene järilleh $1 {{PLURAL:$1|edituičendu|edituičendua}}",
+	"protectlogpage": "Suojavushistourii",
+	"undelete-show-file-submit": "Muga",
+	"namespace": "Nimitilat:",
+	"invert": "Piänvastaine valličendu",
+	"tooltip-invert": "Tahtonet peittiä tämän sivun muutokset vallitul nimitilal, valliče tämä kohtu.",
+	"namespace_association": "Liittyjät nimitilat",
+	"tooltip-namespace_association": "Tahtonet kerale sežo vallittuh nimitilah liittyjät pagin- libo tiemunimitilat, valliče tämä kohtu.",
+	"blanknamespace": "(Piä)",
+	"contributions": "{{GENDER:$1|Käyttäi}} kirjutukset",
+	"mycontris": "Kirjutukset",
+	"month": "Täs kuus (libo aijembi)",
+	"year": "Tänävuon (libo aijembi):",
+	"whatlinkshere": "Linkit tänne",
+	"whatlinkshere-title": "Sivut, kudamat kosketah sivuu \"$1\"",
+	"whatlinkshere-page": "Sivu:",
+	"linkshere": "Nämmä sivut linkittiäkseh sivuh <strong>[[:$1]]</strong>:",
+	"isredirect": "uvvellehohjavussivu",
+	"istemplate": "sižällyttämine",
+	"isimage": "failan linku",
+	"whatlinkshere-prev": "{{PLURAL:$1|ielline|ielline $1}}",
+	"whatlinkshere-next": "{{PLURAL:$1|tulii|tulii $1}}",
+	"whatlinkshere-links": "← linkat",
+	"whatlinkshere-hideredirs": "$1 uvvellehohjavukset",
+	"whatlinkshere-hidetrans": "$1 sižällyttämizet",
+	"whatlinkshere-hidelinks": "$1 linkat",
+	"whatlinkshere-filters": "Filtrat",
+	"blocklink": "Lukiče",
+	"contribslink": "korjavukset",
+	"movelogpage": "Siirrä loga",
+	"export": "Vie sivut",
+	"allmessages-language": "Kieli:",
+	"allmessages-filter-submit": "Mene",
+	"allmessages-filter-translate": "Kiännä",
+	"thumbnail-more": "Suurendua",
+	"filemissing": "Failua ei ole",
+	"tooltip-pt-userpage": "Sinun käyttäisivu",
+	"tooltip-pt-mytalk": "Sinun paginsivu",
+	"tooltip-pt-preferences": "Sinun azetukset",
+	"tooltip-pt-watchlist": "Listu sivulois kudamien muutoksii valvot",
+	"tooltip-pt-mycontris": "Listu sinun kirjutuksis",
+	"tooltip-pt-login": "Täs voibi registriiruijakseh, ga se ei ole vältämätöi",
+	"tooltip-pt-logout": "Kirjuttai ullos",
+	"tooltip-pt-createaccount": "Voit registriiruijakseh da kirjuttuakseh järjestelmäh, ga se ei ole vältämätöi",
+	"tooltip-ca-talk": "Pagize piäsivun sizäldös",
+	"tooltip-ca-edit": "Korjua tädä sivuu",
+	"tooltip-ca-addsection": "Luaji uuzi alalugu",
+	"tooltip-ca-viewsource": "Tämä sivu on suojattu. Voit kaččuo sen lähtehkoudan",
+	"tooltip-ca-history": "Tämän sivun jälgimäzet muutokset",
+	"tooltip-ca-move": "Siirrä tämä sivu",
+	"tooltip-ca-watch": "Ližiä tämä sivu omah valvonduluvetteloh",
+	"tooltip-search": "Eči {{SITENAME}}",
+	"tooltip-search-go": "Mennä sivule, kudamal on sama nimi",
+	"tooltip-search-fulltext": "Eči sivuloi, kudamis on tädä tekstua",
+	"tooltip-p-logo": "Mene piäsivule",
+	"tooltip-n-mainpage": "Mene piäsivule",
+	"tooltip-n-mainpage-description": "Mene piäsivule",
+	"tooltip-n-portal": "Täs projektas, midä voit ruadua, kus midä on",
+	"tooltip-n-currentevents": "Ližätieduo aijankohtazis tapahtumis",
+	"tooltip-n-recentchanges": "Luvettelo vaste luajittulois wikimuutoksis",
+	"tooltip-n-randompage": "Kačo sattumastu sivuu",
+	"tooltip-n-help": "Täs voit kyzyö abuu",
+	"tooltip-t-whatlinkshere": "Kaikkien sivuloin luvettelo, kudamis on linki täh sivuh",
+	"tooltip-t-recentchangeslinked": "Jälgimäzet muutokset sivuloil, kudamile on linki täl sivul",
+	"tooltip-feed-atom": "Atom-syöttö täh sivuh",
+	"tooltip-t-contributions": "Listu tämän käyttäjän kirjutuksis",
+	"tooltip-t-upload": "Ližiä tiijostot",
+	"tooltip-t-specialpages": "Kaikkien erikozien sivuloin luvettelo",
+	"tooltip-t-print": "Tämän sivun tulostettavu versii",
+	"tooltip-t-permalink": "Pyzyi linki tämän sivun versieh",
+	"tooltip-ca-nstab-main": "Kačo piäsivun sizäldö",
+	"tooltip-ca-nstab-user": "Ozuta käyttäisivu",
+	"tooltip-ca-nstab-special": "Tämä on erikoine sivu, sidä ei voi korjata",
+	"tooltip-ca-nstab-project": "Ozuta projektusivu",
+	"tooltip-ca-nstab-image": "Kačo failan sivu",
+	"tooltip-ca-nstab-template": "Ozuta Å¡ablon",
+	"tooltip-ca-nstab-category": "Kategourien sivu",
+	"tooltip-save": "Tallenda muutokset",
+	"tooltip-preview": "Ezikačo muutokset. Ole hyvä, luaji nenga ainos enne tallendamistu!",
+	"tooltip-diff": "Ozuta sinun luajitut muutokset tekstah",
+	"tooltip-rollback": "Yhtel painalluksel poistua jälgimäine korjavus",
+	"tooltip-undo": "\"Kumua\" tuou järilleh aijemban edituičenduversien da avuau edituičenduankietan ezikaččelendutilas. Sen vuoh voi ližätä kumuandumotiivan yhtehvevos.",
+	"tooltip-summary": "Kirjuta lyhyt kuvavus",
+	"simpleantispam-label": "Anti-spam-tarkistus. \n<strong>älä</strong> täytä!",
+	"pageinfo-toolboxlink": "Sivun tiijot",
+	"pageinfo-protect-cascading-yes": "Muga",
+	"previousdiff": "Vahnembi muutos",
+	"nextdiff": "Uvvembi muutos →",
+	"file-info-size": "$1 × $2 pikselii, failan kogo: $3, MIME-laji: $4",
+	"file-nohires": "Ei korgiembua rezoluciedu suadavannu.",
+	"svg-long-desc": "SVG-failu, nimellizesti $1 × $2 pikselua, failan kogo: $3",
+	"show-big-image": "Alguperäine failu",
+	"show-big-image-preview": "Tämän failan kogo: $1.",
+	"show-big-image-other": "Toine {{PLURAL:$2|resolution|resolutions}}: $1.",
+	"show-big-image-size": "$1 × $2 pikselii",
+	"metadata": "Metatiijostot",
+	"metadata-help": "Failah kuulutah ližätiijot, kudamii tavan mugah ližätäh digikameroil libo skanneroil. Gu failua oldaneh korjattu jälles sen enzimästy julguamistu, erähät parametrat voijah erota nygözes kuvas.",
+	"metadata-fields": "Kuvan metatiedoloin kentät, kudamat ollah täs luvettelos, ruvetah nägymäh kuvan sivul, konzu metatiedoloin taulukko ei rodei nägyvis. Toizet kentät roijah sultetut automuattizesti.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
+	"exif-orientation": "Orientacii",
+	"exif-xresolution": "Horizontualine rezolucii",
+	"exif-yresolution": "Vertikualine rezolucii",
+	"exif-datetime": "Tiijoston muutospäivy da -aigu",
+	"exif-make": "Kameran valmistai",
+	"exif-model": "Kamerumodellu",
+	"exif-software": "Käytetty programmu",
+	"exif-exifversion": "Exif-versii",
+	"exif-colorspace": "Väritila",
+	"exif-datetimeoriginal": "Suaduloin tiedoloin päivy da aigu",
+	"exif-datetimedigitized": "Digituimizen päivy da aigu",
+	"exif-orientation-1": "Tavalline",
+	"exif-subjectdistancerange-0": "Tundematoi",
+	"namespacesall": "kai",
+	"monthsall": "kai",
+	"quotation-marks": "\"$1\"",
+	"imgmultipageprev": "← ielline sivu",
+	"imgmultipagenext": "tulii sivu →",
+	"imgmultigo": "Mene!",
+	"imgmultigoto": "Mene sivule $1",
+	"table_pager_first": "Enzimäine sivu",
+	"table_pager_last": "Jälgimäine sivu",
+	"table_pager_limit_submit": "Mene",
+	"table_pager_empty": "Ei tuloksii",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|pagize]])",
+	"specialpages": "Erikozet sivut",
+	"tag-filter": "[[Special:Tags|Tag]] filtru:",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Merki|Merkii}}]]: $2)",
+	"tags-edit-existing-tags-none": "\"Nimidä\"",
+	"compare-page1": "Sivu 1",
+	"compare-page2": "Sivu 2",
+	"htmlform-no": "Ei",
+	"htmlform-yes": "Muga",
+	"logentry-delete-delete": "$1 {{GENDER:$2|iäreotettu}} sivu $3",
+	"logentry-move-move": "$1 {{GENDER:$2|siirretty}} sivu $3 kohtah $4",
+	"logentry-newusers-create": "Käyttäi $1 oli perustettu $2",
+	"logentry-upload-upload": "$1 {{GENDER:$2|päivitetty}} $3",
+	"rightsnone": "(nimidä)",
+	"searchsuggest-search": "Eči",
+	"mw-widgets-titleinput-description-new-page": "sivuu ei vie ole"
+}
diff --git a/languages/i18n/pl.json b/languages/i18n/pl.json
index 826921efec..4693f77d56 100644
--- a/languages/i18n/pl.json
+++ b/languages/i18n/pl.json
@@ -501,6 +501,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|strona|strony|stron}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|aktywny użytkownik|aktywnych użytkowników}} w ostatnim miesiącu",
 	"badretype": "Wprowadzone hasła różnią się między sobą.",
+	"usernameinprogress": "Tworzenie konta dla tej nazwy użytkownika jest już w toku.\nProszę czekać.",
 	"userexists": "Wybrana przez Ciebie nazwa użytkownika jest już zajęta.\nWybierz inną nazwę użytkownika.",
 	"loginerror": "Błąd logowania",
 	"createacct-error": "Błąd tworzenia konta",
@@ -990,7 +991,8 @@
 	"rows": "Wiersze:",
 	"columns": "Kolumny:",
 	"searchresultshead": "Wyszukiwanie",
-	"stub-threshold": "Maksymalny (w bajtach) rozmiar strony oznaczanej jako <a href=\"#\" class=\"stub\">zalążek (stub)</a>:",
+	"stub-threshold": "Maksymalny rozmiar strony oznaczanej jako zalążek ($1):",
+	"stub-threshold-sample-link": "przykład",
 	"stub-threshold-disabled": "Wyłączone",
 	"recentchangesdays": "Liczba dni prezentowanych w ostatnich zmianach:",
 	"recentchangesdays-max": "(maksymalnie $1 {{PLURAL:$1|dzień|dni}})",
@@ -2371,7 +2373,7 @@
 	"tooltip-ca-nstab-main": "Zobacz stronę treści",
 	"tooltip-ca-nstab-user": "Zobacz stronę osobistą użytkownika",
 	"tooltip-ca-nstab-media": "Zobacz stronę pliku",
-	"tooltip-ca-nstab-special": "To jest strona specjalna. Nie możesz jej edytować.",
+	"tooltip-ca-nstab-special": "To jest strona specjalna i nie można jej edytować.",
 	"tooltip-ca-nstab-project": "Zobacz stronę projektu",
 	"tooltip-ca-nstab-image": "Zobacz stronę grafiki",
 	"tooltip-ca-nstab-mediawiki": "Zobacz komunikat systemowy",
diff --git a/languages/i18n/pms.json b/languages/i18n/pms.json
index 26cf2d067b..f42c4717c9 100644
--- a/languages/i18n/pms.json
+++ b/languages/i18n/pms.json
@@ -354,8 +354,8 @@
 	"actionthrottled": "Assion limità",
 	"actionthrottledtext": "Për evité che 'd gent ò 'd màchine an carìo dla rumenta, st'assion-sì as peul nen fesse tròp ëd soèns, e chiel a l'ha arpetula tròpe vire. Ch'a sia gentil, ch'a preuva torna antra dontré minute.",
 	"protectedpagetext": "Sta pàgina-sì a l'è stàita blocà për evité 'd modìfiche o d'àutre assion.",
-	"viewsourcetext": "A peul vardé e copié la sorgiss dë sta pàgina:",
-	"viewyourtext": "A peul vëdde e copié la sorgiss ëd '''soe modìfiche''' a costa pàgina-sì:",
+	"viewsourcetext": "A peul vardé e copié la sorgiss dë sta pàgina.",
+	"viewyourtext": "A peul vëdde e copié la sorgiss ëd <strong>soe modìfiche</strong> a costa pàgina-sì.",
 	"protectedinterface": "Costa pàgina-sì a l'ha andrinta un cheicòs che a fa part dl'antërfacia dël programa che a deuvro tùit; donca a l'é proteta për evité che a-i rivo dle ròbe brute.\nPër gionté o modifiché dle tradussion për tute le wiki, për piasì ch'a deuvra [//translatewiki.net/ translatewiki.net], ël proget ëd localisassion ëd MediaWiki.",
 	"editinginterface": "<strong>Dossman!</strong> A l'é dapress ch'a modìfica na pàgina ch'as deuvra për generé ël test dl'antërfacia dël programa. \nLe modìfiche a sta pàgina a toco l'aparensa ëd l'antërfacia utent a tuti j'utent dzora a sta wiki.",
 	"translateinterface": "Për gionté o modifiché le tradussion për tute le wiki, për piasì ch'a deuvra [//translatewiki.net/ translatewiki.net], ël proget ëd localisassion ëd MediaWiki.",
@@ -435,6 +435,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pàgina|pàgine}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contributor}} recent",
 	"badretype": "Le doe ciav che a l'ha scrivù a resto diferente antra 'd lor.",
+	"usernameinprogress": "Na creassion ëd cont për së stranòm a l'é già an cors. Ch'a l'abia passiensa.",
 	"userexists": "Lë stranòm anserì a l'é già dovrà.\nPër piasì ch'a serna në stranòm diferent.",
 	"loginerror": "Eror ën rintrand ant ël sistema",
 	"createacct-error": "Eror durant la creassion dël cont",
@@ -870,6 +871,7 @@
 	"search-category": "(categorìa $1)",
 	"search-file-match": "(a corëspond al contnù d'archivi)",
 	"search-suggest": "Vorìi-lo pa dì: $1",
+	"search-rewritten": "Visualisassion dj'arzultà për $1. Sërché nopà $2.",
 	"search-interwiki-caption": "Proget frej",
 	"search-interwiki-default": "Arzultà da $1:",
 	"search-interwiki-more": "(ëd pì)",
@@ -923,7 +925,8 @@
 	"rows": "Righe:",
 	"columns": "Colòne:",
 	"searchresultshead": "Specifiché soe preferense d'arserca",
-	"stub-threshold": "Valor mìnim për j'<a href=\"#\" class=\"stub\">anliure a jë sbòss</a>:",
+	"stub-threshold": "Valor mìnim për buté an forma j'anliure dë sbòss ($1):",
+	"stub-threshold-sample-link": "esempi",
 	"stub-threshold-disabled": "Disabilità",
 	"recentchangesdays": "Vàire dì smon-e ant j'ùltime modìfiche:",
 	"recentchangesdays-max": "(al pì $1 {{PLURAL:$1|di|di}})",
@@ -1210,8 +1213,8 @@
 	"newpageletter": "N",
 	"boteditletter": "t",
 	"number_of_watching_users_pageview": "[tnùa sot-euj da {{PLURAL:$1|n'utent|$1 utent}}]",
-	"rc_categories": "Limité a le categorìe (che a jë scriva separand-je antra 'd lor con un \"|\")",
-	"rc_categories_any": "Qualsëssìa",
+	"rc_categories": "Limité a le categorìe (che a jë scriva separand-je antra 'd lor con un \"|\"):",
+	"rc_categories_any": "Un-a qualsëssìa ëd cole selessionà",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|byte}} apress ij cambi",
 	"newsectionsummary": "/* $1 */ session neuva",
 	"rc-enhanced-expand": "Mostré ij detaj",
@@ -1298,6 +1301,8 @@
 	"uploaded-href-attribute-svg": "J'atribù <code>&lt;$1 $2=\"$3\"&gt;</code> con un bërsaj nen local (për esempi http://, javascript:, e via fòrt) a son nen përmëttù ant j'archivi SVG.",
 	"uploaded-href-unsafe-target-svg": "href ver un bërsaj nen sigur <code>&lt;$1 $2=\"$3\"&gt;</code> trovà ant l'archivi SVG carià.",
 	"uploaded-animate-svg": "Trovà na tichëtta «animate», ch'a podrìa modifiché ël href an dovrand l'atribù «from» <code>&lt;$1 $2=\"$3\"&gt;</code> ant l'archivi SVG carià.",
+	"uploaded-setting-event-handler-svg": "Ël posissionament dj'atribù ëd mansé a l'é blocà, <code>&lt;$1 $2=\"$3\"&gt;</code> trovà ant l'archivi SVG carià.",
+	"uploaded-setting-href-svg": "L’usage dla tichëtta «set» për gionté n'atribù «href» a l’element pare a l'é blocà.",
 	"uploadscriptednamespace": "S'archivi SVG a conten në spassi nominal «$1» nen autorisà",
 	"uploadinvalidxml": "L'XML ant l'archivi carià a l'ha nen podù esse analisà.",
 	"uploadvirus": "St'archivi-sì a l'han andrinta un '''vìrus!''' Detaj: $1",
@@ -2253,7 +2258,7 @@
 	"tooltip-pt-logout": "Seurte da",
 	"tooltip-pt-createaccount": "I-j consejoma ëd creé un cont e ëd rintré ant ël sistema; però a l'é nen obligatòri",
 	"tooltip-ca-talk": "Discussion ansima a sta pàgina ëd contnù.",
-	"tooltip-ca-edit": "A peul modifiché sa pàgina-sì. Për piasì, che as fasa na preuva anans che salvé.",
+	"tooltip-ca-edit": "Modifiché costa pàgina",
 	"tooltip-ca-addsection": "Ancaminé na neuva session",
 	"tooltip-ca-viewsource": "Sta pàgina-sì a l'é protegiùa.\nA peul visualisene la sorgiss",
 	"tooltip-ca-history": "Veje version dla pàgina.",
@@ -2289,7 +2294,7 @@
 	"tooltip-ca-nstab-main": "Vardé la pàgina ëd contnù.",
 	"tooltip-ca-nstab-user": "Vardé la pàgina Utent.",
 	"tooltip-ca-nstab-media": "Vardé la pàgina dël mojen",
-	"tooltip-ca-nstab-special": "Costa a l'é na pàgina special, a peul nen modifichela.",
+	"tooltip-ca-nstab-special": "Costa a l'é na pàgina special, e a peul nen esse modificà",
 	"tooltip-ca-nstab-project": "Vardé la pàgina proteta.",
 	"tooltip-ca-nstab-image": "Vardé la pàgina dl'archivi",
 	"tooltip-ca-nstab-mediawiki": "Vardé ël mëssagi ëd sistema.",
@@ -2329,7 +2334,7 @@
 	"spam_reverting": "Butà andaré a l'ùltima version che a l'avèissa pa andrinta dj'anliure a $1",
 	"spam_blanking": "Pàgina dësvujdà, che tute le version a l'avìo andrinta dj'anliure a $1",
 	"spam_deleting": "Scancelà, dagià che tute le revision a contnisìo dle liure a $1",
-	"simpleantispam-label": "Contròl contra la rumenta.\nCompilé '''NEN''' sòn!",
+	"simpleantispam-label": "Contròl contra la rumenta.\nCompilé <strong>NEN</strong> sòn!",
 	"pageinfo-title": "Anformassion për «$1»",
 	"pageinfo-not-current": "J'anformassion a peulo mach esse smonùe për la revision an cors.",
 	"pageinfo-header-basic": "Anformassion ëd base",
diff --git a/languages/i18n/ps.json b/languages/i18n/ps.json
index c37ec0ee34..0f8da479e9 100644
--- a/languages/i18n/ps.json
+++ b/languages/i18n/ps.json
@@ -321,6 +321,7 @@
 	"badtitle": "ناسم سرليک",
 	"badtitletext": "ستاسې د غوښتل شوي مخ سرليک سم نه وو، يا مو د سرليک ځای تش وو او يا هم د ژبو خپلمنځي تړنې څخه يا د ويکي گانو خپلمنځي سرليکونو څخه يو ناسم توری مو پکې کارولی وي.\nکېدای شي چې ستاسې په ورکړ شوي سرليک کې يو يا څو داسې توري وي چې د سرليک په توگه بايد و نه کارېږي.",
 	"title-invalid-interwiki": "په سرليک کې يوه ويکي خپلمنځي تړنه ده",
+	"perfcached": "لاندينی اومتوک په حافظه کې ساتل شوی او کېدای شي اوسمهاله شوی نه وي.  اکثر بريد له مخې {{PLURAL:$1|يوه پايله|$1 پايلې}} په حافظه کې شته.",
 	"querypage-no-updates": "د دې مخ اوسمهالېدنې ناچارن شوي.\nپه ښکاره توگه د دې ځای اومتوک به نه وي تازه شوي.",
 	"viewsource": "سرچينه کتل",
 	"viewsource-title": "د $1 سرچينه کتل",
@@ -772,6 +773,7 @@
 	"rows": "ليکې:",
 	"columns": "ستنې:",
 	"searchresultshead": "پلټل",
+	"stub-threshold-sample-link": "مخبېلگه",
 	"stub-threshold-disabled": "ناچارن",
 	"recentchangesdays": "د هغو ورځو شمېر وټاکی چې په وروستي بدلونو کې يې ليدل غواړی:",
 	"recentchangesdays-max": "حد اکثر $1 {{PLURAL:$1|ورځ|ورځې}}",
@@ -1078,6 +1080,19 @@
 	"upload-file-error": "کورنۍ ستونزه",
 	"upload-misc-error": "د پورته کېدنې نامالومه تېروتنه",
 	"upload-http-error": "د HTTP يوه ستونزه رامېنځ ته شوې: $1",
+	"upload-dialog-title": "دوتنه پورته کول",
+	"upload-dialog-error": "يوه ستونزه پېښه شوې",
+	"upload-dialog-warning": "يوه گواښنه رامېنځ ته شوه",
+	"upload-dialog-button-cancel": "ناگارل",
+	"upload-dialog-button-done": "ترسره شو",
+	"upload-dialog-button-save": "خوندي کول",
+	"upload-dialog-button-upload": "پورته کول",
+	"upload-dialog-label-select-file": "دوتنه ټاکل",
+	"upload-dialog-label-infoform-title": "ځانگړنې",
+	"upload-dialog-label-infoform-name": "نوم",
+	"upload-dialog-label-infoform-description": "څرگندونه",
+	"upload-dialog-label-usage-title": "کارېدنې",
+	"upload-dialog-label-usage-filename": "د دوتنې نوم",
 	"backend-fail-notexists": "د $1 په نوم دوتنه نشته.",
 	"backend-fail-delete": "د \"$1\" دوتنه ړنګه نه شوه.",
 	"backend-fail-alreadyexists": "د $1 دوتنه له پخوا نه شته.",
@@ -1776,7 +1791,7 @@
 	"tooltip-ca-nstab-main": "د مخ مېنځپانگه کتل",
 	"tooltip-ca-nstab-user": "د کارن پاڼه کتل",
 	"tooltip-ca-nstab-media": "د رسنۍ مخ کتل",
-	"tooltip-ca-nstab-special": "دا يو ځانگړی مخ دی، تاسې په دې مخ کې سمون نه شی کولای.",
+	"tooltip-ca-nstab-special": "دا يو ځانگړی مخ دی، او په دې مخ کې سمون نه کېږي.",
 	"tooltip-ca-nstab-project": "د پروژې مخ کتل",
 	"tooltip-ca-nstab-image": "د دوتنې مخ کتل",
 	"tooltip-ca-nstab-mediawiki": "د غونډال پيغامونه کتل",
@@ -1804,7 +1819,7 @@
 	"siteusers": "د {{SITENAME}} {{PLURAL:$2|کارن|کارنان}} $1",
 	"anonusers": "د {{SITENAME}} {{PLURAL:$2|ورکنومی کارن|ورکنومي کارنان}} $1",
 	"creditspage": "د دې مخ کرېډټونه",
-	"simpleantispam-label": "سپام-ضد څارنه.\nدا برخه <strong>مه </strong> ډکوئ!",
+	"simpleantispam-label": "سپام-ضد څارنه.\nدا برخه <strong>مه</strong> ډکوئ!",
 	"pageinfo-title": "د \"$1\" مالومات",
 	"pageinfo-header-basic": "بنسټيز مالومات",
 	"pageinfo-header-edits": "د سمون پېښليک",
diff --git a/languages/i18n/pt-br.json b/languages/i18n/pt-br.json
index d03c991829..2e423278d7 100644
--- a/languages/i18n/pt-br.json
+++ b/languages/i18n/pt-br.json
@@ -82,7 +82,8 @@
 			"Macofe",
 			"TheEduGobi",
 			"Araceletorres",
-			"L"
+			"L",
+			"Walesson"
 		]
 	},
 	"tog-underline": "Sublinhar links:",
@@ -231,14 +232,14 @@
 	"faq": "FAQ",
 	"faqpage": "Project:FAQ",
 	"actions": "Ações",
-	"namespaces": "Espaços nominais",
+	"namespaces": "Domínios",
 	"variants": "Variantes",
 	"navigation-heading": "Menu de navegação",
 	"errorpagetitle": "Erro",
 	"returnto": "Retornar para $1.",
 	"tagline": "De {{SITENAME}}",
 	"help": "Ajuda",
-	"search": "Pesquisar",
+	"search": "Pesquisa",
 	"searchbutton": "Pesquisar",
 	"go": "Ir",
 	"searcharticle": "Ir",
@@ -246,7 +247,7 @@
 	"history_short": "Histórico",
 	"updatedmarker": "atualizado desde a minha última visita",
 	"printableversion": "Versão para impressão",
-	"permalink": "Link permanente",
+	"permalink": "Ligação permanente",
 	"print": "Imprimir",
 	"view": "Ver",
 	"view-foreign": "Ver no $1",
@@ -268,7 +269,7 @@
 	"unprotectthispage": "Alterar a proteção desta página",
 	"newpage": "Página nova",
 	"talkpage": "Dialogar sobre esta página",
-	"talkpagelinktext": "discussão",
+	"talkpagelinktext": "Discussão",
 	"specialpage": "Página especial",
 	"personaltools": "Ferramentas pessoais",
 	"articlepage": "Ver página de conteúdo",
@@ -306,8 +307,8 @@
 	"copyrightpage": "{{ns:project}}:Direitos_de_autor",
 	"currentevents": "Eventos atuais",
 	"currentevents-url": "Project:Eventos atuais",
-	"disclaimers": "Exoneração de responsabilidade",
-	"disclaimerpage": "Project:Aviso_geral",
+	"disclaimers": "Termo de responsabilidade",
+	"disclaimerpage": "Project:Aviso geral",
 	"edithelp": "Ajuda de edição",
 	"helppage-top-gethelp": "Ajuda",
 	"mainpage": "Página principal",
@@ -316,7 +317,7 @@
 	"portal": "Portal comunitário",
 	"portal-url": "Project:Portal comunitário",
 	"privacy": "Política de privacidade",
-	"privacypage": "Project:Política_de_privacidade",
+	"privacypage": "Project:Política de privacidade",
 	"badaccess": "Erro de permissão",
 	"badaccess-group0": "Você não está autorizado a executar a ação requisitada.",
 	"badaccess-groups": "A ação que você tentou executar está limitada a usuários {{PLURAL:$2|do grupo|de um dos seguintes grupos}}: $1.",
@@ -364,7 +365,7 @@
 	"nstab-user": "Página d{{GENDER:{{BASEPAGENAME}}|o usuário|a usuária|e usuário(a)}}",
 	"nstab-media": "Página de mídia",
 	"nstab-special": "Página especial",
-	"nstab-project": "Página do projeto",
+	"nstab-project": "Página de projeto",
 	"nstab-image": "Arquivo",
 	"nstab-mediawiki": "Mensagem",
 	"nstab-template": "Predefinição",
@@ -425,12 +426,12 @@
 	"actionthrottled": "Ação controlada",
 	"actionthrottledtext": "Como medida \"anti-spam\", você se encontra impedido de realizar esta operação muitas vezes em um curto espaço de tempo; você já excedeu esse limite.\nTente novamente em alguns minutos.",
 	"protectedpagetext": "Esta página foi protegida contra novas edições ou ações relacionadas.",
-	"viewsourcetext": "Você pode ver e copiar o código desta página:",
-	"viewyourtext": "Pode ver e copiar o código fonte '''das suas edições''' nesta página:",
+	"viewsourcetext": "Você pode ver e copiar o código desta página.",
+	"viewyourtext": "Você pode ver e copiar o código fonte '''das suas edições''' a esta página.",
 	"protectedinterface": "Esta página fornece texto de interface ao software deste wiki, se encontrando protegida para prevenir abusos.\n\nPara adicionar ou alterar traduções em todos os wikis, utilize o [//translatewiki.net/ translatewiki.net], projeto de traduções do MediaWiki.",
 	"editinginterface": "'''Aviso:''' Você se encontra prestes a editar uma página que é utilizada para fornecer texto de interface ao software.\nAlterações nesta página irão afetar a aparência da interface de usuário para outros usuários deste wiki.\nPara alterar ou adicionar traduções, considere utilizar a [//translatewiki.net/wiki/Main_Page?setlang=pt-br translatewiki.net], um projeto destinado para a tradução do MediaWiki.",
 	"translateinterface": "Para adicionar ou modificar traduções para todas as wikis, por favor use  [//translatewiki.net/ translatewiki.net], o projeto de localização do MediaWiki.",
-	"cascadeprotected": "Esta página foi protegida contra edições por estar incluída {{PLURAL:$1|na página listada|nas páginas listadas}} a seguir, ({{PLURAL:$1|página essa que está protegida|páginas essas que estão protegidas}} com a opção de \"proteção progressiva\" ativada):\n$2",
+	"cascadeprotected": "Esta página foi protegida contra edições porque é transcluída na seguinte {{PLURAL: $1, | página, que é | páginas, que estão protegidas}} com a \"cascata\" opção ativada: $2",
 	"namespaceprotected": "Você não possui permissão para editar páginas no espaço nominal '''$1'''.",
 	"customcssprotected": "Você não tem permissão para editar esta página CSS, porque ele contém configurações pessoais de outro usuário.",
 	"customjsprotected": "Você não tem permissão para editar esta página de JavaScript, porque ele contém configurações pessoais de outro usuário.",
@@ -506,6 +507,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|página|páginas}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contribuidor|contribuidores}} recentes",
 	"badretype": "As senhas que você digitou não são iguais.",
+	"usernameinprogress": "Uma criação da conta para este nome de usuário já está em andamento. Por favor, aguarde.",
 	"userexists": "O nome de usuário fornecido já está em uso.\nEscolha um nome diferente.",
 	"loginerror": "Erro de autenticação",
 	"createacct-error": "Erro ao criar a conta",
@@ -705,11 +707,12 @@
 	"yourdiff": "Diferenças",
 	"copyrightwarning": "Por favor, note que todas as suas contribuições em {{SITENAME}} são consideradas como lançadas nos termos da licença $2 (veja $1 para detalhes). Se não deseja que o seu texto seja inexoravelmente editado e redistribuído de tal forma, não o envie.<br />\nVocê está, ao mesmo tempo, garantindo-nos que isto é algo escrito por você mesmo ou algo copiado de uma fonte de textos em domínio público ou similarmente de teor livre.\n'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS AUTORAIS SEM A DEVIDA PERMISSÃO!'''",
 	"copyrightwarning2": "Por favor, note que todas as suas contribuições em {{SITENAME}} podem ser editadas, alteradas ou removidas por outros contribuidores. Se você não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />\nVocê está, ao mesmo tempo, a garantir-nos que isto é algo escrito por si, ou algo copiado de alguma fonte de textos em domínio público ou similarmente de teor livre (veja $1 para detalhes).\n'''NÃO ENVIE TRABALHO PROTEGIDO POR DIREITOS DE AUTOR SEM A DEVIDA PERMISSÃO!'''",
+	"editpage-cannot-use-custom-model": "O modelo de conteúdo desta página não pode ser alterado.",
 	"longpageerror": "'''Erro: O texto que submeteu ocupa {{PLURAL:$1|um kilobyte|$1 kilobytes}}, que excede o máximo de {{PLURAL:$2|um kilobyte|$2 kilobytes}}.'''\nA página não pode ser salva.",
 	"readonlywarning": "'''Aviso: O banco de dados foi bloqueado para manutenção, por isso você não poderá salvar a sua edição neste momento.'''\nTalvez você queira copiar o seu texto num editor externo e guardá-lo, para posterior envio.\n\nQuem bloqueou o banco de dados forneceu a seguinte explicação: $1",
 	"protectedpagewarning": "'''Atenção: Esta página foi protegida para que apenas usuários com privilégios de administrador possam editá-la.'''\nA última entrada no histórico é fornecida abaixo como referência:",
 	"semiprotectedpagewarning": "'''Nota:''' Esta página foi protegida, sendo que apenas usuários registrados poderão editá-la.\nA última entrada no histórico é fornecida abaixo para referência:",
-	"cascadeprotectedwarning": "'''Atenção:''' Esta página se encontra protegida; apenas {{int:group-sysop}} podem editá-la, uma vez que se encontra incluída {{PLURAL:$1|na seguinte página protegida|nas seguintes páginas protegidas}} com a \"proteção progressiva\":",
+	"cascadeprotectedwarning": "<strong> Aviso: </ strong> Esta página foi protegida para que somente os usuários com privilégios de administrador pode editá-lo porque ele é transcluída na seguinte protegido por cascata {{PLURAL: $1 | página | páginas}}:",
 	"titleprotectedwarning": "'''Atenção: esta página foi protegida; [[Special:ListGroupRights|privilégios específicos]] são necessários para criá-la.'''\nA última entrada no histórico é fornecida abaixo como referência:",
 	"templatesused": "{{PLURAL:$1|Predefinição usada|Predefinições usadas}} nesta página:",
 	"templatesusedpreview": "{{PLURAL:$1|Predefinição usada|Predefinições usadas}} nesta previsão:",
@@ -749,6 +752,7 @@
 	"content-model-css": "CSS",
 	"content-json-empty-object": "Objeto vazio",
 	"content-json-empty-array": "Array vazia",
+	"duplicate-args-warning": "<strong> Aviso: </ strong> [[:$1]] está chamando [[:$2]] com mais de um valor para o parâmetro \"$3\". Será utilizado apenas o último valor fornecido.",
 	"duplicate-args-category": "Páginas que utilizam argumentos duplicados ao chamar predefinições",
 	"duplicate-args-category-desc": "A pagina contem modelos que usam argumentos duplicados, como <code><nowiki>{{foo|bar=1|bar=2}}</nowiki></code> ou <code><nowiki>{{foo|bar|1=baz}}</nowiki></code>.",
 	"expensive-parserfunction-warning": "Aviso: Esta página contém muitas chamadas a funções do analisador \"parser\".\n\nDeveria ter menos de $2 {{PLURAL:$2|chamada|chamadas}}. Neste momento {{PLURAL:$1|há $1 chamada|existem $1 chamadas}}.",
@@ -938,7 +942,8 @@
 	"search-section": "(seção $1)",
 	"search-category": "(categoria $1)",
 	"search-file-match": "(coincide com o conteúdo do arquivo)",
-	"search-suggest": "Você quis dizer: $1",
+	"search-suggest": "Você quis dizer: $1?",
+	"search-rewritten": "Mostrando resultados por $1. Pesquisar em vez de $2.",
 	"search-interwiki-caption": "Projetos irmãos",
 	"search-interwiki-default": "Resultados de $1:",
 	"search-interwiki-more": "(mais)",
@@ -992,7 +997,8 @@
 	"rows": "Linhas:",
 	"columns": "Colunas:",
 	"searchresultshead": "Pesquisar",
-	"stub-threshold": "Links para páginas de conteúdo aparecerão <a href=\"#\" class=\"stub\">desta forma</a> se elas possuírem menos de (bytes):",
+	"stub-threshold": "Limiar para a formatação ligação stub (US $1):",
+	"stub-threshold-sample-link": "amostra",
 	"stub-threshold-disabled": "Desabilitado",
 	"recentchangesdays": "Dias a apresentar nas mudanças recentes:",
 	"recentchangesdays-max": "(máximo: $1 {{PLURAL:$1|dia|dias}})",
@@ -1276,8 +1282,8 @@
 	"newpageletter": "N",
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[{{PLURAL:$1|$1 usuário|$1 usuários}} vigiando]",
-	"rc_categories": "Limite para categorias (separar com \"|\")",
-	"rc_categories_any": "Qualquer",
+	"rc_categories": "Limite para categorias (separar com \"|\"):",
+	"rc_categories_any": "Qualquer dos escolhidos",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} após alterações",
 	"newsectionsummary": "/* $1 */ nova seção",
 	"rc-enhanced-expand": "Exibir detalhes",
@@ -1357,6 +1363,10 @@
 	"uploaddisabledtext": "O envio de arquivos encontra-se desativado.",
 	"php-uploaddisabledtext": "O envio de arquivos via PHP está desativado.\nVerifique a configuração file_uploads.",
 	"uploadscripted": "Este arquivo contém HTML ou código que pode ser erroneamente interpretado por um navegador web.",
+	"upload-scripted-pi-callback": "Não é possível fazer upload de um arquivo que contém a instrução de processamento XML-estilo.",
+	"uploaded-script-svg": "Elemento encontrado programável \"$1\" no arquivo SVG carregado.",
+	"uploaded-hostile-svg": "Encontrado CSS inseguro no elemento de estilo do arquivo SVG carregado.",
+	"uploaded-event-handler-on-svg": "Configuração de manipulador de eventos atribui <code> $1 = \"$2\" </ code> não é permitido em arquivos SVG.",
 	"uploadscriptednamespace": "Este aruivo SVG contém um espaço nominal probido \"$1\"",
 	"uploadinvalidxml": "O XML no arquivo enviado não pôde ser analisado.",
 	"uploadvirus": "O arquivo contém vírus!\nDetalhes: $1",
@@ -1387,6 +1397,16 @@
 	"upload-too-many-redirects": "A URL contém redirecionamentos demais",
 	"upload-http-error": "Ocorreu um erro HTTP: $1",
 	"upload-copy-upload-invalid-domain": "Não é possível realizar envios remotos neste domínio.",
+	"upload-dialog-button-cancel": "Cancelar",
+	"upload-dialog-button-done": "Feito",
+	"upload-dialog-button-save": "Salvar",
+	"upload-dialog-button-upload": "Enviar",
+	"upload-dialog-label-select-file": "Selecionar arquivo",
+	"upload-dialog-label-infoform-title": "Detalhes",
+	"upload-dialog-label-infoform-name": "Nome",
+	"upload-dialog-label-infoform-description": "Descrição",
+	"upload-dialog-label-usage-title": "uso",
+	"upload-dialog-label-usage-filename": "Nome do arquivo",
 	"backend-fail-stream": "Não foi possível transmitir o arquivo  $1.",
 	"backend-fail-backup": "Não foi possível fazer backup do arquivo  $1 .",
 	"backend-fail-notexists": "O arquivo $1 não existe.",
@@ -1616,7 +1636,7 @@
 	"unusedimages": "Arquivos não utilizados",
 	"wantedcategories": "Categorias pedidas",
 	"wantedpages": "Páginas pedidas",
-	"wantedpages-summary": "Lista de páginas não-existentes com mais links para elas, excluindo páginas que apenas têm redirecionamentos para elas. Para obter uma lista de páginas inexistentes com redirecionamentos para elas, veja [[{{#special: Brokenredirects}}]].",
+	"wantedpages-summary": "Lista de páginas não-existentes com mais links para eles, excluindo páginas que apenas têm redirecionamentos links para eles. Para obter uma lista de páginas não-existentes que têm redirecionamentos links para eles, veja [[{{#special: Brokenredirects}} | lista de redirecionamentos quebrados]].",
 	"wantedpages-badtitle": "Título inválido no conjunto de resultados: $1",
 	"wantedfiles": "Arquivos pedidos",
 	"wantedfiletext-cat": "Os seguintes arquivos são usados, mas não existem. Arquivos de repositórios externos podem acabar sendo listados apesar de existirem. Esses falsos positivos aparecerão <del>riscados</del>. As páginas que incluem arquivos inexistentes são listadas em [[:$1]].",
@@ -1684,7 +1704,7 @@
 	"booksources-text": "É exibida a seguir uma listagem de links para outros sites que vendem livros novos e usados e que possam possuir informações adicionais sobre os livros que você está pesquisando:",
 	"booksources-invalid-isbn": "O número ISBN fornecido não parece ser válido; verifique se houve erros ao copiar da fonte original.",
 	"specialloguserlabel": "Executor:",
-	"speciallogtitlelabel": "Destino (título ou usuário):",
+	"speciallogtitlelabel": "Alvo (título ou {{ns: user}}: nome de usuário para usuário):",
 	"log": "Registros",
 	"all-logs-page": "Todos os registros públicos",
 	"alllogstext": "Exibição combinada de todos registros disponíveis para o {{SITENAME}}.\nVocê pode diminuir a lista escolhendo um tipo de registro, um nome de usuário (sensível a maiúsculas e minúsculas), ou uma página afetada (também sensível a maiúsculas e minúsculas).",
@@ -1877,6 +1897,8 @@
 	"rollback-success": "Foram revertidas as edições de $1, com o conteúdo passando a estar como na última edição de $2.",
 	"sessionfailure-title": "Erro de sessão",
 	"sessionfailure": "Foram detetados problemas com a sua sessão;\nEsta ação foi cancelada como medida de proteção contra a intercepção de sessões.\nExperimente usar o botão \"Voltar\" e atualizar a página de onde veio e tente novamente.",
+	"changecontentmodel": "Mudar modelo de conteúdo de uma página",
+	"changecontentmodel-legend": "Mudar modelo de conteúdo",
 	"changecontentmodel-title-label": "Título da página",
 	"changecontentmodel-reason-label": "Motivo:",
 	"logentry-contentmodel-change-revertlink": "reverter",
@@ -2311,7 +2333,7 @@
 	"tooltip-pt-preferences": "Suas configurações",
 	"tooltip-pt-watchlist": "Lista de alterações nas páginas que você está monitorando",
 	"tooltip-pt-mycontris": "Listagem de suas contribuições",
-	"tooltip-pt-login": "Você é encorajado a autenticar-se, apesar disso não ser obrigatório.",
+	"tooltip-pt-login": "Você é encorajado a autenticar-se; no entanto, não é obrigatório",
 	"tooltip-pt-logout": "Sair",
 	"tooltip-pt-createaccount": "É recomendado que você crie uma conta e inicie uma seção; todavia, isto não é obrigatório",
 	"tooltip-ca-talk": "Discussão sobre o conteúdo da página",
@@ -2334,9 +2356,9 @@
 	"tooltip-n-mainpage-description": "Acessar a página principal",
 	"tooltip-n-portal": "Sobre o projeto, o que se pode fazer e onde achar as coisas",
 	"tooltip-n-currentevents": "Encontre informações sobre acontecimentos atuais",
-	"tooltip-n-recentchanges": "A lista de mudanças recentes desta wiki.",
+	"tooltip-n-recentchanges": "Uma lista de mudanças recentes nesta wiki",
 	"tooltip-n-randompage": "Acessar uma página de forma aleatória",
-	"tooltip-n-help": "Lugar específico para obter ajuda quanto ao ambiente.",
+	"tooltip-n-help": "O lugar para informar-se",
 	"tooltip-t-whatlinkshere": "Lista de todas as páginas que possuem links para esta",
 	"tooltip-t-recentchangeslinked": "Mudanças recentes nas páginas para as quais esta possui links",
 	"tooltip-feed-rss": "Feed RSS desta página",
@@ -2391,7 +2413,7 @@
 	"spam_reverting": "Revertendo para a última versão que não contém links para $1",
 	"spam_blanking": "Todas revisões contendo links para $1, limpando",
 	"spam_deleting": "Eliminada por todas as suas edições conterem links para $1",
-	"simpleantispam-label": "Verificação contra spam\n'''NÃO''' preencha isto!",
+	"simpleantispam-label": "Verificação contra spam.\n<strong>Não</strong>  preencha isto!",
 	"pageinfo-title": "Informações sobre \"$1\"",
 	"pageinfo-not-current": "Desculpe-nos, não é possível fornecer esses dados para edições antigas.",
 	"pageinfo-header-basic": "Informação básica",
@@ -3387,5 +3409,6 @@
 	"special-characters-title-emdash": "travessão",
 	"special-characters-title-minus": "sinal de menos",
 	"mw-widgets-dateinput-placeholder-day": "AAAA-MM-DD",
-	"mw-widgets-dateinput-placeholder-month": "AAAA-MM"
+	"mw-widgets-dateinput-placeholder-month": "AAAA-MM",
+	"mw-widgets-titleinput-description-redirect": "Direto para $1"
 }
diff --git a/languages/i18n/pt.json b/languages/i18n/pt.json
index 90e0f861d3..40b13395ae 100644
--- a/languages/i18n/pt.json
+++ b/languages/i18n/pt.json
@@ -482,6 +482,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|página|páginas}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|contribuidor|contribuidores}} recentes",
 	"badretype": "As palavras-passe que introduziu não coincidem.",
+	"usernameinprogress": "Uma conta para este nome de utilizador já está a ser criada.\nPor favor, aguarde.",
 	"userexists": "O nome de utilizador introduzido já existe.\nPor favor escolha um nome diferente.",
 	"loginerror": "Erro ao iniciar sessão",
 	"createacct-error": "Erro na criação da conta",
@@ -681,6 +682,7 @@
 	"yourdiff": "Diferenças",
 	"copyrightwarning": "Note, por favor, que todas as suas contribuições na {{SITENAME}} são consideradas publicadas nos termos da licença $2 (consulte $1 para mais detalhes).\nSe não deseja que o seu texto possa ser inexoravelmente editado e redistribuído, não o envie.\nGarante-nos também que isto é algo escrito por si, ou copiado do domínio público ou de outra fonte de teor livre.<br />\n'''Não envie conteúdos cujos direitos de autor estão protegidos, sem ter a devida permissão!'''",
 	"copyrightwarning2": "Note, por favor, que todas as suas contribuições na {{SITENAME}} podem ser editadas, alteradas ou removidas por outros utilizadores.\nSe não deseja que o seu texto seja inexoravelmente editado, não o envie.<br />\nGarante-nos também que isto é algo escrito por si, ou copiado do domínio público ou de outra fonte de teor livre (consulte $1 para mais detalhes).<br />\n'''Não envie conteúdos cujos direitos de autor estão protegidos, sem ter a devida permissão!'''",
+	"editpage-cannot-use-custom-model": "O modelo de conteúdo desta página não pode ser alterado.",
 	"longpageerror": "'''Erro: O texto que submeteu ocupa {{PLURAL:$1|um kilobyte|$1 kilobytes}}, que excede o máximo de {{PLURAL:$2|um kilobyte|$2 kilobytes}}.'''\nA página não pode ser gravada.",
 	"readonlywarning": "'''Aviso: A base de dados foi bloqueada para manutenção, pelo que não poderá gravar a sua edição neste momento.'''\nPode, no entanto, copiar e colar o seu texto num ficheiro de texto e guardá-lo para mais tarde.\n\nO administrador que bloqueou a base de dados forneceu a seguinte explicação: $1",
 	"protectedpagewarning": "'''Aviso: Esta página foi protegida para só poder ser editada por administradores.'''\nO último registo é apresentado abaixo para referência:",
@@ -970,7 +972,8 @@
 	"rows": "Linhas:",
 	"columns": "Colunas:",
 	"searchresultshead": "Pesquisar",
-	"stub-threshold": "Limite para a formatação de <a href=\"#\" class=\"stub\">ligações para esboços</a> (bytes):",
+	"stub-threshold": "Limite para a formatação de ligações para esboços ($1):",
+	"stub-threshold-sample-link": "amostra",
 	"stub-threshold-disabled": "Desativado",
 	"recentchangesdays": "Dias a apresentar nas mudanças recentes:",
 	"recentchangesdays-max": "Máximo: $1 {{PLURAL:$1|dia|dias}}",
@@ -1255,7 +1258,7 @@
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[{{PLURAL:$1|$1 utilizador|$1 utilizadores}} a vigiar]",
 	"rc_categories": "Limitar às categorias (separar com \"|\"):",
-	"rc_categories_any": "Qualquer",
+	"rc_categories_any": "Qualquer dos escolhidos",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} após mudança",
 	"newsectionsummary": "/* $1 */ nova secção",
 	"rc-enhanced-expand": "Mostrar detalhes",
@@ -1367,6 +1370,7 @@
 	"upload-copy-upload-invalid-domain": "Não é possível realizar carregamentos remotos neste domínio.",
 	"upload-dialog-title": "Carregar ficheiro",
 	"upload-dialog-error": "Ocorreu um erro",
+	"upload-dialog-warning": "Ocorreu um aviso",
 	"upload-dialog-button-cancel": "Cancelar",
 	"upload-dialog-button-done": "Feito",
 	"upload-dialog-button-save": "Gravar",
@@ -1605,6 +1609,7 @@
 	"unusedimages": "Ficheiros não utilizados",
 	"wantedcategories": "Categorias desejadas",
 	"wantedpages": "Páginas desejadas",
+	"wantedpages-summary": "Lista de páginas inexistentes com o maior número de ligações a elas, excluindo páginas que possuem apenas redirecionamentos a elas. Para obter uma lista de páginas inexistentes que possuam redirecionamento a elas, veja [[{{#special:BrokenRedirects}}|a lista de redirecionamentos quebrados]].",
 	"wantedpages-badtitle": "Título inválido no conjunto de resultados: $1",
 	"wantedfiles": "Ficheiros desejados",
 	"wantedfiletext-cat": "Os seguintes ficheiros são usados, mas não existem. Ficheiros de repositórios externos podem ser listados apesar de existirem. Tais falsos positivos aparecerão <del>riscados</del>. Adicionalmente, as páginas que incorporam ficheiros que não existem estão listadas em [[:$1]].",
@@ -1672,7 +1677,7 @@
 	"booksources-text": "É apresentada abaixo uma lista de ligações para outros sítios na Internet que vendem livros novos e usados e talvez possuam informações adicionais sobre os livros que procura:",
 	"booksources-invalid-isbn": "O número ISBN fornecido não parece ser válido; verifique a existência de erros ao copiar da fonte original.",
 	"specialloguserlabel": "Executante:",
-	"speciallogtitlelabel": "Alvo (página ou utilizador):",
+	"speciallogtitlelabel": "Alvo (título ou página ou {{ns:user}}:nome de utilizador):",
 	"log": "Registos",
 	"all-logs-page": "Todos os registos públicos",
 	"alllogstext": "Apresentação combinada de todos os registos disponíveis na wiki {{SITENAME}}.\nPode reduzir a lista escolhendo um tipo de registo, um nome de utilizador ou um título de página. Respeite maiúsculas e minúsculas.",
@@ -1936,7 +1941,7 @@
 	"undeletepagetext": "{{PLURAL:$1|A seguinte página foi eliminada|As seguintes páginas foram eliminadas}}, mas ainda {{PLURAL:$1|permanece|permanecem}} em arquivo e podem ser restauradas. O arquivo pode ser limpo periodicamente.",
 	"undelete-fieldset-title": "Restaurar edições",
 	"undeleteextrahelp": "Para restaurar o histórico de edições completo desta página, desmarque todas as caixas de seleção e clique '''''{{int:undeletebtn}}'''''.\nPara efetuar uma restauração seletiva, marque as caixas correspondentes às edições que pretende restaurar e clique '''''{{int:undeletebtn}}'''''.",
-	"undeleterevisions": "$1 {{PLURAL:$1|edição disponível|edições disponíveis}}",
+	"undeleterevisions": "$1 {{PLURAL:$1|revisão eliminada|revisões eliminadas}}",
 	"undeletehistory": "Se restaurar uma página, todas as edições serão restauradas para o histórico.\nSe uma nova página foi criada com o mesmo nome desde a eliminação, as edições restauradas aparecerão no histórico anterior.",
 	"undeleterevdel": "O restauro não será efetuado se resulta na remoção parcial da versão mais recente da página ou ficheiro.\nNestes casos, deverá desmarcar ou revelar a versão eliminada mais recente.",
 	"undeletehistorynoadmin": "Esta página foi eliminada. O motivo de eliminação é apresentado no sumário abaixo, junto dos detalhes do utilizador que editou esta página antes de eliminar. O texto atual destas edições eliminadas encontra-se agora apenas disponível para administradores.",
@@ -2262,7 +2267,7 @@
 	"importcantopen": "Não foi possível abrir o ficheiro a importar",
 	"importbadinterwiki": "Ligação interlíngua incorreta",
 	"importsuccess": "Importação completa!",
-	"importnosources": "Não foram definidas fontes de importação transwikis e o carregamento direto de históricos encontra-se desativado.",
+	"importnosources": "Não foram definidas as wikis das quais importar e o carregamento direto de históricos encontra-se desativado.",
 	"importnofile": "Nenhum ficheiro de importação foi carregado.",
 	"importuploaderrorsize": "O carregamento do ficheiro importado falhou.\nO ficheiro é maior do que o tamanho máximo permitido.",
 	"importuploaderrorpartial": "O carregamento do ficheiro importado falhou.\nO ficheiro foi recebido parcialmente.",
@@ -2325,7 +2330,7 @@
 	"tooltip-n-mainpage-description": "Visitar a página principal",
 	"tooltip-n-portal": "Sobre o projeto, o que se pode fazer e onde encontrar as coisas",
 	"tooltip-n-currentevents": "Informação temática sobre acontecimentos atuais",
-	"tooltip-n-recentchanges": "A lista de mudanças recentes nesta wiki.",
+	"tooltip-n-recentchanges": "Uma lista de mudanças recentes nesta wiki",
 	"tooltip-n-randompage": "Carregar página aleatória",
 	"tooltip-n-help": "Um local reservado para auxílio.",
 	"tooltip-t-whatlinkshere": "Lista de todas as páginas que contêm ligações para esta",
@@ -2342,7 +2347,7 @@
 	"tooltip-ca-nstab-main": "Ver a página de conteúdo",
 	"tooltip-ca-nstab-user": "Ver a página de utilizador",
 	"tooltip-ca-nstab-media": "Ver a página de multimédia",
-	"tooltip-ca-nstab-special": "Esta é uma página especial, não pode ser editada.",
+	"tooltip-ca-nstab-special": "Esta é uma página especial e não pode ser editada.",
 	"tooltip-ca-nstab-project": "Ver a página de projeto",
 	"tooltip-ca-nstab-image": "Ver a página de ficheiro",
 	"tooltip-ca-nstab-mediawiki": "Ver a mensagem de sistema",
@@ -2386,7 +2391,7 @@
 	"spam_reverting": "A reverter para a última revisão que não contém ligação para $1",
 	"spam_blanking": "Todas as revisões continham ligações para $1; a esvaziar",
 	"spam_deleting": "Todas as revisões continham ligações para $1; a eliminar",
-	"simpleantispam-label": "Verificação contra spam.\n<strong>NÃO</strong> preencha isto!",
+	"simpleantispam-label": "Verificação contra spam.\n<strong>Não</strong> preencha isto!",
 	"pageinfo-title": "Informações sobre \"$1\"",
 	"pageinfo-not-current": "Desculpe, é impossível fornecer esta informação para revisões antigas.",
 	"pageinfo-header-basic": "Informação básica",
@@ -2405,6 +2410,7 @@
 	"pageinfo-watchers": "Número de vigilantes da página",
 	"pageinfo-visiting-watchers": "Número de vigilantes que consultaram as edições recentes da página",
 	"pageinfo-few-watchers": "Menos do que $1 {{PLURAL:$1|vigilante|vigilantes}}",
+	"pageinfo-few-visiting-watchers": "Pode ou não pode haver editores a vigiar as edições recentes",
 	"pageinfo-redirects-name": "Número de redirecionamentos para esta página",
 	"pageinfo-subpages-name": "Subpáginas desta página",
 	"pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|redirecionamento|redirecionamentos}}; $3 {{PLURAL:$3|não-redirecionamento|não-redirecionamentos}})",
@@ -3111,6 +3117,7 @@
 	"tags-edit-success": "As alterações foram aplicadas com sucesso.",
 	"tags-edit-failure": "As alterações não puderam ser aplicadas:\n$1",
 	"tags-edit-nooldid-title": "Revisão de página inválida",
+	"tags-edit-nooldid-text": "Não foi especificada nenhuma revisão na qual será realizada esta ação, ou a revisão especificada não existe.",
 	"tags-edit-none-selected": "Por favor, selecione pelo menos uma etiqueta para adicionar ou remover.",
 	"comparepages": "Comparar páginas",
 	"compare-page1": "Página 1",
@@ -3148,6 +3155,7 @@
 	"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.",
 	"htmlform-user-not-exists": "<strong>$1</strong> não existe.",
+	"htmlform-user-not-valid": "<strong>$1</strong> não é um nome de utilizador válido.",
 	"sqlite-has-fts": "$1 com suporte de pesquisa de texto completo",
 	"sqlite-no-fts": "$1 sem suporte de pesquisa de texto completo",
 	"logentry-delete-delete": "$1 apagou a página $3",
@@ -3188,6 +3196,7 @@
 	"logentry-newusers-create2": "A conta de utilizador $3 foi criada por $1",
 	"logentry-newusers-byemail": "A conta de utilizador $3 foi criada por $1 e a palavra-passe foi enviada por correio eletrónico",
 	"logentry-newusers-autocreate": "A conta de utilizador $1 foi criada automaticamente",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|moveu}} as preferências de proteção de $4 para $3",
 	"logentry-rights-rights": "$1 modificou os privilégios do utilizador $3 de $4 para $5",
 	"logentry-rights-rights-legacy": "$1 alterou os grupos de $3",
 	"logentry-rights-autopromote": "$1 foi automaticamente {{GENDER:$2|promovido|promovida}} de $4 a $5",
@@ -3227,9 +3236,11 @@
 	"feedback-message": "Mensagem:",
 	"feedback-subject": "Assunto:",
 	"feedback-submit": "Enviar",
+	"feedback-terms": "Entendo que as informações de meu agente de utilizador inclui a informação acerca da versão exata de meu navegador e sistema operacional e que serão partilhadas publicamente juntamente aos meus comentários.",
 	"feedback-termsofuse": "Concordo em fornecer comentários de acordo com as Condições de Uso.",
 	"feedback-thanks": "Obrigado! O seu comentário foi adicionado à página \"[$2 $1]\".",
 	"feedback-thanks-title": "Obrigado!",
+	"feedback-useragent": "Agente de utilizador:",
 	"searchsuggest-search": "Pesquisa",
 	"searchsuggest-containing": "contendo...",
 	"api-error-badaccess-groups": "Não tem permissão para enviar ficheiros para esta wiki.",
@@ -3342,6 +3353,7 @@
 	"mediastatistics-header-drawing": "Desenhos (imagens vetoriais)",
 	"mediastatistics-header-audio": "Áudio",
 	"mediastatistics-header-video": "Vídeo",
+	"mediastatistics-header-multimedia": "Rich media",
 	"mediastatistics-header-office": "Documentos",
 	"mediastatistics-header-text": "Textuais",
 	"mediastatistics-header-executable": "Executáveis",
diff --git a/languages/i18n/qqq.json b/languages/i18n/qqq.json
index 7287269c9b..d3b5a99ddb 100644
--- a/languages/i18n/qqq.json
+++ b/languages/i18n/qqq.json
@@ -170,13 +170,15 @@
 			"Macofe",
 			"FRacco",
 			"Robin0van0der0vliet",
-			"TTO"
+			"TTO",
+			"J. 'mach' wust",
+			"Ciencia Al Poder"
 		]
 	},
 	"sidebar": "{{notranslate}}",
 	"tog-underline": "[[Special:Preferences]], tab 'Misc'. Offers user a choice how to underline links. {{Gender}}",
-	"tog-hideminor": "[[Special:Preferences]], tab 'Recent changes'. Offers user to hide minor edits in recent changes or not. {{Gender}}",
-	"tog-hidepatrolled": "Option in Recent changes tab of [[Special:Preferences]] (if [[mw:Manual:$wgUseRCPatrol|$wgUseRCPatrol]] is enabled). {{Gender}}",
+	"tog-hideminor": "[[Special:Preferences]], tab 'Recent changes'. Offers user to hide minor edits in recent changes or not. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-hidepatrolled": "Option in Recent changes tab of [[Special:Preferences]] (if [[mw:Manual:$wgUseRCPatrol|$wgUseRCPatrol]] is enabled). {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
 	"tog-newpageshidepatrolled": "Toggle in [[Special:Preferences]], section \"Recent changes\" (if [[mw:Manual:$wgUseRCPatrol|$wgUseRCPatrol]] is enabled). {{Gender}}",
 	"tog-extendwatchlist": "[[Special:Preferences]], tab 'Watchlist'. Offers user to show all applicable changes in watchlist (by default only the last change to a page on the watchlist is shown). {{Gender}}",
 	"tog-usenewrc": "{{Gender}}\nUsed as label for the checkbox in [[Special:Preferences]], tab \"Recent changes\".\n\nOffers user to use alternative representation of [[Special:RecentChanges]] and watchlist.",
@@ -201,12 +203,12 @@
 	"tog-fancysig": "In user preferences under the signature box.  {{Gender}}",
 	"tog-uselivepreview": "{{Gender}}\nToggle option used in [[Special:Preferences]].\n\nLive preview is a feature to use edit preview without loading the page again.",
 	"tog-forceeditsummary": "Toggle option used in [[Special:Preferences]] to force an edit ''{{msg-mw|summary}}''. {{Gender}}",
-	"tog-watchlisthideown": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide own edits from watchlist. {{Gender}}",
-	"tog-watchlisthidebots": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide bot edits from watchlist. {{Gender}}",
-	"tog-watchlisthideminor": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide minor edits from watchlist. {{Gender}}",
-	"tog-watchlisthideliu": "Option in tab 'Watchlist' of [[Special:Preferences]]. {{Gender}}",
-	"tog-watchlisthideanons": "Option in tab 'Watchlist' of [[Special:Preferences]]. {{Gender}}",
-	"tog-watchlisthidepatrolled": "Option in Watchlist tab of [[Special:Preferences]]. {{Gender}}",
+	"tog-watchlisthideown": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide own edits from watchlist. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-watchlisthidebots": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide bot edits from watchlist. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-watchlisthideminor": "[[Special:Preferences]], tab 'Watchlist'. Offers user to hide minor edits from watchlist. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-watchlisthideliu": "Option in tab 'Watchlist' of [[Special:Preferences]]. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-watchlisthideanons": "Option in tab 'Watchlist' of [[Special:Preferences]]. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
+	"tog-watchlisthidepatrolled": "Option in Watchlist tab of [[Special:Preferences]]. {{Gender}}\n\n{{Related|Preferences-watchlistrc-toggle}}",
 	"tog-ccmeonemails": "Option in [[Special:Preferences]] > {{int:prefs-personal}} > {{int:email}}. {{Gender}}",
 	"tog-diffonly": "Toggle option used in [[Special:Preferences]]. {{Gender}}",
 	"tog-showhiddencats": "Toggle option used in [[Special:Preferences]]. {{Gender}}",
@@ -553,8 +555,8 @@
 	"virus-scanfailed": "Used as error message. \"scan\" stands for \"virus scan\". Parameters:\n* $1 - exit code of virus scanner",
 	"virus-unknownscanner": "Used as error message. This message is followed by the virus scanner name.",
 	"logouttext": "Log out message. Parameters:\n* $1 - (Unused) an URL to [[Special:Userlogin]] containing <code>returnto</code> and <code>returntoquery</code> parameters",
-	"welcomeuser": "Text for a welcome heading that users see after registering a user account.\n\nParameters:\n* $1 - the username of the new user. See [[bugzilla:42215]]",
-	"welcomecreation-msg": "A welcome message users see after registering a user account, following a welcomeuser heading.\n\nParameters:\n* $1 - (Unused) the username of the new user.\n\nReplaces welcomecreation in 1.21wmf5, see [[bugzilla:42215]]",
+	"welcomeuser": "Text for a welcome heading that users see after registering a user account.\n\nParameters:\n* $1 - the username of the new user. See [[phab:T44215]]",
+	"welcomecreation-msg": "A welcome message users see after registering a user account, following a welcomeuser heading.\n\nParameters:\n* $1 - (Unused) the username of the new user.\n\nReplaces [[MediaWiki:welcomecreation|welcomecreation]] in 1.21wmf5, see [[phab:T44215]]",
 	"yourname": "Since 1.22 no longer used in core, but used by some extensions.\n{{Identical|Username}}",
 	"userlogin-yourname": "In user login & create account forms, label for username field.\n{{doc-important|<nowiki>{{</nowiki>[[Gender|GENDER]]<nowiki>}}</nowiki> is '''NOT''' supported.}}\n\nSee examples: [[Special:UserLogin]] and [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]\n{{Identical|Username}}",
 	"userlogin-yourname-ph": "Placeholder text in login & create account form field.\n\nSee example: [[Special:UserLogin]] and [{{canonicalurl:Special:UserLogin|type=signup}} Special:UserLogin?type=signup]",
@@ -859,7 +861,7 @@
 	"sectioneditnotsupported-text": "I think this is the text of an error message, which presumably appears when someone tries to edit a section, and section editing is disabled. Explanation of section editing on [[meta:Help:Section_editing#Section_editing|meta]].",
 	"permissionserrors": "Used as title of error message.\n\nSee also:\n* {{msg-mw|loginreqtitle}}\n{{Identical|Permission error}}",
 	"permissionserrorstext": "This message is \"without action\" version of {{msg-mw|Permissionserrorstext-withaction}}.\n\nParameters:\n* $1 - the number of reasons that were found why ''the action'' cannot be performed",
-	"permissionserrorstext-withaction": "This message is \"with action\" version of {{msg-mw|Permissionserrorstext}}.\n\nParameters:\n* $1 - the number of reasons that were found why the action cannot be performed\n* $2 - one of the action-* messages (for example {{msg-mw|action-edit}}) or other such messages tagged with {{tl|doc-action}} in their documentation\n\nPlease report at [[Support]] if you are unable to properly translate this message. Also see [[bugzilla:14246]] (now closed) for background.",
+	"permissionserrorstext-withaction": "This message is \"with action\" version of {{msg-mw|Permissionserrorstext}}.\n\nParameters:\n* $1 - the number of reasons that were found why the action cannot be performed\n* $2 - one of the action-* messages (for example {{msg-mw|action-edit}}) or other such messages tagged with {{tl|doc-action}} in their documentation\n\nPlease report at [[Support]] if you are unable to properly translate this message. Also see [[phab:T16246]] (now closed) for background.",
 	"recreate-moveddeleted-warn": "Warning shown when creating a page which has already been deleted. See for example [[Test]].",
 	"moveddeleted-notice": "Shown on top of a deleted page in normal view modus ([{{canonicalurl:Test}} example]).",
 	"log-fulllog": "Used as link text.",
@@ -1144,7 +1146,8 @@
 	"rows": "Used on [[Special:Preferences]], \"Editing\" section in the \"Size of editing window\" fieldset.\n{{Identical|Row}}",
 	"columns": "Used on [[Special:Preferences]], \"Editing\" section in the \"Size of editing window\" fieldset.\n{{Identical|Column}}",
 	"searchresultshead": "Replaced by {{msg-mw|prefs-searchoptions}}, though may still be used in some extensions. DEPRECATED.\n\n{{Identical|Search}}",
-	"stub-threshold": "Used in [[Special:Preferences]], tab \"Misc\".",
+	"stub-threshold": "Used in [[Special:Preferences]], \"Advanced options\" section. The setting allows the user to select a threshold value, in bytes, from a predefined list of options. Any links that lead to pages smaller than the threshold (\"stub links\") will be styled differently.\n\nParameters:\n* $1: the text of {{msg-mw|stub-threshold-sample-link}}, styled as a stub link",
+	"stub-threshold-sample-link": "Passed as a parameter to the {{msg-mw|stub-threshold}} message.",
 	"stub-threshold-disabled": "Used in [[Special:Preferences]].\n{{Identical|Disabled}}",
 	"recentchangesdays": "Used in [[Special:Preferences]], tab \"Recent changes\".",
 	"recentchangesdays-max": "Shown as hint in [[Special:Preferences]], tab \"Recent changes\". Parameters:\n* $1 - number of days\nSee also:\n* {{msg-mw|Prefs-watchlist-days-max}}",
@@ -1524,7 +1527,7 @@
 	"overwroteimage": "{{ignored}}This is a ''logentry'' message only used on IRC. $1 is the name of the file uploaded.",
 	"uploaddisabled": "Title of the [[Special:Upload]] page when upload is disabled.\n\nSee also:\n* {{msg-mw|Copyuploaddisabled}}",
 	"copyuploaddisabled": "See also:\n* {{msg-mw|Uploaddisabled}}",
-	"uploaddisabledtext": "Parameters:\n* $1 - (Optional) the name of the target file. See r22243 and [[bugzilla:8818|bug 8818]].",
+	"uploaddisabledtext": "Parameters:\n* $1 - (Optional) the name of the target file. See [[mw:Special:Code/MediaWiki/r22243|r22243]] and [[phab:T10818|T10818]].",
 	"php-uploaddisabledtext": "This means that file uploading is disabled in PHP, not upload of PHP-files.",
 	"uploadscripted": "Used as error message when uploading a file.\n\nSee also:\n* {{msg-mw|zip-wrong-format}}\n* {{msg-mw|uploadjava}}\n* {{msg-mw|uploadvirus}}",
 	"upload-scripted-pi-callback": "Used as error message when uploading an SVG file that contains xml-stylesheet processing instruction.",
@@ -1563,7 +1566,7 @@
 	"upload-warning-msg": "Used as warning body which is posted on the user talk page. Parameters:\n* $1 - the URL the file was uploaded from, when using upload-by-URL\n* $2 - the session key for the upload\nSee also:\n* {{msg-mw|Upload-warning-subj|subject}}",
 	"upload-proto-error": "See also:\n* {{msg-mw|Upload-proto-error|title}}\n* {{msg-mw|Upload-proto-error-text|text}}",
 	"upload-proto-error-text": "\"Remote upload\" is explained on [[w:Uploading_and_downloading#Remote_upload|Wikipedia]].\n\nSee also:\n* {{msg-mw|Upload-proto-error|title}}\n* {{msg-mw|Upload-proto-error-text|text}}",
-	"upload-file-error": "Unused on core [http://svn.wikimedia.org/viewvc/mediawiki/trunk/phase3/includes/specials/SpecialUpload.php?r1=53161&r2=53282].\n\nExtensions making use of it:\n*ImportFreeImages\n*SemanticForms\nSee also:\n* {{msg-mw|Upload-file-error|title}}\n* {{msg-mw|Upload-file-error-text|text}}\n{{Identical|Internal error}}",
+	"upload-file-error": "Unused on core [[mw:Special:Code/MediaWiki/53282]].\n\nExtensions making use of it:\n*ImportFreeImages\n*SemanticForms\nSee also:\n* {{msg-mw|Upload-file-error|title}}\n* {{msg-mw|Upload-file-error-text|text}}\n{{Identical|Internal error}}",
 	"upload-file-error-text": "See also:\n* {{msg-mw|Upload-file-error|title}}\n* {{msg-mw|Upload-file-error-text|text}}",
 	"upload-misc-error": "See also:\n* {{msg-mw|Upload-misc-error|title}}\n* {{msg-mw|Upload-misc-error-text|text}}",
 	"upload-misc-error-text": "See also:\n* {{msg-mw|Upload-misc-error|title}}\n* {{msg-mw|Upload-misc-error-text|text}}",
@@ -1581,7 +1584,7 @@
 	"upload-dialog-label-infoform-title": "Title for the information form\n{{Identical|Detail}}",
 	"upload-dialog-label-infoform-name": "Label for the file name input\n{{Identical|Name}}",
 	"upload-dialog-label-infoform-description": "Label for the file description input\n{{Identical|Description}}",
-	"upload-dialog-label-usage-title": "Title for the usage form\n{{Identical|Usage}}",
+	"upload-dialog-label-usage-title": "Title for the insert form showing how to use the uploaded item.\n{{Identical|Usage}}",
 	"upload-dialog-label-usage-filename": "Label for the file name input\n{{Identical|Filename}}",
 	"backend-fail-stream": "Parameters:\n* $1 - a filename",
 	"backend-fail-backup": "Parameters:\n* $1 - a filename",
@@ -1891,7 +1894,7 @@
 	"listusers-summary": "{{notranslate}}\nThe summary displayed at the top of [[Special:Listusers]]. [[mw:Manual:Interface/Special pages summary|mw manual]].",
 	"listusers-editsonly": "Option in [[Special:ListUsers]].",
 	"listusers-creationsort": "Option in [[Special:ListUsers]].",
-	"listusers-desc": "Used as label for the checkbox.",
+	"listusers-desc": "Used as label for the checkbox on [[Special:ListUsers]].",
 	"usereditcount": "Shown behind every username on [[Special:ListUsers]]. Parameters:\n* $1 - number of edits",
 	"usercreated": "Used in [[Special:ListUsers]]. Parameters:\n* $1 - a date\n* $2 - a time\n* $3 - the name of the user, for use in GENDER",
 	"newpages": "{{doc-special|NewPages}}\n{{Identical|New page}}",
@@ -3383,7 +3386,7 @@
 	"autosumm-new": "The auto summary when creating a new page. $1 are the first X number of characters of the new page.",
 	"autosumm-newblank": "The automatic edit summary when creating a blank page. This is not the same as blanking a page.",
 	"autoblock_whitelist": "{{notranslate}}",
-	"size-bytes": "{{optional}}\nSize (of a page, typically) in bytes.",
+	"size-bytes": "Size (of a page, typically) in bytes.",
 	"size-kilobytes": "{{optional}}\nSize (of a page, typically) in kibibytes (1 kibibyte = 1024 bytes).",
 	"size-megabytes": "{{optional}}\nSize (of a file, typically) in mebibytes (1 mebibyte = 1024×1024 bytes).",
 	"size-gigabytes": "{{optional}}\nSize (of a file, typically) in gibibytes (1 gibibyte = 1024×1024×1024 bytes).",
@@ -3392,7 +3395,7 @@
 	"size-exabytes": "{{optional}}\nSize (of a file, typically) in exbibytes (1 exbibytes = 1024×1024×1024×1024×1024×1024 bytes).",
 	"size-zetabytes": "{{optional}}\nSize (of a file, typically) in zebibytes (1 zebibytes = 1024×1024×1024×1024×1024×1024×1024 bytes).",
 	"size-yottabytes": "{{optional}}\nSize (of a file, typically) in yobibytes (1 yobibytes = 1024×1024×1024×1024×1024×1024×1024×1024 bytes).",
-	"size-pixel": "{{optional}}\nSize (of a file, typically) in pixel.",
+	"size-pixel": "Size (of a file, typically) in pixel.",
 	"size-kilopixel": "{{optional}}\nSize (of a file, typically) in kilopixel (1 kilopixel = 1000 pixel).",
 	"size-megapixel": "{{optional}}\nSize (of a file, typically) in megapixel (1 megapixel = 1000×1000 pixel).",
 	"size-gigapixel": "{{optional}}\nSize (of a file, typically) in gigapixel (1 gigapixel = 1000×1000×1000 pixel).",
@@ -3758,8 +3761,8 @@
 	"logentry-move-move-noredirect": "{{Logentry|[[Special:Log/move]]}}\nParameter $4, the target page, is also not visible to parser functions.",
 	"logentry-move-move_redir": "{{Logentry|[[Special:Log/move]]}}\nParameter $4, the target page, is also not visible to parser functions.",
 	"logentry-move-move_redir-noredirect": "{{Logentry|[[Special:Log/move]]}}\nParameter $4, the target page, is also not visible to parser functions.",
-	"logentry-patrol-patrol": "{{Logentry|[[Special:Log/patrol]]}}\n* $4 - a formatted revision number, maybe linked to the diff.",
-	"logentry-patrol-patrol-auto": "{{Logentry|[[Special:Log/patrol]]}}\n* $4 - a formatted revision number, maybe linked to the diff.\n\"Automatically\" refers to users with autopatrol right who mark revisions automatically patrolled when editing.",
+	"logentry-patrol-patrol": "{{Logentry|[[Special:Log/patrol]]}}\n* $4 - a formatted revision number, maybe linked to the diff.\n\nSee also:\n* {{msg-mw|logentry-patrol-patrol-auto}}",
+	"logentry-patrol-patrol-auto": "{{Logentry|[[Special:Log/patrol]]}}\n* $4 - a formatted revision number, maybe linked to the diff.\n\"Automatically\" refers to users with autopatrol right who mark revisions automatically patrolled when editing.\n\nSee also:\n* {{msg-mw|logentry-patrol-patrol}}",
 	"logentry-newusers-newusers": "The user (previously unregistered) has registered on the wiki, creating an account for self.\n----\n{{Logentry|[[Special:Log/newusers]]}}",
 	"logentry-newusers-create": "{{Logentry|[[Special:Log/newusers]]}}\n\n$4 is the gender of the target user.",
 	"logentry-newusers-create2": "{{Logentry|[[Special:Log/newusers]]}}\n\n$4 is the name of the user that was created.",
@@ -3906,7 +3909,7 @@
 	"limitreport-postexpandincludesize-value": "Format for the \"Post-expand include size\" row in the limit report table. Parameters:\n* $1 - the usage (in bytes)\n* $2 - the maximum (in bytes)",
 	"limitreport-templateargumentsize": "Label for the \"Template argument size\" row in the limit report table",
 	"limitreport-templateargumentsize-value": "Format for the \"Template argument size\" row in the limit report table.\n\nParameters:\n* $1 - the usage (in bytes)\n* $2 - the maximum (in bytes)",
-	"limitreport-expansiondepth": "Label for the \"Highest expansion depth\" row in the limit report table",
+	"limitreport-expansiondepth": "Label for the \"Highest expansion depth\" row in the limit report table.\n\nIf \"highest depth\" is an oxymoron in your language, use \"deepest (depth)\" instead.",
 	"limitreport-expansiondepth-value": "{{optional}}\nFormat for the \"Highest expansion depth\" row in the limit report table.\n\nParameters:\n* $1 - the depth\n* $2 - the maximum",
 	"limitreport-expensivefunctioncount": "Label for the \"Expensive parser function count\" row in the limit report table",
 	"limitreport-expensivefunctioncount-value": "{{optional}}\nFormat for the \"Expensive parser function count\" row in the limit report table.\n\nParameters:\n* $1 - the usage\n* $2 - the maximum",
diff --git a/languages/i18n/ro.json b/languages/i18n/ro.json
index 0980b6fe09..a71f4d1013 100644
--- a/languages/i18n/ro.json
+++ b/languages/i18n/ro.json
@@ -936,7 +936,8 @@
 	"rows": "Rânduri:",
 	"columns": "Coloane:",
 	"searchresultshead": "Parametri căutare",
-	"stub-threshold": "Valoarea minimă pentru un <a href=\"#\" class=\"stub\">ciot</a> (octeți):",
+	"stub-threshold": "Pragul pentru formatarea legăturilor către cioturi ($1):",
+	"stub-threshold-sample-link": "exemplu",
 	"stub-threshold-disabled": "Dezactivat",
 	"recentchangesdays": "Numărul de zile afișate în schimbări recente:",
 	"recentchangesdays-max": "(maxim {{PLURAL:$1|o zi|$1 zile}})",
@@ -1654,7 +1655,7 @@
 	"booksources-text": "Mai jos se află o listă de legături înspre alte situri care vând cărți noi sau vechi și care pot oferi informații suplimentare despre cărțile pe care le căutați:",
 	"booksources-invalid-isbn": "Codul ISBN oferit nu este valid; verificați dacă a fost copiat corect de la sursa originală.",
 	"specialloguserlabel": "Executant:",
-	"speciallogtitlelabel": "Destinație (titlu sau utilizator):",
+	"speciallogtitlelabel": "Destinație (titlu sau {{ns:user}}:numeutilizator pentru utilizator):",
 	"log": "Jurnale",
 	"all-logs-page": "Toate jurnalele publice",
 	"alllogstext": "Afișare combinată a tuturor jurnalelor {{SITENAME}}.\nPuteți limita vizualizarea selectând tipul jurnalului, numele de utilizator sau pagina afectată.",
@@ -2332,7 +2333,7 @@
 	"tooltip-ca-nstab-main": "Vedeți conținutul paginii",
 	"tooltip-ca-nstab-user": "Vezi pagina de utilizator",
 	"tooltip-ca-nstab-media": "Vezi pagina media",
-	"tooltip-ca-nstab-special": "Aceasta este o pagină specială, nu o puteți modifica direct.",
+	"tooltip-ca-nstab-special": "Aceasta este o pagină specială și nu poate fi modificată",
 	"tooltip-ca-nstab-project": "Vezi pagina proiectului",
 	"tooltip-ca-nstab-image": "Vezi pagina fişierului",
 	"tooltip-ca-nstab-mediawiki": "Vedeți mesajul de sistem",
diff --git a/languages/i18n/roa-tara.json b/languages/i18n/roa-tara.json
index 9f60825cf3..8f3eebb814 100644
--- a/languages/i18n/roa-tara.json
+++ b/languages/i18n/roa-tara.json
@@ -926,7 +926,8 @@
 	"rows": "Righe:",
 	"columns": "Culonne:",
 	"searchresultshead": "Cirche",
-	"stub-threshold": "Soglie pe <a href=\"#\" class=\"stub\">collegamende stub</a> de formattazione (byte):",
+	"stub-threshold": "Soglie pe collegamende stub de formattazione ($1):",
+	"stub-threshold-sample-link": "esembie",
 	"stub-threshold-disabled": "Disabbilitate",
 	"recentchangesdays": "Sciurne da fà vedè jndr'à le cangiaminde recende:",
 	"recentchangesdays-max": "(massime $1 {{PLURAL:$1|sciurne|sciurne}})",
@@ -1643,7 +1644,7 @@
 	"booksources-text": "Sotte stè 'na liste de collegaminde a otre site ca vennene libbre nuève e ausete e puà pure acchià cchiù 'mbormaziune sus a le libbre ca tu ste cirche:",
 	"booksources-invalid-isbn": "L'ISBN ca è mise non ge pare ca ète corrette; verifiche ce è commesse quacche errore quanne ste cupiave quidde origginale.",
 	"specialloguserlabel": "'Mblemendatore:",
-	"speciallogtitlelabel": "Destinazione (titole o utende):",
+	"speciallogtitlelabel": "Destinazione (titole o {{ns:user}}:nome de l'utende pe l'utende):",
 	"log": "Archivije",
 	"all-logs-page": "Tutte l'archivije pubbleche",
 	"alllogstext": "Visualizzazione combinate de tutte le archivije disponibbele sus a {{SITENAME}}.\nTu puè restringere 'a viste selezionanne 'u tipe de archivije, 'u nome utende (senzibbile a le maiuscole), o le pàggene coinvolte (pure chiste senzibbile a le maiuscole).",
@@ -1839,6 +1840,7 @@
 	"rollback-success": "Cangiaminde annullate da $1;\nturnate rete a l'urtema versione da $2.",
 	"sessionfailure-title": "Sessione fallite",
 	"sessionfailure": "Pare ca stonne probbleme cu 'a sessiona toje de collegamende;\nst'azione ha state scangellate pe precauzione condre a le 'ngasinaminde d'a sessione.\nPe piacere cazze \"rete\" e recareche 'a pàgene da addò tu è venute e pruève 'n'otra vote.",
+	"changecontentmodel": "Cange 'u modelle de condenute de 'na pàgene",
 	"changecontentmodel-legend": "Cange 'u modelle de condenute",
 	"changecontentmodel-title-label": "Titole d'a vôsce",
 	"changecontentmodel-model-label": "Modelle de vôsce de condenute nuève",
@@ -2320,7 +2322,7 @@
 	"tooltip-ca-nstab-main": "Vide 'a pàgene cu le condenute",
 	"tooltip-ca-nstab-user": "Vide 'a pàgene de l'utende",
 	"tooltip-ca-nstab-media": "Vide 'a pàgene de le media",
-	"tooltip-ca-nstab-special": "Queste jè 'na pàgena speciale, ca tu non ge puè cangià",
+	"tooltip-ca-nstab-special": "Queste ète 'na pàgena speciale, e non ge pò essere cangiate",
 	"tooltip-ca-nstab-project": "Vide 'a pàgene d'u proggette",
 	"tooltip-ca-nstab-image": "Vide 'a pàgene d'u fail",
 	"tooltip-ca-nstab-mediawiki": "Vide le messàgge d'u sisteme",
diff --git a/languages/i18n/ru.json b/languages/i18n/ru.json
index 208e8878df..4ea698df10 100644
--- a/languages/i18n/ru.json
+++ b/languages/i18n/ru.json
@@ -689,10 +689,10 @@
 	"session_fail_preview_html": "'''К сожалению, сервер не смог обработать вашу правку из-за потери данных сессии.'''\n\n''Так как {{SITENAME}} разрешает использовать чистый HTML, предварительный просмотр отключён в качестве меры предотвращения JavaScript-атак.''\n\n'''Если это добросовестная попытка редактирования, пожалуйста, попробуйте ещё раз.\nЕсли не получается повторная правка, попробуйте [[Special:UserLogout|завершить сеанс]] работы и заново представиться.'''",
 	"token_suffix_mismatch": "'''Ваша правка была отклонена, так как ваша программа неправильно обрабатывает знаки пунктуации\nв окне редактирования. Правка была отменена для предотвращения искажения текста статьи.\nПодобные проблемы могут возникать при использовании анонимизирующих веб-прокси, содержащих ошибки.'''",
 	"edit_form_incomplete": "'''Некоторые части формы редактирования не достигли сервера. Внимательно проверьте, что ваши правки не повреждены, и попробуйте ещё раз.'''",
-	"editing": "Редактирование $1",
+	"editing": "Редактирование: $1",
 	"creating": "Создание страницы «$1»",
 	"editingsection": "Редактирование: $1 (раздел)",
-	"editingcomment": "Редактирование $1 (новый раздел)",
+	"editingcomment": "Редактирование: $1 (новый раздел)",
 	"editconflict": "Конфликт редактирования: $1",
 	"explainconflict": "Пока вы редактировали эту страницу, кто-то внёс в неё изменения.\nВ верхнем окне для редактирования вы видите текущий текст страницы.\nВ нижнем окне находится ваш вариант.\nПеренесите сделанные вами изменения из нижнего окна в верхнее.\nПри нажатии на кнопку «{{int:savearticle}}» будет сохранён текст верхнего окна.",
 	"yourtext": "Ваш текст",
@@ -992,7 +992,8 @@
 	"rows": "Строк:",
 	"columns": "Столбцов:",
 	"searchresultshead": "Поиск",
-	"stub-threshold": "Порог для определения оформления <a href=\"#\" class=\"stub\">ссылок на заготовки</a> (в байтах):",
+	"stub-threshold": "Порог для определения оформления ссылок на заготовки ($1):",
+	"stub-threshold-sample-link": "пример",
 	"stub-threshold-disabled": "Отключён",
 	"recentchangesdays": "Количество дней, за которые показывать свежие правки:",
 	"recentchangesdays-max": "(не более $1 {{PLURAL:$1|дня|дней}})",
@@ -1712,7 +1713,7 @@
 	"booksources-text": "На этой странице приведён список ссылок на сайты, где вы, возможно, найдёте дополнительную информацию о книге. Это интернет-магазины и системы поиска в библиотечных каталогах.",
 	"booksources-invalid-isbn": "Указанный номер ISBN, судя по всему, содержит ошибку. Пожалуйста, проверьте, что при переносе номера из первоисточника не возникло искажений.",
 	"specialloguserlabel": "Исполнитель:",
-	"speciallogtitlelabel": "Цель (название или участник):",
+	"speciallogtitlelabel": "Цель (название или {{ns:user}}:имя участника):",
 	"log": "Журналы",
 	"all-logs-page": "Все доступные журналы",
 	"alllogstext": "Общий список журналов сайта {{SITENAME}}.\nВы можете отфильтровать результаты по типу журнала, имени участника (учитывается регистр) или затронутой странице (также учитывается регистр).",
diff --git a/languages/i18n/sah.json b/languages/i18n/sah.json
index ee7c91bd0c..6e2ded17b6 100644
--- a/languages/i18n/sah.json
+++ b/languages/i18n/sah.json
@@ -432,6 +432,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|сирэй|сирэй}}",
 	"createacct-benefit-body3": "кэнники {{PLURAL:$1|кыттааччы|кыттааччы}}",
 	"badretype": "Киирии тылларыҥ сөп түбэспэтилэр.",
+	"usernameinprogress": "Бу аатынан бэлиэтэнии бара турар.\nБука диэн кэтэһэ түс.",
 	"userexists": "Суруйбут аатыҥ бэлиэр баар.\nБука диэн, атын аатта тал.",
 	"loginerror": "Ааккын система билбэтэ",
 	"createacct-error": "Бэлиэтэнии кэмигэр алҕас таҕыста",
@@ -921,7 +922,8 @@
 	"rows": "Строкаалара:",
 	"columns": "Колонкалара:",
 	"searchresultshead": "Көрдөөһүн түмүгэ",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">омооннорго ыйынньыктары</a> оҥоруу боруога:",
+	"stub-threshold": "Омооннорго ыйынньыктары оҥоруу боруога ($1):",
+	"stub-threshold-sample-link": "холобур",
 	"stub-threshold-disabled": "Арахсыбыт",
 	"recentchangesdays": "Хас хонук иһинэн уларытыылары көрдөрөргө:",
 	"recentchangesdays-max": "(улааппыта $1 күн)",
@@ -1294,6 +1296,8 @@
 	"uploaded-href-unsafe-target-svg": "Хачайдаммыт SVG-билэҕэ кутталлаах сигэ көһүннэ <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploaded-animate-svg": "«Animate» тиэк көһүннэ, кини «from»-атрибут көмөтүнэн  <code>&lt;$1 $2=\"$3\"&gt;</code> хачайдаммыт SVG-билэҕэ сигэни уларытыан сөп.",
 	"uploaded-setting-href-svg": "Төрүт элэмиэҥҥэ «href» атрибуту киллэрэр «set» тиэги туһанар бобуулаах.",
+	"uploaded-wrong-setting-svg": "«Set» тиэги аадырыс/дааннай/сценарий быһыытынан ханнык баҕарар атрибуукка эбии хааччахтаммыт. Угуллубут SVG-билэҕэ <code>&lt;set to=\"$1\"&gt;</code> конструкция көстүбүт.",
+	"uploaded-setting-handler-svg": "«Handler» атрибууту аадырыс/дааннай/скрипт көмөтүнэн быһаарар SVG хааччахтаммыт. Угуллубут SVG-билэҕэ <code>$1=\"$2\"</code> конструкция көстүбүт.",
 	"uploaded-image-filter-svg": "Хачайдаммыт SVG-билэҕэ маннык URL-аадырыстаах ойуу сиидэтэ көстүбүт <code>&lt;$1 $2=\"$3\"&gt;</code>.",
 	"uploadscriptednamespace": "Бу SVG-билэ алҕастаах аат даллаах эбит: '$1'",
 	"uploadinvalidxml": "Хачайдаммит билэҕэ XML анаалыстанар кыаҕа суох.",
diff --git a/languages/i18n/scn.json b/languages/i18n/scn.json
index c44e0d6a69..bbc3660626 100644
--- a/languages/i18n/scn.json
+++ b/languages/i18n/scn.json
@@ -17,7 +17,7 @@
 			"Macofe"
 		]
 	},
-	"tog-underline": "Suttalinia li lijami:",
+	"tog-underline": "Suttalìnia li lijami:",
 	"tog-hideminor": "Ammuccia li canciamenti nichi nta l'ùrtimi canciamenti",
 	"tog-hidepatrolled": "Ammuccia li mudìfichi battugghiati nta l'ùrtimi canciamenti",
 	"tog-newpageshidepatrolled": "Ammuccia li pàggini battugghiati di l'alencu dî pàggini cchiu' novi",
@@ -169,7 +169,7 @@
 	"returnto": "Ritorna a' $1.",
 	"tagline": "Di {{SITENAME}}",
 	"help": "Guida",
-	"search": "Arriscedi",
+	"search": "Arricerca",
 	"searchbutton": "Va cerca",
 	"go": "Trova",
 	"searcharticle": "Vai",
@@ -313,7 +313,7 @@
 	"readonly": "Basi di dati bluccata",
 	"enterlockreason": "Spiega lu mutivu dû bloccu, spicificannu na stima di quannu veniravi livatu.",
 	"readonlytext": "Com'ad ora la basi di dati è bluccata e nun sunnu pussìbbili junti o canciamenti; lu mutivu prubbabbili è la manutinzioni ordinària, finuta la quali la basi di dati turniravi normali.\n\nL'amministraturi chi la bluccau desi sta spiegazzioni: $1",
-	"missing-article": "La basi di dati nun attruvau lu testu di na pàggina ch'avìssi avutu a' attruvari, cu' nomu \"$1\" $2.\n\nSta cosa di sòlitu succedi quannu s'arrichiama, a' pàrtiri di na crunuluggìa o di nu cunfruntu tra virsioni, nu liami a na pàggina chi' fu' cancillata.\n\nSi' nun è accussì, po' èssiri ca scupristi nu bug ntô software.\nPi' favuri signala stu fattu a' n'[[Special:ListUsers/sysop|amministraturi]], spicificannu l'URL.",
+	"missing-article": "La basi di dati nun attruvau lu testu di na pàggina c'avissi avutu a attruvari, cu nomu \"$1\" $2.\n\nSta cosa di sòlitu succedi quannu s'arrichiama, a pàrtiri di na crunuluggìa o di nu cunfruntu tra virsioni, nu liami a na pàggina chi fu cancillata.\n\nSi nun è accussì, pò èssiri ca scupristi nu bug ntô software.\nPi favuri signala stu fattu a n'[[Special:ListUsers/sysop|amministraturi]], spicificannu l'URL.",
 	"missingarticle-rev": "(№ di virsioni: $1)",
 	"missingarticle-diff": "(Diff: $1, $2)",
 	"readonly_lag": "La basi di dati fu' bluccata autumaticamenti nta mentri ca li server di basi di dati slave si sincrunìzzanu cu' chiddu master",
@@ -335,7 +335,7 @@
 	"delete-hook-aborted": "Cancillazzioni annullata di n'hook.\nNun desi nudda spiegazzioni.",
 	"no-null-revision": "Non fu' pussibbili criari na virsioni nulla pâ paggina \"$1\"",
 	"badtitle": "Tìtulu nun bonu",
-	"badtitletext": "Lu tìtulu di pàggina addumannatu nun era vàlidu, era vacanti, o vinìa dûn lijami intir-linguìsticu o intir-wiki malu fattu.\nPutissi cuntèniri unu o cchiu' ssai caràttiri chi' nun su' cunsintuti ntê tìtula.",
+	"badtitletext": "Lu tìtulu di pàggina addumannatu nun era vàlidu, era vacanti, o vinìa dûn lijami nterlinguìsticu o nterwiki malu fattu.\nPutissi cuntèniri unu o chiossai caràttiri chi nun sù cunzintuti ntê tìtula.",
 	"title-invalid-empty": "Lu tìtulu addumannatu pâ pàggina è vacanti o puru cunteni sulu lu nomu dûn namespace.",
 	"title-invalid-utf8": "Lu tìtulu addumannatu pâ pàggina cunteni na siguenza UTF-8 nun vàlida.",
 	"title-invalid-interwiki": "Lu tìtulu addumannatu pâ pàggina cunteni ligami interwiki, ca ntê tìtula nun si ponnu adupirari.",
@@ -354,11 +354,11 @@
 	"actionthrottledtext": "Comu misura di sicurezza contru lu spam, l'esecuzioni di alcuni azzionu è limitata a nu nùmmuru massimu di voti ni nu determinatu piriudu du tempu, limiti ca ni stu casu fu supiratu. Si prega di ripruvari tra qualchi minutu.",
 	"protectedpagetext": "Sta pàggina fu bluccata pi privèniri canciamenti o autri opirazzioni.",
 	"viewsourcetext": "Poi taliari e cupiari lu còdici surgenti di sta pàggina.",
-	"viewyourtext": "Poi taliari e cupiari lu còdici surgenti dî <strong>to canciamenti</strong> nti sta pàggina.",
+	"viewyourtext": "Poi taliari e cupiari lu còdici surgenti dî <strong>tò canciamenti</strong> nti sta pàggina.",
 	"protectedinterface": "Sta pàggina cunteni un elementu ca fà parti dâ nterfaccia utenti dû software eggh'è  prutetta p'evitari pussìbbili abbusi. Pi jùnciri o canciari li traduzzioni pi tutti li wiki usari [//translatewiki.net/translatewiki.net] lu pruggettu di lucalizzazzioni di Mediawiki.",
 	"editinginterface": "<strong>Accura:</strong> Lu testu di sta pàggina fà parti di l'interfaccia utenti dû situ.\nTutti li canciamenti appurtati a sta pàggina si riflèttinu supra li missaggi visualizzati pi tutti l'utenti di sta wiki.",
 	"translateinterface": "Pi' agghiunciri o canciari traduzzioni pi' tutti i wiki, pi' favuri adupirati [//translatewiki.net/ translatewiki.net], lu pruggettu di lucalizzazzioni di MediaWiki.",
-	"cascadeprotected": "Sta pàggina è prutetta dî canciamenti pirchì veni trasclusa {{PLURAL:$1|ntâ pàggina siquenti, ca fu' prutiggiuta|ntê pàggini siquenti, ca foru prutiggiuti}} cu' l'opzioni «a' cascata»:\n$2",
+	"cascadeprotected": "Sta pàggina è prutetta dî canciamenti pirchì veni nclusa {{PLURAL:$1|ntâ pàggina siquenti, ca fu prutiggiuta|ntê pàggini siquenti, ca foru prutiggiuti}} cu l'opzioni «a cascata»:\n$2",
 	"namespaceprotected": "Nun hai lu pirmissu pi canciari li pàggini ntô namespace '''$1'''.",
 	"customcssprotected": "Nun hai lu pirmissu pi' canciari sta pàggina CSS picchì cunteni i mpustazzioni pirsunali di n'autru utenti.",
 	"customjsprotected": "Nun hai lu pirmissu pi' canciari sta pàggina JavaScript picchì cunteni i mpustazzioni pirsunali di n'autru utenti.",
@@ -434,6 +434,7 @@
 	"createacct-benefit-body2": "{{PLURAL:$1|pàggina|pàggini}}",
 	"createacct-benefit-body3": "{{PLURAL:$1|cuntribbuturi ricenti|cuntribbutura ricenti}}",
 	"badretype": "Li password chi' mittisti nun currispùnnunu tra d'iddi.",
+	"usernameinprogress": "Un cuntu cu stu nomu utenti già si sta criannu.\nPi favuri aspetta.",
 	"userexists": "Lu nomu utenti nziritu è già usatu.\nTi prijamu pirciò di vuliri scègghîri nu nomu utenti diffirenti.",
 	"loginerror": "Erruri ntâ trasuta",
 	"createacct-error": "Erruri ntâ criazzioni dû cuntu",
@@ -552,7 +553,7 @@
 	"link_sample": "Tìtulu dû lijami",
 	"link_tip": "Lijami di dintra",
 	"extlink_sample": "http://www.example.com tìtulu dâ lijami",
-	"extlink_tip": "Lijami di fora (ricurdàrisi lu prifissu http://)",
+	"extlink_tip": "Lijami di fora (arricurdàrisi lu prifissu http://)",
 	"headline_sample": "Ntistazzioni",
 	"headline_tip": "Suttantistazzioni",
 	"nowiki_sample": "Nzirisci ccà lu testu nun furmattatu",
@@ -560,7 +561,7 @@
 	"image_sample": "Asempiu.jpg",
 	"image_tip": "File ncurpuratu",
 	"media_sample": "Asempiu.ogg",
-	"media_tip": "Lijami a' file",
+	"media_tip": "Lijami a file",
 	"sig_tip": "A to firma cu' data e ura",
 	"hr_tip": "Linia urizzuntali (usari cu' giudizziu)",
 	"summary": "Riassuntu:",
@@ -595,11 +596,11 @@
 	"accmailtitle": "Password mannata",
 	"accmailtext": "Na password ginirata casualmenti pi' [[User talk:$1|$1]] fu' spiduta a $2. Si po' canciari di la pàggina di <em>[[Special:ChangePassword|canciamentu dâ password]]</em> comu unu trasi.",
 	"newarticle": "(Novu)",
-	"newarticletext": "Siguisti na lijami a' na pàggina ch'ancora nun esisti.\nPi' criari sta pàggina, accumenza a' scrìviri ccassutta (talìa la [$1 pàggina d'ajutu] p'aviri majuri nfurmazzioni).\nSi' agghicasti cca pi' sbagghiu, carca lu buttuni <strong>n' arreri</strong> dû to browser.",
+	"newarticletext": "Siguisti na lijami a na pàggina chancora nun esisti.\nPi criari sta pàggina, accumenza a scrìviri ccassutta (talìa la [$1 pàggina d'aiutu] p'aviri maiuri nfurmazzioni).\nSi agghicasti ccà pi sbagghiu, carca lu buttuni <strong>n arreri</strong> dû tò browser.",
 	"anontalkpagetext": "----''Chista è la pàggina di discussioni di n’utenti anònimu, ca nun criau ancora n’accessu o ca nun l’usa.\nP’idintificàrilu è pirciò nicissariu usari lu nùmmiru di lu sò nnirizzu IP.\nLi nnirizzi IP ponnu pirò èssiri spartuti di cchiù utenti.\nSiddu sî n’utenti anònimu e riteni ca li cummenti prisenti nta sta pàggina nun si rifirìscinu a tia, [[Special:UserLogin/signup|crea n’accessu novu]] o [[Special:UserLogin|trasi]] cu chiddu ca già hai p’evitari d’èssiri cunfusu cu àutri utenti anònimi ‘n futuru.''",
 	"noarticletext": "Nta stu mumentu la pàggina addumannata è vacanti. È pussìbbili [[Special:Search/{{PAGENAME}}|circari stu tìtulu]] nta l'àutri pàggini dû situ oppuru <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|action=edit}} circari ntê riggistra culligati] oppuru [{{fullurl:{{FULLPAGENAME}}|action=edit}} canciari la pàggina ora]</span>.",
 	"noarticletext-nopermission": "Nta stu mumentu la pàggina addumannata è vacanti. È pussibbili [[Special:Search/{{PAGENAME}}|circari stu titulu]] nti àutri pàggini dû situ o <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} circari ntê riggistra culligati]</span>, ma nun hai li pirmissa pi criari sta pàggina.",
-	"missing-revision": "A virsioni #$1 dâ paggina ntitulata \"{{FULLPAGENAME}}\" nun esisti.\n\nStu fattu di sòlitu succedi quannu si segui na lijami di crunuluggìa versu na pàggina chi' fu' cancillata.\nSi ponnu a' vìdiri i dittagghî ntô [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} riggistru dî cancillazzioni].",
+	"missing-revision": "A virsioni #$1 dâ paggina ntitulata \"{{FULLPAGENAME}}\" nun esisti.\n\nStu fattu di sòlitu succedi quannu si segui na lijami di crunuluggìa versu na pàggina chi fu cancillata.\nSi ponnu vìdiri li dittagghî ntô [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} riggistru dî cancillazzioni].",
 	"userpage-userdoesnotexist": "L'account \"<nowiki>$1</nowiki>\" nun currispunni a n'utenti riggistratu. Virificari si si voli criari o canciari sta pàggina.",
 	"userpage-userdoesnotexist-view": "U cuntu utenti \"$1\" nun è riggistratu.",
 	"blocked-notice-logextract": "St'utenti pi' com'ora è bluccatu.\nComu rifirimentu ccassutta cc'è l'ùltima vuci dû riggìstru dî blocchi:",
@@ -633,12 +634,12 @@
 	"yourdiff": "Diffirenzi",
 	"copyrightwarning": "Pi' favuri nota ca tutti li cuntribbuti mannati a' {{SITENAME}} s'hannu a' cunsiddirari sutta â licenza d'usu $2 (talìa $1 pî dittagghî).\nSi' nun voi ca li to testi vènunu mudificati senza nuddu riguardu e ridistribbuùti a' vogghia, allura nê mannari cca.<br />\nMannannu lu to testu nni dichiari sparti chi' lu scrivisti tu pirsunalmenti, o puru ca lu cupiasti di na fonti di pùbblicu duminiu o analugamenti lìbbira.\n<strong>Nun mannari matiriali cupertu di drittu d'auturi senza auturizzazzioni!</strong>",
 	"copyrightwarning2": "Pi' favuri nota ca tutti li cuntribbuti mannati a' {{SITENAME}} ponnu vèniri canciati, altirati o cancillati di l'autri participanti.\nSi' nun voi ca li to testi vènunu mudificati senza nuddu riguardu, allura nê mannari cca.<br />\nMannannu lu to testu nni dichiari sparti ca lu scrivisti tu pirsunalmenti, o puru ca lu cupiasti di na fonti di pùbblicu duminiu o analugamenti lìbbira (talìa $1 pi' majuri dittagghî).\n<strong>Nun mannari matiriali cupertu di drittu d'auturi senza auturizzazzioni!</strong>",
-	"editpage-cannot-use-custom-model": "Lu mudellu dû cuntinutu di sta pàggina nun si po’ canciari.",
+	"editpage-cannot-use-custom-model": "Lu mudellu dû cuntinutu di sta pàggina nun si pò canciari.",
 	"longpageerror": "<strong>Erruri: Lu testu ca hai suttamisu è longu {{PLURAL:$1|un kilobyte|$1 kilobyte}}, cchiù' ssai dû màssimu ca è di {{PLURAL:$2|un kilobyte|$2 kilobyte}}.</strong>\nNun si po' sarvari.",
 	"readonlywarning": "<strong>Accura: Lu database è fermu pi manutinzioni, pirciò nun poi sarvari li tò canciamenti nta stu mumentu.</strong>\nLa cosa megghia è fari un copia e ncodda dû testu nta n'àutru prugramma e sarvàrilu pi quannu lu database torna accissìbbili.\n\nL'amministraturi ca bluccau lu database desi sta spiegazzioni: $1",
 	"protectedpagewarning": "<strong>Accura: Sta pàggina fu' prutetta a' manera chi' sulu l'utenti cu' privileggi d'amministraturi a ponnu canciari.</strong>\nPi' rifirimentu, ccassutta è ripurtata l'ultima vuci dû riggistru:",
 	"semiprotectedpagewarning": "<strong>Nota:</strong> Sta pàggina fu' prutetta a' manera chi' sulu l'utenti riggistrati la ponnu canciari.\nPi' rifirimentu, ccassutta è ripurtata l'ultima vuci dû riggistru:",
-	"cascadeprotectedwarning": "<strong>Accura:</strong> Sta pàggina fu' bluccata di manera ca sulu l'utenti cu' privileggi di amministraturi la ponnu canciari, pirchì veni trasclusa {{PLURAL:$1|nta siquenti pàggina ca è prutiggiuta|ntê siquenti pàggini ca sunnu prutiggiuti}} a' cascata:",
+	"cascadeprotectedwarning": "<strong>Accura:</strong> Sta pàggina fu bluccata di manera ca sulu l'utenti cu privileggi di amministraturi la ponnu canciari, pirchì veni nclusa {{PLURAL:$1|ntâ pàggina  siquenti ca è prutiggiuta|ntê pàggini siquenti ca sunnu prutiggiuti}} a cascata:",
 	"titleprotectedwarning": "<strong>Accura: Sta pàggina fu' prutetta a' manera chi' giuvunu [[Special:ListGroupRights|privileggi spicìfici]] pi' criàrila.</strong>\nPi' rifirimentu, ccassutta è ripurtata l'ultima vuci dû riggistru:",
 	"templatesused": "{{PLURAL:$1|Template adupiratu|Template adupirati}} nta sta pàggina:",
 	"templatesusedpreview": "{{PLURAL:$1|Template adupiratu|Template adupirati}} nta st'antiprima:",
@@ -800,14 +801,14 @@
 	"revdelete-edit-reasonlist": "Cancia li mutivazioni pi la cancillazzioni",
 	"revdelete-offender": "Auturi dâ virsioni:",
 	"suppressionlog": "Riggistru dî supprissioni",
-	"suppressionlogtext": "Ccassutta cc'è n'elencu dî cancillazzioni e dî blocchi chi' cumpòrtunu l'ammucciata di cuntinutu a' l'occhî di l'amministratura.\nSi po' cunsultari la [[Special:BlockList|lista dî blocchi]] pi' canùsciri li furbanna e li blocchi in viguri pi' com'ora.",
+	"suppressionlogtext": "Ccassutta c'è n'elencu dî cancillazzioni e dî blocchi chi cumpòrtanu l'ammucciata di cuntinutu a l'occhî di l'amministratura.\nSi pò cunzurtari la [[Special:BlockList|lista dî blocchi]] pi canùsciri li furbanna e li blocchi n viguri pi com'ora.",
 	"mergehistory": "Junciuta dî crunuluggìi",
 	"mergehistory-header": "Sta pàggina fa' jùnciri li crunuluggìi di du pàggini, abbuccannu li virsioni di na pàggina surgenti nta na pàggina cchiu' nova.\nAssicùriti ca stu canciamentu mantiniràvi la cuntinuità storica di la pàggina.",
 	"mergehistory-box": "Junci li storii di dui pàggini:",
 	"mergehistory-from": "Pàggina d'orìggini:",
 	"mergehistory-into": "Pàggina di distinazioni:",
 	"mergehistory-list": "Crunuluggìa chi' si po' jùnciri",
-	"mergehistory-merge": "Si pònnu jùnciri li virsioni di [[:$1]] nnicati ccassutta â crunuluggìa di [[:$2]].\nAdòpira la culonna chî buttuni di opzioni pi' jùnciri sulu li virsioni fatti nfina â data e l'ura spicificati.\nGuàrditi ca s'adòpiri lijami di navigazzioni la culonna veni azzirata.",
+	"mergehistory-merge": "Si ponnu jùnciri li virsioni di [[:$1]] nnicati ccassutta â crunuluggìa di [[:$2]].\nAdòpira la culonna chî buttuna d'opzioni pi jùnciri sulu li virsioni fatti nfina â data e l'ura spicificati.\nGuàrdati ca s'adòpiri lijami di navigazzioni la culonna veni azzirata.",
 	"mergehistory-go": "Vidi li canciamenti ca ponnu èssiri junciuti",
 	"mergehistory-submit": "Junci li virsioni",
 	"mergehistory-empty": "Nudda virsioni di jùnciri.",
@@ -837,7 +838,7 @@
 	"diff-multi-sameuser": "({{PLURAL:$1|Na diffirenza minzana|$1 diffirenzi minzani}} dû stissu utenti nun {{PLURAL:$1|mustrata|mustrati}})",
 	"diff-multi-otherusers": "({{PLURAL:$1|Na diffirenza minzana|$1 diffirenzi minzani}} di {{PLURAL:$2|n'autru utenti|autri $2 utenti}} nun {{PLURAL:$1|mustrata|mustrati}})",
 	"diff-multi-manyusers": "({{PLURAL:$1|Na diffirenza minzana|$1 diffirenzi minzani}} di cchiu' ssai di {{PLURAL:$2|n'autru utenti|autri $2 utenti}} nun {{PLURAL:$1|mustrata|mustrati}})",
-	"difference-missing-revision": "{{PLURAL:$2|Na virsioni|$2 virsioni}} di sta diffirenza ($1) {{PLURAL:$2|nun fu' truvata|nun furu truvati}}.\n\nStu fattu di sòlitu succedi quannu si segui nu lijami di diffirenza versu na pàggina chi' fu' cancillata.\nSi ponnu a' vìdiri i dittagghî ntô [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} riggistru dî cancillazzioni].",
+	"difference-missing-revision": "{{PLURAL:$2|Na virsioni|$2 virsioni}} di sta diffirenza ($1) {{PLURAL:$2|nun fu attruvata|nun foru attruvati}}.\n\nStu fattu di sòlitu succedi quannu si segui nu lijami di diffirenza versu na pàggina chi fu cancillata.\nSi ponnu vìdiri li dittagghî ntô [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} riggistru dî cancillazzioni].",
 	"searchresults": "Risurtati dâ risciduta",
 	"searchresults-title": "Risurtati dâ risciduta di \"$1\"",
 	"titlematches": "Currispunnenzi ntê tìtuli dî pàggini",
@@ -868,7 +869,7 @@
 	"search-category": "(catigurìa $1)",
 	"search-file-match": "(currispunnenza ntô cuntinutu dûn file)",
 	"search-suggest": "Forsi circavutu: $1",
-	"search-rewritten": "Sunnu ammustrati li risurtati pi’ $1. Nveci cerca $2.",
+	"search-rewritten": "Sunnu ammustrati li risurtati pi $1. Mmeci cerca $2.",
 	"search-interwiki-caption": "Pruggetti frati",
 	"search-interwiki-default": "Risultati di $1:",
 	"search-interwiki-more": "(cchiù)",
@@ -922,7 +923,8 @@
 	"rows": "Righi:",
 	"columns": "Culonni:",
 	"searchresultshead": "Risciduta",
-	"stub-threshold": "Valuri minimu pî <a href=\"#\" class=\"stub\">liami a li stub</a>:",
+	"stub-threshold": "Sogghia pi furmattari na liami comu bozza ($1):",
+	"stub-threshold-sample-link": "esempiu",
 	"stub-threshold-disabled": "Disattivatu",
 	"recentchangesdays": "Nùmmiru di jorna a' ammustrari nta l'ùrtimi cancaiamenti:",
 	"recentchangesdays-max": "(màssimu $1 {{PLURAL:$1|jornu|jorna}})",
@@ -969,14 +971,14 @@
 	"badsig": "Firma grezza nun vàlida.\nCuntrolla l'etichetti HTML.",
 	"badsiglength": "La to firma è troppu longa.\nNun havi a' èssiri cchiu' longa di $1 {{PLURAL:$1|caràttiri|caràttiri}}.",
 	"yourgender": "Comu prifirisci èssiri discrivutu?",
-	"gender-unknown": "Quannu ti mmuntùa, si’ po’, lu prugramma adupiriràvi lu gèniri grammaticali neutru",
+	"gender-unknown": "Quannu t'ammintua, si pò, lu prugramma adòpira lu gèniri grammaticali nèutru",
 	"gender-male": "N'auturi di pàggini dâ wiki",
 	"gender-female": "N'autrici di pàggini dâ wiki",
 	"prefs-help-gender": "Mpustari sta prifirenza è facultativu.\nU software adòpira u so valuri pi' parrari cu' tia, e di tia a' l'autri, facennu usu dû gèniri grammaticali currettu.\nSta nfurmazzioni sarravi pùbblica.",
 	"email": "Nnirizzu di posta elittrònica",
 	"prefs-help-realname": "Lu nomu veru è facultativu.\nSiddu scegghî di furnìrilu, veni adupiratu pi' dàriti crèditu dû tò travagghiu.",
 	"prefs-help-email": "Lu nnirizzu di posta elittrònica è facultativu, ma po' giuvari p'azzirari la password, ntô casu chi' tâ scordi.",
-	"prefs-help-email-others": "Poi videmma scègghîri di pirmèttiri ca l'autri ti cuntàttanu pi' posta elittrònica a' pàrtiri dî lijami chi' si tròvanu ntê to pàggini d'utenti o di discussioni.\nLu tò nnirizzu nun veni rivilatu quannu l'àutri utenti ti cuntàttunu.",
+	"prefs-help-email-others": "Poi videmma scègghiri di pirmèttiri ca l'àutri ti cuntàttanu pi posta elittrònica a pàrtiri dî lijami chi s'attròvanu ntê tò pàggini d'utenti o di discussioni.\nLu tò nnirizzu nun veni rivilatu quannu l'àutri utenti ti cuntàttanu.",
 	"prefs-help-email-required": "Lu nnirizzu di posta elittrònica è obbligatoriu.",
 	"prefs-info": "Nfurmazzioni essinziali",
 	"prefs-i18n": "Intirnazziunalizzazioni",
@@ -1205,8 +1207,8 @@
 	"newpageletter": "N",
 	"boteditletter": "b",
 	"number_of_watching_users_pageview": "[taliata di {{PLURAL:$1|nu utenti|$1 utenti}}]",
-	"rc_categories": "Lìmita a li catigurìi (siparati di \"|\")",
-	"rc_categories_any": "Quali è jè",
+	"rc_categories": "Lìmita a li catigurìi (spartuti cu «|»)",
+	"rc_categories_any": "Qualegghiè tra chiddi scigghiuti",
 	"rc-change-size-new": "$1 {{PLURAL:$1|byte|byte}} appressu dû canciamentu",
 	"newsectionsummary": "/* $1 */ sizzioni nova",
 	"rc-enhanced-expand": "Ammustra li dittagghî",
@@ -1329,6 +1331,19 @@
 	"upload-too-many-redirects": "L'URL cuntineva troppi redirect",
 	"upload-http-error": "Mmattìu n'erruri HTTP: $1",
 	"upload-copy-upload-invalid-domain": "Lu carricamentu di copî nun è cunsintutu di stu duminiu.",
+	"upload-dialog-title": "Carricamentu dûn file",
+	"upload-dialog-error": "Ammattìu n'erruri",
+	"upload-dialog-warning": "Ammattìu n'avvisu",
+	"upload-dialog-button-cancel": "Annulla",
+	"upload-dialog-button-done": "Finutu",
+	"upload-dialog-button-save": "Sarva",
+	"upload-dialog-button-upload": "Càrrica",
+	"upload-dialog-label-select-file": "Scegghi lu file",
+	"upload-dialog-label-infoform-title": "Dittagghî",
+	"upload-dialog-label-infoform-name": "Nomu",
+	"upload-dialog-label-infoform-description": "Discrizzioni",
+	"upload-dialog-label-usage-title": "Usu",
+	"upload-dialog-label-usage-filename": "Nomu dû file",
 	"backend-fail-stream": "Nun fu pussìbbili trasmèttiri lu file \"$1\".",
 	"backend-fail-backup": "Nun fu' pussìbbili fari na copia di riserva dû file \"$1\".",
 	"backend-fail-notexists": "Lu file $1 nun esisti.",
@@ -1349,9 +1364,9 @@
 	"backend-fail-maxsize": "Nun fu' pussìbbili scrìviri lu file \"$1\" picchì è cchiu' grossu di {{PLURAL:$2|un byte|$2 byte}}.",
 	"backend-fail-readonly": "U backend di mimurizzazzioni \"$1\" pi' com'ora è a' sula littura. La spiegazzioni data è: \"<em>$2</em>\"",
 	"backend-fail-synced": "Lu file \"$1\" si trova nta nu statu incoerenti tra dî backend di mimurizzazzioni interni.",
-	"backend-fail-connect": "Nun fu' pussìbbili culligàrisi ô backend di mimurizzazzioni \"$1\".",
-	"backend-fail-internal": "Mmattìu n'erruri scanusciutu ntô backend di mimurizzazzioni \"$1\".",
-	"backend-fail-contenttype": "Nun fu' pussìbbili ditirminari lu tipu di cuntinutu dû file di mimurizzari nta \"$1\".",
+	"backend-fail-connect": "Nun fu pussìbbili culligàrisi ô supportu di mimurizzazzioni \"$1\".",
+	"backend-fail-internal": "Si virificau n'erruri scanusciutu ntô supportu di mimurizzazzioni \"$1\".",
+	"backend-fail-contenttype": "Nun fu pussìbbili ditirminari lu tipu di cuntinutu dû file di mimurizzari nti \"$1\".",
 	"backend-fail-batchsize": "U backend di mimurizzazzioni ricivìu na nfurnata di {{PLURAL:$1|una opirazzioni|$1 opirazzioni}} tra file; però lu so lìmiti è di {{PLURAL:$2|na sula opirazzioni|$2 opirazzioni}}.",
 	"backend-fail-usable": "Nun fu' pussìbbili lèggiri o scrìviri lu file \"$1\" pi' causa di pirmissi nsufficienti o cartelli/cuntinituri mancanti.",
 	"filejournal-fail-dbconnect": "Nun fu' pussìbbili culligàrisi â basi di dati giurnali dû backend di mimurizzazzioni \"$1\".",
@@ -1442,7 +1457,7 @@
 	"linkstoimage": "{{PLURAL:$1|La pàggina siquenti richiàma|Li $1 pàggini siquenti richiàmanu}} stu file:",
 	"linkstoimage-more": "Cci su' cchiu' ssai di $1 {{PLURAL:$1|pàggina|pàggini}} ca richiàmunu stu file.\nLa lista ccassutta ammustra sulu {{PLURAL:$1|la prima pàggina|li primi $1 pàggini}}.\nSi po' puru a' vìdiri [[Special:WhatLinksHere/$2|na lista cumpleta]].",
 	"nolinkstoimage": "Nudda pàggina richiama stu file.",
-	"morelinkstoimage": "Ammustra [[Special:WhatLinksHere/$1|autri lijami]] versu di stu file.",
+	"morelinkstoimage": "Ammustra [[Special:WhatLinksHere/$1|àutri lijami]] versu di stu file.",
 	"linkstoimage-redirect": "$1 (rimannu ô file) $2",
 	"duplicatesoffile": "{{PLURAL:$1|Stu|Sti $1}} file {{PLURAL:$1|è nu dupppiuni|sunnu duppiuni}} di st'autru file ([[Special:FileDuplicateSearch/$2|cchiù dittagli]]):",
 	"sharedupload": "Stu file veni di $1 e purrìa èssiri adupiratu di autri pruggetti.",
@@ -1490,8 +1505,8 @@
 	"listduplicatedfiles-summary": "Chista è na lista dî file unni la virsioni cchiu' nova è nu duppiuni dâ virsioni cchiu' nova di quarchi' autru file. Sulu li file lucali su' pigghiati a' cunsiddirazzioni.",
 	"listduplicatedfiles-entry": "[[:File:$1|$1]] havi [[$3|{{PLURAL:$2|nu duppiuni|$2 duppiuna}}]].",
 	"unusedtemplates": "Template nun usati",
-	"unusedtemplatestext": "Sta pàggina elenca tutti li pàggini nto namespace {{ns:template}} ca nun sunnu nclusi nta nudda autra pàggina.\nPrima di cancillàrili è megghiu cuntrullari ca nun hannu autri lijami ca cci tràsunu.",
-	"unusedtemplateswlh": "autri lijami",
+	"unusedtemplatestext": "Sta pàggina elenca tutti li pàggini ntô namespace {{ns:template}} ca nun sunnu nclusi nta nudda àutra pàggina.\nPrima di cancillàrili è megghiu cuntrullari ca nun hannu àutri lijami ca ci tràsinu.",
+	"unusedtemplateswlh": "àutri lijami",
 	"randompage": "Na pàggina a' muzzu",
 	"randompage-nopages": "Nun cci su' pàggini {{PLURAL:$2|nta stu namespace|nta sti namespace}}: $1.",
 	"randomincategory": "Na pàggina a' muzzu nta na catigurìa",
@@ -1524,7 +1539,7 @@
 	"pageswithprop-prophidden-long": "valuri tistuali longu dâ prupietà ammucciatu ($1)",
 	"pageswithprop-prophidden-binary": "valuri binariu dâ prupietà ammucciatu ($1)",
 	"doubleredirects": "Rimanni duppî",
-	"doubleredirectstext": "Sta pàggina alenca li pàggini chi' rimànnunu ad autri pàggini di rimannu.\nOgnin riga cunteni lijami versu lu primu e versu lu secunnu rimannu, sparti dâ distinazzioni dû secunnu rimannu, ca di sòlitu è la pàggina \"giusta\" unni avissi a' puntari macari lu primu rimannu.\nLi rimanni <del>sbarrati</del> hannu statu cunsati.",
+	"doubleredirectstext": "Sta pàggina alenca li pàggini chi rimànnanu a àutri pàggini di rimannu.\nOgni riga cunteni lijami versu lu primu e versu lu secunnu rimannu, sparti dâ distinazzioni dû secunnu rimannu, ca di sòlitu è la pàggina \"giusta\" unni avissi a puntari macari lu primu rimannu.\nLi rimanni <del>sbarrati</del> foru cunzati.",
 	"double-redirect-fixed-move": "[[$1]] fu spustata.\nFu aggiurnata autumaticamenti e ora rimanna a [[$2]].",
 	"double-redirect-fixed-maintenance": "Cunsatu autumaticamenti nu rimannu duppiu di [[$1]] a' [[$2]] ntôn sirvizzu di manutinzioni.",
 	"double-redirect-fixer": "Cunsaturi dî rimanni",
@@ -1532,8 +1547,8 @@
 	"brokenredirectstext": "Li rimanni siguenti pùntanu a' pàggini ca nun esìstinu:",
 	"brokenredirects-edit": "cancia",
 	"brokenredirects-delete": "cancella",
-	"withoutinterwiki": "Pàggini senza lijami intir-linguìstici",
-	"withoutinterwiki-summary": "Li pàggini siguenti nun hannu lijami versu dî virsioni nta l'autri lingui.",
+	"withoutinterwiki": "Pàggini senza lijami nterlinguìstici",
+	"withoutinterwiki-summary": "Li pàggini siguenti nun hannu lijami versu dî virsioni nta l'àutri lingui.",
 	"withoutinterwiki-legend": "Prifissu",
 	"withoutinterwiki-submit": "Ammustra",
 	"fewestrevisions": "Pàggini cu' cchiu' picca virsioni",
@@ -1548,7 +1563,7 @@
 	"ntransclusions": "adupiratu nta $1 {{PLURAL:$1|pàggina|pàggini}}",
 	"specialpage-empty": "Nun cci su' risultati pi' stu rennicuntu.",
 	"lonelypages": "Pàggini òrfani",
-	"lonelypagestext": "Li pàggini ccassutta nun hannu lijami ca vèninu d'autri pàggini e nun su' trasclusi nta autri pàggini di {{SITENAME}}.",
+	"lonelypagestext": "Li pàggini ccassutta nun hannu lijami ca vèninu d'àutri pàggini e nun sù nclusi nta àutri pàggini di {{SITENAME}}.",
 	"uncategorizedpages": "Pàggini nun catigurizzati",
 	"uncategorizedcategories": "Catigurìi nun catigurizzati",
 	"uncategorizedimages": "File nun catigurizzati",
@@ -1578,7 +1593,7 @@
 	"shortpages": "Pàggini curti",
 	"longpages": "Pàggini longhi",
 	"deadendpages": "Pàggini senza nisciuta",
-	"deadendpagestext": "Li pàggini siguenti sunnu privi di lijami versu autri pàggini di {{SITENAME}}.",
+	"deadendpagestext": "Li pàggini siguenti sunnu privi di lijami versu àutri pàggini di {{SITENAME}}.",
 	"protectedpages": "Pàggini prutetti",
 	"protectedpages-indef": "Sulu prutizzioni a' tempu innitirminatu",
 	"protectedpages-summary": "Sta pàggina elenca li pàggini già esistenti chi' comu ad ora su' prutetti. Pi' na lista dî tìtuli prutetti, chî quali vèni pruibbutu criari pàggini novi, talìa [[{{#special:ProtectedTitles}}|{{int:protectedtitles}}]].",
@@ -1607,7 +1622,7 @@
 	"ancientpages": "Pàggini cchiu' vecchî",
 	"move": "Sposta",
 	"movethispage": "Sposta sta pàggina",
-	"unusedimagestext": "Li file ccassutta esìstunu però nun sunnu ncurpurati nta nudda pàggina.\nAccura: autri siti web ponnu aviri lijami versu dûn file pi' menzu di URL diretti; li file addupirati a' sta manera putìssiru èssiri elincati ccassutta macari si' si nni fa' usu.",
+	"unusedimagestext": "Li file ccassutta esìstinu pirò nun sunnu ncurpurati nta nudda pàggina.\nAccura: àutri siti web ponnu aviri lijami versu dûn file pi menzu di URL diretti; li file addupirati a sta manera putìssiru èssiri elincati ccassutta macari si si nni fa usu.",
 	"unusedcategoriestext": "Li siguenti pàggini di catigurìi esìstunu, però nudda autra pàggina o catigurìa nni fa' usu.",
 	"notargettitle": "Nudda distinazzioni",
 	"notargettext": "Nun spicificasti na pàggina o puru n'utenti comu distinazzioni di st'opirazzioni.",
@@ -1623,10 +1638,10 @@
 	"booksources-search-legend": "Ricerca di fonti libbrarî",
 	"booksources-isbn": "Còdici ISBN:",
 	"booksources-search": "Va cerca",
-	"booksources-text": "Ccassutta cc'è n'elencu di lijami versu autri siti ca vìnninu libbra novi e usati, e ponnu aviri majuri nfurmazzioni a' prupòsitu dî libbra ca stai circannu:",
+	"booksources-text": "Ccassutta c'è n'elencu di lijami versu àutri siti ca vìnninu libbra novi e usati, e ponnu aviri maiuri nfurmazzioni a prupòsitu dî libbra ca stai circannu:",
 	"booksources-invalid-isbn": "Lu còdici ISBN chi' spicificasti nun pari bonu; cuntrolla si' nun cci furu sbagghî di ricupiatura.",
 	"specialloguserlabel": "Fattu di l'utenti:",
-	"speciallogtitlelabel": "Oggettu (tìtulu o utenti):",
+	"speciallogtitlelabel": "Oggettu (tìtulu o {{ns:user}}:nomuutenti):",
 	"log": "Riggistra",
 	"all-logs-page": "Tutti li riggistra pubblici",
 	"alllogstext": "Prisintazzioni cumminata di tutti li riggistra dispunìbbili di {{SITENAME}}.\nPoi ristrìnciri la visuali silizziunannu nu tipu di riggistru, l'utenti ca fici l'azzioni (cuntunu majusculi e minusculi), o la pàggina ntirissata (cuntunu majusculi e minusculi puru).",
@@ -1657,10 +1672,10 @@
 	"deletedcontributions": "Cuntribbuta di l'utenti cancillati",
 	"deletedcontributions-title": "Cuntribbuta di l'utenti cancillati",
 	"sp-deletedcontributions-contribs": "cuntribbuta",
-	"linksearch": "Risciduta dî lijami di fora",
+	"linksearch": "Arricerca dî lijami di fora",
 	"linksearch-pat": "Esprissioni di risciduta:",
 	"linksearch-ns": "Namespace:",
-	"linksearch-ok": "Arriscedi",
+	"linksearch-ok": "Arricerca",
 	"linksearch-text": "Si ponnu adupirari li caràttiri matta, ad esempiu \"*.wikipedia.org\".\nCci voli almenu nu duminiu di primu liveddu, ad esempiu \"*.org\".<br />\n{{PLURAL:$2|Protucollu suppurtatu|Protucolli suppurtati}}: $1 (è pridifinutu http:// si' nun si nni spicìfica)",
 	"linksearch-line": "$1 è culligatu dâ pàggina $2",
 	"linksearch-error": "Li caràttiri matta ponnu appariri sulu ô principiu dû nomu host.",
@@ -1703,8 +1718,8 @@
 	"post-expand-template-inclusion-category-desc": "La grannizza di sta pàggina passa <code>$wgMaxArticleSize</code> appressu a' l'espansioni di tutti li template, dunca certi template nun furu espannuti.",
 	"post-expand-template-argument-category-desc": "Sta pàggina veni cchiu' granni di <code>$wgMaxArticleSize</code> appressu chi' s'espànni l'argumentu dûn template (quarchi' cosa nta parèntisi graffi tripli, comu <code>{{{Pippu}}}</code>).",
 	"expensive-parserfunction-category-desc": "Sta pàggina adòpira troppi funzioni di l'analizzaturi sintatticu custusi (comu <code>#ifexist</code>). Talìa [https://www.mediawiki.org/wiki/Special:MyLanguage/Manual:$wgExpensiveParserFunctionLimit Manual:$wgExpensiveParserFunctionLimit].",
-	"broken-file-category-desc": "Sta pàggina cunteni nu lijami a' file ruttu (nu lijami pi' ncurpurari nu file chi' nun esisti).",
-	"hidden-category-category-desc": "Sta catigurìa cunteni <code><nowiki>__HIDDENCAT__</nowiki></code> ntô corpu dâ so pàggina, cosa chi' nâ fa' spuntari comu mpustazzioni pridifinuta dintra dû riquatru dî lijami ê catigurìi ntê pàggini.",
+	"broken-file-category-desc": "Sta pàggina cunteni nu lijami a file ruttu (nu lijami pi ncurpurari nu file chi nun esisti).",
+	"hidden-category-category-desc": "Sta catigurìa cunteni <code><nowiki>__HIDDENCAT__</nowiki></code> ntô corpu dâ sò pàggina, cosa chi nun la fa spuntari comu mpustazzioni pridifinuta dintra dû riquatru dî lijami ê catigurìi ntê pàggini.",
 	"trackingcategories-nodesc": "Nudda discrizzioni dispunìbbili.",
 	"trackingcategories-disabled": "Sta catigurìa è disattivata",
 	"mailnologin": "Nuddu nnirizzu pi' mannari",
@@ -1743,10 +1758,10 @@
 	"watchlistanontext": "Pi' vìdiri e canciari li vuci dâ to lista taliata hâ' tràsiri.",
 	"watchnologin": "Nun hai trasutu",
 	"addwatch": "Agghiunci â lista taliata",
-	"addedwatchtext": "La pàggina «[[:$1]]» e la so pàggina di discussioni furu agghiunciuti â to [[Special:Watchlist|lista taliata]].",
+	"addedwatchtext": "La pàggina «[[:$1]]» e la sò pàggina di discussioni foru agghiunciuti â tò [[Special:Watchlist|lista taliata]].",
 	"addedwatchtext-short": "La pàggina \"$1\" fu' agghiunciuta â to lista taliata.",
 	"removewatch": "Leva dâ lista taliata",
-	"removedwatchtext": "La pàggina «[[:$1]]» e la so pàggina di discussioni furu livati dâ to [[Special:Watchlist|lista taliata]].",
+	"removedwatchtext": "La pàggina «[[:$1]]» e la sò pàggina di discussioni foru livati dâ tò [[Special:Watchlist|lista taliata]].",
 	"removedwatchtext-short": "La pàggina \"$1\" fu' livata dâ to lista taliata.",
 	"watch": "Talìa",
 	"watchthispage": "Talìa sta pàggina",
@@ -1824,13 +1839,13 @@
 	"changecontentmodel-title-label": "Tìtulu dâ pàggina",
 	"changecontentmodel-model-label": "Mudellu dû cuntinutu novu",
 	"changecontentmodel-reason-label": "Mutivu:",
-	"changecontentmodel-success-title": "Lu mudellu dû cuntinutu fu’ canciatu",
-	"changecontentmodel-success-text": "Lu tipu dû cuntinutu di [[:$1]] fu’ canciatu.",
-	"changecontentmodel-cannot-convert": "Nun si po’ cunvèrtiri lu cuntinutu di [[:$1]] ntô tipu $2.",
-	"changecontentmodel-nodirectediting": "Lu mudellu dû cuntinutu $1 nun cunsenti lu canciamentu direttu.",
+	"changecontentmodel-success-title": "Lu mudellu dû cuntinutu fu canciatu",
+	"changecontentmodel-success-text": "Lu tipu dû cuntinutu di [[:$1]] fu canciatu.",
+	"changecontentmodel-cannot-convert": "Nun si pò cummèrtiri lu cuntinutu di [[:$1]] ntô tipu $2.",
+	"changecontentmodel-nodirectediting": "Lu mudellu dû cuntinutu $1 nun cunzenti lu canciamentu direttu.",
 	"log-name-contentmodel": "Riggistru dî canciamenti ô mudellu dû cuntinutu",
-	"log-description-contentmodel": "Eventi ca riguàrdunu lu mudellu dû cuntinutu di na pàggina",
-	"logentry-contentmodel-change": "$1 {{GENDER:$2|canciàu}} lu mudellu dû cuntinutu dâ pàggina $3 di «$4» a’ «$5»",
+	"log-description-contentmodel": "Eventi c'arriguàrdanu lu mudellu dû cuntinutu di na pàggina",
+	"logentry-contentmodel-change": "$1 {{GENDER:$2|canciau}} lu mudellu dû cuntinutu dâ pàggina $3 di «$4» a’ «$5»",
 	"logentry-contentmodel-change-revertlink": "annulla",
 	"logentry-contentmodel-change-revert": "annullamentu",
 	"protectlogpage": "Riggistru dî prutizzioni",
@@ -1856,7 +1871,7 @@
 	"protect-locked-blocked": "Nun si ponnu canciari li livedda di prutizzioni quannu unu è bluccatu.\nCca cci su' li mpustazzioni attuali dâ pàggina <strong>$1</strong>:",
 	"protect-locked-dblock": "Nun si ponnu canciari li livedda di prutizzioni picchì cc'è attivatu un bloccu dâ basi di dati.\nCca cci su' li mpustazzioni attuali dâ pàggina <strong>$1</strong>:",
 	"protect-locked-access": "Lu to cuntu nun havi lu pirmissu di canciari li livedda di prutizzioni.\nCca cci su' li mpustazzioni attuali dâ pàggina <strong>$1</strong>:",
-	"protect-cascadeon": "Com'ad ora sta pàggina è prutetta picchì veni trasclusa {{PLURAL:$1|ntâ siquenti pàggina, ca havi|ntê siquenti pàggini, ca hannu}} la prutizzioni a' cascata attivata.\nLi canciamenti ca si fannu ô liveddu di prutizzioni di sta pàggina nun vannu a' canciari la prutizzioni a' cascata.",
+	"protect-cascadeon": "Com'a ora sta pàggina è prutetta pirchì veni nclusa {{PLURAL:$1|ntâ pàggina siquenti, ca havi|ntê pàggini siquenti, ca hannu}} la prutizzioni a cascata attivata.\nLi canciamenti ca si fannu ô liveddu di prutizzioni di sta pàggina nun vannu a canciari la prutizzioni a cascata.",
 	"protect-default": "Cunsenti a' tutti l'utenti",
 	"protect-fallback": "Cunsenti sulu a' l'utenti cû pirmissu \"$1\"",
 	"protect-level-autoconfirmed": "Cunsenti sulu a' l'utenti autu-cunfirmati",
@@ -1895,12 +1910,12 @@
 	"undeletepagetext": "{{PLURAL:$1|La siguenti pàggina fu' cancillata|Li siguenti $1 pàggini foru cancillati}}, però {{PLURAL:$1|è|sunnu}} ancora nta l'archiviu e pi' chistu si {{PLURAL:$1|po|ponnu}} ancora ricupirari.\nPiriudicamenti l'archìviu po' vèniri svacantatu.",
 	"undelete-fieldset-title": "Ricùpira virsioni",
 	"undeleteextrahelp": "Pi' ricupirari la storia sana dâ pàggina, cliccari <strong><em>{{int:undeletebtn}}</em></strong> senza scegghîri nudda casedda.\nPi' fari nu ricùpiru silittivu, scegghîri li caseddi currispunnenti ê virsioni di ripigghiari, e cliccari <strong><em>{{int:undeletebtn}}</em></strong>.",
-	"undeleterevisions": "$1 {{PLURAL:$1|virsioni|virsioni}} nta l'archiviu",
+	"undeleterevisions": "$1 {{PLURAL:$1|virsioni}} cancillati",
 	"undeletehistory": "Siddu ricùpiri sta pàggina, tutti li so virsioni vèninu ricupirati ntâ crunuluggìa.\nSiddu na pàggina nova havi statu criata cû stissu tìtulu di chidda di ricupirari doppu dâ so cancillazzioni, li virsioni ricupirati vannu a' finiri ntâ crunuluggìa passata.",
 	"undeleterevdel": "Lu ricùpiru nun veni fattu siddu pròvuca la cancillazzioni parziali dâ virsioni currenti dâ pàggina o dû file.\nNta stu casu, hai a' livari lu signu di spunta o l'ammucciamentu dâ virsioni cancillata cchiu' ricenti.",
 	"undeletehistorynoadmin": "Sta pàggina fu' cancillata.\nLu mutivu dâ cancillazzioni è ammustratu ccà sutta, nzèmmula ê dittagghî di l'utenti ca canciaru sta pàggina prima dâ so cancillazzioni.\nLu testu cuntinutu ntê virsioni cancillati è dispunìbbili sulu a' l'amministratura.",
 	"undelete-revision": "Virsioni cancillata di $1 (dû $4 ê $5) di $3:",
-	"undeleterevision-missing": "Virsioni nun vàlida o mancanti.\nPo' èssiri chi' hai na lijami sbagghiata, o puru la virsioni hâ statu già ricupirata o livata di l'archiviu.",
+	"undeleterevision-missing": "Virsioni nun vàlida o ammancanti.\nPò èssiri chi hai na lijami sbagghiata, o puru la virsioni fu già ricupirata o livata di l'archiviu.",
 	"undelete-nodiff": "Nun fu attruvata nudda virsioni passata.",
 	"undeletebtn": "Ricùpira",
 	"undeletelink": "talìa/ricùpira",
@@ -1959,7 +1974,7 @@
 	"sp-contributions-username": "Nnirizzu IP o nomu utenti:",
 	"sp-contributions-toponly": "Ammustra sulu li canciamenti ca sunnu l'ùrtimi virsioni pâ pàggina",
 	"sp-contributions-newonly": "Ammustra sulu li canciamenti ca sunnu criazzioni di pàggini novi",
-	"sp-contributions-submit": "Risciduta",
+	"sp-contributions-submit": "Arricerca",
 	"whatlinkshere": "Chi' punta cca",
 	"whatlinkshere-title": "Pàggini ca pùntanu a \"$1\"",
 	"whatlinkshere-page": "Pàggina:",
@@ -1975,7 +1990,7 @@
 	"whatlinkshere-hideredirs": "$1 li rimanni",
 	"whatlinkshere-hidetrans": "$1 li trasclusioni",
 	"whatlinkshere-hidelinks": "$1 li lijami",
-	"whatlinkshere-hideimages": "$1 li lijami a' file",
+	"whatlinkshere-hideimages": "$1 li lijami a file",
 	"whatlinkshere-filters": "Filtri",
 	"autoblockid": "Bloccu autumàticu #$1",
 	"block": "Bluccari a' n'utenti",
@@ -2030,7 +2045,7 @@
 	"blocklist-by": "Amministraturi chi' bluccau",
 	"blocklist-params": "Paràmitri dû bloccu",
 	"blocklist-reason": "Mutivu",
-	"ipblocklist-submit": "Risciduta",
+	"ipblocklist-submit": "Arricerca",
 	"ipblocklist-localblock": "Bloccu lucali",
 	"ipblocklist-otherblocks": "{{PLURAL:$1|Autru bloccu|Autri blocchi}}",
 	"infiniteblock": "infinitu",
@@ -2053,7 +2068,7 @@
 	"blocklog-showsuppresslog": "St'utenti havi statu bluccatu e ammucciatu ntô passatu.\nComu rifirimentu ccassutta cc'è lu riggistru dî supprissioni:",
 	"blocklogentry": "hà bluccatu [[$1]]; scadenza $2 $3",
 	"reblock-logentry": "Canciau li mpustazzioni dû bloccu pi [[$1]] cu na scadenza di $2 $3",
-	"blocklogtext": "Chistu è l'alencu di l'azzioni di bloccu e sbloccu di l'utenti.\nLi nnirizzi IP bluccati autumaticamenti nun sunnu alincati.\nCunzurtari l'[[Special:BlockList|alencu dî blocchi]] pi' vìdiri li furbanna e' li blocchi chi' sunnu 'n viguri pi' com'ora.",
+	"blocklogtext": "Chistu è l'alencu di l'azzioni di bloccu e sbloccu di l'utenti.\nLi nnirizzi IP bluccati autumaticamenti nun sunnu alincati.\nCunzurtari l'[[Special:BlockList|alencu dî blocchi]] pi vìdiri li furbanna e li blocchi chi sunnu n viguri pi com'ora.",
 	"unblocklogentry": "sbluccau a' \"$1\"",
 	"block-log-flags-anononly": "sulu utenti anònimi",
 	"block-log-flags-nocreate": "criazzioni account bluccata",
@@ -2158,7 +2173,7 @@
 	"move-over-sharedrepo": "== U file già esisti ==\n[[:$1]] già esisti ntôn dipòsitu cunnivisu. Spustari nu file nta chistu titulu suprascriviravi u file cunnivisu.",
 	"file-exists-sharedrepo": "U nomu di file scigghiutu già è adupiratu ntôn dipòsitu cunnivisu.\nPi' favuri scegghî n'autru nomu.",
 	"export": "Esporta pàggini",
-	"exporttext": "È pussìbbili espurtari lu testu e la cronoluggìa dî canciamenti di na pàggina o d'un gruppu di pàggini n furmatu XML pi mpurtàrili n àutri siti ca utilìzzanu lu software MediaWiki, attraversu la pàggina [[Special:Import|d'importu]].\n\nP'espurtari li pàggini innicari li tìtuli ntâ casella di testu suttastanti, unu pi riga, e spicificari siddu s'addisìa attèniri la virsioni currenti e tutti li virsioni pricidenti, cu li dati dâ cronoluggìa dâ pàggina, oppuru surtantu l'ùrtima virsioni e li dati currispunnenti a l'ùrtimu canciamentu.\n\nNta st'ùrtimu casu si pò macari utilizzari na lijami, p'asempiu [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] p'espurtari \"[[{{MediaWiki:Mainpage}}]]\".",
+	"exporttext": "È pussìbbili spurtari lu testu e la cronoluggìa dî canciamenti di na pàggina o d'un gruppu di pàggini n furmatu XML pi mpurtàrili n àutri siti ca utilìzzanu lu software MediaWiki, attraversu la pàggina [[Special:Import|di mportu]].\n\nPi spurtari li pàggini innicari li tìtuli ntâ casella di testu suttastanti, unu pi riga, e spicificari siddu s'addisìa ottèniri la virsioni currenti e tutti li virsioni pricidenti, cu li dati dâ cronuluggìa dâ pàggina, oppuru surtantu l'ùrtima virsioni e li dati currispunnenti a l'ùrtimu canciamentu.\n\nNta st'ùrtimu casu si pò macari utilizzari na lijami, p'asempiu [[{{#Special:Export}}/{{MediaWiki:Mainpage}}]] pi spurtari \"[[{{MediaWiki:Mainpage}}]]\".",
 	"exportall": "Esporta tutti i pàggini",
 	"exportcuronly": "Ncludi sulu la rivisioni attuali, nun la ntera cronoluggìa",
 	"exportnohistory": "---- '''Nota:''' l'espurtazzioni dâ ntera cronoluggìa dî pàggini attraversu sta nterfaccia hà stata disattivata pi mutivi ligati a li pristazzioni dû sistema.",
@@ -2238,7 +2253,7 @@
 	"import-invalid-interwiki": "E' mpussìbbili mpurtari dû pruggettu wiki nnicatu.",
 	"import-error-edit": "A pàggina \"$1\" nun fu' mpurtata picchì nun hai u pirmissu di canciàrila.",
 	"import-error-create": "La pàggina \"$1\" nun fu' mpurtata picchì nun hai u pirmissu di criàrila.",
-	"import-error-interwiki": "La pàggina \"$1\" nun fu' mpurtata picchì lu so nomu è risirvatu pî lijami di fora (inter-wiki).",
+	"import-error-interwiki": "La pàggina \"$1\" nun fu mpurtata picchì lu sò nomu è risirvatu pî lijami di fora (inter-wiki).",
 	"import-error-special": "A pàggina \"$1\" nun fu' mpurtata picchì apparteni a' nu namespace spiciali chi' nun cunsenti pàggini.",
 	"import-error-invalid": "A pàggina \"$1\" nun fu' mpurtata picchì u nomu unni sarrìa mpurtata nun è vàlidu supra a' sta wiki.",
 	"import-error-unserialize": "A virsioni $2 dâ pàggina \"$1\" nun si potti di-sirializzari. Era signatu chi' sta virsioni adupirava u mudellu di cuntinutu $3 sirializzatu comu $4.",
@@ -2281,7 +2296,7 @@
 	"tooltip-ca-unwatch": "Leva sta pàggina dâ to lista taliata",
 	"tooltip-search": "Cerca 'n {{SITENAME}}",
 	"tooltip-search-go": "Vai a na pàggina cu chistu nomu esattu siddu asisti",
-	"tooltip-search-fulltext": "Arriscedi pàggini pi chistu testu",
+	"tooltip-search-fulltext": "Attrova pàggini pi stu testu",
 	"tooltip-p-logo": "Pàggina principali",
 	"tooltip-n-mainpage": "Vìsita la pàggina principali",
 	"tooltip-n-mainpage-description": "Talìa la pàggina principali",
@@ -2304,7 +2319,7 @@
 	"tooltip-ca-nstab-main": "Vidi l'artìculu",
 	"tooltip-ca-nstab-user": "Vidi la pàggina utenti",
 	"tooltip-ca-nstab-media": "Vidi la pàggina dû file multimidiali",
-	"tooltip-ca-nstab-special": "Chista è na pàggina spiciali, nun pò èssiri canciata",
+	"tooltip-ca-nstab-special": "Chista è na pàggina spiciali, e nun si pò canciari",
 	"tooltip-ca-nstab-project": "Vidi la pàggina di sirvizziu",
 	"tooltip-ca-nstab-image": "Vidi la pàggina dâ mmàggini",
 	"tooltip-ca-nstab-mediawiki": "Vidi lu missaggiu di sistema",
@@ -2342,9 +2357,9 @@
 	"spamprotectionmatch": "Lu nostru filtru anti-spam hà ndividuatu lu testu siquenti: $1",
 	"spambot_username": "MediaWiki - sistema di rimuzzioni spam",
 	"spam_reverting": "Ripristinata l'ùrtima virsioni priva di lijami versu $1",
-	"spam_blanking": "Pàggina svacantata, tutti li virsioni cuntinìunu lijami versu $1",
-	"spam_deleting": "Pàggina cancillata, tutti li virsioni cuntinìunu lijami versu $1",
-	"simpleantispam-label": "Cuntrollu anti spam.\n<strong>NUN</strong> jìnchiri stu campu!",
+	"spam_blanking": "Pàggina svacantata, tutti li virsioni cuntinìanu lijami versu $1",
+	"spam_deleting": "Pàggina cancillata, tutti li virsioni cuntinìanu lijami versu $1",
+	"simpleantispam-label": "Cuntrollu anti-spam.\n<strong>NUN JÌNCHIRI</strong> stu campu!",
 	"pageinfo-title": "Nfurmazzioni supra a' \"$1\"",
 	"pageinfo-not-current": "Sfurtunatamenti, nun è pussìbbili furnìri sti nfurmazzioni pî virsioni vecchî.",
 	"pageinfo-header-basic": "Nfurmazzioni essinziali",
@@ -2361,9 +2376,9 @@
 	"pageinfo-robot-index": "Cunsintuta",
 	"pageinfo-robot-noindex": "Pruibbuta",
 	"pageinfo-watchers": "Quanti talìunu sta pàggina",
-	"pageinfo-visiting-watchers": "Nùmmiru d’utenti ntirissati a’ sta pàggina ca hannu taliatu li canciamenti cchiu’ ricenti",
+	"pageinfo-visiting-watchers": "Nùmmiru d'utenti ntirissati a sta pàggina ca hannu taliatu li canciamenti chiù ricenti",
 	"pageinfo-few-watchers": "Cchiu' picca di $1 {{PLURAL:$1|taliaturi|taliatura}}",
-	"pageinfo-few-visiting-watchers": "Forsi cc’è quarchi utenti ntirissatu ca talìa li canciamenti ricenti, forsi no",
+	"pageinfo-few-visiting-watchers": "Forsi c'è quarchi utenti ntirissatu ca talìa li canciamenti ricenti, forsi no",
 	"pageinfo-redirects-name": "Nùmmiru di rimanni a' sta pàggina",
 	"pageinfo-subpages-name": "Nùmmiru di suttapàggini di sta pàggina",
 	"pageinfo-subpages-value": "$1 ($2 {{PLURAL:$2|chi' è un rimannu|chi' su' rimanni}}; $3 {{PLURAL:$3|chi' nun è un rimannu|chi' nun su' rimanni}})",
@@ -2468,7 +2483,7 @@
 	"saturday-at": "Sàbbatu ê $1",
 	"sunday-at": "Dumìnica ê $1",
 	"yesterday-at": "Ajeri ê $1",
-	"bad_image_list": "Lu furmatu è lu siguenti:\n\nSu' pigghiati a' cunsiddirazzioni sulu li vuci d'elenchi puntati (li righi ca accumènzanu cû sìmmulu *).\nLa prima lijami nta ogni' riga havi a' puntari ôn file nun addisiatu.\nSi' cci su' autri lijami ntâ stissa riga, su' cunsiddirati comu eccizzioni, vali a' diri pàggini unni lu file po' èssiri ncurpuratu.",
+	"bad_image_list": "Lu furmatu è lu siguenti:\n\nSù pigghiati a cunziddirazzioni sulu li vuci d'elenchi puntati (li righi c'accumènzanu cû sìmmulu *).\nLa prima lijami nta ogni riga havi a puntari ôn file nun addisiatu.\nSi ci sù àutri lijami ntâ stissa riga, sù cunziddirati comu eccizzioni, vali a diri pàggini unni lu file pò èssiri ncurpuratu.",
 	"metadata": "Metadati",
 	"metadata-help": "Stu file cunteni autri nfurmazzioni, prubbabbirmenti agghiunciuti dâ màchina futugràfica o dû scanner adupirati pi' criàrilu o diggitalizzàrilu.\nSiddu lu file hâ statu canciatu dâ so cunnizzioni origginali, certi dittagghî putìssiru nun currispùnniri ô statu novu dû file.",
 	"metadata-expand": "Ammustra li nfurmazzioni dittagghiati",
@@ -2636,7 +2651,7 @@
 	"exif-originaldocumentid": "Idintificaturi unìvucu dû ducumentu origginali",
 	"exif-licenseurl": "URL dâ licenza di drittu d'auturi",
 	"exif-morepermissionsurl": "Nfurmazzioni pâ cuncissioni di autri licenzi",
-	"exif-attributionurl": "Quannu si fa' usu di st'òpira, si prega di mèttiri na lijami versu",
+	"exif-attributionurl": "Quannu si fa usu di st'òpira, si prega di mèttiri na lijami versu",
 	"exif-preferredattributionname": "Quannu si fa' usu di st'òpira, si prega di attribuìrinni a patirnità a'",
 	"exif-pngfilecomment": "Cummentu dû file PNG",
 	"exif-disclaimer": "Dichiarazzioni di esclusioni di rispunsabbilità",
@@ -2822,7 +2837,7 @@
 	"monthsall": "tutti",
 	"confirmemail": "Cunfirma dû nnirizzu di posta elittrònica",
 	"confirmemail_noemail": "Nun hà statu ndicatu un ndirizzu e-mail vàlidu ntê propi [[Special:Preferences|prifirenzi]].",
-	"confirmemail_text": "{{SITENAME}} dumanna la cunvàlida dû to nnirizzu di posta elittrònica pi' putìri adupirari li funziunalità assuciati.\nCalca lu buttuni ccassutta pi' mannari nu missaggiu e-mail di cunfirma a lu to nnirizzu.\nNtô missaggiu cci sarravi na lijami cuntinenti un còdici;\ncàrrica dda lijami cu lu to browser pi' cunfirmari ca lu to nnirizzu di posta elittrònica è vàlidu.",
+	"confirmemail_text": "{{SITENAME}} addumanna la cunvàlida dû tò nnirizzu di posta elittrònica pi putìri adupirari li funziunalità assuciati.\nCarca lu buttuni ccassutta pi mannari nu missaggiu e-mail di cunferma a lu tò nnirizzu.\nNtô missaggiu c'è na lijami ca cunteni un còdici;\ncàrrica dda lijami cô tò browser pi cunfirmari ca lu tò nnirizzu di posta elittrònica è vàlidu.",
 	"confirmemail_pending": "Già nu còdici di cunfirma t'havi statu mannatu via posta elittrònica;\nsiddu hai criatu lu to cuntu di picca tempu, è mègghiu ch'aspètti l'arrivu dû còdici pi' quarchi minutu prima di pruvari a' addumannàrinni unu novu.",
 	"confirmemail_send": "Manna un còdici di cunfirma via e-mail",
 	"confirmemail_sent": "Missaggiu e-mail di cunfirma mannatu.",
@@ -2833,9 +2848,9 @@
 	"confirmemail_success": "Lu ndirizzu e-mail è cunfirmatu. Ora è pussìbbili esèquiri l'accessu e fari chinu usu dû situ.",
 	"confirmemail_loggedin": "Lu tò nnirizzu email fu ora cunfirmatu.",
 	"confirmemail_subject": "Cunfirma dû nnirizzu di posta elittronica pi' {{SITENAME}}",
-	"confirmemail_body": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\nriggistràu un cuntu \"$2\" cu stu nnirizzu di posta elittrònica supra a' {{SITENAME}}.\n\nPi' cunfirmari ca stu cuntu apparteni pi' davera a' tia,\ne attivari li funziunalità di posta elittrònica supra a' {{SITENAME}},\napri sta lijami cû to browser:\n\n$3\n\nSi' nveci stu cuntu *nun t'apparteni*, clicca sta lijami\npi' nigari la cunfirma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunfirma scadi û $4.",
-	"confirmemail_body_changed": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\ncanciàu u nnirizzu di posta elittrònica dû cuntu \"$2\" supra a' {{SITENAME}} mpustannulu a' chistu.\n\nPi' cunfirmari ca stu cuntu apparteni pi' davera a' tia,\ne attivari n'autra vota i funziunalità di posta elittrònica supra a' {{SITENAME}},\napri sta lijami cû to browser:\n\n$3\n\nSi' nveci stu cuntu *nun t'apparteni*, clicca sta lijami\npi' nigari la cunfirma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunfirma scadi û $4.",
-	"confirmemail_body_set": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\nmpustàu stu nnirizzu di posta elittrònica pû cuntu \"$2\" supra a' {{SITENAME}}.\n\nPi' cunfirmari ca stu cuntu apparteni pi' davera a' tia,\ne attivari li funziunalità di posta elittrònica supra a' {{SITENAME}},\napri sta lijami cû to browser:\n\n$3\n\nSi' nveci stu cuntu *nun t'apparteni*, clicca sta lijami\npi' nigari la cunfirma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunfirma scadi û $4.",
+	"confirmemail_body": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\nriggistrau un cuntu \"$2\" cu stu nnirizzu di posta elittrònica supra a {{SITENAME}}.\n\nPi cunfirmari ca stu cuntu apparteni pi daveru a tìa,\ne attivari li funziunalità di posta elittrònica supra a {{SITENAME}},\ngrapi sta lijami cû tò browser:\n\n$3\n\nSi mmeci stu cuntu *nun t'apparteni*, clicca sta lijami\npi nigari la cunferma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunferma scadi lu $4.",
+	"confirmemail_body_changed": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\ncanciau lu nnirizzu di posta elittrònica dû cuntu \"$2\" supra a {{SITENAME}} mpustànnulu a chistu.\n\nPi cunfirmari ca stu cuntu apparteni pi daveru a tìa,\ne attivari n'àutra vota li funziunalità di posta elittrònica supra a {{SITENAME}},\ngrapi sta lijami cû tò browser:\n\n$3\n\nSi mmeci stu cuntu *nun t'apparteni*, clicca sta lijami\npi nigari la cunferma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunferma scadi lu $4.",
+	"confirmemail_body_set": "Quarchidunu, prubbabbilmenti tu stissu, dû nnirizzu IP $1,\nmpustau stu nnirizzu di posta elittrònica pû cuntu \"$2\" supra a {{SITENAME}}.\n\nPi cunfirmari ca stu cuntu apparteni pi daveru a tìa,\ne attivari li funziunalità di posta elittrònica supra a {{SITENAME}},\ngrapi sta lijami cû tò browser:\n\n$3\n\nSi mmeci stu cuntu *nun t'apparteni*, clicca sta lijami\npi nigari la cunferma dû nnirizzu di posta elittrònica:\n\n$5\n\nStu còdici di cunferma scadi lu $4.",
 	"confirmemail_invalidated": "Cunvàlida dû nnirizzu di posta elittronica nigata",
 	"invalidateemail": "Nigazzioni dâ cunvàlida dâ posta elittrònica",
 	"scarytranscludedisabled": "[La nchiusioni di pàggini tra siti wiki nun è attiva]",
@@ -2994,7 +3009,7 @@
 	"specialpages-group-developer": "Stigghi dû sviluppaturi",
 	"blankpage": "Pàggina vacanti",
 	"intentionallyblankpage": "Sta pàggina è lassata vacanti apposta e è usata pi benchmark, ecc.",
-	"external_image_whitelist": " #Lassari sta riga pi' com'è ora, senza tuccàrila<pre>\n#Mèttiri li frammenti dî sprissioni rigulari (sulu la parti ca va' mmenzu ê //) ccassutta\n#Sarrannu cunfruntati cu l'URL dî mmàggini esterni (hotlinked)\n#Chiddi ca currispùnnunu sarrannu ammustrati comu mmàggini, pi' l'autri veniravi ammustrata sulu na lijami a' la mmàggini\n#Li righi ca accumencianu cu' # sunnu trattati comu cummenti\n#Nun cc'è diffirenza tra majusculi e minusculi\n\n#Mèttiri tutti li frammenti di sprissioni rigulari supra a' sta riga. Lassari sta riga pi' com'è ora, senza tuccàrila</pre>",
+	"external_image_whitelist": " #Lassari sta riga pi com'è ora, senza tuccàrila<pre>\n#Mèttiri li frammenti dî sprissioni rigulari (sulu la parti ca va ammenzu ê //) ccassutta\n#Sunnu cunfruntati cu l'URL dî mmàggini esterni (hotlinked)\n#Chiddi ca currispùnninu sunnu ammustrati comu mmàggini, pi l'àutri veni ammustrata sulu na lijami â mmàggini\n#Li righi ca accumènzanu cu # sunnu trattati comu cummenti\n#Nun c'è diffirenza tra maiùsculi e minùsculi\n\n#Mèttiri tutti li frammenti di sprissioni rigulari supra a sta riga. Lassari sta riga pi com'è ora, senza tuccàrila</pre>",
 	"tags": "Etichetti dî canciamenti validi",
 	"tag-filter": "Filtra pi' [[Special:Tags|etichetta]]",
 	"tag-filter-submit": "Filtra",
@@ -3115,7 +3130,7 @@
 	"htmlform-cloner-delete": "Leva",
 	"htmlform-cloner-required": "Cci voli almenu nu valuri.",
 	"htmlform-title-badnamespace": "[[:$1]] nun sta ntô namespace «{{ns:$2}}».",
-	"htmlform-title-not-creatable": "«$1» nun è tìtulu di na pàggina ca si po’ criari",
+	"htmlform-title-not-creatable": "«$1» nun è lu tìtulu di na pàggina ca si pò criari",
 	"htmlform-title-not-exists": "[[:$1]] nun esisti.",
 	"htmlform-user-not-exists": "<strong>$1</strong> nun esisti.",
 	"htmlform-user-not-valid": "<strong>$1</strong> nun è vàlidu comu nomu utenti.",
@@ -3159,6 +3174,7 @@
 	"logentry-newusers-create2": "U cuntu di l'utenti $3 fu' {{GENDER:$2|criatu}} di $1",
 	"logentry-newusers-byemail": "U cuntu di l'utenti $3 fu' {{GENDER:$2|criatu}} di $1 e a password fu' mannata via posta elittrònica",
 	"logentry-newusers-autocreate": "U cuntu di l'utenti $1 fu' {{GENDER:$2|criatu}} di manera autumàtica",
+	"logentry-protect-move_prot": "$1 {{GENDER:$2|spustau}} li mpustazzioni di prutizzioni di $4 a’ $3",
 	"logentry-rights-rights": "$1 {{GENDER:$2|canciau}} l'appartinenza di $3 dû gruppu $4 ô gruppu $5",
 	"logentry-rights-rights-legacy": "$1 {{GENDER:$2|canciau}} l'appartinenza a' gruppi di $3",
 	"logentry-rights-autopromote": "$1 fu' {{GENDER:$2|prumuvutu|prumuvuta}} di manera autumatica di $4 a' $5",
@@ -3204,7 +3220,7 @@
 	"feedback-thanks": "Grazzî! U to cummentu fu' affissu ntâ pàggina \"[$2 $1]\".",
 	"feedback-thanks-title": "Ti ringrazziamu!",
 	"feedback-useragent": "Aggenti di l'utenti:",
-	"searchsuggest-search": "Risciduta",
+	"searchsuggest-search": "Arricerca",
 	"searchsuggest-containing": "chi' cunteni...",
 	"api-error-badaccess-groups": "Nun hai u pirmissu di carricari file nta sta wiki.",
 	"api-error-badtoken": "Erruri nternu: Token sbagghiatu",
@@ -3356,6 +3372,7 @@
 	"special-characters-title-endash": "liniedda enni",
 	"special-characters-title-emdash": "liniedda emmi",
 	"special-characters-title-minus": "signu menu",
+	"mw-widgets-dateinput-no-date": "Nudda data scigghiuta",
 	"mw-widgets-titleinput-description-new-page": "sta pàggina ancora nun esisti",
-	"mw-widgets-titleinput-description-redirect": "rimannu a’ $1"
+	"mw-widgets-titleinput-description-redirect": "rimannu a $1"
 }
diff --git a/languages/i18n/sl.json b/languages/i18n/sl.json
index 555db1ab9e..37b4b30a10 100644
--- a/languages/i18n/sl.json
+++ b/languages/i18n/sl.json
@@ -10,7 +10,8 @@
 			"Yerpo",
 			"아라",
 			"MaGa",
-			"Skalcaa"
+			"Skalcaa",
+			"Janezdrilc"
 		]
 	},
 	"tog-underline": "Podčrtavanje povezav:",
@@ -921,7 +922,8 @@
 	"rows": "Vrstic:",
 	"columns": "Stolpcev:",
 	"searchresultshead": "Nastavitve poizvedovanja",
-	"stub-threshold": "Prag označevanja <a href=\"#\" class=\"stub\">škrbin</a> (v bajtih):",
+	"stub-threshold": "Prag označevanja škrbin ($1):",
+	"stub-threshold-sample-link": "primer",
 	"stub-threshold-disabled": "Onemogočeno",
 	"recentchangesdays": "Å tevilo dni, prikazanih v zadnjih spremembah:",
 	"recentchangesdays-max": "Največ $1 {{PLURAL:$1|dan|dneva|dnevi|dni}}",
@@ -1619,7 +1621,7 @@
 	"newpages": "Nove strani",
 	"newpages-username": "Uporabniško ime:",
 	"ancientpages": "Najdlje nespremenjeni članki",
-	"move": "Prestavi",
+	"move": "Preimenuj",
 	"movethispage": "Prestavi stran",
 	"unusedimagestext": "Spodnje datoteke obstajajo, vendar niso vključene v nobeno stran.\nProsimo, upoštevajte, da se lahko druge spletne strani povezujejo na datoteko z neposrednim URL in je zato morda še vedno navedena tukaj, čeprav se aktivno uporablja.",
 	"unusedcategoriestext": "Naslednje strani kategorij obstajajo, vendar jih ne uporablja noben članek ali druga kategorija.",
@@ -1639,7 +1641,7 @@
 	"booksources-text": "Sledi seznam povezav do drugi spletnih strani, ki prodajajo nove in rabljene knjige, in imajo morda nadaljnje informacije o knjigah, ki jih iščete:",
 	"booksources-invalid-isbn": "Za dani ISBN se ne zdi, da je veljaven; preverite za morebitne napake pri kopiranju iz prvotnega vira.",
 	"specialloguserlabel": "Izvajalec:",
-	"speciallogtitlelabel": "Cilj (naslov ali uporabnik):",
+	"speciallogtitlelabel": "Cilj (naslov ali {{ns:user}}:uporabniškoime za uporabnika):",
 	"log": "Dnevniki",
 	"all-logs-page": "Vsi javni dnevniki",
 	"alllogstext": "Združeno so prikazani dnevniki sprememb uporabniških pravic, preimenovanj uporabnikov, nalaganja predstavnostnih datotek, prestavljanja in zaščite strani, brisanja, registracij uporabnikov, sprememb položaja botov ter blokiranja in deblokiranja uporabnikov na strani {{SITENAME}}. Pogled lahko zožite z izbiro dnevnika, uporabniškega imena ali strani. Vedite, da polje »Uporabnik« razlikuje med malimi in velikimi črkami.",
@@ -2111,12 +2113,12 @@
 	"lockfilenotwritable": "Datoteka zaklepanja zbirke podatkov ni zapisljiva.\nZa zaklepanje in odklepanje zbirke podatkov mora biti ta datoteka zapisljiva s strani spletnega strežnika.",
 	"databasenotlocked": "Zbirka podatkov ni zaklenjena.",
 	"lockedbyandtime": "($1 dne $2 ob $3)",
-	"move-page": "Prestavi $1",
+	"move-page": "Preimenuj $1",
 	"move-page-legend": "Prestavitev strani",
 	"movepagetext": "Z naslednjim obrazcem lahko stran preimenujete in hkrati prestavite tudi vso njeno zgodovino.\nDosedanja stran se bo spremenila v preusmeritev na prihodnje mesto.\nSamodejno lahko posodobite preusmeritve, ki kažejo na dosedanji naslov.\nČe se za to ne odločite, ne pozabite preveriti vseh [[Special:DoubleRedirects|dvojnih]] ali [[Special:BrokenRedirects|pretrganih preusmeritev]].\nOdgovorni ste, da bodo povezave še naprej kazale na prava mesta.\n\nKjer stran z izbranim novim imenom že obstaja, dejanje '''ne''' bo izvedeno, razen če je sedanja stran preusmeritev in brez zgodovine urejanj.\nTo pomeni, da lahko, če se zmotite, strani vrnete prvotno ime, ne morete pa prepisati že obstoječe strani.\n\n'''Opozorilo!'''\nPrestavitev strani je lahko za priljubljeno stran velika in nepričakovana sprememba, zato pred izbiro ukaza dobro premislite.",
 	"movepagetext-noredirectfixer": "Z uporabo spodnjega obrazca lahko preimenujete stran tako, da prestavite vso njeno zgodovino na novo ime.\nStar naslov bo postal preusmeritvena stran na nov naslov.\nNe pozabite preveriti [[Special:DoubleRedirects|dvojnih]] ali [[Special:BrokenRedirects|pretrganih preusmeritev]].\nVi ste odgovorni, da vse povezave še naprej kažejo tja, kamor naj bi.\n\nUpoštevajte, da stran '''ne''' bo prestavljena, če že obstaja stran z novim naslovom, razen če je prazna ali preusmeritev brez pretekle zgodovine urejanj.\nTo pomeni, da lahko stran preimenujete nazaj, če ste naredili napako, vendar ne morete prepisati obstoječe strani.\n\n'''Opozorilo!'''\nTo je lahko velika in nepričakovana sprememba za priljubljeno stran;\nprosimo, pred nadaljevanjem se prepričajte, da razumete posledice tega dejanja.",
 	"movepagetalktext": "Če obstaja, bo samodejno prestavljena tudi pripadajoča pogovorna stran, '''razen kadar'''\n*pod novim imenom že obstaja neprazna pogovorna stran ali\n*ste odkljukali spodnji okvirček.\n\nČe je tako, boste morali pogovorno stran, če želite, prestaviti ali povezati ročno.",
-	"movearticle": "Prestavi stran:",
+	"movearticle": "Preimenuj stran:",
 	"moveuserpage-warning": "'''Opozorilo:''' Premikate uporabniško stran. To pomeni, da bo premaknjena samo stran in uporabnik ''ne'' bo preimenovan.",
 	"movecategorypage-warning": "<strong>Opozorilo:</strong> Prestavili boste stran kategorije. Pomnite, da boste prestavili samo stran; vse strani v stari kategoriji <em>ne</em> bomo prekategorizirali v novo kategorijo.",
 	"movenologintext": "Za prestavljanje strani morate biti registrirani in [[Special:UserLogin|prijavljeni]].",
@@ -2289,7 +2291,7 @@
 	"tooltip-ca-unprotect": "Spremenite zaščito strani",
 	"tooltip-ca-delete": "Brišite stran",
 	"tooltip-ca-undelete": "Obnovite pred izbrisom napravljena urejanja strani.",
-	"tooltip-ca-move": "Preimenujte stran",
+	"tooltip-ca-move": "Preimenuj stran",
 	"tooltip-ca-watch": "Dodajte stran na spisek nadzorov",
 	"tooltip-ca-unwatch": "Odstranite stran s spiska nadzorov",
 	"tooltip-search": "Preiščite wiki",
@@ -2317,7 +2319,7 @@
 	"tooltip-ca-nstab-main": "Prikaže članek",
 	"tooltip-ca-nstab-user": "Prikaže uporabniško stran",
 	"tooltip-ca-nstab-media": "Prikaže stran s predstavnostno vsebino",
-	"tooltip-ca-nstab-special": "Te posebne strani ne morete urejati",
+	"tooltip-ca-nstab-special": "To je posebna stran in je ni mogoče urejati",
 	"tooltip-ca-nstab-project": "Prikaže stran projekta",
 	"tooltip-ca-nstab-image": "Prikaže stran s sliko ali drugo datoteko",
 	"tooltip-ca-nstab-mediawiki": "Prikaže sistemsko sporočilo",
diff --git a/languages/i18n/sq.json b/languages/i18n/sq.json
index 1f658999b9..5813cfe8d1 100644
--- a/languages/i18n/sq.json
+++ b/languages/i18n/sq.json
@@ -29,11 +29,12 @@
 			"OrvenBregu",
 			"Macofe",
 			"Liridon",
-			"Ammartivari"
+			"Ammartivari",
+			"Kosovastar"
 		]
 	},
-	"tog-underline": "Nënvizo lidhjet:",
-	"tog-hideminor": "Fshih redaktimet e vogla në ndryshimet e fundit",
+	"tog-underline": "Nënvizizimi i lidhjes:",
+	"tog-hideminor": "Fsheh redaktimet e vogla nga ndryshimet e fundit",
 	"tog-hidepatrolled": "Fshih redaktimet e vrojtuara në ndryshimet e fundit",
 	"tog-newpageshidepatrolled": "Fshih faqet e vrojtuara nga lista e faqeve të reja",
 	"tog-extendwatchlist": "Zgjero listën e faqeve të vëzhguara që t'i tregojë të gjitha ndryshimet, jo vetëm më të fundit.",
@@ -46,6 +47,7 @@
 	"tog-watchdefault": "Shto faqet dhe skedat e redaktuara prej meje tek lista e faqeve nën mbikqyrje",
 	"tog-watchmoves": "Shto faqet dhe skedat e zhvendosura prej meje tek lista e faqeve nën mbikqyrje",
 	"tog-watchdeletion": "Shto faqet dhe skedat e grisura prej meje tek lista e faqeve  nën mbikqyrje",
+	"tog-watchrollback": "Shto faqet ku unë kam kryer një rikthim tek lista ime mbikqyrëse",
 	"tog-minordefault": "Shëno të gjitha redaktimet si të vogla automatikisht",
 	"tog-previewontop": "Vendose kutinë e bocetit sipër kutisë së redaktimeve",
 	"tog-previewonfirst": "Tregoje bocetin në redaktimin e parë",
@@ -303,10 +305,10 @@
 	"sort-descending": "Radhit në zbritje",
 	"sort-ascending": "Radhit në ngjitje",
 	"nstab-main": "Artikulli",
-	"nstab-user": "Faqja e përdoruesit",
-	"nstab-media": "Media-faqe",
+	"nstab-user": "{{GENDER:{{ROOTPAGENAME}}|Faqja e përdoruesit|Faqja e përdorueses}}",
+	"nstab-media": "Medie",
 	"nstab-special": "Faqe speciale",
-	"nstab-project": "Projekt-faqe",
+	"nstab-project": "Projekti",
 	"nstab-image": "Skedë",
 	"nstab-mediawiki": "Mesazh",
 	"nstab-template": "Stampa",
@@ -333,6 +335,7 @@
 	"readonly_lag": "Databaza është kyçur automatikisht për t'i dhënë kohë serverëve databazë slave që të arrijnë në një nivel me serverin databazë master",
 	"internalerror": "Gabim i brendshëm",
 	"internalerror_info": "Gabim i brendshëm: $1",
+	"internalerror-fatal-exception": "Përjashtim fatal i tipit \"$1\"",
 	"filecopyerror": "I pamundur kopjimi i skedës \"$1\" tek \"$2\".",
 	"filerenameerror": "I pamundur riemërtimi i skedës \"$1\" në \"$2\".",
 	"filedeleteerror": "E pamundur fshirja e skedës \"$1\".",
@@ -438,9 +441,9 @@
 	"createacct-submit": "Krijoni llogarinë tuaj",
 	"createacct-another-submit": "Krijo një llogari tjeter",
 	"createacct-benefit-heading": "{{SITENAME}} është bërë nga njerëz si ju.",
-	"createacct-benefit-body1": "$1 {{PLURAL:$1|redaktim|redaktime}}",
-	"createacct-benefit-body2": "\n{{Plural: $ 1 | faqe | faqe}}",
-	"createacct-benefit-body3": "kohët e fundit <span class=\"notranslate\" translate=\"asnjë\">{{PLURAL:$1|</span>kontribues|kontribuesit}}",
+	"createacct-benefit-body1": "{{PLURAL:$1|redaktim|redaktime}}",
+	"createacct-benefit-body2": "{{PLURAL:$1|faqe|faqe}}",
+	"createacct-benefit-body3": "{{PLURAL:$1|kontribues}} kohët e fundit",
 	"badretype": "Fjalëkalimet nuk janë njësoj.",
 	"userexists": "Emri i përdoruesit që kërkuat është në përdorim. \nZgjidhni një emër tjetër.",
 	"loginerror": "Gabim gjatë identifikimit",
@@ -612,7 +615,7 @@
 	"updated": "(E ndryshuar)",
 	"note": "'''Shënim:'''",
 	"previewnote": "'''Vini re! Kjo faqe është vetëm për shqyrtim.'''\nNdryshimet tuaja nuk janë ruajtur ende!",
-	"continue-editing": "Vazhdo ndryshimin",
+	"continue-editing": "Shko në pjesën për redaktim",
 	"previewconflict": "Kjo parapamje reflekton tekstin sipër kutisë së redaktimit siç do të duket kur të kryeni ndryshimin.",
 	"session_fail_preview": "'''Ju kërkojmë ndjesë! Redaktimi juaj nuk mund të perpunohej për shkak të humbjes së të dhënave të seancës.'''\nJu lutemi, provojeni përsëri.\nNëse përsëri nuk punon, provoni të [[Special:UserLogout|dilni nga faqja]] dhe të identifikoheni serish.",
 	"session_fail_preview_html": "'''Ju kërkojmë ndjesë! I pamundur përpunimi i redaktimeve tuaja për shkak të humbjes së të dhënave të seancës.'''\n'' Për shkak se {{SITENAME}} ka të aktivizuar përdorimin e HTML-së së papërpunuar, teksti për shqyrtim është fshehur si masë parandaluese kundër sulmeve JavaScript.''\n'''Nëse kjo është një përpjekje e sinqertë për redaktim, ju lutemi, provojeni përsëri.'''\nNëse përsëri nuk funksiono, provoni [[Special:UserLogout|të dilni nga faqja]] dhe të identifikoheni sërish.",
@@ -709,7 +712,7 @@
 	"history-feed-empty": "Faqja që kërkuat nuk ekziston. Ajo mund të jetë grisur nga wiki ose mund të jetë zhvendosur nën një emër tjetër. Mund të provoni ta gjeni duke e [[Special:Search|kërkuar]].",
 	"rev-deleted-comment": "(Edit përmbledhje larguar)",
 	"rev-deleted-user": "(përdoruesi u largua)",
-	"rev-deleted-event": "(veprimi në regjistër është hequr)",
+	"rev-deleted-event": "(detajet e regjistrit janë hequr)",
 	"rev-deleted-user-contribs": "[Përdoruesi ose adresa IP u hoq - redaktimet e  fshehura nga kontribuesit]",
 	"rev-deleted-text-permission": "Versioni i kësaj faqeje është '''fshirë'''.\nDetajet mund të gjenden tek [{{fullurl:{{#Special:Log}}/delete={{FULLPAGENAME}}}} regjistri i grisjeve].",
 	"rev-deleted-text-unhide": "Ky version i faqes është '''grisur'''.\nDetajet mund të gjenden tek [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAME}}}} regjistri i grisjeve].\nJu akoma mund ta [$1 shikoni këtë version] nëse doni të vazhdoni.",
@@ -910,8 +913,8 @@
 	"prefs-reset-intro": "Mundeni me përdorë këtë faqe për me i kthy parapëlqimet tueja në ato të paracaktuemet e faqes.\nKjo nuk mundet me u zhbâ.",
 	"prefs-emailconfirm-label": "Konfirmimi i emailit:",
 	"youremail": "Adresa e email-it*",
-	"username": "Nofka e përdoruesit:",
-	"prefs-memberingroups": "Anëtar i {{PLURAL:$1|grupit|grupeve}}:",
+	"username": "{{GENDER:$1|Emri i përdoruesit|Emri i përdorueses}}:",
+	"prefs-memberingroups": "{{GENDER:$2|Anëtar i|Anëtare e}} {{PLURAL:$1|grupit|grupeve}}:",
 	"prefs-registration": "Koha e regjistrimit:",
 	"yourrealname": "Emri juaj i vërtetë*",
 	"yourlanguage": "Ndërfaqja gjuhësore",
@@ -921,11 +924,11 @@
 	"prefs-help-signature": "Komentet në faqet e diskutimit duhet të nënshkruhen me \"<nowiki>~~~~</nowiki>\" të cilat do të konvertohen me emrin tuaj të përdoruesit dhe kohën.",
 	"badsig": "Sintaksa e signaturës është e pavlefshme, kontrolloni HTML-in.",
 	"badsiglength": "Nënshkrimi është tepër i gjatë.\nNuk duhet të jetë më i gjatë se $1 {{PLURAL:$1|karakter|karaktere}}.",
-	"yourgender": "Gjinia:",
-	"gender-unknown": "e pacaktuar",
+	"yourgender": "Si dëshironi të përshkruheni?",
+	"gender-unknown": "Kur ju të përmendeni, softueri do të përdorë fjalë asnjanëse kur është e mundur (në të shumtën e rasteve do të jenë fjalë të gjinisë mashkullore)",
 	"gender-male": "Ai redakton faqet wiki",
 	"gender-female": "Ajo redakton faqet wiki",
-	"prefs-help-gender": "Sipas dëshirës: përdoret për adresim korrekt në relacion me gjininë nga software-i.\nKjo informatë është publike.",
+	"prefs-help-gender": "Vendosja e këtij parapëlqimi nuk është e detyrueshme.\nSoftueri përdor vlerat e tij për t'ju adresuar dhe për t'ju përmendur ju te të tjerët duke përdorur gjininë e duhur gramatikore.\nKy informacion do të jetë publik.",
 	"email": "Email",
 	"prefs-help-realname": "* Emri i vërtetë nuk është i domosdoshëm: Nëse e jipni do të përmendeni si kontribues për punën që ke bërë.",
 	"prefs-help-email": "Posta elektronike është zgjedhore, por ju mundëson që fjalëkalimi i ri të ju dërgohet nëse e harroni atë. Gjithashtu mund të zgjidhni nëse doni të tjerët t'ju shkruajnë ose jo përmes faqes suaj të diskutimit pa patur nevojë të zbulojnë identitetin tuaj.",
@@ -952,19 +955,20 @@
 	"userrights-lookup-user": "Ndrysho grupet e përdoruesit",
 	"userrights-user-editname": "Fusni emrin e përdoruesit:",
 	"editusergroup": "Redakto grupet e përdoruesve",
-	"editinguser": "Duke ndryshuar privilegjet e përdoruesit '''[[User:$1|$1]]''' $2",
+	"editinguser": "Duke ndryshuar privilegjet e {{GENDER:$1|përdoruesit|përdorueses}} <strong>[[User:$1|$1]]</strong> $2",
 	"userrights-editusergroup": "Anëtarësimi tek grupet",
 	"saveusergroups": "Ruaj Grupin e Përdoruesve",
-	"userrights-groupsmember": "Anëtar i:",
-	"userrights-groupsmember-auto": "Anëtar implicit i:",
-	"userrights-groups-help": "Mund të ndryshoni anëtarësimin e këtij përdoruesi në grupe:\n* Kutia e zgjedhur shënon që përdoruesi është anëtar në atë grup\n* Kutia e pazgjedhur shënon që përdoruesi nuk është anëtar në atë grup\n* Një * shënon që nuk mund ta hiqni grupin pasi ta keni shtuar (dhe anasjelltas).",
+	"userrights-groupsmember": "{{GENDER:$2|Anëtar i|Anëtare e}}:",
+	"userrights-groupsmember-auto": "{{GENDER:$2|Anëtar i nënkuptuar i|Anëtare e nënkuptuar e}}:",
+	"userrights-groups-help": "Mund të ndryshoni anëtarësimin e {{GENDER:$1|këtij përdoruesi|kësaj përdorueseje}} në grupe:\n* Kutia e zgjedhur shënon që {{GENDER:$1|përdoruesi|përdoruesja}} është {{GENDER:$1|anëtar|anëtare}} në atë grup.\n* Kutia e pazgjedhur shënon që {{GENDER:$1|përdoruesi|përdoruesja}} nuk është {{GENDER:$1|anëtar|anëtare}} në atë grup.\n* Një * tregon që nuk mund ta hiqni grupin pasi ta keni shtuar (dhe anasjelltas).",
 	"userrights-reason": "Arsyeja:",
 	"userrights-no-interwiki": "Nuk keni leje për të ndryshuar privilegjet e përdoruesve në wiki të tjera.",
 	"userrights-nodatabase": "Regjistri $1 nuk ekziston ose nuk është vendor.",
 	"userrights-nologin": "Duhet të [[Special:UserLogin|hyni brenda]] me një llogari administrative për të ndryshuar privilegjet e përdoruesve.",
-	"userrights-notallowed": "llogaria juaj nuk ka leje për të shtuar ose hequr privilegjet e përdoruesve.",
+	"userrights-notallowed": "Ju nuk keni leje për të shtuar ose hequr privilegjet e përdoruesve.",
 	"userrights-changeable-col": "Grupe që mund të ndryshoni",
 	"userrights-unchangeable-col": "Grupe që s'mund të ndryshoni",
+	"userrights-conflict": "Konflikt në ndryshimin e të drejtave të përdoruesit! Ju lutemi të rishikoni dhe konfirmomi ndryshimet tuaja.",
 	"group": "Grupi:",
 	"group-user": "Përdorues",
 	"group-autoconfirmed": "Përdorues të vërtetuar automatikisht",
@@ -1089,9 +1093,10 @@
 	"recentchanges": "Ndryshimet e fundit",
 	"recentchanges-legend": "Zgjedhjet e ndryshimeve momentale",
 	"recentchanges-summary": "Ndiqni ndryshime së fundmi tek kjo faqe.",
+	"recentchanges-noresult": "Nuk ka ndryshime gjatë periudhës së dhënë që plotësojnë këto kritere.",
 	"recentchanges-feed-description": "Ndjek ndryshimet më të fundit në wiki tek kjo fushë.",
 	"recentchanges-label-newpage": "Ky redaktim krijoi një faqe të re",
-	"recentchanges-label-minor": "Ky është një editim i vogël",
+	"recentchanges-label-minor": "Ky është një redaktim i vogël",
 	"recentchanges-label-bot": "Ky redaktim u krye nga një robot",
 	"recentchanges-label-unpatrolled": "Ky editim ende nuk është patrolluar",
 	"recentchanges-label-plusminus": "Madhësia e faqes ndryshoi me këtë numër bajtësh",
@@ -1378,6 +1383,11 @@
 	"unusedtemplateswlh": "lidhje",
 	"randompage": "Faqe e rastit",
 	"randompage-nopages": "Nuk ka faqe në {{PLURLA:$2|hapësirën|hapësirat}} në vijim: $1",
+	"randomincategory-invalidcategory": "\"$1\" nuk është emër i vlefshëm kategorie.",
+	"randomincategory-nopages": "Nuk ka faqe në kategorinë [[:Category:$1|$1]].",
+	"randomincategory-category": "Kategoria:",
+	"randomincategory-legend": "Faqe e rastit në kategori",
+	"randomincategory-submit": "Shko",
 	"randomredirect": "Përcjellim i rastit",
 	"randomredirect-nopages": "Nuk ka përcjellim në \"$1\".",
 	"statistics": "Statistika",
@@ -1394,9 +1404,11 @@
 	"statistics-users": "[[Special:ListUsers|Përdoruesit]] e regjistruar",
 	"statistics-users-active": "Përdoruesit aktiv",
 	"statistics-users-active-desc": "Përdoruesit që kanë së paku një veprim në {{PLURAL:$1|ditën|$1 ditët}} e fundit",
+	"pageswithprop-prop": "Emri i pronës:",
+	"pageswithprop-submit": "Shko",
 	"doubleredirects": "Përcjellime dopjo",
 	"doubleredirectstext": "Kjo faqe liston faqet përcjellëse tek faqet e tjera përcjellëse.\nSecili rresht përmban lidhjet tek përcjellimi i parë dhe përcjellimi i dytë, gjithashtu synimin e përcjellimit të dytë, që është zakonisht faqja synuese '''e vërtetë''', që faqja w parë duhej të ishte përcjellëse e kësaj faqeje.\n<del>Kalimet nga</del> hyrjet janë zgjidhur.",
-	"double-redirect-fixed-move": "[[$1]] u zhvendos, tani është gjendet në [[$2]]",
+	"double-redirect-fixed-move": "[[$1]] u zhvendos.\n\nËshtë përditësuar automatikisht dhe tani përcjellet tek [[$2]]",
 	"double-redirect-fixed-maintenance": "Duke zgjidhur përcjellimin e dyfishtë nga [[$1]] tek [[$2]].",
 	"double-redirect-fixer": "Rregullues zhvendosjesh",
 	"brokenredirects": "Përcjellime të prishura",
@@ -1410,8 +1422,10 @@
 	"fewestrevisions": "Artikuj më të paredaktuar",
 	"nbytes": "$1 {{PLURAL:$1|byte|byte}}",
 	"ncategories": "$1 {{PLURAL:$1|kategori|kategori}}",
+	"ninterwikis": "$1 {{PLURAL:$1|ndërwiki|ndërwikit}}",
 	"nlinks": "$1 {{PLURAL:$1|lidhje|lidhje}}",
 	"nmembers": "$1 {{PLURAL:$1|antar|antarë}}",
+	"nmemberschanged": "$1 → $2 {{PLURAL:$2|anëtar|anëtarët}}",
 	"nrevisions": "$1 {{PLURAL:$1|version|versione}}",
 	"nimagelinks": "Përdorur në $1 {{PLURAL:$1|faqe|faqe}}",
 	"ntransclusions": "përdorur në $1 {{PLURAL:$1|faqe|faqe}}",
@@ -1447,6 +1461,9 @@
 	"protectedpages-indef": "Vetëm mbrojtjet pa afat",
 	"protectedpages-cascade": "Vetëm mbrojtjet",
 	"protectedpagesempty": "Nuk ka faqe të mbrojtura me të dhënat e kërkuara.",
+	"protectedpages-page": "Faqja",
+	"protectedpages-expiry": "Skadon",
+	"protectedpages-reason": "Arsyeja",
 	"protectedtitles": "Titujt e mbrojtur",
 	"protectedtitlesempty": "Asnjë titull i mbrojtur nuk u gjet në këtë hapësirë.",
 	"listusers": "Lista e përdoruesve",
@@ -1469,6 +1486,7 @@
 	"pager-older-n": "{{PLURAL:$1|1 më i vjetër|$1 më të vjetra}}",
 	"suppress": "Kujdestari",
 	"querypage-disabled": "Kjo faqe speciale është çaktivizuar për arsye të performancës.",
+	"apihelp-no-such-module": "Moduli \"$1\" nuk u gjet.",
 	"booksources": "Burime librash",
 	"booksources-search-legend": "Kërkim burimor librash",
 	"booksources-search": "Kërko",
@@ -1592,6 +1610,7 @@
 	"watcherrortext": "Është paraqitur një gabim përderisa ndryshuat parametrat e listës suaj mbikqyrëse për \"$1\".",
 	"enotif_reset": "Shëno të gjitha faqet e vizituara",
 	"enotif_impersonal_salutation": "Përdorues i {{SITENAME}}",
+	"enotif_subject_created": "{{SITENAME}} faqja $1 është {{GJINIA:$2|krijuar}} nga $2",
 	"enotif_lastvisited": "Shikoni $1 për të gjitha ndryshimet që prej vizitës tuaj të fundit.",
 	"enotif_lastdiff": "Shikoni $1 për ndryshime.",
 	"enotif_anon_editor": "përdorues anonim $1",
@@ -1617,13 +1636,13 @@
 	"deletecomment": "Arsyeja:",
 	"deleteotherreason": "Arsye tjetër:",
 	"deletereasonotherlist": "Arsyeja tjetër",
-	"deletereason-dropdown": "*Arsye për grisje:\n** Pa të drejtë autori\n** Kërkesë nga autori\n** Vandalizëm",
+	"deletereason-dropdown": "*Arsye të zakonshme të grisjes\n** Spam\n** Vandalizëm\n** Shkelje e të drejtave të autorit\n** Kërkesë e autorit\n** Faqe përcjellëse e thyer",
 	"delete-edit-reasonlist": "Ndrysho arsyet e grisjes",
 	"delete-toobig": "Kjo faqe ka një historik të madh redaktimesh, më shumë se $1 {{PLURAL:$1|version|versione}}.\nGrisja e faqeve të tilla ka qenë kufizuar për të parandaluar përçarjen aksidentale të {{SITENAME}}.",
 	"delete-warning-toobig": "Kjo faqe ka një historik të madh redaktimesh, më shumë se $1 {{PLURAL:$1|version|versione}}.\nGrisja e saj mund të ndërpresë operacionet e bazës së të dhënave të {{SITENAME}};\nvazhdoni me kujdes.",
 	"rollback": "Riktheji mbrapsh redaktimet",
 	"rollbacklink": "riktheje",
-	"rollbacklinkcount": "riktheni $1 {{PLURAL:$1|ndryshimin|ndryshiemt}}",
+	"rollbacklinkcount": "riktheni $1 {{PLURAL:$1|ndryshim|ndryshime}}",
 	"rollbacklinkcount-morethan": "riktheni më tepër $1 {{PLURAL:$1|ndryshim|ndryshime}}",
 	"rollbackfailed": "Rikthimi dështoi",
 	"cantrollback": "Redaktimi nuk mund të kthehej;\nredaktori i fundit është i vetmi autor i këtij artikulli.",
@@ -1634,6 +1653,7 @@
 	"rollback-success": "Ndryshimet e $1 u kthyen mbrapsh; artikulli ndodhet tek verzioni i $2.",
 	"sessionfailure-title": "Dështim sesioni",
 	"sessionfailure": "Duket se ka një problem me seancën tuaj hyrëse; ky veprim është anuluar për tu mbrojtur nga ndonjë veprim dashakeq kundrejt shfletimit tuaj. Ju lutemi kthehuni mbrapsh, rifreskoni faqen prej nga erdhët dhe provojeni përsëri veprimin.",
+	"changecontentmodel-reason-label": "Arsyeja:",
 	"protectlogpage": "Regjistri i mbrojtjeve",
 	"protectlogtext": "Më poshtë është lista e kyçjeve dhe çkyçjeve të faqes.\nShih listën e [[Special:ProtectedPages|faqeve të mbrojtura]] nga lista e mbrojtjeve të faqeve tani në veprim.",
 	"protectedarticle": "mbrojti [[$1]]",
@@ -1671,7 +1691,7 @@
 	"protect-existing-expiry": "Koha ekzistuese e skadimit: $3, $2",
 	"protect-otherreason": "Arsye tjera/shtesë:",
 	"protect-otherreason-op": "Arsyeja tjetër",
-	"protect-dropdown": "*Arsyet e përbashkëta të mbrojtjes\n**Vandalizëm i tepërt\n**Spam i tepërt\n**Counter-productive edit warning\n**Faqe e lartë trafiku",
+	"protect-dropdown": "*Arsye të zakonshme të mbrojtjes\n**Vandalizëm i tepërt\n**Spam i tepërt\n**Paralajmërim i redaktimeve joprodukive\n**Faqe e trafikut të lartë",
 	"protect-edit-reasonlist": "Redakto arsyet e mbrojtjes",
 	"protect-expiry-options": "1 Orë:1 hour,1 Ditë:1 day,1 Javë:1 week,2 Javë:2 weeks,1 Muaj:1 month,3 Muaj:3 months,6 Muaj:6 months,1 Vjet:1 year,Pa kufi:infinite",
 	"restriction-type": "Lejet:",
@@ -1781,7 +1801,7 @@
 	"ipaddressorusername": "Adresë IP ose emër përdoruesi",
 	"ipbexpiry": "Afati",
 	"ipbreason": "Arsyeja:",
-	"ipbreason-dropdown": "*Arsyet më të shpeshta të bllokimit\n** Postimi i informacioneve të rreme\n** Largimi i përmbajtjes së faqes\n** Futja e lidhjeve \"spam\"\n** Futja e informatave pa kuptim në faqe\n** Sjellje arrogante/perverze\n** Përdorimi i më shumë llogarive të përdoruesve\n** Nofkë të papranueshme",
+	"ipbreason-dropdown": "*Arsye të zakonshme të bllokimit\n** Vendosja e të dhënave të rreme\n** Largimi i përmbajtjeve të faqeve\n** Vendosja e lidhjeve spam \n** Vendosja e të dhënave të pakuptimta\n** Sjellje arrogante dhe/ose ngacmuese\n** Përdorimi i më shumë llogarive\n** Nofkë e papranueshme",
 	"ipb-hardblock": "Parandalo përdoruesit e kyçur për të redaktuar nga kjo IP adresë",
 	"ipbcreateaccount": "Mbroje krijimin e llogarive",
 	"ipbemailban": "Pa mundëso dërgimin  e porosive elektronike nga përdoruesit",
@@ -1800,16 +1820,17 @@
 	"ipb-blockingself": "Ju jeni duke bllokuar vetëveten ! Jeni te sigurte qe doni te bëni këtë?",
 	"ipb-confirmhideuser": "Ju jeni gati për të bllokuar një përdorues me \"përdorues të fshehur\" të aktivizuar. Kjo do të shtypur emrin e përdoruesit në të gjitha listat dhe aktivitetet hyrëse. Jeni te sigurte qe doni ta bëni këtë ?",
 	"ipb-edit-dropdown": "Redakto arsyet e bllokimit",
-	"ipb-unblock-addr": "Çblloko $1",
+	"ipb-unblock-addr": "Zhblloko $1",
 	"ipb-unblock": "Çblloko përdorues dhe IP të bllokuara",
 	"ipb-blocklist": "Përdorues dhe IP adresa të bllokuara",
-	"ipb-blocklist-contribs": "Kontributet për $1",
-	"unblockip": "Çblloko përdoruesin",
+	"ipb-blocklist-contribs": "Kontributet për {{GENDER:$1|$1}}",
+	"unblockip": "Zhblloko përdoruesin",
 	"unblockiptext": "Përdor formularin e më poshtëm për t'i ridhënë leje shkrimi\nnjë përdoruesi ose IP adreseje të bllokuar.",
 	"ipusubmit": "Hiqni këtë bllokim",
-	"unblocked": "[[User:$1|$1]] është çbllokuar",
-	"unblocked-range": "$1 është zhbllokuar",
+	"unblocked": "[[User:$1|$1]] është zhbllokuar.",
+	"unblocked-range": "$1 është zhbllokuar.",
 	"unblocked-id": "Bllokimi $1 është hequr",
+	"unblocked-ip": "[[Special:Contributions/$1|$1]] është zhbllokuar.",
 	"blocklist": "Përdorues i Bllokuar",
 	"ipblocklist": "Përdorues i Bllokuar",
 	"ipblocklist-legend": "Gjej një përdorues të bllokuar",
@@ -1836,7 +1857,7 @@
 	"ipblocklist-empty": "Lista e të bllokimeve është e zbrazët.",
 	"ipblocklist-no-results": "Adresa IP ose përdoruesi i kërkuar nuk është i bllokuar.",
 	"blocklink": "blloko",
-	"unblocklink": "çblloko",
+	"unblocklink": "zhblloko",
 	"change-blocklink": "ndryshoje bllokun",
 	"contribslink": "kontribute",
 	"emaillink": "dërgo e-mail",
@@ -1846,7 +1867,7 @@
 	"blocklog-showsuppresslog": "Ky përdorues ka qenë i bllokuar dhe i fshehur më parë.\nRegjistri i bllokimeve është poshtë për referncë:",
 	"blocklogentry": "bllokoi [[$1]] për një kohë prej: $2 $3",
 	"reblock-logentry": "ndryshoi parametrat e bllokimit për [[$1]] me një kohë prej $2 $3",
-	"blocklogtext": "Ky është një regjistër bllokimesh dhe çbllokimesh të përdoruesve. IP-të e bllokuara automatikisht nuk janë të dhëna. Shikoni dhe [[Special:BlockList|listën e IP-ve të bllokuara]] për një listë të bllokimeve të tanishme.",
+	"blocklogtext": "Ky është një regjistër i veprimeve bllokuese dhe zhbllokuese të përdoruesit.\n\nAdresat I të bllokuara automatikisht nuk janë të paraqitura. \n\nShikoni dhe [[Special:BlockList|listën e të bllokuarve]] për një listë të bllokimeve dhe ndalimeve vepruese të tanishme.",
 	"unblocklogentry": "çbllokoi \"$1\"",
 	"block-log-flags-anononly": "vetëm anonimët",
 	"block-log-flags-nocreate": "krijimi i llogarive është pamundësuar",
@@ -1862,8 +1883,8 @@
 	"ipb_already_blocked": "\"$1\" është i bllokuar",
 	"ipb-needreblock": "$1 është i bllokuar.\nDëshironi t'i ndryshoni parametrat?",
 	"ipb-otherblocks-header": "{{PLURAL:$1|Bllokim tjetër|Bllokime të tjera}}",
-	"unblock-hideuser": "Ju nuk mund të zhbllokoni këtë përdorues, përderisa nofka e tij është fshehur.",
-	"ipb_cant_unblock": "Gabim: Bllokimi ID $1 nuk u gjet.\nMund të jetë zhbllokuar.",
+	"unblock-hideuser": "Ju nuk mund të zhbllokoni këtë përdorues, përderisa nofka e tij është e fshehur.",
+	"ipb_cant_unblock": "Gabim: Bllokimi ID $1 nuk u gjet.\n\nMund të jetë zhbllokuar deri tani.",
 	"ipb_blocked_as_range": "Gabim: Adresa IP $1 nuk është bllokuar direkt dhe nuk mund të zhbllokohet.\nAjo është, megjithatë, e bllokuar si pjesë e rangut $2, që nuk mund të zhbllokohet.",
 	"ip_range_invalid": "Shtrirje IP gabim.",
 	"ip_range_toolarge": "Radhitja e bllokimeve më të mëdha se /$1 nuk lejohet.",
@@ -1884,9 +1905,9 @@
 	"unlockbtn": "Çblloko regjistrin",
 	"locknoconfirm": "Nuk vendose kryqin tek kutia konfirmuese.",
 	"lockdbsuccesssub": "Regjistri u bllokua me sukses",
-	"unlockdbsuccesssub": "Regjistri u çbllokua me sukses",
+	"unlockdbsuccesssub": "Regjistri u zhbllokua me sukses",
 	"lockdbsuccesstext": "Regjistri është bllokuar.<br />\nKujtohuni ta [[Special:UnlockDB|çbllokoni]] pasi të keni mbaruar mirëmbajtjen.",
-	"unlockdbsuccesstext": "Regjistri i {{SITENAME}} është çbllokuar.",
+	"unlockdbsuccesstext": "Regjistri i {{SITENAME}} është zhbllokuar.",
 	"lockfilenotwritable": "Skeda për bllokimin e regjistrit s'mund të shkruhet.\nShërbyesi i rrjetit duhet të jetë në gjendje të shkruaj këtë skedë për të bllokuar ose çbllokuar regjistrin.",
 	"databasenotlocked": "Regjistri nuk është bllokuar.",
 	"lockedbyandtime": "(nga {{GENDER:$1|$1}} më $2 në $3)",
@@ -2117,11 +2138,12 @@
 	"spam_deleting": "Të gjitha inspektimet përmbanin lidhje në $1, duke fshirë",
 	"simpleantispam-label": "Kontrolli anti-spam.\n<strong>Mos</strong> e plotëso këtë!",
 	"pageinfo-title": "Informacion për \" $1 \"",
-	"pageinfo-header-edits": "Redaktimet",
-	"pageinfo-watchers": "Numri i mbikqyrësve",
-	"pageinfo-edits": "Numri i redaktimeve",
-	"pageinfo-authors": "Numri i autorëve të veçantë",
+	"pageinfo-header-edits": "Historiku i redaktimeve",
+	"pageinfo-watchers": "Numri i mbikqyrësve të faqes",
+	"pageinfo-edits": "Numri total i redaktimeve",
+	"pageinfo-authors": "Numri i përgjithshëm i autorëve të veçantë",
 	"pageinfo-toolboxlink": "Informacioni i faqes",
+	"pageinfo-category-total": "Numri i përgjithshëm i anëtarëve",
 	"markaspatrolleddiff": "Shënoje si të patrulluar",
 	"markaspatrolledtext": "Shënoje këtë artikull të patrulluar",
 	"markedaspatrolled": "Shënoje të patrulluar",
@@ -2175,6 +2197,14 @@
 	"hours": "{{PLURAL:$1|$1 orë|$1 orë}}",
 	"days": "{{PLURAL:$1|$1 ditë|$1 ditë}}",
 	"ago": "$1 më parë",
+	"monday-at": "Të hënën në $1",
+	"tuesday-at": "Të martën në $1",
+	"wednesday-at": "Të mërkurën në $1",
+	"thursday-at": "Të enjten në $1",
+	"friday-at": "Të premten në $1",
+	"saturday-at": "Të shtunën në $1",
+	"sunday-at": "Të dielën në $1",
+	"yesterday-at": "Dje në $1",
 	"bad_image_list": "Formati është si vijon:\n\nVetëm elementët listë ( rreshtat duhet të fillojnë me * ) merren parasysh.\nLidhja e parë në një rresht duhet të lidhet me një skedë të prishur.\nÇdo lidhje pasuese në rreshtin e njëjtë konsiderohet si përjashtim, p.sh. faqe në të cilat skeda mund të shfaqet në të njëjtin rresht.",
 	"metadata": "Metadata",
 	"metadata-help": "Kjo skedë përmban hollësira të tjera të cilat mund të jenë shtuar nga kamera ose skaneri dixhital që është përdorur për ta krijuar.\nNë qoftë se skeda është ndryshuar nga gjendja origjinale, disa hollësira mund të mos pasqyrojnë versionin e tanishëm.",
@@ -2362,7 +2392,7 @@
 	"exif-compression-3": "CCITT Grupi 3 faks kodimi",
 	"exif-compression-4": "CCITT Grupi 4 faks kodimi",
 	"exif-copyrighted-true": "E drejtë e autorit",
-	"exif-copyrighted-false": "Sferë publike",
+	"exif-copyrighted-false": "Statusi i së drejtës së autorit nuk u caktua",
 	"exif-unknowndate": "E dhënë e pa njohur",
 	"exif-orientation-1": "Normale",
 	"exif-orientation-2": "E kthyer horizontalisht",
@@ -2571,6 +2601,7 @@
 	"autosumm-replace": "Faqja u zëvendësua me '$1'",
 	"autoredircomment": "Përcjellim te [[$1]]",
 	"autosumm-new": "Krijoi faqen me \"$1\"",
+	"autosumm-newblank": "Krijoi faqe të zbrazët",
 	"lag-warn-normal": "Ndryshimet më të reja se $1 {{PLURAL:$1|sekond|sekonda}} mund të mos tregohen në këtë listë.",
 	"lag-warn-high": "Për shkak të vonesës së regjistrit ndryshimet më të reja se $1 {{PLURAL:$1|sekond|sekonda}} mund të mos tregohen në këtë listë.",
 	"watchlistedit-normal-title": "Redakto listën mbikqyrëse",
@@ -2593,7 +2624,7 @@
 	"duplicate-defaultsort": "'''Kujdes:''' Renditja kryesore e çelësit \"$2\" refuzon renditjen e mëparshme kryesore të çelësit \"$1\".",
 	"version": "Versioni",
 	"version-extensions": "Zgjerime të instaluara",
-	"version-skins": "Pamjet",
+	"version-skins": "Pamjet e instaluara",
 	"version-specialpages": "Faqe speciale",
 	"version-parserhooks": "Parser goditje",
 	"version-variables": "Variabël",
@@ -2606,7 +2637,7 @@
 	"version-hook-name": "Emri i goditjes",
 	"version-hook-subscribedby": "Abonuar nga",
 	"version-version": "($1)",
-	"version-license": "Licensa",
+	"version-license": " Liçenca MediaWiki",
 	"version-poweredby-credits": "Ky wiki është mundësuar nga '''[https://www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 	"version-poweredby-others": "të tjerë",
 	"version-license-info": "MediaWiki është një softuer i lirë; ju mund ta shpërndani dhe redakatoni atë nën kushtet GNU General Public License si e publikuar nga fondacioni Free Software; ose versioni 2 i licensës, ose çdo version më i vonshëm.\n\nMediaWiki është shpërndarë me shpresën se do të jetë i dobishëm, por PA ASNJË GARANCI; as garancinë e shprehur të SHITJES apo PËRDORIMIT PËR NJË QËLLIM TË CAKTUAR. Shikoni GNU General Public License  për më shumë detaje.\n\nJu duhet të keni marrë [{{SERVER}}{{SCRIPTPATH}}/COPYING një kopje të GNU General Public License] së bashku me këtë program; nëse jo, shkruani tek Free Software Foundation, Inc., 51 Rruga Franklin, Kati i pestë, Boston, MA 02110-1301, ShBA ose [//www.gnu.org/licenses/old-licenses/gpl-2.0.html lexojeni atë online].",
@@ -2652,6 +2683,11 @@
 	"tags-hitcount-header": "Ndrzshimet e etikuara",
 	"tags-edit": "redakto",
 	"tags-hitcount": "$1 {{PLURAL:$1|ndryshim|ndryshime}}",
+	"tags-create-reason": "Arsyeja:",
+	"tags-delete-reason": "Arsyeja:",
+	"tags-activate-reason": "Arsyeja:",
+	"tags-deactivate-reason": "Arsyeja:",
+	"tags-edit-reason": "Arsyeja:",
 	"comparepages": "Krahasoni faqet",
 	"compare-page1": "Faqe 1",
 	"compare-page2": "Faqe 2",
@@ -2680,12 +2716,12 @@
 	"sqlite-has-fts": "$1 me mbështetje të kërkimit me teskt të plotë",
 	"sqlite-no-fts": "$1 pa mbështetje të kërkimit me teskt të plotë",
 	"logentry-delete-delete": "$1 {{GENDER:$2|grisi}} faqen $3",
-	"logentry-delete-restore": "$1 riktheu faqen $3",
-	"logentry-delete-event": "$1 ndryshoi dukshmërinë e {{PLURAL:$5|një ngjarje regjistri|$5 ngjarjeve regjistri}} në $3: $4",
-	"logentry-delete-revision": "$1 ndryshoi dukshmërinë e {{PLURAL:$5|një versioni|$5 versioneve}} në $3: $4",
-	"logentry-delete-event-legacy": "$1 ndryshoi dukshmërinë e ngjarjeve të regjistrit në $3",
-	"logentry-delete-revision-legacy": "$1 ndryshoi dukshmërinë e versioneve në $3",
-	"logentry-suppress-delete": "$1 shtypi faqen $3",
+	"logentry-delete-restore": "$1 {{GENDER:$2|riktheu}} faqen $3",
+	"logentry-delete-event": "$1 {{GENDER:$2|ndryshoi}} dukshmërinë e {{PLURAL:$5|e një ngjarjeje regjistri|$5 ngjarjeve regjitri}} në $3: $4",
+	"logentry-delete-revision": "$1 {{GENDER:$2|ndryshoi}} dukshmërinë e {{PLURAL:$5|një rishikimi|$5 rishikimeve}} në faqen $3: $4",
+	"logentry-delete-event-legacy": "$1 {{GENDER:$2|ndryshoi}} dukshmërinë e ngjarjeve të regjistit në $3",
+	"logentry-delete-revision-legacy": "$1 {{GENDER:$2|ndryshpi}} dukshmërinë e rishikimeve në faqen $3",
+	"logentry-suppress-delete": "$1 {{GENDER:$2|shtypi}} faqen $3",
 	"logentry-suppress-event": "$1 në mënyrë sekrete ndryshoi dukshmërinë e {{PLURAL:$5|një ngjarje regjistri|$5 ngjarjeve regjistri}} në $3: $4",
 	"logentry-suppress-revision": "$1 në mënyrë sekrete ndryshoi dukshmërinë e {{PLURAL:$5|një versioni|$5 versioneve}} në $3: $4",
 	"logentry-suppress-event-legacy": "$1 në mënyrë sekrete ndryshoi dukshmërinë e ngjarjeve të regjistrit në $3",
@@ -2698,16 +2734,23 @@
 	"revdelete-uname-unhid": "emri i përdoruesit jo i fshehur",
 	"revdelete-restricted": "u vendosën kufizime për administruesit",
 	"revdelete-unrestricted": "u hoqën kufizimet për administruesit",
+	"logentry-block-block": "$1 {{GENDER:$2|bllokoi}} {{GENDER:$4|$3}} me një kohë të skadimit $5 $6",
+	"logentry-block-unblock": "$1 {{GENDER:$2|zhbllokoi}} {{GENDER:$4|$3}}",
+	"logentry-block-reblock": "$1 {{GENDER:$2|changed}} bllokoi cilësimet për {{GENDER:$4|$3}} me një kohë të skadimit $5 $6",
+	"logentry-suppress-block": "$1 {{GENDER:$2|bllokoi}} {{GENDER:$4|$3}} me një kohë të skadimit $5 $6",
+	"logentry-suppress-reblock": "$1 {{GENDER:$2|changed}} bllokoi cilësimet për {{GENDER:$4|$3}} me një kohë të skadimit $5 $6",
 	"logentry-move-move": "$1 {{GENDER:$2|zhvendosi}} faqen $3 tek $4",
 	"logentry-move-move-noredirect": "$1 zhvendosi faqen $3 te $4 pa lënë një përcjellim",
 	"logentry-move-move_redir": "$1 zhvendosi faqen $3 te $4 nëpërmjet përcjellimit",
 	"logentry-move-move_redir-noredirect": "$1 zhvendosi faqen $3 te $4 nëpërmjet një përcjellimi pa lënë një përcjellim",
 	"logentry-patrol-patrol": "$1 shënoi versionin $4 të faqes $3 të patrolluar",
 	"logentry-patrol-patrol-auto": "$1 automatikisht shënoi versionin $4 të faqes $3 të patrolluar",
-	"logentry-newusers-newusers": "$1 krijoi një llogari",
+	"logentry-newusers-newusers": "Llogaria e përdoruesit $1 është {{GENDER:$2|krijuar}}",
 	"logentry-newusers-create": "Llogaria e {{GENDER:$2|përdoruesit|përdorueses}} $1 u krijua.",
-	"logentry-newusers-create2": "$1 krijoi një llogari $3",
-	"logentry-newusers-autocreate": "Llogaria $1 u krijua automatikisht",
+	"logentry-newusers-create2": "Llogaria e përdoruesit $3 është {{GENDER:$2|krijuar}} nga $1",
+	"logentry-newusers-autocreate": "Llogaria e {{GENDER:$2|përdoruesit|përdorueses}} $1 u {{GENDER:$2|krijua}} automatikisht",
+	"logentry-rights-rights": "$1 {{GENDER:$2|ndërroi}} anëtarësinë e grupit për $3 nga $4 në $5",
+	"logentry-rights-autopromote": "$1 është {{GENDER:$2|promovuar}} automatikisht nga $4 në $5",
 	"logentry-upload-upload": "$1 {{GENDER:$2|ngarkoi}} $3",
 	"rightsnone": "(asgjë)",
 	"revdelete-summary": "përmbledhja redaktimit",
diff --git a/languages/i18n/sr-ec.json b/languages/i18n/sr-ec.json
index 1bdd3d54c8..847ed1abe6 100644
--- a/languages/i18n/sr-ec.json
+++ b/languages/i18n/sr-ec.json
@@ -327,7 +327,7 @@
 	"databaseerror-query": "Упит: $1",
 	"databaseerror-function": "Функција: $1",
 	"databaseerror-error": "Грешка: $1",
-	"laggedslavemode": "'''Упозорење:''' страница је можда застарела.",
+	"laggedslavemode": "<strong>Упозорење:</strong> страница је можда застарела.",
 	"readonly": "База података је закључана",
 	"enterlockreason": "Унесите разлог за закључавање, укључујући и време откључавања",
 	"readonlytext": "База података је тренутно закључана, што значи да је није могуће мењати.\n\nРазлог: $1",
@@ -377,7 +377,7 @@
 	"editinginterface": "<strong>Упозорење:</strong> уређујете страницу која се користи за приказивање текста корисничког окружења.\nИзмене на овој страници ће утицати на све кориснике овог викија.",
 	"translateinterface": "Да додате или промените преводе за све викије, посетите [//translatewiki.net/ Транслејтвики], пројекат за локализацију Медијавикија.",
 	"cascadeprotected": "Ова страница је закључана јер садржи {{PLURAL:$1|следећу страницу која је заштићена|следеће странице које су заштићене}} „преносивом“ заштитом:\n$2",
-	"namespaceprotected": "Немате дозволу да уређујете странице у именском простору '''$1'''.",
+	"namespaceprotected": "Немате дозволу да уређујете странице у именском простору <strong>$1</strong>.",
 	"customcssprotected": "Немате дозволу да мењате ову CSS страницу јер садржи личне поставке другог корисника.",
 	"customjsprotected": "Немате дозволу да мењате ову страницу јаваскрипта јер садржи личне поставке другог корисника.",
 	"mycustomcssprotected": "Немате дозволу за мењање ове CSS странице.",
@@ -395,7 +395,7 @@
 	"virus-badscanner": "Неисправна поставка: непознати скенер за вирусе: ''$1''",
 	"virus-scanfailed": "неуспешно скенирање (код $1)",
 	"virus-unknownscanner": "непознати антивирус:",
-	"logouttext": "'''Одјављени сте.'''\n\nИмајте на уму да неке странице могу наставити да се приказују као да сте још пријављени, све док не очистите привремену меморију свог прегледача.",
+	"logouttext": "<strong>Одјављени сте.</strong>\n\nИмајте на уму да неке странице могу наставити да се приказују као да сте још пријављени, све док не очистите привремену меморију свог прегледача.",
 	"welcomeuser": "Добро дошли, $1!",
 	"welcomecreation-msg": "Ваш налог је отворен.\nНе заборавите да промените своја [[Special:Preferences|подешавања]].",
 	"yourname": "Корисничко име:",
@@ -524,7 +524,7 @@
 	"resetpass-submit-loggedin": "Промени лозинку",
 	"resetpass-submit-cancel": "Откажи",
 	"resetpass-wrong-oldpass": "Неисправна привремена или текућа лозинка.\nМожда сте већ променили лозинку или сте затражили нову привремену лозинку.",
-	"resetpass-recycled": "Унели сте садашњу лозинку, да би сте ресетовали лозинку морате унети нову.",
+	"resetpass-recycled": "Унели сте садашњу лозинку, да бисте ресетовали лозинку морате унети нову.",
 	"resetpass-temp-emailed": "Пријавили сте се са привременим кодом из е-поште.\nДа бисте завршили пријављивање морате поставити нову лозинку овде:",
 	"resetpass-temp-password": "Привремена лозинка:",
 	"resetpass-abort-generic": "Промену лозинке је спречио додатак.",
@@ -533,7 +533,7 @@
 	"resetpass-validity-soft": "Ваша лозинка није ваљана: $1\n\nМолимо изаберите нову или кликните „{{int:resetpass-submit-cancel}}“ да ресетујете касније.",
 	"passwordreset": "Обнављање лозинке",
 	"passwordreset-text-one": "Попуните овај образац да бисте добили привремену лозинку на е-пошту.",
-	"passwordreset-text-many": "{{PLURAL:$1|Испуните једно од поља како би сте добили привремену лозинку на е-пошту.}}",
+	"passwordreset-text-many": "{{PLURAL:$1|Испуните једно од поља како бисте добили привремену лозинку на е-пошту.}}",
 	"passwordreset-disabled": "Обнављање лозинке је онемогућено на овом викију.",
 	"passwordreset-emaildisabled": "Е-пошта је онемогућена на овом викију.",
 	"passwordreset-username": "Корисничко име:",
@@ -630,9 +630,9 @@
 	"userjspreview": "'''Ово је само преглед јаваскрипта.'''\n'''Страница још није сачувана!'''",
 	"sitecsspreview": "'''Ово је само преглед CSS-а.'''\n'''Страница још није сачувана!'''",
 	"sitejspreview": "'''Ово је само преглед јаваскрипта.'''\n'''Страница још није сачувана!'''",
-	"userinvalidcssjstitle": "'''Упозорење:''' не постоји тема „$1“.\nПрилагођене странице CSS и јаваскрипт почињу малим словом, нпр. {{ns:user}}:Foo/vector.css, а не {{ns:user}}:Foo/Vector.css.",
+	"userinvalidcssjstitle": "<strong>Упозорење:</strong> не постоји тема „$1“.\nПрилагођене странице CSS и јаваскрипт почињу малим словом, нпр. {{ns:user}}:Foo/vector.css, а не {{ns:user}}:Foo/Vector.css.",
 	"updated": "(Ажурирано)",
-	"note": "'''Напомена:'''",
+	"note": "<strong>Напомена:</strong>",
 	"previewnote": "<strong>Ово је претпреглед.</strong>\nВаше измене још нису сачуване!",
 	"continue-editing": "Иди на уређивачки оквир",
 	"previewconflict": "Овај преглед осликава како ће текст у текстуалном оквиру изгледати.",
@@ -791,7 +791,7 @@
 	"revdelete-legend": "Ограничења видљивости",
 	"revdelete-hide-text": "Текст измене",
 	"revdelete-hide-image": "Сакриј садржај датотеке",
-	"revdelete-hide-name": "Сакриј циљ и параметре",
+	"revdelete-hide-name": "Циљ и параметре",
 	"revdelete-hide-comment": "Опис измене",
 	"revdelete-hide-user": "Корисничко име/ИП адреса",
 	"revdelete-hide-restricted": "Сакриј податке од администратора и других корисника",
@@ -944,7 +944,7 @@
 	"rows": "Редова:",
 	"columns": "Колона",
 	"searchresultshead": "Претрага",
-	"stub-threshold": "Праг за обликовање <a href=\"#\" class=\"stub\">везе као клице</a>:",
+	"stub-threshold": "Праг за обликовање везе као клице ($1):",
 	"stub-threshold-disabled": "Онемогућено",
 	"recentchangesdays": "Број дана у скорашњим изменама:",
 	"recentchangesdays-max": "Највише $1 {{PLURAL:$1|дан|дана}}",
@@ -1055,7 +1055,7 @@
 	"group-autoconfirmed-member": "{{GENDER:$1|аутоматски потврђен корисник|аутоматски потврђена корисница}}",
 	"group-bot-member": "{{GENDER:$1|бот}}",
 	"group-sysop-member": "{{GENDER:$1|администратор|администраторка|администратор}}",
-	"group-bureaucrat-member": "{{GENDER:$1|бирократа|бирократкиња|бирократа}}",
+	"group-bureaucrat-member": "{{GENDER:$1|бирократа}}",
 	"group-suppress-member": "{{GENDER:$1|ревизор|ревизорка}}",
 	"grouppage-user": "{{ns:project}}:Корисници",
 	"grouppage-autoconfirmed": "{{ns:project}}:Аутоматски потврђени корисници",
@@ -1768,8 +1768,8 @@
 	"watchlistanontext": "Морате бити пријављени да бисте гледали и уређивали ставке на вашем списку надгледања.",
 	"watchnologin": "Нисте пријављени",
 	"addwatch": "Додај на списак надгледања",
-	"addedwatchtext": "Страница „[[:$1]]“ и њена страница за разговор је додата на ваш [[Special:Watchlist|списак надгледања]].",
-	"addedwatchtext-short": "Страница „$1“ је додата на ваш списак надгледања.",
+	"addedwatchtext": "Страница „[[:$1]]“ и њена страница за разговор је додата на Ваш [[Special:Watchlist|списак надгледања]].",
+	"addedwatchtext-short": "Страница „$1“ је додата на Ваш списак надгледања.",
 	"removewatch": "Уклони са списка надгледања",
 	"removedwatchtext": "Страница „[[:$1]]“ и њена страница за разговор је уклоњена с вашег [[Special:Watchlist|списка надгледања]].",
 	"removedwatchtext-short": "Страница „$1“ је уклоњена с вашег списка надгледања.",
@@ -1782,7 +1782,7 @@
 	"watchlist-details": "Имате {{PLURAL:$1|$1 страница|$1 странице|$1 страница}} на вашем списку надгледања, не рачунајући странице за разговор.",
 	"wlheader-enotif": "Обавештење е-поруком је омогућено.",
 	"wlheader-showupdated": "Странице које су измењене откад сте их последњи пут посетили су '''подебљане'''.",
-	"wlnote": "Испод {{PLURAL:$1|је последња измена|су последње '''$1''' измене|је последњих '''$1''' измена}} у {{PLURAL:$2|претходном сату|претходна '''$2''' сата|претходних '''$2''' сати}}, закључно са $3, $4.",
+	"wlnote": "Испод {{PLURAL:$1|је последња измена|су последње <strong>$1</strong> измене|је последњих <strong>$1</strong> измена}} у {{PLURAL:$2|претходном сату|претходна <strong>$2</strong> сата|претходних <strong>$2</strong> сати}}, закључно са $3, $4.",
 	"wlshowlast": "Прикажи последњих $1 сати, $2 дана",
 	"watchlist-options": "Поставке списка надгледања",
 	"watching": "Надгледање…",
@@ -1795,11 +1795,11 @@
 	"enotif_subject_moved": "Страницу $1 на {{SITENAME}} {{GENDER:$2|преместио је|преместила је}} $2",
 	"enotif_subject_restored": "Страницу $1 на {{SITENAME}} {{GENDER:$2|вратио је|вратила је|вратио је}} $2",
 	"enotif_subject_changed": "Страницу $1 на {{SITENAME}} {{GENDER:$2|променио је|променила је|променио је}} $2",
-	"enotif_body_intro_deleted": "Страницу $1 на {{SITENAME}} {{GENDER:$2|обрисао је|обрисала је|обрисао је}} $2 дана $PAGEEDITDATE. Погледајте $3.",
-	"enotif_body_intro_created": "Страницу $1 на {{SITENAME}} {{GENDER:$2|направио је|направила је|направио је}} $2 дана $PAGEEDITDATE. Тренутна измена налази се на $3.",
-	"enotif_body_intro_moved": "Страницу $1 на {{SITENAME}} {{GENDER:$2|преместио је|преместила је}} $2 дана $PAGEEDITDATE. Тренутна измена налази се на  $3.",
-	"enotif_body_intro_restored": "Страницу $1 на {{SITENAME}} {{GENDER:$2|вратио је|вратила је|вратио је}} $2 дана $PAGEEDITDATE. Тренутна измена налази се на $3.",
-	"enotif_body_intro_changed": "Страницу $1 на {{SITENAME}} {{GENDER:$2|променио је|променила је|променио је}} $2 дана $PAGEEDITDATE. Тренутна измена налази се на $3.",
+	"enotif_body_intro_deleted": "Страницу $1 на {{SITENAME}} {{GENDER:$2|обрисао|обрисала}} је $2 дана $PAGEEDITDATE Погледајте $3.",
+	"enotif_body_intro_created": "Страницу $1 на {{SITENAME}} {{GENDER:$2|направио|направила}} је $2 дана $PAGEEDITDATE Тренутна измена налази се на $3.",
+	"enotif_body_intro_moved": "Страницу $1 на {{SITENAME}} {{GENDER:$2|преместио|преместила}} је $2 дана $PAGEEDITDATE Тренутна измена налази се на  $3.",
+	"enotif_body_intro_restored": "Страницу $1 на {{SITENAME}} {{GENDER:$2|вратио|вратила}} је $2 дана $PAGEEDITDATE Тренутна измена налази се на $3.",
+	"enotif_body_intro_changed": "Страницу $1 на {{SITENAME}} {{GENDER:$2|променио|променила}} је $2 дана $PAGEEDITDATE Тренутна измена налази се на $3.",
 	"enotif_lastvisited": "Погледајте $1 за све измене од ваше последње посете.",
 	"enotif_lastdiff": "Погледајте $1 да видите ову измену.",
 	"enotif_anon_editor": "анониман корисник $1",
@@ -1882,7 +1882,7 @@
 	"protect-locked-dblock": "Степени заштите се не могу мењати јер је активна база података закључана.\nОво су поставке странице '''$1''':",
 	"protect-locked-access": "Немате овлашћења за мењање степена заштите странице.\nОво су тренутне поставке странице '''$1''':",
 	"protect-cascadeon": "Ова страница је тренутно заштићена јер се налази на {{PLURAL:$1|страници која има|страницама које имају}} преносиву заштиту.\nМожете да промените степен заштите, али то неће утицати на преносиву заштиту.",
-	"protect-default": "Допуштено свим корисницима",
+	"protect-default": "Допуштено свима",
 	"protect-fallback": "Дозвољено само корисницима са дозволом „$1“",
 	"protect-level-autoconfirmed": "Допуштено само аутоматски потврђеним корисницима",
 	"protect-level-sysop": "Допуштено само администраторима",
@@ -1932,9 +1932,9 @@
 	"undeleteviewlink": "погледај",
 	"undeleteinvert": "Обрни избор",
 	"undeletecomment": "Разлог:",
-	"undeletedrevisions": "{{PLURAL:$1|Измена је враћена|$1 измене су враћене|$1 измена је враћено}}",
+	"undeletedrevisions": "{{PLURAL:$1|измена враћено}} $1",
 	"undeletedrevisions-files": "$1 {{PLURAL:$1|измена|измене|измена}} и $2 {{PLURAL:$2|датотека је враћена|датотеке су враћене|датотека је враћено}}",
-	"undeletedfiles": "{{PLURAL:$1|Датотека је враћена|$1 датотеке су враћене|$1 датотека је враћено}}",
+	"undeletedfiles": "{{PLURAL:$1|датотека враћено}} $1",
 	"cannotundelete": "Враћање није успело:\n$1",
 	"undeletedpage": "<strong>Страница $1 је враћена</strong>\n\nПогледајте [[Special:Log/delete|дневник брисања]] за записе о скорашњим брисањима и враћањима.",
 	"undelete-header": "Погледајте [[Special:Log/delete|историјат брисања]] за недавно обрисане странице.",
@@ -1971,7 +1971,7 @@
 	"sp-contributions-newbies-sub": "За нове кориснике",
 	"sp-contributions-newbies-title": "Доприноси нових корисника",
 	"sp-contributions-blocklog": "дневник блокирања",
-	"sp-contributions-deleted": "обрисани кориснички доприноси",
+	"sp-contributions-deleted": "обрисани доприноси",
 	"sp-contributions-uploads": "отпремања",
 	"sp-contributions-logs": "дневници",
 	"sp-contributions-talk": "разговор",
@@ -2019,7 +2019,7 @@
 	"ipboptions": "2 сата:2 hours,1 дан:1 day,3 дана:3 days,1 недеља:1 week,2 недеље:2 weeks,1 месец:1 month,3 месеца:3 months,6 месеци:6 months,1 година:1 year,трајно:infinite",
 	"ipbhidename": "Сакриј корисничко име са измена и спискова",
 	"ipbwatchuser": "Надгледај корисничке странице и странице за разговор овог корисника",
-	"ipb-disableusertalk": "Забрани овом кориснику да уређује своју страницу за разговор док је блокиран",
+	"ipb-disableusertalk": "Онемогући кориснику да уређује своју страницу за разговор",
 	"ipb-change-block": "Поново блокирај корисника с овим поставкама",
 	"ipb-confirm": "Потврди блокирање",
 	"badipaddress": "Неисправна ИП адреса",
@@ -2055,7 +2055,7 @@
 	"blocklist-reason": "Разлог",
 	"ipblocklist-submit": "Претражи",
 	"ipblocklist-localblock": "Локално блокирање",
-	"ipblocklist-otherblocks": "{{PLURAL:$1|Друго блокирање|Друга блокирања}}",
+	"ipblocklist-otherblocks": "{{PLURAL:$1|Друга блокирања}}",
 	"infiniteblock": "трајно",
 	"expiringblock": "истиче $1 у $2",
 	"anononlyblock": "само анонимни",
@@ -2091,7 +2091,7 @@
 	"ipb_hide_invalid": "Не могу да потиснем овај налог; има више од {{PLURAL:$1|једне измене|$1 измена}}.",
 	"ipb_already_blocked": "„$1“ је већ блокиран.",
 	"ipb-needreblock": "$1 је већ блокиран. Желите ли да промените подешавања?",
-	"ipb-otherblocks-header": "{{PLURAL:$1|Друга блокада|Друге блокаде}}",
+	"ipb-otherblocks-header": "{{PLURAL:$1|Друге блокаде}}",
 	"unblock-hideuser": "Не можете деблокирати овог корисника јер је његово корисничко име сакривено.",
 	"ipb_cant_unblock": "Грешка: блокада $1 не постоји. Можда је корисник деблокиран.",
 	"ipb_blocked_as_range": "Грешка: ИП адреса $1 није директно блокирана и не може да се деблокира.\nОна је блокирана као део блокаде $2, која може бити деблокирана.",
@@ -2174,7 +2174,7 @@
 	"imagetypemismatch": "Екстензија нове датотеке се не поклапа с њеном врстом",
 	"imageinvalidfilename": "Циљани назив датотеке је неисправан",
 	"fix-double-redirects": "Ажурирајте сва преусмерења која воде до првобитног наслова",
-	"move-leave-redirect": "Направи преусмерење",
+	"move-leave-redirect": "Остави преусмерење",
 	"protectedpagemovewarning": "'''Упозорење:''' ова страница је заштићена, тако да само корисници с администраторским овлашћењима могу да је преместе.\nЗа више информација, последњи запис у дневнику измена је приказан испод:",
 	"semiprotectedpagemovewarning": "'''Напомена:''' ова страница је заштићена, тако да само регистровани корисници могу да је преместе.\nЗа више информација, последњи запис у дневнику измена је приказан испод:",
 	"move-over-sharedrepo": "== Датотека постоји ==\n[[:$1]] се налази на дељеном складишту. Ако преместите датотеку на овај наслов, то ће заменити дељену датотеку.",
@@ -2228,7 +2228,9 @@
 	"import-interwiki-history": "Копирај све верзије историје за ову страницу",
 	"import-interwiki-templates": "Укључи све шаблоне",
 	"import-interwiki-submit": "Увези",
+	"import-mapping-default": "Исто као и изворне странице",
 	"import-mapping-namespace": "Увези у именски простор:",
+	"import-mapping-subpage": "Увези као подстранице следеће странице:",
 	"import-upload-filename": "Назив датотеке:",
 	"import-comment": "Коментар:",
 	"importtext": "Извезите датотеку с изворног викија користећи [[Special:Export|извоз]].\nСачувајте је на рачунар и пошаљите овде.",
@@ -2425,7 +2427,7 @@
 	"markedaspatrollederrortext": "Морате изабрати измену да бисте је означили као патролирану.",
 	"markedaspatrollederror-noautopatrol": "Не можете да означите своје измене као патролиране.",
 	"markedaspatrollednotify": "Ова измена на страници „$1“ је означена као патролирана.",
-	"markedaspatrollederrornotify": "Означавање ове странице патролираном није успело.",
+	"markedaspatrollederrornotify": "Означавање ове измене патролираном није успело.",
 	"patrol-log-page": "Дневник патролирања",
 	"patrol-log-header": "Ово је дневник патролираних измена.",
 	"log-show-hide-patrol": "$1 дневник патролирања",
@@ -2439,7 +2441,7 @@
 	"filedelete-archive-read-only": "Сервер не може да пише по складишној фасцикли ($1).",
 	"previousdiff": "← Старија измена",
 	"nextdiff": "Новија измена →",
-	"mediawarning": "'''Упозорење''': ова врста датотеке може садржати штетан код.\nАко га покренете, ваш рачунар може бити угрожен.",
+	"mediawarning": "<strong>Упозорење:</strong> ова врста датотеке може садржати штетан код.\nАко га покренете, Ваш рачунар може бити угрожен.",
 	"imagemaxsize": "Ограничење величине слике:<br />''(на страницама за опис датотека)''",
 	"thumbsize": "Величина минијатуре:",
 	"widthheight": "$1 × $2",
diff --git a/languages/i18n/sr-el.json b/languages/i18n/sr-el.json
index d3f4458335..939524d6d2 100644
--- a/languages/i18n/sr-el.json
+++ b/languages/i18n/sr-el.json
@@ -316,7 +316,7 @@
 	"databaseerror-query": "Upit: $1",
 	"databaseerror-function": "Funkcija: $1",
 	"databaseerror-error": "Greška: $1",
-	"laggedslavemode": "'''Upozorenje:''' stranica je možda zastarela.",
+	"laggedslavemode": "<strong>Upozorenje:</strong> stranica je možda zastarela.",
 	"readonly": "Baza podataka je zaključana",
 	"enterlockreason": "Unesite razlog za zaključavanje, uključujući i vreme otključavanja",
 	"readonlytext": "Baza podataka je trenutno zaključana, što znači da je nije moguće menjati.\n\nRazlog: $1",
@@ -356,7 +356,7 @@
 	"editinginterface": "<strong>Upozorenje:</strong> uređujete stranicu koja se koristi za prikazivanje teksta korisničkog okruženja.\nIzmene na ovoj stranici će uticati na sve korisnike ovog vikija.",
 	"translateinterface": "Da dodate ili promenite prevode za sve vikije, posetite [//translatewiki.net/ Translejtviki], projekat za lokalizaciju Medijavikija.",
 	"cascadeprotected": "Ova stranica je zaključana jer sadrži {{PLURAL:$1|sledeću stranicu koja je zaštićena|sledeće stranice koje su zaštićene}} „prenosivom“ zaštitom:\n$2",
-	"namespaceprotected": "Nemate dozvolu da uređujete stranice u imenskom prostoru '''$1'''.",
+	"namespaceprotected": "Nemate dozvolu da uređujete stranice u imenskom prostoru <strong>$1</strong>.",
 	"customcssprotected": "Nemate dozvolu da menjate ovu CSS stranicu jer sadrži lične postavke drugog korisnika.",
 	"customjsprotected": "Nemate dozvolu da menjate ovu stranicu javaskripta jer sadrži lične postavke drugog korisnika.",
 	"mycustomcssprotected": "Nemate dozvolu za menjanje ove CSS stranice.",
@@ -374,7 +374,7 @@
 	"virus-badscanner": "Neispravna postavka: nepoznati skener za viruse: ''$1''",
 	"virus-scanfailed": "neuspešno skeniranje (kod $1)",
 	"virus-unknownscanner": "nepoznati antivirus:",
-	"logouttext": "'''Odjavljeni ste.'''\n\nImajte na umu da neke stranice mogu nastaviti da se prikazuju kao da ste još prijavljeni, sve dok ne očistite privremenu memoriju svog pregledača.",
+	"logouttext": "<strong>Odjavljeni ste.</strong>\n\nImajte na umu da neke stranice mogu nastaviti da se prikazuju kao da ste još prijavljeni, sve dok ne očistite privremenu memoriju svog pregledača.",
 	"welcomeuser": "Dobrodošli, $1!",
 	"welcomecreation-msg": "Vaš nalog je otvoren.\nNe zaboravite da promenite svoja [[Special:Preferences|podešavanja]].",
 	"yourname": "Korisničko ime:",
@@ -502,7 +502,7 @@
 	"resetpass-submit-loggedin": "Promeni lozinku",
 	"resetpass-submit-cancel": "Otkaži",
 	"resetpass-wrong-oldpass": "Neispravna privremena ili tekuća lozinka.\nMožda ste već promenili lozinku ili ste zatražili novu privremenu lozinku.",
-	"resetpass-recycled": "Uneli ste sadašnju lozinku, da bi ste resetovali lozinku morate uneti novu.",
+	"resetpass-recycled": "Uneli ste sadašnju lozinku, da biste resetovali lozinku morate uneti novu.",
 	"resetpass-temp-emailed": "Prijavili ste se sa privremenim kodom iz e-pošte.\nDa biste završili prijavljivanje morate postaviti novu lozinku ovde:",
 	"resetpass-temp-password": "Privremena lozinka:",
 	"resetpass-abort-generic": "Promenu lozinke je sprečio dodatak.",
@@ -511,7 +511,7 @@
 	"resetpass-validity-soft": "Vaša lozinka nije valjana: $1\n\nMolimo izaberite novu ili kliknite „{{int:resetpass-submit-cancel}}“ da resetujete kasnije.",
 	"passwordreset": "Obnavljanje lozinke",
 	"passwordreset-text-one": "Popunite ovaj obrazac da biste dobili privremenu lozinku na e-poštu.",
-	"passwordreset-text-many": "{{PLURAL:$1|Ispunite jedno od polja kako bi ste dobili privremenu lozinku na e-poštu.}}",
+	"passwordreset-text-many": "{{PLURAL:$1|Ispunite jedno od polja kako biste dobili privremenu lozinku na e-poštu.}}",
 	"passwordreset-disabled": "Obnavljanje lozinke je onemogućeno na ovom vikiju.",
 	"passwordreset-emaildisabled": "E-pošta je onemogućena na ovom vikiju.",
 	"passwordreset-username": "Korisničko ime:",
@@ -606,9 +606,9 @@
 	"userjspreview": "'''Ovo je samo pregled javaskripta.'''\n'''Stranica još nije sačuvana!'''",
 	"sitecsspreview": "'''Ovo je samo pregled CSS-a.'''\n'''Stranica još nije sačuvana!'''",
 	"sitejspreview": "'''Ovo je samo pregled javaskripta.'''\n'''Stranica još nije sačuvana!'''",
-	"userinvalidcssjstitle": "'''Upozorenje:''' ne postoji tema „$1“.\nPrilagođene stranice CSS i javaskript počinju malim slovom, npr. {{ns:user}}:Foo/vector.css, a ne {{ns:user}}:Foo/Vector.css.",
+	"userinvalidcssjstitle": "<strong>Upozorenje:</strong> ne postoji tema „$1“.\nPrilagođene stranice CSS i javaskript počinju malim slovom, npr. {{ns:user}}:Foo/vector.css, a ne {{ns:user}}:Foo/Vector.css.",
 	"updated": "(Ažurirano)",
-	"note": "'''Napomena:'''",
+	"note": "<strong>Napomena:</strong>",
 	"previewnote": "<strong>Ovo je pretpregled.</strong>\nVaše izmene još nisu sačuvane!",
 	"continue-editing": "Idi na uređivački okvir",
 	"previewconflict": "Ovaj pregled oslikava kako će tekst u tekstualnom okviru izgledati.",
@@ -757,7 +757,7 @@
 	"revdelete-legend": "Ograničenja vidljivosti",
 	"revdelete-hide-text": "Tekst izmene",
 	"revdelete-hide-image": "Sakrij sadržaj datoteke",
-	"revdelete-hide-name": "Sakrij cilj i parametre",
+	"revdelete-hide-name": "Cilj i parametre",
 	"revdelete-hide-comment": "Opis izmene",
 	"revdelete-hide-user": "Korisničko ime/IP adresa",
 	"revdelete-hide-restricted": "Sakrij podatke od administratora i drugih korisnika",
@@ -910,7 +910,7 @@
 	"rows": "Redova:",
 	"columns": "Kolona",
 	"searchresultshead": "Pretraga",
-	"stub-threshold": "Prag za oblikovanje <a href=\"#\" class=\"stub\">veze kao klice</a>:",
+	"stub-threshold": "Prag za oblikovanje veze kao klice ($1):",
 	"stub-threshold-disabled": "Onemogućeno",
 	"recentchangesdays": "Broj dana u skorašnjim izmenama:",
 	"recentchangesdays-max": "Najviše $1 {{PLURAL:$1|dan|dana}}",
@@ -1021,7 +1021,7 @@
 	"group-autoconfirmed-member": "{{GENDER:$1|automatski potvrđen korisnik|automatski potvrđena korisnica}}",
 	"group-bot-member": "{{GENDER:$1|bot}}",
 	"group-sysop-member": "{{GENDER:$1|administrator|administratorka}}",
-	"group-bureaucrat-member": "{{GENDER:$1|birokrata|birokratkinja}}",
+	"group-bureaucrat-member": "{{GENDER:$1|birokrata}}",
 	"group-suppress-member": "{{GENDER:$1|revizor|revizorka}}",
 	"grouppage-user": "{{ns:project}}:Korisnici",
 	"grouppage-autoconfirmed": "{{ns:project}}:Automatski potvrđeni korisnici",
@@ -1710,8 +1710,8 @@
 	"watchlistanontext": "Morate biti $1 da biste gledali i uređivali stavke na vašem spisku nadgledanja.",
 	"watchnologin": "Niste prijavljeni",
 	"addwatch": "Dodaj na spisak nadgledanja",
-	"addedwatchtext": "Stranica „[[:$1]]“ i njena stranica za razgovor je dodata na vaš [[Special:Watchlist|spisak nadgledanja]].",
-	"addedwatchtext-short": "Stranica „$1“ je dodata na vaš spisak nadgledanja.",
+	"addedwatchtext": "Stranica „[[:$1]]“ i njena stranica za razgovor je dodata na Vaš [[Special:Watchlist|spisak nadgledanja]].",
+	"addedwatchtext-short": "Stranica „$1“ je dodata na Vaš spisak nadgledanja.",
 	"removewatch": "Ukloni sa spiska nadgledanja",
 	"removedwatchtext": "Stranica „[[:$1]]“ i njena stranica za razgovor je uklonjena s vašeg [[Special:Watchlist|spiska nadgledanja]].",
 	"removedwatchtext-short": "Stranica „$1“ je uklonjena s vašeg spiska nadgledanja.",
@@ -1724,7 +1724,7 @@
 	"watchlist-details": "Imate {{PLURAL:$1|$1 stranica|$1 stranice|$1 stranica}} na vašem spisku nadgledanja, ne računajući stranice za razgovor.",
 	"wlheader-enotif": "Obaveštenje e-porukom je omogućeno.",
 	"wlheader-showupdated": "Stranice koje su izmenjene otkad ste ih poslednji put posetili su '''podebljane'''.",
-	"wlnote": "Ispod {{PLURAL:$1|je poslednja izmena|su poslednje '''$1''' izmene|je poslednjih '''$1''' izmena}} u {{PLURAL:$2|prethodnom satu|prethodna '''$2''' sata|prethodnih '''$2''' sati}}, zaključno sa $3, $4.",
+	"wlnote": "Ispod {{PLURAL:$1|je poslednja izmena|su poslednje <strong>$1</strong> izmene|je poslednjih <strong>$1</strong> izmena}} u {{PLURAL:$2|prethodnom satu|prethodna <strong>$2</strong> sata|prethodnih <strong>$2</strong> sati}}, zaključno sa $3, $4.",
 	"wlshowlast": "Prikaži poslednjih $1 sati, $2 dana",
 	"watchlist-options": "Postavke spiska nadgledanja",
 	"watching": "Nadgledanje…",
@@ -1737,11 +1737,11 @@
 	"enotif_subject_moved": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|premestio je|premestila je}} $2",
 	"enotif_subject_restored": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|vratio je|vratila je}} $2",
 	"enotif_subject_changed": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|promenio je|promenila je}} $2",
-	"enotif_body_intro_deleted": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|obrisao je|obrisala je}} $2 dana $PAGEEDITDATE. Pogledajte $3.",
-	"enotif_body_intro_created": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|napravio je|napravila je|napravio je}} $2 dana $PAGEEDITDATE. Trenutna izmena nalazi se na $3.",
-	"enotif_body_intro_moved": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|premestio je|premestila je}} $2 dana $PAGEEDITDATE. Trenutna izmena nalazi se na  $3.",
-	"enotif_body_intro_restored": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|vratio je|vratila je|vratio je}} $2 dana $PAGEEDITDATE. Trenutna izmena nalazi se na $3.",
-	"enotif_body_intro_changed": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|promenio je|promenila je|promenio je}} $2 dana $PAGEEDITDATE. Trenutna izmena nalazi se na $3.",
+	"enotif_body_intro_deleted": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|obrisao|obrisala}} je $2 dana $PAGEEDITDATE Pogledajte $3.",
+	"enotif_body_intro_created": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|napravio|napravila}} je $2 dana $PAGEEDITDATE Trenutna izmena nalazi se na $3.",
+	"enotif_body_intro_moved": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|premestio|premestila}} je $2 dana $PAGEEDITDATE Trenutna izmena nalazi se na  $3.",
+	"enotif_body_intro_restored": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|vratio|vratila}} je $2 dana $PAGEEDITDATE Trenutna izmena nalazi se na $3.",
+	"enotif_body_intro_changed": "Stranicu $1 na {{SITENAME}} {{GENDER:$2|promenio|promenila}} je $2 dana $PAGEEDITDATE Trenutna izmena nalazi se na $3.",
 	"enotif_lastvisited": "Pogledajte $1 za sve izmene od vaše poslednje posete.",
 	"enotif_lastdiff": "Pogledajte $1 da vidite ovu izmenu.",
 	"enotif_anon_editor": "anoniman korisnik $1",
@@ -1824,7 +1824,7 @@
 	"protect-locked-dblock": "Stepeni zaštite se ne mogu menjati jer je aktivna baza podataka zaključana.\nOvo su postavke stranice '''$1''':",
 	"protect-locked-access": "Nemate ovlašćenja za menjanje stepena zaštite stranice.\nOvo su trenutne postavke stranice '''$1''':",
 	"protect-cascadeon": "Ova stranica je trenutno zaštićena jer se nalazi na {{PLURAL:$1|stranici koja ima|stranicama koje imaju}} prenosivu zaštitu.\nMožete da promenite stepen zaštite, ali to neće uticati na prenosivu zaštitu.",
-	"protect-default": "Dopušteno svim korisnicima",
+	"protect-default": "Dopušteno svima",
 	"protect-fallback": "Dozvoljeno samo korisnicima sa dozvolom „$1“",
 	"protect-level-autoconfirmed": "Dopušteno samo automatski potvrđenim korisnicima",
 	"protect-level-sysop": "Dopušteno samo administratorima",
@@ -1874,9 +1874,9 @@
 	"undeleteviewlink": "pogledaj",
 	"undeleteinvert": "Obrni izbor",
 	"undeletecomment": "Razlog:",
-	"undeletedrevisions": "{{PLURAL:$1|Izmena je vraćena|$1 izmene su vraćene|$1 izmena je vraćeno}}",
+	"undeletedrevisions": "{{PLURAL:$1|izmena vraćeno}} $1",
 	"undeletedrevisions-files": "$1 {{PLURAL:$1|izmena|izmene|izmena}} i $2 {{PLURAL:$2|datoteka je vraćena|datoteke su vraćene|datoteka je vraćeno}}",
-	"undeletedfiles": "{{PLURAL:$1|Datoteka je vraćena|$1 datoteke su vraćene|$1 datoteka je vraćeno}}",
+	"undeletedfiles": "{{PLURAL:$1|datoteka vraćeno}} $1",
 	"cannotundelete": "Vraćanje nije uspelo:\n$1",
 	"undeletedpage": "<strong>Stranica $1 je vraćena</strong>\n\nPogledajte [[Special:Log/delete|dnevnik brisanja]] za zapise o skorašnjim brisanjima i vraćanjima.",
 	"undelete-header": "Pogledajte [[Special:Log/delete|istorijat brisanja]] za nedavno obrisane stranice.",
@@ -1913,7 +1913,7 @@
 	"sp-contributions-newbies-sub": "Za nove korisnike",
 	"sp-contributions-newbies-title": "Doprinosi novih korisnika",
 	"sp-contributions-blocklog": "dnevnik blokiranja",
-	"sp-contributions-deleted": "obrisani korisnički doprinosi",
+	"sp-contributions-deleted": "obrisani doprinosi",
 	"sp-contributions-uploads": "otpremanja",
 	"sp-contributions-logs": "dnevnici",
 	"sp-contributions-talk": "razgovor",
@@ -1961,7 +1961,7 @@
 	"ipboptions": "2 sata:2 hours,1 dan:1 day,3 dana:3 days,1 nedelja:1 week,2 nedelje:2 weeks,1 mesec:1 month,3 meseca:3 months,6 meseci:6 months,1 godina:1 year,trajno:infinite",
 	"ipbhidename": "Sakrij korisničko ime sa izmena i spiskova",
 	"ipbwatchuser": "Nadgledaj korisničke stranice i stranice za razgovor ovog korisnika",
-	"ipb-disableusertalk": "Zabrani ovom korisniku da uređuje svoju stranicu za razgovor dok je blokiran",
+	"ipb-disableusertalk": "Onemogući korisniku da uređuje svoju stranicu za razgovor",
 	"ipb-change-block": "Ponovo blokiraj korisnika s ovim postavkama",
 	"ipb-confirm": "Potvrdi blokiranje",
 	"badipaddress": "Neispravna IP adresa",
@@ -1996,7 +1996,7 @@
 	"blocklist-reason": "Razlog",
 	"ipblocklist-submit": "Pretraži",
 	"ipblocklist-localblock": "Lokalno blokiranje",
-	"ipblocklist-otherblocks": "{{PLURAL:$1|Drugo blokiranje|Druga blokiranja}}",
+	"ipblocklist-otherblocks": "{{PLURAL:$1|Druga blokiranja}}",
 	"infiniteblock": "trajno",
 	"expiringblock": "ističe $1 u $2",
 	"anononlyblock": "samo anonimni",
@@ -2032,7 +2032,7 @@
 	"ipb_hide_invalid": "Ne mogu da potisnem ovaj nalog; ima više od {{PLURAL:$1|jedne izmene|$1 izmena}}.",
 	"ipb_already_blocked": "„$1“ je već blokiran.",
 	"ipb-needreblock": "$1 je već blokiran. Želite li da promenite podešavanja?",
-	"ipb-otherblocks-header": "{{PLURAL:$1|Druga blokada|Druge blokade}}",
+	"ipb-otherblocks-header": "{{PLURAL:$1|Druge blokade}}",
 	"unblock-hideuser": "Ne možete deblokirati ovog korisnika jer je njegovo korisničko ime sakriveno.",
 	"ipb_cant_unblock": "Greška: blokada $1 ne postoji. Možda je korisnik deblokiran.",
 	"ipb_blocked_as_range": "Greška: IP adresa $1 nije direktno blokirana i ne može da se deblokira.\nOna je blokirana kao deo blokade $2, koja može biti deblokirana.",
@@ -2115,7 +2115,7 @@
 	"imagetypemismatch": "Ekstenzija nove datoteke se ne poklapa s njenom vrstom",
 	"imageinvalidfilename": "Ciljani naziv datoteke je neispravan",
 	"fix-double-redirects": "Ažurirajte sva preusmerenja koja vode do prvobitnog naslova",
-	"move-leave-redirect": "Napravi preusmerenje",
+	"move-leave-redirect": "Ostavi preusmerenje",
 	"protectedpagemovewarning": "'''Upozorenje:''' ova stranica je zaštićena, tako da samo korisnici s administratorskim ovlašćenjima mogu da je premeste.\nZa više informacija, poslednji zapis u dnevniku izmena je prikazan ispod:",
 	"semiprotectedpagemovewarning": "'''Napomena:''' ova stranica je zaštićena, tako da samo registrovani korisnici mogu da je premeste.\nZa više informacija, poslednji zapis u dnevniku izmena je prikazan ispod:",
 	"move-over-sharedrepo": "== Datoteka postoji ==\n[[:$1]] se nalazi na deljenom skladištu. Ako premestite datoteku na ovaj naslov, to će zameniti deljenu datoteku.",
@@ -2365,7 +2365,7 @@
 	"markedaspatrollederrortext": "Morate izabrati izmenu da biste je označili kao patroliranu.",
 	"markedaspatrollederror-noautopatrol": "Ne možete da označite svoje izmene kao patrolirane.",
 	"markedaspatrollednotify": "Ova izmena na stranici „$1“ je označena kao patrolirana.",
-	"markedaspatrollederrornotify": "Označavanje ove stranice patroliranom nije uspelo.",
+	"markedaspatrollederrornotify": "Označavanje ove izmene patroliranom nije uspelo.",
 	"patrol-log-page": "Dnevnik patroliranja",
 	"patrol-log-header": "Ovo je dnevnik patroliranih izmena.",
 	"log-show-hide-patrol": "$1 dnevnik patroliranja",
@@ -2378,7 +2378,7 @@
 	"filedelete-archive-read-only": "Server ne može da piše po skladišnoj fascikli ($1).",
 	"previousdiff": "← Starija izmena",
 	"nextdiff": "Novija izmena →",
-	"mediawarning": "'''Upozorenje''': ova vrsta datoteke može sadržati štetan kod.\nAko ga pokrenete, vaš računar može biti ugrožen.",
+	"mediawarning": "<strong>Upozorenje:</strong> ova vrsta datoteke može sadržati štetan kod.\nAko ga pokrenete, Vaš računar može biti ugrožen.",
 	"imagemaxsize": "Ograničenje veličine slike:<br />''(na stranicama za opis datoteka)''",
 	"thumbsize": "Veličina minijature:",
 	"widthheight": "$1 × $2",
diff --git a/languages/i18n/sv.json b/languages/i18n/sv.json
index 8d32a882ef..9fc552e966 100644
--- a/languages/i18n/sv.json
+++ b/languages/i18n/sv.json
@@ -977,7 +977,8 @@
 	"rows": "Rader:",
 	"columns": "Kolumner:",
 	"searchresultshead": "Sökning",
-	"stub-threshold": "Gräns för <a href=\"#\" class=\"stub\">stubblänk</a>-formatering (byte):",
+	"stub-threshold": "Gräns för formatering av stubblänk ($1):",
+	"stub-threshold-sample-link": "exempel",
 	"stub-threshold-disabled": "Avaktiverat",
 	"recentchangesdays": "Antal dygn som skall visas i \"senaste ändringarna\":",
 	"recentchangesdays-max": "Maximalt $1 {{PLURAL:$1|dygn}}",
@@ -1695,7 +1696,7 @@
 	"booksources-text": "Nedan följer en lista över länkar till webbplatser som säljer nya och begagnade böcker, och som kanske har ytterligare information om de böcker du söker.",
 	"booksources-invalid-isbn": "Det angivna ISBN-numret verkar inte vara giltigt. Kontrollera källan för eventuella fel.",
 	"specialloguserlabel": "Utförare:",
-	"speciallogtitlelabel": "Mål (titel eller användare):",
+	"speciallogtitlelabel": "Mål (titel eller {{ns:user}}:användarnamn för användare):",
 	"log": "Loggar",
 	"all-logs-page": "Alla publika loggar",
 	"alllogstext": "Kombinerad visning av alla tillgängliga loggar för {{SITENAME}}.\nDu kan avgränsa sökningen och få färre träffar genom att ange typ av logg, användarnamn (skiftlägeskänsligt), eller berörd sida (också skiftlägeskänsligt).",
@@ -2373,7 +2374,7 @@
 	"tooltip-ca-nstab-main": "Visa innehållssidan",
 	"tooltip-ca-nstab-user": "Visa användarsidan",
 	"tooltip-ca-nstab-media": "Visa mediesidan",
-	"tooltip-ca-nstab-special": "Detta är en specialsida; du kan inte redigera själva sidan",
+	"tooltip-ca-nstab-special": "Detta är en specialsida och kan inte redigeras",
 	"tooltip-ca-nstab-project": "Visa projektsidan",
 	"tooltip-ca-nstab-image": "Visa filsidan",
 	"tooltip-ca-nstab-mediawiki": "Visa systemmeddelandet",
diff --git a/languages/i18n/th.json b/languages/i18n/th.json
index f0b2d410ec..5d91ea2bef 100644
--- a/languages/i18n/th.json
+++ b/languages/i18n/th.json
@@ -428,6 +428,7 @@
 	"createacct-benefit-body2": "$1 หน้า",
 	"createacct-benefit-body3": "$1 ผู้ร่วมเขียนล่าสุด",
 	"badretype": "รหัสผ่านที่คุณกรอกไม่ตรง",
+	"usernameinprogress": "การสร้างบัญชีสำหรับชื่อผู้ใช้นี้อยู่ระหว่างดำเนินการแล้ว\nโปรดรอสักครู่",
 	"userexists": "ชื่อผู้ใช้ที่กรอกมีผู้ใช้แล้ว \nกรุณาเลือกชื่ออื่น",
 	"loginerror": "ล็อกอินผิดพลาด",
 	"createacct-error": "การสร้างบัญชีผิดพลาด",
@@ -720,6 +721,7 @@
 	"history-feed-description": "ประวัติรุ่นปรับปรุงของหน้านี้ในวิกิ",
 	"history-feed-item-nocomment": "$1 เมื่อ $2",
 	"history-feed-empty": "ไม่มีหน้าที่ต้องการ \nซึ่งอาจถูกลบหรือเปลี่ยนชื่อแล้ว \nลอง[[Special:Search|ค้นวิกินี้]]หาหน้าใหม่ที่เกี่ยวข้อง",
+	"history-edit-tags": "ป้ายระบุการแก้ไขของรุ่นแก้ไขที่เลือก",
 	"rev-deleted-comment": "(คำอธิบายอย่างย่อถูกลบออก)",
 	"rev-deleted-user": "(ชื่อผู้ใช้ถูกลบออก)",
 	"rev-deleted-event": "(รายละเอียดปูมถูกลบ)",
@@ -908,7 +910,8 @@
 	"rows": "แถว:",
 	"columns": "คอลัมน์:",
 	"searchresultshead": "ค้นหา",
-	"stub-threshold": "ขีดแบ่งสำหรับการจัดรูปแบบ <a href=\"#\" class=\"stub\">ลิงก์โครง</a> (ไบต์):",
+	"stub-threshold": "ขีดแบ่งสำหรับการจัดรูปแบบลิงก์โครง ($1):",
+	"stub-threshold-sample-link": "ตัวอย่าง",
 	"stub-threshold-disabled": "ปิดใช้งาน",
 	"recentchangesdays": "จำนวนวันที่แสดงในปรับปรุงล่าสุด:",
 	"recentchangesdays-max": "มากสุด $1 วัน",
@@ -1295,6 +1298,18 @@
 	"upload-http-error": "เกิดข้อผิดพลาดเอชทีทีพี: $1",
 	"upload-copy-upload-invalid-domain": "ไม่สามารถคัดลอกการอัปโหลดจากโดเมนนี้",
 	"upload-dialog-title": "อัปโหลดไฟล์",
+	"upload-dialog-error": "เกิดข้อผิดพลาด",
+	"upload-dialog-warning": "เกิดคำเตือน",
+	"upload-dialog-button-cancel": "ยกเลิก",
+	"upload-dialog-button-done": "เสร็จสิ้น",
+	"upload-dialog-button-save": "บันทึก",
+	"upload-dialog-button-upload": "อัปโหลด",
+	"upload-dialog-label-select-file": "เลือกไฟล์",
+	"upload-dialog-label-infoform-title": "รายละเอียด",
+	"upload-dialog-label-infoform-name": "ชื่อ",
+	"upload-dialog-label-infoform-description": "คำอธิบาย",
+	"upload-dialog-label-usage-title": "การใช้",
+	"upload-dialog-label-usage-filename": "ชื่อไฟล์",
 	"backend-fail-backup": "ไม่สามารถสำรองไฟล์ \"$1\"",
 	"backend-fail-notexists": "ไม่มีไฟล์ $1",
 	"backend-fail-delete": "ไม่สามารถลบไฟล์ \"$1\"",
@@ -1562,7 +1577,7 @@
 	"booksources-text": "ด้านล่างเป็นรายการการเชื่อมโยงไปยังเว็บไซต์อื่นที่ขายหนังสือใหม่และหนังสือใช้แล้ว และอาจมีสารสนเทศเพิ่มเติมเกี่ยวกับหนังสือที่คุณกำลังมองหา:",
 	"booksources-invalid-isbn": "รหัส ISBN ที่ให้ไว้ไม่ถูกต้อง กรุณาตรวจสอบจากต้นฉบับอีกครั้ง",
 	"specialloguserlabel": "ผู้ดำเนินการ:",
-	"speciallogtitlelabel": "เป้าหมาย (ชื่อเรื่องหรือผู้ใช้):",
+	"speciallogtitlelabel": "เป้าหมาย (ชื่อเรื่องหรือ {{ns:user}}:ชื่อผู้ใช้ สำหรับผู้ใช้):",
 	"log": "ปูม",
 	"all-logs-page": "ปูมสาธารณะทั้งหมด",
 	"alllogstext": "การแสดงผลรวมปูมที่มีทั้งหมดของ {{SITENAME}}\nคุณสามารถค้นหาให้ละเอียดขึ้นโดยเลือกประเภทปูม ชื่อผู้ใช้หรือหน้าที่ต้องการ (ไวต่ออักษรใหญ่เล็ก)",
@@ -2202,7 +2217,7 @@
 	"tooltip-ca-nstab-main": "ดูหน้าเนื้อหา",
 	"tooltip-ca-nstab-user": "ดูหน้าผู้ใช้",
 	"tooltip-ca-nstab-media": "ดูหน้าสื่อ ภาพ เพลง",
-	"tooltip-ca-nstab-special": "หน้านี้เป็นหน้าพิเศษ คุณไม่สามารถแก้ไขได้",
+	"tooltip-ca-nstab-special": "หน้านี้เป็นหน้าพิเศษ ไม่สามารถแก้ไขได้",
 	"tooltip-ca-nstab-project": "ดูหน้าโครงการ",
 	"tooltip-ca-nstab-image": "ดูหน้าภาพไฟล์",
 	"tooltip-ca-nstab-mediawiki": "ดูข้อความระบบ",
diff --git a/languages/i18n/tr.json b/languages/i18n/tr.json
index 4406660f5d..b52f41a46e 100644
--- a/languages/i18n/tr.json
+++ b/languages/i18n/tr.json
@@ -2373,7 +2373,7 @@
 	"tooltip-ca-nstab-main": "İçerik sayfasını göster",
 	"tooltip-ca-nstab-user": "Kullanıcı sayfasını göster",
 	"tooltip-ca-nstab-media": "Medya sayfasını göster",
-	"tooltip-ca-nstab-special": "Bu özel sayfa olduğu için üzerinde değişiklik yapamazsınız.",
+	"tooltip-ca-nstab-special": "Bu bir özel sayfadır ve düzenleme yapılamaz",
 	"tooltip-ca-nstab-project": "Proje sayfasını göster",
 	"tooltip-ca-nstab-image": "Dosya sayfasını göster",
 	"tooltip-ca-nstab-mediawiki": "Sistem mesajını göster",
@@ -2413,7 +2413,7 @@
 	"spam_reverting": "$1 ile bağlantı içermeyen son sürüme geri dönülüyor",
 	"spam_blanking": "Tüm revizyonlar $1 sayfasına bağlantı içeriyor, boşaltılıyor",
 	"spam_deleting": "Tüm revizyonlar $1 sayfasına bağlantı içeriyor, siliniyor",
-	"simpleantispam-label": "Anti-spam denetimi.\nBunu '''doldurMAyın'''!",
+	"simpleantispam-label": "Anti-spam denetimi.\nBunu <strong>doldurmayın</strong>!",
 	"pageinfo-title": "Bilgi için \"$1\"",
 	"pageinfo-not-current": "Üzgünüz, eski sürümler için bu bilgileri sağlamamız mümkün değildir.",
 	"pageinfo-header-basic": "Temel bilgiler",
diff --git a/languages/i18n/uk.json b/languages/i18n/uk.json
index 348ff17812..8c86f8f713 100644
--- a/languages/i18n/uk.json
+++ b/languages/i18n/uk.json
@@ -1287,7 +1287,7 @@
 	"reuploaddesc": "Повернутися до форми завантаження",
 	"upload-tryagain": "Зберегти змінений опис файлу",
 	"uploadnologin": "Ви не ввійшли в систему",
-	"uploadnologintext": "Ви повинні $1, щоб завантажувати файли.",
+	"uploadnologintext": "Будь ласка, $1, щоб завантажувати файли.",
 	"upload_directory_missing": "Директорія для завантажень ($1) відсутня і не може бути створена веб-сервером.",
 	"upload_directory_read_only": "Веб-сервер не має прав запису в папку ($1), в якій планується зберігати завантажувані файли.",
 	"uploaderror": "Помилка завантаження файлу",
diff --git a/languages/i18n/ur.json b/languages/i18n/ur.json
index 17cfc1a79d..c2ef7acf75 100644
--- a/languages/i18n/ur.json
+++ b/languages/i18n/ur.json
@@ -350,8 +350,8 @@
 	"actionthrottled": "Action throttled",
 	"actionthrottledtext": "بطورِ ایک ضدسپم تدبیر، آپ کو مختصر وقت میں کئی بار یہ عمل بجا لانے سے محدود کیا گیا، اور آپ یہ حد پار کرچکے ہیں.\nبراہِ کرم، کچھ منٹ بعد کوشش کیجئے.",
 	"protectedpagetext": "اس صفحہ کو تدوین سے محفوظ رکھنے کیلیے مقفل کر دیا گیا ہے۔",
-	"viewsourcetext": "آپ صرف مسودہ دیکھ سکتے ہیں اور اسکی نقل اتار سکتے ہیں:",
-	"viewyourtext": "آپ اس مواد کو دیکھ سکتے ہیں اور اٹھا (کاپی) سکتے ہیں <strong>آپ کی ترامیم </strong>اس صفحہ پر:",
+	"viewsourcetext": "آپ صرف مسودہ دیکھ سکتے ہیں اور اسکی نقل اتار سکتے ہیں۔",
+	"viewyourtext": "آپ اس مواد کو دیکھ سکتے ہیں اور اٹھا (کاپی) سکتے ہیں <strong>آپ کی ترامیم</strong> اس صفحہ پر۔",
 	"protectedinterface": "یہ صفحہ سوفٹ وئیر کے لیے انٹرفیس متن فراہم کرتا ہے، اور ناجائزاستعمال کے سدِباب کے لیے اِسے مقفل کیا گیا ہے.",
 	"editinginterface": "'''انتباہ: ''' آپ ایک ایسا صفحہ تدوین کر رہے ہیں جو سوفٹ ویئر کیلئے انٹرفیس متن فراہم کرتا ہے۔ اس صفحہ میں کی جانے والی ترمیم، دیگر صارفین کے لیے انٹرفیس کو تبدیل کردے گی۔\nبراہِ کرم، ترجمہ کے لیے [//translatewiki.net/wiki/Main_Page?setlang=en '''ٹرانسلیٹ ویکی.نیٹ'''] (میڈیا ویکی دارالترجمہ) استعمال کریں.",
 	"translateinterface": "تمام ویکیوں میں تبدیلی یا شامل کرنے کے لیے، اسے استعمال کریں [//translatewiki.net/ translatewiki.net]، میڈیا ویکی دارالترجمہ.",
@@ -366,7 +366,7 @@
 	"virus-badscanner": "خراب وضعیت: انجان وائرسی مفراس: ''$1''",
 	"virus-scanfailed": "تفریس ناکام (رمز $1)",
 	"virus-unknownscanner": "انجان ضدوائرس:",
-	"logouttext": "'''اب آپ خارج ہوچکے ہیں'''\n\nآپ گمنام طور پر {{SITENAME}}  کا استعمال جاری رکھ سکتے ہیں، یا دوبارہ اسی نام یا مختلف نام سے <span class='plainlinks'>[$1 دوبارہ داخلِ نوشتہ]</span> بھی ہو سکتے ہیں۔  یہ یاد آوری کرلیجیۓ کہ کچھ صفحات ایسے نظر آتے رہیں گے کہ جیسے ابھی آپ خارج نہیں ہوئے ، جب تک آپ اپنے متصفح کا ابطن صاف نہ کردیں۔",
+	"logouttext": "<strong>اب آپ خارج ہوچکے ہیں۔</strong>\n\nیاد رکھیں! کچھ صفحات ایسے نظر آتے رہیں گے کہ جیسے ابھی آپ خارج نہیں ہوئے، جب تک آپ اپنے کیشے صاف نہیں کرتے۔",
 	"welcomeuser": "خوش آمدید، $1!",
 	"yourname": "اسمِ رکنیت",
 	"userlogin-yourname": "صارف نام",
@@ -437,19 +437,19 @@
 	"passwordtooshort": "آپکا منتخب کردہ پارلفظ مختصر ہے. پارلفظ کم از کم {{PLURAL:$1|1 محرف|$1 محارف}} ہونا چاہئے.",
 	"password-name-match": "آپکا پارلفظ آپکے اسمِ صارف سے مختلف ہونا چاہئے.",
 	"password-login-forbidden": "اس صارف نام یا کلمۂ شناخت (پاسورڈ) کا استعمال ممنوع ہے",
-	"mailmypassword": "نیا پارلفظ برقی ڈاک میں بھیجو",
+	"mailmypassword": "پاسورڈ تبدیل کریں",
 	"passwordremindertitle": "نیا عارضی کلمۂ شناخت برائے {{SITENAME}}",
 	"passwordremindertext": "(IP پتہ $1 سے) کسی (یا شاید آپ) نے {{SITENAME}} ($4)\nکیلئے نئی کلمۂ شناخت کیلئے التماس کیا. ایک عارضی کلمۂ شناخت \"$3\"\nبرائے صارف \"$2\" تخلیق کیا گیا ہے. اگر یہ آپ کا ارادہ تھا، تو آپ\nکو چاہئے کہ داخلِ نوشتہ ہونے کے بعد نئے کلمۂ شناخت کا انتخاب کریں.\nآپ کا کلمۂ شناخت {{PLURAL:$5|ایک دِن|$5 دِن}} کے بعد ناکارہ ہوجائے گا.\n\nاگر کسی اَور نے یہ التماس کیا ہے، یا آپ کو اپنا کلمۂ شناخت یاد آگیا ہے،\nاور آپ اسے تبدیل نہیں کرنا چاہتے، تو آپ یہ پیغام نظر انداز کرسکتے ہیں اور\nآپنا پُرانا کلمۂ شناخت کا استعمال جاری رکھ سکتے ہیں.",
 	"noemail": "صارف \"$1\" کیلئے کوئی برقی پتہ درج نہیں کیا گیا.",
 	"noemailcreate": "صحیح برقی پتہ مہیّا کریں",
 	"passwordsent": "ایک نیا کلمۂ شناخت \"$1\" کے نام سے بننے والی برقی ڈاک کے پتے کیلیے بھیج دیا گیا ہے۔\nجب وہ موصول ہو جاۓ تو براہ کرم اسکے ذریعے دوبارہ داخل ہوں۔",
 	"blocked-mailpassword": "آپ کا آئی.پی پتہ تدوین سے روک لیا گیا ہے، سو، ناجائز استعمال کو روکنے کیلئے، آپ کے آئی.پی پتہ کو کلمۂ شناخت کی بحالی کا فعل استعمال کرنے کی اِجازت نہیں ہے.",
-	"eauthentsent": "ایک تصدیقی برقی خط نامزد کئے گئے برقی پتہ پر ارسال کردیا گیا ہے.\nآپ کو موصول ہوئے برقی خط میں ہدایات پر عمل کرکے اس بات کی توثیق کرلیں کہ مذکورہ برقی پتہ آپ کا ہی ہے.",
-	"throttled-mailpassword": "گزشتہ {{PLURAL:$1|گھنٹے|$1 گھنٹوں}} کے دوران پہلے سے ہی پارلفظ کی ایک یادآوری بھیجی جاچکی ہے.\nناجائز استعمال کے سدّباب کیلئے، {{PLURAL:$1|گھنٹہ|$1 گھنٹوں}} کے دوران صرف ایک پارلفظی یادآواری بھیجی جاسکتی ہے.",
+	"eauthentsent": "ایک تصدیقی برقی خط نامزد کیے گئے برقی پتہ پر ارسال کردیا گیا ہے۔\nآپ کو موصول ہوئے برقی خط میں ہدایات پر عمل کرکے اس بات کی توثیق کرلیں کہ مذکورہ برقی پتہ آپ کا ہی ہے۔",
+	"throttled-mailpassword": "گزشتہ {{PLURAL:$1|گھنٹے|$1 گھنٹوں}} کے دوران پہلے سے ہی پارلفظ (پاسورڈ) کی تبدیلی کے لیے برقی خط بھیجا گيا ہے۔\nناجائز استعمال کے سدّباب کیلئے، {{PLURAL:$1|گھنٹہ|$1 گھنٹوں}} کے دوران صرف ایک برقی خط بھیجا جاسکتا ہے۔",
 	"mailerror": "مسلہ دوران ترسیل خط:$1",
 	"acct_creation_throttle_hit": "آپکی آئی.پی کے ذریعے اِس ویکی پر آنے والے صارفین نے پچھلے ایک دِن میں {{PLURAL:$1|1 کھاتہ بنایا ہے|$1 کھاتے بنائے ہیں}}، جو کہ مذکورہ وقت میں کافی ہیں.\nلہٰذا، آپکی آئی.پی استعمال کرنے والے صارفین اِس وقت مزید کھاتے نہیں بناسکتے.",
-	"emailauthenticated": "آپکے برقی ڈاک پتہ کی تصدیق تاریخ $2 بوقت $3 بجے کو ہوئی.",
-	"emailnotauthenticated": "آپ کے برقی پتہ کی ابھی تصدیق نہیں ہوئی ہے.\nدرج ذیل میں سے کسی بھی چیز کیلئے آپکے برقی پتہ پر برقی ڈاک ارسال نہیں کیا جائے گا.",
+	"emailauthenticated": "آپکے برقی ڈاک پتہ کی تصدیق تاریخ $2 بوقت $3 بجے کو ہوئی۔",
+	"emailnotauthenticated": "آپ کے برقی پتہ کی ابھی تصدیق نہیں ہوئی ہے۔\nدرج ذیل میں سے کسی بھی چیز کیلئے آپ کے برقی پتہ پر برقی ڈاک ارسال نہیں کی جائے گی۔",
 	"noemailprefs": "اِن خصائص کو کام میں لانے کیلئے اپنے ترجیحات میں برقی ڈاک کا پتہ متعین کیجئے.",
 	"emailconfirmlink": "اپنے برقی پتہ کی تصدیق کیجئے",
 	"invalidemailaddress": "برقی پتہ قبول نہیں کیا جاسکتا کیونکہ یہ غلط شکل میں ہے.\nبراہِ کرم! ایک برقی پتہ صحیح شکل میں درج کیجئے یا جگہ کو خالی چھوڑ دیجئے.",
@@ -467,13 +467,13 @@
 	"user-mail-no-addy": "برقی ڈاک بھیجنے کی کوشش بغیر برقی ڈاک پتہ",
 	"user-mail-no-body": "خالی یا بہت ہی مختصر برقی خط بھیجنے کی کوشش",
 	"changepassword": "کلمۂ شناخت تبدیل کریں",
-	"resetpass_announce": "آپ ایک برقی ارسال کردہ عارضی رمز کے ساتھ داخل ہوئے ہیں.\nداخلِ نوشتہ کے عمل کو مکمل کرنے کیلئے آپ کو یہاں نیا پارلفظ متعین کرنا ہوگا:",
+	"resetpass_announce": "آپ ایک برقی ارسال کردہ عارضی رمز (کوڈ) کے ساتھ داخل ہوئے ہیں۔\nداخلِ نوشتہ کے عمل کو مکمل کرنے کیلئے آپ کو یہاں نیا پارلفظ (پاسورڈ) متعین کرنا ہوگا۔",
 	"resetpass_header": "کھاتہ کا پارلفظ تبدیل کریں",
 	"oldpassword": "پرانا کلمۂ شناخت:",
 	"newpassword": "نیا کلمۂ شناخت",
 	"retypenew": "نیا کلمۂ شناخت دوبارہ درج کریں:",
 	"resetpass_submit": "پارلفظ بناؤ اور داخل ہوجاؤ",
-	"changepassword-success": "آپ کا پارلفظ کامیابی سے تبدیل ہوگیا!\nاَب داخلِ نوشتہ کیا جارہا ہے...",
+	"changepassword-success": "آپ کا پارلفظ کامیابی سے تبدیل ہوگیا!",
 	"resetpass_forbidden": "پارلفظ تبدیل نہیں ہوسکتا",
 	"resetpass-no-info": "اِس صفحہ تک براہِ راست رسائی کیلئے آپ کو داخلِ نوشتہ ہونا پڑے گا.",
 	"resetpass-submit-loggedin": "پارلفظ کی تبدیلی",
@@ -514,10 +514,10 @@
 	"preview": "نمائش",
 	"showpreview": "نمائش",
 	"showdiff": "تبدیلیاں دکھاؤ",
-	"anoneditwarning": "آپ {{SITENAME}} میں داخل نہیں ہوۓ لہذا آپکا IP پتہ اس صفحہ کے تاریخچہ ء ترمیم میں محفوظ ہوجاۓ گا۔",
+	"anoneditwarning": "آپ {{SITENAME}} میں داخل نہیں ہوئے لہذا آپکا IP پتہ اس صفحہ کے تاریخچۂ  ترمیم میں محفوظ ہوجائے گا۔",
 	"missingsummary": "'''انتباہ:''' آپ نے ترمیمی خلاصہ مہیّا نہیں کیا.\nاگر آپ نے محفوظ کا بٹن دوبارہ دبایا تو آپ کی ترمیم بغیر کسی خلاصہ کے محفوظ ہوجائے گی.",
 	"missingcommenttext": "براہِ کرم! تبصرہ نیچے درج کیجئے.",
-	"missingcommentheader": "'''انتباہ:''' آپ نے اِس تبصرہ کیلئے عنوان یا شہ سرخی مہیّا نہیں کی.\nاگر آپ نے محفوظ کا بٹن دوبارہ دبایا تو آپ کا تبصرہ بغیر کسی عنوان کے محفوظ ہوجائے گا.",
+	"missingcommentheader": "<strong>انتباہ:</strong>  آپ نے اِس تبصرہ کیلئے عنوان یا شہ سرخی مہیّا نہیں کی۔\nاگر آپ نے محفوظ کا بٹن دوبارہ دبایا تو آپ کا تبصرہ بغیر کسی عنوان کے محفوظ ہوجائے گا۔",
 	"summary-preview": "نمائش خلاصہ:",
 	"subject-preview": "عنوان/شہ سرخی کا پیش منظر:",
 	"blockedtitle": "صارف مسدود ہے",
@@ -1008,7 +1008,6 @@
 	"mailnologintext": "دیگر ارکان کو برقی خط ارسال کرنے کیلیۓ لازم ہے کہ آپ [[Special:UserLogin|داخل شدہ]] حالت میں ہوں اور آپ کی [[Special:Preferences|ترجیحات]] ایک درست برقی خط کا پتا درج ہو۔",
 	"emailuser": "صارف کو برقی خط لکھیں",
 	"emailuser-title-notarget": "ای میل صارف",
-	"emailpage": "صارف کو برقی خط لکھیں",
 	"defemailsubject": "{{SITENAME}} سے برقی خط",
 	"noemailtext": "اس صارف نے برقی خط کے لیے پتہ فراہم نہیں کیا، یا یہ چاہتا ہے کا اس سے کوئی صارف رابطہ نہ کرے۔",
 	"emailusername": "صارف نام:",
diff --git a/languages/i18n/uz.json b/languages/i18n/uz.json
index ad3028e220..c295163873 100644
--- a/languages/i18n/uz.json
+++ b/languages/i18n/uz.json
@@ -19,7 +19,7 @@
 	"tog-hidepatrolled": "Yangi oʻzgarishlar roʻyxatida tekshirilgan tahrirlarni yashirish",
 	"tog-newpageshidepatrolled": "Yangi sahifalar roʻyxatidan tekshirilgan sahifalarni yashirish",
 	"tog-extendwatchlist": "Kengaytirilgan kuzatuv roʻyxati: faqat oxirgi paytdagi emas, barcha oʻzgarishlar koʻrsatiladi",
-	"tog-usenewrc": "Yangi oʻzgarishlar va kuzatuv roʻyxatidagi sahifalarni guruhlarga boʻlish (JavaScript orqali)",
+	"tog-usenewrc": "Yangi oʻzgarishlar va kuzatuv roʻyxatidagi sahifalarni guruhlarga boʻlish",
 	"tog-numberheadings": "Sarlavhalarni avtomatik raqamlash",
 	"tog-showtoolbar": "Tahrirlash asboblarini koʻrsatish",
 	"tog-editondblclick": "Sichqonchaning chap tugmasini ikki marta bosib tahrirlashni boshlash",
@@ -38,7 +38,7 @@
 	"tog-shownumberswatching": "Sahifani kuzatuv roʻyxatiga olgan foydalanuvchilar sonini koʻrsatish",
 	"tog-oldsig": "Joriy imzo:",
 	"tog-fancysig": "Imzoni viki-belgi qilib koʻrsatish (avtomatik ishoratsiz)",
-	"tog-uselivepreview": "Tez koʻrib chiqish (JavaScript orqali) (sinovda)",
+	"tog-uselivepreview": "Tez koʻrib chiqish",
 	"tog-forceeditsummary": "Qisqa tavsif oynasi toʻldirilmagani haqida ogohlantirish koʻrsatish",
 	"tog-watchlisthideown": "Oʻz tahrirlarim kuzatuv roʻyxatimda koʻrsatilmasin",
 	"tog-watchlisthidebots": "Botlar qilgan tahrirlar kuzatuv roʻyxatimda koʻrsatilmasin",
@@ -984,7 +984,6 @@
 	"emailuser": "Foydalanuvchiga maktub",
 	"emailuser-title-target": "Ushbu {{GENDER:$1|foydalanuvchi}}ga maktub joʻnatish",
 	"emailuser-title-notarget": "Foydalanuvchiga elektron maktub yozish",
-	"emailpage": "Foydalanuvchiga maktub",
 	"defemailsubject": "{{SITENAME}} — $1 tomonidan maktub",
 	"usermaildisabled": "Foydalanuvchi elektron pochtasi o‘chirilgan",
 	"noemailtitle": "Elektron pochta manzili mavjud emas",
@@ -1125,7 +1124,7 @@
 	"invert": "Tanlash tartibini almashtirish",
 	"namespace_association": "Bogʻliq nomfazo",
 	"blanknamespace": "(asosiy)",
-	"contributions": "{{GENDER:$1|Foydalanuvchi}} hissasi",
+	"contributions": "Hissasi",
 	"contributions-title": "{{GENDER:$1|Foydalanuvchi}} $1 hissasi",
 	"mycontris": "Hissam",
 	"contribsub2": "$1 uchun ($2)",
@@ -1147,7 +1146,7 @@
 	"sp-contributions-username": "IP-manzil yoki foydalanuvchi nomi:",
 	"sp-contributions-toponly": "Faqat oxirgi deb hisoblangan tahrirlarni koʻrsat",
 	"sp-contributions-submit": "Qidirish",
-	"whatlinkshere": "Bu sahifaga bog'langan sahifalar",
+	"whatlinkshere": "Bogʻliq sahifalar",
 	"whatlinkshere-title": "\"$1\"ga bogʻlangan sahifalar",
 	"whatlinkshere-page": "Sahifa:",
 	"linkshere": "Quyidagi sahifalar '''[[:$1]]''' sahifasiga bogʻlangan:",
@@ -1291,7 +1290,7 @@
 	"tooltip-t-recentchangeslinked": "Bu sahifaga bogʻlangan sahifalardagi yangi oʻzgarishlar",
 	"tooltip-feed-rss": "Bu sahifa uchun RSS ta'minot",
 	"tooltip-feed-atom": "Bu sahifa uchun Atom ta'minot",
-	"tooltip-t-contributions": "Bu foydalanuvchinig qoʻshgan hissasini koʻrish",
+	"tooltip-t-contributions": "Ushbu foydalanuvchi qoʻshgan hissasini koʻrish",
 	"tooltip-t-emailuser": "Ushbu foydalanuvchiga xat jo‘natish",
 	"tooltip-t-upload": "Rasmlar yoki media fayllar yuklash",
 	"tooltip-t-specialpages": "Maxsus sahifalar ro‘yxati",
diff --git a/languages/i18n/vec.json b/languages/i18n/vec.json
index daf15c284e..74014ed76a 100644
--- a/languages/i18n/vec.json
+++ b/languages/i18n/vec.json
@@ -45,7 +45,7 @@
 	"tog-shownumberswatching": "Mostra el numaro de utenti che i ga ła pajina en oservasion",
 	"tog-oldsig": "Anteprima de ła firma:",
 	"tog-fancysig": "Interpreta i comandi wiki in te la firma (sensa colegamento automatego)",
-	"tog-uselivepreview": "Ativa ƚa funsion \"Live preview\" (sperimentaƚe)",
+	"tog-uselivepreview": "Intaca l'anteprima dal vivo",
 	"tog-forceeditsummary": "Chiedi conferma se l'ozeto de ła modifega el xé vodo",
 	"tog-watchlisthideown": "Scondi łe me modifeghe ne i oservai spesałi",
 	"tog-watchlisthidebots": "Scondi łe modifeghe de i bot ne i oservai spesałi",
@@ -185,6 +185,7 @@
 	"view-foreign": "Varda su $1",
 	"edit": "Canbia",
 	"create": "Crea",
+	"create-local": "Xonta na descrision local",
 	"editthispage": "Canbia sta pagina",
 	"create-this-page": "Crea sta pagina",
 	"delete": "Scansela",
@@ -237,6 +238,7 @@
 	"disclaimers": "Avertense",
 	"disclaimerpage": "Project:Avertense xenerali",
 	"edithelp": "Guida",
+	"helppage-top-gethelp": "Ajuto",
 	"mainpage": "Pajina prinsipałe",
 	"mainpage-description": "Pajina prinsipałe",
 	"policy-url": "Project:Policy",
@@ -268,6 +270,9 @@
 	"hidetoc": "scondi",
 	"collapsible-collapse": "Conprimi",
 	"collapsible-expand": "Espandi",
+	"confirmable-confirm": "Sito {{GENDER:$1|seguro|segura}}?",
+	"confirmable-yes": "Sì",
+	"confirmable-no": "No",
 	"thisisdeleted": "Varda o ripristina $1?",
 	"viewdeleted": "Varda $1?",
 	"restorelink": "{{PLURAL:$1|un canbiamento scanselà|$1 canbiamenti scanselà}}",
@@ -384,6 +389,7 @@
 	"gotaccountlink": "Entra",
 	"userlogin-resetlink": "Desmentegà i to dati d'aceso?",
 	"userlogin-resetpassword-link": "Te gheto desmentegà ła paroła d'ordine?",
+	"userlogin-helplink2": "Ajuto par 'ndar drento",
 	"createacct-emailrequired": "Indirisso e-mail",
 	"createacct-emailoptional": "Indiriso e-mail (opsionałe)",
 	"createacct-email-ph": "Inserissi el to indirizo de e-mail",
@@ -448,6 +454,8 @@
 	"loginlanguagelabel": "Lengua: $1",
 	"suspicious-userlogout": "Ła to richiesta de disconesion xè sta negà parché e a senbra invià da on browser non funsionante o on proxy de caching.",
 	"pt-login": "Va drento",
+	"pt-login-button": "Va drento",
+	"pt-createaccount": "Crea utensa",
 	"pt-userlogout": "Và fora",
 	"php-mail-error-unknown": "Erore sconosudo nte'l funsionamento deła posta ełetronega PHP",
 	"user-mail-no-addy": "Te ghe provà spedire un mesajo de posta ełetronega sensa un indiriso.",
@@ -518,7 +526,7 @@
 	"preview": "Anteprima",
 	"showpreview": "Varda anteprima",
 	"showdiff": "Mostra canbiamenti",
-	"anoneditwarning": "'''Ocio:''' Nò te sì entrà co' un nome utente.\nIn te ła storia de ła pajina restarà el to indiriso IP.",
+	"anoneditwarning": "<strong>Ocio:</strong> Nò te sì entrà co' un nome utente.\nSe te fè calche canbiamento, el to indiriso IP el sarà visibile a tuti.\nSe te <strong>[$1 entri col to nome utente]</strong> o te te <strong>[$2 crei un utente]</strong>, i to contributi i vegnarà assegnà al nome utente che te te sì messo, oltre ad altri vantaji.",
 	"anonpreviewwarning": "\"No te ghe eseguio el login. Salvando el to indiriso IP sarà rejistrà ne ła cronołosia de sta voxe.\"",
 	"missingsummary": "'''Ocio:''' No te ghè indicà l'ogeto de la modifica. Macando de novo 'Salva la pagina' la modifica la vegnerà con l'ogeto vodo.",
 	"missingcommenttext": "Inserissi un comento qua soto.",
@@ -641,7 +649,7 @@
 	"currentrev": "Ultima version",
 	"currentrev-asof": "Ultima version de le $1",
 	"revisionasof": "Version de le $1",
-	"revision-info": "Version del $1, autor: $2",
+	"revision-info": "Version del $1 de {{GENDER:$6|$2}}$7",
 	"previousrevision": "← Version pi vecia",
 	"nextrevision": "Version pì nova →",
 	"currentrevisionlink": "Ultima version",
@@ -754,6 +762,7 @@
 	"showhideselectedversions": "Mostra/scondi version selessionà",
 	"editundo": "tira indrìo",
 	"diff-empty": "(Nissuna difarensa)",
+	"diff-multi-sameuser": "({{PLURAL:$1|Una revision intermedia|$1 revision intermedie}} del stesso utente mia mostrà)",
 	"diff-multi-manyusers": "({{PLURAL:$1|Una revision intermedia|$1 revision intermedie}} de pi de {{PLURAL:$2|un utente|$2 utenti}} mia mostrà)",
 	"difference-missing-revision": "{{PLURAL:$2|Na version|$2 version}} de sta difarensa ($1) {{PLURAL:$2|nó ła xe sta trovà|nó łe xe stae trovae}}.\n\nCuesto se verifega de sołito seguendo un ligamente vecio de un dif a na pàjina scansełà.\nI detaji i pol esar catai inte'l [{{fullurl:{{#Special:Log}}/delete|page={{FULLPAGENAMEE}}}} registro de łe scansełasion].",
 	"searchresults": "Risultati de la riserca",
@@ -768,7 +777,7 @@
 	"shown-title": "Fà védar {{PLURAL:$1|un risultato|$1 risultati}} par pagina",
 	"viewprevnext": "Varda ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "Su sto sito ghe xe na pagina che se ciama \"[[:$1]]\"",
-	"searchmenu-new": "'''Crèa la pagina \"[[:$1]]\" su sta wiki!'''",
+	"searchmenu-new": "<strong>Crèa la pagina \"[[:$1]]\" su sta wiki!</strong> Varda anca {{PLURAL:$2|0=|la pagina|le pagine}} catà co la riserca.",
 	"searchprofile-articles": "Pagine de contenuti",
 	"searchprofile-images": "File",
 	"searchprofile-everything": "Tuto quanto",
@@ -781,6 +790,7 @@
 	"search-result-category-size": "{{PLURAL:$1|1 utente|$1 utenti}} ({{PLURAL:$2|1 sotocategoria|$2 sotocategorie}}, {{PLURAL:$3|1 file|$3 file}})",
 	"search-redirect": "(redirect $1)",
 	"search-section": "(sesion $1)",
+	"search-category": "(categoria $1)",
 	"search-suggest": "Sercavito forsi: $1",
 	"search-interwiki-caption": "Projeti fradei",
 	"search-interwiki-default": "Risultati da $1:",
@@ -789,6 +799,7 @@
 	"searchrelated": "ligà",
 	"searchall": "tuti",
 	"showingresults": "Qua de soto vien mostrà al massimo {{PLURAL:$1|'''1''' risultato|'''$1''' risultati}} a partir dal nùmaro '''$2'''.",
+	"search-showingresults": "{{PLURAL:$4|Risultato <strong>$1</strong> de <strong>$3</strong>|Risultati <strong>$1 - $2</strong> de <strong>$3</strong>}}",
 	"search-nonefound": "La riserca no la gà catà gnente.",
 	"powersearch-legend": "Riserca avansà",
 	"powersearch-ns": "Serca ne i namespace:",
@@ -888,12 +899,14 @@
 	"prefs-timeoffset": "Ore de difarensa",
 	"prefs-advancedediting": "Preferense avansade",
 	"prefs-editor": "Contributor",
+	"prefs-preview": "Anteprima",
 	"prefs-advancedrc": "Preferense avansade",
 	"prefs-advancedrendering": "Preferense avansade",
 	"prefs-advancedsearchoptions": "Preferense avansade",
 	"prefs-advancedwatchlist": "Preferense avansade",
 	"prefs-displayrc": "Preferense de visualixassion",
 	"prefs-displaywatchlist": "Opzioni de visualixassion",
+	"prefs-tokenwatchlist": "Geton",
 	"prefs-diffs": "Difarense",
 	"email-address-validity-valid": "L'indiriso de posta eletronega pararìa vałido",
 	"email-address-validity-invalid": "Inserisi un indiriso de posta eletronega vałido",
@@ -1057,11 +1070,14 @@
 	"rcshowhidebots-show": "Mostra",
 	"rcshowhidebots-hide": "Scondi",
 	"rcshowhideliu": "$1 i utenti registrài",
+	"rcshowhideliu-show": "Mostra",
 	"rcshowhideliu-hide": "Scondi",
 	"rcshowhideanons": "$1 i utenti anonimi",
 	"rcshowhideanons-show": "Mostra",
 	"rcshowhideanons-hide": "Scondi",
 	"rcshowhidepatr": "$1 łe modifeghe controłae",
+	"rcshowhidepatr-show": "Mostra",
+	"rcshowhidepatr-hide": "Scondi",
 	"rcshowhidemine": "$1 i me canbiamenti",
 	"rcshowhidemine-show": "Mostra",
 	"rcshowhidemine-hide": "Scondi",
@@ -1181,6 +1197,16 @@
 	"upload-too-many-redirects": "In te l'URL ghe jera massa rimandi",
 	"upload-http-error": "Se gà verificà un eròr HTTP: $1",
 	"upload-copy-upload-invalid-domain": "No xe consentìo cargare copie da sto dominio.",
+	"upload-dialog-title": "Carga un file",
+	"upload-dialog-button-cancel": "Łasa star",
+	"upload-dialog-button-done": "Fato",
+	"upload-dialog-button-save": "Salva",
+	"upload-dialog-button-upload": "Carga",
+	"upload-dialog-label-select-file": "Siegli el file",
+	"upload-dialog-label-infoform-name": "Nome",
+	"upload-dialog-label-infoform-description": "Descrision",
+	"upload-dialog-label-usage-title": "Uso",
+	"upload-dialog-label-usage-filename": "Nome del file",
 	"backend-fail-stream": "Inposibiłe traxmetare el file $1.",
 	"backend-fail-backup": "Inposibiłe fare el backup del file $1.",
 	"backend-fail-notexists": "El file $1 no existe.",
@@ -1257,6 +1283,7 @@
 	"license-nopreview": "(Anteprima mìa disponibile)",
 	"upload_source_url": " (na URL coreta e acessibile)",
 	"upload_source_file": " (un file sul to computer)",
+	"listfiles-delete": "scancela",
 	"listfiles-summary": "Sta pajina speciałe ła fa vedare tuti i file caricadi.\nSe l'utente modifega l'ordenamento, vien mostradi soło i file caricadi pi de recente da l'utente.",
 	"listfiles_search_for": "Serca file par nome:",
 	"imgfile": "file",
@@ -1342,6 +1369,8 @@
 	"randomincategory": "Pagina a ocio in te na categoria",
 	"randomincategory-invalidcategory": "\"$1\" no'l và mia ben come nome de categoria.",
 	"randomincategory-nopages": "No ghe xe mia pagine in [[:Category:$1]].",
+	"randomincategory-category": "Categoria:",
+	"randomincategory-submit": "Và",
 	"randomredirect": "Un redirect a caso",
 	"randomredirect-nopages": "No ghe xe nissun rimando in tel namespace \"$1\".",
 	"statistics": "Statisteghe",
@@ -1382,6 +1411,7 @@
 	"ninterwikis": "$1 {{PLURAL:$1|interwiki}}",
 	"nlinks": "$1 {{PLURAL:$1|colegamento|colegamenti}}",
 	"nmembers": "$1 {{PLURAL:$1|elemento|elementi}}",
+	"nmemberschanged": "$1 → $2 {{PLURAL:$2|elemento|elementi}}",
 	"nrevisions": "$1 {{PLURAL:$1|revision}}",
 	"nimagelinks": "Doparà su $1 {{PLURAL:$1|pagina|pagine}}",
 	"ntransclusions": "doparà su $1 {{PLURAL:$1|pagina|pagine}}",
@@ -1419,6 +1449,12 @@
 	"protectedpages-cascade": "Solo protezion ricorsive",
 	"protectedpages-noredirect": "Scondi rimandi",
 	"protectedpagesempty": "Al momento no ghe xe pagine protete",
+	"protectedpages-timestamp": "Data e ora",
+	"protectedpages-page": "Pàjina",
+	"protectedpages-expiry": "Scade",
+	"protectedpages-reason": "Motivo",
+	"protectedpages-unknown-timestamp": "Sconossùa",
+	"protectedpages-unknown-performer": "Utente sconossùo",
 	"protectedtitles": "Titoli proteti",
 	"protectedtitlesempty": "Al momento no ghe xe titoli proteti coi parametri specificà.",
 	"listusers": "Elenco dei utenti",
@@ -1442,6 +1478,7 @@
 	"pager-older-n": "{{PLURAL:$1|quel pi vecio|i $1 pi vèci}}",
 	"suppress": "Supervision",
 	"querypage-disabled": "Sta pàjina speciałe ła xe dixativà par motivi de prestasion.",
+	"apihelp-no-such-module": "Modulo \"$1\" mia catà.",
 	"booksources": "Fonti librarie",
 	"booksources-search-legend": "Riserca de fonti librarie",
 	"booksources-search": "Serca",
@@ -1511,6 +1548,8 @@
 	"listgrouprights-removegroup-self": "Pol cavarse da {{PLURAL:$2|un grupo|dei grupi}}: $1",
 	"listgrouprights-addgroup-self-all": "Pol xontarse a tuti i grupi",
 	"listgrouprights-removegroup-self-all": "Pol cavarse da tuti i grupi",
+	"listgrouprights-namespaceprotection-namespace": "Namespace",
+	"trackingcategories-name": "Nome del messajo",
 	"mailnologin": "Nissun indirizo a cui mandarghe el messagio",
 	"mailnologintext": "Par inviare messagi e-mail ad altri utenti bisogna [[Special:UserLogin|acedere al sito]] e aver registrà un indirisso vałido ne łe proprie [[Special:Preferences|preferense]].",
 	"emailuser": "Scrìveghe a sto utente",
@@ -1619,6 +1658,8 @@
 	"rollback-success": "Anułàe łe modifighe de $1; riportà a ła version de prima de $2.",
 	"sessionfailure-title": "Eròr de session",
 	"sessionfailure": "Se gà verificà un problema ne la session che identifica l'acesso; el sistema, par precauzion, no'l gà mìa eseguìo el comando che te ghè dato. Torna a la pagina precedente col boton 'Indrìo' del to browser, ricarica la pagina e ripróa da novo.",
+	"changecontentmodel-title-label": "Tìtoło de ła pàjina",
+	"changecontentmodel-reason-label": "Motivo:",
 	"protectlogpage": "Protesion",
 	"protectlogtext": "De seguito xe elencade łe modifeghe ałe protesion dełe pajine.\nVedi ła [[Special:ProtectedPages|lista dełe pajine protete]] pa l'elenco de łe protesion de pajina atualmente ative.",
 	"protectedarticle": "ga proteto \"[[$1]]\"",
@@ -1961,6 +2002,7 @@
 	"allmessages-prefix": "Filtra par prefisso:",
 	"allmessages-language": "Lengua:",
 	"allmessages-filter-submit": "Và",
+	"allmessages-filter-translate": "Tradusi",
 	"thumbnail-more": "Ingrandissi",
 	"filemissing": "File mancante",
 	"thumbnail_error": "Eror ne la creazion de la miniatura: $1",
@@ -2032,8 +2074,9 @@
 	"tooltip-pt-mycontris": "Elenco de i to contributi",
 	"tooltip-pt-login": "Te consiliemo de registrarte, ma no te ghè da farlo par forsa.",
 	"tooltip-pt-logout": "Và fora",
+	"tooltip-pt-createaccount": "Te incorajemo de farte un utente e 'ndar drento co quelo; comunque no te toca farlo pa' forsa.",
 	"tooltip-ca-talk": "Discussion sul contenuto de sta pagina",
-	"tooltip-ca-edit": "Te poli canbiar sta pagina. Par piaser dòpara el boton de anteprima, prima de salvar.",
+	"tooltip-ca-edit": "Modifega sta pagina",
 	"tooltip-ca-addsection": "Scumisia na nova sesion",
 	"tooltip-ca-viewsource": "Sta pagina la xe proteta, ma te poli vardar el so testo",
 	"tooltip-ca-history": "Version vece de sta pagina",
@@ -2119,8 +2162,8 @@
 	"pageinfo-article-id": "ID de la pagina",
 	"pageinfo-language": "Lengua del contenuto de la pagina",
 	"pageinfo-robot-policy": "Stato par i motori de riserca",
-	"pageinfo-robot-index": "Indicizabile",
-	"pageinfo-robot-noindex": "Mia indicizabile",
+	"pageinfo-robot-index": "Parmesso",
+	"pageinfo-robot-noindex": "Vietà",
 	"pageinfo-watchers": "Nùmaro de utenti che tien d'ocio sta pagina",
 	"pageinfo-few-watchers": "Manco de $1 {{PLURAL:$1|oservador|oservadori}}",
 	"pageinfo-redirects-name": "Rimandi verso sta pagina",
@@ -2609,11 +2652,13 @@
 	"confirm-watch-top": "Xonto sta pàjina a ła to lista de łe tegnùe d'ocio?",
 	"confirm-unwatch-button": "Va ben",
 	"confirm-unwatch-top": "Cavo sta pàjina da ła to lista de łe tegnùe d'ocio?",
+	"quotation-marks": "\"$1\"",
 	"imgmultipageprev": "← la pagina prima",
 	"imgmultipagenext": "la pagina dopo →",
 	"imgmultigo": "Và",
 	"imgmultigoto": "Và a la pagina $1",
 	"img-lang-default": "(lengua predefinìa)",
+	"img-lang-go": "Và",
 	"ascending_abbrev": "cresc",
 	"descending_abbrev": "decresc",
 	"table_pager_next": "Pagina sucessiva",
@@ -2643,6 +2688,7 @@
 	"watchlistedit-raw-done": "La lista dei osservati speciali la xe stà agiornà.",
 	"watchlistedit-raw-added": "Xe stà zontà {{PLURAL:$1|una pagina|$1 pagine}}:",
 	"watchlistedit-raw-removed": "Xe stà eliminà {{PLURAL:$1|una pagina|$1 pagine}}:",
+	"watchlistedit-clear-titles": "Pagine:",
 	"watchlisttools-view": "Varda i canbiamenti",
 	"watchlisttools-edit": "Varda e canbia le pagine tegnùe d'ocio",
 	"watchlisttools-raw": "Canbia la lista in formato testo",
@@ -2663,12 +2709,14 @@
 	"version-hook-name": "Nome de l'hook",
 	"version-hook-subscribedby": "Sotoscrizioni",
 	"version-version": "($1)",
+	"version-no-ext-name": "[nissun nome]",
 	"version-license": "Licensa MediaWiki",
 	"version-ext-license": "Licensa",
 	"version-ext-colheader-name": "Estension",
 	"version-ext-colheader-version": "Version",
 	"version-ext-colheader-license": "Licensa",
 	"version-ext-colheader-description": "Descrission",
+	"version-ext-colheader-credits": "Autori",
 	"version-license-title": "Licensa par $1",
 	"version-poweredby-credits": "Sta wiki la va con '''[https://www.mediawiki.org/ MediaWiki]''', copyright © 2001-$1 $2.",
 	"version-poweredby-others": "altri",
@@ -2681,7 +2729,13 @@
 	"version-entrypoints": "URL de aceso",
 	"version-entrypoints-header-entrypoint": "Punti de aceso",
 	"version-entrypoints-header-url": "URL",
-	"redirect": "Rimando par file, utente, o ID de revision.",
+	"version-libraries": "Librarie instalà",
+	"version-libraries-library": "Libraria",
+	"version-libraries-version": "Version",
+	"version-libraries-license": "Licensa",
+	"version-libraries-description": "Descrision",
+	"version-libraries-authors": "Autori",
+	"redirect": "Rimando par file, utente, pagina o ID de version.",
 	"redirect-legend": "Rimandar a un file o na pagina",
 	"redirect-summary": "Sta pagina speciale la rimanda a un file (dato el nome del file), a na pagina (dato l'ID de la revision), o a na pagina utente (dato l'ID de l'utente).",
 	"redirect-submit": "Và",
@@ -2701,6 +2755,7 @@
 	"fileduplicatesearch-result-n": "Ghe xe {{PLURAL:$2|un duplicato conpagno|$2 duplicati conpagni}} al file \"$1\".",
 	"fileduplicatesearch-noresults": "Nisun file de nome \"$1\" trovà.",
 	"specialpages": "Pagine speciali",
+	"specialpages-note-top": "Legenda",
 	"specialpages-note": "* Pàjine speciałi normałi.\n* <span class=\"mw-specialpagerestricted\">Pàjine speciałi a aceso limità.</span>",
 	"specialpages-group-maintenance": "Resoconti de manutenzion",
 	"specialpages-group-other": "Altre pagine speciali",
@@ -2727,10 +2782,29 @@
 	"tags-tag": "Nome del tag",
 	"tags-display-header": "Aspetto ne la lista de le modifiche",
 	"tags-description-header": "Descrission conpleta del significado",
+	"tags-source-header": "Fonte",
 	"tags-active-header": "Ativo?",
 	"tags-hitcount-header": "Modifiche che gà dei tag",
+	"tags-actions-header": "Asion",
+	"tags-active-yes": "Sì",
+	"tags-active-no": "No",
 	"tags-edit": "modìfega",
+	"tags-delete": "scancela",
+	"tags-activate": "intaca",
+	"tags-deactivate": "destaca",
 	"tags-hitcount": "$1 {{PLURAL:$1|modìfega|modìfeghe}}",
+	"tags-create-reason": "Motivo:",
+	"tags-create-submit": "Crea",
+	"tags-delete-reason": "Motivo:",
+	"tags-activate-reason": "Motivo:",
+	"tags-activate-submit": "Intaca",
+	"tags-deactivate-reason": "Motivo:",
+	"tags-edit-existing-tags-none": "''Nissuna''",
+	"tags-edit-new-tags": "Etichete nove:",
+	"tags-edit-add": "Zonta ste etichete:",
+	"tags-edit-remove": "Cava ste etichete:",
+	"tags-edit-remove-all-tags": "(cava tute le etichete)",
+	"tags-edit-reason": "Motivo:",
 	"comparepages": "Confronta le pagine",
 	"compare-page1": "Pagina 1",
 	"compare-page2": "Pagina 2",
@@ -2798,11 +2872,13 @@
 	"rightsnone": "(nissun)",
 	"revdelete-summary": "modifica ogeto",
 	"feedback-adding": "Inserimento del feedback inte ła pàjina...",
+	"feedback-back": "Indrìo",
 	"feedback-bugcheck": "Otimo! Verifega che nó 'l sia xà infrà i [$1 bug conosui].",
 	"feedback-bugnew": "Controło efetuà. Segnała un novo bug",
 	"feedback-bugornote": "Se se xe in grado de descrivare el problema tenico riscontrà in maniera precixa, [$1 segnałare el bug]. In alternadiva, se pol doparar el moduło senplifegà cuà soto. El comento inserio el sarà xontà a ła pàjina \"[$3 $2]\", insieme al propio nome utente.",
 	"feedback-cancel": "Anuła",
 	"feedback-close": "Fato",
+	"feedback-error-title": "Eròr",
 	"feedback-error1": "Eror: Da ła API xe rivà un rexultà nó riconosùo",
 	"feedback-error2": "Eror: Nó xe sta posibiłe exeguir ła modifega",
 	"feedback-error3": "Errore: Nisuna risposta da ła API",
@@ -2810,6 +2886,7 @@
 	"feedback-subject": "Ogeto:",
 	"feedback-submit": "Manda",
 	"feedback-thanks": "Grasie! El to feedback el xe sta publicà a ła pàjina \"[$2 $1]\".",
+	"feedback-thanks-title": "Grassie!",
 	"searchsuggest-search": "Serca",
 	"searchsuggest-containing": "che contien...",
 	"api-error-badaccess-groups": "Nó te si autorixà a cargar documenti so sta wiki.",
@@ -2862,6 +2939,8 @@
 	"duration-centuries": "$1 {{PLURAL:$1|secolo|secoli}}",
 	"duration-millennia": "$1 {{PLURAL:$1|milenio|mileni}}",
 	"rotate-comment": "Imagine girà de $1 {{PLURAL:$1|grado|gradi}} in senso orario",
+	"limitreport-cputime-value": "$1 {{PLURAL:$1|secondo|secondi}}",
+	"limitreport-postexpandincludesize-value": "$1/$2 {{PLURAL:$1|byte}}",
 	"expandtemplates": "Espansion dei template",
 	"expand_templates_intro": "Sta pagina speciale la elabora un testo espandendo tuti i template presenti. La calcola inoltre el risultato de le funzion suportàe dal parser come <nowiki>{{</nowiki>#language:...}} e de le variabili de sistema quali <nowiki>{{</nowiki>CURRENTDAY}}, overo in pratica tuto quel che se cata tra dopie parentesi grafe. La funsiona riciamando le oportune funzion del parser de MediaWiki.",
 	"expand_templates_title": "Contesto (par {{FULLPAGENAME}} ecc.):",
@@ -2873,6 +2952,12 @@
 	"expand_templates_remove_nowiki": "Cava i tag <nowiki> dal risultato",
 	"expand_templates_generate_xml": "Mostra àlbaro sintàtico XML",
 	"expand_templates_preview": "Anteprima",
+	"pagelang-name": "Pàjina",
+	"pagelang-language": "Lengua",
+	"mediastatistics-header-unknown": "Sconossùo",
+	"mediastatistics-header-audio": "Audio",
+	"mediastatistics-header-video": "Video",
+	"mediastatistics-header-executable": "File eseguibili",
 	"special-characters-group-latin": "Latìn",
 	"special-characters-group-latinextended": "Latìn estexo",
 	"special-characters-group-ipa": "IPA",
@@ -2896,5 +2981,6 @@
 	"special-characters-title-emdash": "lineeta eme",
 	"special-characters-title-minus": "segno meno",
 	"mw-widgets-dateinput-placeholder-day": "AAAA-MM-GG",
-	"mw-widgets-dateinput-placeholder-month": "AAAA-MM"
+	"mw-widgets-dateinput-placeholder-month": "AAAA-MM",
+	"mw-widgets-titleinput-description-redirect": "rimando a $1"
 }
diff --git a/languages/i18n/vi.json b/languages/i18n/vi.json
index 471fda95f3..0d1f70f2a0 100644
--- a/languages/i18n/vi.json
+++ b/languages/i18n/vi.json
@@ -942,7 +942,8 @@
 	"rows": "Số hàng:",
 	"columns": "Số cột:",
 	"searchresultshead": "Tìm kiếm",
-	"stub-threshold": "Định dạng <a href=\"#\" class=\"stub\">liên kết đến sơ khai</a> cho các trang ngắn hơn (byte):",
+	"stub-threshold": "Định dạng liên kết đến sơ khai ($1) cho các trang ngắn hơn:",
+	"stub-threshold-sample-link": "ví dụ",
 	"stub-threshold-disabled": "Tắt",
 	"recentchangesdays": "Số ngày hiển thị trong thay đổi gần đây:",
 	"recentchangesdays-max": "(tối đa $1 {{PLURAL:$1|ngày|ngày}})",
@@ -1660,7 +1661,7 @@
 	"booksources-text": "Dưới đây là danh sách những trang bán sách mới và cũ, đồng thời có thể có thêm thông tin về những cuốn sách bạn đang tìm:",
 	"booksources-invalid-isbn": "ISBN mà bạn cung cấp dường như không đúng; xin hãy kiểm tra lại xem có lỗi gì khi sao chép từ nội dung gốc hay không.",
 	"specialloguserlabel": "Người thực hiện:",
-	"speciallogtitlelabel": "Mục tiêu (tiêu đề hoặc người dùng):",
+	"speciallogtitlelabel": "Mục tiêu (tiêu đề hoặc {{ns:user}}:Tên-người-dùng đối với người dùng):",
 	"log": "Nhật trình",
 	"all-logs-page": "Tất cả các nhật trình công khai",
 	"alllogstext": "Hiển thị tất cả các nhật trình đang có của {{SITENAME}} chung với nhau.\nBạn có thể thu hẹp kết quả bằng cách chọn loại nhật trình, tên thành viên (phân biệt chữ hoa-chữ thường), hoặc các trang bị ảnh hưởng (cũng phân biệt chữ hoa-chữ thường).",
@@ -2953,7 +2954,9 @@
 	"autoredircomment": "Đổi hướng đến [[$1]]",
 	"autosumm-new": "Tạo trang mới với nội dung “$1”",
 	"autosumm-newblank": "Đã tạo trang trống",
+	"size-bytes": "$1 byte",
 	"size-kilobytes": "$1 kB",
+	"size-pixel": "$1 điểm ảnh",
 	"size-kilopixel": "$1 kP",
 	"bitrate-bits": "$1 bit/s",
 	"bitrate-kilobits": "$1 kbit/s",
diff --git a/languages/i18n/war.json b/languages/i18n/war.json
index 66ac477b85..ca1295a376 100644
--- a/languages/i18n/war.json
+++ b/languages/i18n/war.json
@@ -8,7 +8,8 @@
 			"Wiki indio",
 			"לערי ריינהארט",
 			"Kolega2357",
-			"아라"
+			"아라",
+			"MarcoAurelio"
 		]
 	},
 	"tog-underline": "Bagisa ha ilarom an mga sumpay:",
@@ -794,7 +795,7 @@
 	"prefs-reset-intro": "Puydi nimo ini gamiton nga pakli para makareset han imo mga preperensya nga ginbutang nga daan han sityo. Diri ini puydi mapawaray-buhat.",
 	"prefs-emailconfirm-label": "Kompirmasyon han email:",
 	"youremail": "E-mail:",
-	"username": "{{HENERO:$1|Agnay hit gumaramit}}:",
+	"username": "{{GENDER:$1|Agnay hit gumaramit}}:",
 	"prefs-memberingroups": "{{GENDER:$2|Api}} han {{PLURAL:$1|grupo|mga grupo}}:",
 	"prefs-registration": "Oras han pagrehistro:",
 	"yourrealname": "Tinuod nga ngaran:",
@@ -1628,7 +1629,7 @@
 	"pageinfo-category-subcats": "Ihap han mga ubos-kaarangay",
 	"pageinfo-category-files": "Ihap han mga paypay",
 	"markaspatrolleddiff": "Igmarka komo ginpatrolya na",
-	"markaspatrolledtext": "Markaha ini nga pakli komo ginpatrolya na",
+	"markaspatrolledtext": "Markaha ini nga pakli nga napatrolyahan na",
 	"markedaspatrolled": "Igmarka komo ginpatrolya na",
 	"markedaspatrollederror": "Diri nakakamarka komo ginpatrolya na",
 	"patrol-log-page": "Talaan han pagpatrolya",
diff --git a/languages/i18n/wo.json b/languages/i18n/wo.json
index 48db3591cf..a08c972999 100644
--- a/languages/i18n/wo.json
+++ b/languages/i18n/wo.json
@@ -124,7 +124,7 @@
 	"cancel": "Neenal",
 	"moredotdotdot": "Ak yeneen...",
 	"mypage": "Samaw xët",
-	"mytalk": "Xëtu waxtaanuwaay",
+	"mytalk": "Waxtaan",
 	"anontalk": "Waxtaan ak bii IP",
 	"navigation": "Joowiin",
 	"and": "&#32;ak",
@@ -138,6 +138,7 @@
 	"actions": "Jëf",
 	"namespaces": "Barabu tur",
 	"variants": "Wuute",
+	"navigation-heading": "Njëlul joowiin",
 	"errorpagetitle": "Njuumte",
 	"returnto": "Dellu ci wii xët $1.",
 	"tagline": "Jóge  {{SITENAME}}.",
@@ -152,8 +153,11 @@
 	"printableversion": "Sumb bu móolu",
 	"permalink": "Lëkkalekaay yu sax",
 	"print": "Móol",
+	"view": "Xool",
+	"view-foreign": "Xoolee ko ci $1",
 	"edit": "Soppi",
 	"create": "Sos",
+	"create-local": "Yokk faramfàcceb barab bii",
 	"editthispage": "Soppi xët wii",
 	"create-this-page": "Sos wii xët",
 	"delete": "Far",
@@ -184,6 +188,7 @@
 	"otherlanguages": "Yeneeni làkk",
 	"redirectedfrom": "(Yoonalaat gu jóge $1)",
 	"redirectpagesub": "Xëtu yoonalaat",
+	"redirectto": "Jëmalewaat:",
 	"lastmodifiedat": "Coppite bu mujj bu xët wii $1 ci $2.<br />",
 	"viewcount": "Xët wii nemmeeku nañ ko {{PLURAL:$1|$1 yoon|$1 yoon}}.",
 	"protectedpage": "Xët wees aar",
@@ -205,8 +210,8 @@
 	"policy-url": "Project:àtte",
 	"portal": "Buntub askan",
 	"portal-url": "Project:Xët wu njëkk",
-	"privacy": "Politigu mbóot",
-	"privacypage": "Project:Xibaar ci say mbóot",
+	"privacy": "Politigu sutura",
+	"privacypage": "Project:Xibaari sutura",
 	"badaccess": "Njuumte ci ndigël gi",
 	"badaccess-group0": "Amoo ay sañ-sañ yu doy ngir man a def li nga bëgg a def.",
 	"badaccess-groups": "Jëf ji ngay jéem a def dañu koo jagleel jëfandikukat yi bokk ci {{PLURAL:$2|mbooloo mu|benn ci mbooloo yi toftal}}: $1.",
@@ -292,7 +297,10 @@
 	"virus-scanfailed": "Saytu gi dog na (code $1)",
 	"logouttext": "Fi mu nekk nii génn nga.'''\n\nMan ngaa wéy di jëfandikoo {{SITENAME}} ci anam buñ la dul xamme walla nga  <span class='plainlinks'>[$1 duggewaat]</span> ak wenn tur wi walla ak weneen.",
 	"yourname": "Sa turu jëfandikukat",
+	"userlogin-yourname": "Turu jëfandikukat",
+	"userlogin-yourname-ph": "Duggalal sa turu jëfandikukat",
 	"yourpassword": "Sa baatujàll",
+	"userlogin-yourpassword": "Baatujàll",
 	"yourpasswordagain": "Bindaatal sa baatujàll",
 	"remembermypassword": "Denc sama yëgley dukkukaay ci bii joowukaay (lu ëpp nag $1 {{PLURAL:$1|day|days}})",
 	"yourdomainname": "Sa barab",
@@ -309,6 +317,8 @@
 	"gotaccount": "Sos nga am sàq? '''$1'''.",
 	"gotaccountlink": "Dugg",
 	"createaccountmail": "Jaare ko ci m-bataaxal",
+	"createacct-captcha": "Caytug kaaraange",
+	"createacct-imgcaptcha-ph": "Duggalal mbind  miy toftal mi ngay gis",
 	"badretype": "Baatujàll yi nga bind yemuñu.",
 	"userexists": "Turu jëfandikukat bi nga bind am na boroom ba noppi. Tànnal weneen.",
 	"loginerror": "Njuumte ci dugg gi",
@@ -347,6 +357,9 @@
 	"createaccount-text": "Kenn ku sos am sàq ci {{SITENAME}} te tudd $2 ($4).\nBaatujàll bu « $2 » mooy « $3 ». Li gën mooy nga dugg ci teel te soppi baatujàll bi.\n\nJéelaleel bataaxal bii su fekkee ci njuumte nga sosee mii sàq.",
 	"login-throttled": "Jéem ngaa dugg ay yoon te jàllul.\n\nNgalla néggandikul ab diir door a jéemaat.",
 	"loginlanguagelabel": "Làkk : $1",
+	"pt-login": "Dugg",
+	"pt-createaccount": "Sos am sàq",
+	"pt-userlogout": "Génn",
 	"changepassword": "Coppiteg baatujàll bi",
 	"resetpass_announce": "Danga dugg ak ab baatujàll bu saxul-dakk, buñ la yónne cib bataaxal. Ngir matal mbindu mi, faaw nga roof ab baatujàll bu bees fii:",
 	"resetpass_text": "<!-- Bindal fii -->",
@@ -387,7 +400,7 @@
 	"preview": "Wonendi",
 	"showpreview": "Wonendi",
 	"showdiff": "Wone samay soppi",
-	"anoneditwarning": "'''Moytul :''' Duggoo. Sa màkkaanub IP di nañu ko dugal ci jaar-jaaru xët wii.",
+	"anoneditwarning": "<strong>Moytul :</strong> Duggoo. Bépp coppite boo def sa màkkaanub IP lañu koy xaatimee ci jaar-jaaru xët wi, ñépp di ko gis. Waaye soo <strong>[$1 duggee]</strong> walla nga <strong>[$2 sos am sàq]</strong>, say coppite sa tur lañuy àndal ak yeneeni njariñ.",
 	"missingsummary": "'''Fattali :''' Defoo ab tënk ci coppite yi nga amal. Soo cuqaate ci «Denc xët wi», say coppite di nañ dugg te duñ am tënk, maanaam duñ xam loo soppi.",
 	"missingcommenttext": "Di la sakku nga dugal ab tënk ci suuf, jërëjëf.",
 	"missingcommentheader": "'''Fattali :''' Joxoo ab koj say coppite. Soo cuqaate ci «Denc xët wi», di nañ leen dugal te duñ am koj.",
@@ -410,7 +423,7 @@
 	"newarticletext": "Da ngaa topp ab lëkkalekaay buy jëme ci aw xët wu amagul. ngir sos xët wi léegi, duggalal sa mbind ci boyot bii ci suuf (man ngaa yër [$1 xëtu ndimbal wi] ngir yeneeni xamle). Su fekkee njuumtee la fi indi cuqal ci '''dellu''' bu sa joowukaay.",
 	"anontalkpagetext": "---- ''Yaa ngi ci xëtu waxtaanuwaayu ab jëfandikukatu alaxam, bu bindoogul ba fim ne mbaa jëfandikoowul am sàqam.\nKon ngir xàmmee ko fàw nga jëfandikoo màkkaanub IP wam. Te màkkaanub IP jëfandikukat yu bari man nañ koo bokk.\nSu fekkee jëfandikukatu alaxam nga, te nga gis ne dees laa féetale ay kàddu yoo moomul, ngalla [[Special:UserLogin|bindu]] walla [[Special:UserLogin|dugg]] ngir benn jaxase bañatee am ëllëg .''",
 	"noarticletext": "Fi mu ne ni amul menn mbind ci xët wii; man ngaa [[Special:Search/{{PAGENAME}}|seet koju xët wi]] ci yeneen xët, <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} seet ci xëtu jagleel wi ],\nwalla [{{fullurl:{{FULLPAGENAME}}|action=edit}} soppi xët wii]</span>.",
-	"noarticletext-nopermission": "Nii-nii amul menn mbind ci wii xët.\nMan nga [[Special:Search/{{PAGENAME}}|seet bii koj]] ci yeneen xët,\nwalla <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} nga seet ci yéenekaay yees ko féetaleel]</span>.",
+	"noarticletext-nopermission": "Nii-nii amul menn mbind ci wii xët.\nMan ngaa [[Special:Search/{{PAGENAME}}|seet bii koj]] ci yeneen xët walla <span class=\"plainlinks\">[{{fullurl:{{#Special:Log}}|page={{FULLPAGENAMEE}}}} nga seet ciy yéenekaayam]</span>. Numu man a deme, amoo sañ-sañu sos wii xët.",
 	"userpage-userdoesnotexist": "Mii sàqum jëfandikukat « <nowiki>$1</nowiki> » du bu ku-bindu. Seetal bu baax ndax da ngaa namma sos walla soppi wii xët.",
 	"clearyourcache": "'''Karmat :''' Soo dence xët wi ba noppi, faaw nga far nëmbiitu sa joowukaay ngir man a gis say coppite, te nga, su dee '''Mozilla / Firefox / Safari :''' cuq ci ''yeesal'' te bësaale ''shift'', walla nga bës ''Shift-R'' walla ''Ctrl-F5'' (Command-R ci Mac ), su dee '''Konqueror''': cuq ''yeesal'' walla nga bës ''F5''; su dee '''Opera''' faral nëbiit li (''Jumtukaay → Tànneef'') su dee '''Internet Explorer:''' cuq ci ''yeesal te bësaale ''Ctrl''  walla nga bës ''Ctrl-F5''.",
 	"usercssyoucanpreview": "'''Xelal :''' di la digël nga cuq ci «Wonendi» ngir gis say xobi CSS walla JavaScript yu bees laata nga leen di denc.",
@@ -581,7 +594,7 @@
 	"shown-title": "Wone $1 {{PLURAL:$1|ngérte|ngérte}} ciw xët",
 	"viewprevnext": "Xool ($1 {{int:pipe-separator}} $2) ($3).",
 	"searchmenu-exists": "'''wenn xët wu tudd « [[:$1]] » moo am ci bii wiki'''",
-	"searchmenu-new": "'''Sosal xët wii di « [[:$1|$1]] » ci bii wiki !'''",
+	"searchmenu-new": "<strong>Sosal xët wii di « [[:$1|$1]] » ci bii wiki !</strong>\n{{PLURAL:$2|0=|Xoolal itam xët wees gis ak sa ceet gi.|Xoolal itam ngértey ceet gi.}}",
 	"searchprofile-articles": "Xëti ëmbiit",
 	"searchprofile-images": "Barixibaarukaay",
 	"searchprofile-everything": "Lépp",
@@ -601,6 +614,7 @@
 	"searchrelated": "yeneeni ngérte",
 	"searchall": "yépp",
 	"showingresults": "Woneg <b>$1</b> {{PLURAL:$1|ngérte|ciy ngérte}} doore ko ci #<b>$2</b>.",
+	"search-showingresults": "{{PLURAL:$4|Ngérte <strong>$1</strong> ci <strong>$3</strong>|Ngérte <strong>$1 - $2</strong> ci <strong>$3</strong>}}",
 	"search-nonefound": "Ceet gi jurul dara.",
 	"powersearch-legend": "Ceet gu xóot",
 	"powersearch-ns": "Seet ci barabi tur yi :",
@@ -610,7 +624,7 @@
 	"search-external": "Ceet gu biti",
 	"searchdisabled": "Ceet gi ci {{SITENAME}} doxul. Ci négandiku doxal gi, man nga seet ci Google. Jàppal ne, xéj-na ëmbiti {{SITENAME}} gi ci bii seetukaay yeesaluñ leen.",
 	"preferences": "Tànneef",
-	"mypreferences": "Samay tànneef",
+	"mypreferences": "Tànnéef",
 	"prefs-edits": "Limu coppite yi:",
 	"prefs-skin": "Melokaan",
 	"skin-preview": "Wonendil",
@@ -814,6 +828,7 @@
 	"action-userrights-interwiki": "soppi aqi jëfandikukat yu jëfandikukat yu beneen wiki",
 	"action-siteadmin": "caabi walla caabeedi dàttub njoxe bi",
 	"nchanges": "$1 {{PLURAL:$1|coppite|ciy coppite}}",
+	"enhancedrc-history": "jaar-jaar",
 	"recentchanges": "Coppite yu mujj",
 	"recentchanges-legend": "tànneefi coppite yu mujj",
 	"recentchanges-summary": "Toppal ci wii xët coppite yu mujj ci {{SITENAME}}.",
@@ -822,15 +837,22 @@
 	"recentchanges-label-minor": "Coppite gu néewal la",
 	"recentchanges-label-bot": "Coppite bu ab bot def",
 	"recentchanges-label-unpatrolled": "Coppite bii kenn fugloogu ko",
-	"recentchanges-legend-newpage": "$1 - xët wu bees",
+	"recentchanges-label-plusminus": "Dayoob xët wi soppeeku na ci lu ni toll ciy byte.",
+	"recentchanges-legend-heading": "'''Piri:'''",
+	"recentchanges-legend-newpage": "{{int:recentchanges-label-newpage}} (wone itam [[Special:NewPages|limu xët yu bees yi]]) -",
 	"rcnotefrom": "Yii ñooy coppite yi dalee '''$2''' (ba '''$1''').",
 	"rclistfrom": "Wone coppite yi mujj yi dooree $3 $2",
 	"rcshowhideminor": "$1 Coppite yu néewal",
+	"rcshowhideminor-hide": "Nëbb",
 	"rcshowhidebots": "$1 bot yi",
-	"rcshowhideliu": "$1 jëfandikukat yu bindu",
+	"rcshowhidebots-show": "Wone",
+	"rcshowhideliu": "$1 jëfandikukat yi bindu",
+	"rcshowhideliu-hide": "Nëbb",
 	"rcshowhideanons": "$1 jëfandikukat yu binduwul",
+	"rcshowhideanons-hide": "Nëbb",
 	"rcshowhidepatr": "$1 coppite bees fuglu",
 	"rcshowhidemine": "$1 samay cëru",
+	"rcshowhidemine-hide": "Nëbb",
 	"rclinks": "Wone $1 coppite yi mujj ci $2  fan yi mujj <br />$3.",
 	"diff": "wuute",
 	"hist": "Jaar",
@@ -843,6 +865,7 @@
 	"rc_categories": "Digalub wàll yi (xaajale leen ak « \"|\" »)",
 	"rc_categories_any": "Yépp",
 	"rc-change-size": "$1",
+	"rc-change-size-new": "$1 {{PLURAL:$1|byte|bytes}} ginnaaw coppite gi",
 	"newsectionsummary": "/* $1 */ xaaj bu bees",
 	"rc-enhanced-expand": "Xool faramfacce yi (laaj na JavaScript)",
 	"rc-enhanced-hide": "nëbb faramfacce yi",
@@ -903,6 +926,7 @@
 	"filewasdeleted": "Dencukaay bu tudd nii yeboon nañ ko fi ba noppi, faraat ko. Saytul $1 laataa nga koy yebaat.",
 	"filename-bad-prefix": "Turu dencukaay bi ngay yeb moo ngi tambalee '''\"$1\"''', te muy tur wu nosukaay bi di joxal boppam nataalukaay yi.\nDila ñaan nga tànn tur wuy faramfacce dencukaay bi.",
 	"upload-success-subj": "Yeb gi jàll na",
+	"license-header": "Anami Jëfandikoo gi",
 	"imgfile": "Dencukaay",
 	"listfiles": "Limu dencukaay",
 	"listfiles_date": "Taariix",
@@ -925,7 +949,7 @@
 	"filehist-dimensions": "Dayoo",
 	"filehist-filesize": "Dayoo ŋara wi",
 	"filehist-comment": "Saraa",
-	"imagelinks": "Xët yi am bii dencukaay",
+	"imagelinks": "Njëfandikug dencukaay bi",
 	"linkstoimage": "{{PLURAL:$1|Xët wii ci suuf ëmb na|$1 xët yii ci suuf ëmb nañu}} bii dencukaay:",
 	"linkstoimage-more": "Lu ëpp $1 {{PLURAL:$1|xët lëkkale nañu leen|xët lëkkale nañu leen}} ak bii dencukaay.\nLim bii di toftal moo lay won {{PLURAL:$1|xët wi ñu njëkk a|xët yi ñu njëkk a}} lëkkale ak wii.\nAb [[Special:WhatLinksHere/$2|lim bu mat]] jàppandi na.",
 	"nolinkstoimage": "Amul wenn xët wu ëmb bii dencukaay.",
@@ -939,6 +963,7 @@
 	"uploadnewversion-linktext": "Yeb sumb bu bees bu bii dencukaay",
 	"shared-repo-from": "$1",
 	"shared-repo": "ab dencu bees bokk",
+	"upload-disallowed-here": "Manoo bindaat ci kaw bii dencukaay.",
 	"filerevert": "Loppanti $1",
 	"filerevert-legend": "Delloowaat dencukaay bi",
 	"filerevert-intro": "Yaa ngi waaj a delloowaat dencukaay bii di '''[[Media:$1|$1]]''' ci  [$4 sumb bu $2 ci $3].",
@@ -1004,7 +1029,6 @@
 	"nlinks": "$1 {{PLURAL:$1|lëkkalekaay|ciy lëkkalekaay}}",
 	"nmembers": "$1 {{PLURAL:$1|xët|ciy xët}} ci biir",
 	"nrevisions": "$1 {{PLURAL:$1|sumb|sumb}}",
-	"nviews": "$1 {{PLURAL:$1|nemmeeku|nemmeeku}}",
 	"specialpage-empty": "Xët wii amul dara",
 	"lonelypages": "Xëti jiriim",
 	"lonelypagestext": "Xët yiy toftal amuñuy lëkkalekaay yu ne ci yeneen xët yu leen di ubbi te ëmbuwuñu itam ci benn xëtu {{SITENAME}}.",
@@ -1114,7 +1138,6 @@
 	"mailnologin": "Amul benn mákkaan boo man a yónne bataaxal bi",
 	"mailnologintext": "Ngir man a yónney bataaxal laaj na nga [[Special:UserLogin|dugg]] te it am ab màkkaanub m-bataaxal bu baax ci say [[Special:Preferences|tànneef]].",
 	"emailuser": "Bind bii jëfandikukat",
-	"emailpage": "Yónne ab m-bataaxal bii jëfandikukat",
 	"defemailsubject": "M-bataaxalu {{SITENAME}}",
 	"noemailtitle": "Amul mákkaanub m-bataaxal",
 	"noemailtext": "Bii jëfandikukat joxewul ab màkkaanub m-bataaxal bu baax.",
@@ -1178,7 +1201,6 @@
 	"delete-toobig": "Xët wii dafa am jaar-jaar bu bari, bu weesu $1 {{PLURAL:$1|sumb|sumb}}. Farteg yooyule xët dañu koo digal ngir bañ ay jafe-jafe yu mana am ci doxinu {{SITENAME}}.",
 	"delete-warning-toobig": "Xët wii dafa am jaar-jaar bu bari, bu weesu $1 {{PLURAL:$1|sumb|sumb}}. Seenug farte man naa jur ag jaxasoo ci dáttub njoxeeb {{SITENAME}} ; def ko ak teey.",
 	"rollback": "Loppanti coppite yi",
-	"rollback_short": "Loppanti",
 	"rollbacklink": "delloowaat",
 	"rollbackfailed": "Loppanti gi antuwul",
 	"cantrollback": "Neenal coppite gi manula nekk;\nKi def coppite gi mooy Kenn ki masa cëru ci xët wii.",
@@ -1257,10 +1279,13 @@
 	"undelete-show-file-submit": "Waaw",
 	"namespace": "Barabu tur :",
 	"invert": "Jallarbi fal gi",
+	"tooltip-invert": "Falal bii néeg ngir nëbb coppitey xët yi ci barabu tur bi nga tànn (ak yi mu lonkool su fekkee tànnaale nga leen)",
+	"namespace_association": "Barabu turam",
+	"tooltip-namespace_association": "Falal bii néeg ngir boolewaale ci xëtu waxtaanuwaay walla koju barabu tur bi nga fal",
 	"blanknamespace": "(njëkk)",
-	"contributions": "Cëruy bii jëfandikukat",
+	"contributions": "Cëruy bii {{GENDER:$1|jëfandikukat}}",
 	"contributions-title": "Cëru yu jëfandikukat bii di $1",
-	"mycontris": "Samay cëru",
+	"mycontris": "Cëru",
 	"contribsub2": "Ngir $1 ($2)",
 	"nocontribs": "Amul benn coppite bu melokaanoo nii bu ñu gis.",
 	"uctop": "(bi mujj)",
@@ -1285,7 +1310,7 @@
 	"nolinkshere-ns": "Amul wenn xët wu lëkkalook wii '''[[:$1]]''' ci barabu tur bi nga tànn.",
 	"isredirect": "Xëtu jubluwaat",
 	"istemplate": "mboole",
-	"isimage": "lëkkalekaayu nataal bi",
+	"isimage": "lëkkalekaayu dencukaay bi",
 	"whatlinkshere-prev": "{{PLURAL:$1|wi jiitu|$1 yi jiitu}}",
 	"whatlinkshere-next": "{{PLURAL:$1|wi toftal|$1 yi toftal}}",
 	"whatlinkshere-links": "← lëkkalekaay",
@@ -1437,8 +1462,9 @@
 	"tooltip-pt-mycontris": "Limu say cëru",
 	"tooltip-pt-login": "Woo nan la ngir nga xammeku, waaye doonul lu manuta ñakk.",
 	"tooltip-pt-logout": "Génn",
+	"tooltip-pt-createaccount": "Dees na la digal nga bindu te dugg, donte doonul lu manul-ñàkk",
 	"tooltip-ca-talk": "Waxtaan yi ñeel xët wii",
-	"tooltip-ca-edit": "Man ngaa soppi xët wi. Ngir yàlla wonendil laataa ngay denc.",
+	"tooltip-ca-edit": "Soppi xët wii",
 	"tooltip-ca-addsection": "Tambali xaaj bu bees",
 	"tooltip-ca-viewsource": "Xët wii dañ koo aar. Waaye man ngaa xool ëmbitam.",
 	"tooltip-ca-history": "Sumb yi weesu yu xët wi.",
@@ -1489,6 +1515,7 @@
 	"tooltip-upload": "Door yeb gi",
 	"tooltip-rollback": "\"Delloowaat\" dafay neenal coppitey cërukat bi mujj ci xët wii ci benn cuq.",
 	"tooltip-undo": "\"Neenal\" dafay far coppite yi te ubbi palanteeru coppite bi ci anamug wonendi.\nDafay tax nga man a bind ngirte li ci boyotu tënk bi.",
+	"tooltip-summary": "Def ci ab tënk",
 	"common.css": "/* CSS yiñ def fii dañuy am ay njeexit ci col yépp  */",
 	"common.js": "/* Bépp JavaScript buñ fi duggal, xët yéppa koy yeb ak jëfandikukat bumu manti doon. */",
 	"anonymous": "Benn walla ay jëfandikukat yu binduwul yu {{SITENAME}}",
@@ -1502,13 +1529,17 @@
 	"spamprotectiontitle": "Seggukaay lank-spam",
 	"spam_reverting": "Loppantib sumb mu mujj mu amul lëkkalekaay buy jëme $1",
 	"spam_blanking": "Setal nañ wecc sumb yi amoon lëkkalekaay buy jëme $1",
+	"simpleantispam-label": "Caytu lànk-spam.\n<strong>Bu</strong> fi yokk lenn!",
+	"pageinfo-toolboxlink": "Xibaar ci xëtu wi",
 	"previousdiff": "← Coppite yi gën a yàgg",
 	"nextdiff": "Coppite yi mujj →",
 	"file-info": "Réyaayu file bi : $1, type MIME : $2",
 	"file-info-size": "$1 × $2 pixels, réyaayu file bi : $3, type MIME : $4",
 	"file-nohires": "Amul kem bu ëpp bii bu jàppandi.",
 	"svg-long-desc": "Dencukaay SVG, kem bu jaadu  $1 × $2 pixel, dayoo dencukaay bi: $3",
-	"show-big-image": "Ngandalal nataal gii",
+	"show-big-image": "Dencukaay bi mu bàyyikoo",
+	"show-big-image-preview": "Dayoob bii wonendi: $1.",
+	"show-big-image-size": "$1 × $2 pixel",
 	"ilsubmit": "Seet",
 	"bydate": "ci diir",
 	"bad_image_list": "Limu  cër yi nekk ci rëdd yi tàmbalee * rekk lees di faale.\nLëkkalekaay bu njëkk bu aw rëdd dafa war a nekk bu ab dencukaay bu baaxul.\nLëkkalekaay yiy toftal, ci wenn rëdd wi, dees leen di jàppee nikiy sette, maanaam xët yi dencukaay bi man a feeñ.",
@@ -1516,10 +1547,18 @@
 	"metadata-help": "Bii dencukaay dafa ami xibaar yees ci yokk, xéj-na nataalukaay bu waaraame walla waaraamalekaay bees jëfandikoo moo leen ci yokk. Su fekkee soppees na xar-kanamu dencukaay bi, yenn ci fàramfacce ñeel ko manees nañoo bañ a dëppook li am.",
 	"metadata-expand": "Wone faramfacce yi",
 	"metadata-collapse": "Nëbb faramfacce yi",
-	"metadata-fields": "Tool yi ñu jagleel jégginjoxe yu EXIF yi ñu lim ci wii xët di nañu leen wone ci xëtu nataal wi suñu waññee àlliwa bu jegginjoxe yi.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
+	"metadata-fields": "Tooli jégginjoxe yu nataal yi ñu lim ci bii bataaxal dañ leen di wone ci xëtu faramfàcce wu nataal bi su fekkee dañoo lem àlliwab jégginjoxe bi.\nYeneen tool yi dañ leen di nëbb.\n* make\n* model\n* datetimeoriginal\n* exposuretime\n* fnumber\n* isospeedratings\n* focallength\n* artist\n* copyright\n* imagedescription\n* gpslatitude\n* gpslongitude\n* gpsaltitude",
 	"exif-imagewidth": "Yaatuwaay",
 	"exif-imagelength": "Kawewaay",
+	"exif-orientation": "Jubluwaay",
+	"exif-datetime": "Taariix ak waxtu coppiteg dencukaay bi",
+	"exif-make": "Defarkatu nataalukaay bi",
+	"exif-software": "Jëfekaay bees jëfandikoo",
+	"exif-exifversion": "Sumb bu Exif",
+	"exif-colorspace": "Barabu melo",
 	"exif-usercomment": "Kadduy jëfëndikookat bi",
+	"exif-datetimeoriginal": "Taariix ak waxtub njurug njoxe yi",
+	"exif-orientation-1": "Jaadu",
 	"exif-componentsconfiguration-0": "Amul",
 	"namespacesall": "Yépp",
 	"monthsall": "Yépp",
@@ -1545,9 +1584,15 @@
 	"watchlisttools-view": "Limu toppte",
 	"watchlisttools-edit": "Xool te soppi limu toppte gi",
 	"watchlisttools-raw": "Soppi lim gi",
+	"signature": "[[{{ns:user}}:$1|$2]] ([[{{ns:user_talk}}:$1|waxtaan]])",
 	"specialpages": "Xëti jagleel",
+	"tag-filter": "Seggee ak [[Special:Tags|Tafaan]]:",
+	"tag-list-wrapper": "([[Special:Tags|{{PLURAL:$1|Tag|Tag}}]]: $2)",
+	"logentry-delete-delete": "$1 {{GENDER:$2|moo far}} xët wi $3",
 	"revdelete-restricted": "doxalub digal ngir yorkat yi",
 	"revdelete-unrestricted": "digal ngir yorkat yi deñ na",
+	"logentry-newusers-create": "Sàqum jëfandikukat $1 sos nañu ko",
 	"rightsnone": "(menn)",
-	"revdelete-summary": "soppi tënk gi"
+	"revdelete-summary": "soppi tënk gi",
+	"searchsuggest-search": "Seet"
 }
diff --git a/languages/i18n/yi.json b/languages/i18n/yi.json
index 56468140c4..d0a661bab5 100644
--- a/languages/i18n/yi.json
+++ b/languages/i18n/yi.json
@@ -345,6 +345,9 @@
 	"title-invalid-interwiki": "דער געזונט ער בלאט־קעפל אנטהאלט אן אינטערוויקי־לינק, וואס מ'קען נישט ניצן אין א קעפל.",
 	"title-invalid-talk-namespace": "דער געזוכטער בלאט־קעפל באציט זיך צו א שמועס־בלאט וואס קען נישט עקזעסטירן.",
 	"title-invalid-characters": "דער געזוכטער בלאט־קעפל אנטהאלט אומגילטיקע צייכענען: \"$1\".",
+	"title-invalid-relative": "דער טיטל האט א רעלאטיוון שטעג. . רעלאטיווע בלאט טיטלען  (./, ../) זענען אומגילטיג, ווייל אפט זענען זיי אומגרייכבאר דורכן בלעטערער פונעם באניצער.",
+	"title-invalid-magic-tilde": "דער געבעטענער בלאט־טיטל אנטהאלט אן אומגילטיגן מאגישן טילדה־סעקווענץ (<nowiki>~~~</nowiki>).",
+	"title-invalid-too-long": "דיר געבעטענער בלאט־טיטל איז צו לאנג. ער אטר נישט זיין לענגער ווי $1 {{PLURAL:$1|בייט|בייטן}} אין UTF-8 קאדירונג.",
 	"title-invalid-leading-colon": "דער געבעטענער בלאט־טיטל הייבט אן מיט אן אומגילטיגן צווייפינטל.",
 	"perfcached": "די פאלגנדע דאטן זענען גענומען פונעם 'זאַפאַס' און מעגלעך נישט אקטועל. מאקסימום {{PLURAL:$1|איין רעזולטאט איז|$1 רעזולטאטן זענען}} פאראן אין זאפאס.",
 	"perfcachedts": "די פאלגנדע דאטן זענען פונעם זאַפאַס, וואס איז לעצט געווארן דערהײַנטיגט $1. מאקסימום {{PLURAL:$4|איין רעזולטאט איז|$4 רעזולטאטן זענען}} פאראן אין זאפאס",
@@ -923,7 +926,8 @@
 	"rows": "שורות:",
 	"columns": "עמודים:",
 	"searchresultshead": "זוכן",
-	"stub-threshold": "שוועל פֿאַר <a href=\"#\" class=\"stub\">שטומף לינק</a> פֿאָרמאַטירונג (בייטן):",
+	"stub-threshold": "שוועל פֿאַר שטומף לינק פֿאָרמאַטירונג ($1):",
+	"stub-threshold-sample-link": "ביישפיל",
 	"stub-threshold-disabled": "אַנולירט",
 	"recentchangesdays": "צאל פון טעג צו ווייזן אין די לעצטע ענדערונגן:",
 	"recentchangesdays-max": "מאַקסימום $1 {{PLURAL:$1|טאָג|טעג}}",
@@ -1159,6 +1163,7 @@
 	"action-editmyprivateinfo": "רעדאקטירן אײַער פריוואטע אינפארמאציע",
 	"action-editcontentmodel": "רעדאקטירן אינהאלט־מאדעל פון א בלאט",
 	"action-managechangetags": "שאפן און אויסמעקן טאגן פון דער דאטנבאזע",
+	"action-applychangetags": "אנווענדן טאגן צוזאמען מיט אייערע ענדערונגען",
 	"nchanges": "{{PLURAL:$1|ענדערונג|$1 ענדערונגען}}",
 	"enhancedrc-since-last-visit": "$1 {{PLURAL:$1|זײַט לעצטן וויזיט}}",
 	"enhancedrc-history": "היסטאריע",
@@ -1312,6 +1317,19 @@
 	"upload-too-many-redirects": "דער URL אַנטהאַלט צופֿיל ווײַטערפֿירונגען.",
 	"upload-http-error": "א HTTP גרײַז האט פאַסירט: $1",
 	"upload-copy-upload-invalid-domain": "ארויפלאדן טעקעס פון דעם דאמיין נישט מעגלעך.",
+	"upload-dialog-title": "אַרױפֿלאָדן טעקע",
+	"upload-dialog-error": "א גרײַז האט פאסירט",
+	"upload-dialog-warning": "א ווארענונג האט פאסירט",
+	"upload-dialog-button-cancel": "אַנולירן",
+	"upload-dialog-button-done": "ערליידיקט",
+	"upload-dialog-button-save": "אויפֿהיטן",
+	"upload-dialog-button-upload": "אַרויפֿלאָדן",
+	"upload-dialog-label-select-file": "קלויבן טעקע",
+	"upload-dialog-label-infoform-title": "פרטים",
+	"upload-dialog-label-infoform-name": "נאָמען",
+	"upload-dialog-label-infoform-description": "באַשרײבונג",
+	"upload-dialog-label-usage-title": "באניץ",
+	"upload-dialog-label-usage-filename": "טעקע נאמען",
 	"backend-fail-stream": "קען נישט מאכן שטראמען טעקע $1.",
 	"backend-fail-notexists": "נישט פֿאראן די טעקע $1.",
 	"backend-fail-notsame": "א נישט־אידענטישע טעקע עקזיסטירט שוין ביי \"$1\".",
@@ -1346,6 +1364,7 @@
 	"uploadstash-nofiles": "איר האט נישט קיין טעקעס אין זאפאס.",
 	"uploadstash-errclear": "אוועקנעמען די טעקעס דורכגעפאלן.",
 	"uploadstash-refresh": "דערפֿרישן די רשימה פון טעקעס",
+	"invalid-chunk-offset": "אומגילטיקער סטארטפונקט",
 	"img-auth-accessdenied": "צוטריט אָפגעזאָגט",
 	"img-auth-notindir": "געשיכטעס שטעג איז נישט אין דער קאנפיגורטער ארויפלאד־דירעקטאריע.",
 	"img-auth-badtitle": "קען נישט שאפֿן א גילטיקן טיטל פֿון \"$1\"",
@@ -1585,7 +1604,7 @@
 	"booksources-text": "אונטן איז א ליסטע פון סייטס וואס פֿארקויפֿן נייע און גענוצטע ביכער און האבן אויך נאך אינפֿארמאציע וועגן די ביכער וואס איר זוכט:",
 	"booksources-invalid-isbn": "דאָס געגעבענע ISBN זעט נישט אויס צו זיין גילטיק; קאנטראלירט פֿאַר גרײַזן בײַם קאפּירן פון דעם ערשטיקן מקור.",
 	"specialloguserlabel": "אויספֿירער:",
-	"speciallogtitlelabel": "ציל (טיטל אדער באניצער):",
+	"speciallogtitlelabel": "ציל (טיטל אדער {{ns:user}}:באניצער־נאמען פאר א באניצער):",
 	"log": "לאגביכער",
 	"all-logs-page": "אלע פובליקע לאגביכער",
 	"alllogstext": "קאמבינירטער אויסשטעל פון אלע לאגביכער פון {{SITENAME}} בנמצא.\nמען קען פֿאַרשמעלרן די אויסוואל דורך אויסוויילן א סארט לאג, באַניצער נאמען אדער אנרירנדע בלעטער.",
@@ -2221,7 +2240,7 @@
 	"tooltip-ca-nstab-main": "זעט דעם אינהאַלט בלאַט",
 	"tooltip-ca-nstab-user": "זעט דעם באניצער בלאט",
 	"tooltip-ca-nstab-media": "קוקט אין דעם מעדיע בלאט",
-	"tooltip-ca-nstab-special": "דאס איז א ספעציעלער בלאט, מ'קען אים נישט ענדערן",
+	"tooltip-ca-nstab-special": "דאס איז א ספעציעלער בלאט, מ'קען אים נישט רעדאקטירן",
 	"tooltip-ca-nstab-project": "באקוקט דעם פראיעקט בלאט",
 	"tooltip-ca-nstab-image": "באקוקט דעם טעקע בלאט",
 	"tooltip-ca-nstab-mediawiki": "באקוקט די סיסטעם מעלדונגען",
diff --git a/languages/i18n/zh-hans.json b/languages/i18n/zh-hans.json
index ac3cb4eb0c..7113f38bd7 100644
--- a/languages/i18n/zh-hans.json
+++ b/languages/i18n/zh-hans.json
@@ -998,7 +998,8 @@
 	"rows": "行数：",
 	"columns": "列数：",
 	"searchresultshead": "搜索",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">短链接</a>格式阈值（字节）：",
+	"stub-threshold": "短链接格式阈值（$1）：",
+	"stub-threshold-sample-link": "样例",
 	"stub-threshold-disabled": "停用",
 	"recentchangesdays": "最近更改中显示的天数：",
 	"recentchangesdays-max": "最多$1天",
@@ -1718,7 +1719,7 @@
 	"booksources-text": "下面是销售新书和二手书的其他网站的链接的列表，也可能有关于你正在寻找的图书的更多信息：",
 	"booksources-invalid-isbn": "提供的ISBN号码并不正确，请检查原始复制来源号码是否有误。",
 	"specialloguserlabel": "执行者：",
-	"speciallogtitlelabel": "目标（标题或用户）：",
+	"speciallogtitlelabel": "目标（标题，或对于用户使用{{ns:user}}:用户名）：",
 	"log": "日志",
 	"all-logs-page": "所有公开日志",
 	"alllogstext": "所有{{SITENAME}}公开日志的联合展示。您可以通过选择日志类型、输入用户名（区分大小写）或相关页面（区分大小写）筛选日志条目。",
@@ -2387,7 +2388,7 @@
 	"tooltip-t-recentchangeslinked": "链自本页的页面的最近更改",
 	"tooltip-feed-rss": "本页面的RSS源",
 	"tooltip-feed-atom": "本页面的Atom源",
-	"tooltip-t-contributions": "该用户的贡献的列表",
+	"tooltip-t-contributions": "由此用户做出的贡献列表",
 	"tooltip-t-emailuser": "给该用户发送电子邮件",
 	"tooltip-t-info": "关于此页面的更多信息",
 	"tooltip-t-upload": "上传文件",
@@ -2397,7 +2398,7 @@
 	"tooltip-ca-nstab-main": "查看内容页面",
 	"tooltip-ca-nstab-user": "查看用户页面",
 	"tooltip-ca-nstab-media": "查看媒体文件页面",
-	"tooltip-ca-nstab-special": "这是特殊页面，你无法编辑该页",
+	"tooltip-ca-nstab-special": "这是特殊页面，并且它不能被编辑",
 	"tooltip-ca-nstab-project": "查看项目页面",
 	"tooltip-ca-nstab-image": "查看文件页面",
 	"tooltip-ca-nstab-mediawiki": "查看系统消息",
diff --git a/languages/i18n/zh-hant.json b/languages/i18n/zh-hant.json
index b7958214f3..a56e266962 100644
--- a/languages/i18n/zh-hant.json
+++ b/languages/i18n/zh-hant.json
@@ -971,7 +971,8 @@
 	"rows": "列數：",
 	"columns": "欄數：",
 	"searchresultshead": "搜尋",
-	"stub-threshold": "<a href=\"#\" class=\"stub\">短頁面連結</a>格式門檻值 (位元組)：",
+	"stub-threshold": "短頁面連結格式門檻值 ($1)：",
+	"stub-threshold-sample-link": "樣本",
 	"stub-threshold-disabled": "已停用",
 	"recentchangesdays": "近期變更顯示的天數：",
 	"recentchangesdays-max": "最多 $1 {{PLURAL:$1|天}}",
@@ -1689,7 +1690,7 @@
 	"booksources-text": "下列清單包含其他銷售新書籍或二手書籍的網站連結，可會有你想尋找書籍的進一部資訊：",
 	"booksources-invalid-isbn": "您提供的 ISBN 不正確，請檢查複製的來源是否有誤。",
 	"specialloguserlabel": "執行者：",
-	"speciallogtitlelabel": "目標 (標題或使用者)：",
+	"speciallogtitlelabel": "目標 (標題或以 {{ns:user}}:使用者 表示使用者)：",
 	"log": "日誌",
 	"all-logs-page": "所有公開日誌",
 	"alllogstext": "合併顯示所有 {{SITENAME}} 中所有類型的日誌。\n您可以點選下拉式選單選擇日誌的類型，指定使用者名稱 (區分大小寫) 或影響的頁面 (區分大小寫)。",
diff --git a/languages/i18n/zh-tw.json b/languages/i18n/zh-tw.json
index 74a454201b..8e5704e785 100644
--- a/languages/i18n/zh-tw.json
+++ b/languages/i18n/zh-tw.json
@@ -338,7 +338,6 @@
     "lonelypagestext": "以下頁面尚未被這個wiki中的其它頁面連結。",
     "uncategorizedimages": "待分類圖片",
     "unusedimages": "未使用圖片",
-    "popularpages": "熱門頁面",
     "mostimages": "最多連結圖片",
     "prefixindex": "所有頁面之前綴",
     "deadendpagestext": "以下頁面沒有連結到這個wiki中的其它頁面。",
@@ -415,7 +414,6 @@
     "sp-contributions-blocklog": "封鎖記錄",
     "sp-contributions-userrights": "使用者權限管理",
     "sp-contributions-username": "IP位址或使用者名稱：",
-    "whatlinkshere-title": "鏈接到$1的頁面",
     "blockip": "封鎖使用者",
     "ipadressorusername": "IP地址或使用者名:",
     "ipbreason-dropdown": "*一般的封鎖理由\n** 屢次增加不實資料\n** 刪除頁面內容\n** 外部連結廣告\n** 在頁面中增加無意義文字\n** 無禮的行為、攻擊／騷擾別人\n** 濫用多個帳號\n** 不能接受的使用者名",
diff --git a/languages/messages/MessagesAce.php b/languages/messages/MessagesAce.php
index 40627a252f..4f7638a7c3 100644
--- a/languages/messages/MessagesAce.php
+++ b/languages/messages/MessagesAce.php
@@ -116,7 +116,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Peugah_haba_lon' ),
 	'Newimages'                 => array( 'Beureukaih_baro' ),
 	'Newpages'                  => array( 'On_baro' ),
-	'Popularpages'              => array( 'On_meuceuhu' ),
 	'Preferences'               => array( 'Geunalak' ),
 	'Prefixindex'               => array( 'Dapeuta_neuaway' ),
 	'Protectedpages'            => array( 'On_nyang_geupeulindong' ),
diff --git a/languages/messages/MessagesAf.php b/languages/messages/MessagesAf.php
index 7482841abe..320efa30e9 100644
--- a/languages/messages/MessagesAf.php
+++ b/languages/messages/MessagesAf.php
@@ -151,7 +151,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Nuwe_beelde', 'Nuwebeelde', 'Nuwe_lêers', 'Nuwelêers' ),
 	'Newpages'                  => array( 'Nuwe_bladsye', 'Nuwebladsye' ),
 	'PasswordReset'             => array( 'WagwoordHerstel' ),
-	'Popularpages'              => array( 'PopulêreBladsye' ),
 	'Preferences'               => array( 'Voorkeure' ),
 	'Prefixindex'               => array( 'VoorvoegselIndeks' ),
 	'Protectedpages'            => array( 'BeskermdeBladsye' ),
diff --git a/languages/messages/MessagesAln.php b/languages/messages/MessagesAln.php
index 588cf340df..98b8b66037 100644
--- a/languages/messages/MessagesAln.php
+++ b/languages/messages/MessagesAln.php
@@ -44,7 +44,6 @@ $namespaceGenderAliases = array(
 );
 
 $specialPageAliases = array(
-	'Popularpages'              => array( 'Faqe të famshme' ),
 	'Search'                    => array( 'Kërko' ),
 );
 
diff --git a/languages/messages/MessagesAn.php b/languages/messages/MessagesAn.php
index 7ec924e646..4f84bfb930 100644
--- a/languages/messages/MessagesAn.php
+++ b/languages/messages/MessagesAn.php
@@ -88,7 +88,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'A_mía_descusión', 'A_mía_pachina_de_descusión' ),
 	'Newimages'                 => array( 'Nuevos_fichers', 'Nuevas_imáchens', 'Nuevas_imachens', 'Nuebas_imachens' ),
 	'Newpages'                  => array( 'Pachinas_nuevas', 'Pachinas_recients', 'Pachinas_nuebas', 'Pachinas_más_nuebas', 'Pachinas_más_rezients', 'Pachinas_rezients' ),
-	'Popularpages'              => array( 'Pachinas_populars', 'Pachinas_más_populars' ),
 	'Preferences'               => array( 'Preferencias' ),
 	'Prefixindex'               => array( 'Pachinas_por_prefixo', 'Mirar_por_prefixo' ),
 	'Protectedpages'            => array( 'Pachinas_protechitas', 'Pachinas_protechidas' ),
diff --git a/languages/messages/MessagesAr.php b/languages/messages/MessagesAr.php
index 781799007e..54412370d8 100644
--- a/languages/messages/MessagesAr.php
+++ b/languages/messages/MessagesAr.php
@@ -373,7 +373,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'لغة_الصفحة' ),
 	'PasswordReset'             => array( 'إعادة_ضبط_كلمة_السر' ),
 	'PermanentLink'             => array( 'وصلة_دائمة', 'رابط_دائم' ),
-	'Popularpages'              => array( 'صفحات_مشهورة' ),
 	'Preferences'               => array( 'تفضيلات' ),
 	'Prefixindex'               => array( 'فهرس_بادئة' ),
 	'Protectedpages'            => array( 'صفحات_محمية' ),
diff --git a/languages/messages/MessagesArc.php b/languages/messages/MessagesArc.php
index f88650b35e..c833b0273e 100644
--- a/languages/messages/MessagesArc.php
+++ b/languages/messages/MessagesArc.php
@@ -70,7 +70,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'ܠܦܦ̈ܐ_ܚܕ̈ܬܐ', 'ܨܘܪ̈ܬܐ_ܚܕ̈ܬܬܐ' ),
 	'Newpages'                  => array( 'ܦܐܬܬ̈ܐ_ܚܕ̈ܬܬܐ' ),
 	'PermanentLink'             => array( 'ܐܣܘܪܐ_ܦܝܘܫܐ' ),
-	'Popularpages'              => array( 'ܦܐܬܬ̈ܐ_ܡܫܡܗ̈ܐ' ),
 	'Preferences'               => array( 'ܨܒܝܢܝܘ̈ܬܐ' ),
 	'Protectedpages'            => array( 'ܦܐܬܬ̈ܐ_ܢܛܝܪ̈ܬܐ' ),
 	'Protectedtitles'           => array( 'ܟܘܢܝ̈ܐ_ܢܛܝܪ̈ܐ' ),
diff --git a/languages/messages/MessagesArz.php b/languages/messages/MessagesArz.php
index 4d0b3db679..e2078ad400 100644
--- a/languages/messages/MessagesArz.php
+++ b/languages/messages/MessagesArz.php
@@ -102,7 +102,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'لغه_الصفحه' ),
 	'PasswordReset'             => array( 'ضبط_الباسوورد' ),
 	'PermanentLink'             => array( 'وصله_دايمه' ),
-	'Popularpages'              => array( 'صفح_مشهوره' ),
 	'Preferences'               => array( 'تفضيلات' ),
 	'Prefixindex'               => array( 'فهرس_بدايه' ),
 	'Protectedpages'            => array( 'صفح_محميه' ),
diff --git a/languages/messages/MessagesAs.php b/languages/messages/MessagesAs.php
index f9f1b5b269..e173661177 100644
--- a/languages/messages/MessagesAs.php
+++ b/languages/messages/MessagesAs.php
@@ -106,7 +106,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'পৰৱৰ্তী_পৃষ্ঠা' ),
 	'PasswordReset'             => array( 'গুপ্তশব্দ_ঘূৰাই_আনক' ),
 	'PermanentLink'             => array( 'স্থায়ী_সংযোগ' ),
-	'Popularpages'              => array( 'জনপ্ৰিয়_পৃষ্ঠাসমূহ' ),
 	'Preferences'               => array( 'পচন্দ' ),
 	'Protectedpages'            => array( 'সুৰক্ষিত_পৃষ্ঠাসমূহ' ),
 	'Protectedtitles'           => array( 'সুৰক্ষিত_শিৰোনামসমূহ' ),
diff --git a/languages/messages/MessagesAv.php b/languages/messages/MessagesAv.php
index ea64271c1b..34b2ba0fc0 100644
--- a/languages/messages/MessagesAv.php
+++ b/languages/messages/MessagesAv.php
@@ -72,7 +72,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'ЦІиял_гьумерал' ),
 	'PasswordReset'             => array( 'Сброс_пароля' ),
 	'PermanentLink'             => array( 'Даимаб_ссылка' ),
-	'Popularpages'              => array( 'Машгьурал_гьумерал' ),
 	'Preferences'               => array( 'Рекъезабиял' ),
 	'Prefixindex'               => array( 'ЦІаразул_бетІералде_бихьизаби' ),
 	'Protectedpages'            => array( 'ЦІунарал_гьумерал' ),
diff --git a/languages/messages/MessagesAvk.php b/languages/messages/MessagesAvk.php
index 0892ec9f3a..0c8b1e6dbc 100644
--- a/languages/messages/MessagesAvk.php
+++ b/languages/messages/MessagesAvk.php
@@ -62,7 +62,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'JinafaPrilara' ),
 	'Newimages'                 => array( 'WarzafEwaveem' ),
 	'Newpages'                  => array( 'WarzafBueem' ),
-	'Popularpages'              => array( 'LorupenBueem' ),
 	'Preferences'               => array( 'Lodamaceem' ),
 	'Protectedpages'            => array( 'NendanBueem' ),
 	'Protectedtitles'           => array( 'NendanVergumvelteem' ),
diff --git a/languages/messages/MessagesBa.php b/languages/messages/MessagesBa.php
index aaf6c2b7c2..50ed217590 100644
--- a/languages/messages/MessagesBa.php
+++ b/languages/messages/MessagesBa.php
@@ -91,7 +91,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Яңы_биттәр' ),
 	'PasswordReset'             => array( 'Паролде_яңыртыу' ),
 	'PermanentLink'             => array( 'Даими_һылтанма' ),
-	'Popularpages'              => array( 'Популяр_биттәр' ),
 	'Preferences'               => array( 'Көйләүҙәр' ),
 	'Protectedpages'            => array( 'Һаҡланған_биттәр' ),
 	'Protectedtitles'           => array( 'Һаҡланған_исемдәр' ),
diff --git a/languages/messages/MessagesBcc.php b/languages/messages/MessagesBcc.php
index f9ee1bea90..b32067cb24 100644
--- a/languages/messages/MessagesBcc.php
+++ b/languages/messages/MessagesBcc.php
@@ -97,7 +97,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'منی گپ' ),
 	'Newimages'                 => array( 'نوکین عکسان' ),
 	'Newpages'                  => array( 'نوکین صفحات' ),
-	'Popularpages'              => array( 'مردمی صفحات' ),
 	'Preferences'               => array( 'ترجیحات' ),
 	'Prefixindex'               => array( 'ایندکس پیشوند' ),
 	'Protectedpages'            => array( 'صفحات محافظتی' ),
diff --git a/languages/messages/MessagesBe_tarask.php b/languages/messages/MessagesBe_tarask.php
index 5a2a7a074f..2309d7941a 100644
--- a/languages/messages/MessagesBe_tarask.php
+++ b/languages/messages/MessagesBe_tarask.php
@@ -72,7 +72,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Мае_размовы' ),
 	'Newimages'                 => array( 'Новыя_файлы' ),
 	'Newpages'                  => array( 'Новыя_старонкі' ),
-	'Popularpages'              => array( 'Папулярныя_старонкі' ),
 	'Protectedpages'            => array( 'Абароненыя_старонкі' ),
 	'Protectedtitles'           => array( 'Забароненыя_старонкі' ),
 	'Randompage'                => array( 'Выпадковая_старонка' ),
diff --git a/languages/messages/MessagesBg.php b/languages/messages/MessagesBg.php
index 242581775f..322255f3d4 100644
--- a/languages/messages/MessagesBg.php
+++ b/languages/messages/MessagesBg.php
@@ -85,7 +85,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Моята_беседа' ),
 	'Newimages'                 => array( 'Нови_файлове' ),
 	'Newpages'                  => array( 'Нови_страници' ),
-	'Popularpages'              => array( 'Най-посещавани_страници' ),
 	'Preferences'               => array( 'Настройки' ),
 	'Prefixindex'               => array( 'Всички_страници_с_представка', 'Представка' ),
 	'Protectedpages'            => array( 'Защитени_страници' ),
diff --git a/languages/messages/MessagesBgn.php b/languages/messages/MessagesBgn.php
index 0c9fa2660e..45a13bf4d4 100644
--- a/languages/messages/MessagesBgn.php
+++ b/languages/messages/MessagesBgn.php
@@ -106,7 +106,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'وّرق_ئی_زبان' ),
 	'PasswordReset'             => array( 'چیهرگالی_نادینتین' ),
 	'PermanentLink'             => array( 'دایمین_لینک' ),
-	'Popularpages'              => array( 'مشهورین_وّرق_ئان' ),
 	'Preferences'               => array( 'تنزیمات' ),
 	'Prefixindex'               => array( 'دیمۆندین_نمایگ' ),
 	'Protectedpages'            => array( 'قُلپ_بوته_ئین_ورق_ئان' ),
diff --git a/languages/messages/MessagesBjn.php b/languages/messages/MessagesBjn.php
index 07246a4ae1..4cd2022705 100644
--- a/languages/messages/MessagesBjn.php
+++ b/languages/messages/MessagesBjn.php
@@ -99,7 +99,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Barakas_hanyar' ),
 	'Newpages'                  => array( 'Tungkaran_hanyar' ),
 	'PermanentLink'             => array( 'Tautan_tatap' ),
-	'Popularpages'              => array( 'Tungkaran_popular' ),
 	'Preferences'               => array( 'Kakatujuan' ),
 	'Protectedpages'            => array( 'Tungkaran_nang_dilindungi' ),
 	'Protectedtitles'           => array( 'Judul_nang_dilindungi' ),
diff --git a/languages/messages/MessagesBr.php b/languages/messages/MessagesBr.php
index 66cef9edd3..040beda790 100644
--- a/languages/messages/MessagesBr.php
+++ b/languages/messages/MessagesBr.php
@@ -71,7 +71,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MaC\'haozeadennoù' ),
 	'Newimages'                 => array( 'RestroùNevez', 'SkeudennoùNevez' ),
 	'Newpages'                  => array( 'PajennoùNevez' ),
-	'Popularpages'              => array( 'PajennoùPoblek' ),
 	'Preferences'               => array( 'Penndibaboù' ),
 	'Protectedpages'            => array( 'PajennoùGwarezet' ),
 	'Protectedtitles'           => array( 'TitloùGwarezet' ),
diff --git a/languages/messages/MessagesBs.php b/languages/messages/MessagesBs.php
index e553b7f0cd..a5f33fe927 100644
--- a/languages/messages/MessagesBs.php
+++ b/languages/messages/MessagesBs.php
@@ -90,7 +90,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MojRazgovor' ),
 	'Newimages'                 => array( 'Nove_datoteke', 'Nove_slike' ),
 	'Newpages'                  => array( 'NoveStranice' ),
-	'Popularpages'              => array( 'PopularneStranice' ),
 	'Preferences'               => array( 'Postavke' ),
 	'Prefixindex'               => array( 'IndeksPrefiksa' ),
 	'Protectedpages'            => array( 'ZasticeneStranice' ),
diff --git a/languages/messages/MessagesBxr.php b/languages/messages/MessagesBxr.php
index f9a58ca439..8ae5e4cb29 100644
--- a/languages/messages/MessagesBxr.php
+++ b/languages/messages/MessagesBxr.php
@@ -60,7 +60,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Минии_хэлэлсэл' ),
 	'Myuploads'                 => array( 'Минии_ашаалһан_зүйл' ),
 	'Newpages'                  => array( 'Шэнэ_хуудаһан' ),
-	'Popularpages'              => array( 'Оло_уншагдаһан_хуудаһан' ),
 	'Protectedpages'            => array( 'Хамгаалалтатай_хуудаһан' ),
 	'Protectedtitles'           => array( 'Хамгаалалтатай_гаршаг' ),
 	'Recentchanges'             => array( 'Сайтдахи_хубилалтанууд' ),
diff --git a/languages/messages/MessagesCa.php b/languages/messages/MessagesCa.php
index 29c9a16222..9169f97d7f 100644
--- a/languages/messages/MessagesCa.php
+++ b/languages/messages/MessagesCa.php
@@ -82,7 +82,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Discussió_personal' ),
 	'Newimages'                 => array( 'Imatges_noves', 'Fitxers_nous' ),
 	'Newpages'                  => array( 'Pàgines_noves' ),
-	'Popularpages'              => array( 'Pàgines_populars' ),
 	'Preferences'               => array( 'Preferències' ),
 	'Prefixindex'               => array( 'Cerca_per_prefix' ),
 	'Protectedpages'            => array( 'Pàgines_protegides' ),
diff --git a/languages/messages/MessagesCdo.php b/languages/messages/MessagesCdo.php
index 1bc4385892..f175246ac1 100644
--- a/languages/messages/MessagesCdo.php
+++ b/languages/messages/MessagesCdo.php
@@ -88,7 +88,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( '新其頁面' ),
 	'PasswordReset'             => array( '密碼重置' ),
 	'PermanentLink'             => array( '永久鏈接' ),
-	'Popularpages'              => array( '受歡迎其頁面' ),
 	'Preferences'               => array( '喜好' ),
 	'Prefixindex'               => array( '前綴索引' ),
 	'Protectedpages'            => array( '受保護其頁面' ),
diff --git a/languages/messages/MessagesCe.php b/languages/messages/MessagesCe.php
index 514ec17df5..f146a86bfa 100644
--- a/languages/messages/MessagesCe.php
+++ b/languages/messages/MessagesCe.php
@@ -126,7 +126,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Керла_агӀонаш' ),
 	'PasswordReset'             => array( 'Пароль_кхоссар' ),
 	'PermanentLink'             => array( 'Гуттарлера_хьажорг' ),
-	'Popularpages'              => array( 'ГӀараяьлла_агӀонаш' ),
 	'Preferences'               => array( 'ГӀирсаш' ),
 	'Prefixindex'               => array( 'Хьалха_агӀонийн_цӀераш_хӀотто_еза' ),
 	'Protectedpages'            => array( 'ГӀаролла_дина_агӀонаш' ),
diff --git a/languages/messages/MessagesCkb.php b/languages/messages/MessagesCkb.php
index 027161fbe8..cdde53a381 100644
--- a/languages/messages/MessagesCkb.php
+++ b/languages/messages/MessagesCkb.php
@@ -81,7 +81,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'لێدوانەکەم' ),
 	'Newimages'                 => array( 'پەڕگە_نوێکان' ),
 	'Newpages'                  => array( 'پەڕە_نوێکان' ),
-	'Popularpages'              => array( 'پەڕە_ناودارەکان' ),
 	'Preferences'               => array( 'ھەڵبژاردەکان' ),
 	'Protectedpages'            => array( 'پەڕە_پارێزراوەکان' ),
 	'Protectedtitles'           => array( 'بابەتە_پارێزراوەکان' ),
diff --git a/languages/messages/MessagesCs.php b/languages/messages/MessagesCs.php
index b796acad02..609629f56e 100644
--- a/languages/messages/MessagesCs.php
+++ b/languages/messages/MessagesCs.php
@@ -98,7 +98,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Moje_diskuse' ),
 	'Newimages'                 => array( 'Nové_obrázky', 'Galerie_nových_obrázků', 'Nove_obrazky' ),
 	'Newpages'                  => array( 'Nové_stránky', 'Nove_stranky', 'Nejnovější_stránky', 'Nejnovejsi_stranky' ),
-	'Popularpages'              => array( 'Nejnavštěvovanější_stránky', 'Nejnavstevovanejsi_stranky' ),
 	'Preferences'               => array( 'Nastavení', 'Nastaveni' ),
 	'Protectedpages'            => array( 'Zamčené_stránky', 'Zamcene_stranky' ),
 	'Protectedtitles'           => array( 'Zamčené_názvy', 'Zamcene_nazvy', 'Stránky_které_nelze_vytvořit' ),
diff --git a/languages/messages/MessagesDa.php b/languages/messages/MessagesDa.php
index 075369ed07..d2096e9062 100644
--- a/languages/messages/MessagesDa.php
+++ b/languages/messages/MessagesDa.php
@@ -87,7 +87,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Min_diskussionsside' ),
 	'Newimages'                 => array( 'Nye_filer' ),
 	'Newpages'                  => array( 'Nye_sider' ),
-	'Popularpages'              => array( 'Populære_sider' ),
 	'Preferences'               => array( 'Indstillinger' ),
 	'Prefixindex'               => array( 'Præfiksindeks' ),
 	'Protectedpages'            => array( 'Beskyttede_sider' ),
diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index c9994e2632..b5c1475dbe 100644
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -105,7 +105,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Seitensprache' ),
 	'PasswordReset'             => array( 'Passwort_neu_vergeben' ),
 	'PermanentLink'             => array( 'Permanenter_Link', 'Permalink' ),
-	'Popularpages'              => array( 'Beliebteste_Seiten' ),
 	'Preferences'               => array( 'Einstellungen' ),
 	'Prefixindex'               => array( 'Präfixindex' ),
 	'Protectedpages'            => array( 'Geschützte_Seiten' ),
diff --git a/languages/messages/MessagesDiq.php b/languages/messages/MessagesDiq.php
index 445aba04cd..6adf6f1604 100644
--- a/languages/messages/MessagesDiq.php
+++ b/languages/messages/MessagesDiq.php
@@ -118,7 +118,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Zıwanê_Pele' ),
 	'PasswordReset'             => array( 'ParolaPeysereştış' ),
 	'PermanentLink'             => array( 'GıreyoDaimi' ),
-	'Popularpages'              => array( 'PelêPopuleri' ),
 	'Preferences'               => array( 'Tercihi' ),
 	'Prefixindex'               => array( 'VerbendZerrek' ),
 	'Protectedpages'            => array( 'PelêKeŞevekiyayiyé' ),
diff --git a/languages/messages/MessagesDsb.php b/languages/messages/MessagesDsb.php
index f291a1d4be..06b90f39e9 100644
--- a/languages/messages/MessagesDsb.php
+++ b/languages/messages/MessagesDsb.php
@@ -89,7 +89,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mója_diskusija' ),
 	'Newimages'                 => array( 'Nowe_dataje' ),
 	'Newpages'                  => array( 'Nowe_boki' ),
-	'Popularpages'              => array( 'Woblubowane_boki' ),
 	'Preferences'               => array( 'Nastajenja' ),
 	'Prefixindex'               => array( 'Indeks_prefiksow' ),
 	'Protectedpages'            => array( 'Šćitane_boki' ),
diff --git a/languages/messages/MessagesEl.php b/languages/messages/MessagesEl.php
index 0334344e39..5f239fbf87 100644
--- a/languages/messages/MessagesEl.php
+++ b/languages/messages/MessagesEl.php
@@ -117,7 +117,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'ΤαΑρχείαΜου', 'ΤαΑνεβάσματάΜου', 'ΟιΕπιφορτώσειςΜου' ),
 	'Newimages'                 => array( 'ΝέαΑρχεία', 'ΝέεςΕικόνες' ),
 	'Newpages'                  => array( 'ΝέεςΣελίδες' ),
-	'Popularpages'              => array( 'ΔημοφιλείςΣελίδες' ),
 	'Preferences'               => array( 'Προτιμήσεις' ),
 	'Prefixindex'               => array( 'ΕυρετήριοΠροθεμάτων' ),
 	'Protectedpages'            => array( 'ΠροστατευμένεςΣελίδες' ),
diff --git a/languages/messages/MessagesEn.php b/languages/messages/MessagesEn.php
index 57a79bcecf..4e6f12b61c 100644
--- a/languages/messages/MessagesEn.php
+++ b/languages/messages/MessagesEn.php
@@ -644,4 +644,3 @@ $preloadedMessages = array(
 	'whatlinkshere',
 	'word-separator',
 );
-
diff --git a/languages/messages/MessagesEo.php b/languages/messages/MessagesEo.php
index e31710b96b..958fa6f88c 100644
--- a/languages/messages/MessagesEo.php
+++ b/languages/messages/MessagesEo.php
@@ -109,7 +109,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Novaj_paĝoj' ),
 	'PasswordReset'             => array( 'Ŝanĝo_de_pasvorto' ),
 	'PermanentLink'             => array( 'DaÅ­ra_ligilo' ),
-	'Popularpages'              => array( 'Popularaj_paĝoj' ),
 	'Preferences'               => array( 'Preferoj' ),
 	'Prefixindex'               => array( 'Indekso_de_prefiksoj' ),
 	'Protectedpages'            => array( 'Protektitaj_paĝoj' ),
diff --git a/languages/messages/MessagesEs.php b/languages/messages/MessagesEs.php
index 52e363c476..dfd97f5fa4 100644
--- a/languages/messages/MessagesEs.php
+++ b/languages/messages/MessagesEs.php
@@ -99,7 +99,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'PáginasNuevas', 'Páginas_nuevas' ),
 	'PasswordReset'             => array( 'RestablecerContraseña' ),
 	'PermanentLink'             => array( 'EnlacePermanente' ),
-	'Popularpages'              => array( 'PáginasMásVisitadas', 'PáginasPopulares', 'Páginas_más_visitadas' ),
 	'Preferences'               => array( 'Preferencias' ),
 	'Prefixindex'               => array( 'PáginasPorPrefijo', 'Páginas_por_prefijo' ),
 	'Protectedpages'            => array( 'PáginasProtegidas', 'Páginas_protegidas' ),
diff --git a/languages/messages/MessagesEt.php b/languages/messages/MessagesEt.php
index 1aaabd6e28..b8ef36064a 100644
--- a/languages/messages/MessagesEt.php
+++ b/languages/messages/MessagesEt.php
@@ -94,7 +94,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Atribuudiga_leheküljed' ),
 	'PasswordReset'             => array( 'Parooli_lähtestamine' ),
 	'PermanentLink'             => array( 'Püsilink' ),
-	'Popularpages'              => array( 'Loetumad_leheküljed' ),
 	'Preferences'               => array( 'Eelistused' ),
 	'Prefixindex'               => array( 'Kõik_pealkirjad_eesliitega' ),
 	'Protectedpages'            => array( 'Kaitstud_leheküljed' ),
diff --git a/languages/messages/MessagesFa.php b/languages/messages/MessagesFa.php
index dd1cc55346..fa359fc70d 100644
--- a/languages/messages/MessagesFa.php
+++ b/languages/messages/MessagesFa.php
@@ -105,7 +105,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'زبان_صفحه' ),
 	'PasswordReset'             => array( 'بازنشاندن_گذرواژه' ),
 	'PermanentLink'             => array( 'پیوند_دائمی' ),
-	'Popularpages'              => array( 'صفحه‌های_محبوب' ),
 	'Preferences'               => array( 'ترجیحات' ),
 	'Prefixindex'               => array( 'نمایه_پیشوندی' ),
 	'Protectedpages'            => array( 'صفحه‌های_محافظت‌شده' ),
diff --git a/languages/messages/MessagesFi.php b/languages/messages/MessagesFi.php
index 1219911996..fd5db32ebf 100644
--- a/languages/messages/MessagesFi.php
+++ b/languages/messages/MessagesFi.php
@@ -98,7 +98,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Sivun_kieli' ),
 	'PasswordReset'             => array( 'Unohtuneen_salasanan_vaihto' ),
 	'PermanentLink'             => array( 'Ikilinkki' ),
-	'Popularpages'              => array( 'Suositut_sivut' ),
 	'Preferences'               => array( 'Asetukset' ),
 	'Prefixindex'               => array( 'Etuliiteluettelo' ),
 	'Protectedpages'            => array( 'Suojatut_sivut' ),
diff --git a/languages/messages/MessagesFr.php b/languages/messages/MessagesFr.php
index b9e8b544e0..b64922ee4a 100644
--- a/languages/messages/MessagesFr.php
+++ b/languages/messages/MessagesFr.php
@@ -100,7 +100,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Pages_avec_la_propriété' ),
 	'PasswordReset'             => array( 'Réinitialisation_du_mot_de_passe', 'RéinitialisationDuMotDePasse' ),
 	'PermanentLink'             => array( 'LienPermanent', 'Lien_permanent' ),
-	'Popularpages'              => array( 'Pages_les_plus_visitées', 'Pages_les_plus_visitees', 'Pageslesplusvisitées', 'Pageslesplusvisitees' ),
 	'Preferences'               => array( 'Préférences' ),
 	'Prefixindex'               => array( 'Index', 'Préfixes', 'Prefixes' ),
 	'Protectedpages'            => array( 'Pages_protégées', 'PagesProtégées', 'Pages_protegees', 'PagesProtegees' ),
diff --git a/languages/messages/MessagesFrp.php b/languages/messages/MessagesFrp.php
index 51a0e1322c..6c25ae9a7b 100644
--- a/languages/messages/MessagesFrp.php
+++ b/languages/messages/MessagesFrp.php
@@ -102,7 +102,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Novéls_fichiérs', 'NovélsFichiérs', 'Émâges_novèles', 'ÉmâgesNovèles' ),
 	'Newpages'                  => array( 'Pâges_novèles', 'PâgesNovèles' ),
 	'PermanentLink'             => array( 'Lim_fixo', 'LimFixo' ),
-	'Popularpages'              => array( 'Pâges_les_ples_consultâs', 'PâgesLesPlesConsultâs' ),
 	'Preferences'               => array( 'Prèferences' ),
 	'Prefixindex'               => array( 'Endèxe_des_prèfixos', 'EndèxeDesPrèfixos' ),
 	'Protectedpages'            => array( 'Pâges_protègiês', 'PâgesProtègiês' ),
diff --git a/languages/messages/MessagesFur.php b/languages/messages/MessagesFur.php
index 52fdee8a55..03ac8e5a06 100644
--- a/languages/messages/MessagesFur.php
+++ b/languages/messages/MessagesFur.php
@@ -64,7 +64,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MêsDiscussions' ),
 	'Newimages'                 => array( 'GnovisFiguris' ),
 	'Newpages'                  => array( 'GnovisPagjinis' ),
-	'Popularpages'              => array( 'PagjinisPopolârs' ),
 	'Preferences'               => array( 'Preferencis' ),
 	'Prefixindex'               => array( 'Prefìs' ),
 	'Protectedpages'            => array( 'PagjinisProtezudis' ),
diff --git a/languages/messages/MessagesFy.php b/languages/messages/MessagesFy.php
index e02baf0c2a..473e212fa0 100644
--- a/languages/messages/MessagesFy.php
+++ b/languages/messages/MessagesFy.php
@@ -94,7 +94,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Myn oerlis' ),
 	'Newimages'                 => array( 'Nije ôfbylden', 'Nije ôfbyldings', 'Nije ôfbyldingen', 'List mei nije ôfbylden', 'Nije Ofbylden' ),
 	'Newpages'                  => array( 'Nije siden' ),
-	'Popularpages'              => array( 'Populêre siden', 'Grage siden' ),
 	'Preferences'               => array( 'Ynstellings', 'Ynsteld' ),
 	'Prefixindex'               => array( 'Alle siden neffens foarheaksel' ),
 	'Protectedpages'            => array( 'Befeilige siden', 'Skoattele siden' ),
diff --git a/languages/messages/MessagesGag.php b/languages/messages/MessagesGag.php
index 390e6589d6..059b8a06b4 100644
--- a/languages/messages/MessagesGag.php
+++ b/languages/messages/MessagesGag.php
@@ -66,7 +66,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'SözleşmäkSayfam', 'SözleşmäkYapraım' ),
 	'Newimages'                 => array( 'EniDosyeler', 'EniPätretler' ),
 	'Newpages'                  => array( 'EniYazılar', 'EniSayfalar', 'EniYapraklar' ),
-	'Popularpages'              => array( 'EnAnılmışSayfalar', 'EnAnılmışYazılar' ),
 	'Preferences'               => array( 'Seçimner' ),
 	'Prefixindex'               => array( 'PrefiksÄ°ndeksi' ),
 	'Randompage'                => array( 'Razgele', 'RazgeleYazı', 'RazgeleSayfa', 'RazgeleYaprak' ),
diff --git a/languages/messages/MessagesGl.php b/languages/messages/MessagesGl.php
index 8ab5bccc1c..e00988cb45 100644
--- a/languages/messages/MessagesGl.php
+++ b/languages/messages/MessagesGl.php
@@ -113,7 +113,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Páxinas_con_propiedades' ),
 	'PasswordReset'             => array( 'Restablecer_o_contrasinal', 'Restablecer_contrasinal' ),
 	'PermanentLink'             => array( 'Ligazón_permanente' ),
-	'Popularpages'              => array( 'Páxinas_populares' ),
 	'Preferences'               => array( 'Preferencias' ),
 	'Prefixindex'               => array( 'Índice_de_prefixos' ),
 	'Protectedpages'            => array( 'Páxinas_protexidas' ),
diff --git a/languages/messages/MessagesGsw.php b/languages/messages/MessagesGsw.php
index d16549584b..52833cb5e3 100644
--- a/languages/messages/MessagesGsw.php
+++ b/languages/messages/MessagesGsw.php
@@ -68,7 +68,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Neji_Syte' ),
 	'PasswordReset'             => array( 'Passwort_zruggsetze' ),
 	'PermanentLink'             => array( 'Permalink' ),
-	'Popularpages'              => array( 'Beliebteschti_Syte' ),
 	'Preferences'               => array( 'Ystellige' ),
 	'Prefixindex'               => array( 'Vorsilbeverzeichnis' ),
 	'Protectedpages'            => array( 'Gschitzti_Syte' ),
diff --git a/languages/messages/MessagesGu.php b/languages/messages/MessagesGu.php
index 3fc9f6bdab..937b50db3b 100644
--- a/languages/messages/MessagesGu.php
+++ b/languages/messages/MessagesGu.php
@@ -74,7 +74,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'મારીચર્ચા' ),
 	'Newimages'                 => array( 'નવીફાઇલો', 'નવાંચિત્રો' ),
 	'Newpages'                  => array( 'નવાપાનાં' ),
-	'Popularpages'              => array( 'લોકપ્રિયપાનાં' ),
 	'Preferences'               => array( 'પસંદ' ),
 	'Prefixindex'               => array( 'ઉપસર્ગ' ),
 	'Protectedpages'            => array( 'સંરક્ષિતપાનાં' ),
diff --git a/languages/messages/MessagesHe.php b/languages/messages/MessagesHe.php
index 3d7fc43db4..e80611826f 100644
--- a/languages/messages/MessagesHe.php
+++ b/languages/messages/MessagesHe.php
@@ -108,7 +108,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'שפת_הדף' ),
 	'PasswordReset'             => array( 'איפוס_סיסמה' ),
 	'PermanentLink'             => array( 'קישור_קבוע' ),
-	'Popularpages'              => array( 'הדפים_הנצפים_ביותר', 'דפים_פופולריים' ),
 	'Preferences'               => array( 'העדפות', 'ההעדפות_שלי' ),
 	'Prefixindex'               => array( 'דפים_המתחילים_ב' ),
 	'Protectedpages'            => array( 'דפים_מוגנים' ),
diff --git a/languages/messages/MessagesHr.php b/languages/messages/MessagesHr.php
index 65077c1eff..6452b007c7 100644
--- a/languages/messages/MessagesHr.php
+++ b/languages/messages/MessagesHr.php
@@ -88,7 +88,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'Moje_datoteke' ),
 	'Newimages'                 => array( 'Nove_datoteke', 'Nove_slike' ),
 	'Newpages'                  => array( 'Nove_stranice' ),
-	'Popularpages'              => array( 'Popularne_stranice' ),
 	'Preferences'               => array( 'Postavke' ),
 	'Prefixindex'               => array( 'Prefiks_indeks', 'Stranice_po_prefiksu' ),
 	'Protectedpages'            => array( 'Zaštićene_stranice' ),
diff --git a/languages/messages/MessagesHsb.php b/languages/messages/MessagesHsb.php
index fb8fdb3b50..e06512b2e5 100644
--- a/languages/messages/MessagesHsb.php
+++ b/languages/messages/MessagesHsb.php
@@ -106,7 +106,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Nowe_dataje' ),
 	'Newpages'                  => array( 'Nowe_strony' ),
 	'PermanentLink'             => array( 'Trajny_wotkaz' ),
-	'Popularpages'              => array( 'Najwoblubowaniše_strony' ),
 	'Preferences'               => array( 'Nastajenja' ),
 	'Prefixindex'               => array( 'Prefiksindeks' ),
 	'Protectedpages'            => array( 'Å kitane_strony' ),
diff --git a/languages/messages/MessagesHt.php b/languages/messages/MessagesHt.php
index 18e4a2df47..d345fabcda 100644
--- a/languages/messages/MessagesHt.php
+++ b/languages/messages/MessagesHt.php
@@ -94,7 +94,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'PajNouvo' ),
 	'PasswordReset'             => array( 'ResètMopas2' ),
 	'PermanentLink'             => array( 'LyenPouToutTan' ),
-	'Popularpages'              => array( 'PajPopilè' ),
 	'Preferences'               => array( 'Preferans' ),
 	'Prefixindex'               => array( 'EndèksPrefiks' ),
 	'Protectedpages'            => array( 'PajPwoteje' ),
diff --git a/languages/messages/MessagesHu.php b/languages/messages/MessagesHu.php
index 0019a4b873..3309314743 100644
--- a/languages/messages/MessagesHu.php
+++ b/languages/messages/MessagesHu.php
@@ -98,7 +98,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Új_fájlok', 'Új_képek', 'Új_képek_galériája' ),
 	'Newpages'                  => array( 'Új_lapok' ),
 	'PasswordReset'             => array( 'Jelszó_helyreállítása' ),
-	'Popularpages'              => array( 'Népszerű_lapok', 'Népszerű_oldalak' ),
 	'Preferences'               => array( 'Beállításaim' ),
 	'Prefixindex'               => array( 'Keresés_előtag_szerint' ),
 	'Protectedpages'            => array( 'Védett_lapok' ),
diff --git a/languages/messages/MessagesHy.php b/languages/messages/MessagesHy.php
index ea23ef0577..1b95c78ae9 100644
--- a/languages/messages/MessagesHy.php
+++ b/languages/messages/MessagesHy.php
@@ -223,7 +223,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Իմքննարկումները' ),
 	'Newimages'                 => array( 'Նորպատկերներ' ),
 	'Newpages'                  => array( 'Նորէջերը' ),
-	'Popularpages'              => array( 'Հանրաճանաչէջերը' ),
 	'Preferences'               => array( 'Նախընտրությունները' ),
 	'Prefixindex'               => array( 'Որոնումնախածանցով' ),
 	'Randompage'                => array( 'Պատահականէջ' ),
diff --git a/languages/messages/MessagesIa.php b/languages/messages/MessagesIa.php
index 0d4fd18c08..41f9fdfd3b 100644
--- a/languages/messages/MessagesIa.php
+++ b/languages/messages/MessagesIa.php
@@ -93,7 +93,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Paginas_nove', 'Nove_paginas' ),
 	'PasswordReset'             => array( 'Reinitialisar_contrasigno' ),
 	'PermanentLink'             => array( 'Ligamine_permanente' ),
-	'Popularpages'              => array( 'Paginas_popular' ),
 	'Preferences'               => array( 'Preferentias' ),
 	'Prefixindex'               => array( 'Indice_de_prefixos' ),
 	'Protectedpages'            => array( 'Paginas_protegite' ),
diff --git a/languages/messages/MessagesId.php b/languages/messages/MessagesId.php
index 35109313c1..1fcfa7ec90 100644
--- a/languages/messages/MessagesId.php
+++ b/languages/messages/MessagesId.php
@@ -252,7 +252,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Halaman_baru', 'HalamanBaru' ),
 	'PasswordReset'             => array( 'Reset_sandi', 'ResetSandi' ),
 	'PermanentLink'             => array( 'Pranala_permanen' ),
-	'Popularpages'              => array( 'Halaman_populer', 'HalamanPopuler' ),
 	'Preferences'               => array( 'Preferensi' ),
 	'Prefixindex'               => array( 'Indeks_awalan', 'IndeksAwalan' ),
 	'Protectedpages'            => array( 'Halaman_yang_dilindungi', 'HalamanDilindungi' ),
diff --git a/languages/messages/MessagesIe.php b/languages/messages/MessagesIe.php
index 748f82b888..699da887f4 100644
--- a/languages/messages/MessagesIe.php
+++ b/languages/messages/MessagesIe.php
@@ -81,7 +81,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Nov_págines' ),
 	'PasswordReset'             => array( 'Recomensar_parol-clave' ),
 	'PermanentLink'             => array( 'Catenun_permanen' ),
-	'Popularpages'              => array( 'Págines_populari' ),
 	'Preferences'               => array( 'Preferenties' ),
 	'Prefixindex'               => array( 'Index_de_prefixe' ),
 	'Protectedpages'            => array( 'Págines_gardat' ),
diff --git a/languages/messages/MessagesIs.php b/languages/messages/MessagesIs.php
index effce71c69..7500a23274 100644
--- a/languages/messages/MessagesIs.php
+++ b/languages/messages/MessagesIs.php
@@ -169,7 +169,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Nýjar_myndir' ),
 	'Newpages'                  => array( 'Nýjustu_greinar' ),
 	'PasswordReset'             => array( 'Endursetja_lykilorð' ),
-	'Popularpages'              => array( 'Vinsælar_síður' ),
 	'Preferences'               => array( 'Stillingar' ),
 	'Prefixindex'               => array( 'Forskeyti' ),
 	'Protectedpages'            => array( 'Verndaðar_síður' ),
diff --git a/languages/messages/MessagesIt.php b/languages/messages/MessagesIt.php
index a369d1ddec..c072a42643 100644
--- a/languages/messages/MessagesIt.php
+++ b/languages/messages/MessagesIt.php
@@ -111,7 +111,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'PagineConProprietà' ),
 	'PasswordReset'             => array( 'ReimpostaPassword' ),
 	'PermanentLink'             => array( 'LinkPermanente' ),
-	'Popularpages'              => array( 'PaginePiùVisitate' ),
 	'Preferences'               => array( 'Preferenze' ),
 	'Prefixindex'               => array( 'Prefissi' ),
 	'Protectedpages'            => array( 'PagineProtette' ),
diff --git a/languages/messages/MessagesJa.php b/languages/messages/MessagesJa.php
index caca23dd18..ecf64ab66c 100644
--- a/languages/messages/MessagesJa.php
+++ b/languages/messages/MessagesJa.php
@@ -125,7 +125,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'ページ言語' ),
 	'PasswordReset'             => array( 'パスワード再設定', 'パスワードの再設定', 'パスワードのリセット', 'パスワードリセット' ),
 	'PermanentLink'             => array( '固定リンク', 'パーマリンク' ),
-	'Popularpages'              => array( '人気ページ' ),
 	'Preferences'               => array( '個人設定', 'オプション' ),
 	'Prefixindex'               => array( '前方一致ページ一覧', '始点指定ページ一覧' ),
 	'Protectedpages'            => array( '保護されているページ' ),
diff --git a/languages/messages/MessagesKa.php b/languages/messages/MessagesKa.php
index 598f101136..01a2b660d9 100644
--- a/languages/messages/MessagesKa.php
+++ b/languages/messages/MessagesKa.php
@@ -79,7 +79,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'ჩემი_ატვირთვები' ),
 	'Newimages'                 => array( 'ახალი_ფაილები' ),
 	'Newpages'                  => array( 'ახალი_გვერდები' ),
-	'Popularpages'              => array( 'პოპგვერდები' ),
 	'Preferences'               => array( 'კონფიგურაცია' ),
 	'Protectedpages'            => array( 'დაცული_გვერდები' ),
 	'Protectedtitles'           => array( 'დაცული_სათაურები' ),
diff --git a/languages/messages/MessagesKaa.php b/languages/messages/MessagesKaa.php
index 44b7224e6d..af1be4f50a 100644
--- a/languages/messages/MessagesKaa.php
+++ b/languages/messages/MessagesKaa.php
@@ -70,7 +70,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Menin\' sa\'wbetim' ),
 	'Newimages'                 => array( 'Taza su\'wretler' ),
 	'Newpages'                  => array( 'Taza betler' ),
-	'Popularpages'              => array( 'Ko\'p ko\'rilgen betler' ),
 	'Preferences'               => array( 'Sazlawlar' ),
 	'Protectedpages'            => array( 'Qorg\'alg\'an betler' ),
 	'Randompage'                => array( 'Qa\'legen', 'Qa\'legen bet' ),
diff --git a/languages/messages/MessagesKk_arab.php b/languages/messages/MessagesKk_arab.php
index 8749ccbef3..516da1d6df 100644
--- a/languages/messages/MessagesKk_arab.php
+++ b/languages/messages/MessagesKk_arab.php
@@ -348,7 +348,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'تالقىلاۋىم' ),
 	'Newimages'                 => array( 'جاڭا_سۋرەتتەر' ),
 	'Newpages'                  => array( 'جاڭا_بەتتەر' ),
-	'Popularpages'              => array( 'ەڭ_كوپ_قارالعان_بەتتەر', 'ايگىلى_بەتتەر' ),
 	'Preferences'               => array( 'باپتالىمدار', 'باپتاۋ' ),
 	'Prefixindex'               => array( 'ٴباستاۋىش_ٴتىزىمى' ),
 	'Protectedpages'            => array( 'قورعالعان_بەتتەر' ),
diff --git a/languages/messages/MessagesKk_cyrl.php b/languages/messages/MessagesKk_cyrl.php
index 680c2eabb8..01aaab9c2b 100644
--- a/languages/messages/MessagesKk_cyrl.php
+++ b/languages/messages/MessagesKk_cyrl.php
@@ -322,7 +322,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Талқылауым' ),
 	'Newimages'                 => array( 'Жаңа_суреттер' ),
 	'Newpages'                  => array( 'Жаңа_беттер' ),
-	'Popularpages'              => array( 'Ең_көп_қаралған_беттер', 'Әйгілі_беттер' ),
 	'Preferences'               => array( 'Бапталымдар', 'Баптау' ),
 	'Prefixindex'               => array( 'Бастауыш_тізімі' ),
 	'Protectedpages'            => array( 'Қорғалған_беттер' ),
diff --git a/languages/messages/MessagesKk_latn.php b/languages/messages/MessagesKk_latn.php
index b7f8c6fc31..7a9cbaa652 100644
--- a/languages/messages/MessagesKk_latn.php
+++ b/languages/messages/MessagesKk_latn.php
@@ -316,7 +316,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Talqılawım' ),
 	'Newimages'                 => array( 'Jaña_swretter' ),
 	'Newpages'                  => array( 'Jaña_better' ),
-	'Popularpages'              => array( 'Eñ_köp_qaralğan_better', 'Äýgili_better' ),
 	'Preferences'               => array( 'Baptalımdar', 'Baptaw' ),
 	'Prefixindex'               => array( 'Bastawış_tizimi' ),
 	'Protectedpages'            => array( 'Qorğalğan_better' ),
diff --git a/languages/messages/MessagesKm.php b/languages/messages/MessagesKm.php
index 289e5c2f84..4c412098ce 100644
--- a/languages/messages/MessagesKm.php
+++ b/languages/messages/MessagesKm.php
@@ -147,7 +147,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'ទំព័រថ្មីៗ' ),
 	'PasswordReset'             => array( 'កំណត់ពាក្យសំងាត់ឡើងវិញ' ),
 	'PermanentLink'             => array( 'តំណភ្ជាប់អចិន្ត្រែយ៍' ),
-	'Popularpages'              => array( 'ទំព័រដែលមានប្រជាប្រិយ' ),
 	'Preferences'               => array( 'ចំណង់ចំណូលចិត្ត' ),
 	'Prefixindex'               => array( 'លិបិក្រមបុព្វបទ' ),
 	'Protectedpages'            => array( 'ទំព័របានការពារ' ),
diff --git a/languages/messages/MessagesKo.php b/languages/messages/MessagesKo.php
index d34e249a9b..38265ae2c3 100644
--- a/languages/messages/MessagesKo.php
+++ b/languages/messages/MessagesKo.php
@@ -35,6 +35,7 @@
  * @author Pi.C.Noizecehx
  * @author Priviet
  * @author PuzzletChung
+ * @author Revi
  * @author TheAlpha for knowledge
  * @author ToePeu
  * @author Yjs5497
@@ -139,7 +140,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( '문서언어' ),
 	'PasswordReset'             => array( '비밀번호재설정', '비밀번호초기화' ),
 	'PermanentLink'             => array( '고유링크', '영구링크' ),
-	'Popularpages'              => array( '인기있는문서' ),
 	'Preferences'               => array( '환경설정' ),
 	'Prefixindex'               => array( '접두어찾기' ),
 	'Protectedpages'            => array( '보호된문서' ),
@@ -339,7 +339,7 @@ $magicWords = array(
 	'numberingroup'             => array( '1', '권한별사용자수', '그룹별사용자수', 'NUMBERINGROUP', 'NUMINGROUP' ),
 	'staticredirect'            => array( '1', '__넘겨주기고정__', '__STATICREDIRECT__' ),
 	'protectionlevel'           => array( '1', '보호수준', 'PROTECTIONLEVEL' ),
-	'cascadingsources'          => array( '1', '계단식원본', 'CASCADINGSOURCES' ),
+	'cascadingsources'          => array( '1', '연쇄식원본', '계단식원본', 'CASCADINGSOURCES' ),
 	'formatdate'                => array( '0', '날짜형식', 'formatdate', 'dateformat' ),
 	'url_path'                  => array( '0', '경로', 'PATH' ),
 	'url_wiki'                  => array( '0', '위키', 'WIKI' ),
diff --git a/languages/messages/MessagesKrc.php b/languages/messages/MessagesKrc.php
index 6b62160746..659f97f6f2 100644
--- a/languages/messages/MessagesKrc.php
+++ b/languages/messages/MessagesKrc.php
@@ -87,7 +87,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Джангы_бетле' ),
 	'PasswordReset'             => array( 'Паролну_ийиу' ),
 	'PermanentLink'             => array( 'Дайым_джибериу' ),
-	'Popularpages'              => array( 'Популяр_бетле' ),
 	'Preferences'               => array( 'Джарашдырыула' ),
 	'Protectedpages'            => array( 'Джакъланнган_бетле' ),
 	'Protectedtitles'           => array( 'Джакъланнган_атла' ),
diff --git a/languages/messages/MessagesKsh.php b/languages/messages/MessagesKsh.php
index b1c9d3b346..11c1a49e9e 100644
--- a/languages/messages/MessagesKsh.php
+++ b/languages/messages/MessagesKsh.php
@@ -158,7 +158,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Ming_Klaafsigg', 'Klaaf' ),
 	'Newimages'                 => array( 'Neu_Dateie' ),
 	'Newpages'                  => array( 'Neu_Atikelle' ),
-	'Popularpages'              => array( 'Miehts_affjeroofe_Sigge' ),
 	'Preferences'               => array( 'Ming_Enstellunge', 'Enstellunge' ),
 	'Prefixindex'               => array( 'Sigge_met_Aanfang' ),
 	'Protectedpages'            => array( 'Siggeschotz' ),
diff --git a/languages/messages/MessagesKw.php b/languages/messages/MessagesKw.php
index b093b58413..fc4dbd030c 100644
--- a/languages/messages/MessagesKw.php
+++ b/languages/messages/MessagesKw.php
@@ -118,7 +118,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'FolennowNowyth' ),
 	'PasswordReset'             => array( 'DassetyaGerTremena' ),
 	'PermanentLink'             => array( 'KevrenFast' ),
-	'Popularpages'              => array( 'FolennowGerysDa' ),
 	'Preferences'               => array( 'Dewisyansow' ),
 	'Prefixindex'               => array( 'MenegvaRagerow' ),
 	'Protectedpages'            => array( 'FolennowDifresys' ),
diff --git a/languages/messages/MessagesLa.php b/languages/messages/MessagesLa.php
index 9f3d904358..8ea1978d82 100644
--- a/languages/messages/MessagesLa.php
+++ b/languages/messages/MessagesLa.php
@@ -120,7 +120,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Disputatio_mea' ),
 	'Newimages'                 => array( 'Fasciculi_novi', 'Imagines_novae' ),
 	'Newpages'                  => array( 'Paginae_novae' ),
-	'Popularpages'              => array( 'Paginae_saepe_monstratae' ),
 	'Preferences'               => array( 'Praeferentiae' ),
 	'Prefixindex'               => array( 'Praefixa', 'Quaerere_per_praefixa' ),
 	'Protectedpages'            => array( 'Paginae_protectae' ),
diff --git a/languages/messages/MessagesLad.php b/languages/messages/MessagesLad.php
index cbeb69eedd..96d11ae547 100644
--- a/languages/messages/MessagesLad.php
+++ b/languages/messages/MessagesLad.php
@@ -129,7 +129,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'HojasMuevas' ),
 	'PasswordReset'             => array( 'Meter_á_zero_el_kóddiche' ),
 	'PermanentLink'             => array( 'AtamientoPermanente' ),
-	'Popularpages'              => array( 'HojasMásVisitadas' ),
 	'Preferences'               => array( 'Preferencias' ),
 	'Prefixindex'               => array( 'Fijhrist_de_prefiksos' ),
 	'Protectedpages'            => array( 'HojasGuardadas' ),
diff --git a/languages/messages/MessagesLb.php b/languages/messages/MessagesLb.php
index 203788c6ff..45cde709bc 100644
--- a/languages/messages/MessagesLb.php
+++ b/languages/messages/MessagesLb.php
@@ -116,7 +116,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Sprooch_vun_der_Säit' ),
 	'PasswordReset'             => array( 'Zrécksetze_vum_Passwuert' ),
 	'PermanentLink'             => array( 'Permanente_Link' ),
-	'Popularpages'              => array( 'Beléifst_Säiten' ),
 	'Preferences'               => array( 'Astellungen' ),
 	'Prefixindex'               => array( 'Indexsich' ),
 	'Protectedpages'            => array( 'Protegéiert_Säiten' ),
diff --git a/languages/messages/MessagesLi.php b/languages/messages/MessagesLi.php
index 4efd38ccdc..babd32b74b 100644
--- a/languages/messages/MessagesLi.php
+++ b/languages/messages/MessagesLi.php
@@ -100,7 +100,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mien_euverlèk' ),
 	'Newimages'                 => array( 'Nuuj_plaetjes' ),
 	'Newpages'                  => array( 'Nuuj_pagina\'s' ),
-	'Popularpages'              => array( 'Populair_pagina\'s' ),
 	'Preferences'               => array( 'Veurkäöre' ),
 	'Prefixindex'               => array( 'Alle_artikele' ),
 	'Protectedpages'            => array( 'Beveiligde_pagina\'s' ),
diff --git a/languages/messages/MessagesLij.php b/languages/messages/MessagesLij.php
index 8cc1a2145e..b5de5095b1 100644
--- a/languages/messages/MessagesLij.php
+++ b/languages/messages/MessagesLij.php
@@ -87,7 +87,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mæ Discûscioîn' ),
 	'Newimages'                 => array( 'Immaggini reçenti' ),
 	'Newpages'                  => array( 'Paggine ciû reçenti' ),
-	'Popularpages'              => array( 'Paggine ciû viscitæ' ),
 	'Preferences'               => array( 'Preferense' ),
 	'Prefixindex'               => array( 'Prefisci' ),
 	'Protectedpages'            => array( 'Paggine protezûe' ),
diff --git a/languages/messages/MessagesLrc.php b/languages/messages/MessagesLrc.php
index 94a7a396fd..8b706d7f9a 100644
--- a/languages/messages/MessagesLrc.php
+++ b/languages/messages/MessagesLrc.php
@@ -106,7 +106,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'بألگە_زوٙن' ),
 	'PasswordReset'             => array( 'د_نۊ_زئنە_کئردئن_رازینە_گوڤاردئن' ),
 	'PermanentLink'             => array( 'ھوم_پئیڤأند_دایئمی' ),
-	'Popularpages'              => array( 'بألگە_یا_حاستئنی' ),
 	'Preferences'               => array( 'میزوٙنکاریا' ),
 	'Prefixindex'               => array( 'دئماڤأن_سیاأ' ),
 	'Protectedpages'            => array( 'بألگە_یا_پور_و_پیم_بیە' ),
diff --git a/languages/messages/MessagesLt.php b/languages/messages/MessagesLt.php
index a2ce260a27..fdaeecd65c 100644
--- a/languages/messages/MessagesLt.php
+++ b/languages/messages/MessagesLt.php
@@ -107,7 +107,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mano_aptarimas' ),
 	'Newimages'                 => array( 'Nauji_paveikslėliai' ),
 	'Newpages'                  => array( 'Naujausi_puslapiai' ),
-	'Popularpages'              => array( 'Populiarūs_puslapiai' ),
 	'Preferences'               => array( 'Nustatymai' ),
 	'Prefixindex'               => array( 'Prasidedantys' ),
 	'Protectedpages'            => array( 'Užrakinti_puslapiai' ),
diff --git a/languages/messages/MessagesMdf.php b/languages/messages/MessagesMdf.php
index 274b724280..874dfb3592 100644
--- a/languages/messages/MessagesMdf.php
+++ b/languages/messages/MessagesMdf.php
@@ -101,7 +101,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'МоньКорхнемазе' ),
 	'Newimages'                 => array( 'ОдНяйфне' ),
 	'Newpages'                  => array( 'ОдЛопат' ),
-	'Popularpages'              => array( 'СидестаЛопатне' ),
 	'Preferences'               => array( 'Латцематне' ),
 	'Prefixindex'               => array( 'ВалынгольксИндекс' ),
 	'Protectedpages'            => array( 'АралафЛопат' ),
diff --git a/languages/messages/MessagesMg.php b/languages/messages/MessagesMg.php
index 4c962add29..3e4bfd5efc 100644
--- a/languages/messages/MessagesMg.php
+++ b/languages/messages/MessagesMg.php
@@ -187,7 +187,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Fitenim-pejy', 'Fitenimpejy' ),
 	'PasswordReset'             => array( 'Famerenan-tenimiafina', 'Famerenantenimiafina' ),
 	'PermanentLink'             => array( 'Rohy_maharitra', 'RohyMaharitra' ),
-	'Popularpages'              => array( 'Pejy_be_mpitsidika_indrindra' ),
 	'Preferences'               => array( 'Safidy' ),
 	'Prefixindex'               => array( 'Index' ),
 	'Protectedpages'            => array( 'Pejy_voaaro' ),
diff --git a/languages/messages/MessagesMin.php b/languages/messages/MessagesMin.php
index 451e373466..cbe9a8fc35 100644
--- a/languages/messages/MessagesMin.php
+++ b/languages/messages/MessagesMin.php
@@ -116,7 +116,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'LamanJoProperti', 'Laman_jo_properti' ),
 	'PasswordReset'             => array( 'TukaSandi', 'Tuka_baliak_sandi' ),
 	'PermanentLink'             => array( 'PautanPamanen', 'Pautan_pamanen' ),
-	'Popularpages'              => array( 'LamanPopuler', 'Laman_populer' ),
 	'Preferences'               => array( 'Rujuakan' ),
 	'Prefixindex'               => array( 'DaptaAwalan' ),
 	'Protectedpages'            => array( 'LamanTalinduang', 'Laman_nan_dilinduang' ),
diff --git a/languages/messages/MessagesMk.php b/languages/messages/MessagesMk.php
index 9f74d16a6b..3c7b31d7ea 100644
--- a/languages/messages/MessagesMk.php
+++ b/languages/messages/MessagesMk.php
@@ -159,7 +159,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'ЈазикНаСтраницата' ),
 	'PasswordReset'             => array( 'ПроменаНаЛозинка' ),
 	'PermanentLink'             => array( 'ПостојанаВрска' ),
-	'Popularpages'              => array( 'ПопуларниСтраници' ),
 	'Preferences'               => array( 'Нагодувања' ),
 	'Prefixindex'               => array( 'ИндексНаПретставки' ),
 	'Protectedpages'            => array( 'ЗаштитениСтраници' ),
diff --git a/languages/messages/MessagesMl.php b/languages/messages/MessagesMl.php
index d23e47f207..4de1f3153c 100644
--- a/languages/messages/MessagesMl.php
+++ b/languages/messages/MessagesMl.php
@@ -148,7 +148,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'താളിന്റെഭാഷ' ),
 	'PasswordReset'             => array( 'രഹസ്യവാക്ക്‌‌പുനക്രമീകരണം' ),
 	'PermanentLink'             => array( 'സ്ഥിരംകണ്ണി' ),
-	'Popularpages'              => array( 'ജനപ്രിയതാളുകൾ' ),
 	'Preferences'               => array( 'ക്രമീകരണങ്ങൾ' ),
 	'Prefixindex'               => array( 'പൂർവ്വപദസൂചിക' ),
 	'Protectedpages'            => array( 'സംരക്ഷിത_താളുകൾ' ),
diff --git a/languages/messages/MessagesMr.php b/languages/messages/MessagesMr.php
index 5cdb35f6bc..8c284e4cdb 100644
--- a/languages/messages/MessagesMr.php
+++ b/languages/messages/MessagesMr.php
@@ -128,7 +128,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'माझ्या_चर्चा' ),
 	'Newimages'                 => array( 'नवीन_संचिका', 'नवीन_चित्रे' ),
 	'Newpages'                  => array( 'नवीन_पाने' ),
-	'Popularpages'              => array( 'प्रसिद्ध_पाने' ),
 	'Preferences'               => array( 'पसंती' ),
 	'Prefixindex'               => array( 'उपसर्गसुची' ),
 	'Protectedpages'            => array( 'सुरक्षित_पाने' ),
diff --git a/languages/messages/MessagesMs.php b/languages/messages/MessagesMs.php
index fb972b0a8b..69d565267d 100644
--- a/languages/messages/MessagesMs.php
+++ b/languages/messages/MessagesMs.php
@@ -170,7 +170,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Bahasa_laman' ),
 	'PasswordReset'             => array( 'Tetap_semula_kata_kunci' ),
 	'PermanentLink'             => array( 'Pautan_kekal' ),
-	'Popularpages'              => array( 'Laman_popular' ),
 	'Preferences'               => array( 'Keutamaan' ),
 	'Prefixindex'               => array( 'Indeks_awalan' ),
 	'Protectedpages'            => array( 'Laman_dilindungi' ),
diff --git a/languages/messages/MessagesMt.php b/languages/messages/MessagesMt.php
index 2529cc987f..a043864033 100644
--- a/languages/messages/MessagesMt.php
+++ b/languages/messages/MessagesMt.php
@@ -100,7 +100,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'DiskussjonijietTiegħi' ),
 	'Newimages'                 => array( 'StampiÄ odda', 'FajlsÄ odda' ),
 	'Newpages'                  => array( 'PaġniĠodda' ),
-	'Popularpages'              => array( 'PaġniPopolari' ),
 	'Preferences'               => array( 'Preferenzi' ),
 	'Prefixindex'               => array( 'IndiċiPrefiss' ),
 	'Protectedpages'            => array( 'PaġniProtetti' ),
diff --git a/languages/messages/MessagesMyv.php b/languages/messages/MessagesMyv.php
index ac3342b3d3..fe3db11667 100644
--- a/languages/messages/MessagesMyv.php
+++ b/languages/messages/MessagesMyv.php
@@ -79,7 +79,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'МоньКортамом' ),
 	'Newimages'                 => array( 'ОдАртовкст' ),
 	'Newpages'                  => array( 'ОдЛопат' ),
-	'Popularpages'              => array( 'ЛисийСовийМартоЛопат' ),
 	'Protectedpages'            => array( 'ВанстоньЛопат' ),
 	'Protectedtitles'           => array( 'ВанстоньКонякст' ),
 	'Randompage'                => array( 'КодамоПонгсьЛопа' ),
diff --git a/languages/messages/MessagesNb.php b/languages/messages/MessagesNb.php
index 6f9cf1f940..08d3e93615 100644
--- a/languages/messages/MessagesNb.php
+++ b/languages/messages/MessagesNb.php
@@ -160,7 +160,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Sider_med_egenskap' ),
 	'PasswordReset'             => array( 'Nullstill_passord' ),
 	'PermanentLink'             => array( 'Permanent_lenke' ),
-	'Popularpages'              => array( 'Populære_sider' ),
 	'Preferences'               => array( 'Innstillinger' ),
 	'Prefixindex'               => array( 'Prefiksindeks' ),
 	'Protectedpages'            => array( 'Beskyttede_sider' ),
diff --git a/languages/messages/MessagesNds.php b/languages/messages/MessagesNds.php
index f87d770c74..87f460f713 100644
--- a/languages/messages/MessagesNds.php
+++ b/languages/messages/MessagesNds.php
@@ -179,7 +179,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Miene Diskuschoonssiet' ),
 	'Newimages'                 => array( 'Nee Datein' ),
 	'Newpages'                  => array( 'Nee Sieden' ),
-	'Popularpages'              => array( 'Veel besöchte Sieden' ),
 	'Preferences'               => array( 'Instellungen' ),
 	'Prefixindex'               => array( 'Sieden de anfangt mit' ),
 	'Protectedpages'            => array( 'Schuulte Sieden' ),
diff --git a/languages/messages/MessagesNds_nl.php b/languages/messages/MessagesNds_nl.php
index 5e82e82cb8..7625fef49b 100644
--- a/languages/messages/MessagesNds_nl.php
+++ b/languages/messages/MessagesNds_nl.php
@@ -278,7 +278,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Ziejen_mit_eigenschap' ),
 	'PasswordReset'             => array( 'Wachtwoord_opniej_instellen' ),
 	'PermanentLink'             => array( 'Vaste_verwiezing' ),
-	'Popularpages'              => array( 'Populaere_artikels' ),
 	'Preferences'               => array( 'Veurkeuren' ),
 	'Prefixindex'               => array( 'Veurvoegselindex' ),
 	'Protectedpages'            => array( 'Beveiligden_ziejen' ),
diff --git a/languages/messages/MessagesNl.php b/languages/messages/MessagesNl.php
index 7d7fa054e8..27af255238 100644
--- a/languages/messages/MessagesNl.php
+++ b/languages/messages/MessagesNl.php
@@ -335,7 +335,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Paginataal' ),
 	'PasswordReset'             => array( 'WachtwoordOpnieuwInstellen' ),
 	'PermanentLink'             => array( 'PermanenteVerwijzing' ),
-	'Popularpages'              => array( 'PopulairePaginas', 'PopulairePagina’s', 'PopulairePagina\'s' ),
 	'Preferences'               => array( 'Voorkeuren' ),
 	'Prefixindex'               => array( 'Voorvoegselindex' ),
 	'Protectedpages'            => array( 'BeveiligdePaginas', 'BeveiligdePagina\'s', 'BeschermdePaginas', 'BeschermdePagina’s', 'BeschermdePagina\'s' ),
diff --git a/languages/messages/MessagesNn.php b/languages/messages/MessagesNn.php
index 606f720594..4cdb3d7101 100644
--- a/languages/messages/MessagesNn.php
+++ b/languages/messages/MessagesNn.php
@@ -274,7 +274,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Nye_filer' ),
 	'Newpages'                  => array( 'Nye_sider' ),
 	'PermanentLink'             => array( 'Permanent_lenkje', 'Permanent_lenke' ),
-	'Popularpages'              => array( 'Populære_sider' ),
 	'Preferences'               => array( 'Innstillingar' ),
 	'Prefixindex'               => array( 'Prefiksindeks' ),
 	'Protectedpages'            => array( 'Verna_sider' ),
diff --git a/languages/messages/MessagesOc.php b/languages/messages/MessagesOc.php
index 64220d8918..443cd90efc 100644
--- a/languages/messages/MessagesOc.php
+++ b/languages/messages/MessagesOc.php
@@ -106,7 +106,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mas_discussions', 'Masdiscussions' ),
 	'Newimages'                 => array( 'Imatges_novèls', 'ImatgesNovèls' ),
 	'Newpages'                  => array( 'Paginas_novèlas' ),
-	'Popularpages'              => array( 'Paginas_mai_visitadas', 'Paginas_las_mai_visitadas', 'Paginasmaivisitadas' ),
 	'Preferences'               => array( 'Preferéncias' ),
 	'Prefixindex'               => array( 'Indèx' ),
 	'Protectedpages'            => array( 'Paginas_protegidas' ),
diff --git a/languages/messages/MessagesOr.php b/languages/messages/MessagesOr.php
index f3bea17478..5df9cdf70b 100644
--- a/languages/messages/MessagesOr.php
+++ b/languages/messages/MessagesOr.php
@@ -131,7 +131,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'ନୂଆଫାଇଲ' ),
 	'Newpages'                  => array( 'ନୂଆପୃଷ୍ଠା' ),
 	'PermanentLink'             => array( 'ଚିରକାଳଲିଙ୍କ' ),
-	'Popularpages'              => array( 'ଜଣାଶୁଣାପୃଷ୍ଠା' ),
 	'Preferences'               => array( 'ପସନ୍ଦ' ),
 	'Prefixindex'               => array( 'ଆଗରେଯୋଡ଼ାହେବାଇଣ୍ଡେକ୍ସ' ),
 	'Protectedpages'            => array( 'କିଳାଯାଇଥିବାପୃଷ୍ଠା' ),
diff --git a/languages/messages/MessagesOs.php b/languages/messages/MessagesOs.php
index 3c6561087d..17902091c5 100644
--- a/languages/messages/MessagesOs.php
+++ b/languages/messages/MessagesOs.php
@@ -109,7 +109,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'НогФæрстæ' ),
 	'PasswordReset'             => array( 'ПарольНогКæнын' ),
 	'PermanentLink'             => array( 'УдгасÆрвитæн' ),
-	'Popularpages'              => array( 'АрæхФæрстæ' ),
 	'Preferences'               => array( 'Уагæвæрдтæ' ),
 	'Prefixindex'               => array( 'РазæфтуантыИндекс' ),
 	'Protectedpages'            => array( 'ÆхгæдФæрстæ' ),
diff --git a/languages/messages/MessagesPa.php b/languages/messages/MessagesPa.php
index 3e3090c624..988e0b0459 100644
--- a/languages/messages/MessagesPa.php
+++ b/languages/messages/MessagesPa.php
@@ -128,7 +128,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'ਸਫ਼ੇ_ਦੀ_ਭਾਸ਼ਾ' ),
 	'PasswordReset'             => array( 'ਪਾਸਵਰਡ_ਰੀਸੈੱਟ' ),
 	'PermanentLink'             => array( 'ਪੱਕਾ_ਲਿੰਕ', 'ਪੱਕੀ_ਕੜੀ' ),
-	'Popularpages'              => array( 'ਮਸ਼ਹੂਰ_ਸਫ਼ੇ' ),
 	'Preferences'               => array( 'ਪਸੰਦਾਂ' ),
 	'Prefixindex'               => array( 'ਅਗੇਤਰ_ਤਤਕਰਾ' ),
 	'Protectedpages'            => array( 'ਸੁਰੱਖਿਅਤ_ਸਫ਼ੇ' ),
diff --git a/languages/messages/MessagesPl.php b/languages/messages/MessagesPl.php
index 4c822760ac..8f1fbf4e25 100644
--- a/languages/messages/MessagesPl.php
+++ b/languages/messages/MessagesPl.php
@@ -187,7 +187,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Strony_z_własnością' ),
 	'PasswordReset'             => array( 'Wyczyść_hasło' ),
 	'PermanentLink'             => array( 'Niezmienny_link' ),
-	'Popularpages'              => array( 'Popularne_strony' ),
 	'Preferences'               => array( 'Preferencje' ),
 	'Prefixindex'               => array( 'Strony_według_prefiksu' ),
 	'Protectedpages'            => array( 'Zabezpieczone_strony' ),
diff --git a/languages/messages/MessagesPs.php b/languages/messages/MessagesPs.php
index fbc94194a9..df393a6eed 100644
--- a/languages/messages/MessagesPs.php
+++ b/languages/messages/MessagesPs.php
@@ -64,7 +64,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'زما_خبرې_اترې' ),
 	'Newimages'                 => array( 'نوي_انځورونه' ),
 	'Newpages'                  => array( 'نوي_مخونه' ),
-	'Popularpages'              => array( 'نامتومخونه' ),
 	'Preferences'               => array( 'غوره_توبونه' ),
 	'Prefixindex'               => array( 'د_مختاړيو_ليکلړ' ),
 	'Protectedpages'            => array( 'ژغورلي_مخونه' ),
diff --git a/languages/messages/MessagesPt.php b/languages/messages/MessagesPt.php
index 7a293f6de8..814a7f436c 100644
--- a/languages/messages/MessagesPt.php
+++ b/languages/messages/MessagesPt.php
@@ -174,7 +174,6 @@ $specialPageAliases = array(
 	'PagesWithProp'             => array( 'Propriedades_de_página' ),
 	'PasswordReset'             => array( 'Redefinir_autenticação' ),
 	'PermanentLink'             => array( 'Ligação_permanente', 'Link_permanente' ),
-	'Popularpages'              => array( 'Páginas_populares', 'Artigos_populares' ),
 	'Preferences'               => array( 'Preferências' ),
 	'Prefixindex'               => array( 'Índice_por_prefixo', 'Índice_de_prefixo' ),
 	'Protectedpages'            => array( 'Páginas_protegidas', 'Artigos_protegidos' ),
diff --git a/languages/messages/MessagesPt_br.php b/languages/messages/MessagesPt_br.php
index 8a63470608..cc69fd4deb 100644
--- a/languages/messages/MessagesPt_br.php
+++ b/languages/messages/MessagesPt_br.php
@@ -177,7 +177,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Arquivos_novos', 'Imagens_novas', 'Ficheiros_novos' ),
 	'Newpages'                  => array( 'Páginas_novas', 'Artigos_novos' ),
 	'PermanentLink'             => array( 'Ligação_permanente', 'Link_permanente' ),
-	'Popularpages'              => array( 'Páginas_populares', 'Artigos_populares' ),
 	'Preferences'               => array( 'Preferências' ),
 	'Prefixindex'               => array( 'Índice_de_prefixo', 'Índice_por_prefixo' ),
 	'Protectedpages'            => array( 'Páginas_protegidas', 'Artigos_protegidos' ),
diff --git a/languages/messages/MessagesQu.php b/languages/messages/MessagesQu.php
index 97afe6ba48..9a3b57e2ed 100644
--- a/languages/messages/MessagesQu.php
+++ b/languages/messages/MessagesQu.php
@@ -100,7 +100,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'MusuqPanqa' ),
 	'PasswordReset'             => array( 'YaykunaRimaKutichina' ),
 	'PermanentLink'             => array( 'KakuqTinki' ),
-	'Popularpages'              => array( 'WatukuqsapaPanqa', 'RikuqsapaPanqa', 'QhawaqsapaPanqa' ),
 	'Preferences'               => array( 'Allinkachina', 'Allinkachinakuna' ),
 	'Prefixindex'               => array( 'QallarinaKaskaSutisuyu' ),
 	'Protectedpages'            => array( 'AmachasqaPanqa' ),
diff --git a/languages/messages/MessagesRo.php b/languages/messages/MessagesRo.php
index 3d62d4315e..b13be7b524 100644
--- a/languages/messages/MessagesRo.php
+++ b/languages/messages/MessagesRo.php
@@ -243,7 +243,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'Imagini_noi' ),
 	'Newpages'                  => array( 'Pagini_noi' ),
 	'PasswordReset'             => array( 'Resetare_parolă' ),
-	'Popularpages'              => array( 'Pagini_populare' ),
 	'Preferences'               => array( 'Preferințe' ),
 	'Prefixindex'               => array( 'Index' ),
 	'Protectedpages'            => array( 'Pagini_protejate' ),
diff --git a/languages/messages/MessagesRu.php b/languages/messages/MessagesRu.php
index a74c9db97d..1c5e371f68 100644
--- a/languages/messages/MessagesRu.php
+++ b/languages/messages/MessagesRu.php
@@ -194,7 +194,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Новые_страницы' ),
 	'PasswordReset'             => array( 'Сброс_пароля' ),
 	'PermanentLink'             => array( 'Постоянная_ссылка' ),
-	'Popularpages'              => array( 'Популярные_страницы' ),
 	'Preferences'               => array( 'Настройки' ),
 	'Prefixindex'               => array( 'Указатель_по_началу_названия' ),
 	'Protectedpages'            => array( 'Защищённые_страницы' ),
diff --git a/languages/messages/MessagesRue.php b/languages/messages/MessagesRue.php
index cb23741808..255ed6678c 100644
--- a/languages/messages/MessagesRue.php
+++ b/languages/messages/MessagesRue.php
@@ -100,7 +100,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Новы_сторінкы' ),
 	'PasswordReset'             => array( 'Ресет_гесла' ),
 	'PermanentLink'             => array( 'Тырвалый_одказ' ),
-	'Popularpages'              => array( 'Популарны_сторінкы' ),
 	'Preferences'               => array( 'Наставлїня' ),
 	'Protectedpages'            => array( 'Замкнуты_сторінкы' ),
 	'Protectedtitles'           => array( 'Замкнуты_назвы' ),
diff --git a/languages/messages/MessagesSa.php b/languages/messages/MessagesSa.php
index 423055a4eb..35bc37a810 100644
--- a/languages/messages/MessagesSa.php
+++ b/languages/messages/MessagesSa.php
@@ -142,7 +142,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'नूतनसंचिका', 'नूतनचित्रानि' ),
 	'Newpages'                  => array( 'नूतनपृष्टानि' ),
 	'PasswordReset'             => array( 'सङ्केतशब्दपुन:प्रयु्क्ता' ),
-	'Popularpages'              => array( 'लोकप्रियपृष्टानि' ),
 	'Preferences'               => array( 'इष्टतमानि' ),
 	'Prefixindex'               => array( 'उपसर्गअनुक्रमणी' ),
 	'Protectedpages'            => array( 'सुरक्षितपृष्टानि' ),
diff --git a/languages/messages/MessagesScn.php b/languages/messages/MessagesScn.php
index 6cc09a9dea..9016a0b1e0 100644
--- a/languages/messages/MessagesScn.php
+++ b/languages/messages/MessagesScn.php
@@ -110,7 +110,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'PaginePiùRecenti' ),
 	'PasswordReset'             => array( 'ReimpostaPassword' ),
 	'PermanentLink'             => array( 'LinkPermanente' ),
-	'Popularpages'              => array( 'PaginePiùVisitate' ),
 	'Preferences'               => array( 'Preferenze' ),
 	'Prefixindex'               => array( 'Prefissi' ),
 	'Protectedpages'            => array( 'PagineProtette' ),
diff --git a/languages/messages/MessagesSd.php b/languages/messages/MessagesSd.php
index adfc05e33b..2339c07c17 100644
--- a/languages/messages/MessagesSd.php
+++ b/languages/messages/MessagesSd.php
@@ -66,7 +66,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'مون سان ڳالهه' ),
 	'Newimages'                 => array( 'نوان عڪس' ),
 	'Newpages'                  => array( 'نوان صفحا' ),
-	'Popularpages'              => array( 'مقبول صفحا' ),
 	'Preferences'               => array( 'ترجيحات' ),
 	'Prefixindex'               => array( 'اڳياڙي ڏسڻي' ),
 	'Protectedpages'            => array( 'تحفظيل صفحا' ),
diff --git a/languages/messages/MessagesSdc.php b/languages/messages/MessagesSdc.php
index 4ab9c11cdb..fe982369b6 100644
--- a/languages/messages/MessagesSdc.php
+++ b/languages/messages/MessagesSdc.php
@@ -68,7 +68,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MéDischussioni' ),
 	'Newimages'                 => array( 'ImmaginiRizzenti' ),
 	'Newpages'                  => array( 'PàginiPiùRizzenti' ),
-	'Popularpages'              => array( 'PàginiPiùVisitaddi' ),
 	'Preferences'               => array( 'Prifirènzi' ),
 	'Prefixindex'               => array( 'Prefissi' ),
 	'Protectedpages'            => array( 'PàginiPrutiggiddi' ),
diff --git a/languages/messages/MessagesSe.php b/languages/messages/MessagesSe.php
index 1917f32b8a..66fa2e4c65 100644
--- a/languages/messages/MessagesSe.php
+++ b/languages/messages/MessagesSe.php
@@ -80,7 +80,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Mu_ságastallan' ),
 	'Newimages'                 => array( 'Ođđa_govat', 'Ođđa_fiillat' ),
 	'Newpages'                  => array( 'Ođđa_siiddut' ),
-	'Popularpages'              => array( 'Bivnnuhis_siiddut' ),
 	'Preferences'               => array( 'Válljemat', 'Ásahusat' ),
 	'Protectedpages'            => array( 'Suodjaluvvon_siiddut' ),
 	'Protectedtitles'           => array( 'Suodjaluvvon_bajilčállagat', 'Suodjaluvvon_siidonamat' ),
diff --git a/languages/messages/MessagesSh.php b/languages/messages/MessagesSh.php
index f8aa19f7c0..9fb137ab5d 100644
--- a/languages/messages/MessagesSh.php
+++ b/languages/messages/MessagesSh.php
@@ -76,7 +76,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'Moje_postavljene_datoteke' ),
 	'Newimages'                 => array( 'Nove_datoteke', 'Nove_slike' ),
 	'Newpages'                  => array( 'Nove_stranice' ),
-	'Popularpages'              => array( 'Popularne_stranice' ),
 	'Preferences'               => array( 'Postavke' ),
 	'Prefixindex'               => array( 'Prefiks_indeks', 'Stranice_po_prefiksu' ),
 	'Protectedpages'            => array( 'Zaštićene_stranice' ),
diff --git a/languages/messages/MessagesSi.php b/languages/messages/MessagesSi.php
index 1ac48a00ce..e13e0147fa 100644
--- a/languages/messages/MessagesSi.php
+++ b/languages/messages/MessagesSi.php
@@ -107,7 +107,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'මගේ_සාකච්ඡාව' ),
 	'Newimages'                 => array( 'නව_ගොනු', 'නව_රූප' ),
 	'Newpages'                  => array( 'නව_පිටුව' ),
-	'Popularpages'              => array( 'ජනප්‍රිය_පිටු' ),
 	'Preferences'               => array( 'අභිරුචියන්' ),
 	'Prefixindex'               => array( 'උපසර්ග_සූචිය' ),
 	'Protectedpages'            => array( 'ආරක්‍ෂිත_පිටුව' ),
diff --git a/languages/messages/MessagesSk.php b/languages/messages/MessagesSk.php
index 83155dab25..26d474f705 100644
--- a/languages/messages/MessagesSk.php
+++ b/languages/messages/MessagesSk.php
@@ -81,7 +81,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MojaDiskusia' ),
 	'Newimages'                 => array( 'NovéSúbory' ),
 	'Newpages'                  => array( 'NovéStránky' ),
-	'Popularpages'              => array( 'PopulárneStránky' ),
 	'Preferences'               => array( 'Nastavenia' ),
 	'Prefixindex'               => array( 'IndexPredpon' ),
 	'Protectedpages'            => array( 'ZamknutéStránky' ),
diff --git a/languages/messages/MessagesSl.php b/languages/messages/MessagesSl.php
index ea6b569d9f..bc7afb95a1 100644
--- a/languages/messages/MessagesSl.php
+++ b/languages/messages/MessagesSl.php
@@ -81,7 +81,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MojPogovor' ),
 	'Newimages'                 => array( 'NoveDatoteke', 'NoveSlike' ),
 	'Newpages'                  => array( 'NoveStrani' ),
-	'Popularpages'              => array( 'PriljubljeneStrani' ),
 	'Preferences'               => array( 'Nastavitve' ),
 	'Protectedpages'            => array( 'ZaščiteneStrani' ),
 	'Protectedtitles'           => array( 'ZaščiteniNaslovi' ),
diff --git a/languages/messages/MessagesSq.php b/languages/messages/MessagesSq.php
index 71180c33d7..c647010d61 100644
--- a/languages/messages/MessagesSq.php
+++ b/languages/messages/MessagesSq.php
@@ -96,7 +96,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'NgarkimeteMia' ),
 	'Newimages'                 => array( 'SkedaTëReja' ),
 	'Newpages'                  => array( 'FaqeteReja' ),
-	'Popularpages'              => array( 'FaqetëFamshme' ),
 	'Preferences'               => array( 'Preferencat' ),
 	'Protectedpages'            => array( 'FaqeteMbrojtura' ),
 	'Protectedtitles'           => array( 'TitujteMbrojtur' ),
diff --git a/languages/messages/MessagesSr_ec.php b/languages/messages/MessagesSr_ec.php
index 0f89cca6f3..a325067644 100644
--- a/languages/messages/MessagesSr_ec.php
+++ b/languages/messages/MessagesSr_ec.php
@@ -143,7 +143,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'НовеДатотеке', 'НовиФајлови', 'НовеСлике' ),
 	'Newpages'                  => array( 'НовеСтране' ),
 	'PermanentLink'             => array( 'Привремена_веза' ),
-	'Popularpages'              => array( 'Популарне_странице' ),
 	'Preferences'               => array( 'Подешавања', 'Поставке' ),
 	'Protectedpages'            => array( 'ЗаштићенеСтранице', 'Заштићене_странице' ),
 	'Protectedtitles'           => array( 'ЗаштићениНаслови', 'Заштићени_наслови' ),
diff --git a/languages/messages/MessagesSu.php b/languages/messages/MessagesSu.php
index 9092e9e8df..b4643f0a6c 100644
--- a/languages/messages/MessagesSu.php
+++ b/languages/messages/MessagesSu.php
@@ -88,7 +88,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'ObrolanKuring' ),
 	'Newimages'                 => array( 'GambarAnyar' ),
 	'Newpages'                  => array( 'KacaAnyar' ),
-	'Popularpages'              => array( 'KacaPayu' ),
 	'Preferences'               => array( 'Preferensi' ),
 	'Prefixindex'               => array( 'IndeksAwalan' ),
 	'Protectedpages'            => array( 'KacaDikonci' ),
diff --git a/languages/messages/MessagesSv.php b/languages/messages/MessagesSv.php
index 48e3511115..f85659f4ab 100644
--- a/languages/messages/MessagesSv.php
+++ b/languages/messages/MessagesSv.php
@@ -156,7 +156,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Sidspråk' ),
 	'PasswordReset'             => array( 'Återställ_lösenord' ),
 	'PermanentLink'             => array( 'Permanent_länk' ),
-	'Popularpages'              => array( 'Populära_sidor' ),
 	'Preferences'               => array( 'Inställningar' ),
 	'Protectedpages'            => array( 'Skyddade_sidor' ),
 	'Protectedtitles'           => array( 'Skyddade_titlar' ),
diff --git a/languages/messages/MessagesSw.php b/languages/messages/MessagesSw.php
index c653de307a..311b6cc381 100644
--- a/languages/messages/MessagesSw.php
+++ b/languages/messages/MessagesSw.php
@@ -89,7 +89,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'MajadilianoYangu' ),
 	'Newimages'                 => array( 'FailiMpya', 'FailimpyazaPicha' ),
 	'Newpages'                  => array( 'KurasaMpya' ),
-	'Popularpages'              => array( 'KurasaMaarufu' ),
 	'Preferences'               => array( 'Mapendekezo' ),
 	'Prefixindex'               => array( 'KurasaKuu' ),
 	'Protectedpages'            => array( 'KurasaZilizolindwa' ),
diff --git a/languages/messages/MessagesTe.php b/languages/messages/MessagesTe.php
index 5a5e44bf4f..808df084d8 100644
--- a/languages/messages/MessagesTe.php
+++ b/languages/messages/MessagesTe.php
@@ -101,7 +101,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'నాచర్చ' ),
 	'Newimages'                 => array( 'కొత్తఫైళ్లు', 'కొత్తబొమ్మలు' ),
 	'Newpages'                  => array( 'కొత్తపేజీలు' ),
-	'Popularpages'              => array( 'ప్రాచుర్యంపొందినపేజీలు' ),
 	'Preferences'               => array( 'అభిరుచులు' ),
 	'Protectedpages'            => array( 'సంరక్షితపేజీలు' ),
 	'Randompage'                => array( 'యాదృచ్చికపేజీ' ),
diff --git a/languages/messages/MessagesTh.php b/languages/messages/MessagesTh.php
index 140073ab27..99b2ab4abe 100644
--- a/languages/messages/MessagesTh.php
+++ b/languages/messages/MessagesTh.php
@@ -110,7 +110,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'หน้าใหม่' ),
 	'PasswordReset'             => array( 'ตั้งรหัสผ่านใหม่' ),
 	'PermanentLink'             => array( 'ลิงก์ถาวร' ),
-	'Popularpages'              => array( 'หน้าที่ได้รับความนิยม' ),
 	'Preferences'               => array( 'การตั้งค่า', 'ตั้งค่า' ),
 	'Prefixindex'               => array( 'ดัชนีตามคำขึ้นต้น' ),
 	'Protectedpages'            => array( 'หน้าที่ถูกป้องกัน' ),
diff --git a/languages/messages/MessagesTl.php b/languages/messages/MessagesTl.php
index 799dc345f1..c111a02e08 100644
--- a/languages/messages/MessagesTl.php
+++ b/languages/messages/MessagesTl.php
@@ -104,7 +104,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Bagong_mga_pahina' ),
 	'PasswordReset'             => array( 'Muling_Pagtatakda_ng_Hudyat' ),
 	'PermanentLink'             => array( 'Pamalagiang_Kawing' ),
-	'Popularpages'              => array( 'Sikat_na_mga_pahina' ),
 	'Preferences'               => array( 'Mga_nais' ),
 	'Prefixindex'               => array( 'Talatuntunan_ng_unlapi' ),
 	'Protectedpages'            => array( 'Mga_pahinang_nakasanggalang' ),
diff --git a/languages/messages/MessagesTr.php b/languages/messages/MessagesTr.php
index 0f61a96b7c..ffd23f7b86 100644
--- a/languages/messages/MessagesTr.php
+++ b/languages/messages/MessagesTr.php
@@ -153,7 +153,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'YeniSayfalar' ),
 	'PasswordReset'             => array( 'ParolaSıfırlama' ),
 	'PermanentLink'             => array( 'KalıcıBağ' ),
-	'Popularpages'              => array( 'PopülerSayfalar' ),
 	'Preferences'               => array( 'Tercihler', 'Ayarlar' ),
 	'Prefixindex'               => array( 'ÖnekDizini' ),
 	'Protectedpages'            => array( 'KorunanSayfalar' ),
diff --git a/languages/messages/MessagesTt_cyrl.php b/languages/messages/MessagesTt_cyrl.php
index 0487c8f7ac..8a61e33a33 100644
--- a/languages/messages/MessagesTt_cyrl.php
+++ b/languages/messages/MessagesTt_cyrl.php
@@ -145,7 +145,6 @@ $specialPageAliases = array(
 	'Mytalk'                    => array( 'Бәхәсем' ),
 	'Newimages'                 => array( 'Яңа_файл' ),
 	'Newpages'                  => array( 'Яңа_бит' ),
-	'Popularpages'              => array( 'Популяр_битләр' ),
 	'Preferences'               => array( 'Көйләнмәләр' ),
 	'Protectedpages'            => array( 'Якланган_битләр' ),
 	'Protectedtitles'           => array( 'Якланган_башлыклар' ),
diff --git a/languages/messages/MessagesUk.php b/languages/messages/MessagesUk.php
index 2caaefaa7d..4cc185919d 100644
--- a/languages/messages/MessagesUk.php
+++ b/languages/messages/MessagesUk.php
@@ -176,7 +176,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'Нові_сторінки' ),
 	'PasswordReset'             => array( 'Скинути_пароль' ),
 	'PermanentLink'             => array( 'Постійне_посилання' ),
-	'Popularpages'              => array( 'Популярні_сторінки' ),
 	'Preferences'               => array( 'Налаштування' ),
 	'Prefixindex'               => array( 'Покажчик_за_початком_назви' ),
 	'Protectedpages'            => array( 'Захищені_сторінки' ),
diff --git a/languages/messages/MessagesUr.php b/languages/messages/MessagesUr.php
index 81a6d2f085..1de001a481 100644
--- a/languages/messages/MessagesUr.php
+++ b/languages/messages/MessagesUr.php
@@ -104,7 +104,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( 'جدید_املاف', 'جدید_تصاویر' ),
 	'Newpages'                  => array( 'جدید_صفحات' ),
 	'PermanentLink'             => array( 'مستقل_ربط' ),
-	'Popularpages'              => array( 'مقبول_صفحات' ),
 	'Preferences'               => array( 'ترجیحات' ),
 	'Prefixindex'               => array( 'اشاریہ_سابقہ' ),
 	'Protectedpages'            => array( 'محفوظ_صفحات' ),
diff --git a/languages/messages/MessagesVec.php b/languages/messages/MessagesVec.php
index 9242d83954..ebfc64a0bd 100644
--- a/languages/messages/MessagesVec.php
+++ b/languages/messages/MessagesVec.php
@@ -117,7 +117,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( 'PagineNove' ),
 	'PasswordReset'             => array( 'ReinpostaPassword' ),
 	'PermanentLink'             => array( 'LinkParmanente' ),
-	'Popularpages'              => array( 'PaginePiassèVisità' ),
 	'Preferences'               => array( 'Preferense' ),
 	'Prefixindex'               => array( 'Prefissi' ),
 	'Protectedpages'            => array( 'PagineProtete' ),
diff --git a/languages/messages/MessagesVi.php b/languages/messages/MessagesVi.php
index 2724a60af5..56ee88c7d0 100644
--- a/languages/messages/MessagesVi.php
+++ b/languages/messages/MessagesVi.php
@@ -125,7 +125,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( 'Ngôn_ngữ_trang' ),
 	'PasswordReset'             => array( 'Tái_tạo_mật_khẩu', 'Đặt_lại_mật_khẩu' ),
 	'PermanentLink'             => array( 'Liên_kết_thường_trực' ),
-	'Popularpages'              => array( 'Trang_phổ_biến' ),
 	'Preferences'               => array( 'Tùy_chọn', 'Tuỳ_chọn' ),
 	'Prefixindex'               => array( 'Tiền_tố' ),
 	'Protectedpages'            => array( 'Trang_khóa', 'Trang_khoá' ),
diff --git a/languages/messages/MessagesYi.php b/languages/messages/MessagesYi.php
index ed61df433d..37d7015f37 100644
--- a/languages/messages/MessagesYi.php
+++ b/languages/messages/MessagesYi.php
@@ -110,7 +110,6 @@ $specialPageAliases = array(
 	'Myuploads'                 => array( 'מיינע_ארויפלאדונגען' ),
 	'Newimages'                 => array( 'נייע_בילדער' ),
 	'Newpages'                  => array( 'נייע_בלעטער' ),
-	'Popularpages'              => array( 'פאפולערע_בלעטער' ),
 	'Preferences'               => array( 'פרעפערענצן' ),
 	'Prefixindex'               => array( 'בלעטער_וואס_הייבן_אן_מיט' ),
 	'Protectedpages'            => array( 'געשיצטע_בלעטער' ),
diff --git a/languages/messages/MessagesYue.php b/languages/messages/MessagesYue.php
index 8c4c93fd52..e1bb672f67 100644
--- a/languages/messages/MessagesYue.php
+++ b/languages/messages/MessagesYue.php
@@ -151,7 +151,6 @@ $specialPageAliases = array(
 	'Newpages'                  => array( '新版' ),
 	'PasswordReset'             => array( '重設密碼' ),
 	'PermanentLink'             => array( '永久鏈' ),
-	'Popularpages'              => array( '最歡迎頁' ),
 	'Preferences'               => array( '喜好設定' ),
 	'Prefixindex'               => array( '全部頁嘅前綴' ),
 	'Protectedpages'            => array( '保護頁' ),
diff --git a/languages/messages/MessagesZh.php b/languages/messages/MessagesZh.php
index 8ee87f078c..617dd46fb5 100644
--- a/languages/messages/MessagesZh.php
+++ b/languages/messages/MessagesZh.php
@@ -144,7 +144,6 @@ $specialPageAliases = array(
 	'Newimages'                 => array( '新建文件', '新建檔案' ),
 	'Newpages'                  => array( '最新页面', '最新頁面' ),
 	'PasswordReset'             => array( '重置密码', '重設密碼' ),
-	'Popularpages'              => array( '热点页面', '熱點頁面' ),
 	'Preferences'               => array( '参数设置', '偏好設定', '參數設置' ),
 	'Prefixindex'               => array( '前缀索引', '前綴索引', '字首索引' ),
 	'Protectedpages'            => array( '已保护页面', '已保護頁面' ),
diff --git a/languages/messages/MessagesZh_hans.php b/languages/messages/MessagesZh_hans.php
index 84d437348f..57c9a614d8 100644
--- a/languages/messages/MessagesZh_hans.php
+++ b/languages/messages/MessagesZh_hans.php
@@ -199,7 +199,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( '页面语言' ),
 	'PasswordReset'             => array( '重设密码' ),
 	'PermanentLink'             => array( '固定链接', '永久链接' ),
-	'Popularpages'              => array( '热点页面' ),
 	'Preferences'               => array( '参数设置', '设置' ),
 	'Prefixindex'               => array( '前缀索引' ),
 	'Protectedpages'            => array( '已保护页面' ),
diff --git a/languages/messages/MessagesZh_hant.php b/languages/messages/MessagesZh_hant.php
index 6e5dea115d..1f6bcfaa0c 100644
--- a/languages/messages/MessagesZh_hant.php
+++ b/languages/messages/MessagesZh_hant.php
@@ -183,7 +183,6 @@ $specialPageAliases = array(
 	'PageLanguage'              => array( '頁面語言' ),
 	'PasswordReset'             => array( '重設密碼' ),
 	'PermanentLink'             => array( '靜態連結', '永久連結' ),
-	'Popularpages'              => array( '熱門頁面', '熱點頁面' ),
 	'Preferences'               => array( '偏好設定' ),
 	'Prefixindex'               => array( '字首索引', '前綴索引' ),
 	'Protectedpages'            => array( '受保護頁面', '已保護頁面' ),
diff --git a/maintenance/interwiki.list b/maintenance/interwiki.list
index 91c60c1c26..4899143422 100644
--- a/maintenance/interwiki.list
+++ b/maintenance/interwiki.list
@@ -46,7 +46,6 @@ 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
-sourceforge|http://sourceforge.net/$1|0|
 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|
diff --git a/maintenance/interwiki.sql b/maintenance/interwiki.sql
index 0628773e8f..12352e7c56 100644
--- a/maintenance/interwiki.sql
+++ b/maintenance/interwiki.sql
@@ -48,7 +48,6 @@ REPLACE INTO /*$wgDBprefix*/interwiki (iw_prefix,iw_url,iw_local,iw_api) VALUES
 ('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'),
-('sourceforge','http://sourceforge.net/$1',0,''),
 ('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,''),
diff --git a/maintenance/jsduck/categories.json b/maintenance/jsduck/categories.json
index ec2e51d6d2..d142556a2c 100644
--- a/maintenance/jsduck/categories.json
+++ b/maintenance/jsduck/categories.json
@@ -61,7 +61,9 @@
 				"name": "Interfaces",
 				"classes": [
 					"mw.Feedback*",
-					"mw.Upload*"
+					"mw.Upload*",
+					"mw.ForeignUpload",
+					"mw.ForeignStructuredUpload"
 				]
 			},
 			{
diff --git a/maintenance/language/zhtable/toCN.manual b/maintenance/language/zhtable/toCN.manual
index 2d3a922a14..3a00bd4591 100644
--- a/maintenance/language/zhtable/toCN.manual
+++ b/maintenance/language/zhtable/toCN.manual
@@ -2177,6 +2177,8 @@
 分佈著	分布着
 散布著	散布着
 散佈著	散布着
+遍佈著	遍布着
+遍布著	遍布着
 三十六著	三十六着
 走為上著	走为上着
 記憶體	内存
@@ -2481,6 +2483,7 @@
 數位照相機	数码照相机
 單眼相機	单反相机
 單鏡反光機	单反相机
+桌上型電腦	台式电脑
 韌體	固件
 唯讀	只读
 作業系統	操作系统
@@ -2512,6 +2515,7 @@ IP位址	IP地址
 結他	吉他
 了結他	了结他
 連結他	连结他
+鏈結	链接
 已開發國家	发达国家
 太空飛行員	宇航员
 太空衣	宇航服
diff --git a/maintenance/language/zhtable/toHK.manual b/maintenance/language/zhtable/toHK.manual
index 69bce98b77..525100e0f0 100644
--- a/maintenance/language/zhtable/toHK.manual
+++ b/maintenance/language/zhtable/toHK.manual
@@ -41,6 +41,7 @@
 分布	分佈
 分布于	分佈於
 宣布	宣佈
+承宣布政	承宣布政
 公布	公佈
 摆布	擺佈
 擺布	擺佈
@@ -2560,6 +2561,8 @@
 分佈著	分佈着
 散布著	散佈着
 散佈著	散佈着
+遍佈著	遍佈着
+遍布著	遍佈着
 三十六著	三十六着
 走為上著	走為上着
 鬧著	鬧着
@@ -2884,6 +2887,7 @@ IP地址	IP位址
 数字照相机	数碼照相機
 單眼相機	單鏡反光機
 单反相机	單鏡反光機
+台式电脑	桌上型電腦
 形上學	形而上學
 吉尼斯世界纪录	健力士世界紀錄
 吉他	結他
diff --git a/maintenance/language/zhtable/toTW.manual b/maintenance/language/zhtable/toTW.manual
index 6c93bb53e5..22456a785d 100644
--- a/maintenance/language/zhtable/toTW.manual
+++ b/maintenance/language/zhtable/toTW.manual
@@ -191,7 +191,6 @@
 磁盘	磁碟
 磁道	磁軌
 端口	埠
-算子	運算元
 芯片	晶片
 译码	解碼
 软驱	軟碟機
@@ -209,10 +208,9 @@
 数据库	資料庫
 打印机	印表機
 打印機	印表機
-字节	位元組
-字節	位元組
 打印	列印
-攻打印	攻打印
+攻打	攻打 #分詞用
+打印度	打印度
 硬件	硬體
 二极管	二極體
 二極管	二極體
@@ -650,6 +648,7 @@ IP地址	IP位址
 数码照相机	數位照相機
 數碼照相機	數位照相機
 单反相机	單眼相機
+台式电脑	桌上型電腦
 形而上學	形上學
 形而上学	形上學
 当且仅当	若且唯若
@@ -733,6 +732,8 @@ IP地址	IP位址
 數碼訊號	數位訊號
 移动网络	行動網路
 流動網絡	行動網路
+网络游戏	網路遊戲
+網絡遊戲	網路遊戲
 咪高峰	麥克風
 電單車	機車
 搜索引擎	搜尋引擎
diff --git a/maintenance/language/zhtable/toTrad.manual b/maintenance/language/zhtable/toTrad.manual
index b23faef590..13a0b98938 100644
--- a/maintenance/language/zhtable/toTrad.manual
+++ b/maintenance/language/zhtable/toTrad.manual
@@ -2,7 +2,7 @@
 “	「
 ‘	『
 ’	』
-’s 	’s
+’s	’s
 手塚治虫	手塚治虫
 無言不仇	無言不讎
 視如寇仇	視如寇讎
@@ -69,9 +69,6 @@
 乾象曆	乾象曆
 乾象历	乾象曆
 不好干預	不好干預
-不干預	不干預
-不干擾	不干擾
-不干牠	不干牠
 范文瀾	范文瀾
 機械系	機械系
 頂多	頂多
@@ -200,7 +197,7 @@
 員山庄	員山庄
 昵称	暱稱
 單于	單于
-鮮于樞	鮮于樞
+鮮于	鮮于
 賦范	賦范
 茅于軾	茅于軾
 陳有后	陳有后
@@ -214,6 +211,7 @@
 水里高級商工	水里高級商工
 水里鳳林	水里鳳林
 水里濁水溪	水里濁水溪
+洞里薩	洞里薩
 划不來	划不來
 划來划去	划來划去
 划動	划動
diff --git a/maintenance/language/zhtable/tradphrases.manual b/maintenance/language/zhtable/tradphrases.manual
index c7e4eca671..b97ca6e439 100644
--- a/maintenance/language/zhtable/tradphrases.manual
+++ b/maintenance/language/zhtable/tradphrases.manual
@@ -422,6 +422,7 @@
 採區
 採運
 採風
+採血
 官地為寀
 寮寀
 蔘綏
@@ -2400,17 +2401,6 @@
 不占算
 不好干涉
 不好干預
-不干預
-不干涉
-不干休
-不干犯
-不干擾
-不干你
-不干我
-不干他
-不干她
-不干它
-不干事
 不斗膽
 不每只
 不采聲
@@ -2516,6 +2506,7 @@
 好斗篷
 好斗膽
 好斗蓬
+墨斗
 小几
 尸利
 尸祿
@@ -2958,6 +2949,7 @@
 這裡
 中文裡
 洞裡
+洞里薩
 界裡
 眼睛裡
 百科裡
@@ -3098,6 +3090,7 @@
 有只用
 葉叶琹
 胡子昂
+胡子嬰
 包括
 特别致
 分别致
@@ -3342,6 +3335,9 @@
 舞后
 甄后
 郭后
+高后
+升高後
+提高後
 0年 # 協助分詞
 1å¹´
 2å¹´
@@ -3426,7 +3422,8 @@
 于再清
 茅于軾
 張樂于張徐
-鮮于樞
+鮮于
+朝鮮於
 于寶軒
 于震
 於震前
@@ -3551,6 +3548,7 @@
 羅馬曆
 羅馬歷史
 羅馬歷代
+曆數書
 你誇
 誇你
 誇我
@@ -3712,6 +3710,9 @@
 蒸製
 烹製
 醃製
+和製漢
+壓製機
+壓製出
 體徵
 綜合徵
 价川
@@ -3816,3 +3817,4 @@
 腌臢
 風颳
 颳大風
+黃白術
diff --git a/maintenance/language/zhtable/tradphrases_exclude.manual b/maintenance/language/zhtable/tradphrases_exclude.manual
index c6e4bf8681..1f8a6e06d2 100644
--- a/maintenance/language/zhtable/tradphrases_exclude.manual
+++ b/maintenance/language/zhtable/tradphrases_exclude.manual
@@ -698,3 +698,9 @@
 于是
 于七
 于今
+曆數
+發矇
+不幹
+作姦犯科
+游牧民族
+穀道
diff --git a/maintenance/namespaceDupes.php b/maintenance/namespaceDupes.php
index 96e01fe43c..088f6776cb 100644
--- a/maintenance/namespaceDupes.php
+++ b/maintenance/namespaceDupes.php
@@ -39,9 +39,12 @@ class NamespaceConflictChecker extends Maintenance {
 	 */
 	protected $db;
 
-	private $resolvableCount = 0;
+	private $resolvablePages = 0;
 	private $totalPages = 0;
 
+	private $resolvableLinks = 0;
+	private $totalLinks = 0;
+
 	public function __construct() {
 		parent::__construct();
 		$this->mDescription = "";
@@ -172,7 +175,43 @@ class NamespaceConflictChecker extends Maintenance {
 		}
 
 		$this->output( "{$this->totalPages} pages to fix, " .
-			"{$this->resolvableCount} were resolvable.\n" );
+			"{$this->resolvablePages} were resolvable.\n\n" );
+
+		foreach ( $spaces as $name => $ns ) {
+			if ( $ns != 0 ) {
+				// Fix up link destinations for non-interwiki links only.
+				//
+				// For example if a page has [[Foo:Bar]] and then a Foo namespace
+				// is introduced, pagelinks needs to be updated to have
+				// page_namespace = NS_FOO.
+				//
+				// If instead an interwiki prefix was introduced called "Foo",
+				// the link should instead be moved to the iwlinks table. If a new
+				// language is introduced called "Foo", or if there is a pagelink
+				// [[fr:Bar]] when interlanguage magic links are turned on, the
+				// link would have to be moved to the langlinks table. Let's put
+				// those cases in the too-hard basket for now. The consequences are
+				// not especially severe.
+				//
+				// @fixme Handle interwiki links, and pagelinks to Category:, File:
+				// which probably need reparsing.
+
+				$this->checkLinkTable( 'pagelinks', 'pl', $ns, $name, $options );
+				$this->checkLinkTable( 'templatelinks', 'tl', $ns, $name, $options );
+
+				// The redirect table has interwiki links randomly mixed in, we
+				// need to filter those out. For example [[w:Foo:Bar]] would
+				// have rd_interwiki=w and rd_namespace=0, which would match the
+				// query for a conflicting namespace "Foo" if filtering wasn't done.
+				$this->checkLinkTable( 'redirect', 'rd', $ns, $name, $options,
+					array( 'rd_interwiki' => null ) );
+				$this->checkLinkTable( 'redirect', 'rd', $ns, $name, $options,
+					array( 'rd_interwiki' => '' ) );
+			}
+		}
+
+		$this->output( "{$this->totalLinks} links to fix, " .
+			"{$this->resolvableLinks} were resolvable.\n" );
 
 		return $ok;
 	}
@@ -215,7 +254,8 @@ class NamespaceConflictChecker extends Maintenance {
 
 			// Find the new title and determine the action to take
 
-			$newTitle = $this->getDestinationTitle( $ns, $name, $row, $options );
+			$newTitle = $this->getDestinationTitle( $ns, $name,
+				$row->page_namespace, $row->page_title, $options );
 			$logStatus = false;
 			if ( !$newTitle ) {
 				$logStatus = 'invalid title';
@@ -271,26 +311,101 @@ class NamespaceConflictChecker extends Maintenance {
 						$newTitle->getPrefixedDBkey() . " (merge)$dryRunNote\n" );
 
 					if ( $options['fix'] ) {
-						$pageOK = $this->mergePage( $row->page_id, $newTitle );
+						$pageOK = $this->mergePage( $row, $newTitle );
 					}
 					break;
 			}
 
 			if ( $pageOK ) {
-				$this->resolvableCount++;
+				$this->resolvablePages++;
 			} else {
 				$ok = false;
 			}
 		}
 
-		// @fixme Also needs to do like self::getTargetList() on the
-		// *_namespace and *_title fields of pagelinks, templatelinks, and
-		// redirects, and schedule a LinksUpdate job or similar for each found
-		// *_from.
-
 		return $ok;
 	}
 
+	/**
+	 * Check and repair the destination fields in a link table
+	 * @param string $table The link table name
+	 * @param string $fieldPrefix The field prefix in the link table
+	 * @param int $ns Destination namespace id
+	 * @param string $name
+	 * @param array $options Associative array of validated command-line options
+	 * @param array $extraConds Extra conditions for the SQL query
+	 */
+	private function checkLinkTable( $table, $fieldPrefix, $ns, $name, $options,
+		$extraConds = array()
+	) {
+		$batchConds = array();
+		$fromField = "{$fieldPrefix}_from";
+		$namespaceField = "{$fieldPrefix}_namespace";
+		$titleField = "{$fieldPrefix}_title";
+		$batchSize = 500;
+		while ( true ) {
+			$res = $this->db->select(
+				$table,
+				array( $fromField, $namespaceField, $titleField ),
+				array_merge( $batchConds, $extraConds, array(
+					$namespaceField => 0,
+					$titleField . $this->db->buildLike( "$name:", $this->db->anyString() )
+				) ),
+				__METHOD__,
+				array(
+					'ORDER BY' => array( $titleField, $fromField ),
+					'LIMIT' => $batchSize
+				)
+			);
+
+			if ( $res->numRows() == 0 ) {
+				break;
+			}
+			foreach ( $res as $row ) {
+				$logTitle = "from={$row->$fromField} ns={$row->$namespaceField} " .
+					"dbk={$row->$titleField}";
+				$destTitle = $this->getDestinationTitle( $ns, $name,
+					$row->$namespaceField, $row->$titleField, $options );
+				$this->totalLinks++;
+				if ( !$destTitle ) {
+					$this->output( "$table $logTitle *** INVALID\n" );
+					continue;
+				}
+				$this->resolvableLinks++;
+				if ( !$options['fix'] ) {
+					$this->output( "$table $logTitle -> " .
+						$destTitle->getPrefixedDBkey() . " DRY RUN\n" );
+					continue;
+				}
+
+				$this->db->update( $table,
+					// SET
+					array(
+						$namespaceField => $destTitle->getNamespace(),
+						$titleField => $destTitle->getDBkey()
+					),
+					// WHERE
+					array(
+						$namespaceField => 0,
+						$titleField => $row->$titleField,
+						$fromField => $row->$fromField
+					),
+					__METHOD__
+				);
+				$this->output( "$table $logTitle -> " .
+					$destTitle->getPrefixedDBkey() . "\n" );
+			}
+			$encLastTitle = $this->db->addQuotes( $row->$titleField );
+			$encLastFrom = $this->db->addQuotes( $row->$fromField );
+
+			$batchConds = array(
+				"$titleField > $encLastTitle " .
+				"OR ($titleField = $encLastTitle AND $fromField > $encLastFrom)" );
+
+			wfWaitForSlaves();
+		}
+	}
+
 	/**
 	 * Move the given pseudo-namespace, either replacing the colon with a hyphen
 	 * (useful for pseudo-namespaces that conflict with interwiki links) or move
@@ -338,21 +453,22 @@ class NamespaceConflictChecker extends Maintenance {
 	}
 
 	/**
-	 * Get the preferred destination title for a given target page row.
+	 * Get the preferred destination title for a given target page.
 	 * @param integer $ns The destination namespace ID
 	 * @param string $name The conflicting prefix
-	 * @param stdClass $row
+	 * @param integer $sourceNs The source namespace
+	 * @param integer $sourceDbk The source DB key (i.e. page_title)
 	 * @param array $options Associative array of validated command-line options
 	 * @return Title|false
 	 */
-	private function getDestinationTitle( $ns, $name, $row, $options ) {
-		$dbk = substr( $row->page_title, strlen( "$name:" ) );
+	private function getDestinationTitle( $ns, $name, $sourceNs, $sourceDbk, $options ) {
+		$dbk = substr( $sourceDbk, strlen( "$name:" ) );
 		if ( $ns == 0 ) {
 			// An interwiki; try an alternate encoding with '-' for ':'
 			$dbk = "$name-" . $dbk;
 		}
 		$destNS = $ns;
-		if ( $row->page_namespace == NS_TALK && MWNamespace::isSubject( $ns ) ) {
+		if ( $sourceNs == NS_TALK && MWNamespace::isSubject( $ns ) ) {
 			// This is an associated talk page moved with the --move-talk feature.
 			$destNS = MWNamespace::getTalk( $destNS );
 		}
@@ -392,8 +508,6 @@ class NamespaceConflictChecker extends Maintenance {
 	/**
 	 * Move a page
 	 *
-	 * @fixme Update pl_from_namespace etc.
-	 *
 	 * @param integer $id The page_id
 	 * @param Title $newTitle The new title
 	 * @return bool
@@ -409,8 +523,20 @@ class NamespaceConflictChecker extends Maintenance {
 			),
 			__METHOD__ );
 
-		// @fixme Needs updating the *_from_namespace fields in categorylinks,
-		// pagelinks, templatelinks and imagelinks.
+		// Update *_from_namespace in links tables
+		$fromNamespaceTables = array(
+			array( 'pagelinks', 'pl' ),
+			array( 'templatelinks', 'tl' ),
+			array( 'imagelinks', 'il' ) );
+		foreach ( $fromNamespaceTables as $tableInfo ) {
+			list( $table, $fieldPrefix ) = $tableInfo;
+			$this->db->update( $table,
+				// SET
+				array( "{$fieldPrefix}_from_namespace" => $newTitle->getNamespace() ),
+				// WHERE
+				array( "{$fieldPrefix}_from" => $id ),
+				__METHOD__ );
+		}
 
 		return true;
 	}
@@ -444,7 +570,17 @@ class NamespaceConflictChecker extends Maintenance {
 	 * @param integer $id The page_id
 	 * @param Title $newTitle The new title
 	 */
-	private function mergePage( $id, Title $newTitle ) {
+	private function mergePage( $row, Title $newTitle ) {
+		$id = $row->page_id;
+
+		// Construct the WikiPage object we will need later, while the
+		// page_id still exists. Note that this cannot use makeTitleSafe(),
+		// we are deliberately constructing an invalid title.
+		$sourceTitle = Title::makeTitle( $row->page_namespace, $row->page_title );
+		$sourceTitle->resetArticleID( $id );
+		$wikiPage = new WikiPage( $sourceTitle );
+		$wikiPage->loadPageData( 'fromdbmaster' );
+
 		$destId = $newTitle->getArticleId();
 		$this->db->begin( __METHOD__ );
 		$this->db->update( 'revision',
@@ -456,10 +592,18 @@ class NamespaceConflictChecker extends Maintenance {
 
 		$this->db->delete( 'page', array( 'page_id' => $id ), __METHOD__ );
 
-		// @fixme Need WikiPage::doDeleteUpdates() or similar to avoid orphan
-		// rows in the links tables.
-
+		// Call LinksDeletionUpdate to delete outgoing links from the old title,
+		// and update category counts.
+		//
+		// Calling external code with a fake broken Title is a fairly dubious
+		// idea. It's necessary because it's quite a lot of code to duplicate,
+		// but that also makes it fragile since it would be easy for someone to
+		// accidentally introduce an assumption of title validity to the code we
+		// are calling.
+		$update = new LinksDeletionUpdate( $wikiPage );
+		$update->doUpdate();
 		$this->db->commit( __METHOD__ );
+
 		return true;
 	}
 }
diff --git a/maintenance/refreshLinks.php b/maintenance/refreshLinks.php
index 763d97e00d..06e1449e15 100644
--- a/maintenance/refreshLinks.php
+++ b/maintenance/refreshLinks.php
@@ -73,7 +73,7 @@ class RefreshLinks extends Maintenance {
 	private function doRefreshLinks( $start, $newOnly = false,
 		$end = null, $redirectsOnly = false, $oldRedirectsOnly = false
 	) {
-		global $wgParser, $wgUseTidy;
+		global $wgParser;
 
 		$reportingInterval = 100;
 		$dbr = wfGetDB( DB_SLAVE );
@@ -88,9 +88,6 @@ class RefreshLinks extends Maintenance {
 		# Don't generate extension images (e.g. Timeline)
 		$wgParser->clearTagHooks();
 
-		# Don't use HTML tidy
-		$wgUseTidy = false;
-
 		$what = $redirectsOnly ? "redirects" : "links";
 
 		if ( $oldRedirectsOnly ) {
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index de36d26fbf..aa0c7ea9a1 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -3,7 +3,9 @@
 -- not have to run it by itself unless doing a manual install.
 
 -- This is a shared schema file used for both MySQL and SQLite installs.
-
+--
+-- For more documentation on the database schema, see
+-- https://www.mediawiki.org/wiki/Manual:Database_layout
 --
 -- General notes:
 --
diff --git a/mw-config/config.js b/mw-config/config.js
index cf17aef77c..d2dc213213 100644
--- a/mw-config/config.js
+++ b/mw-config/config.js
@@ -3,7 +3,7 @@
 		var $label, labelText;
 
 		function syncText() {
-			var value = $(this).val()
+			var value = $( this ).val()
 				.replace( /[\[\]\{\}|#<>%+? ]/g, '_' )
 				.replace( /&/, '&amp;' )
 				.replace( /__+/g, '_' )
@@ -20,7 +20,7 @@
 				.find( '.mw-help-field-hint' )
 					.show()
 					.click( function () {
-						$(this)
+						$( this )
 							.closest( '.mw-help-field-container' )
 								.find( '.mw-help-field-data' )
 									.slideToggle( 'fast' );
@@ -29,7 +29,7 @@
 		// Show/hide code for DB-specific options
 		// FIXME: Do we want slow, fast, or even non-animated (instantaneous) showing/hiding here?
 		$( '.dbRadio' ).each( function () {
-			$( document.getElementById( $(this).attr( 'rel' ) ) ).hide();
+			$( document.getElementById( $( this ).attr( 'rel' ) ) ).hide();
 		} );
 		$( document.getElementById( $( '.dbRadio:checked' ).attr( 'rel' ) ) ).show();
 		$( '.dbRadio' ).click( function () {
@@ -58,16 +58,16 @@
 
 		// Show/hide random stuff (email, upload)
 		$( '.showHideRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
+			var $wrapper = $( '#' + $( this ).attr( 'rel' ) );
+			if ( $( this ).is( ':checked' ) ) {
 				$wrapper.show( 'slow' );
 			} else {
 				$wrapper.hide( 'slow' );
 			}
 		} );
 		$( '.hideShowRadio' ).click( function () {
-			var $wrapper = $( '#' + $(this).attr( 'rel' ) );
-			if ( $(this).is( ':checked' ) ) {
+			var $wrapper = $( '#' + $( this ).attr( 'rel' ) );
+			if ( $( this ).is( ':checked' ) ) {
 				$wrapper.hide( 'slow' );
 			} else {
 				$wrapper.show( 'slow' );
@@ -80,9 +80,9 @@
 
 		// Enable/disable "other" textboxes
 		$( '.enableForOther' ).click( function () {
-			var $textbox = $( document.getElementById( $(this).attr( 'rel' ) ) );
+			var $textbox = $( document.getElementById( $( this ).attr( 'rel' ) ) );
 			// FIXME: Ugh, this is ugly
-			if ( $(this).val() === 'other' ) {
+			if ( $( this ).val() === 'other' ) {
 				$textbox.removeProp( 'readonly' ).closest( '.config-block' ).slideDown( 'fast' );
 			} else {
 				$textbox.prop( 'readonly', true ).closest( '.config-block' ).slideUp( 'fast' );
diff --git a/mw-config/images/help-question-hover.gif b/mw-config/images/help-question-hover.gif
new file mode 100644
index 0000000000..515138dbe1
Binary files /dev/null and b/mw-config/images/help-question-hover.gif differ
diff --git a/mw-config/images/help-question.gif b/mw-config/images/help-question.gif
new file mode 100644
index 0000000000..b4fc9c5b20
Binary files /dev/null and b/mw-config/images/help-question.gif differ
diff --git a/package.json b/package.json
index e28aef4cb5..c00dbed89b 100644
--- a/package.json
+++ b/package.json
@@ -9,11 +9,11 @@
   "devDependencies": {
     "grunt": "0.4.5",
     "grunt-cli": "0.1.13",
-    "grunt-banana-checker": "0.2.2",
+    "grunt-banana-checker": "0.3.0",
     "grunt-contrib-copy": "0.8.0",
-    "grunt-contrib-jshint": "0.11.2",
+    "grunt-contrib-jshint": "0.11.3",
     "grunt-contrib-watch": "0.6.1",
-    "grunt-jscs": "1.8.0",
+    "grunt-jscs": "2.1.0",
     "grunt-jsonlint": "1.0.4",
     "grunt-karma": "0.11.0",
     "karma": "0.12.36",
diff --git a/phpcs.xml b/phpcs.xml
index 7f1bcedcc3..36ad39479a 100644
--- a/phpcs.xml
+++ b/phpcs.xml
@@ -4,6 +4,9 @@
 	<file>.</file>
 	<arg name="encoding" value="utf8"/>
 	<arg name="extensions" value="php,php5,inc,sample"/>
+	<rule ref="Generic.Files.LineLength">
+		<exclude-pattern>*/languages/messages/Messages*.php</exclude-pattern>
+	</rule>
 	<exclude-pattern>node_modules</exclude-pattern>
 	<exclude-pattern>vendor</exclude-pattern>
 	<exclude-pattern>extensions</exclude-pattern>
diff --git a/resources/Resources.php b/resources/Resources.php
index 8579d05a80..07142a5511 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -847,6 +847,12 @@ return array(
 			'resources/src/mediawiki/mediawiki.template.mustache.js',
 		),
 		'targets' => array( 'desktop', 'mobile' ),
+		'dependencies' => 'mediawiki.template',
+	),
+	'mediawiki.template.regexp' => array(
+		'scripts' => 'resources/src/mediawiki/mediawiki.template.regexp.js',
+		'targets' => array( 'desktop', 'mobile' ),
+		'dependencies' => 'mediawiki.template',
 	),
 	'mediawiki.apipretty' => array(
 		'styles' => 'resources/src/mediawiki/mediawiki.apipretty.css',
@@ -1024,6 +1030,10 @@ return array(
 			'colon-separator',
 		),
 	),
+	'mediawiki.htmlform.styles' => array(
+		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.css',
+		'position' => 'top',
+	),
 	'mediawiki.htmlform.ooui.styles' => array(
 		'styles' => 'resources/src/mediawiki/mediawiki.htmlform.ooui.css',
 		'position' => 'top',
@@ -1126,6 +1136,20 @@ return array(
 			'mediawiki.api.upload',
 		),
 	),
+	'mediawiki.ForeignUpload' => array(
+		'scripts' => 'resources/src/mediawiki/mediawiki.ForeignUpload.js',
+		'dependencies' => array(
+			'mediawiki.ForeignApi',
+			'mediawiki.Upload',
+			'oojs',
+		),
+	),
+	'mediawiki.ForeignStructuredUpload' => array(
+		'scripts' => 'resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js',
+		'dependencies' => array(
+			'mediawiki.ForeignUpload',
+		),
+	),
 	'mediawiki.Upload.Dialog' => array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.Upload.Dialog.js',
 		'dependencies' => array(
@@ -1156,6 +1180,10 @@ return array(
 	),
 	'mediawiki.Uri' => array(
 		'scripts' => 'resources/src/mediawiki/mediawiki.Uri.js',
+		'templates' => array(
+			'strict.regexp' => 'resources/src/mediawiki/mediawiki.Uri.strict.regexp',
+			'loose.regexp' => 'resources/src/mediawiki/mediawiki.Uri.loose.regexp',
+		),
 		'dependencies' => 'mediawiki.util',
 		'targets' => array( 'desktop', 'mobile' ),
 	),
@@ -1339,6 +1367,13 @@ return array(
 			'prefs-editing'
 		),
 	),
+	'mediawiki.action.view.filepage' => array(
+		'styles' => array(
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
+		),
+		'position' => 'top',
+	),
 
 	/* MediaWiki Language */
 
@@ -1662,15 +1697,6 @@ return array(
 			'resources/src/mediawiki.special/mediawiki.special.userlogin.login.css',
 		),
 	),
-	'mediawiki.special.userlogin.common.js' => array(
-		'scripts' => array(
-			'resources/src/mediawiki.special/mediawiki.special.userlogin.common.js',
-		),
-		'messages' => array(
-			'createacct-captcha',
-			'createacct-imgcaptcha-ph',
-		),
-	),
 	'mediawiki.special.userlogin.signup.js' => array(
 		'scripts' => 'resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js',
 		'messages' => array(
@@ -1735,9 +1761,10 @@ return array(
 		'styles' => array(
 			// @todo: Remove mediawiki.page.gallery when cache has cleared
 			'resources/src/mediawiki.page/mediawiki.page.gallery.print.css' => array( 'media' => 'print' ),
+			// @todo: Remove mediawiki.action.view.filepage.print.css when cache has cleared
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css' => array( 'media' => 'print' ),
 			'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
 		),
-		'group' => 'print',
 	),
 	'mediawiki.legacy.protect' => array(
 		'scripts' => 'resources/src/mediawiki.legacy/protect.js',
@@ -1750,6 +1777,9 @@ return array(
 		'styles' => array(
 			// @todo: Remove when mediawiki.page.gallery in cached html.
 			'resources/src/mediawiki.page/mediawiki.page.gallery.css',
+			// @todo: Remove mediawiki.action.view.filepage.css
+			// and mediawiki.legacy/images/checker.png when cache has cleared
+			'resources/src/mediawiki.action/mediawiki.action.view.filepage.css',
 			'resources/src/mediawiki.legacy/shared.css' => array( 'media' => 'screen' )
 		),
 	),
@@ -1855,6 +1885,7 @@ return array(
 			'resources/src/mediawiki.widgets/mw.widgets.ComplexTitleInputWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.TitleOptionWidget.js',
 			'resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js',
+			'resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js',
 		),
 		'skinStyles' => array(
 			'default' => array(
diff --git a/resources/lib/oojs-ui/i18n/ar.json b/resources/lib/oojs-ui/i18n/ar.json
index 493920dc3c..610e1eee9c 100644
--- a/resources/lib/oojs-ui/i18n/ar.json
+++ b/resources/lib/oojs-ui/i18n/ar.json
@@ -11,7 +11,8 @@
 			"مشعل الحربي",
 			"ترجمان05",
 			"Abanima",
-			"محمد أحمد عبد الفتاح"
+			"محمد أحمد عبد الفتاح",
+			"Hiba Alshawi"
 		]
 	},
 	"ooui-outline-control-move-down": "انقل العنصر للأسفل",
@@ -26,6 +27,8 @@
 	"ooui-dialog-process-dismiss": "أغلق",
 	"ooui-dialog-process-retry": "حاول مرة أخرى",
 	"ooui-dialog-process-continue": "استمر",
+	"ooui-selectfile-button-select": "أختر ملف",
 	"ooui-selectfile-not-supported": "تحديد الملفات غير مدعوم",
-	"ooui-selectfile-placeholder": "لم يختر أي ملف"
+	"ooui-selectfile-placeholder": "لم يختر أي ملف",
+	"ooui-selectfile-dragdrop-placeholder": "ترك ملف هنا"
 }
diff --git a/resources/lib/oojs-ui/i18n/ast.json b/resources/lib/oojs-ui/i18n/ast.json
index 3ecbe50b52..11761c6cc2 100644
--- a/resources/lib/oojs-ui/i18n/ast.json
+++ b/resources/lib/oojs-ui/i18n/ast.json
@@ -18,7 +18,8 @@
 	"ooui-dialog-process-dismiss": "Descartar",
 	"ooui-dialog-process-retry": "Vuelvi a intentalo",
 	"ooui-dialog-process-continue": "Siguir",
+	"ooui-selectfile-button-select": "Seleicionar un ficheru",
 	"ooui-selectfile-not-supported": "Nun hai encontu pa la seleición de ficheros",
 	"ooui-selectfile-placeholder": "Nun se seleicionó nengún ficheru",
-	"ooui-selectfile-dragdrop-placeholder": "Soltar el ficheru equí (o facer clic pa restolar)"
+	"ooui-selectfile-dragdrop-placeholder": "Soltar el ficheru equí"
 }
diff --git a/resources/lib/oojs-ui/i18n/bn.json b/resources/lib/oojs-ui/i18n/bn.json
index 9481a2c391..02d57e0c08 100644
--- a/resources/lib/oojs-ui/i18n/bn.json
+++ b/resources/lib/oojs-ui/i18n/bn.json
@@ -24,6 +24,8 @@
 	"ooui-dialog-process-dismiss": "বাতিল করুন",
 	"ooui-dialog-process-retry": "আবার চেষ্টা করুন",
 	"ooui-dialog-process-continue": "অগ্রসর হোন",
+	"ooui-selectfile-button-select": "একটি ফাইল নির্বাচন করুন",
 	"ooui-selectfile-not-supported": "চিত্র নির্বাচন সমর্থন করছে না।",
-	"ooui-selectfile-placeholder": " কোন চিত্র নির্বাচিত হয়নি।"
+	"ooui-selectfile-placeholder": " কোন চিত্র নির্বাচিত হয়নি।",
+	"ooui-selectfile-dragdrop-placeholder": "এখানে ফাইল ছাড়ুন"
 }
diff --git a/resources/lib/oojs-ui/i18n/de.json b/resources/lib/oojs-ui/i18n/de.json
index ee735ceab5..b48dfb5eb8 100644
--- a/resources/lib/oojs-ui/i18n/de.json
+++ b/resources/lib/oojs-ui/i18n/de.json
@@ -25,7 +25,8 @@
 	"ooui-dialog-process-dismiss": "Ausblenden",
 	"ooui-dialog-process-retry": "Erneut versuchen",
 	"ooui-dialog-process-continue": "Fortfahren",
+	"ooui-selectfile-button-select": "Eine Datei auswählen",
 	"ooui-selectfile-not-supported": "Die Dateiauswahl wird nicht unterstützt",
 	"ooui-selectfile-placeholder": "Keine Datei ausgewählt",
-	"ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen (oder klicken zum Durchsuchen)"
+	"ooui-selectfile-dragdrop-placeholder": "Dateien hier ablegen"
 }
diff --git a/resources/lib/oojs-ui/i18n/en-ca.json b/resources/lib/oojs-ui/i18n/en-ca.json
new file mode 100644
index 0000000000..218ece26c5
--- /dev/null
+++ b/resources/lib/oojs-ui/i18n/en-ca.json
@@ -0,0 +1,23 @@
+{
+	"@metadata": {
+		"authors": [
+			"Skyllful"
+		]
+	},
+	"ooui-outline-control-move-down": "Move item down",
+	"ooui-outline-control-move-up": "Move item up",
+	"ooui-outline-control-remove": "Remove item",
+	"ooui-toolbar-more": "More",
+	"ooui-toolgroup-expand": "More",
+	"ooui-toolgroup-collapse": "Less",
+	"ooui-dialog-message-accept": "OK",
+	"ooui-dialog-message-reject": "Cancel",
+	"ooui-dialog-process-error": "Something went wrong",
+	"ooui-dialog-process-dismiss": "Dismiss",
+	"ooui-dialog-process-retry": "Try again",
+	"ooui-dialog-process-continue": "Continue",
+	"ooui-selectfile-not-supported": "File(s) not supported",
+	"ooui-selectfile-placeholder": "No file selected",
+	"ooui-selectfile-dragdrop-placeholder": "Drop file here (or click to browse your computer)",
+	"ooui-semicolon-separator": ";"
+}
diff --git a/resources/lib/oojs-ui/i18n/en.json b/resources/lib/oojs-ui/i18n/en.json
index db2399fd12..7cf2eb16ec 100644
--- a/resources/lib/oojs-ui/i18n/en.json
+++ b/resources/lib/oojs-ui/i18n/en.json
@@ -28,8 +28,9 @@
 	"ooui-dialog-process-dismiss": "Dismiss",
 	"ooui-dialog-process-retry": "Try again",
 	"ooui-dialog-process-continue": "Continue",
+	"ooui-selectfile-button-select": "Select a file",
 	"ooui-selectfile-not-supported": "File selection is not supported",
 	"ooui-selectfile-placeholder": "No file is selected",
-	"ooui-selectfile-dragdrop-placeholder": "Drop file here (or click to browse)",
+	"ooui-selectfile-dragdrop-placeholder": "Drop file here",
 	"ooui-semicolon-separator": "; "
 }
diff --git a/resources/lib/oojs-ui/i18n/es.json b/resources/lib/oojs-ui/i18n/es.json
index 3f690fc801..fa11a3625b 100644
--- a/resources/lib/oojs-ui/i18n/es.json
+++ b/resources/lib/oojs-ui/i18n/es.json
@@ -30,7 +30,8 @@
 	"ooui-dialog-process-dismiss": "Descartar",
 	"ooui-dialog-process-retry": "Intentar de nuevo",
 	"ooui-dialog-process-continue": "Continuar",
+	"ooui-selectfile-button-select": "Selecciona un archivo",
 	"ooui-selectfile-not-supported": "No se admite la selección de archivos",
 	"ooui-selectfile-placeholder": "Ningún archivo seleccionado",
-	"ooui-selectfile-dragdrop-placeholder": "Soltar el archivo aquí (o pulsa para examinar)"
+	"ooui-selectfile-dragdrop-placeholder": "Suelta el archivo aquí"
 }
diff --git a/resources/lib/oojs-ui/i18n/et.json b/resources/lib/oojs-ui/i18n/et.json
index 1283c8d62d..59b7ccd9f6 100644
--- a/resources/lib/oojs-ui/i18n/et.json
+++ b/resources/lib/oojs-ui/i18n/et.json
@@ -18,7 +18,8 @@
 	"ooui-dialog-process-dismiss": "Hülga",
 	"ooui-dialog-process-retry": "Proovi uuesti",
 	"ooui-dialog-process-continue": "Jätka",
+	"ooui-selectfile-button-select": "Vali fail",
 	"ooui-selectfile-not-supported": "Faili valiku tugi puudub",
 	"ooui-selectfile-placeholder": "Faili ei ole valitud",
-	"ooui-selectfile-dragdrop-placeholder": "Lohista fail siia (või klõpsa, et sirvida)"
+	"ooui-selectfile-dragdrop-placeholder": "Lohista fail siia"
 }
diff --git a/resources/lib/oojs-ui/i18n/eu.json b/resources/lib/oojs-ui/i18n/eu.json
index 93c66c516e..e507325174 100644
--- a/resources/lib/oojs-ui/i18n/eu.json
+++ b/resources/lib/oojs-ui/i18n/eu.json
@@ -20,6 +20,7 @@
 	"ooui-dialog-process-dismiss": "Utzi",
 	"ooui-dialog-process-retry": "Saiatu berriro",
 	"ooui-dialog-process-continue": "Jarraitu",
+	"ooui-selectfile-button-select": "Fitxategi bat aukeratu",
 	"ooui-selectfile-not-supported": "Fitxategi aukeraketa ez da onartzen",
 	"ooui-selectfile-placeholder": "Ez da fitxategirik hautatu"
 }
diff --git a/resources/lib/oojs-ui/i18n/fa.json b/resources/lib/oojs-ui/i18n/fa.json
index e20997a96d..11bd4b8b06 100644
--- a/resources/lib/oojs-ui/i18n/fa.json
+++ b/resources/lib/oojs-ui/i18n/fa.json
@@ -13,7 +13,8 @@
 			"Armin1392",
 			"Alirezaaa",
 			"Leyth",
-			"الناز"
+			"الناز",
+			"فلورانس"
 		]
 	},
 	"ooui-outline-control-move-down": "انتقال مورد به پایین",
@@ -29,5 +30,6 @@
 	"ooui-dialog-process-retry": "دوباره امتحان کنید",
 	"ooui-dialog-process-continue": "ادامه",
 	"ooui-selectfile-not-supported": "انتخاب پرونده پشتیبانی نمی‌شود",
-	"ooui-selectfile-placeholder": "هیچ پرونده‌ای انتخاب نشده است"
+	"ooui-selectfile-placeholder": "هیچ پرونده‌ای انتخاب نشده است",
+	"ooui-selectfile-dragdrop-placeholder": "رها کردن فایل در اینجا (و یا کلیک کنید به فهرست)"
 }
diff --git a/resources/lib/oojs-ui/i18n/fi.json b/resources/lib/oojs-ui/i18n/fi.json
index c96a74ecea..bdf015f9c9 100644
--- a/resources/lib/oojs-ui/i18n/fi.json
+++ b/resources/lib/oojs-ui/i18n/fi.json
@@ -30,5 +30,6 @@
 	"ooui-dialog-process-retry": "Yritä uudelleen",
 	"ooui-dialog-process-continue": "Jatka",
 	"ooui-selectfile-not-supported": "Tiedoston valitsemista ei tueta",
-	"ooui-selectfile-placeholder": "Tiedostoa ei ole valittu"
+	"ooui-selectfile-placeholder": "Tiedostoa ei ole valittu",
+	"ooui-selectfile-dragdrop-placeholder": "Pudota tiedosto (tai selaa tiedostoja napsauttamalla)"
 }
diff --git a/resources/lib/oojs-ui/i18n/fr.json b/resources/lib/oojs-ui/i18n/fr.json
index fe8ec04ac3..92015a4f59 100644
--- a/resources/lib/oojs-ui/i18n/fr.json
+++ b/resources/lib/oojs-ui/i18n/fr.json
@@ -44,7 +44,8 @@
 	"ooui-dialog-process-dismiss": "Rejeter",
 	"ooui-dialog-process-retry": "Réessayer",
 	"ooui-dialog-process-continue": "Continuer",
+	"ooui-selectfile-button-select": "Sélectionner un fichier",
 	"ooui-selectfile-not-supported": "La sélection de fichier n’est pas prise en charge",
 	"ooui-selectfile-placeholder": "Aucun fichier sélectionné",
-	"ooui-selectfile-dragdrop-placeholder": "Déposer le fichier ici (ou cliquez pour parcourir)"
+	"ooui-selectfile-dragdrop-placeholder": "Déposer le fichier ici"
 }
diff --git a/resources/lib/oojs-ui/i18n/gl.json b/resources/lib/oojs-ui/i18n/gl.json
index 0f7ac78547..4cb28399c5 100644
--- a/resources/lib/oojs-ui/i18n/gl.json
+++ b/resources/lib/oojs-ui/i18n/gl.json
@@ -19,7 +19,8 @@
 	"ooui-dialog-process-dismiss": "Agochar",
 	"ooui-dialog-process-retry": "Inténteo de novo",
 	"ooui-dialog-process-continue": "Continuar",
+	"ooui-selectfile-button-select": "Seleccionar un ficheiro",
 	"ooui-selectfile-not-supported": "Non está soportada a selección de ficheiros",
 	"ooui-selectfile-placeholder": "Non se seleccionou ningún ficheiro",
-	"ooui-selectfile-dragdrop-placeholder": "Solte un ficheiro aquí (ou prema para buscalo)"
+	"ooui-selectfile-dragdrop-placeholder": "Solte un ficheiro aquí"
 }
diff --git a/resources/lib/oojs-ui/i18n/glk.json b/resources/lib/oojs-ui/i18n/glk.json
new file mode 100644
index 0000000000..9b15046fa3
--- /dev/null
+++ b/resources/lib/oojs-ui/i18n/glk.json
@@ -0,0 +1,23 @@
+{
+	"@metadata": {
+		"authors": [
+			"V6rg"
+		]
+	},
+	"ooui-outline-control-move-down": "مأسمکه جابجا بۊکۊن جير",
+	"ooui-outline-control-move-up": "مأسمکه جابجا بۊکۊن جؤر",
+	"ooui-outline-control-remove": "مأسمکه حذفأکۊن",
+	"ooui-toolbar-more": "ويشتر",
+	"ooui-toolgroup-expand": "ويشتر",
+	"ooui-toolgroup-collapse": "کمتر",
+	"ooui-dialog-message-accept": "خؤ",
+	"ooui-dialog-message-reject": "لغو",
+	"ooui-dialog-process-error": "ىک مؤشکلي هنأ",
+	"ooui-dialog-process-dismiss": "وأبدي",
+	"ooui-dialog-process-retry": "هنده حقسأى بۊکۊنين",
+	"ooui-dialog-process-continue": "سره",
+	"ooui-selectfile-button-select": "ىکته فاىله دؤجين بۊکۊنين",
+	"ooui-selectfile-not-supported": "نشأنهىکته فاىله دؤجين گۊدن",
+	"ooui-selectfile-placeholder": "هيچ فاىلي دؤجين نۊبؤ",
+	"ooui-selectfile-dragdrop-placeholder": "فاىله ائره فدي"
+}
diff --git a/resources/lib/oojs-ui/i18n/he.json b/resources/lib/oojs-ui/i18n/he.json
index b652d63a32..650d67dde0 100644
--- a/resources/lib/oojs-ui/i18n/he.json
+++ b/resources/lib/oojs-ui/i18n/he.json
@@ -27,7 +27,8 @@
 	"ooui-dialog-process-dismiss": "לוותר",
 	"ooui-dialog-process-retry": "לנסות שוב",
 	"ooui-dialog-process-continue": "המשך",
+	"ooui-selectfile-button-select": "נא לבחור קובץ",
 	"ooui-selectfile-not-supported": "בחירת קבצים אינה נתמכת",
 	"ooui-selectfile-placeholder": "לא נבחר שום קובץ",
-	"ooui-selectfile-dragdrop-placeholder": "נא לשחרר את הקובץ כאן (או ללחוץ לעיון)"
+	"ooui-selectfile-dragdrop-placeholder": "נא לשחרר את הקובץ כאן"
 }
diff --git a/resources/lib/oojs-ui/i18n/ja.json b/resources/lib/oojs-ui/i18n/ja.json
index 631b3f5c10..d0df02748f 100644
--- a/resources/lib/oojs-ui/i18n/ja.json
+++ b/resources/lib/oojs-ui/i18n/ja.json
@@ -6,7 +6,8 @@
 			"Penn Station",
 			"Shirayuki",
 			"Takot",
-			"Los688"
+			"Los688",
+			"Sujiniku"
 		]
 	},
 	"ooui-outline-control-move-down": "項目を下に移動させる",
@@ -21,6 +22,8 @@
 	"ooui-dialog-process-dismiss": "閉じる",
 	"ooui-dialog-process-retry": "もう一度お試しください",
 	"ooui-dialog-process-continue": "続行",
+	"ooui-selectfile-button-select": "ファイルを選択",
 	"ooui-selectfile-not-supported": "ファイルの選択はサポートされていません",
-	"ooui-selectfile-placeholder": "ファイルが選択されていません"
+	"ooui-selectfile-placeholder": "ファイルが選択されていません",
+	"ooui-selectfile-dragdrop-placeholder": "ファイルをここにドロップ"
 }
diff --git a/resources/lib/oojs-ui/i18n/km.json b/resources/lib/oojs-ui/i18n/km.json
index e54099d2fe..e64889f493 100644
--- a/resources/lib/oojs-ui/i18n/km.json
+++ b/resources/lib/oojs-ui/i18n/km.json
@@ -17,7 +17,8 @@
 	"ooui-dialog-process-dismiss": "បិទ",
 	"ooui-dialog-process-retry": "ព្យាយាមម្ដងទៀត",
 	"ooui-dialog-process-continue": "បន្ត",
+	"ooui-selectfile-button-select": "ជ្រើសរើសឯកសារ",
 	"ooui-selectfile-not-supported": "ការជ្រើសរើសឯកសារមិនអាចប្រើបានទេ",
 	"ooui-selectfile-placeholder": "គ្មានឯកសារណាមួយត្រូវបានជ្រើសរើស",
-	"ooui-selectfile-dragdrop-placeholder": "ទម្លាក់ឯកសារនៅទីនេះ(ឬចុចដើម្បីរាវរក)"
+	"ooui-selectfile-dragdrop-placeholder": "ទម្លាក់ឯកសារនៅទីនេះ"
 }
diff --git a/resources/lib/oojs-ui/i18n/ksh.json b/resources/lib/oojs-ui/i18n/ksh.json
index 792b6fcb18..f99c29fd68 100644
--- a/resources/lib/oojs-ui/i18n/ksh.json
+++ b/resources/lib/oojs-ui/i18n/ksh.json
@@ -16,6 +16,7 @@
 	"ooui-dialog-process-dismiss": "Maach fott, ha_sch jelässe",
 	"ooui-dialog-process-retry": "Norr_ens versöhke",
 	"ooui-dialog-process-continue": "Wigger maache",
+	"ooui-selectfile-button-select": "Söhg en Dattei uß",
 	"ooui-selectfile-not-supported": "Mer ogerschtözze et Datteij_Ußwähle nit.",
 	"ooui-selectfile-placeholder": "Kein Dattei es ußjewählt"
 }
diff --git a/resources/lib/oojs-ui/i18n/lb.json b/resources/lib/oojs-ui/i18n/lb.json
index 65bce10bfd..39bc670166 100644
--- a/resources/lib/oojs-ui/i18n/lb.json
+++ b/resources/lib/oojs-ui/i18n/lb.json
@@ -22,6 +22,7 @@
 	"ooui-dialog-process-dismiss": "Verwerfen",
 	"ooui-dialog-process-retry": "Nach eng Kéier probéieren",
 	"ooui-dialog-process-continue": "Virufueren",
+	"ooui-selectfile-button-select": "E Fichier eraussichen",
 	"ooui-selectfile-placeholder": "Et ass kee Fichier erausgesicht",
-	"ooui-selectfile-dragdrop-placeholder": "Fichier hei deposéieren (oder klickt fir ze sichen)"
+	"ooui-selectfile-dragdrop-placeholder": "Fichier hei ofleeën"
 }
diff --git a/resources/lib/oojs-ui/i18n/lt.json b/resources/lib/oojs-ui/i18n/lt.json
index 20aa2f1147..fbd22d0f43 100644
--- a/resources/lib/oojs-ui/i18n/lt.json
+++ b/resources/lib/oojs-ui/i18n/lt.json
@@ -19,7 +19,8 @@
 	"ooui-dialog-process-dismiss": "Paslėpti",
 	"ooui-dialog-process-retry": "Bandykite dar kartą",
 	"ooui-dialog-process-continue": "Tęsti",
+	"ooui-selectfile-button-select": "Pasirinkti failą",
 	"ooui-selectfile-not-supported": "Failų pasirinkimas nepalaikomas",
 	"ooui-selectfile-placeholder": "Nėra pasirinktų failų",
-	"ooui-selectfile-dragdrop-placeholder": "Atitempkite failą čia (arba paspauskite paieškai)"
+	"ooui-selectfile-dragdrop-placeholder": "Atitempkite failą čia"
 }
diff --git a/resources/lib/oojs-ui/i18n/mk.json b/resources/lib/oojs-ui/i18n/mk.json
index dd55db40a2..46f37fe811 100644
--- a/resources/lib/oojs-ui/i18n/mk.json
+++ b/resources/lib/oojs-ui/i18n/mk.json
@@ -18,7 +18,8 @@
 	"ooui-dialog-process-dismiss": "Тргни",
 	"ooui-dialog-process-retry": "Обиди се пак",
 	"ooui-dialog-process-continue": "Продолжи",
+	"ooui-selectfile-button-select": "Одберете податотека",
 	"ooui-selectfile-not-supported": "Изборот на податотеки не е поддржан",
 	"ooui-selectfile-placeholder": "Немате одбрано податотека",
-	"ooui-selectfile-dragdrop-placeholder": "Тука пуштете ја податотеката (или стиснете за да прелистате)"
+	"ooui-selectfile-dragdrop-placeholder": "Тука пуштете ја податотеката"
 }
diff --git a/resources/lib/oojs-ui/i18n/nap.json b/resources/lib/oojs-ui/i18n/nap.json
index 9c07f410d1..b7e37b49b6 100644
--- a/resources/lib/oojs-ui/i18n/nap.json
+++ b/resources/lib/oojs-ui/i18n/nap.json
@@ -4,7 +4,8 @@
 			"Chelin",
 			"Chrisportelli",
 			"PiRSquared17",
-			"C.R."
+			"C.R.",
+			"Candalua"
 		]
 	},
 	"ooui-outline-control-move-down": "Mòve abbascio",
@@ -19,6 +20,8 @@
 	"ooui-dialog-process-dismiss": "Passa 'a vacca",
 	"ooui-dialog-process-retry": "Prova n'ata vota",
 	"ooui-dialog-process-continue": "Continua",
+	"ooui-selectfile-button-select": "Sceglie nu file",
 	"ooui-selectfile-not-supported": "Filtro 'e selezione nun suppurtato",
-	"ooui-selectfile-placeholder": "Nun s'è scigliuto nisciuno file"
+	"ooui-selectfile-placeholder": "Nun s'è scigliuto nisciuno file",
+	"ooui-selectfile-dragdrop-placeholder": "Lassa 'o file ccà"
 }
diff --git a/resources/lib/oojs-ui/i18n/pl.json b/resources/lib/oojs-ui/i18n/pl.json
index 9dd84b0c63..486e87f43f 100644
--- a/resources/lib/oojs-ui/i18n/pl.json
+++ b/resources/lib/oojs-ui/i18n/pl.json
@@ -32,7 +32,8 @@
 	"ooui-dialog-process-dismiss": "Ukryj",
 	"ooui-dialog-process-retry": "Spróbuj ponownie",
 	"ooui-dialog-process-continue": "Kontynuuj",
+	"ooui-selectfile-button-select": "Wybierz plik",
 	"ooui-selectfile-not-supported": "Wybór pliku nie jest obsługiwany",
 	"ooui-selectfile-placeholder": "Nie wybrano pliku",
-	"ooui-selectfile-dragdrop-placeholder": "Umieść plik tutaj (lub kliknij, aby je przeglądać)"
+	"ooui-selectfile-dragdrop-placeholder": "Umieść plik tutaj"
 }
diff --git a/resources/lib/oojs-ui/i18n/ps.json b/resources/lib/oojs-ui/i18n/ps.json
index c371bbc3cd..228291acc8 100644
--- a/resources/lib/oojs-ui/i18n/ps.json
+++ b/resources/lib/oojs-ui/i18n/ps.json
@@ -16,6 +16,7 @@
 	"ooui-dialog-process-dismiss": "تړل",
 	"ooui-dialog-process-retry": "بيا هڅه",
 	"ooui-dialog-process-continue": "پرله پورې",
+	"ooui-selectfile-button-select": "يوه دوتنه وټاکئ",
 	"ooui-selectfile-not-supported": "د دوتنې د ټاکنې ملاتړ نه دی شوی",
 	"ooui-selectfile-placeholder": "کومه دوتنه نه ده ټاکل شوې"
 }
diff --git a/resources/lib/oojs-ui/i18n/pt.json b/resources/lib/oojs-ui/i18n/pt.json
index aab0aed430..8379cacda7 100644
--- a/resources/lib/oojs-ui/i18n/pt.json
+++ b/resources/lib/oojs-ui/i18n/pt.json
@@ -26,5 +26,6 @@
 	"ooui-dialog-process-retry": "Tentar novamente",
 	"ooui-dialog-process-continue": "Continuar",
 	"ooui-selectfile-not-supported": "A seleção de ficheiros não é suportada",
-	"ooui-selectfile-placeholder": "Nenhum ficheiro selecionado"
+	"ooui-selectfile-placeholder": "Nenhum ficheiro selecionado",
+	"ooui-selectfile-dragdrop-placeholder": "Soltar ficheiro aqui (ou clicar para navegar)"
 }
diff --git a/resources/lib/oojs-ui/i18n/qqq.json b/resources/lib/oojs-ui/i18n/qqq.json
index 607229d9ad..cd9c0c25d4 100644
--- a/resources/lib/oojs-ui/i18n/qqq.json
+++ b/resources/lib/oojs-ui/i18n/qqq.json
@@ -32,8 +32,9 @@
 	"ooui-dialog-process-dismiss": "Label for process dialog dismiss error button, visible when describing errors\n{{Identical|Dismiss}}",
 	"ooui-dialog-process-retry": "Label for process dialog retry action button, visible when describing recoverable errors\n{{Identical|Try again}}",
 	"ooui-dialog-process-continue": "Label for process dialog retry action button, visible when describing only warnings\n{{Identical|Continue}}",
-	"ooui-selectfile-not-supported": "Label for the file selection dialog if file selection is not supported",
-	"ooui-selectfile-placeholder": "Label for the file selection dialog when no file is currently selected",
-	"ooui-selectfile-dragdrop-placeholder": "Label for the file selection dialog when no file is currently selected in the drag drop UI. Suggests clicking to open the browse dialog.",
+	"ooui-selectfile-button-select": "Label for the file selection widget's select file button",
+	"ooui-selectfile-not-supported": "Label for the file selection widget if file selection is not supported",
+	"ooui-selectfile-placeholder": "Label for the file selection widget when no file is currently selected",
+	"ooui-selectfile-dragdrop-placeholder": "Label for the file selection widget's drop target",
 	"ooui-semicolon-separator": "{{optional}} Semicolon used as a separator"
 }
diff --git a/resources/lib/oojs-ui/i18n/ro.json b/resources/lib/oojs-ui/i18n/ro.json
index bf44621816..69daa1806c 100644
--- a/resources/lib/oojs-ui/i18n/ro.json
+++ b/resources/lib/oojs-ui/i18n/ro.json
@@ -20,7 +20,8 @@
 	"ooui-dialog-process-dismiss": "Renunțare",
 	"ooui-dialog-process-retry": "Reîncearcă",
 	"ooui-dialog-process-continue": "Continuă",
+	"ooui-selectfile-button-select": "Alege un fișier",
 	"ooui-selectfile-not-supported": "Selecția de fișiere nu este acceptată",
 	"ooui-selectfile-placeholder": "Niciun fișier selectat",
-	"ooui-selectfile-dragdrop-placeholder": "Trageți fișierul aici (sau faceți clic pentru a răsfoi)"
+	"ooui-selectfile-dragdrop-placeholder": "Trageți fișierul aici"
 }
diff --git a/resources/lib/oojs-ui/i18n/roa-tara.json b/resources/lib/oojs-ui/i18n/roa-tara.json
index 42005feafe..73a5a6c120 100644
--- a/resources/lib/oojs-ui/i18n/roa-tara.json
+++ b/resources/lib/oojs-ui/i18n/roa-tara.json
@@ -16,6 +16,8 @@
 	"ooui-dialog-process-dismiss": "Scitte",
 	"ooui-dialog-process-retry": "Pruève arrete",
 	"ooui-dialog-process-continue": "Condinue",
+	"ooui-selectfile-button-select": "Scacchie 'nu file",
 	"ooui-selectfile-not-supported": "'U scacchiamende d'u file non g'è supportate",
-	"ooui-selectfile-placeholder": "Nisciune file scacchiate"
+	"ooui-selectfile-placeholder": "Nisciune file scacchiate",
+	"ooui-selectfile-dragdrop-placeholder": "Scitte 'u file aqquà"
 }
diff --git a/resources/lib/oojs-ui/i18n/ru.json b/resources/lib/oojs-ui/i18n/ru.json
index 743541609c..6c62d360da 100644
--- a/resources/lib/oojs-ui/i18n/ru.json
+++ b/resources/lib/oojs-ui/i18n/ru.json
@@ -32,6 +32,8 @@
 	"ooui-dialog-process-dismiss": "Закрыть",
 	"ooui-dialog-process-retry": "Попробовать ещё раз",
 	"ooui-dialog-process-continue": "Продолжить",
+	"ooui-selectfile-button-select": "Выберите файл",
 	"ooui-selectfile-not-supported": "Выбор файла не поддерживается",
-	"ooui-selectfile-placeholder": "Не выбран файл"
+	"ooui-selectfile-placeholder": "Не выбран файл",
+	"ooui-selectfile-dragdrop-placeholder": "Перетащите файл сюда"
 }
diff --git a/resources/lib/oojs-ui/i18n/sv.json b/resources/lib/oojs-ui/i18n/sv.json
index 9cd8ea3ba9..3ffbc48927 100644
--- a/resources/lib/oojs-ui/i18n/sv.json
+++ b/resources/lib/oojs-ui/i18n/sv.json
@@ -27,6 +27,8 @@
 	"ooui-dialog-process-dismiss": "Stäng",
 	"ooui-dialog-process-retry": "Försök igen",
 	"ooui-dialog-process-continue": "Fortsätt",
+	"ooui-selectfile-button-select": "Välj en fil",
 	"ooui-selectfile-not-supported": "Filval stöds inte",
-	"ooui-selectfile-placeholder": "Ingen fil är vald"
+	"ooui-selectfile-placeholder": "Ingen fil är vald",
+	"ooui-selectfile-dragdrop-placeholder": "Släpp filen här"
 }
diff --git a/resources/lib/oojs-ui/i18n/uk.json b/resources/lib/oojs-ui/i18n/uk.json
index 9e727e472e..a38afbfd61 100644
--- a/resources/lib/oojs-ui/i18n/uk.json
+++ b/resources/lib/oojs-ui/i18n/uk.json
@@ -32,7 +32,8 @@
 	"ooui-dialog-process-dismiss": "Приховати",
 	"ooui-dialog-process-retry": "Спробуйте ще раз",
 	"ooui-dialog-process-continue": "Продовжити",
+	"ooui-selectfile-button-select": "Оберіть файл",
 	"ooui-selectfile-not-supported": "Вибір файлу не підтримується",
 	"ooui-selectfile-placeholder": "Жодного файлу не вибрано",
-	"ooui-selectfile-dragdrop-placeholder": "Помістіть файл сюди (або натисніть, щоб переглянути)"
+	"ooui-selectfile-dragdrop-placeholder": "Помістіть файл сюди"
 }
diff --git a/resources/lib/oojs-ui/i18n/vec.json b/resources/lib/oojs-ui/i18n/vec.json
index 4de584bfda..1ccc67b47f 100644
--- a/resources/lib/oojs-ui/i18n/vec.json
+++ b/resources/lib/oojs-ui/i18n/vec.json
@@ -9,5 +9,9 @@
 	"ooui-outline-control-move-down": "Sposta in baso",
 	"ooui-outline-control-move-up": "Sposta in sima",
 	"ooui-toolbar-more": "Altro",
-	"ooui-dialog-message-accept": "Va ben"
+	"ooui-dialog-message-accept": "Va ben",
+	"ooui-dialog-process-error": "Xe 'ndà storto calcossa",
+	"ooui-dialog-process-dismiss": "Scondi",
+	"ooui-dialog-process-retry": "Proa da novo",
+	"ooui-dialog-process-continue": "Và vanti"
 }
diff --git a/resources/lib/oojs-ui/i18n/vi.json b/resources/lib/oojs-ui/i18n/vi.json
index 7d4252def1..ff14801f4e 100644
--- a/resources/lib/oojs-ui/i18n/vi.json
+++ b/resources/lib/oojs-ui/i18n/vi.json
@@ -21,5 +21,6 @@
 	"ooui-dialog-process-retry": "Thử lại",
 	"ooui-dialog-process-continue": "Tiếp tục",
 	"ooui-selectfile-not-supported": "Không hỗ trợ việc chọn tập tin",
-	"ooui-selectfile-placeholder": "Không có tập tin nào được chọn"
+	"ooui-selectfile-placeholder": "Không có tập tin nào được chọn",
+	"ooui-selectfile-dragdrop-placeholder": "Thả tập tin vào đây (hoặc nhấn chuột để duyệt)"
 }
diff --git a/resources/lib/oojs-ui/i18n/zh-hans.json b/resources/lib/oojs-ui/i18n/zh-hans.json
index b5b51a0a50..9934d9d00c 100644
--- a/resources/lib/oojs-ui/i18n/zh-hans.json
+++ b/resources/lib/oojs-ui/i18n/zh-hans.json
@@ -32,7 +32,8 @@
 	"ooui-dialog-process-dismiss": "关闭",
 	"ooui-dialog-process-retry": "重试",
 	"ooui-dialog-process-continue": "继续",
+	"ooui-selectfile-button-select": "选择一个文件",
 	"ooui-selectfile-not-supported": "文件选择不受支持",
 	"ooui-selectfile-placeholder": "没有选定文件",
-	"ooui-selectfile-dragdrop-placeholder": "将文件拖动至此（或点击以浏览）"
+	"ooui-selectfile-dragdrop-placeholder": "将文件拖动至此"
 }
diff --git a/resources/lib/oojs-ui/i18n/zh-hant.json b/resources/lib/oojs-ui/i18n/zh-hant.json
index 195bb3ab31..f70efe1960 100644
--- a/resources/lib/oojs-ui/i18n/zh-hant.json
+++ b/resources/lib/oojs-ui/i18n/zh-hant.json
@@ -30,6 +30,8 @@
 	"ooui-dialog-process-dismiss": "關閉",
 	"ooui-dialog-process-retry": "再試一次",
 	"ooui-dialog-process-continue": "繼續",
+	"ooui-selectfile-button-select": "選擇一個檔案",
 	"ooui-selectfile-not-supported": "無法支援所選擇的檔案",
-	"ooui-selectfile-placeholder": "未選擇檔案"
+	"ooui-selectfile-placeholder": "未選擇檔案",
+	"ooui-selectfile-dragdrop-placeholder": "拖曳檔案到此處"
 }
diff --git a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css
index 1d07fe902b..ede6ea95e8 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex-noimages.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex-noimages.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.12.6
+ * OOjs UI v0.12.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-26T00:14:44Z
+ * Date: 2015-09-08T20:56:08Z
  */
 @-webkit-keyframes oo-ui-progressBarWidget-slide {
 	from {
@@ -125,7 +125,7 @@
 }
 .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button > .oo-ui-iconElement-icon {
 	/* Don't animate opacities for now, causes wiggling in Chrome (bug 63020) */
-	/*.oo-ui-transition(opacity 200ms);*/
+	/*.oo-ui-transition(opacity @medium-ease);*/
 }
 .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button:hover,
 .oo-ui-buttonElement-frameless > .oo-ui-buttonElement-button:focus {
@@ -174,11 +174,11 @@
 	border-radius: 0.3em;
 	text-shadow: 0 1px 1px rgba(255, 255, 255, 0.5);
 	border: 1px #c9c9c9 solid;
-	-webkit-transition: border-color 100ms ease-in-out;
-	   -moz-transition: border-color 100ms ease-in-out;
-	    -ms-transition: border-color 100ms ease-in-out;
-	     -o-transition: border-color 100ms ease-in-out;
-	        transition: border-color 100ms ease-in-out;
+	-webkit-transition: border-color 100ms ease;
+	   -moz-transition: border-color 100ms ease;
+	    -ms-transition: border-color 100ms ease;
+	     -o-transition: border-color 100ms ease;
+	        transition: border-color 100ms ease;
 	background: #eeeeee;
 	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#ffffff', endColorstr='#dddddd');
 	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #dddddd));
@@ -573,11 +573,11 @@
 .oo-ui-menuLayout-menu,
 .oo-ui-menuLayout-content {
 	position: absolute;
-	-webkit-transition: all ease-in-out 200ms;
-	   -moz-transition: all ease-in-out 200ms;
-	    -ms-transition: all ease-in-out 200ms;
-	     -o-transition: all ease-in-out 200ms;
-	        transition: all ease-in-out 200ms;
+	-webkit-transition: all 200ms ease;
+	   -moz-transition: all 200ms ease;
+	    -ms-transition: all 200ms ease;
+	     -o-transition: all 200ms ease;
+	        transition: all 200ms ease;
 }
 .oo-ui-menuLayout-menu {
 	height: 18em;
@@ -722,11 +722,11 @@
 	margin: 0.375em;
 	border-radius: 0.3125em;
 	border: 1px solid transparent;
-	-webkit-transition: border-color 300ms ease-in-out;
-	   -moz-transition: border-color 300ms ease-in-out;
-	    -ms-transition: border-color 300ms ease-in-out;
-	     -o-transition: border-color 300ms ease-in-out;
-	        transition: border-color 300ms ease-in-out;
+	-webkit-transition: border-color 250ms ease;
+	   -moz-transition: border-color 250ms ease;
+	    -ms-transition: border-color 250ms ease;
+	     -o-transition: border-color 250ms ease;
+	        transition: border-color 250ms ease;
 }
 .oo-ui-toolGroup-empty {
 	display: none;
@@ -1178,11 +1178,11 @@
 	bottom: -9px;
 	height: 9px;
 	opacity: 0.5;
-	-webkit-transition: opacity 500ms ease-in-out;
-	   -moz-transition: opacity 500ms ease-in-out;
-	    -ms-transition: opacity 500ms ease-in-out;
-	     -o-transition: opacity 500ms ease-in-out;
-	        transition: opacity 500ms ease-in-out;
+	-webkit-transition: opacity 500ms ease;
+	   -moz-transition: opacity 500ms ease;
+	    -ms-transition: opacity 500ms ease;
+	     -o-transition: opacity 500ms ease;
+	        transition: opacity 500ms ease;
 }
 .oo-ui-optionWidget {
 	position: relative;
@@ -1449,11 +1449,11 @@
 	border-radius: 1em;
 	box-shadow: 0 0.1em 0.25em rgba(0, 0, 0, 0.1);
 	border: 1px #c9c9c9 solid;
-	-webkit-transition: left 200ms ease-in-out, margin-left 200ms ease-in-out;
-	   -moz-transition: left 200ms ease-in-out, margin-left 200ms ease-in-out;
-	    -ms-transition: left 200ms ease-in-out, margin-left 200ms ease-in-out;
-	     -o-transition: left 200ms ease-in-out, margin-left 200ms ease-in-out;
-	        transition: left 200ms ease-in-out, margin-left 200ms ease-in-out;
+	-webkit-transition: left 250ms ease, margin-left 250ms ease;
+	   -moz-transition: left 250ms ease, margin-left 250ms ease;
+	    -ms-transition: left 250ms ease, margin-left 250ms ease;
+	     -o-transition: left 250ms ease, margin-left 250ms ease;
+	        transition: left 250ms ease, margin-left 250ms ease;
 	background: #eeeeee;
 	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#ffffff', endColorstr='#dddddd');
 	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #ffffff), color-stop(100%, #dddddd));
@@ -1469,11 +1469,11 @@
 .oo-ui-toggleSwitchWidget .oo-ui-toggleSwitchWidget-glow {
 	border-radius: 1em;
 	box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07);
-	-webkit-transition: opacity 200ms ease-in-out;
-	   -moz-transition: opacity 200ms ease-in-out;
-	    -ms-transition: opacity 200ms ease-in-out;
-	     -o-transition: opacity 200ms ease-in-out;
-	        transition: opacity 200ms ease-in-out;
+	-webkit-transition: opacity 250ms ease;
+	   -moz-transition: opacity 250ms ease;
+	    -ms-transition: opacity 250ms ease;
+	     -o-transition: opacity 250ms ease;
+	        transition: opacity 250ms ease;
 	background: #cde7f4;
 	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#b0d9ee', endColorstr='#eaf4fa');
 	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #b0d9ee), color-stop(100%, #eaf4fa));
@@ -1506,11 +1506,11 @@
 .oo-ui-progressBarWidget-bar {
 	height: 1em;
 	border-right: 1px solid #cccccc;
-	-webkit-transition: width 200ms, margin-left 200ms;
-	   -moz-transition: width 200ms, margin-left 200ms;
-	    -ms-transition: width 200ms, margin-left 200ms;
-	     -o-transition: width 200ms, margin-left 200ms;
-	        transition: width 200ms, margin-left 200ms;
+	-webkit-transition: width 250ms ease, margin-left 250ms ease;
+	   -moz-transition: width 250ms ease, margin-left 250ms ease;
+	    -ms-transition: width 250ms ease, margin-left 250ms ease;
+	     -o-transition: width 250ms ease, margin-left 250ms ease;
+	        transition: width 250ms ease, margin-left 250ms ease;
 	background: #cde7f4;
 	filter: progid:DXImageTransform.Microsoft.gradient(GradientType=0, startColorstr='#eaf4fa', endColorstr='#b0d9ee');
 	background-image: -webkit-gradient(linear, right top, right bottom, color-stop(0%, #eaf4fa), color-stop(100%, #b0d9ee));
@@ -1607,11 +1607,11 @@
 	border-width: 6px;
 }
 .oo-ui-popupWidget-transitioning .oo-ui-popupWidget-popup {
-	-webkit-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out;
-	   -moz-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out;
-	    -ms-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out;
-	     -o-transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out;
-	        transition: width 100ms ease-in-out, height 100ms ease-in-out, left 100ms ease-in-out;
+	-webkit-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	   -moz-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	    -ms-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	     -o-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	        transition: width 100ms ease, height 100ms ease, left 100ms ease;
 }
 .oo-ui-popupWidget-head {
 	height: 2.5em;
@@ -1782,11 +1782,11 @@
 	border: 1px solid #cccccc;
 	box-shadow: 0 0 0 white, inset 0 0.1em 0.2em #dddddd;
 	border-radius: 0.25em;
-	-webkit-transition: border-color 200ms, box-shadow 200ms;
-	   -moz-transition: border-color 200ms, box-shadow 200ms;
-	    -ms-transition: border-color 200ms, box-shadow 200ms;
-	     -o-transition: border-color 200ms, box-shadow 200ms;
-	        transition: border-color 200ms, box-shadow 200ms;
+	-webkit-transition: border-color 250ms ease, box-shadow 250ms ease;
+	   -moz-transition: border-color 250ms ease, box-shadow 250ms ease;
+	    -ms-transition: border-color 250ms ease, box-shadow 250ms ease;
+	     -o-transition: border-color 250ms ease, box-shadow 250ms ease;
+	        transition: border-color 250ms ease, box-shadow 250ms ease;
 }
 .oo-ui-textInputWidget input.oo-ui-pendingElement-pending,
 .oo-ui-textInputWidget textarea.oo-ui-pendingElement-pending {
@@ -1975,32 +1975,20 @@
 }
 .oo-ui-selectFileWidget {
 	display: inline-block;
-	position: relative;
 	vertical-align: middle;
 	width: 100%;
 	max-width: 50em;
 	margin-right: 0.5em;
 }
-.oo-ui-selectFileWidget-handle {
-	width: 100%;
-	display: inline-block;
-	cursor: pointer;
-	overflow: hidden;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	    -ms-user-select: none;
-	        user-select: none;
-	-webkit-box-sizing: border-box;
-	   -moz-box-sizing: border-box;
-	        box-sizing: border-box;
+.oo-ui-selectFileWidget-selectButton {
+	display: table-cell;
+	vertical-align: middle;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator,
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget-handle > .oo-ui-selectFileWidget-clearButton {
-	position: absolute;
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+	position: relative;
+	overflow: hidden;
 }
-.oo-ui-selectFileWidget-handle > input[type="file"] {
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button > input[type="file"] {
 	position: absolute;
 	margin: 0;
 	top: 0;
@@ -2012,17 +2000,43 @@
 	opacity: 0;
 	z-index: 1;
 	cursor: pointer;
+	/* Push the button part of the native control out of view, as it changes the cursor */
+	padding-top: 100px;
+}
+.oo-ui-selectFileWidget-selectButton.oo-ui-widget-disabled > .oo-ui-buttonElement-button > input[type="file"] {
+	display: none;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info {
+	width: 100%;
+	display: table-cell;
+	vertical-align: middle;
+	position: relative;
+	overflow: hidden;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	text-overflow: ellipsis;
+}
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
+	position: absolute;
+}
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
 	z-index: 2;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle {
+.oo-ui-selectFileWidget-dropTarget {
 	cursor: default;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > input[type="file"],
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle > input[type="file"] {
-	display: none;
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled .oo-ui-selectFileWidget-dropTarget {
+	cursor: pointer;
 }
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-clearButton,
 .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-clearButton {
@@ -2031,104 +2045,105 @@
 .oo-ui-selectFileWidget:last-child {
 	margin-right: 0;
 }
-.oo-ui-selectFileWidget-handle {
-	height: 2.5em;
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+	margin: 0 0 0 0.5em;
+}
+.oo-ui-selectFileWidget-info {
+	height: 2.4em;
 	border: 1px solid rgba(0, 0, 0, 0.1);
 	border-radius: 0.25em;
-	padding: 0 0.5em;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	right: 0;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	left: 0.25em;
 }
-.oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
-	line-height: 2.5em;
+.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	line-height: 2.3em;
 	margin: 0;
-	display: inline-block;
 	overflow: hidden;
-	width: 100%;
 	white-space: nowrap;
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
 	text-overflow: ellipsis;
+	left: 0.5em;
+	right: 0.5em;
 }
-.oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	top: 0;
 	width: 1.875em;
 	height: 1.875em;
 	margin: 0.3em;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	top: 0;
 	width: 0.9375em;
 	height: 0.9375em;
 	margin: 0.775em;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	top: 0;
 	width: 1.875em;
 	height: 1.875em;
 	margin: 0.3em;
 }
-.oo-ui-selectFileWidget:hover .oo-ui-selectFileWidget-handle {
-	border-color: #aaaaaa;
-}
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle {
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
 	color: #cccccc;
 	text-shadow: 0 1px 1px #ffffff;
 	border-color: #dddddd;
 	background-color: #f3f3f3;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	opacity: 0.2;
 }
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label {
 	color: #cccccc;
 }
-.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-handle {
-	padding-left: 3em;
+.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	left: 2.75em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-handle {
-	padding-right: 3em;
+.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 3em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	right: 0;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
-	padding-right: 5em;
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 5em;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	right: 2em;
 }
-.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle {
-	padding-right: 1em;
+.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 1em;
 }
-.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
-	padding-right: 2em;
+.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 2em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle {
-	height: 3.5em;
+.oo-ui-selectFileWidget-dropTarget {
+	line-height: 3.5em;
 	border: 1px dashed #aaaaaa;
 	padding: 0.5em 1em;
+	margin-bottom: 0.5em;
 	background: #ffffff;
 	text-align: center;
 	vertical-align: middle;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-iconElement-icon {
-	margin: 0.6em 0;
-}
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
-	color: #000000;
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled .oo-ui-selectFileWidget-dropTarget:hover,
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop oo-ui-selectfilewidget-droptarget {
+	background-color: #e1f3ff;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle:hover,
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-handle {
-	background-color: #eeeeee;
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget {
+	color: #cccccc;
+	text-shadow: 0 1px 1px #ffffff;
+	border-color: #dddddd;
+	background-color: #f3f3f3;
 }
 .oo-ui-outlineOptionWidget {
 	position: relative;
@@ -2881,11 +2896,11 @@
 .oo-ui-windowManager-modal > .oo-ui-dialog {
 	background-color: rgba(255, 255, 255, 0.5);
 	opacity: 0;
-	-webkit-transition: opacity 250ms ease-in-out;
-	   -moz-transition: opacity 250ms ease-in-out;
-	    -ms-transition: opacity 250ms ease-in-out;
-	     -o-transition: opacity 250ms ease-in-out;
-	        transition: opacity 250ms ease-in-out;
+	-webkit-transition: opacity 250ms ease;
+	   -moz-transition: opacity 250ms ease;
+	    -ms-transition: opacity 250ms ease;
+	     -o-transition: opacity 250ms ease;
+	        transition: opacity 250ms ease;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame {
 	top: 1em;
@@ -2897,11 +2912,11 @@
 	    -ms-transform: scale(0.5);
 	     -o-transform: scale(0.5);
 	        transform: scale(0.5);
-	-webkit-transition: all 250ms ease-in-out;
-	   -moz-transition: all 250ms ease-in-out;
-	    -ms-transition: all 250ms ease-in-out;
-	     -o-transition: all 250ms ease-in-out;
-	        transition: all 250ms ease-in-out;
+	-webkit-transition: all 250ms ease;
+	   -moz-transition: all 250ms ease;
+	    -ms-transition: all 250ms ease;
+	     -o-transition: all 250ms ease;
+	        transition: all 250ms ease;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready {
 	/* Fade window overlay */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js b/resources/lib/oojs-ui/oojs-ui-apex.js
index 6d6d46a4df..83452d0d23 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.12.6
+ * OOjs UI v0.12.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-26T00:14:36Z
+ * Date: 2015-09-08T20:55:55Z
  */
 /**
  * @class
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
index f23902a593..87ae9a55e6 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki-noimages.css
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.12.6
+ * OOjs UI v0.12.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-26T00:14:44Z
+ * Date: 2015-09-08T20:56:08Z
  */
 @-webkit-keyframes oo-ui-progressBarWidget-slide {
 	from {
@@ -194,11 +194,11 @@
 	margin: 0.1em 0;
 	padding: 0.2em 0.8em;
 	border-radius: 2px;
-	-webkit-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out;
-	   -moz-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out;
-	    -ms-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out;
-	     -o-transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out;
-	        transition: background 0.1s ease-in-out, color 0.1s ease-in-out, box-shadow 0.1s ease-in-out;
+	-webkit-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
+	   -moz-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
+	    -ms-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
+	     -o-transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
+	        transition: background 100ms ease, color 100ms ease, box-shadow 100ms ease;
 }
 .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:hover,
 .oo-ui-buttonElement-framed > .oo-ui-buttonElement-button:focus {
@@ -651,11 +651,11 @@
 .oo-ui-menuLayout-menu,
 .oo-ui-menuLayout-content {
 	position: absolute;
-	-webkit-transition: all ease-in-out 200ms;
-	   -moz-transition: all ease-in-out 200ms;
-	    -ms-transition: all ease-in-out 200ms;
-	     -o-transition: all ease-in-out 200ms;
-	        transition: all ease-in-out 200ms;
+	-webkit-transition: all 200ms ease;
+	   -moz-transition: all 200ms ease;
+	    -ms-transition: all 200ms ease;
+	     -o-transition: all 200ms ease;
+	        transition: all 200ms ease;
 }
 .oo-ui-menuLayout-menu {
 	height: 18em;
@@ -765,6 +765,9 @@
 .oo-ui-horizontalLayout > .oo-ui-widget:last-child {
 	margin-right: 0;
 }
+.oo-ui-horizontalLayout .oo-ui-fieldLayout {
+	margin-bottom: 0;
+}
 .oo-ui-popupTool .oo-ui-popupWidget-popup,
 .oo-ui-popupTool .oo-ui-popupWidget-anchor {
 	z-index: 4;
@@ -1428,11 +1431,11 @@
 	border-radius: 1em;
 	border: 1px #555555 solid;
 	background: #ffffff;
-	-webkit-transition: background-color 0.1s ease-in-out;
-	   -moz-transition: background-color 0.1s ease-in-out;
-	    -ms-transition: background-color 0.1s ease-in-out;
-	     -o-transition: background-color 0.1s ease-in-out;
-	        transition: background-color 0.1s ease-in-out;
+	-webkit-transition: background-color 100ms ease;
+	   -moz-transition: background-color 100ms ease;
+	    -ms-transition: background-color 100ms ease;
+	     -o-transition: background-color 100ms ease;
+	        transition: background-color 100ms ease;
 	margin-right: 0.5em;
 }
 .oo-ui-toggleSwitchWidget.oo-ui-widget-disabled {
@@ -1471,11 +1474,11 @@
 	margin-top: -1px;
 	border-radius: 1em;
 	background: #555555;
-	-webkit-transition: left 0.1s ease-in-out, margin-left 0.1s ease-in-out;
-	   -moz-transition: left 0.1s ease-in-out, margin-left 0.1s ease-in-out;
-	    -ms-transition: left 0.1s ease-in-out, margin-left 0.1s ease-in-out;
-	     -o-transition: left 0.1s ease-in-out, margin-left 0.1s ease-in-out;
-	        transition: left 0.1s ease-in-out, margin-left 0.1s ease-in-out;
+	-webkit-transition: left 100ms ease, margin-left 100ms ease;
+	   -moz-transition: left 100ms ease, margin-left 100ms ease;
+	    -ms-transition: left 100ms ease, margin-left 100ms ease;
+	     -o-transition: left 100ms ease, margin-left 100ms ease;
+	        transition: left 100ms ease, margin-left 100ms ease;
 }
 .oo-ui-toggleSwitchWidget-glow {
 	display: none;
@@ -1621,11 +1624,11 @@
 	border-width: 9px;
 }
 .oo-ui-popupWidget-transitioning .oo-ui-popupWidget-popup {
-	-webkit-transition: width 0.1s ease-in-out, height 0.1s ease-in-out, left 0.1s ease-in-out;
-	   -moz-transition: width 0.1s ease-in-out, height 0.1s ease-in-out, left 0.1s ease-in-out;
-	    -ms-transition: width 0.1s ease-in-out, height 0.1s ease-in-out, left 0.1s ease-in-out;
-	     -o-transition: width 0.1s ease-in-out, height 0.1s ease-in-out, left 0.1s ease-in-out;
-	        transition: width 0.1s ease-in-out, height 0.1s ease-in-out, left 0.1s ease-in-out;
+	-webkit-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	   -moz-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	    -ms-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	     -o-transition: width 100ms ease, height 100ms ease, left 100ms ease;
+	        transition: width 100ms ease, height 100ms ease, left 100ms ease;
 }
 .oo-ui-popupWidget-head {
 	height: 2.5em;
@@ -1690,11 +1693,11 @@
 }
 .oo-ui-checkboxInputWidget input[type="checkbox"] + span {
 	cursor: pointer;
-	-webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	   -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	    -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	     -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	        transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	-webkit-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	   -moz-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	    -ms-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	     -o-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	        transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
@@ -1796,11 +1799,11 @@
 }
 .oo-ui-radioInputWidget input[type="radio"] + span {
 	cursor: pointer;
-	-webkit-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	   -moz-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	    -ms-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	     -o-transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
-	        transition: background-size 0.2s cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	-webkit-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	   -moz-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	    -ms-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	     -o-transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
+	        transition: background-size 200ms cubic-bezier(0.175, 0.885, 0.32, 1.275);
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
@@ -1936,11 +1939,11 @@
 	border: solid 1px #cccccc;
 	box-shadow: inset 0 0 0 0 #347bff;
 	border-radius: 0.1em;
-	-webkit-transition: box-shadow 0.1s ease-in-out;
-	   -moz-transition: box-shadow 0.1s ease-in-out;
-	    -ms-transition: box-shadow 0.1s ease-in-out;
-	     -o-transition: box-shadow 0.1s ease-in-out;
-	        transition: box-shadow 0.1s ease-in-out;
+	-webkit-transition: box-shadow 100ms ease;
+	   -moz-transition: box-shadow 100ms ease;
+	    -ms-transition: box-shadow 100ms ease;
+	     -o-transition: box-shadow 100ms ease;
+	        transition: box-shadow 100ms ease;
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
@@ -1958,11 +1961,11 @@
 }
 .oo-ui-textInputWidget.oo-ui-widget-enabled input,
 .oo-ui-textInputWidget.oo-ui-widget-enabled textarea {
-	-webkit-transition: border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1);
-	   -moz-transition: border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1);
-	    -ms-transition: border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1);
-	     -o-transition: border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1);
-	        transition: border 0.2s cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 0.2s cubic-bezier(0.39, 0.575, 0.565, 1);
+	-webkit-transition: border 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1);
+	   -moz-transition: border 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1);
+	    -ms-transition: border 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1);
+	     -o-transition: border 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1);
+	        transition: border 200ms cubic-bezier(0.39, 0.575, 0.565, 1), box-shadow 200ms cubic-bezier(0.39, 0.575, 0.565, 1);
 }
 .oo-ui-textInputWidget.oo-ui-widget-enabled input:focus,
 .oo-ui-textInputWidget.oo-ui-widget-enabled textarea:focus {
@@ -2169,32 +2172,20 @@
 }
 .oo-ui-selectFileWidget {
 	display: inline-block;
-	position: relative;
 	vertical-align: middle;
 	width: 100%;
 	max-width: 50em;
 	margin-right: 0.5em;
 }
-.oo-ui-selectFileWidget-handle {
-	width: 100%;
-	display: inline-block;
-	cursor: pointer;
-	overflow: hidden;
-	-webkit-touch-callout: none;
-	-webkit-user-select: none;
-	   -moz-user-select: none;
-	    -ms-user-select: none;
-	        user-select: none;
-	-webkit-box-sizing: border-box;
-	   -moz-box-sizing: border-box;
-	        box-sizing: border-box;
+.oo-ui-selectFileWidget-selectButton {
+	display: table-cell;
+	vertical-align: middle;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator,
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget-handle > .oo-ui-selectFileWidget-clearButton {
-	position: absolute;
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+	position: relative;
+	overflow: hidden;
 }
-.oo-ui-selectFileWidget-handle > input[type="file"] {
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button > input[type="file"] {
 	position: absolute;
 	margin: 0;
 	top: 0;
@@ -2206,17 +2197,43 @@
 	opacity: 0;
 	z-index: 1;
 	cursor: pointer;
+	/* Push the button part of the native control out of view, as it changes the cursor */
+	padding-top: 100px;
+}
+.oo-ui-selectFileWidget-selectButton.oo-ui-widget-disabled > .oo-ui-buttonElement-button > input[type="file"] {
+	display: none;
+}
+.oo-ui-selectFileWidget-info {
+	width: 100%;
+	display: table-cell;
+	vertical-align: middle;
+	position: relative;
+	overflow: hidden;
+	-webkit-box-sizing: border-box;
+	   -moz-box-sizing: border-box;
+	        box-sizing: border-box;
+}
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-label {
+	position: absolute;
+	top: 0;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	text-overflow: ellipsis;
+}
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator,
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
+	position: absolute;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info > .oo-ui-selectFileWidget-clearButton {
 	z-index: 2;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle {
+.oo-ui-selectFileWidget-dropTarget {
 	cursor: default;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > input[type="file"],
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle > input[type="file"] {
-	display: none;
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled .oo-ui-selectFileWidget-dropTarget {
+	cursor: pointer;
 }
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-clearButton,
 .oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-clearButton {
@@ -2225,106 +2242,107 @@
 .oo-ui-selectFileWidget:last-child {
 	margin-right: 0;
 }
-.oo-ui-selectFileWidget-handle {
-	height: 2.5em;
+.oo-ui-selectFileWidget-selectButton > .oo-ui-buttonElement-button {
+	margin: 0 0 0 0.5em;
+}
+.oo-ui-selectFileWidget-info {
+	height: 2.4em;
 	border: 1px solid #cccccc;
 	border-radius: 0.1em;
-	padding: 0 1em;
-	background: #ffffff;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	right: 0;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	left: 0.25em;
 }
-.oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
-	line-height: 2.5em;
+.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	line-height: 2.3em;
 	margin: 0;
-	display: inline-block;
 	overflow: hidden;
-	width: 100%;
 	white-space: nowrap;
 	-webkit-box-sizing: border-box;
 	   -moz-box-sizing: border-box;
 	        box-sizing: border-box;
 	text-overflow: ellipsis;
+	left: 1em;
+	right: 1em;
 }
-.oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	top: 0;
 	width: 1.875em;
 	height: 1.875em;
 	margin: 0.3em;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	top: 0;
 	width: 0.9375em;
 	height: 0.9375em;
 	margin: 0.775em;
 }
-.oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon {
+.oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon {
 	top: 0;
 	width: 1.875em;
 	height: 1.875em;
 	margin: 0.3em;
 }
-.oo-ui-selectFileWidget:hover .oo-ui-selectFileWidget-handle {
-	border-color: #aaaaaa;
-}
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle {
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info {
 	color: #cccccc;
 	text-shadow: 0 1px 1px #ffffff;
 	border-color: #dddddd;
 	background-color: #f3f3f3;
 }
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > .oo-ui-iconElement-icon,
-.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-handle > .oo-ui-indicatorElement-indicator {
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-iconElement-icon,
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-info > .oo-ui-indicatorElement-indicator {
 	opacity: 0.2;
 }
 .oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-label {
 	color: #cccccc;
 }
-.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-handle {
-	padding-left: 3em;
+.oo-ui-selectFileWidget.oo-ui-iconElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	left: 2.75em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-handle {
-	padding-right: 3em;
+.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 3em;
 }
-.oo-ui-selectFileWidget .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	right: 0;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
-	padding-right: 5em;
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 5em;
 }
-.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-clearButton {
+.oo-ui-selectFileWidget.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-clearButton {
 	right: 2em;
 }
-.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-handle {
-	padding-right: 1em;
+.oo-ui-selectFileWidget-empty .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 1em;
 }
-.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle,
-.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-handle {
-	padding-right: 2em;
+.oo-ui-selectFileWidget-empty.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label,
+.oo-ui-selectFileWidget-notsupported.oo-ui-indicatorElement .oo-ui-selectFileWidget-info .oo-ui-selectFileWidget-label {
+	right: 2em;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle {
-	height: 3.5em;
+.oo-ui-selectFileWidget-dropTarget {
+	line-height: 3.5em;
 	border: 1px dashed #cccccc;
-	border-radius: 0;
 	padding: 0.5em 1em;
+	margin-bottom: 0.5em;
 	background: #ffffff;
 	text-align: center;
 	vertical-align: middle;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-iconElement-icon {
-	margin: 0.6em 0;
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled .oo-ui-selectFileWidget-dropTarget:hover {
+	background-color: #eeeeee;
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle .oo-ui-selectFileWidget-label {
-	color: #000000;
+.oo-ui-selectFileWidget-supported.oo-ui-widget-enabled.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-dropTarget {
+	background: rgba(52, 123, 255, 0.1);
 }
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui .oo-ui-selectFileWidget-handle:hover,
-.oo-ui-selectFileWidget.oo-ui-selectFileWidget-dragdrop-ui.oo-ui-selectFileWidget-canDrop .oo-ui-selectFileWidget-handle {
-	background-color: #eeeeee;
+.oo-ui-selectFileWidget.oo-ui-widget-disabled .oo-ui-selectFileWidget-dropTarget,
+.oo-ui-selectFileWidget-notsupported .oo-ui-selectFileWidget-dropTarget {
+	color: #cccccc;
+	text-shadow: 0 1px 1px #ffffff;
+	border-color: #dddddd;
+	background-color: #f3f3f3;
 }
 .oo-ui-outlineOptionWidget {
 	position: relative;
@@ -3050,11 +3068,11 @@
 .oo-ui-windowManager-modal > .oo-ui-dialog {
 	background-color: rgba(255, 255, 255, 0.5);
 	opacity: 0;
-	-webkit-transition: opacity 250ms ease-in-out;
-	   -moz-transition: opacity 250ms ease-in-out;
-	    -ms-transition: opacity 250ms ease-in-out;
-	     -o-transition: opacity 250ms ease-in-out;
-	        transition: opacity 250ms ease-in-out;
+	-webkit-transition: opacity 250ms ease;
+	   -moz-transition: opacity 250ms ease;
+	    -ms-transition: opacity 250ms ease;
+	     -o-transition: opacity 250ms ease;
+	        transition: opacity 250ms ease;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame {
 	top: 1em;
@@ -3066,11 +3084,11 @@
 	    -ms-transform: scale(0.5);
 	     -o-transform: scale(0.5);
 	        transform: scale(0.5);
-	-webkit-transition: all 250ms ease-in-out;
-	   -moz-transition: all 250ms ease-in-out;
-	    -ms-transition: all 250ms ease-in-out;
-	     -o-transition: all 250ms ease-in-out;
-	        transition: all 250ms ease-in-out;
+	-webkit-transition: all 250ms ease;
+	   -moz-transition: all 250ms ease;
+	    -ms-transition: all 250ms ease;
+	     -o-transition: all 250ms ease;
+	        transition: all 250ms ease;
 }
 .oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-ready {
 	/* Fade window overlay */
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index ecb210a4f4..a2915700c8 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.12.6
+ * OOjs UI v0.12.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-26T00:14:36Z
+ * Date: 2015-09-08T20:55:55Z
  */
 /**
  * @class
@@ -57,12 +57,6 @@ OO.ui.MediaWikiTheme.prototype.getElementClasses = function ( element ) {
 		}
 	}
 
-	if ( element instanceof OO.ui.SelectFileWidget ) {
-		if ( !element.isDisabled() && element.active ) {
-			variants.invert = true;
-		}
-	}
-
 	for ( variant in variants ) {
 		classes[ variants[ variant ] ? 'on' : 'off' ].push( 'oo-ui-image-' + variant );
 	}
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index e5f54fcd6b..81677ed8ce 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
 /*!
- * OOjs UI v0.12.6
+ * OOjs UI v0.12.8
  * https://www.mediawiki.org/wiki/OOjs_UI
  *
  * Copyright 2011–2015 OOjs UI Team and other contributors.
  * Released under the MIT license
  * http://oojs.mit-license.org
  *
- * Date: 2015-08-26T00:14:36Z
+ * Date: 2015-09-08T20:55:55Z
  */
 ( function ( OO ) {
 
@@ -279,12 +279,14 @@ OO.ui.infuse = function ( idOrNode ) {
 		'ooui-dialog-process-retry': 'Try again',
 		// Label for process dialog retry action button, visible when describing only warnings
 		'ooui-dialog-process-continue': 'Continue',
-		// Default placeholder for file selection widgets
+		// Label for the file selection widget's select file button
+		'ooui-selectfile-button-select': 'Select a file',
+		// Label for the file selection widget if file selection is not supported
 		'ooui-selectfile-not-supported': 'File selection is not supported',
-		// Default placeholder for file selection widgets
+		// Label for the file selection widget when no file is currently selected
 		'ooui-selectfile-placeholder': 'No file is selected',
-		// Default placeholder for file selection widgets when using drag drop UI
-		'ooui-selectfile-dragdrop-placeholder': 'Drop file here (or click to browse)',
+		// Label for the file selection widget's drop target
+		'ooui-selectfile-dragdrop-placeholder': 'Drop file here',
 		// Semicolon separator
 		'ooui-semicolon-separator': '; '
 	};
@@ -5976,7 +5978,7 @@ OO.ui.mixin.LookupElement.prototype.populateLookupMenu = function () {
 	var widget = this,
 		value = this.getValue();
 
-	if ( this.lookupsDisabled ) {
+	if ( this.lookupsDisabled || this.isReadOnly() ) {
 		return;
 	}
 
@@ -6142,9 +6144,8 @@ OO.ui.mixin.LookupElement.prototype.setReadOnly = function ( readOnly ) {
 	// Note: Calling #setReadOnly this way assumes this is mixed into an OO.ui.TextInputWidget
 	OO.ui.TextInputWidget.prototype.setReadOnly.call( this, readOnly );
 
-	this.setLookupsDisabled( readOnly );
 	// During construction, #setReadOnly is called before the OO.ui.mixin.LookupElement constructor
-	if ( readOnly && this.lookupMenu ) {
+	if ( this.isReadOnly() && this.lookupMenu ) {
 		this.closeLookupMenu();
 	}
 
@@ -7558,10 +7559,12 @@ OO.ui.Toolbar.prototype.onWindowResize = function () {
  * This must be called after it is attached to a visible document and before doing anything else.
  */
 OO.ui.Toolbar.prototype.initialize = function () {
-	this.initialized = true;
-	this.narrowThreshold = this.$group.width() + this.$actions.width();
-	$( this.getElementWindow() ).on( 'resize', this.onWindowResizeHandler );
-	this.onWindowResize();
+	if ( !this.initialized ) {
+		this.initialized = true;
+		this.narrowThreshold = this.$group.width() + this.$actions.width();
+		$( this.getElementWindow() ).on( 'resize', this.onWindowResizeHandler );
+		this.onWindowResize();
+	}
 };
 
 /**
@@ -13697,7 +13700,6 @@ OO.ui.DropdownWidget.prototype.onKeyPress = function ( e ) {
  * @mixins OO.ui.mixin.IndicatorElement
  * @mixins OO.ui.mixin.PendingElement
  * @mixins OO.ui.mixin.LabelElement
- * @mixins OO.ui.mixin.TabIndexedElement
  *
  * @constructor
  * @param {Object} [config] Configuration options
@@ -13705,39 +13707,40 @@ OO.ui.DropdownWidget.prototype.onKeyPress = function ( e ) {
  * @cfg {string} [placeholder] Text to display when no file is selected.
  * @cfg {string} [notsupported] Text to display when file support is missing in the browser.
  * @cfg {boolean} [droppable=true] Whether to accept files by drag and drop.
- * @cfg {boolean} [dragDropUI=false] Whether to render the drag and drop UI.
+ * @cfg {boolean} [showDropTarget=false] Whether to show a drop target. Requires droppable to be true.
+ * @cfg {boolean} [dragDropUI=false] Deprecated alias for showDropTarget
  */
 OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
-	var dragHandler,
-		placeholderMsg = ( config && config.dragDropUI ) ?
-			'ooui-selectfile-dragdrop-placeholder' :
-			'ooui-selectfile-placeholder';
+	var dragHandler;
+
+	// TODO: Remove in next release
+	if ( config && config.dragDropUI ) {
+		config.showDropTarget = true;
+	}
 
 	// Configuration initialization
 	config = $.extend( {
 		accept: null,
-		placeholder: OO.ui.msg( placeholderMsg ),
+		placeholder: OO.ui.msg( 'ooui-selectfile-placeholder' ),
 		notsupported: OO.ui.msg( 'ooui-selectfile-not-supported' ),
 		droppable: true,
-		dragDropUI: false
+		showDropTarget: false
 	}, config );
 
 	// Parent constructor
 	OO.ui.SelectFileWidget.parent.call( this, config );
 
-	// Properties (must be set before TabIndexedElement constructor call)
-	this.$handle = $( '<span>' );
-
 	// Mixin constructors
 	OO.ui.mixin.IconElement.call( this, config );
 	OO.ui.mixin.IndicatorElement.call( this, config );
-	OO.ui.mixin.PendingElement.call( this, $.extend( {}, config, { $pending: this.$handle } ) );
+	OO.ui.mixin.PendingElement.call( this, $.extend( {}, config, { $pending: this.$info } ) );
 	OO.ui.mixin.LabelElement.call( this, $.extend( {}, config, { autoFitLabel: true } ) );
-	OO.ui.mixin.TabIndexedElement.call( this, $.extend( {}, config, { $tabIndexed: this.$handle } ) );
 
 	// Properties
-	this.active = false;
-	this.dragDropUI = config.dragDropUI;
+	this.$info = $( '<span>' );
+
+	// Properties
+	this.showDropTarget = config.showDropTarget;
 	this.isSupported = this.constructor.static.isSupported();
 	this.currentFile = null;
 	if ( Array.isArray( config.accept ) ) {
@@ -13749,6 +13752,12 @@ OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
 	this.notsupported = config.notsupported;
 	this.onFileSelectedHandler = this.onFileSelected.bind( this );
 
+	this.selectButton = new OO.ui.ButtonWidget( {
+		classes: [ 'oo-ui-selectFileWidget-selectButton' ],
+		label: 'Select a file',
+		disabled: this.disabled || !this.isSupported
+	} );
+
 	this.clearButton = new OO.ui.ButtonWidget( {
 		classes: [ 'oo-ui-selectFileWidget-clearButton' ],
 		framed: false,
@@ -13757,7 +13766,7 @@ OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
 	} );
 
 	// Events
-	this.$handle.on( {
+	this.selectButton.$button.on( {
 		keypress: this.onKeyPress.bind( this )
 	} );
 	this.clearButton.connect( this, {
@@ -13765,7 +13774,7 @@ OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
 	} );
 	if ( config.droppable ) {
 		dragHandler = this.onDragEnterOrOver.bind( this );
-		this.$handle.on( {
+		this.$element.on( {
 			dragenter: dragHandler,
 			dragover: dragHandler,
 			dragleave: this.onDragLeave.bind( this ),
@@ -13777,22 +13786,20 @@ OO.ui.SelectFileWidget = function OoUiSelectFileWidget( config ) {
 	this.addInput();
 	this.updateUI();
 	this.$label.addClass( 'oo-ui-selectFileWidget-label' );
-	this.$handle
-		.addClass( 'oo-ui-selectFileWidget-handle' )
+	this.$info
+		.addClass( 'oo-ui-selectFileWidget-info' )
 		.append( this.$icon, this.$label, this.clearButton.$element, this.$indicator );
 	this.$element
 		.addClass( 'oo-ui-selectFileWidget' )
-		.append( this.$handle );
-	if ( config.droppable ) {
-		if ( config.dragDropUI ) {
-			this.$element.addClass( 'oo-ui-selectFileWidget-dragdrop-ui' );
-			this.$element.on( {
-				mouseover: this.onMouseOver.bind( this ),
-				mouseleave: this.onMouseLeave.bind( this )
+		.append( this.$info, this.selectButton.$element );
+	if ( config.droppable && config.showDropTarget ) {
+		this.$dropTarget = $( '<div>' )
+			.addClass( 'oo-ui-selectFileWidget-dropTarget' )
+			.text( OO.ui.msg( 'ooui-selectfile-dragdrop-placeholder' ) )
+			.on( {
+				click: this.onDropTargetClick.bind( this )
 			} );
-		} else {
-			this.$element.addClass( 'oo-ui-selectFileWidget-droppable' );
-		}
+		this.$element.prepend( this.$dropTarget );
 	}
 };
 
@@ -13803,7 +13810,6 @@ OO.mixinClass( OO.ui.SelectFileWidget, OO.ui.mixin.IconElement );
 OO.mixinClass( OO.ui.SelectFileWidget, OO.ui.mixin.IndicatorElement );
 OO.mixinClass( OO.ui.SelectFileWidget, OO.ui.mixin.PendingElement );
 OO.mixinClass( OO.ui.SelectFileWidget, OO.ui.mixin.LabelElement );
-OO.mixinClass( OO.ui.SelectFileWidget, OO.ui.mixin.TabIndexedElement );
 
 /* Static Properties */
 
@@ -13868,14 +13874,17 @@ OO.ui.SelectFileWidget.prototype.updateUI = function () {
 		this.$element.addClass( 'oo-ui-selectFileWidget-notsupported' );
 		this.$element.removeClass( 'oo-ui-selectFileWidget-empty' );
 		this.setLabel( this.notsupported );
-	} else if ( this.currentFile ) {
-		this.$element.removeClass( 'oo-ui-selectFileWidget-empty' );
-		this.setLabel( this.currentFile.name +
-			( this.currentFile.type !== '' ? OO.ui.msg( 'ooui-semicolon-separator' ) + this.currentFile.type : '' )
-		);
 	} else {
-		this.$element.addClass( 'oo-ui-selectFileWidget-empty' );
-		this.setLabel( this.placeholder );
+		this.$element.addClass( 'oo-ui-selectFileWidget-supported' );
+		if ( this.currentFile ) {
+			this.$element.removeClass( 'oo-ui-selectFileWidget-empty' );
+			this.setLabel( this.currentFile.name +
+				( this.currentFile.type !== '' ? OO.ui.msg( 'ooui-semicolon-separator' ) + this.currentFile.type : '' )
+			);
+		} else {
+			this.$element.addClass( 'oo-ui-selectFileWidget-empty' );
+			this.setLabel( this.placeholder );
+		}
 	}
 
 	if ( this.$input ) {
@@ -13884,7 +13893,7 @@ OO.ui.SelectFileWidget.prototype.updateUI = function () {
 };
 
 /**
- * Add the input to the handle
+ * Add the input to the widget
  *
  * @private
  */
@@ -13907,31 +13916,30 @@ OO.ui.SelectFileWidget.prototype.addInput = function () {
 	if ( this.accept ) {
 		this.$input.attr( 'accept', this.accept.join( ', ' ) );
 	}
-	this.$handle.append( this.$input );
+	this.selectButton.$button.append( this.$input );
 };
 
 /**
  * Determine if we should accept this file
  *
  * @private
- * @param {File} file
+ * @param {string} File MIME type
  * @return {boolean}
  */
-OO.ui.SelectFileWidget.prototype.isFileAcceptable = function ( file ) {
-	var i, mime, mimeTest;
+OO.ui.SelectFileWidget.prototype.isAllowedType = function ( mimeType ) {
+	var i, mimeTest;
 
-	if ( !this.accept || file.type === '' ) {
+	if ( !this.accept || !mimeType ) {
 		return true;
 	}
 
-	mime = file.type;
 	for ( i = 0; i < this.accept.length; i++ ) {
 		mimeTest = this.accept[ i ];
-		if ( mimeTest === mime ) {
+		if ( mimeTest === mimeType ) {
 			return true;
 		} else if ( mimeTest.substr( -2 ) === '/*' ) {
 			mimeTest = mimeTest.substr( 0, mimeTest.length - 1 );
-			if ( mime.substr( 0, mimeTest.length ) === mimeTest ) {
+			if ( mimeType.substr( 0, mimeTest.length ) === mimeTest ) {
 				return true;
 			}
 		}
@@ -13947,13 +13955,10 @@ OO.ui.SelectFileWidget.prototype.isFileAcceptable = function ( file ) {
  * @param {jQuery.Event} e
  */
 OO.ui.SelectFileWidget.prototype.onFileSelected = function ( e ) {
-	var file = null;
+	var file = OO.getProp( e.target, 'files', 0 ) || null;
 
-	if ( e.target.files && e.target.files[ 0 ] ) {
-		file = e.target.files[ 0 ];
-		if ( !this.isFileAcceptable( file ) ) {
-			file = null;
-		}
+	if ( file && !this.isAllowedType( file.type ) ) {
+		file = null;
 	}
 
 	this.setValue( file );
@@ -13985,6 +13990,19 @@ OO.ui.SelectFileWidget.prototype.onKeyPress = function ( e ) {
 	}
 };
 
+/**
+ * Handle drop target click events.
+ *
+ * @private
+ * @param {jQuery.Event} e Key press event
+ */
+OO.ui.SelectFileWidget.prototype.onDropTargetClick = function () {
+	if ( this.isSupported && !this.isDisabled() && this.$input ) {
+		this.$input.click();
+		return false;
+	}
+};
+
 /**
  * Handle drag enter and over events
  *
@@ -13992,7 +14010,8 @@ OO.ui.SelectFileWidget.prototype.onKeyPress = function ( e ) {
  * @param {jQuery.Event} e Drag event
  */
 OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
-	var file = null,
+	var itemOrFile,
+		droppableFile = false,
 		dt = e.originalEvent.dataTransfer;
 
 	e.preventDefault();
@@ -14000,28 +14019,27 @@ OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
 
 	if ( this.isDisabled() || !this.isSupported ) {
 		this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
-		this.setActive( false );
 		dt.dropEffect = 'none';
 		return false;
 	}
 
-	if ( dt && dt.files && dt.files[ 0 ] ) {
-		file = dt.files[ 0 ];
-		if ( !this.isFileAcceptable( file ) ) {
-			file = null;
+	// DataTransferItem and File both have a type property, but in Chrome files
+	// have no information at this point.
+	itemOrFile = OO.getProp( dt, 'items', 0 ) || OO.getProp( dt, 'files', 0 );
+	if ( itemOrFile ) {
+		if ( this.isAllowedType( itemOrFile.type ) ) {
+			droppableFile = true;
 		}
-	} else if ( dt && dt.types && dt.types.indexOf( 'Files' ) !== -1 ) {
-		// We know we have files so set 'file' to something truthy, we just
-		// can't know any details about them.
-		// * https://bugzilla.mozilla.org/show_bug.cgi?id=640534
-		file = 'Files exist, but details are unknown';
+	// dt.types is Array-like, but not an Array
+	} else if ( Array.prototype.indexOf.call( OO.getProp( dt, 'types' ) || [], 'Files' ) !== -1 ) {
+		// File information is not available at this point for security so just assume
+		// it is acceptable for now.
+		// https://bugzilla.mozilla.org/show_bug.cgi?id=640534
+		droppableFile = true;
 	}
-	if ( file ) {
-		this.$element.addClass( 'oo-ui-selectFileWidget-canDrop' );
-		this.setActive( true );
-	} else {
-		this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
-		this.setActive( false );
+
+	this.$element.toggleClass( 'oo-ui-selectFileWidget-canDrop', droppableFile );
+	if ( !droppableFile ) {
 		dt.dropEffect = 'none';
 	}
 
@@ -14036,7 +14054,6 @@ OO.ui.SelectFileWidget.prototype.onDragEnterOrOver = function ( e ) {
  */
 OO.ui.SelectFileWidget.prototype.onDragLeave = function () {
 	this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
-	this.setActive( false );
 };
 
 /**
@@ -14052,17 +14069,14 @@ OO.ui.SelectFileWidget.prototype.onDrop = function ( e ) {
 	e.preventDefault();
 	e.stopPropagation();
 	this.$element.removeClass( 'oo-ui-selectFileWidget-canDrop' );
-	this.setActive( false );
 
 	if ( this.isDisabled() || !this.isSupported ) {
 		return false;
 	}
 
-	if ( dt && dt.files && dt.files[ 0 ] ) {
-		file = dt.files[ 0 ];
-		if ( !this.isFileAcceptable( file ) ) {
-			file = null;
-		}
+	file = OO.getProp( dt, 'files', 0 );
+	if ( file && !this.isAllowedType( file.type ) ) {
+		file = null;
 	}
 	if ( file ) {
 		this.setValue( file );
@@ -14071,47 +14085,16 @@ OO.ui.SelectFileWidget.prototype.onDrop = function ( e ) {
 	return false;
 };
 
-/**
- * Handle mouse over events.
- *
- * @private
- * @param {jQuery.Event} e Mouse over event
- */
-OO.ui.SelectFileWidget.prototype.onMouseOver = function () {
-	this.setActive( true );
-};
-
-/**
- * Handle mouse leave events.
- *
- * @private
- * @param {jQuery.Event} e Mouse over event
- */
-OO.ui.SelectFileWidget.prototype.onMouseLeave = function () {
-	this.setActive( false );
-};
-
 /**
  * @inheritdoc
  */
-OO.ui.SelectFileWidget.prototype.setDisabled = function ( state ) {
-	OO.ui.SelectFileWidget.parent.prototype.setDisabled.call( this, state );
-	if ( this.clearButton ) {
-		this.clearButton.setDisabled( state );
+OO.ui.SelectFileWidget.prototype.setDisabled = function ( disabled ) {
+	OO.ui.SelectFileWidget.parent.prototype.setDisabled.call( this, disabled );
+	if ( this.selectButton ) {
+		this.selectButton.setDisabled( disabled );
 	}
-	return this;
-};
-
-/**
- * Set 'active' (hover) state, only matters for widgets with `dragDropUI: true`.
- *
- * @param {boolean} value Whether widget is active
- * @chainable
- */
-OO.ui.SelectFileWidget.prototype.setActive = function ( value ) {
-	if ( this.dragDropUI ) {
-		this.active = value;
-		this.updateThemeClasses();
+	if ( this.clearButton ) {
+		this.clearButton.setDisabled( disabled );
 	}
 	return this;
 };
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/advanced.png b/resources/lib/oojs-ui/themes/apex/images/icons/advanced.png
index 9769e0357d..3709f21a8c 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/advanced.png and b/resources/lib/oojs-ui/themes/apex/images/icons/advanced.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg b/resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
index 4922543da5..8d9687678b 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/advanced.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="settings">
-        <path id="gear" d="M20.87 13.476c.078-.482.13-.972.13-1.476s-.052-.994-.13-1.476l-2.464-.26c-.15-.555-.367-1.08-.648-1.57l1.558-1.923c-.576-.803-1.28-1.51-2.087-2.084l-1.927 1.558c-.488-.28-1.015-.5-1.57-.648l-.26-2.463C12.996 3.053 12.506 3 12 3s-.994.052-1.476.13l-.26 2.464c-.554.15-1.08.367-1.57.648L6.772 4.685c-.804.576-1.51 1.28-2.085 2.086l1.558 1.927c-.28.488-.5 1.015-.648 1.57l-2.463.26c-.08.48-.132.97-.132 1.475s.052.995.13 1.477l2.464.26c.15.554.367 1.08.648 1.57l-1.558 1.92c.576.805 1.28 1.51 2.087 2.086l1.925-1.558c.488.28 1.015.5 1.57.648l.26 2.463c.48.076.97.13 1.475.13s.994-.054 1.476-.13l.26-2.466c.553-.15 1.08-.367 1.57-.648l1.92 1.558c.806-.576 1.51-1.28 2.087-2.087l-1.558-1.925c.28-.488.5-1.015.647-1.57l2.463-.26zM12 15.998c-2.21 0-3.998-1.79-3.998-3.998S9.792 8.002 12 8.002s3.998 1.79 3.998 3.998-1.79 3.998-3.998 3.998z"/>
+        <path id="gear" d="M20.87 13.476c.078-.482.13-.972.13-1.476s-.052-.994-.13-1.476l-2.464-.26c-.15-.555-.367-1.08-.648-1.57l1.558-1.923c-.576-.802-1.28-1.51-2.087-2.083L15.3 6.245c-.488-.28-1.015-.5-1.57-.648l-.26-2.463C12.996 3.054 12.506 3 12 3s-.994.052-1.476.13l-.26 2.464c-.554.15-1.08.367-1.57.648L6.772 4.685c-.804.576-1.51 1.28-2.085 2.086L6.245 8.7c-.28.488-.5 1.015-.648 1.57l-2.463.26c-.08.48-.132.97-.132 1.475s.052.995.13 1.477l2.464.26c.15.554.367 1.08.648 1.57l-1.558 1.92c.576.805 1.28 1.51 2.087 2.086l1.925-1.558c.488.28 1.015.5 1.57.648l.26 2.463c.48.075.97.13 1.475.13s.994-.055 1.476-.13l.26-2.467c.552-.15 1.08-.367 1.57-.648l1.92 1.558c.805-.576 1.51-1.28 2.086-2.087L17.758 15.3c.28-.487.5-1.014.647-1.57l2.463-.26zM12 15.998c-2.21 0-3.998-1.79-3.998-3.998S9.792 8.002 12 8.002s3.998 1.79 3.998 3.998-1.79 3.998-3.998 3.998z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
index 918c5b6286..1c2abb708b 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/arched-arrow-ltr.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="arched-arrow-ltr">
-        <path id="arrow" d="M19.925 14.937l-2.39-6.9-1.48 2.328c-.965-.845-2.7-1.85-5.514-1.823-4.884.046-6.52 4.244-6.52 4.244s2.752-2.64 6.924-1.95c1.73.287 3.007 1.207 3.675 1.792l-1.475 2.32 6.782-.01z"/>
+        <path id="arrow" d="M19.925 14.937l-2.39-6.9-1.48 2.328c-.965-.845-2.7-1.85-5.514-1.823-4.883.046-6.52 4.244-6.52 4.244s2.753-2.64 6.925-1.95c1.73.287 3.007 1.207 3.675 1.792l-1.475 2.32 6.782-.01z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png
index ad076346a2..e9dce6875f 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png and b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
index 2f0edb7151..23ed091aa9 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-ain.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-arab-ain">
-        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.124-.25.342-.662.65l-.09.065c-1.235.93-2.422 1.393-3.56 1.393-1.142 0-2.045-.33-2.71-.99-.65-.66-.975-1.56-.975-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.606-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.717-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.328-1.527-.05-2.054.827l.015.074 1.123.866.052.005c1.403-.497 2.417-.74 3.042-.725-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.385.05c-1.743.24-2.992.716-3.745 1.43-.463.463-.697.972-.702 1.524"/>
+        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.123-.25.34-.66.65l-.09.064c-1.236.93-2.423 1.393-3.56 1.393-1.143 0-2.046-.33-2.71-.99-.65-.66-.976-1.56-.976-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.607-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.718-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.33-1.527-.05-2.054.826l.016.074 1.123.866.05.005c1.404-.496 2.418-.74 3.043-.724-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.386.05c-1.743.24-2.992.716-3.745 1.43-.464.463-.698.972-.703 1.524"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png
index 0ade40ce63..46d579b860 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png and b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
index ba7ffe112c..7e6769d9d3 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-arab-dad.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-arab-dad">
-        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.474 0-.985.205-1.535.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.006m-6.803 3.293c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.066.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.193.31-.474.555-.845.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.144.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
+        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.475 0-.986.205-1.536.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.005M10.382 14.6c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.065.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.192.31-.473.555-.844.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.143.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png b/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png
index 0a16f8c795..5e16e38fc9 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png and b/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
index 0dc8b52e19..7471d1a31b 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-armn-to.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-armn-to">
-        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.277.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.215.178.392.29.53.12.133.25.23.386.29.14.05.276.074.406.074m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.345.49.735.64 1.17.15.43.226 1.09.226 1.61h1.356v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.812-.845 1.114-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.314-.626-.704-.835-1.173-.203-.473-.304-1.028-.304-1.663s.102-1.182.32-1.64c.21-.46.494-.685.85-.977.352-.297.76-.513 1.22-.648.455-.14.932-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.456-.58-.77-.767-.31-.193-.597-.332-.983-.426-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.102z"/>
+        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.278.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.214.18.39.29.53.12.132.25.23.387.29.14.05.276.073.406.073m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.344.49.734.64 1.17.15.43.226 1.09.226 1.61h1.357v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.81-.845 1.113-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.315-.626-.705-.835-1.174-.203-.473-.304-1.028-.304-1.663s.1-1.182.32-1.64c.21-.46.493-.685.85-.977.35-.297.76-.513 1.22-.648.454-.14.93-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.457-.58-.77-.767-.31-.192-.598-.33-.984-.425-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.103z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
index d87d0fcefd..383ef32367 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-be.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-cyrl-be">
-        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.395-.255-1.067-.397-2.02-.397H10v3"/>
+        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.396-.255-1.068-.397-2.02-.397H10v3"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
index 3c0a87962b..e349905098 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-cyrl-zhe.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-cyrl-zhe">
-        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.116-.337.3-.452.55-.115.25-.286.762-.512 1.537-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.273-.268-.62-.392-1.04-.222-.76-.39-1.264-.505-1.52-.11-.253-.26-.442-.45-.57-.185-.122-.49-.184-.916-.184L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
+        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.115-.337.3-.452.55-.115.25-.286.76-.512 1.536-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.272-.268-.62-.392-1.04-.222-.76-.39-1.263-.505-1.52-.11-.252-.26-.44-.45-.57-.184-.12-.49-.183-.915-.183L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png b/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png
index e80945317c..cc4be630fa 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png and b/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg b/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
index 277f17eb07..05b46e2d60 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/bold-g.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-g">
-        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.516-.94 1.268-1.66 2.258-2.16.754-.386 1.693-.58 2.816-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.335-1.022-.5-1.707-.5-1.038 0-1.864.323-2.48.972-.61.65-.914 1.612-.914 2.89 0 1.376.31 2.41.93 3.102.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.867"/>
+        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.517-.94 1.27-1.66 2.26-2.16.753-.386 1.692-.58 2.815-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.336-1.022-.5-1.707-.5-1.038 0-1.864.322-2.48.97-.61.65-.914 1.613-.914 2.89 0 1.377.31 2.41.93 3.103.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.866"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png b/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png
index 1b0a6594aa..f36e52cbd6 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png and b/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg b/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
index 8de25836ee..2f0e406de6 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/case-sensitive.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="regular-expression">
-        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.655 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
-        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.444.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.666.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.803.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .583.336.875 1.008.875.48 0 .865-.138 1.152-.415.29-.276.436-.644.436-1.102v-.627"/>
+        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.654 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
+        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.443.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.665.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.802.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .582.336.874 1.008.874.48 0 .865-.138 1.152-.415.29-.277.436-.645.436-1.103v-.627"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/close.png b/resources/lib/oojs-ui/themes/apex/images/icons/close.png
index 4eedfbceb3..86dc8b39d8 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/close.png and b/resources/lib/oojs-ui/themes/apex/images/icons/close.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/close.svg b/resources/lib/oojs-ui/themes/apex/images/icons/close.svg
index f05a9653eb..d058d65b31 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/close.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/close.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="close">
-        <path id="x" d="M18.717 6.697l-1.414-1.414L12 10.586 6.697 5.283 5.283 6.697 10.586 12l-5.303 5.303 1.414 1.414L12 13.414l5.303 5.303 1.414-1.414L13.414 12z"/>
+        <path id="cross" d="M17.717 7.697l-1.414-1.414L12 10.586 7.697 6.283 6.283 7.697 10.586 12l-4.303 4.303 1.414 1.414L12 13.414l4.303 4.303 1.414-1.414L13.414 12z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/code.png b/resources/lib/oojs-ui/themes/apex/images/icons/code.png
index ee58c9a723..6e678e2aaf 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/code.png and b/resources/lib/oojs-ui/themes/apex/images/icons/code.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/code.svg b/resources/lib/oojs-ui/themes/apex/images/icons/code.svg
index fe5309dc05..d3893b0fe1 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/code.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/code.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
     <g id="code">
-        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.478.808-.587C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.306.238.76.238 1.487v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
+        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.588C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.307.238.76.238 1.488v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
         <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" width="24" height="24" xlink:href="#left-bracket"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png
index 10927e164a..4b59b2a221 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png and b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg
index e8363615a9..1d7980dc3f 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="external">
-        <path id="box" d="M2 2h3v1H3v6h6V7h1v3H2z"/>
-        <path id="arrow" d="M6.21 2H10v3.79L8.58 4.367 6.446 6.5 5.5 5.553 7.632 3.42z"/>
+        <path id="box" d="M4 4h6v2H6v12h12v-4h2v6H4z"/>
+        <path id="arrow" d="M12.42 4H20v7.58l-2.84-2.846L12.892 13 11 11.106l4.264-4.266z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png
index 7a3454e9b1..2978654875 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png and b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg
index 9fdc8ca56c..7e25d034cb 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/external-link-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="external">
-        <path id="box" d="M7 3h2v6H3V7H2v3h8V2H7z"/>
-        <path id="arrow" d="M2 5.79l1.42-1.422L5.554 6.5l.947-.947L4.37 3.42 5.788 2H2z"/>
+        <path id="box" d="M20 4h-6v2h4v12H6v-4H4v6h16z"/>
+        <path id="arrow" d="M11.58 4H4v7.58l2.84-2.846L11.108 13 13 11.106 8.736 6.84z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png b/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png
index 5c666880d0..9f418b8801 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png and b/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg
index bbfdaa0317..67e6943448 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/find-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="find">
-        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.372c.19.19.534.153.78-.094s.315-.59.126-.78L16.66 16.59l-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.804 1.84-1.816 1.84-1.01 0-1.844-.83-1.844-1.843s.833-1.814 1.845-1.814z"/>
+        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.37c.19.19.534.154.78-.093s.315-.59.126-.78l-2.37-2.377-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.805 1.84-1.817 1.84-1.01 0-1.844-.83-1.844-1.844s.832-1.814 1.844-1.814z"/>
         <path id="text" d="M6 5v2h10V5H6zm0 3v2h11V8H6zm0 3v2h3.53c.284-.797.787-1.486 1.44-2H6zm0 3v2h3.53c-.177-.48-.28-.99-.28-1.53 0-.16.046-.315.063-.47H6z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png b/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png
index 28aab68bcf..b63eb841e4 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png and b/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg
index e70ae483a1..962165d66a 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/find-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="find">
-        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.372c-.19.19-.534.153-.78-.094s-.315-.59-.126-.78L8.34 16.59l.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.804 1.84 1.816 1.84 1.01 0 1.844-.83 1.844-1.843s-.833-1.814-1.845-1.814z"/>
+        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.37c-.19.19-.534.154-.78-.093s-.315-.59-.126-.78l2.37-2.377.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.805 1.84 1.817 1.84 1.01 0 1.844-.83 1.844-1.844s-.832-1.814-1.844-1.814z"/>
         <path id="text" d="M19 5v2H9V5zm0 3v2H8V8zm0 3v2h-3.53c-.284-.797-.787-1.486-1.44-2zm0 3v2h-3.53c.177-.48.28-.99.28-1.53 0-.16-.046-.315-.063-.47z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg
index a9a0ebbad9..825435dab0 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/help-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="help">
-        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.917 9.916 9.917 5.48 0 9.917-4.438 9.917-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.918 9.916 9.918 5.48 0 9.918-4.438 9.918-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M11.766 6.688c-2.5 0-3.22 2.188-3.22 2.188l1.412.854s.298-.79.9-1.23c.517-.374 1.626-.624 2.22.126.7.885-.17 1.587-1.078 2.72C11.047 12.53 11 15 11 15h1.97s.134-2.318 1.04-3.38c.603-.708 1.443-1.34 1.443-2.495s-1.187-2.437-3.687-2.437z"/>
             <path id="bottom" d="M11 16h2v2h-2z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg
index 1b513d05d0..0d8052f1ed 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/help-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="help">
-        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.917-9.916 9.917-5.48 0-9.917-4.438-9.917-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.918-9.916 9.918-5.48 0-9.918-4.438-9.918-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M12.234 6.688c2.5 0 3.22 2.188 3.22 2.188l-1.412.854s-.298-.79-.9-1.23c-.517-.374-1.626-.624-2.22.126-.7.885.17 1.587 1.078 2.72C12.953 12.53 13 15 13 15h-1.97s-.134-2.318-1.04-3.38c-.603-.708-1.443-1.34-1.443-2.495 0-1.156 1.187-2.437 3.687-2.437z"/>
             <path id="bottom" d="M13 16h-2v2h2z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/history.svg b/resources/lib/oojs-ui/themes/apex/images/icons/history.svg
index 937575199c..10d1b81e7a 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/history.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/history.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="history">
         <path id="clock-hands" d="M17.26 15.076s-2.385-1.935-4.005-3.062c.72-2.397 1.702-6.56 1.702-6.56s-4.35 5.364-4.877 6.7c-.463 1.168 1.46 2.21 2.346 1.678 1.9.55 4.834 1.244 4.834 1.244z"/>
-        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.462 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.083 0 4.465-3.616 8.084-8.08 8.084-1.145 0-2.23-.247-3.213-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
+        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.46 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.084 0 4.465-3.615 8.084-8.08 8.084-1.144 0-2.23-.247-3.212-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/info.svg b/resources/lib/oojs-ui/themes/apex/images/icons/info.svg
index 3147340148..6cff2ffadb 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/info.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/info.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0, 0, 24, 24">
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="info">
         <path id="circled-i" d="M11.5 17C8.462 17 6 14.536 6 11.5 6 8.463 8.462 6 11.5 6c3.036 0 5.5 2.462 5.5 5.5 0 3.036-2.464 5.5-5.5 5.5zm0-12C7.91 5 5 7.91 5 11.5S7.91 18 11.5 18s6.5-2.91 6.5-6.5S15.09 5 11.5 5zm.5 5v4h1v1h-3v-1h1v-3h-1v-1zm-1-2h1v1h-1z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png
index 3285ad9b2e..9f603eab83 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg
index 04cdebbce5..99980c05ea 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-keheh-jeem.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-arab-keheh-jeem">
-        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.872 1.125-.064.263-.035.572.063.78.19.406.54.575.844.814l.094-.122.53.625c.14.165.344.514.47.94.137.462.08.724 0 1.124H11.22c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.935-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.357.026-.768.24-1.03.72-.247.447-.435.838-.657 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.204-.51.4-.72.562-.3.26-.703.688-.907 1-.402.615-.693 1.084-.874 1.78-.18.69.003 1.34.468 1.75.426.377.846.52 1.28.564.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.384-1.47-.594-.27-.283-.306-.64-.155-1.22.036-.14.097-.322.25-.53.17-.228.364-.435.594-.656.45-.436 1.01-.737 1.46-.938-.044.205-.106.442-.054.687.05.23.25.38.44.47.26.12.506.153.69.154 1.42.01 2.86 0 4.28 0 .246 0 .45-.163.593-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.443-.673-.83-1-1.22 1.258-.814 2.717-1.238 3.97-1.687.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .378.286.75.556 1.097.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
+        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.87 1.125-.065.263-.036.572.062.78.19.406.54.575.844.814l.094-.12.53.624c.14.165.344.514.47.94.137.462.08.724 0 1.124h-3.44c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.934-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.358.026-.77.24-1.03.72-.248.447-.436.838-.658 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.203-.51.4-.72.56-.3.26-.703.69-.907 1-.402.616-.693 1.085-.874 1.78-.18.69.003 1.34.468 1.75.426.378.846.52 1.28.565.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.385-1.47-.595-.27-.283-.306-.64-.155-1.22.035-.14.096-.322.25-.53.17-.228.363-.435.593-.656.45-.437 1.01-.738 1.46-.94-.044.206-.106.443-.054.688.05.23.25.38.44.47.26.12.505.153.69.154 1.42.01 2.86 0 4.28 0 .245 0 .45-.163.592-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.442-.673-.83-1-1.22 1.258-.813 2.717-1.237 3.97-1.686.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .38.286.75.556 1.098.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png
index 3c5adc36d1..03493be1bd 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg
index f315377a0f..a9c7deff45 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-arab-meem.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-arab-meem">
-        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.696-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.008-.11-.01-.24-.053-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.376.125-.05-.247 1.557-1.71 2.707-2.566 3.45-2.566.382 0 .67.13.862.394.134.195.25.6.343 1.21l.203 1.2c.105.586.24.895.408.925"/>
+        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.695-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.01-.11-.01-.24-.052-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.377.125-.05-.247 1.556-1.71 2.706-2.566 3.45-2.566.38 0 .67.13.86.394.135.195.25.6.344 1.21l.203 1.2c.105.586.24.895.408.925"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png
index 15795c552b..b5e55cca85 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg
index f0d10d988a..a653a27d20 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-armn-sha.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-armn-sha">
-        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.327 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.582 0-1.136.095-1.662.284-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.215-1.344.323-2.106.323-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.435-.573-.97-.678-1.606-.105-.637-.078-1.364.08-2.184.125-.66.346-1.273.66-1.835.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
+        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.328 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.583 0-1.137.094-1.663.283-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.216-1.344.324-2.106.324-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.436-.573-.97-.678-1.607-.105-.637-.078-1.364.08-2.184.125-.66.346-1.274.66-1.836.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png
index 2b8b6e47cc..f46dea5989 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg
index 2018e60e61..0a0d1103fc 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-c.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-c">
-        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.628-1.78-.628-1.368 0-2.475.63-3.32 1.892-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.777 0 1.476-.26 2.1-.785.628-.522 1.08-1.26 1.368-2.216"/>
+        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.63-1.78-.63-1.368 0-2.475.63-3.32 1.893-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.778 0 1.477-.26 2.1-.785.63-.522 1.08-1.26 1.37-2.216"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg
index c044c86039..feadca08aa 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-d.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-d">
-        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.502.063 1.952.188.644.17 1.194.472 1.65.91.456.43.8.97 1.03 1.62.23.65.346 1.378.346 2.186 0 .966-.146 1.847-.436 2.644-.284.79-.66 1.49-1.127 2.095-.46.6-.947 1.072-1.456 1.416-.504.335-1.1.586-1.794.75-.526.126-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.238.41-.098.76-.243 1.05-.434.38-.247.726-.57 1.037-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
+        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.5.063 1.95.188.645.17 1.195.472 1.65.91.457.43.8.97 1.03 1.62.23.65.347 1.378.347 2.186 0 .966-.146 1.847-.436 2.644-.283.79-.66 1.49-1.126 2.095-.46.6-.947 1.072-1.456 1.416-.504.334-1.1.585-1.794.75-.526.125-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.24.41-.097.76-.242 1.05-.433.38-.247.727-.57 1.038-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png
index 7f2512e4fe..7f9da2ac1e 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg
index 867f458123..65670ef4ab 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-geor-kan.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-geor-kan">
-        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.616c-.055.26-.083.497-.083.712 0 .972.52 1.458 1.564 1.458 1.31 0 2.104-.723 2.386-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.547-1.39-1.64-1.39h-1.116l.248-1.26h1.118c1.202-.004 1.908-.55 2.118-1.64.04-.18.058-.355.058-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
+        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.617c-.055.26-.083.497-.083.712 0 .97.52 1.457 1.564 1.457 1.31 0 2.105-.723 2.387-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.546-1.39-1.64-1.39h-1.115l.248-1.26h1.118c1.203-.004 1.91-.55 2.12-1.64.04-.18.057-.355.057-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png b/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png
index c3b1e6e5c8..4a7b1fc29d 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png and b/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg b/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg
index 1c5a4cab2a..615e5f2244 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/italic-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-s">
-        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.655.302.86.207.193.733.405 1.58.632l.937.232c1.06.274 1.795.622 2.208 1.046.413.42.62 1.008.62 1.767 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.302-1.867-.55l.315-1.61c.573.355 1.147.624 1.72.805.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.884-1 .884-1.697 0-.464-.12-.815-.356-1.053-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.044-1.108 3.464-1.108.553 0 1.1.05 1.642.147.542.098 1.085.245 1.627.442"/>
+        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.654.302.86.207.192.733.404 1.58.63l.937.233c1.06.274 1.795.622 2.208 1.046.413.42.62 1.007.62 1.766 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.3-1.867-.55l.314-1.61c.573.356 1.147.625 1.72.806.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.883-1 .883-1.697 0-.465-.12-.816-.356-1.054-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.043-1.108 3.463-1.108.553 0 1.1.05 1.642.147.542.1 1.085.246 1.627.443"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/language.png b/resources/lib/oojs-ui/themes/apex/images/icons/language.png
index cae0e774d4..b4f0875ed2 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/language.png and b/resources/lib/oojs-ui/themes/apex/images/icons/language.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/language.svg b/resources/lib/oojs-ui/themes/apex/images/icons/language.svg
index 694d225296..956aba1f05 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/language.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/language.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="language">
-        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.968-.15 1.648-.333 2.04-.545.454-.21.785-.48.998-.813.21-.303.314-.663.314-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.042.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.144.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.585-.514.03-.92.045-1.222.045-.393 0-.71-.016-.95-.046l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.738.228-1.766l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.572-.09.633-.09s.647-.15 1.765-.453l.046 1.04c-.966.243-2.144.44-3.53.59-.063.663-.093 1.086-.093 1.266.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.133-1.252-.224-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.195.137.316.137.364 0 .908-.364 1.63-1.09zm.774-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
+        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.97-.15 1.65-.333 2.04-.545.455-.21.786-.48 1-.813.21-.303.313-.663.313-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.043.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.143.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.584-.514.03-.92.045-1.222.045-.393 0-.71-.015-.95-.045l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.74.228-1.767l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.573-.09.634-.09s.647-.15 1.765-.453l.045 1.04c-.966.242-2.144.44-3.53.59-.063.662-.093 1.085-.093 1.265.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.132-1.252-.223-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.194.137.315.137.364 0 .908-.365 1.63-1.09zm.775-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
         <path id="english" d="M9.497 15.98h1.85L8.265 7.033h-1.85l-3.08 8.95h1.85L5.74 14h3.21l.547 1.98zm-3.49-3.376L7.34 8.822l1.343 3.782H6.008z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/link.svg b/resources/lib/oojs-ui/themes/apex/images/icons/link.svg
index 710872bb29..23c9539b73 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/link.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/link.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="link">
-        <path id="right" d="M19.188 12c0 1.1-.89 2.016-1.988 2.016L13.005 14c.538 1.09.963 2 1.997 2h3C19.658 16 21 13.657 21 12s-1.342-4-2.998-4h-3c-1.034 0-1.46.91-1.998 2l4.195-.016c1.095 0 1.986.917 1.986 2.017z"/>
+        <path id="right" d="M19.188 12c0 1.1-.89 2.016-1.988 2.016L13.005 14c.538 1.09.963 2 1.997 2h3C19.658 16 21 13.657 21 12s-1.342-4-2.998-4h-3c-1.034 0-1.46.91-1.998 2l4.195-.016c1.094 0 1.985.917 1.985 2.017z"/>
         <path id="center" d="M8 12c0 .535.42 1 .938 1h6.11c.517 0 .937-.465.937-1 0-.534-.42-1-.938-1h-6.11C8.42 11 8 11.466 8 12z"/>
         <path id="left" d="M4.816 12c0-1.1.89-2.016 1.988-2.016L11 10c-.54-1.09-.964-2-1.998-2h-3c-1.656 0-2.998 2.343-2.998 4s1.342 4 2.998 4h3c1.034 0 1.46-.91 1.998-2l-4.195.016c-1.098 0-1.99-.917-1.99-2.017z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/lock.svg b/resources/lib/oojs-ui/themes/apex/images/icons/lock.svg
index a7b7ae8839..85baad263b 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/lock.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/lock.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="lock">
         <path d="M12 6c-2.21 0-4 1.79-4 4v1H7v7h10v-7h-1v-1c0-2.21-1.79-4-4-4zm0 2c1.105 0 2 .895 2 2v1h-4v-1c0-1.105.895-2 2-2z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg
index 48d2c7e1bb..35b637513b 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/move-rtl.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="move-rtl">
-        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.716L13.65 19.2z"/>
+        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.717L13.65 19.2z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/notice.svg b/resources/lib/oojs-ui/themes/apex/images/icons/notice.svg
index b7fb2e7795..9334b50e45 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/notice.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/notice.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" id="svg3116">
     <g id="alert">
         <path d="M12 18c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zm-1-5h2V8h-2zm0 3h2v-2h-2z" id="path3119"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png b/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png
index b8736a0aca..00ace1923a 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png and b/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg b/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg
index 5f10d4da20..844013d339 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/regular-expression.svg
@@ -3,7 +3,7 @@
     <g id="regular-expression">
         <path id="left-bracket" d="M3 12.045c0-.99.15-1.915.45-2.777.306-.862.743-1.618 1.314-2.268H6.23c-.552.72-.968 1.512-1.25 2.374-.28.862-.42 1.75-.42 2.66 0 .915.142 1.8.427 2.654.29.85.7 1.622 1.23 2.312h-1.45c-.575-.635-1.013-1.376-1.314-2.223-.3-.847-.45-1.758-.45-2.732"/>
         <path id="dot" d="M10 16c0 .552-.448 1-1 1s-1-.448-1-1 .448-1 1-1 1 .448 1 1z"/>
-        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.475-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.383-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.157h1.534"/>
-        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.844-.737 1.582-1.307 2.21h-1.453c.527-.688.936-1.457 1.225-2.308.29-.855.434-1.74.434-2.66 0-.91-.14-1.797-.422-2.66-.28-.862-.697-1.654-1.248-2.374h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
+        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.474-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.382-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.158h1.534"/>
+        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.843-.737 1.58-1.307 2.21h-1.453c.527-.69.936-1.458 1.225-2.31.29-.854.434-1.74.434-2.66 0-.91-.14-1.796-.422-2.66-.28-.86-.697-1.653-1.248-2.373h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/search.svg b/resources/lib/oojs-ui/themes/apex/images/icons/search.svg
index 070e4bfa34..137150b339 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/search.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/search.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="search">
-        <path id="search" d="M16.02 15.96l-2.373-2.375-.17-.1c.404-.565.644-1.26.644-2.008C14.12 9.557 12.566 8 10.647 8c-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.643l.098.17 2.375 2.373c.19.19.542.143.79-.104s.292-.6.103-.79zm-5.376-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.995-2.213 2.216-2.213 1.222 0 2.213.992 2.213 2.213 0 1.222-.993 2.213-2.214 2.213z"/>
+        <path id="search" d="M16.02 15.96l-2.373-2.375-.17-.1c.404-.565.644-1.26.644-2.008C14.12 9.557 12.567 8 10.648 8 8.727 8 7.17 9.557 7.17 11.478c0 1.92 1.556 3.477 3.477 3.477.75 0 1.442-.24 2.01-.643l.098.17 2.375 2.373c.19.19.542.143.79-.104s.292-.6.103-.79zm-5.376-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.996-2.213 2.217-2.213 1.222 0 2.213.992 2.213 2.213 0 1.222-.993 2.213-2.214 2.213z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg b/resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg
index 6eefe90a91..e064672f00 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/secure-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="secure">
-        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.485-.485 1.45-.487 1.935-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
+        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.486-.485 1.45-.487 1.936-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/settings.svg b/resources/lib/oojs-ui/themes/apex/images/icons/settings.svg
index 7ec62636be..37997674f6 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/settings.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/settings.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0, 0, 24, 24">
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="settings">
         <path id="gear" d="M3 4h3v2H3zm9 0h9v2h-9zM8 3h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1H8c-.552 0-1-.448-1-1V4c0-.552.448-1 1-1zm-5 8h9v2H3zm15 0h3v2h-3zm-4-1h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1zM3 18h6v2H3zm12 0h6v2h-6zm-4-1h2c.552 0 1 .448 1 1v2c0 .552-.448 1-1 1h-2c-.552 0-1-.448-1-1v-2c0-.552.448-1 1-1z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png b/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png
index e632f8a694..7f658819ed 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png and b/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg b/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg
index bb81880d2e..dbf6ed5a95 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/specialCharacter.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="special-character">
-        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.125.513-.19 1.08-.19 1.7 0 .512.06 1 .175 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.602.044.75.035.457.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.895.92 1.157 1.54.27.614.403 1.33.403 2.15 0 .65-.108 1.242-.32 1.78-.216.53-.515.996-.9 1.397-.38.4-.83.732-1.356.99-.525.255-.707.43-1.336.523l-.092.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.038c1.066-.11 1.337-.696 2.002-1.363.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.066-1.186-.194-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
+        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.124.513-.19 1.08-.19 1.7 0 .512.06 1 .176 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.6.044.75.035.458.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.896.92 1.158 1.54.27.614.403 1.33.403 2.15 0 .65-.107 1.242-.32 1.78-.215.53-.514.996-.9 1.397-.38.4-.83.732-1.355.99-.525.255-.707.43-1.336.523l-.093.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.04c1.066-.11 1.337-.695 2.002-1.362.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.067-1.186-.195-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg b/resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg
index 71fa9600e5..46092a6b23 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/strikethrough-s.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="strikethrough-s">
         <path id="strikethrough" d="M6 12h12v1H6v-1z"/>
-        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.474 0-.966-.074-1.466-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.156.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.716-.148-1.204-.352-1.406-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
+        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.473 0-.965-.074-1.465-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.155.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.715-.148-1.203-.352-1.405-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/tag.svg b/resources/lib/oojs-ui/themes/apex/images/icons/tag.svg
index 71671c09f6..5265e04b76 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/tag.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/tag.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg b/resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg
index 77c66a0fc0..466672ebe9 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/text-style.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="text-style">
-        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.288 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
+        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.29 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
         <path id="underline" d="M6 19h12v1H6v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/unLock-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unLock-ltr.svg
index 6f3da1ea39..f443f8465e 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/unLock-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/unLock-ltr.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="unLock">
         <path d="M8 6c-2.21 0-4 1.79-4 4v1h2v-1c0-1.105.895-2 2-2s2 .895 2 2v1H9v7h10v-7h-7v-1c0-2.21-1.79-4-4-4z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/unLock-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/icons/unLock-rtl.svg
index 96305a6fb8..1aabf8bd45 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/unLock-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/unLock-rtl.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="unLock">
         <path d="M15 6c2.21 0 4 1.79 4 4v1h-2v-1c0-1.105-.895-2-2-2s-2 .895-2 2v1h1v7H4v-7h7v-1c0-2.21 1.79-4 4-4z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/icons/underline-u.svg b/resources/lib/oojs-ui/themes/apex/images/icons/underline-u.svg
index 73782984ed..f5aaf5d606 100644
--- a/resources/lib/oojs-ui/themes/apex/images/icons/underline-u.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/icons/underline-u.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="underline-u">
-        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.654-1.666.98-2.98.98-1.32 0-2.32-.324-2.996-.98C8.336 14.37 8 13.405 8 12.126V6"/>
+        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.655-1.666.98-2.98.98-1.32 0-2.32-.323-2.996-.98C8.336 14.37 8 13.406 8 12.127V6"/>
         <path id="underline" d="M7 17h10v1H7v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/alert.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/alert.svg
index cddc0db2ba..868bcc9633 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/alert.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/alert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="alert">
         <path d="M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zM5 7h2V2H5zm0 3h2V8H5z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-ltr.svg
index c4f799818b..e0f13e6d15 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-ltr.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="ltr">
         <path id="arrow" d="M3 9V2l6 3.5z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-rtl.svg
index b49613e708..c88c364b54 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/arrow-rtl.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="rtl">
         <path id="arrow" d="M3 5.5L9 9V2z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/clear.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/clear.svg
index b18405dfa3..3c010c1046 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/clear.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/clear.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="clear">
         <path id="circle-with-cross" d="M6 0C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM3.5 2.5L6 5l2.5-2.5 1 1L7 6l2.5 2.5-1 1L6 7 3.5 9.5l-1-1L5 6 2.5 3.5z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/required.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/required.svg
index 051ed5fd6a..d1e0cba6e3 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/required.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/required.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="required">
         <path d="M5 1h2v10H5zm4.83 1.634l1 1.732-8.66 5-1-1.732zM1.17 4.366l1-1.732 8.66 5-1 1.732z"/>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.png b/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.png
index 985e6023f1..2718a9b0e9 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.png and b/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.svg
index e5c4010ee2..9b3c1997fb 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/search-ltr.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="search">
-        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.646l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.213S6.21 7.207 4.99 7.207z"/>
+        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.647l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.214s-.99 2.213-2.21 2.213z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.png b/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.png
index 4213d678bc..b7a8d221e1 100644
Binary files a/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.png and b/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.svg b/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.svg
index 759f57ec06..3201301edb 100644
--- a/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/indicators/search-rtl.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="search">
-        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.646l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21-1.222 0-2.213.99-2.213 2.213S5.79 7.207 7.01 7.207z"/>
+        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.647l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21S4.8 3.77 4.8 4.995 5.79 7.207 7.01 7.207z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/apex/images/textures/transparency.svg b/resources/lib/oojs-ui/themes/apex/images/textures/transparency.svg
index e413e75719..cadec2a63d 100644
--- a/resources/lib/oojs-ui/themes/apex/images/textures/transparency.svg
+++ b/resources/lib/oojs-ui/themes/apex/images/textures/transparency.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0, 0, 16, 16">
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
     <g id="transparency">
         <path d="M0 0h8v8H0zm8 8h8v8H8z" fill="#ccc"/>
         <path d="M8 0h8v8H8zM0 8h8v8H0z" fill="#fff"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png
index 4f786c5a10..ba0b477360 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg
index a0f06706d6..7813622f0c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced-invert.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
-    <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087 1.5-.997c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.1.9-.298 1.4-.596l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/>
+    <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087L9 17.61c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.1.9-.298 1.4-.596l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png
index 1358969aa9..c2a2e5e0ac 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg
index d0bd78b926..a68158d2c2 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/advanced.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087 1.5-.997c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.1.9-.298 1.4-.596l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/>
+    <path d="M20 13.44v-2.88l-1.8-.3c-.1-.397-.3-.794-.6-1.39l1.1-1.49-2.1-2.088-1.5 1.093c-.5-.298-1-.497-1.4-.596L13.5 4h-2.9l-.3 1.79c-.5.098-.9.297-1.4.595L7.4 5.292 5.3 7.38l1 1.49c-.3.496-.4.894-.6 1.39l-1.7.2v2.882l1.8.298c.1.497.3.894.6 1.39l-1 1.492 2.1 2.087L9 17.61c.4.2.9.397 1.4.596l.3 1.79h3l.3-1.79c.5-.1.9-.298 1.4-.596l1.5 1.093L19 16.62l-1.1-1.49c.3-.496.5-.993.6-1.39l1.5-.3zm-8 1.492c-1.7 0-3-1.292-3-2.982 0-1.69 1.3-2.98 3-2.98s3 1.29 3 2.98-1.3 2.982-3 2.982z"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.png
index 37b57fe564..327e1dd64e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg
index 5b29c9868e..df95976feb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr-invert.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
-    <path d="M-472.8 494.7l6.3 5.7-6.3 5.7v-3.8h-1.3c-3.2 0-6.3 1.3-7.6 3.8 0-4.7 2.8-7.6 7.9-7.6h.9v-3.8z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+    <path d="M13.3 6.3l6.3 5.7-6.3 5.7v-3.8H12c-3.2 0-6.3 1.3-7.6 3.8 0-4.7 2.8-7.6 7.9-7.6h.9V6.3z" id="path3034"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.png
index 7d2113f247..649cd143fc 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.svg
index 20835d28fd..9abef4fc34 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-ltr.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
-    <path d="M-472.8 494.7l6.3 5.7-6.3 5.7v-3.8h-1.3c-3.2 0-6.3 1.3-7.6 3.8 0-4.7 2.8-7.6 7.9-7.6h.9v-3.8z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M13.3 6.3l6.3 5.7-6.3 5.7v-3.8H12c-3.2 0-6.3 1.3-7.6 3.8 0-4.7 2.8-7.6 7.9-7.6h.9V6.3z" id="path3034"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.png
index a50b30669a..f04017c129 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg
index 6f6994091b..d957f70828 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl-invert.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
-    <path d="M-476.3 494.7l-6.3 5.7 6.3 5.7v-3.8h1.3c3.2 0 6.3 1.3 7.6 3.8 0-4.7-2.8-7.6-7.9-7.6h-.9v-3.8z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+    <path d="M10.7 6.3L4.4 12l6.3 5.7v-3.8H12c3.2 0 6.3 1.3 7.6 3.8 0-4.7-2.8-7.6-7.9-7.6h-.9V6.3z" id="path3034"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.png
index ed69a01117..d591768600 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.svg
index e919d378e4..6ec2fcc867 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/arched-arrow-rtl.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
-    <path d="M-476.3 494.7l-6.3 5.7 6.3 5.7v-3.8h1.3c3.2 0 6.3 1.3 7.6 3.8 0-4.7-2.8-7.6-7.9-7.6h-.9v-3.8z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <path d="M10.7 6.3L4.4 12l6.3 5.7v-3.8H12c3.2 0 6.3 1.3 7.6 3.8 0-4.7-2.8-7.6-7.9-7.6h-.9V6.3z" id="path3034"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.png
index b498481745..30d7d2053e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg
index 4363d3eec6..e1a7c67722 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-arab-ain">
-        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.124-.25.342-.662.65l-.09.065c-1.235.93-2.422 1.393-3.56 1.393-1.142 0-2.045-.33-2.71-.99-.65-.66-.975-1.56-.975-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.606-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.717-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.328-1.527-.05-2.054.827l.015.074 1.123.866.052.005c1.403-.497 2.417-.74 3.042-.725-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.385.05c-1.743.24-2.992.716-3.745 1.43-.463.463-.697.972-.702 1.524"/>
+        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.123-.25.34-.66.65l-.09.064c-1.236.93-2.423 1.393-3.56 1.393-1.143 0-2.046-.33-2.71-.99-.65-.66-.976-1.56-.976-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.607-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.718-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.33-1.527-.05-2.054.826l.016.074 1.123.866.05.005c1.404-.496 2.418-.74 3.043-.724-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.386.05c-1.743.24-2.992.716-3.745 1.43-.464.463-.698.972-.703 1.524"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.png
index ad076346a2..e9dce6875f 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.svg
index 2f0edb7151..23ed091aa9 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-ain.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-arab-ain">
-        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.124-.25.342-.662.65l-.09.065c-1.235.93-2.422 1.393-3.56 1.393-1.142 0-2.045-.33-2.71-.99-.65-.66-.975-1.56-.975-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.606-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.717-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.328-1.527-.05-2.054.827l.015.074 1.123.866.052.005c1.403-.497 2.417-.74 3.042-.725-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.385.05c-1.743.24-2.992.716-3.745 1.43-.463.463-.697.972-.702 1.524"/>
+        <path id="arab-ain" d="M9.337 13.616c0 1.35 1.386 2.1 4.16 2.258l2.186-.03.318.045c-.03.123-.25.34-.66.65l-.09.064c-1.236.93-2.423 1.393-3.56 1.393-1.143 0-2.046-.33-2.71-.99-.65-.66-.976-1.56-.976-2.7.006-1.353.567-2.572 1.685-3.657v-.043l-.607-.55c-.15-.18-.222-.39-.222-.63 0-.49.24-1.11.718-1.863.65-1.046 1.303-1.566 1.958-1.56.886.004 1.618.42 2.194 1.245.324.48-.03.55-1.065.22-.842-.33-1.527-.05-2.054.826l.016.074 1.123.866.05.005c1.404-.496 2.418-.74 3.043-.724-.058.116-.14.36-.243.732-.105.357-.206.684-.305.982l-.126.373-.386.05c-1.743.24-2.992.716-3.745 1.43-.464.463-.698.972-.703 1.524"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.png
index 42518e779f..9eb593bd12 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg
index 6a2a9e350a..8b75d71c27 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-arab-dad">
-        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.474 0-.985.205-1.535.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.006m-6.803 3.293c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.066.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.193.31-.474.555-.845.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.144.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
+        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.475 0-.986.205-1.536.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.005M10.382 14.6c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.065.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.192.31-.473.555-.844.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.143.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.png
index 0ade40ce63..46d579b860 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.svg
index ba7ffe112c..7e6769d9d3 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-arab-dad.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-arab-dad">
-        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.474 0-.985.205-1.535.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.006m-6.803 3.293c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.066.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.193.31-.474.555-.845.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.144.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
+        <path id="arab-dad" d="M16.41 8.232l-1.675-.665L15.43 6l1.687.64-.707 1.592m.775 3.078c-.51-.286-1-.427-1.476-.423-.475 0-.986.205-1.536.616l-.506.38.006.024c1.084.066 1.934.1 2.55.1h.314c.57-.022.994-.065 1.278-.132-.067-.17-.275-.36-.625-.566h-.005M10.382 14.6c-.017-.904-.33-1.87-.938-2.898l1.294-1.73.118.15c.267.336.504.924.713 1.766l.065.05c.496-.007.942-.17 1.338-.484v-.006l1.732-1.53c.68-.6 1.282-.9 1.807-.9.384.003.85.194 1.395.57.55.378.884.697 1 .96.063.15.094.385.094.71 0 .694-.11 1.227-.33 1.596-.192.31-.473.555-.844.734-.438.208-1.55.312-3.333.312-.8 0-1.794-.02-2.982-.062l-.143.43c-.254.67-.463 1.112-.625 1.323-.725.937-1.786 1.405-3.183 1.405C5.85 16.99 5 16.076 5 14.256c.003-.94.278-1.814.824-2.618.15-.216.298-.367.444-.454.225-.133.288-.09.188.124-.396.862-.596 1.548-.6 2.058.008 1.177.752 1.768 2.232 1.772 1.038-.004 1.803-.182 2.295-.535"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.png
index c11de3e8f0..03a79311d9 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg
index e3a081344f..0176bb2219 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-armn-to">
-        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.277.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.215.178.392.29.53.12.133.25.23.386.29.14.05.276.074.406.074m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.345.49.735.64 1.17.15.43.226 1.09.226 1.61h1.356v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.812-.845 1.114-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.314-.626-.704-.835-1.173-.203-.473-.304-1.028-.304-1.663s.102-1.182.32-1.64c.21-.46.494-.685.85-.977.352-.297.76-.513 1.22-.648.455-.14.932-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.456-.58-.77-.767-.31-.193-.597-.332-.983-.426-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.102z"/>
+        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.278.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.214.18.39.29.53.12.132.25.23.387.29.14.05.276.073.406.073m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.344.49.734.64 1.17.15.43.226 1.09.226 1.61h1.357v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.81-.845 1.113-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.315-.626-.705-.835-1.174-.203-.473-.304-1.028-.304-1.663s.1-1.182.32-1.64c.21-.46.493-.685.85-.977.35-.297.76-.513 1.22-.648.454-.14.93-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.457-.58-.77-.767-.31-.192-.598-.33-.984-.425-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.103z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.png
index 0a16f8c795..5e16e38fc9 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.svg
index 0dc8b52e19..7471d1a31b 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-armn-to.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-armn-to">
-        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.277.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.215.178.392.29.53.12.133.25.23.386.29.14.05.276.074.406.074m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.345.49.735.64 1.17.15.43.226 1.09.226 1.61h1.356v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.812-.845 1.114-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.314-.626-.704-.835-1.173-.203-.473-.304-1.028-.304-1.663s.102-1.182.32-1.64c.21-.46.494-.685.85-.977.352-.297.76-.513 1.22-.648.455-.14.932-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.456-.58-.77-.767-.31-.193-.597-.332-.983-.426-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.102z"/>
+        <path id="armn-to" d="M13.86 16.257c.124 0 .254-.026.39-.078.135-.06.257-.15.367-.278.114-.13.205-.302.273-.516.073-.214.11-.48.11-.798V13h-1.14c-.14 0-.284.026-.43.078-.14.047-.27.133-.383.258-.11.125-.2.294-.274.508-.067.213-.1.487-.1.82 0 .34.035.47.108.695.08.214.18.39.29.53.12.132.25.23.387.29.14.05.276.073.406.073m-2.97-7.84c-.37.082-.694.247-.975.45-.28.198-.505.47-.672.813-.16.342-.242.78-.242 1.31V18H6v-7.188c0-.776.15-1.455.453-2.04.302-.587.714-1.077 1.234-1.467.52-.39 1.13-.685 1.83-.883.697-.198 1.44-.297 2.225-.297.526 0 1.04.044 1.54.133.504.088.98.22 1.43.398.447.172.858.388 1.233.65.375.26.698.564.97.913.275.344.49.734.64 1.17.15.43.226 1.09.226 1.61h1.357v2.04H17.78v1.6c0 .58-.103 1.09-.31 1.54-.21.44-.49.81-.845 1.113-.35.302-.834.53-1.297.687-.464.15-.953.227-1.47.227-.51 0-.996-.08-1.46-.235-.464-.156-.87-.39-1.22-.703-.348-.315-.626-.705-.835-1.174-.203-.473-.304-1.028-.304-1.663s.1-1.182.32-1.64c.21-.46.493-.685.85-.977.35-.297.76-.513 1.22-.648.454-.14.93-.21 1.43-.21h1.13c-.01-.49-.04-1.044-.24-1.36-.2-.324-.457-.58-.77-.767-.31-.192-.598-.33-.984-.425-.375-.09-.578-.094-1.1-.094-.52 0-.64.02-1.01.103z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg
index 5716249420..396215dc17 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-cyrl-be">
-        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.395-.255-1.067-.397-2.02-.397H10v3"/>
+        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.396-.255-1.068-.397-2.02-.397H10v3"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be.svg
index d87d0fcefd..383ef32367 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-be.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-cyrl-be">
-        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.395-.255-1.067-.397-2.02-.397H10v3"/>
+        <path id="cyrl-be" d="M7 6h9v2h-6v3h2.65c.892 0 1.632.11 2.22.327.587.218 1.087.622 1.5 1.21.42.59.63 1.188.63 1.98 0 .812-.21 1.397-.63 1.976-.418.578-.897.974-1.436 1.187-.533.213-1.295.32-2.286.32h-5.65m4.768-2c.75 0 1.28-.05 1.584-.12.305-.077.57-.247.792-.51.23-.26.343-.472.343-.854 0-.557-.2-.868-.596-1.12-.396-.255-1.068-.397-2.02-.397H10v3"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg
index 6085d9c4c1..3d7523a08c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-cyrl-zhe">
-        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.116-.337.3-.452.55-.115.25-.286.762-.512 1.537-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.273-.268-.62-.392-1.04-.222-.76-.39-1.264-.505-1.52-.11-.253-.26-.442-.45-.57-.185-.122-.49-.184-.916-.184L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
+        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.115-.337.3-.452.55-.115.25-.286.76-.512 1.536-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.272-.268-.62-.392-1.04-.222-.76-.39-1.263-.505-1.52-.11-.252-.26-.44-.45-.57-.184-.12-.49-.183-.915-.183L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe.svg
index 3c0a87962b..e349905098 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-cyrl-zhe.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-cyrl-zhe">
-        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.116-.337.3-.452.55-.115.25-.286.762-.512 1.537-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.273-.268-.62-.392-1.04-.222-.76-.39-1.264-.505-1.52-.11-.253-.26-.442-.45-.57-.185-.122-.49-.184-.916-.184L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
+        <path id="cyrl-zhe" d="M13 6v5.154c.328-.033.537-.18.705-.447.168-.266.4-.873.698-1.82.39-1.242.79-2.034 1.197-2.375.403-.336 1.075-.504 2.014-.504L18 6v1.78l-.386-.008c-.4 0-.69.062-.878.187-.186.115-.337.3-.452.55-.115.25-.286.76-.512 1.536-.12.41-.25.755-.392 1.032-.137.275-.383.536-.738.78.44.156.8.465 1.084.926.288.454.603 1.102.944 1.942L18 18h-2.314l-1.17-3.08-.113-.253-.24-.56c-.247-.57-.45-.933-.61-1.09-.16-.157-.318-.236-.553-.236V18h-2v-5.22c-.226 0-.382.077-.546.23-.164.15-.368.517-.612 1.097l-.246.56-.113.253L8.313 18H6l1.33-3.267c.327-.808.635-1.447.923-1.92.293-.476.663-.793 1.11-.95-.355-.244-.603-.5-.745-.772-.137-.272-.268-.62-.392-1.04-.222-.76-.39-1.263-.505-1.52-.11-.252-.26-.44-.45-.57-.184-.12-.49-.183-.915-.183L6 7.782v-1.78l.386.008c.953 0 1.63.17 2.034.512.4.347.79 1.136 1.177 2.366.3.954.534 1.564.698 1.83.168.26.377.405.705.438V6.002"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.png
index 18de673e3c..5dc39ee48d 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg
index c840c518a7..88733e0cbd 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="bold-g">
-        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.516-.94 1.268-1.66 2.258-2.16.754-.386 1.693-.58 2.816-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.335-1.022-.5-1.707-.5-1.038 0-1.864.323-2.48.972-.61.65-.914 1.612-.914 2.89 0 1.376.31 2.41.93 3.102.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.867"/>
+        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.517-.94 1.27-1.66 2.26-2.16.753-.386 1.692-.58 2.815-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.336-1.022-.5-1.707-.5-1.038 0-1.864.322-2.48.97-.61.65-.914 1.613-.914 2.89 0 1.377.31 2.41.93 3.103.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.866"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.png
index e80945317c..cc4be630fa 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.svg
index 277f17eb07..05b46e2d60 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bold-g.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="bold-g">
-        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.516-.94 1.268-1.66 2.258-2.16.754-.386 1.693-.58 2.816-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.335-1.022-.5-1.707-.5-1.038 0-1.864.323-2.48.972-.61.65-.914 1.612-.914 2.89 0 1.376.31 2.41.93 3.102.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.867"/>
+        <path id="g" d="M12 14v-2h5v4.203c-.497.475-1.22.894-2.166 1.26-.94.358-1.896.537-2.864.537-1.23 0-2.303-.253-3.217-.76-.915-.512-1.602-1.24-2.062-2.185-.46-.95-.69-1.982-.69-3.095 0-1.208.26-2.282.77-3.222.517-.94 1.27-1.66 2.26-2.16.753-.386 1.692-.58 2.815-.58 1.46 0 2.6.304 3.418.91.825.603 1.354 1.436 1.59 2.502l-2.36.435c-.165-.57-.48-1.018-.94-1.346-.453-.336-1.022-.5-1.707-.5-1.038 0-1.864.322-2.48.97-.61.65-.914 1.613-.914 2.89 0 1.377.31 2.41.93 3.103.62.686 1.434 1.03 2.44 1.03.497 0 .995-.096 1.49-.286.505-.196 1.334-.57 1.69-.846v-.866"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg
index 576e89d560..2717b5a402 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/bright.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <path d="M18.1 5.1c0 .3-.1.6-.3.9l-1.4 1.4-.9-.8 2.2-2.2c.3.1.4.4.4.7zm-.5 5.3h3.2c0 .3-.1.6-.4.9-.3.3-.5.4-.8.4h-2v-1.3zm-6.2-5V2.2c.3 0 .6.1.9.4.3.3.4.5.4.8v2h-1.3zm6.4 11.7c-.3 0-.6-.1-.8-.3l-1.4-1.4.8-.8 2.2 2.2c-.2.2-.5.3-.8.3zM6.2 4.9c.3 0 .6.1.8.3l1.4 1.4-.8.9-2.2-2.3c.2-.2.5-.3.8-.3zm5.2 11.7h1.2v3.2c-.3 0-.6-.1-.9-.4-.3-.3-.4-.5-.4-.8l.1-2zm-7-6.2h2v1.2H3.2c0-.3.1-.6.4-.9.3-.3.5-.3.8-.3zM6.2 16l1.4-1.4.8.8-2.2 2.2c-.2-.2-.3-.5-.3-.8 0-.3.1-.6.3-.8z"/>
     <g>
         <path d="M12 8c1.7 0 3 1.3 3 3s-1.3 3-3 3-3-1.3-3-3 1.3-3 3-3m0-1c-2.2 0-4 1.8-4 4s1.8 4 4 4 4-1.8 4-4-1.8-4-4-4z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.png
index 1a1ce2e0c0..212e16d3aa 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg
index 170867495b..a90feebe63 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="regular-expression">
-        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.655 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
-        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.444.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.666.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.803.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .583.336.875 1.008.875.48 0 .865-.138 1.152-.415.29-.276.436-.644.436-1.102v-.627"/>
+        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.654 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
+        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.443.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.665.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.802.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .582.336.874 1.008.874.48 0 .865-.138 1.152-.415.29-.277.436-.645.436-1.103v-.627"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.png
index 1b0a6594aa..f36e52cbd6 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg
index 8de25836ee..2f0e406de6 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/case-sensitive.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="regular-expression">
-        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.655 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
-        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.444.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.666.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.803.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .583.336.875 1.008.875.48 0 .865-.138 1.152-.415.29-.276.436-.644.436-1.102v-.627"/>
+        <path id="upper-case" d="M7.53 7L4 17h2.063l.72-2.406h3.624l.72 2.406h2.062L9.654 7H7.533zm1.064 1.53L9.938 13H7.25l1.344-4.47z"/>
+        <path id="lower-case" d="M18.55 17l-.184-1.035h-.055c-.35.44-.71.747-1.08.92-.37.167-.85.25-1.443.25-.564 0-.955-.208-1.377-.625-.42-.418-.628-1.012-.628-1.784 0-.808.283-1.403.846-1.784.568-.386 1.193-.607 2.208-.64l1.322-.04v-.335c0-.772-.395-1.158-1.186-1.158-.61 0-1.325.18-2.147.55l-.688-1.4c.877-.46 1.85-.69 2.916-.69 1.024 0 1.59.22 2.134.665.545.445.818 1.12.818 2.03V17h-1.45m-.394-3.527l-.802.027c-.604.018-1.054.127-1.35.327-.294.2-.442.504-.442.912 0 .582.336.874 1.008.874.48 0 .865-.138 1.152-.415.29-.277.436-.645.436-1.103v-.627"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png
index 6d8abc3be9..32d5ae82b6 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg
index 89c5e254f3..cd7ce21822 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr-invert.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
-    <path d="M18.4 8.1c.8-.8.8-2 0-2.8L12 11.8 6.4 6.2 5 7.6l5.6 5.6-5 5c-.8.8-.8 2 0 2.8l6.4-6.4 5.6 5.6 1.4-1.4-5.6-5.6 5-5.1z"/>
+    <g id="close">
+        <path id="cross" d="M17.4 9.1c.8-.8.8-2 0-2.8L12 11.8 7.4 7.2 6 8.6l4.6 4.6-4 4c-.8.8-.8 2 0 2.8l5.4-5.4 4.6 4.6 1.4-1.4-4.6-4.6z"/>
+    </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png
index ea65697c16..b05cc97350 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg
index 4dfa16ad2a..1427670d0c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-ltr.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M18.4 8.1c.8-.8.8-2 0-2.8L12 11.8 6.4 6.2 5 7.6l5.6 5.6-5 5c-.8.8-.8 2 0 2.8l6.4-6.4 5.6 5.6 1.4-1.4-5.6-5.6 5-5.1z"/>
+    <g id="close">
+        <path id="cross" d="M17.4 9.1c.8-.8.8-2 0-2.8L12 11.8 7.4 7.2 6 8.6l4.6 4.6-4 4c-.8.8-.8 2 0 2.8l5.4-5.4 4.6 4.6 1.4-1.4-4.6-4.6z"/>
+    </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png
index 004a51869d..731baf9943 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg
index d20fff1f1f..ee8a82d3fd 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl-invert.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
-    <path d="M5.6 8.1c-.8-.8-.8-2 0-2.8l6.4 6.5 5.6-5.6L19 7.6l-5.6 5.6 5 5c.8.8.8 2 0 2.8L12 14.6l-5.6 5.6L5 18.8l5.6-5.6-5-5.1z" id="path140"/>
+    <g id="close">
+        <path id="cross" d="M6.6 9.1c-.8-.8-.8-2 0-2.8l5.4 5.5 4.6-4.6L18 8.6l-4.6 4.6 4 4c.8.8.8 2 0 2.8L12 14.6l-4.6 4.6L6 17.8l4.6-4.6z"/>
+    </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png
index 1cb898d1f0..3752520127 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg
index 3666a34716..6e0ca93781 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/close-rtl.svg
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-    <path d="M5.6 8.1c-.8-.8-.8-2 0-2.8l6.4 6.5 5.6-5.6L19 7.6l-5.6 5.6 5 5c.8.8.8 2 0 2.8L12 14.6l-5.6 5.6L5 18.8l5.6-5.6-5-5.1z" id="path140"/>
+    <g id="close">
+        <path id="cross" d="M6.6 9.1c-.8-.8-.8-2 0-2.8l5.4 5.5 4.6-4.6L18 8.6l-4.6 4.6 4 4c.8.8.8 2 0 2.8L12 14.6l-4.6 4.6L6 17.8l4.6-4.6z"/>
+    </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.png
index 23c598355b..97e0c2c549 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.svg
index fab61c1de2..d62d23013f 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="code">
-        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.478.808-.587C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.306.238.76.238 1.487v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
+        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.588C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.307.238.76.238 1.488v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
         <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" width="24" height="24" xlink:href="#left-bracket"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.png
index ee58c9a723..6e678e2aaf 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.svg
index fe5309dc05..d3893b0fe1 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/code.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24" height="24" viewBox="0 0 24 24">
     <g id="code">
-        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.478.808-.587C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.306.238.76.238 1.487v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
+        <path id="left-bracket" d="M4 12v-1h1c1 0 1 0 1-1V7.614c0-.514.024-.896.073-1.142.054-.252.14-.463.257-.633.204-.28.473-.48.808-.588C7.473 5.14 8.01 5 8.973 5H10v1h-.752c-.457 0-.77.19-.936.408C8.145 6.623 8 6.853 8 7.476v1.857c0 .73-.04 1.18-.244 1.493-.2.307-.562.53-1.09.667.535.155.9.385 1.096.688.2.307.238.76.238 1.488v1.862c0 .62.145.847.312 1.06.166.22.48.407.936.407L10 17v1H8.973c-.963 0-1.5-.133-1.835-.248-.335-.11-.604-.307-.808-.59-.118-.166-.203-.375-.257-.626-.05-.253-.073-.636-.073-1.15V13c0-1 0-1-1-1H4z"/>
         <use transform="matrix(-1 0 0 1 24 0)" id="right-bracket" width="24" height="24" xlink:href="#left-bracket"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.png
index 3be50ba084..eec31027c0 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.svg
index 99ded02c15..0526f75b27 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="external">
-        <path id="box" d="M2 2h3v1H3v6h6V7h1v3H2z"/>
-        <path id="arrow" d="M6.21 2H10v3.79L8.58 4.367 6.446 6.5 5.5 5.553 7.632 3.42z"/>
+        <path id="box" d="M4 4h6v2H6v12h12v-4h2v6H4z"/>
+        <path id="arrow" d="M12.42 4H20v7.58l-2.84-2.846L12.892 13 11 11.106l4.264-4.266z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.png
index 10927e164a..4b59b2a221 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.svg
index e8363615a9..1d7980dc3f 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="external">
-        <path id="box" d="M2 2h3v1H3v6h6V7h1v3H2z"/>
-        <path id="arrow" d="M6.21 2H10v3.79L8.58 4.367 6.446 6.5 5.5 5.553 7.632 3.42z"/>
+        <path id="box" d="M4 4h6v2H6v12h12v-4h2v6H4z"/>
+        <path id="arrow" d="M12.42 4H20v7.58l-2.84-2.846L12.892 13 11 11.106l4.264-4.266z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.png
index eaeaf6eef2..bf0ef13909 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.svg
index d1d7093e68..d747aa68fb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="external">
-        <path id="box" d="M7 3h2v6H3V7H2v3h8V2H7z"/>
-        <path id="arrow" d="M2 5.79l1.42-1.422L5.554 6.5l.947-.947L4.37 3.42 5.788 2H2z"/>
+        <path id="box" d="M20 4h-6v2h4v12H6v-4H4v6h16z"/>
+        <path id="arrow" d="M11.58 4H4v7.58l2.84-2.846L11.108 13 13 11.106 8.736 6.84z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.png
index 7a3454e9b1..2978654875 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.svg
index 9fdc8ca56c..7e25d034cb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/external-link-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="external">
-        <path id="box" d="M7 3h2v6H3V7H2v3h8V2H7z"/>
-        <path id="arrow" d="M2 5.79l1.42-1.422L5.554 6.5l.947-.947L4.37 3.42 5.788 2H2z"/>
+        <path id="box" d="M20 4h-6v2h4v12H6v-4H4v6h16z"/>
+        <path id="arrow" d="M11.58 4H4v7.58l2.84-2.846L11.108 13 13 11.106 8.736 6.84z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.png
index dd95034d9c..010b224b7d 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.svg
index dc37aa148c..5764ee6dbf 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="find">
-        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.372c.19.19.534.153.78-.094s.315-.59.126-.78L16.66 16.59l-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.804 1.84-1.816 1.84-1.01 0-1.844-.83-1.844-1.843s.833-1.814 1.845-1.814z"/>
+        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.37c.19.19.534.154.78-.093s.315-.59.126-.78l-2.37-2.377-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.805 1.84-1.817 1.84-1.01 0-1.844-.83-1.844-1.844s.832-1.814 1.844-1.814z"/>
         <path id="text" d="M6 5v2h10V5H6zm0 3v2h11V8H6zm0 3v2h3.53c.284-.797.787-1.486 1.44-2H6zm0 3v2h3.53c-.177-.48-.28-.99-.28-1.53 0-.16.046-.315.063-.47H6z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.png
index 5c666880d0..9f418b8801 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.svg
index bbfdaa0317..67e6943448 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="find">
-        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.372c.19.19.534.153.78-.094s.315-.59.126-.78L16.66 16.59l-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.804 1.84-1.816 1.84-1.01 0-1.844-.83-1.844-1.843s.833-1.814 1.845-1.814z"/>
+        <path id="magnifying-glass" d="M13.656 11c-1.92 0-3.5 1.548-3.5 3.47 0 1.92 1.58 3.5 3.5 3.5.75 0 1.432-.253 2-.657l.094.156 2.375 2.37c.19.19.534.154.78-.093s.315-.59.126-.78l-2.37-2.377-.188-.093c.402-.567.655-1.283.655-2.03 0-1.92-1.55-3.47-3.47-3.47zm0 1.656c1.01 0 1.813.8 1.813 1.813 0 1.01-.805 1.84-1.817 1.84-1.01 0-1.844-.83-1.844-1.844s.832-1.814 1.844-1.814z"/>
         <path id="text" d="M6 5v2h10V5H6zm0 3v2h11V8H6zm0 3v2h3.53c.284-.797.787-1.486 1.44-2H6zm0 3v2h3.53c-.177-.48-.28-.99-.28-1.53 0-.16.046-.315.063-.47H6z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.png
index 9f23f4a266..4a70b137c6 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.svg
index 083c2d3dfe..6854553558 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="find">
-        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.372c-.19.19-.534.153-.78-.094s-.315-.59-.126-.78L8.34 16.59l.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.804 1.84 1.816 1.84 1.01 0 1.844-.83 1.844-1.843s-.833-1.814-1.845-1.814z"/>
+        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.37c-.19.19-.534.154-.78-.093s-.315-.59-.126-.78l2.37-2.377.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.805 1.84 1.817 1.84 1.01 0 1.844-.83 1.844-1.844s-.832-1.814-1.844-1.814z"/>
         <path id="text" d="M19 5v2H9V5zm0 3v2H8V8zm0 3v2h-3.53c-.284-.797-.787-1.486-1.44-2zm0 3v2h-3.53c.177-.48.28-.99.28-1.53 0-.16-.046-.315-.063-.47z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.png
index 28aab68bcf..b63eb841e4 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.svg
index e70ae483a1..962165d66a 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/find-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="find">
-        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.372c-.19.19-.534.153-.78-.094s-.315-.59-.126-.78L8.34 16.59l.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.804 1.84 1.816 1.84 1.01 0 1.844-.83 1.844-1.843s-.833-1.814-1.845-1.814z"/>
+        <path id="magnifying-glass" d="M11.344 11c1.92 0 3.5 1.548 3.5 3.47 0 1.92-1.58 3.5-3.5 3.5-.75 0-1.432-.253-2-.657l-.094.156-2.375 2.37c-.19.19-.534.154-.78-.093s-.315-.59-.126-.78l2.37-2.377.188-.093c-.402-.567-.655-1.283-.655-2.03 0-1.92 1.55-3.47 3.47-3.47zm0 1.656c-1.01 0-1.813.8-1.813 1.813 0 1.01.805 1.84 1.817 1.84 1.01 0 1.844-.83 1.844-1.844s-.832-1.814-1.844-1.814z"/>
         <path id="text" d="M19 5v2H9V5zm0 3v2H8V8zm0 3v2h-3.53c-.284-.797-.787-1.486-1.44-2zm0 3v2h-3.53c.177-.48.28-.99.28-1.53 0-.16-.046-.315-.063-.47z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg
index b97eae3529..fff92e741b 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/halfBright.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <path d="M11.4 5.4V2.2c.3 0 .6.1.9.4.3.3.4.5.4.8v2h-1.3zm-5.2-.5c.3 0 .6.1.8.3l1.4 1.4-.8.9-2.2-2.3c.2-.2.5-.3.8-.3zm5.2 11.7h1.2v3.2c-.3 0-.6-.1-.9-.4-.3-.3-.4-.5-.4-.8l.1-2zm-7-6.2h2v1.2H3.2c0-.3.1-.6.4-.9.3-.3.5-.3.8-.3zM6.2 16l1.4-1.4.8.8-2.2 2.2c-.2-.2-.3-.5-.3-.8 0-.3.1-.6.3-.8zM12 7c-2.2 0-4 1.8-4 4s1.8 4 4 4 4-1.8 4-4-1.8-4-4-4zm-3 4c0-1.7 1.3-3 3-3v6c-1.7 0-3-1.3-3-3z"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr-invert.svg
index 3f560092ef..fdefd97280 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="help">
-        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.917 9.916 9.917 5.48 0 9.917-4.438 9.917-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.918 9.916 9.918 5.48 0 9.918-4.438 9.918-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M11.766 6.688c-2.5 0-3.22 2.188-3.22 2.188l1.412.854s.298-.79.9-1.23c.517-.374 1.626-.624 2.22.126.7.885-.17 1.587-1.078 2.72C11.047 12.53 11 15 11 15h1.97s.134-2.318 1.04-3.38c.603-.708 1.443-1.34 1.443-2.495s-1.187-2.437-3.687-2.437z"/>
             <path id="bottom" d="M11 16h2v2h-2z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr.svg
index a9a0ebbad9..825435dab0 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-ltr.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="help">
-        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.917 9.916 9.917 5.48 0 9.917-4.438 9.917-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c-5.477 0-9.915 4.438-9.915 9.916 0 5.48 4.438 9.918 9.916 9.918 5.48 0 9.918-4.438 9.918-9.914 0-5.477-4.438-9.915-9.914-9.915zm.002 18c-4.465 0-8.084-3.62-8.084-8.083 0-4.465 3.62-8.084 8.084-8.084 4.464 0 8.083 3.62 8.083 8.084 0 4.464-3.62 8.083-8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M11.766 6.688c-2.5 0-3.22 2.188-3.22 2.188l1.412.854s.298-.79.9-1.23c.517-.374 1.626-.624 2.22.126.7.885-.17 1.587-1.078 2.72C11.047 12.53 11 15 11 15h1.97s.134-2.318 1.04-3.38c.603-.708 1.443-1.34 1.443-2.495s-1.187-2.437-3.687-2.437z"/>
             <path id="bottom" d="M11 16h2v2h-2z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl-invert.svg
index 6866809434..b369813827 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="help">
-        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.917-9.916 9.917-5.48 0-9.917-4.438-9.917-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.918-9.916 9.918-5.48 0-9.918-4.438-9.918-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M12.234 6.688c2.5 0 3.22 2.188 3.22 2.188l-1.412.854s-.298-.79-.9-1.23c-.517-.374-1.626-.624-2.22.126-.7.885.17 1.587 1.078 2.72C12.953 12.53 13 15 13 15h-1.97s-.134-2.318-1.04-3.38c-.603-.708-1.443-1.34-1.443-2.495 0-1.156 1.187-2.437 3.687-2.437z"/>
             <path id="bottom" d="M13 16h-2v2h2z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl.svg
index 1b513d05d0..0d8052f1ed 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/help-rtl.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="help">
-        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.917-9.916 9.917-5.48 0-9.917-4.438-9.917-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
+        <path id="circle" d="M12 2.085c5.477 0 9.915 4.438 9.915 9.916 0 5.48-4.438 9.918-9.916 9.918-5.48 0-9.918-4.438-9.918-9.914 0-5.477 4.438-9.915 9.914-9.915zm-.002 18c4.465 0 8.084-3.62 8.084-8.083 0-4.465-3.62-8.084-8.084-8.084-4.464 0-8.083 3.62-8.083 8.084 0 4.464 3.62 8.083 8.083 8.083z"/>
         <g id="question-mark">
             <path id="top" d="M12.234 6.688c2.5 0 3.22 2.188 3.22 2.188l-1.412.854s-.298-.79-.9-1.23c-.517-.374-1.626-.624-2.22.126-.7.885.17 1.587 1.078 2.72C12.953 12.53 13 15 13 15h-1.97s-.134-2.318-1.04-3.38c-.603-.708-1.443-1.34-1.443-2.495 0-1.156 1.187-2.437 3.687-2.437z"/>
             <path id="bottom" d="M13 16h-2v2h2z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/history-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/history-invert.svg
index 6fcd85624e..31287cda25 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/history-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/history-invert.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="history">
         <path id="clock-hands" d="M17.26 15.076s-2.385-1.935-4.005-3.062c.72-2.397 1.702-6.56 1.702-6.56s-4.35 5.364-4.877 6.7c-.463 1.168 1.46 2.21 2.346 1.678 1.9.55 4.834 1.244 4.834 1.244z"/>
-        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.462 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.083 0 4.465-3.616 8.084-8.08 8.084-1.145 0-2.23-.247-3.213-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
+        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.46 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.084 0 4.465-3.615 8.084-8.08 8.084-1.144 0-2.23-.247-3.212-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/history.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/history.svg
index 937575199c..10d1b81e7a 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/history.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/history.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="history">
         <path id="clock-hands" d="M17.26 15.076s-2.385-1.935-4.005-3.062c.72-2.397 1.702-6.56 1.702-6.56s-4.35 5.364-4.877 6.7c-.463 1.168 1.46 2.21 2.346 1.678 1.9.55 4.834 1.244 4.834 1.244z"/>
-        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.462 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.083 0 4.465-3.616 8.084-8.08 8.084-1.145 0-2.23-.247-3.213-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
+        <path id="arrow" d="M12.086 2.085C6.608 2.085 2.17 6.523 2.17 12c0 1.784.476 3.455 1.3 4.9l-2.22 2.04h5.688v-5.22L4.87 15.616c-.55-1.088-.866-2.312-.866-3.615 0-4.46 3.62-8.08 8.084-8.08 4.464 0 8.083 3.62 8.083 8.084 0 4.465-3.615 8.084-8.08 8.084-1.144 0-2.23-.247-3.212-.678l-.833 1.633c1.235.557 2.602.874 4.045.874C17.562 21.914 22 17.477 22 12c0-5.477-4.438-9.915-9.914-9.915z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.png
index cf194aae8b..d899142405 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.svg
index 938c32e3b8..b359c47e86 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-arab-keheh-jeem">
-        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.872 1.125-.064.263-.035.572.063.78.19.406.54.575.844.814l.094-.122.53.625c.14.165.344.514.47.94.137.462.08.724 0 1.124H11.22c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.935-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.357.026-.768.24-1.03.72-.247.447-.435.838-.657 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.204-.51.4-.72.562-.3.26-.703.688-.907 1-.402.615-.693 1.084-.874 1.78-.18.69.003 1.34.468 1.75.426.377.846.52 1.28.564.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.384-1.47-.594-.27-.283-.306-.64-.155-1.22.036-.14.097-.322.25-.53.17-.228.364-.435.594-.656.45-.436 1.01-.737 1.46-.938-.044.205-.106.442-.054.687.05.23.25.38.44.47.26.12.506.153.69.154 1.42.01 2.86 0 4.28 0 .246 0 .45-.163.593-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.443-.673-.83-1-1.22 1.258-.814 2.717-1.238 3.97-1.687.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .378.286.75.556 1.097.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
+        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.87 1.125-.065.263-.036.572.062.78.19.406.54.575.844.814l.094-.12.53.624c.14.165.344.514.47.94.137.462.08.724 0 1.124h-3.44c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.934-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.358.026-.77.24-1.03.72-.248.447-.436.838-.658 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.203-.51.4-.72.56-.3.26-.703.69-.907 1-.402.616-.693 1.085-.874 1.78-.18.69.003 1.34.468 1.75.426.378.846.52 1.28.565.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.385-1.47-.595-.27-.283-.306-.64-.155-1.22.035-.14.096-.322.25-.53.17-.228.363-.435.593-.656.45-.437 1.01-.738 1.46-.94-.044.206-.106.443-.054.688.05.23.25.38.44.47.26.12.505.153.69.154 1.42.01 2.86 0 4.28 0 .245 0 .45-.163.592-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.442-.673-.83-1-1.22 1.258-.813 2.717-1.237 3.97-1.686.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .38.286.75.556 1.098.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.png
index 3285ad9b2e..9f603eab83 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.svg
index 04cdebbce5..99980c05ea 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-keheh-jeem.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-arab-keheh-jeem">
-        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.872 1.125-.064.263-.035.572.063.78.19.406.54.575.844.814l.094-.122.53.625c.14.165.344.514.47.94.137.462.08.724 0 1.124H11.22c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.935-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.357.026-.768.24-1.03.72-.247.447-.435.838-.657 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.204-.51.4-.72.562-.3.26-.703.688-.907 1-.402.615-.693 1.084-.874 1.78-.18.69.003 1.34.468 1.75.426.377.846.52 1.28.564.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.384-1.47-.594-.27-.283-.306-.64-.155-1.22.036-.14.097-.322.25-.53.17-.228.364-.435.594-.656.45-.436 1.01-.737 1.46-.938-.044.205-.106.442-.054.687.05.23.25.38.44.47.26.12.506.153.69.154 1.42.01 2.86 0 4.28 0 .246 0 .45-.163.593-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.443-.673-.83-1-1.22 1.258-.814 2.717-1.238 3.97-1.687.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .378.286.75.556 1.097.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
+        <path id="arab-keheh-jeem" d="M18.125 5.844c-1.695.555-3.297 1.162-4.594 1.938-.49.3-.77.712-.87 1.125-.065.263-.036.572.062.78.19.406.54.575.844.814l.094-.12.53.624c.14.165.344.514.47.94.137.462.08.724 0 1.124h-3.44c-.34 0-.593.007-.767-.02-.34-.053-.256-.208-.234-.34.33-.127.56-.173.934-.14.29-.495.593-.886.906-1.314-.98.037-1.877.015-2.687-.094-.346-.048-.698-.187-1.094-.157-.358.026-.77.24-1.03.72-.248.447-.436.838-.658 1.28l.75-.47c.23-.14.484-.226.72-.218.156.005.274.054.405.094-.233.203-.51.4-.72.56-.3.26-.703.69-.907 1-.402.616-.693 1.085-.874 1.78-.18.69.003 1.34.468 1.75.426.378.846.52 1.28.565.65.065 1.206.093 2-.188.658-.23 1.022-.553 1.5-.97-.882.11-1.816.09-2.53.032-.87-.07-1.268-.385-1.47-.595-.27-.283-.306-.64-.155-1.22.035-.14.096-.322.25-.53.17-.228.363-.435.593-.656.45-.437 1.01-.738 1.46-.94-.044.206-.106.443-.054.688.05.23.25.38.44.47.26.12.505.153.69.154 1.42.01 2.86 0 4.28 0 .245 0 .45-.163.592-.375.14-.21.25-.48.344-.845.13-.5.094-1.062-.094-1.625-.182-.543-.418-1.01-.72-1.406-.334-.442-.673-.83-1-1.22 1.258-.813 2.717-1.237 3.97-1.686.12-.452.224-.926.313-1.313zm-9.47 8.438c-.26.394-.583.69-.874 1 .38.286.75.556 1.098.813.335-.303.626-.674.875-.97-.39-.267-.77-.587-1.093-.843z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.png
index 37282efe78..960653e09e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.svg
index 4b9da20c3b..a0f9c0c00c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-arab-meem">
-        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.696-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.008-.11-.01-.24-.053-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.376.125-.05-.247 1.557-1.71 2.707-2.566 3.45-2.566.382 0 .67.13.862.394.134.195.25.6.343 1.21l.203 1.2c.105.586.24.895.408.925"/>
+        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.695-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.01-.11-.01-.24-.052-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.377.125-.05-.247 1.556-1.71 2.706-2.566 3.45-2.566.38 0 .67.13.86.394.135.195.25.6.344 1.21l.203 1.2c.105.586.24.895.408.925"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.png
index 3c5adc36d1..03493be1bd 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.svg
index f315377a0f..a9c7deff45 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-arab-meem.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-arab-meem">
-        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.696-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.008-.11-.01-.24-.053-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.376.125-.05-.247 1.557-1.71 2.707-2.566 3.45-2.566.382 0 .67.13.862.394.134.195.25.6.343 1.21l.203 1.2c.105.586.24.895.408.925"/>
+        <path id="arab-meem" d="M16 9.73l-.93 2.19h-4.663c-.48 0-.857.12-1.135.366l-.06.11c-.185 2.016-.503 3.558-.956 4.627-.272.64-.633 1.252-1.082 1.833-.177.226-.22.186-.126-.12l.142-.503.17-.67.234-.87.002-.008.202-1.045.258-1.41.353-1.907c.19-.312.42-.638.695-.98.276-.342.59-.706.94-1.09.13-.092.697-.18 1.705-.266 1.05-.086 1.64-.183 1.766-.293l.065-.128c.01-.11-.01-.24-.052-.394-.044-.153-.12-.327-.232-.522-.22-.428-.438-.64-.654-.64-.293 0-.914.268-1.863.805-.36.208-.377.125-.05-.247 1.556-1.71 2.706-2.566 3.45-2.566.38 0 .67.13.86.394.135.195.25.6.344 1.21l.203 1.2c.105.586.24.895.408.925"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.png
index 91497a7f0d..7f6d412158 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.svg
index c75dda053f..fd60619c8c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-armn-sha">
-        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.327 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.582 0-1.136.095-1.662.284-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.215-1.344.323-2.106.323-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.435-.573-.97-.678-1.606-.105-.637-.078-1.364.08-2.184.125-.66.346-1.273.66-1.835.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
+        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.328 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.583 0-1.137.094-1.663.283-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.216-1.344.324-2.106.324-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.436-.573-.97-.678-1.607-.105-.637-.078-1.364.08-2.184.125-.66.346-1.274.66-1.836.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.png
index 15795c552b..b5e55cca85 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.svg
index f0d10d988a..a653a27d20 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-armn-sha.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-armn-sha">
-        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.327 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.582 0-1.136.095-1.662.284-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.215-1.344.323-2.106.323-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.435-.573-.97-.678-1.606-.105-.637-.078-1.364.08-2.184.125-.66.346-1.273.66-1.835.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
+        <path id="armn-sha" d="M11.564 7.678c-.268-.13-.578-.22-.93-.268-.35-.047-.75-.07-1.197-.07h-1.11L8.587 6h1.723c.558 0 1.042.032 1.45.095.416.063.794.173 1.136.33l4.483 2.033-.328 1.67-2.624-1.165c-.126-.058-.27-.103-.433-.134-.164-.04-.356-.06-.576-.06-.583 0-1.137.094-1.663.283-.526.19-1 .46-1.427.812-.42.35-.776.78-1.07 1.283-.294.504-.504 1.074-.63 1.71-.24 1.255-.15 2.21.27 2.87.424.65 1.19.976 2.292.976.55 0 1.045-.08 1.48-.237.437-.157.815-.378 1.136-.66.325-.29.59-.634.795-1.034.21-.4.362-.84.457-1.323l.11-.56h1.6l-.12.59c-.13.674-.356 1.288-.676 1.845-.32.55-.725 1.024-1.214 1.423-.488.395-1.053.7-1.694.923-.643.216-1.344.324-2.106.324-.767 0-1.434-.114-2-.34-.568-.226-1.025-.554-1.372-.985-.347-.436-.573-.97-.678-1.607-.105-.637-.078-1.364.08-2.184.125-.66.346-1.274.66-1.836.316-.568.697-1.067 1.144-1.497.445-.436.944-.794 1.496-1.072.55-.283 1.13-.474 1.733-.574l-.466-.23"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.png
index f7851fac69..a2a2c829ac 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.svg
index 761aea3a72..f2850c42e6 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-c">
-        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.628-1.78-.628-1.368 0-2.475.63-3.32 1.892-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.777 0 1.476-.26 2.1-.785.628-.522 1.08-1.26 1.368-2.216"/>
+        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.63-1.78-.63-1.368 0-2.475.63-3.32 1.893-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.778 0 1.477-.26 2.1-.785.63-.522 1.08-1.26 1.37-2.216"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.png
index 2b8b6e47cc..f46dea5989 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.svg
index 2018e60e61..0a0d1103fc 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-c.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-c">
-        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.628-1.78-.628-1.368 0-2.475.63-3.32 1.892-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.777 0 1.476-.26 2.1-.785.628-.522 1.08-1.26 1.368-2.216"/>
+        <path id="c" d="M15.008 13.718l1.48.214c-.467 1.34-1.15 2.354-2.045 3.04-.896.686-1.9 1.03-3.015 1.03-1.36 0-2.438-.43-3.237-1.29C7.4 15.85 7 14.618 7 13.012c0-2.09.606-3.817 1.817-5.184C9.897 6.61 11.237 6 12.84 6c1.186 0 2.145.33 2.878.99.738.66 1.165 1.546 1.282 2.66l-1.397.135c-.148-.84-.453-1.464-.916-1.876-.458-.42-1.05-.63-1.78-.63-1.368 0-2.475.63-3.32 1.893-.733 1.087-1.1 2.377-1.1 3.87 0 1.194.283 2.104.848 2.732.565.628 1.3.942 2.206.942.778 0 1.477-.26 2.1-.785.63-.522 1.08-1.26 1.37-2.216"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d-invert.svg
index e9ce6db7cc..8ca4218a66 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-d">
-        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.502.063 1.952.188.644.17 1.194.472 1.65.91.456.43.8.97 1.03 1.62.23.65.346 1.378.346 2.186 0 .966-.146 1.847-.436 2.644-.284.79-.66 1.49-1.127 2.095-.46.6-.947 1.072-1.456 1.416-.504.335-1.1.586-1.794.75-.526.126-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.238.41-.098.76-.243 1.05-.434.38-.247.726-.57 1.037-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
+        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.5.063 1.95.188.645.17 1.195.472 1.65.91.457.43.8.97 1.03 1.62.23.65.347 1.378.347 2.186 0 .966-.146 1.847-.436 2.644-.283.79-.66 1.49-1.126 2.095-.46.6-.947 1.072-1.456 1.416-.504.334-1.1.585-1.794.75-.526.125-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.24.41-.097.76-.242 1.05-.433.38-.247.727-.57 1.038-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d.svg
index c044c86039..feadca08aa 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-d.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-d">
-        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.502.063 1.952.188.644.17 1.194.472 1.65.91.456.43.8.97 1.03 1.62.23.65.346 1.378.346 2.186 0 .966-.146 1.847-.436 2.644-.284.79-.66 1.49-1.127 2.095-.46.6-.947 1.072-1.456 1.416-.504.335-1.1.586-1.794.75-.526.126-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.238.41-.098.76-.243 1.05-.434.38-.247.726-.57 1.037-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
+        <path id="d" d="M7 18L9.462 6h3.557c.85 0 1.5.063 1.95.188.645.17 1.195.472 1.65.91.457.43.8.97 1.03 1.62.23.65.347 1.378.347 2.186 0 .966-.146 1.847-.436 2.644-.283.79-.66 1.49-1.126 2.095-.46.6-.947 1.072-1.456 1.416-.504.334-1.1.585-1.794.75-.526.125-1.172.19-1.94.19H7m1.86-1.36h1.866c.842 0 1.59-.08 2.245-.24.41-.097.76-.242 1.05-.433.38-.247.727-.57 1.038-.975.408-.535.732-1.143.974-1.825.247-.687.37-1.467.37-2.34 0-.97-.166-1.716-.5-2.235-.332-.524-.755-.87-1.27-1.04-.38-.126-.974-.188-1.78-.188H11L9.095 16.64"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.png
index c3feced5d1..68e90a92a8 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.svg
index d77fe40c7e..8669961608 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-geor-kan">
-        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.616c-.055.26-.083.497-.083.712 0 .972.52 1.458 1.564 1.458 1.31 0 2.104-.723 2.386-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.547-1.39-1.64-1.39h-1.116l.248-1.26h1.118c1.202-.004 1.908-.55 2.118-1.64.04-.18.058-.355.058-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
+        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.617c-.055.26-.083.497-.083.712 0 .97.52 1.457 1.564 1.457 1.31 0 2.105-.723 2.387-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.546-1.39-1.64-1.39h-1.115l.248-1.26h1.118c1.203-.004 1.91-.55 2.12-1.64.04-.18.057-.355.057-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.png
index 7f2512e4fe..7f9da2ac1e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.svg
index 867f458123..65670ef4ab 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-geor-kan.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-geor-kan">
-        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.616c-.055.26-.083.497-.083.712 0 .972.52 1.458 1.564 1.458 1.31 0 2.104-.723 2.386-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.547-1.39-1.64-1.39h-1.116l.248-1.26h1.118c1.202-.004 1.908-.55 2.118-1.64.04-.18.058-.355.058-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
+        <path id="geor-kan" d="M15.057 14.663C14.617 16.888 13.223 18 10.88 18 8.96 18 8 17.213 8 15.64c0-.298.036-.624.108-.977.083-.43.245-.836.488-1.217l1.24.605-.206.617c-.055.26-.083.497-.083.712 0 .97.52 1.457 1.564 1.457 1.31 0 2.105-.723 2.387-2.17l.058-.33c.044-.222.066-.426.066-.614 0-.927-.546-1.39-1.64-1.39h-1.115l.248-1.26h1.118c1.203-.004 1.91-.55 2.12-1.64.04-.18.057-.355.057-.52 0-1.144-.9-1.715-2.697-1.715L11.94 6C14.646 6 16 6.877 16 8.627c0 .248-.027.516-.082.803-.204 1.092-1.05 1.824-2.54 2.194l-.033.166c1.23.2 1.845.823 1.845 1.872 0 .21-.025.433-.074.67l-.058.332"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.png
index eb3dc91a82..954bfbf794 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.svg
index ef5a411a19..9515299a8a 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="italic-s">
-        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.655.302.86.207.193.733.405 1.58.632l.937.232c1.06.274 1.795.622 2.208 1.046.413.42.62 1.008.62 1.767 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.302-1.867-.55l.315-1.61c.573.355 1.147.624 1.72.805.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.884-1 .884-1.697 0-.464-.12-.815-.356-1.053-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.044-1.108 3.464-1.108.553 0 1.1.05 1.642.147.542.098 1.085.245 1.627.442"/>
+        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.654.302.86.207.192.733.404 1.58.63l.937.233c1.06.274 1.795.622 2.208 1.046.413.42.62 1.007.62 1.766 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.3-1.867-.55l.314-1.61c.573.356 1.147.625 1.72.806.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.883-1 .883-1.697 0-.465-.12-.816-.356-1.054-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.043-1.108 3.463-1.108.553 0 1.1.05 1.642.147.542.1 1.085.246 1.627.443"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.png
index c3b1e6e5c8..4a7b1fc29d 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.svg
index 1c5a4cab2a..615e5f2244 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/italic-s.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="italic-s">
-        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.655.302.86.207.193.733.405 1.58.632l.937.232c1.06.274 1.795.622 2.208 1.046.413.42.62 1.008.62 1.767 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.302-1.867-.55l.315-1.61c.573.355 1.147.624 1.72.805.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.884-1 .884-1.697 0-.464-.12-.815-.356-1.053-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.044-1.108 3.464-1.108.553 0 1.1.05 1.642.147.542.098 1.085.245 1.627.442"/>
+        <path id="s" d="M16.474 6.59l-.302 1.525c-.522-.28-1.04-.488-1.557-.628-.51-.145-1.007-.217-1.487-.217-.935 0-1.68.204-2.23.612-.554.408-.83.95-.83 1.627 0 .37.1.654.302.86.207.192.733.404 1.58.63l.937.233c1.06.274 1.795.622 2.208 1.046.413.42.62 1.007.62 1.766 0 1.167-.46 2.117-1.38 2.85-.913.734-2.12 1.1-3.617 1.1-.615 0-1.232-.06-1.852-.185-.62-.12-1.242-.3-1.867-.55l.314-1.61c.573.356 1.147.625 1.72.806.578.18 1.154.27 1.728.27.976 0 1.76-.216 2.347-.65.59-.434.883-1 .883-1.697 0-.465-.12-.816-.356-1.054-.233-.243-.737-.462-1.512-.658l-.937-.24c-1.07-.28-1.8-.6-2.19-.964-.39-.367-.584-.878-.584-1.534 0-1.152.442-2.094 1.325-2.828.89-.74 2.043-1.108 3.463-1.108.553 0 1.1.05 1.642.147.542.1 1.085.246 1.627.443"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.png
index 81930e310c..ad816df8ad 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.svg
index d857a04e2f..abc618e844 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="language">
-        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.968-.15 1.648-.333 2.04-.545.454-.21.785-.48.998-.813.21-.303.314-.663.314-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.042.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.144.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.585-.514.03-.92.045-1.222.045-.393 0-.71-.016-.95-.046l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.738.228-1.766l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.572-.09.633-.09s.647-.15 1.765-.453l.046 1.04c-.966.243-2.144.44-3.53.59-.063.663-.093 1.086-.093 1.266.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.133-1.252-.224-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.195.137.316.137.364 0 .908-.364 1.63-1.09zm.774-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
+        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.97-.15 1.65-.333 2.04-.545.455-.21.786-.48 1-.813.21-.303.313-.663.313-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.043.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.143.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.584-.514.03-.92.045-1.222.045-.393 0-.71-.015-.95-.045l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.74.228-1.767l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.573-.09.634-.09s.647-.15 1.765-.453l.045 1.04c-.966.242-2.144.44-3.53.59-.063.662-.093 1.085-.093 1.265.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.132-1.252-.223-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.194.137.315.137.364 0 .908-.365 1.63-1.09zm.775-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
         <path id="english" d="M9.497 15.98h1.85L8.265 7.033h-1.85l-3.08 8.95h1.85L5.74 14h3.21l.547 1.98zm-3.49-3.376L7.34 8.822l1.343 3.782H6.008z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.png
index cae0e774d4..b4f0875ed2 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.svg
index 694d225296..956aba1f05 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/language.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="language">
-        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.968-.15 1.648-.333 2.04-.545.454-.21.785-.48.998-.813.21-.303.314-.663.314-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.042.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.144.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.585-.514.03-.92.045-1.222.045-.393 0-.71-.016-.95-.046l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.738.228-1.766l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.572-.09.633-.09s.647-.15 1.765-.453l.046 1.04c-.966.243-2.144.44-3.53.59-.063.663-.093 1.086-.093 1.266.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.133-1.252-.224-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.195.137.316.137.364 0 .908-.364 1.63-1.09zm.774-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
+        <path id="japanese" d="M17.533 9.81l.27-.59 1.042.407-.18.363c.66.27 1.1.468 1.312.59.33.21.618.513.86.904.21.393.316.846.316 1.358 0 .786-.302 1.48-.905 2.083-.604.634-1.66 1.057-3.17 1.268-.12-.36-.257-.68-.407-.95.97-.15 1.65-.333 2.04-.545.455-.21.786-.48 1-.813.21-.303.313-.663.313-1.087 0-.482-.135-.905-.406-1.27-.33-.33-.8-.588-1.402-.77-.332.635-.648 1.118-.95 1.45-.242.332-.694.906-1.358 1.72.09.394.18.71.272.952l-1.043.362-.09-.498c-.424.36-.802.617-1.134.77-.36.15-.664.226-.905.226-.303 0-.574-.136-.814-.407-.243-.3-.362-.68-.362-1.132 0-.6.137-1.143.408-1.63.24-.45.603-.89 1.086-1.31.273-.24.726-.53 1.36-.86 0-.27.03-.8.09-1.584-.514.03-.92.045-1.222.045-.393 0-.71-.015-.95-.045l-.047-1.04c.726.09 1.495.134 2.31.134 0-.15.076-.74.228-1.767l1.177.184c-.15.542-.256 1.04-.316 1.493.24-.03.542-.077.905-.138.36-.06.573-.09.634-.09s.647-.15 1.765-.453l.045 1.04c-.966.242-2.144.44-3.53.59-.063.662-.093 1.085-.093 1.265.664-.15 1.285-.225 1.858-.225zm-2.672 3.893c-.06-.48-.132-1.252-.223-2.31-.573.424-1.04.86-1.403 1.313-.302.423-.45.875-.45 1.358 0 .24.043.438.135.588.09.092.194.137.315.137.364 0 .908-.365 1.63-1.09zm.775-2.763c0 .483.03 1.088.09 1.81.604-.904 1.057-1.598 1.36-2.08-.575.06-1.06.15-1.45.27z"/>
         <path id="english" d="M9.497 15.98h1.85L8.265 7.033h-1.85l-3.08 8.95h1.85L5.74 14h3.21l.547 1.98zm-3.49-3.376L7.34 8.822l1.343 3.782H6.008z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg
index 99d6f0170c..166ce4769e 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-ltr.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g>
         <path d="M20.8 20h-8.1v-.8c.4 0 .8-.1 1.3-.2s.8-.2.8-.4v-.2c0-.1 0-.2-.1-.3L13.4 15H8.3c-.1.3-.2.6-.4 1-.1.4-.3.7-.4 1-.1.4-.2.7-.2.8v.4c0 .2.2.4.5.6.3.2.9.3 1.7.3v.9H3.4v-.8c.2 0 .5-.1.8-.1.3-.1.5-.1.7-.2.3-.2.5-.4.7-.6.2-.3.4-.6.5-.9.8-2 1.6-3.9 2.4-5.9.8-2 1.7-4.1 2.7-6.5h2.1c1.4 3.3 2.4 6 3.2 7.9.8 1.9 1.4 3.6 2 4.8l.3.6c.1.2.3.3.6.5.2.1.4.2.7.3.3.1.5.1.7.1v.8zM13 14l-2.1-5.3L8.8 14H13z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg
index 99d6f0170c..166ce4769e 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/largerText-rtl.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g>
         <path d="M20.8 20h-8.1v-.8c.4 0 .8-.1 1.3-.2s.8-.2.8-.4v-.2c0-.1 0-.2-.1-.3L13.4 15H8.3c-.1.3-.2.6-.4 1-.1.4-.3.7-.4 1-.1.4-.2.7-.2.8v.4c0 .2.2.4.5.6.3.2.9.3 1.7.3v.9H3.4v-.8c.2 0 .5-.1.8-.1.3-.1.5-.1.7-.2.3-.2.5-.4.7-.6.2-.3.4-.6.5-.9.8-2 1.6-3.9 2.4-5.9.8-2 1.7-4.1 2.7-6.5h2.1c1.4 3.3 2.4 6 3.2 7.9.8 1.9 1.4 3.6 2 4.8l.3.6c.1.2.3.3.6.5.2.1.4.2.7.3.3.1.5.1.7.1v.8zM13 14l-2.1-5.3L8.8 14H13z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.png
index ed0006cb1f..ca5beaf32e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.svg
index 7b545cadda..9cf9d286ad 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
-    <g>
-        <path d="M-471.2 493.6c-2.1 0-3.6 1.9-5.1 3.3.2 0 .5-.1.8-.1.5 0 1 .1 1.5.3.8-.8 1.6-1.7 2.8-1.7.6 0 1.3.3 1.8.7 1 1 1 2.6 0 3.6l-2.6 2.6c-.4.4-1.2.7-1.8.7-1.4 0-2.1-.9-2.6-2l-1.3 1.3c.8 1.5 2 2.6 3.8 2.6 1.2 0 2.3-.5 3-1.3l2.6-2.6c.9-.9 1.5-2 1.5-3.3-.2-2.2-2.2-4.1-4.4-4.1zm-4.3 12.1l-.9.9c-.4.4-1.2.7-1.8.7-.6 0-1.3-.3-1.8-.7-1-1-1-2.7 0-3.6l2.6-2.6c.4-.4 1.2-.7 1.8-.7 1.4 0 2.1 1 2.6 2l1.3-1.3c-.8-1.5-2-2.6-3.8-2.6-1.2 0-2.3.5-3 1.3l-2.6 2.6c-1.7 1.7-1.7 4.4 0 6 1.6 1.6 4.4 1.7 5.9 0l1.9-1.9c-.3.1-.6.1-.9.1-.5 0-.9 0-1.3-.2z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+    <g id="g3097">
+        <path d="M15.387 4.33c-2.1 0-3.6 1.9-5.1 3.3.2 0 .5-.1.8-.1.5 0 1 .1 1.5.3.8-.8 1.6-1.7 2.8-1.7.6 0 1.3.3 1.8.7 1 1 1 2.6 0 3.6l-2.6 2.6c-.4.4-1.2.7-1.8.7-1.4 0-2.1-.9-2.6-2l-1.3 1.3c.8 1.5 2 2.6 3.8 2.6 1.2 0 2.3-.5 3-1.3l2.6-2.6c.9-.9 1.5-2 1.5-3.3-.2-2.2-2.2-4.1-4.4-4.1zm-4.3 12.1l-.9.9c-.4.4-1.2.7-1.8.7-.6 0-1.3-.3-1.8-.7-1-1-1-2.7 0-3.6l2.6-2.6c.4-.4 1.2-.7 1.8-.7 1.4 0 2.1 1 2.6 2l1.3-1.3c-.8-1.5-2-2.6-3.8-2.6-1.2 0-2.3.5-3 1.3l-2.6 2.6c-1.7 1.7-1.7 4.4 0 6 1.6 1.6 4.4 1.7 5.9 0l1.9-1.9c-.3.1-.6.1-.9.1-.5 0-.9 0-1.3-.2z" id="path3099"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.png
index 3db2467441..25980e6066 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.svg
index 0d3c186c88..dd3df73a73 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/link-ltr.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
-    <g>
-        <path d="M-471.2 493.6c-2.1 0-3.6 1.9-5.1 3.3.2 0 .5-.1.8-.1.5 0 1 .1 1.5.3.8-.8 1.6-1.7 2.8-1.7.6 0 1.3.3 1.8.7 1 1 1 2.6 0 3.6l-2.6 2.6c-.4.4-1.2.7-1.8.7-1.4 0-2.1-.9-2.6-2l-1.3 1.3c.8 1.5 2 2.6 3.8 2.6 1.2 0 2.3-.5 3-1.3l2.6-2.6c.9-.9 1.5-2 1.5-3.3-.2-2.2-2.2-4.1-4.4-4.1zm-4.3 12.1l-.9.9c-.4.4-1.2.7-1.8.7-.6 0-1.3-.3-1.8-.7-1-1-1-2.7 0-3.6l2.6-2.6c.4-.4 1.2-.7 1.8-.7 1.4 0 2.1 1 2.6 2l1.3-1.3c-.8-1.5-2-2.6-3.8-2.6-1.2 0-2.3.5-3 1.3l-2.6 2.6c-1.7 1.7-1.7 4.4 0 6 1.6 1.6 4.4 1.7 5.9 0l1.9-1.9c-.3.1-.6.1-.9.1-.5 0-.9 0-1.3-.2z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="g3097">
+        <path d="M15.387 4.33c-2.1 0-3.6 1.9-5.1 3.3.2 0 .5-.1.8-.1.5 0 1 .1 1.5.3.8-.8 1.6-1.7 2.8-1.7.6 0 1.3.3 1.8.7 1 1 1 2.6 0 3.6l-2.6 2.6c-.4.4-1.2.7-1.8.7-1.4 0-2.1-.9-2.6-2l-1.3 1.3c.8 1.5 2 2.6 3.8 2.6 1.2 0 2.3-.5 3-1.3l2.6-2.6c.9-.9 1.5-2 1.5-3.3-.2-2.2-2.2-4.1-4.4-4.1zm-4.3 12.1l-.9.9c-.4.4-1.2.7-1.8.7-.6 0-1.3-.3-1.8-.7-1-1-1-2.7 0-3.6l2.6-2.6c.4-.4 1.2-.7 1.8-.7 1.4 0 2.1 1 2.6 2l1.3-1.3c-.8-1.5-2-2.6-3.8-2.6-1.2 0-2.3.5-3 1.3l-2.6 2.6c-1.7 1.7-1.7 4.4 0 6 1.6 1.6 4.4 1.7 5.9 0l1.9-1.9c-.3.1-.6.1-.9.1-.5 0-.9 0-1.3-.2z" id="path3099"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png
index 0246e4d397..72bbf3478e 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg
index 59885e9065..3bda245079 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="menu">
-        <path id="lines" d="M-481 505h12c.6 0 1 .4 1 1v1c0 .6-.4 1-1 1h-12c-.6 0-1-.4-1-1v-1c0-.6.4-1 1-1zm-1-4v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-12c-.6 0-1 .4-1 1zm0-5v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-12c-.6 0-1 .4-1 1z"/>
+        <path id="lines" d="M6 15.5h12c.6 0 1 .4 1 1v1c0 .6-.4 1-1 1H6c-.6 0-1-.4-1-1v-1c0-.6.4-1 1-1zm-1-4v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1H6c-.6 0-1 .4-1 1zm0-5v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1H6c-.6 0-1 .4-1 1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png
index de7b1d2459..45daeab428 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg
index 9ef19fe414..b84ab8662b 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/menu.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="menu">
-        <path id="lines" d="M-481 505h12c.6 0 1 .4 1 1v1c0 .6-.4 1-1 1h-12c-.6 0-1-.4-1-1v-1c0-.6.4-1 1-1zm-1-4v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-12c-.6 0-1 .4-1 1zm0-5v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1h-12c-.6 0-1 .4-1 1z"/>
+        <path id="lines" d="M6 15.5h12c.6 0 1 .4 1 1v1c0 .6-.4 1-1 1H6c-.6 0-1-.4-1-1v-1c0-.6.4-1 1-1zm-1-4v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1H6c-.6 0-1 .4-1 1zm0-5v1c0 .6.4 1 1 1h12c.6 0 1-.4 1-1v-1c0-.6-.4-1-1-1H6c-.6 0-1 .4-1 1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg
index 55e5ac7569..45b005020c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/moon.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <path d="M19.1 17.5c-3.3 1.4-7.1-.2-8.5-3.5-1.4-3.3.2-7.1 3.5-8.5.2-.1.5-.2.7-.3-1.6-.4-3.2-.3-4.8.4C6 7.3 4 12 5.7 16c1.7 4.1 6.4 6 10.5 4.3 1.7-.7 3-1.9 3.8-3.4-.3.3-.6.4-.9.6z"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl-invert.svg
index 8ca43a3967..9c859e4ef1 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="move-rtl">
-        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.716L13.65 19.2z"/>
+        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.717L13.65 19.2z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl.svg
index 48d2c7e1bb..35b637513b 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/move-rtl.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="move-rtl">
-        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.716L13.65 19.2z"/>
+        <path id="arrow" d="M15.065 17.786l-5.302-5.303 5.302-5.302-1.415-1.41-6.714 6.717L13.65 19.2z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg
index 04139daadf..dedbc2d60c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notBright.svg
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <path d="M12 5c-4.4 0-8 3.6-8 8s3.6 8 8 8 8-3.6 8-8-3.6-8-8-8z"/>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice-invert.svg
index 48273f4fd8..386ccc254a 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice-invert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" id="svg3116"><style>* { fill: #FFFFFF }</style>
     <g id="alert">
         <path d="M12 18c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zm-1-5h2V8h-2zm0 3h2v-2h-2z" id="path3119"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice.svg
index b7fb2e7795..9334b50e45 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/notice.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" id="svg3116">
     <g id="alert">
         <path d="M12 18c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zm-1-5h2V8h-2zm0 3h2v-2h-2z" id="path3119"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.png
index dbde6edd29..472bb4f70c 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.svg
index e5146721ff..9304bdb461 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
-    <g>
-        <path d="M-468.9 498.1c.2-.1.5-.2.6-.5s.2-.5.2-.9v-.7c-1 .2-1.5.2-2.6.6-.7.4-1.2.9-1.7 1.4-.5.5-1.9 2.6-1.9 5.8v3.1h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.1zm-11.2-.1c-.5.5-1.9 2.9-1.9 6v2.9h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.2.2-.1.5-.2.6-.5s.2-.5.2-.9v-.6c-1 .2-1.5.2-2.6.6-.6.4-1.2.9-1.7 1.4z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
+    <g id="g3226">
+        <path d="M18.1 8.65c.2-.1.5-.2.6-.5.1-.3.2-.5.2-.9v-.7c-1 .2-1.5.2-2.6.6-.7.4-1.2.9-1.7 1.4-.5.5-1.9 2.6-1.9 5.8v3.1h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.1zm-11.2-.1c-.5.5-1.9 2.9-1.9 6v2.9h4.7c.9 0 1.6-.7 1.6-1.6v-4.7H8.2s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.2.2-.1.5-.2.6-.5.1-.3.2-.5.2-.9v-.6c-1 .2-1.5.2-2.6.6-.6.4-1.2.9-1.7 1.4z" id="path3228"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png
index 5f143221fc..72c7e3ddcf 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg
index c2925ca630..4885f432c6 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-ltr.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
-    <g>
-        <path d="M-468.9 498.1c.2-.1.5-.2.6-.5s.2-.5.2-.9v-.7c-1 .2-1.5.2-2.6.6-.7.4-1.2.9-1.7 1.4-.5.5-1.9 2.6-1.9 5.8v3.1h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.1zm-11.2-.1c-.5.5-1.9 2.9-1.9 6v2.9h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.2.2-.1.5-.2.6-.5s.2-.5.2-.9v-.6c-1 .2-1.5.2-2.6.6-.6.4-1.2.9-1.7 1.4z"/>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+    <g id="g3226">
+        <path d="M18.1 8.65c.2-.1.5-.2.6-.5.1-.3.2-.5.2-.9v-.7c-1 .2-1.5.2-2.6.6-.7.4-1.2.9-1.7 1.4-.5.5-1.9 2.6-1.9 5.8v3.1h4.7c.9 0 1.6-.7 1.6-1.6v-4.7h-3.1s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.1zm-11.2-.1c-.5.5-1.9 2.9-1.9 6v2.9h4.7c.9 0 1.6-.7 1.6-1.6v-4.7H8.2s.1-.7.6-1.4c.5-.5 1-.9 1.6-1.2.2-.1.5-.2.6-.5.1-.3.2-.5.2-.9v-.6c-1 .2-1.5.2-2.6.6-.6.4-1.2.9-1.7 1.4z" id="path3228"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.png
index 0b7d107fa7..47fd687da7 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.svg
index be46adf6ac..f5dcce50bf 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g>
-        <path d="M-479.5 499.3c.5.7.6 1.4.6 1.4h-3.1v4.7c0 .9.7 1.6 1.6 1.6h4.7v-3.1c0-3.1-1.5-5.2-1.9-5.8-.5-.5-1-1-1.7-1.4-1.1-.5-1.6-.5-2.6-.6v.8c0 .3.1.6.2.9s.4.4.6.5c.6 0 1.1.4 1.6 1zm7.8-2.7c-1.1-.5-1.6-.5-2.6-.6v.8c0 .3.1.6.2.9s.4.4.6.5c.6.2 1.2.6 1.6 1.2.5.7.6 1.4.6 1.4h-3.1v4.7c0 .9.7 1.6 1.6 1.6h4.7V504c0-3.1-1.5-5.4-1.9-6-.4-.5-1-1-1.7-1.4z"/>
+        <path d="M5.9 8.65c-.2-.1-.5-.2-.6-.5-.1-.3-.2-.5-.2-.9v-.7c1 .2 1.5.2 2.6.6.7.4 1.2.9 1.7 1.4.5.5 1.9 2.6 1.9 5.8v3.1H6.6c-.9 0-1.6-.7-1.6-1.6v-4.7h3.1s-.1-.7-.6-1.4c-.5-.5-1-.9-1.6-1.1zm11.2-.1c.5.5 1.9 2.9 1.9 6v2.9h-4.7c-.9 0-1.6-.7-1.6-1.6v-4.7h3.1s-.1-.7-.6-1.4c-.5-.5-1-.9-1.6-1.2-.2-.1-.5-.2-.6-.5-.1-.3-.2-.5-.2-.9v-.6c1 .2 1.5.2 2.6.6.6.4 1.2.9 1.7 1.4z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png
index e5039fc5dc..2b4c8d77b4 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg
index dd7bfb1f6a..91fe300d88 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/quotes-rtl.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-487 489 24 24">
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g>
-        <path d="M-479.5 499.3c.5.7.6 1.4.6 1.4h-3.1v4.7c0 .9.7 1.6 1.6 1.6h4.7v-3.1c0-3.1-1.5-5.2-1.9-5.8-.5-.5-1-1-1.7-1.4-1.1-.5-1.6-.5-2.6-.6v.8c0 .3.1.6.2.9s.4.4.6.5c.6 0 1.1.4 1.6 1zm7.8-2.7c-1.1-.5-1.6-.5-2.6-.6v.8c0 .3.1.6.2.9s.4.4.6.5c.6.2 1.2.6 1.6 1.2.5.7.6 1.4.6 1.4h-3.1v4.7c0 .9.7 1.6 1.6 1.6h4.7V504c0-3.1-1.5-5.4-1.9-6-.4-.5-1-1-1.7-1.4z"/>
+        <path d="M5.9 8.65c-.2-.1-.5-.2-.6-.5-.1-.3-.2-.5-.2-.9v-.7c1 .2 1.5.2 2.6.6.7.4 1.2.9 1.7 1.4.5.5 1.9 2.6 1.9 5.8v3.1H6.6c-.9 0-1.6-.7-1.6-1.6v-4.7h3.1s-.1-.7-.6-1.4c-.5-.5-1-.9-1.6-1.1zm11.2-.1c.5.5 1.9 2.9 1.9 6v2.9h-4.7c-.9 0-1.6-.7-1.6-1.6v-4.7h3.1s-.1-.7-.6-1.4c-.5-.5-1-.9-1.6-1.2-.2-.1-.5-.2-.6-.5-.1-.3-.2-.5-.2-.9v-.6c1 .2 1.5.2 2.6.6.6.4 1.2.9 1.7 1.4z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.png
index 0d34e60b2c..21b4d79368 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.svg
index e7889c369d..5d2ff7756e 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression-invert.svg
@@ -3,7 +3,7 @@
     <g id="regular-expression">
         <path id="left-bracket" d="M3 12.045c0-.99.15-1.915.45-2.777.306-.862.743-1.618 1.314-2.268H6.23c-.552.72-.968 1.512-1.25 2.374-.28.862-.42 1.75-.42 2.66 0 .915.142 1.8.427 2.654.29.85.7 1.622 1.23 2.312h-1.45c-.575-.635-1.013-1.376-1.314-2.223-.3-.847-.45-1.758-.45-2.732"/>
         <path id="dot" d="M10 16c0 .552-.448 1-1 1s-1-.448-1-1 .448-1 1-1 1 .448 1 1z"/>
-        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.475-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.383-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.157h1.534"/>
-        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.844-.737 1.582-1.307 2.21h-1.453c.527-.688.936-1.457 1.225-2.308.29-.855.434-1.74.434-2.66 0-.91-.14-1.797-.422-2.66-.28-.862-.697-1.654-1.248-2.374h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
+        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.474-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.382-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.158h1.534"/>
+        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.843-.737 1.58-1.307 2.21h-1.453c.527-.69.936-1.458 1.225-2.31.29-.854.434-1.74.434-2.66 0-.91-.14-1.796-.422-2.66-.28-.86-.697-1.653-1.248-2.373h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.png
index b8736a0aca..00ace1923a 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.svg
index 5f10d4da20..844013d339 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/regular-expression.svg
@@ -3,7 +3,7 @@
     <g id="regular-expression">
         <path id="left-bracket" d="M3 12.045c0-.99.15-1.915.45-2.777.306-.862.743-1.618 1.314-2.268H6.23c-.552.72-.968 1.512-1.25 2.374-.28.862-.42 1.75-.42 2.66 0 .915.142 1.8.427 2.654.29.85.7 1.622 1.23 2.312h-1.45c-.575-.635-1.013-1.376-1.314-2.223-.3-.847-.45-1.758-.45-2.732"/>
         <path id="dot" d="M10 16c0 .552-.448 1-1 1s-1-.448-1-1 .448-1 1-1 1 .448 1 1z"/>
-        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.475-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.383-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.157h1.534"/>
-        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.844-.737 1.582-1.307 2.21h-1.453c.527-.688.936-1.457 1.225-2.308.29-.855.434-1.74.434-2.66 0-.91-.14-1.797-.422-2.66-.28-.862-.697-1.654-1.248-2.374h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
+        <path id="star" d="M14.25 7.013l-.24 2.156 2.187-.61.193 1.474-1.992.14 1.307 1.74-1.33.71-.914-1.834-.8 1.823-1.382-.697 1.295-1.74-1.98-.152.23-1.465 2.14.61-.24-2.158h1.534"/>
+        <path id="right-bracket" d="M21 12.045c0 .982-.152 1.896-.457 2.744-.3.843-.737 1.58-1.307 2.21h-1.453c.527-.69.936-1.458 1.225-2.31.29-.854.434-1.74.434-2.66 0-.91-.14-1.796-.422-2.66-.28-.86-.697-1.653-1.248-2.373h1.465c.574.652 1.012 1.412 1.313 2.28.3.86.45 1.782.45 2.764"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link-invert.svg
index ce6f7b21c2..8660556dd4 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="secure">
-        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.485-.485 1.45-.487 1.935-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
+        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.486-.485 1.45-.487 1.936-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link.svg
index 6eefe90a91..e064672f00 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/secure-link.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="secure">
-        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.485-.485 1.45-.487 1.935-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
+        <path id="lock" d="M8 5h.02v-.997c0-.057.003-1.41-.833-2.255-.434-.438-.998-.66-1.68-.66s-1.244.222-1.677.66c-.837.846-.833 2.198-.832 2.25V5H3c-.553 0-1 .447-1 1v3c0 .553.447 1 1 1h5c.553 0 1-.447 1-1V6c0-.553-.447-1-1-1zM3.998 5V3.993c0-.01.005-1 .543-1.543.486-.485 1.45-.487 1.936-.002.544.546.546 1.536.546 1.55V5H3.998z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg
index fb025f3eaa..b3d2e9448c 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-ltr.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g>
         <path d="M17.6 20h-5.4v-.5c.2 0 .5-.1.9-.1.3-.1.5-.2.5-.3V19s0-.1-.1-.2l-.8-2H9.3c-.1.2-.2.4-.3.7-.1.3-.2.5-.2.7-.1.3-.1.4-.2.6v.2c0 .1.1.3.3.4.2.1.6.2 1.1.2v.4H6v-.5c.2 0 .3 0 .5-.1.2 0 .3-.1.5-.2s.4-.2.5-.4l.3-.6c.5-1.3 1.1-2.6 1.6-3.9.5-1.3 1.1-2.7 1.8-4.3h1.4c.9 2.2 1.6 4 2.1 5.3.5 1.3 1 2.4 1.3 3.2.1.1.1.3.2.4.1.1.2.2.4.3.1.1.3.1.5.2s.3.1.5.1v.5zm-5.2-4L11 12.4 9.6 16h2.8z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg
index bd995db670..34d46bcef8 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/smallerText-rtl.svg
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
+<svg id="Layer_1" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g>
         <path d="M6 19.5c.1 0 .3 0 .5-.1s.3-.1.5-.2.3-.2.4-.3c.1-.1.2-.2.2-.4.4-.9.8-1.9 1.3-3.2.5-1.3 1.2-3.1 2.1-5.3h1.4c.7 1.6 1.2 3 1.8 4.3.5 1.3 1.1 2.6 1.6 3.9l.3.6c.1.2.3.3.5.4.1.1.3.1.5.2.2 0 .4.1.5.1v.5h-4v-.5c.5 0 .9-.1 1.1-.2.2-.1.3-.2.3-.4v-.2c0-.1-.1-.3-.2-.6-.1-.2-.2-.4-.2-.7-.1-.3-.2-.5-.3-.7h-3.4l-.8 2c0 .1-.1.1-.1.2v.1c0 .1.2.2.5.3.3.1.6.1.9.1v.6H6v-.5zm8-3.5l-1.4-3.6-1.4 3.6H14z"/>
     </g>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.png
index 10e7967e04..008efd0421 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.svg
index fbba082b19..5f3d9147bb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="special-character">
-        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.125.513-.19 1.08-.19 1.7 0 .512.06 1 .175 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.602.044.75.035.457.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.895.92 1.157 1.54.27.614.403 1.33.403 2.15 0 .65-.108 1.242-.32 1.78-.216.53-.515.996-.9 1.397-.38.4-.83.732-1.356.99-.525.255-.707.43-1.336.523l-.092.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.038c1.066-.11 1.337-.696 2.002-1.363.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.066-1.186-.194-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
+        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.124.513-.19 1.08-.19 1.7 0 .512.06 1 .176 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.6.044.75.035.458.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.896.92 1.158 1.54.27.614.403 1.33.403 2.15 0 .65-.107 1.242-.32 1.78-.215.53-.514.996-.9 1.397-.38.4-.83.732-1.355.99-.525.255-.707.43-1.336.523l-.093.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.04c1.066-.11 1.337-.695 2.002-1.362.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.067-1.186-.195-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.png b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.png
index e632f8a694..7f658819ed 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.png and b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.svg
index bb81880d2e..dbf6ed5a95 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/specialCharacter.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="special-character">
-        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.125.513-.19 1.08-.19 1.7 0 .512.06 1 .175 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.602.044.75.035.457.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.895.92 1.157 1.54.27.614.403 1.33.403 2.15 0 .65-.108 1.242-.32 1.78-.216.53-.515.996-.9 1.397-.38.4-.83.732-1.356.99-.525.255-.707.43-1.336.523l-.092.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.038c1.066-.11 1.337-.696 2.002-1.363.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.066-1.186-.194-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
+        <path id="omega" d="M12 6.708c-.794 0-1.368.103-1.894.31-.525.207-.944.496-1.255.867-.31.366-.53.808-.66 1.327-.124.513-.19 1.08-.19 1.7 0 .512.06 1 .176 1.46.122.46.31.87.568 1.23.63.862 1.156 1.138 2.012 1.362L11 18H6v-3h.604l.53 1.353.395.053.6.044.75.035.458.01H10l-.09-.895c-.63-.094-.812-.268-1.337-.522-.525-.26-.98-.59-1.365-.99-.38-.402-.675-.868-.89-1.4-.213-.536-.32-1.13-.32-1.778 0-.82.13-1.537.394-2.15.27-.62.656-1.133 1.163-1.54.507-.407 1.133-.71 1.878-.912.745-.206 1.6-.31 2.565-.31.96 0 1.81.103 2.556.31.75.2 1.38.504 1.887.912.51.407.896.92 1.158 1.54.27.614.403 1.33.403 2.15 0 .65-.107 1.242-.32 1.78-.215.53-.514.996-.9 1.397-.38.4-.83.732-1.355.99-.525.255-.707.43-1.336.523l-.093.894h.66l.447-.01.75-.034.606-.044.4-.053.533-1.354H18v3h-5l.246-3.04c1.066-.11 1.337-.695 2.002-1.362.263-.36.452-.77.568-1.23.122-.46.183-.947.183-1.46 0-.62-.067-1.186-.195-1.7-.128-.52-.348-.96-.66-1.326-.31-.372-.73-.66-1.255-.867-.524-.206-1.1-.31-1.893-.31"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s-invert.svg
index b707280db7..fd1c16d3b7 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s-invert.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="strikethrough-s">
         <path id="strikethrough" d="M6 12h12v1H6v-1z"/>
-        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.474 0-.966-.074-1.466-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.156.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.716-.148-1.204-.352-1.406-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
+        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.473 0-.965-.074-1.465-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.155.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.715-.148-1.203-.352-1.405-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s.svg
index 71fa9600e5..46092a6b23 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/strikethrough-s.svg
@@ -2,6 +2,6 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="strikethrough-s">
         <path id="strikethrough" d="M6 12h12v1H6v-1z"/>
-        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.474 0-.966-.074-1.466-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.156.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.716-.148-1.204-.352-1.406-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
+        <path id="s" d="M12.094 6c-1.133 0-2.076.287-2.75.9-.67.613-1 1.49-1 2.52 0 .89.22 1.602.72 2.13.497.528 1.278.91 2.31 1.14l.813.182v-.03c.656.147 1.128.375 1.375.63.252.256.375.607.375 1.11 0 .573-.172.97-.53 1.26-.36.29-.895.45-1.626.45-.473 0-.965-.074-1.465-.24-.502-.166-1.03-.417-1.562-.75l-.374-.238v2.158l.155.062c.58.237 1.144.417 1.69.54.548.12 1.07.18 1.56.18 1.287 0 2.298-.293 3-.9.71-.605 1.063-1.486 1.063-2.608 0-.943-.256-1.726-.78-2.312-.522-.592-1.306-1-2.345-1.23l-.812-.18c-.715-.148-1.203-.352-1.405-.54-.205-.202-.312-.484-.312-.934 0-.533.162-.9.5-1.17.342-.27.836-.42 1.53-.42.396 0 .82.052 1.25.18.434.128.91.334 1.407.6l.374.18V6.63s-1.188-.383-1.688-.48c-.5-.097-.984-.15-1.468-.15z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg
index b79e14cb70..aab025e573 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-constructive.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #00AF89 }</style>
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg
index 61848c7543..1fe8f5a6ac 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-destructive.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #D11D13 }</style>
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-invert.svg
index 71e05f195f..394e4319a5 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg
index d4b70329d5..0f140c3df9 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-progressive.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #347BFF }</style>
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg
index 36e56b275e..ed26598183 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag-warning.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FF5D00 }</style>
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag.svg
index 71671c09f6..5265e04b76 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/tag.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="tag">
-        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.386-.707-1.154-.707-1.704V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.574 1.515.574 2.094 0 .576-.58.576-1.52 0-2.097-.58-.576-1.518-.577-2.094 0z"/>
+        <path d="M18.748 11.717c.39.39.39 1.025 0 1.414l-4.95 4.95c-.388.39-1.024.39-1.413 0l-6.01-6.01c-.39-.385-.707-1.153-.707-1.703V6c0-.55.45-1 1-1h4.363c.55 0 1.32.318 1.71.707l6.01 6.01zM8.104 7.457c-.58.575-.578 1.513 0 2.092.577.573 1.515.573 2.094 0 .576-.58.576-1.52 0-2.098-.58-.576-1.518-.577-2.094 0z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style-invert.svg
index 33089a098f..0367cfe0fd 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="text-style">
-        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.288 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
+        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.29 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
         <path id="underline" d="M6 19h12v1H6v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style.svg
index 77c66a0fc0..466672ebe9 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/text-style.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="text-style">
-        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.288 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
+        <path id="a" d="M15.296 18h2.79l-1.14-12h-2.79L6 18h2.79l2.038-3h4.183l.29 3zm-3.11-5L14.5 9.6l.323 3.4H12.19z"/>
         <path id="underline" d="M6 19h12v1H6v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u-invert.svg
index 342493b63b..c998822efc 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u-invert.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><style>* { fill: #FFFFFF }</style>
     <g id="underline-u">
-        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.654-1.666.98-2.98.98-1.32 0-2.32-.324-2.996-.98C8.336 14.37 8 13.405 8 12.126V6"/>
+        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.655-1.666.98-2.98.98-1.32 0-2.32-.323-2.996-.98C8.336 14.37 8 13.406 8 12.127V6"/>
         <path id="underline" d="M7 17h10v1H7v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u.svg b/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u.svg
index 73782984ed..f5aaf5d606 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/icons/underline-u.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
     <g id="underline-u">
-        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.654-1.666.98-2.98.98-1.32 0-2.32-.324-2.996-.98C8.336 14.37 8 13.405 8 12.126V6"/>
+        <path id="u" d="M8 6h2v5.96c-.104 1.706.695 2 2 2.04 1.777.062 2.002-.88 2-2.04V6h2v6.123c0 1.28-.338 2.245-1.016 2.898-.672.655-1.666.98-2.98.98-1.32 0-2.32-.323-2.996-.98C8.336 14.37 8 13.406 8 12.127V6"/>
         <path id="underline" d="M7 17h10v1H7v-1z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-invert.svg
index 3207aaf6bd..0d17c02ada 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert-invert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="alert">
         <path d="M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zM5 7h2V2H5zm0 3h2V8H5z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert.svg
index cddc0db2ba..868bcc9633 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/alert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="alert">
         <path d="M6 12c-3.314 0-6-2.686-6-6s2.686-6 6-6 6 2.686 6 6-2.686 6-6 6zM5 7h2V2H5zm0 3h2V8H5z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.png
index f18841d460..fcb50d6f93 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.svg
index 6330d97b39..7567b5d688 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="down">
-        <path id="arrow" d="M883.3 341H116.7L500 724.3 883.3 341"/>
+        <path id="arrow" d="M1 4h10L6 9 1 4"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.png
index 15ec58611e..034fe2b2aa 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.svg
index d8979aea7c..f5c76f374d 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-down.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1000 1000">
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="down">
-        <path id="arrow" d="M883.3 341H116.7L500 724.3 883.3 341"/>
+        <path id="arrow" d="M1 4h10L6 9 1 4"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-invert.svg
index 476dbcc454..63384fa0f4 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="ltr">
-        <path id="arrow" d="M-489 496v10l5-5-5-5"/>
+        <path id="arrow" d="M4 1v10l5-5-5-5"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr.svg
index d824ff1b30..059372d580 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-ltr.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="ltr">
-        <path id="arrow" d="M-489 496v10l5-5-5-5"/>
+        <path id="arrow" d="M4 1v10l5-5-5-5"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-invert.svg
index 276052b574..a9e9ce31a4 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="rtl">
-        <path id="arrow" d="M-485 506v-10l-5 5 5 5"/>
+        <path id="arrow" d="M8 11V1L3 6l5 5"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl.svg
index 88ad88b23d..c6498e82aa 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-rtl.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="rtl">
-        <path id="arrow" d="M-485 506v-10l-5 5 5 5"/>
+        <path id="arrow" d="M8 11V1L3 6l5 5"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-invert.svg
index e33ba065c8..2d11d4fe89 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up-invert.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12"><style>* { fill: #FFFFFF }</style>
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="up">
-        <path id="arrow" d="M-492 503h10l-5-5-5 5"/>
+        <path id="arrow" d="M1 8h10L6 3 1 8"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up.svg
index 0640cc3cf4..5eada07db6 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/arrow-up.svg
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="-493 495 12 12">
+<svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="up">
-        <path id="arrow" d="M-492 503h10l-5-5-5 5"/>
+        <path id="arrow" d="M1 8h10L6 3 1 8"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-invert.svg
index ba5fd1d9d6..5b030542b8 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear-invert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="clear">
         <path id="circle-with-cross" d="M6 0C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM3.5 2.5L6 5l2.5-2.5 1 1L7 6l2.5 2.5-1 1L6 7 3.5 9.5l-1-1L5 6 2.5 3.5z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear.svg
index b18405dfa3..3c010c1046 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/clear.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="clear">
         <path id="circle-with-cross" d="M6 0C2.7 0 0 2.7 0 6s2.7 6 6 6 6-2.7 6-6-2.7-6-6-6zM3.5 2.5L6 5l2.5-2.5 1 1L7 6l2.5 2.5-1 1L6 7 3.5 9.5l-1-1L5 6 2.5 3.5z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-invert.svg
index 0d2e79ad10..406869965d 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required-invert.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="required">
         <path d="M5 1h2v10H5zm4.83 1.634l1 1.732-8.66 5-1-1.732zM1.17 4.366l1-1.732 8.66 5-1 1.732z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required.svg
index 051ed5fd6a..d1e0cba6e3 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/required.svg
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="required">
         <path d="M5 1h2v10H5zm4.83 1.634l1 1.732-8.66 5-1-1.732zM1.17 4.366l1-1.732 8.66 5-1 1.732z"/>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.png
index fbd6af1086..68fcab8db3 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.svg
index 322b5b1b7f..cf4de688d9 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr-invert.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="search">
-        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.646l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.213S6.21 7.207 4.99 7.207z"/>
+        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.647l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.214s-.99 2.213-2.21 2.213z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.png
index 985e6023f1..2718a9b0e9 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.svg
index e5c4010ee2..9b3c1997fb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-ltr.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="search">
-        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.646l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.213S6.21 7.207 4.99 7.207z"/>
+        <path id="path3051" d="M10.37 9.474L7.994 7.1l-.17-.1c.404-.566.644-1.26.644-2.01-.002-1.92-1.56-3.476-3.478-3.476-1.92 0-3.478 1.557-3.478 3.478 0 1.92 1.557 3.477 3.478 3.477.75 0 1.442-.24 2.01-.647l.098.17 2.375 2.373c.19.188.543.142.79-.105s.293-.6.104-.79zm-5.38-2.27c-1.22 0-2.213-.99-2.213-2.213 0-1.22.99-2.21 2.212-2.21 1.22 0 2.21.99 2.21 2.214s-.99 2.213-2.21 2.213z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.png
index bcafcd6cb5..c8ebef4b45 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.svg
index a90817daae..41fe9bd58b 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl-invert.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12"><style>* { fill: #FFFFFF }</style>
     <g id="search">
-        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.646l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21-1.222 0-2.213.99-2.213 2.213S5.79 7.207 7.01 7.207z"/>
+        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.647l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21S4.8 3.77 4.8 4.995 5.79 7.207 7.01 7.207z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.png b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.png
index 4213d678bc..b7a8d221e1 100644
Binary files a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.png and b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.png differ
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.svg b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.svg
index 759f57ec06..3201301edb 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/indicators/search-rtl.svg
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version="1.0" encoding="utf-8"?>
 <svg xmlns="http://www.w3.org/2000/svg" width="12" height="12" viewBox="0 0 12 12">
     <g id="search">
-        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.646l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21-1.222 0-2.213.99-2.213 2.213S5.79 7.207 7.01 7.207z"/>
+        <path id="path3051" d="M1.63 9.474L4.006 7.1l.17-.1c-.404-.566-.644-1.26-.644-2.01.002-1.92 1.56-3.476 3.478-3.476 1.92 0 3.478 1.557 3.478 3.478 0 1.92-1.557 3.477-3.478 3.477-.75 0-1.442-.24-2.01-.647l-.098.17-2.375 2.373c-.19.188-.543.142-.79-.105s-.293-.6-.104-.79zm5.378-2.27c1.22 0 2.213-.99 2.213-2.213 0-1.22-.99-2.21-2.21-2.21S4.8 3.77 4.8 4.995 5.79 7.207 7.01 7.207z"/>
     </g>
 </svg>
diff --git a/resources/lib/oojs-ui/themes/mediawiki/images/textures/transparency.svg b/resources/lib/oojs-ui/themes/mediawiki/images/textures/transparency.svg
index e413e75719..cadec2a63d 100644
--- a/resources/lib/oojs-ui/themes/mediawiki/images/textures/transparency.svg
+++ b/resources/lib/oojs-ui/themes/mediawiki/images/textures/transparency.svg
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0, 0, 16, 16">
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
     <g id="transparency">
         <path d="M0 0h8v8H0zm8 8h8v8H8z" fill="#ccc"/>
         <path d="M8 0h8v8H8zM0 8h8v8H0z" fill="#fff"/>
diff --git a/resources/src/jquery/jquery.accessKeyLabel.js b/resources/src/jquery/jquery.accessKeyLabel.js
index 1ac34a5271..92f8eb9c54 100644
--- a/resources/src/jquery/jquery.accessKeyLabel.js
+++ b/resources/src/jquery/jquery.accessKeyLabel.js
@@ -150,14 +150,14 @@ function updateTooltip( element ) {
 		if ( id ) {
 			$label = $( 'label[for="' + id + '"]' );
 			if ( $label.length === 1 ) {
-				updateTooltipOnElement( element, $label[0] );
+				updateTooltipOnElement( element, $label[ 0 ] );
 			}
 		}
 
 		// Search it as parent, because the form control can also be inside the label element itself
 		$labelParent = $element.parents( 'label' );
 		if ( $labelParent.length === 1 ) {
-			updateTooltipOnElement( element, $labelParent[0] );
+			updateTooltipOnElement( element, $labelParent[ 0 ] );
 		}
 	}
 }
diff --git a/resources/src/jquery/jquery.autoEllipsis.js b/resources/src/jquery/jquery.autoEllipsis.js
index 9a196b5dbc..e1115d6504 100644
--- a/resources/src/jquery/jquery.autoEllipsis.js
+++ b/resources/src/jquery/jquery.autoEllipsis.js
@@ -69,16 +69,16 @@ $.fn.autoEllipsis = function ( options ) {
 		// Try cache
 		if ( options.matchText ) {
 			if ( !( text in matchTextCache ) ) {
-				matchTextCache[text] = {};
+				matchTextCache[ text ] = {};
 			}
-			if ( !( options.matchText in matchTextCache[text] ) ) {
-				matchTextCache[text][options.matchText] = {};
+			if ( !( options.matchText in matchTextCache[ text ] ) ) {
+				matchTextCache[ text ][ options.matchText ] = {};
 			}
-			if ( !( w in matchTextCache[text][options.matchText] ) ) {
-				matchTextCache[text][options.matchText][w] = {};
+			if ( !( w in matchTextCache[ text ][ options.matchText ] ) ) {
+				matchTextCache[ text ][ options.matchText ][ w ] = {};
 			}
-			if ( options.position in matchTextCache[text][options.matchText][w] ) {
-				$container.html( matchTextCache[text][options.matchText][w][options.position] );
+			if ( options.position in matchTextCache[ text ][ options.matchText ][ w ] ) {
+				$container.html( matchTextCache[ text ][ options.matchText ][ w ][ options.position ] );
 				if ( options.tooltip ) {
 					$container.attr( 'title', text );
 				}
@@ -86,13 +86,13 @@ $.fn.autoEllipsis = function ( options ) {
 			}
 		} else {
 			if ( !( text in cache ) ) {
-				cache[text] = {};
+				cache[ text ] = {};
 			}
-			if ( !( w in cache[text] ) ) {
-				cache[text][w] = {};
+			if ( !( w in cache[ text ] ) ) {
+				cache[ text ][ w ] = {};
 			}
-			if ( options.position in cache[text][w] ) {
-				$container.html( cache[text][w][options.position] );
+			if ( options.position in cache[ text ][ w ] ) {
+				$container.html( cache[ text ][ w ][ options.position ] );
 				if ( options.tooltip ) {
 					$container.attr( 'title', text );
 				}
@@ -120,19 +120,19 @@ $.fn.autoEllipsis = function ( options ) {
 					break;
 				case 'center':
 					// TODO: Use binary search like for 'right'
-					i = [Math.round( trimmableText.length / 2 ), Math.round( trimmableText.length / 2 )];
+					i = [ Math.round( trimmableText.length / 2 ), Math.round( trimmableText.length / 2 ) ];
 					// Begin with making the end shorter
 					side = 1;
-					while ( $trimmableText.outerWidth() + pw > w && i[0] > 0 ) {
-						$trimmableText.text( trimmableText.slice( 0, i[0] ) + '...' + trimmableText.slice( i[1] ) );
+					while ( $trimmableText.outerWidth() + pw > w && i[ 0 ] > 0 ) {
+						$trimmableText.text( trimmableText.slice( 0, i[ 0 ] ) + '...' + trimmableText.slice( i[ 1 ] ) );
 						// Alternate between trimming the end and begining
 						if ( side === 0 ) {
 							// Make the begining shorter
-							i[0]--;
+							i[ 0 ]--;
 							side = 1;
 						} else {
 							// Make the end shorter
-							i[1]++;
+							i[ 1 ]++;
 							side = 0;
 						}
 					}
@@ -152,9 +152,9 @@ $.fn.autoEllipsis = function ( options ) {
 		}
 		if ( options.matchText ) {
 			$container.highlightText( options.matchText );
-			matchTextCache[text][options.matchText][w][options.position] = $container.html();
+			matchTextCache[ text ][ options.matchText ][ w ][ options.position ] = $container.html();
 		} else {
-			cache[text][w][options.position] = $container.html();
+			cache[ text ][ w ][ options.position ] = $container.html();
 		}
 
 	} );
diff --git a/resources/src/jquery/jquery.byteLimit.js b/resources/src/jquery/jquery.byteLimit.js
index afff463e92..6203239066 100644
--- a/resources/src/jquery/jquery.byteLimit.js
+++ b/resources/src/jquery/jquery.byteLimit.js
@@ -77,12 +77,12 @@
 		// until the limit is statisfied.
 		if ( fn ) {
 			// stop, when there is nothing to slice - bug 41450
-			while ( $.byteLength( fn( inpParts.join( '' ) ) ) > byteLimit && inpParts[1].length > 0 ) {
-				inpParts[1] = inpParts[1].slice( 0, -1 );
+			while ( $.byteLength( fn( inpParts.join( '' ) ) ) > byteLimit && inpParts[ 1 ].length > 0 ) {
+				inpParts[ 1 ] = inpParts[ 1 ].slice( 0, -1 );
 			}
 		} else {
 			while ( $.byteLength( inpParts.join( '' ) ) > byteLimit ) {
-				inpParts[1] = inpParts[1].slice( 0, -1 );
+				inpParts[ 1 ] = inpParts[ 1 ].slice( 0, -1 );
 			}
 		}
 
diff --git a/resources/src/jquery/jquery.color.js b/resources/src/jquery/jquery.color.js
index 04f8047b8e..a3cc8fc3af 100644
--- a/resources/src/jquery/jquery.color.js
+++ b/resources/src/jquery/jquery.color.js
@@ -28,7 +28,7 @@
 	}
 
 	// We override the animation for all of these color styles
-	$.each([
+	$.each( [
 		'backgroundColor',
 		'borderBottomColor',
 		'borderLeftColor',
@@ -37,17 +37,17 @@
 		'color',
 		'outlineColor'
 	], function ( i, attr ) {
-		$.fx.step[attr] = function ( fx ) {
+		$.fx.step[ attr ] = function ( fx ) {
 			if ( !fx.colorInit ) {
 				fx.start = getColor( fx.elem, attr );
 				fx.end = $.colorUtil.getRGB( fx.end );
 				fx.colorInit = true;
 			}
 
-			fx.elem.style[attr] = 'rgb(' + [
-				Math.max( Math.min( parseInt( (fx.pos * (fx.end[0] - fx.start[0])) + fx.start[0], 10 ), 255 ), 0 ),
-				Math.max( Math.min( parseInt( (fx.pos * (fx.end[1] - fx.start[1])) + fx.start[1], 10 ), 255 ), 0 ),
-				Math.max( Math.min( parseInt( (fx.pos * (fx.end[2] - fx.start[2])) + fx.start[2], 10 ), 255 ), 0 )
+			fx.elem.style[ attr ] = 'rgb(' + [
+				Math.max( Math.min( parseInt( ( fx.pos * ( fx.end[ 0 ] - fx.start[ 0 ] ) ) + fx.start[ 0 ], 10 ), 255 ), 0 ),
+				Math.max( Math.min( parseInt( ( fx.pos * ( fx.end[ 1 ] - fx.start[ 1 ] ) ) + fx.start[ 1 ], 10 ), 255 ), 0 ),
+				Math.max( Math.min( parseInt( ( fx.pos * ( fx.end[ 2 ] - fx.start[ 2 ] ) ) + fx.start[ 2 ], 10 ), 255 ), 0 )
 			].join( ',' ) + ')';
 		};
 	} );
diff --git a/resources/src/jquery/jquery.colorUtil.js b/resources/src/jquery/jquery.colorUtil.js
index a6ff8bc8bc..c14f2c861c 100644
--- a/resources/src/jquery/jquery.colorUtil.js
+++ b/resources/src/jquery/jquery.colorUtil.js
@@ -32,48 +32,48 @@
 			}
 
 			// Look for rgb(num,num,num)
-			if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) {
+			if ( result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec( color ) ) {
 				return [
-					parseInt( result[1], 10 ),
-					parseInt( result[2], 10 ),
-					parseInt( result[3], 10 )
+					parseInt( result[ 1 ], 10 ),
+					parseInt( result[ 2 ], 10 ),
+					parseInt( result[ 3 ], 10 )
 				];
 			}
 
 			// Look for rgb(num%,num%,num%)
-			if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) {
+			if ( result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec( color ) ) {
 				return [
-					parseFloat( result[1] ) * 2.55,
-					parseFloat( result[2] ) * 2.55,
-					parseFloat( result[3] ) * 2.55
+					parseFloat( result[ 1 ] ) * 2.55,
+					parseFloat( result[ 2 ] ) * 2.55,
+					parseFloat( result[ 3 ] ) * 2.55
 				];
 			}
 
 			// Look for #a0b1c2
-			if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) {
+			if ( result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec( color ) ) {
 				return [
-					parseInt( result[1], 16 ),
-					parseInt( result[2], 16 ),
-					parseInt( result[3], 16 )
+					parseInt( result[ 1 ], 16 ),
+					parseInt( result[ 2 ], 16 ),
+					parseInt( result[ 3 ], 16 )
 				];
 			}
 
 			// Look for #fff
-			if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) {
+			if ( result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec( color ) ) {
 				return [
-					parseInt( result[1] + result[1], 16 ),
-					parseInt( result[2] + result[2], 16 ),
-					parseInt( result[3] + result[3], 16)
+					parseInt( result[ 1 ] + result[ 1 ], 16 ),
+					parseInt( result[ 2 ] + result[ 2 ], 16 ),
+					parseInt( result[ 3 ] + result[ 3 ], 16 )
 				];
 			}
 
 			// Look for rgba(0, 0, 0, 0) == transparent in Safari 3
-			if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) {
+			if ( result = /rgba\(0, 0, 0, 0\)/.exec( color ) ) {
 				return $.colorUtil.colors.transparent;
 			}
 
 			// Otherwise, we're most likely dealing with a named color
-			return $.colorUtil.colors[$.trim(color).toLowerCase()];
+			return $.colorUtil.colors[ $.trim( color ).toLowerCase() ];
 		},
 
 		/**
@@ -85,50 +85,50 @@
 		 * @property {Object}
 		 */
 		colors: {
-			aqua: [0, 255, 255],
-			azure: [240, 255, 255],
-			beige: [245, 245, 220],
-			black: [0, 0, 0],
-			blue: [0, 0, 255],
-			brown: [165, 42, 42],
-			cyan: [0, 255, 255],
-			darkblue: [0, 0, 139],
-			darkcyan: [0, 139, 139],
-			darkgrey: [169, 169, 169],
-			darkgreen: [0, 100, 0],
-			darkkhaki: [189, 183, 107],
-			darkmagenta: [139, 0, 139],
-			darkolivegreen: [85, 107, 47],
-			darkorange: [255, 140, 0],
-			darkorchid: [153, 50, 204],
-			darkred: [139, 0, 0],
-			darksalmon: [233, 150, 122],
-			darkviolet: [148, 0, 211],
-			fuchsia: [255, 0, 255],
-			gold: [255, 215, 0],
-			green: [0, 128, 0],
-			indigo: [75, 0, 130],
-			khaki: [240, 230, 140],
-			lightblue: [173, 216, 230],
-			lightcyan: [224, 255, 255],
-			lightgreen: [144, 238, 144],
-			lightgrey: [211, 211, 211],
-			lightpink: [255, 182, 193],
-			lightyellow: [255, 255, 224],
-			lime: [0, 255, 0],
-			magenta: [255, 0, 255],
-			maroon: [128, 0, 0],
-			navy: [0, 0, 128],
-			olive: [128, 128, 0],
-			orange: [255, 165, 0],
-			pink: [255, 192, 203],
-			purple: [128, 0, 128],
-			violet: [128, 0, 128],
-			red: [255, 0, 0],
-			silver: [192, 192, 192],
-			white: [255, 255, 255],
-			yellow: [255, 255, 0],
-			transparent: [255, 255, 255]
+			aqua: [ 0, 255, 255 ],
+			azure: [ 240, 255, 255 ],
+			beige: [ 245, 245, 220 ],
+			black: [ 0, 0, 0 ],
+			blue: [ 0, 0, 255 ],
+			brown: [ 165, 42, 42 ],
+			cyan: [ 0, 255, 255 ],
+			darkblue: [ 0, 0, 139 ],
+			darkcyan: [ 0, 139, 139 ],
+			darkgrey: [ 169, 169, 169 ],
+			darkgreen: [ 0, 100, 0 ],
+			darkkhaki: [ 189, 183, 107 ],
+			darkmagenta: [ 139, 0, 139 ],
+			darkolivegreen: [ 85, 107, 47 ],
+			darkorange: [ 255, 140, 0 ],
+			darkorchid: [ 153, 50, 204 ],
+			darkred: [ 139, 0, 0 ],
+			darksalmon: [ 233, 150, 122 ],
+			darkviolet: [ 148, 0, 211 ],
+			fuchsia: [ 255, 0, 255 ],
+			gold: [ 255, 215, 0 ],
+			green: [ 0, 128, 0 ],
+			indigo: [ 75, 0, 130 ],
+			khaki: [ 240, 230, 140 ],
+			lightblue: [ 173, 216, 230 ],
+			lightcyan: [ 224, 255, 255 ],
+			lightgreen: [ 144, 238, 144 ],
+			lightgrey: [ 211, 211, 211 ],
+			lightpink: [ 255, 182, 193 ],
+			lightyellow: [ 255, 255, 224 ],
+			lime: [ 0, 255, 0 ],
+			magenta: [ 255, 0, 255 ],
+			maroon: [ 128, 0, 0 ],
+			navy: [ 0, 0, 128 ],
+			olive: [ 128, 128, 0 ],
+			orange: [ 255, 165, 0 ],
+			pink: [ 255, 192, 203 ],
+			purple: [ 128, 0, 128 ],
+			violet: [ 128, 0, 128 ],
+			red: [ 255, 0, 0 ],
+			silver: [ 192, 192, 192 ],
+			white: [ 255, 255, 255 ],
+			yellow: [ 255, 255, 0 ],
+			transparent: [ 255, 255, 255 ]
 		},
 
 		/**
@@ -157,29 +157,29 @@
 				min = Math.min( r, g, b ),
 				h,
 				s,
-				l = (max + min) / 2;
+				l = ( max + min ) / 2;
 
 			if ( max === min ) {
 				// achromatic
 				h = s = 0;
 			} else {
 				d = max - min;
-				s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+				s = l > 0.5 ? d / ( 2 - max - min ) : d / ( max + min );
 				switch ( max ) {
 					case r:
-						h = (g - b) / d + (g < b ? 6 : 0);
+						h = ( g - b ) / d + ( g < b ? 6 : 0 );
 						break;
 					case g:
-						h = (b - r) / d + 2;
+						h = ( b - r ) / d + 2;
 						break;
 					case b:
-						h = (r - g) / d + 4;
+						h = ( r - g ) / d + 4;
 						break;
 				}
 				h /= 6;
 			}
 
-			return [h, s, l];
+			return [ h, s, l ];
 		},
 
 		/**
@@ -212,25 +212,25 @@
 						t -= 1;
 					}
 					if ( t < 1 / 6 ) {
-						return p + (q - p) * 6 * t;
+						return p + ( q - p ) * 6 * t;
 					}
 					if ( t < 1 / 2 ) {
 						return q;
 					}
 					if ( t < 2 / 3 ) {
-						return p + (q - p) * (2 / 3 - t) * 6;
+						return p + ( q - p ) * ( 2 / 3 - t ) * 6;
 					}
 					return p;
 				};
 
-				q = l < 0.5 ? l * (1 + s) : l + s - l * s;
+				q = l < 0.5 ? l * ( 1 + s ) : l + s - l * s;
 				p = 2 * l - q;
 				r = hue2rgb( p, q, h + 1 / 3 );
 				g = hue2rgb( p, q, h );
 				b = hue2rgb( p, q, h - 1 / 3 );
 			}
 
-			return [r * 255, g * 255, b * 255];
+			return [ r * 255, g * 255, b * 255 ];
 		},
 
 		/**
@@ -249,11 +249,11 @@
 		 */
 		getColorBrightness: function ( currentColor, mod ) {
 			var rgbArr = $.colorUtil.getRGB( currentColor ),
-				hslArr = $.colorUtil.rgbToHsl(rgbArr[0], rgbArr[1], rgbArr[2] );
-			rgbArr = $.colorUtil.hslToRgb(hslArr[0], hslArr[1], hslArr[2] + mod);
+				hslArr = $.colorUtil.rgbToHsl( rgbArr[ 0 ], rgbArr[ 1 ], rgbArr[ 2 ] );
+			rgbArr = $.colorUtil.hslToRgb( hslArr[ 0 ], hslArr[ 1 ], hslArr[ 2 ] + mod );
 
 			return 'rgb(' +
-				[parseInt( rgbArr[0], 10), parseInt( rgbArr[1], 10 ), parseInt( rgbArr[2], 10 )].join( ',' ) +
+				[ parseInt( rgbArr[ 0 ], 10 ), parseInt( rgbArr[ 1 ], 10 ), parseInt( rgbArr[ 2 ], 10 ) ].join( ',' ) +
 				')';
 		}
 
diff --git a/resources/src/jquery/jquery.expandableField.js b/resources/src/jquery/jquery.expandableField.js
index 48341bc541..221e6bbe59 100644
--- a/resources/src/jquery/jquery.expandableField.js
+++ b/resources/src/jquery/jquery.expandableField.js
@@ -23,7 +23,7 @@
 		expandField: function ( e, context ) {
 			context.config.beforeExpand.call( context.data.$field, context );
 			context.data.$field
-				.animate( { 'width': context.data.expandedWidth }, 'fast', function () {
+				.animate( { width: context.data.expandedWidth }, 'fast', function () {
 					context.config.afterExpand.call( this, context );
 				} );
 		},
@@ -33,18 +33,19 @@
 		condenseField: function ( e, context ) {
 			context.config.beforeCondense.call( context.data.$field, context );
 			context.data.$field
-				.animate( { 'width': context.data.condensedWidth }, 'fast', function () {
+				.animate( { width: context.data.condensedWidth }, 'fast', function () {
 					context.config.afterCondense.call( this, context );
 				} );
 		},
 		/**
 		 * Sets the value of a property, and updates the widget accordingly
-		 * @param property String Name of property
-		 * @param value Mixed Value to set property with
+		 *
+		 * @param {String} property Name of property
+		 * @param {Mixed} value Value to set property with
 		 */
 		configure: function ( context, property, value ) {
 			// TODO: Validate creation using fallback values
-			context.config[property] = value;
+			context.config[ property ] = value;
 		}
 
 	};
@@ -87,20 +88,20 @@
 			/* API */
 			// Handle various calling styles
 			if ( args.length > 0 ) {
-				if ( typeof args[0] === 'object' ) {
+				if ( typeof args[ 0 ] === 'object' ) {
 					// Apply set of properties
-					for ( key in args[0] ) {
-						$.expandableField.configure( context, key, args[0][key] );
+					for ( key in args[ 0 ] ) {
+						$.expandableField.configure( context, key, args[ 0 ][ key ] );
 					}
-				} else if ( typeof args[0] === 'string' ) {
+				} else if ( typeof args[ 0 ] === 'string' ) {
 					if ( args.length > 1 ) {
 						// Set property values
-						$.expandableField.configure( context, args[0], args[1] );
+						$.expandableField.configure( context, args[ 0 ], args[ 1 ] );
 
 					// TODO: Do we need to check both null and undefined?
 					} else if ( returnValue === null || returnValue === undefined ) {
 						// Get property values, but don't give access to internal data - returns only the first
-						returnValue = ( args[0] in context.config ? undefined : context.config[args[0]] );
+						returnValue = ( args[ 0 ] in context.config ? undefined : context.config[ args[ 0 ] ] );
 					}
 				}
 			}
diff --git a/resources/src/jquery/jquery.farbtastic.js b/resources/src/jquery/jquery.farbtastic.js
index d7024cc8f0..f70913f90f 100644
--- a/resources/src/jquery/jquery.farbtastic.js
+++ b/resources/src/jquery/jquery.farbtastic.js
@@ -52,10 +52,10 @@ jQuery._farbtastic = function (container, callback) {
 			if (this.currentStyle.backgroundImage != 'none') {
 				var image = this.currentStyle.backgroundImage;
 				image = this.currentStyle.backgroundImage.slice(5, image.length - 2);
-				$(this).css({
-					'backgroundImage': 'none',
-					'filter': "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image + "')"
-				});
+				$(this).css( {
+					backgroundImage: 'none',
+					filter: "progid:DXImageTransform.Microsoft.AlphaImageLoader(enabled=true, sizingMethod=crop, src='" + image + "')"
+				} );
 			}
 		});
 	}
diff --git a/resources/src/jquery/jquery.getAttrs.js b/resources/src/jquery/jquery.getAttrs.js
index 64827fb785..3064b42341 100644
--- a/resources/src/jquery/jquery.getAttrs.js
+++ b/resources/src/jquery/jquery.getAttrs.js
@@ -8,7 +8,7 @@ function serializeControls( controls ) {
 		len = controls.length;
 
 	for ( i = 0; i < len; i++ ) {
-		data[ controls[i].name ] = controls[i].value;
+		data[ controls[ i ].name ] = controls[ i ].value;
 	}
 
 	return data;
@@ -23,7 +23,7 @@ function serializeControls( controls ) {
  * @return {Object}
  */
 jQuery.fn.getAttrs = function () {
-	return serializeControls( this[0].attributes );
+	return serializeControls( this[ 0 ].attributes );
 };
 
 /**
diff --git a/resources/src/jquery/jquery.hidpi.js b/resources/src/jquery/jquery.hidpi.js
index 8fca05677e..aa6590bf50 100644
--- a/resources/src/jquery/jquery.hidpi.js
+++ b/resources/src/jquery/jquery.hidpi.js
@@ -27,14 +27,15 @@
 $.devicePixelRatio = function () {
 	if ( window.devicePixelRatio !== undefined ) {
 		// Most web browsers:
-		// * WebKit (Safari, Chrome, Android browser, etc)
+		// * WebKit/Blink (Safari, Chrome, Android browser, etc)
 		// * Opera
 		// * Firefox 18+
+		// * Microsoft Edge (Windows 10)
 		return window.devicePixelRatio;
 	} else if ( window.msMatchMedia !== undefined ) {
 		// Windows 8 desktops / tablets, probably Windows Phone 8
 		//
-		// IE 10 doesn't report pixel ratio directly, but we can get the
+		// IE 10/11 doesn't report pixel ratio directly, but we can get the
 		// screen DPI and divide by 96. We'll bracket to [1, 1.5, 2.0] for
 		// simplicity, but you may get different values depending on zoom
 		// factor, size of screen and orientation in Metro IE.
@@ -52,6 +53,52 @@ $.devicePixelRatio = function () {
 	}
 };
 
+/**
+ * Bracket a given device pixel ratio to one of [1, 1.5, 2].
+ *
+ * This is useful for grabbing images on the fly with sizes based on the display
+ * density, without causing slowdown and extra thumbnail renderings on devices
+ * that are slightly different from the most common sizes.
+ *
+ * The bracketed ratios match the default 'srcset' output on MediaWiki thumbnails,
+ * so will be consistent with default renderings.
+ *
+ * @static
+ * @inheritable
+ * @return {number} Device pixel ratio
+ */
+$.bracketDevicePixelRatio = function ( baseRatio ) {
+	if ( baseRatio > 1.5 ) {
+		return 2;
+	} else if ( baseRatio > 1 ) {
+		return 1.5;
+	} else {
+		return 1;
+	}
+};
+
+/**
+ * Get reported or approximate device pixel ratio, bracketed to [1, 1.5, 2].
+ *
+ * This is useful for grabbing images on the fly with sizes based on the display
+ * density, without causing slowdown and extra thumbnail renderings on devices
+ * that are slightly different from the most common sizes.
+ *
+ * The bracketed ratios match the default 'srcset' output on MediaWiki thumbnails,
+ * so will be consistent with default renderings.
+ *
+ * - 1.0 means 1 CSS pixel is 1 hardware pixel
+ * - 1.5 means 1 CSS pixel is 1.5 hardware pixels
+ * - 2.0 means 1 CSS pixel is 2 hardware pixels
+ *
+ * @static
+ * @inheritable
+ * @return {number} Device pixel ratio
+ */
+$.bracketedDevicePixelRatio = function () {
+	return $.bracketDevicePixelRatio( $.devicePixelRatio() );
+};
+
 /**
  * Implement responsive images based on srcset attributes, if browser has no
  * native srcset support.
@@ -106,11 +153,11 @@ $.matchSrcSet = function ( devicePixelRatio, srcset ) {
 		selectedSrc = null;
 	candidates = srcset.split( / *, */ );
 	for ( i = 0; i < candidates.length; i++ ) {
-		candidate = candidates[i];
+		candidate = candidates[ i ];
 		bits = candidate.split( / +/ );
-		src = bits[0];
-		if ( bits.length > 1 && bits[1].charAt( bits[1].length - 1 ) === 'x' ) {
-			ratioStr = bits[1].slice( 0, -1 );
+		src = bits[ 0 ];
+		if ( bits.length > 1 && bits[ 1 ].charAt( bits[ 1 ].length - 1 ) === 'x' ) {
+			ratioStr = bits[ 1 ].slice( 0, -1 );
 			ratio = parseFloat( ratioStr );
 			if ( ratio <= devicePixelRatio && ratio > selectedRatio ) {
 				selectedRatio = ratio;
diff --git a/resources/src/jquery/jquery.highlightText.js b/resources/src/jquery/jquery.highlightText.js
index 1ec4db0505..e37f19b04a 100644
--- a/resources/src/jquery/jquery.highlightText.js
+++ b/resources/src/jquery/jquery.highlightText.js
@@ -12,10 +12,10 @@
 			var i,
 				patArray = pat.split( ' ' );
 			for ( i = 0; i < patArray.length; i++ ) {
-				if ( patArray[i].length === 0 ) {
+				if ( patArray[ i ].length === 0 ) {
 					continue;
 				}
-				$.highlightText.innerHighlight( node, patArray[i] );
+				$.highlightText.innerHighlight( node, patArray[ i ] );
 			}
 			return node;
 		},
@@ -30,7 +30,7 @@
 				// look for an occurrence of our pattern and store the starting position
 				match = node.data.match( new RegExp( '(^|\\s)' + mw.RegExp.escape( pat ), 'i' ) );
 				if ( match ) {
-					pos = match.index + match[1].length; // include length of any matched spaces
+					pos = match.index + match[ 1 ].length; // include length of any matched spaces
 					// create the span wrapper for the matched text
 					spannode = document.createElement( 'span' );
 					spannode.className = 'highlight';
@@ -55,7 +55,7 @@
 			) {
 				for ( i = 0; i < node.childNodes.length; ++i ) {
 					// call the highlight function for each child node
-					$.highlightText.innerHighlight( node.childNodes[i], pat );
+					$.highlightText.innerHighlight( node.childNodes[ i ], pat );
 				}
 			}
 		}
diff --git a/resources/src/jquery/jquery.localize.js b/resources/src/jquery/jquery.localize.js
index 0b423545a1..f5932b246f 100644
--- a/resources/src/jquery/jquery.localize.js
+++ b/resources/src/jquery/jquery.localize.js
@@ -5,16 +5,16 @@
 
 /**
  * Gets a localized message, using parameters from options if present.
- * @ignore
  *
+ * @ignore
  * @param {Object} options
  * @param {string} key
  * @return {string} Localized message
  */
 function msg( options, key ) {
-	var args = options.params[key] || [];
+	var args = options.params[ key ] || [];
 	// Format: mw.msg( key [, p1, p2, ...] )
-	args.unshift( options.prefix + ( options.keys[key] || key ) );
+	args.unshift( options.prefix + ( options.keys[ key ] || key ) );
 	return mw.msg.apply( mw, args );
 }
 
@@ -108,7 +108,7 @@ function msg( options, key ) {
  */
 $.fn.localize = function ( options ) {
 	var $target = this,
-		attributes = ['title', 'alt', 'placeholder'];
+		attributes = [ 'title', 'alt', 'placeholder' ];
 
 	// Extend options
 	options = $.extend( {
diff --git a/resources/src/jquery/jquery.mwExtension.js b/resources/src/jquery/jquery.mwExtension.js
index 548421286d..27ceb2bc45 100644
--- a/resources/src/jquery/jquery.mwExtension.js
+++ b/resources/src/jquery/jquery.mwExtension.js
@@ -44,11 +44,11 @@
 				return false;
 			}
 			for ( var i = 0; i < arrThis.length; i++ ) {
-				if ( $.isArray( arrThis[i] ) ) {
-					if ( !$.compareArray( arrThis[i], arrAgainst[i] ) ) {
+				if ( $.isArray( arrThis[ i ] ) ) {
+					if ( !$.compareArray( arrThis[ i ], arrAgainst[ i ] ) ) {
 						return false;
 					}
-				} else if ( arrThis[i] !== arrAgainst[i] ) {
+				} else if ( arrThis[ i ] !== arrAgainst[ i ] ) {
 					return false;
 				}
 			}
@@ -71,24 +71,24 @@
 							// Check if this property is also present in the other object
 							if ( prop in objectB ) {
 								// Compare the types of the properties
-								type = typeof objectA[prop];
-								if ( type === typeof objectB[prop] ) {
+								type = typeof objectA[ prop ];
+								if ( type === typeof objectB[ prop ] ) {
 									// Recursively check objects inside this one
 									switch ( type ) {
 										case 'object' :
-											if ( !$.compareObject( objectA[prop], objectB[prop] ) ) {
+											if ( !$.compareObject( objectA[ prop ], objectB[ prop ] ) ) {
 												return false;
 											}
 											break;
 										case 'function' :
 											// Functions need to be strings to compare them properly
-											if ( objectA[prop].toString() !== objectB[prop].toString() ) {
+											if ( objectA[ prop ].toString() !== objectB[ prop ].toString() ) {
 												return false;
 											}
 											break;
 										default:
 											// Strings, numbers
-											if ( objectA[prop] !== objectB[prop] ) {
+											if ( objectA[ prop ] !== objectB[ prop ] ) {
 												return false;
 											}
 											break;
diff --git a/resources/src/jquery/jquery.placeholder.js b/resources/src/jquery/jquery.placeholder.js
index d50422e2c7..9c18a919c1 100644
--- a/resources/src/jquery/jquery.placeholder.js
+++ b/resources/src/jquery/jquery.placeholder.js
@@ -13,23 +13,115 @@
  * @version 2.1.0
  * @license MIT
  */
-( function ($) {
+( function ( $ ) {
 
-	var isInputSupported = 'placeholder' in document.createElement('input'),
-		isTextareaSupported = 'placeholder' in document.createElement('textarea'),
+	var isInputSupported = 'placeholder' in document.createElement( 'input' ),
+		isTextareaSupported = 'placeholder' in document.createElement( 'textarea' ),
 		prototype = $.fn,
 		valHooks = $.valHooks,
 		propHooks = $.propHooks,
 		hooks,
 		placeholder;
 
-	if (isInputSupported && isTextareaSupported) {
+	function safeActiveElement() {
+		// Avoid IE9 `document.activeElement` of death
+		// https://github.com/mathiasbynens/jquery-placeholder/pull/99
+		try {
+			return document.activeElement;
+		} catch ( err ) {}
+	}
+
+	function args( elem ) {
+		// Return an object of element attributes
+		var newAttrs = {},
+				rinlinejQuery = /^jQuery\d+$/;
+		$.each( elem.attributes, function ( i, attr ) {
+			if ( attr.specified && !rinlinejQuery.test( attr.name ) ) {
+				newAttrs[ attr.name ] = attr.value;
+			}
+		} );
+		return newAttrs;
+	}
+
+	function clearPlaceholder( event, value ) {
+		var input = this,
+				$input = $( input );
+		if ( input.value === $input.attr( 'placeholder' ) && $input.hasClass( 'placeholder' ) ) {
+			if ( $input.data( 'placeholder-password' ) ) {
+				$input = $input.hide().next().show().attr( 'id', $input.removeAttr( 'id' ).data( 'placeholder-id' ) );
+				// If `clearPlaceholder` was called from `$.valHooks.input.set`
+				if ( event === true ) {
+					$input[ 0 ].value = value;
+					return value;
+				}
+				$input.focus();
+			} else {
+				input.value = '';
+				$input.removeClass( 'placeholder' );
+				if ( input === safeActiveElement() ) {
+					input.select();
+				}
+			}
+		}
+	}
 
-		placeholder = prototype.placeholder = function (text) {
+	function setPlaceholder() {
+		var $replacement,
+				input = this,
+				$input = $( input ),
+				id = this.id;
+		if ( !input.value ) {
+			if ( input.type === 'password' ) {
+				if ( !$input.data( 'placeholder-textinput' ) ) {
+					try {
+						$replacement = $input.clone().attr( { type: 'text' } );
+					} catch ( e ) {
+						$replacement = $( '<input>' ).attr( $.extend( args( this ), { type: 'text' } ) );
+					}
+					$replacement
+							.removeAttr( 'name' )
+							.data( {
+								'placeholder-password': $input,
+								'placeholder-id': id
+							} )
+							.bind( 'focus.placeholder drop.placeholder', clearPlaceholder );
+					$input
+							.data( {
+								'placeholder-textinput': $replacement,
+								'placeholder-id': id
+							} )
+							.before( $replacement );
+				}
+				$input = $input.removeAttr( 'id' ).hide().prev().attr( 'id', id ).show();
+				// Note: `$input[0] != input` now!
+			}
+			$input.addClass( 'placeholder' );
+			$input[ 0 ].value = $input.attr( 'placeholder' );
+		} else {
+			$input.removeClass( 'placeholder' );
+		}
+	}
+
+	function changePlaceholder( text ) {
+		var hasArgs = arguments.length,
+				$input = this;
+		if ( hasArgs ) {
+			if ( $input.attr( 'placeholder' ) !== text ) {
+				$input.prop( 'placeholder', text );
+				if ( $input.hasClass( 'placeholder' ) ) {
+					$input[ 0 ].value = text;
+				}
+			}
+		}
+	}
+
+	if ( isInputSupported && isTextareaSupported ) {
+
+		placeholder = prototype.placeholder = function ( text ) {
 			var hasArgs = arguments.length;
 
-			if (hasArgs) {
-				changePlaceholder.call(this, text);
+			if ( hasArgs ) {
+				changePlaceholder.call( this, text );
 			}
 
 			return this;
@@ -39,25 +131,25 @@
 
 	} else {
 
-		placeholder = prototype.placeholder = function (text) {
+		placeholder = prototype.placeholder = function ( text ) {
 			var $this = this,
 				hasArgs = arguments.length;
 
-			if (hasArgs) {
-				changePlaceholder.call(this, text);
+			if ( hasArgs ) {
+				changePlaceholder.call( this, text );
 			}
 
 			$this
-				.filter((isInputSupported ? 'textarea' : ':input') + '[placeholder]')
+				.filter( ( isInputSupported ? 'textarea' : ':input' ) + '[placeholder]' )
 				.filter( function () {
-					return !$(this).data('placeholder-enabled');
-				})
-				.bind({
+					return !$( this ).data( 'placeholder-enabled' );
+				} )
+				.bind( {
 					'focus.placeholder drop.placeholder': clearPlaceholder,
 					'blur.placeholder': setPlaceholder
-				})
-				.data('placeholder-enabled', true)
-				.trigger('blur.placeholder');
+				} )
+				.data( 'placeholder-enabled', true )
+				.trigger( 'blur.placeholder' );
 			return $this;
 		};
 
@@ -65,36 +157,36 @@
 		placeholder.textarea = isTextareaSupported;
 
 		hooks = {
-			'get': function (element) {
-				var $element = $(element),
-					$passwordInput = $element.data('placeholder-password');
-				if ($passwordInput) {
-					return $passwordInput[0].value;
+			get: function ( element ) {
+				var $element = $( element ),
+					$passwordInput = $element.data( 'placeholder-password' );
+				if ( $passwordInput ) {
+					return $passwordInput[ 0 ].value;
 				}
 
-				return $element.data('placeholder-enabled') && $element.hasClass('placeholder') ? '' : element.value;
+				return $element.data( 'placeholder-enabled' ) && $element.hasClass( 'placeholder' ) ? '' : element.value;
 			},
-			'set': function (element, value) {
-				var $element = $(element),
-					$passwordInput = $element.data('placeholder-password');
-				if ($passwordInput) {
-					$passwordInput[0].value = value;
+			set: function ( element, value ) {
+				var $element = $( element ),
+					$passwordInput = $element.data( 'placeholder-password' );
+				if ( $passwordInput ) {
+					$passwordInput[ 0 ].value = value;
 					return value;
 				}
 
-				if (!$element.data('placeholder-enabled')) {
+				if ( !$element.data( 'placeholder-enabled' ) ) {
 					element.value = value;
 					return value;
 				}
-				if (!value) {
+				if ( !value ) {
 					element.value = value;
 					// Issue #56: Setting the placeholder causes problems if the element continues to have focus.
-					if (element !== safeActiveElement()) {
+					if ( element !== safeActiveElement() ) {
 						// We can't use `triggerHandler` here because of dummy text/password inputs :(
-						setPlaceholder.call(element);
+						setPlaceholder.call( element );
 					}
-				} else if ($element.hasClass('placeholder')) {
-					if (!clearPlaceholder.call(element, true, value)) {
+				} else if ( $element.hasClass( 'placeholder' ) ) {
+					if ( !clearPlaceholder.call( element, true, value ) ) {
 						element.value = value;
 					}
 				} else {
@@ -105,125 +197,32 @@
 			}
 		};
 
-		if (!isInputSupported) {
+		if ( !isInputSupported ) {
 			valHooks.input = hooks;
 			propHooks.value = hooks;
 		}
-		if (!isTextareaSupported) {
+		if ( !isTextareaSupported ) {
 			valHooks.textarea = hooks;
 			propHooks.value = hooks;
 		}
 
 		$( function () {
 			// Look for forms
-			$(document).delegate('form', 'submit.placeholder', function () {
+			$( document ).delegate( 'form', 'submit.placeholder', function () {
 				// Clear the placeholder values so they don't get submitted
-				var $inputs = $('.placeholder', this).each(clearPlaceholder);
+				var $inputs = $( '.placeholder', this ).each( clearPlaceholder );
 				setTimeout( function () {
-					$inputs.each(setPlaceholder);
-				}, 10);
-			});
-		});
+					$inputs.each( setPlaceholder );
+				}, 10 );
+			} );
+		} );
 
 		// Clear placeholder values upon page reload
-		$(window).bind('beforeunload.placeholder', function () {
-			$('.placeholder').each( function () {
+		$( window ).bind( 'beforeunload.placeholder', function () {
+			$( '.placeholder' ).each( function () {
 				this.value = '';
-			});
-		});
+			} );
+		} );
 
 	}
-
-	function args(elem) {
-		// Return an object of element attributes
-		var newAttrs = {},
-			rinlinejQuery = /^jQuery\d+$/;
-		$.each(elem.attributes, function (i, attr) {
-			if (attr.specified && !rinlinejQuery.test(attr.name)) {
-				newAttrs[attr.name] = attr.value;
-			}
-		});
-		return newAttrs;
-	}
-
-	function clearPlaceholder(event, value) {
-		var input = this,
-			$input = $(input);
-		if (input.value === $input.attr('placeholder') && $input.hasClass('placeholder')) {
-			if ($input.data('placeholder-password')) {
-				$input = $input.hide().next().show().attr('id', $input.removeAttr('id').data('placeholder-id'));
-				// If `clearPlaceholder` was called from `$.valHooks.input.set`
-				if (event === true) {
-					$input[0].value = value;
-					return value;
-				}
-				$input.focus();
-			} else {
-				input.value = '';
-				$input.removeClass('placeholder');
-				if (input === safeActiveElement()) {
-					input.select();
-				}
-			}
-		}
-	}
-
-	function setPlaceholder() {
-		var $replacement,
-			input = this,
-			$input = $(input),
-			id = this.id;
-		if (!input.value) {
-			if (input.type === 'password') {
-				if (!$input.data('placeholder-textinput')) {
-					try {
-						$replacement = $input.clone().attr({ 'type': 'text' });
-					} catch (e) {
-						$replacement = $('<input>').attr($.extend(args(this), { 'type': 'text' }));
-					}
-					$replacement
-						.removeAttr('name')
-						.data({
-							'placeholder-password': $input,
-							'placeholder-id': id
-						})
-						.bind('focus.placeholder drop.placeholder', clearPlaceholder);
-					$input
-						.data({
-							'placeholder-textinput': $replacement,
-							'placeholder-id': id
-						})
-						.before($replacement);
-				}
-				$input = $input.removeAttr('id').hide().prev().attr('id', id).show();
-				// Note: `$input[0] != input` now!
-			}
-			$input.addClass('placeholder');
-			$input[0].value = $input.attr('placeholder');
-		} else {
-			$input.removeClass('placeholder');
-		}
-	}
-
-	function safeActiveElement() {
-		// Avoid IE9 `document.activeElement` of death
-		// https://github.com/mathiasbynens/jquery-placeholder/pull/99
-		try {
-			return document.activeElement;
-		} catch (err) {}
-	}
-
-	function changePlaceholder(text) {
-		var hasArgs = arguments.length,
-			$input = this;
-		if (hasArgs) {
-			if ($input.attr('placeholder') !== text) {
-				$input.prop('placeholder', text);
-				if ($input.hasClass('placeholder')) {
-					$input[0].value = text;
-				}
-			}
-		}
-	}
-
-}(jQuery));
+}( jQuery ) );
diff --git a/resources/src/jquery/jquery.qunit.completenessTest.js b/resources/src/jquery/jquery.qunit.completenessTest.js
index 556bf8c72c..785b27387c 100644
--- a/resources/src/jquery/jquery.qunit.completenessTest.js
+++ b/resources/src/jquery/jquery.qunit.completenessTest.js
@@ -51,14 +51,14 @@
 
 	/**
 	 * CompletenessTest
-	 * @constructor
 	 *
+	 * @constructor
 	 * @example
 	 *  var myTester = new CompletenessTest( myLib );
-	 * @param masterVariable {Object} The root variable that contains all object
+	 * @param {Object} masterVariable The root variable that contains all object
 	 *  members. CompletenessTest will recursively traverse objects and keep track
 	 *  of all methods.
-	 * @param ignoreFn {Function} Optionally pass a function to filter out certain
+	 * @param {Function} [ignoreFn] Optionally pass a function to filter out certain
 	 *  methods. Example: You may want to filter out instances of jQuery or some
 	 *  other constructor. Otherwise "missingTests" will include all methods that
 	 *  were not called from that instance.
@@ -132,7 +132,7 @@
 				elOutputWrapper.appendChild( elContainer );
 
 				util.each( style, function ( key, value ) {
-					elOutputWrapper.style[key] = value;
+					elOutputWrapper.style[ key ] = value;
 				} );
 				return elOutputWrapper;
 			}
@@ -186,12 +186,12 @@
 		 * Depending on the action it either injects our listener into the methods, or
 		 * reads from our tracker and records which methods have not been called by the test suite.
 		 *
-		 * @param currName {String|Null} Name of the given object member (Initially this is null).
-		 * @param currVar {mixed} The variable to check (initially an object,
+		 * @param {String|Null} currName Name of the given object member (Initially this is null).
+		 * @param {mixed} currVar The variable to check (initially an object,
 		 *  further down it could be anything).
-		 * @param masterVariable {Object} Throughout our interation, always keep track of the master/root.
+		 * @param {Object} masterVariable Throughout our interation, always keep track of the master/root.
 		 *  Initially this is the same as currVar.
-		 * @param parentPathArray {Array} Array of names that indicate our breadcrumb path starting at
+		 * @param {Array} parentPathArray Array of names that indicate our breadcrumb path starting at
 		 *  masterVariable. Not including currName.
 		 */
 		walkTheObject: function ( currObj, currName, masterVariable, parentPathArray ) {
@@ -201,7 +201,7 @@
 
 			if ( currName ) {
 				currPathArray.push( currName );
-				currVal = currObj[currName];
+				currVal = currObj[ currName ];
 			} else {
 				currName = '(root)';
 				currVal = currObj;
@@ -258,12 +258,12 @@
 		 * was called during the test suite (as far as the tracker knows).
 		 * If not it adds it to missingTests.
 		 *
-		 * @param fnName {String}
+		 * @param {String} fnName
 		 * @return {Boolean}
 		 */
 		hasTest: function ( fnName ) {
 			if ( !( fnName in this.methodCallTracker ) ) {
-				this.missingTests[fnName] = true;
+				this.missingTests[ fnName ] = true;
 				return false;
 			}
 			return true;
@@ -275,9 +275,9 @@
 		 * Injects a function (such as a spy that updates methodCallTracker when
 		 * it's called) inside another function.
 		 *
-		 * @param masterVariable {Object}
-		 * @param objectPathArray {Array}
-		 * @param injectFn {Function}
+		 * @param {Object} masterVariable
+		 * @param {Array} objectPathArray
+		 * @param {Function} injectFn
 		 */
 		injectCheck: function ( obj, key, injectFn ) {
 			var spy,
@@ -291,8 +291,11 @@
 			// Make the spy inherit from the original so that its static methods are also
 			// visible in the spy (e.g. when we inject a check into mw.log, mw.log.warn
 			// must remain accessible).
+			// XXX: https://github.com/jshint/jshint/issues/2656
+			/*jshint ignore:start */
 			/*jshint proto:true */
 			spy.__proto__ = val;
+			/*jshint ignore:end */
 
 			// Objects are by reference, members (unless objects) are not.
 			obj[ key ] = spy;
diff --git a/resources/src/jquery/jquery.spinner.js b/resources/src/jquery/jquery.spinner.js
index 361d3e0804..41c555b71c 100644
--- a/resources/src/jquery/jquery.spinner.js
+++ b/resources/src/jquery/jquery.spinner.js
@@ -67,7 +67,7 @@
 
 			opts = $.extend( {}, defaults, opts );
 
-			var $spinner = $( '<div>', { 'class': 'mw-spinner', 'title': '...' } );
+			var $spinner = $( '<div>', { 'class': 'mw-spinner', title: '...' } );
 			if ( opts.id !== undefined ) {
 				$spinner.attr( 'id', 'mw-spinner-' + opts.id );
 			}
diff --git a/resources/src/jquery/jquery.suggestions.js b/resources/src/jquery/jquery.suggestions.js
index 7c9bec3220..dc1c7794f6 100644
--- a/resources/src/jquery/jquery.suggestions.js
+++ b/resources/src/jquery/jquery.suggestions.js
@@ -142,6 +142,7 @@ $.suggestions = {
 	 * call to this function still pending will be canceled. If the value in the
 	 * textbox is empty or hasn't changed since the last time suggestions were fetched,
 	 * this function does nothing.
+	 *
 	 * @param {boolean} delayed Whether or not to delay this by the currently configured amount of time
 	 */
 	update: function ( context, delayed ) {
@@ -229,6 +230,7 @@ $.suggestions = {
 
 	/**
 	 * Sets the value of a property, and updates the widget accordingly
+	 *
 	 * @param {string} property Name of property
 	 * @param {Mixed} value Value to set property with
 	 */
@@ -246,10 +248,10 @@ $.suggestions = {
 			case 'update':
 			case '$region':
 			case 'expandFrom':
-				context.config[property] = value;
+				context.config[ property ] = value;
 				break;
 			case 'suggestions':
-				context.config[property] = value;
+				context.config[ property ] = value;
 				// Update suggestions
 				if ( context.data !== undefined ) {
 					if ( context.data.$textbox.val().length === 0 ) {
@@ -277,7 +279,7 @@ $.suggestions = {
 								expandFrom = 'left';
 
 							// Catch invalid values, default to 'auto'
-							} else if ( $.inArray( expandFrom, ['left', 'right', 'start', 'end', 'auto'] ) === -1 ) {
+							} else if ( $.inArray( expandFrom, [ 'left', 'right', 'start', 'end', 'auto' ] ) === -1 ) {
 								expandFrom = 'auto';
 							}
 
@@ -336,11 +338,11 @@ $.suggestions = {
 						expWidth = -1;
 						for ( i = 0; i < context.config.suggestions.length; i++ ) {
 							/*jshint loopfunc:true */
-							text = context.config.suggestions[i];
+							text = context.config.suggestions[ i ];
 							$result = $( '<div>' )
 								.addClass( 'suggestions-result' )
 								.attr( 'rel', i )
-								.data( 'text', context.config.suggestions[i] )
+								.data( 'text', context.config.suggestions[ i ] )
 								.mousemove( function () {
 									context.data.selectedWithMouse = true;
 									$.suggestions.highlight(
@@ -352,7 +354,7 @@ $.suggestions = {
 								.appendTo( $results );
 							// Allow custom rendering
 							if ( typeof context.config.result.render === 'function' ) {
-								context.config.result.render.call( $result, context.config.suggestions[i], context );
+								context.config.result.render.call( $result, context.config.suggestions[ i ], context );
 							} else {
 								$result.text( text );
 							}
@@ -393,28 +395,29 @@ $.suggestions = {
 				}
 				break;
 			case 'maxRows':
-				context.config[property] = Math.max( 1, Math.min( 100, value ) );
+				context.config[ property ] = Math.max( 1, Math.min( 100, value ) );
 				break;
 			case 'delay':
-				context.config[property] = Math.max( 0, Math.min( 1200, value ) );
+				context.config[ property ] = Math.max( 0, Math.min( 1200, value ) );
 				break;
 			case 'cacheMaxAge':
-				context.config[property] = Math.max( 1, value );
+				context.config[ property ] = Math.max( 1, value );
 				break;
 			case 'maxExpandFactor':
-				context.config[property] = Math.max( 1, value );
+				context.config[ property ] = Math.max( 1, value );
 				break;
 			case 'cache':
 			case 'submitOnClick':
 			case 'positionFromLeft':
 			case 'highlightInput':
-				context.config[property] = !!value;
+				context.config[ property ] = !!value;
 				break;
 		}
 	},
 
 	/**
 	 * Highlight a result in the results table
+	 *
 	 * @param {jQuery|string} result `<tr>` to highlight, or 'prev' or 'next'
 	 * @param {boolean} updateTextbox If true, put the suggestion in the textbox
 	 */
@@ -484,6 +487,7 @@ $.suggestions = {
 
 	/**
 	 * Respond to keypress event
+	 *
 	 * @param {number} key Code of key pressed
 	 */
 	keypress: function ( e, context, key ) {
@@ -595,18 +599,18 @@ $.fn.suggestions = function () {
 
 		// Handle various calling styles
 		if ( args.length > 0 ) {
-			if ( typeof args[0] === 'object' ) {
+			if ( typeof args[ 0 ] === 'object' ) {
 				// Apply set of properties
-				for ( key in args[0] ) {
-					$.suggestions.configure( context, key, args[0][key] );
+				for ( key in args[ 0 ] ) {
+					$.suggestions.configure( context, key, args[ 0 ][ key ] );
 				}
-			} else if ( typeof args[0] === 'string' ) {
+			} else if ( typeof args[ 0 ] === 'string' ) {
 				if ( args.length > 1 ) {
 					// Set property values
-					$.suggestions.configure( context, args[0], args[1] );
+					$.suggestions.configure( context, args[ 0 ], args[ 1 ] );
 				} else if ( returnValue === null || returnValue === undefined ) {
 					// Get property values, but don't give access to internal data - returns only the first
-					returnValue = ( args[0] in context.config ? undefined : context.config[args[0]] );
+					returnValue = ( args[ 0 ] in context.config ? undefined : context.config[ args[ 0 ] ] );
 				}
 			}
 		}
diff --git a/resources/src/jquery/jquery.tablesorter.js b/resources/src/jquery/jquery.tablesorter.js
index 8efbb1ce8f..eaa138b937 100644
--- a/resources/src/jquery/jquery.tablesorter.js
+++ b/resources/src/jquery/jquery.tablesorter.js
@@ -70,8 +70,8 @@
 		var i,
 			len = parsers.length;
 		for ( i = 0; i < len; i++ ) {
-			if ( parsers[i].id.toLowerCase() === name.toLowerCase() ) {
-				return parsers[i];
+			if ( parsers[ i ].id.toLowerCase() === name.toLowerCase() ) {
+				return parsers[ i ];
 			}
 		}
 		return false;
@@ -105,69 +105,83 @@
 		}
 	}
 
-	function detectParserForColumn( table, rows, cellIndex ) {
+	function detectParserForColumn( table, rows, column ) {
 		var l = parsers.length,
+			cellIndex,
 			nodeValue,
 			// Start with 1 because 0 is the fallback parser
 			i = 1,
+			lastRowIndex = -1,
 			rowIndex = 0,
 			concurrent = 0,
+			empty = 0,
 			needed = ( rows.length > 4 ) ? 5 : rows.length;
 
 		while ( i < l ) {
-			if ( rows[rowIndex] && rows[rowIndex].cells[cellIndex] ) {
-				nodeValue = $.trim( getElementSortKey( rows[rowIndex].cells[cellIndex] ) );
+			if ( rows[ rowIndex ] ) {
+				if ( rowIndex !== lastRowIndex ) {
+					lastRowIndex = rowIndex;
+					cellIndex = $( rows[ rowIndex ] ).data( 'columnToCell' )[ column ];
+					nodeValue = $.trim( getElementSortKey( rows[ rowIndex ].cells[ cellIndex ] ) );
+				}
 			} else {
 				nodeValue = '';
 			}
 
 			if ( nodeValue !== '' ) {
-				if ( parsers[i].is( nodeValue, table ) ) {
+				if ( parsers[ i ].is( nodeValue, table ) ) {
 					concurrent++;
 					rowIndex++;
 					if ( concurrent >= needed ) {
 						// Confirmed the parser for multiple cells, let's return it
-						return parsers[i];
+						return parsers[ i ];
 					}
 				} else {
 					// Check next parser, reset rows
 					i++;
 					rowIndex = 0;
 					concurrent = 0;
+					empty = 0;
 				}
 			} else {
 				// Empty cell
+				empty++;
 				rowIndex++;
-				if ( rowIndex > rows.length ) {
-					rowIndex = 0;
+				if ( rowIndex >= rows.length ) {
+					if ( concurrent >= rows.length - empty ) {
+						// Confirmed the parser for all filled cells
+						return parsers[ i ];
+					}
+					// Check next parser, reset rows
 					i++;
+					rowIndex = 0;
+					concurrent = 0;
+					empty = 0;
 				}
 			}
 		}
 
 		// 0 is always the generic parser (text)
-		return parsers[0];
+		return parsers[ 0 ];
 	}
 
 	function buildParserCache( table, $headers ) {
-		var sortType, cells, len, i, parser,
-			rows = table.tBodies[0].rows,
+		var sortType, len, j, parser,
+			rows = table.tBodies[ 0 ].rows,
+			config = $( table ).data( 'tablesorter' ).config,
 			parsers = [];
 
-		if ( rows[0] ) {
-
-			cells = rows[0].cells;
-			len = cells.length;
-
-			for ( i = 0; i < len; i++ ) {
+		if ( rows[ 0 ] ) {
+			len = config.columns;
+			for ( j = 0; j < len; j++ ) {
 				parser = false;
-				sortType = $headers.eq( i ).data( 'sortType' );
+				sortType = $headers.eq( config.columnToHeader[ j ] ).data( 'sortType' );
 				if ( sortType !== undefined ) {
 					parser = getParserById( sortType );
 				}
 
 				if ( parser === false ) {
-					parser = detectParserForColumn( table, rows, i );
+					parser = detectParserForColumn( table, rows, j );
 				}
 
 				parsers.push( parser );
@@ -180,33 +194,35 @@
 
 	function buildCache( table ) {
 		var i, j, $row, cols,
-			totalRows = ( table.tBodies[0] && table.tBodies[0].rows.length ) || 0,
-			totalCells = ( table.tBodies[0].rows[0] && table.tBodies[0].rows[0].cells.length ) || 0,
+			totalRows = ( table.tBodies[ 0 ] && table.tBodies[ 0 ].rows.length ) || 0,
 			config = $( table ).data( 'tablesorter' ).config,
 			parsers = config.parsers,
+			len = parsers.length,
+			cellIndex,
 			cache = {
 				row: [],
 				normalized: []
 			};
 
-		for ( i = 0; i < totalRows; ++i ) {
+		for ( i = 0; i < totalRows; i++ ) {
 
 			// Add the table data to main data array
-			$row = $( table.tBodies[0].rows[i] );
+			$row = $( table.tBodies[ 0 ].rows[ i ] );
 			cols = [];
 
 			// if this is a child row, add it to the last row's children and
 			// continue to the next row
 			if ( $row.hasClass( config.cssChildRow ) ) {
-				cache.row[cache.row.length - 1] = cache.row[cache.row.length - 1].add( $row );
+				cache.row[ cache.row.length - 1 ] = cache.row[ cache.row.length - 1 ].add( $row );
 				// go to the next for loop
 				continue;
 			}
 
 			cache.row.push( $row );
 
-			for ( j = 0; j < totalCells; ++j ) {
-				cols.push( parsers[j].format( getElementSortKey( $row[0].cells[j] ), table, $row[0].cells[j] ) );
+			for ( j = 0; j < len; j++ ) {
+				cellIndex = $row.data( 'columnToCell' )[ j ];
+				cols.push( parsers[ j ].format( getElementSortKey( $row[ 0 ].cells[ cellIndex ] ) ) );
 			}
 
 			cols.push( cache.normalized.length ); // add position for rowCache
@@ -222,20 +238,20 @@
 			row = cache.row,
 			normalized = cache.normalized,
 			totalRows = normalized.length,
-			checkCell = ( normalized[0].length - 1 ),
+			checkCell = ( normalized[ 0 ].length - 1 ),
 			fragment = document.createDocumentFragment();
 
 		for ( i = 0; i < totalRows; i++ ) {
-			pos = normalized[i][checkCell];
+			pos = normalized[ i ][ checkCell ];
 
-			l = row[pos].length;
+			l = row[ pos ].length;
 
 			for ( j = 0; j < l; j++ ) {
-				fragment.appendChild( row[pos][j] );
+				fragment.appendChild( row[ pos ][ j ] );
 			}
 
 		}
-		table.tBodies[0].appendChild( fragment );
+		table.tBodies[ 0 ].appendChild( fragment );
 
 		$( table ).trigger( 'sortEnd.tablesorter' );
 	}
@@ -248,7 +264,8 @@
 	 *
 	 * After this, it will look at all rows at the bottom for footer rows
 	 * And place these in a tfoot using similar rules.
-	 * @param $table jQuery object for a <table>
+	 *
+	 * @param {jQuery} $table object for a <table>
 	 */
 	function emulateTHeadAndFoot( $table ) {
 		var $thead, $tfoot, i, len,
@@ -269,26 +286,37 @@
 			$tfoot = $( '<tfoot>' );
 			len = $rows.length;
 			for ( i = len - 1; i >= 0; i-- ) {
-				if ( $( $rows[i] ).children( 'td' ).length ) {
+				if ( $( $rows[ i ] ).children( 'td' ).length ) {
 					break;
 				}
-				$tfoot.prepend( $( $rows[i] ) );
+				$tfoot.prepend( $( $rows[ i ] ) );
 			}
 			$table.append( $tfoot );
 		}
 	}
 
+	function uniqueElements( array ) {
+		var uniques = [];
+		$.each( array, function ( index, elem ) {
+			if ( elem !== undefined && $.inArray( elem, uniques ) === -1 ) {
+				uniques.push( elem );
+			}
+		} );
+		return uniques;
+	}
+
 	function buildHeaders( table, msg ) {
 		var config = $( table ).data( 'tablesorter' ).config,
 			maxSeen = 0,
 			colspanOffset = 0,
 			columns,
-			i,
+			k,
 			$cell,
 			rowspan,
 			colspan,
 			headerCount,
 			longestTR,
+			headerIndex,
 			exploded,
 			$tableHeaders = $( [] ),
 			$tableRows = $( 'thead:eq(0) > tr', table );
@@ -307,7 +335,7 @@
 					colspan = Number( cell.colSpan );
 
 					// Skip the spots in the exploded matrix that are already filled
-					while ( exploded[rowIndex] && exploded[rowIndex][columnIndex] !== undefined ) {
+					while ( exploded[ rowIndex ] && exploded[ rowIndex ][ columnIndex ] !== undefined ) {
 						++columnIndex;
 					}
 
@@ -315,10 +343,10 @@
 					// in the exploded matrix rowspan times colspan times, with the proper offsets
 					for ( matrixColumnIndex = columnIndex; matrixColumnIndex < columnIndex + colspan; ++matrixColumnIndex ) {
 						for ( matrixRowIndex = rowIndex; matrixRowIndex < rowIndex + rowspan; ++matrixRowIndex ) {
-							if ( !exploded[matrixRowIndex] ) {
-								exploded[matrixRowIndex] = [];
+							if ( !exploded[ matrixRowIndex ] ) {
+								exploded[ matrixRowIndex ] = [];
 							}
-							exploded[matrixRowIndex][matrixColumnIndex] = cell;
+							exploded[ matrixRowIndex ][ matrixColumnIndex ] = cell;
 						}
 					}
 				} );
@@ -332,49 +360,65 @@
 				}
 			} );
 			// We cannot use $.unique() here because it sorts into dom order, which is undesirable
-			$tableHeaders = $( uniqueElements( exploded[longestTR] ) ).filter( 'th' );
+			$tableHeaders = $( uniqueElements( exploded[ longestTR ] ) ).filter( 'th' );
 		}
 
 		// as each header can span over multiple columns (using colspan=N),
 		// we have to bidirectionally map headers to their columns and columns to their headers
-		$tableHeaders.each( function ( headerIndex ) {
+		config.columnToHeader = [];
+		config.headerToColumns = [];
+		config.headerList = [];
+		headerIndex = 0;
+		$tableHeaders.each( function () {
 			$cell = $( this );
 			columns = [];
 
-			for ( i = 0; i < this.colSpan; i++ ) {
-				config.columnToHeader[ colspanOffset + i ] = headerIndex;
-				columns.push( colspanOffset + i );
-			}
-
-			config.headerToColumns[ headerIndex ] = columns;
-			colspanOffset += this.colSpan;
-
-			$cell.data( {
-				headerIndex: headerIndex,
-				order: 0,
-				count: 0
-			} );
-
-			if ( $cell.hasClass( config.unsortableClass ) ) {
-				$cell.data( 'sortDisabled', true );
-			}
-
-			if ( !$cell.data( 'sortDisabled' ) ) {
+			if ( !$cell.hasClass( config.unsortableClass ) ) {
 				$cell
 					.addClass( config.cssHeader )
 					.prop( 'tabIndex', 0 )
 					.attr( {
 						role: 'columnheader button',
-						title: msg[1]
+						title: msg[ 1 ]
 					} );
+
+				for ( k = 0; k < this.colSpan; k++ ) {
+					config.columnToHeader[ colspanOffset + k ] = headerIndex;
+					columns.push( colspanOffset + k );
+				}
+
+				config.headerToColumns[ headerIndex ] = columns;
+
+				$cell.data( {
+					headerIndex: headerIndex,
+					order: 0,
+					count: 0
+				} );
+
+				// add only sortable cells to headerList
+				config.headerList[ headerIndex ] = this;
+				headerIndex++;
 			}
 
-			// add cell to headerList
-			config.headerList[headerIndex] = this;
+			colspanOffset += this.colSpan;
 		} );
 
-		return $tableHeaders;
+		// number of columns with extended colspan, inclusive unsortable
+		// parsers[j], cache[][j], columnToHeader[j], columnToCell[j] have so many elements
+		config.columns = colspanOffset;
 
+		return $tableHeaders.not( '.' + config.unsortableClass );
+	}
+
+	function isValueInArray( v, a ) {
+		var i,
+				len = a.length;
+		for ( i = 0; i < len; i++ ) {
+			if ( a[ i ][ 0 ] === v ) {
+				return true;
+			}
+		}
+		return false;
 	}
 
 	/**
@@ -390,7 +434,7 @@
 		$.each( headerToColumns, function ( headerIndex, columns ) {
 
 			$.each( columns, function ( i, columnIndex ) {
-				var header = $headers[headerIndex],
+				var header = $headers[ headerIndex ],
 					$header = $( header );
 
 				if ( !isValueInArray( columnIndex, sortList ) ) {
@@ -402,10 +446,10 @@
 				} else {
 					// Column shall be sorted: Apply designated count and order.
 					$.each( sortList, function ( j, sortColumn ) {
-						if ( sortColumn[0] === i ) {
+						if ( sortColumn[ 0 ] === i ) {
 							$header.data( {
-								order: sortColumn[1],
-								count: sortColumn[1] + 1
+								order: sortColumn[ 1 ],
+								count: sortColumn[ 1 ] + 1
 							} );
 							return false;
 						}
@@ -416,35 +460,14 @@
 		} );
 	}
 
-	function isValueInArray( v, a ) {
-		var i,
-			len = a.length;
-		for ( i = 0; i < len; i++ ) {
-			if ( a[i][0] === v ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	function uniqueElements( array ) {
-		var uniques = [];
-		$.each( array, function ( index, elem ) {
-			if ( elem !== undefined && $.inArray( elem, uniques ) === -1 ) {
-				uniques.push( elem );
-			}
-		} );
-		return uniques;
-	}
-
 	function setHeadersCss( table, $headers, list, css, msg, columnToHeader ) {
 		// Remove all header information and reset titles to default message
-		$headers.removeClass( css[0] ).removeClass( css[1] ).attr( 'title', msg[1] );
+		$headers.removeClass( css[ 0 ] ).removeClass( css[ 1 ] ).attr( 'title', msg[ 1 ] );
 
 		for ( var i = 0; i < list.length; i++ ) {
-			$headers.eq( columnToHeader[ list[i][0] ] )
-				.addClass( css[ list[i][1] ] )
-				.attr( 'title', msg[ list[i][1] ] );
+			$headers.eq( columnToHeader[ list[ i ][ 0 ] ] )
+				.addClass( css[ list[ i ][ 1 ] ] )
+				.attr( 'title', msg[ list[ i ][ 1 ] ] );
 		}
 	}
 
@@ -461,19 +484,19 @@
 			sortFn = [],
 			len = sortList.length;
 		for ( i = 0; i < len; i++ ) {
-			sortFn[i] = ( sortList[i][1] ) ? sortTextDesc : sortText;
+			sortFn[ i ] = ( sortList[ i ][ 1 ] ) ? sortTextDesc : sortText;
 		}
 		cache.normalized.sort( function ( array1, array2 ) {
 			var i, col, ret;
 			for ( i = 0; i < len; i++ ) {
-				col = sortList[i][0];
-				ret = sortFn[i].call( this, array1[col], array2[col] );
+				col = sortList[ i ][ 0 ];
+				ret = sortFn[ i ].call( this, array1[ col ], array2[ col ] );
 				if ( ret !== 0 ) {
 					return ret;
 				}
 			}
 			// Fall back to index number column to ensure stable sort
-			return sortText.call( this, array1[array1.length - 1], array2[array2.length - 1] );
+			return sortText.call( this, array1[ array1.length - 1 ], array2[ array2.length - 1 ] );
 		} );
 		return cache;
 	}
@@ -484,19 +507,19 @@
 			separatorTransformTable = mw.config.get( 'wgSeparatorTransformTable' ),
 			digitTransformTable = mw.config.get( 'wgDigitTransformTable' );
 
-		if ( separatorTransformTable === null || ( separatorTransformTable[0] === '' && digitTransformTable[2] === '' ) ) {
+		if ( separatorTransformTable === null || ( separatorTransformTable[ 0 ] === '' && digitTransformTable[ 2 ] === '' ) ) {
 			ts.transformTable = false;
 		} else {
 			ts.transformTable = {};
 
 			// Unpack the transform table
-			ascii = separatorTransformTable[0].split( '\t' ).concat( digitTransformTable[0].split( '\t' ) );
-			localised = separatorTransformTable[1].split( '\t' ).concat( digitTransformTable[1].split( '\t' ) );
+			ascii = separatorTransformTable[ 0 ].split( '\t' ).concat( digitTransformTable[ 0 ].split( '\t' ) );
+			localised = separatorTransformTable[ 1 ].split( '\t' ).concat( digitTransformTable[ 1 ].split( '\t' ) );
 
 			// Construct regex for number identification
 			for ( i = 0; i < ascii.length; i++ ) {
-				ts.transformTable[localised[i]] = ascii[i];
-				digits.push( mw.RegExp.escape( localised[i] ) );
+				ts.transformTable[ localised[ i ] ] = ascii[ i ];
+				digits.push( mw.RegExp.escape( localised[ i ] ) );
 			}
 		}
 		digitClass = '[' + digits.join( '', digits ) + ']';
@@ -515,14 +538,14 @@
 		ts.monthNames = {};
 
 		for ( i = 0; i < 12; i++ ) {
-			name = mw.language.months.names[i].toLowerCase();
-			ts.monthNames[name] = i + 1;
+			name = mw.language.months.names[ i ].toLowerCase();
+			ts.monthNames[ name ] = i + 1;
 			regex.push( mw.RegExp.escape( name ) );
-			name = mw.language.months.genitive[i].toLowerCase();
-			ts.monthNames[name] = i + 1;
+			name = mw.language.months.genitive[ i ].toLowerCase();
+			ts.monthNames[ name ] = i + 1;
 			regex.push( mw.RegExp.escape( name ) );
-			name = mw.language.months.abbrev[i].toLowerCase().replace( '.', '' );
-			ts.monthNames[name] = i + 1;
+			name = mw.language.months.abbrev[ i ].toLowerCase().replace( '.', '' );
+			ts.monthNames[ name ] = i + 1;
 			regex.push( mw.RegExp.escape( name ) );
 		}
 
@@ -531,13 +554,13 @@
 
 		// Build RegEx
 		// Any date formated with . , ' - or /
-		ts.dateRegex[0] = new RegExp( /^\s*(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{2,4})\s*?/i );
+		ts.dateRegex[ 0 ] = new RegExp( /^\s*(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{1,2})[\,\.\-\/'\s]{1,2}(\d{2,4})\s*?/i );
 
 		// Written Month name, dmy
-		ts.dateRegex[1] = new RegExp( '^\\s*(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' );
+		ts.dateRegex[ 1 ] = new RegExp( '^\\s*(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' );
 
 		// Written Month name, mdy
-		ts.dateRegex[2] = new RegExp( '^\\s*(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' );
+		ts.dateRegex[ 2 ] = new RegExp( '^\\s*(' + regex + ')' + '[\\,\\.\\-\\/\'\\s]+(\\d{1,2})[\\,\\.\\-\\/\'\\s]+(\\d{2,4})\\s*$', 'i' );
 
 	}
 
@@ -545,7 +568,7 @@
 	 * Replace all rowspanned cells in the body with clones in each row, so sorting
 	 * need not worry about them.
 	 *
-	 * @param $table jQuery object for a <table>
+	 * @param {jQuery} $table jQuery object for a <table>
 	 */
 	function explodeRowspans( $table ) {
 		var spanningRealCellIndex, rowSpan, colSpan,
@@ -565,11 +588,11 @@
 				col = 0,
 				l = this.cells.length;
 			for ( i = 0; i < l; i++ ) {
-				$( this.cells[i] ).data( 'tablesorter', {
+				$( this.cells[ i ] ).data( 'tablesorter', {
 					realCellIndex: col,
 					realRowIndex: this.rowIndex
 				} );
-				col += this.cells[i].colSpan;
+				col += this.cells[ i ].colSpan;
 			}
 		} );
 
@@ -608,7 +631,7 @@
 		}
 
 		while ( rowspanCells.length ) {
-			if ( $.data( rowspanCells[0], 'tablesorter' ).needResort ) {
+			if ( $.data( rowspanCells[ 0 ], 'tablesorter' ).needResort ) {
 				resortCells();
 			}
 
@@ -620,7 +643,7 @@
 			cell.rowSpan = 1;
 			$nextRows = $( cell ).parent().nextAll();
 			for ( i = 0; i < rowSpan - 1; i++ ) {
-				$tds = $( $nextRows[i].cells ).filter( filterfunc );
+				$tds = $( $nextRows[ i ].cells ).filter( filterfunc );
 				$clone = $( cell ).clone();
 				$clone.data( 'tablesorter', {
 					realCellIndex: spanningRealCellIndex,
@@ -637,6 +660,49 @@
 		}
 	}
 
+	/**
+	 * Build index to handle colspanned cells in the body.
+	 * Set the cell index for each column in an array,
+	 * so that colspaned cells set multiple in this array.
+	 * columnToCell[collumnIndex] point at the real cell in this row.
+	 *
+	 * @param {jQuery} $table object for a <table>
+	 */
+	function manageColspans( $table ) {
+		var i, j, k, $row,
+			$rows = $table.find( '> tbody > tr' ),
+			totalRows = $rows.length || 0,
+			config = $table.data( 'tablesorter' ).config,
+			columns = config.columns,
+			columnToCell, cellsInRow, index;
+
+		for ( i = 0; i < totalRows; i++ ) {
+
+			$row = $rows.eq( i );
+			// if this is a child row, continue to the next row (as buildCache())
+			if ( $row.hasClass( config.cssChildRow ) ) {
+				// go to the next for loop
+				continue;
+			}
+
+			columnToCell = [];
+			cellsInRow = ( $row[ 0 ].cells.length ) || 0;  // all cells in this row
+			index = 0; // real cell index in this row
+			for ( j = 0; j < columns; index++ ) {
+				if ( index === cellsInRow ) {
+					// Row with cells less than columns: add empty cell
+					$row.append( '<td>' );
+					cellsInRow++;
+				}
+				for ( k = 0; k < $row[ 0 ].cells[ index ].colSpan; k++ ) {
+					columnToCell[ j++ ] = index;
+				}
+			}
+			// Store it in $row
+			$row.data( 'columnToCell', columnToCell );
+		}
+	}
+
 	function buildCollationTable() {
 		ts.collationTable = mw.config.get( 'tableSorterCollation' );
 		ts.collationRegex = null;
@@ -698,7 +764,7 @@
 		$.each( sortObjects, function ( i, sortObject ) {
 			$.each( sortObject, function ( columnIndex, order ) {
 				var orderIndex = ( order === 'desc' ) ? 1 : 0;
-				sortList.push( [parseInt( columnIndex, 10 ), orderIndex] );
+				sortList.push( [ parseInt( columnIndex, 10 ), orderIndex ] );
 			} );
 		} );
 		return sortList;
@@ -714,20 +780,21 @@
 				cssChildRow: 'expand-child',
 				sortMultiSortKey: 'shiftKey',
 				unsortableClass: 'unsortable',
-				parsers: {},
+				parsers: [],
 				cancelSelection: true,
 				sortList: [],
 				headerList: [],
 				headerToColumns: [],
-				columnToHeader: []
+				columnToHeader: [],
+				columns: 0
 			},
 
 			dateRegex: [],
 			monthNames: {},
 
 			/**
-			 * @param $tables {jQuery}
-			 * @param settings {Object} (optional)
+			 * @param {jQuery} $tables
+			 * @param {Object} [settings]
 			 */
 			construct: function ( $tables, settings ) {
 				return $tables.each( function ( i, table ) {
@@ -797,6 +864,7 @@
 						}
 
 						explodeRowspans( $table );
+						manageColspans( $table );
 
 						// Try to auto detect column type, and store in tables config
 						config.parsers = buildParserCache( table, $headers );
@@ -804,7 +872,7 @@
 
 					// Apply event handling to headers
 					// this is too big, perhaps break it out?
-					$headers.not( '.' + config.unsortableClass ).on( 'keypress click', function ( e ) {
+					$headers.on( 'keypress click', function ( e ) {
 						var cell, $cell, columns, newSortList, i,
 							totalRows,
 							j, s, o;
@@ -832,8 +900,8 @@
 						// cells get event .change() and bubbles up to the <table> here
 						cache = buildCache( table );
 
-						totalRows = ( $table[0].tBodies[0] && $table[0].tBodies[0].rows.length ) || 0;
-						if ( !table.sortDisabled && totalRows > 0 ) {
+						totalRows = ( $table[ 0 ].tBodies[ 0 ] && $table[ 0 ].tBodies[ 0 ].rows.length ) || 0;
+						if ( totalRows > 0 ) {
 							cell = this;
 							$cell = $( cell );
 
@@ -848,12 +916,12 @@
 							columns = config.headerToColumns[ $cell.data( 'headerIndex' ) ];
 							newSortList = $.map( columns, function ( c ) {
 								// jQuery "helpfully" flattens the arrays...
-								return [[c, $cell.data( 'order' )]];
+								return [ [ c, $cell.data( 'order' ) ] ];
 							} );
 							// Index of first column belonging to this header
-							i = columns[0];
+							i = columns[ 0 ];
 
-							if ( !e[config.sortMultiSortKey] ) {
+							if ( !e[ config.sortMultiSortKey ] ) {
 								// User only wants to sort on one column set
 								// Flush the sort list and add new columns
 								config.sortList = newSortList;
@@ -865,11 +933,11 @@
 									// The user has clicked on an already sorted column.
 									// Reverse the sorting direction for all tables.
 									for ( j = 0; j < config.sortList.length; j++ ) {
-										s = config.sortList[j];
-										o = config.headerList[s[0]];
-										if ( isValueInArray( s[0], newSortList ) ) {
-											$( o ).data( 'count', s[1] + 1 );
-											s[1] = $( o ).data( 'count' ) % 2;
+										s = config.sortList[ j ];
+										o = config.headerList[ config.columnToHeader[ s[ 0 ] ] ];
+										if ( isValueInArray( s[ 0 ], newSortList ) ) {
+											$( o ).data( 'count', s[ 1 ] + 1 );
+											s[ 1 ] = $( o ).data( 'count' ) % 2;
 										}
 									}
 								} else {
@@ -882,9 +950,9 @@
 							setHeadersOrder( $headers, config.sortList, config.headerToColumns );
 
 							// Set CSS for headers
-							setHeadersCss( $table[0], $headers, config.sortList, sortCSS, sortMsg, config.columnToHeader );
+							setHeadersCss( $table[ 0 ], $headers, config.sortList, sortCSS, sortMsg, config.columnToHeader );
 							appendToTable(
-								$table[0], multisort( $table[0], config.sortList, cache )
+								$table[ 0 ], multisort( $table[ 0 ], config.sortList, cache )
 							);
 
 							// Stop normal event by returning false
@@ -907,7 +975,7 @@
 					 * Passing an empty array will reset sorting (basically just reset the headers
 					 * making the table appear unsorted).
 					 *
-					 * @param sortList {Array} (optional) List of sort objects.
+					 * @param {Array} [sortList] List of sort objects.
 					 */
 					$table.data( 'tablesorter' ).sort = function ( sortList ) {
 
@@ -937,7 +1005,6 @@
 
 					// sort initially
 					if ( config.sortList.length > 0 ) {
-						setupForFirstSort();
 						config.sortList = convertSortList( config.sortList );
 						$table.data( 'tablesorter' ).sort();
 					}
@@ -950,7 +1017,7 @@
 					len = parsers.length,
 					a = true;
 				for ( i = 0; i < len; i++ ) {
-					if ( parsers[i].id.toLowerCase() === parser.id.toLowerCase() ) {
+					if ( parsers[ i ].id.toLowerCase() === parser.id.toLowerCase() ) {
 						a = false;
 					}
 				}
@@ -966,7 +1033,7 @@
 					for ( p = 0; p < s.length; p++ ) {
 						c = s.charAt( p );
 						if ( c in ts.transformTable ) {
-							out += ts.transformTable[c];
+							out += ts.transformTable[ c ];
 						} else {
 							out += c;
 						}
@@ -988,7 +1055,7 @@
 			},
 
 			clearTableBody: function ( table ) {
-				$( table.tBodies[0] ).empty();
+				$( table.tBodies[ 0 ] ).empty();
 			},
 
 			getParser: function ( id ) {
@@ -998,6 +1065,10 @@
 				buildCollationTable();
 
 				return getParserById( id );
+			},
+
+			getParsers: function () {  // for table diagnosis
+				return parsers;
 			}
 		};
 
@@ -1020,7 +1091,7 @@
 			if ( ts.collationRegex ) {
 				var tsc = ts.collationTable;
 				s = s.replace( ts.collationRegex, function ( match ) {
-					var r = tsc[match] ? tsc[match] : tsc[match.toUpperCase()];
+					var r = tsc[ match ] ? tsc[ match ] : tsc[ match.toUpperCase() ];
 					return r.toLowerCase();
 				} );
 			}
@@ -1032,7 +1103,7 @@
 	ts.addParser( {
 		id: 'IPAddress',
 		is: function ( s ) {
-			return ts.rgx.IPAddress[0].test( s );
+			return ts.rgx.IPAddress[ 0 ].test( s );
 		},
 		format: function ( s ) {
 			var i, item,
@@ -1040,7 +1111,7 @@
 				r = '',
 				len = a.length;
 			for ( i = 0; i < len; i++ ) {
-				item = a[i];
+				item = a[ i ];
 				if ( item.length === 1 ) {
 					r += '00' + item;
 				} else if ( item.length === 2 ) {
@@ -1057,10 +1128,10 @@
 	ts.addParser( {
 		id: 'currency',
 		is: function ( s ) {
-			return ts.rgx.currency[0].test( s );
+			return ts.rgx.currency[ 0 ].test( s );
 		},
 		format: function ( s ) {
-			return $.tablesorter.formatDigit( s.replace( ts.rgx.currency[1], '' ) );
+			return $.tablesorter.formatDigit( s.replace( ts.rgx.currency[ 1 ], '' ) );
 		},
 		type: 'numeric'
 	} );
@@ -1068,10 +1139,10 @@
 	ts.addParser( {
 		id: 'url',
 		is: function ( s ) {
-			return ts.rgx.url[0].test( s );
+			return ts.rgx.url[ 0 ].test( s );
 		},
 		format: function ( s ) {
-			return $.trim( s.replace( ts.rgx.url[1], '' ) );
+			return $.trim( s.replace( ts.rgx.url[ 1 ], '' ) );
 		},
 		type: 'text'
 	} );
@@ -1079,7 +1150,7 @@
 	ts.addParser( {
 		id: 'isoDate',
 		is: function ( s ) {
-			return ts.rgx.isoDate[0].test( s );
+			return ts.rgx.isoDate[ 0 ].test( s );
 		},
 		format: function ( s ) {
 			return $.tablesorter.formatFloat( ( s !== '' ) ? new Date( s.replace(
@@ -1091,7 +1162,7 @@
 	ts.addParser( {
 		id: 'usLongDate',
 		is: function ( s ) {
-			return ts.rgx.usLongDate[0].test( s );
+			return ts.rgx.usLongDate[ 0 ].test( s );
 		},
 		format: function ( s ) {
 			return $.tablesorter.formatFloat( new Date( s ).getTime() );
@@ -1102,49 +1173,49 @@
 	ts.addParser( {
 		id: 'date',
 		is: function ( s ) {
-			return ( ts.dateRegex[0].test( s ) || ts.dateRegex[1].test( s ) || ts.dateRegex[2].test( s ) );
+			return ( ts.dateRegex[ 0 ].test( s ) || ts.dateRegex[ 1 ].test( s ) || ts.dateRegex[ 2 ].test( s ) );
 		},
 		format: function ( s ) {
 			var match, y;
 			s = $.trim( s.toLowerCase() );
 
-			if ( ( match = s.match( ts.dateRegex[0] ) ) !== null ) {
+			if ( ( match = s.match( ts.dateRegex[ 0 ] ) ) !== null ) {
 				if ( mw.config.get( 'wgDefaultDateFormat' ) === 'mdy' || mw.config.get( 'wgPageContentLanguage' ) === 'en' ) {
-					s = [ match[3], match[1], match[2] ];
+					s = [ match[ 3 ], match[ 1 ], match[ 2 ] ];
 				} else if ( mw.config.get( 'wgDefaultDateFormat' ) === 'dmy' ) {
-					s = [ match[3], match[2], match[1] ];
+					s = [ match[ 3 ], match[ 2 ], match[ 1 ] ];
 				} else {
 					// If we get here, we don't know which order the dd-dd-dddd
 					// date is in. So return something not entirely invalid.
 					return '99999999';
 				}
-			} else if ( ( match = s.match( ts.dateRegex[1] ) ) !== null ) {
-				s = [ match[3], String( ts.monthNames[match[2]] ), match[1] ];
-			} else if ( ( match = s.match( ts.dateRegex[2] ) ) !== null ) {
-				s = [ match[3], String( ts.monthNames[match[1]] ), match[2] ];
+			} else if ( ( match = s.match( ts.dateRegex[ 1 ] ) ) !== null ) {
+				s = [ match[ 3 ], String( ts.monthNames[ match[ 2 ] ] ), match[ 1 ] ];
+			} else if ( ( match = s.match( ts.dateRegex[ 2 ] ) ) !== null ) {
+				s = [ match[ 3 ], String( ts.monthNames[ match[ 1 ] ] ), match[ 2 ] ];
 			} else {
 				// Should never get here
 				return '99999999';
 			}
 
 			// Pad Month and Day
-			if ( s[1].length === 1 ) {
-				s[1] = '0' + s[1];
+			if ( s[ 1 ].length === 1 ) {
+				s[ 1 ] = '0' + s[ 1 ];
 			}
-			if ( s[2].length === 1 ) {
-				s[2] = '0' + s[2];
+			if ( s[ 2 ].length === 1 ) {
+				s[ 2 ] = '0' + s[ 2 ];
 			}
 
-			if ( ( y = parseInt( s[0], 10 ) ) < 100 ) {
+			if ( ( y = parseInt( s[ 0 ], 10 ) ) < 100 ) {
 				// Guestimate years without centuries
 				if ( y < 30 ) {
-					s[0] = 2000 + y;
+					s[ 0 ] = 2000 + y;
 				} else {
-					s[0] = 1900 + y;
+					s[ 0 ] = 1900 + y;
 				}
 			}
-			while ( s[0].length < 4 ) {
-				s[0] = '0' + s[0];
+			while ( s[ 0 ].length < 4 ) {
+				s[ 0 ] = '0' + s[ 0 ];
 			}
 			return parseInt( s.join( '' ), 10 );
 		},
@@ -1154,7 +1225,7 @@
 	ts.addParser( {
 		id: 'time',
 		is: function ( s ) {
-			return ts.rgx.time[0].test( s );
+			return ts.rgx.time[ 0 ].test( s );
 		},
 		format: function ( s ) {
 			return $.tablesorter.formatFloat( new Date( '2000/01/01 ' + s ).getTime() );
diff --git a/resources/src/jquery/jquery.textSelection.js b/resources/src/jquery/jquery.textSelection.js
index 5111930517..b901642495 100644
--- a/resources/src/jquery/jquery.textSelection.js
+++ b/resources/src/jquery/jquery.textSelection.js
@@ -138,7 +138,7 @@
 							insertText = '',
 							selTextArr = selText.split( '\n' );
 						for ( i = 0; i < selTextArr.length; i++ ) {
-							insertText += pre + selTextArr[i] + post;
+							insertText += pre + selTextArr[ i ] + post;
 							if ( i !== selTextArr.length - 1 ) {
 								insertText += '\n';
 							}
@@ -160,7 +160,7 @@
 								context.fn.restoreCursorAndScrollTop();
 							}
 							if ( options.selectionStart !== undefined ) {
-								$( this ).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
+								$( this ).textSelection( 'setSelection', { start: options.selectionStart, end: options.selectionEnd } );
 							}
 
 							selText = $( this ).textSelection( 'getSelection' );
@@ -203,7 +203,7 @@
 
 							$( this ).focus();
 							if ( options.selectionStart !== undefined ) {
-								$( this ).textSelection( 'setSelection', { 'start': options.selectionStart, 'end': options.selectionEnd } );
+								$( this ).textSelection( 'setSelection', { start: options.selectionStart, end: options.selectionEnd } );
 							}
 
 							selText = $( this ).textSelection( 'getSelection' );
@@ -411,7 +411,8 @@
 			 *
 			 * Scroll a textarea to the current cursor position. You can set the cursor
 			 * position with setSelection()
-			 * @param options boolean Whether to force a scroll even if the caret position
+			 *
+			 * @param {boolean} options Whether to force a scroll even if the caret position
 			 *  is already visible. Defaults to false
 			 *
 			 * @fixme document the options parameters (function body suggests options.force is a boolean, not options itself)
@@ -576,7 +577,7 @@
 			context.fn.restoreSelection();
 			needSave = true;
 		}
-		retval = ( alternateFn && alternateFn[command] || fn[command] ).call( this, options );
+		retval = ( alternateFn && alternateFn[ command ] || fn[ command ] ).call( this, options );
 		if ( hasWikiEditor && needSave ) {
 			context.fn.saveSelection();
 		}
diff --git a/resources/src/mediawiki.action/images/checker.png b/resources/src/mediawiki.action/images/checker.png
new file mode 100644
index 0000000000..3e9e3d0969
Binary files /dev/null and b/resources/src/mediawiki.action/images/checker.png differ
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
index e181472dfc..011f9c55ef 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.collapsibleFooter.js
@@ -53,9 +53,9 @@
 		for ( i = 0; i < collapsibleLists.length; i++ ) {
 			// Pass to a function for iteration-local variables
 			handleOne(
-				$editForm.find( collapsibleLists[i].listSel ),
-				$editForm.find( collapsibleLists[i].togglerSel ),
-				collapsibleLists[i].cookieName
+				$editForm.find( collapsibleLists[ i ].listSel ),
+				$editForm.find( collapsibleLists[ i ].togglerSel ),
+				collapsibleLists[ i ].cookieName
 			);
 		}
 	} );
diff --git a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
index 5f1058f14b..ab4535b66e 100644
--- a/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
+++ b/resources/src/mediawiki.action/mediawiki.action.edit.preview.js
@@ -17,6 +17,7 @@
 		$editform = $( '#editform' );
 		$textbox = $editform.find( '#wpTextbox1' );
 		$summary = $editform.find( '#wpSummary' );
+		$spinner = $( '.mw-spinner-preview' );
 		$errorBox = $( '.errorbox' );
 		section = $editform.find( '[name="wpSection"]' ).val();
 
@@ -36,7 +37,7 @@
 		$wikiPreview.show();
 
 		// Jump to where the preview will appear
-		$wikiPreview[0].scrollIntoView();
+		$wikiPreview[ 0 ].scrollIntoView();
 
 		copySelectors = [
 			// Main
@@ -55,14 +56,17 @@
 		// Not shown during normal preview, to be removed if present
 		$( '.mw-newarticletext' ).remove();
 
-		$spinner = $.createSpinner( {
-			size: 'large',
-			type: 'block'
-		} );
-		$wikiPreview.before( $spinner );
-		$spinner.css( {
-			marginTop: $spinner.height()
-		} );
+		if ( $spinner.length === 0 ) {
+			$spinner = $.createSpinner( {
+				size: 'large',
+				type: 'block'
+			} )
+				.addClass( 'mw-spinner-preview' )
+				.css( 'margin-top', '1em' );
+			$wikiPreview.before( $spinner );
+		} else {
+			$spinner.show();
+		}
 
 		// Can't use fadeTo because it calls show(), and we might want to keep some elements hidden
 		// (e.g. empty #catlinks)
@@ -98,7 +102,7 @@
 					indexpageids: '',
 					prop: 'revisions',
 					titles: mw.config.get( 'wgPageName' ),
-					rvdifftotext: response.parse.text['*'],
+					rvdifftotext: response.parse.text[ '*' ],
 					rvprop: ''
 				};
 				if ( section !== '' ) {
@@ -106,8 +110,8 @@
 				}
 				return api.post( postData ).done( function ( result2 ) {
 					try {
-						var diffHtml = result2.query.pages[result2.query.pageids[0]]
-							.revisions[0].diff['*'];
+						var diffHtml = result2.query.pages[ result2.query.pageids[ 0 ] ]
+							.revisions[ 0 ].diff[ '*' ];
 						$wikiDiff.find( 'table.diff tbody' ).html( diffHtml );
 					} catch ( e ) {
 						// "result.blah is undefined" error, ignore
@@ -151,7 +155,7 @@
 					);
 				}
 				if ( response.parse.categorieshtml ) {
-					$( '#catlinks' ).replaceWith( response.parse.categorieshtml['*'] );
+					$( '#catlinks' ).replaceWith( response.parse.categorieshtml[ '*' ] );
 				}
 				if ( response.parse.templates ) {
 					newList = [];
@@ -159,10 +163,10 @@
 						li = $( '<li>' )
 							.append( $( '<a>' )
 								.attr( {
-									'href': mw.util.getUrl( template['*'] ),
+									href: mw.util.getUrl( template[ '*' ] ),
 									'class': ( template.exists !== undefined ? '' : 'new' )
 								} )
-								.text( template['*'] )
+								.text( template[ '*' ] )
 							);
 						newList.push( li );
 					} );
@@ -170,7 +174,7 @@
 					$editform.find( '.templatesUsed .mw-editfooter-list' ).detach().empty().append( newList ).appendTo( '.templatesUsed' );
 				}
 				if ( response.parse.limitreporthtml ) {
-					$( '.limitreport' ).html( response.parse.limitreporthtml['*'] );
+					$( '.limitreport' ).html( response.parse.limitreporthtml[ '*' ] );
 				}
 				if ( response.parse.langlinks && mw.config.get( 'skin' ) === 'vector' ) {
 					newList = [];
@@ -179,10 +183,10 @@
 							.addClass( 'interlanguage-link interwiki-' + langlink.lang )
 							.append( $( '<a>' )
 								.attr( {
-									'href': langlink.url,
-									'title': langlink['*'] + ' - ' + langlink.langname,
-									'lang': langlink.lang,
-									'hreflang': langlink.lang
+									href: langlink.url,
+									title: langlink[ '*' ] + ' - ' + langlink.langname,
+									lang: langlink.lang,
+									hreflang: langlink.lang
 								} )
 								.text( langlink.autonym )
 							);
@@ -193,11 +197,11 @@
 					$list.detach().empty().append( newList ).prependTo( $parent );
 				}
 
-				if ( response.parse.text['*'] ) {
+				if ( response.parse.text[ '*' ] ) {
 					$content = $wikiPreview.children( '.mw-content-ltr,.mw-content-rtl' );
 					$content
 						.detach()
-						.html( response.parse.text['*'] );
+						.html( response.parse.text[ '*' ] );
 
 					mw.hook( 'wikipage.content' ).fire( $content );
 
@@ -213,21 +217,21 @@
 			var isSubject = ( section === 'new' ),
 				summaryMsg = isSubject ? 'subject-preview' : 'summary-preview',
 				$summaryPreview = $editform.find( '.mw-summary-preview' ).empty();
-			if ( response.parse.parsedsummary && response.parse.parsedsummary['*'] !== '' ) {
+			if ( response.parse.parsedsummary && response.parse.parsedsummary[ '*' ] !== '' ) {
 				$summaryPreview.append(
 					mw.message( summaryMsg ).parse(),
 					' ',
 					$( '<span>' ).addClass( 'comment' ).html(
 						// There is no equivalent to rawParams
 						mw.message( 'parentheses' ).escaped()
-							.replace( '$1', response.parse.parsedsummary['*'] )
+							.replace( '$1', response.parse.parsedsummary[ '*' ] )
 					)
 				);
 			}
 			mw.hook( 'wikipage.editform' ).fire( $editform );
 		} );
 		request.always( function () {
-			$spinner.remove();
+			$spinner.hide();
 			$copyElements.animate( {
 				opacity: 1
 			}, 'fast' );
@@ -268,9 +272,9 @@
 			$( '.portal:last' ).after(
 				$( '<div>' ).attr( {
 					'class': 'portal',
-					'id': 'p-lang',
-					'role': 'navigation',
-					'title': mw.msg( 'tooltip-p-lang' ),
+					id: 'p-lang',
+					role: 'navigation',
+					title: mw.msg( 'tooltip-p-lang' ),
 					'aria-labelledby': 'p-lang-label'
 				} )
 				.append( $( '<h3>' ).attr( 'id', 'p-lang-label' ).text( mw.msg( 'otherlanguages' ) ) )
diff --git a/resources/src/mediawiki.action/mediawiki.action.history.js b/resources/src/mediawiki.action/mediawiki.action.history.js
index 2ebfe921aa..077d5e3a09 100644
--- a/resources/src/mediawiki.action/mediawiki.action.history.js
+++ b/resources/src/mediawiki.action/mediawiki.action.history.js
@@ -9,7 +9,7 @@ jQuery( function ( $ ) {
 	/**
 	 * @ignore
 	 * @context {Element} input
-	 * @param e {jQuery.Event}
+	 * @param {jQuery.Event} e
 	 */
 	function updateDiffRadios() {
 		var nextState = 'before',
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.css b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
new file mode 100644
index 0000000000..bfc201afc7
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.css
@@ -0,0 +1,71 @@
+/*!
+ * File description page
+ */
+
+div.mw-filepage-resolutioninfo {
+	font-size: smaller;
+}
+
+/*
+ * File histories
+ */
+h2#filehistory {
+	clear: both;
+}
+
+table.filehistory th,
+table.filehistory td {
+	vertical-align: top;
+}
+
+table.filehistory th {
+	text-align: left;
+}
+
+table.filehistory td.mw-imagepage-filesize,
+table.filehistory th.mw-imagepage-filesize {
+	white-space: nowrap;
+}
+
+table.filehistory td.filehistory-selected {
+	font-weight: bold;
+}
+
+/*
+ * Add a checkered background image on hover for file
+ * description pages. (bug 26470)
+ */
+.filehistory a img,
+#file img:hover {
+	/* @embed */
+	background: white url(images/checker.png) repeat;
+}
+
+/*
+ * filetoc
+ */
+ul#filetoc {
+	text-align: center;
+	border: 1px solid #aaaaaa;
+	background-color: #f9f9f9;
+	padding: 5px;
+	font-size: 95%;
+	margin-bottom: 0.5em;
+	margin-left: 0;
+	margin-right: 0;
+}
+
+#filetoc li {
+	display: inline;
+	list-style-type: none;
+	padding-right: 2em;
+}
+
+/*
+ * Shared images hint
+ */
+#shared-image-dup,
+#shared-image-conflict {
+	font-style: italic;
+}
+
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css b/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
new file mode 100644
index 0000000000..15b20f10b4
--- /dev/null
+++ b/resources/src/mediawiki.action/mediawiki.action.view.filepage.print.css
@@ -0,0 +1,8 @@
+/*!
+ * File description page - print style
+ */
+
+span.mw-filepage-other-resolutions,
+#filetoc {
+	display: none;
+}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
index 9f786ecbd6..b07965ee3c 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
+++ b/resources/src/mediawiki.action/mediawiki.action.view.metadata.css
@@ -14,3 +14,9 @@ table.collapsed tr.collapsable {
 	-ms-user-select: none;
 	user-select: none;
 }
+
+@media print {
+	tr.mw-metadata-show-hide-extended {
+		display: none;
+	}
+}
diff --git a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
index c008dfd80f..168a1c18d5 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.postEdit.js
@@ -24,6 +24,19 @@
 		cookieVal = mw.cookie.get( cookieKey ),
 		$div, id;
 
+	function removeConfirmation() {
+		$div.remove();
+		mw.hook( 'postEdit.afterRemoval' ).fire();
+	}
+
+	function fadeOutConfirmation() {
+		clearTimeout( id );
+		$div.find( '.postedit' ).addClass( 'postedit postedit-faded' );
+		setTimeout( removeConfirmation, 500 );
+
+		return false;
+	}
+
 	function showConfirmation( data ) {
 		data = data || {};
 		if ( data.message === undefined ) {
@@ -45,19 +58,6 @@
 		id = setTimeout( fadeOutConfirmation, 3000 );
 	}
 
-	function fadeOutConfirmation() {
-		clearTimeout( id );
-		$div.find( '.postedit' ).addClass( 'postedit postedit-faded' );
-		setTimeout( removeConfirmation, 500 );
-
-		return false;
-	}
-
-	function removeConfirmation() {
-		$div.remove();
-		mw.hook( 'postEdit.afterRemoval' ).fire();
-	}
-
 	mw.hook( 'postEdit' ).add( showConfirmation );
 
 	if ( config.wgAction === 'view' && cookieVal ) {
@@ -68,7 +68,7 @@
 			// postedit-confirmation-saved
 			// postedit-confirmation-created
 			// postedit-confirmation-restored
-			'message': mw.msg(
+			message: mw.msg(
 				'postedit-confirmation-' + cookieVal,
 				mw.user
 			)
diff --git a/resources/src/mediawiki.api/mediawiki.api.edit.js b/resources/src/mediawiki.api/mediawiki.api.edit.js
index e6161e422e..e43285ff11 100644
--- a/resources/src/mediawiki.api/mediawiki.api.edit.js
+++ b/resources/src/mediawiki.api/mediawiki.api.edit.js
@@ -31,6 +31,7 @@
 
 		/**
 		 * Post a new section to the page.
+		 *
 		 * @see #postWithEditToken
 		 * @param {mw.Title|String} title Target page
 		 * @param {string} header
diff --git a/resources/src/mediawiki.api/mediawiki.api.js b/resources/src/mediawiki.api/mediawiki.api.js
index cae65c56b1..43b20b8b2e 100644
--- a/resources/src/mediawiki.api/mediawiki.api.js
+++ b/resources/src/mediawiki.api/mediawiki.api.js
@@ -122,12 +122,12 @@
 			// Handle common MediaWiki API idioms for passing parameters
 			for ( key in parameters ) {
 				// Multiple values are pipe-separated
-				if ( $.isArray( parameters[key] ) ) {
-					parameters[key] = parameters[key].join( '|' );
+				if ( $.isArray( parameters[ key ] ) ) {
+					parameters[ key ] = parameters[ key ].join( '|' );
 				}
 				// Boolean values are only false when not given at all
-				if ( parameters[key] === false || parameters[key] === undefined ) {
-					delete parameters[key];
+				if ( parameters[ key ] === false || parameters[ key ] === undefined ) {
+					delete parameters[ key ];
 				}
 			}
 		},
@@ -166,7 +166,7 @@
 				formData = new FormData();
 
 				for ( key in parameters ) {
-					formData.append( key, parameters[key] );
+					formData.append( key, parameters[ key ] );
 				}
 				// If we extracted a token parameter, add it back in.
 				if ( token ) {
@@ -295,8 +295,8 @@
 
 				d = apiPromise
 					.then( function ( data ) {
-						if ( data.tokens && data.tokens[type + 'token'] ) {
-							return data.tokens[type + 'token'];
+						if ( data.tokens && data.tokens[ type + 'token' ] ) {
+							return data.tokens[ type + 'token' ];
 						}
 
 						// If token type is not available for this user,
diff --git a/resources/src/mediawiki.api/mediawiki.api.login.js b/resources/src/mediawiki.api/mediawiki.api.login.js
index 25257927b4..2b709aae7b 100644
--- a/resources/src/mediawiki.api/mediawiki.api.login.js
+++ b/resources/src/mediawiki.api/mediawiki.api.login.js
@@ -1,5 +1,6 @@
 /**
  * Make the two-step login easier.
+ *
  * @author Niklas Laxström
  * @class mw.Api.plugin.login
  * @since 1.22
diff --git a/resources/src/mediawiki.api/mediawiki.api.options.js b/resources/src/mediawiki.api/mediawiki.api.options.js
index b839fbdc54..399e6f4356 100644
--- a/resources/src/mediawiki.api/mediawiki.api.options.js
+++ b/resources/src/mediawiki.api/mediawiki.api.options.js
@@ -14,7 +14,7 @@
 		 */
 		saveOption: function ( name, value ) {
 			var param = {};
-			param[name] = value;
+			param[ name ] = value;
 			return this.saveOptions( param );
 		},
 
@@ -38,7 +38,7 @@
 				deferreds = [];
 
 			for ( name in options ) {
-				value = options[name] === null ? null : String( options[name] );
+				value = options[ name ] === null ? null : String( options[ name ] );
 
 				// Can we bundle this option, or does it need a separate request?
 				bundleable =
diff --git a/resources/src/mediawiki.api/mediawiki.api.parse.js b/resources/src/mediawiki.api/mediawiki.api.parse.js
index 2dcf8078fe..bc3d44f946 100644
--- a/resources/src/mediawiki.api/mediawiki.api.parse.js
+++ b/resources/src/mediawiki.api/mediawiki.api.parse.js
@@ -21,7 +21,7 @@
 
 			return apiPromise
 				.then( function ( data ) {
-					return data.parse.text['*'];
+					return data.parse.text[ '*' ];
 				} )
 				.promise( { abort: apiPromise.abort } );
 		}
diff --git a/resources/src/mediawiki.api/mediawiki.api.upload.js b/resources/src/mediawiki.api/mediawiki.api.upload.js
index d05ba57809..4abff28f62 100644
--- a/resources/src/mediawiki.api/mediawiki.api.upload.js
+++ b/resources/src/mediawiki.api/mediawiki.api.upload.js
@@ -1,5 +1,6 @@
 /**
  * Provides an interface for uploading files to MediaWiki.
+ *
  * @class mw.Api.plugin.upload
  * @singleton
  */
@@ -18,6 +19,7 @@
 	/**
 	 * @private
 	 * Get nonce for iframe IDs on the page.
+	 *
 	 * @return {number}
 	 */
 	function getNonce() {
@@ -27,6 +29,7 @@
 	/**
 	 * @private
 	 * Get new iframe object for an upload.
+	 *
 	 * @return {HTMLIframeElement}
 	 */
 	function getNewIframe( id ) {
@@ -39,10 +42,11 @@
 	/**
 	 * @private
 	 * Shortcut for getting hidden inputs
+	 *
 	 * @return {jQuery}
 	 */
 	function getHiddenInput( name, val ) {
-		return $( '<input type="hidden" />')
+		return $( '<input type="hidden" />' )
 			.attr( 'name', name )
 			.val( val );
 	}
@@ -58,7 +62,7 @@
 	 */
 	function processIframeResult( iframe ) {
 		var json,
-			doc = iframe.contentDocument || frames[iframe.id].document;
+			doc = iframe.contentDocument || frames[ iframe.id ].document;
 
 		if ( doc.XMLDocument ) {
 			// The response is a document property in IE
@@ -108,7 +112,7 @@
 			isFileInput = file && file.nodeType === Node.ELEMENT_NODE;
 
 			if ( formDataAvailable() && isFileInput && file.files ) {
-				file = file.files[0];
+				file = file.files[ 0 ];
 			}
 
 			if ( !file ) {
@@ -159,8 +163,8 @@
 				$iframe = $( iframe );
 
 			for ( key in data ) {
-				if ( !fieldsAllowed[key] ) {
-					delete data[key];
+				if ( !fieldsAllowed[ key ] ) {
+					delete data[ key ];
 				}
 			}
 
@@ -245,8 +249,8 @@
 				deferred = $.Deferred();
 
 			for ( key in data ) {
-				if ( !fieldsAllowed[key] ) {
-					delete data[key];
+				if ( !fieldsAllowed[ key ] ) {
+					delete data[ key ];
 				}
 			}
 
@@ -297,6 +301,7 @@
 		 * This function will return a promise, which when resolved, will pass back a function
 		 * to finish the stash upload. You can call that function with an argument containing
 		 * more, or conflicting, data to pass to the server. For example:
+		 *
 		 *     // upload a file to the stash with a placeholder filename
 		 *     api.uploadToStash( file, { filename: 'testing.png' } ).done( function ( finish ) {
 		 *         // finish is now the function we can use to finalize the upload
@@ -305,6 +310,7 @@
 		 *             // the upload is complete, data holds the API response
 		 *         } );
 		 *     } );
+		 *
 		 * @param {File|HTMLInputElement} file
 		 * @param {Object} [data]
 		 * @return {jQuery.Promise}
diff --git a/resources/src/mediawiki.api/mediawiki.api.watch.js b/resources/src/mediawiki.api/mediawiki.api.watch.js
index 40ba136d3f..a2ff1292bb 100644
--- a/resources/src/mediawiki.api/mediawiki.api.watch.js
+++ b/resources/src/mediawiki.api/mediawiki.api.watch.js
@@ -37,7 +37,7 @@
 		return apiPromise
 			.then( function ( data ) {
 				// If a single page was given (not an array) respond with a single item as well.
-				return $.isArray( pages ) ? data.watch : data.watch[0];
+				return $.isArray( pages ) ? data.watch : data.watch[ 0 ];
 			} )
 			.promise( { abort: apiPromise.abort } );
 	}
diff --git a/resources/src/mediawiki.language/languages/bs.js b/resources/src/mediawiki.language/languages/bs.js
index b56e4b29fd..cb9e19edb7 100644
--- a/resources/src/mediawiki.language/languages/bs.js
+++ b/resources/src/mediawiki.language/languages/bs.js
@@ -4,8 +4,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'bs', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'instrumental': // instrumental
diff --git a/resources/src/mediawiki.language/languages/dsb.js b/resources/src/mediawiki.language/languages/dsb.js
index 69c36cc02f..dc4447abb1 100644
--- a/resources/src/mediawiki.language/languages/dsb.js
+++ b/resources/src/mediawiki.language/languages/dsb.js
@@ -4,8 +4,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'dsb', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'instrumental': // instrumental
diff --git a/resources/src/mediawiki.language/languages/fi.js b/resources/src/mediawiki.language/languages/fi.js
index d9c2b06d28..2bbfc6b877 100644
--- a/resources/src/mediawiki.language/languages/fi.js
+++ b/resources/src/mediawiki.language/languages/fi.js
@@ -7,8 +7,8 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms, aou, origWord;
 
 	grammarForms = mediaWiki.language.getData( 'fi', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 
 	// vowel harmony flag
diff --git a/resources/src/mediawiki.language/languages/ga.js b/resources/src/mediawiki.language/languages/ga.js
index fb4e939655..a4c911a339 100644
--- a/resources/src/mediawiki.language/languages/ga.js
+++ b/resources/src/mediawiki.language/languages/ga.js
@@ -5,8 +5,8 @@
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	/*jshint onecase:true */
 	var grammarForms = mediaWiki.language.getData( 'ga', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'ainmlae':
diff --git a/resources/src/mediawiki.language/languages/he.js b/resources/src/mediawiki.language/languages/he.js
index d1eba43b4c..945f02fed2 100644
--- a/resources/src/mediawiki.language/languages/he.js
+++ b/resources/src/mediawiki.language/languages/he.js
@@ -4,8 +4,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'he', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'prefixed':
diff --git a/resources/src/mediawiki.language/languages/hsb.js b/resources/src/mediawiki.language/languages/hsb.js
index 2c0abd3df9..8e9b1296d0 100644
--- a/resources/src/mediawiki.language/languages/hsb.js
+++ b/resources/src/mediawiki.language/languages/hsb.js
@@ -4,8 +4,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'hsb', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'instrumental': // instrumental
diff --git a/resources/src/mediawiki.language/languages/hu.js b/resources/src/mediawiki.language/languages/hu.js
index d72a1c05b4..4f8f74df72 100644
--- a/resources/src/mediawiki.language/languages/hu.js
+++ b/resources/src/mediawiki.language/languages/hu.js
@@ -5,8 +5,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'hu', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'rol':
diff --git a/resources/src/mediawiki.language/languages/hy.js b/resources/src/mediawiki.language/languages/hy.js
index c4a1cf7307..935d466d14 100644
--- a/resources/src/mediawiki.language/languages/hy.js
+++ b/resources/src/mediawiki.language/languages/hy.js
@@ -5,8 +5,8 @@
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	/*jshint onecase:true */
 	var grammarForms = mediaWiki.language.getData( 'hy', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 
 	// These rules are not perfect, but they are currently only used for site names so it doesn't
diff --git a/resources/src/mediawiki.language/languages/la.js b/resources/src/mediawiki.language/languages/la.js
index 52e8dd4429..29e04a6749 100644
--- a/resources/src/mediawiki.language/languages/la.js
+++ b/resources/src/mediawiki.language/languages/la.js
@@ -5,8 +5,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'la', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'genitive':
@@ -30,7 +30,7 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 			word = word.replace( /nuntii$/i, 'nuntios' );// 2nd declension plural (partly)
 			word = word.replace( /tio$/i, 'tionem' ); // 3rd declension singular (partly)
 			word = word.replace( /ns$/i, 'ntem' );
-			word = word.replace( /as$/i, 'atem');
+			word = word.replace( /as$/i, 'atem' );
 			word = word.replace( /es$/i, 'em' ); // 5th declension singular
 			break;
 		case 'ablative':
@@ -42,7 +42,7 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 			word = word.replace( /nuntii$/i, 'nuntiis' ); // 2nd declension plural (partly)
 			word = word.replace( /tio$/i, 'tione' ); // 3rd declension singular (partly)
 			word = word.replace( /ns$/i, 'nte' );
-			word = word.replace( /as$/i, 'ate');
+			word = word.replace( /as$/i, 'ate' );
 			word = word.replace( /es$/i, 'e' ); // 5th declension singular
 			break;
 	}
diff --git a/resources/src/mediawiki.language/languages/os.js b/resources/src/mediawiki.language/languages/os.js
index 554e99d4c5..3e0f279def 100644
--- a/resources/src/mediawiki.language/languages/os.js
+++ b/resources/src/mediawiki.language/languages/os.js
@@ -14,8 +14,8 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 		// Variable for ending
 		ending = '';
 
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	// Checking if the $word is in plural form
 	if ( word.match( /тæ$/i ) ) {
diff --git a/resources/src/mediawiki.language/languages/ru.js b/resources/src/mediawiki.language/languages/ru.js
index 2077b6beb2..ee1d6ef2f2 100644
--- a/resources/src/mediawiki.language/languages/ru.js
+++ b/resources/src/mediawiki.language/languages/ru.js
@@ -10,8 +10,8 @@ mediaWiki.language.convertGrammar = function ( word, form ) {
 	'use strict';
 
 	var grammarForms = mediaWiki.language.getData( 'ru', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'genitive': // родительный падеж
diff --git a/resources/src/mediawiki.language/languages/sl.js b/resources/src/mediawiki.language/languages/sl.js
index d20d0b3418..3d8bdfde4b 100644
--- a/resources/src/mediawiki.language/languages/sl.js
+++ b/resources/src/mediawiki.language/languages/sl.js
@@ -4,8 +4,8 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'sl', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'mestnik': // locative
diff --git a/resources/src/mediawiki.language/languages/uk.js b/resources/src/mediawiki.language/languages/uk.js
index 550a388c25..a22874b35f 100644
--- a/resources/src/mediawiki.language/languages/uk.js
+++ b/resources/src/mediawiki.language/languages/uk.js
@@ -4,31 +4,31 @@
 
 mediaWiki.language.convertGrammar = function ( word, form ) {
 	var grammarForms = mediaWiki.language.getData( 'uk', 'grammarForms' );
-	if ( grammarForms && grammarForms[form] ) {
-		return grammarForms[form][word];
+	if ( grammarForms && grammarForms[ form ] ) {
+		return grammarForms[ form ][ word ];
 	}
 	switch ( form ) {
 		case 'genitive': // родовий відмінок
 			if ( word.slice( -4 ) !== 'вікі' && word.slice( -4 ) !== 'Вікі' ) {
 				if ( word.slice( -1 ) === 'ь' ) {
-					word = word.slice(0, -1 ) + 'я';
+					word = word.slice( 0, -1 ) + 'я';
 				} else if ( word.slice( -2 ) === 'ія' ) {
-					word = word.slice(0, -2 ) + 'ії';
+					word = word.slice( 0, -2 ) + 'ії';
 				} else if ( word.slice( -2 ) === 'ка' ) {
-					word = word.slice(0, -2 ) + 'ки';
+					word = word.slice( 0, -2 ) + 'ки';
 				} else if ( word.slice( -2 ) === 'ти' ) {
-					word = word.slice(0, -2 ) + 'тей';
+					word = word.slice( 0, -2 ) + 'тей';
 				} else if ( word.slice( -2 ) === 'ды' ) {
-					word = word.slice(0, -2 ) + 'дов';
+					word = word.slice( 0, -2 ) + 'дов';
 				} else if ( word.slice( -3 ) === 'ник' ) {
-					word = word.slice(0, -3 ) + 'ника';
+					word = word.slice( 0, -3 ) + 'ника';
 				}
 			}
 			break;
 		case 'accusative': // знахідний відмінок
 			if ( word.slice( -4 ) !== 'вікі' && word.slice( -4 ) !== 'Вікі' ) {
 				if ( word.slice( -2 ) === 'ія' ) {
-					word = word.slice(0, -2 ) + 'ію';
+					word = word.slice( 0, -2 ) + 'ію';
 				}
 			}
 			break;
diff --git a/resources/src/mediawiki.language/mediawiki.cldr.js b/resources/src/mediawiki.language/mediawiki.cldr.js
index f6fb8f1079..ca4b6fbe49 100644
--- a/resources/src/mediawiki.language/mediawiki.cldr.js
+++ b/resources/src/mediawiki.language/mediawiki.cldr.js
@@ -21,7 +21,7 @@
 		getPluralForm: function ( number, pluralRules ) {
 			var i;
 			for ( i = 0; i < pluralRules.length; i++ ) {
-				if ( mw.libs.pluralRuleParser( pluralRules[i], number ) ) {
+				if ( mw.libs.pluralRuleParser( pluralRules[ i ], number ) ) {
 					break;
 				}
 			}
diff --git a/resources/src/mediawiki.language/mediawiki.language.init.js b/resources/src/mediawiki.language/mediawiki.language.init.js
index b3765c85e7..808f6e5e02 100644
--- a/resources/src/mediawiki.language/mediawiki.language.init.js
+++ b/resources/src/mediawiki.language/mediawiki.language.init.js
@@ -55,8 +55,8 @@
 		getData: function ( langCode, dataKey ) {
 			var langData = mw.language.data;
 			langCode = langCode.toLowerCase();
-			if ( langData && langData[langCode] instanceof mw.Map ) {
-				return langData[langCode].get( dataKey );
+			if ( langData && langData[ langCode ] instanceof mw.Map ) {
+				return langData[ langCode ].get( dataKey );
 			}
 			return undefined;
 		},
@@ -73,10 +73,10 @@
 		setData: function ( langCode, dataKey, value ) {
 			var langData = mw.language.data;
 			langCode = langCode.toLowerCase();
-			if ( !( langData[langCode] instanceof mw.Map ) ) {
-				langData[langCode] = new mw.Map();
+			if ( !( langData[ langCode ] instanceof mw.Map ) ) {
+				langData[ langCode ] = new mw.Map();
 			}
-			langData[langCode].set( dataKey, value );
+			langData[ langCode ].set( dataKey, value );
 		}
 	};
 
diff --git a/resources/src/mediawiki.language/mediawiki.language.js b/resources/src/mediawiki.language/mediawiki.language.js
index 78e391910e..0d324ed358 100644
--- a/resources/src/mediawiki.language/mediawiki.language.js
+++ b/resources/src/mediawiki.language/mediawiki.language.js
@@ -29,8 +29,8 @@ $.extend( mw.language, {
 			return mw.language.convertPlural( parseInt( count, 10 ), template.parameters );
 		}
 		// Could not process plural return first form or nothing
-		if ( template.parameters[0] ) {
-			return template.parameters[0];
+		if ( template.parameters[ 0 ] ) {
+			return template.parameters[ 0 ];
 		}
 		return '';
 	},
@@ -47,8 +47,8 @@ $.extend( mw.language, {
 		var pluralRules,
 			pluralFormIndex = 0;
 
-		if ( explicitPluralForms && explicitPluralForms[count] ) {
-			return explicitPluralForms[count];
+		if ( explicitPluralForms && explicitPluralForms[ count ] ) {
+			return explicitPluralForms[ count ];
 		}
 
 		if ( !forms || forms.length === 0 ) {
@@ -58,11 +58,11 @@ $.extend( mw.language, {
 		pluralRules = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'pluralRules' );
 		if ( !pluralRules ) {
 			// default fallback.
-			return ( count === 1 ) ? forms[0] : forms[1];
+			return ( count === 1 ) ? forms[ 0 ] : forms[ 1 ];
 		}
 		pluralFormIndex = mw.cldr.getPluralForm( count, pluralRules );
 		pluralFormIndex = Math.min( pluralFormIndex, forms.length - 1 );
-		return forms[pluralFormIndex];
+		return forms[ pluralFormIndex ];
 	},
 
 	/**
@@ -90,7 +90,7 @@ $.extend( mw.language, {
 	 *
 	 * @param {string} gender 'male', 'female', or anything else for neutral.
 	 * @param {Array} forms List of gender forms
-	 * @return string
+	 * @return {string}
 	 */
 	gender: function ( gender, forms ) {
 		if ( !forms || forms.length === 0 ) {
@@ -98,12 +98,12 @@ $.extend( mw.language, {
 		}
 		forms = mw.language.preConvertPlural( forms, 2 );
 		if ( gender === 'male' ) {
-			return forms[0];
+			return forms[ 0 ];
 		}
 		if ( gender === 'female' ) {
-			return forms[1];
+			return forms[ 1 ];
 		}
-		return ( forms.length === 3 ) ? forms[2] : forms[0];
+		return ( forms.length === 3 ) ? forms[ 2 ] : forms[ 0 ];
 	},
 
 	/**
@@ -119,8 +119,8 @@ $.extend( mw.language, {
 	 */
 	convertGrammar: function ( word, form ) {
 		var grammarForms = mw.language.getData( mw.config.get( 'wgUserLanguage' ), 'grammarForms' );
-		if ( grammarForms && grammarForms[form] ) {
-			return grammarForms[form][word] || word;
+		if ( grammarForms && grammarForms[ form ] ) {
+			return grammarForms[ form ][ word ] || word;
 		}
 		return word;
 	},
@@ -138,7 +138,7 @@ $.extend( mw.language, {
 			i = 0;
 
 		for ( ; i < list.length; i++ ) {
-			text += list[i];
+			text += list[ i ];
 			if ( list.length - 2 === i ) {
 				text += mw.msg( 'and' ) + mw.msg( 'word-separator' );
 			} else if ( list.length - 1 !== i ) {
diff --git a/resources/src/mediawiki.language/mediawiki.language.numbers.js b/resources/src/mediawiki.language/mediawiki.language.numbers.js
index 3c13055b7f..268985f8e4 100644
--- a/resources/src/mediawiki.language/mediawiki.language.numbers.js
+++ b/resources/src/mediawiki.language/mediawiki.language.numbers.js
@@ -6,6 +6,26 @@
 	 * @class mw.language
 	 */
 
+	/**
+	 * Replicate a string 'n' times.
+	 *
+	 * @private
+	 * @param {string} str The string to replicate
+	 * @param {number} num Number of times to replicate the string
+	 * @return {string}
+	 */
+	function replicate( str, num ) {
+		if ( num <= 0 || !str ) {
+			return '';
+		}
+
+		var buf = [];
+		while ( num-- ) {
+			buf.push( str );
+		}
+		return buf.join( '' );
+	}
+
 	/**
 	 * Pad a string to guarantee that it is at least `size` length by
 	 * filling with the character `ch` at either the start or end of the
@@ -33,26 +53,6 @@
 		return end ? out + padStr : padStr + out;
 	}
 
-	/**
-	 * Replicate a string 'n' times.
-	 *
-	 * @private
-	 * @param {string} str The string to replicate
-	 * @param {number} num Number of times to replicate the string
-	 * @return {string}
-	 */
-	function replicate( str, num ) {
-		if ( num <= 0 || !str ) {
-			return '';
-		}
-
-		var buf = [];
-		while ( num-- ) {
-			buf.push( str );
-		}
-		return buf.join( '' );
-	}
-
 	/**
 	 * Apply numeric pattern to absolute value using options. Gives no
 	 * consideration to local customs.
@@ -74,7 +74,7 @@
 			decimal: '.'
 		};
 
-		if ( isNaN( value) ) {
+		if ( isNaN( value ) ) {
 			return value;
 		}
 
@@ -85,62 +85,62 @@
 			off,
 			remainder,
 			patternParts = pattern.split( '.' ),
-			maxPlaces = ( patternParts[1] || [] ).length,
+			maxPlaces = ( patternParts[ 1 ] || [] ).length,
 			valueParts = String( Math.abs( value ) ).split( '.' ),
-			fractional = valueParts[1] || '',
+			fractional = valueParts[ 1 ] || '',
 			groupSize = 0,
 			groupSize2 = 0,
 			pieces = [];
 
-		if ( patternParts[1] ) {
+		if ( patternParts[ 1 ] ) {
 			// Pad fractional with trailing zeros
-			padLength = ( patternParts[1] && patternParts[1].lastIndexOf( '0' ) + 1 );
+			padLength = ( patternParts[ 1 ] && patternParts[ 1 ].lastIndexOf( '0' ) + 1 );
 
 			if ( padLength > fractional.length ) {
-				valueParts[1] = pad( fractional, padLength, '0', true );
+				valueParts[ 1 ] = pad( fractional, padLength, '0', true );
 			}
 
 			// Truncate fractional
 			if ( maxPlaces < fractional.length ) {
-				valueParts[1] = fractional.slice( 0, maxPlaces );
+				valueParts[ 1 ] = fractional.slice( 0, maxPlaces );
 			}
 		} else {
-			if ( valueParts[1] ) {
+			if ( valueParts[ 1 ] ) {
 				valueParts.pop();
 			}
 		}
 
 		// Pad whole with leading zeros
-		patternDigits = patternParts[0].replace( ',', '' );
+		patternDigits = patternParts[ 0 ].replace( ',', '' );
 
 		padLength = patternDigits.indexOf( '0' );
 
 		if ( padLength !== -1 ) {
 			padLength = patternDigits.length - padLength;
 
-			if ( padLength > valueParts[0].length ) {
-				valueParts[0] = pad( valueParts[0], padLength );
+			if ( padLength > valueParts[ 0 ].length ) {
+				valueParts[ 0 ] = pad( valueParts[ 0 ], padLength );
 			}
 
 			// Truncate whole
 			if ( patternDigits.indexOf( '#' ) === -1 ) {
-				valueParts[0] = valueParts[0].slice( valueParts[0].length - padLength );
+				valueParts[ 0 ] = valueParts[ 0 ].slice( valueParts[ 0 ].length - padLength );
 			}
 		}
 
 		// Add group separators
-		index = patternParts[0].lastIndexOf( ',' );
+		index = patternParts[ 0 ].lastIndexOf( ',' );
 
 		if ( index !== -1 ) {
-			groupSize = patternParts[0].length - index - 1;
-			remainder = patternParts[0].slice( 0, index );
+			groupSize = patternParts[ 0 ].length - index - 1;
+			remainder = patternParts[ 0 ].slice( 0, index );
 			index = remainder.lastIndexOf( ',' );
 			if ( index !== -1 ) {
 				groupSize2 = remainder.length - index - 1;
 			}
 		}
 
-		for ( whole = valueParts[0]; whole; ) {
+		for ( whole = valueParts[ 0 ]; whole; ) {
 			off = groupSize ? whole.length - groupSize : 0;
 			pieces.push( ( off > 0 ) ? whole.slice( off ) : whole );
 			whole = ( off > 0 ) ? whole.slice( 0, off ) : '';
@@ -150,7 +150,7 @@
 				groupSize2 = null;
 			}
 		}
-		valueParts[0] = pieces.reverse().join( options.group );
+		valueParts[ 0 ] = pieces.reverse().join( options.group );
 
 		return valueParts.join( options.decimal );
 	}
@@ -198,17 +198,18 @@
 
 			convertedNumber = '';
 			for ( i = 0; i < numberString.length; i++ ) {
-				if ( transformTable[ numberString[i] ] ) {
-					convertedNumber += transformTable[numberString[i]];
+				if ( transformTable[ numberString[ i ] ] ) {
+					convertedNumber += transformTable[ numberString[ i ] ];
 				} else {
-					convertedNumber += numberString[i];
+					convertedNumber += numberString[ i ];
 				}
 			}
 			return integer ? parseInt( convertedNumber, 10 ) : convertedNumber;
 		},
 
 		/**
-		 * Get the  digit transform table for current UI language.
+		 * Get the digit transform table for current UI language.
+		 *
 		 * @return {Object|Array}
 		 */
 		getDigitTransformTable: function () {
@@ -217,7 +218,8 @@
 		},
 
 		/**
-		 * Get the  separator transform table for current UI language.
+		 * Get the separator transform table for current UI language.
+		 *
 		 * @return {Object|Array}
 		 */
 		getSeparatorTransformTable: function () {
@@ -238,20 +240,20 @@
 		commafy: function ( value, pattern ) {
 			var numberPattern,
 				transformTable = mw.language.getSeparatorTransformTable(),
-				group = transformTable[','] || ',',
+				group = transformTable[ ',' ] || ',',
 				numberPatternRE = /[#0,]*[#0](?:\.0*#*)?/, // not precise, but good enough
-				decimal = transformTable['.'] || '.',
+				decimal = transformTable[ '.' ] || '.',
 				patternList = pattern.split( ';' ),
-				positivePattern = patternList[0];
+				positivePattern = patternList[ 0 ];
 
-			pattern = patternList[ ( value < 0 ) ? 1 : 0] || ( '-' + positivePattern );
+			pattern = patternList[ ( value < 0 ) ? 1 : 0 ] || ( '-' + positivePattern );
 			numberPattern = positivePattern.match( numberPatternRE );
 
 			if ( !numberPattern ) {
 				throw new Error( 'unable to find a number expression in pattern: ' + pattern );
 			}
 
-			return pattern.replace( numberPatternRE, commafyNumber( value, numberPattern[0], {
+			return pattern.replace( numberPatternRE, commafyNumber( value, numberPattern[ 0 ], {
 				decimal: decimal,
 				group: group
 			} ) );
diff --git a/resources/src/mediawiki.legacy/commonPrint.css b/resources/src/mediawiki.legacy/commonPrint.css
index 22915727fa..e1b3198227 100644
--- a/resources/src/mediawiki.legacy/commonPrint.css
+++ b/resources/src/mediawiki.legacy/commonPrint.css
@@ -16,7 +16,6 @@ div#jump-to-nav,
 .mw-jump,
 div.top,
 div#column-one,
-#colophon,
 .mw-editsection,
 .mw-editsection-like,
 .toctoggle,
@@ -29,9 +28,6 @@ li#mobileview,
 li#privacy,
 #footer-places,
 .mw-hidden-catlinks,
-tr.mw-metadata-show-hide-extended,
-span.mw-filepage-other-resolutions,
-#filetoc,
 .usermessage,
 .patrollink,
 .ns-0 .mw-redirectedfrom,
diff --git a/resources/src/mediawiki.legacy/images/checker.png b/resources/src/mediawiki.legacy/images/checker.png
deleted file mode 100644
index 3e9e3d0969..0000000000
Binary files a/resources/src/mediawiki.legacy/images/checker.png and /dev/null differ
diff --git a/resources/src/mediawiki.legacy/images/question.png b/resources/src/mediawiki.legacy/images/question.png
deleted file mode 100644
index f7405d2626..0000000000
Binary files a/resources/src/mediawiki.legacy/images/question.png and /dev/null differ
diff --git a/resources/src/mediawiki.legacy/images/question.svg b/resources/src/mediawiki.legacy/images/question.svg
deleted file mode 100644
index 98fbe8dd75..0000000000
--- a/resources/src/mediawiki.legacy/images/question.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="21.059" height="21.06"><path fill="#575757" d="M10.529 0c-5.814 0-10.529 4.714-10.529 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53s-4.712-10.529-10.529-10.529zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5h-2.205v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638l-1.051-1.807c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/></svg>
\ No newline at end of file
diff --git a/resources/src/mediawiki.legacy/oldshared.css b/resources/src/mediawiki.legacy/oldshared.css
index 196ea2125d..b0f86e6e31 100644
--- a/resources/src/mediawiki.legacy/oldshared.css
+++ b/resources/src/mediawiki.legacy/oldshared.css
@@ -320,10 +320,6 @@ span.comment {
 	font-style: italic;
 }
 
-span.changedby {
-	font-size: 95%;
-}
-
 .previewnote {
 	text-align: center;
 	color: #cc0000;
diff --git a/resources/src/mediawiki.legacy/protect.js b/resources/src/mediawiki.legacy/protect.js
index 3f4b263efd..6226c90b8d 100644
--- a/resources/src/mediawiki.legacy/protect.js
+++ b/resources/src/mediawiki.legacy/protect.js
@@ -146,7 +146,7 @@ var ProtectionForm = window.ProtectionForm = {
 	 */
 	matchAttribute: function ( objects, attrName ) {
 		return $.map( objects, function ( object ) {
-			return object[attrName];
+			return object[ attrName ];
 		} ).filter( function ( item, index, a ) {
 			return index === a.indexOf( item );
 		} ).length === 1;
@@ -177,6 +177,7 @@ var ProtectionForm = window.ProtectionForm = {
 
 	/**
 	 * Find the highest protection level in any selector
+	 *
 	 * @return {number}
 	 */
 	getMaxLevel: function () {
diff --git a/resources/src/mediawiki.legacy/shared.css b/resources/src/mediawiki.legacy/shared.css
index 8122701021..9045e4c28f 100644
--- a/resources/src/mediawiki.legacy/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -126,15 +126,11 @@ abbr[title],
 	font-style: italic;
 }
 
-/* Comment and username portions of RC entries */
+/* Comment portions of RC entries */
 span.comment {
 	font-style: italic;
 }
 
-span.changedby {
-	font-size: 95%;
-}
-
 /* Math */
 .texvc {
 	direction: ltr;
@@ -164,49 +160,6 @@ span.texhtml {
 	clear: both;
 }
 
-/**
- * File description page
- */
-
-div.mw-filepage-resolutioninfo {
-	font-size: smaller;
-}
-
-/**
- * File histories
- */
-h2#filehistory {
-	clear: both;
-}
-
-table.filehistory th,
-table.filehistory td {
-	vertical-align: top;
-}
-
-table.filehistory th {
-	text-align: left;
-}
-
-table.filehistory td.mw-imagepage-filesize,
-table.filehistory th.mw-imagepage-filesize {
-	white-space: nowrap;
-}
-
-table.filehistory td.filehistory-selected {
-	font-weight: bold;
-}
-
-/**
- * Add a checkered background image on hover for file
- * description pages. (bug 26470)
- */
-.filehistory a img,
-#file img:hover {
-	/* @embed */
-	background: white url(images/checker.png) repeat;
-}
-
 /**
  * rev_deleted stuff
  */
@@ -265,56 +218,10 @@ td.mw-label {
 	width: auto;
 }
 
-.mw-icon-question {
-	/* SVG support using a transparent gradient to guarantee cross-browser
-	 * compatibility (browsers able to understand gradient syntax support also SVG).
-	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-	background-image: url(images/question.png);
-	background-image: -webkit-linear-gradient(transparent, transparent), url(images/question.svg);
-	background-image: linear-gradient(transparent, transparent), url(images/question.svg);
-	background-repeat: no-repeat;
-	background-size: 13px 13px;
-	display: inline-block;
-	height: 13px;
-	width: 13px;
-	margin-left: 4px;
-}
-
-.mw-icon-question:lang(ar),
-.mw-icon-question:lang(fa),
-.mw-icon-question:lang(ur) {
-	-webkit-transform: scaleX(-1);
-	-ms-transform: scaleX(-1);
-	transform: scaleX(-1);
-}
-
 td.mw-submit {
 	white-space: nowrap;
 }
 
-table.mw-htmlform-nolabel td.mw-label {
-	width: 1px;
-}
-
-tr.mw-htmlform-vertical-label td.mw-label {
-	text-align: left !important;
-}
-
-.mw-htmlform-invalid-input td.mw-input input {
-	border-color: red;
-}
-
-.mw-htmlform-flatlist div.mw-htmlform-flatlist-item {
-	display: inline;
-	margin-right: 1em;
-	white-space: nowrap;
-}
-
-.mw-htmlform-matrix td {
-	padding-left: 0.5em;
-	padding-right: 0.5em;
-}
-
 input#wpSummary {
 	width: 80%;
 	margin-bottom: 1em;
@@ -448,11 +355,6 @@ p.mw-upload-editlicenses {
 	font-weight: bold;
 }
 
-#shared-image-dup,
-#shared-image-conflict {
-	font-style: italic;
-}
-
 /**
  * Recreating deleted page warning
  * Reupload file warning
@@ -492,21 +394,6 @@ a.new {
 	color: #BA0000;
 }
 
-/* feed links */
-/* To be removed before 1.26 release, moved to mediawiki.feedlink module */
-a.feedlink {
-	/* SVG support using a transparent gradient to guarantee cross-browser
-	 * compatibility (browsers able to understand gradient syntax support also SVG).
-	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-	background-image: url(../mediawiki/images/feed-icon.png);
-	background-image: -webkit-linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg);
-	background-image: linear-gradient(transparent, transparent), url(../mediawiki/images/feed-icon.svg);
-	background-position: center left;
-	background-repeat: no-repeat;
-	background-size: 12px 12px;
-	padding-left: 16px;
-}
-
 /* Plainlinks - this can be used to switch
  * off special external link styling */
 .plainlinks a.external {
@@ -672,24 +559,6 @@ table.wikitable > caption {
 	background-color: #eeeeff;
 }
 
-/* filetoc */
-ul#filetoc {
-	text-align: center;
-	border: 1px solid #aaaaaa;
-	background-color: #f9f9f9;
-	padding: 5px;
-	font-size: 95%;
-	margin-bottom: 0.5em;
-	margin-left: 0;
-	margin-right: 0;
-}
-
-#filetoc li {
-	display: inline;
-	list-style-type: none;
-	padding-right: 2em;
-}
-
 /* Classes for Exif data display */
 table.mw_metadata {
 	font-size: 0.8em;
diff --git a/resources/src/mediawiki.legacy/wikibits.js b/resources/src/mediawiki.legacy/wikibits.js
index b5720a4464..7d1f6d73fd 100644
--- a/resources/src/mediawiki.legacy/wikibits.js
+++ b/resources/src/mediawiki.legacy/wikibits.js
@@ -85,7 +85,7 @@
 
 		// Execute the queued functions
 		for ( i = 0; i < functs.length; i++ ) {
-			functs[i]();
+			functs[ i ]();
 		}
 	} );
 
@@ -164,33 +164,26 @@
 	 * See https://www.mediawiki.org/wiki/ResourceLoader/Legacy_JavaScript#wikibits.js
 	 */
 
-	function importScript( page ) {
-		var uri = mw.config.get( 'wgScript' ) + '?title=' +
-			mw.util.wikiUrlencode( page ) +
-			'&action=raw&ctype=text/javascript';
-		return importScriptURI( uri );
-	}
-
 	/**
 	 * @deprecated since 1.17 Use mw.loader instead. Warnings added in 1.25.
 	 */
 	function importScriptURI( url ) {
-		if ( loadedScripts[url] ) {
+		if ( loadedScripts[ url ] ) {
 			return null;
 		}
-		loadedScripts[url] = true;
+		loadedScripts[ url ] = true;
 		var s = document.createElement( 'script' );
 		s.setAttribute( 'src', url );
 		s.setAttribute( 'type', 'text/javascript' );
-		document.getElementsByTagName( 'head' )[0].appendChild( s );
+		document.getElementsByTagName( 'head' )[ 0 ].appendChild( s );
 		return s;
 	}
 
-	function importStylesheet( page ) {
+	function importScript( page ) {
 		var uri = mw.config.get( 'wgScript' ) + '?title=' +
 			mw.util.wikiUrlencode( page ) +
-			'&action=raw&ctype=text/css';
-		return importStylesheetURI( uri );
+			'&action=raw&ctype=text/javascript';
+		return importScriptURI( uri );
 	}
 
 	/**
@@ -203,10 +196,17 @@
 		if ( media ) {
 			l.media = media;
 		}
-		document.getElementsByTagName( 'head' )[0].appendChild( l );
+		document.getElementsByTagName( 'head' )[ 0 ].appendChild( l );
 		return l;
 	}
 
+	function importStylesheet( page ) {
+		var uri = mw.config.get( 'wgScript' ) + '?title=' +
+			mw.util.wikiUrlencode( page ) +
+			'&action=raw&ctype=text/css';
+		return importStylesheetURI( uri );
+	}
+
 	msg = 'Use mw.loader instead.';
 	mw.log.deprecate( win, 'loadedScripts', loadedScripts, msg );
 	mw.log.deprecate( win, 'importScriptURI', importScriptURI, msg );
diff --git a/resources/src/mediawiki.less/mediawiki.mixins.less b/resources/src/mediawiki.less/mediawiki.mixins.less
index e94777578b..79549c33d5 100644
--- a/resources/src/mediawiki.less/mediawiki.mixins.less
+++ b/resources/src/mediawiki.less/mediawiki.mixins.less
@@ -52,7 +52,7 @@
 .list-style-image-svg(@svg, @fallback) {
 	list-style-image: e('/* @embed */') url(@svg);
 	/* Fallback to PNG bullet for IE 8 and below using CSS hack */
-	list-style-image: e('/* @embed */') url(@fallback)\9;
+	list-style-image: e('/* @embed */') url(@fallback) e('\9');
 }
 
 .transition(@value) {
diff --git a/resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js b/resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js
index ec14f8ba7a..6f9aa02593 100644
--- a/resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js
+++ b/resources/src/mediawiki.messagePoster/mediawiki.messagePoster.factory.js
@@ -24,11 +24,11 @@
 	 * @param {Function} messagePosterConstructor Constructor for MessagePoster
 	 */
 	MwMessagePosterFactory.prototype.register = function ( contentModel, messagePosterConstructor ) {
-		if ( this.contentModelToClass[contentModel] !== undefined ) {
+		if ( this.contentModelToClass[ contentModel ] !== undefined ) {
 			throw new Error( 'The content model \'' + contentModel + '\' is already registered.' );
 		}
 
-		this.contentModelToClass[contentModel] = messagePosterConstructor;
+		this.contentModelToClass[ contentModel ] = messagePosterConstructor;
 	};
 
 	/**
@@ -38,7 +38,7 @@
 	 * @param {string} contentModel Content model to unregister
 	 */
 	MwMessagePosterFactory.prototype.unregister = function ( contentModel ) {
-		delete this.contentModelToClass[contentModel];
+		delete this.contentModelToClass[ contentModel ];
 	};
 
 	/**
@@ -68,8 +68,8 @@
 			titles: title.getPrefixedDb()
 		} ).then( function ( result ) {
 			if ( result.query.pageids && result.query.pageids.length > 0 ) {
-				pageId = result.query.pageids[0];
-				page = result.query.pages[pageId];
+				pageId = result.query.pageids[ 0 ];
+				page = result.query.pages[ pageId ];
 
 				contentModel = page.contentmodel;
 				moduleName = 'mediawiki.messagePoster.' + contentModel;
@@ -100,7 +100,7 @@
 	 *
 	 */
 	MwMessagePosterFactory.prototype.createForContentModel = function ( contentModel, title ) {
-		return new this.contentModelToClass[contentModel]( title );
+		return new this.contentModelToClass[ contentModel ]( title );
 	};
 
 	mw.messagePoster = {
diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.css b/resources/src/mediawiki.page/mediawiki.page.gallery.css
index 2e4daea061..20deb2142e 100644
--- a/resources/src/mediawiki.page/mediawiki.page.gallery.css
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.css
@@ -1,6 +1,6 @@
 /* Galleries */
 /* These display attributes look nonsensical, but are needed to support IE and FF2 */
-/* Don't forget to update commonPrint.css */
+/* Don't forget to update mediawiki.page.gallery.print.css */
 li.gallerybox {
 	vertical-align: top;
 	display: -moz-inline-box;
diff --git a/resources/src/mediawiki.page/mediawiki.page.gallery.js b/resources/src/mediawiki.page/mediawiki.page.gallery.js
index 95140704fd..dfccf21516 100644
--- a/resources/src/mediawiki.page/mediawiki.page.gallery.js
+++ b/resources/src/mediawiki.page/mediawiki.page.gallery.js
@@ -12,6 +12,7 @@
 
 	/**
 	 * Perform the layout justification.
+	 *
 	 * @ignore
 	 * @context {HTMLElement} A `ul.mw-gallery-*` element
 	 */
@@ -30,14 +31,14 @@
 				$this = $( this );
 
 			if ( top !== lastTop ) {
-				rows[rows.length] = [];
+				rows[ rows.length ] = [];
 				lastTop = top;
 			}
 
 			$img = $this.find( 'div.thumb a.image img' );
-			if ( $img.length && $img[0].height ) {
-				imgHeight = $img[0].height;
-				imgWidth = $img[0].width;
+			if ( $img.length && $img[ 0 ].height ) {
+				imgHeight = $img[ 0 ].height;
+				imgWidth = $img[ 0 ].width;
 			} else {
 				// If we don't have a real image, get the containing divs width/height.
 				// Note that if we do have a real image, using this method will generally
@@ -54,7 +55,7 @@
 			}
 
 			captionWidth = $this.children().children( 'div.gallerytextwrapper' ).width();
-			rows[rows.length - 1][rows[rows.length - 1].length] = {
+			rows[ rows.length - 1 ][ rows[ rows.length - 1 ].length ] = {
 				$elm: $this,
 				width: $this.outerWidth(),
 				imgWidth: imgWidth,
@@ -96,25 +97,25 @@
 				maxWidth = $gallery.width();
 				combinedAspect = 0;
 				combinedPadding = 0;
-				curRow = rows[i];
+				curRow = rows[ i ];
 				curRowHeight = 0;
 
 				for ( j = 0; j < curRow.length; j++ ) {
 					if ( curRowHeight === 0 ) {
-						if ( isFinite( curRow[j].height ) ) {
+						if ( isFinite( curRow[ j ].height ) ) {
 							// Get the height of this row, by taking the first
 							// non-out of bounds height
-							curRowHeight = curRow[j].height;
+							curRowHeight = curRow[ j ].height;
 						}
 					}
 
-					if ( curRow[j].aspect === 0 || !isFinite( curRow[j].aspect ) ) {
+					if ( curRow[ j ].aspect === 0 || !isFinite( curRow[ j ].aspect ) ) {
 						// One of the dimensions are 0. Probably should
 						// not try to resize.
-						combinedPadding += curRow[j].width;
+						combinedPadding += curRow[ j ].width;
 					} else {
-						combinedAspect += curRow[j].aspect;
-						combinedPadding += curRow[j].width - curRow[j].imgWidth;
+						combinedAspect += curRow[ j ].aspect;
+						combinedPadding += curRow[ j ].width - curRow[ j ].imgWidth;
 					}
 				}
 
@@ -162,13 +163,13 @@
 				}
 
 				for ( j = 0; j < curRow.length; j++ ) {
-					newWidth = preferredHeight * curRow[j].aspect;
-					padding = curRow[j].width - curRow[j].imgWidth;
-					$outerDiv = curRow[j].$elm;
+					newWidth = preferredHeight * curRow[ j ].aspect;
+					padding = curRow[ j ].width - curRow[ j ].imgWidth;
+					$outerDiv = curRow[ j ].$elm;
 					$innerDiv = $outerDiv.children( 'div' ).first();
 					$imageDiv = $innerDiv.children( 'div.thumb' );
 					$imageElm = $imageDiv.find( 'img' ).first();
-					imageElm = $imageElm.length ? $imageElm[0] : null;
+					imageElm = $imageElm.length ? $imageElm[ 0 ] : null;
 					$caption = $outerDiv.find( 'div.gallerytextwrapper' );
 
 					// Since we are going to re-adjust the height, the vertical
@@ -187,7 +188,7 @@
 						$outerDiv.width( newWidth + padding );
 						$innerDiv.width( newWidth + padding );
 						$imageDiv.width( newWidth );
-						$caption.width( curRow[j].captionWidth + ( newWidth - curRow[j].imgWidth ) );
+						$caption.width( curRow[ j ].captionWidth + ( newWidth - curRow[ j ].imgWidth ) );
 					}
 
 					if ( imageElm ) {
@@ -220,7 +221,7 @@
 			$( this ).find( 'div.gallerytextwrapper' ).width( captionWidth );
 
 			$imageElm = $( this ).find( 'img' ).first();
-			imageElm = $imageElm.length ? $imageElm[0] : null;
+			imageElm = $imageElm.length ? $imageElm[ 0 ] : null;
 			if ( imageElm ) {
 				imageElm.width = imgWidth;
 				imageElm.height = imgHeight;
diff --git a/resources/src/mediawiki.page/mediawiki.page.image.pagination.js b/resources/src/mediawiki.page/mediawiki.page.image.pagination.js
index 9ad9c30a79..49a51dfc23 100644
--- a/resources/src/mediawiki.page/mediawiki.page.image.pagination.js
+++ b/resources/src/mediawiki.page/mediawiki.page.image.pagination.js
@@ -2,6 +2,7 @@
  * Implement AJAX navigation for multi-page images so the user may browse without a full page reload.
  */
 ( function ( mw, $ ) {
+	/*jshint latedef:false */
 	var jqXhr, $multipageimage, $spinner,
 		cache = {},
 		cacheOrder = [];
@@ -18,11 +19,11 @@
 		jqXhr = undefined;
 
 		// Try the cache
-		if ( cache[url] ) {
+		if ( cache[ url ] ) {
 			// Update access freshness
 			cacheOrder.splice( $.inArray( url, cacheOrder ), 1 );
 			cacheOrder.push( url );
-			return $.Deferred().resolve( cache[url] ).promise();
+			return $.Deferred().resolve( cache[ url ] ).promise();
 		}
 
 		// @todo Don't fetch the entire page. Ideally we'd only fetch the content portion or the data
@@ -36,12 +37,12 @@
 			jqXhr = undefined;
 
 			// Cache the newly loaded page
-			cache[url] = $contents;
+			cache[ url ] = $contents;
 			cacheOrder.push( url );
 
 			// Remove the oldest entry if we're over the limit
 			if ( cacheOrder.length > 10 ) {
-				delete cache[ cacheOrder[0] ];
+				delete cache[ cacheOrder[ 0 ] ];
 				cacheOrder = cacheOrder.slice( 1 );
 			}
 		} );
diff --git a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
index 9724c562a3..a3197da367 100644
--- a/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
+++ b/resources/src/mediawiki.page/mediawiki.page.watch.ajax.js
@@ -84,12 +84,12 @@
 		actionPaths = mw.config.get( 'wgActionPaths' );
 		for ( key in actionPaths ) {
 			if ( actionPaths.hasOwnProperty( key ) ) {
-				parts = actionPaths[key].split( '$1' );
+				parts = actionPaths[ key ].split( '$1' );
 				for ( i = 0; i < parts.length; i++ ) {
-					parts[i] = mw.RegExp.escape( parts[i] );
+					parts[ i ] = mw.RegExp.escape( parts[ i ] );
 				}
 				m = new RegExp( parts.join( '(.+)' ) ).exec( url );
-				if ( m && m[1] ) {
+				if ( m && m[ 1 ] ) {
 					return key;
 				}
 
@@ -138,7 +138,7 @@
 
 			api = new mw.Api();
 
-			api[action]( title )
+			api[ action ]( title )
 				.done( function ( watchResponse ) {
 					var otherAction = action === 'watch' ? 'unwatch' : 'watch';
 
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeemail.js b/resources/src/mediawiki.special/mediawiki.special.changeemail.js
index 67531f78bc..06851b9372 100644
--- a/resources/src/mediawiki.special/mediawiki.special.changeemail.js
+++ b/resources/src/mediawiki.special/mediawiki.special.changeemail.js
@@ -4,6 +4,7 @@
 ( function ( mw, $ ) {
 	/**
 	 * Given an email validity status (true, false, null) update the label CSS class
+	 *
 	 * @ignore
 	 */
 	function updateMailValidityLabel( mail ) {
diff --git a/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css b/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css
index 0e026aff98..a4843509c2 100644
--- a/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css
+++ b/resources/src/mediawiki.special/mediawiki.special.changeslist.enhanced.css
@@ -59,3 +59,7 @@ table.mw-enhanced-rc td.mw-enhanced-rc-nested {
 .mw-enhanced-watched .mw-enhanced-rc-time {
 	font-weight: bold;
 }
+
+span.changedby {
+	font-size: 95%;
+}
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.css b/resources/src/mediawiki.special/mediawiki.special.preferences.css
index 0e71d30b78..8fb9a4785b 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.css
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.css
@@ -20,7 +20,7 @@
 	zoom: 1;
 }
 
-/* When JS is enabled, .successbox is replaced with a mw.notification */
-.successbox {
+/* When JS is enabled, .mw-preferences-messageboxes are replaced with mw.notifications */
+.mw-preferences-messagebox {
 	display: none;
 }
diff --git a/resources/src/mediawiki.special/mediawiki.special.preferences.js b/resources/src/mediawiki.special/mediawiki.special.preferences.js
index 893db9827e..bad1c0837d 100644
--- a/resources/src/mediawiki.special/mediawiki.special.preferences.js
+++ b/resources/src/mediawiki.special/mediawiki.special.preferences.js
@@ -1,4 +1,3 @@
-
 /*!
  * JavaScript for Special:Preferences
  */
@@ -52,8 +51,8 @@ jQuery( function ( $ ) {
 	 * It uses document.getElementById for security reasons (HTML injections in $()).
 	 *
 	 * @ignore
-	 * @param String name: the name of a tab without the prefix ("mw-prefsection-")
-	 * @param String mode: [optional] A hash will be set according to the current
+	 * @param {String} name the name of a tab without the prefix ("mw-prefsection-")
+	 * @param {String} [mode] A hash will be set according to the current
 	 *  open section. Set mode 'noHash' to surpress this.
 	 */
 	function switchPrefTab( name, mode ) {
@@ -86,18 +85,23 @@ jQuery( function ( $ ) {
 		}
 	}
 
-	// If there is a #mw-preferences-success box and javascript is enabled, use a slick notification instead!
-	if ( $( '#mw-preferences-success' ).length ) {
-		notif = mediaWiki.notification.notify( mediaWiki.message( 'savedprefs' ), { autoHide: false } );
-		$( '#preftoc, .prefsection' ).one( 'change keydown mousedown', function () { // 'change' event not reliable!
-			if ( notif ) {
-				notif.close();
-			}
-		} );
+	// Check for messageboxes (.successbox, .warningbox, .errorbox) to replace with notifications
+	if ( $( '.mw-preferences-messagebox' ).length ) {
+		// If there is a #mw-preferences-success box and javascript is enabled, use a slick notification instead!
+		if ( $( '#mw-preferences-success' ).length ) {
+			notif = mediaWiki.notification.notify( mediaWiki.message( 'savedprefs' ), { autoHide: false } );
+			// 'change' event not reliable!
+			$( '#preftoc, .prefsection' ).one( 'change keydown mousedown', function () {
+				if ( notif ) {
+					notif.close();
+					notif = null;
+				}
+			} );
 
-		// Remove now-unnecessary success=1 querystring to prevent reappearance of notification on reload
-		if ( history.replaceState ) {
-			history.replaceState( {}, document.title, document.URL.replace( /&?success=1/, '' ) );
+			// Remove now-unnecessary success=1 querystring to prevent reappearance of notification on reload
+			if ( history.replaceState ) {
+				history.replaceState( {}, document.title, location.href.replace( /&?success=1/, '' ) );
+			}
 		}
 	}
 
@@ -130,7 +134,7 @@ jQuery( function ( $ ) {
 	// Disable the button to save preferences unless preferences have changed
 	$( '#prefcontrol' ).prop( 'disabled', true );
 	$( '.prefsection' ).one( 'change keydown mousedown', function () {
-		$( '#prefcontrol' ).prop( 'disabled', false);
+		$( '#prefcontrol' ).prop( 'disabled', false );
 	} );
 
 	// Enable keyboard users to use left and right keys to switch tabs
@@ -206,15 +210,15 @@ jQuery( function ( $ ) {
 		var minutes,
 			arr = hour.split( ':' );
 
-		arr[0] = parseInt( arr[0], 10 );
+		arr[ 0 ] = parseInt( arr[ 0 ], 10 );
 
 		if ( arr.length === 1 ) {
 			// Specification is of the form [-]XX
-			minutes = arr[0] * 60;
+			minutes = arr[ 0 ] * 60;
 		} else {
 			// Specification is of the form [-]XX:XX
-			minutes = Math.abs( arr[0] ) * 60 + parseInt( arr[1], 10 );
-			if ( arr[0] < 0 ) {
+			minutes = Math.abs( arr[ 0 ] ) * 60 + parseInt( arr[ 1 ], 10 );
+			if ( arr[ 0 ] < 0 ) {
 				minutes *= -1;
 			}
 		}
@@ -241,7 +245,7 @@ jQuery( function ( $ ) {
 			minuteDiff = hoursToMinutes( $tzTextbox.val() );
 		} else {
 			// Grab data from the $tzSelect value
-			minuteDiff = parseInt( type.split( '|' )[1], 10 ) || 0;
+			minuteDiff = parseInt( type.split( '|' )[ 1 ], 10 ) || 0;
 			$tzTextbox.val( minutesToHours( minuteDiff ) );
 		}
 
diff --git a/resources/src/mediawiki.special/mediawiki.special.search.js b/resources/src/mediawiki.special/mediawiki.special.search.js
index b27fe349b1..730119e862 100644
--- a/resources/src/mediawiki.special/mediawiki.special.search.js
+++ b/resources/src/mediawiki.special/mediawiki.special.search.js
@@ -39,12 +39,12 @@
 				var parts = $( this ).attr( 'href' ).split( 'search=' ),
 					lastpart = '',
 					prefix = 'search=';
-				if ( parts.length > 1 && parts[1].indexOf( '&' ) !== -1 ) {
-					lastpart = parts[1].slice( parts[1].indexOf( '&' ) );
+				if ( parts.length > 1 && parts[ 1 ].indexOf( '&' ) !== -1 ) {
+					lastpart = parts[ 1 ].slice( parts[ 1 ].indexOf( '&' ) );
 				} else {
 					prefix = '&search=';
 				}
-				this.href = parts[0] + prefix + encodeURIComponent( searchterm ) + lastpart;
+				this.href = parts[ 0 ] + prefix + encodeURIComponent( searchterm ) + lastpart;
 			} );
 		} ).trigger( 'change' );
 
diff --git a/resources/src/mediawiki.special/mediawiki.special.upload.js b/resources/src/mediawiki.special/mediawiki.special.upload.js
index 7dd0369eb5..677d26d798 100644
--- a/resources/src/mediawiki.special/mediawiki.special.upload.js
+++ b/resources/src/mediawiki.special/mediawiki.special.upload.js
@@ -6,6 +6,7 @@
  * @singleton
  */
 ( function ( mw, $ ) {
+	/*jshint latedef:false */
 	var uploadWarning, uploadLicense,
 		ajaxUploadDestCheck = mw.config.get( 'wgAjaxUploadDestCheck' ),
 		$license = $( '#wpLicense' );
@@ -35,7 +36,7 @@
 			}
 			// Check response cache
 			if ( this.responseCache.hasOwnProperty( this.nameToCheck ) ) {
-				this.setWarning( this.responseCache[this.nameToCheck] );
+				this.setWarning( this.responseCache[ this.nameToCheck ] );
 				return;
 			}
 
@@ -71,7 +72,7 @@
 			} ).done( function ( result ) {
 				var resultOut = '';
 				if ( result.query ) {
-					resultOut = result.query.pages[result.query.pageids[0]].imageinfo[0];
+					resultOut = result.query.pages[ result.query.pageids[ 0 ] ].imageinfo[ 0 ];
 				}
 				$spinnerDestCheck.remove();
 				uploadWarning.processResult( resultOut, uploadWarning.nameToCheck );
@@ -80,7 +81,7 @@
 
 		processResult: function ( result, fileName ) {
 			this.setWarning( result.html );
-			this.responseCache[fileName] = result.html;
+			this.responseCache[ fileName ] = result.html;
 		},
 
 		setWarning: function ( warning ) {
@@ -107,7 +108,7 @@
 				return;
 			}
 			if ( this.responseCache.hasOwnProperty( license ) ) {
-				this.showPreview( this.responseCache[license] );
+				this.showPreview( this.responseCache[ license ] );
 				return;
 			}
 
@@ -126,8 +127,8 @@
 		},
 
 		processResult: function ( result, license ) {
-			this.responseCache[license] = result.parse.text['*'];
-			this.showPreview( this.responseCache[license] );
+			this.responseCache[ license ] = result.parse.text[ '*' ];
+			this.showPreview( this.responseCache[ license ] );
 		},
 
 		showPreview: function ( preview ) {
@@ -228,7 +229,7 @@
 				fname = fname.replace( / /g, '_' );
 				// Capitalise first letter if needed
 				if ( mw.config.get( 'wgCapitalizeUploads' ) ) {
-					fname = fname[0].toUpperCase() + fname.slice( 1 );
+					fname = fname[ 0 ].toUpperCase() + fname.slice( 1 );
 				}
 
 				// Output result
@@ -265,14 +266,31 @@
 		 * TODO: Put SVG back after working around Firefox 7 bug <https://bugzilla.wikimedia.org/show_bug.cgi?id=31643>
 		 *
 		 * @param {File} file
-		 * @return boolean
+		 * @return {boolean}
 		 */
 		function fileIsPreviewable( file ) {
-			var known = ['image/png', 'image/gif', 'image/jpeg', 'image/svg+xml'],
+			var known = [ 'image/png', 'image/gif', 'image/jpeg', 'image/svg+xml' ],
 				tooHuge = 10 * 1024 * 1024;
 			return ( $.inArray( file.type, known ) !== -1 ) && file.size > 0 && file.size < tooHuge;
 		}
 
+		/**
+		 * Format a file size attractively.
+		 *
+		 * TODO: Match numeric formatting
+		 *
+		 * @param {number} s
+		 * @return {string}
+		 */
+		function prettySize( s ) {
+			var sizeMsgs = [ 'size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes' ];
+			while ( s >= 1024 && sizeMsgs.length > 1 ) {
+				s /= 1024;
+				sizeMsgs = sizeMsgs.slice( 1 );
+			}
+			return mw.msg( sizeMsgs[ 0 ], Math.round( s ) );
+		}
+
 		/**
 		 * Show a thumbnail preview of PNG, JPEG, GIF, and SVG files prior to upload
 		 * in browsers supporting HTML5 FileAPI.
@@ -291,13 +309,17 @@
 				ctx,
 				meta,
 				previewSize = 180,
+				$spinner = $.createSpinner( { size: 'small', type: 'block' } )
+					.css( { width: previewSize, height: previewSize } ),
 				thumb = mw.template.get( 'mediawiki.special.upload', 'thumbnail.html' ).render();
 
-			thumb.find( '.filename' ).text( file.name ).end()
-				.find( '.fileinfo' ).text( prettySize( file.size ) ).end();
+			thumb
+				.find( '.filename' ).text( file.name ).end()
+				.find( '.fileinfo' ).text( prettySize( file.size ) ).end()
+				.find( '.thumbinner' ).prepend( $spinner ).end();
 
-			$canvas = $( '<canvas width="' + previewSize + '" height="' + previewSize + '" ></canvas>' );
-			ctx = $canvas[0].getContext( '2d' );
+			$canvas = $( '<canvas>' ).attr( { width: previewSize, height: previewSize } );
+			ctx = $canvas[ 0 ].getContext( '2d' );
 			$( '#mw-htmlform-source' ).parent().prepend( thumb );
 
 			fetchPreview( file, function ( dataURL ) {
@@ -369,7 +391,7 @@
 					ctx.clearRect( 0, 0, 180, 180 );
 					ctx.rotate( rotation / 180 * Math.PI );
 					ctx.drawImage( img, x, y, width, height );
-					thumb.find( '.mw-spinner-small' ).replaceWith( $canvas );
+					$spinner.replaceWith( $canvas );
 
 					// Image size
 					info = mw.msg( 'widthheight', logicalWidth, logicalHeight ) +
@@ -421,7 +443,7 @@
 						buffer = new Uint8Array( reader.result ),
 						string = '';
 					for ( i = 0; i < buffer.byteLength; i++ ) {
-						string += String.fromCharCode( buffer[i] );
+						string += String.fromCharCode( buffer[ i ] );
 					}
 					callbackBinary( string );
 
@@ -450,23 +472,6 @@
 			}
 		}
 
-		/**
-		 * Format a file size attractively.
-		 *
-		 * TODO: Match numeric formatting
-		 *
-		 * @param {number} s
-		 * @return {string}
-		 */
-		function prettySize( s ) {
-			var sizeMsgs = ['size-bytes', 'size-kilobytes', 'size-megabytes', 'size-gigabytes'];
-			while ( s >= 1024 && sizeMsgs.length > 1 ) {
-				s /= 1024;
-				sizeMsgs = sizeMsgs.slice( 1 );
-			}
-			return mw.msg( sizeMsgs[0], Math.round( s ) );
-		}
-
 		/**
 		 * Clear the file upload preview area.
 		 */
@@ -483,10 +488,10 @@
 			function getMaxUploadSize( type ) {
 				var sizes = mw.config.get( 'wgMaxUploadSize' );
 
-				if ( sizes[type] !== undefined ) {
-					return sizes[type];
+				if ( sizes[ type ] !== undefined ) {
+					return sizes[ type ];
 				}
-				return sizes['*'];
+				return sizes[ '*' ];
 			}
 
 			$( '.mw-upload-source-error' ).remove();
@@ -511,7 +516,7 @@
 				clearPreview();
 				if ( this.files && this.files.length ) {
 					// Note: would need to be updated to handle multiple files.
-					var file = this.files[0];
+					var file = this.files[ 0 ];
 
 					if ( !checkMaxUploadSize( file ) ) {
 						return;
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
deleted file mode 100644
index f5289deea0..0000000000
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.common.js
+++ /dev/null
@@ -1,72 +0,0 @@
-/*!
- * JavaScript for login and signup forms.
- */
-( function ( mw, $ ) {
-	// Move the FancyCaptcha image into a more attractive container.
-	// The CAPTCHA is in a <div class="captcha"> at the top of the form. If it's a FancyCaptcha,
-	// then we remove it and insert it lower down, in a customized div with just what we need (e.g.
-	// no 'fancycaptcha-createaccount' message).
-	function adjustFancyCaptcha( $content, buttonSubmit ) {
-		var $submit = $content.find( buttonSubmit ),
-			tabIndex,
-			$captchaStuff,
-			$captchaImageContainer,
-			// JavaScript can't yet parse the message 'createacct-imgcaptcha-help' when it
-			// contains a MediaWiki transclusion, so PHP parses it and sends the HTML.
-			// This is only set for the signup form (and undefined for login).
-			helpMsg = mw.config.get( 'wgCreateacctImgcaptchaHelp' ),
-			helpHtml = '';
-
-		if ( !$submit.length ) {
-			return;
-		}
-		tabIndex = $submit.prop( 'tabIndex' ) - 1;
-		$captchaStuff = $content.find( '.captcha' );
-
-		if ( $captchaStuff.length ) {
-			// The FancyCaptcha has this class in the ConfirmEdit extension since 2013-04-18.
-			$captchaImageContainer = $captchaStuff.find( '.fancycaptcha-image-container' );
-			if ( $captchaImageContainer.length !== 1 ) {
-				return;
-			}
-
-			$captchaStuff.remove();
-
-			if ( helpMsg ) {
-				helpHtml = '<small class="mw-createacct-captcha-assisted">' + helpMsg + '</small>';
-			}
-
-			// Insert another div before the submit button that will include the
-			// repositioned FancyCaptcha div, an input field, and possible help.
-			$submit.closest( 'div' ).before( [
-				'<div>',
-					'<label for="wpCaptchaWord">' + mw.message( 'createacct-captcha' ).escaped() + '</label>',
-					'<div class="mw-createacct-captcha-container">',
-						'<div class="mw-createacct-captcha-and-reload" />',
-						'<input id="wpCaptchaWord" class="mw-ui-input" name="wpCaptchaWord" type="text" placeholder="' +
-							mw.message( 'createacct-imgcaptcha-ph' ).escaped() +
-							'" tabindex="' + tabIndex + '" autocapitalize="off" autocorrect="off">',
-							helpHtml,
-					'</div>',
-				'</div>'
-			].join( '' ) );
-
-			// Stick the FancyCaptcha container inside our bordered and framed parents.
-			$captchaImageContainer
-				.prependTo( $content.find( '.mw-createacct-captcha-and-reload' ) );
-
-			// Find the input field, add the text (if any) of the existing CAPTCHA
-			// field (although usually it's blanked out on every redisplay),
-			// and after it move over the hidden field that tells the CAPTCHA
-			// what to do.
-			$content.find( '#wpCaptchaWord' )
-				.val( $captchaStuff.find( '#wpCaptchaWord' ).val() )
-				.after( $captchaStuff.find( '#wpCaptchaId' ) );
-		}
-	}
-
-	$( function () {
-		// Work with both login and signup form
-		adjustFancyCaptcha( $( '#mw-content-text' ), '#wpCreateaccount, #wpLoginAttempt' );
-	} );
-}( mediaWiki, jQuery ) );
diff --git a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js
index a32a790261..a0c6ee2a63 100644
--- a/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js
+++ b/resources/src/mediawiki.special/mediawiki.special.userlogin.signup.js
@@ -65,7 +65,7 @@
 				ususers: username // '|' in usernames is handled below
 			} )
 				.done( function ( resp ) {
-					var userinfo = resp.query.users[0];
+					var userinfo = resp.query.users[ 0 ];
 
 					if ( resp.query.users.length !== 1 ) {
 						// Happens if the user types '|' into the field
diff --git a/resources/src/mediawiki.special/templates/thumbnail.html b/resources/src/mediawiki.special/templates/thumbnail.html
index 305f20c6ea..bf0e7014db 100644
--- a/resources/src/mediawiki.special/templates/thumbnail.html
+++ b/resources/src/mediawiki.special/templates/thumbnail.html
@@ -1,7 +1,5 @@
 <div id="mw-upload-thumbnail" class="thumb tright">
 	<div class="thumbinner">
-		<!-- Note: Change showPreview() in mediawiki.special.upload.js if mw-spinner-small classname changes -->
-		<div class="mw-spinner mw-spinner-small" style="width: 180px; height: 180px"></div>
 		<div class="thumbcaption">
 			<div class="filename"></div>
 			<div class="fileinfo"></div>
diff --git a/resources/src/mediawiki.toolbar/toolbar.js b/resources/src/mediawiki.toolbar/toolbar.js
index 70d54ce39b..0469cc5058 100644
--- a/resources/src/mediawiki.toolbar/toolbar.js
+++ b/resources/src/mediawiki.toolbar/toolbar.js
@@ -174,7 +174,7 @@
 		$toolbar = $( '#toolbar' );
 
 		for ( i = 0; i < queue.length; i++ ) {
-			button = queue[i];
+			button = queue[ i ];
 			if ( $.isArray( button ) ) {
 				// Forwarded arguments array from mw.toolbar.addButton
 				insertButton.apply( toolbar, button );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
index f1a08a3d80..d519c0df54 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.CalendarWidget.js
@@ -173,7 +173,7 @@
 		}
 		this.$oldBody = this.$body.addClass( 'mw-widget-calendarWidget-old-body' );
 		// Clone without children
-		this.$body = $( this.$body[0].cloneNode( false ) )
+		this.$body = $( this.$body[ 0 ].cloneNode( false ) )
 			.removeClass( 'mw-widget-calendarWidget-old-body' )
 			.toggleClass( 'mw-widget-calendarWidget-body-month', this.displayLayer === 'month' )
 			.toggleClass( 'mw-widget-calendarWidget-body-year', this.displayLayer === 'year' )
@@ -310,6 +310,7 @@
 
 	/**
 	 * Handle click events on the "up" button, switching to less precise view.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onUpButtonClick = function () {
@@ -327,6 +328,7 @@
 
 	/**
 	 * Handle click events on the "previous" button, switching to previous pane.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onPrevButtonClick = function () {
@@ -346,6 +348,7 @@
 
 	/**
 	 * Handle click events on the "next" button, switching to next pane.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onNextButtonClick = function () {
@@ -367,6 +370,7 @@
 	 * Handle click events anywhere in the body of the widget, which contains the matrix of days,
 	 * months or years to choose. Maybe change the pane or switch to more precise view, depending on
 	 * what gets clicked.
+	 *
 	 * @private
 	 */
 	mw.widgets.CalendarWidget.prototype.onBodyClick = function ( e ) {
diff --git a/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
new file mode 100644
index 0000000000..8d6452cd19
--- /dev/null
+++ b/resources/src/mediawiki.widgets/mw.widgets.CategorySelector.js
@@ -0,0 +1,102 @@
+/*!
+ * MediaWiki Widgets - CategorySelector class.
+ *
+ * @copyright 2011-2015 MediaWiki Widgets Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+( function ( $, mw ) {
+
+	/**
+	 * Category selector widget. Displays an OO.ui.CapsuleMultiSelectWidget
+	 * and autocompletes with available categories.
+	 *
+	 * @class
+	 * @uses mw.Api
+	 * @extends OO.ui.CapsuleMultiSelectWidget
+	 *
+	 * @constructor
+	 * @param {Object} [config] Configuration options
+	 * @cfg {number} [limit=10] Maximum number of results to load
+	 */
+	mw.widgets.CategorySelector = function ( config ) {
+		// Config initialization
+		config = $.extend( { limit: 10 }, config );
+		this.limit = config.limit;
+
+		// Parent constructor
+		mw.widgets.CategorySelector.parent.call( this, config );
+
+		// Event handler to call the autocomplete methods
+		this.$input.on( 'change input cut paste', OO.ui.debounce( this.updateMenuItems.bind( this ), 100 ) );
+	};
+
+	/* Setup */
+
+	OO.inheritClass( mw.widgets.CategorySelector, OO.ui.CapsuleMultiSelectWidget );
+
+	/* Methods */
+
+	/**
+	 * Gets new items based on the input by calling
+	 * {@link #getNewMenuItems getNewItems} and updates the menu
+	 * after removing duplicates based on the data value.
+	 *
+	 * @private
+	 * @method
+	 */
+	mw.widgets.CategorySelector.prototype.updateMenuItems = function () {
+		this.getNewMenuItems( this.$input.val() ).then( function ( items ) {
+			var existingItems, filteredItems,
+				menu = this.getMenu();
+
+			// Array of strings of the data of OO.ui.MenuOptionsWidgets
+			existingItems = menu.getItems().map( function ( item ) {
+				return item.data;
+			} );
+
+			// Remove if items' data already exists
+			filteredItems = items.filter( function ( item ) {
+				return existingItems.indexOf( item ) === -1;
+			} );
+
+			// Map to an array of OO.ui.MenuOptionWidgets
+			filteredItems = filteredItems.map( function ( item ) {
+				return new OO.ui.MenuOptionWidget( {
+					data: item,
+					label: item
+				} );
+			} );
+
+			menu.addItems( filteredItems ).updateItemVisibility();
+		}.bind( this ) );
+	};
+
+	/**
+	 * Searches for categories based on the input.
+	 *
+	 * @private
+	 * @method
+	 * @param {string} input The input used to prefix search categories
+	 * @return {jQuery.Promise} Resolves with an array of categories
+	 */
+	mw.widgets.CategorySelector.prototype.getNewMenuItems = function ( input ) {
+		var deferred = new $.Deferred(),
+			catNsId = mw.config.get( 'wgNamespaceIds' ).category,
+			api = new mw.Api();
+
+		api.get( {
+			action: 'opensearch',
+			namespace: catNsId,
+			limit: this.limit,
+			search: input
+		} ).done( function ( res ) {
+			var categoryNames = res[ 1 ].map( function ( name ) {
+				return mw.Title.newFromText( name, catNsId ).getMainText();
+			} );
+
+			deferred.resolve( categoryNames );
+		} );
+
+		return deferred.promise();
+	};
+}( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
index 8d952e5a76..b478c4a95c 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.js
@@ -75,12 +75,20 @@
 	 *     field when it's empty. Should be the same as `inputFormat`, but translated to the user's
 	 *     language. When not given, defaults to a translated version of 'YYYY-MM-DD' or 'YYYY-MM',
 	 *     depending on `precision`.
+	 * @cfg {boolean} [required=false] Mark the field as required. Implies `indicator: 'required'`.
+	 * @cfg {string} [mustBeAfter] Validates the date to be after this. In the 'YYYY-MM-DD' format.
+	 * @cfg {string} [mustBeBefore] Validates the date to be before this. In the 'YYYY-MM-DD' format.
 	 */
 	mw.widgets.DateInputWidget = function MWWDateInputWidget( config ) {
 		// Config initialization
 		config = $.extend( { precision: 'day' }, config );
+		if ( config.required ) {
+			if ( config.indicator === undefined ) {
+				config.indicator = 'required';
+			}
+		}
 
-		var placeholder;
+		var placeholder, mustBeAfter, mustBeBefore;
 		if ( config.placeholder ) {
 			placeholder = config.placeholder;
 		} else if ( config.inputFormat ) {
@@ -105,6 +113,23 @@
 		this.inputFormat = config.inputFormat;
 		this.displayFormat = config.displayFormat;
 
+		// Validate and set min and max dates as properties
+		mustBeAfter = moment( config.mustBeAfter, 'YYYY-MM-DD' );
+		mustBeBefore = moment( config.mustBeBefore, 'YYYY-MM-DD' );
+		if (
+			config.mustBeAfter !== undefined &&
+			mustBeAfter.isValid()
+		) {
+			this.mustBeAfter = mustBeAfter;
+		}
+
+		if (
+			config.mustBeBefore !== undefined &&
+			mustBeBefore.isValid()
+		) {
+			this.mustBeBefore = mustBeBefore;
+		}
+
 		// Parent constructor
 		mw.widgets.DateInputWidget.parent.call( this, config );
 
@@ -128,6 +153,10 @@
 		} );
 
 		// Initialization
+		if ( config.required ) {
+			this.$input.attr( 'required', 'required' );
+			this.$input.attr( 'aria-required', 'true' );
+		}
 		// Move 'tabindex' from this.$input (which is invisible) to the visible handle
 		this.setTabIndexedElement( this.handle.$element );
 		this.handle.$element
@@ -175,31 +204,32 @@
 	 * @private
 	 */
 	mw.widgets.DateInputWidget.prototype.onTextInputChange = function () {
-		var
+		var mom,
 			widget = this,
-			value = this.textInput.getValue();
+			value = this.textInput.getValue(),
+			valid = this.isValidDate( value );
 		this.inTextInput++;
-		this.textInput.isValid().done( function ( valid ) {
-			if ( value === '' ) {
-				// No date selected
-				widget.setValue( '' );
-			} else if ( valid ) {
-				// Well-formed date value, parse and set it
-				var mom = moment( value, widget.getInputFormat() );
-				// Use English locale to avoid number formatting
-				widget.setValue( mom.locale( 'en' ).format( widget.getInternalFormat() ) );
-			} else {
-				// Not well-formed, but possibly partial? Try updating the calendar, but do not set the
-				// internal value. Generally this only makes sense when 'inputFormat' is little-endian (e.g.
-				// 'YYYY-MM-DD'), but that's hard to check for, and might be difficult to handle the parsing
-				// right for weird formats. So limit this trick to only when we're using the default
-				// 'inputFormat', which is the same as the internal format, 'YYYY-MM-DD'.
-				if ( widget.getInputFormat() === widget.getInternalFormat() ) {
-					widget.calendar.setDate( widget.textInput.getValue() );
-				}
+
+		if ( value === '' ) {
+			// No date selected
+			widget.setValue( '' );
+		} else if ( valid ) {
+			// Well-formed date value, parse and set it
+			mom = moment( value, widget.getInputFormat() );
+			// Use English locale to avoid number formatting
+			widget.setValue( mom.locale( 'en' ).format( widget.getInternalFormat() ) );
+		} else {
+			// Not well-formed, but possibly partial? Try updating the calendar, but do not set the
+			// internal value. Generally this only makes sense when 'inputFormat' is little-endian (e.g.
+			// 'YYYY-MM-DD'), but that's hard to check for, and might be difficult to handle the parsing
+			// right for weird formats. So limit this trick to only when we're using the default
+			// 'inputFormat', which is the same as the internal format, 'YYYY-MM-DD'.
+			if ( widget.getInputFormat() === widget.getInternalFormat() ) {
+				widget.calendar.setDate( widget.textInput.getValue() );
 			}
-			widget.inTextInput--;
-		} );
+		}
+		widget.inTextInput--;
+
 	};
 
 	/**
@@ -231,7 +261,7 @@
 		setTimeout( function () {
 			var $focussed = $( ':focus' );
 			// Deactivate unless the focus moved to something else inside this widget
-			if ( !OO.ui.contains( widget.$element[ 0 ], $focussed[0], true ) ) {
+			if ( !OO.ui.contains( widget.$element[ 0 ], $focussed[ 0 ], true ) ) {
 				widget.deactivate();
 			}
 		}, 0 );
@@ -433,12 +463,25 @@
 	 * @private
 	 * @param {string} date Date string, to be valid, must be empty (no date selected) or in
 	 *     'YYYY-MM-DD' or 'YYYY-MM' format to be valid
+	 * @returns {boolean}
 	 */
 	mw.widgets.DateInputWidget.prototype.validateDate = function ( date ) {
 		if ( date === '' ) {
 			return true;
 		}
 
+		var isValid = this.isValidDate( date ) && this.isInRange( date );
+		this.setValidityFlag( isValid );
+		return isValid;
+	};
+
+	/**
+	 * @private
+	 * @param {string} date Date string, to be valid, must be empty (no date selected) or in
+	 *     'YYYY-MM-DD' or 'YYYY-MM' format to be valid
+	 * @returns {boolean}
+	 */
+	mw.widgets.DateInputWidget.prototype.isValidDate = function ( date ) {
 		// "Half-strict mode": for example, for the format 'YYYY-MM-DD', 2015-1-3 instead of 2015-01-03
 		// is okay, but 2015-01 isn't, and neither is 2015-01-foo. Use Moment's "fuzzy" mode and check
 		// parsing flags for the details (stoled from implementation of #isValid).
@@ -449,4 +492,66 @@
 		return mom.isValid() && flags.charsLeftOver === 0 && flags.unusedTokens.length === 0;
 	};
 
+	/**
+	 * Validates if the date is within the range configured with {@link #cfg-mustBeAfter}
+	 * and {@link #cfg-mustBeBefore}.
+	 *
+	 * @private
+	 * @param {string} date Date string, to be valid, must be empty (no date selected) or in
+	 *     'YYYY-MM-DD' or 'YYYY-MM' format to be valid
+	 * @returns {boolean}
+	 */
+	mw.widgets.DateInputWidget.prototype.isInRange = function ( date ) {
+		var momentDate = moment( date, 'YYYY-MM-DD' ),
+			isAfter = ( this.mustBeAfter === undefined || momentDate.isAfter( this.mustBeAfter ) ),
+			isBefore = ( this.mustBeBefore === undefined || momentDate.isBefore( this.mustBeBefore ) );
+
+		return isAfter && isBefore;
+	};
+
+	/**
+	 * Get the validity of current value.
+	 *
+	 * This method returns a promise that resolves if the value is valid and rejects if
+	 * it isn't. Uses {@link #validateDate}.
+	 *
+	 * @return {jQuery.Promise} A promise that resolves if the value is valid, rejects if not.
+	 */
+	mw.widgets.DateInputWidget.prototype.getValidity = function () {
+		var isValid = this.validateDate( this.getValue() );
+
+		if ( isValid ) {
+			return $.Deferred().resolve().promise();
+		} else {
+			return $.Deferred().reject().promise();
+		}
+	};
+
+	/**
+	 * Sets the 'invalid' flag appropriately.
+	 *
+	 * @param {boolean} [isValid] Optionally override validation result
+	 */
+	mw.widgets.DateInputWidget.prototype.setValidityFlag = function ( isValid ) {
+		var widget = this,
+			setFlag = function ( valid ) {
+				if ( !valid ) {
+					widget.$input.attr( 'aria-invalid', 'true' );
+				} else {
+					widget.$input.removeAttr( 'aria-invalid' );
+				}
+				widget.setFlags( { invalid: !valid } );
+			};
+
+		if ( isValid !== undefined ) {
+			setFlag( isValid );
+		} else {
+			this.getValidity().then( function () {
+				setFlag( true );
+			}, function () {
+				setFlag( false );
+			} );
+		}
+	};
+
 }( jQuery, mediaWiki ) );
diff --git a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
index 1feb8f044a..f78a18d9e5 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
+++ b/resources/src/mediawiki.widgets/mw.widgets.DateInputWidget.less
@@ -104,6 +104,13 @@
 		}
 	}
 
+	&.oo-ui-flaggedElement-invalid {
+		.mw-widget-dateInputWidget-handle {
+			border-color: red;
+			box-shadow: inset 0 0 0 0 red;
+		}
+	}
+
 	&-empty {
 		.mw-widget-dateInputWidget-handle {
 			color: #ccc;
diff --git a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
index c9c9f031ee..d5a7abc68f 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.TitleInputWidget.js
@@ -29,7 +29,10 @@
 		var widget = this;
 
 		// Config initialization
-		config = $.extend( { maxLength: 255 }, config );
+		config = $.extend( {
+			maxLength: 255,
+			limit: 10
+		}, config );
 
 		// Parent constructor
 		mw.widgets.TitleInputWidget.parent.call( this, $.extend( {}, config, { autocomplete: false } ) );
@@ -38,7 +41,7 @@
 		OO.ui.mixin.LookupElement.call( this, config );
 
 		// Properties
-		this.limit = config.limit || 10;
+		this.limit = config.limit;
 		this.maxLength = config.maxLength;
 		this.namespace = config.namespace !== undefined ? config.namespace : null;
 		this.relative = config.relative !== undefined ? config.relative : true;
@@ -145,9 +148,9 @@
 					widget.interwikiPrefixes.indexOf( interwiki ) !== -1
 				) {
 					return $.Deferred().resolve( { query: {
-						pages: [{
+						pages: [ {
 							title: widget.value
-						}]
+						} ]
 					} } ).promise( promiseAbortObject );
 				} else {
 					params = {
@@ -210,15 +213,15 @@
 
 		if ( data.redirects ) {
 			for ( i = 0, len = data.redirects.length; i < len; i++ ) {
-				redirect = data.redirects[i];
-				redirectsTo[redirect.to] = redirectsTo[redirect.to] || [];
-				redirectsTo[redirect.to].push( redirect.from );
+				redirect = data.redirects[ i ];
+				redirectsTo[ redirect.to ] = redirectsTo[ redirect.to ] || [];
+				redirectsTo[ redirect.to ].push( redirect.from );
 			}
 		}
 
 		for ( index in data.pages ) {
-			suggestionPage = data.pages[index];
-			pageData[suggestionPage.title] = {
+			suggestionPage = data.pages[ index ];
+			pageData[ suggestionPage.title ] = {
 				missing: suggestionPage.missing !== undefined,
 				redirect: suggestionPage.redirect !== undefined,
 				disambiguation: OO.getProp( suggestionPage, 'pageprops', 'disambiguation' ) !== undefined,
@@ -232,15 +235,15 @@
 				titles.push( suggestionPage.title );
 			}
 
-			redirects = redirectsTo[suggestionPage.title] || [];
+			redirects = redirectsTo[ suggestionPage.title ] || [];
 			for ( i = 0, len = redirects.length; i < len; i++ ) {
-				pageData[redirects[i]] = {
+				pageData[ redirects[ i ] ] = {
 					missing: false,
 					redirect: true,
 					disambiguation: false,
 					description: mw.msg( 'mw-widgets-titleinput-description-redirect', suggestionPage.title )
 				};
-				titles.push( redirects[i] );
+				titles.push( redirects[ i ] );
 			}
 		}
 
@@ -253,7 +256,7 @@
 		);
 
 		if ( !pageExists ) {
-			pageData[this.value] = {
+			pageData[ this.value ] = {
 				missing: true, redirect: false, disambiguation: false,
 				description: mw.msg( 'mw-widgets-titleinput-description-new-page' )
 			};
@@ -272,8 +275,8 @@
 			titles.push( this.value );
 		}
 		for ( i = 0, len = titles.length; i < len; i++ ) {
-			page = pageData[titles[i]] || {};
-			items.push( new mw.widgets.TitleOptionWidget( this.getOptionWidgetData( titles[i], page ) ) );
+			page = pageData[ titles[ i ] ] || {};
+			items.push( new mw.widgets.TitleOptionWidget( this.getOptionWidgetData( titles[ i ], page ) ) );
 		}
 
 		return items;
diff --git a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
index d540877a0b..0d0fb735fa 100644
--- a/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
+++ b/resources/src/mediawiki.widgets/mw.widgets.UserInputWidget.js
@@ -80,7 +80,7 @@
 			list: 'allusers',
 			// Prefix of list=allusers is case sensitive. Normalise first
 			// character to uppercase so that "fo" may yield "Foo".
-			auprefix: inputValue[0].toUpperCase() + inputValue.slice( 1 ),
+			auprefix: inputValue[ 0 ].toUpperCase() + inputValue.slice( 1 ),
 			aulimit: this.limit
 		} );
 	};
@@ -106,7 +106,7 @@
 			items = [];
 
 		for ( i = 0, len = data.length; i < len; i++ ) {
-			user = data[i] || {};
+			user = data[ i ] || {};
 			items.push( new OO.ui.MenuOptionWidget( {
 				label: user.name,
 				data: user.name
diff --git a/resources/src/mediawiki/images/question.png b/resources/src/mediawiki/images/question.png
new file mode 100644
index 0000000000..f7405d2626
Binary files /dev/null and b/resources/src/mediawiki/images/question.png differ
diff --git a/resources/src/mediawiki/images/question.svg b/resources/src/mediawiki/images/question.svg
new file mode 100644
index 0000000000..98fbe8dd75
--- /dev/null
+++ b/resources/src/mediawiki/images/question.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg xmlns="http://www.w3.org/2000/svg" width="21.059" height="21.06"><path fill="#575757" d="M10.529 0c-5.814 0-10.529 4.714-10.529 10.529s4.715 10.53 10.529 10.53c5.816 0 10.529-4.715 10.529-10.53s-4.712-10.529-10.529-10.529zm-.002 16.767c-.861 0-1.498-.688-1.498-1.516 0-.862.637-1.534 1.498-1.534.828 0 1.5.672 1.5 1.534 0 .827-.672 1.516-1.5 1.516zm2.137-6.512c-.723.568-1 .931-1 1.739v.5h-2.205v-.603c0-1.517.449-2.136 1.154-2.688.707-.552 1.139-.845 1.139-1.637 0-.672-.414-1.051-1.24-1.051-.707 0-1.328.189-1.982.638l-1.051-1.807c.861-.604 1.93-1.034 3.342-1.034 1.912 0 3.516 1.051 3.516 3.066-.001 1.43-.794 2.188-1.673 2.877z"/></svg>
\ No newline at end of file
diff --git a/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
new file mode 100644
index 0000000000..fe8520bfe1
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.ForeignStructuredUpload.js
@@ -0,0 +1,172 @@
+( function ( mw, OO ) {
+	/**
+	 * @class mw.ForeignStructuredUpload
+	 * @extends mw.ForeignUpload
+	 *
+	 * Used to represent an upload in progress on the frontend.
+	 *
+	 * This subclass will upload to a wiki using a structured metadata
+	 * system similar to (or identical to) the one on Wikimedia Commons.
+	 *
+	 * See <https://commons.wikimedia.org/wiki/Commons:Structured_data> for
+	 * a more detailed description of how that system works.
+	 *
+	 * TODO this currently only supports uploads under CC-BY-SA 4.0,
+	 *     and should really have support for more licenses.
+	 *
+	 * @inheritdoc
+	 */
+	function ForeignStructuredUpload( targetHost, apiconfig ) {
+		this.date = undefined;
+		this.descriptions = [];
+		this.categories = [];
+
+		mw.ForeignUpload.call( this, targetHost, apiconfig );
+	}
+
+	OO.inheritClass( ForeignStructuredUpload, mw.ForeignUpload );
+
+	/**
+	 * Add categories to the upload.
+	 *
+	 * @param {string[]} categories Array of categories to which this upload will be added.
+	 */
+	ForeignStructuredUpload.prototype.addCategories = function ( categories ) {
+		var i, category;
+
+		for ( i = 0; i < categories.length; i++ ) {
+			category = categories[ i ];
+			this.categories.push( category );
+		}
+	};
+
+	/**
+	 * Add a description to the upload.
+	 *
+	 * @param {string} language The language code for the description's language. Must have a template on the target wiki to work properly.
+	 * @param {string} description The description of the file.
+	 */
+	ForeignStructuredUpload.prototype.addDescription = function ( language, description ) {
+		this.descriptions.push( {
+			language: language,
+			text: description
+		} );
+	};
+
+	/**
+	 * Set the date of creation for the upload.
+	 *
+	 * @param {Date} date
+	 */
+	ForeignStructuredUpload.prototype.setDate = function ( date ) {
+		this.date = date;
+	};
+
+	/**
+	 * Get the text of the file page, to be created on upload. Brings together
+	 * several different pieces of information to create useful text.
+	 *
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getText = function () {
+		return (
+			'{{' +
+			this.getTemplateName() +
+			'\n|description=' +
+			this.getDescriptions() +
+			'\n|date=' +
+			this.getDate() +
+			'\n|source=' +
+			this.getUser() +
+			'\n|author=' +
+			this.getUser() +
+			'\n}}\n\n' +
+			this.getLicense() +
+			'\n\n' +
+			this.getCategories()
+		);
+	};
+
+	/**
+	 * Gets the wikitext for the creation date of this upload.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getDate = function () {
+		if ( !this.date ) {
+			return '';
+		}
+
+		return this.date.toString();
+	};
+
+	/**
+	 * Gets the name of the template to use for creating the file metadata.
+	 * Override in subclasses for other templates.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getTemplateName = function () {
+		return 'Information';
+	};
+
+	/**
+	 * Fetches the wikitext for any descriptions that have been added
+	 * to the upload.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getDescriptions = function () {
+		var i, desc, templateCalls = [];
+
+		for ( i = 0; i < this.descriptions.length; i++ ) {
+			desc = this.descriptions[ i ];
+			templateCalls.push( '{{' + desc.language + '|' + desc.text + '}}' );
+		}
+
+		return templateCalls.join( '\n' );
+	};
+
+	/**
+	 * Fetches the wikitext for the categories to which the upload will
+	 * be added.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getCategories = function () {
+		var i, cat, categoryLinks = [];
+
+		for ( i = 0; i < this.categories.length; i++ ) {
+			cat = this.categories[ i ];
+			categoryLinks.push( '[[Category:' + cat + ']]' );
+		}
+
+		return categoryLinks.join( '\n' );
+	};
+
+	/**
+	 * Gets the wikitext for the license of the upload. Abstract for now.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getLicense = function () {
+		return '';
+	};
+
+	/**
+	 * Get the username.
+	 *
+	 * @private
+	 * @return {string}
+	 */
+	ForeignStructuredUpload.prototype.getUser = function () {
+		return mw.config.get( 'wgUserName' );
+	};
+
+	mw.ForeignStructuredUpload = ForeignStructuredUpload;
+}( mediaWiki, OO ) );
diff --git a/resources/src/mediawiki/mediawiki.ForeignUpload.js b/resources/src/mediawiki/mediawiki.ForeignUpload.js
new file mode 100644
index 0000000000..0929661648
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.ForeignUpload.js
@@ -0,0 +1,58 @@
+( function ( mw, OO ) {
+	/**
+	 * @class mw.ForeignUpload
+	 * @extends mw.Upload
+	 *
+	 * Used to represent an upload in progress on the frontend.
+	 *
+	 * Subclassed to upload to a foreign API, with no other goodies. Use
+	 * this for a generic foreign image repository on your wiki farm.
+	 *
+	 * Note you can provide the {@link #targetHost targetHost} or not - if the first argument is
+	 * an object, we assume you want the default, and treat it as apiconfig
+	 * instead.
+	 *
+	 * @constructor
+	 * @param {string} [targetHost="commons.wikimedia.org"] Used to set up the target
+	 *     wiki. If not remote, this class behaves identically to mw.Upload (unless further subclassed)
+	 * @param {Object} [apiconfig] Passed to the constructor of mw.ForeignApi or mw.Api, as needed.
+	 */
+	function ForeignUpload( targetHost, apiconfig ) {
+		var api;
+
+		if ( typeof targetHost === 'object' ) {
+			// targetHost probably wasn't passed in, it must
+			// be apiconfig
+			apiconfig = targetHost;
+		} else {
+			// targetHost is a useful string, set it here
+			this.targetHost = targetHost || this.targetHost;
+		}
+
+		if ( location.host !== this.targetHost ) {
+			api = new mw.ForeignApi(
+				location.protocol + '//' + this.targetHost + '/w/api.php',
+				apiconfig
+			);
+		} else {
+			// We'll ignore the CORS and centralauth stuff if we're on Commons already
+			api = new mw.Api( apiconfig );
+		}
+
+		mw.Upload.call( this, api );
+	}
+
+	OO.inheritClass( ForeignUpload, mw.Upload );
+
+	/**
+	 * @property targetHost
+	 * Used to specify the target repository of the upload.
+	 *
+	 * You could override this to point at something that isn't Commons,
+	 * but be sure it has the correct templates and is CORS and CentralAuth
+	 * ready.
+	 */
+	ForeignUpload.prototype.targetHost = 'commons.wikimedia.org';
+
+	mw.ForeignUpload = ForeignUpload;
+}( mediaWiki, OO ) );
diff --git a/resources/src/mediawiki/mediawiki.Title.js b/resources/src/mediawiki/mediawiki.Title.js
index 661ab7444b..14297b129a 100644
--- a/resources/src/mediawiki/mediawiki.Title.js
+++ b/resources/src/mediawiki/mediawiki.Title.js
@@ -4,6 +4,7 @@
  * @since 1.18
  */
 ( function ( mw, $ ) {
+	/*jshint latedef:false */
 
 	/**
 	 * @class mw.Title
@@ -108,7 +109,7 @@
 			return false;
 		}
 		ns = ns.toLowerCase();
-		id = mw.config.get( 'wgNamespaceIds' )[ns];
+		id = mw.config.get( 'wgNamespaceIds' )[ ns ];
 		if ( id === undefined ) {
 			return false;
 		}
@@ -234,7 +235,7 @@
 			.replace( rUnderscoreTrim, '' );
 
 		// Process initial colon
-		if ( title !== '' && title[0] === ':' ) {
+		if ( title !== '' && title[ 0 ] === ':' ) {
 			// Initial colon means main namespace instead of specified default
 			namespace = NS_MAIN;
 			title = title
@@ -251,16 +252,16 @@
 		// Process namespace prefix (if any)
 		m = title.match( rSplit );
 		if ( m ) {
-			id = getNsIdByName( m[1] );
+			id = getNsIdByName( m[ 1 ] );
 			if ( id !== false ) {
 				// Ordinary namespace
 				namespace = id;
-				title = m[2];
+				title = m[ 2 ];
 
 				// For Talk:X pages, make sure X has no "namespace" prefix
 				if ( namespace === NS_TALK && ( m = title.match( rSplit ) ) ) {
 					// Disallow titles like Talk:File:x (subject should roundtrip: talk:file:x -> file:x -> file_talk:x)
-					if ( getNsIdByName( m[1] ) !== false ) {
+					if ( getNsIdByName( m[ 1 ] ) !== false ) {
 						return false;
 					}
 				}
@@ -325,7 +326,7 @@
 		}
 
 		// Any remaining initial :s are illegal.
-		if ( title[0] === ':' ) {
+		if ( title[ 0 ] === ':' ) {
 			return false;
 		}
 
@@ -380,9 +381,9 @@
 			rules = sanitationRules;
 
 		for ( i = 0, ruleLength = rules.length; i < ruleLength; ++i ) {
-			rule = rules[i];
+			rule = rules[ i ];
 			for ( m = 0, filterLength = filter.length; m < filterLength; ++m ) {
-				if ( rule[filter[m]] ) {
+				if ( rule[ filter[ m ] ] ) {
 					s = s.replace( rule.pattern, rule.replace );
 				}
 			}
@@ -492,7 +493,7 @@
 	 * @return {mw.Title|null} A valid Title object or null if the input cannot be turned into a valid title
 	 */
 	Title.newFromUserInput = function ( title, defaultNamespace, options ) {
-		var namespace, m, id, ext, parts, normalizeExtension;
+		var namespace, m, id, ext, parts;
 
 		// defaultNamespace is optional; check whether options moves up
 		if ( arguments.length < 3 && $.type( defaultNamespace ) === 'object' ) {
@@ -506,19 +507,13 @@
 			forUploading: true
 		}, options );
 
-		normalizeExtension = function ( extension ) {
-			// Remove only trailing space (that is removed by MW anyway)
-			extension = extension.toLowerCase().replace( /\s*$/, '' );
-			return extension;
-		};
-
 		namespace = defaultNamespace === undefined ? NS_MAIN : defaultNamespace;
 
 		// Normalise whitespace and remove duplicates
 		title = $.trim( title.replace( rWhitespace, ' ' ) );
 
 		// Process initial colon
-		if ( title !== '' && title[0] === ':' ) {
+		if ( title !== '' && title[ 0 ] === ':' ) {
 			// Initial colon means main namespace instead of specified default
 			namespace = NS_MAIN;
 			title = title
@@ -531,11 +526,11 @@
 		// Process namespace prefix (if any)
 		m = title.match( rSplit );
 		if ( m ) {
-			id = getNsIdByName( m[1] );
+			id = getNsIdByName( m[ 1 ] );
 			if ( id !== false ) {
 				// Ordinary namespace
 				namespace = id;
-				title = m[2];
+				title = m[ 2 ];
 			}
 		}
 
@@ -555,15 +550,14 @@
 				// Get the last part, which is supposed to be the file extension
 				ext = parts.pop();
 
-				// Does the supplied file name carry the desired file extension?
-				if ( options.fileExtension
-					&& normalizeExtension( ext ) !== normalizeExtension( options.fileExtension )
-				) {
-
-					// No, push back, whatever there was after the dot
-					parts.push( ext );
+				if ( options.fileExtension ) {
+					// Does the supplied file name carry the desired file extension?
+					if ( Title.normalizeExtension( ext ) !== Title.normalizeExtension( options.fileExtension ) ) {
+						// No, push back, whatever there was after the dot
+						parts.push( ext );
+					}
 
-					// And add the desired file extension later
+					// Always canonicalize to the desired file extension (e.g. 'jpeg' to 'jpg')
 					ext = options.fileExtension;
 				}
 
@@ -655,7 +649,7 @@
 
 			recount = regexes.length;
 
-		src = img.jquery ? img[0].src : img.src;
+		src = img.jquery ? img[ 0 ].src : img.src;
 
 		matches = src.match( thumbPhpRegex );
 
@@ -666,11 +660,11 @@
 		decodedSrc = decodeURIComponent( src );
 
 		for ( i = 0; i < recount; i++ ) {
-			regex = regexes[i];
+			regex = regexes[ i ];
 			matches = decodedSrc.match( regex );
 
-			if ( matches && matches[1] ) {
-				return mw.Title.newFromText( 'File:' + matches[1] );
+			if ( matches && matches[ 1 ] ) {
+				return mw.Title.newFromText( 'File:' + matches[ 1 ] );
 			}
 		}
 
@@ -690,9 +684,9 @@
 			obj = Title.exist.pages;
 
 		if ( type === 'string' ) {
-			match = obj[title];
+			match = obj[ title ];
 		} else if ( type === 'object' && title instanceof Title ) {
-			match = obj[title.toString()];
+			match = obj[ title.toString() ];
 		} else {
 			throw new Error( 'mw.Title.exists: title must be a string or an instance of Title' );
 		}
@@ -729,19 +723,46 @@
 		pages: {},
 
 		set: function ( titles, state ) {
-			titles = $.isArray( titles ) ? titles : [titles];
+			titles = $.isArray( titles ) ? titles : [ titles ];
 			state = state === undefined ? true : !!state;
 			var i,
 				pages = this.pages,
 				len = titles.length;
 
 			for ( i = 0; i < len; i++ ) {
-				pages[ titles[i] ] = state;
+				pages[ titles[ i ] ] = state;
 			}
 			return true;
 		}
 	};
 
+	/**
+	 * Normalize a file extension to the common form, making it lowercase and checking some synonyms,
+	 * and ensure it's clean. Extensions with non-alphanumeric characters will be discarded.
+	 * Keep in sync with File::normalizeExtension() in PHP.
+	 *
+	 * @param {string} extension File extension (without the leading dot)
+	 * @return {string} File extension in canonical form
+	 */
+	Title.normalizeExtension = function ( extension ) {
+		var
+			lower = extension.toLowerCase(),
+			squish = {
+				htm: 'html',
+				jpeg: 'jpg',
+				mpeg: 'mpg',
+				tiff: 'tif',
+				ogv: 'ogg'
+			};
+		if ( squish.hasOwnProperty( lower ) ) {
+			return squish[ lower ];
+		} else if ( /^[0-9a-z]+$/.test( lower ) ) {
+			return lower;
+		} else {
+			return '';
+		}
+	};
+
 	/* Public members */
 
 	Title.prototype = {
@@ -788,7 +809,7 @@
 			) {
 				return this.title;
 			}
-			return this.title[0].toUpperCase() + this.title.slice( 1 );
+			return this.title[ 0 ].toUpperCase() + this.title.slice( 1 );
 		},
 
 		/**
diff --git a/resources/src/mediawiki/mediawiki.Upload.Dialog.js b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
index 96db7cc1d3..36fbd4656c 100644
--- a/resources/src/mediawiki/mediawiki.Upload.Dialog.js
+++ b/resources/src/mediawiki/mediawiki.Upload.Dialog.js
@@ -34,7 +34,7 @@
 	 * To use, setup a {@link OO.ui.WindowManager window manager} like for normal
 	 * dialogs:
 	 *
-	 *     var uploadDialog = new mw.Upload.Dialog( { size: 'small' } );
+	 *     var uploadDialog = new mw.Upload.Dialog();
 	 *     var windowManager = new OO.ui.WindowManager();
 	 *     $( 'body' ).append( windowManager.$element );
 	 *     windowManager.addWindows( [ uploadDialog ] );
@@ -437,19 +437,13 @@
 
 		// Validation
 		function checkValidity() {
-			var validityPromises = [
-				dialog.filenameWidget.isValid(),
-				dialog.descriptionWidget.isValid()
-			];
-
-			$.when.apply( $, validityPromises ).done( function () {
-				var allValid,
-					values = Array.prototype.slice.apply( arguments );
-				allValid = values.every( function ( value ) {
-					return value;
-				} );
-
-				dialog.actions.setAbilities( { save: allValid } );
+			$.when(
+				dialog.filenameWidget.getValidity(),
+				dialog.descriptionWidget.getValidity()
+			).done( function () {
+				dialog.actions.setAbilities( { save: true } );
+			} ).fail( function () {
+				dialog.actions.setAbilities( { save: false } );
 			} );
 		}
 		this.filenameWidget.on( 'change', checkValidity );
diff --git a/resources/src/mediawiki/mediawiki.Upload.js b/resources/src/mediawiki/mediawiki.Upload.js
index 58c66c1060..79628de50d 100644
--- a/resources/src/mediawiki/mediawiki.Upload.js
+++ b/resources/src/mediawiki/mediawiki.Upload.js
@@ -64,6 +64,7 @@
 
 	/**
 	 * Set the text of the file page, to be created on file upload.
+	 *
 	 * @param {string} text
 	 */
 	UP.setText = function ( text ) {
@@ -72,6 +73,7 @@
 
 	/**
 	 * Set the filename, to be finalized on upload.
+	 *
 	 * @param {string} filename
 	 */
 	UP.setFilename = function ( filename ) {
@@ -82,17 +84,19 @@
 	 * Sets the filename based on the filename as it was on the upload.
 	 */
 	UP.setFilenameFromFile = function () {
-		if ( this.file.nodeType && this.file.nodeType === Node.ELEMENT_NODE ) {
+		var file = this.getFile();
+		if ( file.nodeType && file.nodeType === Node.ELEMENT_NODE ) {
 			// File input element, use getBasename to cut out the path
-			this.setFilename( this.getBasename( this.file.value ) );
-		} else if ( this.file.name && this.file.lastModified ) {
+			this.setFilename( this.getBasename( file.value ) );
+		} else if ( file.name && file.lastModified ) {
 			// HTML5 FileAPI File object, but use getBasename to be safe
-			this.setFilename( this.getBasename( this.file.name ) );
+			this.setFilename( this.getBasename( file.name ) );
 		}
 	};
 
 	/**
 	 * Set the file to be uploaded.
+	 *
 	 * @param {HTMLInputElement|File} file
 	 */
 	UP.setFile = function ( file ) {
@@ -101,6 +105,7 @@
 
 	/**
 	 * Set whether the file should be watchlisted after upload.
+	 *
 	 * @param {boolean} watchlist
 	 */
 	UP.setWatchlist = function ( watchlist ) {
@@ -109,6 +114,7 @@
 
 	/**
 	 * Set the edit comment for the upload.
+	 *
 	 * @param {string} comment
 	 */
 	UP.setComment = function ( comment ) {
@@ -117,6 +123,7 @@
 
 	/**
 	 * Get the text of the file page, to be created on file upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getText = function () {
@@ -125,6 +132,7 @@
 
 	/**
 	 * Get the filename, to be finalized on upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getFilename = function () {
@@ -133,6 +141,7 @@
 
 	/**
 	 * Get the file being uploaded.
+	 *
 	 * @return {HTMLInputElement|File}
 	 */
 	UP.getFile = function () {
@@ -141,6 +150,7 @@
 
 	/**
 	 * Get the boolean for whether the file will be watchlisted after upload.
+	 *
 	 * @return {boolean}
 	 */
 	UP.getWatchlist = function () {
@@ -149,6 +159,7 @@
 
 	/**
 	 * Get the current value of the edit comment for the upload.
+	 *
 	 * @return {string}
 	 */
 	UP.getComment = function () {
@@ -157,6 +168,7 @@
 
 	/**
 	 * Gets the base filename from a path name.
+	 *
 	 * @param {string} path
 	 * @return {string}
 	 */
@@ -177,6 +189,7 @@
 
 	/**
 	 * Gets the state of the upload.
+	 *
 	 * @return {mw.Upload.State}
 	 */
 	UP.getState = function () {
@@ -187,6 +200,7 @@
 	 * Get the imageinfo object for the finished upload.
 	 * Only available once the upload is finished! Don't try to get it
 	 * beforehand.
+	 *
 	 * @return {Object|undefined}
 	 */
 	UP.getImageInfo = function () {
@@ -195,26 +209,27 @@
 
 	/**
 	 * Upload the file directly.
+	 *
 	 * @return {jQuery.Promise}
 	 */
 	UP.upload = function () {
 		var upload = this;
 
-		if ( !this.file ) {
+		if ( !this.getFile() ) {
 			return $.Deferred().reject( 'No file to upload. Call setFile to add one.' );
 		}
 
-		if ( !this.filename ) {
+		if ( !this.getFilename() ) {
 			return $.Deferred().reject( 'No filename set. Call setFilename to add one.' );
 		}
 
 		this.state = Upload.State.UPLOADING;
 
-		return this.api.upload( this.file, {
-			watchlist: ( this.watchlist === true ) ? 1 : undefined,
-			comment: this.comment,
-			filename: this.filename,
-			text: this.text
+		return this.api.upload( this.getFile(), {
+			watchlist: ( this.getWatchlist() ) ? 1 : undefined,
+			comment: this.getComment(),
+			filename: this.getFilename(),
+			text: this.getText()
 		} ).then( function ( result ) {
 			upload.state = Upload.State.UPLOADED;
 			upload.imageinfo = result.upload.imageinfo;
@@ -226,23 +241,24 @@
 
 	/**
 	 * Upload the file to the stash to be completed later.
+	 *
 	 * @return {jQuery.Promise}
 	 */
 	UP.uploadToStash = function () {
 		var upload = this;
 
-		if ( !this.file ) {
+		if ( !this.getFile() ) {
 			return $.Deferred().reject( 'No file to upload. Call setFile to add one.' );
 		}
 
-		if ( !this.filename ) {
+		if ( !this.getFilename() ) {
 			this.setFilenameFromFile();
 		}
 
 		this.state = Upload.State.UPLOADING;
 
-		this.stashPromise = this.api.uploadToStash( this.file, {
-			filename: this.filename
+		this.stashPromise = this.api.uploadToStash( this.getFile(), {
+			filename: this.getFilename()
 		} ).then( function ( finishStash ) {
 			upload.state = Upload.State.STASHED;
 			return finishStash;
@@ -255,6 +271,7 @@
 
 	/**
 	 * Finish a stash upload.
+	 *
 	 * @return {jQuery.Promise}
 	 */
 	UP.finishStashUpload = function () {
@@ -268,7 +285,7 @@
 			upload.state = Upload.State.UPLOADING;
 
 			return finishStash( {
-				watchlist: ( upload.watchlist === true ) ? 1 : undefined,
+				watchlist: ( upload.getWatchlist() ) ? 1 : undefined,
 				comment: upload.getComment(),
 				filename: upload.getFilename(),
 				text: upload.getText()
diff --git a/resources/src/mediawiki/mediawiki.Uri.js b/resources/src/mediawiki/mediawiki.Uri.js
index 07d89006b2..29b224ee6a 100644
--- a/resources/src/mediawiki/mediawiki.Uri.js
+++ b/resources/src/mediawiki/mediawiki.Uri.js
@@ -68,19 +68,25 @@
 		if ( val === undefined || val === null || val === '' ) {
 			return '';
 		}
+		/* jshint latedef:false */
 		return pre + ( raw ? val : mw.Uri.encode( val ) ) + post;
+		/* jshint latedef:true */
 	}
 
 	/**
 	 * Regular expressions to parse many common URIs.
 	 *
+	 * As they are gnarly, they have been moved to separate files to allow us to format them in the
+	 * 'extended' regular expression format (which JavaScript normally doesn't support). The subset of
+	 * features handled is minimal, but just the free whitespace gives us a lot.
+	 *
 	 * @private
 	 * @static
 	 * @property {Object} parser
 	 */
 	var parser = {
-		strict: /^(?:([^:\/?#]+):)?(?:\/\/(?:(?:([^:@\/?#]*)(?::([^:@\/?#]*))?)?@)?([^:\/?#]*)(?::(\d*))?)?((?:[^?#\/]*\/)*[^?#]*)(?:\?([^#]*))?(?:#(.*))?/,
-		loose:  /^(?:(?![^:@]+:[^:@\/]*@)([^:\/?#.]+):)?(?:\/\/)?(?:(?:([^:@\/?#]*)(?::([^:@\/?#]*))?)?@)?([^:\/?#]*)(?::(\d*))?((?:\/(?:[^?#](?![^?#\/]*\.[^?#\/.]+(?:[?#]|$)))*\/?)?[^?#\/]*)(?:\?([^#]*))?(?:#(.*))?/
+		strict: mw.template.get( 'mediawiki.Uri', 'strict.regexp' ).render(),
+		loose: mw.template.get( 'mediawiki.Uri', 'loose.regexp' ).render()
 	},
 
 	/**
@@ -169,6 +175,7 @@
 		 * @param {boolean} [options.overrideKeys=false] Whether to let duplicate query parameters
 		 *  override each other (`true`) or automagically convert them to an array (`false`).
 		 */
+		/* jshint latedef:false */
 		function Uri( uri, options ) {
 			var prop,
 				defaultUri = getDefaultUri();
@@ -188,10 +195,10 @@
 						// Only copy direct properties, not inherited ones
 						if ( uri.hasOwnProperty( prop ) ) {
 							// Deep copy object properties
-							if ( $.isArray( uri[prop] ) || $.isPlainObject( uri[prop] ) ) {
-								this[prop] = $.extend( true, {}, uri[prop] );
+							if ( $.isArray( uri[ prop ] ) || $.isPlainObject( uri[ prop ] ) ) {
+								this[ prop ] = $.extend( true, {}, uri[ prop ] );
 							} else {
-								this[prop] = uri[prop];
+								this[ prop ] = uri[ prop ];
 							}
 						}
 					}
@@ -216,7 +223,7 @@
 					this.port = defaultUri.port;
 				}
 			}
-			if ( this.path && this.path[0] !== '/' ) {
+			if ( this.path && this.path[ 0 ] !== '/' ) {
 				// A real relative URL, relative to defaultUri.path. We can't really handle that since we cannot
 				// figure out whether the last path component of defaultUri.path is a directory or a file.
 				throw new Error( 'Bad constructor arguments' );
diff --git a/resources/src/mediawiki/mediawiki.Uri.loose.regexp b/resources/src/mediawiki/mediawiki.Uri.loose.regexp
new file mode 100644
index 0000000000..300ab3bacf
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.Uri.loose.regexp
@@ -0,0 +1,22 @@
+^
+(?:
+	(?![^:@]+:[^:@/]*@)
+	(?<protocol>[^:/?#.]+):
+)?
+(?://)?
+(?:(?:
+	(?<user>[^:@/?#]*)
+	(?::(?<password>[^:@/?#]*))?
+)?@)?
+(?<host>[^:/?#]*)
+(?::(?<port>\d*))?
+(
+	(?:/
+		(?:[^?#]
+			(?![^?#/]*\.[^?#/.]+(?:[?#]|$))
+		)*/?
+	)?
+	[^?#/]*
+)
+(?:\?(?<query>[^#]*))?
+(?:\#(?<fragment>.*))?
diff --git a/resources/src/mediawiki/mediawiki.Uri.strict.regexp b/resources/src/mediawiki/mediawiki.Uri.strict.regexp
new file mode 100644
index 0000000000..2ac7d2fce9
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.Uri.strict.regexp
@@ -0,0 +1,13 @@
+^
+(?:(?<protocol>[^:/?#]+):)?
+(?://(?:
+	(?:
+		(?<user>[^:@/?#]*)
+		(?::(?<password>[^:@/?#]*))?
+	)?@)?
+	(?<host>[^:/?#]*)
+	(?::(?<port>\d*))?
+)?
+(?<path>(?:[^?#/]*/)*[^?#]*)
+(?:\?(?<query>[^#]*))?
+(?:\#(?<fragment>.*))?
diff --git a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js
index 8d1faa625b..4d0c1352de 100644
--- a/resources/src/mediawiki/mediawiki.confirmCloseWindow.js
+++ b/resources/src/mediawiki/mediawiki.confirmCloseWindow.js
@@ -77,12 +77,14 @@
 
 		/**
 		 * Return the object with functions to release and manually trigger the confirm alert
+		 *
 		 * @ignore
 		 */
 		return {
 			/**
 			 * Remove all event listeners and don't show an alert anymore, if the user wants to leave
 			 * the page.
+			 *
 			 * @ignore
 			 */
 			release: function () {
@@ -92,8 +94,9 @@
 			 * Trigger the module's function manually: Check, if options.test() returns true and show
 			 * an alert to the user if he/she want to leave this page. Returns false, if options.test() returns
 			 * false or the user cancelled the alert window (~don't leave the page), true otherwise.
+			 *
 			 * @ignore
-			 * @return boolean
+			 * @return {boolean}
 			 */
 			trigger: function () {
 				// use confirm to show the message to the user (if options.text() is true)
diff --git a/resources/src/mediawiki/mediawiki.debug.js b/resources/src/mediawiki/mediawiki.debug.js
index bdff99f7a1..f721009537 100644
--- a/resources/src/mediawiki/mediawiki.debug.js
+++ b/resources/src/mediawiki/mediawiki.debug.js
@@ -222,7 +222,7 @@
 						className: 'mw-debug-pane',
 						id: 'mw-debug-pane-' + id
 					} )
-					.append( panes[id] )
+					.append( panes[ id ] )
 					.appendTo( $container );
 			}
 
@@ -255,7 +255,7 @@
 			};
 
 			for ( i = 0, length = this.data.log.length; i < length; i += 1 ) {
-				entry = this.data.log[i];
+				entry = this.data.log[ i ];
 				entry.typeText = entryTypeText( entry.type );
 
 				$( '<tr>' )
@@ -289,13 +289,13 @@
 			.appendTo( $table );
 
 			for ( i = 0, length = this.data.queries.length; i < length; i += 1 ) {
-				query = this.data.queries[i];
+				query = this.data.queries[ i ];
 
 				$( '<tr>' )
 					.append( $( '<td>' ).text( i + 1 ) )
 					.append( $( '<td>' ).text( query.sql ) )
 					.append( $( '<td class="stats">' ).text( ( query.time * 1000 ).toFixed( 4 ) + 'ms' ) )
-					.append( $( '<td>' ).text( query['function'] ) )
+					.append( $( '<td>' ).text( query[ 'function' ] ) )
 				.appendTo( $table );
 			}
 
@@ -312,7 +312,7 @@
 			$list = $( '<ul>' );
 
 			for ( i = 0, length = this.data.debugLog.length; i < length; i += 1 ) {
-				line = this.data.debugLog[i];
+				line = this.data.debugLog[ i ];
 				$( '<li>' )
 					.html( mw.html.escape( line ).replace( /\n/g, '<br />\n' ) )
 					.appendTo( $list );
@@ -346,7 +346,7 @@
 
 					$( '<tr>' )
 						.append( $( '<th>' ).text( key ) )
-						.append( $( '<td>' ).text( data[key] ) )
+						.append( $( '<td>' ).text( data[ key ] ) )
 						.appendTo( $table );
 				}
 
@@ -370,7 +370,7 @@
 			$table = $( '<table>' );
 
 			for ( i = 0, length = this.data.includes.length; i < length; i += 1 ) {
-				file = this.data.includes[i];
+				file = this.data.includes[ i ];
 				$( '<tr>' )
 					.append( $( '<td>' ).text( file.name ) )
 					.append( $( '<td class="nr">' ).text( file.size ) )
diff --git a/resources/src/mediawiki/mediawiki.errorLogger.js b/resources/src/mediawiki/mediawiki.errorLogger.js
index 9f4f19ddc3..46b8479724 100644
--- a/resources/src/mediawiki/mediawiki.errorLogger.js
+++ b/resources/src/mediawiki/mediawiki.errorLogger.js
@@ -1,5 +1,6 @@
 /**
  * Try to catch errors in modules which don't do their own error handling.
+ *
  * @class mw.errorLogger
  * @singleton
  */
@@ -24,6 +25,7 @@
 		/**
 		 * Install a window.onerror handler that will report via mw.track, while preserving
 		 * any previous handler.
+		 *
 		 * @param {Object} window
 		 */
 		installGlobalHandler: function ( window ) {
@@ -35,6 +37,7 @@
 
 			/**
 			 * Dumb window.onerror handler which forwards the errors via mw.track.
+			 *
 			 * @fires global_error
 			 */
 			window.onerror = function ( errorMessage, url, lineNumber, columnNumber, errorObject ) {
diff --git a/resources/src/mediawiki/mediawiki.experiments.js b/resources/src/mediawiki/mediawiki.experiments.js
index 930bfec5ee..75b1f80de4 100644
--- a/resources/src/mediawiki/mediawiki.experiments.js
+++ b/resources/src/mediawiki/mediawiki.experiments.js
@@ -91,14 +91,14 @@
 			}
 
 			for ( key in buckets ) {
-				range += buckets[key];
+				range += buckets[ key ];
 			}
 
 			hash = hashString( experiment.name + ':' + token );
 			max = ( hash / MAX_INT32_UNSIGNED ) * range;
 
 			for ( key in buckets ) {
-				acc += buckets[key];
+				acc += buckets[ key ];
 
 				if ( max <= acc ) {
 					return key;
diff --git a/resources/src/mediawiki/mediawiki.feedback.js b/resources/src/mediawiki/mediawiki.feedback.js
index d90ca4bd65..d226ed9d6a 100644
--- a/resources/src/mediawiki/mediawiki.feedback.js
+++ b/resources/src/mediawiki/mediawiki.feedback.js
@@ -86,6 +86,7 @@
 	 * Respond to dialog submit event. If the information was
 	 * submitted, either successfully or with an error, open
 	 * a MessageDialog to thank the user.
+	 *
 	 * @param {string} [status] A status of the end of operation
 	 *  of the main feedback dialog. Empty if the dialog was
 	 *  dismissed with no action or the user followed the button
@@ -486,6 +487,7 @@
 
 	/**
 	 * Set the bug report link
+	 *
 	 * @param {string} link Link to the external bug report form
 	 */
 	mw.Feedback.Dialog.prototype.setBugReportLink = function ( link ) {
@@ -494,6 +496,7 @@
 
 	/**
 	 * Get the bug report link
+	 *
 	 * @returns {string} Link to the external bug report form
 	 */
 	mw.Feedback.Dialog.prototype.getBugReportLink = function () {
diff --git a/resources/src/mediawiki/mediawiki.feedlink.css b/resources/src/mediawiki/mediawiki.feedlink.css
index 1dda2ac4d1..8221f52f09 100644
--- a/resources/src/mediawiki/mediawiki.feedlink.css
+++ b/resources/src/mediawiki/mediawiki.feedlink.css
@@ -1,8 +1,6 @@
 /* Styles for links to RSS/Atom feeds in sidebar */
 
-/* Until the copy of this code in mediawiki.legacy.shared is removed, which no longer @embeds the
- * background image, the selector below must be kept more specific. */
-#feedlinks a.feedlink {
+a.feedlink {
 	/* SVG support using a transparent gradient to guarantee cross-browser
 	 * compatibility (browsers able to understand gradient syntax support also SVG).
 	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
diff --git a/resources/src/mediawiki/mediawiki.htmlform.css b/resources/src/mediawiki/mediawiki.htmlform.css
new file mode 100644
index 0000000000..e41248c1be
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.htmlform.css
@@ -0,0 +1,51 @@
+/* HTMLForm styles */
+
+table.mw-htmlform-nolabel td.mw-label {
+	width: 1px;
+}
+
+.mw-htmlform-invalid-input td.mw-input input {
+	border-color: red;
+}
+
+.mw-htmlform-flatlist div.mw-htmlform-flatlist-item {
+	display: inline;
+	margin-right: 1em;
+	white-space: nowrap;
+}
+
+/* HTMLCheckMatrix */
+
+.mw-htmlform-matrix td {
+	padding-left: 0.5em;
+	padding-right: 0.5em;
+}
+
+tr.mw-htmlform-vertical-label td.mw-label {
+	text-align: left !important;
+}
+
+.mw-icon-question {
+	/* SVG support using a transparent gradient to guarantee cross-browser
+	 * compatibility (browsers able to understand gradient syntax support also SVG).
+	 * http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
+	background-image: url(images/question.png);
+	/* @embed */
+	background-image: -webkit-linear-gradient(transparent, transparent), url(images/question.svg);
+	/* @embed */
+	background-image: linear-gradient(transparent, transparent), url(images/question.svg);
+	background-repeat: no-repeat;
+	background-size: 13px 13px;
+	display: inline-block;
+	height: 13px;
+	width: 13px;
+	margin-left: 4px;
+}
+
+.mw-icon-question:lang(ar),
+.mw-icon-question:lang(fa),
+.mw-icon-question:lang(ur) {
+	-webkit-transform: scaleX(-1);
+	-ms-transform: scaleX(-1);
+	transform: scaleX(-1);
+}
diff --git a/resources/src/mediawiki/mediawiki.htmlform.js b/resources/src/mediawiki/mediawiki.htmlform.js
index 7fdaa6ec3d..8c6f3ab9f6 100644
--- a/resources/src/mediawiki/mediawiki.htmlform.js
+++ b/resources/src/mediawiki/mediawiki.htmlform.js
@@ -53,7 +53,7 @@
 	function hideIfParse( $el, spec ) {
 		var op, i, l, v, $field, $fields, fields, func, funcs, getVal;
 
-		op = spec[0];
+		op = spec[ 0 ];
 		l = spec.length;
 		switch ( op ) {
 			case 'AND':
@@ -63,12 +63,12 @@
 				funcs = [];
 				fields = [];
 				for ( i = 1; i < l; i++ ) {
-					if ( !$.isArray( spec[i] ) ) {
+					if ( !$.isArray( spec[ i ] ) ) {
 						throw new Error( op + ' parameters must be arrays' );
 					}
-					v = hideIfParse( $el, spec[i] );
-					fields = fields.concat( v[0].toArray() );
-					funcs.push( v[1] );
+					v = hideIfParse( $el, spec[ i ] );
+					fields = fields.concat( v[ 0 ].toArray() );
+					funcs.push( v[ 1 ] );
 				}
 				$fields = $( fields );
 
@@ -78,7 +78,7 @@
 						func = function () {
 							var i;
 							for ( i = 0; i < l; i++ ) {
-								if ( !funcs[i]() ) {
+								if ( !funcs[ i ]() ) {
 									return false;
 								}
 							}
@@ -90,7 +90,7 @@
 						func = function () {
 							var i;
 							for ( i = 0; i < l; i++ ) {
-								if ( funcs[i]() ) {
+								if ( funcs[ i ]() ) {
 									return true;
 								}
 							}
@@ -102,7 +102,7 @@
 						func = function () {
 							var i;
 							for ( i = 0; i < l; i++ ) {
-								if ( !funcs[i]() ) {
+								if ( !funcs[ i ]() ) {
 									return true;
 								}
 							}
@@ -114,7 +114,7 @@
 						func = function () {
 							var i;
 							for ( i = 0; i < l; i++ ) {
-								if ( funcs[i]() ) {
+								if ( funcs[ i ]() ) {
 									return false;
 								}
 							}
@@ -129,12 +129,12 @@
 				if ( l !== 2 ) {
 					throw new Error( 'NOT takes exactly one parameter' );
 				}
-				if ( !$.isArray( spec[1] ) ) {
+				if ( !$.isArray( spec[ 1 ] ) ) {
 					throw new Error( 'NOT parameters must be arrays' );
 				}
-				v = hideIfParse( $el, spec[1] );
-				$fields = v[0];
-				func = v[1];
+				v = hideIfParse( $el, spec[ 1 ] );
+				$fields = v[ 0 ];
+				func = v[ 1 ];
 				return [ $fields, function () {
 					return !func();
 				} ];
@@ -144,13 +144,13 @@
 				if ( l !== 3 ) {
 					throw new Error( op + ' takes exactly two parameters' );
 				}
-				$field = hideIfGetField( $el, spec[1] );
+				$field = hideIfGetField( $el, spec[ 1 ] );
 				if ( !$field ) {
 					return [ $(), function () {
 						return false;
 					} ];
 				}
-				v = spec[2];
+				v = spec[ 2 ];
 
 				if ( $field.first().prop( 'type' ) === 'radio' ||
 					$field.first().prop( 'type' ) === 'checkbox'
@@ -203,7 +203,7 @@
 	 * jQuery plugin to fade or snap to hiding state.
 	 *
 	 * @param {boolean} [instantToggle=false]
-	 * @return jQuery
+	 * @return {jQuery}
 	 * @chainable
 	 */
 	$.fn.goOut = function ( instantToggle ) {
@@ -222,7 +222,7 @@
 	 * @param {Function} callback
 	 * @param {boolean|jQuery.Event} callback.immediate True when the event is called immediately,
 	 *  an event object when triggered from an event.
-	 * @return jQuery
+	 * @return {jQuery}
 	 * @chainable
 	 */
 	mw.log.deprecate( $.fn, 'liveAndTestAtStart', function ( callback ) {
@@ -304,8 +304,8 @@
 			}
 
 			v = hideIfParse( $el, spec );
-			$fields = v[0];
-			test = v[1];
+			$fields = v[ 0 ];
+			test = v[ 1 ];
 			func = function () {
 				if ( test() ) {
 					$el.hide();
diff --git a/resources/src/mediawiki/mediawiki.inspect.js b/resources/src/mediawiki/mediawiki.inspect.js
index 31cd6c46d3..4859953dbe 100644
--- a/resources/src/mediawiki/mediawiki.inspect.js
+++ b/resources/src/mediawiki/mediawiki.inspect.js
@@ -13,7 +13,7 @@
 	function sortByProperty( array, prop, descending ) {
 		var order = descending ? -1 : 1;
 		return array.sort( function ( a, b ) {
-			return a[prop] > b[prop] ? order : a[prop] < b[prop] ? -order : 0;
+			return a[ prop ] > b[ prop ] ? order : a[ prop ] < b[ prop ] ? -order : 0;
 		} );
 	}
 
@@ -25,7 +25,7 @@
 		for ( ; bytes >= 1024; bytes /= 1024 ) { i++; }
 		// Maintain one decimal for kB and above, but don't
 		// add ".0" for bytes.
-		return bytes.toFixed( i > 0 ? 1 : 0 ) + units[i];
+		return bytes.toFixed( i > 0 ? 1 : 0 ) + units[ i ];
 	}
 
 	/**
@@ -45,18 +45,18 @@
 				graph = {};
 
 			$.each( modules, function ( moduleIndex, moduleName ) {
-				var dependencies = mw.loader.moduleRegistry[moduleName].dependencies || [];
+				var dependencies = mw.loader.moduleRegistry[ moduleName ].dependencies || [];
 
 				if ( !hasOwn.call( graph, moduleName ) ) {
-					graph[moduleName] = { requiredBy: [] };
+					graph[ moduleName ] = { requiredBy: [] };
 				}
-				graph[moduleName].requires = dependencies;
+				graph[ moduleName ].requires = dependencies;
 
 				$.each( dependencies, function ( depIndex, depName ) {
 					if ( !hasOwn.call( graph, depName ) ) {
-						graph[depName] = { requiredBy: [] };
+						graph[ depName ] = { requiredBy: [] };
 					}
-					graph[depName].requiredBy.push( moduleName );
+					graph[ depName ].requiredBy.push( moduleName );
 				} );
 			} );
 			return graph;
@@ -101,7 +101,7 @@
 		 * document.
 		 *
 		 * @param {string} css CSS source
-		 * @return Selector counts
+		 * @return {Object} Selector counts
 		 * @return {number} return.selectors Total number of selectors
 		 * @return {number} return.matched Number of matched selectors
 		 */
@@ -117,9 +117,15 @@
 			rules = sheet.cssRules || sheet.rules;
 			$.each( rules, function ( index, rule ) {
 				selectors.total++;
-				if ( document.querySelector( rule.selectorText ) !== null ) {
-					selectors.matched++;
-				}
+				// document.querySelector() on prefixed pseudo-elements can throw exceptions
+				// in Firefox and Safari. Ignore these exceptions.
+				// https://bugs.webkit.org/show_bug.cgi?id=149160
+				// https://bugzilla.mozilla.org/show_bug.cgi?id=1204880
+				try {
+					if ( document.querySelector( rule.selectorText ) !== null ) {
+						selectors.matched++;
+					}
+				} catch ( e ) {}
 			} );
 			document.body.removeChild( style );
 			return selectors;
@@ -173,7 +179,7 @@
 				$.map( inspect.reports, function ( v, k ) { return k; } );
 
 			$.each( reports, function ( index, name ) {
-				inspect.dumpTable( inspect.reports[name]() );
+				inspect.dumpTable( inspect.reports[ name ]() );
 			} );
 		},
 
@@ -214,7 +220,7 @@
 				var modules = [];
 
 				$.each( inspect.getLoadedModules(), function ( index, name ) {
-					var css, stats, module = mw.loader.moduleRegistry[name];
+					var css, stats, module = mw.loader.moduleRegistry[ name ];
 
 					try {
 						css = module.style.css.join();
@@ -247,7 +253,7 @@
 						stats.totalSize = humanSize( $.byteLength( raw ) );
 					} catch ( e ) {}
 				}
-				return [stats];
+				return [ stats ];
 			}
 		},
 
@@ -265,7 +271,7 @@
 			}
 
 			return $.grep( inspect.getLoadedModules(), function ( moduleName ) {
-				var module = mw.loader.moduleRegistry[moduleName];
+				var module = mw.loader.moduleRegistry[ moduleName ];
 
 				// Grep module's JavaScript
 				if ( $.isFunction( module.script ) && pattern.test( module.script.toString() ) ) {
diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index 343d516e75..ce92423d89 100644
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -15,7 +15,7 @@
 		slice = Array.prototype.slice,
 		parserDefaults = {
 			magic: {
-				'SITENAME': mw.config.get( 'wgSiteName' )
+				SITENAME: mw.config.get( 'wgSiteName' )
 			},
 			// Whitelist for allowed HTML elements in wikitext.
 			// Self-closing tags are not currently supported.
@@ -71,12 +71,12 @@
 		var i, len;
 
 		if ( !$.isArray( children ) ) {
-			children = [children];
+			children = [ children ];
 		}
 
 		for ( i = 0, len = children.length; i < len; i++ ) {
-			if ( typeof children[i] !== 'object' ) {
-				children[i] = document.createTextNode( children[i] );
+			if ( typeof children[ i ] !== 'object' ) {
+				children[ i ] = document.createTextNode( children[ i ] );
 			}
 		}
 
@@ -105,6 +105,7 @@
 	 * Try to parse a key and optional replacements, returning a jQuery object that may be a tree of jQuery nodes.
 	 * If there was an error parsing, return the key and the error message (wrapped in jQuery). This should put the error right into
 	 * the interface, without causing the page to halt script execution, and it hopefully should be clearer how to fix it.
+	 *
 	 * @private
 	 * @param {Object} options Parser options
 	 * @return {Function}
@@ -116,8 +117,8 @@
 
 		return function ( args ) {
 			var fallback,
-				key = args[0],
-				argsArray = $.isArray( args[1] ) ? args[1] : slice.call( args, 1 );
+				key = args[ 0 ],
+				argsArray = $.isArray( args[ 1 ] ) ? args[ 1 ] : slice.call( args, 1 );
 			try {
 				return parser.parse( key, argsArray );
 			} catch ( e ) {
@@ -266,6 +267,7 @@
 		 * Where the magic happens.
 		 * Parses a message from the key, and swaps in replacements as necessary, wraps in jQuery
 		 * If an error is thrown, returns original key, and logs the error
+		 *
 		 * @param {string} key Message key.
 		 * @param {Array} replacements Variable replacements for $1, $2... $n
 		 * @return {jQuery}
@@ -277,12 +279,13 @@
 		/**
 		 * Fetch the message string associated with a key, return parsed structure. Memoized.
 		 * Note that we pass '[' + key + ']' back for a missing message here.
+		 *
 		 * @param {string} key
 		 * @return {string|Array} string of '[key]' if message missing, simple string if possible, array of arrays if needs parsing
 		 */
 		getAst: function ( key ) {
 			var wikiText,
-				cacheKey = [key, this.settings.onlyCurlyBraceTransform].join( ':' );
+				cacheKey = [ key, this.settings.onlyCurlyBraceTransform ].join( ':' );
 
 			if ( this.astCache[ cacheKey ] === undefined ) {
 				wikiText = this.settings.messages.get( key );
@@ -327,6 +330,7 @@
 
 			/**
 			 * Try parsers until one works, if none work return null
+			 *
 			 * @private
 			 * @param {Function[]} ps
 			 * @return {string|null}
@@ -335,7 +339,7 @@
 				return function () {
 					var i, result;
 					for ( i = 0; i < ps.length; i++ ) {
-						result = ps[i]();
+						result = ps[ i ]();
 						if ( result !== null ) {
 							return result;
 						}
@@ -347,6 +351,7 @@
 			/**
 			 * Try several ps in a row, all must succeed or return null.
 			 * This is the only eager one.
+			 *
 			 * @private
 			 * @param {Function[]} ps
 			 * @return {string|null}
@@ -356,7 +361,7 @@
 					originalPos = pos,
 					result = [];
 				for ( i = 0; i < ps.length; i++ ) {
-					res = ps[i]();
+					res = ps[ i ]();
 					if ( res === null ) {
 						pos = originalPos;
 						return null;
@@ -369,6 +374,7 @@
 			/**
 			 * Run the same parser over and over until it fails.
 			 * Must succeed a minimum of n times or return null.
+			 *
 			 * @private
 			 * @param {number} n
 			 * @param {Function} p
@@ -411,6 +417,7 @@
 
 			/**
 			 * Just make parsers out of simpler JS builtin types
+			 *
 			 * @private
 			 * @param {string} s
 			 * @return {Function}
@@ -443,8 +450,8 @@
 					if ( matches === null ) {
 						return null;
 					}
-					pos += matches[0].length;
-					return matches[0];
+					pos += matches[ 0 ].length;
+					return matches[ 0 ];
 				};
 			}
 
@@ -484,7 +491,7 @@
 					backslash,
 					anyCharacter
 				] );
-				return result === null ? null : result[1];
+				return result === null ? null : result[ 1 ];
 			}
 			escapedOrLiteralWithoutSpace = choice( [
 				escapedLiteral,
@@ -543,7 +550,7 @@
 				if ( result === null ) {
 					return null;
 				}
-				return [ 'REPLACE', parseInt( result[1], 10 ) - 1 ];
+				return [ 'REPLACE', parseInt( result[ 1 ], 10 ) - 1 ];
 			}
 			openExtlink = makeStringParser( '[' );
 			closeExtlink = makeStringParser( ']' );
@@ -559,13 +566,13 @@
 					closeExtlink
 				] );
 				if ( parsedResult !== null ) {
-					result = [ 'EXTLINK', parsedResult[1] ];
+					result = [ 'EXTLINK', parsedResult[ 1 ] ];
 					// TODO (mattflaschen, 2013-03-22): Clean this up if possible.
 					// It's avoiding CONCAT for single nodes, so they at least doesn't get the htmlEmitter span.
-					if ( parsedResult[3].length === 1 ) {
-						result.push( parsedResult[3][0] );
+					if ( parsedResult[ 3 ].length === 1 ) {
+						result.push( parsedResult[ 3 ][ 0 ] );
 					} else {
-						result.push( ['CONCAT'].concat( parsedResult[3] ) );
+						result.push( [ 'CONCAT' ].concat( parsedResult[ 3 ] ) );
 					}
 				}
 				return result;
@@ -583,7 +590,7 @@
 				if ( result === null ) {
 					return null;
 				}
-				return [ 'EXTLINKPARAM', parseInt( result[2], 10 ) - 1, result[4] ];
+				return [ 'EXTLINKPARAM', parseInt( result[ 2 ], 10 ) - 1, result[ 4 ] ];
 			}
 			openWikilink = makeStringParser( '[[' );
 			closeWikilink = makeStringParser( ']]' );
@@ -595,7 +602,7 @@
 					templateContents,
 					closeTemplate
 				] );
-				return result === null ? null : result[1];
+				return result === null ? null : result[ 1 ];
 			}
 
 			wikilinkPage = choice( [
@@ -609,7 +616,7 @@
 					pipe,
 					expression
 				] );
-				return result === null ? null : [ result[0], result[2] ];
+				return result === null ? null : [ result[ 0 ], result[ 2 ] ];
 			}
 
 			wikilinkContents = choice( [
@@ -627,7 +634,7 @@
 					closeWikilink
 				] );
 				if ( parsedResult !== null ) {
-					parsedLinkContents = parsedResult[1];
+					parsedLinkContents = parsedResult[ 1 ];
 					result = [ 'WIKILINK' ].concat( parsedLinkContents );
 				}
 				return result;
@@ -640,7 +647,7 @@
 					htmlDoubleQuoteAttributeValue,
 					doubleQuote
 				] );
-				return parsedResult === null ? null : parsedResult[1];
+				return parsedResult === null ? null : parsedResult[ 1 ];
 			}
 
 			function singleQuotedHtmlAttributeValue() {
@@ -649,7 +656,7 @@
 					htmlSingleQuoteAttributeValue,
 					singleQuote
 				] );
-				return parsedResult === null ? null : parsedResult[1];
+				return parsedResult === null ? null : parsedResult[ 1 ];
 			}
 
 			function htmlAttribute() {
@@ -662,7 +669,7 @@
 						singleQuotedHtmlAttributeValue
 					] )
 				] );
-				return parsedResult === null ? null : [parsedResult[1], parsedResult[3]];
+				return parsedResult === null ? null : [ parsedResult[ 1 ], parsedResult[ 3 ] ];
 			}
 
 			/**
@@ -684,9 +691,9 @@
 				}
 
 				for ( i = 0, len = attributes.length; i < len; i += 2 ) {
-					attributeName = attributes[i];
+					attributeName = attributes[ i ];
 					if ( $.inArray( attributeName, settings.allowedHtmlCommonAttributes ) === -1 &&
-						$.inArray( attributeName, settings.allowedHtmlAttributesByElement[startTagName] || [] ) === -1 ) {
+						$.inArray( attributeName, settings.allowedHtmlAttributesByElement[ startTagName ] || [] ) === -1 ) {
 						return false;
 					}
 				}
@@ -697,7 +704,7 @@
 			function htmlAttributes() {
 				var parsedResult = nOrMore( 0, htmlAttribute )();
 				// Un-nest attributes array due to structure of jQueryMsg operations (see emit).
-				return concat.apply( ['HTMLATTRIBUTES'], parsedResult );
+				return concat.apply( [ 'HTMLATTRIBUTES' ], parsedResult );
 			}
 
 			// Subset of allowed HTML markup.
@@ -728,7 +735,7 @@
 				}
 
 				endOpenTagPos = pos;
-				startTagName = parsedOpenTagResult[1];
+				startTagName = parsedOpenTagResult[ 1 ];
 
 				parsedHtmlContents = nOrMore( 0, expression )();
 
@@ -746,8 +753,8 @@
 				}
 
 				endCloseTagPos = pos;
-				endTagName = parsedCloseTagResult[1];
-				wrappedAttributes = parsedOpenTagResult[2];
+				endTagName = parsedCloseTagResult[ 1 ];
+				wrappedAttributes = parsedOpenTagResult[ 2 ];
 				attributes = wrappedAttributes.slice( 1 );
 				if ( isAllowedHtml( startTagName, endTagName, attributes ) ) {
 					result = [ 'HTMLELEMENT', startTagName, wrappedAttributes ]
@@ -787,9 +794,9 @@
 				if ( result === null ) {
 					return null;
 				}
-				expr = result[1];
+				expr = result[ 1 ];
 				// use a CONCAT operator if there are multiple nodes, otherwise return the first node, raw.
-				return expr.length > 1 ? [ 'CONCAT' ].concat( expr ) : expr[0];
+				return expr.length > 1 ? [ 'CONCAT' ].concat( expr ) : expr[ 0 ];
 			}
 
 			function templateWithReplacement() {
@@ -798,7 +805,7 @@
 					colon,
 					replacement
 				] );
-				return result === null ? null : [ result[0], result[2] ];
+				return result === null ? null : [ result[ 0 ], result[ 2 ] ];
 			}
 			function templateWithOutReplacement() {
 				var result = sequence( [
@@ -806,14 +813,14 @@
 					colon,
 					paramExpression
 				] );
-				return result === null ? null : [ result[0], result[2] ];
+				return result === null ? null : [ result[ 0 ], result[ 2 ] ];
 			}
 			function templateWithOutFirstParameter() {
 				var result = sequence( [
 					templateName,
 					colon
 				] );
-				return result === null ? null : [ result[0], '' ];
+				return result === null ? null : [ result[ 0 ], '' ];
 			}
 			colon = makeStringParser( ':' );
 			templateContents = choice( [
@@ -824,7 +831,7 @@
 						choice( [ templateWithReplacement, templateWithOutReplacement, templateWithOutFirstParameter ] ),
 						nOrMore( 0, templateParam )
 					] );
-					return res === null ? null : res[0].concat( res[1] );
+					return res === null ? null : res[ 0 ].concat( res[ 1 ] );
 				},
 				function () {
 					var res = sequence( [
@@ -834,7 +841,7 @@
 					if ( res === null ) {
 						return null;
 					}
-					return [ res[0] ].concat( res[1] );
+					return [ res[ 0 ] ].concat( res[ 1 ] );
 				}
 			] );
 			openTemplate = makeStringParser( '{{' );
@@ -921,6 +928,7 @@
 		/**
 		 * (We put this method definition here, and not in prototype, to make sure it's not overwritten by any magic.)
 		 * Walk entire node structure, applying replacements and template functions when appropriate
+		 *
 		 * @param {Mixed} node Abstract syntax tree (top node or subnode)
 		 * @param {Array} replacements for $1, $2, ... $n
 		 * @return {Mixed} single-string node or array of nodes suitable for jQuery appending
@@ -939,8 +947,8 @@
 					subnodes = $.map( node.slice( 1 ), function ( n ) {
 						return jmsg.emit( n, replacements );
 					} );
-					operation = node[0].toLowerCase();
-					if ( typeof jmsg[operation] === 'function' ) {
+					operation = node[ 0 ].toLowerCase();
+					if ( typeof jmsg[ operation ] === 'function' ) {
 						ret = jmsg[ operation ]( subnodes, replacements );
 					} else {
 						throw new Error( 'Unknown operation "' + operation + '"' );
@@ -970,6 +978,7 @@
 		 * Parsing has been applied depth-first we can assume that all nodes here are single nodes
 		 * Must return a single node to parents -- a jQuery with synthetic span
 		 * However, unwrap any other synthetic spans in our children and pass them upwards
+		 *
 		 * @param {Mixed[]} nodes Some single nodes, some arrays of nodes
 		 * @return {jQuery}
 		 */
@@ -1002,10 +1011,10 @@
 		 * @return {String} replacement
 		 */
 		replace: function ( nodes, replacements ) {
-			var index = parseInt( nodes[0], 10 );
+			var index = parseInt( nodes[ 0 ], 10 );
 
 			if ( index < replacements.length ) {
-				return replacements[index];
+				return replacements[ index ];
 			} else {
 				// index not found, fallback to displaying variable
 				return '$' + ( index + 1 );
@@ -1024,12 +1033,12 @@
 		 * from the server, since the replacement is done at save time.
 		 * It may, though, if the wikitext appears in extension-controlled content.
 		 *
-		 * @param nodes
+		 * @param {String[]} nodes
 		 */
 		wikilink: function ( nodes ) {
 			var page, anchor, url;
 
-			page = nodes[0];
+			page = nodes[ 0 ];
 			url = mw.util.getUrl( page );
 
 			if ( nodes.length === 1 ) {
@@ -1037,7 +1046,7 @@
 				anchor = page;
 			} else {
 				// [[Some Page|anchor text]] or [[Namespace:Some Page|anchor]]
-				anchor = nodes[1];
+				anchor = nodes[ 1 ];
 			}
 
 			return $( '<a>' ).attr( {
@@ -1056,7 +1065,7 @@
 		htmlattributes: function ( nodes ) {
 			var i, len, mapping = {};
 			for ( i = 0, len = nodes.length; i < len; i += 2 ) {
-				mapping[nodes[i]] = decodePrimaryHtmlEntities( nodes[i + 1] );
+				mapping[ nodes[ i ] ] = decodePrimaryHtmlEntities( nodes[ i + 1 ] );
 			}
 			return mapping;
 		},
@@ -1091,8 +1100,8 @@
 		 */
 		extlink: function ( nodes ) {
 			var $el,
-				arg = nodes[0],
-				contents = nodes[1];
+				arg = nodes[ 0 ],
+				contents = nodes[ 1 ];
 			if ( arg instanceof jQuery ) {
 				$el = arg;
 			} else {
@@ -1124,19 +1133,20 @@
 		 */
 		extlinkparam: function ( nodes, replacements ) {
 			var replacement,
-				index = parseInt( nodes[0], 10 );
+				index = parseInt( nodes[ 0 ], 10 );
 			if ( index < replacements.length ) {
-				replacement = replacements[index];
+				replacement = replacements[ index ];
 			} else {
 				replacement = '$' + ( index + 1 );
 			}
-			return this.extlink( [ replacement, nodes[1] ] );
+			return this.extlink( [ replacement, nodes[ 1 ] ] );
 		},
 
 		/**
 		 * Transform parsed structure into pluralization
 		 * n.b. The first node may be a non-integer (for instance, a string representing an Arabic number).
 		 * So convert it back with the current language's convertNumber.
+		 *
 		 * @param {Array} nodes List of nodes, [ {string|number}, {string}, {string} ... ]
 		 * @return {string} selected pluralized form according to current language
 		 */
@@ -1144,10 +1154,10 @@
 			var forms, firstChild, firstChildText, explicitPluralFormNumber, formIndex, form, count,
 				explicitPluralForms = {};
 
-			count = parseFloat( this.language.convertNumber( nodes[0], true ) );
+			count = parseFloat( this.language.convertNumber( nodes[ 0 ], true ) );
 			forms = nodes.slice( 1 );
 			for ( formIndex = 0; formIndex < forms.length; formIndex++ ) {
-				form = forms[formIndex];
+				form = forms[ formIndex ];
 
 				if ( form.jquery && form.hasClass( 'mediaWiki_htmlEmitter' ) ) {
 					// This is a nested node, may be an explicit plural form like 5=[$2 linktext]
@@ -1155,19 +1165,19 @@
 					if ( firstChild && firstChild.nodeType === Node.TEXT_NODE ) {
 						firstChildText = firstChild.textContent;
 						if ( /^\d+=/.test( firstChildText ) ) {
-							explicitPluralFormNumber = parseInt( firstChildText.split( /=/ )[0], 10 );
+							explicitPluralFormNumber = parseInt( firstChildText.split( /=/ )[ 0 ], 10 );
 							// Use the digit part as key and rest of first text node and
 							// rest of child nodes as value.
 							firstChild.textContent = firstChildText.slice( firstChildText.indexOf( '=' ) + 1 );
-							explicitPluralForms[explicitPluralFormNumber] = form;
-							forms[formIndex] = undefined;
+							explicitPluralForms[ explicitPluralFormNumber ] = form;
+							forms[ formIndex ] = undefined;
 						}
 					}
 				} else if ( /^\d+=/.test( form ) ) {
 					// Simple explicit plural forms like 12=a dozen
-					explicitPluralFormNumber = parseInt( form.split( /=/ )[0], 10 );
-					explicitPluralForms[explicitPluralFormNumber] = form.slice( form.indexOf( '=' ) + 1 );
-					forms[formIndex] = undefined;
+					explicitPluralFormNumber = parseInt( form.split( /=/ )[ 0 ], 10 );
+					explicitPluralForms[ explicitPluralFormNumber ] = form.slice( form.indexOf( '=' ) + 1 );
+					forms[ formIndex ] = undefined;
 				}
 			}
 
@@ -1194,7 +1204,7 @@
 		 */
 		gender: function ( nodes ) {
 			var gender,
-				maybeUser = nodes[0],
+				maybeUser = nodes[ 0 ],
 				forms = nodes.slice( 1 );
 
 			if ( maybeUser === '' ) {
@@ -1215,23 +1225,25 @@
 		/**
 		 * Transform parsed structure into grammar conversion.
 		 * Invoked by putting `{{grammar:form|word}}` in a message
+		 *
 		 * @param {Array} nodes List of nodes [{Grammar case eg: genitive}, {string word}]
 		 * @return {string} selected grammatical form according to current language
 		 */
 		grammar: function ( nodes ) {
-			var form = nodes[0],
-				word = nodes[1];
+			var form = nodes[ 0 ],
+				word = nodes[ 1 ];
 			return word && form && this.language.convertGrammar( word, form );
 		},
 
 		/**
 		 * Tranform parsed structure into a int: (interface language) message include
 		 * Invoked by putting `{{int:othermessage}}` into a message
+		 *
 		 * @param {Array} nodes List of nodes
 		 * @return {string} Other message
 		 */
 		'int': function ( nodes ) {
-			var msg = nodes[0];
+			var msg = nodes[ 0 ];
 			return mw.jqueryMsg.getMessageFunction()( msg.charAt( 0 ).toLowerCase() + msg.slice( 1 ) );
 		},
 
@@ -1239,12 +1251,13 @@
 		 * Takes an unformatted number (arab, no group separators and . as decimal separator)
 		 * and outputs it in the localized digit script and formatted with decimal
 		 * separator, according to the current language.
+		 *
 		 * @param {Array} nodes List of nodes
 		 * @return {number|string} Formatted number
 		 */
 		formatnum: function ( nodes ) {
-			var isInteger = ( nodes[1] && nodes[1] === 'R' ) ? true : false,
-				number = nodes[0];
+			var isInteger = ( nodes[ 1 ] && nodes[ 1 ] === 'R' ) ? true : false,
+				number = nodes[ 0 ];
 
 			return this.language.convertNumber( number, isInteger );
 		}
@@ -1279,9 +1292,9 @@
 		}
 
 		messageFunction = mw.jqueryMsg.getMessageFunction( {
-			'messages': this.map,
+			messages: this.map,
 			// For format 'escaped', escaping part is handled by mediawiki.js
-			'format': this.format
+			format: this.format
 		} );
 		return messageFunction( this.key, this.parameters );
 	};
diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 56a4699b6a..122e5122be 100644
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -7,6 +7,7 @@
  * @alternateClassName mediaWiki
  * @singleton
  */
+/*jshint latedef:false */
 /*global sha1 */
 ( function ( $ ) {
 	'use strict';
@@ -68,7 +69,7 @@
 
 				if ( $.isPlainObject( selection ) ) {
 					for ( s in selection ) {
-						setGlobalMapValue( this, s, selection[s] );
+						setGlobalMapValue( this, s, selection[ s ] );
 					}
 					return true;
 				}
@@ -95,13 +96,13 @@
 	 * @param {Mixed} value
 	 */
 	function setGlobalMapValue( map, key, value ) {
-		map.values[key] = value;
+		map.values[ key ] = value;
 		mw.log.deprecate(
-			window,
-			key,
-			value,
-			// Deprecation notice for mw.config globals (T58550, T72470)
-			map === mw.config && 'Use mw.config instead.'
+				window,
+				key,
+				value,
+				// Deprecation notice for mw.config globals (T58550, T72470)
+				map === mw.config && 'Use mw.config instead.'
 		);
 	}
 
@@ -128,7 +129,7 @@
 				selection = slice.call( selection );
 				results = {};
 				for ( i = 0; i < selection.length; i++ ) {
-					results[selection[i]] = this.get( selection[i], fallback );
+					results[ selection[ i ] ] = this.get( selection[ i ], fallback );
 				}
 				return results;
 			}
@@ -137,7 +138,7 @@
 				if ( !hasOwn.call( this.values, selection ) ) {
 					return fallback;
 				}
-				return this.values[selection];
+				return this.values[ selection ];
 			}
 
 			if ( selection === undefined ) {
@@ -160,12 +161,12 @@
 
 			if ( $.isPlainObject( selection ) ) {
 				for ( s in selection ) {
-					this.values[s] = selection[s];
+					this.values[ s ] = selection[ s ];
 				}
 				return true;
 			}
 			if ( typeof selection === 'string' && arguments.length > 1 ) {
-				this.values[selection] = value;
+				this.values[ selection ] = value;
 				return true;
 			}
 			return false;
@@ -182,7 +183,7 @@
 
 			if ( $.isArray( selection ) ) {
 				for ( s = 0; s < selection.length; s++ ) {
-					if ( typeof selection[s] !== 'string' || !hasOwn.call( this.values, selection[s] ) ) {
+					if ( typeof selection[ s ] !== 'string' || !hasOwn.call( this.values, selection[ s ] ) ) {
 						return false;
 					}
 				}
@@ -284,7 +285,7 @@
 		params: function ( parameters ) {
 			var i;
 			for ( i = 0; i < parameters.length; i += 1 ) {
-				this.parameters.push( parameters[i] );
+				this.parameters.push( parameters[ i ] );
 			}
 			return this;
 		},
@@ -422,7 +423,7 @@
 			var parameters = slice.call( arguments, 1 );
 			return formatString.replace( /\$(\d+)/g, function ( str, match ) {
 				var index = parseInt( match, 10 ) - 1;
-				return parameters[index] !== undefined ? parameters[index] : '$' + match;
+				return parameters[ index ] !== undefined ? parameters[ index ] : '$' + match;
 			} );
 		},
 
@@ -485,8 +486,8 @@
 		 */
 		trackUnsubscribe: function ( callback ) {
 			trackHandlers = $.grep( trackHandlers, function ( fns ) {
-				if ( fns[1] === callback ) {
-					trackCallbacks.remove( fns[0] );
+				if ( fns[ 1 ] === callback ) {
+					trackCallbacks.remove( fns[ 0 ] );
 					// Ensure the tuple is removed to avoid holding on to closures
 					return false;
 				}
@@ -581,6 +582,7 @@
 
 		/**
 		 * Dummy placeholder for {@link mw.log}
+		 *
 		 * @method
 		 */
 		log: ( function () {
@@ -632,7 +634,7 @@
 			 * @param {string} [msg] Optional text to include in the deprecation message
 			 */
 			log.deprecate = !Object.defineProperty ? function ( obj, key, val ) {
-				obj[key] = val;
+				obj[ key ] = val;
 			} : function ( obj, key, val, msg ) {
 				msg = 'Use of "' + key + '" is deprecated.' + ( msg ? ( ' ' + msg ) : '' );
 				// Support: IE8
@@ -654,7 +656,7 @@
 					} );
 				} catch ( err ) {
 					// Fallback to creating a copy of the value to the object.
-					obj[key] = val;
+					obj[ key ] = val;
 				}
 			};
 
@@ -717,7 +719,7 @@
 			 *
 			 *     {
 			 *         'moduleName': {
-			 *             // From mw.loader.register() in startup module
+			 *             // From mw.loader.register()
 			 *             'version': '########' (hash)
 			 *             'dependencies': ['required.foo', 'bar.also', ...], (or) function () {}
 			 *             'group': 'somegroup', (or) null
@@ -735,6 +737,30 @@
 			 *         }
 			 *     }
 			 *
+			 * State machine:
+			 *
+			 * - `registered`:
+			 *    The module is known to the system but not yet requested.
+			 *    Meta data is registered via mw.loader#register. Calls to that method are
+			 *    generated server-side by the startup module.
+			 * - `loading`:
+			 *    The module is requested through mw.loader (either directly or as dependency of
+			 *    another module). The client will be fetching module contents from the server.
+			 *    The contents are then stashed in the registry via mw.loader#implement.
+			 * - `loaded`:
+			 *    The module has been requested from the server and stashed via mw.loader#implement.
+			 *    If the module has no more dependencies in-fight, the module will be executed
+			 *    right away. Otherwise execution is deferred, controlled via #handlePending.
+			 * - `executing`:
+			 *    The module is being executed.
+			 * - `ready`:
+			 *    The module has been successfully executed.
+			 * - `error`:
+			 *    The module (or one of its dependencies) produced an error during execution.
+			 * - `missing`:
+			 *    The module was registered client-side and requested, but the server denied knowledge
+			 *    of the module's existence.
+			 *
 			 * @property
 			 * @private
 			 */
@@ -755,7 +781,25 @@
 				// List of modules to be loaded
 				queue = [],
 
-				// List of callback functions waiting for modules to be ready to be called
+				/**
+				 * List of callback jobs waiting for modules to be ready.
+				 *
+				 * Jobs are created by #request() and run by #handlePending().
+				 *
+				 * Typically when a job is created for a module, the job's dependencies contain
+				 * both the module being requested and all its recursive dependencies.
+				 *
+				 * Format:
+				 *
+				 *     {
+				 *         'dependencies': [ module names ],
+				 *         'ready': Function callback
+				 *         'error': Function callback
+				 *     }
+				 *
+				 * @property {Object[]} jobs
+				 * @private
+				 */
 				jobs = [],
 
 				// Selector cache for the marker element. Use getMarker() to get/use the marker!
@@ -795,7 +839,7 @@
 				if ( nextnode ) {
 					$( nextnode ).before( s );
 				} else {
-					document.getElementsByTagName( 'head' )[0].appendChild( s );
+					document.getElementsByTagName( 'head' )[ 0 ].appendChild( s );
 				}
 				if ( s.styleSheet ) {
 					// Support: IE6-10
@@ -911,7 +955,7 @@
 			 */
 			function getCombinedVersion( modules ) {
 				var hashes = $.map( modules, function ( module ) {
-					return registry[module].version;
+					return registry[ module ].version;
 				} );
 				// Trim for consistency with server-side ResourceLoader::makeHash. It also helps
 				// save precious space in the limited query string. Otherwise modules are more
@@ -919,93 +963,6 @@
 				return sha1( hashes.join( '' ) ).slice( 0, 12 );
 			}
 
-			/**
-			 * Resolve dependencies and detect circular references.
-			 *
-			 * @private
-			 * @param {string} module Name of the top-level module whose dependencies shall be
-			 *  resolved and sorted.
-			 * @param {Array} resolved Returns a topological sort of the given module and its
-			 *  dependencies, such that later modules depend on earlier modules. The array
-			 *  contains the module names. If the array contains already some module names,
-			 *  this function appends its result to the pre-existing array.
-			 * @param {Object} [unresolved] Hash used to track the current dependency
-			 *  chain; used to report loops in the dependency graph.
-			 * @throws {Error} If any unregistered module or a dependency loop is encountered
-			 */
-			function sortDependencies( module, resolved, unresolved ) {
-				var n, deps, len, skip;
-
-				if ( !hasOwn.call( registry, module ) ) {
-					throw new Error( 'Unknown dependency: ' + module );
-				}
-
-				if ( registry[module].skip !== null ) {
-					/*jshint evil:true */
-					skip = new Function( registry[module].skip );
-					registry[module].skip = null;
-					if ( skip() ) {
-						registry[module].skipped = true;
-						registry[module].dependencies = [];
-						registry[module].state = 'ready';
-						handlePending( module );
-						return;
-					}
-				}
-
-				// Resolves dynamic loader function and replaces it with its own results
-				if ( $.isFunction( registry[module].dependencies ) ) {
-					registry[module].dependencies = registry[module].dependencies();
-					// Ensures the module's dependencies are always in an array
-					if ( typeof registry[module].dependencies !== 'object' ) {
-						registry[module].dependencies = [registry[module].dependencies];
-					}
-				}
-				if ( $.inArray( module, resolved ) !== -1 ) {
-					// Module already resolved; nothing to do
-					return;
-				}
-				// Create unresolved if not passed in
-				if ( !unresolved ) {
-					unresolved = {};
-				}
-				// Tracks down dependencies
-				deps = registry[module].dependencies;
-				len = deps.length;
-				for ( n = 0; n < len; n += 1 ) {
-					if ( $.inArray( deps[n], resolved ) === -1 ) {
-						if ( unresolved[deps[n]] ) {
-							throw new Error(
-								'Circular reference detected: ' + module +
-								' -> ' + deps[n]
-							);
-						}
-
-						// Add to unresolved
-						unresolved[module] = true;
-						sortDependencies( deps[n], resolved, unresolved );
-						delete unresolved[module];
-					}
-				}
-				resolved[resolved.length] = module;
-			}
-
-			/**
-			 * Get a list of module names that a module depends on in their proper dependency
-			 * order.
-			 *
-			 * @private
-			 * @param {string[]} module Array of string module names
-			 * @return {Array} List of dependencies, including 'module'.
-			 */
-			function resolve( modules ) {
-				var resolved = [];
-				$.each( modules, function ( idx, module ) {
-					sortDependencies( module, resolved );
-				} );
-				return resolved;
-			}
-
 			/**
 			 * Determine whether all dependencies are in state 'ready', which means we may
 			 * execute the module or job now.
@@ -1017,7 +974,7 @@
 			function allReady( modules ) {
 				var i;
 				for ( i = 0; i < modules.length; i++ ) {
-					if ( mw.loader.getState( modules[i] ) !== 'ready' ) {
+					if ( mw.loader.getState( modules[ i ] ) !== 'ready' ) {
 						return false;
 					}
 				}
@@ -1035,7 +992,7 @@
 			function anyFailed( modules ) {
 				var i, state;
 				for ( i = 0; i < modules.length; i++ ) {
-					state = mw.loader.getState( modules[i] );
+					state = mw.loader.getState( modules[ i ] );
 					if ( state === 'error' || state === 'missing' ) {
 						return true;
 					}
@@ -1057,16 +1014,16 @@
 			function handlePending( module ) {
 				var j, job, hasErrors, m, stateChange;
 
-				if ( registry[module].state === 'error' || registry[module].state === 'missing' ) {
+				if ( registry[ module ].state === 'error' || registry[ module ].state === 'missing' ) {
 					// If the current module failed, mark all dependent modules also as failed.
 					// Iterate until steady-state to propagate the error state upwards in the
 					// dependency tree.
 					do {
 						stateChange = false;
 						for ( m in registry ) {
-							if ( registry[m].state !== 'error' && registry[m].state !== 'missing' ) {
-								if ( anyFailed( registry[m].dependencies ) ) {
-									registry[m].state = 'error';
+							if ( registry[ m ].state !== 'error' && registry[ m ].state !== 'missing' ) {
+								if ( anyFailed( registry[ m ].dependencies ) ) {
+									registry[ m ].state = 'error';
 									stateChange = true;
 								}
 							}
@@ -1076,16 +1033,16 @@
 
 				// Execute all jobs whose dependencies are either all satisfied or contain at least one failed module.
 				for ( j = 0; j < jobs.length; j += 1 ) {
-					hasErrors = anyFailed( jobs[j].dependencies );
-					if ( hasErrors || allReady( jobs[j].dependencies ) ) {
+					hasErrors = anyFailed( jobs[ j ].dependencies );
+					if ( hasErrors || allReady( jobs[ j ].dependencies ) ) {
 						// All dependencies satisfied, or some have errors
-						job = jobs[j];
+						job = jobs[ j ];
 						jobs.splice( j, 1 );
 						j -= 1;
 						try {
 							if ( hasErrors ) {
 								if ( $.isFunction( job.error ) ) {
-									job.error( new Error( 'Module ' + module + ' has failed dependencies' ), [module] );
+									job.error( new Error( 'Module ' + module + ' has failed dependencies' ), [ module ] );
 								}
 							} else {
 								if ( $.isFunction( job.ready ) ) {
@@ -1100,27 +1057,114 @@
 					}
 				}
 
-				if ( registry[module].state === 'ready' ) {
+				if ( registry[ module ].state === 'ready' ) {
 					// The current module became 'ready'. Set it in the module store, and recursively execute all
 					// dependent modules that are loaded and now have all dependencies satisfied.
-					mw.loader.store.set( module, registry[module] );
+					mw.loader.store.set( module, registry[ module ] );
 					for ( m in registry ) {
-						if ( registry[m].state === 'loaded' && allReady( registry[m].dependencies ) ) {
+						if ( registry[ m ].state === 'loaded' && allReady( registry[ m ].dependencies ) ) {
 							execute( m );
 						}
 					}
 				}
 			}
 
+			/**
+			 * Resolve dependencies and detect circular references.
+			 *
+			 * @private
+			 * @param {string} module Name of the top-level module whose dependencies shall be
+			 *  resolved and sorted.
+			 * @param {Array} resolved Returns a topological sort of the given module and its
+			 *  dependencies, such that later modules depend on earlier modules. The array
+			 *  contains the module names. If the array contains already some module names,
+			 *  this function appends its result to the pre-existing array.
+			 * @param {Object} [unresolved] Hash used to track the current dependency
+			 *  chain; used to report loops in the dependency graph.
+			 * @throws {Error} If any unregistered module or a dependency loop is encountered
+			 */
+			function sortDependencies( module, resolved, unresolved ) {
+				var n, deps, len, skip;
+
+				if ( !hasOwn.call( registry, module ) ) {
+					throw new Error( 'Unknown dependency: ' + module );
+				}
+
+				if ( registry[ module ].skip !== null ) {
+					/*jshint evil:true */
+					skip = new Function( registry[ module ].skip );
+					registry[ module ].skip = null;
+					if ( skip() ) {
+						registry[ module ].skipped = true;
+						registry[ module ].dependencies = [];
+						registry[ module ].state = 'ready';
+						handlePending( module );
+						return;
+					}
+				}
+
+				// Resolves dynamic loader function and replaces it with its own results
+				if ( $.isFunction( registry[ module ].dependencies ) ) {
+					registry[ module ].dependencies = registry[ module ].dependencies();
+					// Ensures the module's dependencies are always in an array
+					if ( typeof registry[ module ].dependencies !== 'object' ) {
+						registry[ module ].dependencies = [ registry[ module ].dependencies ];
+					}
+				}
+				if ( $.inArray( module, resolved ) !== -1 ) {
+					// Module already resolved; nothing to do
+					return;
+				}
+				// Create unresolved if not passed in
+				if ( !unresolved ) {
+					unresolved = {};
+				}
+				// Tracks down dependencies
+				deps = registry[ module ].dependencies;
+				len = deps.length;
+				for ( n = 0; n < len; n += 1 ) {
+					if ( $.inArray( deps[ n ], resolved ) === -1 ) {
+						if ( unresolved[ deps[ n ] ] ) {
+							throw new Error(
+								'Circular reference detected: ' + module +
+								' -> ' + deps[ n ]
+							);
+						}
+
+						// Add to unresolved
+						unresolved[ module ] = true;
+						sortDependencies( deps[ n ], resolved, unresolved );
+						delete unresolved[ module ];
+					}
+				}
+				resolved[ resolved.length ] = module;
+			}
+
+			/**
+			 * Get a list of module names that a module depends on in their proper dependency
+			 * order.
+			 *
+			 * @private
+			 * @param {string[]} module Array of string module names
+			 * @return {Array} List of dependencies, including 'module'.
+			 */
+			function resolve( modules ) {
+				var resolved = [];
+				$.each( modules, function ( idx, module ) {
+					sortDependencies( module, resolved );
+				} );
+				return resolved;
+			}
+
 			/**
 			 * Load and execute a script with callback.
 			 *
 			 * @private
 			 * @param {string} src URL to script, will be used as the src attribute in the script tag
-			 * @param {Function} [callback] Callback which will be run when the script is done
+			 * @return {jQuery.Promise}
 			 */
-			function addScript( src, callback ) {
-				$.ajax( {
+			function addScript( src ) {
+				return $.ajax( {
 					url: src,
 					dataType: 'script',
 					// Force jQuery behaviour to be for crossDomain. Otherwise jQuery would use
@@ -1130,7 +1174,26 @@
 					// text, so we'd need to $.globalEval, which then messes up line numbers.
 					crossDomain: true,
 					cache: true
-				} ).always( callback );
+				} );
+			}
+
+			/**
+			 * Utility function for execute()
+			 *
+			 * @ignore
+			 */
+			function addLink( media, url ) {
+				var el = document.createElement( 'link' );
+				// Support: IE
+				// Insert in document *before* setting href
+				getMarker().before( el );
+				el.rel = 'stylesheet';
+				if ( media && media !== 'all' ) {
+					el.media = media;
+				}
+				// If you end up here from an IE exception "SCRIPT: Invalid property value.",
+				// see #addEmbeddedCSS, bug 31676, and bug 47277 for details.
+				el.href = url;
 			}
 
 			/**
@@ -1140,50 +1203,27 @@
 			 * @param {string} module Module name to execute
 			 */
 			function execute( module ) {
-				var key, value, media, i, urls, cssHandle, checkCssHandles,
+				var key, value, media, i, urls, cssHandle, checkCssHandles, runScript,
 					cssHandlesRegistered = false;
 
 				if ( !hasOwn.call( registry, module ) ) {
 					throw new Error( 'Module has not been registered yet: ' + module );
 				}
-				if ( registry[module].state === 'registered' ) {
-					throw new Error( 'Module has not been requested from the server yet: ' + module );
-				}
-				if ( registry[module].state === 'loading' ) {
-					throw new Error( 'Module has not completed loading yet: ' + module );
-				}
-				if ( registry[module].state === 'ready' ) {
-					throw new Error( 'Module has already been executed: ' + module );
+				if ( registry[ module ].state !== 'loaded' ) {
+					throw new Error( 'Module in state "' + registry[ module ].state + '" may not be executed: ' + module );
 				}
 
-				/**
-				 * Define loop-function here for efficiency
-				 * and to avoid re-using badly scoped variables.
-				 * @ignore
-				 */
-				function addLink( media, url ) {
-					var el = document.createElement( 'link' );
-					// Support: IE
-					// Insert in document *before* setting href
-					getMarker().before( el );
-					el.rel = 'stylesheet';
-					if ( media && media !== 'all' ) {
-						el.media = media;
-					}
-					// If you end up here from an IE exception "SCRIPT: Invalid property value.",
-					// see #addEmbeddedCSS, bug 31676, and bug 47277 for details.
-					el.href = url;
-				}
+				registry[ module ].state = 'executing';
 
-				function runScript() {
+				runScript = function () {
 					var script, markModuleReady, nestedAddScript, legacyWait,
 						// Expand to include dependencies since we have to exclude both legacy modules
 						// and their dependencies from the legacyWait (to prevent a circular dependency).
 						legacyModules = resolve( mw.config.get( 'wgResourceLoaderLegacyModules', [] ) );
 					try {
-						script = registry[module].script;
+						script = registry[ module ].script;
 						markModuleReady = function () {
-							registry[module].state = 'ready';
+							registry[ module ].state = 'ready';
 							handlePending( module );
 						};
 						nestedAddScript = function ( arr, callback, i ) {
@@ -1195,7 +1235,7 @@
 								return;
 							}
 
-							addScript( arr[i], function () {
+							addScript( arr[ i ] ).always( function () {
 								nestedAddScript( arr, callback, i + 1 );
 							} );
 						};
@@ -1210,9 +1250,8 @@
 							} else if ( $.isFunction( script ) ) {
 								// Pass jQuery twice so that the signature of the closure which wraps
 								// the script can bind both '$' and 'jQuery'.
-								registry[module].state = 'ready';
 								script( $, $ );
-								handlePending( module );
+								markModuleReady();
 							} else if ( typeof script === 'string' ) {
 								// Site and user modules are a legacy scripts that run in the global scope.
 								// This is transported as a string instead of a function to avoid needing
@@ -1221,40 +1260,35 @@
 									// Implicit dependency on the site module. Not real dependency because
 									// it should run after 'site' regardless of whether it succeeds or fails.
 									mw.loader.using( 'site' ).always( function () {
-										registry[module].state = 'ready';
 										$.globalEval( script );
-										handlePending( module );
+										markModuleReady();
 									} );
 								} else {
-									registry[module].state = 'ready';
 									$.globalEval( script );
-									handlePending( module );
+									markModuleReady();
 								}
+							} else {
+								// Module without script
+								markModuleReady();
 							}
 						} );
 					} catch ( e ) {
 						// This needs to NOT use mw.log because these errors are common in production mode
 						// and not in debug mode, such as when a symbol that should be global isn't exported
-						registry[module].state = 'error';
+						registry[ module ].state = 'error';
 						mw.track( 'resourceloader.exception', { exception: e, module: module, source: 'module-execute' } );
 						handlePending( module );
 					}
-				}
-
-				// This used to be inside runScript, but since that is now fired asychronously
-				// (after CSS is loaded) we need to set it here right away. It is crucial that
-				// when execute() is called this is set synchronously, otherwise modules will get
-				// executed multiple times as the registry will state that it isn't loading yet.
-				registry[module].state = 'loading';
+				};
 
 				// Add localizations to message system
-				if ( $.isPlainObject( registry[module].messages ) ) {
-					mw.messages.set( registry[module].messages );
+				if ( registry[ module ].messages ) {
+					mw.messages.set( registry[ module ].messages );
 				}
 
 				// Initialise templates
-				if ( registry[module].templates ) {
-					mw.templates.set( module, registry[module].templates );
+				if ( registry[ module ].templates ) {
+					mw.templates.set( module, registry[ module ].templates );
 				}
 
 				// Make sure we don't run the scripts until all stylesheet insertions have completed.
@@ -1286,9 +1320,9 @@
 				// * back-compat: { <media>: [url, ..] }
 				// * { "css": [css, ..] }
 				// * { "url": { <media>: [url, ..] } }
-				if ( $.isPlainObject( registry[module].style ) ) {
-					for ( key in registry[module].style ) {
-						value = registry[module].style[key];
+				if ( registry[ module ].style ) {
+					for ( key in registry[ module ].style ) {
+						value = registry[ module ].style[ key ];
 						media = undefined;
 
 						if ( key !== 'url' && key !== 'css' ) {
@@ -1313,10 +1347,10 @@
 							for ( i = 0; i < value.length; i += 1 ) {
 								if ( key === 'bc-url' ) {
 									// back-compat: { <media>: [url, ..] }
-									addLink( media, value[i] );
+									addLink( media, value[ i ] );
 								} else if ( key === 'css' ) {
 									// { "css": [css, ..] }
-									addEmbeddedCSS( value[i], cssHandle() );
+									addEmbeddedCSS( value[ i ], cssHandle() );
 								}
 							}
 						// Not an array, but a regular object
@@ -1324,9 +1358,9 @@
 						} else if ( typeof value === 'object' ) {
 							// { "url": { <media>: [url, ..] } }
 							for ( media in value ) {
-								urls = value[media];
+								urls = value[ media ];
 								for ( i = 0; i < urls.length; i += 1 ) {
-									addLink( media, urls[i] );
+									addLink( media, urls[ i ] );
 								}
 							}
 						}
@@ -1350,19 +1384,20 @@
 			function request( dependencies, ready, error ) {
 				// Allow calling by single module name
 				if ( typeof dependencies === 'string' ) {
-					dependencies = [dependencies];
+					dependencies = [ dependencies ];
 				}
 
 				// Add ready and error callbacks if they were given
 				if ( ready !== undefined || error !== undefined ) {
-					jobs[jobs.length] = {
+					jobs.push( {
+						// Narrow down the list to modules that are worth waiting for
 						dependencies: $.grep( dependencies, function ( module ) {
 							var state = mw.loader.getState( module );
-							return state === 'registered' || state === 'loaded' || state === 'loading';
+							return state === 'registered' || state === 'loaded' || state === 'loading' || state === 'executing';
 						} ),
 						ready: ready,
 						error: error
-					};
+					} );
 				}
 
 				$.each( dependencies, function ( idx, module ) {
@@ -1372,8 +1407,8 @@
 					if ( state === 'registered' && $.inArray( module, queue ) === -1 ) {
 						// Private modules must be embedded in the page. Don't bother queuing
 						// these as the server will deny them anyway (T101806).
-						if ( registry[module].group === 'private' ) {
-							registry[module].state = 'error';
+						if ( registry[ module ].group === 'private' ) {
+							registry[ module ].state = 'error';
 							handlePending( module );
 							return;
 						}
@@ -1396,7 +1431,7 @@
 				}
 				a.sort();
 				for ( key = 0; key < a.length; key += 1 ) {
-					sorted[a[key]] = o[a[key]];
+					sorted[ a[ key ] ] = o[ a[ key ] ];
 				}
 				return sorted;
 			}
@@ -1404,6 +1439,7 @@
 			/**
 			 * Converts a module map of the form { foo: [ 'bar', 'baz' ], bar: [ 'baz, 'quux' ] }
 			 * to a query string of the form foo.bar,baz|bar.baz,quux
+			 *
 			 * @private
 			 */
 			function buildModulesString( moduleMap ) {
@@ -1412,13 +1448,14 @@
 
 				for ( prefix in moduleMap ) {
 					p = prefix === '' ? '' : prefix + '.';
-					arr.push( p + moduleMap[prefix].join( ',' ) );
+					arr.push( p + moduleMap[ prefix ].join( ',' ) );
 				}
 				return arr.join( '|' );
 			}
 
 			/**
 			 * Load modules from load.php
+			 *
 			 * @private
 			 * @param {Object} moduleMap Module map, see #buildModulesString
 			 * @param {Object} currReqBase Object with other parameters (other than 'modules') to use in the request
@@ -1446,9 +1483,9 @@
 			 */
 			function resolveIndexedDependencies( modules ) {
 				$.each( modules, function ( idx, module ) {
-					if ( module[2] ) {
-						module[2] = $.map( module[2], function ( dep ) {
-							return typeof dep === 'number' ? modules[dep][0] : dep;
+					if ( module[ 2 ] ) {
+						module[ 2 ] = $.map( module[ 2 ], function ( dep ) {
+							return typeof dep === 'number' ? modules[ dep ][ 0 ] : dep;
 						} );
 					}
 				} );
@@ -1494,12 +1531,12 @@
 					// Appends a list of modules from the queue to the batch
 					for ( q = 0; q < queue.length; q += 1 ) {
 						// Only request modules which are registered
-						if ( hasOwn.call( registry, queue[q] ) && registry[queue[q]].state === 'registered' ) {
+						if ( hasOwn.call( registry, queue[ q ] ) && registry[ queue[ q ] ].state === 'registered' ) {
 							// Prevent duplicate entries
-							if ( $.inArray( queue[q], batch ) === -1 ) {
-								batch[batch.length] = queue[q];
+							if ( $.inArray( queue[ q ], batch ) === -1 ) {
+								batch[ batch.length ] = queue[ q ];
 								// Mark registered modules as loading
-								registry[queue[q]].state = 'loading';
+								registry[ queue[ q ] ].state = 'loading';
 							}
 						}
 					}
@@ -1535,7 +1572,7 @@
 							// the error) instead of all of them.
 							mw.track( 'resourceloader.exception', { exception: err, source: 'store-eval' } );
 							origBatch = $.grep( origBatch, function ( module ) {
-								return registry[module].state === 'loading';
+								return registry[ module ].state === 'loading';
 							} );
 							batch = batch.concat( origBatch );
 						}
@@ -1555,16 +1592,16 @@
 
 					// Split batch by source and by group.
 					for ( b = 0; b < batch.length; b += 1 ) {
-						bSource = registry[batch[b]].source;
-						bGroup = registry[batch[b]].group;
+						bSource = registry[ batch[ b ] ].source;
+						bGroup = registry[ batch[ b ] ].group;
 						if ( !hasOwn.call( splits, bSource ) ) {
-							splits[bSource] = {};
+							splits[ bSource ] = {};
 						}
-						if ( !hasOwn.call( splits[bSource], bGroup ) ) {
-							splits[bSource][bGroup] = [];
+						if ( !hasOwn.call( splits[ bSource ], bGroup ) ) {
+							splits[ bSource ][ bGroup ] = [];
 						}
-						bSourceGroup = splits[bSource][bGroup];
-						bSourceGroup[bSourceGroup.length] = batch[b];
+						bSourceGroup = splits[ bSource ][ bGroup ];
+						bSourceGroup[ bSourceGroup.length ] = batch[ b ];
 					}
 
 					// Clear the batch - this MUST happen before we append any
@@ -1576,13 +1613,13 @@
 
 					for ( source in splits ) {
 
-						sourceLoadScript = sources[source];
+						sourceLoadScript = sources[ source ];
 
-						for ( group in splits[source] ) {
+						for ( group in splits[ source ] ) {
 
 							// Cache access to currently selected list of
 							// modules for this group from this source.
-							modules = splits[source][group];
+							modules = splits[ source ][ group ];
 
 							currReqBase = $.extend( {
 								version: getCombinedVersion( modules )
@@ -1600,15 +1637,15 @@
 
 							for ( i = 0; i < modules.length; i += 1 ) {
 								// Determine how many bytes this module would add to the query string
-								lastDotIndex = modules[i].lastIndexOf( '.' );
+								lastDotIndex = modules[ i ].lastIndexOf( '.' );
 
 								// If lastDotIndex is -1, substr() returns an empty string
-								prefix = modules[i].substr( 0, lastDotIndex );
-								suffix = modules[i].slice( lastDotIndex + 1 );
+								prefix = modules[ i ].substr( 0, lastDotIndex );
+								suffix = modules[ i ].slice( lastDotIndex + 1 );
 
 								bytesAdded = hasOwn.call( moduleMap, prefix )
 									? suffix.length + 3 // '%2C'.length == 3
-									: modules[i].length + 3; // '%7C'.length == 3
+									: modules[ i ].length + 3; // '%7C'.length == 3
 
 								// If the request would become too long, create a new one,
 								// but don't create empty requests
@@ -1621,9 +1658,9 @@
 									mw.track( 'resourceloader.splitRequest', { maxQueryLength: maxQueryLength } );
 								}
 								if ( !hasOwn.call( moduleMap, prefix ) ) {
-									moduleMap[prefix] = [];
+									moduleMap[ prefix ] = [];
 								}
-								moduleMap[prefix].push( suffix );
+								moduleMap[ prefix ].push( suffix );
 								l += bytesAdded;
 							}
 							// If there's anything left in moduleMap, request that too
@@ -1651,7 +1688,7 @@
 					// Allow multiple additions
 					if ( typeof id === 'object' ) {
 						for ( source in id ) {
-							mw.loader.addSource( source, id[source] );
+							mw.loader.addSource( source, id[ source ] );
 						}
 						return true;
 					}
@@ -1664,7 +1701,7 @@
 						loadUrl = loadUrl.loadScript;
 					}
 
-					sources[id] = loadUrl;
+					sources[ id ] = loadUrl;
 
 					return true;
 				},
@@ -1695,11 +1732,11 @@
 						resolveIndexedDependencies( module );
 						for ( i = 0, len = module.length; i < len; i++ ) {
 							// module is an array of module names
-							if ( typeof module[i] === 'string' ) {
-								mw.loader.register( module[i] );
+							if ( typeof module[ i ] === 'string' ) {
+								mw.loader.register( module[ i ] );
 							// module is an array of arrays
-							} else if ( typeof module[i] === 'object' ) {
-								mw.loader.register.apply( mw.loader, module[i] );
+							} else if ( typeof module[ i ] === 'object' ) {
+								mw.loader.register.apply( mw.loader, module[ i ] );
 							}
 						}
 						return;
@@ -1712,7 +1749,7 @@
 						throw new Error( 'module already registered: ' + module );
 					}
 					// List the module as registered
-					registry[module] = {
+					registry[ module ] = {
 						version: version !== undefined ? String( version ) : '',
 						dependencies: [],
 						group: typeof group === 'string' ? group : null,
@@ -1722,11 +1759,11 @@
 					};
 					if ( typeof dependencies === 'string' ) {
 						// Allow dependencies to be given as a single module name
-						registry[module].dependencies = [ dependencies ];
+						registry[ module ].dependencies = [ dependencies ];
 					} else if ( typeof dependencies === 'object' || $.isFunction( dependencies ) ) {
 						// Allow dependencies to be given as an array of module names
 						// or a function which returns an array
-						registry[module].dependencies = dependencies;
+						registry[ module ].dependencies = dependencies;
 					}
 				},
 
@@ -1779,18 +1816,18 @@
 						mw.loader.register( module );
 					}
 					// Check for duplicate implementation
-					if ( hasOwn.call( registry, module ) && registry[module].script !== undefined ) {
+					if ( hasOwn.call( registry, module ) && registry[ module ].script !== undefined ) {
 						throw new Error( 'module already implemented: ' + module );
 					}
 					// Attach components
-					registry[module].script = script || [];
-					registry[module].style = style || {};
-					registry[module].messages = messages || {};
-					registry[module].templates = templates || {};
+					registry[ module ].script = script || null;
+					registry[ module ].style = style || null;
+					registry[ module ].messages = messages || null;
+					registry[ module ].templates = templates || null;
 					// The module may already have been marked as erroneous
-					if ( $.inArray( registry[module].state, ['error', 'missing'] ) === -1 ) {
-						registry[module].state = 'loaded';
-						if ( allReady( registry[module].dependencies ) ) {
+					if ( $.inArray( registry[ module ].state, [ 'error', 'missing' ] ) === -1 ) {
+						registry[ module ].state = 'loaded';
+						if ( allReady( registry[ module ].dependencies ) ) {
 							execute( module );
 						}
 					}
@@ -1924,21 +1961,21 @@
 
 					if ( typeof module === 'object' ) {
 						for ( m in module ) {
-							mw.loader.state( m, module[m] );
+							mw.loader.state( m, module[ m ] );
 						}
 						return;
 					}
 					if ( !hasOwn.call( registry, module ) ) {
 						mw.loader.register( module );
 					}
-					if ( $.inArray( state, ['ready', 'error', 'missing'] ) !== -1
-						&& registry[module].state !== state ) {
+					if ( $.inArray( state, [ 'ready', 'error', 'missing' ] ) !== -1
+						&& registry[ module ].state !== state ) {
 						// Make sure pending modules depending on this one get executed if their
 						// dependencies are now fulfilled!
-						registry[module].state = state;
+						registry[ module ].state = state;
 						handlePending( module );
 					} else {
-						registry[module].state = state;
+						registry[ module ].state = state;
 					}
 				},
 
@@ -1950,10 +1987,10 @@
 				 *  in the registry.
 				 */
 				getVersion: function ( module ) {
-					if ( !hasOwn.call( registry, module ) || registry[module].version === undefined ) {
+					if ( !hasOwn.call( registry, module ) || registry[ module ].version === undefined ) {
 						return null;
 					}
-					return registry[module].version;
+					return registry[ module ].version;
 				},
 
 				/**
@@ -1964,10 +2001,10 @@
 				 *  in the registry.
 				 */
 				getState: function ( module ) {
-					if ( !hasOwn.call( registry, module ) || registry[module].state === undefined ) {
+					if ( !hasOwn.call( registry, module ) || registry[ module ].state === undefined ) {
 						return null;
 					}
-					return registry[module].state;
+					return registry[ module ].state;
 				},
 
 				/**
@@ -2019,6 +2056,7 @@
 
 					/**
 					 * Construct a JSON-serializable object representing the content of the store.
+					 *
 					 * @return {Object} Module store contents.
 					 */
 					toJSON: function () {
@@ -2037,6 +2075,7 @@
 
 					/**
 					 * Get a key on which to vary the module cache.
+					 *
 					 * @return {string} String of concatenated vary conditions.
 					 */
 					getVary: function () {
@@ -2055,7 +2094,7 @@
 					 */
 					getModuleKey: function ( module ) {
 						return hasOwn.call( registry, module ) ?
-							( module + '@' + registry[module].version ) : null;
+							( module + '@' + registry[ module ].version ) : null;
 					},
 
 					/**
@@ -2127,7 +2166,7 @@
 						key = mw.loader.store.getModuleKey( module );
 						if ( key in mw.loader.store.items ) {
 							mw.loader.store.stats.hits++;
-							return mw.loader.store.items[key];
+							return mw.loader.store.items[ key ];
 						}
 						mw.loader.store.stats.misses++;
 						return false;
@@ -2175,8 +2214,8 @@
 							];
 							// Attempted workaround for a possible Opera bug (bug T59567).
 							// This regex should never match under sane conditions.
-							if ( /^\s*\(/.test( args[1] ) ) {
-								args[1] = 'function' + args[1];
+							if ( /^\s*\(/.test( args[ 1 ] ) ) {
+								args[ 1 ] = 'function' + args[ 1 ];
 								mw.track( 'resourceloader.assert', { source: 'bug-T59567' } );
 							}
 						} catch ( e ) {
@@ -2188,7 +2227,7 @@
 						if ( src.length > mw.loader.store.MODULE_SIZE_MAX ) {
 							return false;
 						}
-						mw.loader.store.items[key] = src;
+						mw.loader.store.items[ key ] = src;
 						mw.loader.store.update();
 					},
 
@@ -2207,10 +2246,10 @@
 							module = key.slice( 0, key.indexOf( '@' ) );
 							if ( mw.loader.store.getModuleKey( module ) !== key ) {
 								mw.loader.store.stats.expired++;
-								delete mw.loader.store.items[key];
-							} else if ( mw.loader.store.items[key].length > mw.loader.store.MODULE_SIZE_MAX ) {
+								delete mw.loader.store.items[ key ];
+							} else if ( mw.loader.store.items[ key ].length > mw.loader.store.MODULE_SIZE_MAX ) {
 								// This value predates the enforcement of a size limit on cached modules.
-								delete mw.loader.store.items[key];
+								delete mw.loader.store.items[ key ];
 							}
 						}
 					},
@@ -2339,7 +2378,7 @@
 					var v, attrName, s = '<' + name;
 
 					for ( attrName in attrs ) {
-						v = attrs[attrName];
+						v = attrs[ attrName ];
 						// Convert name=true, to name=name
 						if ( v === true ) {
 							v = attrName;
@@ -2386,6 +2425,7 @@
 
 				/**
 				 * Wrapper object for raw HTML passed to mw.html.element().
+				 *
 				 * @class mw.html.Raw
 				 */
 				Raw: function ( value ) {
@@ -2394,6 +2434,7 @@
 
 				/**
 				 * Wrapper object for CDATA element contents passed to mw.html.element()
+				 *
 				 * @class mw.html.Cdata
 				 */
 				Cdata: function ( value ) {
@@ -2460,12 +2501,13 @@
 			 */
 			return function ( name ) {
 				var list = hasOwn.call( lists, name ) ?
-					lists[name] :
-					lists[name] = $.Callbacks( 'memory' );
+					lists[ name ] :
+					lists[ name ] = $.Callbacks( 'memory' );
 
 				return {
 					/**
 					 * Register a hook handler
+					 *
 					 * @param {Function...} handler Function to bind.
 					 * @chainable
 					 */
@@ -2473,6 +2515,7 @@
 
 					/**
 					 * Unregister a hook handler
+					 *
 					 * @param {Function...} handler Function to unbind.
 					 * @chainable
 					 */
@@ -2480,6 +2523,7 @@
 
 					/**
 					 * Run a hook.
+					 *
 					 * @param {Mixed...} data
 					 * @chainable
 					 */
@@ -2534,10 +2578,33 @@
 		}
 	}
 
-	// subscribe to error streams
+	// Subscribe to error streams
 	mw.trackSubscribe( 'resourceloader.exception', log );
 	mw.trackSubscribe( 'resourceloader.assert', log );
 
+	/**
+	 * Fired when all modules associated with the page have finished loading.
+	 *
+	 * @event resourceloader_loadEnd
+	 * @member mw.hook
+	 */
+	$( function () {
+		var loading = $.grep( mw.loader.getModuleNames(), function ( module ) {
+			return mw.loader.getState( module ) === 'loading';
+		} );
+		// In order to use jQuery.when (which stops early if one of the promises got rejected)
+		// cast any loading failures into successes. We only need a callback, not the module.
+		loading = $.map( loading, function ( module ) {
+			return mw.loader.using( module ).then( null, function () {
+				return $.Deferred().resolve();
+			} );
+		} );
+		$.when.apply( $, loading ).then( function () {
+			mwPerformance.mark( 'mwLoadEnd' );
+			mw.hook( 'resourceloader.loadEnd' ).fire();
+		} );
+	} );
+
 	// Attach to window and globally alias
 	window.mw = window.mediaWiki = mw;
 }( jQuery ) );
diff --git a/resources/src/mediawiki/mediawiki.notification.js b/resources/src/mediawiki/mediawiki.notification.js
index 004e71086a..f361ec86de 100644
--- a/resources/src/mediawiki/mediawiki.notification.js
+++ b/resources/src/mediawiki/mediawiki.notification.js
@@ -362,7 +362,7 @@
 		$notifications.each( function () {
 			var notif = $( this ).data( 'mw.notification' );
 			if ( notif ) {
-				notif[fn]();
+				notif[ fn ]();
 			}
 		} );
 	}
@@ -370,6 +370,7 @@
 	/**
 	 * Initialisation.
 	 * Must only be called once, and not before the document is ready.
+	 *
 	 * @ignore
 	 */
 	function init() {
@@ -420,6 +421,7 @@
 		/**
 		 * Pause auto-hide timers for all notifications.
 		 * Notifications will not auto-hide until resume is called.
+		 *
 		 * @see mw.Notification#pause
 		 */
 		pause: function () {
diff --git a/resources/src/mediawiki/mediawiki.searchSuggest.js b/resources/src/mediawiki/mediawiki.searchSuggest.js
index 5292e807ce..6c7484e26b 100644
--- a/resources/src/mediawiki/mediawiki.searchSuggest.js
+++ b/resources/src/mediawiki/mediawiki.searchSuggest.js
@@ -2,6 +2,20 @@
  * Add search suggestions to the search form.
  */
 ( function ( mw, $ ) {
+	mw.searchSuggest = {
+		request: function ( api, query, response, maxRows ) {
+			return api.get( {
+				action: 'opensearch',
+				search: query,
+				namespace: 0,
+				limit: maxRows,
+				suggest: ''
+			} ).done( function ( data ) {
+				response( data[ 1 ] );
+			} );
+		}
+	};
+
 	$( function () {
 		var api, map, searchboxesSelectors,
 			// Region where the suggestions box will appear directly below
@@ -18,14 +32,14 @@
 		// Compatibility map
 		map = {
 			// SimpleSearch is broken in Opera < 9.6
-			opera: [['>=', 9.6]],
+			opera: [ [ '>=', 9.6 ] ],
 			// Older Konquerors are unable to position the suggestions correctly (bug 50805)
-			konqueror: [['>=', '4.11']],
+			konqueror: [ [ '>=', '4.11' ] ],
 			docomo: false,
 			blackberry: false,
 			// Support for iOS 6 or higher. It has not been tested on iOS 5 or lower
-			ipod: [['>=', 6]],
-			iphone: [['>=', 6]]
+			ipod: [ [ '>=', 6 ] ],
+			iphone: [ [ '>=', 6 ] ]
 		};
 
 		if ( !$.client.test( map ) ) {
@@ -58,6 +72,7 @@
 		/**
 		 * Callback that's run when the user changes the search input text
 		 * 'this' is the search input box (jQuery object)
+		 *
 		 * @ignore
 		 */
 		function onBeforeUpdate() {
@@ -74,6 +89,7 @@
 		/**
 		 * Callback that's run when suggestions have been updated either from the cache or the API
 		 * 'this' is the search input box (jQuery object)
+		 *
 		 * @ignore
 		 */
 		function onAfterUpdate() {
@@ -168,22 +184,14 @@
 		$( searchboxesSelectors.join( ', ' ) )
 			.suggestions( {
 				fetch: function ( query, response, maxRows ) {
-					var node = this[0];
+					var node = this[ 0 ];
 
 					api = api || new mw.Api();
 
-					$.data( node, 'request', api.get( {
-						action: 'opensearch',
-						search: query,
-						namespace: 0,
-						limit: maxRows,
-						suggest: ''
-					} ).done( function ( data ) {
-						response( data[ 1 ] );
-					} ) );
+					$.data( node, 'request', mw.searchSuggest.request( api, query, response, maxRows ) );
 				},
 				cancel: function () {
-					var node = this[0],
+					var node = this[ 0 ],
 						request = $.data( node, 'request' );
 
 					if ( request ) {
diff --git a/resources/src/mediawiki/mediawiki.template.js b/resources/src/mediawiki/mediawiki.template.js
index 61bbb0d7bf..c3db69e6f4 100644
--- a/resources/src/mediawiki/mediawiki.template.js
+++ b/resources/src/mediawiki/mediawiki.template.js
@@ -17,7 +17,7 @@
 			if ( !compiler.compile ) {
 				throw new Error( 'Compiler must implement compile method.' );
 			}
-			compilers[name] = compiler;
+			compilers[ name ] = compiler;
 		},
 
 		/**
@@ -63,12 +63,12 @@
 			var compiledTemplate,
 				compilerName = this.getCompilerName( templateName );
 
-			if ( !compiledTemplates[moduleName] ) {
-				compiledTemplates[moduleName] = {};
+			if ( !compiledTemplates[ moduleName ] ) {
+				compiledTemplates[ moduleName ] = {};
 			}
 
 			compiledTemplate = this.compile( templateBody, compilerName );
-			compiledTemplates[moduleName][ templateName ] = compiledTemplate;
+			compiledTemplates[ moduleName ][ templateName ] = compiledTemplate;
 			return compiledTemplate;
 		},
 
diff --git a/resources/src/mediawiki/mediawiki.template.regexp.js b/resources/src/mediawiki/mediawiki.template.regexp.js
new file mode 100644
index 0000000000..3ec0a1f5c9
--- /dev/null
+++ b/resources/src/mediawiki/mediawiki.template.regexp.js
@@ -0,0 +1,15 @@
+mediaWiki.template.registerCompiler( 'regexp', {
+	compile: function ( src ) {
+		return {
+			render: function () {
+				return new RegExp(
+					src
+						// Remove whitespace
+						.replace( /\s+/g, '' )
+						// Remove named capturing groups
+						.replace( /\?<\w+?>/g, '' )
+				);
+			}
+		};
+	}
+} );
diff --git a/resources/src/mediawiki/mediawiki.user.js b/resources/src/mediawiki/mediawiki.user.js
index ec34ce6cca..b4baa66caa 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -16,7 +16,7 @@
 	 */
 	function getUserInfo( info ) {
 		var api;
-		if ( !deferreds[info] ) {
+		if ( !deferreds[ info ] ) {
 
 			deferreds.rights = $.Deferred();
 			deferreds.groups = $.Deferred();
@@ -38,13 +38,13 @@
 
 		}
 
-		return deferreds[info].promise();
+		return deferreds[ info ].promise();
 	}
 
 	// Map from numbers 0-255 to a hex string (with padding)
 	for ( i = 0; i < 256; i++ ) {
 		// Padding: Add a full byte (0x100, 256) and strip the extra character
-		byteToHex[i] = ( i + 256 ).toString( 16 ).slice( 1 );
+		byteToHex[ i ] = ( i + 256 ).toString( 16 ).slice( 1 );
 	}
 
 	// mw.user with the properties options and tokens gets defined in mediawiki.js.
@@ -89,12 +89,12 @@
 					if ( ( i & 3 ) === 0 ) {
 						r = Math.random() * 0x100000000;
 					}
-					rnds[i] = r >>> ( ( i & 3 ) << 3 ) & 255;
+					rnds[ i ] = r >>> ( ( i & 3 ) << 3 ) & 255;
 				}
 			}
 			// Convert from number to hex
 			for ( i = 0; i < 8; i++ ) {
-				hexRnds[i] = byteToHex[rnds[i]];
+				hexRnds[ i ] = byteToHex[ rnds[ i ] ];
 			}
 
 			// Concatenation of two random integers with entrophy n and m
@@ -213,9 +213,9 @@
 			// Bucket information is stored as 2 integers, together as version:bucket like: "1:2"
 			if ( typeof cookie === 'string' && cookie.length > 2 && cookie.indexOf( ':' ) !== -1 ) {
 				parts = cookie.split( ':' );
-				if ( parts.length > 1 && Number( parts[0] ) === options.version ) {
-					version = Number( parts[0] );
-					bucket = String( parts[1] );
+				if ( parts.length > 1 && Number( parts[ 0 ] ) === options.version ) {
+					version = Number( parts[ 0 ] );
+					bucket = String( parts[ 1 ] );
 				}
 			}
 
@@ -229,7 +229,7 @@
 				// Find range
 				range = 0;
 				for ( k in options.buckets ) {
-					range += options.buckets[k];
+					range += options.buckets[ k ];
 				}
 
 				// Select random value within range
@@ -239,7 +239,7 @@
 				total = 0;
 				for ( k in options.buckets ) {
 					bucket = k;
-					total += options.buckets[k];
+					total += options.buckets[ k ];
 					if ( total >= rand ) {
 						break;
 					}
diff --git a/resources/src/mediawiki/mediawiki.userSuggest.js b/resources/src/mediawiki/mediawiki.userSuggest.js
index df1020445c..02a90fc341 100644
--- a/resources/src/mediawiki/mediawiki.userSuggest.js
+++ b/resources/src/mediawiki/mediawiki.userSuggest.js
@@ -6,7 +6,7 @@
 
 	config = {
 		fetch: function ( userInput, response, maxRows ) {
-			var node = this[0];
+			var node = this[ 0 ];
 
 			api = api || new mw.Api();
 
@@ -15,7 +15,7 @@
 				list: 'allusers',
 				// Prefix of list=allusers is case sensitive. Normalise first
 				// character to uppercase so that "fo" may yield "Foo".
-				auprefix: userInput[0].toUpperCase() + userInput.slice( 1 ),
+				auprefix: userInput[ 0 ].toUpperCase() + userInput.slice( 1 ),
 				aulimit: maxRows
 			} ).done( function ( data ) {
 				var users = $.map( data.query.allusers, function ( userObj ) {
@@ -25,7 +25,7 @@
 			} ) );
 		},
 		cancel: function () {
-			var node = this[0],
+			var node = this[ 0 ],
 				request = $.data( node, 'request' );
 
 			if ( request ) {
diff --git a/resources/src/mediawiki/mediawiki.util.js b/resources/src/mediawiki/mediawiki.util.js
index 93a1b3bfbc..50fd0b4240 100644
--- a/resources/src/mediawiki/mediawiki.util.js
+++ b/resources/src/mediawiki/mediawiki.util.js
@@ -33,7 +33,7 @@
 				];
 
 				for ( i = 0, l = selectors.length; i < l; i++ ) {
-					$node = $( selectors[i] );
+					$node = $( selectors[ i ] );
 					if ( $node.length ) {
 						return $node.first();
 					}
@@ -112,8 +112,8 @@
 		 * For index.php use `mw.config.get( 'wgScript' )`.
 		 *
 		 * @since 1.18
-		 * @param str string Name of script (eg. 'api'), defaults to 'index'
-		 * @return string Address to script (eg. '/w/api.php' )
+		 * @param {string} str Name of script (e.g. 'api'), defaults to 'index'
+		 * @return {string} Address to script (e.g. '/w/api.php' )
 		 */
 		wikiScript: function ( str ) {
 			str = str || 'index';
@@ -165,7 +165,7 @@
 			if ( m ) {
 				// Beware that decodeURIComponent is not required to understand '+'
 				// by spec, as encodeURIComponent does not produce it.
-				return decodeURIComponent( m[1].replace( /\+/g, '%20' ) );
+				return decodeURIComponent( m[ 1 ].replace( /\+/g, '%20' ) );
 			}
 			return null;
 		},
@@ -299,7 +299,7 @@
 					// Error: Invalid nextnode
 					nextnode = undefined;
 				}
-				if ( nextnode && ( nextnode.length !== 1 || nextnode[0].parentNode !== $ul[0] ) ) {
+				if ( nextnode && ( nextnode.length !== 1 || nextnode[ 0 ].parentNode !== $ul[ 0 ] ) ) {
 					// Error: nextnode must resolve to a single node
 					// Error: nextnode must have the associated <ul> as its parent
 					nextnode = undefined;
@@ -318,7 +318,7 @@
 			// to get a localized access key label (bug 67946).
 			$link.updateTooltipAccessKeys();
 
-			return $item[0];
+			return $item[ 0 ];
 		},
 
 		/**
diff --git a/resources/src/startup.js b/resources/src/startup.js
index eb4dc9fc21..1a10f8379e 100644
--- a/resources/src/startup.js
+++ b/resources/src/startup.js
@@ -3,16 +3,16 @@
  * continue loading jQuery and the MediaWiki modules. This code should work on
  * even the most ancient of browsers, so be very careful when editing.
  */
+/*jshint unused: false, evil: true */
+/*globals mw, RLQ: true, $VARS, $CODE, performance */
 
-var mediaWikiLoadStart = ( new Date() ).getTime();
+var mediaWikiLoadStart = ( new Date() ).getTime(),
 
-if ( !window.performance ) {
-	window.performance = {};
-}
-if ( !performance.mark ) {
-	performance.mark = function () {};
-}
-performance.mark( 'mediaWikiStartUp' );
+	mwPerformance = ( window.performance && performance.mark ) ? performance : {
+		mark: function () {}
+	};
+
+mwPerformance.mark( 'mwLoadStart' );
 
 /**
  * Returns false for Grade C supported browsers.
@@ -24,9 +24,6 @@ performance.mark( 'mediaWikiStartUp' );
  * - https://www.mediawiki.org/wiki/Compatibility#Browsers
  * - https://jquery.com/browser-support/
  */
-
-/*jshint unused: false, evil: true */
-/*globals mw, RLQ: true, $VARS, $CODE */
 function isCompatible( ua ) {
 	if ( ua === undefined ) {
 		ua = navigator.userAgent;
@@ -35,18 +32,18 @@ function isCompatible( ua ) {
 	// Browsers with outdated or limited JavaScript engines get the no-JS experience
 	return !(
 		// Internet Explorer < 8
-		( ua.indexOf( 'MSIE' ) !== -1 && parseFloat( ua.split( 'MSIE' )[1] ) < 8 ) ||
+		( ua.indexOf( 'MSIE' ) !== -1 && parseFloat( ua.split( 'MSIE' )[ 1 ] ) < 8 ) ||
 		// Firefox < 3
-		( ua.indexOf( 'Firefox/' ) !== -1 && parseFloat( ua.split( 'Firefox/' )[1] ) < 3 ) ||
+		( ua.indexOf( 'Firefox/' ) !== -1 && parseFloat( ua.split( 'Firefox/' )[ 1 ] ) < 3 ) ||
 		// Opera < 12
 		( ua.indexOf( 'Opera/' ) !== -1 && ( ua.indexOf( 'Version/' ) === -1 ?
 			// "Opera/x.y"
-			parseFloat( ua.split( 'Opera/' )[1] ) < 10 :
+			parseFloat( ua.split( 'Opera/' )[ 1 ] ) < 10 :
 			// "Opera/9.80 ... Version/x.y"
-			parseFloat( ua.split( 'Version/' )[1] ) < 12
+			parseFloat( ua.split( 'Version/' )[ 1 ] ) < 12
 		) ) ||
 		// "Mozilla/0.0 ... Opera x.y"
-		( ua.indexOf( 'Opera ' ) !== -1 && parseFloat( ua.split( ' Opera ' )[1] ) < 10 ) ||
+		( ua.indexOf( 'Opera ' ) !== -1 && parseFloat( ua.split( ' Opera ' )[ 1 ] ) < 10 ) ||
 		// BlackBerry < 6
 		ua.match( /BlackBerry[^\/]*\/[1-5]\./ ) ||
 		// Open WebOS < 1.5
@@ -75,6 +72,7 @@ function isCompatible( ua ) {
 		// See OutputPage::getHeadScripts().
 		document.documentElement.className = document.documentElement.className
 			.replace( /(^|\s)client-js(\s|$)/, '$1client-nojs$2' );
+		return;
 	}
 
 	/**
@@ -111,5 +109,5 @@ function isCompatible( ua ) {
 			startUp();
 		}
 	};
-	document.getElementsByTagName( 'head' )[0].appendChild( script );
+	document.getElementsByTagName( 'head' )[ 0 ].appendChild( script );
 }() );
diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index cc0df7ab06..f429c30a72 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -889,9 +889,9 @@ class ParserTest {
 			'wgDisableTitleConversion' => false,
 			// Tidy options.
 			'wgUseTidy' => isset( $opts['tidy'] ),
-			'wgAlwaysUseTidy' => false,
+			'wgTidyConfig' => null,
 			'wgDebugTidy' => false,
-			'wgTidyConf' => $IP . '/includes/tidy.conf',
+			'wgTidyConf' => $IP . '/includes/tidy/tidy.conf',
 			'wgTidyOpts' => '',
 			'wgTidyInternal' => $this->tidySupport->isInternal(),
 		);
@@ -936,6 +936,7 @@ class ParserTest {
 		$wgHooks['ParserGetVariableValueTs'][] = 'ParserTest::getFakeTimestamp';
 
 		MagicWord::clearCache();
+		MWTidy::destroySingleton();
 
 		return $context;
 	}
@@ -1218,6 +1219,7 @@ class ParserTest {
 		FileBackendGroup::destroySingleton();
 		LockManagerGroup::destroySingletons();
 		LinkCache::singleton()->clear();
+		MWTidy::destroySingleton();
 
 		foreach ( $this->savedGlobals as $var => $val ) {
 			$GLOBALS[$var] = $val;
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index f70a1b0de0..c8c63f397b 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2057,13 +2057,28 @@ Tabs don't trigger preformatted text
 	 preformatted text.
  This is preformatted text.
  	So is this.
-!! html
+!! html/php
 <p>	This is not
 	 preformatted text.
 </p>
 <pre>This is preformatted text.
 	So is this.
 </pre>
+!! html/parsoid
+<p>	This is not
+	 preformatted text.</p>
+<pre>This is preformatted text.
+	So is this.</pre>
+!! end
+
+!! test
+Space before tab needs nowiki pre protection
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p> 	a</p>
+!! wikitext
+<nowiki> </nowiki>	a
 !! end
 
 !! test
@@ -5234,38 +5249,6 @@ External link containing a single quote. (bug 63947)
 <p><a rel="mw:ExtLink" href="//foo.org/bar'baz">bang</a></p>
 !! end
 
-
-!! test
-External link containing a period in the anchor. (bug 63947)
-!! wikitext
-[//foo.org/bar#baz. bang]
-
-[//foo.org/bar. bang]
-!! html/php
-<p><a rel="nofollow" class="external text" href="//foo.org/bar#baz.">bang</a>
-</p><p><a rel="nofollow" class="external text" href="//foo.org/bar.">bang</a>
-</p>
-!! html/parsoid
-<p><a rel="mw:ExtLink" href="//foo.org/bar#baz.">bang</a></p>
-<p><a rel="mw:ExtLink" href="//foo.org/bar.">bang</a></p>
-!! end
-
-!! test
-External link containing a single quote. (bug 63947)
-!! wikitext
-[//foo.org/bar'baz]
-
-[//foo.org/bar'baz bang]
-!! html/php
-<p><a rel="nofollow" class="external autonumber" href="//foo.org/bar'baz">[1]</a>
-</p><p><a rel="nofollow" class="external text" href="//foo.org/bar'baz">bang</a>
-</p>
-!! html/parsoid
-<p><a rel="mw:ExtLink" href="//foo.org/bar'baz"></a></p>
-<p><a rel="mw:ExtLink" href="//foo.org/bar'baz">bang</a></p>
-!! end
-
-
 !! test
 External link containing double-single-quotes in text '' (bug 4598 sanity check)
 !! wikitext
@@ -5301,9 +5284,22 @@ External link containing double-single-quotes with no space separating the url f
 External link with comments in link text
 !! wikitext
 [http://www.google.com Google <!-- comment -->]
-!! html
+!! html/php
 <p><a rel="nofollow" class="external text" href="http://www.google.com">Google </a>
 </p>
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://www.google.com">Google <!-- comment --></a></p>
+!! end
+
+!! test
+External link to bare IPv4 address
+!! wikitext
+[http://192.168.0.1 Link]
+!! html/php
+<p><a rel="nofollow" class="external text" href="http://192.168.0.1">Link</a>
+</p>
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://192.168.0.1">Link</a></p>
 !! end
 
 !! test
@@ -5345,7 +5341,7 @@ IPv6 urls, autolink format (T23261)
 !! wikitext
 http://[2404:130:0:1000::187:2]/index.php
 
-Examples from RFC2373, section 2.2:
+Examples from RFC 2373, section 2.2:
 * http://[1080::8:800:200C:417A]/unicast
 * http://[FF01::101]/multicast
 * http://[::1]/loopback
@@ -5362,9 +5358,9 @@ Examples from RFC 2732, section 2:
 * http://[::FFFF:129.144.52.38]:80/index.html
 * http://[2010:836B:4179::836B:4179]
 
-!! html
+!! html/php
 <p><a rel="nofollow" class="external free" href="http://[2404:130:0:1000::187:2]/index.php">http://[2404:130:0:1000::187:2]/index.php</a>
-</p><p>Examples from RFC2373, section 2.2:
+</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc2373">RFC 2373</a>, section 2.2:
 </p>
 <ul><li> <a rel="nofollow" class="external free" href="http://[1080::8:800:200C:417A]/unicast">http://[1080::8:800:200C:417A]/unicast</a></li>
 <li> <a rel="nofollow" class="external free" href="http://[FF01::101]/multicast">http://[FF01::101]/multicast</a></li>
@@ -5382,6 +5378,25 @@ Examples from RFC 2732, section 2:
 <li> <a rel="nofollow" class="external free" href="http://[::FFFF:129.144.52.38]:80/index.html">http://[::FFFF:129.144.52.38]:80/index.html</a></li>
 <li> <a rel="nofollow" class="external free" href="http://[2010:836B:4179::836B:4179]">http://[2010:836B:4179::836B:4179]</a></li></ul>
 
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://[2404:130:0:1000::187:2]/index.php">http://[2404:130:0:1000::187:2]/index.php</a></p>
+
+<p>Examples from <a href="//tools.ietf.org/html/rfc2373" rel="mw:ExtLink">RFC 2373</a>, section 2.2:</p>
+<ul><li> <a rel="mw:ExtLink" href="http://[1080::8:800:200C:417A]/unicast">http://[1080::8:800:200C:417A]/unicast</a></li>
+<li> <a rel="mw:ExtLink" href="http://[FF01::101]/multicast">http://[FF01::101]/multicast</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::1]/loopback">http://[::1]/loopback</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::]/unspecified">http://[::]/unspecified</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::13.1.68.3]/ipv4compat">http://[::13.1.68.3]/ipv4compat</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::FFFF:129.144.52.38]/ipv4compat">http://[::FFFF:129.144.52.38]/ipv4compat</a></li></ul>
+
+<p>Examples from <a href="//tools.ietf.org/html/rfc2732" rel="mw:ExtLink">RFC 2732</a>, section 2:</p>
+<ul><li> <a rel="mw:ExtLink" href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html">http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html</a></li>
+<li> <a rel="mw:ExtLink" href="http://[1080:0:0:0:8:800:200C:417A]/index.html">http://[1080:0:0:0:8:800:200C:417A]/index.html</a></li>
+<li> <a rel="mw:ExtLink" href="http://[3ffe:2a00:100:7031::1]">http://[3ffe:2a00:100:7031::1]</a></li>
+<li> <a rel="mw:ExtLink" href="http://[1080::8:800:200C:417A]/foo">http://[1080::8:800:200C:417A]/foo</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::192.9.5.5]/ipng">http://[::192.9.5.5]/ipng</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::FFFF:129.144.52.38]:80/index.html">http://[::FFFF:129.144.52.38]:80/index.html</a></li>
+<li> <a rel="mw:ExtLink" href="http://[2010:836B:4179::836B:4179]">http://[2010:836B:4179::836B:4179]</a></li></ul>
 !! end
 
 !! test
@@ -5389,7 +5404,7 @@ IPv6 urls, bracketed format (T23261)
 !! wikitext
 [http://[2404:130:0:1000::187:2]/index.php test]
 
-Examples from RFC2373, section 2.2:
+Examples from RFC 2373, section 2.2:
 * [http://[1080::8:800:200C:417A] unicast]
 * [http://[FF01::101] multicast]
 * [http://[::1]/ loopback]
@@ -5406,9 +5421,9 @@ Examples from RFC 2732, section 2:
 * [http://[::FFFF:129.144.52.38]:80/index.html 6]
 * [http://[2010:836B:4179::836B:4179] 7]
 
-!! html
+!! html/php
 <p><a rel="nofollow" class="external text" href="http://[2404:130:0:1000::187:2]/index.php">test</a>
-</p><p>Examples from RFC2373, section 2.2:
+</p><p>Examples from <a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc2373">RFC 2373</a>, section 2.2:
 </p>
 <ul><li> <a rel="nofollow" class="external text" href="http://[1080::8:800:200C:417A]">unicast</a></li>
 <li> <a rel="nofollow" class="external text" href="http://[FF01::101]">multicast</a></li>
@@ -5426,6 +5441,25 @@ Examples from RFC 2732, section 2:
 <li> <a rel="nofollow" class="external text" href="http://[::FFFF:129.144.52.38]:80/index.html">6</a></li>
 <li> <a rel="nofollow" class="external text" href="http://[2010:836B:4179::836B:4179]">7</a></li></ul>
 
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://[2404:130:0:1000::187:2]/index.php">test</a></p>
+
+<p>Examples from <a href="//tools.ietf.org/html/rfc2373" rel="mw:ExtLink">RFC 2373</a>, section 2.2:</p>
+<ul><li> <a rel="mw:ExtLink" href="http://[1080::8:800:200C:417A]">unicast</a></li>
+<li> <a rel="mw:ExtLink" href="http://[FF01::101]">multicast</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::1]/">loopback</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::]">unspecified</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::13.1.68.3]">ipv4compat</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::FFFF:129.144.52.38]">ipv4compat</a></li></ul>
+
+<p>Examples from <a href="//tools.ietf.org/html/rfc2732" rel="mw:ExtLink">RFC 2732</a>, section 2:</p>
+<ul><li> <a rel="mw:ExtLink" href="http://[FEDC:BA98:7654:3210:FEDC:BA98:7654:3210]:80/index.html">1</a></li>
+<li> <a rel="mw:ExtLink" href="http://[1080:0:0:0:8:800:200C:417A]/index.html">2</a></li>
+<li> <a rel="mw:ExtLink" href="http://[3ffe:2a00:100:7031::1]">3</a></li>
+<li> <a rel="mw:ExtLink" href="http://[1080::8:800:200C:417A]/foo">4</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::192.9.5.5]/ipng">5</a></li>
+<li> <a rel="mw:ExtLink" href="http://[::FFFF:129.144.52.38]:80/index.html">6</a></li>
+<li> <a rel="mw:ExtLink" href="http://[2010:836B:4179::836B:4179]">7</a></li></ul>
 !! end
 
 !! test
@@ -5443,7 +5477,8 @@ Non-extlinks in brackets
 [{{echo|foo}}l's errand]
 [url={{echo|foo}}]
 [url=http://example.com]
-!! html
+[http:// bare protocols don't count]
+!! html/php
 <p>[foo]
 [foo bar]
 [foo <i>bar</i>]
@@ -5456,7 +5491,22 @@ Non-extlinks in brackets
 [fool's errand]
 [url=foo]
 [url=<a rel="nofollow" class="external free" href="http://example.com">http://example.com</a>]
+[http:// bare protocols don't count]
 </p>
+!! html/parsoid
+<p>[foo]
+[foo bar]
+[foo <i>bar</i>]
+[fool's] errand
+[fool's errand]
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"{{echo|foo}}"}'>foo</span>]
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"{{echo|foo}}"}'>foo</span> bar]
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"{{echo|foo}}"}'>foo</span> <i>bar</i>]
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"{{echo|foo}}l&#39;s"}'>fool's</span>] errand
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"{{echo|foo}}l&#39;s"}'>fool's</span> errand]
+[<span typeof="mw:Placeholder" data-parsoid='{"src":"url={{echo|foo}}"}'>url=foo</span>]
+[url=<a rel="mw:ExtLink" href="http://example.com">http://example.com</a>]
+[http:// bare protocols don't count]</p>
 !! end
 
 !! test
@@ -6190,7 +6240,7 @@ Table cell attributes: Pipes protected by nowikis should be treated as a plain c
 | title="foo<nowiki>|</nowiki>" |bar
 | title="foo<nowiki>|</nowiki>" bar
 |}
-!! html
+!! html/php
 <table>
 <tr>
 <td title="foo">bar
@@ -6200,12 +6250,19 @@ Table cell attributes: Pipes protected by nowikis should be treated as a plain c
 <td> title="foo|" bar
 </td></tr></table>
 
+!! html/parsoid
+<table>
+<tbody><tr><td title="foo">bar</td>
+<td title="foo|" data-parsoid='{"a":{"title":"foo|"},"sa":{"title":"foo&lt;nowiki>|&lt;/nowiki>"},"autoInsertedEnd":true}'>bar</td>
+<td> title="foo<span typeof="mw:Nowiki">|</span>" bar</td></tr>
+</tbody></table>
 !! end
 
-# The "|}" to close the table is missing from the input, so parsoid's
-# *2wt modes will fail.
+# See: http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html
+# N.B. The "|}" to close the table is missing from the input, so parsoid's
+#      *2wt modes will fail.
 !! test
-Table security: embedded pipes (http://lists.wikimedia.org/mailman/htdig/wikitech-l/2006-April/022293.html)
+Table security: embedded pipes
 !! options
 parsoid=wt2html,html2html
 !! wikitext
@@ -6223,12 +6280,14 @@ parsoid=wt2html,html2html
 !! html/parsoid
 <table><tbody>
 <tr>
-<td><a rel="mw:ExtLink" href="ftp://|x||"></a>" onmouseover="alert(document.cookie)">test</td></tr></tbody></table>
+<td data-parsoid='{"startTagSrc":"| ","attrSepSrc":"|","autoInsertedEnd":true}'><a rel="mw:ExtLink" href="ftp://|x||"></a>" onmouseover="alert(document.cookie)">test</td></tr></tbody></table>
 !! end
 
-# FIXME: The php output is broken.
+# FIXME: The output seems broken. Filed as T110268.
 !! test
 ! and || in td attributes should not be parsed as <th>/<td>
+!! options
+parsoid=wt2html
 !! wikitext
 {|
 | style="color: red !important;" data-contrived="put this here ||" | foo
@@ -6242,7 +6301,7 @@ parsoid=wt2html,html2html
 
 !! html/parsoid
 <table>
-<tbody><tr><td style="color: red !important;" data-contrived="put this here ||" data-parsoid='{"autoInsertedEnd":true}'> foo</td></tr>
+<tbody><tr><td> style="color: red !important;" data-contrived="put this here </td><td data-parsoid='{"stx_v":"row","a":{"\"":null},"sa":{"\"":""},"autoInsertedEnd":true}'> foo</td></tr>
 </tbody></table>
 !! end
 
@@ -6859,9 +6918,6 @@ parsoid=wt2html,wt2wt
 </tbody></table>
 !! end
 
-
-# PHP throws away the (semi-broken) "foo" class here; Parsoid
-# preserves it.
 !!test
 Parsoid: Recover better from broken table attributes
 !!options
@@ -6872,7 +6928,7 @@ parsoid=wt2html
 foo
 |}
 !!html/php+tidy
-<table>
+<table class="foo">
 <tr>
 <td class="bar">
 <p>foo</p>
@@ -6887,6 +6943,23 @@ foo
 </tbody></table>
 !!end
 
+!! test
+Tables: Digest broken attributes on table and tr tag
+!! options
+parsoid=wt2html
+!! wikitext
+{| || |} ++
+|- || || ++ --
+|- > [
+|}
+!! html
+<table>
+<tbody>
+<tr></tr>
+<tr></tr>
+</tbody></table>
+!! end
+
 !! test
 Strip unsupported table tags
 !! options
@@ -7097,8 +7170,10 @@ Link with HTML entity in suffix / tail
 Link with 3 brackets
 !! wikitext
 [[[Main Page]]]
+Foo [[[Main Page]]]
 !! html
 <p>[[[Main Page]]]
+Foo [[[Main Page]]]
 </p>
 !! end
 
@@ -9877,27 +9952,33 @@ __proto__
 Magic links: internal link to RFC (bug 479)
 !! wikitext
 [[RFC 123]]
-!! html
+!! html/php
 <p><a href="/index.php?title=RFC_123&amp;action=edit&amp;redlink=1" class="new" title="RFC 123 (page does not exist)">RFC 123</a>
 </p>
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="./RFC_123" title="RFC 123">RFC 123</a></p>
 !! end
 
 !! test
 Magic links: RFC (bug 479)
 !! wikitext
 RFC 822
-!! html
+!! html/php
 <p><a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc822">RFC 822</a>
 </p>
+!! html/parsoid
+<p><a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC 822</a></p>
 !! end
 
 !! test
 Magic links: RFC (bug 65278)
 !! wikitext
 This is RFC 822 but thisRFC 822 is not RFC 822linked.
-!! html
+!! html/php
 <p>This is <a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc822">RFC 822</a> but thisRFC 822 is not RFC 822linked.
 </p>
+!! html/parsoid
+<p>This is <a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC 822</a> but thisRFC 822 is not RFC 822linked.</p>
 !! end
 
 !! test
@@ -9906,20 +9987,26 @@ Magic links: RFC (w/ non-newline whitespace, bug 28950/29025)
 RFC &nbsp;&#160;&#0160;&#xA0;&#Xa0; 822
 RFC
 822
-!! html
+!! html/php
 <p><a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc822">RFC 822</a>
 RFC
 822
 </p>
+!! html/parsoid
+<p><a href="//tools.ietf.org/html/rfc822" rel="mw:ExtLink">RFC <span typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#Xa0;","srcContent":" "}'> </span> 822</a>
+RFC
+822</p>
 !! end
 
 !! test
 Magic links: ISBN (bug 1937)
 !! wikitext
 ISBN 0-306-40615-2
-!! html
+!! html/php
 <p><a href="/wiki/Special:BookSources/0306406152" class="internal mw-magiclink-isbn">ISBN 0-306-40615-2</a>
 </p>
+!! html/parsoid
+<p><a href="./Special:BookSources/0306406152" rel="mw:WikiLink">ISBN 0-306-40615-2</a></p>
 !! end
 
 !! test
@@ -9930,7 +10017,7 @@ This is ISBN 978-0-316-09811-3 but thisISBN 978-0-316-09811-3 is not ISBN 978-0-
 <p>This is <a href="/wiki/Special:BookSources/9780316098113" class="internal mw-magiclink-isbn">ISBN 978-0-316-09811-3</a> but thisISBN 978-0-316-09811-3 is not ISBN 978-0-316-09811-3linked.
 </p>
 !! html/parsoid
-<p>This is <a href="./Special:BookSources/9780316098113" rel="mw:ExtLink">ISBN 978-0-316-09811-3</a> but thisISBN 978-0-316-09811-3 is not ISBN 978-0-316-09811-3linked.</p>
+<p>This is <a href="./Special:BookSources/9780316098113" rel="mw:WikiLink">ISBN 978-0-316-09811-3</a> but thisISBN 978-0-316-09811-3 is not ISBN 978-0-316-09811-3linked.</p>
 !! end
 
 !! test
@@ -9941,31 +10028,41 @@ ISBN
 9780316098113
 ISBN 978
 0316098113
-!! html
+!! html/php
 <p><a href="/wiki/Special:BookSources/9780316098113" class="internal mw-magiclink-isbn">ISBN 978 0 316 09811 3</a>
 ISBN
 9780316098113
 ISBN 978
 0316098113
 </p>
+!! html/parsoid
+<p><a href="./Special:BookSources/9780316098113" rel="mw:WikiLink">ISBN <span typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#Xa0;","srcContent":" "}'> </span> 978<span typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> </span>0<span typeof="mw:Entity" data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span>316<span typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> </span>09811<span typeof="mw:Entity" data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span>3</a>
+ISBN
+9780316098113
+ISBN 978
+0316098113</p>
 !! end
 
 !! test
 Magic links: PMID incorrectly converts space to underscore
 !! wikitext
 PMID 1234
-!! html
+!! html/php
 <p><a class="external mw-magiclink-pmid" rel="nofollow" href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract">PMID 1234</a>
 </p>
+!! html/parsoid
+<p><a href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract" rel="mw:ExtLink">PMID 1234</a></p>
 !! end
 
 !! test
 Magic links: PMID (bug 65278)
 !! wikitext
 This is PMID 1234 but thisPMID 1234 is not PMID 1234linked.
-!! html
+!! html/php
 <p>This is <a class="external mw-magiclink-pmid" rel="nofollow" href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract">PMID 1234</a> but thisPMID 1234 is not PMID 1234linked.
 </p>
+!! html/parsoid
+<p>This is <a href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract" rel="mw:ExtLink">PMID 1234</a> but thisPMID 1234 is not PMID 1234linked.</p>
 !! end
 
 !! test
@@ -9974,11 +10071,15 @@ Magic links: PMID (w/ non-newline whitespace, bug 28950/29025)
 PMID &nbsp;&#160;&#0160;&#xA0;&#Xa0; 1234
 PMID
 1234
-!! html
+!! html/php
 <p><a class="external mw-magiclink-pmid" rel="nofollow" href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract">PMID 1234</a>
 PMID
 1234
 </p>
+!! html/parsoid
+<p><a href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract" rel="mw:ExtLink">PMID <span typeof="mw:Entity" data-parsoid='{"src":"&amp;nbsp;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#0160;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#xA0;","srcContent":" "}'> </span><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#Xa0;","srcContent":" "}'> </span> 1234</a>
+PMID
+1234</p>
 !! end
 
 ###
@@ -13267,7 +13368,7 @@ BUG 1887: A ISBN with a thumbnail
 <div class="thumb tright"><div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>  <div class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div><a href="/wiki/Special:BookSources/1235467890" class="internal mw-magiclink-isbn">ISBN 1235467890</a></div></div></div>
 
 !! html/parsoid
-<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a href="./Special:BookSources/1235467890" rel="mw:ExtLink">ISBN 1235467890</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a href="./Special:BookSources/1235467890" rel="mw:WikiLink">ISBN 1235467890</a></figcaption></figure>
 !! end
 
 !! test
@@ -13765,9 +13866,9 @@ bar
 bar</p>
 !! end
 
-## Edge case bug in Parsoid
+## Edge case bugs in Parsoid from T93580
 !! test
-T93580: Templated <ref> inside images
+T93580: 1. Templated <ref> inside block images
 !! wikitext
 [[File:Foobar.jpg|thumb|Caption with templated ref: {{echo|<ref>foo</ref>}}]]
 
@@ -13778,6 +13879,30 @@ T93580: Templated <ref> inside images
 <ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
 !! end
 
+!! test
+T93580: 2. <ref> inside inline images
+!! wikitext
+[[File:Foobar.jpg|Undisplayed caption in inline image with ref: <ref>foo</ref>]]
+
+<references />
+!! html/parsoid
+<p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: &lt;ref>foo&lt;/ref>"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: &lt;span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Extension/ref\" data-parsoid=\"{&amp;quot;dsr&amp;quot;:[64,78,5,6]}\" data-mw=\"{&amp;quot;name&amp;quot;:&amp;quot;ref&amp;quot;,&amp;quot;body&amp;quot;:{&amp;quot;id&amp;quot;:&amp;quot;mw-reference-text-cite_note-1&amp;quot;},&amp;quot;attrs&amp;quot;:{}}\">&lt;a href=\"#cite_note-1\" style=\"counter-reset: mw-Ref 1;\">&lt;span class=\"mw-reflink-text\">[1]&lt;/span>&lt;/a>&lt;/span>&lt;meta typeof=\"mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=\"{&amp;quot;group&amp;quot;:&amp;quot;&amp;quot;,&amp;quot;name&amp;quot;:&amp;quot;&amp;quot;,&amp;quot;content&amp;quot;:&amp;quot;foo&amp;quot;,&amp;quot;hasRefInRef&amp;quot;:false,&amp;quot;dsr&amp;quot;:[64,78,5,6],&amp;quot;tmp&amp;quot;:{}}\" data-mw=\"{}\">"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
+
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+!! end
+
+!! test
+T93580: 3. Templated <ref> inside inline images
+!! wikitext
+[[File:Foobar.jpg|Undisplayed caption in inline image with ref: {{echo|<ref>{{echo|foo}}</ref>}}]]
+
+<references />
+!! html/parsoid
+<p><span class="mw-default-size" typeof="mw:Image" data-parsoid='{"optList":[{"ck":"caption","ak":"Undisplayed caption in inline image with ref: {{echo|&lt;ref>{{echo|foo}}&lt;/ref>}}"}]}' data-mw='{"caption":"Undisplayed caption in inline image with ref: &lt;span about=\"#mwt2\" class=\"mw-ref\" id=\"cite_ref-1\" rel=\"dc:references\" typeof=\"mw:Transclusion  mw:Extension/ref\" data-parsoid=\"{&amp;quot;dsr&amp;quot;:[64,96,null,null],&amp;quot;pi&amp;quot;:[[{&amp;quot;k&amp;quot;:&amp;quot;1&amp;quot;,&amp;quot;spc&amp;quot;:[&amp;quot;&amp;quot;,&amp;quot;&amp;quot;,&amp;quot;&amp;quot;,&amp;quot;&amp;quot;]}]]}\" data-mw=\"{&amp;quot;parts&amp;quot;:[{&amp;quot;template&amp;quot;:{&amp;quot;target&amp;quot;:{&amp;quot;wt&amp;quot;:&amp;quot;echo&amp;quot;,&amp;quot;href&amp;quot;:&amp;quot;./Template:Echo&amp;quot;},&amp;quot;params&amp;quot;:{&amp;quot;1&amp;quot;:{&amp;quot;wt&amp;quot;:&amp;quot;&lt;ref>{{echo|foo}}&lt;/ref>&amp;quot;}},&amp;quot;i&amp;quot;:0}}]}\">&lt;a href=\"#cite_note-1\" style=\"counter-reset: mw-Ref 1;\">&lt;span class=\"mw-reflink-text\">[1]&lt;/span>&lt;/a>&lt;/span>&lt;meta typeof=\"mw:Transclusion mw:Extension/ref/Marker\" about=\"#mwt2\" data-parsoid=\"{&amp;quot;group&amp;quot;:&amp;quot;&amp;quot;,&amp;quot;name&amp;quot;:&amp;quot;&amp;quot;,&amp;quot;content&amp;quot;:&amp;quot;foo&amp;quot;,&amp;quot;hasRefInRef&amp;quot;:false,&amp;quot;dsr&amp;quot;:[64,96,null,null],&amp;quot;pi&amp;quot;:[[{&amp;quot;k&amp;quot;:&amp;quot;1&amp;quot;,&amp;quot;spc&amp;quot;:[&amp;quot;&amp;quot;,&amp;quot;&amp;quot;,&amp;quot;&amp;quot;,&amp;quot;&amp;quot;]}]],&amp;quot;tmp&amp;quot;:{}}\" data-mw=\"{&amp;quot;parts&amp;quot;:[{&amp;quot;template&amp;quot;:{&amp;quot;target&amp;quot;:{&amp;quot;wt&amp;quot;:&amp;quot;echo&amp;quot;,&amp;quot;href&amp;quot;:&amp;quot;./Template:Echo&amp;quot;},&amp;quot;params&amp;quot;:{&amp;quot;1&amp;quot;:{&amp;quot;wt&amp;quot;:&amp;quot;&lt;ref>{{echo|foo}}&lt;/ref>&amp;quot;}},&amp;quot;i&amp;quot;:0}}]}\">"}'><a href="./File:Foobar.jpg" data-parsoid='{"a":{"href":"./File:Foobar.jpg"},"sa":{}}'><img resource="./File:Foobar.jpg" src="//example.com/images/3/3a/Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="220" width="1941" data-parsoid='{"a":{"resource":"./File:Foobar.jpg","height":"220","width":"1941"},"sa":{"resource":"File:Foobar.jpg"}}'/></a></span></p>
+
+<ol class="mw-references" typeof="mw:Extension/references" about="#mwt6" data-mw='{"name":"references","attrs":{}}'><li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">foo</span></li></ol>
+!! end
+
 ###
 ### Subpages
 ###
@@ -15778,6 +15903,7 @@ MSIE 6 CSS safety test: sup/sub script (bug 55332)
 
 !! end
 
+# FIXME: Parsoid fails to sanitize this! See T58846.
 !! test
 Opera -o-link CSS
 !! wikitext
@@ -18237,7 +18363,7 @@ ISBN  978-0-1234-56&#x20;789
 !! html+tidy
 <p><a href="/wiki/Special:BookSources/9780123456" class="internal mw-magiclink-isbn">ISBN 978-0-1234-56</a> 789</p>
 !! html/parsoid
-<p><a href="./Special:BookSources/9780123456" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978-0-1234-56</a><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#x20;","srcContent":" "}'> </span>789</p>
+<p><a href="./Special:BookSources/9780123456" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978-0-1234-56</a><span typeof="mw:Entity" data-parsoid='{"src":"&amp;#x20;","srcContent":" "}'> </span>789</p>
 !! end
 
 !! test
@@ -18257,7 +18383,7 @@ ISBN ISBN 1234567890
 <p>ISBN <a href="/wiki/Special:BookSources/1234567890" class="internal mw-magiclink-isbn">ISBN 1234567890</a>
 </p>
 !! html/parsoid
-<p>ISBN <a href="./Special:BookSources/1234567890" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a></p>
+<p>ISBN <a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a></p>
 !! end
 
 # Uppercase X and lowercase x as well
@@ -18279,12 +18405,12 @@ ISBN 978080442957x
 <a href="/wiki/Special:BookSources/978080442957X" class="internal mw-magiclink-isbn">ISBN 978080442957x</a>
 </p>
 !! html/parsoid
-<p><a href="./Special:BookSources/346204561X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 3-462-04561-X</a>
-<a href="./Special:BookSources/346204561X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 3-462-04561-x</a>
-<a href="./Special:BookSources/080442957X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 080442957X</a>
-<a href="./Special:BookSources/080442957X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 080442957x</a>
-<a href="./Special:BookSources/978080442957X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978080442957X</a>
-<a href="./Special:BookSources/978080442957X" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978080442957x</a></p>
+<p><a href="./Special:BookSources/346204561X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 3-462-04561-X</a>
+<a href="./Special:BookSources/346204561X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 3-462-04561-x</a>
+<a href="./Special:BookSources/080442957X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 080442957X</a>
+<a href="./Special:BookSources/080442957X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 080442957x</a>
+<a href="./Special:BookSources/978080442957X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978080442957X</a>
+<a href="./Special:BookSources/978080442957X" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 978080442957x</a></p>
 !! end
 
 !! test
@@ -18295,7 +18421,7 @@ ISBN 1234567890
 <p><a href="/wiki/Special:BookSources/1234567890" class="internal mw-magiclink-isbn">ISBN 1234567890</a>
 </p>
 !! html/parsoid
-<p><a href="./Special:BookSources/1234567890" rel="mw:ExtLink">ISBN 1234567890</a></p>
+<p><a href="./Special:BookSources/1234567890" rel="mw:WikiLink">ISBN 1234567890</a></p>
 !! end
 
 !! test
@@ -18306,7 +18432,7 @@ Bug 22905: <abbr> followed by ISBN followed by </a>
 <p><abbr>(fr)</abbr> <a href="/wiki/Special:BookSources/2753300917" class="internal mw-magiclink-isbn">ISBN 2753300917</a> <a rel="nofollow" class="external text" href="http://www.example.com">example.com</a>
 </p>
 !! html/parsoid
-<p><abbr data-parsoid='{"stx":"html"}'>(fr)</abbr> <a href="./Special:BookSources/2753300917" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 2753300917</a> <a rel="mw:ExtLink" href="http://www.example.com">example.com</a></p>
+<p><abbr data-parsoid='{"stx":"html"}'>(fr)</abbr> <a href="./Special:BookSources/2753300917" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 2753300917</a> <a rel="mw:ExtLink" href="http://www.example.com">example.com</a></p>
 !! end
 
 !! test
@@ -20600,14 +20726,18 @@ __TOC__
 <p><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: Foo Bar">edit</a><span class="mw-editsection-bracket">]</span></span></p>
 !! end
 
+# Don't expect Parsoid to roundtrip this until the php parser comes closer to
+# html5 tag parsing.
 !! test
 Tags with parameters in TOC
+!! options
+parsoid=wt2html
 !! wikitext
 __TOC__
 == <sup class="in-h2">Hello</sup> ==
 
 == <sup class="a > b">Evilbye</sup> ==
-!! html
+!! html/php
 <div id="toc" class="toc"><div id="toctitle"><h2>Contents</h2></div>
 <ul>
 <li class="toclevel-1 tocsection-1"><a href="#Hello"><span class="tocnumber">1</span> <span class="toctext"><sup>Hello</sup></span></a></li>
@@ -20616,8 +20746,13 @@ __TOC__
 </div>
 
 <h2><span class="mw-headline" id="Hello"><sup class="in-h2">Hello</sup></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: Hello">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
-<h2><span class="mw-headline" id="b.22.3EEvilbye"><sup> b"&gt;Evilbye</sup></span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: b&quot;&gt;Evilbye">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+<h2><span class="mw-headline" id="b.22.3EEvilbye"><sup class="a"> b"&gt;Evilbye</sup></span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: b&quot;&gt;Evilbye">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+
+!! html/parsoid
+<meta property="mw:PageProp/toc" />
+<h2> <sup class="in-h2" data-parsoid='{"stx":"html"}'>Hello</sup> </h2>
 
+<h2> <sup class="a " data-parsoid='{"stx":"html"}'> b">Evilbye</sup> </h2>
 !! end
 
 !! test
@@ -21816,23 +21951,23 @@ Empty TR nodes should not be stripped if they have any attributes set
 !! test
 Headings: 0. Unnested
 !! options
-parsoid
+parsoid=html2wt
+!! html/parsoid
+<p>=foo=</p>
+
+<p> =foo=
+<!--cmt-->
+=foo=</p>
+
+<p>=foo<i>a</i>=</p>
 !! wikitext
 <nowiki>=foo=</nowiki>
 
-<nowiki> =foo= </nowiki>
+<nowiki> </nowiki>=foo=
 <!--cmt-->
 <nowiki>=foo=</nowiki>
 
 =foo''a''<nowiki>=</nowiki>
-!! html
-<p><span typeof="mw:Nowiki">=foo=</span></p>
-
-<p><span typeof="mw:Nowiki"> =foo= </span>
-<!--cmt-->
-<span typeof="mw:Nowiki">=foo=</span></p>
-
-<p>=foo<i>a</i><span typeof="mw:Nowiki">=</span></p>
 !!end
 
 # New headings and existing headings are handled differently
@@ -21889,15 +22024,26 @@ parsoid=html2wt
 !! test
 Headings: 3. Nested inside html with wikitext split by html tags
 !! options
-parsoid=html2wt,wt2wt
-!! wikitext
-= ='''bold'''<nowiki>foo=</nowiki> =
+parsoid=html2wt
 !! html/parsoid
 <h1>=<b>bold</b>foo=</h1>
+!! wikitext
+= ='''bold'''<nowiki>foo=</nowiki> =
 !!end
 
 !! test
 Headings: 4a. No escaping needed (testing just h1 and h2)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<h1>=foo</h1>
+<h1>foo=</h1>
+<h1> =foo= </h1>
+<h1>=foo= bar</h1>
+<h2>=foo</h2>
+<h2>foo=</h2>
+<h1>=</h1>
+<h1><i>=</i>foo=</h1>
 !! wikitext
 = =foo =
 
@@ -21914,15 +22060,6 @@ Headings: 4a. No escaping needed (testing just h1 and h2)
 = = =
 
 = ''=''foo= =
-!! html/parsoid
-<h1>=foo</h1>
-<h1>foo=</h1>
-<h1> =foo= </h1>
-<h1>=foo= bar</h1>
-<h2>=foo</h2>
-<h2>foo=</h2>
-<h1>=</h1>
-<h1><i>=</i>foo=</h1>
 !!end
 
 !! test
@@ -21942,6 +22079,20 @@ parsoid=html2wt
 
 !! test
 Headings: 5. Empty headings
+!! options
+parsoid=html2wt
+!! html/parsoid
+<h1 data-parsoid='{}'></h1>
+
+<h2 data-parsoid='{}'></h2>
+
+<h3 data-parsoid='{}'></h3>
+
+<h4 data-parsoid='{}'></h4>
+
+<h5 data-parsoid='{}'></h5>
+
+<h6 data-parsoid='{}'></h6>
 !! wikitext
 =<nowiki/>=
 
@@ -21954,112 +22105,74 @@ Headings: 5. Empty headings
 =====<nowiki/>=====
 
 ======<nowiki/>======
-!! html/parsoid
-<h1 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h1>
-
-<h2 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h2>
-
-<h3 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h3>
-
-<h4 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h4>
-
-<h5 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h5>
-
-<h6 data-parsoid='{}'><meta typeof="mw:Placeholder" data-parsoid='{"src":"&lt;nowiki/>"}'/></h6>
 !!end
 
 !! test
 Headings: 6a. Heading chars in SOL context (with trailing spaces)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>=a=</p>
+
+<p>=a=</p> 
+
+<p>=a=</p>	
 !! wikitext
 <nowiki>=a=</nowiki>
 
 <nowiki>=a=</nowiki> 
 
 <nowiki>=a=</nowiki>	
-
-<nowiki>=a=</nowiki> 	
-!! html/php
-<p>=a=
-</p><p>=a= 
-</p><p>=a=	
-</p><p>=a= 	
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">=a=</span></p>
-
-<p><span typeof="mw:Nowiki">=a=</span></p> 
-
-<p><span typeof="mw:Nowiki">=a=</span></p>	
-
-<p><span typeof="mw:Nowiki">=a=</span></p> 	
 !!end
 
 !! test
 Headings: 6b. Heading chars in SOL context (with trailing newlines)
-!! wikitext
-<nowiki>=a=
-b</nowiki>
-
-<nowiki>=a= 
-b</nowiki>
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>=a=
+b</p>
 
-<nowiki>=a=	
-b</nowiki>
+<p>=a= 
+b</p>
 
-<nowiki>=a=	 
-b</nowiki>
-!! html/php
-<p>=a=
-b
-</p><p>=a= 
-b
-</p><p>=a=	
-b
-</p><p>=a=	 
+<p>=a=	
+b</p>
+!! wikitext
+<nowiki>=a=</nowiki>
 b
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">=a=
-b</span></p>
 
-<p><span typeof="mw:Nowiki">=a= 
-b</span></p>
-
-<p><span typeof="mw:Nowiki">=a=	
-b</span></p>
+<nowiki>=a=</nowiki> 
+b
 
-<p><span typeof="mw:Nowiki">=a=	 
-b</span></p>
+<nowiki>=a=</nowiki>	
+b
 !!end
 
 !! test
 Headings: 6c. Heading chars in SOL context (leading newline break)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>a
+=b=</p>
 !! wikitext
 a
 <nowiki>=b=</nowiki>
-!! html/php
-<p>a
-=b=
-</p>
-!! html/parsoid
-<p>a
-<span typeof="mw:Nowiki">=b=</span>
 !!end
 
 !! test
 Headings: 6d. Heading chars in SOL context (with interspersed comments)
-!! wikitext
-<!--c0--><nowiki>=a=</nowiki>
-
-<!--c1--><nowiki>=a=</nowiki> <!--c2-->	 <!--c3-->
-!! html/php
-<p>=a=
-</p><p>=a= 	 
-</p>
+!! options
+parsoid=html2wt
 !! html/parsoid
-<!--c0--><p><span typeof="mw:Nowiki">=a=</span></p>
+<!--c0--><p>=a=</p>
 
-<!--c1--><p><span typeof="mw:Nowiki">=a=</span></p> <!--c2-->	 <!--c3-->
+<!--c1--><p>=a=</p> <!--c2-->	 <!--c3-->
+!! wikitext
+<!--c0--><nowiki>=a=</nowiki>
+
+<!--c1--><nowiki>=a=</nowiki> <!--c2-->	 <!--c3-->
 !!end
 
 !! test
@@ -22103,27 +22216,36 @@ a
 
 !! test
 Lists: 0. Outside nests
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>*foo</p>
+
+<p>#foo</p>
+
+<p>;Foo:bar</p>
 !! wikitext
 <nowiki>*</nowiki>foo
 
 <nowiki>#</nowiki>foo
 
-<nowiki>;Foo:</nowiki>bar
-!! html/php
-<p>*foo
-</p><p>#foo
-</p><p>;Foo:bar
-</p>
-!! html/parsoid
-<p><span typeof="mw:Nowiki">*</span>foo</p>
-
-<p><span typeof="mw:Nowiki">#</span>foo</p>
-
-<p><span typeof="mw:Nowiki">;Foo:</span>bar</p>
+<nowiki>;</nowiki>Foo<nowiki>:</nowiki>bar
 !!end
 
 !! test
 Lists: 1. Nested inside html
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li>*foo</li></ul>
+<ul><li>#foo</li></ul>
+<ul><li>:foo</li></ul>
+<ul><li>;foo</li></ul>
+<ol><li>*foo</li></ol>
+<ol><li>#foo</li></ol>
+<ol><li>:foo</li></ol>
+<ol><li>;foo</li></ol>
+
 !! wikitext
 *<nowiki>*foo</nowiki>
 
@@ -22140,20 +22262,19 @@ Lists: 1. Nested inside html
 #<nowiki>:foo</nowiki>
 
 #<nowiki>;foo</nowiki>
-!! html
-<ul><li>*foo</li></ul>
-<ul><li>#foo</li></ul>
-<ul><li>:foo</li></ul>
-<ul><li>;foo</li></ul>
-<ol><li>*foo</li></ol>
-<ol><li>#foo</li></ol>
-<ol><li>:foo</li></ol>
-<ol><li>;foo</li></ol>
-
 !!end
 
 !! test
 Lists: 2. Inside definition lists
+!! options
+parsoid=html2wt
+!! html/parsoid
+<dl><dt>;foo</dt></dl>
+<dl><dt>:foo</dt></dl>
+<dl><dt>:foo</dt>
+<dd>bar</dd></dl>
+<dl><dd>:foo</dd></dl>
+
 !! wikitext
 ;<nowiki>;foo</nowiki>
 
@@ -22163,40 +22284,27 @@ Lists: 2. Inside definition lists
 :bar
 
 :<nowiki>:foo</nowiki>
-!! html
-<dl><dt>;foo</dt></dl>
-<dl><dt>:foo</dt></dl>
-<dl><dt>:foo</dt>
-<dd>bar</dd></dl>
-<dl><dd>:foo</dd></dl>
-
 !!end
 
 !! test
 Lists: 3. Only bullets at start of text should be escaped
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li>*foo*bar</li></ul>
+<ul><li>*foo<i>it</i>*bar</li></ul>
+
 !! wikitext
 *<nowiki>*foo*bar</nowiki>
 
 *<nowiki>*foo</nowiki>''it''*bar
-!! html
-<ul><li>*foo*bar</li></ul>
-<ul><li>*foo<i>it</i>*bar</li></ul>
-
 !!end
 
 !! test
 Lists: 4. No escapes needed
 !! options
-parsoid
-!! wikitext
-*foo*bar
-
-*''foo''*bar
-
-*[[Foo]]: bar
-
-*[[Foo]]*bar
-!! html
+parsoid=html2wt
+!! html/parsoid
 <ul>
 <li>foo*bar
 </li>
@@ -22213,10 +22321,29 @@ parsoid
 <li><a rel="mw:WikiLink" href="Foo" title="Foo">Foo</a>*bar
 </li>
 </ul>
+!! wikitext
+*foo*bar
+
+*''foo''*bar
+
+*[[Foo]]: bar
+
+*[[Foo]]*bar
 !!end
 
 !! test
 Lists: 5. No unnecessary escapes
+!! options
+parsoid=html2wt
+!! html/parsoid
+<ul><li> bar <span>[[foo]]</span></li></ul>
+<ul><li> =bar <span>[[foo]]</span></li></ul>
+<ul><li> [[bar <span>[[foo]]</span></li></ul>
+<ul><li> ]]bar <span>[[foo]]</span></li></ul>
+<ul><li> =bar <span>foo]]</span>=</li></ul>
+<ul><li> <s></s>: a</li></ul>
+<ul><li> <i>* foo</i></li></ul>
+
 !! wikitext
 * bar <span><nowiki>[[foo]]</nowiki></span>
 
@@ -22231,15 +22358,6 @@ Lists: 5. No unnecessary escapes
 * <s></s>: a
 
 * ''* foo''
-!! html
-<ul><li> bar <span>[[foo]]</span></li></ul>
-<ul><li> =bar <span>[[foo]]</span></li></ul>
-<ul><li> [[bar <span>[[foo]]</span></li></ul>
-<ul><li> ]]bar <span>[[foo]]</span></li></ul>
-<ul><li> =bar <span>foo]]</span>=</li></ul>
-<ul><li> <s></s>: a</li></ul>
-<ul><li> <i>* foo</i></li></ul>
-
 !!end
 
 !! test
@@ -22254,13 +22372,15 @@ parsoid=html2wt
 
 !! test
 Lists: 7. Escape bullets in a multi-line context
-!! wikitext
-a
-<nowiki>*</nowiki>b
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>a
 *b
 </p>
+!! wikitext
+a
+<nowiki>*</nowiki>b
 !!end
 
 !! test
@@ -22279,17 +22399,16 @@ parsoid=html2wt
 
 !! test
 HRs: 1. Single line
+!! options
+parsoid=html2wt
+!! html/parsoid
+<hr />----
+<hr />=foo=
+<hr />*foo
 !! wikitext
 ----<nowiki>----</nowiki>
 ----=foo=
 ----*foo
-!! html+tidy
-<hr />
-<p>----</p>
-<hr />
-<p>=foo=</p>
-<hr />
-<p>*foo</p>
 !! end
 
 #### --------------- Tables ---------------
@@ -22313,40 +22432,48 @@ HRs: 1. Single line
 
 !! test
 Tables: 1a. Simple example
-!! wikitext
-<nowiki>{|
-|}</nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>{|
 |}
 </p>
+!! wikitext
+<nowiki>{|</nowiki>
+|}
 !! end
 
 !! test
 Tables: 1b. No escaping needed
-!! wikitext
-!foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>!foo
 </p>
+!! wikitext
+!foo
 !! end
 
 !! test
 Tables: 1c. No escaping needed
-!! wikitext
-|foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>|foo
 </p>
+!! wikitext
+|foo
 !! end
 
 !! test
 Tables: 1d. No escaping needed
-!! wikitext
-|}foo
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>|}foo
 </p>
+!! wikitext
+|}foo
 !! end
 
 !! test
@@ -22407,11 +22534,8 @@ parsoid=html2wt
 
 !! test
 Tables: 2c. Nested in td -- no escaping needed
-!! wikitext
-{|
-
-|foo!!bar
-|}
+!! options
+parsoid=html2wt
 !! html/*
 <table>
 
@@ -22419,15 +22543,17 @@ Tables: 2c. Nested in td -- no escaping needed
 <td>foo!!bar
 </td></tr></table>
 
-!! end
-
-!! test
-Tables: 3a. Nested in th
 !! wikitext
 {|
 
-!foo!bar
+|foo!!bar
 |}
+!! end
+
+!! test
+Tables: 3a. Nested in th
+!! options
+parsoid=html2wt
 !! html/*
 <table>
 
@@ -22435,6 +22561,11 @@ Tables: 3a. Nested in th
 <th>foo!bar
 </th></tr></table>
 
+!! wikitext
+{|
+
+!foo!bar
+|}
 !! end
 
 !! test
@@ -22543,6 +22674,19 @@ parsoid=html2wt
 
 !! test
 Tables: 4c. No escaping needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table><tbody>
+<tr><td>foo-bar</td><td>foo+bar</td></tr>
+<tr><td><i>foo</i>-bar</td><td><i>foo</i>+bar</td></tr>
+<tr><td>foo
+<p>bar|baz
++bar
+-bar</p></td></tr>
+<tr><td>x
+<div>a|b</div></td>
+</tbody></table>
 !! wikitext
 {|
 |foo-bar
@@ -22583,21 +22727,18 @@ bar|baz
 <div>a|b</div>
 </td></tr></table>
 
-!! html/parsoid
-<table><tbody>
-<tr><td>foo-bar</td><td>foo+bar</td></tr>
-<tr><td><i>foo</i>-bar</td><td><i>foo</i>+bar</td></tr>
-<tr><td>foo
-<p>bar|baz
-+bar
--bar</p></td></tr>
-<tr><td>x
-<div>a|b</div></td>
-</tbody></table>
 !! end
 
 !! test
 Tables: 4d. No escaping needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table>
+<tbody><tr><td><a rel="mw:WikiLink" href="./Foo" title="Foo">Foo</a>-bar</td>
+<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>+1</td>
+<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>-2</td></tr>
+</tbody></table>
 !! wikitext
 {|
 |[[Foo]]-bar
@@ -22614,29 +22755,6 @@ Tables: 4d. No escaping needed
 <td>-2
 </td></tr></table>
 
-!! html/parsoid
-<table>
-<tbody><tr><td><a rel="mw:WikiLink" href="./Foo" title="Foo">Foo</a>-bar</td>
-<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>+1</td>
-<td data-parsoid='{"startTagSrc":"|","attrSepSrc":"|"}'>-2</td></tr>
-</tbody></table>
-!! end
-
-!! test
-Tables: Digest broken attributes on table and tr tag
-!! options
-parsoid=wt2html
-!! wikitext
-{| || |} ++
-|- || || ++ --
-|- > [
-|}
-!! html
-<table>
-<tbody>
-<tr></tr>
-<tr></tr>
-</tbody></table>
 !! end
 
 !! test
@@ -22648,11 +22766,18 @@ parsoid=html2wt
 |** Make this another long long long sentence forcing the nowiki algo to split up the nowikis.</p>
 !! wikitext
 <nowiki>*</nowiki>This is a long sentence here that will make the nowiki algo split up the nowikis into multiple pairs
-<nowiki>|</nowiki>** Make this another long long long sentence forcing the nowiki algo to split up the nowikis.
+|** Make this another long long long sentence forcing the nowiki algo to split up the nowikis.
 !! end
 
 !! test
 Unclosed xmlish element in table line shouldn't eat end delimiters
+!! options
+parsoid=html2wt
+!! html/parsoid
+<table>
+<tbody><tr><td> &lt;foo</td>
+<td> bar></td></tr>
+</tbody></table>
 !! wikitext
 {|
 | <foo
@@ -22666,11 +22791,6 @@ Unclosed xmlish element in table line shouldn't eat end delimiters
 <td> bar&gt;
 </td></tr></table>
 
-!! html/parsoid
-<table>
-<tbody><tr><td> &lt;foo</td>
-<td> bar></td></tr>
-</tbody></table>
 !! end
 
 #### --------------- Links ----------------
@@ -22682,6 +22802,12 @@ Unclosed xmlish element in table line shouldn't eat end delimiters
 #### --------------------------------------
 !! test
 Links 1. WikiLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Foo" title="Foo">Foo<i>boo</i></a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">[Foobar]</a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">x [Foobar] x</a></p>
 !! wikitext
 [[Foo|Foo''boo'']]
 [[Foo|[Foobar]]]
@@ -22691,10 +22817,6 @@ Links 1. WikiLinks: No escapes needed
 <a href="/wiki/Foo" title="Foo">[Foobar]</a>
 <a href="/wiki/Foo" title="Foo">x [Foobar] x</a>
 </p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Foo" title="Foo">Foo<i>boo</i></a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">[Foobar]</a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">x [Foobar] x</a></p>
 !! end
 
 !! test
@@ -22739,6 +22861,11 @@ parsoid=html2wt
 
 !! test
 Links 3. WikiLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Foo">[Foobar</a>
+<a rel="mw:WikiLink" href="Foo" title="Foo">foo|bar</a></p>
 !! wikitext
 [[Foo|[Foobar]]
 [[Foo|foo|bar]]
@@ -22746,9 +22873,6 @@ Links 3. WikiLinks: No escapes needed
 <p><a href="/wiki/Foo" title="Foo">[Foobar</a>
 <a href="/wiki/Foo" title="Foo">foo|bar</a>
 </p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Foo">[Foobar</a>
-<a rel="mw:WikiLink" href="Foo" title="Foo">foo|bar</a></p>
 !! end
 
 !! test
@@ -22778,17 +22902,21 @@ parsoid=html2wt
 
 !! test
 Links 5. ExtLinks: No escapes needed
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:ExtLink" href="http://google.com">[google</a></p>
 !! wikitext
 [http://google.com [google]
 !! html/php
 <p><a rel="nofollow" class="external text" href="http://google.com">[google</a>
 </p>
-!! html/parsoid
-<p><a rel="mw:ExtLink" href="http://google.com">[google</a></p>
 !! end
 
 !! test
 Links 6. Add <nowiki/>s between text-nodes and url-links when required (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p>x<a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>y
 <a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>?x
@@ -22822,6 +22950,8 @@ http://example.com(x<nowiki/>)
 
 !! test
 Links 7a. Don't add spurious <nowiki/>s between text-nodes and url-links (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p>x
 <a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>
@@ -22855,6 +22985,8 @@ y
 
 !! test
 Links 7b. Don't add spurious <nowiki/>s between text-nodes and url-links (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p><a rel="mw:ExtLink" href="http://example.com" data-parsoid='{"stx":"url"}'>http://example.com</a>.,;:!?\
 -<a rel="mw:ExtLink" href="http://example.com">http://example.com</a>:</p>
@@ -22869,6 +23001,8 @@ http://example.com.,;:!?\
 
 !! test
 Links 8. Add <nowiki/>s between text-nodes and RFC-links when required (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>4
 <a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>y
@@ -22881,6 +23015,8 @@ X<nowiki/>RFC 123<nowiki/>y
 
 !! test
 Links 9. Don't add spurious <nowiki/>s between text-nodes and RFC-links (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p><a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>?foo
 <a href="//tools.ietf.org/html/rfc123" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>RFC 123</a>&amp;foo
@@ -22899,6 +23035,8 @@ RFC 123&foo
 
 !! test
 Links 10. Add <nowiki/>s between text-nodes and PMID-links when required (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p><a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>4
 <a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>y
@@ -22911,6 +23049,8 @@ X<nowiki/>PMID 123<nowiki/>y
 
 !! test
 Links 11. Don't add spurious <nowiki/>s between text-nodes and PMID-links (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
 <p><a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>?foo
 <a href="//www.ncbi.nlm.nih.gov/pubmed/123?dopt=Abstract" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>PMID 123</a>&foo
@@ -22929,10 +23069,12 @@ PMID 123&foo
 
 !! test
 Links 12. Add <nowiki/>s between text-nodes and ISBN-links when required (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
-<p><a href="./Special:BookSources/1234567890" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>1
-<a href="./Special:BookSources/1234567890" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>x
-a<a href="./Special:BookSources/1234567890" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>b
+<p><a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>1
+<a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>x
+a<a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>b
 </p>
 !! wikitext
 ISBN 1234567890<nowiki/>1
@@ -22942,8 +23084,10 @@ a<nowiki/>ISBN 1234567890<nowiki/>b
 
 !! test
 Links 13. Don't add spurious <nowiki/>s between text-nodes and ISBN-links (bug 64300)
+!! options
+parsoid=html2wt
 !! html/parsoid
-<p>-<a href="./Special:BookSources/1234567890" rel="mw:ExtLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>'s
+<p>-<a href="./Special:BookSources/1234567890" rel="mw:WikiLink" data-parsoid='{"stx":"magiclink"}'>ISBN 1234567890</a>'s
 !! wikitext
 -ISBN 1234567890's
 !! html/php
@@ -22966,13 +23110,14 @@ parsoid=html2wt
 Links 15. Link trails can't become link prefixes.
 !! options
 language=is
+parsoid=html2wt
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="Söfnuður" title="Söfnuður" data-parsoid='{"stx":"simple","tail":"-"}'>Söfnuður-</a><a rel="mw:WikiLink" href="00" title="00">00</a></p>
 !! wikitext
 [[Söfnuður]]-[[00]]
 !! html/php
 <p><a href="/wiki/S%C3%B6fnu%C3%B0ur" title="Söfnuður">Söfnuður-</a><a href="/wiki/00" title="00">00</a>
 </p>
-!! html/parsoid
-<p><a rel="mw:WikiLink" href="Söfnuður" title="Söfnuður" data-parsoid='{"stx":"simple","tail":"-"}'>Söfnuður-</a><a rel="mw:WikiLink" href="00" title="00">00</a></p>
 !! end
 
 #### --------------- Quotes ---------------
@@ -22984,28 +23129,7 @@ language=is
 !! test
 1a. Quotes inside <b> and <i>
 !! options
-parsoid=html2wt,wt2wt
-!! wikitext
-''<nowiki/>'foo'''
-''<nowiki>''foo''</nowiki>''
-''<nowiki>'''foo'''</nowiki>''
-''foo''<nowiki/>'s
-'''<nowiki/>'foo''''
-'''<nowiki>''foo''</nowiki>'''
-'''<nowiki>'''foo'''</nowiki>'''
-'''foo'<nowiki/>''bar'<nowiki/>''baz'''
-'''foo'''<nowiki/>'s
-'''foo''
-''foo''<nowiki/>'
-''foo'''<nowiki/>'
-'''foo''<nowiki/>'
-''''foo'''
-'''foo'''<nowiki/>'
-''''foo'''<nowiki/>'
-''fools'<span> errand</span>''
-''<span>fool</span>'s errand''
-'<nowiki/>''foo'' bar '''baz''
-a|!*#-:;+-~[]{}b'''x''
+parsoid=html2wt
 !! html/*
 <p><i>'foo'</i>
 <i>''foo''</i>
@@ -23028,22 +23152,34 @@ a|!*#-:;+-~[]{}b'''x''
 '<i>foo</i> bar '<i>baz</i>
 a|!*#-:;+-~[]{}b'<i>x</i>
 </p>
+!! wikitext
+''<nowiki/>'foo'''
+''<nowiki>''foo''</nowiki>''
+''<nowiki>'''foo'''</nowiki>''
+''foo''<nowiki/>'s
+'''<nowiki/>'foo''''
+'''<nowiki>''foo''</nowiki>'''
+'''<nowiki>'''foo'''</nowiki>'''
+'''foo'<nowiki/>''bar'<nowiki/>''baz'''
+'''foo'''<nowiki/>'s
+'''foo''
+''foo''<nowiki/>'
+''foo'''<nowiki/>'
+'''foo''<nowiki/>'
+''''foo'''
+'''foo'''<nowiki/>'
+''''foo'''<nowiki/>'
+''fools'<span> errand</span>''
+''<span>fool</span>'s errand''
+'<nowiki/>''foo'' bar '''baz''
+a|!*#-:;+-~[]{}b'''x''
 !! end
 
 !! test
 1b. Quotes inside <b> and <i> with other tags on same line
 !! options
-parsoid=html2wt,wt2wt
-!! wikitext
-'''a'' foo ''[[bar]]''
-''a''' foo ''[[bar]]''
-''a''' foo '''{{echo|[[bar]]}}'''
-[[foo]] x'''[[bar]]''
-'''foo'' <ref>test</ref>
-'''foo'' <div title="name">test</div>
-'''foo'' and <br> bar
-<references />
-!! html
+parsoid=html2wt
+!! html/parsoid
 '<i>a</i> foo <i><a rel="mw:WikiLink" href="Bar" title="Bar">bar</a></i>
 <i>a'</i> foo <i><a rel="mw:WikiLink" href="Bar" title="Bar">bar</a></i>
 <i>a'</i> foo <b><a rel="mw:WikiLink" href="Bar" title="Bar" typeof="mw:Transclusion" data-mw='{"parts":[{"template":{"target":{"wt":"echo","href":"./Template:Echo"},"params":{"1":{"wt":"[[bar]]"}},"i":0}}]}'>bar</a></b>
@@ -23054,45 +23190,58 @@ parsoid=html2wt,wt2wt
 <ol class="mw-references" typeof="mw:Extension/references" about="#mwt5" data-mw='{"name":"references","attrs":{}}'>
 <li about="#cite_note-1" id="cite_note-1"><span rel="mw:referencedBy"><a href="#cite_ref-1">↑</a></span> <span id="mw-reference-text-cite_note-1" class="mw-reference-text" data-parsoid="{}">test</span></li>
 </ol>
+!! wikitext
+'''a'' foo ''[[bar]]''
+''a''' foo ''[[bar]]''
+''a''' foo '''{{echo|[[bar]]}}'''
+[[foo]] x'''[[bar]]''
+'''foo'' <ref>test</ref>
+'''foo'' <div title="name">test</div>
+'''foo'' and <br> bar
+<references />
 !! end
 
 !! test
 2. Link fragments separated by <i> and <b> tags
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>[[<i>foo</i>hello]]</p>
+<p>[[<b>foo</b>hello]]</p>
 !! wikitext
 [[''foo''<nowiki>hello]]</nowiki>
 
 [['''foo'''<nowiki>hello]]</nowiki>
-!! html
-<p>[[<i>foo</i>hello]]
-</p><p>[[<b>foo</b>hello]]
-</p>
 !! end
 
 # FIXME: Escaping one or both of [[ and ]] is also acceptable --
 #        this is one of the shortcomings of this format
 !! test
 3. Link fragments inside <i> and <b>
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p><i>[[foo</i>]]</p>
+<p><b>[[foo</b>]]</p>
 !! wikitext
 ''[[foo''<nowiki>]]</nowiki>
 
 '''[[foo'''<nowiki>]]</nowiki>
-!! html
-<p><i>[[foo</i>]]
-</p><p><b>[[foo</b>]]
-</p>
 !! end
 
 !! test
 4. No escaping needed
-!! wikitext
-'<span>''bar''</span>'
-'<span>'''bar'''</span>'
-'a:b'foo
-!! html
+!! options
+options=html2wt
+!! html/parsoid
 <p>'<span><i>bar</i></span>'
 '<span><b>bar</b></span>'
 'a:b'foo
 </p>
+!! wikitext
+'<span>''bar''</span>'
+'<span>'''bar'''</span>'
+'a:b'foo
 !! end
 
 #### ----------- Paragraphs ---------------
@@ -23101,6 +23250,15 @@ parsoid=html2wt,wt2wt
 
 !! test
 1. No unnecessary escapes
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>bar <span>[[foo]]</span>
+</p><p>=bar <span>[[foo]]</span>
+</p><p>[[bar <span>[[foo]]</span>
+</p><p>]]bar <span>[[foo]]</span>
+</p><p>=bar <span>foo]]</span>=
+</p>
 !! wikitext
 bar <span><nowiki>[[foo]]</nowiki></span>
 
@@ -23111,13 +23269,6 @@ bar <span><nowiki>[[foo]]</nowiki></span>
 ]]bar <span><nowiki>[[foo]]</nowiki></span>
 
 =bar <span>foo]]</span><nowiki>=</nowiki>
-!! html
-<p>bar <span>[[foo]]</span>
-</p><p>=bar <span>[[foo]]</span>
-</p><p>[[bar <span>[[foo]]</span>
-</p><p>]]bar <span>[[foo]]</span>
-</p><p>=bar <span>foo]]</span>=
-</p>
 !!end
 
 #### ----------------------- PRE --------------------------
@@ -23126,83 +23277,103 @@ bar <span><nowiki>[[foo]]</nowiki></span>
 !! test
 1. Leading whitespace in SOL context should be escaped
 !! options
-parsoid
+parsoid=html2wt
+!! html/parsoid
+<p> a</p>
+
+<p>  a</p>
+
+<p>	a(tab)</p>
+
+<p> 	a
+<!--cmt-->
+  a</p>
+
+<p>a
+ b</p>
+
+<p>a
+	b</p>
+
+<p>a
+	 b</p>
 !! wikitext
 <nowiki> </nowiki>a
 
 <nowiki> </nowiki> a
 
-<nowiki>	</nowiki>a(tab)
+	a(tab)
 
 <nowiki> </nowiki>	a
 <!--cmt-->
-<nowiki> </nowiki> a
+<nowiki>  </nowiki>a
 
 a
 <nowiki> </nowiki>b
 
 a
-<nowiki>	</nowiki>b
+	b
 
 a
-<nowiki>	</nowiki> b
-!! html
-<p> a</p>
-<p>  a</p>
-<p>	a(tab)</p>
-<p> 	a</p>
-<p><!--cmt-->  a</p>
-<p>a
- b</p>
-<p>a
-	b</p>
-<p>a
-	 b</p>
+	 b
+!! html/php
+<p> a
+</p><p>  a
+</p><p>	a(tab)
+</p><p> 	a
+  a
+</p><p>a
+ b
+</p><p>a
+	b
+</p><p>a
+	 b
+</p>
 !! end
 
 !! test
 2. Leading whitespace in non-indent-pre contexts should not be escaped
 !! options
-parsoid
-!! wikitext
-foo <ref>''a''
- b</ref>
-<references />
-!! html
+parsoid=htm2wt
+!! html/parsoid
 <p>foo <span about="#mwt2" class="mw-ref" id="cite_ref-1" rel="dc:references" typeof="mw:Extension/ref" data-mw='{"name":"ref","body":{"id":"mw-reference-text-cite_note-1"},"attrs":{}}'><a href="#cite_note-1"><span class="mw-reflink-text">[1]</span></a></span></p>
 <ol class="mw-references" typeof="mw:Extension/references" about="#mwt4" data-mw='{"name":"references","attrs":{}}'>
 <li about="#cite_note-1" id="cite_note-1"><a href="#cite_ref-1" rel="mw:referencedBy"><span class="mw-linkback-text">↑ </span></a> <span id="mw-reference-text-cite_note-1" class="mw-reference-text"><i data-parsoid='{"dsr":[9,14,2,2]}'>a</i>
  b</span></li>
 </ol>
+!! wikitext
+foo <ref>''a''
+ b</ref>
+<references />
 !! end
 
 !! test
 3. Leading whitespace in indent-pre suppressing contexts should not be escaped
 !! options
-parsoid
-!! wikitext
+parsoid=html2wt
+!! html/parsoid
 <blockquote>
+<p>
  a
  <span>b</span>
- c
+ c</p>
 </blockquote>
-!! html
+!! wikitext
 <blockquote>
-<p>
  a
  <span>b</span>
- c</p>
+ c
 </blockquote>
 !! end
 
 !! test
 4. Leading whitespace in indent-pre suppressing contexts should not be escaped
 !! options
-parsoid
-!! wikitext
- [[File:Foobar.jpg|thumb|caption]]
+options=html2wt
 !! html/parsoid
  <figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption>caption</figcaption></figure>
+!! wikitext
+ [[File:Foobar.jpg|thumb|caption]]
 !! end
 
 !! test
@@ -23218,15 +23389,15 @@ parsoid=html2wt
 !!test
 T95794: nowiki escaping should account for leading space at start-of-line in an indent-pre block
 !! options
-parsoid
-!! wikitext
- * foo
- * bar
-!! html
+parsoid=html2wt
+!! html/parsoid
 <pre>
 * foo
 * bar
 </pre>
+!! wikitext
+ * foo
+ * bar
 !! end
 
 #### --------------- Behavior Switches --------------------
@@ -23258,15 +23429,8 @@ __|__
 # We use indent-pre as an indirect way to test for sol-transparent behavior.
 !! test
 Behavior switches should be SOL-transparent
-!! wikitext
- __TOC__
-
- <!-- this one's bogus -->
- __TOO__
-
- __TOC__ foo
-
-__TOC__ bar
+!! options
+parsoid=html2wt
 !! html/parsoid
  <meta property="mw:PageProp/toc" />
 
@@ -23276,6 +23440,15 @@ __TOC__ bar
 <pre data-parsoid='{}'><meta property="mw:PageProp/toc" data-parsoid='{"src":"__TOC__","magicSrc":"__TOC__"}'/> foo</pre>
 
 <meta property="mw:PageProp/toc" data-parsoid='{"src":"__TOC__","magicSrc":"__TOC__"}'/><pre data-parsoid='{}'>bar</pre>
+!! wikitext
+ __TOC__
+
+ <!-- this one's bogus -->
+ __TOO__
+
+ __TOC__ foo
+
+__TOC__ bar
 !! end
 
 #### --------------- HTML tags ---------------
@@ -23287,75 +23460,85 @@ __TOC__ bar
 !! test
 1. a tags
 !! options
-parsoid
+parsoid=html2wt
+!! html/parsoid
+&lt;a href=&quot;http://google.com&quot;&gt;google&lt;/a&gt;
 !! wikitext
 <a href="http://google.com">google</a>
-!! html
-&lt;a href=&quot;http://google.com&quot;&gt;google&lt;/a&gt;
 !! end
 
 !! test
 2. other tags
-!! wikitext
-* <nowiki><div>foo</div></nowiki>
-* <nowiki><div style="color:red">foo</div></nowiki>
-* <nowiki><td></nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <ul><li> &lt;div&gt;foo&lt;/div&gt;</li>
 <li> &lt;div style=&quot;color:red&quot;&gt;foo&lt;/div&gt;</li>
 <li> &lt;td&gt;</li></ul>
 
+!! wikitext
+* <nowiki><div>foo</div></nowiki>
+* <nowiki><div style="color:red">foo</div></nowiki>
+* <nowiki><td></nowiki>
 !! end
 
 !! test
 3. multi-line html tag
-!! wikitext
-<nowiki><div
->foo</div
-></nowiki>
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>&lt;div
 &gt;foo&lt;/div
 &gt;
 </p>
+!! wikitext
+<nowiki><div
+>foo</div
+></nowiki>
 !! end
 
 !! test
 4. extension tags
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>&lt;ref&gt;foo&lt;/ref&gt;
+</p><p>&lt;ref&gt;bar
+</p><p>baz&lt;/ref&gt;
+</p>
 !! wikitext
 <nowiki><ref>foo</ref></nowiki>
 
 <nowiki><ref>bar</nowiki>
 
 baz<nowiki></ref></nowiki>
-!! html
-<p>&lt;ref&gt;foo&lt;/ref&gt;
-</p><p>&lt;ref&gt;bar
-</p><p>baz&lt;/ref&gt;
-</p>
 !! end
 
 #### --------------- Others ---------------
 !! test
 Escaping nowikis
-!! wikitext
-&lt;nowiki&gt;foo&lt;/nowiki&gt;
-!! html
+!! options
+parsoid=html2wt
+!! html/parsoid
 <p>&lt;nowiki&gt;foo&lt;/nowiki&gt;
 </p>
+!! wikitext
+&lt;nowiki&gt;foo&lt;/nowiki&gt;
 !! end
 
 ## The quote-char in the input is necessary for triggering the bug
 !! test
 (Bug 52035) Nowiki-escaping should not get tripped by " :" in text
 !! options
-parsoid=wt2wt,html2wt
+parsoid=html2wt
+!! html/parsoid
+<p>foo's bar :</p>
 !! wikitext
 foo's bar :
-!! html
-<p>foo's bar :</p>
 !! end
 
+#----------- End of wikitext escaping tests --------------
+
 !! test
 
 Tag-like HTML structures are passed through as text
@@ -23407,20 +23590,9 @@ HTML tag with broken attribute value quoting
 !! wikitext
 <span title="Hello world>Foo</span>
 !! html/php
-<p><span>Foo</span>
-</p>
-!! html/parsoid
 <p><span title="Hello world">Foo</span>
 </p>
-!! end
-
-!! test
-Parsoid-only: HTML tag with broken attribute value quoting
-!! options
-parsoid
-!! wikitext
-<span title="Hello world>Foo</span>
-!! html
+!! html/parsoid
 <p><span title="Hello world">Foo</span>
 </p>
 !! end
@@ -23434,7 +23606,7 @@ Table with broken attribute value quoting
 !! html/php
 <table>
 <tr>
-<td>Foo
+<td title="Hello world">Foo
 </td></tr></table>
 
 !! html/parsoid
@@ -23455,9 +23627,9 @@ Table with broken attribute value quoting on consecutive lines
 !! html/php
 <table>
 <tr>
-<td>Foo
+<td title="Hello world">Foo
 </td>
-<td>Bar
+<td style="color:red">Bar
 </td></tr></table>
 
 !! html/parsoid
@@ -23470,7 +23642,7 @@ Table with broken attribute value quoting on consecutive lines
 !! end
 
 !! test
-Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug 42353)
+2. Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug 42353)
 !! options
 parsoid
 !! wikitext
@@ -23480,7 +23652,7 @@ parsoid
 !! end
 
 !! test
-Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug 42353)
+1. Parsoid-only: Don't wrap broken template tags in <nowiki> on wt2wt (Bug 42353)
 !! options
 parsoid
 !! wikitext
@@ -24529,7 +24701,7 @@ parsoid={
 
 ==  [[Category:A2]] hi pal ==
 
-== <!--foo-->   [[Category:A3]]    how goes it ==
+==  <!--foo-->  [[Category:A3]]    how goes it ==
 
 == it goes well    [[Category:A4]]  <!--bar-->  ==
 
@@ -24981,7 +25153,7 @@ Edited ISBN links not serializable as ISBN links should serialize as wikilinks
 !! options
 parsoid=html2wt
 !! html/parsoid
-<a rel="mw:ExtLink" href="./Special:BookSources/1234567890">ISBN 1234567895</a>
+<a href="./Special:BookSources/1234567890" rel="mw:ExtLink">ISBN 1234567895</a>
 !! wikitext
 [[Special:BookSources/1234567890|ISBN 1234567895]]
 !! end
@@ -25091,6 +25263,92 @@ parsoid=html2wt
 http://example.com<nowiki> http://example.com is not a link.</nowiki>
 !! end
 
+!! test
+Magic links inside links (not autolinked)
+!! wikitext
+[[Foo|http://example.com]]
+[[Foo|RFC 1234]]
+[[Foo|PMID 1234]]
+[[Foo|ISBN 123456789x]]
+
+[http://foo.com http://example.com]
+[http://foo.com RFC 1234]
+[http://foo.com PMID 1234]
+[http://foo.com ISBN 123456789x]
+!! html+tidy
+<p><a href="/wiki/Foo" title="Foo">http://example.com</a> <a href="/wiki/Foo" title="Foo">RFC 1234</a> <a href="/wiki/Foo" title="Foo">PMID 1234</a> <a href="/wiki/Foo" title="Foo">ISBN 123456789x</a></p>
+<p><a rel="nofollow" class="external text" href="http://foo.com">http://example.com</a> <a rel="nofollow" class="external text" href="http://foo.com">RFC 1234</a> <a rel="nofollow" class="external text" href="http://foo.com">PMID 1234</a> <a rel="nofollow" class="external text" href="http://foo.com">ISBN 123456789x</a></p>
+!! html/parsoid
+<p><a rel="mw:WikiLink" href="./Foo" title="Foo">http://example.com</a>
+<a rel="mw:WikiLink" href="./Foo" title="Foo">RFC 1234</a>
+<a rel="mw:WikiLink" href="./Foo" title="Foo">PMID 1234</a>
+<a rel="mw:WikiLink" href="./Foo" title="Foo">ISBN 123456789x</a></p>
+
+<p><a rel="mw:ExtLink" href="http://foo.com">http://example.com</a>
+<a rel="mw:ExtLink" href="http://foo.com">RFC 1234</a>
+<a rel="mw:ExtLink" href="http://foo.com">PMID 1234</a>
+<a rel="mw:ExtLink" href="http://foo.com">ISBN 123456789x</a></p>
+!! end
+
+!! test
+Magic links inside image captions (autolinked)
+!! wikitext
+[[File:Foobar.jpg|thumb|http://example.com]]
+[[File:Foobar.jpg|thumb|RFC 1234]]
+[[File:Foobar.jpg|thumb|PMID 1234]]
+[[File:Foobar.jpg|thumb|ISBN 123456789x]]
+!! html+tidy
+<div class="thumb tright">
+<div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
+<div class="thumbcaption">
+<div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>
+<a rel="nofollow" class="external free" href="http://example.com">http://example.com</a></div>
+</div>
+</div>
+<div class="thumb tright">
+<div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
+<div class="thumbcaption">
+<div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>
+<a class="external mw-magiclink-rfc" rel="nofollow" href="//tools.ietf.org/html/rfc1234">RFC 1234</a></div>
+</div>
+</div>
+<div class="thumb tright">
+<div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
+<div class="thumbcaption">
+<div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>
+<a class="external mw-magiclink-pmid" rel="nofollow" href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract">PMID 1234</a></div>
+</div>
+</div>
+<div class="thumb tright">
+<div class="thumbinner" style="width:182px;"><a href="/wiki/File:Foobar.jpg" class="image"><img alt="" src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg" width="180" height="20" class="thumbimage" srcset="http://example.com/images/thumb/3/3a/Foobar.jpg/270px-Foobar.jpg 1.5x, http://example.com/images/thumb/3/3a/Foobar.jpg/360px-Foobar.jpg 2x" /></a>
+<div class="thumbcaption">
+<div class="magnify"><a href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"></a></div>
+<a href="/wiki/Special:BookSources/123456789X" class="internal mw-magiclink-isbn">ISBN 123456789x</a></div>
+</div>
+</div>
+!! html/parsoid
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a rel="mw:ExtLink" href="http://example.com">http://example.com</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a href="//tools.ietf.org/html/rfc1234" rel="mw:ExtLink">RFC 1234</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a href="//www.ncbi.nlm.nih.gov/pubmed/1234?dopt=Abstract" rel="mw:ExtLink">PMID 1234</a></figcaption></figure>
+<figure class="mw-default-size" typeof="mw:Image/Thumb"><a href="./File:Foobar.jpg"><img resource="./File:Foobar.jpg" src="//example.com/images/thumb/3/3a/Foobar.jpg/220px-Foobar.jpg" data-file-width="1941" data-file-height="220" data-file-type="bitmap" height="25" width="220"/></a><figcaption><a href="./Special:BookSources/123456789X" rel="mw:WikiLink">ISBN 123456789x</a></figcaption></figure>
+!! end
+
+!! test
+WTS of magic word text (T109371)
+!! options
+parsoid=html2wt
+!! html/parsoid
+<p>RFC 1234</p>
+<p><a href="http://foo.com" rel="mw:ExtLink">RFC 1234</a></p>
+<p><a href="./Foo" rel="mw:WikiLink">RFC 1234</a></p>
+!! wikitext
+<nowiki>RFC 1234</nowiki>
+
+[http://foo.com RFC 1234]
+
+[[Foo|RFC 1234]]
+!! end
+
 !! test
 Edited Redirect link should emit a non-piped wikitext link
 !! options
@@ -25796,6 +26054,16 @@ parsoid={
 </table>
 !! end
 
+!! test
+Escape nowiki DOM elements
+!! options
+parsoid=html2wt
+!! html/parsoid
+<nowiki><i>foo</i></nowiki>
+!! wikitext
+&lt;nowiki&gt;''foo''&lt;/nowiki&gt;
+!! end
+
 # ---------------------------------------------------
 # End of tests spec'ing wikitext serialization norms |
 # ---------------------------------------------------
diff --git a/tests/phpunit/Makefile b/tests/phpunit/Makefile
index a33b86a353..e1537bf5cc 100644
--- a/tests/phpunit/Makefile
+++ b/tests/phpunit/Makefile
@@ -73,7 +73,6 @@ help:
 	#
 	# Targets:
 	#   phpunit (default)   Run all the tests with phpunit
-	#   install             Install PHPUnit from phpunit.de
 	#   tap                 Run the tests individually through Test::Harness's prove(1)
 	#   help                You're looking at it!
 	#   coverage            Run the tests and generates an HTML code coverage report
diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 43d8ce8691..7dc7027afb 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -208,6 +208,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 
 		DeferredUpdates::clearPendingUpdates();
 
+		ob_start( 'MediaWikiTestCase::wfResetOutputBuffersBarrier' );
 	}
 
 	protected function addTmpFiles( $files ) {
@@ -215,6 +216,11 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 	}
 
 	protected function tearDown() {
+		$status = ob_get_status();
+		if ( isset( $status['name'] ) && $status['name'] === 'MediaWikiTestCase::wfResetOutputBuffersBarrier' ) {
+			ob_end_flush();
+		}
+
 		$this->called['tearDown'] = true;
 		// Cleaning up temporary files
 		foreach ( $this->tmpFiles as $fileName ) {
@@ -1111,7 +1117,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 		// of tidy. In that case however, we can not reliably detect whether a failing validation
 		// is due to malformed HTML, or caused by tidy not being installed as a command line tool.
 		// That would cause all HTML assertions to fail on a system that has no tidy installed.
-		if ( !$GLOBALS['wgTidyInternal'] ) {
+		if ( !$GLOBALS['wgTidyInternal'] || !MWTidy::isEnabled() ) {
 			$this->markTestSkipped( 'Tidy extension not installed' );
 		}
 
@@ -1174,4 +1180,12 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
 
 		self::assertFalse( self::tagMatch( $matcher, $actual, $isHtml ), $message );
 	}
+
+	/**
+	 * Used as a marker to prevent wfResetOutputBuffers from breaking PHPUnit.
+	 * @return string
+	 */
+	public static function wfResetOutputBuffersBarrier( $buffer ) {
+		return $buffer;
+	}
 }
diff --git a/tests/phpunit/data/helpers/WellProtectedClass.php b/tests/phpunit/data/helpers/WellProtectedClass.php
index 99c7f642f2..a45cfbbfc3 100644
--- a/tests/phpunit/data/helpers/WellProtectedClass.php
+++ b/tests/phpunit/data/helpers/WellProtectedClass.php
@@ -1,20 +1,47 @@
 <?php
 
-class WellProtectedClass {
+class WellProtectedParentClass {
+	private $privateParentProperty;
+
+	public function __construct() {
+		$this->privateParentProperty = 9000;
+	}
+
+	private function incrementPrivateParentPropertyValue() {
+		$this->privateParentProperty++;
+	}
+
+	public function getPrivateParentProperty() {
+		return $this->privateParentProperty;
+	}
+}
+
+class WellProtectedClass extends WellProtectedParentClass {
 	protected $property;
+	private $privateProperty;
 
 	public function __construct() {
+		parent::__construct();
 		$this->property = 1;
+		$this->privateProperty = 42;
 	}
 
 	protected function incrementPropertyValue() {
 		$this->property++;
 	}
 
+	private function incrementPrivatePropertyValue() {
+		$this->privateProperty++;
+	}
+
 	public function getProperty() {
 		return $this->property;
 	}
 
+	public function getPrivateProperty() {
+		return $this->privateProperty;
+	}
+
 	protected function whatSecondArg( $a, $b = false ) {
 		return $b;
 	}
diff --git a/tests/phpunit/data/less/common/test.common.mixins.less b/tests/phpunit/data/less/common/test.common.mixins.less
index 2fbe9b79eb..40647291e1 100644
--- a/tests/phpunit/data/less/common/test.common.mixins.less
+++ b/tests/phpunit/data/less/common/test.common.mixins.less
@@ -1,5 +1,4 @@
 .test-mixin (@value) {
 	color: @value;
 	border: @foo solid @Foo;
-	line-height: test-sum(@bar, 10, 20);
 }
diff --git a/tests/phpunit/data/less/module/styles.css b/tests/phpunit/data/less/module/styles.css
index b78780a903..e8099d10f1 100644
--- a/tests/phpunit/data/less/module/styles.css
+++ b/tests/phpunit/data/less/module/styles.css
@@ -2,5 +2,4 @@
 .unit-tests {
   color: green;
   border: 2px solid #eeeeee;
-  line-height: 35;
 }
diff --git a/tests/phpunit/includes/ExtraParserTest.php b/tests/phpunit/includes/ExtraParserTest.php
index 77b26b3bd4..7b60fb3f74 100644
--- a/tests/phpunit/includes/ExtraParserTest.php
+++ b/tests/phpunit/includes/ExtraParserTest.php
@@ -22,7 +22,6 @@ class ExtraParserTest extends MediaWikiTestCase {
 			'wgContLang' => $contLang,
 			'wgLang' => Language::factory( 'en' ),
 			'wgMemc' => new EmptyBagOStuff,
-			'wgAlwaysUseTidy' => false,
 			'wgCleanSignatures' => true,
 		) );
 
diff --git a/tests/phpunit/includes/GlobalFunctions/wfArrayPlus2dTest.php b/tests/phpunit/includes/GlobalFunctions/wfArrayPlus2dTest.php
new file mode 100644
index 0000000000..88875bb012
--- /dev/null
+++ b/tests/phpunit/includes/GlobalFunctions/wfArrayPlus2dTest.php
@@ -0,0 +1,94 @@
+<?php
+/**
+ * @group GlobalFunctions
+ * @covers ::wfArrayPlus2d
+ */
+class WfArrayPlus2dTest extends MediaWikiTestCase {
+	/**
+	 * @dataProvider provideArrays
+	 */
+	public function testWfArrayPlus2d( $baseArray, $newValues, $expected, $testName ) {
+		$this->assertEquals(
+			$expected,
+			wfArrayPlus2d( $baseArray, $newValues ),
+			$testName
+		);
+	}
+
+	/**
+	 * Provider for testing wfArrayPlus2d
+	 *
+	 * @return array
+	 */
+	public static function provideArrays() {
+		return array(
+			// target array, new values array, expected result
+			array(
+				array( 0 => '1dArray' ),
+				array( 1 => '1dArray' ),
+				array( 0 => '1dArray', 1 => '1dArray' ),
+				"Test simple union of two arrays with different keys",
+			),
+			array(
+				array(
+					0 => array( 0 => '2dArray' ),
+				),
+				array(
+					0 => array( 1 => '2dArray' ),
+				),
+				array(
+					0 => array( 0 => '2dArray', 1 => '2dArray' ),
+				),
+				"Test union of 2d arrays with different keys in the value array",
+			),
+			array(
+				array(
+					0 => array( 0 => '2dArray' ),
+				),
+				array(
+					0 => array( 0 => '1dArray' ),
+				),
+				array(
+					0 => array( 0 => '2dArray' ),
+				),
+				"Test union of 2d arrays with same keys in the value array",
+			),
+			array(
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ) ),
+				),
+				array(
+					0 => array( 0 => array( 1 => '2dArray' ) ),
+				),
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ) ),
+				),
+				"Test union of 3d array with different keys",
+			),
+			array(
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ) ),
+				),
+				array(
+					0 => array( 1 => array( 0 => '2dArray' ) ),
+				),
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ), 1 => array( 0 => '2dArray' ) ),
+				),
+				"Test union of 3d array with different keys in the value array",
+			),
+			array(
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ) ),
+				),
+				array(
+					0 => array( 0 => array( 0 => '2dArray' ) ),
+				),
+				array(
+					0 => array( 0 => array( 0 => '3dArray' ) ),
+				),
+				"Test union of 3d array with same keys in the value array",
+			),
+		);
+	}
+}
diff --git a/tests/phpunit/includes/LinkerTest.php b/tests/phpunit/includes/LinkerTest.php
index 823c9330a6..a3efbb8da0 100644
--- a/tests/phpunit/includes/LinkerTest.php
+++ b/tests/phpunit/includes/LinkerTest.php
@@ -93,12 +93,26 @@ class LinkerTest extends MediaWikiLangTestCase {
 	 * @covers Linker::formatAutocomments
 	 * @covers Linker::formatLinksInComment
 	 */
-	public function testFormatComment( $expected, $comment, $title = false, $local = false ) {
+	public function testFormatComment( $expected, $comment, $title = false, $local = false, $wikiId = null ) {
+		$conf = new SiteConfiguration();
+		$conf->settings = array(
+			'wgServer' => array(
+				'enwiki' => '//en.example.org',
+				'dewiki' => '//de.example.org',
+			),
+			'wgArticlePath' => array(
+				'enwiki' => '/w/$1',
+				'dewiki' => '/w/$1',
+			),
+		);
+		$conf->suffixes = array( 'wiki' );
+
 		$this->setMwGlobals( array(
 			'wgScript' => '/wiki/index.php',
 			'wgArticlePath' => '/wiki/$1',
 			'wgWellFormedXml' => true,
 			'wgCapitalLinks' => true,
+			'wgConf' => $conf,
 		) );
 
 		if ( $title === false ) {
@@ -108,11 +122,13 @@ class LinkerTest extends MediaWikiLangTestCase {
 
 		$this->assertEquals(
 			$expected,
-			Linker::formatComment( $comment, $title, $local )
+			Linker::formatComment( $comment, $title, $local, $wikiId )
 		);
 	}
 
-	public static function provideCasesForFormatComment() {
+	public function provideCasesForFormatComment() {
+		$wikiId = 'enwiki'; // $wgConf has a fake entry for this
+
 		return array(
 			// Linker::formatComment
 			array(
@@ -127,6 +143,10 @@ class LinkerTest extends MediaWikiLangTestCase {
 				"&#039;&#039;&#039;not bolded&#039;&#039;&#039;",
 				"'''not bolded'''",
 			),
+			array(
+				"try &lt;script&gt;evil&lt;/scipt&gt; things",
+				"try <script>evil</scipt> things",
+			),
 			// Linker::formatAutocomments
 			array(
 				'<a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a>‎<span dir="auto"><span class="autocomment">autocomment</span></span>',
@@ -156,6 +176,14 @@ class LinkerTest extends MediaWikiLangTestCase {
 				'<a href="/wiki/Special:BlankPage#autocomment_containing_.2F.2A" title="Special:BlankPage">→</a>‎<span dir="auto"><span class="autocomment">autocomment containing /*: </span> T70361</span>',
 				"/* autocomment containing /* */ T70361"
 			),
+			array(
+				'<a href="/wiki/Special:BlankPage#autocomment_containing_.22quotes.22" title="Special:BlankPage">→</a>‎<span dir="auto"><span class="autocomment">autocomment containing &quot;quotes&quot;</span></span>',
+				"/* autocomment containing \"quotes\" */"
+			),
+			array(
+				'<a href="/wiki/Special:BlankPage#autocomment_containing_.3Cscript.3Etags.3C.2Fscript.3E" title="Special:BlankPage">→</a>‎<span dir="auto"><span class="autocomment">autocomment containing &lt;script&gt;tags&lt;/script&gt;</span></span>',
+				"/* autocomment containing <script>tags</script> */"
+			),
 			array(
 				'<a href="#autocomment">→</a>‎<span dir="auto"><span class="autocomment">autocomment</span></span>',
 				"/* autocomment */",
@@ -166,6 +194,16 @@ class LinkerTest extends MediaWikiLangTestCase {
 				"/* autocomment */",
 				null
 			),
+			array(
+				'<a href="/wiki/Special:BlankPage#autocomment" title="Special:BlankPage">→</a>‎<span dir="auto"><span class="autocomment">autocomment</span></span>',
+				"/* autocomment */",
+				false, false
+			),
+			array(
+				'<a class="external" rel="nofollow" href="//en.example.org/w/Special:BlankPage#autocomment">→</a>‎<span dir="auto"><span class="autocomment">autocomment</span></span>',
+				"/* autocomment */",
+				false, false, $wikiId
+			),
 			// Linker::formatLinksInComment
 			array(
 				'abc <a href="/wiki/index.php?title=Link&amp;action=edit&amp;redlink=1" class="new" title="Link (page does not exist)">link</a> def',
@@ -191,6 +229,28 @@ class LinkerTest extends MediaWikiLangTestCase {
 				'abc <a href="/wiki/index.php?title=/subpage&amp;action=edit&amp;redlink=1" class="new" title="/subpage (page does not exist)">/subpage</a> def',
 				"abc [[/subpage]] def",
 			),
+			array(
+				'abc <a href="/wiki/index.php?title=%22evil!%22&amp;action=edit&amp;redlink=1" class="new" title="&quot;evil!&quot; (page does not exist)">&quot;evil!&quot;</a> def',
+				"abc [[\"evil!\"]] def",
+			),
+			array(
+				'abc [[&lt;script&gt;very evil&lt;/script&gt;]] def',
+				"abc [[<script>very evil</script>]] def",
+			),
+			array(
+				'abc [[|]] def',
+				"abc [[|]] def",
+			),
+			array(
+				'abc <a href="/wiki/index.php?title=Link&amp;action=edit&amp;redlink=1" class="new" title="Link (page does not exist)">link</a> def',
+				"abc [[link]] def",
+				false, false
+			),
+			array(
+				'abc <a class="external" rel="nofollow" href="//en.example.org/w/Link">link</a> def',
+				"abc [[link]] def",
+				false, false, $wikiId
+			)
 		);
 	}
 
diff --git a/tests/phpunit/includes/OutputPageTest.php b/tests/phpunit/includes/OutputPageTest.php
index ee2b278d4c..f0d905e599 100644
--- a/tests/phpunit/includes/OutputPageTest.php
+++ b/tests/phpunit/includes/OutputPageTest.php
@@ -259,6 +259,86 @@ class OutputPageTest extends MediaWikiTestCase {
 		$actualHtml = implode( "\n", $links['html'] );
 		$this->assertEquals( $expectedHtml, $actualHtml );
 	}
+
+	/**
+	 * @dataProvider provideVaryHeaders
+	 * @covers OutputPage::addVaryHeader
+	 * @covers OutputPage::getVaryHeader
+	 * @covers OutputPage::getXVO
+	 */
+	public function testVaryHeaders( $calls, $vary, $xvo ) {
+		// get rid of default Vary fields
+		$outputPage = $this->getMockBuilder( 'OutputPage' )
+			->setConstructorArgs( array( new RequestContext() ) )
+			->setMethods( array( 'getCacheVaryCookies' ) )
+			->getMock();
+		$outputPage->expects( $this->any() )
+			->method( 'getCacheVaryCookies' )
+			->will( $this->returnValue( array() ) );
+		TestingAccessWrapper::newFromObject( $outputPage )->mVaryHeader = array();
+
+		foreach ( $calls as $call ) {
+			call_user_func_array( array( $outputPage, 'addVaryHeader' ), $call );
+		}
+		$this->assertEquals( $vary, $outputPage->getVaryHeader(), 'Vary:' );
+		$this->assertEquals( $xvo, $outputPage->getXVO(), 'X-Vary-Options:' );
+	}
+
+	public function provideVaryHeaders() {
+		// note: getXVO() automatically adds Vary: Cookie
+		return array(
+			array( // single header
+				array(
+					array( 'Cookie' ),
+				),
+				'Vary: Cookie',
+				'X-Vary-Options: Cookie',
+			),
+			array( // non-unique headers
+				array(
+					array( 'Cookie' ),
+					array( 'Accept-Language' ),
+					array( 'Cookie' ),
+				),
+				'Vary: Cookie, Accept-Language',
+				'X-Vary-Options: Cookie,Accept-Language',
+			),
+			array( // two headers with single options
+				array(
+					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
+					array( 'Accept-Language', array( 'string-contains=en' ) ),
+				),
+				'Vary: Cookie, Accept-Language',
+				'X-Vary-Options: Cookie;string-contains=phpsessid,Accept-Language;string-contains=en',
+			),
+			array( // one header with multiple options
+				array(
+					array( 'Cookie', array( 'string-contains=phpsessid', 'string-contains=userId' ) ),
+				),
+				'Vary: Cookie',
+				'X-Vary-Options: Cookie;string-contains=phpsessid;string-contains=userId',
+			),
+			array( // Duplicate option
+				array(
+					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
+					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
+					array( 'Accept-Language', array( 'string-contains=en', 'string-contains=en' ) ),
+
+
+				),
+				'Vary: Cookie, Accept-Language',
+				'X-Vary-Options: Cookie;string-contains=phpsessid,Accept-Language;string-contains=en',
+			),
+			array( // Same header, different options
+				array(
+					array( 'Cookie', array( 'string-contains=phpsessid' ) ),
+					array( 'Cookie', array( 'string-contains=userId' ) ),
+				),
+				'Vary: Cookie',
+				'X-Vary-Options: Cookie;string-contains=phpsessid;string-contains=userId',
+			),
+		);
+	}
 }
 
 /**
diff --git a/tests/phpunit/includes/SanitizerTest.php b/tests/phpunit/includes/SanitizerTest.php
index c615c460c9..d3dc512bea 100644
--- a/tests/phpunit/includes/SanitizerTest.php
+++ b/tests/phpunit/includes/SanitizerTest.php
@@ -6,6 +6,11 @@
  */
 class SanitizerTest extends MediaWikiTestCase {
 
+	protected function tearDown() {
+		MWTidy::destroySingleton();
+		parent::tearDown();
+	}
+
 	/**
 	 * @covers Sanitizer::decodeCharReferences
 	 */
@@ -93,9 +98,7 @@ class SanitizerTest extends MediaWikiTestCase {
 	 * @param bool $escaped Whether sanitizer let the tag in or escape it (ie: '&lt;video&gt;')
 	 */
 	public function testRemovehtmltagsOnHtml5Tags( $tag, $escaped ) {
-		$this->setMwGlobals( array(
-			'wgUseTidy' => false
-		) );
+		MWTidy::setInstance( false );
 
 		if ( $escaped ) {
 			$this->assertEquals( "&lt;$tag&gt;",
@@ -157,7 +160,7 @@ class SanitizerTest extends MediaWikiTestCase {
 	 * @covers Sanitizer::removeHTMLtags
 	 */
 	public function testRemoveHTMLtags( $input, $output, $msg = null ) {
-		$GLOBALS['wgUseTidy'] = false;
+		MWTidy::setInstance( false );
 		$this->assertEquals( $output, Sanitizer::removeHTMLtags( $input ), $msg );
 	}
 
@@ -360,5 +363,4 @@ class SanitizerTest extends MediaWikiTestCase {
 			array( '&lt;script&gt;foo&lt;/script&gt;', '<script>foo</script>' ),
 		);
 	}
-
 }
diff --git a/tests/phpunit/includes/TestingAccessWrapper.php b/tests/phpunit/includes/TestingAccessWrapper.php
index 84c0f9b5be..63d897198b 100644
--- a/tests/phpunit/includes/TestingAccessWrapper.php
+++ b/tests/phpunit/includes/TestingAccessWrapper.php
@@ -34,16 +34,42 @@ class TestingAccessWrapper {
 		return $methodReflection->invokeArgs( $this->object, $args );
 	}
 
-	public function __set( $name, $value ) {
+	/**
+	 * ReflectionClass::getProperty() fails if the private property is defined
+	 * in a parent class. This works more like ReflectionClass::getMethod().
+	 */
+	private function getProperty( $name ) {
 		$classReflection = new ReflectionClass( $this->object );
-		$propertyReflection = $classReflection->getProperty( $name );
+		try {
+			return $classReflection->getProperty( $name );
+		} catch ( ReflectionException $ex ) {
+			while ( true ) {
+				$classReflection = $classReflection->getParentClass();
+				if ( !$classReflection ) {
+					throw $ex;
+				}
+				try {
+					$propertyReflection = $classReflection->getProperty( $name );
+				} catch ( ReflectionException $ex2 ) {
+					continue;
+				}
+				if ( $propertyReflection->isPrivate() ) {
+					return $propertyReflection;
+				} else {
+					throw $ex;
+				}
+			}
+		}
+	}
+
+	public function __set( $name, $value ) {
+		$propertyReflection = $this->getProperty( $name );
 		$propertyReflection->setAccessible( true );
 		$propertyReflection->setValue( $this->object, $value );
 	}
 
 	public function __get( $name ) {
-		$classReflection = new ReflectionClass( $this->object );
-		$propertyReflection = $classReflection->getProperty( $name );
+		$propertyReflection = $this->getProperty( $name );
 		$propertyReflection->setAccessible( true );
 		return $propertyReflection->getValue( $this->object );
 	}
diff --git a/tests/phpunit/includes/TestingAccessWrapperTest.php b/tests/phpunit/includes/TestingAccessWrapperTest.php
index 7e5b91a119..fc54afae33 100644
--- a/tests/phpunit/includes/TestingAccessWrapperTest.php
+++ b/tests/phpunit/includes/TestingAccessWrapperTest.php
@@ -14,18 +14,36 @@ class TestingAccessWrapperTest extends MediaWikiTestCase {
 
 	function testGetProperty() {
 		$this->assertSame( 1, $this->wrapped->property );
+		$this->assertSame( 42, $this->wrapped->privateProperty );
+		$this->assertSame( 9000, $this->wrapped->privateParentProperty );
 	}
 
 	function testSetProperty() {
 		$this->wrapped->property = 10;
 		$this->assertSame( 10, $this->wrapped->property );
 		$this->assertSame( 10, $this->raw->getProperty() );
+
+		$this->wrapped->privateProperty = 11;
+		$this->assertSame( 11, $this->wrapped->privateProperty );
+		$this->assertSame( 11, $this->raw->getPrivateProperty() );
+
+		$this->wrapped->privateParentProperty = 12;
+		$this->assertSame( 12, $this->wrapped->privateParentProperty );
+		$this->assertSame( 12, $this->raw->getPrivateParentProperty() );
 	}
 
 	function testCallMethod() {
 		$this->wrapped->incrementPropertyValue();
 		$this->assertSame( 2, $this->wrapped->property );
 		$this->assertSame( 2, $this->raw->getProperty() );
+
+		$this->wrapped->incrementPrivatePropertyValue();
+		$this->assertSame( 43, $this->wrapped->privateProperty );
+		$this->assertSame( 43, $this->raw->getPrivateProperty() );
+
+		$this->wrapped->incrementPrivateParentPropertyValue();
+		$this->assertSame( 9001, $this->wrapped->privateParentProperty );
+		$this->assertSame( 9001, $this->raw->getPrivateParentProperty() );
 	}
 
 	function testCallMethodTwoArgs() {
diff --git a/tests/phpunit/includes/WikiMapTest.php b/tests/phpunit/includes/WikiMapTest.php
new file mode 100644
index 0000000000..9233416c74
--- /dev/null
+++ b/tests/phpunit/includes/WikiMapTest.php
@@ -0,0 +1,108 @@
+<?php
+
+/**
+ * @covers WikiMap
+ */
+
+class WikiMapTest extends MediaWikiLangTestCase {
+
+	public function setUp() {
+		parent::setUp();
+
+		$conf = new SiteConfiguration();
+		$conf->settings = array(
+			'wgServer' => array(
+				'enwiki' => 'http://en.example.org',
+				'ruwiki' => '//ru.example.org',
+			),
+			'wgArticlePath' => array(
+				'enwiki' => '/w/$1',
+				'ruwiki' => '/wiki/$1',
+			),
+		);
+		$conf->suffixes = array( 'wiki' );
+		$this->setMwGlobals( array(
+			'wgConf' => $conf,
+		) );
+	}
+
+	public function provideGetWiki() {
+		$enwiki = new WikiReference( 'wiki', 'en', 'http://en.example.org', '/w/$1' );
+		$ruwiki = new WikiReference( 'wiki', 'ru', '//ru.example.org', '/wiki/$1' );
+
+		return array(
+			'unknown' => array( false, 'xyzzy' ),
+			'enwiki' => array( $enwiki, 'enwiki' ),
+			'ruwiki' => array( $ruwiki, 'ruwiki' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetWiki
+	 */
+	public function testGetWiki( $expected, $wikiId ) {
+		$this->assertEquals( $expected, WikiMap::getWiki( $wikiId ) );
+	}
+
+	public function provideGetWikiName() {
+		return array(
+			'unknown' => array( 'xyzzy', 'xyzzy' ),
+			'enwiki' => array( 'en.example.org', 'enwiki' ),
+			'ruwiki' => array( 'ru.example.org', 'ruwiki' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetWikiName
+	 */
+	public function testGetWikiName( $expected, $wikiId ) {
+		$this->assertEquals( $expected, WikiMap::getWikiName( $wikiId ) );
+	}
+
+	public function provideMakeForeignLink() {
+		return array(
+			'unknown' => array( false, 'xyzzy', 'Foo' ),
+			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/Foo">Foo</a>', 'enwiki', 'Foo',  ),
+			'ruwiki' => array( '<a class="external" rel="nofollow" href="//ru.example.org/wiki/%D0%A4%D1%83">вар</a>', 'ruwiki', 'Фу', 'вар' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideMakeForeignLink
+	 */
+	public function testMakeForeignLink( $expected, $wikiId, $page, $text = null ) {
+		$this->assertEquals( $expected, WikiMap::makeForeignLink( $wikiId, $page, $text ) );
+	}
+
+	public function provideForeignUserLink() {
+		return array(
+			'unknown' => array( false, 'xyzzy', 'Foo' ),
+			'enwiki' => array( '<a class="external" rel="nofollow" href="http://en.example.org/w/User:Foo">User:Foo</a>', 'enwiki', 'Foo',  ),
+			'ruwiki' => array( '<a class="external" rel="nofollow" href="//ru.example.org/wiki/User:%D0%A4%D1%83">вар</a>', 'ruwiki', 'Фу', 'вар' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideForeignUserLink
+	 */
+	public function testForeignUserLink( $expected, $wikiId, $user, $text = null ) {
+		$this->assertEquals( $expected, WikiMap::foreignUserLink( $wikiId, $user, $text ) );
+	}
+
+	public function provideGetForeignURL() {
+		return array(
+			'unknown' => array( false, 'xyzzy', 'Foo' ),
+			'enwiki' => array( 'http://en.example.org/w/Foo', 'enwiki', 'Foo',  ),
+			'ruwiki with fragement' => array( '//ru.example.org/wiki/%D0%A4%D1%83#%D0%B2%D0%B0%D1%80', 'ruwiki', 'Фу', 'вар' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetForeignURL
+	 */
+	public function testGetForeignURL( $expected, $wikiId, $page, $fragment = null ) {
+		$this->assertEquals( $expected, WikiMap::getForeignURL( $wikiId, $page, $fragment ) );
+	}
+
+}
+
diff --git a/tests/phpunit/includes/WikiReferenceTest.php b/tests/phpunit/includes/WikiReferenceTest.php
new file mode 100644
index 0000000000..4fe2e855b6
--- /dev/null
+++ b/tests/phpunit/includes/WikiReferenceTest.php
@@ -0,0 +1,80 @@
+<?php
+
+/**
+ * @covers WikiReference
+ */
+
+class WikiReferenceTest extends PHPUnit_Framework_TestCase {
+
+	public function provideGetDisplayName() {
+		return array(
+			'http' => array( 'foo.bar', 'http://foo.bar' ),
+			'https' => array( 'foo.bar', 'http://foo.bar' ),
+
+			// apparently, this is the expected behavior
+			'invalid' => array( 'purple kittens', 'purple kittens' ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetDisplayName
+	 */
+	public function testGetDisplayName( $expected, $canonicalServer ) {
+		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, '/wiki/$1' );
+		$this->assertEquals( $expected, $reference->getDisplayName() );
+	}
+
+	public function testGetCanonicalServer() {
+		$reference = new WikiReference( 'wiki', 'xx', 'https://acme.com', '/wiki/$1', '//acme.com' );
+		$this->assertEquals( 'https://acme.com', $reference->getCanonicalServer() );
+	}
+
+	public function provideGetCanonicalUrl() {
+		return array(
+			'no fragement' => array( 'https://acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', null ),
+			'empty fragement' => array( 'https://acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', '' ),
+			'fragment' => array( 'https://acme.com/wiki/Foo#Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar' ),
+			'double fragment' => array( 'https://acme.com/wiki/Foo#Bar%23Xus', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar#Xus' ),
+			'escaped fragement' => array( 'https://acme.com/wiki/Foo%23Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo#Bar', null ),
+			'empty path' => array( 'https://acme.com/Foo', 'https://acme.com', '//acme.com', '/$1', 'Foo', null ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetCanonicalUrl
+	 */
+	public function testGetCanonicalUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
+		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+		$this->assertEquals( $expected, $reference->getCanonicalUrl( $page, $fragmentId ) );
+	}
+
+	/**
+	 * @dataProvider provideGetCanonicalUrl
+	 * @note getUrl is an alias for getCanonicalUrl
+	 */
+	public function testGetUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
+		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+		$this->assertEquals( $expected, $reference->getUrl( $page, $fragmentId ) );
+	}
+
+	public function provideGetFullUrl() {
+		return array(
+			'no fragement' => array( '//acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', null ),
+			'empty fragement' => array( '//acme.com/wiki/Foo', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', '' ),
+			'fragment' => array( '//acme.com/wiki/Foo#Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar' ),
+			'double fragment' => array( '//acme.com/wiki/Foo#Bar%23Xus', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo', 'Bar#Xus' ),
+			'escaped fragement' => array( '//acme.com/wiki/Foo%23Bar', 'https://acme.com', '//acme.com', '/wiki/$1', 'Foo#Bar', null ),
+			'empty path' => array( '//acme.com/Foo', 'https://acme.com', '//acme.com', '/$1', 'Foo', null ),
+		);
+	}
+
+	/**
+	 * @dataProvider provideGetFullUrl
+	 */
+	public function testGetFullUrl( $expected, $canonicalServer, $server, $path, $page, $fragmentId ) {
+		$reference = new WikiReference( 'wiki', 'xx', $canonicalServer, $path, $server );
+		$this->assertEquals( $expected, $reference->getFullUrl( $page, $fragmentId ) );
+	}
+
+}
+
diff --git a/tests/phpunit/includes/api/ApiMainTest.php b/tests/phpunit/includes/api/ApiMainTest.php
index ee1a9546d4..94b741dcac 100644
--- a/tests/phpunit/includes/api/ApiMainTest.php
+++ b/tests/phpunit/includes/api/ApiMainTest.php
@@ -79,4 +79,173 @@ class ApiMainTest extends ApiTestCase {
 			);
 		}
 	}
+
+	/**
+	 * Test HTTP precondition headers
+	 *
+	 * @covers ApiMain::checkConditionalRequestHeaders
+	 * @dataProvider provideCheckConditionalRequestHeaders
+	 * @param array $headers HTTP headers
+	 * @param array $conditions Return data for ApiBase::getConditionalRequestData
+	 * @param int $status Expected response status
+	 * @param bool $post Request is a POST
+	 */
+	public function testCheckConditionalRequestHeaders( $headers, $conditions, $status, $post = false ) {
+		$request = new FauxRequest( array( 'action' => 'query', 'meta' => 'siteinfo' ), $post );
+		$request->setHeaders( $headers );
+		$request->response()->statusHeader( 200 ); // Why doesn't it default?
+
+		$api = new ApiMain( $request );
+		$priv = TestingAccessWrapper::newFromObject( $api );
+		$priv->mInternalMode = false;
+
+		$module = $this->getMockBuilder( 'ApiBase' )
+			->setConstructorArgs( array( $api, 'mock' ) )
+			->setMethods( array( 'getConditionalRequestData' ) )
+			->getMockForAbstractClass();
+		$module->expects( $this->any() )
+			->method( 'getConditionalRequestData' )
+			->will( $this->returnCallback( function ( $condition ) use ( $conditions ) {
+				return isset( $conditions[$condition] ) ? $conditions[$condition] : null;
+			} ) );
+
+		$ret = $priv->checkConditionalRequestHeaders( $module );
+
+		$this->assertSame( $status, $request->response()->getStatusCode() );
+		$this->assertSame( $status === 200, $ret );
+	}
+
+	public static function provideCheckConditionalRequestHeaders() {
+		$now = time();
+
+		return array(
+			// Non-existing from module is ignored
+			array( array( 'If-None-Match' => '"foo", "bar"' ), array(), 200 ),
+			array( array( 'If-Modified-Since' => 'Tue, 18 Aug 2015 00:00:00 GMT' ), array(), 200 ),
+
+			// No headers
+			array(
+				array(),
+				array(
+					'etag' => '""',
+					'last-modified' => '20150815000000',
+				),
+				200
+			),
+
+			// Basic If-None-Match
+			array( array( 'If-None-Match' => '"foo", "bar"' ), array( 'etag' => '"bar"' ), 304 ),
+			array( array( 'If-None-Match' => '"foo", "bar"' ), array( 'etag' => '"baz"' ), 200 ),
+			array( array( 'If-None-Match' => '"foo"' ), array( 'etag' => 'W/"foo"' ), 304 ),
+			array( array( 'If-None-Match' => 'W/"foo"' ), array( 'etag' => '"foo"' ), 304 ),
+			array( array( 'If-None-Match' => 'W/"foo"' ), array( 'etag' => 'W/"foo"' ), 304 ),
+
+			// Pointless, but supported
+			array( array( 'If-None-Match' => '*' ), array(), 304 ),
+
+			// Basic If-Modified-Since
+			array( array( 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 304 ),
+			array( array( 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now ) ), 304 ),
+			array( array( 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now + 1 ) ), 200 ),
+
+			// If-Modified-Since ignored when If-None-Match is given too
+			array( array( 'If-None-Match' => '""', 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'etag' => '"x"', 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 200 ),
+			array( array( 'If-None-Match' => '""', 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 304 ),
+
+			// Ignored for POST
+			array( array( 'If-None-Match' => '"foo", "bar"' ), array( 'etag' => '"bar"' ), 200, true ),
+			array( array( 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 200, true ),
+
+			// Other date formats allowed by the RFC
+			array( array( 'If-Modified-Since' => gmdate( 'l, d-M-y H:i:s', $now ) . ' GMT' ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 304 ),
+			array( array( 'If-Modified-Since' => gmdate( 'D M j H:i:s Y', $now ) ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 304 ),
+
+			// Old browser extension to HTTP/1.0
+			array( array( 'If-Modified-Since' => wfTimestamp( TS_RFC2822, $now ) . '; length=123' ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 304 ),
+
+			// Invalid date formats should be ignored
+			array( array( 'If-Modified-Since' => gmdate( 'Y-m-d H:i:s', $now ) . ' GMT' ),
+				array( 'last-modified' => wfTimestamp( TS_MW, $now - 1 ) ), 200 ),
+		);
+	}
+
+	/**
+	 * Test conditional headers output
+	 * @dataProvider provideConditionalRequestHeadersOutput
+	 * @param array $conditions Return data for ApiBase::getConditionalRequestData
+	 * @param array $headers Expected output headers
+	 * @param bool $isError $isError flag
+	 * @param bool $post Request is a POST
+	 */
+	public function testConditionalRequestHeadersOutput( $conditions, $headers, $isError = false, $post = false ) {
+		$request = new FauxRequest( array( 'action' => 'query', 'meta' => 'siteinfo' ), $post );
+		$response = $request->response();
+
+		$api = new ApiMain( $request );
+		$priv = TestingAccessWrapper::newFromObject( $api );
+		$priv->mInternalMode = false;
+
+		$module = $this->getMockBuilder( 'ApiBase' )
+			->setConstructorArgs( array( $api, 'mock' ) )
+			->setMethods( array( 'getConditionalRequestData' ) )
+			->getMockForAbstractClass();
+		$module->expects( $this->any() )
+			->method( 'getConditionalRequestData' )
+			->will( $this->returnCallback( function ( $condition ) use ( $conditions ) {
+				return isset( $conditions[$condition] ) ? $conditions[$condition] : null;
+			} ) );
+		$priv->mModule = $module;
+
+		$priv->sendCacheHeaders( $isError );
+
+		foreach ( array( 'Last-Modified', 'ETag' ) as $header ) {
+			$this->assertEquals(
+				isset( $headers[$header] ) ? $headers[$header] : null,
+				$response->getHeader( $header ),
+				$header
+			);
+		}
+	}
+
+	public static function provideConditionalRequestHeadersOutput() {
+		return array(
+			array(
+				array(),
+				array()
+			),
+			array(
+				array( 'etag' => '"foo"' ),
+				array( 'ETag' => '"foo"' )
+			),
+			array(
+				array( 'last-modified' => '20150818000102' ),
+				array( 'Last-Modified' => 'Tue, 18 Aug 2015 00:01:02 GMT' )
+			),
+			array(
+				array( 'etag' => '"foo"', 'last-modified' => '20150818000102' ),
+				array( 'ETag' => '"foo"', 'Last-Modified' => 'Tue, 18 Aug 2015 00:01:02 GMT' )
+			),
+			array(
+				array( 'etag' => '"foo"', 'last-modified' => '20150818000102' ),
+				array(),
+				true,
+			),
+			array(
+				array( 'etag' => '"foo"', 'last-modified' => '20150818000102' ),
+				array(),
+				false,
+				true,
+			),
+		);
+	}
+
 }
diff --git a/tests/phpunit/includes/api/ApiResultTest.php b/tests/phpunit/includes/api/ApiResultTest.php
index affb0fa9a5..cff2328dc8 100644
--- a/tests/phpunit/includes/api/ApiResultTest.php
+++ b/tests/phpunit/includes/api/ApiResultTest.php
@@ -181,6 +181,19 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
+		ApiResult::setValue( $arr, null, NAN, ApiResult::NO_VALIDATE );
+
+		try {
+			ApiResult::setValue( $arr, null, NAN, ApiResult::NO_SIZE_CHECK );
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( InvalidArgumentException $ex ) {
+			$this->assertSame(
+				'Cannot add non-finite floats to ApiResult',
+				$ex->getMessage(),
+				'Expected exception'
+			);
+		}
+
 		$arr = array();
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
@@ -408,6 +421,19 @@ class ApiResultTest extends MediaWikiTestCase {
 			);
 		}
 
+		$result->addValue( null, null, NAN, ApiResult::NO_VALIDATE );
+
+		try {
+			$result->addValue( null, null, NAN, ApiResult::NO_SIZE_CHECK );
+			$this->fail( 'Expected exception not thrown' );
+		} catch ( InvalidArgumentException $ex ) {
+			$this->assertSame(
+				'Cannot add non-finite floats to ApiResult',
+				$ex->getMessage(),
+				'Expected exception'
+			);
+		}
+
 		$result->reset();
 		$result->addParsedLimit( 'foo', 12 );
 		$this->assertSame( array(
@@ -444,6 +470,12 @@ class ApiResultTest extends MediaWikiTestCase {
 		$result->removeValue( null, 'foo' );
 		$this->assertTrue( $result->addValue( null, 'foo', '1' ) );
 
+		$result = new ApiResult( 10 );
+		$obj = new ApiResultTestSerializableObject( 'ok' );
+		$obj->foobar = 'foobaz';
+		$this->assertTrue( $result->addValue( null, 'foo', $obj ) );
+		$this->assertSame( 2, $result->getSize() );
+
 		$result = new ApiResult( 8388608 );
 		$result2 = new ApiResult( 8388608 );
 		$result2->addValue( null, 'foo', 'bar' );
diff --git a/tests/phpunit/includes/content/TextContentHandlerTest.php b/tests/phpunit/includes/content/TextContentHandlerTest.php
index 33861f11e3..492fec6b68 100644
--- a/tests/phpunit/includes/content/TextContentHandlerTest.php
+++ b/tests/phpunit/includes/content/TextContentHandlerTest.php
@@ -4,7 +4,6 @@
  * @group ContentHandler
  */
 class TextContentHandlerTest extends MediaWikiLangTestCase {
-
 	public function testSupportsDirectEditing() {
 		$handler = new TextContentHandler();
 		$this->assertTrue( $handler->supportsDirectEditing(), 'direct editing is supported' );
diff --git a/tests/phpunit/includes/content/TextContentTest.php b/tests/phpunit/includes/content/TextContentTest.php
index dd61f85b4e..fe263756a0 100644
--- a/tests/phpunit/includes/content/TextContentTest.php
+++ b/tests/phpunit/includes/content/TextContentTest.php
@@ -27,10 +27,16 @@ class TextContentTest extends MediaWikiLangTestCase {
 				CONTENT_MODEL_JAVASCRIPT,
 			),
 			'wgUseTidy' => false,
-			'wgAlwaysUseTidy' => false,
 			'wgCapitalLinks' => true,
 			'wgHooks' => array(), // bypass hook ContentGetParserOutput that force custom rendering
 		) );
+
+		MWTidy::destroySingleton();
+	}
+
+	protected function tearDown() {
+		MWTidy::destroySingleton();
+		parent::tearDown();
 	}
 
 	public function newContent( $text ) {
diff --git a/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php b/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
index f12cf5bd80..6ee54d3380 100644
--- a/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
+++ b/tests/phpunit/includes/debug/logger/monolog/LineFormatterTest.php
@@ -48,10 +48,10 @@ class LineFormatterTest extends MediaWikiTestCase {
 			)
 		);
 		$out = $fixture->normalizeException( $boom );
-		$this->assertContains( '[Exception InvalidArgumentException]', $out );
-		$this->assertContains( ', [Exception LengthException]', $out );
-		$this->assertContains( ', [Exception LogicException]', $out );
-		$this->assertNotContains( '[stacktrace]', $out );
+		$this->assertContains( "\n[Exception InvalidArgumentException]", $out );
+		$this->assertContains( "\nCaused by: [Exception LengthException]", $out );
+		$this->assertContains( "\nCaused by: [Exception LogicException]", $out );
+		$this->assertNotContains( "\n  #0", $out );
 	}
 
 	/**
@@ -67,9 +67,9 @@ class LineFormatterTest extends MediaWikiTestCase {
 			)
 		);
 		$out = $fixture->normalizeException( $boom );
-		$this->assertContains( '[Exception InvalidArgumentException', $out );
-		$this->assertContains( ', [Exception LengthException]', $out );
-		$this->assertContains( ', [Exception LogicException]', $out );
-		$this->assertContains( '[stacktrace]', $out );
+		$this->assertContains( "\n[Exception InvalidArgumentException]", $out );
+		$this->assertContains( "\nCaused by: [Exception LengthException]", $out );
+		$this->assertContains( "\nCaused by: [Exception LogicException]", $out );
+		$this->assertContains( "\n  #0", $out );
 	}
 }
diff --git a/tests/phpunit/includes/libs/IEUrlExtensionTest.php b/tests/phpunit/includes/libs/IEUrlExtensionTest.php
index e96953ee12..57668e505c 100644
--- a/tests/phpunit/includes/libs/IEUrlExtensionTest.php
+++ b/tests/phpunit/includes/libs/IEUrlExtensionTest.php
@@ -170,4 +170,37 @@ class IEUrlExtensionTest extends PHPUnit_Framework_TestCase {
 			'Two dots'
 		);
 	}
+
+	/**
+	 * @covers IEUrlExtension::findIE6Extension
+	 */
+	public function testScriptQuery() {
+		$this->assertEquals(
+			'php',
+			IEUrlExtension::findIE6Extension( 'example.php?foo=a&bar=b' ),
+			'Script with query'
+		);
+	}
+
+	/**
+	 * @covers IEUrlExtension::findIE6Extension
+	 */
+	public function testEscapedScriptQuery() {
+		$this->assertEquals(
+			'',
+			IEUrlExtension::findIE6Extension( 'example%2Ephp?foo=a&bar=b' ),
+			'Script with urlencoded dot and query'
+		);
+	}
+
+	/**
+	 * @covers IEUrlExtension::findIE6Extension
+	 */
+	public function testEscapedScriptQueryDot() {
+		$this->assertEquals(
+			'y',
+			IEUrlExtension::findIE6Extension( 'example%2Ephp?foo=a.x&bar=b.y' ),
+			'Script with urlencoded dot and query with dot'
+		);
+	}
 }
diff --git a/tests/phpunit/includes/objectcache/BagOStuffTest.php b/tests/phpunit/includes/objectcache/BagOStuffTest.php
index f5814e4483..b684006202 100644
--- a/tests/phpunit/includes/objectcache/BagOStuffTest.php
+++ b/tests/phpunit/includes/objectcache/BagOStuffTest.php
@@ -138,21 +138,25 @@ class BagOStuffTest extends MediaWikiTestCase {
 	public function testGetMulti() {
 		$value1 = array( 'this' => 'is', 'a' => 'test' );
 		$value2 = array( 'this' => 'is', 'another' => 'test' );
+		$value3 = array( 'testing a key that may be encoded when sent to cache backend' );
 
 		$key1 = wfMemcKey( 'test1' );
 		$key2 = wfMemcKey( 'test2' );
+		$key3 = wfMemcKey( 'will-%-encode' ); // internally, MemcachedBagOStuffs will encode to will-%25-encode
 
 		$this->cache->add( $key1, $value1 );
 		$this->cache->add( $key2, $value2 );
+		$this->cache->add( $key3, $value3 );
 
 		$this->assertEquals(
-			$this->cache->getMulti( array( $key1, $key2 ) ),
-			array( $key1 => $value1, $key2 => $value2 )
+			array( $key1 => $value1, $key2 => $value2, $key3 => $value3 ),
+			$this->cache->getMulti( array( $key1, $key2, $key3 ) )
 		);
 
 		// cleanup
 		$this->cache->delete( $key1 );
 		$this->cache->delete( $key2 );
+		$this->cache->delete( $key3 );
 	}
 
 	/**
diff --git a/tests/phpunit/includes/parser/MediaWikiParserTest.php b/tests/phpunit/includes/parser/MediaWikiParserTest.php
index df891f5a4b..96ae3bec64 100644
--- a/tests/phpunit/includes/parser/MediaWikiParserTest.php
+++ b/tests/phpunit/includes/parser/MediaWikiParserTest.php
@@ -91,7 +91,7 @@ class MediaWikiParserTest {
 			// enough to cause there to be separate names for different
 			// things, which is good enough for our purposes.
 			$extensionName = basename( dirname( $fileName ) );
-			$testsName = $extensionName . '⁄' . basename( $fileName, '.txt' );
+			$testsName = $extensionName . '__' . basename( $fileName, '.txt' );
 			$escapedFileName = strtr( $fileName, array( "'" => "\\'", '\\' => '\\\\' ) );
 			$parserTestClassName = ucfirst( $testsName );
 			// Official spec for class names: http://php.net/manual/en/language.oop5.basic.php
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index c7a310367b..0d2129b729 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -160,10 +160,10 @@ class NewParserTest extends MediaWikiTestCase {
 		$this->djVuSupport = new DjVuSupport();
 		// Tidy support
 		$this->tidySupport = new TidySupport();
+		$tmpGlobals['wgTidyConfig'] = null;
 		$tmpGlobals['wgUseTidy'] = false;
-		$tmpGlobals['wgAlwaysUseTidy'] = false;
 		$tmpGlobals['wgDebugTidy'] = false;
-		$tmpGlobals['wgTidyConf'] = $IP . '/includes/tidy.conf';
+		$tmpGlobals['wgTidyConf'] = $IP . '/includes/tidy/tidy.conf';
 		$tmpGlobals['wgTidyOpts'] = '';
 		$tmpGlobals['wgTidyInternal'] = $this->tidySupport->isInternal();
 
@@ -185,6 +185,8 @@ class NewParserTest extends MediaWikiTestCase {
 		$wgNamespaceAliases['Image'] = $this->savedWeirdGlobals['image_alias'];
 		$wgNamespaceAliases['Image_talk'] = $this->savedWeirdGlobals['image_talk_alias'];
 
+		MWTidy::destroySingleton();
+
 		// Restore backends
 		RepoGroup::destroySingleton();
 		FileBackendGroup::destroySingleton();
@@ -454,6 +456,7 @@ class NewParserTest extends MediaWikiTestCase {
 			$GLOBALS[$var] = $val;
 		}
 
+		MWTidy::destroySingleton();
 		MagicWord::clearCache();
 
 		# The entries saved into RepoGroup cache with previous globals will be wrong.
diff --git a/tests/phpunit/includes/parser/TagHooksTest.php b/tests/phpunit/includes/parser/TagHooksTest.php
index 3605e50f14..4af389852a 100644
--- a/tests/phpunit/includes/parser/TagHooksTest.php
+++ b/tests/phpunit/includes/parser/TagHooksTest.php
@@ -19,12 +19,6 @@ class TagHookTest extends MediaWikiTestCase {
 		return array( array( "foo<bar" ), array( "foo>bar" ), array( "foo\nbar" ), array( "foo\rbar" ) );
 	}
 
-	protected function setUp() {
-		parent::setUp();
-
-		$this->setMwGlobals( 'wgAlwaysUseTidy', false );
-	}
-
 	/**
 	 * @dataProvider provideValidNames
 	 * @covers Parser::setHook
diff --git a/tests/phpunit/includes/parser/TidyTest.php b/tests/phpunit/includes/parser/TidyTest.php
index f656a74dbf..5db2908048 100644
--- a/tests/phpunit/includes/parser/TidyTest.php
+++ b/tests/phpunit/includes/parser/TidyTest.php
@@ -7,8 +7,7 @@ class TidyTest extends MediaWikiTestCase {
 
 	protected function setUp() {
 		parent::setUp();
-		$check = MWTidy::tidy( '' );
-		if ( strpos( $check, '<!--' ) !== false ) {
+		if ( !MWTidy::isEnabled() ) {
 			$this->markTestSkipped( 'Tidy not found' );
 		}
 	}
diff --git a/tests/phpunit/includes/registration/ExtensionProcessorTest.php b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
index 09641377da..1cb8a5d964 100644
--- a/tests/phpunit/includes/registration/ExtensionProcessorTest.php
+++ b/tests/phpunit/includes/registration/ExtensionProcessorTest.php
@@ -113,11 +113,20 @@ class ExtensionProcessorTest extends MediaWikiTestCase {
 				'@IGNORED' => 'yes',
 			),
 		) + self::$default;
+		$info2 = array(
+			'config' => array(
+				'_prefix' => 'eg',
+				'Bar' => 'somevalue'
+			),
+		) + self::$default;
 		$processor->extractInfo( $this->dir, $info, 1 );
+		$processor->extractInfo( $this->dir, $info2, 1 );
 		$extracted = $processor->getExtractedInfo();
 		$this->assertEquals( 'somevalue', $extracted['globals']['wgBar'] );
 		$this->assertEquals( 10, $extracted['globals']['wgFoo'] );
 		$this->assertArrayNotHasKey( 'wg@IGNORED', $extracted['globals'] );
+		// Custom prefix:
+		$this->assertEquals( 'somevalue', $extracted['globals']['egBar'] );
 	}
 
 	public static function provideExtracttExtensionMessagesFiles() {
diff --git a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
index cc20e7facf..b6838859c9 100644
--- a/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
+++ b/tests/phpunit/includes/resourceloader/ResourceLoaderTest.php
@@ -6,15 +6,6 @@ class ResourceLoaderTest extends ResourceLoaderTestCase {
 		parent::setUp();
 
 		$this->setMwGlobals( array(
-			'wgResourceLoaderLESSFunctions' => array(
-				'test-sum' => function ( $frame, $less ) {
-					$sum = 0;
-					foreach ( $frame[2] as $arg ) {
-						$sum += (int)$arg[1];
-					}
-					return $sum;
-				},
-			),
 			'wgResourceLoaderLESSImportPaths' => array(
 				dirname( dirname( __DIR__ ) ) . '/data/less/common',
 			),
diff --git a/tests/phpunit/includes/upload/UploadStashTest.php b/tests/phpunit/includes/upload/UploadStashTest.php
index d5d1188e7d..8f9eabe9f8 100644
--- a/tests/phpunit/includes/upload/UploadStashTest.php
+++ b/tests/phpunit/includes/upload/UploadStashTest.php
@@ -20,7 +20,7 @@ class UploadStashTest extends MediaWikiTestCase {
 		parent::setUp();
 
 		// Setup a file for bug 29408
-		$this->bug29408File = __DIR__ . '/bug29408';
+		$this->bug29408File = wfTempDir() . '/bug29408';
 		file_put_contents( $this->bug29408File, "\x00" );
 
 		self::$users = array(
diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php
index f9ddcf2746..0a29af5b43 100644
--- a/tests/qunit/QUnitTestResources.php
+++ b/tests/qunit/QUnitTestResources.php
@@ -71,6 +71,8 @@ return array(
 			'tests/qunit/suites/resources/mediawiki/mediawiki.storage.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.template.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.test.js',
+			'tests/qunit/suites/resources/mediawiki/mediawiki.ForeignUpload.test.js',
+			'tests/qunit/suites/resources/mediawiki/mediawiki.ForeignStructuredUpload.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.toc.test.js',
 			'tests/qunit/suites/resources/mediawiki/mediawiki.track.test.js',
@@ -114,6 +116,8 @@ return array(
 			'mediawiki.api.upload',
 			'mediawiki.api.watch',
 			'mediawiki.ForeignApi.core',
+			'mediawiki.ForeignUpload',
+			'mediawiki.ForeignStructuredUpload',
 			'mediawiki.jqueryMsg',
 			'mediawiki.messagePoster',
 			'mediawiki.RegExp',
diff --git a/tests/qunit/data/testrunner.js b/tests/qunit/data/testrunner.js
index 78771decd0..01f9625204 100644
--- a/tests/qunit/data/testrunner.js
+++ b/tests/qunit/data/testrunner.js
@@ -8,12 +8,12 @@
 	/**
 	 * Add bogus to url to prevent IE crazy caching
 	 *
-	 * @param value {String} a relative path (eg. 'data/foo.js'
+	 * @param {String} value a relative path (eg. 'data/foo.js'
 	 * or 'data/test.php?foo=bar').
 	 * @return {String} Such as 'data/foo.js?131031765087663960'
 	 */
 	QUnit.fixurl = function ( value ) {
-		return value + (/\?/.test( value ) ? '&' : '?')
+		return value + ( /\?/.test( value ) ? '&' : '?' )
 			+ String( new Date().getTime() )
 			+ String( parseInt( Math.random() * 100000, 10 ) );
 	};
@@ -66,7 +66,7 @@
 	sinon.config = {
 		injectIntoThis: true,
 		injectInto: null,
-		properties: ['spy', 'stub', 'mock', 'sandbox'],
+		properties: [ 'spy', 'stub', 'mock', 'sandbox' ],
 		// Don't fake timers by default
 		useFakeTimers: false,
 		useFakeServer: false
@@ -164,7 +164,8 @@
 	/**
 	 * Reset mw.config and others to a fresh copy of the live config for each test(),
 	 * and restore it back to the live one afterwards.
-	 * @param localEnv {Object} [optional]
+	 *
+	 * @param {Object} [localEnv]
 	 * @example (see test suite at the bottom of this file)
 	 * </code>
 	 */
@@ -268,7 +269,7 @@
 						$.each( $.timers, function ( i, timer ) {
 							var node = timer.elem;
 							mw.log.warn( 'Unfinished animation #' + i + ' in ' + timer.queue + ' queue on ' +
-								mw.html.element( node.nodeName.toLowerCase(), $(node).getAttrs() )
+								mw.html.element( node.nodeName.toLowerCase(), $( node ).getAttrs() )
 							);
 						} );
 						// Force animations to stop to give the next test a clean start
@@ -333,7 +334,7 @@
 			children = $node.contents();
 			processedChildren = [];
 			for ( i = 0, len = children.length; i < len; i++ ) {
-				el = children[i];
+				el = children[ i ];
 				if ( el.nodeType === Node.ELEMENT_NODE || el.nodeType === Node.TEXT_NODE ) {
 					processedChildren.push( getDomStructure( el ) );
 				}
@@ -356,7 +357,7 @@
 	 * @param {string} html HTML markup for one or more nodes.
 	 */
 	function getHtmlStructure( html ) {
-		var el = $( '<div>' ).append( html )[0];
+		var el = $( '<div>' ).append( html )[ 0 ];
 		return getDomStructure( el );
 	}
 
@@ -488,11 +489,11 @@
 			missing = [];
 
 		for ( i = 0, len = modules.length; i < len; i++ ) {
-			state = mw.loader.getState( modules[i] );
+			state = mw.loader.getState( modules[ i ] );
 			if ( state === 'error' ) {
-				error.push( modules[i] );
+				error.push( modules[ i ] );
 			} else if ( state === 'missing' ) {
-				missing.push( modules[i] );
+				missing.push( modules[ i ] );
 			}
 		}
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
index 4484467d0b..cf34fc1103 100644
--- a/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.accessKeyLabel.test.js
@@ -1,7 +1,7 @@
 ( function ( $ ) {
 	QUnit.module( 'jquery.accessKeyLabel', QUnit.newMwEnvironment( {
 		messages: {
-			'brackets': '[$1]',
+			brackets: '[$1]',
 			'word-separator': ' '
 		}
 	} ) );
@@ -9,23 +9,23 @@
 	var getAccessKeyPrefixTestData = [
 			// ua string, platform string, expected prefix
 			// Internet Explorer
-			['Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)', 'Win32', 'alt-'],
-			['Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)', 'Win32', 'alt-'],
-			['Mozilla/5.0 (Windows NT 6.3; Win64; x64; Trident/7.0; rv:11.0) like Gecko', 'Win64', 'alt-'],
+			[ 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1)', 'Win32', 'alt-' ],
+			[ 'Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0)', 'Win32', 'alt-' ],
+			[ 'Mozilla/5.0 (Windows NT 6.3; Win64; x64; Trident/7.0; rv:11.0) like Gecko', 'Win64', 'alt-' ],
 			// Firefox
-			['Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.19) Gecko/20110420 Firefox/3.5.19', 'MacIntel', 'ctrl-'],
-			['Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110422 Ubuntu/10.10 (maverick) Firefox/3.6.17', 'Linux i686', 'alt-shift-'],
-			['Mozilla/5.0 (Windows NT 6.0; rv:2.0.1) Gecko/20100101 Firefox/4.0.1', 'Win32', 'alt-shift-'],
+			[ 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.5; en-US; rv:1.9.1.19) Gecko/20110420 Firefox/3.5.19', 'MacIntel', 'ctrl-' ],
+			[ 'Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110422 Ubuntu/10.10 (maverick) Firefox/3.6.17', 'Linux i686', 'alt-shift-' ],
+			[ 'Mozilla/5.0 (Windows NT 6.0; rv:2.0.1) Gecko/20100101 Firefox/4.0.1', 'Win32', 'alt-shift-' ],
 			// Safari / Konqueror
-			['Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; nl-nl) AppleWebKit/531.22.7 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7', 'MacIntel', 'ctrl-alt-'],
-			['Mozilla/5.0 (Windows; U; Windows NT 6.0; cs-CZ) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7', 'Win32', 'alt-'],
-			['Mozilla/5.0 (X11; Linux i686) KHTML/4.9.1 (like Gecko) Konqueror/4.9', 'Linux i686', 'ctrl-'],
+			[ 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_7; nl-nl) AppleWebKit/531.22.7 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7', 'MacIntel', 'ctrl-alt-' ],
+			[ 'Mozilla/5.0 (Windows; U; Windows NT 6.0; cs-CZ) AppleWebKit/533.21.1 (KHTML, like Gecko) Version/4.0.5 Safari/531.22.7', 'Win32', 'alt-' ],
+			[ 'Mozilla/5.0 (X11; Linux i686) KHTML/4.9.1 (like Gecko) Konqueror/4.9', 'Linux i686', 'ctrl-' ],
 			// Opera
-			['Opera/9.80 (Windows NT 5.1)', 'Win32', 'shift-esc-'],
-			['Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 OPR/15.0.1147.130', 'Win32', 'shift-esc-'],
+			[ 'Opera/9.80 (Windows NT 5.1)', 'Win32', 'shift-esc-' ],
+			[ 'Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.52 Safari/537.36 OPR/15.0.1147.130', 'Win32', 'shift-esc-' ],
 			// Chrome
-			['Mozilla/5.0 (Macintosh; Intel Mac OS X 10_5_8) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.112 Safari/534.30', 'MacIntel', 'ctrl-option-'],
-			['Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.68 Safari/534.30', 'Linux i686', 'alt-shift-']
+			[ 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_5_8) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.112 Safari/534.30', 'MacIntel', 'ctrl-option-' ],
+			[ 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.30 (KHTML, like Gecko) Chrome/12.0.742.68 Safari/534.30', 'Linux i686', 'alt-shift-' ]
 		],
 		// strings appended to title to make sure updateTooltipAccessKeys handles them correctly
 		updateTooltipAccessKeysTestData = [ '', ' [a]', ' [test-a]', ' [alt-b]' ];
@@ -39,9 +39,9 @@
 		var i;
 		for ( i = 0; i < getAccessKeyPrefixTestData.length; i++ ) {
 			assert.equal( $.fn.updateTooltipAccessKeys.getAccessKeyPrefix( {
-				userAgent: getAccessKeyPrefixTestData[i][0],
-				platform: getAccessKeyPrefixTestData[i][1]
-			} ), getAccessKeyPrefixTestData[i][2], 'Correct prefix for ' + getAccessKeyPrefixTestData[i][0] );
+				userAgent: getAccessKeyPrefixTestData[ i ][ 0 ],
+				platform: getAccessKeyPrefixTestData[ i ][ 1 ]
+			} ), getAccessKeyPrefixTestData[ i ][ 2 ], 'Correct prefix for ' + getAccessKeyPrefixTestData[ i ][ 0 ] );
 		}
 	} );
 
@@ -52,13 +52,13 @@
 			// (no browser is known using such a short prefix, though) or "Alt+Umschalt+" in German Firefox.
 			result = /^Title \[(.+)[aA]\]$/.exec( title );
 		assert.ok( result, 'title should match expected structure.' );
-		assert.notEqual( result[1], 'test-', 'Prefix used for testing shouldn\'t be used in production.' );
+		assert.notEqual( result[ 1 ], 'test-', 'Prefix used for testing shouldn\'t be used in production.' );
 	} );
 
 	QUnit.test( 'updateTooltipAccessKeys - no access key', updateTooltipAccessKeysTestData.length, function ( assert ) {
 		var i, oldTitle, $input, newTitle;
 		for ( i = 0; i < updateTooltipAccessKeysTestData.length; i++ ) {
-			oldTitle = 'Title' + updateTooltipAccessKeysTestData[i];
+			oldTitle = 'Title' + updateTooltipAccessKeysTestData[ i ];
 			$input = $( makeInput( oldTitle ) );
 			$( '#qunit-fixture' ).append( $input );
 			newTitle = $input.updateTooltipAccessKeys().prop( 'title' );
@@ -70,7 +70,7 @@
 		$.fn.updateTooltipAccessKeys.setTestMode( true );
 		var i, oldTitle, $input, newTitle;
 		for ( i = 0; i < updateTooltipAccessKeysTestData.length; i++ ) {
-			oldTitle = 'Title' + updateTooltipAccessKeysTestData[i];
+			oldTitle = 'Title' + updateTooltipAccessKeysTestData[ i ];
 			$input = $( makeInput( oldTitle, 'a' ) );
 			$( '#qunit-fixture' ).append( $input );
 			newTitle = $input.updateTooltipAccessKeys().prop( 'title' );
diff --git a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
index e8c5121429..a1b2e5c3db 100644
--- a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js
@@ -11,7 +11,7 @@
 
 	function findDivergenceIndex( a, b ) {
 		var i = 0;
-		while ( i < a.length && i < b.length && a[i] === b[i] ) {
+		while ( i < a.length && i < b.length && a[ i ] === b[ i ] ) {
 			i++;
 		}
 		return i;
@@ -41,7 +41,7 @@
 		// Add two characters using scary black magic
 		spanText = $span.text();
 		d = findDivergenceIndex( origText, spanText );
-		spanTextNew = spanText.slice( 0, d ) + origText[d] + origText[d] + '...';
+		spanTextNew = spanText.slice( 0, d ) + origText[ d ] + origText[ d ] + '...';
 
 		assert.gt( spanTextNew.length, spanText.length, 'Verify that the new span-length is indeed greater' );
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.color.test.js b/tests/qunit/suites/resources/jquery/jquery.color.test.js
index c8e8ac70e0..9afd793e5b 100644
--- a/tests/qunit/suites/resources/jquery/jquery.color.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.color.test.js
@@ -10,7 +10,7 @@
 
 		$canvas.animate( { backgroundColor: '#000' }, 10 ).promise().then( function () {
 			var endColors = $.colorUtil.getRGB( $canvas.css( 'background-color' ) );
-			assert.deepEqual( endColors, [0, 0, 0], 'end state' );
+			assert.deepEqual( endColors, [ 0, 0, 0 ], 'end state' );
 		} );
 
 		this.clock.tick( 20 );
diff --git a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
index 39ae363c61..00de895dad 100644
--- a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js
@@ -4,25 +4,25 @@
 	QUnit.test( 'getRGB', 18, function ( assert ) {
 		assert.strictEqual( $.colorUtil.getRGB(), undefined, 'No arguments' );
 		assert.strictEqual( $.colorUtil.getRGB( '' ), undefined, 'Empty string' );
-		assert.deepEqual( $.colorUtil.getRGB( [0, 100, 255] ), [0, 100, 255], 'Parse array of rgb values' );
-		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0,100,255)' ), [0, 100, 255], 'Parse simple rgb string' );
-		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0, 100, 255)' ), [0, 100, 255], 'Parse simple rgb string with spaces' );
-		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%,20%,40%)' ), [0, 51, 102], 'Parse rgb string with percentages' );
-		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%, 20%, 40%)' ), [0, 51, 102], 'Parse rgb string with percentages and spaces' );
-		assert.deepEqual( $.colorUtil.getRGB( '#f2ddee' ), [242, 221, 238], 'Hex string: 6 char lowercase' );
-		assert.deepEqual( $.colorUtil.getRGB( '#f2DDEE' ), [242, 221, 238], 'Hex string: 6 char uppercase' );
-		assert.deepEqual( $.colorUtil.getRGB( '#f2DdEe' ), [242, 221, 238], 'Hex string: 6 char mixed' );
-		assert.deepEqual( $.colorUtil.getRGB( '#eee' ), [238, 238, 238], 'Hex string: 3 char lowercase' );
-		assert.deepEqual( $.colorUtil.getRGB( '#EEE' ), [238, 238, 238], 'Hex string: 3 char uppercase' );
-		assert.deepEqual( $.colorUtil.getRGB( '#eEe' ), [238, 238, 238], 'Hex string: 3 char mixed' );
-		assert.deepEqual( $.colorUtil.getRGB( 'rgba(0, 0, 0, 0)' ), [255, 255, 255], 'Zero rgba for Safari 3; Transparent (whitespace)' );
+		assert.deepEqual( $.colorUtil.getRGB( [ 0, 100, 255 ] ), [ 0, 100, 255 ], 'Parse array of rgb values' );
+		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0,100,255)' ), [ 0, 100, 255 ], 'Parse simple rgb string' );
+		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0, 100, 255)' ), [ 0, 100, 255 ], 'Parse simple rgb string with spaces' );
+		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%,20%,40%)' ), [ 0, 51, 102 ], 'Parse rgb string with percentages' );
+		assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%, 20%, 40%)' ), [ 0, 51, 102 ], 'Parse rgb string with percentages and spaces' );
+		assert.deepEqual( $.colorUtil.getRGB( '#f2ddee' ), [ 242, 221, 238 ], 'Hex string: 6 char lowercase' );
+		assert.deepEqual( $.colorUtil.getRGB( '#f2DDEE' ), [ 242, 221, 238 ], 'Hex string: 6 char uppercase' );
+		assert.deepEqual( $.colorUtil.getRGB( '#f2DdEe' ), [ 242, 221, 238 ], 'Hex string: 6 char mixed' );
+		assert.deepEqual( $.colorUtil.getRGB( '#eee' ), [ 238, 238, 238 ], 'Hex string: 3 char lowercase' );
+		assert.deepEqual( $.colorUtil.getRGB( '#EEE' ), [ 238, 238, 238 ], 'Hex string: 3 char uppercase' );
+		assert.deepEqual( $.colorUtil.getRGB( '#eEe' ), [ 238, 238, 238 ], 'Hex string: 3 char mixed' );
+		assert.deepEqual( $.colorUtil.getRGB( 'rgba(0, 0, 0, 0)' ), [ 255, 255, 255 ], 'Zero rgba for Safari 3; Transparent (whitespace)' );
 
 		// Perhaps this is a bug in colorUtil, but it is the current behavior so, let's keep
 		// track of it, so we will know in case it would ever change.
 		assert.strictEqual( $.colorUtil.getRGB( 'rgba(0,0,0,0)' ), undefined, 'Zero rgba without whitespace' );
 
-		assert.deepEqual( $.colorUtil.getRGB( 'lightGreen' ), [144, 238, 144], 'Color names (lightGreen)' );
-		assert.deepEqual( $.colorUtil.getRGB( 'transparent' ), [255, 255, 255], 'Color names (transparent)' );
+		assert.deepEqual( $.colorUtil.getRGB( 'lightGreen' ), [ 144, 238, 144 ], 'Color names (lightGreen)' );
+		assert.deepEqual( $.colorUtil.getRGB( 'transparent' ), [ 255, 255, 255 ], 'Color names (transparent)' );
 		assert.strictEqual( $.colorUtil.getRGB( 'mediaWiki' ), undefined, 'Inexisting color name' );
 	} );
 
@@ -37,9 +37,9 @@
 
 		// Re-create the rgbToHsl return array items, limited to two decimals.
 		hsl = $.colorUtil.rgbToHsl( 144, 238, 144 );
-		ret = [ dualDecimals( hsl[0] ), dualDecimals( hsl[1] ), dualDecimals( hsl[2] ) ];
+		ret = [ dualDecimals( hsl[ 0 ] ), dualDecimals( hsl[ 1 ] ), dualDecimals( hsl[ 2 ] ) ];
 
-		assert.deepEqual( ret, [0.33, 0.73, 0.75], 'rgb(144, 238, 144): hsl(0.33, 0.73, 0.75)' );
+		assert.deepEqual( ret, [ 0.33, 0.73, 0.75 ], 'rgb(144, 238, 144): hsl(0.33, 0.73, 0.75)' );
 	} );
 
 	QUnit.test( 'hslToRgb', 1, function ( assert ) {
@@ -47,9 +47,9 @@
 		rgb = $.colorUtil.hslToRgb( 0.3, 0.7, 0.8 );
 
 		// Re-create the hslToRgb return array items, rounded to whole numbers.
-		ret = [ Math.round( rgb[0] ), Math.round( rgb[1] ), Math.round( rgb[2] ) ];
+		ret = [ Math.round( rgb[ 0 ] ), Math.round( rgb[ 1 ] ), Math.round( rgb[ 2 ] ) ];
 
-		assert.deepEqual( ret, [183, 240, 168], 'hsl(0.3, 0.7, 0.8): rgb(183, 240, 168)' );
+		assert.deepEqual( ret, [ 183, 240, 168 ], 'hsl(0.3, 0.7, 0.8): rgb(183, 240, 168)' );
 	} );
 
 	QUnit.test( 'getColorBrightness', 2, function ( assert ) {
diff --git a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
index 906369eec0..8c6287658e 100644
--- a/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.hidpi.test.js
@@ -6,6 +6,22 @@
 		assert.equal( typeof devicePixelRatio, 'number', '$.devicePixelRatio() returns a number' );
 	} );
 
+	QUnit.test( 'bracketedDevicePixelRatio', 1, function ( assert ) {
+		var devicePixelRatio = $.devicePixelRatio();
+		assert.equal( typeof devicePixelRatio, 'number', '$.bracketedDevicePixelRatio() returns a number' );
+	} );
+
+	QUnit.test( 'bracketDevicePixelRatio', 8, function ( assert ) {
+		assert.equal( $.bracketDevicePixelRatio( 0.75 ), 1, '0.75 gives 1' );
+		assert.equal( $.bracketDevicePixelRatio( 1 ), 1, '1 gives 1' );
+		assert.equal( $.bracketDevicePixelRatio( 1.25 ), 1.5, '1.25 gives 1.5' );
+		assert.equal( $.bracketDevicePixelRatio( 1.5 ), 1.5, '1.5 gives 1.5' );
+		assert.equal( $.bracketDevicePixelRatio( 1.75 ), 2, '1.75 gives 2' );
+		assert.equal( $.bracketDevicePixelRatio( 2 ), 2, '2 gives 2' );
+		assert.equal( $.bracketDevicePixelRatio( 2.5 ), 2, '2.5 gives 2' );
+		assert.equal( $.bracketDevicePixelRatio( 3 ), 2, '3 gives 2' );
+	} );
+
 	QUnit.test( 'matchSrcSet', 6, function ( assert ) {
 		var srcset = 'onefive.png 1.5x, two.png 2x';
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.localize.test.js b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
index 3ef27903ba..c503fc9932 100644
--- a/tests/qunit/suites/resources/jquery/jquery.localize.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.localize.test.js
@@ -76,8 +76,8 @@
 		html = '<div><span title-msg="title"><html:msg key="label" /></span></div>';
 		$lc = $( html ).localize( {
 			keys: {
-				'title': 'foo-' + x + '-title',
-				'label': 'foo-' + x + '-label'
+				title: 'foo-' + x + '-title',
+				label: 'foo-' + x + '-label'
 			}
 		} ).find( 'span' );
 
@@ -88,7 +88,7 @@
 		html = '<div><span><html:msg key="foo-welcome" /></span></div>';
 		$lc = $( html ).localize( {
 			params: {
-				'foo-welcome': [sitename, 'yesterday']
+				'foo-welcome': [ sitename, 'yesterday' ]
 			}
 		} ).find( 'span' );
 
@@ -100,12 +100,12 @@
 		$lc = $( html ).localize( {
 			prefix: 'foo-',
 			keys: {
-				'title': x + '-title',
-				'label': x + '-label'
+				title: x + '-title',
+				label: x + '-label'
 			},
 			params: {
-				'title': [sitename, '3 minutes ago'],
-				'label': [sitename, '3 minutes ago']
+				title: [ sitename, '3 minutes ago' ],
+				label: [ sitename, '3 minutes ago' ]
 
 			}
 		} ).find( 'span' );
diff --git a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
index 911e9d01ca..029edd5587 100644
--- a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js
@@ -8,7 +8,7 @@
 		teardown: function () {
 			this.restoreWarnings();
 		}
-	}) );
+	} ) );
 
 	QUnit.test( 'String functions', 7, function ( assert ) {
 		assert.equal( $.trimLeft( '  foo bar  ' ), 'foo bar  ', 'trimLeft' );
@@ -52,9 +52,9 @@
 	} );
 
 	QUnit.test( 'Comparison functions', 5, function ( assert ) {
-		assert.ok( $.compareArray( [0, 'a', [], [2, 'b'] ], [0, 'a', [], [2, 'b'] ] ),
+		assert.ok( $.compareArray( [ 0, 'a', [], [ 2, 'b' ] ], [ 0, 'a', [], [ 2, 'b' ] ] ),
 			'compareArray: Two deep arrays that are excactly the same' );
-		assert.ok( !$.compareArray( [1], [2] ), 'compareArray: Two different arrays (false)' );
+		assert.ok( !$.compareArray( [ 1 ], [ 2 ] ), 'compareArray: Two different arrays (false)' );
 
 		assert.ok( $.compareObject( {}, {} ), 'compareObject: Two empty objects' );
 		assert.ok( $.compareObject( { foo: 1 }, { foo: 1 } ), 'compareObject: Two the same objects' );
diff --git a/tests/qunit/suites/resources/jquery/jquery.placeholder.test.js b/tests/qunit/suites/resources/jquery/jquery.placeholder.test.js
index 78c185f108..5d0ddebb98 100644
--- a/tests/qunit/suites/resources/jquery/jquery.placeholder.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.placeholder.test.js
@@ -1,13 +1,13 @@
-( function ($) {
+( function ( $ ) {
 
-	QUnit.module('jquery.placeholder', QUnit.newMwEnvironment());
+	QUnit.module( 'jquery.placeholder', QUnit.newMwEnvironment() );
 
-	QUnit.test('caches results of feature tests', 2, function (assert) {
-		assert.strictEqual( typeof $.fn.placeholder.input, 'boolean', '$.fn.placeholder.input');
-		assert.strictEqual( typeof $.fn.placeholder.textarea, 'boolean', '$.fn.placeholder.textarea');
-	});
+	QUnit.test( 'caches results of feature tests', 2, function ( assert ) {
+		assert.strictEqual( typeof $.fn.placeholder.input, 'boolean', '$.fn.placeholder.input' );
+		assert.strictEqual( typeof $.fn.placeholder.textarea, 'boolean', '$.fn.placeholder.textarea' );
+	} );
 
-	if ($.fn.placeholder.input && $.fn.placeholder.textarea) {
+	if ( $.fn.placeholder.input && $.fn.placeholder.textarea ) {
 		return;
 	}
 
@@ -20,126 +20,126 @@
 			'<input id="input-type-password" type="password" placeholder="e.g. hunter2">' +
 			'<textarea id="textarea" name="message" placeholder="Your message goes here"></textarea>' +
 		'</form>',
-	testElement = function ($el, assert) {
+	testElement = function ( $el, assert ) {
 
-		var el = $el[0],
-			placeholder = el.getAttribute('placeholder');
+		var el = $el[ 0 ],
+			placeholder = el.getAttribute( 'placeholder' );
 
-		assert.strictEqual($el.placeholder(), $el, 'should be chainable');
+		assert.strictEqual( $el.placeholder(), $el, 'should be chainable' );
 
-		assert.strictEqual(el.value, placeholder, 'should set `placeholder` text as `value`');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok($el.hasClass('placeholder'), 'should have `placeholder` class');
+		assert.strictEqual( el.value, placeholder, 'should set `placeholder` text as `value`' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( $el.hasClass( 'placeholder' ), 'should have `placeholder` class' );
 
 		// test on focus
 		$el.focus();
-		assert.strictEqual(el.value, '', '`value` should be the empty string on focus');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok(!$el.hasClass('placeholder'), 'should not have `placeholder` class on focus');
+		assert.strictEqual( el.value, '', '`value` should be the empty string on focus' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( !$el.hasClass( 'placeholder' ), 'should not have `placeholder` class on focus' );
 
 		// and unfocus (blur) again
 		$el.blur();
 
-		assert.strictEqual(el.value, placeholder, 'should set `placeholder` text as `value`');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok($el.hasClass('placeholder'), 'should have `placeholder` class');
+		assert.strictEqual( el.value, placeholder, 'should set `placeholder` text as `value`' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( $el.hasClass( 'placeholder' ), 'should have `placeholder` class' );
 
 		// change the value
-		$el.val('lorem ipsum');
-		assert.strictEqual($el.prop('value'), 'lorem ipsum', '`$el.val(string)` should change the `value` property');
-		assert.strictEqual(el.value, 'lorem ipsum', '`$el.val(string)` should change the `value` attribute');
-		assert.ok(!$el.hasClass('placeholder'), '`$el.val(string)` should remove `placeholder` class');
+		$el.val( 'lorem ipsum' );
+		assert.strictEqual( $el.prop( 'value' ), 'lorem ipsum', '`$el.val(string)` should change the `value` property' );
+		assert.strictEqual( el.value, 'lorem ipsum', '`$el.val(string)` should change the `value` attribute' );
+		assert.ok( !$el.hasClass( 'placeholder' ), '`$el.val(string)` should remove `placeholder` class' );
 
 		// and clear it again
-		$el.val('');
-		assert.strictEqual($el.prop('value'), '', '`$el.val("")` should change the `value` property');
-		assert.strictEqual(el.value, placeholder, '`$el.val("")` should change the `value` attribute');
-		assert.ok($el.hasClass('placeholder'), '`$el.val("")` should re-enable `placeholder` class');
+		$el.val( '' );
+		assert.strictEqual( $el.prop( 'value' ), '', '`$el.val("")` should change the `value` property' );
+		assert.strictEqual( el.value, placeholder, '`$el.val("")` should change the `value` attribute' );
+		assert.ok( $el.hasClass( 'placeholder' ), '`$el.val("")` should re-enable `placeholder` class' );
 
 		// make sure the placeholder property works as expected.
-		assert.strictEqual($el.prop('placeholder'), placeholder, '$el.prop(`placeholder`) should return the placeholder value');
-		$el.placeholder('new placeholder');
-		assert.strictEqual(el.getAttribute('placeholder'), 'new placeholder', '$el.placeholder(<string>) should set the placeholder value');
-		assert.strictEqual(el.value, 'new placeholder', '$el.placeholder(<string>) should update the displayed placeholder value');
-		$el.placeholder(placeholder);
+		assert.strictEqual( $el.prop( 'placeholder' ), placeholder, '$el.prop(`placeholder`) should return the placeholder value' );
+		$el.placeholder( 'new placeholder' );
+		assert.strictEqual( el.getAttribute( 'placeholder' ), 'new placeholder', '$el.placeholder(<string>) should set the placeholder value' );
+		assert.strictEqual( el.value, 'new placeholder', '$el.placeholder(<string>) should update the displayed placeholder value' );
+		$el.placeholder( placeholder );
 	};
 
-	QUnit.test('emulates placeholder for <input type=text>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#input-type-text'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <input type=text>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#input-type-text' ), assert );
+	} );
 
-	QUnit.test('emulates placeholder for <input type=search>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#input-type-search'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <input type=search>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#input-type-search' ), assert );
+	} );
 
-	QUnit.test('emulates placeholder for <input type=email>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#input-type-email'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <input type=email>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#input-type-email' ), assert );
+	} );
 
-	QUnit.test('emulates placeholder for <input type=url>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#input-type-url'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <input type=url>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#input-type-url' ), assert );
+	} );
 
-	QUnit.test('emulates placeholder for <input type=tel>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#input-type-tel'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <input type=tel>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#input-type-tel' ), assert );
+	} );
 
-	QUnit.test('emulates placeholder for <input type=password>', 13, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
+	QUnit.test( 'emulates placeholder for <input type=password>', 13, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
 
 		var selector = '#input-type-password',
-			$el = $(selector),
-			el = $el[0],
-			placeholder = el.getAttribute('placeholder');
+			$el = $( selector ),
+			el = $el[ 0 ],
+			placeholder = el.getAttribute( 'placeholder' );
 
-		assert.strictEqual($el.placeholder(), $el, 'should be chainable');
+		assert.strictEqual( $el.placeholder(), $el, 'should be chainable' );
 
 		// Re-select the element, as it gets replaced by another one in some browsers
-		$el = $(selector);
-		el = $el[0];
+		$el = $( selector );
+		el = $el[ 0 ];
 
-		assert.strictEqual(el.value, placeholder, 'should set `placeholder` text as `value`');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok($el.hasClass('placeholder'), 'should have `placeholder` class');
+		assert.strictEqual( el.value, placeholder, 'should set `placeholder` text as `value`' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( $el.hasClass( 'placeholder' ), 'should have `placeholder` class' );
 
 		// test on focus
 		$el.focus();
 
 		// Re-select the element, as it gets replaced by another one in some browsers
-		$el = $(selector);
-		el = $el[0];
+		$el = $( selector );
+		el = $el[ 0 ];
 
-		assert.strictEqual(el.value, '', '`value` should be the empty string on focus');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok(!$el.hasClass('placeholder'), 'should not have `placeholder` class on focus');
+		assert.strictEqual( el.value, '', '`value` should be the empty string on focus' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( !$el.hasClass( 'placeholder' ), 'should not have `placeholder` class on focus' );
 
 		// and unfocus (blur) again
 		$el.blur();
 
 		// Re-select the element, as it gets replaced by another one in some browsers
-		$el = $(selector);
-		el = $el[0];
+		$el = $( selector );
+		el = $el[ 0 ];
 
-		assert.strictEqual(el.value, placeholder, 'should set `placeholder` text as `value`');
-		assert.strictEqual($el.prop('value'), '', 'propHooks works properly');
-		assert.strictEqual($el.val(), '', 'valHooks works properly');
-		assert.ok($el.hasClass('placeholder'), 'should have `placeholder` class');
+		assert.strictEqual( el.value, placeholder, 'should set `placeholder` text as `value`' );
+		assert.strictEqual( $el.prop( 'value' ), '', 'propHooks works properly' );
+		assert.strictEqual( $el.val(), '', 'valHooks works properly' );
+		assert.ok( $el.hasClass( 'placeholder' ), 'should have `placeholder` class' );
 
-	});
+	} );
 
-	QUnit.test('emulates placeholder for <textarea></textarea>', 22, function (assert) {
-		$('<div>').html(html).appendTo($('#qunit-fixture'));
-		testElement($('#textarea'), assert);
-	});
+	QUnit.test( 'emulates placeholder for <textarea></textarea>', 22, function ( assert ) {
+		$( '<div>' ).html( html ).appendTo( $( '#qunit-fixture' ) );
+		testElement( $( '#textarea' ), assert );
+	} );
 
-}(jQuery));
+}( jQuery ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
index 00d4a08ed0..032551d815 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.parsers.test.js
@@ -12,20 +12,20 @@
 		setup: function () {
 			this.liveMonths = mw.language.months;
 			mw.language.months = {
-				'keys': {
-					'names': ['january', 'february', 'march', 'april', 'may_long', 'june',
-						'july', 'august', 'september', 'october', 'november', 'december'],
-					'genitive': ['january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
-						'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen', 'december-gen'],
-					'abbrev': ['jan', 'feb', 'mar', 'apr', 'may', 'jun',
-						'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
+				keys: {
+					names: [ 'january', 'february', 'march', 'april', 'may_long', 'june',
+						'july', 'august', 'september', 'october', 'november', 'december' ],
+					genitive: [ 'january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
+						'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen', 'december-gen' ],
+					abbrev: [ 'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+						'jul', 'aug', 'sep', 'oct', 'nov', 'dec' ]
 				},
-				'names': ['January', 'February', 'March', 'April', 'May', 'June',
-						'July', 'August', 'September', 'October', 'November', 'December'],
-				'genitive': ['January', 'February', 'March', 'April', 'May', 'June',
-						'July', 'August', 'September', 'October', 'November', 'December'],
-				'abbrev': ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-						'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+				names: [ 'January', 'February', 'March', 'April', 'May', 'June',
+						'July', 'August', 'September', 'October', 'November', 'December' ],
+				genitive: [ 'January', 'February', 'March', 'April', 'May', 'June',
+						'July', 'August', 'September', 'October', 'November', 'December' ],
+				abbrev: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+						'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]
 			};
 		},
 		teardown: function () {
@@ -36,8 +36,8 @@
 			/* default date format of the content language */
 			wgDefaultDateFormat: 'dmy',
 			/* These two are important for numeric interpretations */
-			wgSeparatorTransformTable: ['', ''],
-			wgDigitTransformTable: ['', '']
+			wgSeparatorTransformTable: [ '', '' ],
+			wgDigitTransformTable: [ '', '' ]
 		}
 	} ) );
 
@@ -57,17 +57,17 @@
 		QUnit.test( msg, data.length * 2, function ( assert ) {
 			var extractedR, extractedF, parser;
 
-			if (callback !== undefined ) {
+			if ( callback !== undefined ) {
 				callback();
 			}
 
 			parser = $.tablesorter.getParser( parserId );
 			$.each( data, function ( index, testcase ) {
-				extractedR = parser.is( testcase[0] );
-				extractedF = parser.format( testcase[0] );
+				extractedR = parser.is( testcase[ 0 ] );
+				extractedF = parser.format( testcase[ 0 ] );
 
-				assert.strictEqual( extractedR, testcase[1], 'Detect: ' + testcase[3] );
-				assert.strictEqual( extractedF, testcase[2], 'Sortkey: ' + testcase[3] );
+				assert.strictEqual( extractedR, testcase[ 1 ], 'Detect: ' + testcase[ 3 ] );
+				assert.strictEqual( extractedF, testcase[ 2 ], 'Sortkey: ' + testcase[ 3 ] );
 			} );
 
 		} );
@@ -82,139 +82,139 @@
 
 	ipv4 = [
 		// Some randomly generated fake IPs
-		['0.0.0.0', true, 0, 'An IP address' ],
-		['255.255.255.255', true, 255255255255, 'An IP address' ],
-		['45.238.27.109', true, 45238027109, 'An IP address' ],
-		['1.238.27.1', true, 1238027001, 'An IP address with small numbers' ],
-		['238.27.1', false, 238027001, 'A malformed IP Address' ],
-		['1', false, 1, 'A super malformed IP Address' ],
-		['Just text', false, 0, 'A line with just text' ],
-		['45.238.27.109Postfix', false, 45238027109, 'An IP address with a connected postfix' ],
-		['45.238.27.109 postfix', false, 45238027109, 'An IP address with a seperated postfix' ]
+		[ '0.0.0.0', true, 0, 'An IP address' ],
+		[ '255.255.255.255', true, 255255255255, 'An IP address' ],
+		[ '45.238.27.109', true, 45238027109, 'An IP address' ],
+		[ '1.238.27.1', true, 1238027001, 'An IP address with small numbers' ],
+		[ '238.27.1', false, 238027001, 'A malformed IP Address' ],
+		[ '1', false, 1, 'A super malformed IP Address' ],
+		[ 'Just text', false, 0, 'A line with just text' ],
+		[ '45.238.27.109Postfix', false, 45238027109, 'An IP address with a connected postfix' ],
+		[ '45.238.27.109 postfix', false, 45238027109, 'An IP address with a seperated postfix' ]
 	];
 	parserTest( 'IPv4', 'IPAddress', ipv4 );
 
 	simpleMDYDatesInMDY = [
-		['January 17, 2010',	true, 20100117, 'Long middle endian date'],
-		['Jan 17, 2010',	true, 20100117, 'Short middle endian date'],
-		['1/17/2010',		true, 20100117, 'Numeric middle endian date'],
-		['01/17/2010',		true, 20100117, 'Numeric middle endian date with padding on month'],
-		['01/07/2010',		true, 20100107, 'Numeric middle endian date with padding on day'],
-		['01/07/0010',		true, 20100107, 'Numeric middle endian date with padding on year'],
-		['5.12.1990',		true, 19900512, 'Numeric middle endian date with . separator']
+		[ 'January 17, 2010',	true, 20100117, 'Long middle endian date' ],
+		[ 'Jan 17, 2010',	true, 20100117, 'Short middle endian date' ],
+		[ '1/17/2010',		true, 20100117, 'Numeric middle endian date' ],
+		[ '01/17/2010',		true, 20100117, 'Numeric middle endian date with padding on month' ],
+		[ '01/07/2010',		true, 20100107, 'Numeric middle endian date with padding on day' ],
+		[ '01/07/0010',		true, 20100107, 'Numeric middle endian date with padding on year' ],
+		[ '5.12.1990',		true, 19900512, 'Numeric middle endian date with . separator' ]
 	];
 	parserTest( 'MDY Dates using mdy content language', 'date', simpleMDYDatesInMDY );
 
 	simpleMDYDatesInDMY = [
-		['January 17, 2010',	true, 20100117, 'Long middle endian date'],
-		['Jan 17, 2010',	true, 20100117, 'Short middle endian date'],
-		['1/17/2010',		true, 20101701, 'Numeric middle endian date'],
-		['01/17/2010',		true, 20101701, 'Numeric middle endian date with padding on month'],
-		['01/07/2010',		true, 20100701, 'Numeric middle endian date with padding on day'],
-		['01/07/0010',		true, 20100701, 'Numeric middle endian date with padding on year'],
-		['5.12.1990',		true, 19901205, 'Numeric middle endian date with . separator']
+		[ 'January 17, 2010',	true, 20100117, 'Long middle endian date' ],
+		[ 'Jan 17, 2010',	true, 20100117, 'Short middle endian date' ],
+		[ '1/17/2010',		true, 20101701, 'Numeric middle endian date' ],
+		[ '01/17/2010',		true, 20101701, 'Numeric middle endian date with padding on month' ],
+		[ '01/07/2010',		true, 20100701, 'Numeric middle endian date with padding on day' ],
+		[ '01/07/0010',		true, 20100701, 'Numeric middle endian date with padding on year' ],
+		[ '5.12.1990',		true, 19901205, 'Numeric middle endian date with . separator' ]
 	];
 	parserTest( 'MDY Dates using dmy content language', 'date', simpleMDYDatesInDMY, function () {
 		mw.config.set( {
-			'wgDefaultDateFormat': 'dmy',
-			'wgPageContentLanguage': 'de'
+			wgDefaultDateFormat: 'dmy',
+			wgPageContentLanguage: 'de'
 		} );
 	} );
 
 	oldMDYDates = [
-		['January 19, 1400 BC',		false, '99999999', 'BC'],
-		['January 19, 1400BC',		false, '99999999', 'Connected BC'],
-		['January, 19 1400 B.C.',	false, '99999999', 'B.C.'],
-		['January 19, 1400 AD',		false, '99999999', 'AD'],
-		['January, 19 10',			true, 20100119, 'AD'],
-		['January, 19 1',			false, '99999999', 'AD']
+		[ 'January 19, 1400 BC',		false, '99999999', 'BC' ],
+		[ 'January 19, 1400BC',		false, '99999999', 'Connected BC' ],
+		[ 'January, 19 1400 B.C.',	false, '99999999', 'B.C.' ],
+		[ 'January 19, 1400 AD',		false, '99999999', 'AD' ],
+		[ 'January, 19 10',			true, 20100119, 'AD' ],
+		[ 'January, 19 1',			false, '99999999', 'AD' ]
 	];
 	parserTest( 'Very old MDY dates', 'date', oldMDYDates );
 
 	complexMDYDates = [
-		['January, 19 2010',	true, 20100119, 'Comma after month'],
-		['January 19, 2010',	true, 20100119, 'Comma after day'],
-		['January/19/2010',		true, 20100119, 'Forward slash separator'],
-		['04 22 1991',			true, 19910422, 'Month with 0 padding'],
-		['April 21 1991',		true, 19910421, 'Space separation'],
-		['04 22 1991',			true, 19910422, 'Month with 0 padding'],
-		['December 12 \'10',	true, 20101212, ''],
-		['Dec 12 \'10',			true, 20101212, ''],
-		['Dec. 12 \'10',		true, 20101212, '']
+		[ 'January, 19 2010',	true, 20100119, 'Comma after month' ],
+		[ 'January 19, 2010',	true, 20100119, 'Comma after day' ],
+		[ 'January/19/2010',		true, 20100119, 'Forward slash separator' ],
+		[ '04 22 1991',			true, 19910422, 'Month with 0 padding' ],
+		[ 'April 21 1991',		true, 19910421, 'Space separation' ],
+		[ '04 22 1991',			true, 19910422, 'Month with 0 padding' ],
+		[ 'December 12 \'10',	true, 20101212, '' ],
+		[ 'Dec 12 \'10',			true, 20101212, '' ],
+		[ 'Dec. 12 \'10',		true, 20101212, '' ]
 	];
 	parserTest( 'MDY Dates', 'date', complexMDYDates );
 
 	clobberedDates = [
-		['January, 19 2010 - January, 20 2010',	false, '99999999', 'Date range with hyphen'],
-		['January, 19 2010 — January, 20 2010',	false, '99999999', 'Date range with mdash'],
-		['prefixJanuary, 19 2010',	false, '99999999', 'Connected prefix'],
-		['prefix January, 19 2010',	false, '99999999', 'Prefix'],
-		['December 12 2010postfix',	false, '99999999', 'ConnectedPostfix'],
-		['December 12 2010 postfix',	false, '99999999', 'Postfix'],
-		['A simple text',		false, '99999999', 'Plain text in date sort'],
-		['04l22l1991',			false, '99999999', 'l char as separator'],
-		['January\\19\\2010',	false, '99999999', 'backslash as date separator']
+		[ 'January, 19 2010 - January, 20 2010',	false, '99999999', 'Date range with hyphen' ],
+		[ 'January, 19 2010 — January, 20 2010',	false, '99999999', 'Date range with mdash' ],
+		[ 'prefixJanuary, 19 2010',	false, '99999999', 'Connected prefix' ],
+		[ 'prefix January, 19 2010',	false, '99999999', 'Prefix' ],
+		[ 'December 12 2010postfix',	false, '99999999', 'ConnectedPostfix' ],
+		[ 'December 12 2010 postfix',	false, '99999999', 'Postfix' ],
+		[ 'A simple text',		false, '99999999', 'Plain text in date sort' ],
+		[ '04l22l1991',			false, '99999999', 'l char as separator' ],
+		[ 'January\\19\\2010',	false, '99999999', 'backslash as date separator' ]
 	];
 	parserTest( 'Clobbered Dates', 'date', clobberedDates );
 
 	MYDates = [
-		['December 2010',	false, '99999999', 'Plain month year'],
-		['Dec 2010',		false, '99999999', 'Abreviated month year'],
-		['12 2010',			false, '99999999', 'Numeric month year']
+		[ 'December 2010',	false, '99999999', 'Plain month year' ],
+		[ 'Dec 2010',		false, '99999999', 'Abreviated month year' ],
+		[ '12 2010',			false, '99999999', 'Numeric month year' ]
 	];
 	parserTest( 'MY Dates', 'date', MYDates );
 
 	YDates = [
-		['2010',	false, '99999999', 'Plain 4-digit year'],
-		['876',		false, '99999999', '3-digit year'],
-		['76',		false, '99999999', '2-digit year'],
-		['\'76',	false, '99999999', '2-digit millenium bug year'],
-		['2010 BC',	false, '99999999', '4-digit year BC']
+		[ '2010',	false, '99999999', 'Plain 4-digit year' ],
+		[ '876',		false, '99999999', '3-digit year' ],
+		[ '76',		false, '99999999', '2-digit year' ],
+		[ '\'76',	false, '99999999', '2-digit millenium bug year' ],
+		[ '2010 BC',	false, '99999999', '4-digit year BC' ]
 	];
 	parserTest( 'Y Dates', 'date', YDates );
 
 	currencyData = [
-		['1.02 $',	true, 1.02, ''],
-		['$ 3.00',	true, 3, ''],
-		['€ 2,99',	true, 299, ''],
-		['$ 1.00',	true, 1, ''],
-		['$3.50',	true, 3.50, ''],
-		['$ 1.50',	true, 1.50, ''],
-		['€ 0.99',	true, 0.99, ''],
-		['$ 299.99',	true, 299.99, ''],
-		['$ 2,299.99',	true, 2299.99, ''],
-		['$ 2,989',	true, 2989, ''],
-		['$ 2 299.99',	true, 2299.99, ''],
-		['$ 2 989',	true, 2989, ''],
-		['$ 2.989',	true, 2.989, '']
+		[ '1.02 $',	true, 1.02, '' ],
+		[ '$ 3.00',	true, 3, '' ],
+		[ '€ 2,99',	true, 299, '' ],
+		[ '$ 1.00',	true, 1, '' ],
+		[ '$3.50',	true, 3.50, '' ],
+		[ '$ 1.50',	true, 1.50, '' ],
+		[ '€ 0.99',	true, 0.99, '' ],
+		[ '$ 299.99',	true, 299.99, '' ],
+		[ '$ 2,299.99',	true, 2299.99, '' ],
+		[ '$ 2,989',	true, 2989, '' ],
+		[ '$ 2 299.99',	true, 2299.99, '' ],
+		[ '$ 2 989',	true, 2989, '' ],
+		[ '$ 2.989',	true, 2.989, '' ]
 	];
 	parserTest( 'Currency', 'currency', currencyData );
 
 	transformedCurrencyData = [
-		['1.02 $',	true, 102, ''],
-		['$ 3.00',	true, 300, ''],
-		['€ 2,99',	true, 2.99, ''],
-		['$ 1.00',	true, 100, ''],
-		['$3.50',	true, 350, ''],
-		['$ 1.50',	true, 150, ''],
-		['€ 0.99',	true, 99, ''],
-		['$ 299.99',	true, 29999, ''],
-		['$ 2\'299,99',	true, 2299.99, ''],
-		['$ 2,989',	true, 2.989, ''],
-		['$ 2 299.99',	true, 229999, ''],
-		['2 989 $',	true, 2989, ''],
-		['299.99 $',	true, 29999, ''],
-		['2\'299,99 $',	true, 2299.99, ''],
-		['2,989 $',	true, 2.989, ''],
-		['2 299.99 $',	true, 229999, ''],
-		['2 989 $',	true, 2989, '']
+		[ '1.02 $',	true, 102, '' ],
+		[ '$ 3.00',	true, 300, '' ],
+		[ '€ 2,99',	true, 2.99, '' ],
+		[ '$ 1.00',	true, 100, '' ],
+		[ '$3.50',	true, 350, '' ],
+		[ '$ 1.50',	true, 150, '' ],
+		[ '€ 0.99',	true, 99, '' ],
+		[ '$ 299.99',	true, 29999, '' ],
+		[ '$ 2\'299,99',	true, 2299.99, '' ],
+		[ '$ 2,989',	true, 2.989, '' ],
+		[ '$ 2 299.99',	true, 229999, '' ],
+		[ '2 989 $',	true, 2989, '' ],
+		[ '299.99 $',	true, 29999, '' ],
+		[ '2\'299,99 $',	true, 2299.99, '' ],
+		[ '2,989 $',	true, 2.989, '' ],
+		[ '2 299.99 $',	true, 229999, '' ],
+		[ '2 989 $',	true, 2989, '' ]
 	];
 	parserTest( 'Currency with european separators', 'currency', transformedCurrencyData, function () {
 		mw.config.set( {
 			// We expect 22'234.444,22
 			// Map from ascii separators => localized separators
-			wgSeparatorTransformTable: [',	.	,', '\'	,	.'],
-			wgDigitTransformTable: ['', '']
+			wgSeparatorTransformTable: [ ',	.	,', '\'	,	.' ],
+			wgDigitTransformTable: [ '', '' ]
 		} );
 	} );
 
diff --git a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
index acd98a66b4..d4d0ce1e76 100644
--- a/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js
@@ -1,5 +1,19 @@
 ( function ( $, mw ) {
-	var header,
+	var header = [ 'Planet', 'Radius (km)' ],
+
+		// Data set "planets"
+		mercury = [ 'Mercury', '2439.7' ],
+		venus = [ 'Venus', '6051.8' ],
+		earth = [ 'Earth', '6371.0' ],
+		mars = [ 'Mars', '3390.0' ],
+		jupiter = [ 'Jupiter', '69911' ],
+		saturn = [ 'Saturn', '58232' ],
+		planets = [ mercury, venus, earth, mars, jupiter, saturn ],
+		planetsAscName = [ earth, jupiter, mars, mercury, saturn, venus ],
+		planetsAscRadius = [ mercury, mars, venus, earth, saturn, jupiter ],
+		planetsRowspan,
+		planetsRowspanII,
+		planetsAscNameLegacy,
 
 		// Data set "simple"
 		a1 = [ 'A', '1' ],
@@ -8,11 +22,12 @@
 		b1 = [ 'B', '1' ],
 		b2 = [ 'B', '2' ],
 		b3 = [ 'B', '3' ],
-		simple = [a2, b3, a1, a3, b2, b1],
-		simpleAsc = [a1, a2, a3, b1, b2, b3],
-		simpleDescasc = [b1, b2, b3, a1, a2, a3],
+		simple = [ a2, b3, a1, a3, b2, b1 ],
+		simpleAsc = [ a1, a2, a3, b1, b2, b3 ],
+		simpleDescasc = [ b1, b2, b3, a1, a2, a3 ],
 
 		// Data set "colspan"
+		header4 = [ 'column1a', 'column1b', 'column1c', 'column2' ],
 		aaa1 = [ 'A', 'A', 'A', '1' ],
 		aab5 = [ 'A', 'A', 'B', '5' ],
 		abc3 = [ 'A', 'B', 'C', '3' ],
@@ -20,159 +35,145 @@
 		caa4 = [ 'C', 'A', 'A', '4' ],
 		colspanInitial = [ aab5, aaa1, abc3, bbc2, caa4 ],
 
-		// Data set "planets"
-		mercury = [ 'Mercury', '2439.7' ],
-		venus = [ 'Venus', '6051.8' ],
-		earth = [ 'Earth', '6371.0' ],
-		mars = [ 'Mars', '3390.0' ],
-		jupiter = [ 'Jupiter', '69911' ],
-		saturn = [ 'Saturn', '58232' ],
-		planets = [mercury, venus, earth, mars, jupiter, saturn],
-		planetsAscName = [earth, jupiter, mars, mercury, saturn, venus],
-		planetsAscRadius = [mercury, mars, venus, earth, saturn, jupiter],
-		planetsRowspan,
-		planetsRowspanII,
-		planetsAscNameLegacy,
-
 		// Data set "ipv4"
 		ipv4 = [
 			// Some randomly generated fake IPs
-			['45.238.27.109'],
-			['44.172.9.22'],
-			['247.240.82.209'],
-			['204.204.132.158'],
-			['170.38.91.162'],
-			['197.219.164.9'],
-			['45.68.154.72'],
-			['182.195.149.80']
+			[ '45.238.27.109' ],
+			[ '44.172.9.22' ],
+			[ '247.240.82.209' ],
+			[ '204.204.132.158' ],
+			[ '170.38.91.162' ],
+			[ '197.219.164.9' ],
+			[ '45.68.154.72' ],
+			[ '182.195.149.80' ]
 		],
 		ipv4Sorted = [
 			// Sort order should go octet by octet
-			['44.172.9.22'],
-			['45.68.154.72'],
-			['45.238.27.109'],
-			['170.38.91.162'],
-			['182.195.149.80'],
-			['197.219.164.9'],
-			['204.204.132.158'],
-			['247.240.82.209']
+			[ '44.172.9.22' ],
+			[ '45.68.154.72' ],
+			[ '45.238.27.109' ],
+			[ '170.38.91.162' ],
+			[ '182.195.149.80' ],
+			[ '197.219.164.9' ],
+			[ '204.204.132.158' ],
+			[ '247.240.82.209' ]
 		],
 
 		// Data set "umlaut"
 		umlautWords = [
-			['Günther'],
-			['Peter'],
-			['Björn'],
-			['Bjorn'],
-			['Apfel'],
-			['Äpfel'],
-			['Strasse'],
-			['Sträßschen']
+			[ 'Günther' ],
+			[ 'Peter' ],
+			[ 'Björn' ],
+			[ 'Bjorn' ],
+			[ 'Apfel' ],
+			[ 'Äpfel' ],
+			[ 'Strasse' ],
+			[ 'Sträßschen' ]
 		],
 		umlautWordsSorted = [
-			['Äpfel'],
-			['Apfel'],
-			['Björn'],
-			['Bjorn'],
-			['Günther'],
-			['Peter'],
-			['Sträßschen'],
-			['Strasse']
+			[ 'Äpfel' ],
+			[ 'Apfel' ],
+			[ 'Björn' ],
+			[ 'Bjorn' ],
+			[ 'Günther' ],
+			[ 'Peter' ],
+			[ 'Sträßschen' ],
+			[ 'Strasse' ]
 		],
 
 		complexMDYDates = [
-			['January, 19 2010'],
-			['April 21 1991'],
-			['04 22 1991'],
-			['5.12.1990'],
-			['December 12 \'10']
+			[ 'January, 19 2010' ],
+			[ 'April 21 1991' ],
+			[ '04 22 1991' ],
+			[ '5.12.1990' ],
+			[ 'December 12 \'10' ]
 		],
 		complexMDYSorted = [
-			['5.12.1990'],
-			['April 21 1991'],
-			['04 22 1991'],
-			['January, 19 2010'],
-			['December 12 \'10']
+			[ '5.12.1990' ],
+			[ 'April 21 1991' ],
+			[ '04 22 1991' ],
+			[ 'January, 19 2010' ],
+			[ 'December 12 \'10' ]
 		],
 
 		currencyUnsorted = [
-			['1.02 $'],
-			['$ 3.00'],
-			['€ 2,99'],
-			['$ 1.00'],
-			['$3.50'],
-			['$ 1.50'],
-			['€ 0.99']
+			[ '1.02 $' ],
+			[ '$ 3.00' ],
+			[ '€ 2,99' ],
+			[ '$ 1.00' ],
+			[ '$3.50' ],
+			[ '$ 1.50' ],
+			[ '€ 0.99' ]
 		],
 		currencySorted = [
-			['€ 0.99'],
-			['$ 1.00'],
-			['1.02 $'],
-			['$ 1.50'],
-			['$ 3.00'],
-			['$3.50'],
+			[ '€ 0.99' ],
+			[ '$ 1.00' ],
+			[ '1.02 $' ],
+			[ '$ 1.50' ],
+			[ '$ 3.00' ],
+			[ '$3.50' ],
 			// Comma's sort after dots
 			// Not intentional but test to detect changes
-			['€ 2,99']
+			[ '€ 2,99' ]
 		],
 
 		numbers = [
-			[ '12'    ],
-			[  '7'    ],
-			[ '13,000'],
-			[  '9'    ],
-			[ '14'    ],
-			[  '8.0'  ]
+			[ '12' ],
+			[ '7' ],
+			[ '13,000' ],
+			[ '9' ],
+			[ '14' ],
+			[ '8.0' ]
 		],
 		numbersAsc = [
-			[  '7'    ],
-			[  '8.0'  ],
-			[  '9'    ],
-			[ '12'    ],
-			[ '14'    ],
-			[ '13,000']
+			[ '7' ],
+			[ '8.0' ],
+			[ '9' ],
+			[ '12' ],
+			[ '14' ],
+			[ '13,000' ]
 		],
 
 		correctDateSorting1 = [
-			['01 January 2010'],
-			['05 February 2010'],
-			['16 January 2010']
+			[ '01 January 2010' ],
+			[ '05 February 2010' ],
+			[ '16 January 2010' ]
 		],
 		correctDateSortingSorted1 = [
-			['01 January 2010'],
-			['16 January 2010'],
-			['05 February 2010']
+			[ '01 January 2010' ],
+			[ '16 January 2010' ],
+			[ '05 February 2010' ]
 		],
 
 		correctDateSorting2 = [
-			['January 01 2010'],
-			['February 05 2010'],
-			['January 16 2010']
+			[ 'January 01 2010' ],
+			[ 'February 05 2010' ],
+			[ 'January 16 2010' ]
 		],
 		correctDateSortingSorted2 = [
-			['January 01 2010'],
-			['January 16 2010'],
-			['February 05 2010']
+			[ 'January 01 2010' ],
+			[ 'January 16 2010' ],
+			[ 'February 05 2010' ]
 		];
 
 	QUnit.module( 'jquery.tablesorter', QUnit.newMwEnvironment( {
 		setup: function () {
 			this.liveMonths = mw.language.months;
 			mw.language.months = {
-				'keys': {
-					'names': ['january', 'february', 'march', 'april', 'may_long', 'june',
-						'july', 'august', 'september', 'october', 'november', 'december'],
-					'genitive': ['january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
-						'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen', 'december-gen'],
-					'abbrev': ['jan', 'feb', 'mar', 'apr', 'may', 'jun',
-						'jul', 'aug', 'sep', 'oct', 'nov', 'dec']
+				keys: {
+					names: [ 'january', 'february', 'march', 'april', 'may_long', 'june',
+						'july', 'august', 'september', 'october', 'november', 'december' ],
+					genitive: [ 'january-gen', 'february-gen', 'march-gen', 'april-gen', 'may-gen', 'june-gen',
+						'july-gen', 'august-gen', 'september-gen', 'october-gen', 'november-gen', 'december-gen' ],
+					abbrev: [ 'jan', 'feb', 'mar', 'apr', 'may', 'jun',
+						'jul', 'aug', 'sep', 'oct', 'nov', 'dec' ]
 				},
-				'names': ['January', 'February', 'March', 'April', 'May', 'June',
-						'July', 'August', 'September', 'October', 'November', 'December'],
-				'genitive': ['January', 'February', 'March', 'April', 'May', 'June',
-						'July', 'August', 'September', 'October', 'November', 'December'],
-				'abbrev': ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-						'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
+				names: [ 'January', 'February', 'March', 'April', 'May', 'June',
+						'July', 'August', 'September', 'October', 'November', 'December' ],
+				genitive: [ 'January', 'February', 'March', 'April', 'May', 'June',
+						'July', 'August', 'September', 'October', 'November', 'December' ],
+				abbrev: [ 'Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
+						'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec' ]
 			};
 		},
 		teardown: function () {
@@ -180,8 +181,8 @@
 		},
 		config: {
 			wgDefaultDateFormat: 'dmy',
-			wgSeparatorTransformTable: ['', ''],
-			wgDigitTransformTable: ['', ''],
+			wgSeparatorTransformTable: [ '', '' ],
+			wgDigitTransformTable: [ '', '' ],
 			wgPageContentLanguage: 'en'
 		}
 	} ) );
@@ -192,7 +193,7 @@
 	 *
 	 * @param {String[]} header
 	 * @param {String[][]} data
-	 * @return jQuery
+	 * @return {jQuery}
 	 */
 	function tableCreate( header, data ) {
 		var i,
@@ -210,7 +211,7 @@
 		for ( i = 0; i < data.length; i++ ) {
 			/*jshint loopfunc: true */
 			$tr = $( '<tr>' );
-			$.each( data[i], function ( j, str ) {
+			$.each( data[ i ], function ( j, str ) {
 				var $td = $( '<td>' );
 				$td.text( str ).appendTo( $tr );
 			} );
@@ -223,7 +224,7 @@
 	 * Extract text from table.
 	 *
 	 * @param {jQuery} $table
-	 * @return String[][]
+	 * @return {String[][]}
 	 */
 	function tableExtract( $table ) {
 		var data = [];
@@ -302,7 +303,6 @@
 	}
 
 	// Sample data set using planets named and their radius
-	header = [ 'Planet', 'Radius (km)'];
 
 	tableTest(
 		'Basic planet table: sorting initially - ascending by name',
@@ -388,9 +388,6 @@
 			$table.find( '.headerSort:eq(1)' ).click().click();
 		}
 	);
-
-	header = [ 'column1', 'column2' ];
-
 	tableTest(
 		'Sorting multiple columns by passing sort list',
 		header,
@@ -466,7 +463,7 @@
 
 			// Pretend to click while pressing the multi-sort key
 			var event = $.Event( 'click' );
-			event[$table.data( 'tablesorter' ).config.sortMultiSortKey] = true;
+			event[ $table.data( 'tablesorter' ).config.sortMultiSortKey ] = true;
 			$table.find( '.headerSort:eq(1)' ).trigger( event );
 		}
 	);
@@ -500,10 +497,9 @@
 	} );
 
 	// Sorting with colspans
-	header = [ 'column1a', 'column1b', 'column1c', 'column2' ];
 
 	tableTest( 'Sorting with colspanned headers: spanned column',
-		header,
+		header4,
 		colspanInitial,
 		[ aaa1, aab5, abc3, bbc2, caa4 ],
 		function ( $table ) {
@@ -516,7 +512,7 @@
 		}
 	);
 	tableTest( 'Sorting with colspanned headers: sort spanned column twice',
-		header,
+		header4,
 		colspanInitial,
 		[ caa4, bbc2, abc3, aab5, aaa1 ],
 		function ( $table ) {
@@ -530,7 +526,7 @@
 		}
 	);
 	tableTest( 'Sorting with colspanned headers: subsequent column',
-		header,
+		header4,
 		colspanInitial,
 		[ aaa1, bbc2, abc3, caa4, aab5 ],
 		function ( $table ) {
@@ -543,7 +539,7 @@
 		}
 	);
 	tableTest( 'Sorting with colspanned headers: sort subsequent column twice',
-		header,
+		header4,
 		colspanInitial,
 		[ aab5, caa4, abc3, bbc2, aaa1 ],
 		function ( $table ) {
@@ -557,38 +553,56 @@
 		}
 	);
 
-	tableTest(
-		'Basic planet table: one unsortable column',
-		header,
-		planets,
-		planets,
-		function ( $table ) {
-			$table.find( 'tr:eq(0) > th:eq(0)' ).addClass( 'unsortable' );
+	QUnit.test( 'Basic planet table: one unsortable column', 3, function ( assert ) {
+		var $table = tableCreate( header, planets ),
+			$cell;
+		$table.find( 'tr:eq(0) > th:eq(0)' ).addClass( 'unsortable' );
 
-			$table.tablesorter();
-			$table.find( 'tr:eq(0) > th:eq(0)' ).click();
-		}
-	);
+		$table.tablesorter();
+		$table.find( 'tr:eq(0) > th:eq(0)' ).click();
+
+		assert.deepEqual(
+			tableExtract( $table ),
+			planets,
+			'table not sorted'
+		);
+
+		$cell = $table.find( 'tr:eq(0) > th:eq(0)' );
+		$table.find( 'tr:eq(0) > th:eq(1)' ).click();
+
+		assert.equal(
+			$cell.hasClass( 'headerSortUp' ) || $cell.hasClass( 'headerSortDown' ),
+			false,
+			'after sort: no class headerSortUp or headerSortDown'
+		);
+
+		assert.equal(
+			$cell.attr( 'title' ),
+			undefined,
+			'after sort: no title tag added'
+		);
+
+	} );
 
 	// Regression tests!
 	tableTest(
 		'Bug 28775: German-style (dmy) short numeric dates',
-		['Date'],
+		[ 'Date' ],
 		[
 			// German-style dates are day-month-year
-			['11.11.2011'],
-			['01.11.2011'],
-			['02.10.2011'],
-			['03.08.2011'],
-			['09.11.2011']
+			[ '11.11.2011' ],
+			[ '01.11.2011' ],
+			[ '02.10.2011' ],
+			[ '03.08.2011' ],
+			[ '09.11.2011' ]
 		],
 		[
 			// Sorted by ascending date
-			['03.08.2011'],
-			['02.10.2011'],
-			['01.11.2011'],
-			['09.11.2011'],
-			['11.11.2011']
+			[ '03.08.2011' ],
+			[ '02.10.2011' ],
+			[ '01.11.2011' ],
+			[ '09.11.2011' ],
+			[ '11.11.2011' ]
 		],
 		function ( $table ) {
 			mw.config.set( 'wgDefaultDateFormat', 'dmy' );
@@ -601,22 +615,22 @@
 
 	tableTest(
 		'Bug 28775: American-style (mdy) short numeric dates',
-		['Date'],
+		[ 'Date' ],
 		[
 			// American-style dates are month-day-year
-			['11.11.2011'],
-			['01.11.2011'],
-			['02.10.2011'],
-			['03.08.2011'],
-			['09.11.2011']
+			[ '11.11.2011' ],
+			[ '01.11.2011' ],
+			[ '02.10.2011' ],
+			[ '03.08.2011' ],
+			[ '09.11.2011' ]
 		],
 		[
 			// Sorted by ascending date
-			['01.11.2011'],
-			['02.10.2011'],
-			['03.08.2011'],
-			['09.11.2011'],
-			['11.11.2011']
+			[ '01.11.2011' ],
+			[ '02.10.2011' ],
+			[ '03.08.2011' ],
+			[ '09.11.2011' ],
+			[ '11.11.2011' ]
 		],
 		function ( $table ) {
 			mw.config.set( 'wgDefaultDateFormat', 'mdy' );
@@ -628,7 +642,7 @@
 
 	tableTest(
 		'Bug 17141: IPv4 address sorting',
-		['IP'],
+		[ 'IP' ],
 		ipv4,
 		ipv4Sorted,
 		function ( $table ) {
@@ -638,7 +652,7 @@
 	);
 	tableTest(
 		'Bug 17141: IPv4 address sorting (reverse)',
-		['IP'],
+		[ 'IP' ],
 		ipv4,
 		reversed( ipv4Sorted ),
 		function ( $table ) {
@@ -649,15 +663,15 @@
 
 	tableTest(
 		'Accented Characters with custom collation',
-		['Name'],
+		[ 'Name' ],
 		umlautWords,
 		umlautWordsSorted,
 		function ( $table ) {
 			mw.config.set( 'tableSorterCollation', {
-				'ä': 'ae',
-				'ö': 'oe',
-				'ß': 'ss',
-				'ü': 'ue'
+				ä: 'ae',
+				ö: 'oe',
+				ß: 'ss',
+				ü: 'ue'
 			} );
 
 			$table.tablesorter();
@@ -749,7 +763,7 @@
 
 	tableTest(
 		'Complex date parsing I',
-		['date'],
+		[ 'date' ],
 		complexMDYDates,
 		complexMDYSorted,
 		function ( $table ) {
@@ -762,7 +776,7 @@
 
 	tableTest(
 		'Currency parsing I',
-		['currency'],
+		[ 'currency' ],
 		currencyUnsorted,
 		currencySorted,
 		function ( $table ) {
@@ -772,7 +786,7 @@
 	);
 
 	planetsAscNameLegacy = planetsAscName.slice( 0 );
-	planetsAscNameLegacy[4] = planetsAscNameLegacy[5];
+	planetsAscNameLegacy[ 4 ] = planetsAscNameLegacy[ 5 ];
 	planetsAscNameLegacy.pop();
 
 	tableTest(
@@ -801,7 +815,7 @@
 		$table.find( '.headerSort:eq(0)' ).click();
 
 		assert.equal(
-			$table.data( 'tablesorter' ).config.parsers[0].id,
+			$table.data( 'tablesorter' ).config.parsers[ 0 ].id,
 			'number',
 			'Correctly detected column content skipping sortbottom'
 		);
@@ -989,7 +1003,7 @@
 	} );
 
 	tableTest( 'bug 8115: sort numbers with commas (ascending)',
-		['Numbers'], numbers, numbersAsc,
+		[ 'Numbers' ], numbers, numbersAsc,
 		function ( $table ) {
 			$table.tablesorter();
 			$table.find( '.headerSort:eq(0)' ).click();
@@ -997,7 +1011,7 @@
 	);
 
 	tableTest( 'bug 8115: sort numbers with commas (descending)',
-		['Numbers'], numbers, reversed( numbersAsc ),
+		[ 'Numbers' ], numbers, reversed( numbersAsc ),
 		function ( $table ) {
 			$table.tablesorter();
 			$table.find( '.headerSort:eq(0)' ).click().click();
@@ -1032,7 +1046,7 @@
 
 	tableTest(
 		'Correct date sorting I',
-		['date'],
+		[ 'date' ],
 		correctDateSorting1,
 		correctDateSortingSorted1,
 		function ( $table ) {
@@ -1045,7 +1059,7 @@
 
 	tableTest(
 		'Correct date sorting II',
-		['date'],
+		[ 'date' ],
 		correctDateSorting2,
 		correctDateSortingSorted2,
 		function ( $table ) {
@@ -1238,7 +1252,7 @@
 				'</tbody></table>' );
 
 			$table.tablesorter();
-			assert.equal( $table.find( 'tr:eq(1) th:eq(1)').data('headerIndex'),
+			assert.equal( $table.find( 'tr:eq(1) th:eq(1)' ).data( 'headerIndex' ),
 				2,
 				'Incorrect index of sort header'
 			);
@@ -1262,14 +1276,14 @@
 	tableTestHTML(
 		'Rowspan exploding with colspanned cells (2)',
 		'<table class="sortable">' +
-			'<thead><tr><th id="sortme">n</th><th>foo</th><th>bar</th><th>baz</th><th>quux</th></tr></thead>' +
+			'<thead><tr><th>n</th><th>foo</th><th>bar</th><th>baz</th><th id="sortme">n2</th></tr></thead>' +
 			'<tbody>' +
-			'<tr><td>1</td><td>foo</td><td>bar</td><td rowspan="2">baz</td><td>quux</td></tr>' +
-			'<tr><td>2</td><td colspan="2">foobar</td><td>quux</td></tr>' +
+			'<tr><td>1</td><td>foo</td><td>bar</td><td rowspan="2">baz</td><td>2</td></tr>' +
+			'<tr><td>2</td><td colspan="2">foobar</td><td>1</td></tr>' +
 			'</tbody></table>',
 		[
-			[ '1', 'foo', 'bar', 'baz', 'quux' ],
-			[ '2', 'foobar', 'baz', 'quux' ]
+			[ '2', 'foobar', 'baz', '1' ],
+			[ '1', 'foo', 'bar', 'baz', '2' ]
 		]
 	);
 
@@ -1345,4 +1359,39 @@
 		]
 	);
 
+	QUnit.test( 'bug 105731 - incomplete rows in table body', 3, function ( assert ) {
+		var $table, parsers;
+		$table = $(
+			'<table class="sortable">' +
+				'<tr><th>A</th><th>B</th></tr>' +
+				'<tr><td>3</td></tr>' +
+				'<tr><td>1</td><td>2</td></tr>' +
+				'</table>'
+		);
+		$table.tablesorter();
+		$table.find( '.headerSort:eq(0)' ).click();
+		// now the first row have 2 columns
+		$table.find( '.headerSort:eq(1)' ).click();
+
+		parsers = $table.data( 'tablesorter' ).config.parsers;
+
+		assert.equal(
+			parsers.length,
+			2,
+			'detectParserForColumn() detect 2 parsers'
+		);
+
+		assert.equal(
+			parsers[ 1 ].id,
+			'number',
+			'detectParserForColumn() detect parser.id "number" for second column'
+		);
+
+		assert.equal(
+			parsers[ 1 ].format( $table.find( 'tbody > tr > td:eq(1)' ).text() ),
+			0,
+			'empty cell is sorted as number 0'
+		);
+
+	} );
 }( jQuery, mediaWiki ) );
diff --git a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
index 4bf44b079c..2e6f05edea 100644
--- a/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
+++ b/tests/qunit/suites/resources/jquery/jquery.textSelection.test.js
@@ -5,13 +5,13 @@
 	/**
 	 * Test factory for $.fn.textSelection( 'encapsulateText' )
 	 *
-	 * @param options {object} associative array containing:
-	 *   description {string}
-	 *   input {string}
-	 *   output {string}
-	 *   start {int} starting char for selection
-	 *   end {int} ending char for selection
-	 *   params {object} add'l parameters for $().textSelection( 'encapsulateText' )
+	 * @param {Object} options Associative configuration array
+	 * @param {string} options.description Description
+	 * @param {string} options.input Input
+	 * @param {string} options.output Output
+	 * @param {int} options.start Starting char for selection
+	 * @param {int} options.end Ending char for selection
+	 * @param {object} options.params Additional parameters for $().textSelection( 'encapsulateText' )
 	 */
 	function encapsulateTest( options ) {
 		var opt = $.extend( {
@@ -237,8 +237,8 @@
 			}
 
 			pos = $textarea.textSelection( 'getCaretPosition', { startAndEnd: true } );
-			among( pos[0], options.start, 'Caret start should be where we set it.' );
-			among( pos[1], options.end, 'Caret end should be where we set it.' );
+			among( pos[ 0 ], options.start, 'Caret start should be where we set it.' );
+			among( pos[ 1 ], options.end, 'Caret end should be where we set it.' );
 		} );
 	}
 
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index 26b6f570e6..803345835e 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@ -14,7 +14,7 @@
 	function sequence( responses ) {
 		var i = 0;
 		return function ( request ) {
-			var response = responses[i];
+			var response = responses[ i ];
 			if ( response ) {
 				i++;
 				request.respond.apply( request, response );
@@ -24,7 +24,7 @@
 
 	function sequenceBodies( status, headers, bodies ) {
 		jQuery.each( bodies, function ( i, body ) {
-			bodies[i] = [ status, headers, body ];
+			bodies[ i ] = [ status, headers, body ];
 		} );
 		return sequence( bodies );
 	}
@@ -268,7 +268,7 @@
 		} );
 
 		assert.equal( this.server.requests.length, 2, 'Request made' );
-		assert.equal( this.server.requests[0].requestHeaders['X-Foo'], 'Bar', 'Header sent' );
+		assert.equal( this.server.requests[ 0 ].requestHeaders[ 'X-Foo' ], 'Bar', 'Header sent' );
 	} );
 
 	QUnit.test( 'postWithToken() - badtoken', function ( assert ) {
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
index 1afbd35e85..030e703e7b 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.upload.test.js
@@ -18,7 +18,7 @@
 			return $.Deferred().promise();
 		} );
 
-		api.uploadWithIframe( $( '<input>' )[0], { filename: 'Testing API upload.jpg' } );
+		api.uploadWithIframe( $( '<input>' )[ 0 ], { filename: 'Testing API upload.jpg' } );
 
 		$iframe = $( 'iframe' );
 		$form = $( 'form.mw-api-upload-form' );
diff --git a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
index 5965ab7b4f..64a5184711 100644
--- a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
+++ b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.watch.test.js
@@ -17,12 +17,12 @@
 		} );
 
 		api.watch( [ 'Foo' ] ).done( function ( items ) {
-			assert.equal( items[0].title, 'Foo' );
+			assert.equal( items[ 0 ].title, 'Foo' );
 		} );
 
 		api.watch( [ 'Foo', 'Bar' ] ).done( function ( items ) {
-			assert.equal( items[0].title, 'Foo' );
-			assert.equal( items[1].title, 'Bar' );
+			assert.equal( items[ 0 ].title, 'Foo' );
+			assert.equal( items[ 1 ].title, 'Bar' );
 		} );
 
 		// Requests are POST, match requestBody instead of url
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignStructuredUpload.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignStructuredUpload.test.js
new file mode 100644
index 0000000000..3007416f35
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignStructuredUpload.test.js
@@ -0,0 +1,30 @@
+( function ( mw ) {
+	QUnit.module( 'mediawiki.ForeignStructuredUpload', QUnit.newMwEnvironment( {} ) );
+
+	QUnit.test( 'Constructor check', function ( assert ) {
+		QUnit.expect( 3 );
+		var upload = new mw.ForeignStructuredUpload();
+
+		assert.ok( upload, 'The ForeignUpload constructor is working.' );
+		assert.ok( upload.descriptions, 'The descriptions array was initialized properly' );
+		assert.ok( upload.categories, 'The categories array was initialized properly' );
+	} );
+
+	QUnit.test( 'getText', function ( assert ) {
+		QUnit.expect( 1 );
+
+		var upload = new mw.ForeignStructuredUpload();
+
+		// Set basic information
+		upload.addDescription( 'en', 'Test description one two three' );
+		upload.addDescription( 'en-x-piglatin', 'Esttay escriptionday unway ootay eethray' );
+		upload.setDate( '1776-07-04' );
+		upload.addCategories( [ 'Test 1', 'Test 2' ] );
+		upload.addCategories( [ 'Test 3' ] );
+
+		// Fake the user
+		this.sandbox.stub( upload, 'getUser' ).returns( 'Test user' );
+
+		assert.strictEqual( upload.getText().trim(), '{{Information\n|description={{en|Test description one two three}}\n{{en-x-piglatin|Esttay escriptionday unway ootay eethray}}\n|date=1776-07-04\n|source=Test user\n|author=Test user\n}}\n\n\n\n[[Category:Test 1]]\n[[Category:Test 2]]\n[[Category:Test 3]]' );
+	} );
+}( mediaWiki ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignUpload.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignUpload.test.js
new file mode 100644
index 0000000000..98b9678142
--- /dev/null
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.ForeignUpload.test.js
@@ -0,0 +1,12 @@
+( function ( mw ) {
+	QUnit.module( 'mediawiki.ForeignUpload', QUnit.newMwEnvironment( {} ) );
+
+	QUnit.test( 'Constructor check', function ( assert ) {
+		QUnit.expect( 3 );
+		var upload = new mw.ForeignUpload();
+
+		assert.ok( upload, 'The ForeignUpload constructor is working.' );
+		assert.strictEqual( upload.targetHost, 'commons.wikimedia.org', 'Default target host is correct' );
+		assert.ok( upload.api instanceof mw.ForeignApi, 'API is correctly configured to point at a foreign wiki.' );
+	} );
+}( mediaWiki ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index 284f21af87..af055beb16 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -100,33 +100,35 @@
 				// testing custom / localized namespace
 				100: 'Penguins'
 			},
+			// jscs: disable requireCamelCaseOrUpperCaseIdentifiers
 			wgNamespaceIds: {
-				'media': -2,
-				'special': -1,
+				media: -2,
+				special: -1,
 				'': 0,
-				'talk': 1,
-				'user': 2,
-				'user_talk': 3,
-				'wikipedia': 4,
-				'wikipedia_talk': 5,
-				'file': 6,
-				'file_talk': 7,
-				'mediawiki': 8,
-				'mediawiki_talk': 9,
-				'template': 10,
-				'template_talk': 11,
-				'help': 12,
-				'help_talk': 13,
-				'category': 14,
-				'category_talk': 15,
-				'image': 6,
-				'image_talk': 7,
-				'project': 4,
-				'project_talk': 5,
+				talk: 1,
+				user: 2,
+				user_talk: 3,
+				wikipedia: 4,
+				wikipedia_talk: 5,
+				file: 6,
+				file_talk: 7,
+				mediawiki: 8,
+				mediawiki_talk: 9,
+				template: 10,
+				template_talk: 11,
+				help: 12,
+				help_talk: 13,
+				category: 14,
+				category_talk: 15,
+				image: 6,
+				image_talk: 7,
+				project: 4,
+				project_talk: 5,
 				// Testing custom namespaces and aliases
-				'penguins': 100,
-				'antarctic_waterfowl': 100
+				penguins: 100,
+				antarctic_waterfowl: 100
 			},
+			// jscs: enable requireCamelCaseOrUpperCaseIdentifiers
 			wgCaseSensitiveNamespaces: []
 		}
 	} ) );
@@ -134,14 +136,14 @@
 	QUnit.test( 'constructor', cases.invalid.length, function ( assert ) {
 		var i, title;
 		for ( i = 0; i < cases.valid.length; i++ ) {
-			title = new mw.Title( cases.valid[i] );
+			title = new mw.Title( cases.valid[ i ] );
 		}
 		for ( i = 0; i < cases.invalid.length; i++ ) {
 			/*jshint loopfunc:true */
-			title = cases.invalid[i];
+			title = cases.invalid[ i ];
 			assert.throws( function () {
 				return new mw.Title( title );
-			}, cases.invalid[i] );
+			}, cases.invalid[ i ] );
 		}
 	} );
 
@@ -149,16 +151,16 @@
 		var i;
 		for ( i = 0; i < cases.valid.length; i++ ) {
 			assert.equal(
-				$.type( mw.Title.newFromText( cases.valid[i] ) ),
+				$.type( mw.Title.newFromText( cases.valid[ i ] ) ),
 				'object',
-				cases.valid[i]
+				cases.valid[ i ]
 			);
 		}
 		for ( i = 0; i < cases.invalid.length; i++ ) {
 			assert.equal(
-				$.type( mw.Title.newFromText( cases.invalid[i] ) ),
+				$.type( mw.Title.newFromText( cases.invalid[ i ] ) ),
 				'null',
-				cases.invalid[i]
+				cases.invalid[ i ]
 			);
 		}
 	} );
@@ -277,7 +279,7 @@
 		assert.equal( title.toString(), 'Article', 'Default config: No sensitive namespaces by default. First-letter becomes uppercase' );
 
 		// $wgCapitalLinks = false;
-		mw.config.set( 'wgCaseSensitiveNamespaces', [0, -2, 1, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15] );
+		mw.config.set( 'wgCaseSensitiveNamespaces', [ 0, -2, 1, 4, 5, 6, 7, 10, 11, 12, 13, 14, 15 ] );
 
 		title = new mw.Title( 'article' );
 		assert.equal( title.toString(), 'article', '$wgCapitalLinks=false: Article namespace is sensitive, first-letter case stays lowercase' );
@@ -320,8 +322,8 @@
 		assert.strictEqual( title.exists(), null, 'Return null with empty existance registry' );
 
 		// Basic registry, checks default to boolean
-		mw.Title.exist.set( ['Does_exist', 'User_talk:NeilK', 'Wikipedia:Sandbox_rules'], true );
-		mw.Title.exist.set( ['Does_not_exist', 'User:John', 'Foobar'], false );
+		mw.Title.exist.set( [ 'Does_exist', 'User_talk:NeilK', 'Wikipedia:Sandbox_rules' ], true );
+		mw.Title.exist.set( [ 'Does_not_exist', 'User:John', 'Foobar' ], false );
 
 		title = new mw.Title( 'Project:Sandbox rules' );
 		assert.assertTrue( title.exists(), 'Return true for page titles marked as existing' );
@@ -338,7 +340,7 @@
 
 		title = new mw.Title( 'Foobar' );
 		assert.equal( title.getUrl(), '/wiki/Foobar', 'Basic functionality, getUrl uses mw.util.getUrl' );
-		assert.equal( title.getUrl({ action: 'edit' }), '/wiki/Foobar?action=edit', 'Basic functionality, \'params\' parameter' );
+		assert.equal( title.getUrl( { action: 'edit' } ), '/wiki/Foobar?action=edit', 'Basic functionality, \'params\' parameter' );
 
 		title = new mw.Title( 'John Doe', 3 );
 		assert.equal( title.getUrl(), '/wiki/User_talk:John_Doe', 'Escaping in title and namespace for urls' );
@@ -431,7 +433,7 @@
 			];
 
 		for ( i = 0; i < cases.length; i++ ) {
-			thisCase = cases[i];
+			thisCase = cases[ i ];
 			title = mw.Title.newFromImg( { src: thisCase.url } );
 
 			if ( thisCase.nameText !== undefined ) {
@@ -478,19 +480,57 @@
 			];
 
 		for ( i = 0; i < cases.length; i++ ) {
-			thisCase = cases[i];
+			thisCase = cases[ i ];
 
 			title = mw.Title.newFromText( thisCase.text );
 			assert.equal( title.getRelativeText( thisCase.relativeTo ), thisCase.expectedResult );
 		}
 	} );
 
-	QUnit.test( 'newFromUserInput', 8, function ( assert ) {
+	QUnit.test( 'normalizeExtension', 5, function ( assert ) {
+		var extension, i, thisCase, prefix,
+			cases = [
+				{
+					extension: 'png',
+					expected: 'png',
+					description: 'Extension already in canonical form'
+				},
+				{
+					extension: 'PNG',
+					expected: 'png',
+					description: 'Extension lowercased in canonical form'
+				},
+				{
+					extension: 'jpeg',
+					expected: 'jpg',
+					description: 'Extension changed in canonical form'
+				},
+				{
+					extension: 'JPEG',
+					expected: 'jpg',
+					description: 'Extension lowercased and changed in canonical form'
+				},
+				{
+					extension: '~~~',
+					expected: '',
+					description: 'Extension invalid and discarded'
+				}
+			];
+
+		for ( i = 0; i < cases.length; i++ ) {
+			thisCase = cases[ i ];
+			extension = mw.Title.normalizeExtension( thisCase.extension );
+
+			prefix = '[' + thisCase.description + '] ';
+			assert.equal( extension, thisCase.expected, prefix + 'Extension as expected' );
+		}
+	} );
+
+	QUnit.test( 'newFromUserInput', 12, function ( assert ) {
 		var title, i, thisCase, prefix,
 			cases = [
 				{
 					title: 'DCS0001557854455.JPG',
-					defaultNamespace: 0,
 					options: {
 						fileExtension: 'PNG'
 					},
@@ -499,7 +539,6 @@
 				},
 				{
 					title: 'MediaWiki:Msg-awesome',
-					defaultNamespace: undefined,
 					expected: 'MediaWiki:Msg-awesome',
 					description: 'Full title (page in MediaWiki namespace) supplied as string'
 				},
@@ -517,11 +556,27 @@
 					},
 					expected: 'File:The/Mw/Sound.kml',
 					description: 'Page in File-namespace without explicit options'
+				},
+				{
+					title: 'File:Foo.JPEG',
+					options: {
+						fileExtension: 'jpg'
+					},
+					expected: 'File:Foo.jpg',
+					description: 'Page in File-namespace with non-canonical extension'
+				},
+				{
+					title: 'File:Foo.JPEG  ',
+					options: {
+						fileExtension: 'jpg'
+					},
+					expected: 'File:Foo.jpg',
+					description: 'Page in File-namespace with trailing whitespace'
 				}
 			];
 
 		for ( i = 0; i < cases.length; i++ ) {
-			thisCase = cases[i];
+			thisCase = cases[ i ];
 			title = mw.Title.newFromUserInput( thisCase.title, thisCase.defaultNamespace, thisCase.options );
 
 			if ( thisCase.expected !== undefined ) {
@@ -535,14 +590,14 @@
 		}
 	} );
 
-	QUnit.test( 'newFromFileName', 62, function ( assert ) {
+	QUnit.test( 'newFromFileName', 66, function ( assert ) {
 		var title, i, thisCase, prefix,
 			cases = [
 				{
 					fileName: 'DCS0001557854455.JPG',
 					typeOfName: 'Standard camera output',
 					nameText: 'DCS0001557854455',
-					prefixedText: 'File:DCS0001557854455.JPG',
+					prefixedText: 'File:DCS0001557854455.jpg',
 					extensionDesired: 'jpg'
 				},
 				{
@@ -555,7 +610,7 @@
 					fileName: 'Treppe 2222 Test upload.jpg',
 					typeOfName: 'File name with spaces in it and lower case file extension',
 					nameText: 'Treppe 2222 Test upload',
-					prefixedText: 'File:Treppe 2222 Test upload.jpg',
+					prefixedText: 'File:Treppe 2222 Test upload.JPG',
 					extensionDesired: 'JPG'
 				},
 				{
@@ -643,7 +698,7 @@
 			];
 
 		for ( i = 0; i < cases.length; i++ ) {
-			thisCase = cases[i];
+			thisCase = cases[ i ];
 			title = mw.Title.newFromFileName( thisCase.fileName, thisCase.extensionDesired );
 
 			if ( thisCase.nameText !== undefined ) {
@@ -652,6 +707,9 @@
 				assert.notStrictEqual( title, null, prefix + 'Parses successfully' );
 				assert.equal( title.getNameText(), thisCase.nameText, prefix + 'Filename matches original' );
 				assert.equal( title.getPrefixedText(), thisCase.prefixedText, prefix + 'File page title matches original' );
+				if ( thisCase.extensionDesired !== undefined ) {
+					assert.equal( title.getExtension(), thisCase.extensionDesired, prefix + 'Extension matches desired' );
+				}
 				assert.equal( title.getNamespaceId(), 6, prefix + 'Namespace ID matches File namespace' );
 			} else {
 				assert.strictEqual( title, null, thisCase.typeOfName + ', should not produce an mw.Title object' );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index ba36655382..51374bd8f4 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -11,7 +11,7 @@
 		}
 	} ) );
 
-	$.each( [true, false], function ( i, strictMode ) {
+	$.each( [ true, false ], function ( i, strictMode ) {
 		QUnit.test( 'Basic construction and properties (' + ( strictMode ? '' : 'non-' ) + 'strict mode)', 2, function ( assert ) {
 			var uriString, uri;
 			uriString = 'http://www.ietf.org/rfc/rfc2396.txt';
@@ -76,8 +76,8 @@
 		} );
 
 		assert.strictEqual( uri.query.n, '1', 'Simple parameter with overrideKeys:false' );
-		assert.strictEqual( uri.query.m[0], 'foo', 'Order of multi-value parameters with overrideKeys:true' );
-		assert.strictEqual( uri.query.m[1], 'bar', 'Order of multi-value parameters with overrideKeys:true' );
+		assert.strictEqual( uri.query.m[ 0 ], 'foo', 'Order of multi-value parameters with overrideKeys:true' );
+		assert.strictEqual( uri.query.m[ 1 ], 'bar', 'Order of multi-value parameters with overrideKeys:true' );
 		assert.strictEqual( uri.query.m.length, 2, 'Number of mult-value field is correct' );
 
 		uri = new mw.Uri( 'ftp://usr:pwd@192.0.2.16/' );
@@ -270,7 +270,7 @@
 
 		assert.deepEqual(
 			original.query,
-			{ 'one': '1', 'two': '2' },
+			{ one: '1', two: '2' },
 			'Properties is deep cloned (bug 37708)'
 		);
 	} );
@@ -367,7 +367,7 @@
 				host: 'example.com',
 				port: undefined,
 				path: '/wiki/Foo',
-				query: { 'v': '2' },
+				query: { v: '2' },
 				fragment: undefined
 			},
 			'basic object properties'
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
index 779a0ed48d..399db91430 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js
@@ -65,9 +65,9 @@
 		QUnit.test( 'Plural Test for ' + langCode, tests.length, function ( assert ) {
 			for ( var i = 0; i < tests.length; i++ ) {
 				assert.equal(
-					mw.language.convertPlural( tests[i][0], tests[i][1] ),
-					tests[i][2],
-					tests[i][3]
+					mw.language.convertPlural( tests[ i ][ 0 ], tests[ i ][ 1 ] ),
+					tests[ i ][ 2 ],
+					tests[ i ][ 3 ]
 				);
 			}
 		} );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
index f5f199ea9c..7a13f0f7f2 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.cookie.test.js
@@ -102,7 +102,7 @@
 		} );
 
 		call = $.cookie.lastCall.args;
-		assert.strictEqual( call[0], 'myPrefixfoo' );
+		assert.strictEqual( call[ 0 ], 'myPrefixfoo' );
 		assert.deepEqual( call[ 2 ], {
 			expires: expiryDate,
 			domain: 'myDomain',
@@ -122,7 +122,7 @@
 		} );
 
 		call = $.cookie.lastCall.args;
-		assert.strictEqual( call[0], 'myPrefixfoo' );
+		assert.strictEqual( call[ 0 ], 'myPrefixfoo' );
 		assert.deepEqual( call[ 2 ], {
 			expires: date,
 			domain: 'myDomain',
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
index 7c3f1ecb3b..587c893167 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.errorLogger.test.js
@@ -7,7 +7,7 @@
 			errorUrl = 'http://example.com',
 			errorLine = '123',
 			errorColumn = '45',
-			errorObject = new Error( 'Foo'),
+			errorObject = new Error( 'Foo' ),
 			oldHandler = this.sandbox.stub();
 
 		this.sandbox.stub( mw, 'track' );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
index d9fd6a7d0a..e7f4517548 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js
@@ -70,7 +70,7 @@
 	 */
 	function getMwLanguage( langCode ) {
 		if ( !hasOwn.call( mwLanguageCache, langCode ) ) {
-			mwLanguageCache[langCode] = $.ajax( {
+			mwLanguageCache[ langCode ] = $.ajax( {
 				url: mw.util.wikiScript( 'load' ),
 				data: {
 					skin: mw.config.get( 'skin' ),
@@ -88,16 +88,16 @@
 				return mw.language;
 			} );
 		}
-		return mwLanguageCache[langCode];
+		return mwLanguageCache[ langCode ];
 	}
 
 	/**
 	 * @param {Function[]} tasks List of functions that perform tasks
 	 *  that may be asynchronous. Invoke the callback parameter when done.
 	 * @param {Function} complete Called when all tasks are done, or when the sequence is aborted.
-	 * @return
 	 */
 	function process( tasks, complete ) {
+		/*jshint latedef:false */
 		function abort() {
 			tasks.splice( 0, tasks.length );
 			next();
@@ -401,14 +401,14 @@
 	QUnit.test( 'Curly brace transformation', 16, function ( assert ) {
 		var oldUserLang = mw.config.get( 'wgUserLanguage' );
 
-		assertBothModes( assert, ['gender-msg', 'Bob', 'male'], 'Bob: blue', 'gender is resolved' );
+		assertBothModes( assert, [ 'gender-msg', 'Bob', 'male' ], 'Bob: blue', 'gender is resolved' );
 
-		assertBothModes( assert, ['plural-msg', 5], 'Found 5 items', 'plural is resolved' );
+		assertBothModes( assert, [ 'plural-msg', 5 ], 'Found 5 items', 'plural is resolved' );
 
-		assertBothModes( assert, ['grammar-msg'], 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'grammar is resolved' );
+		assertBothModes( assert, [ 'grammar-msg' ], 'Przeszukaj ' + mw.config.get( 'wgSiteName' ), 'grammar is resolved' );
 
 		mw.config.set( 'wgUserLanguage', 'en' );
-		assertBothModes( assert, ['formatnum-msg', '987654321.654321'], '987,654,321.654', 'formatnum is resolved' );
+		assertBothModes( assert, [ 'formatnum-msg', '987654321.654321' ], '987,654,321.654', 'formatnum is resolved' );
 
 		// Test non-{{ wikitext, where behavior differs
 
@@ -512,7 +512,7 @@
 			'curly-brace': '{{int:message}}',
 			'single-square-bracket': '[https://www.mediawiki.org/ MediaWiki]',
 			'double-square-bracket': '[[Some page]]',
-			'regular': 'Other message'
+			regular: 'Other message'
 		} );
 
 		oldGMF = mw.jqueryMsg.getMessageFunction;
@@ -529,7 +529,7 @@
 			outerCalled = false;
 			innerCalled = false;
 			message = mw.message( key );
-			message[format]();
+			message[ format ]();
 			assert.strictEqual( outerCalled, shouldCall, 'Outer function called for ' + key );
 			assert.strictEqual( innerCalled, shouldCall, 'Inner function called for ' + key );
 		}
@@ -681,16 +681,16 @@
 	QUnit.test( 'HTML', 26, function ( assert ) {
 		mw.messages.set( 'jquerymsg-italics-msg', '<i>Very</i> important' );
 
-		assertBothModes( assert, ['jquerymsg-italics-msg'], mw.messages.get( 'jquerymsg-italics-msg' ), 'Simple italics unchanged' );
+		assertBothModes( assert, [ 'jquerymsg-italics-msg' ], mw.messages.get( 'jquerymsg-italics-msg' ), 'Simple italics unchanged' );
 
 		mw.messages.set( 'jquerymsg-bold-msg', '<b>Strong</b> speaker' );
-		assertBothModes( assert, ['jquerymsg-bold-msg'], mw.messages.get( 'jquerymsg-bold-msg' ), 'Simple bold unchanged' );
+		assertBothModes( assert, [ 'jquerymsg-bold-msg' ], mw.messages.get( 'jquerymsg-bold-msg' ), 'Simple bold unchanged' );
 
 		mw.messages.set( 'jquerymsg-bold-italics-msg', 'It is <b><i>key</i></b>' );
-		assertBothModes( assert, ['jquerymsg-bold-italics-msg'], mw.messages.get( 'jquerymsg-bold-italics-msg' ), 'Bold and italics nesting order preserved' );
+		assertBothModes( assert, [ 'jquerymsg-bold-italics-msg' ], mw.messages.get( 'jquerymsg-bold-italics-msg' ), 'Bold and italics nesting order preserved' );
 
 		mw.messages.set( 'jquerymsg-italics-bold-msg', 'It is <i><b>vital</b></i>' );
-		assertBothModes( assert, ['jquerymsg-italics-bold-msg'], mw.messages.get( 'jquerymsg-italics-bold-msg' ), 'Italics and bold nesting order preserved' );
+		assertBothModes( assert, [ 'jquerymsg-italics-bold-msg' ], mw.messages.get( 'jquerymsg-italics-bold-msg' ), 'Italics and bold nesting order preserved' );
 
 		mw.messages.set( 'jquerymsg-italics-with-link', 'An <i>italicized [[link|wiki-link]]</i>' );
 
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
index 3328ce3f1a..3b5915ac28 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js
@@ -61,7 +61,7 @@
 			expected = repeat( '\n', n ) + 'some text';
 
 			$textarea = $( '<textarea>\n' + expected + '</textarea>' );
-			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (HTML contained ' + (n + 1) + ')' );
+			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (HTML contained ' + ( n + 1 ) + ')' );
 
 			$textarea = $( '<textarea>' ).val( expected );
 			assert.equal( $textarea.val(), expected, 'Expecting ' + n + ' newlines (from DOM set with ' + n + ')' );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
index 670914ebac..399290ca46 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js
@@ -11,7 +11,7 @@
 		},
 		messages: {
 			// mw.language.listToText test
-			'and': ' and',
+			and: ' and',
 			'comma-separator': ', ',
 			'word-separator': ' '
 		}
@@ -51,9 +51,9 @@
 
 			for ( var i = 0; i < test.length; i++ ) {
 				assert.equal(
-					mw.language.convertGrammar( test[i].word, test[i].grammarForm ),
-					test[i].expected,
-					test[i].description
+					mw.language.convertGrammar( test[ i ].word, test[ i ].grammarForm ),
+					test[ i ].expected,
+					test[ i ].description
 				);
 			}
 		} );
@@ -481,8 +481,8 @@
 
 	QUnit.test( 'List to text test', 4, function ( assert ) {
 		assert.equal( mw.language.listToText( [] ), '', 'Blank list' );
-		assert.equal( mw.language.listToText( ['a'] ), 'a', 'Single item' );
-		assert.equal( mw.language.listToText( ['a', 'b'] ), 'a and b', 'Two items' );
-		assert.equal( mw.language.listToText( ['a', 'b', 'c'] ), 'a, b and c', 'More than two items' );
+		assert.equal( mw.language.listToText( [ 'a' ] ), 'a', 'Single item' );
+		assert.equal( mw.language.listToText( [ 'a', 'b' ] ), 'a and b', 'Two items' );
+		assert.equal( mw.language.listToText( [ 'a', 'b', 'c' ] ), 'a, b and c', 'More than two items' );
 	} );
 }( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
index 61bab03f69..288b527b64 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.messagePoster.factory.test.js
@@ -12,7 +12,7 @@
 
 		mw.messagePoster.factory.register( TEST_MODEL, testMessagePosterConstructor );
 		assert.strictEqual(
-			mw.messagePoster.factory.contentModelToClass[TEST_MODEL],
+			mw.messagePoster.factory.contentModelToClass[ TEST_MODEL ],
 			testMessagePosterConstructor,
 			'Constructor is registered'
 		);
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index c8f00115eb..b55b1e7cb7 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -108,21 +108,21 @@
 
 		// Multiple values at once
 		someValues = {
-			'foo': 'bar',
-			'lorem': 'ipsum',
-			'MediaWiki': true
+			foo: 'bar',
+			lorem: 'ipsum',
+			MediaWiki: true
 		};
 		assert.strictEqual( conf.set( someValues ), true, 'Map.set returns boolean true if multiple values were set by passing an object' );
-		assert.deepEqual( conf.get( ['foo', 'lorem'] ), {
-			'foo': 'bar',
-			'lorem': 'ipsum'
+		assert.deepEqual( conf.get( [ 'foo', 'lorem' ] ), {
+			foo: 'bar',
+			lorem: 'ipsum'
 		}, 'Map.get returns multiple values correctly as an object' );
 
 		assert.deepEqual( conf, new mw.Map( conf.values ), 'new mw.Map maps over existing values-bearing object' );
 
-		assert.deepEqual( conf.get( ['foo', 'notExist'] ), {
-			'foo': 'bar',
-			'notExist': null
+		assert.deepEqual( conf.get( [ 'foo', 'notExist' ] ), {
+			foo: 'bar',
+			notExist: null
 		}, 'Map.get return includes keys that were not found as null values' );
 
 		// Interacting with globals and accessing the values object
@@ -143,7 +143,7 @@
 		this.restoreWarnings();
 
 		// Change value via global Map
-		globalConf.set('anotherGlobalMapChecker', 'Again');
+		globalConf.set( 'anotherGlobalMapChecker', 'Again' );
 		assert.equal( globalConf.get( 'anotherGlobalMapChecker' ), 'Again', 'Change in global Map reflected via get()' );
 		this.suppressWarnings();
 		assert.equal( window.anotherGlobalMapChecker, 'Again', 'Change in global Map reflected window object' );
@@ -175,8 +175,8 @@
 				len = formats.length;
 
 			for ( i = 0; i < len; i++ ) {
-				format = formats[i];
-				assert.equal( mw.message.apply( null, messageArguments )[format](), expectedResult, assertMessage + ' when format is ' + format );
+				format = formats[ i ];
+				assert.equal( mw.message.apply( null, messageArguments )[ format ](), expectedResult, assertMessage + ' when format is ' + format );
 			}
 		}
 
@@ -203,21 +203,21 @@
 		assert.equal( hello.format, 'escaped', 'Message.escaped correctly updated the "format" property' );
 
 		assert.ok( mw.messages.set( 'multiple-curly-brace', '"{{SITENAME}}" is the home of {{int:other-message}}' ), 'mw.messages.set: Register' );
-		assertMultipleFormats( ['multiple-curly-brace'], ['text', 'parse'], '"' + siteName + '" is the home of Other Message', 'Curly brace format works correctly' );
+		assertMultipleFormats( [ 'multiple-curly-brace' ], [ 'text', 'parse' ], '"' + siteName + '" is the home of Other Message', 'Curly brace format works correctly' );
 		assert.equal( mw.message( 'multiple-curly-brace' ).plain(), mw.messages.get( 'multiple-curly-brace' ), 'Plain format works correctly for curly brace message' );
 		assert.equal( mw.message( 'multiple-curly-brace' ).escaped(), mw.html.escape( '"' + siteName + '" is the home of Other Message' ), 'Escaped format works correctly for curly brace message' );
 
 		assert.ok( mw.messages.set( 'multiple-square-brackets-and-ampersand', 'Visit the [[Project:Community portal|community portal]] & [[Project:Help desk|help desk]]' ), 'mw.messages.set: Register' );
-		assertMultipleFormats( ['multiple-square-brackets-and-ampersand'], ['plain', 'text'], mw.messages.get( 'multiple-square-brackets-and-ampersand' ), 'Square bracket message is not processed' );
+		assertMultipleFormats( [ 'multiple-square-brackets-and-ampersand' ], [ 'plain', 'text' ], mw.messages.get( 'multiple-square-brackets-and-ampersand' ), 'Square bracket message is not processed' );
 		assert.equal( mw.message( 'multiple-square-brackets-and-ampersand' ).escaped(), 'Visit the [[Project:Community portal|community portal]] &amp; [[Project:Help desk|help desk]]', 'Escaped format works correctly for square bracket message' );
 		assert.htmlEqual( mw.message( 'multiple-square-brackets-and-ampersand' ).parse(), 'Visit the ' +
 			'<a title="Project:Community portal" href="/wiki/Project:Community_portal">community portal</a>' +
 			' &amp; <a title="Project:Help desk" href="/wiki/Project:Help_desk">help desk</a>', 'Internal links work with parse' );
 
-		assertMultipleFormats( ['mediawiki-test-version-entrypoints-index-php'], ['plain', 'text', 'escaped'], mw.messages.get( 'mediawiki-test-version-entrypoints-index-php' ), 'External link markup is unprocessed' );
+		assertMultipleFormats( [ 'mediawiki-test-version-entrypoints-index-php' ], [ 'plain', 'text', 'escaped' ], mw.messages.get( 'mediawiki-test-version-entrypoints-index-php' ), 'External link markup is unprocessed' );
 		assert.htmlEqual( mw.message( 'mediawiki-test-version-entrypoints-index-php' ).parse(), '<a href="https://www.mediawiki.org/wiki/Manual:index.php">index.php</a>', 'External link works correctly in parse mode' );
 
-		assertMultipleFormats( ['external-link-replace', 'http://example.org/?x=y&z'], ['plain', 'text'], 'Foo [http://example.org/?x=y&z bar]', 'Parameters are substituted but external link is not processed' );
+		assertMultipleFormats( [ 'external-link-replace', 'http://example.org/?x=y&z' ], [ 'plain', 'text' ], 'Foo [http://example.org/?x=y&z bar]', 'Parameters are substituted but external link is not processed' );
 		assert.equal( mw.message( 'external-link-replace', 'http://example.org/?x=y&z' ).escaped(), 'Foo [http://example.org/?x=y&amp;z bar]', 'In escaped mode, parameters are substituted and ampersand is escaped, but external link is not processed' );
 		assert.htmlEqual( mw.message( 'external-link-replace', 'http://example.org/?x=y&z' ).parse(), 'Foo <a href="http://example.org/?x=y&amp;z">bar</a>', 'External link with replacement works in parse mode without double-escaping' );
 
@@ -235,26 +235,26 @@
 		goodbye = mw.message( 'goodbye' );
 		assert.strictEqual( goodbye.exists(), false, 'Message.exists returns false for nonexistent messages' );
 
-		assertMultipleFormats( ['goodbye'], ['plain', 'text'], '<goodbye>', 'Message.toString returns <key> if key does not exist' );
+		assertMultipleFormats( [ 'goodbye' ], [ 'plain', 'text' ], '<goodbye>', 'Message.toString returns <key> if key does not exist' );
 		// bug 30684
-		assertMultipleFormats( ['goodbye'], ['parse', 'escaped'], '&lt;goodbye&gt;', 'Message.toString returns properly escaped &lt;key&gt; if key does not exist' );
+		assertMultipleFormats( [ 'goodbye' ], [ 'parse', 'escaped' ], '&lt;goodbye&gt;', 'Message.toString returns properly escaped &lt;key&gt; if key does not exist' );
 
 		assert.ok( mw.messages.set( 'plural-test-msg', 'There {{PLURAL:$1|is|are}} $1 {{PLURAL:$1|result|results}}' ), 'mw.messages.set: Register' );
-		assertMultipleFormats( ['plural-test-msg', 6], ['text', 'parse', 'escaped'], 'There are 6 results', 'plural get resolved' );
+		assertMultipleFormats( [ 'plural-test-msg', 6 ], [ 'text', 'parse', 'escaped' ], 'There are 6 results', 'plural get resolved' );
 		assert.equal( mw.message( 'plural-test-msg', 6 ).plain(), 'There {{PLURAL:6|is|are}} 6 {{PLURAL:6|result|results}}', 'Parameter is substituted but plural is not resolved in plain' );
 
 		assert.ok( mw.messages.set( 'plural-test-msg-explicit', 'There {{plural:$1|is one car|are $1 cars|0=are no cars|12=are a dozen cars}}' ), 'mw.messages.set: Register message with explicit plural forms' );
-		assertMultipleFormats( ['plural-test-msg-explicit', 12], ['text', 'parse', 'escaped'], 'There are a dozen cars', 'explicit plural get resolved' );
+		assertMultipleFormats( [ 'plural-test-msg-explicit', 12 ], [ 'text', 'parse', 'escaped' ], 'There are a dozen cars', 'explicit plural get resolved' );
 
 		assert.ok( mw.messages.set( 'plural-test-msg-explicit-beginning', 'Basket has {{plural:$1|0=no eggs|12=a dozen eggs|6=half a dozen eggs|one egg|$1 eggs}}' ), 'mw.messages.set: Register message with explicit plural forms' );
-		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 1], ['text', 'parse', 'escaped'], 'Basket has one egg', 'explicit plural given at beginning get resolved for singular' );
-		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 4], ['text', 'parse', 'escaped'], 'Basket has 4 eggs', 'explicit plural given at beginning get resolved for plural' );
-		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 6], ['text', 'parse', 'escaped'], 'Basket has half a dozen eggs', 'explicit plural given at beginning get resolved for 6' );
-		assertMultipleFormats( ['plural-test-msg-explicit-beginning', 0], ['text', 'parse', 'escaped'], 'Basket has no eggs', 'explicit plural given at beginning get resolved for 0' );
+		assertMultipleFormats( [ 'plural-test-msg-explicit-beginning', 1 ], [ 'text', 'parse', 'escaped' ], 'Basket has one egg', 'explicit plural given at beginning get resolved for singular' );
+		assertMultipleFormats( [ 'plural-test-msg-explicit-beginning', 4 ], [ 'text', 'parse', 'escaped' ], 'Basket has 4 eggs', 'explicit plural given at beginning get resolved for plural' );
+		assertMultipleFormats( [ 'plural-test-msg-explicit-beginning', 6 ], [ 'text', 'parse', 'escaped' ], 'Basket has half a dozen eggs', 'explicit plural given at beginning get resolved for 6' );
+		assertMultipleFormats( [ 'plural-test-msg-explicit-beginning', 0 ], [ 'text', 'parse', 'escaped' ], 'Basket has no eggs', 'explicit plural given at beginning get resolved for 0' );
 
-		assertMultipleFormats( ['mediawiki-test-pagetriage-del-talk-page-notify-summary'], ['plain', 'text'], mw.messages.get( 'mediawiki-test-pagetriage-del-talk-page-notify-summary' ), 'Double square brackets with no parameters unchanged' );
+		assertMultipleFormats( [ 'mediawiki-test-pagetriage-del-talk-page-notify-summary' ], [ 'plain', 'text' ], mw.messages.get( 'mediawiki-test-pagetriage-del-talk-page-notify-summary' ), 'Double square brackets with no parameters unchanged' );
 
-		assertMultipleFormats( ['mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName], ['plain', 'text'], 'Notifying author of deletion nomination for [[' + specialCharactersPageName + ']]', 'Double square brackets with one parameter' );
+		assertMultipleFormats( [ 'mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName ], [ 'plain', 'text' ], 'Notifying author of deletion nomination for [[' + specialCharactersPageName + ']]', 'Double square brackets with one parameter' );
 
 		assert.equal( mw.message( 'mediawiki-test-pagetriage-del-talk-page-notify-summary', specialCharactersPageName ).escaped(), 'Notifying author of deletion nomination for [[' + mw.html.escape( specialCharactersPageName ) + ']]', 'Double square brackets with one parameter, when escaped' );
 
@@ -264,21 +264,21 @@
 		assert.ok( mw.messages.set( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result', '<a href=\'#\' title=\'{{#special:mypage}}\'>Username</a> (<a href=\'#\' title=\'{{#special:mytalk}}\'>talk</a>)' ), 'mw.messages.set: Register' );
 		assert.equal( mw.message( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result' ).plain(), mw.messages.get( 'mediawiki-test-wikieditor-toolbar-help-content-signature-result' ), 'HTML message with curly braces is not changed in plain mode' );
 
-		assertMultipleFormats( ['gender-plural-msg', 'male', 1], ['text', 'parse', 'escaped'], 'he is awesome', 'Gender and plural are resolved' );
+		assertMultipleFormats( [ 'gender-plural-msg', 'male', 1 ], [ 'text', 'parse', 'escaped' ], 'he is awesome', 'Gender and plural are resolved' );
 		assert.equal( mw.message( 'gender-plural-msg', 'male', 1 ).plain(), '{{GENDER:male|he|she|they}} {{PLURAL:1|is|are}} awesome', 'Parameters are substituted, but gender and plural are not resolved in plain mode' );
 
 		assert.equal( mw.message( 'grammar-msg' ).plain(), mw.messages.get( 'grammar-msg' ), 'Grammar is not resolved in plain mode' );
-		assertMultipleFormats( ['grammar-msg'], ['text', 'parse'], 'Przeszukaj ' + siteName, 'Grammar is resolved' );
+		assertMultipleFormats( [ 'grammar-msg' ], [ 'text', 'parse' ], 'Przeszukaj ' + siteName, 'Grammar is resolved' );
 		assert.equal( mw.message( 'grammar-msg' ).escaped(), 'Przeszukaj ' + siteName, 'Grammar is resolved in escaped mode' );
 
-		assertMultipleFormats( ['formatnum-msg', '987654321.654321'], ['text', 'parse', 'escaped'], '987,654,321.654', 'formatnum is resolved' );
+		assertMultipleFormats( [ 'formatnum-msg', '987654321.654321' ], [ 'text', 'parse', 'escaped' ], '987,654,321.654', 'formatnum is resolved' );
 		assert.equal( mw.message( 'formatnum-msg' ).plain(), mw.messages.get( 'formatnum-msg' ), 'formatnum is not resolved in plain mode' );
 
-		assertMultipleFormats( ['int-msg'], ['text', 'parse', 'escaped'], 'Some Other Message', 'int is resolved' );
+		assertMultipleFormats( [ 'int-msg' ], [ 'text', 'parse', 'escaped' ], 'Some Other Message', 'int is resolved' );
 		assert.equal( mw.message( 'int-msg' ).plain(), mw.messages.get( 'int-msg' ), 'int is not resolved in plain mode' );
 
 		assert.ok( mw.messages.set( 'mediawiki-italics-msg', '<i>Very</i> important' ),	'mw.messages.set: Register' );
-		assertMultipleFormats( ['mediawiki-italics-msg'], ['plain', 'text', 'parse'], mw.messages.get( 'mediawiki-italics-msg' ), 'Simple italics unchanged' );
+		assertMultipleFormats( [ 'mediawiki-italics-msg' ], [ 'plain', 'text', 'parse' ], mw.messages.get( 'mediawiki-italics-msg' ), 'Simple italics unchanged' );
 		assert.htmlEqual(
 			mw.message( 'mediawiki-italics-msg' ).escaped(),
 			'&lt;i&gt;Very&lt;/i&gt; important',
@@ -286,7 +286,7 @@
 		);
 
 		assert.ok( mw.messages.set( 'mediawiki-italics-with-link', 'An <i>italicized [[link|wiki-link]]</i>' ), 'mw.messages.set: Register' );
-		assertMultipleFormats( ['mediawiki-italics-with-link'], ['plain', 'text'], mw.messages.get( 'mediawiki-italics-with-link' ), 'Italics with link unchanged' );
+		assertMultipleFormats( [ 'mediawiki-italics-with-link' ], [ 'plain', 'text' ], mw.messages.get( 'mediawiki-italics-with-link' ), 'Italics with link unchanged' );
 		assert.htmlEqual(
 			mw.message( 'mediawiki-italics-with-link' ).escaped(),
 			'An &lt;i&gt;italicized [[link|wiki-link]]&lt;/i&gt;',
@@ -299,7 +299,7 @@
 		);
 
 		assert.ok( mw.messages.set( 'mediawiki-script-msg', '<script  >alert( "Who put this script here?" );</script>' ), 'mw.messages.set: Register' );
-		assertMultipleFormats( ['mediawiki-script-msg'], ['plain', 'text'], mw.messages.get( 'mediawiki-script-msg' ), 'Script unchanged' );
+		assertMultipleFormats( [ 'mediawiki-script-msg' ], [ 'plain', 'text' ], mw.messages.get( 'mediawiki-script-msg' ), 'Script unchanged' );
 		assert.htmlEqual(
 			mw.message( 'mediawiki-script-msg' ).escaped(),
 			'&lt;script  &gt;alert( "Who put this script here?" );&lt;/script&gt;',
@@ -340,8 +340,9 @@
 	 * The sync style load test (for @import). This is, in a way, also an open bug for
 	 * ResourceLoader ("execute js after styles are loaded"), but browsers don't offer a
 	 * way to get a callback from when a stylesheet is loaded (that is, including any
-	 * @import rules inside). To work around this, we'll have a little time loop to check
+	 * `@import` rules inside). To work around this, we'll have a little time loop to check
 	 * if the styles apply.
+	 *
 	 * Note: This test originally used new Image() and onerror to get a callback
 	 * when the url is loaded, but that is fragile since it doesn't monitor the
 	 * same request as the css @import, and Safari 4 has issues with
@@ -406,7 +407,7 @@
 			isAwesomeDone = true;
 		};
 
-		mw.loader.implement( 'test.callback', [QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' )] );
+		mw.loader.implement( 'test.callback', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
 
 		mw.loader.using( 'test.callback', function () {
 
@@ -430,7 +431,7 @@
 			isAwesomeDone = true;
 		};
 
-		mw.loader.implement( 'hasOwnProperty', [QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' )], {}, {} );
+		mw.loader.implement( 'hasOwnProperty', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ], {}, {} );
 
 		mw.loader.using( 'hasOwnProperty', function () {
 
@@ -454,7 +455,7 @@
 			isAwesomeDone = true;
 		};
 
-		mw.loader.implement( 'test.promise', [QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' )] );
+		mw.loader.implement( 'test.promise', [ QUnit.fixurl( mw.config.get( 'wgScriptPath' ) + '/tests/qunit/data/callMwLoaderTestCallback.js' ) ] );
 
 		mw.loader.using( 'test.promise' )
 		.done( function () {
@@ -491,7 +492,7 @@
 				QUnit.start();
 			},
 			{
-				'all': '.mw-test-implement-a { float: right; }'
+				all: '.mw-test-implement-a { float: right; }'
 			}
 		);
 
@@ -546,9 +547,9 @@
 				} );
 			},
 			{
-				'url': {
-					'print': [urlStyleTest( '.mw-test-implement-b1', 'text-align', 'center' )],
-					'screen': [
+				url: {
+					print: [ urlStyleTest( '.mw-test-implement-b1', 'text-align', 'center' ) ],
+					screen: [
 						// bug 40834: Make sure it actually works with more than 1 stylesheet reference
 						urlStyleTest( '.mw-test-implement-b2', 'float', 'left' ),
 						urlStyleTest( '.mw-test-implement-b3', 'float', 'right' )
@@ -583,7 +584,7 @@
 				QUnit.start();
 			},
 			{
-				'all': '.mw-test-implement-c { float: right; }'
+				all: '.mw-test-implement-c { float: right; }'
 			}
 		);
 
@@ -619,8 +620,8 @@
 				} );
 			},
 			{
-				'all': [urlStyleTest( '.mw-test-implement-d', 'float', 'right' )],
-				'print': [urlStyleTest( '.mw-test-implement-d2', 'text-align', 'center' )]
+				all: [ urlStyleTest( '.mw-test-implement-d', 'float', 'right' ) ],
+				print: [ urlStyleTest( '.mw-test-implement-d2', 'text-align', 'center' ) ]
 			}
 		);
 
@@ -630,20 +631,20 @@
 	} );
 
 	// @import (bug 31676)
-	QUnit.asyncTest( 'mw.loader.implement( styles has @import)', 5, function ( assert ) {
+	QUnit.asyncTest( 'mw.loader.implement( styles has @import)', 7, function ( assert ) {
 		var isJsExecuted, $element;
 
 		mw.loader.implement(
 			'test.implement.import',
 			function () {
-				assert.strictEqual( isJsExecuted, undefined, 'javascript not executed multiple times' );
+				assert.strictEqual( isJsExecuted, undefined, 'script not executed multiple times' );
 				isJsExecuted = true;
 
-				assert.equal( mw.loader.getState( 'test.implement.import' ), 'ready', 'module state is "ready" while implement() is executing javascript' );
+				assert.equal( mw.loader.getState( 'test.implement.import' ), 'executing', 'module state during implement() script execution' );
 
 				$element = $( '<div class="mw-test-implement-import">Foo bar</div>' ).appendTo( '#qunit-fixture' );
 
-				assert.equal( mw.msg( 'test-foobar' ), 'Hello Foobar, $1!', 'Messages are loaded before javascript execution' );
+				assert.equal( mw.msg( 'test-foobar' ), 'Hello Foobar, $1!', 'messages load before script execution' );
 
 				assertStyleAsync( assert, $element, 'float', 'right', function () {
 					assert.equal( $element.css( 'text-align' ), 'center',
@@ -654,7 +655,7 @@
 				} );
 			},
 			{
-				'css': [
+				css: [
 					'@import url(\''
 						+ urlStyleTest( '.mw-test-implement-import', 'float', 'right' )
 						+ '\');\n'
@@ -666,8 +667,10 @@
 			}
 		);
 
-		mw.loader.load( 'test.implement' );
-
+		mw.loader.using( 'test.implement.import' ).always( function () {
+			assert.strictEqual( isJsExecuted, true, 'script executed' );
+			assert.equal( mw.loader.getState( 'test.implement.import' ), 'ready', 'module state after script execution' );
+		} );
 	} );
 
 	QUnit.asyncTest( 'mw.loader.implement( dependency with styles )', 4, function ( assert ) {
@@ -686,7 +689,7 @@
 		);
 
 		mw.loader.register( [
-			[ 'test.implement.e', '0', ['test.implement.e2']],
+			[ 'test.implement.e', '0', [ 'test.implement.e2' ] ],
 			[ 'test.implement.e2', '0' ]
 		] );
 
@@ -701,7 +704,7 @@
 				QUnit.start();
 			},
 			{
-				'all': '.mw-test-implement-e { float: right; }'
+				all: '.mw-test-implement-e { float: right; }'
 			}
 		);
 
@@ -715,7 +718,7 @@
 				);
 			},
 			{
-				'all': '.mw-test-implement-e2 { float: left; }'
+				all: '.mw-test-implement-e2 { float: left; }'
 			}
 		);
 
@@ -732,7 +735,9 @@
 	QUnit.asyncTest( 'mw.loader.implement( only messages )', 2, function ( assert ) {
 		assert.assertFalse( mw.messages.exists( 'bug_29107' ), 'Verify that the test message doesn\'t exist yet' );
 
-		mw.loader.implement( 'test.implement.msgs', [], {}, { 'bug_29107': 'loaded' } );
+		// jscs: disable requireCamelCaseOrUpperCaseIdentifiers
+		mw.loader.implement( 'test.implement.msgs', [], {}, { bug_29107: 'loaded' } );
+		// jscs: enable requireCamelCaseOrUpperCaseIdentifiers
 		mw.loader.using( 'test.implement.msgs', function () {
 			QUnit.start();
 			assert.ok( mw.messages.exists( 'bug_29107' ), 'Bug 29107: messages-only module should implement ok' );
@@ -747,9 +752,9 @@
 		this.sandbox.stub( mw, 'track' );
 
 		mw.loader.register( [
-			['test.module1', '0'],
-			['test.module2', '0', ['test.module1']],
-			['test.module3', '0', ['test.module2']]
+			[ 'test.module1', '0' ],
+			[ 'test.module2', '0', [ 'test.module1' ] ],
+			[ 'test.module3', '0', [ 'test.module2' ] ]
 		] );
 		mw.loader.implement( 'test.module1', function () {
 			throw new Error( 'expected' );
@@ -763,9 +768,9 @@
 
 	QUnit.test( 'mw.loader out-of-order implementation', 9, function ( assert ) {
 		mw.loader.register( [
-			['test.module4', '0'],
-			['test.module5', '0', ['test.module4']],
-			['test.module6', '0', ['test.module5']]
+			[ 'test.module4', '0' ],
+			[ 'test.module5', '0', [ 'test.module4' ] ],
+			[ 'test.module6', '0', [ 'test.module5' ] ]
 		] );
 		mw.loader.implement( 'test.module4', function () {} );
 		assert.strictEqual( mw.loader.getState( 'test.module4' ), 'ready', 'Expected "ready" state for test.module4' );
@@ -783,9 +788,9 @@
 
 	QUnit.test( 'mw.loader missing dependency', 13, function ( assert ) {
 		mw.loader.register( [
-			['test.module7', '0'],
-			['test.module8', '0', ['test.module7']],
-			['test.module9', '0', ['test.module8']]
+			[ 'test.module7', '0' ],
+			[ 'test.module8', '0', [ 'test.module7' ] ],
+			[ 'test.module9', '0', [ 'test.module8' ] ]
 		] );
 		mw.loader.implement( 'test.module8', function () {} );
 		assert.strictEqual( mw.loader.getState( 'test.module7' ), 'registered', 'Expected "registered" state for test.module7' );
@@ -800,18 +805,18 @@
 		assert.strictEqual( mw.loader.getState( 'test.module8' ), 'error', 'Expected "error" state for test.module8' );
 		assert.strictEqual( mw.loader.getState( 'test.module9' ), 'error', 'Expected "error" state for test.module9' );
 		mw.loader.using(
-			['test.module7'],
+			[ 'test.module7' ],
 			function () {
 				assert.ok( false, 'Success fired despite missing dependency' );
 				assert.ok( true, 'QUnit expected() count dummy' );
 			},
 			function ( e, dependencies ) {
 				assert.strictEqual( $.isArray( dependencies ), true, 'Expected array of dependencies' );
-				assert.deepEqual( dependencies, ['test.module7'], 'Error callback called with module test.module7' );
+				assert.deepEqual( dependencies, [ 'test.module7' ], 'Error callback called with module test.module7' );
 			}
 		);
 		mw.loader.using(
-			['test.module9'],
+			[ 'test.module9' ],
 			function () {
 				assert.ok( false, 'Success fired despite missing dependency' );
 				assert.ok( true, 'QUnit expected() count dummy' );
@@ -821,7 +826,7 @@
 				dependencies.sort();
 				assert.deepEqual(
 					dependencies,
-					['test.module7', 'test.module8', 'test.module9'],
+					[ 'test.module7', 'test.module8', 'test.module9' ],
 					'Error callback called with all three modules as dependencies'
 				);
 			}
@@ -831,9 +836,9 @@
 	QUnit.asyncTest( 'mw.loader dependency handling', 5, function ( assert ) {
 		mw.loader.register( [
 			// [module, version, dependencies, group, source]
-			['testMissing', '1', [], null, 'testloader'],
-			['testUsesMissing', '1', ['testMissing'], null, 'testloader'],
-			['testUsesNestedMissing', '1', ['testUsesMissing'], null, 'testloader']
+			[ 'testMissing', '1', [], null, 'testloader' ],
+			[ 'testUsesMissing', '1', [ 'testMissing' ], null, 'testloader' ],
+			[ 'testUsesNestedMissing', '1', [ 'testUsesMissing' ], null, 'testloader' ]
 		] );
 
 		function verifyModuleStates() {
@@ -842,7 +847,7 @@
 			assert.equal( mw.loader.getState( 'testUsesNestedMissing' ), 'error', 'Module with indirect missing dependency must have state "error"' );
 		}
 
-		mw.loader.using( ['testUsesNestedMissing'],
+		mw.loader.using( [ 'testUsesNestedMissing' ],
 			function () {
 				assert.ok( false, 'Error handler should be invoked.' );
 				assert.ok( true ); // Dummy to reach QUnit expect()
@@ -856,7 +861,7 @@
 				// As soon as server spits out state('testMissing', 'missing');
 				// it will bubble up and trigger the error callback.
 				// Therefor the badmodules array is not testUsesMissing or testUsesNestedMissing.
-				assert.deepEqual( badmodules, ['testMissing'], 'Bad modules as expected.' );
+				assert.deepEqual( badmodules, [ 'testMissing' ], 'Bad modules as expected.' );
 
 				verifyModuleStates();
 
@@ -868,9 +873,9 @@
 	QUnit.asyncTest( 'mw.loader skin-function handling', 5, function ( assert ) {
 		mw.loader.register( [
 			// [module, version, dependencies, group, source, skip]
-			['testSkipped', '1', [], null, 'testloader', 'return true;'],
-			['testNotSkipped', '1', [], null, 'testloader', 'return false;'],
-			['testUsesSkippable', '1', ['testSkipped', 'testNotSkipped'], null, 'testloader']
+			[ 'testSkipped', '1', [], null, 'testloader', 'return true;' ],
+			[ 'testNotSkipped', '1', [], null, 'testloader', 'return false;' ],
+			[ 'testUsesSkippable', '1', [ 'testSkipped', 'testNotSkipped' ], null, 'testloader' ]
 		] );
 
 		function verifyModuleStates() {
@@ -879,7 +884,7 @@
 			assert.equal( mw.loader.getState( 'testUsesSkippable' ), 'ready', 'Module is ready when skippable dependencies are ready' );
 		}
 
-		mw.loader.using( ['testUsesSkippable'],
+		mw.loader.using( [ 'testUsesSkippable' ],
 			function () {
 				assert.ok( true, 'Success handler should be invoked.' );
 				assert.ok( true ); // Dummy to match error handler and reach QUnit expect()
@@ -920,6 +925,31 @@
 		mw.loader.load( target );
 	} );
 
+	QUnit.asyncTest( 'mw.loader() executing race (T112232)', 2, function ( assert ) {
+		var done = false;
+
+		// The red herring schedules its CSS buffer first. In T112232, a bug in the
+		// state machine would cause the job for testRaceLoadMe to run with an earlier job.
+		mw.loader.implement(
+			'testRaceRedHerring',
+			function () {},
+			{ css: [ '.mw-testRaceRedHerring {}' ] }
+		);
+		mw.loader.implement(
+			'testRaceLoadMe',
+			function () {
+				done = true;
+			},
+			{ css: [ '.mw-testRaceLoadMe { float: left; }' ] }
+		);
+
+		mw.loader.load( [ 'testRaceRedHerring', 'testRaceLoadMe' ] );
+		mw.loader.using( 'testRaceLoadMe', function () {
+			assert.strictEqual( done, true, 'script ran' );
+			assert.strictEqual( mw.loader.getState( 'testRaceLoadMe' ), 'ready', 'state' );
+		} ).always( QUnit.start );
+	} );
+
 	QUnit.test( 'mw.html', 13, function ( assert ) {
 		assert.throws( function () {
 			mw.html.escape();
@@ -1013,9 +1043,9 @@
 
 		mw.hook( 'test.hook.data' ).add( function ( data1, data2 ) {
 			assert.equal( data1, 'example', 'Fire with data (string param)' );
-			assert.deepEqual( data2, ['two'], 'Fire with data (array param)' );
+			assert.deepEqual( data2, [ 'two' ], 'Fire with data (array param)' );
 		} );
-		mw.hook( 'test.hook.data' ).fire( 'example', ['two'] );
+		mw.hook( 'test.hook.data' ).fire( 'example', [ 'two' ] );
 
 		hook = mw.hook( 'test.hook.chainable' );
 		assert.strictEqual( hook.add(), hook, 'hook.add is chainable' );
@@ -1026,7 +1056,7 @@
 		add = hook.add;
 		fire = hook.fire;
 		add( function ( x, y ) {
-			assert.deepEqual( [x, y], ['x', 'y'], 'Detached (contextless) with data' );
+			assert.deepEqual( [ x, y ], [ 'x', 'y' ], 'Detached (contextless) with data' );
 		} );
 		fire( 'x', 'y' );
 
@@ -1049,7 +1079,7 @@
 				assert.equal( chr, 'z', 'Adding callback later invokes right away with last data' );
 			} );
 
-		assert.deepEqual( chars, ['x', 'y', 'z'], 'Multiple callbacks with multiple fires' );
+		assert.deepEqual( chars, [ 'x', 'y', 'z' ], 'Multiple callbacks with multiple fires' );
 
 		chars = [];
 		callback = function ( chr ) {
@@ -1078,7 +1108,7 @@
 
 		assert.deepEqual(
 			chars,
-			['x', 'x', 'x', 'x', 'y', 'z'],
+			[ 'x', 'x', 'x', 'x', 'y', 'z' ],
 			'"add" and "remove" support variadic arguments. ' +
 				'"add" does not filter unique. ' +
 				'"remove" removes all equal by reference. ' +
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
index b73d2e39cf..c1f1484c3f 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js
@@ -2,54 +2,54 @@
 	var
 		// Based on IPTest.php > testisIPv4
 		IPV4_CASES = [
-			[false, false, 'Boolean false is not an IP'],
-			[false, true, 'Boolean true is not an IP'],
-			[false, '', 'Empty string is not an IP'],
-			[false, 'abc', '"abc" is not an IP'],
-			[false, ':', 'Colon is not an IP'],
-			[false, '124.24.52', 'IPv4 not enough quads'],
-			[false, '24.324.52.13', 'IPv4 out of range'],
-			[false, '.24.52.13', 'IPv4 starts with period'],
-
-			[true, '124.24.52.13', '124.24.52.134 is a valid IP'],
-			[true, '1.24.52.13', '1.24.52.13 is a valid IP'],
-			[false, '74.24.52.13/20', 'IPv4 ranges are not recognized as valid IPs']
+			[ false, false, 'Boolean false is not an IP' ],
+			[ false, true, 'Boolean true is not an IP' ],
+			[ false, '', 'Empty string is not an IP' ],
+			[ false, 'abc', '"abc" is not an IP' ],
+			[ false, ':', 'Colon is not an IP' ],
+			[ false, '124.24.52', 'IPv4 not enough quads' ],
+			[ false, '24.324.52.13', 'IPv4 out of range' ],
+			[ false, '.24.52.13', 'IPv4 starts with period' ],
+
+			[ true, '124.24.52.13', '124.24.52.134 is a valid IP' ],
+			[ true, '1.24.52.13', '1.24.52.13 is a valid IP' ],
+			[ false, '74.24.52.13/20', 'IPv4 ranges are not recognized as valid IPs' ]
 		],
 
 		// Based on IPTest.php > testisIPv6
 		IPV6_CASES = [
-			[false, ':fc:100::', 'IPv6 starting with lone ":"'],
-			[false, 'fc:100:::', 'IPv6 ending with a ":::"'],
-			[false, 'fc:300', 'IPv6 with only 2 words'],
-			[false, 'fc:100:300', 'IPv6 with only 3 words'],
-
-			[false, 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending with "::"'],
-			[false, 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending with "::"'],
-
-			[false, ':::'],
-			[false, '::0:', 'IPv6 ending in a lone ":"'],
-
-			[true,  '::', 'IPv6 zero address'],
-
-			[false, '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words'],
-			[false, '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words'],
-
-			[false, ':fc::100', 'IPv6 starting with lone ":"'],
-			[false, 'fc::100:', 'IPv6 ending with lone ":"'],
-			[false, 'fc:::100', 'IPv6 with ":::" in the middle'],
-
-			[true,  'fc::100', 'IPv6 with "::" and 2 words'],
-			[true,  'fc::100:a', 'IPv6 with "::" and 3 words'],
-			[true,  'fc::100:a:d', 'IPv6 with "::" and 4 words'],
-			[true,  'fc::100:a:d:1', 'IPv6 with "::" and 5 words'],
-			[true,  'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words'],
-			[true,  'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words'],
-			[true,  '2001::df', 'IPv6 with "::" and 2 words'],
-			[true,  '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words'],
-			[true,  '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words'],
-
-			[false, 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words'],
-			[false, 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words']
+			[ false, ':fc:100::', 'IPv6 starting with lone ":"' ],
+			[ false, 'fc:100:::', 'IPv6 ending with a ":::"' ],
+			[ false, 'fc:300', 'IPv6 with only 2 words' ],
+			[ false, 'fc:100:300', 'IPv6 with only 3 words' ],
+
+			[ false, 'fc:100:a:d:1:e:ac:0::', 'IPv6 with 8 words ending with "::"' ],
+			[ false, 'fc:100:a:d:1:e:ac:0:1::', 'IPv6 with 9 words ending with "::"' ],
+
+			[ false, ':::' ],
+			[ false, '::0:', 'IPv6 ending in a lone ":"' ],
+
+			[ true,  '::', 'IPv6 zero address' ],
+
+			[ false, '::fc:100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' ],
+			[ false, '::fc:100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' ],
+
+			[ false, ':fc::100', 'IPv6 starting with lone ":"' ],
+			[ false, 'fc::100:', 'IPv6 ending with lone ":"' ],
+			[ false, 'fc:::100', 'IPv6 with ":::" in the middle' ],
+
+			[ true,  'fc::100', 'IPv6 with "::" and 2 words' ],
+			[ true,  'fc::100:a', 'IPv6 with "::" and 3 words' ],
+			[ true,  'fc::100:a:d', 'IPv6 with "::" and 4 words' ],
+			[ true,  'fc::100:a:d:1', 'IPv6 with "::" and 5 words' ],
+			[ true,  'fc::100:a:d:1:e', 'IPv6 with "::" and 6 words' ],
+			[ true,  'fc::100:a:d:1:e:ac', 'IPv6 with "::" and 7 words' ],
+			[ true,  '2001::df', 'IPv6 with "::" and 2 words' ],
+			[ true,  '2001:5c0:1400:a::df', 'IPv6 with "::" and 5 words' ],
+			[ true,  '2001:5c0:1400:a::df:2', 'IPv6 with "::" and 6 words' ],
+
+			[ false, 'fc::100:a:d:1:e:ac:0', 'IPv6 with "::" and 8 words' ],
+			[ false, 'fc::100:a:d:1:e:ac:0:1', 'IPv6 with 9 words' ]
 		];
 
 	Array.prototype.push.apply( IPV6_CASES,
@@ -70,7 +70,7 @@
 			'::fc:100:a:d:1:e:ac',
 			'fc:100:a:d:1:e:ac:0'
 		], function ( el ) {
-			return [[ true, el, el + ' is a valid IP' ]];
+			return [ [ true, el, el + ' is a valid IP' ] ];
 		} )
 	);
 
@@ -83,7 +83,7 @@
 		},
 		messages: {
 			// Used by accessKeyLabel in test for addPortletLink
-			'brackets': '[$1]',
+			brackets: '[$1]',
 			'word-separator': ' '
 		}
 	} ) );
@@ -134,10 +134,10 @@
 
 	QUnit.test( 'wikiScript', 4, function ( assert ) {
 		mw.config.set( {
-			'wgScript': '/w/i.php', // customized wgScript for bug 39103
-			'wgLoadScript': '/w/l.php', // customized wgLoadScript for bug 39103
-			'wgScriptPath': '/w',
-			'wgScriptExtension': '.php'
+			wgScript: '/w/i.php', // customized wgScript for bug 39103
+			wgLoadScript: '/w/l.php', // customized wgLoadScript for bug 39103
+			wgScriptPath: '/w',
+			wgScriptExtension: '.php'
 		} );
 
 		assert.equal( mw.util.wikiScript(), mw.config.get( 'wgScript' ),
@@ -176,10 +176,10 @@
 		url = 'http://example.org/#&foo=bad';
 		assert.strictEqual( mw.util.getParamValue( 'foo', url ), null, 'Ignore hash if param is not in querystring but in hash (bug 27427)' );
 
-		url = 'example.org?' + $.param( { 'TEST': 'a b+c' } );
+		url = 'example.org?' + $.param( { TEST: 'a b+c' } );
 		assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c', 'Bug 30441: getParamValue must understand "+" encoding of space' );
 
-		url = 'example.org?' + $.param( { 'TEST': 'a b+c d' } ); // check for sloppy code from r95332 :)
+		url = 'example.org?' + $.param( { TEST: 'a b+c d' } ); // check for sloppy code from r95332 :)
 		assert.strictEqual( mw.util.getParamValue( 'TEST', url ), 'a b+c d', 'Bug 30441: getParamValue must understand "+" encoding of space (multiple spaces)' );
 	} );
 
@@ -266,7 +266,7 @@
 		);
 
 		assert.equal( $tbMW.closest( '.portlet' ).attr( 'id' ), 'p-test-tb', 'Link was inserted within correct portlet' );
-		assert.strictEqual( $tbMW.next()[0], tbRL, 'Link is in the correct position (nextnode as Node object)' );
+		assert.strictEqual( $tbMW.next()[ 0 ], tbRL, 'Link is in the correct position (nextnode as Node object)' );
 
 		cuQuux = mw.util.addPortletLink( 'p-test-custom', '#', 'Quux', null, 'Example [shift-x]', 'q' );
 		$cuQuux = $( cuQuux );
@@ -282,7 +282,7 @@
 		tbRLDM = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
 			'Default modules', 't-rldm', 'List of all default modules ', 'd', '#t-rl' );
 
-		assert.strictEqual( $( tbRLDM ).next()[0], tbRL, 'Link is in the correct position (CSS selector as nextnode)' );
+		assert.strictEqual( $( tbRLDM ).next()[ 0 ], tbRL, 'Link is in the correct position (CSS selector as nextnode)' );
 
 		caFoo = mw.util.addPortletLink( 'p-test-views', '#', 'Foo' );
 
@@ -290,19 +290,19 @@
 		assert.strictEqual( $( caFoo ).find( 'span' ).length, 1, 'A <span> element should be added for porlets with vectorTabs class.' );
 
 		addedAfter = mw.util.addPortletLink( 'p-test-tb', '#', 'After foo', 'post-foo', 'After foo', null, $( tbRL ) );
-		assert.strictEqual( $( addedAfter ).next()[0], tbRL, 'Link is in the correct position (jQuery object as nextnode)' );
+		assert.strictEqual( $( addedAfter ).next()[ 0 ], tbRL, 'Link is in the correct position (jQuery object as nextnode)' );
 
 		// test case - nonexistent id as next node
 		tbRLDMnonexistentid = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
 			'Default modules', 't-rldm-nonexistent', 'List of all default modules ', 'd', '#t-rl-nonexistent' );
 
-		assert.equal( tbRLDMnonexistentid, $( '#p-test-tb li:last' )[0], 'Fallback to adding at the end (nextnode non-matching CSS selector)' );
+		assert.equal( tbRLDMnonexistentid, $( '#p-test-tb li:last' )[ 0 ], 'Fallback to adding at the end (nextnode non-matching CSS selector)' );
 
 		// test case - empty jquery object as next node
 		tbRLDMemptyjquery = mw.util.addPortletLink( 'p-test-tb', '//mediawiki.org/wiki/RL/DM',
 			'Default modules', 't-rldm-empty-jquery', 'List of all default modules ', 'd', $( '#t-rl-nonexistent' ) );
 
-		assert.equal( tbRLDMemptyjquery, $( '#p-test-tb li:last' )[0], 'Fallback to adding at the end (nextnode as empty jQuery object)' );
+		assert.equal( tbRLDMemptyjquery, $( '#p-test-tb li:last' )[ 0 ], 'Fallback to adding at the end (nextnode as empty jQuery object)' );
 	} );
 
 	QUnit.test( 'validateEmail', 6, function ( assert ) {
@@ -320,23 +320,23 @@
 
 	QUnit.test( 'isIPv6Address', 40, function ( assert ) {
 		$.each( IPV6_CASES, function ( i, ipCase ) {
-			assert.strictEqual( mw.util.isIPv6Address( ipCase[1] ), ipCase[0], ipCase[2] );
+			assert.strictEqual( mw.util.isIPv6Address( ipCase[ 1 ] ), ipCase[ 0 ], ipCase[ 2 ] );
 		} );
 	} );
 
 	QUnit.test( 'isIPv4Address', 11, function ( assert ) {
 		$.each( IPV4_CASES, function ( i, ipCase ) {
-			assert.strictEqual( mw.util.isIPv4Address( ipCase[1] ), ipCase[0], ipCase[2] );
+			assert.strictEqual( mw.util.isIPv4Address( ipCase[ 1 ] ), ipCase[ 0 ], ipCase[ 2 ] );
 		} );
 	} );
 
 	QUnit.test( 'isIPAddress', 51, function ( assert ) {
 		$.each( IPV4_CASES, function ( i, ipCase ) {
-			assert.strictEqual( mw.util.isIPv4Address( ipCase[1] ), ipCase[0], ipCase[2] );
+			assert.strictEqual( mw.util.isIPv4Address( ipCase[ 1 ] ), ipCase[ 0 ], ipCase[ 2 ] );
 		} );
 
 		$.each( IPV6_CASES, function ( i, ipCase ) {
-			assert.strictEqual( mw.util.isIPv6Address( ipCase[1] ), ipCase[0], ipCase[2] );
+			assert.strictEqual( mw.util.isIPv6Address( ipCase[ 1 ] ), ipCase[ 0 ], ipCase[ 2 ] );
 		} );
 	} );
 }( mediaWiki, jQuery ) );